xiaoming_global 5 лет назад
Родитель
Сommit
5f8d1f2e2b

+ 5 - 5
config/dev.env.js Просмотреть файл

@@ -3,10 +3,10 @@ module.exports = {
3 3
   ENV_CONFIG: '"dev"',
4 4
   BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
5 5
   
6
-   SSO_HOST: '"https://testsso.sgjyun.com"',
7
-   SRCM_HOST: '"http://test1.sgjyun.com"',
8
-   XT_HOST: '"http://xt.test.sgjyun.com"',
9
-   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
10
-   CDM_HOST: '"http://cdm.test.sgjyun.com"',
6
+  //  SSO_HOST: '"http://testsso.sgjyun.com"',
7
+  //  SRCM_HOST: '"http://test1.sgjyun.com"',
8
+  //  XT_HOST: '"http://xt.test.sgjyun.com"',
9
+  //  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
10
+  //  CDM_HOST: '"http://cdm.test.sgjyun.com"',
11 11
 }
12 12
 

+ 1 - 2
config/index.js Просмотреть файл

@@ -6,7 +6,6 @@ const path = require('path')
6 6
 
7 7
 module.exports = {
8 8
   dev: {
9
-
10 9
     // Paths
11 10
     assetsSubDirectory: 'static',
12 11
     assetsPublicPath: '/',
@@ -17,7 +16,7 @@ module.exports = {
17 16
     // can be overwritten by process.env.HOST
18 17
     // if you want dev by ip, please set host: '0.0.0.0'
19 18
 
20
-     host: 'test1.sgjyun.com',
19
+    host: 'test1.sgjyun.com',
21 20
     // host: 'localhost',
22 21
     // host: 'jk.kuyicloud.com',
23 22
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 1 - 1
index.html Просмотреть файл

@@ -8,7 +8,7 @@
8 8
     <meta name=”referrer” content=”never”>
9 9
     <meta name="referrer" content="no-referrer"/>
10 10
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
11
-    <title>血透管理-酷医云</title>
11
+    <title>SCRM-酷医云</title>
12 12
   </head>
13 13
   <body>
14 14
     <script src="<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js"></script>

+ 21 - 0
package-lock.json Просмотреть файл

@@ -14242,6 +14242,22 @@
14242 14242
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
14243 14243
       "dev": true
14244 14244
     },
14245
+    "v-viewer": {
14246
+      "version": "1.4.2",
14247
+      "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.4.2.tgz",
14248
+      "integrity": "sha512-WEslW+dKPHg10f9jl1v0ilH0uk4ZFOz4vUp4wJjomwl+VQEnsWLjSzHCeFoayxjE9KyZspVu9lYLNxk+o3xzkw==",
14249
+      "requires": {
14250
+        "throttle-debounce": "^2.0.1",
14251
+        "viewerjs": "^1.3.2"
14252
+      },
14253
+      "dependencies": {
14254
+        "throttle-debounce": {
14255
+          "version": "2.1.0",
14256
+          "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
14257
+          "integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg=="
14258
+        }
14259
+      }
14260
+    },
14245 14261
     "validate-npm-package-license": {
14246 14262
       "version": "3.0.4",
14247 14263
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -14275,6 +14291,11 @@
14275 14291
         "extsprintf": "^1.2.0"
14276 14292
       }
14277 14293
     },
14294
+    "viewerjs": {
14295
+      "version": "1.3.7",
14296
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.3.7.tgz",
14297
+      "integrity": "sha512-I7iD166zrqxocoNn1c23nwERzMXXxnlJw8eWLsK28DSAhGWSue1ZPaxV2qr7LC4lbhom1OUa7Z/glWsnGaa3bw=="
14298
+    },
14278 14299
     "vm-browserify": {
14279 14300
       "version": "0.0.4",
14280 14301
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",

+ 1 - 0
package.json Просмотреть файл

@@ -68,6 +68,7 @@
68 68
     "sortablejs": "1.7.0",
69 69
     "spark-md5": "^3.0.0",
70 70
     "swiper": "^4.5.1",
71
+    "v-viewer": "^1.4.2",
71 72
     "vue": "2.5.16",
72 73
     "vue-baidu-map": "^0.21.22",
73 74
     "vue-count-to": "1.0.13",

+ 142 - 11
src/api/site/site.js Просмотреть файл

@@ -354,6 +354,7 @@ export function SaveDocdata(id,data){
354 354
 }
355 355
 
356 356
 export function editOfficeEnviroment(id,data){
357
+    console.log("科室环境id",id)
357 358
     return request({
358 359
         url:"/api/site/editofficeenviroment?id="+id,
359 360
         method:"Get",
@@ -559,10 +560,9 @@ export function getEditImages(params){
559 560
     })
560 561
 }
561 562
 
562
-export function AddMagicNavi(id,data){
563
-    console.log("id是什么呢",id)
563
+export function AddMagicNavi(data){
564 564
    return request({
565
-       url:"/api/site/addmagicnavi?id="+id,
565
+       url:"/api/site/addmagicnavi",
566 566
        method:"Post",
567 567
        data:data,
568 568
    })
@@ -634,11 +634,15 @@ export function deleteImages(id,data){
634 634
     })
635 635
 }
636 636
 
637
-export function deleteSingleImages(id,data){
637
+export function deleteSingleImages(id,modeid){
638
+    const params = {
639
+        id:id,
640
+        modeid:modeid,
641
+    }
638 642
     return request({
639
-        url:"/api/site/deletesingleimages?id="+id,
643
+        url:"/api/site/deletesingleimages",
640 644
         method:"Post",
641
-        data:data,
645
+        params:params,
642 646
     })
643 647
 }
644 648
 
@@ -769,7 +773,6 @@ export function UpdateSingleForm(id,data){
769 773
 }
770 774
 
771 775
 export function addEditPicForm(id,data){
772
-  
773 776
     return request({
774 777
         url:"/api/site/addeditpicform?id="+id,
775 778
         method:"Post",
@@ -778,7 +781,7 @@ export function addEditPicForm(id,data){
778 781
 }
779 782
 
780 783
 export function AddRotationVisible(id,data){
781
-   
784
+//    console.log('这个滚data',data)
782 785
     return request({
783 786
         url:"/api/site/addrotationvisible?id="+id,
784 787
         method:"Post",
@@ -852,6 +855,7 @@ export function UpdatedArticeDetail(id,data){
852 855
 }
853 856
 
854 857
 export function AddOfficeThreeVisible(id,data){
858
+    console.log("科室环境id",id)
855 859
    return request({
856 860
        url:"/api/site/addoffficethree?id="+id,
857 861
        method:"Post",
@@ -899,14 +903,40 @@ export function GetAllActivity(params){
899 903
    })
900 904
 }
901 905
 
902
-export function AddLinkAddress (data){
906
+export function AddLinkAddress (address){
907
+    console.log("data是什么",address);
908
+    const params = {
909
+       address:address,
910
+    }
903 911
    return request({
904
-       url:"/api/site/addlinkaddress",
912
+       url:"/api/site/addlinkaddresstwo",
905 913
        method:"Post",
906
-       data:data,
914
+       params:params,
907 915
    })
908 916
 }
909 917
 
918
+export function AddLinkAddressTwo(address){
919
+   const params = {
920
+       address:address,
921
+   }
922
+   return request({
923
+       url:'/api/site/addlinkaddressthree',
924
+       method:"Post",
925
+       params:params,
926
+   })
927
+}
928
+
929
+export function AddLinkAddressFour(address){
930
+    const params = {
931
+        address:address,
932
+    }
933
+    return request({
934
+        url:"/api/site/addlinkaddressfour",
935
+        method:"Post",
936
+        params:params,
937
+    })
938
+}
939
+
910 940
 export function getLinkAddress(params){
911 941
    return request({
912 942
        url:"/api/site/getlinkaddress",
@@ -1159,3 +1189,104 @@ export function UpdateEditNavigationLinkform(id,data){
1159 1189
     })
1160 1190
 }
1161 1191
 
1192
+export function AddDoctorInfoTwo(id,data){
1193
+   return request({
1194
+       url:"/api/site/addoctorinfotwo?id="+id,
1195
+       method:"Post",
1196
+       data:data,
1197
+   })
1198
+}
1199
+
1200
+export function GetDefaultData(params){
1201
+   return request({
1202
+       url:"/api/site/getDefaultData",
1203
+       method:"Get",
1204
+       params:params,
1205
+   })
1206
+}
1207
+
1208
+export function GetUserOrgid(params){
1209
+    return request({
1210
+        url:"/api/site/getuserorgid",
1211
+        method:"Get",
1212
+        params:params,
1213
+    })
1214
+}
1215
+
1216
+export function navigationset(params){
1217
+    return request({
1218
+        url:"/api/site/navigationset",
1219
+        method:"Get",
1220
+        params:params,
1221
+    })
1222
+}
1223
+
1224
+export function GetNavigationData(params){
1225
+   return request({
1226
+       url:"/api/site/getnavigationdata",
1227
+       method:"Get",
1228
+       params:params,
1229
+   })
1230
+}
1231
+
1232
+
1233
+export function getAllModelTitle(params){
1234
+    return request({
1235
+        url:"/api/site/getallmodeltitle",
1236
+        method:"Get",
1237
+        params:params,
1238
+    })
1239
+}
1240
+
1241
+
1242
+export function GetDoctorDetail(id,params){
1243
+   return request({
1244
+       url:"/api/site/getdoctordetail?id="+id,
1245
+       method:"Get",
1246
+       params:params,
1247
+   })
1248
+}
1249
+
1250
+export function GetArticleListDetail(id,params){
1251
+    return request({
1252
+        url:"/api/site/getArticlelistdetail?id="+id,
1253
+        method:"Get",
1254
+        params:params,
1255
+    })
1256
+}
1257
+
1258
+export function ActivitiesListInfo(id,params){
1259
+   return request({
1260
+       url:"/api/site/getActivitieslistinfo?id="+id,
1261
+       method:"Get",
1262
+       params:params,
1263
+   })
1264
+}
1265
+
1266
+export function GetLinkAddressByLinkid(linkid,params){
1267
+    console.log("linkid是什么",linkid)
1268
+    return request({
1269
+        url:"/api/getlinkaddressbylinkid?linkid="+linkid,
1270
+        method:"Get",
1271
+        params:params,  
1272
+    })
1273
+}
1274
+
1275
+
1276
+export function GetMagicLinkAddressByID(id,params){
1277
+   console.log("id是什么",id)
1278
+   return request({
1279
+       url:"/api/site/getmaginclinkaddressbyid?id="+id,
1280
+       method:"Get",
1281
+       params:params,
1282
+   })
1283
+}
1284
+
1285
+export function GetMagicClickByLinkid(linkid,params){
1286
+   console.log("linkid是什么",linkid)
1287
+   return request({
1288
+       url:"/api.site/getmagicclickbylinkid?linkid="+linkid,
1289
+       method:"Get",
1290
+       params:params,
1291
+   })
1292
+}

+ 1 - 1
src/lang/zh.js Просмотреть файл

@@ -170,7 +170,7 @@ export default {
170 170
     activityPublish: "发布活动",
171 171
     activityModify: "编辑活动",
172 172
     systemsetting:'系统设置',
173
-    staffmanagement:'员工管理',
173
+    staffmanagement:'医护管理',
174 174
     activityDetail: "活动详情",
175 175
     activityShare: "活动分享",
176 176
     activityPreview: "活动预览",

+ 9 - 0
src/main.js Просмотреть файл

@@ -32,6 +32,15 @@ Vue.use(Mint);
32 32
 
33 33
 import { read } from 'fs';
34 34
 import BaiduMap from 'vue-baidu-map'
35
+import Viewer from 'v-viewer'
36
+import 'viewerjs/dist/viewer.css'
37
+
38
+Vue.use(Viewer, {
39
+  defaultOptions: {
40
+      zIndex: 9999
41
+  }
42
+})
43
+
35 44
 Vue.use(Element, {
36 45
   size: 'medium', // set element-ui default size
37 46
   i18n: (key, value) => i18n.t(key, value)

+ 7 - 1
src/router/modules/site.js Просмотреть файл

@@ -29,7 +29,13 @@ export default {
29 29
       },
30 30
       hidden: true,
31 31
       is_menu: false
32
-    }
32
+    },
33
+    {
34
+      path: '/Systemsetting/staffmanagement',
35
+      component: () => import('@/scrm_pages/Systemsetting/staffmanagement'),
36
+      name: 'memberslist',
37
+      meta: { title: 'staffmanagement', noCache: true }
38
+    },
33 39
 
34 40
   ]
35 41
 }

+ 1 - 6
src/router/modules/system.js Просмотреть файл

@@ -36,11 +36,6 @@ export default {
36 36
       hidden: true,
37 37
       meta: { title: '关键词回复', noCache: true }
38 38
     },
39
-    {
40
-      path: '/Systemsetting/staffmanagement',
41
-      component: () => import('@/scrm_pages/Systemsetting/staffmanagement'),
42
-      name: 'memberslist',
43
-      meta: { title: 'staffmanagement', noCache: true }
44
-    },
39
+   
45 40
   ]
46 41
 }

+ 2 - 3
src/scrm_pages/article/createArticle.vue Просмотреть файл

@@ -551,7 +551,6 @@
551 551
       },    
552 552
       gotolink(){
553 553
             this.centerDialogVisible = false;  
554
-            this.show=true;
555 554
             this.form.act_name = "";
556 555
             this.form.act_content = "";
557 556
             this.form.act_picture = "";
@@ -563,7 +562,7 @@
563 562
             this.form.vio_upload = "";
564 563
             this.form.vid_name = "";
565 564
             this.form.vid_type = "";
566
-            console.log("牛逼")
565
+            this.show=true;
567 566
       },
568 567
       gobacklist(){
569 568
         this.$router.push({path:'/articles/articleList'})
@@ -695,7 +694,6 @@
695 694
     text-align: center;
696 695
     width: 200px;
697 696
     height: 200px;
698
-    position: relative;
699 697
     left: 500px;
700 698
     margin-bottom: 60px;
701 699
     margin-top: -140px;
@@ -706,4 +704,5 @@
706 704
     left: 80px;
707 705
     margin-bottom: 20px;
708 706
   }
707
+
709 708
 </style>

+ 1 - 1
src/scrm_pages/contactBox/index.vue Просмотреть файл

@@ -617,7 +617,7 @@ export default {
617 617
             };
618 618
             webim.login(this.loginInfo, listeners, this.loginOptions, 
619 619
                 function(resp){
620
-                    _this.$message.success('webim登录成功');
620
+                    // _this.$message.success('webim登录成功');
621 621
                     _this.imloginFlag = true;
622 622
                 },
623 623
                 function(err) {

+ 6 - 1
src/scrm_pages/kefu/index.vue Просмотреть файл

@@ -394,7 +394,7 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
394 394
 
395 395
         webim.login(this.loginInfo, listeners, this.loginOptions, 
396 396
           function(resp){
397
-            _this.$message.success('登录成功');
397
+            // _this.$message.success('登录成功');
398 398
             _this.imloginFlag = true;
399 399
           },
400 400
           function(err) {
@@ -514,12 +514,17 @@ var kgetPrePageC2CHistroyMsgInfoMap = {};
514 514
         GetAllMembers().then(response=>{
515 515
           if (response.data.state == 1) { 
516 516
             this.customers = response.data.data.members;
517
+            console.log("customers是什么",this.customers)
517 518
             for (const key in this.customers) {
518 519
               var custimerItem = this.customers[key];
519 520
               var mapKey = "User_" + custimerItem.user_id;
520 521
               if(custimerItem.user_id==0 || mapKey in this.customersMap) {
521 522
                 continue;
522 523
               }
524
+              
525
+              if(custimerItem.avatar == ""){
526
+                 custimerItem.avatar = "https://images.shengws.com/201809182128111.png"   
527
+              }
523 528
               custimerItem['sortno'] = -1;
524 529
               custimerItem['unread_msg_count'] = '';
525 530
               this.$set(this.customersMap, mapKey, custimerItem);

+ 2 - 1
src/scrm_pages/members/members.vue Просмотреть файл

@@ -461,7 +461,8 @@
461 461
         }
462 462
     },
463 463
     created(){
464
-        this.sourceOptions = this.$store.getters.members.sources;
464
+        this.sourceOptions = this.$store.getters.members.sources;      
465
+        console.log("来源方式",this.sourceOptions)
465 466
         this.treatTypeOptions = this.$store.getters.members.treat_type;
466 467
         this.GetMembers();
467 468
     }

+ 2 - 2
src/scrm_pages/site/components/add-contact.vue Просмотреть файл

@@ -101,13 +101,13 @@
101 101
        <el-form-item label="医院地址:" required prop="address">
102 102
          <el-input v-model="hospitalform.address"></el-input>
103 103
        </el-form-item>
104
-       <el-form-item label="医院地图:">  
104
+       <!-- <el-form-item label="医院地图:">  
105 105
            <baidu-map>
106 106
               <bm-overview-map anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :isOpen="true"></bm-overview-map>
107 107
               <bm-local-search :keyword="hospitalform.address" :auto-viewport="true" style="display:none" :center="location"  :zoom="zoom"></bm-local-search>
108 108
               <bm-view class="map"></bm-view>
109 109
          </baidu-map>
110
-       </el-form-item>
110
+       </el-form-item> -->
111 111
     
112 112
     </el-form>
113 113
     <span slot="footer" class="dialog-footer">

+ 96 - 164
src/scrm_pages/site/components/new-feature.vue Просмотреть файл

@@ -121,14 +121,6 @@
121 121
           <img v-if="picform.imageUrl" :src="picform.imageUrl" class="avatar">
122 122
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
123 123
         </el-upload> 
124
-         <!-- <div class="addrot" @click="addpicdialogVisible = true">
125
-             <div class="addrotone">
126
-             <i class="el-icon-plus"></i>
127
-            </div>  
128
-             <div class="addrotwo">
129
-               <span>新增图片</span>
130
-             </div>
131
-        </div> -->
132 124
       </el-col>
133 125
       <el-col :span="19" v-show="isImages">   
134 126
           <div class="tpic"> 
@@ -148,7 +140,7 @@
148 140
     </el-form-item>
149 141
     <el-form-item label="链接地址:"  v-show="selectone">
150 142
       <el-col :span="15">
151
-      <el-input v-model="picform.linkaddress" style="width:300px"></el-input>
143
+      <el-input v-model="picform.linkaddress" style="width:300px" :disabled="true"></el-input>
152 144
       </el-col>
153 145
       <el-col :span="4">
154 146
        <el-button size="medium" @click="linkVisible = true">设置链接</el-button>
@@ -193,57 +185,15 @@
193 185
     :visible.sync="linkVisible"
194 186
     width="30%"
195 187
     center>
196
-     <el-form label-width="90px" :model="linkform" ref="linkform">
197
-       <el-form-item label="连接类型">
198
-         <el-radio-group v-model="linkform.connectType">
199
-            <el-radio :label="item.id" :value="item.id" v-for="(item,index) in defineOptionsTwo" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
200
-         </el-radio-group>
201
-     </el-form-item>  
202
-       <el-form-item label="链接类型:" v-show="definetwo">
203
-         <el-col :span="8">
204
-            <el-select v-model="linkform.linkType" placeholder="请选择"
205
-              @change="changeType">
206
-              <el-option
207
-              v-for="item in options"
208
-              :key="item.id"
209
-              :label="item.name"
210
-             :value="item.id" >
211
-            </el-option>
212
-          </el-select>
213
-       </el-col>
214
-       <el-col :span="8" v-show="addTypeShow">
215
-           <el-select v-model="linkform.addtype" placeholder="请选择"
216
-           @change="GetArticleById">
217
-            <el-option
218
-            v-for="item in articeTypelist"
219
-            :key="item.id"
220
-            :label="item.name"
221
-            :value="item.id">
222
-            </el-option>
223
-          </el-select>
224
-       </el-col>
225
-     
226
-     </el-form-item>
227
-     <el-form-item label="站内链接:" v-show="definetwo">
228
-       <el-select v-model="linkform.contenttype" placeholder="请选择">
229
-        <el-option
230
-        v-for="item in articeNamelist"
231
-        :key="item.id"
232
-        :label="item.title"
233
-        :value="item.id" >   
234
-        </el-option>
235
-      </el-select>
236
-     </el-form-item>
237
-     <el-form-item label="自定义地址:" v-show="definethree">
238
-       <el-input v-model="linkform.defineAddress"></el-input>
239
-     </el-form-item>
240
-     <el-form-item label="站外链接:" v-show="definefour">
241
-       <el-input></el-input>
188
+     <el-form label-width="90px" :model="linkformtwo" ref="linkformtwo">
189
+     <el-form-item label="站外链接:">
190
+       <el-input v-model="linkformtwo.address"></el-input>
242 191
      </el-form-item>
243 192
      </el-form>
193
+    
244 194
     <span slot="footer" class="dialog-footer">
245 195
     <el-button @click="linkVisible = false">取 消</el-button>
246
-    <el-button type="primary" @click="AddLinkAddress('linkform');linkVisible = false">确 定</el-button>
196
+    <el-button type="primary" @click="AddLinkAddress('linkformtwo');">确 定</el-button>
247 197
   </span>
248 198
   </el-dialog>
249 199
 
@@ -351,7 +301,7 @@
351 301
     </el-form>
352 302
     <span slot="footer" class="dialog-footer">
353 303
       <el-button @click="four = false">取 消</el-button>
354
-      <el-button type="primary" @click="AddDoctor('doctorform');editDoctorInfo('doctorform')">确 定</el-button>
304
+      <el-button type="primary" @click="AddDoctor('doctorform');">确 定</el-button>
355 305
     </span>
356 306
   </el-dialog>
357 307
 
@@ -364,7 +314,7 @@
364 314
        <el-form label-width="90px" class="clearfix" :model="eidtDoctorform" ref="eidtDoctorform" :rules="rules">
365 315
           <el-row :span=20>
366 316
             <el-col :span="12">
367
-             <el-form-item label="医生姓名:">
317
+             <el-form-item label="医生姓名:" required prop="name">
368 318
               <el-select  placeholder="请选择" v-model="eidtDoctorform.name"  @change="change(eidtDoctorform.name)">
369 319
                 <el-option
370 320
                  v-for="item in docnames"
@@ -740,10 +690,10 @@
740 690
       </el-form-item>
741 691
       <el-form-item>
742 692
          <el-col :span="18">
743
-           <el-input style="width:300px" v-model="editmacform.marginaddress" v-show="define"></el-input>
693
+           <el-input style="width:300px" v-model="editmacform.marginaddress" v-show="define" :disabled="true"></el-input>
744 694
         </el-col>
745 695
         <el-col :span="4">
746
-         <el-button size="medium" @click="magicVisibleOne = true" v-show="define">设置链接</el-button>
696
+         <el-button size="medium" @click="magicVisibleOne = true;GetMagicLinkAddressByID(editmacform.linkid)" v-show="define" >设置链接</el-button>
747 697
         </el-col>
748 698
        </el-form-item>
749 699
     </el-form>
@@ -767,20 +717,10 @@
767 717
        <el-form-item label="链接类型:" v-show="definetwo">
768 718
        <el-select v-model="value" placeholder="请选择">
769 719
         <el-option
770
-        v-for="item in options"
771
-        :key="item.value"
772
-        :label="item.label"
773
-        :value="item.value">
774
-       </el-option>
775
-      </el-select>
776
-     </el-form-item>
777
-     <el-form-item label="文章分类" v-show="definetwo">
778
-       <el-select v-model="value" placeholder="请选择">
779
-        <el-option
780
-        v-for="item in options"
781
-        :key="item.value"
782
-        :label="item.label"
783
-        :value="item.value">
720
+        v-for="item in modelTtile"
721
+        :key="item.id"
722
+        :label="item.title"
723
+        :value="item.id">
784 724
        </el-option>
785 725
       </el-select>
786 726
      </el-form-item>
@@ -799,7 +739,7 @@
799 739
  
800 740
  <!-- 编辑魔法导航 -->
801 741
    <el-dialog
802
-     title="编辑魔方导航3"
742
+     title="编辑魔方导航"
803 743
      :visible.sync="MagicNavigation"
804 744
      width="35%"
805 745
      center>
@@ -851,40 +791,15 @@
851 791
          </el-radio-group>
852 792
      </el-form-item>  
853 793
        <el-form-item label="链接类型:" v-show="definetwo">
854
-       <el-select v-model="maclinkform.instationlink" placeholder="请选择" clearable
855
-       @change="changeArticeType">
794
+       <el-select v-model="maclinkform.instationlink" placeholder="请选择" clearable>
856 795
         <el-option
857
-        v-for="item in options"
796
+        v-for="item in modelTtile"
858 797
         :key="item.id"
859
-        :label="item.name"
798
+        :label="item.title"
860 799
         :value="item.id">
861 800
        </el-option>
862 801
       </el-select>
863 802
      </el-form-item>
864
-     <el-form-item label="文章分类" v-show="definetwo">
865
-       <el-col :span="8">
866
-         <el-select v-model="maclinkform.articeType" placeholder="请选择" clearable
867
-         @change="GetArticleById">
868
-          <el-option
869
-          v-for="item in articeTypelist"
870
-          :key="item.id"
871
-          :label="item.name"
872
-          :value="item.id">
873
-         </el-option>
874
-       </el-select>
875
-       </el-col>
876
-       <el-col :span="8">
877
-        <el-select v-model="maclinkform.title" placeholder="请选择" clearable>
878
-          <el-option
879
-           v-for="item in articeNamelist"
880
-           :key="item.id"
881
-           :label="item.title"
882
-           :value="item.id">
883
-        </el-option>
884
-      </el-select>
885
-       </el-col>
886
-      
887
-     </el-form-item>
888 803
      <el-form-item label="电话号码:" v-show="definethree">
889 804
        <el-input v-model="maclinkform.phone"></el-input>
890 805
      </el-form-item>
@@ -993,7 +908,7 @@
993 908
    getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
994 909
    deleteRotations,editRotationImages,updateRotionImages,addActiveform,deleteMargin,getEditImagesDetail,UpdateEditMacgin,getArticleType
995 910
    ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
996
-   getMacLinkAddress,getCountImages} from '@/api/site/site'  
911
+   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID} from '@/api/site/site'  
997 912
    import { getToken } from '@/api/qiniu'
998 913
    import { getFileExtension} from '@/utils/tools'
999 914
    import { isIP, isIPv4 } from 'net';
@@ -1052,6 +967,9 @@ export default {
1052 967
         {id:2,name:'站内链接'},
1053 968
         {id:3,name:'站外链接'}
1054 969
       ],
970
+      defineOptionsThree:[
971
+         {id:1,name:'站外链接'}
972
+      ],
1055 973
       options: [
1056 974
          {id:1,name:"文章"},
1057 975
          {id:2,name:"活动"}, 
@@ -1060,7 +978,9 @@ export default {
1060 978
          {id:5,name:"肾科科普"},
1061 979
          {id:6,name:"生活"},
1062 980
          {id:7,name:"肾友故事"}, 
1063
-        ],  
981
+        ], 
982
+        
983
+      modelTtile:[],   
1064 984
         id:0,   
1065 985
        articeType:[
1066 986
          {id:1,name:"SCRM"},
@@ -1224,6 +1144,7 @@ export default {
1224 1144
         margImage:"",
1225 1145
         marginaddress:"",
1226 1146
         jumpset:"",
1147
+        linkid:"",
1227 1148
       },
1228 1149
       keform:{
1229 1150
         title:"",
@@ -1275,6 +1196,9 @@ export default {
1275 1196
       articeNamelist:[],
1276 1197
       patientRotation:[],
1277 1198
       totalImages:0,
1199
+      linkformtwo:{
1200
+        address:"",
1201
+      },
1278 1202
        rules: {
1279 1203
          title: [{required: true, message: "请填写模块标题",},],
1280 1204
          sort: [{required: true,message:"请填写排序值"},{validator:checkNumberRule}],
@@ -1300,6 +1224,7 @@ export default {
1300 1224
          marginImages:[{required:true,message:"请添加图片"}],
1301 1225
          jumpset:[{required:true,message:"请选择跳转设置"}],
1302 1226
          margImage:[{required:true,message:"请上传导航图标"}],
1227
+         name:[{required:true,message:"请选择医生姓名"}],
1303 1228
       },
1304 1229
     };
1305 1230
   },
@@ -1332,36 +1257,16 @@ export default {
1332 1257
       })
1333 1258
     },
1334 1259
     AddLinkAddress(formName){
1335
-       if(this.linkform.connectType == 1){
1336
-          this.linkform.linkaddress = "/articles/createArticle/?id="+this.linkform.contenttype; 
1337
-       }
1338
-       if(this.linkform.connectType == 2){
1339
-         this.linkform.linkaddress = "/activity/?id="+this.linkform.contenttype;
1340
-       }
1341
-
1342
-        var addtype = this.linkform.addtype
1343
-        if(addtype == ""){
1344
-           this.linkform.addtype = 1; 
1345
-        }
1346
-        var contenttype =  this.linkform.contenttype
1347
-        if(contenttype == ""){
1348
-         this.linkform.contenttype = 1;
1349
-        }
1350
-
1351
-        var linktype =  this.linkform.linkType
1352
-        if(linktype == ""){
1353
-          this.linkform.linkType = 1;
1354
-        }
1355 1260
       this.$refs[formName].validate((valid)=>{
1356 1261
         if(valid){
1357
-           AddLinkAddress(this.linkform).then(response=>{              
1262
+           AddLinkAddress(this.linkformtwo.address).then(response=>{              
1358 1263
               if(response.data.state == 1){
1359
-                var patientLinkaddress =  response.data.data.patientLinkaddress;
1360
-                var address = response.data.data.address;
1361
-                this.picform.linkaddress = address.linkaddress;
1362
-                this.picform.id = address.id;
1363
-                console.log("返回地址是多少",address)
1364
-                console.log("数据返回",patientLinkaddress)
1264
+                this.linkVisible = false;
1265
+                var linkaddress =  response.data.data.patientLinkaddress;
1266
+                this.picform.linkaddress = linkaddress.defineaddress;
1267
+                this.picform.id = linkaddress.id;
1268
+                this.linkformtwo.address = "";
1269
+                console.log("数据返回",linkaddress)
1365 1270
               }
1366 1271
            })
1367 1272
         }
@@ -1401,6 +1306,7 @@ export default {
1401 1306
             const _self = this
1402 1307
             return new Promise((resolve, reject) => {
1403 1308
                 getToken().then(response => {
1309
+                  
1404 1310
                     const tokentree = response.data.data.uptoken
1405 1311
                     console.log("token是什么?",tokentree)
1406 1312
                     _self._data.doctorData.token = tokentree;
@@ -1423,6 +1329,8 @@ export default {
1423 1329
             var fileType = file.type
1424 1330
             const isJPG = fileType.indexOf("image") > -1;
1425 1331
             const isLt2M = file.size / 1024 / 1024 < 2;
1332
+            console.log("我爱你中国我爱你中奴工")
1333
+            console.log(fileType,isJPG,isLt2M)
1426 1334
             if (!isJPG) {
1427 1335
                 this.$message.error("只能上传图片");
1428 1336
                 return false;
@@ -1432,24 +1340,24 @@ export default {
1432 1340
                 return false;
1433 1341
          }
1434 1342
            var date = new Date()
1343
+           console.log("date是",date)
1435 1344
             var ext = getFileExtension(file.name)
1436
-            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
1437
-            this.uploading = true;
1438
-            this.loadingText = '封面图片上传中'
1439
-
1345
+            console.log("ext",ext)
1346
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;   
1347
+            console.log("key",key)
1440 1348
             const _self = this
1441 1349
             return new Promise((resolve, reject) => {
1442 1350
                 getToken().then(response => {
1443
-                    const tokentree = response.data.data.uptoken
1351
+                    console.log("我爱你中国")
1352
+                    const tokentree = response.data.data.uptoken;
1444 1353
                     console.log("图片编辑token是什么?",tokentree)
1445 1354
                     _self._data.imageData.token = tokentree;
1446 1355
                     _self._data.imageData.key = key;
1447 1356
                     resolve(true)
1448 1357
                 }).catch(err => {
1449 1358
                     reject(false)
1450
-                    this.uploading = false;
1451 1359
                 })
1452
-            })   
1360
+            })    
1453 1361
         },
1454 1362
         handleRemove() {
1455 1363
             this.file = '';
@@ -1782,14 +1690,21 @@ export default {
1782 1690
            }
1783 1691
         });
1784 1692
      },
1693
+
1785 1694
      deleteDoctor(id,index){
1786
-       deleteDoctor(id,index).then(response=>{
1787
-          if(response.data.state == 1){
1788
-             this.docform.splice(index,1);
1789
-          }
1790
-       })
1695
+       this.$confirm('确认要删除吗?删除后信息将无法恢复','删除提示!',{
1696
+         dangerouslyUseHTMLString:true,
1697
+             confirmButtonText: '确定',
1698
+             cancelButtonText: '取消',
1699
+             type: 'warning'
1700
+       }).then(()=>{
1701
+           deleteDoctor(id,index).then(response=>{
1702
+              if(response.data.state == 1){
1703
+                this.docform.splice(index,1)
1704
+              }
1705
+           }).catch(e=>{});
1706
+       }).catch(e=>{});
1791 1707
      },
1792
-
1793 1708
      //编辑医生介绍
1794 1709
      AddDoctorInfo(formName){
1795 1710
          this.$refs[formName].validate((valid)=>{
@@ -1798,9 +1713,10 @@ export default {
1798 1713
                if(response.data.state==1){
1799 1714
                  var doctor =  response.data.data.doctor;
1800 1715
                  this.centerDialogVisible = false;
1801
-                //  console.log("返回数据",doctor);
1716
+                 this.eidtDoctorform.dochead = "";
1717
+                 this.eidtDoctorform.sort = "";
1718
+                 this.eidtDoctorform.content = "";
1802 1719
                  this.getQueryDoCHead();
1803
-                
1804 1720
                }
1805 1721
              })
1806 1722
            }
@@ -2062,6 +1978,10 @@ export default {
2062 1978
          this.definethree = false;
2063 1979
        }
2064 1980
      },
1981
+    selectItemTwo(id){
1982
+      this.definethree = true;
1983
+    },
1984
+
2065 1985
      select(id){
2066 1986
         if(id == 1){
2067 1987
           this.selectone = false;
@@ -2157,7 +2077,7 @@ export default {
2157 2077
      AddMagicNavi(formName){
2158 2078
         this.$refs[formName].validate((valid)=>{
2159 2079
           if(valid){
2160
-            AddMagicNavi(this.editmarginform.id,this.editmarginform).then(response=>{
2080
+            AddMagicNavi(this.editmarginform).then(response=>{
2161 2081
               if(response.data.state == 1){
2162 2082
                this.editmarginform.marginaddress = "";
2163 2083
                this.getMagicImages();
@@ -2333,7 +2253,6 @@ export default {
2333 2253
                  var articlelist =  response.data.data.articlelist;
2334 2254
                    console.log("文章列表",articlelist);
2335 2255
                     this.$emit('getHospitaldata');
2336
-                    this.getLinkAddress();
2337 2256
               }
2338 2257
           })
2339 2258
         })
@@ -2346,7 +2265,6 @@ export default {
2346 2265
             }
2347 2266
         })
2348 2267
      },
2349
-
2350 2268
      changeArticeType(id){
2351 2269
         if(id == 1 ){
2352 2270
           this.getArticleType();
@@ -2378,15 +2296,13 @@ export default {
2378 2296
      },
2379 2297
   
2380 2298
      AddMagiclinkData(formName){
2299
+    
2381 2300
          if(this.maclinkform.instationlink == ""){
2382 2301
             this.maclinkform.instationlink = 0;
2383 2302
          }
2384 2303
          var instationlink =  this.maclinkform.instationlink;
2385 2304
          var instationlinks = parseInt(instationlink);
2386 2305
          this.maclinkform.instationlink = instationlinks;
2387
-        if(this.maclinkform.articeType == ""){
2388
-          this.maclinkform.articeType = 0;
2389
-        }
2390 2306
          var articeType = this.maclinkform.articeType;
2391 2307
          var articeTypes =  parseInt(articeType);
2392 2308
          this.maclinkform.articeType = articeTypes;
@@ -2394,26 +2310,23 @@ export default {
2394 2310
        if(this.maclinkform.title == ""){
2395 2311
           this.maclinkform.title = 0;
2396 2312
        }
2397
-       var articeTitle =  this.maclinkform.title;
2398
-       var articeTitle =  parseInt(articeTitle);
2399
-       this.maclinkform.title = articeTitle;
2400
-
2401
-         this.maclinkform.linkaddress = "/articles/createArticle/?id="+this.maclinkform.title;
2313
+  
2314
+       this.maclinkform.linkaddress = this.maclinkform.instationlink ;
2402 2315
         this.$refs[formName].validate((valid)=>{
2403 2316
           if(valid){
2404 2317
             AddMagiclinkData(this.maclinkform).then(response=>{
2405 2318
                 if(response.data.state == 1){
2406 2319
                   var magiclink =  response.data.data.magiclink;
2407 2320
                   var patientMagiclink  = response.data.data.patientMagiclink;
2408
-                 this.editmarginform.marginaddress = patientMagiclink.linkaddress;
2409
-                 this.editmarginform.id =  patientMagiclink.id
2321
+                 this.editmarginform.marginaddress = magiclink.linkaddress;
2322
+                 this.editmarginform.linkid =  magiclink.id
2410 2323
                   this.magicVisible = false;
2411 2324
                   console.log("链接返回数据",magiclink)
2412
-                  this.maclinkform.articeType = "";
2325
+                  // this.maclinkform.articeType = "";
2413 2326
                   this.maclinkform.instationlink = "";
2414 2327
                   this.maclinkform.phone = "";
2415 2328
                   this.maclinkform.outstationlink = "";
2416
-                  this.maclinkform.title = "";
2329
+                  // this.maclinkform.title = "";
2417 2330
                 }
2418 2331
             })
2419 2332
           }
@@ -2436,7 +2349,25 @@ export default {
2436 2349
            console.log("total是什么",total)
2437 2350
           }
2438 2351
        })
2439
-     } 
2352
+     },
2353
+     getAllModelTitle(){
2354
+       getAllModelTitle().then(response=>{
2355
+          if(response.data.state == 1){
2356
+             var patientModels = response.data.data.patientModels;
2357
+             this.modelTtile = patientModels;
2358
+             console.log("模块标题是什么",patientModels)
2359
+          }
2360
+       })
2361
+     },
2362
+     GetMagicLinkAddressByID(id){
2363
+        GetMagicLinkAddressByID(id).then(response=>{
2364
+             if(response.data.state == 1){
2365
+              var magiclink =  response.data.data.magiclink;
2366
+              console.log("magiclink",magiclink)
2367
+              this.modelTtile.id = magiclink.linkaddress;
2368
+             }
2369
+        })
2370
+     }
2440 2371
   },  
2441 2372
   
2442 2373
    created(){
@@ -2447,7 +2378,8 @@ export default {
2447 2378
      this.getArticleType();
2448 2379
      this.getEnImages();
2449 2380
      this.getMacLinkAddress();
2450
-    //  this.getCountImages();
2381
+     this.getCountImages();
2382
+     this.getAllModelTitle();
2451 2383
    },
2452 2384
  
2453 2385
  };

+ 29 - 3
src/scrm_pages/site/index.vue Просмотреть файл

@@ -11,7 +11,7 @@
11 11
                 <div class="tips">您可以手机扫码访问或在右侧预览</div>
12 12
                 <div id="qrcode" class="qrcode"></div>
13 13
                 <router-link to="/site/preview">
14
-                  <el-button type="primary">进入微官网后台</el-button>
14
+                  <el-button type="primary" @click="GetDefaultData()">进入微官网后台</el-button>
15 15
                 </router-link>
16 16
               </div>
17 17
             </el-col>
@@ -26,6 +26,8 @@
26 26
 <script>
27 27
 import BreadCrumb from "../components/bread-crumb";
28 28
 import QRCode from 'qrcodejs2';
29
+import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
30
+import Vue from 'vue';
29 31
 export default {
30 32
   name: "site",
31 33
   components: {
@@ -34,7 +36,8 @@ export default {
34 36
   data() {
35 37
     return {
36 38
       crumbs: [{ path: false, name: "微网站" }],
37
-      codeImg: require("../../assets/home/wei.jpg")
39
+      codeImg: require("../../assets/home/wei.jpg"),
40
+      usreOrgID:"",
38 41
     };
39 42
   },
40 43
   methods:{
@@ -42,18 +45,41 @@ export default {
42 45
       let qrcode = new QRCode('qrcode', {
43 46
         width: 100,
44 47
         height: 100, // 高度
45
-        text: 'http://microweb.kuyicloud.com' // 二维码内容
48
+        text: 'http://microweb.kuyicloud.com/#/qrcode?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
46 49
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
47 50
         // background: '#f0f'
48 51
         // foreground: '#ff0'
49 52
       })
50 53
       console.log(qrcode)
51 54
     },
55
+    GetDefaultData(){
56
+       GetDefaultData().then(response=>{
57
+         if(response.data.state == 1){
58
+           var model =  response.data.data.model;
59
+         }
60
+       }) 
61
+    },
62
+    GetUserOrgid(){
63
+      GetUserOrgid().then(response=>{
64
+        if(response.data.state == 1){
65
+          var usreOrgID =  response.data.data.usreOrgID;
66
+         this.usreOrgID =  response.data.data.usreOrgID;
67
+          console.log("我的世界我做主",usreOrgID)
68
+        }
69
+      })
70
+    }
71
+    
52 72
   },
53 73
   mounted(){
54 74
     this.qrcode();
75
+  },
76
+  created(){
77
+    // this.GetUserOrgid();
78
+    
55 79
   }
56 80
 };
81
+
82
+
57 83
 </script>
58 84
 
59 85
 <style rel="stylesheet/scss" lang="scss" scoped>

Разница между файлами не показана из-за своего большого размера
+ 756 - 264
src/scrm_pages/site/preview.vue


+ 1 - 1
src/scrm_pages/systemsetting/staffmanagement.vue Просмотреть файл

@@ -196,7 +196,7 @@
196 196
            this.selectedArticles = val;
197 197
         },
198 198
         handleSizeChange(limit) {
199
-            this.from.limit = limit;
199
+            this.form.limit = limit;
200 200
             this.getAllStaffInfo();
201 201
           },
202 202
         handleCurrentChange(page) {

+ 1 - 0
src/scrm_pages/weixinmp/authorization.vue Просмотреть файл

@@ -121,6 +121,7 @@ export default {
121 121
         var res =  response.data;
122 122
         if (res.state===1) {
123 123
           var url = res.data.url;
124
+          console.log("url是什么",url)
124 125
           this.centerDialogVisible = true;
125 126
           this.$nextTick (function () {
126 127
             this.qrcode(url);

+ 1 - 0
src/scrm_pages/weixinmp/menus.vue Просмотреть файл

@@ -339,6 +339,7 @@ export default {
339 339
         }
340 340
         SaveMenus(this.menus).then(response=>{
341 341
           var res = response.data;
342
+          console.log("res是什么",res)
342 343
           if (res.state===1) {
343 344
             this.$message.success("保存成功")
344 345
           }else {

+ 4 - 3
src/store/modules/members.js Просмотреть файл

@@ -7,10 +7,11 @@ const members = {
7 7
             5:{id:5, name:"普通下单"},
8 8
             6:{id:6, name:"外部导入"},
9 9
             7:{id:7, name:"手动录入"},
10
-            8:{id:8, name:"有赞同步"},
11
-            9:{id:9, name:"肾友杯"},
10
+            8:{id:8, name:"慢病系统"},
11
+            // 8:{id:8, name:"有赞同步"},
12
+            // 9:{id:9, name:"肾友杯"},
12 13
             10:{id:10, name:"圣卫士"},
13
-            11:{id:11, name:"血透"},
14
+            11:{id:11, name:"血透系统"},
14 15
         },
15 16
         treat_type:{
16 17
             1:{id:1, name:'西医治疗'},

Двоичные данные
static/images/phone.png Просмотреть файл