Browse Source

更新代码

xiaoming_global 5 years ago
parent
commit
b90c334f4d
4 changed files with 63 additions and 25 deletions
  1. 1 1
      config/index.js
  2. 2 2
      config/prod.env.js
  3. 1 1
      src/scrm_pages/site/index.vue
  4. 59 21
      src/scrm_pages/site/preview.vue

+ 1 - 1
config/index.js View File

17
     // can be overwritten by process.env.HOST
17
     // can be overwritten by process.env.HOST
18
     // if you want dev by ip, please set host: '0.0.0.0'
18
     // if you want dev by ip, please set host: '0.0.0.0'
19
 
19
 
20
-    host: 'test1.sgjyun.com',
20
+     host: 'test1.sgjyun.com',
21
     // host: 'localhost',
21
     // host: 'localhost',
22
     // host: 'jk.kuyicloud.com',
22
     // host: 'jk.kuyicloud.com',
23
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
23
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 2 - 2
config/prod.env.js View File

1
 module.exports = {
1
 module.exports = {
2
   NODE_ENV: '"production"',
2
   NODE_ENV: '"production"',
3
   ENV_CONFIG: '"prod"',
3
   ENV_CONFIG: '"prod"',
4
-  // BASE_API: '"http://api.scrm.kuyicloud.com"',
5
-  BASE_API: '"http://api.test1.sgjyun.com"',
4
+  BASE_API: '"http://api.scrm.kuyicloud.com"',
5
+  // BASE_API: '"http://api.test1.sgjyun.com"',
6
 
6
 
7
   SSO_HOST: '"https://sso.kuyicloud.com"',
7
   SSO_HOST: '"https://sso.kuyicloud.com"',
8
   SRCM_HOST: '"http://jk.kuyicloud.com"',
8
   SRCM_HOST: '"http://jk.kuyicloud.com"',

+ 1 - 1
src/scrm_pages/site/index.vue View File

42
       let qrcode = new QRCode('qrcode', {
42
       let qrcode = new QRCode('qrcode', {
43
         width: 100,
43
         width: 100,
44
         height: 100, // 高度
44
         height: 100, // 高度
45
-        text: '56663159' // 二维码内容
45
+        text: 'http://microweb.kuyicloud.com' // 二维码内容
46
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
46
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
47
         // background: '#f0f'
47
         // background: '#f0f'
48
         // foreground: '#ff0'
48
         // foreground: '#ff0'

+ 59 - 21
src/scrm_pages/site/preview.vue View File

7
             <!-- 新增 -->
7
             <!-- 新增 -->
8
             <el-row :gutter="24">
8
             <el-row :gutter="24">
9
                <el-col :span="7">
9
                <el-col :span="7">
10
-                 <el-tabs type="border-card" style="width:340px">
11
-                    <el-tab-pane>
12
-                        <span slot="label"  @click="myindex()">首页</span>
13
-                        <el-tabs v-model="activeName">
10
+                 <el-tabs type="border-card" style="width:340px" @tab-click="handleClick" v-model="activeNameOne">
11
+                    <el-tab-pane label="首页" name="index">
12
+                        <!-- <span slot="label"  @click="myindex()">首页</span> -->
13
+                        <el-tabs v-model="activeName" @tab-click = "handleClickTwo">
14
                             <el-tab-pane label="新增模块" name="first">
14
                             <el-tab-pane label="新增模块" name="first">
15
                                  <new-feature v-on:getHospitaldata='getHospitaldata'></new-feature>
15
                                  <new-feature v-on:getHospitaldata='getHospitaldata'></new-feature>
16
                             </el-tab-pane>
16
                             </el-tab-pane>
17
-                            <el-tab-pane>
18
-                                <span slot="label" name="second" @click="clickAddmodel()">已使用</span>
17
+                            <el-tab-pane label="已使用" name="used">
18
+                                <!-- <span slot="label" name="second" @click="clickAddmodel()">已使用</span> -->
19
                                 <div class="used" v-for="(item,index) in this.modelform" :key="item.id">
19
                                 <div class="used" v-for="(item,index) in this.modelform" :key="item.id">
20
                                   <ul>
20
                                   <ul>
21
                                    <li>
21
                                    <li>
31
                         </el-tabs>
31
                         </el-tabs>
32
                     </el-tab-pane>
32
                     </el-tab-pane>
33
 
33
 
34
-                    <el-tab-pane>
35
-                        <span slot="label"  @click="myindextwo()">联系我们</span>
36
-                        <el-tabs v-model="activeName">
34
+                    <el-tab-pane label="联系我们" name="contactus">
35
+                        <!-- <span slot="label"  @click="myindextwo()">联系我们</span> -->
36
+                        <el-tabs v-model="activeNameThree"  @tab-click="handleClickThree">
37
                             <el-tab-pane label="新增模块" name="three">
37
                             <el-tab-pane label="新增模块" name="three">
38
                                 <add-contact v-on:getOrderModel='getOrderModel'></add-contact>
38
                                 <add-contact v-on:getOrderModel='getOrderModel'></add-contact>
39
                             </el-tab-pane>
39
                             </el-tab-pane>
40
-                            <el-tab-pane>
41
-                               <span slot="label" name="four" @click="clickmodel()">已使用</span>
40
+                            <el-tab-pane label="已使用" name="usedtwo"> 
41
+                               <!-- <span slot="label" name="four" @click="clickmodel()">已使用</span> -->
42
                               <div class="used" v-for="(item,index) in this.model" :key="item.id">
42
                               <div class="used" v-for="(item,index) in this.model" :key="item.id">
43
                                  <ul>
43
                                  <ul>
44
                                    <li>
44
                                    <li>
414
                         </span>
414
                         </span>
415
                         </div>
415
                         </div>
416
                         </div>
416
                         </div>
417
-                        <img src="static/images/u646.png" @click="centerDialogVisible = true">
417
+                          <div class="addrot" @click="centerDialogVisible = true">
418
+                               <div class="addrotone">
419
+                               <i class="el-icon-plus"></i>
420
+                           </div>
421
+                           <div class="addrotwo">
422
+                             <span>新增名医</span>
423
+                           </div>
424
+                        </div>
425
+                        <!-- <img src="static/images/u646.png" @click="centerDialogVisible = true"> -->
418
                         </div>
426
                         </div>
419
                     </el-form-item>
427
                     </el-form-item>
420
                    </el-form>
428
                    </el-form>
2079
       Connectways:[],
2087
       Connectways:[],
2080
       crumbs: [{ path: false, name: "预览" }],
2088
       crumbs: [{ path: false, name: "预览" }],
2081
       activeName: 'first',
2089
       activeName: 'first',
2090
+      activeNameOne: 'index',
2091
+      activeNameThree: 'three',
2082
       name: "car",
2092
       name: "car",
2083
       modelshow:false,
2093
       modelshow:false,
2084
       modelshowtwo:true,
2094
       modelshowtwo:true,
2792
          this.modelshowtwo= false;
2802
          this.modelshowtwo= false;
2793
          this.modelshow = true;
2803
          this.modelshow = true;
2794
       },
2804
       },
2805
+      
2806
+      handleClick(tab,event){
2807
+        if(this.activeNameOne == "index"){
2808
+          this.modelshowtwo = true;
2809
+          this.modelshow = false;
2810
+        }
2811
+
2812
+        if(this.activeNameOne == "contactus"){
2813
+           this.modelshowtwo = false;
2814
+           this.modelshow = true;
2815
+        }
2816
+      },
2817
+
2818
+      handleClickTwo(tab,event){
2819
+        if(this.activeName == "used"){
2820
+          this.getQueryNewModel();
2821
+        }
2822
+      },
2823
+
2824
+      handleClickThree(tab,event){
2825
+         if(this.activeNameThree == "usedtwo"){
2826
+            this.GetUserdModel();
2827
+         }
2828
+      },
2829
+
2795
       sharemanage(){
2830
       sharemanage(){
2796
         this.navigation = false;
2831
         this.navigation = false;
2797
         this.share = true;
2832
         this.share = true;
4362
       let qrcode = new QRCode('qrcode', {
4397
       let qrcode = new QRCode('qrcode', {
4363
         width: 100,
4398
         width: 100,
4364
         height: 100, // 高度
4399
         height: 100, // 高度
4365
-        text:"www.baidu.com", // 二维码内容
4400
+        text:"http://microweb.kuyicloud.com", // 二维码内容
4366
       })
4401
       })
4367
       console.log(qrcode)
4402
       console.log(qrcode)
4368
     },
4403
     },
5659
      padding-top: 5px;
5694
      padding-top: 5px;
5660
    }
5695
    }
5661
    .doctitle{
5696
    .doctitle{
5662
-     width: 50px;
5697
+     width: 80px;
5663
      height: 20px;
5698
      height: 20px;
5664
-     /* border: solid 1px blue; */
5699
+    //  border: solid 1px blue; 
5665
      float: right;
5700
      float: right;
5666
-     margin-right: 152px;
5701
+     margin-right: 120px;
5667
      margin-top: -75px;
5702
      margin-top: -75px;
5703
+     font-size: 14px;
5668
    }
5704
    }
5669
 
5705
 
5670
    .doccontent{
5706
    .doccontent{
5671
-     width: 150px;
5707
+     width: 180px;
5672
      height: 50px;
5708
      height: 50px;
5673
-     /* border: solid 1px red; */
5709
+    //  border: solid 1px red; 
5674
      margin-top: -50px;
5710
      margin-top: -50px;
5675
      margin-left: 108px;
5711
      margin-left: 108px;
5676
      font-size: 14px;
5712
      font-size: 14px;
5713
+     overflow: hidden;
5714
+     
5677
    }
5715
    }
5678
    .docnamefont{
5716
    .docnamefont{
5679
      font-size: 14px;
5717
      font-size: 14px;
5752
     .xxcontent{
5790
     .xxcontent{
5753
       overflow: hidden;
5791
       overflow: hidden;
5754
       text-overflow: ellipsis;
5792
       text-overflow: ellipsis;
5755
-      display: -webkit-box;
5756
-      -webkit-line-clamp: 3;
5757
-      -webkit-box-orient: vertical
5793
+       display: -webkit-box;
5794
+      -webkit-line-clamp: 2;
5795
+      -webkit-box-orient: vertical;
5758
    }
5796
    }
5759
 
5797
 
5760
      #wrappertwo{
5798
      #wrappertwo{