xiaoming_global hace 5 años
padre
commit
f290cb85b8

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 837 - 1491
package-lock.json


+ 1 - 0
package.json Ver fichero

@@ -75,6 +75,7 @@
75 75
     "vue-i18n": "7.3.2",
76 76
     "vue-infinite-scroll": "^2.0.2",
77 77
     "vue-multiselect": "2.0.8",
78
+    "vue-photo-preview": "^1.1.3",
78 79
     "vue-router": "3.0.1",
79 80
     "vue-splitpane": "1.0.2",
80 81
     "vuedraggable": "^2.23.0",

+ 9 - 0
src/api/site/site.js Ver fichero

@@ -1347,4 +1347,13 @@ export function AddRotationVisibleForm(id,data){
1347 1347
        method:"Post",
1348 1348
        data:data,
1349 1349
     })
1350
+}
1351
+
1352
+export function AddMagiclinkDataTwo(id,data){
1353
+    console.log("data是什么",data)
1354
+   return request({
1355
+       url:"/api/site/addmagiclinkdatatwo?id="+id,
1356
+       method:"Post",
1357
+       data:data,
1358
+   })
1350 1359
 }

+ 2 - 2
src/lang/en.js Ver fichero

@@ -60,7 +60,6 @@ export default {
60 60
     theme: 'Theme',
61 61
     clipboardDemo: 'Clipboard',
62 62
     i18n: 'I18n',
63
-    permissionManage: 'Permission Manage',
64 63
     adminManage: 'Admin Manage',
65 64
     roleManage: 'Role Manage',
66 65
     dialysis: 'Dialysis',
@@ -115,13 +114,14 @@ export default {
115 114
     activityList: "activity list",
116 115
     activityPublish: "publish activity",
117 116
     activityModify: "edit activity",
118
-    systemsetting:'Systemsetting',
119 117
     activityDetail: "activity detail",
120 118
     activityShare: "activity share",
121 119
     activityPreview: "activity preview",
122 120
     activitySignupList: "activity sign up list",
123 121
     SMSManage: "sms manage",
124 122
     SMSSend: "sms send",
123
+    permissionManage: 'Permission Manage',
124
+    systemsetting:'Systemsetting',
125 125
   },
126 126
   navbar: {
127 127
     logOut: 'Log Out',

+ 2 - 2
src/lang/zh.js Ver fichero

@@ -72,7 +72,6 @@ export default {
72 72
     theme: '换肤',
73 73
     clipboardDemo: 'Clipboard',
74 74
     i18n: '国际化',
75
-    permissionManage: '权限管理',
76 75
     adminManage: '用户管理',
77 76
     roleManage: '角色管理',
78 77
     dialysis: '透析管理',
@@ -169,7 +168,6 @@ export default {
169 168
     activityList: "活动列表",
170 169
     activityPublish: "发布活动",
171 170
     activityModify: "编辑活动",
172
-    systemsetting:'系统设置',
173 171
     staffmanagement:'医护管理',
174 172
     activityDetail: "活动详情",
175 173
     activityShare: "活动分享",
@@ -179,6 +177,8 @@ export default {
179 177
     SMSSend: "群发短信",
180 178
     site:"微网站",
181 179
     preview:"预览",
180
+    permissionManage: '权限管理',
181
+    systemsetting:'系统设置',
182 182
   },
183 183
   navbar: {
184 184
     logOut: '退出登录',

+ 5 - 2
src/main.js Ver fichero

@@ -1,7 +1,8 @@
1 1
 import Vue from 'vue'
2 2
 
3 3
 import 'normalize.css/normalize.css'// A modern alternative to CSS resets
4
-
4
+import "./assets/styles/iconfont.css";
5
+import "./assets/styles/common.css";
5 6
 import Element from 'element-ui'
6 7
 import 'element-ui/lib/theme-chalk/index.css'
7 8
 import '@/utils/directives.js'
@@ -27,7 +28,9 @@ import 'swiper/dist/css/swiper.min.css';
27 28
 //引入mint-ui
28 29
 import Mint from 'mint-ui';
29 30
 Vue.use(Mint);
30
-
31
+import preview from "vue-photo-preview";
32
+import "vue-photo-preview/dist/skin.css";
33
+Vue.use(preview);
31 34
 //引入无线滚条
32 35
 
33 36
 import { read } from 'fs';

+ 1 - 1
src/router/index.js Ver fichero

@@ -84,9 +84,9 @@ var _asy_router_map = [
84 84
   article,
85 85
   marketing_tool,
86 86
   org,
87
-  system,
88 87
   site,
89 88
   role,
89
+  system,
90 90
 ]
91 91
 
92 92
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

+ 0 - 2
src/scrm_pages/article/articleList.vue Ver fichero

@@ -230,8 +230,6 @@
230 230
             });
231 231
            },
232 232
            editArticles(id,articletype){
233
-              //  console.log("文章id",id);
234
-              //  console.log("文章内型",articletype)
235 233
                if(articletype == 1){
236 234
                   this.$router.push("/articles/editArticle/"+id);
237 235
                }

+ 7 - 2
src/scrm_pages/article/commentList.vue Ver fichero

@@ -114,8 +114,13 @@ import { copyFile } from 'fs';
114 114
         getReplyAllComents(){
115 115
           getReplyAllComents(this.form).then(response=>{
116 116
                if(response.data.state ==1){
117
-                var comments =  response.data.data.comments;
118
-                this.comments =  response.data.data.comments;
117
+                var comments =  response.data.data.comments;          
118
+                for (let index = 0; index < comments.length; index++) {
119
+                   if(comments[index].comment_user_avater == ""){
120
+                      comments[index].comment_user_avater = "https://images.shengws.com/201809182128222.png";
121
+                   }                
122
+                }
123
+                this.comments = comments;
119 124
                  console.log("评论列表",comments)
120 125
                 var total =  response.data.data.total;
121 126
                  this.total =  response.data.data.total;

+ 21 - 8
src/scrm_pages/article/createArticle.vue Ver fichero

@@ -22,8 +22,11 @@
22 22
                 </keep-alive>
23 23
               </el-form-item>
24 24
               <el-form-item label="封面图片:">
25
-                  <el-radio v-model="radio" label="1" @click.native.prevent="select()" >单图</el-radio>
26
-                  <el-radio v-model="radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio>
25
+                  <!-- <el-radio v-model="form.radio" label="1" @click.native.prevent="select()" >单图</el-radio>
26
+                  <el-radio v-model="form.radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio> -->
27
+                     <el-radio-group v-model="form.radio">
28
+                            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
29
+                    </el-radio-group>
27 30
               </el-form-item>
28 31
               <el-form-item required prop="org_logo">
29 32
                 <el-col :span="3">
@@ -253,7 +256,12 @@
253 256
           vio_upload:"",
254 257
           vid_name:"",
255 258
           vid_type:"",
259
+          radio:1,
256 260
         },
261
+           genderOptions:[
262
+            {id:1, name:'单图'},
263
+            {id:2, name:'三图'},
264
+          ],
257 265
          acttypes:[],
258 266
          imageUrl:'',
259 267
          imageUrlLast:'',
@@ -455,9 +463,12 @@
455 463
              this.$message.error("视频上传失败")
456 464
          },
457 465
         beforeUploadFile(file) {
458
-        const isLt2M = file.size / 1024 / 1024 < 2048;
466
+        const isLt2M = file.size / 1024 / 1024 <= 2048;
467
+        console.log("视频大小",file.size/1024/1024)
468
+        console.log("isLt2M是什么",isLt2M)
459 469
         if (!isLt2M) {
460 470
           this.$message.error('上传视频大小不能超过 2G!');
471
+          return false;
461 472
         }
462 473
             var date = new Date()
463 474
             var ext = getFileExtension(file.name)
@@ -503,11 +514,13 @@
503 514
                 })
504 515
             })
505 516
        },
506
-      select(){
507
-        this.picshow = false
508
-      },
509
-      clickitem(){
510
-        this.picshow = true
517
+      selectGender(id){
518
+        if(id == 1){
519
+          this.picshow = false;
520
+        }
521
+        if(id == 2){
522
+          this.picshow = true;
523
+        }
511 524
       },
512 525
       handleRemove(file, fileList) {
513 526
         console.log(file, fileList);

+ 8 - 4
src/scrm_pages/article/edit_vido.vue Ver fichero

@@ -129,9 +129,9 @@
129 129
           this.form.file =  file.raw
130 130
         }, 
131 131
         handleSuccess(res,file,fileList){  
132
-            this.$message.success("视频上传成功")       
133
-            this.form.vid_pic = "",        
134
-             this.form.vio_upload = this.qiniuDomain + res.url;           
132
+            this.$message.success("视频上传成功")          
133
+             this.form.vio_upload = this.qiniuDomain + res.url; 
134
+              this.form.vid_pic = this.form.vio_upload+"?vframe/jpg/offset/1/w/300/h/200",               
135 135
              console.log("上传之后是什么",this.form.vio_upload)
136 136
 
137 137
              this.show=false;
@@ -221,6 +221,7 @@
221 221
                  var vidos = response.data.data.vidos;
222 222
                  this.form.vid_name = vidos.title;
223 223
                  this.form.vid_pic = vidos.imgs;
224
+                 this.form.vio_upload = vidos.video_url;
224 225
                  console.log("得到的是什么?",this.form.vid_pic)
225 226
                  this.form.vid_type =  vidos.class_id
226 227
                  console.log("视频vidos",vidos)
@@ -241,7 +242,10 @@
241 242
        SumitVido(forName){
242 243
              const id = this.$route.params && this.$route.params.id;
243 244
              console.log("id是多少?",id)
244
-             this.form.vid_pic = this.form.vio_upload;
245
+             console.log("视频是什么",this.form.vio_upload)
246
+             if(this.form.vio_upload == ""){
247
+                this.form.vid_pic = this.form.vio_upload;
248
+             }
245 249
           this.$refs[forName].validate((valid)=>{
246 250
               if(valid){
247 251
                  updataVidoInfo(id,this.form).then(response=>{

+ 10 - 7
src/scrm_pages/site/components/add-contact.vue Ver fichero

@@ -29,7 +29,7 @@
29 29
                 </li>
30 30
                 <li @click="type = true">
31 31
                     <span>
32
-                        <img :src="new1" alt="" style="width:40px;height:40px">
32
+                        <img :src="new5" alt="" style="width:40px;height:40px">
33 33
                         <p>乘车方式</p>  
34 34
                     </span>
35 35
                 </li>
@@ -293,7 +293,7 @@
293 293
  <!-- 编辑图片 -->
294 294
  <el-dialog
295 295
      class="avatar-uploader"
296
-     title="编辑图片3"
296
+     title="编辑图片"
297 297
      :visible.sync="addVisible"
298 298
      width="30%"
299 299
      center>
@@ -501,11 +501,11 @@ export default {
501 501
       qiniuDomain: 'https://images.shengws.com/',
502 502
       Data: { token:'',key: '' },
503 503
       rotationData: { token:'',key: '' },
504
-      new1: require("../../../assets/preview/u481.png"),
505
-      new2: require("../../../assets/preview/u493.png"),
506
-      new3: require("../../../assets/preview/u496.png"),
507
-      new4: require("../../../assets/preview/u488.png"),
508
-      new5: require("../../../assets/preview/u500.png"),    
504
+      new1: require("../../../assets/preview/轮播图.png"),
505
+      new2: require("../../../assets/preview/医院地址.png"),
506
+      new3: require("../../../assets/preview/联系方式.png"),
507
+      new4: require("../../../assets/preview/工作时间.png"),
508
+      new5: require("../../../assets/preview/公交.png"),    
509 509
       form: {
510 510
         name: "",
511 511
         sort:"",
@@ -910,6 +910,9 @@ export default {
910 910
         this.hostaddress = true;
911 911
       },
912 912
       addrotationpic(formName){
913
+        if(this.picform.linkid == ""){
914
+           this.picform.linkid = 0;
915
+        }
913 916
          var sorts = this.picform.sort
914 917
          var sort = parseInt(sorts)
915 918
          this.picform.sort = sort

+ 115 - 79
src/scrm_pages/site/components/new-feature.vue Ver fichero

@@ -761,15 +761,15 @@
761 761
        </el-form-item>
762 762
        <el-form-item label="跳转设置" required prop="jumpset">
763 763
          <el-radio-group v-model="editmarginform.jumpset">
764
-            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
764
+            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="rotationGender(gender.id)">{{gender.name}}</el-radio>
765 765
           </el-radio-group>
766 766
        </el-form-item>
767 767
        <el-form-item>
768 768
          <el-col :span="15">
769
-           <el-input style="width:300px" v-model="editmarginform.marginaddress" v-show="define"></el-input>
769
+           <el-input style="width:300px" v-model="editmarginform.marginaddress" v-show="definefive" :disabled="true"></el-input>
770 770
         </el-col>
771 771
         <el-col :span="4">
772
-         <el-button size="medium" @click="magicVisible=true" v-show="define">设置链接</el-button>
772
+         <el-button size="medium" @click="magicVisible=true" v-show="definefive">设置链接</el-button>
773 773
         </el-col>
774 774
        </el-form-item>
775 775
      </el-form>
@@ -780,7 +780,7 @@
780 780
 </el-dialog> 
781 781
 
782 782
 <el-dialog
783
-  title="设置链接地址"
783
+  title="设置链接地址6"
784 784
   :visible.sync="magicVisible"
785 785
   width="30%"
786 786
   center>
@@ -809,7 +809,7 @@
809 809
   </el-form>
810 810
   <span slot="footer" class="dialog-footer">
811 811
     <el-button @click="magicVisible = false">取 消</el-button>
812
-    <el-button type="primary" @click="AddMagiclinkData('maclinkform');">确 定</el-button>
812
+    <el-button type="primary" @click="AddMagiclinkDataTwo('maclinkform');">确 定</el-button>
813 813
   </span>
814 814
 </el-dialog>
815 815
 
@@ -837,7 +837,7 @@
837 837
       </el-form-item>
838 838
       <el-form-item label="图片链接:">
839 839
           <el-radio-group v-model="editrotationform.piclink">
840
-           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
840
+           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderPicLink" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
841 841
         </el-radio-group>
842 842
       </el-form-item>
843 843
        <el-form-item label="链接地址:" v-show="selectone">
@@ -869,7 +869,7 @@
869 869
   </el-form>
870 870
   <span slot="footer" class="dialog-footer">
871 871
     <el-button @click="rotationVisible = false">取 消</el-button>
872
-    <el-button type="primary" @click="AddRotationVisibleForm('rotationvisibleform');rotationVisible = false">确 定</el-button>
872
+    <el-button type="primary" @click="AddRotationVisibleForm('rotationvisibleform');">确 定</el-button>
873 873
   </span>
874 874
 </el-dialog>
875 875
 </div>
@@ -880,7 +880,7 @@
880 880
    getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
881 881
    deleteRotations,editRotationImages,updateRotionImages,addActiveform,deleteMargin,getEditImagesDetail,UpdateEditMacgin,getArticleType
882 882
    ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
883
-   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID,GetRotationVisibleByLinkId,AddRotationVisibleForm} from '@/api/site/site'  
883
+   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID,GetRotationVisibleByLinkId,AddRotationVisibleForm,AddMagiclinkDataTwo} from '@/api/site/site'  
884 884
    import { getToken } from '@/api/qiniu'
885 885
    import { getFileExtension} from '@/utils/tools'
886 886
    import { isIP, isIPv4 } from 'net';
@@ -974,11 +974,8 @@ export default {
974 974
        maclinkform:{
975 975
          linkType:'',
976 976
          instationlink:'',
977
-         articeType:'',
978
-         title:'',
979 977
          phone:'',
980 978
          outstationlink:'',
981
-         linkaddress:'',
982 979
        },
983 980
        articeTypelist:[],
984 981
        acticeNamelist:[],
@@ -987,6 +984,7 @@ export default {
987 984
        definetwo:false,
988 985
        definethree:false,
989 986
        definefour:false,
987
+       definefive:true,
990 988
        selectone:false,
991 989
        rotationVisible:false,
992 990
        officeVisible:false,
@@ -1017,14 +1015,14 @@ export default {
1017 1015
          gender:"",
1018 1016
        },
1019 1017
        value: '',
1020
-      new1: require("../../../assets/preview/u481.png"),
1021
-      new2: require("../../../assets/preview/u493.png"),
1022
-      new3: require("../../../assets/preview/u496.png"),
1023
-      new4: require("../../../assets/preview/u488.png"),
1024
-      new5: require("../../../assets/preview/u500.png"),
1025
-      new6: require("../../../assets/preview/u504.png"),
1026
-      new7: require("../../../assets/preview/u508.png"),
1027
-      new8: require("../../../assets/preview/u512.png"),
1018
+      new1: require("../../../assets/preview/轮播图.png"),
1019
+      new2: require("../../../assets/preview/医院介绍.png"),
1020
+      new3: require("../../../assets/preview/科室介绍.png"),
1021
+      new4: require("../../../assets/preview/名医介绍.png"),
1022
+      new5: require("../../../assets/preview/科室环境.png"),
1023
+      new6: require("../../../assets/preview/文章列表.png"),
1024
+      new7: require("../../../assets/preview/活动列表.png"),
1025
+      new8: require("../../../assets/preview/魔方导航.png"),
1028 1026
       dialogVisible: false,
1029 1027
       dialogRotationVisible: false,
1030 1028
       editcenterDialogVisible: false,
@@ -1119,7 +1117,7 @@ export default {
1119 1117
         margtitle:"",
1120 1118
         margImage:"",
1121 1119
         marginaddress:"",
1122
-        jumpset:"",
1120
+        jumpset:1,
1123 1121
         linkid:"",
1124 1122
       },
1125 1123
       keform:{
@@ -1132,7 +1130,7 @@ export default {
1132 1130
         id:"",
1133 1131
         imageUrl:"",
1134 1132
         sort:"",
1135
-        imagelink:"",
1133
+        imagelink:1,
1136 1134
         linkaddress:"",
1137 1135
       },
1138 1136
 
@@ -1339,10 +1337,6 @@ export default {
1339 1337
             this.file = '';
1340 1338
       },
1341 1339
      
1342
-      define(){
1343
-         alert("aa")
1344
-      },
1345
-
1346 1340
       handleAvatarSuccess(res, file) {
1347 1341
          this.eidtDoctorform.dochead = this.qiniuDomain + res.url;  
1348 1342
       },
@@ -1929,6 +1923,14 @@ export default {
1929 1923
            this.define = false;
1930 1924
         }
1931 1925
      },
1926
+     rotationGender(id){
1927
+        if(id == 1){
1928
+            this.definefive = true;
1929
+        }
1930
+        if(id == 2){
1931
+           this.definefive = false;
1932
+        }
1933
+     },
1932 1934
      selectItem(id){
1933 1935
        if(id == 1){
1934 1936
          this.definetwo = false;
@@ -1973,8 +1975,6 @@ export default {
1973 1975
          this.definethree = false;
1974 1976
          this.definefour = false;
1975 1977
          this.maclinkform.instationlink = '';
1976
-         this.maclinkform.articeType = '';
1977
-         
1978 1978
          this.maclinkform.phone = '';
1979 1979
          this.maclinkform.outstationlink = '';
1980 1980
         
@@ -1984,26 +1984,24 @@ export default {
1984 1984
           this.definetwo = true;
1985 1985
           this.definethree = false;
1986 1986
           this.definefour = false;
1987
-          this.maclinkform.phone = '';
1988
-          this.maclinkform.outstationlink = '';
1987
+          this.maclinkform.phone = "";
1988
+          this.maclinkform.outstationlink = "";
1989 1989
        }
1990 1990
 
1991 1991
        if(id==3){
1992 1992
          this.definethree = true;
1993 1993
          this.definetwo = false;
1994 1994
          this.definefour = false;
1995
-         this.maclinkform.instationlink = '';
1996
-         this.maclinkform.articeType = '';
1997
-         this.maclinkform.outstationlink = '';
1995
+         this.maclinkform.instationlink = ""
1996
+         this.maclinkform.outstationlink = "";
1998 1997
        }
1999 1998
 
2000 1999
        if(id==4){
2001 2000
          this.definefour = true;
2002 2001
          this.definetwo = false;
2003 2002
          this.definethree = false;
2004
-         this.maclinkform.instationlink = '';
2005
-         this.maclinkform.articeType = '' ;
2006
-         this.maclinkform.phone = '';
2003
+         this.maclinkform.instationlink = "";
2004
+         this.maclinkform.phone = "";
2007 2005
        }
2008 2006
      },
2009 2007
         
@@ -2051,13 +2049,16 @@ export default {
2051 2049
      },
2052 2050
 
2053 2051
      AddMagicNavi(formName){
2052
+         if(this.editmarginform.linkid == ""){
2053
+            this.editmarginform.linkid = 0;
2054
+         }
2054 2055
         this.$refs[formName].validate((valid)=>{
2055 2056
           if(valid){
2056 2057
             AddMagicNavi(this.editmarginform).then(response=>{
2057 2058
               if(response.data.state == 1){
2058
-               this.editmarginform.marginaddress = "";
2059
-               this.getMagicImages();
2060
-               var editmargin  = response.data.data.editmargin;
2059
+                this.editmarginform.marginaddress = "";
2060
+                this.getMagicImages();
2061
+                var editmargin  = response.data.data.editmargin;
2061 2062
                 this.isEmpty = true;
2062 2063
                 this.editmarginform.margtitle = "";
2063 2064
                 this.editmarginform.margImage = "";
@@ -2186,8 +2187,15 @@ export default {
2186 2187
      editImages(id){
2187 2188
       getEditImagesDetail(id,this.editmacform).then(response=>{
2188 2189
           if(response.data.state == 1){
2189
-             this.editmacform = response.data.data.editmargin;
2190
+           
2190 2191
              var editmargin = response.data.data.editmargin;
2192
+             if(editmargin.jumpset == 1){
2193
+                 this.define = true;
2194
+             }
2195
+             if(editmargin.jumpset == 2){
2196
+                this.define = false;
2197
+             }
2198
+             this.editmacform = editmargin;
2191 2199
              console.log("返回导航数据",editmargin)
2192 2200
           }
2193 2201
       })
@@ -2270,44 +2278,71 @@ export default {
2270 2278
          
2271 2279
         }
2272 2280
      },
2273
-  
2274
-     AddMagiclinkData(formName){
2275
-    
2281
+     AddMagiclinkDataTwo(formName){
2276 2282
          if(this.maclinkform.instationlink == ""){
2277
-            this.maclinkform.instationlink = 0;
2283
+                this.maclinkform.instationlink = 0;
2278 2284
          }
2279
-         var instationlink =  this.maclinkform.instationlink;
2280
-         var instationlinks = parseInt(instationlink);
2281
-         this.maclinkform.instationlink = instationlinks;
2282
-         var articeType = this.maclinkform.articeType;
2283
-         var articeTypes =  parseInt(articeType);
2284
-         this.maclinkform.articeType = articeTypes;
2285
-
2286
-       if(this.maclinkform.title == ""){
2287
-          this.maclinkform.title = 0;
2288
-       }
2289
-  
2290
-       this.maclinkform.linkaddress = this.maclinkform.instationlink ;
2291 2285
         this.$refs[formName].validate((valid)=>{
2292 2286
           if(valid){
2293
-            AddMagiclinkData(this.maclinkform).then(response=>{
2294
-                if(response.data.state == 1){
2295
-                  var magiclink =  response.data.data.magiclink;
2296
-                  var patientMagiclink  = response.data.data.patientMagiclink;
2297
-                 this.editmarginform.marginaddress = magiclink.linkaddress;
2298
-                 this.editmarginform.linkid =  magiclink.id
2299
-                  this.magicVisible = false;
2300
-                  console.log("链接返回数据",magiclink)
2301
-                  // this.maclinkform.articeType = "";
2302
-                  this.maclinkform.instationlink = "";
2303
-                  this.maclinkform.phone = "";
2304
-                  this.maclinkform.outstationlink = "";
2305
-                  // this.maclinkform.title = "";
2306
-                }
2287
+            AddMagiclinkDataTwo(this.maclinkform).then(response=>{
2288
+              if(response.data.state == 1){
2289
+                console.log("hhehheehehehheh")
2290
+                 this.magicVisible = false;
2291
+              }
2307 2292
             })
2308 2293
           }
2309 2294
         })
2310 2295
      },
2296
+
2297
+    //  AddMagiclinkData(formName){ 
2298
+    //     this.$refs[formName].validate((valid)=>{
2299
+    //       if(valid){
2300
+    //        if(this.maclinkform.instationlink == ""){
2301
+    //         this.maclinkform.instationlink = 0;
2302
+    //      }
2303
+    //      var instationlink =  this.maclinkform.instationlink;
2304
+    //      var instationlinks = parseInt(instationlink);
2305
+    //      this.maclinkform.instationlink = instationlinks;
2306
+    //         AddMagiclinkData(this.maclinkform).then(response=>{
2307
+    //             if(response.data.state == 1){
2308
+    //                 this.magicVisible = false;
2309
+    //               var magiclink =  response.data.data.magiclink;
2310
+    //                console.log("链接返回数据",magiclink)
2311
+    //               var model =  response.data.data.model;
2312
+    //               console.log("model是什么",model)
2313
+    //            if(model.mode_type == 1){
2314
+    //                 this.editmacform.marginaddress = "javascript:;";
2315
+    //             } 
2316
+    //             if(model.mode_type == 2){
2317
+    //                   this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/hospitalIntroduction?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
2318
+    //             }
2319
+    //             if(model.mode_type == 3){
2320
+    //                    this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/officeIntroduction?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
2321
+    //             }
2322
+    //              if(model.mode_type == 4){
2323
+    //                    this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/medicalTeam?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
2324
+    //             }
2325
+    //            if(model.mode_type == 5){
2326
+    //                 this.editmacform.marginaddress = "javascript:;";
2327
+    //             }
2328
+    //             if(model.mode_type == 6){
2329
+    //                 this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/news?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
2330
+    //             }
2331
+    //              if(model.mode_type == 7){
2332
+    //                 this.editmarginform.marginaddress = "http://microweb.kuyicloud.com/#/activity?id="+model.id+"&orgid="+this.$store.getters.xt_user.org_id;
2333
+    //             }
2334
+    //             if(model.mode_type == 8){
2335
+    //               this.editmacform.marginaddress = "javascript:;";
2336
+    //             }
2337
+    //              this.editmarginform.linkid =  magiclink.id
2338
+    //               this.maclinkform.instationlink = "";
2339
+    //               this.maclinkform.phone = "";
2340
+    //               this.maclinkform.outstationlink = "";
2341
+    //             }
2342
+    //         })
2343
+    //       }
2344
+    //     })
2345
+    //  },
2311 2346
      getMacLinkAddress(){
2312 2347
        getMacLinkAddress().then(response=>{
2313 2348
           if(response.data.state ==1){
@@ -2317,15 +2352,15 @@ export default {
2317 2352
           }
2318 2353
        })
2319 2354
      },
2320
-     getCountImages(){
2321
-       getCountImages().then(response=>{
2322
-          if(response.data.state == 1){
2323
-           var total =  response.data.data.total;
2324
-           this.totalImages = total;
2325
-           console.log("total是什么",total)
2326
-          }
2327
-       })
2328
-     },
2355
+    //  getCountImages(){
2356
+    //    getCountImages().then(response=>{
2357
+    //       if(response.data.state == 1){
2358
+    //        var total =  response.data.data.total;
2359
+    //        this.totalImages = total;
2360
+    //        console.log("total是什么",total)
2361
+    //       }
2362
+    //    })
2363
+    //  },
2329 2364
      getAllModelTitle(){
2330 2365
        getAllModelTitle().then(response=>{
2331 2366
           if(response.data.state == 1){
@@ -2359,6 +2394,7 @@ export default {
2359 2394
          if(valid){
2360 2395
           AddRotationVisibleForm(this.rotationvisibleform.id,this.rotationvisibleform).then(response=>{
2361 2396
                if(response.data.state == 1){
2397
+                 this.rotationVisible = false;
2362 2398
                  var linkaddress =  response.data.data.linkaddress;
2363 2399
                  console.log("linkaddress",linkaddress);
2364 2400
                  this.editrotationform.linkaddress = linkaddress.defineaddress;
@@ -2377,7 +2413,7 @@ export default {
2377 2413
      this.getArticleType();
2378 2414
      this.getEnImages();
2379 2415
      this.getMacLinkAddress();
2380
-     this.getCountImages();
2416
+    //  this.getCountImages();
2381 2417
      this.getAllModelTitle();
2382 2418
    },
2383 2419
  

+ 8 - 6
src/scrm_pages/site/index.vue Ver fichero

@@ -35,7 +35,7 @@
35 35
 <script>
36 36
 import BreadCrumb from "../components/bread-crumb";
37 37
 import QRCode from 'qrcodejs2';
38
-import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
38
+// import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
39 39
 import Vue from 'vue';
40 40
 export default {
41 41
   name: "site",
@@ -48,7 +48,8 @@ export default {
48 48
       codeImg: require("../../assets/home/wei.jpg"),
49 49
       usreOrgID:"",
50 50
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
51
-      url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
51
+       url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
52
+      // url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
52 53
     };
53 54
   },
54 55
   methods:{
@@ -56,7 +57,8 @@ export default {
56 57
       let qrcode = new QRCode('qrcode', {
57 58
         width: 100,
58 59
         height: 100, // 高度
59
-        text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
60
+        // text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
61
+        text:'http://jk.test.sgjyun.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id,// 二维码内容
60 62
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
61 63
         // background: '#f0f'
62 64
         // foreground: '#ff0'
@@ -84,10 +86,10 @@ export default {
84 86
   mounted(){
85 87
     this.qrcode();
86 88
   },
87
-  created(){
88
-    // this.GetUserOrgid();
89
+  // created(){
90
+  //   // this.GetUserOrgid();
89 91
     
90
-  }
92
+  // }
91 93
 };
92 94
 
93 95
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 616 - 388
src/scrm_pages/site/preview.vue