Browse Source

微官网首页

xiaoming_global 5 years ago
parent
commit
d7a7e16b0f

+ 1 - 0
config/dev.env.js View File

@@ -3,6 +3,7 @@ module.exports = {
3 3
   ENV_CONFIG: '"dev"',
4 4
   BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
5 5
   // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
6
+  // BASE_API:'"http://localhost:9536"',
6 7
   
7 8
   //  SSO_HOST: '"http://testsso.sgjyun.com"',
8 9
   //  SRCM_HOST: '"http://test1.sgjyun.com"',

+ 64 - 6
src/api/site/site.js View File

@@ -322,9 +322,10 @@ export function getHospital(params){
322 322
 }
323 323
 
324 324
 export function getHospitaldata(params){
325
+    console.log("params是什么",params)
325 326
    return request({
326 327
        url:"/api/site/getdata",
327
-       method:"Post",
328
+       method:"Get",
328 329
        params:params,
329 330
    })
330 331
 }
@@ -460,10 +461,10 @@ export function Activitiesmore(id,data){
460 461
     })
461 462
 }
462 463
 
463
-export function addNavigation(id,data){
464
-    console.log("id是什么",id)
464
+export function addNavigation(data){
465
+    console.log("data是什么ha",data)
465 466
     return request({
466
-        url:"/api/site/addnavigation?id="+id,
467
+        url:"/api/site/addnavigation",
467 468
         method:"Post",
468 469
         data:data,
469 470
     })
@@ -494,6 +495,7 @@ export function getShareInfo(params){
494 495
 }
495 496
 
496 497
 export function deleteNavigation(id,data){
498
+    console.log("id是什么呢 ",id)
497 499
     return request({
498 500
         url:"/api/site/deletenavition?id="+id,
499 501
         method:"Get",
@@ -502,7 +504,6 @@ export function deleteNavigation(id,data){
502 504
 }
503 505
 
504 506
 export function deletemodle(id,data){
505
-    console.log("这个ID是谁?",id)
506 507
     return request({
507 508
         url:"/api/site/deletemodle?id="+id,
508 509
         method:"Get",
@@ -619,6 +620,7 @@ export function editNavigation (id,data){
619 620
 
620 621
 export function SaveNavigation (id,data) {
621 622
     console.log("id是什么呢",id)
623
+    console.log("data是什么",data)
622 624
     return request({
623 625
         url:"/api/site/savenavigation?id="+id,
624 626
         method:"Post",
@@ -1165,6 +1167,7 @@ export function getCountImages(params){
1165 1167
 }
1166 1168
 
1167 1169
 export function addNavigationlinkform(data){
1170
+    console.log("data是什么",data)
1168 1171
     return request({
1169 1172
         url:"/api/site/addNavigationlinkform",
1170 1173
         method:"Post",
@@ -1182,6 +1185,7 @@ export function getNavgitionlinkAddress(id,params){
1182 1185
 }
1183 1186
 
1184 1187
 export function UpdateEditNavigationLinkform(id,data){
1188
+    console.log("id是什么",id)
1185 1189
     return request({
1186 1190
         url:"/api/site/updateditnavigationlinkform?id="+id,
1187 1191
         method:"Post",
@@ -1283,10 +1287,64 @@ export function GetMagicLinkAddressByID(id,params){
1283 1287
 }
1284 1288
 
1285 1289
 export function GetMagicClickByLinkid(linkid,params){
1286
-   console.log("linkid是什么",linkid)
1290
+  
1287 1291
    return request({
1288 1292
        url:"/api.site/getmagicclickbylinkid?linkid="+linkid,
1289 1293
        method:"Get",
1290 1294
        params:params,
1291 1295
    })
1296
+}
1297
+
1298
+export function editRotationEmages(id,params){
1299
+  
1300
+   return request({
1301
+       url:"/api/site/editrotationemages?id="+id,
1302
+       method:"Get",
1303
+       params:params,
1304
+   })
1305
+}
1306
+
1307
+export function GetOutRotationlink(id,params){
1308
+    // console.log("id是什么",id)
1309
+    return request({
1310
+        url:"/api/site/getoutrotationlink?id="+id,
1311
+        method:"Get",
1312
+        params:params,
1313
+    })
1314
+}
1315
+
1316
+export function UpdatedRolinkAddress(id,data){
1317
+    
1318
+    return request({
1319
+        url:"/api/site/updatedrolinkaddress?id="+id,
1320
+        method:"Post",
1321
+        data:data,
1322
+    })
1323
+}
1324
+
1325
+export function UpdatedConrotation(id,data){
1326
+   
1327
+    return request({
1328
+        url:"/api/site/updatedconrotation?id="+id,
1329
+        method:"Post",
1330
+        data:data,
1331
+    })
1332
+}
1333
+
1334
+export function GetRotationVisibleByLinkId(id,params){
1335
+   
1336
+    return request({
1337
+        url:"/api/site/getrotationvisiblebylinkid?id="+id,
1338
+        method:"Get",
1339
+        params:params,
1340
+    })
1341
+}
1342
+
1343
+export function AddRotationVisibleForm(id,data){
1344
+
1345
+    return request({
1346
+       url:"/api/site/addrotationvisibleform?id="+id,
1347
+       method:"Post",
1348
+       data:data,
1349
+    })
1292 1350
 }

+ 15 - 15
src/router/index.js View File

@@ -55,21 +55,21 @@ var _constant_router_map = [{
55 55
   component: () => import('@/views/errorPage/401'),
56 56
   hidden: true
57 57
 },
58
-{
59
-  path: '',
60
-  component: ()=>import('@/scrm_pages/qrcode/qrcode'),
61
-  redirect: '/qrcode',
62
-  children: [{
63
-    path: '/qrcode',
64
-    component: () => import('@/scrm_pages/qrcode/qrcode'),
65
-    name: 'qrcode',
66
-    meta: {
67
-      title: 'qrcode',
68
-      icon: 'dashboard',
69
-      noCache: true
70
-    }
71
-  }]
72
-},
58
+// {
59
+//   path: '',
60
+//   component: ()=>import('@/scrm_pages/qrcode/qrcode'),
61
+//   redirect: '/qrcode',
62
+//   children: [{
63
+//     path: '/qrcode',
64
+//     component: () => import('@/scrm_pages/qrcode/qrcode'),
65
+//     name: 'qrcode',
66
+//     meta: {
67
+//       title: 'qrcode',
68
+//       icon: 'dashboard',
69
+//       noCache: true
70
+//     }
71
+//   }]
72
+// },
73 73
 {
74 74
   path: '/activity/preview',
75 75
   component: () => import('@/scrm_pages/marketing_tool/activity_preview'),

+ 1 - 1
src/router/modules/article.js View File

@@ -97,6 +97,6 @@ export default {
97 97
       hidden:true,
98 98
       is_menu:false,
99 99
       meta:{ title:'vidoDetail',noCache: true}
100
-    }
100
+    },
101 101
   ]
102 102
 }

+ 10 - 4
src/scrm_pages/article/acticleCategory.vue View File

@@ -29,12 +29,17 @@
29 29
                 {{scope.row.name}}
30 30
               </template>
31 31
             </el-table-column>
32
-
33
-            <el-table-column label="所属文章数量" align="center">
32
+           
33
+            <el-table-column label="分类描述" align="center">
34 34
               <template slot-scope="scope">
35
-                {{scope.row.num}}
35
+                 {{scope.row.summary}}
36 36
               </template>
37 37
             </el-table-column>
38
+            <!-- <el-table-column label="所属文章数量" align="center">
39
+              <template slot-scope="scope">
40
+                 {{scope.row.num}}
41
+              </template>
42
+            </el-table-column> -->
38 43
 
39 44
             <el-table-column label="分类排序" align="center">
40 45
               <template slot-scope="scope">
@@ -114,6 +119,7 @@
114 119
         },
115 120
         articname:[],
116 121
         total:0,
122
+        count:0,
117 123
         listQuery:{
118 124
           page:1,
119 125
           limit:10,
@@ -136,7 +142,7 @@
136 142
              if(response.data.state === 1){
137 143
                this.articsData = response.data.data.category; 
138 144
                var articsData = response.data.data.category; 
139
-               console.log(this.articsData)
145
+               console.log("分类描述是多少",this.articsData)
140 146
                this.total = response.data.data.total;
141 147
                console.log("多少",this.total)
142 148
              }

+ 3 - 3
src/scrm_pages/article/articleList.vue View File

@@ -53,9 +53,9 @@
53 53
             <h3 class="title">
54 54
               <span @click="articleDetail(article.id,article.type)">{{article.title}}</span>
55 55
             </h3>
56
-            <div class="statistics">
56
+            <!-- <div class="statistics">
57 57
               阅读:{{article.real_read_num}} 丨 评论:{{article.comment_num}} 丨 点赞:{{article.star_num}}
58
-            </div>
58
+            </div> -->
59 59
             <div>
60 60
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
61 61
                 <el-button
@@ -419,7 +419,7 @@
419 419
 
420 420
         .title {
421 421
             padding-bottom: 5px;
422
-
422
+            margin-bottom: 15px;
423 423
             a {
424 424
                 color: #495060;
425 425
                 font-size: 20px;

+ 1 - 1
src/scrm_pages/article/article_detail.vue View File

@@ -55,7 +55,7 @@
55 55
 
56 56
 <style scoped>
57 57
     .articlename{
58
-      width: 500px;
58
+      min-width: 500px;
59 59
       height: 50px;
60 60
       /* border: solid 1px red; */
61 61
       margin-left: 600px;

+ 3 - 3
src/scrm_pages/article/components/published_cell.vue View File

@@ -12,9 +12,9 @@
12 12
             <h3 class="title">
13 13
                  <a>{{article.title}}</a>
14 14
             </h3>
15
-            <div class="statistics">
15
+            <!-- <div class="statistics">
16 16
                 阅读:{{article.real_read_num}} 丨 评论:{{article.comment_num}} 丨 点赞:{{article.star_num}}
17
-            </div>
17
+            </div> -->
18 18
              <div>
19 19
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
20 20
                  <el-button
@@ -142,7 +142,7 @@
142 142
 
143 143
         .title {
144 144
             padding-bottom: 5px;
145
-
145
+            margin-bottom: 15px;
146 146
             a {
147 147
                 color: #495060;
148 148
                 font-size: 20px;

+ 4 - 3
src/scrm_pages/article/createArticle.vue View File

@@ -25,7 +25,7 @@
25 25
                   <el-radio v-model="radio" label="1" @click.native.prevent="select()" >单图</el-radio>
26 26
                   <el-radio v-model="radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio>
27 27
               </el-form-item>
28
-              <el-form-item>
28
+              <el-form-item required prop="org_logo">
29 29
                 <el-col :span="3">
30 30
                   <div>
31 31
                     <el-upload
@@ -274,13 +274,14 @@
274 274
          rules: {
275 275
             vid_name: [{required: true, message: "视频标题不能为空"},],
276 276
             vio_upload: [{required: true,message:"请上传视频"}],
277
-            vid_type: [{required: true,message:"所属分类不能为空"}]
277
+            vid_type: [{required: true,message:"所属分类不能为空"}],
278 278
           },
279 279
        
280 280
         artilcrules:{
281 281
             act_name: [{required: true, message: "文章标题不能为空"},],
282 282
             act_content: [{required: true,message:"文章内容不能为空"}],
283
-            act_type: [{required: true,message:"所属分类不能为空"}]
283
+            act_type: [{required: true,message:"所属分类不能为空"}],
284
+             org_logo: [{required:true,message:"请填写封面图片"}],
284 285
         },
285 286
         vidoform:[],
286 287
       }

+ 3 - 3
src/scrm_pages/marketing_tool/components/published_cell.vue View File

@@ -11,9 +11,9 @@
11 11
                     <a>{{ activity.title }}</a>
12 12
                 </router-link>
13 13
             </h3>
14
-            <div class="statistics">
14
+            <!-- <div class="statistics">
15 15
                 阅读:{{ activity.read_num }} 丨 评论:{{ activity.comment_num }} 丨 点赞:{{ activity.star_num }}
16
-            </div>
16
+            </div> -->
17 17
             <div class="progress">
18 18
                 <div class="progress-bar">
19 19
                     <el-progress :percentage="progress_percent" :stroke-width="5" color="#409eff" :show-text="false" ></el-progress>
@@ -144,7 +144,7 @@ export default {
144 144
 
145 145
         .title {
146 146
             padding-bottom: 5px;
147
-
147
+            margin-bottom: 10px;
148 148
             a {
149 149
                 color: #495060;
150 150
                 font-size: 20px;

+ 220 - 122
src/scrm_pages/site/components/add-contact.vue View File

@@ -59,7 +59,7 @@
59 59
                     </label>
60 60
                      <span class="el-upload-list__item-actions">
61 61
                     <span class="el-upload-list__item-delete">
62
-                    <i class="el-icon-edit-outline" @click="editImages(item.id);editcenterDialogVisible = true"></i>
62
+                    <i class="el-icon-edit-outline" @click="editcenterDialogVisible = true;editRotationEmages(item.id)"></i>
63 63
                     <i class="el-icon-delete" @click="deleteImages(item.id,index)"></i>
64 64
                     </span>
65 65
                     </span>
@@ -112,7 +112,7 @@
112 112
     </el-form>
113 113
     <span slot="footer" class="dialog-footer">
114 114
       <el-button @click="hostaddress=false">取 消</el-button>
115
-      <el-button type="primary" @click="addHospital('hospitalform');hostaddress = false">确 定</el-button>
115
+      <el-button type="primary" @click="addHospital('hospitalform');">确 定</el-button>
116 116
     </span>
117 117
   </el-dialog>
118 118
 
@@ -148,7 +148,7 @@
148 148
     <span slot="footer" class="dialog-footer">
149 149
       <el-button @click="addLink = true">添加联系方式</el-button>      
150 150
       <el-button @click="contact = false">取 消</el-button>
151
-      <el-button type="primary" @click="addContract('contractform');contact = false">确 定</el-button>
151
+      <el-button type="primary" @click="addContract('contractform');">确 定</el-button>
152 152
     </span>
153 153
   </el-dialog>
154 154
 
@@ -253,7 +253,7 @@
253 253
     </el-form>
254 254
     <span slot="footer" class="dialog-footer">
255 255
       <el-button @click="time = false">取 消</el-button>
256
-      <el-button type="primary" @click="addWorkTime('woketimeform');time = false">确 定</el-button>
256
+      <el-button type="primary" @click="addWorkTime('woketimeform');">确 定</el-button>
257 257
     </span>
258 258
   </el-dialog>
259 259
 
@@ -293,9 +293,9 @@
293 293
  <!-- 编辑图片 -->
294 294
  <el-dialog
295 295
      class="avatar-uploader"
296
-     title="编辑图片"
296
+     title="编辑图片3"
297 297
      :visible.sync="addVisible"
298
-     width="32%"
298
+     width="30%"
299 299
      center>
300 300
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
301 301
     <el-form-item label="图片编辑:" required prop="Images">
@@ -308,28 +308,18 @@
308 308
           :on-success="RotationSuccess"
309 309
           :before-upload="RotationUpload"
310 310
           :limit="9">
311
-          <div class="addimage">
312 311
             <img v-if="picform.Images" :src="picform.Images" class="avatar" style="width:100px;height:98px">
313 312
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
314
-          </div>
315 313
         </el-upload>  
316
-          <!-- <div class="addrot" @click="addVisibletwo = true">
317
-             <div class="docone">
318
-                <li class="el-icon-plus"></li>  
319
-                <div class="doctwo">
320
-                 <span>新增图片</span>
321
-               </div>
322
-            </div>  
323
-         </div>   -->
324 314
       </el-col>
325
-      <el-col :span="19">
315
+      <!-- <el-col :span="19">
326 316
           <div class="tpic" v-show="showpic"> 
327 317
             <img :src="picform.Images" style="width:200px;height:100px">
328 318
           </div>
329
-      </el-col>
319
+      </el-col> -->
330 320
     </el-form-item>
331 321
     <el-form-item label="排序值:" required prop="sort">
332
-       <el-col :span="24">
322
+       <el-col :span="15">
333 323
          <el-input v-model="picform.sort" type="number"></el-input>
334 324
        </el-col>   
335 325
     </el-form-item>
@@ -338,18 +328,18 @@
338 328
            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
339 329
         </el-radio-group>
340 330
     </el-form-item>
341
-    <el-form-item label="链接地址:" v-show="define">
342
-      <el-col :span="20">
331
+    <el-form-item label="链接地址:" v-show="definetwo">
332
+      <el-col :span="10">
343 333
       <el-input v-model="picform.linkaddress"  :disabled="true"></el-input>
344 334
       </el-col>
345
-      <el-col :span="4">
346
-       <el-button size="medium"  v-show="define" @click="addVisibleThree = true">设置链接</el-button>
335
+      <el-col :span="5">
336
+       <el-button size="medium"  @click="addVisibleThree = true">设置链接</el-button>
347 337
       </el-col>
348 338
     </el-form-item>
349 339
   </el-form>
350 340
   <span slot="footer" class="dialog-footer">
351 341
     <el-button @click="addVisible = false">取 消</el-button>
352
-    <el-button type="primary" @click="addrotationpic('picform');addVisible = false">确 定</el-button>
342
+    <el-button type="primary" @click="addrotationpic('picform');">确 定</el-button>
353 343
   </span>
354 344
 </el-dialog>
355 345
 
@@ -386,48 +376,9 @@
386 376
     width="30%"
387 377
     center>
388 378
     <el-form label-width="120px" :model="linkform" ref="linkform">
389
-      <el-form-item label="链接类型:">
390
-         <el-radio-group v-model="linkform.linkType">
391
-            <el-radio :label="item.id" :value="item.id" v-for="(item,index) in linkType" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
392
-         </el-radio-group>
379
+      <el-form-item label="站外链接:">
380
+         <el-input v-model="linkform.defineaddress"></el-input>
393 381
       </el-form-item>
394
-        <el-form-item label="链接类型:" v-show="showone">
395
-      <el-col :span="8">
396
-          <el-select  placeholder="请选择"  v-model="linkform.linkTypeTwo"
397
-              @change="changeType">
398
-              <el-option
399
-              v-for="item in options"
400
-              :key="item.id"
401
-              :label="item.name"
402
-             :value="item.id" >
403
-            </el-option>
404
-          </el-select>
405
-      </el-col>
406
-      <el-col :span="8" v-show="showFour">
407
-         <el-select  placeholder="请选择" v-model="linkform.linkTypeThree"
408
-              @change="GetArticleById">
409
-              <el-option
410
-              v-for="item in articeTypelist"
411
-              :key="item.id"
412
-              :label="item.name"
413
-             :value="item.id" >
414
-            </el-option>
415
-          </el-select>
416
-      </el-col>
417
-    </el-form-item>
418
-    <el-form-item label="站内链接:" v-show="showFive">
419
-          <el-select  placeholder="请选择" v-model="linkform.linkTypeFour">
420
-              <el-option
421
-              v-for="item in articeNamelist"
422
-              :key="item.id"
423
-              :label="item.title"
424
-             :value="item.id" >
425
-            </el-option>
426
-          </el-select>
427
-    </el-form-item>
428
-    <el-form-item label="自定义链接地址:" v-show="showthree">
429
-       <el-input style="width:300px" v-model="linkform.defineAddress" @input="changeInput($event)"></el-input>
430
-    </el-form-item>
431 382
     </el-form>
432 383
    <span slot="footer" class="dialog-footer">
433 384
      <el-button @click="addVisibleThree = false">取 消</el-button>
@@ -435,6 +386,66 @@
435 386
    </span>
436 387
  </el-dialog>
437 388
 
389
+ <el-dialog 
390
+   title="编辑轮播图"
391
+   :visible.sync="editcenterDialogVisible"
392
+   width="35%"
393
+   center>
394
+    <el-form label-width="90px" :model="editrotationform" ref="editrotationform">
395
+        <el-form-item label="图片编辑">
396
+          <el-col :span="5">
397
+             <el-upload
398
+              :data="rotationData"
399
+              class="avatar-uploader"
400
+              action="https://upload.qiniup.com/"
401
+             :show-file-list="false"
402
+             :on-success="handleAvatarSuccess"
403
+             :before-upload="beforeAvatarUpload">
404
+             <img v-if="editrotationform.images" style="width:100%;height:100px" :src="editrotationform.images" class="avatar">
405
+             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
406
+            </el-upload>    
407
+          </el-col>
408
+       </el-form-item> 
409
+        <el-form-item label="排序值:" required prop="sort">
410
+           <el-col :span="24">
411
+             <el-input v-model="editrotationform.sort" style="width:410px" type="number"></el-input>
412
+           </el-col>   
413
+         </el-form-item>
414
+         <el-form-item label="图片链接:">
415
+             <el-radio-group v-model="editrotationform.piclink">
416
+               <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
417
+             </el-radio-group>
418
+         </el-form-item>
419
+         <el-form-item label="链接地址:">
420
+           <el-col :span="15">
421
+             <el-input v-model="editrotationform.linkaddress" style="width:300px" :disabled="true"></el-input>
422
+           </el-col>
423
+           <el-col :span="4">
424
+             <el-button size="medium" @click="linkVisible = true;getOutRotationlink(editrotationform.linkid)" >设置链接</el-button>
425
+           </el-col>
426
+         </el-form-item>
427
+    </el-form>
428
+      <span slot="footer" class="dialog-footer">
429
+      <el-button @click="editcenterDialogVisible = false">取 消</el-button>
430
+      <el-button type="primary" @click="UpdatedConrotation('editrotationform')">确 定</el-button>
431
+    </span>
432
+ </el-dialog>
433
+
434
+   <el-dialog
435
+       title="设置图片链接地址"
436
+       :visible.sync="linkVisible"
437
+       width="30%"
438
+       center>
439
+     <el-form  label-width="90px" ref="rotationformTwo" :model="rotationformTwo" :rules="rules">
440
+       <el-form-item label="站外链接" required prop="defineaddress">
441
+         <el-input v-model="rotationformTwo.defineaddress"></el-input>
442
+       </el-form-item>
443
+     </el-form>
444
+   <span slot="footer" class="dialog-footer">
445
+      <el-button @click="linkVisible = false">取 消</el-button>
446
+      <el-button type="primary" @click="UpdatedRolinkAddress('rotationformTwo')">确 定</el-button>
447
+    </span>
448
+   </el-dialog>
438 449
   </div>
439 450
 </template>
440 451
 
@@ -444,7 +455,7 @@
444 455
  import { getFileExtension} from '@/utils/tools'
445 456
  import { addRotationUpload,addHospital,addRideWay,addWorkTime,addconnection,queryConnetion,deleteConnecWay,editConnecWay,
446 457
  saveConnecform,addContract,addrotationpic,GetRotationImages,addrotationImage,deleteImages,getArticleType,GetArticleById,GetAllActivity,
447
- AddPiCLink} from '@/api/site/site'  
458
+ AddPiCLink,editRotationEmages,GetOutRotationlink,UpdatedRolinkAddress,UpdatedConrotation} from '@/api/site/site'  
448 459
 import { truncateSync } from 'fs';
449 460
 import {checkNumber} from "@/utils/tools";
450 461
 export default {
@@ -478,11 +489,14 @@ export default {
478 489
       type:false,
479 490
       disabled: false,
480 491
       dialogFormVisibleAdd:true,
492
+      editcenterDialogVisible:false,
481 493
       showone:false,
482 494
       showtwo:false,
483 495
       showthree:false,
484 496
       showFour:false,
485 497
       showFive:false,
498
+      linkVisible:false,
499
+      definetwo:true,
486 500
       labelPosition: 'left',
487 501
       qiniuDomain: 'https://images.shengws.com/',
488 502
       Data: { token:'',key: '' },
@@ -540,12 +554,7 @@ export default {
540 554
         sort:"",
541 555
       },
542 556
       linkform:{
543
-        linkType:"",
544
-        linkTypeTwo:"",
545
-        linkTypeThree:"",
546
-        linkTypeFour:"",
547
-        defineAddress:"",
548
-        linkAddress:"",
557
+        defineaddress:"",
549 558
       },
550 559
       linkType:[
551 560
         {id:1,name:'无'},
@@ -556,6 +565,17 @@ export default {
556 565
          {id:1,name:'文章'},
557 566
          {id:2,name:'活动'},
558 567
        ],
568
+       editrotationform:{
569
+         images:"",  
570
+         sort:"",
571
+         piclink:1,
572
+         linkaddress:"",
573
+         linkid:"",
574
+       },
575
+       rotationformTwo:{
576
+          id:"",
577
+          defineaddress:"",
578
+       },
559 579
       rules: {
560 580
         title: [{required: true, message: "请填写模块标题",},],
561 581
         sort: [{required: true,message:"请填写排序值"},{validator:checkNumberRule}],
@@ -565,7 +585,8 @@ export default {
565 585
         connecway:[{required:true,message:"请选择联系方式"}],
566 586
         linkaddress:[{required:true,message:"请填写链接地址"}],
567 587
         address:[{required:true,message:"请填写医院地址"}],
568
-        Images:[{required:true,message:"请上传图片"}]
588
+        Images:[{required:true,message:"请上传图片"}],
589
+        defineaddress:[{required:true,message:"请填写站外链接"}]
569 590
       },
570 591
      addVisible:false,  
571 592
      addVisibletwo:false,
@@ -573,14 +594,19 @@ export default {
573 594
        picform:{
574 595
          sort:"",
575 596
          Images:"",
576
-         piclink:"",
597
+         piclink:2,
577 598
          linkaddress:"",
599
+         linkid:"",
578 600
       },
579 601
       showpic:false,
580 602
       genderOptions:[
581 603
         {id:1, name:'无'},
582 604
         {id:2, name:'自定义'},
583 605
        ],
606
+       genderPicLink:[
607
+         {id:1,name:"自定义"},
608
+         {id:2,name:"不跳转"},
609
+       ],
584 610
        define:false,
585 611
        articeTypelist:[],
586 612
        articeNamelist:[],
@@ -593,11 +619,11 @@ export default {
593 619
             this.$forceUpdate();
594 620
           },
595 621
         selectGender(id){
596
-        if(id == 1){
597
-          this.define = false;
622
+          if(id == 1){
623
+             this.definetwo = false;
598 624
         }
599 625
         if(id == 2){
600
-           this.define = true;
626
+           this.definetwo = true;
601 627
         }
602 628
      },
603 629
        selectItem(id){
@@ -645,54 +671,14 @@ export default {
645 671
       })
646 672
     },
647 673
     AddPiCLink(formName){
648
-        var linkType = this.linkform.linkType;
649
-        console.log("数据1",linkType)
650
-         var linkTypes =   parseInt(linkType);
651
-        this.linkform.linkType = linkTypes;
652
-               
653
-       var linkTypeTwo = this.linkform.linkTypeTwo;
654
-       console.log("数据2",linkTypeTwo)
655
-       if(linkTypeTwo == ""){
656
-         this.linkform.linkTypeTwo = 1;
657
-       }else{
658
-          var linkTypeTwos =  parseInt(linkTypeTwo);
659
-          this.linkform.linkTypeTwo =  linkTypeTwos;
660
-       }
661
-      
662
-
663
-       var linkTypeThree =  this.linkform.linkTypeThree;
664
-       console.log("数据3",linkTypeThree)
665
-       if(linkTypeThree == ""){
666
-        this.linkform.linkTypeThree = 1;
667
-       }else{
668
-         var linkTypeThrees = parseInt(linkTypeThree);
669
-         this.linkform.linkTypeThree = linkTypeThrees;
670
-       }
671
-       
672
-
673
-        var linkTypeFour = this.linkform.linkTypeFour;
674
-        console.log("数据4",linkTypeFour)
675
-        if(linkTypeFour == ""){
676
-          this.linkform.linkTypeFour = 1;
677
-        }else{
678
-           var linkTypeFours =  parseInt(linkTypeFour);
679
-           this.linkform.linkTypeFour = linkTypeFours;
680
-        }
681
-        
682
-       if(this.linkform.linkTypeTwo == 1){
683
-        
684
-         this.linkform.linkAddress = "/articles/createArticle/?id="+this.linkform.linkTypeFour; 
685
-       } 
686
-       if(this.linkform.linkTypeTwo == 2){
687
-         this.linkform.linkAddress = "/activity/?id="+this.linkform.linkTypeFour;       
688
-       }
689 674
        this.$refs[formName].validate((valid)=>{
690 675
          if(valid){
691 676
            AddPiCLink(this.linkform).then(response=>{
692
-             if(response.data.state == 1){
693
-               var patientConlinkaddress =   response.data.data.patientConlinkaddress;
694
-               console.log("这个数据是",patientConlinkaddress)
695
-               this.picform.linkaddress =  patientConlinkaddress.linkaddress;
677
+               if(response.data.state == 1){
678
+               var conlinkaddress = response.data.data.conlinkaddress;
679
+               console.log("conlinkaddress是什么",conlinkaddress)
680
+                this.picform.linkaddress = conlinkaddress.defineaddress;
681
+                this.picform.linkid = conlinkaddress.id;
696 682
              }
697 683
            })
698 684
          }
@@ -732,6 +718,41 @@ export default {
732 718
             })
733 719
           return isJPG && isLt2M;
734 720
       },
721
+
722
+      handleAvatarSuccess(res,file){
723
+        this.editrotationform.images =   this.qiniuDomain +res.url;
724
+        console.log("是什么",this.editrotationform.imageUrl)
725
+      },
726
+      beforeAvatarUpload(file){
727
+          var fileType = file.type
728
+            const isJPG = fileType.indexOf("image") > -1;
729
+            const isLt2M = file.size / 1024 / 1024 < 2;
730
+            if (!isJPG) {
731
+                this.$message.error("只能上传图片");
732
+                return false;
733
+            }
734
+            if (!isLt2M) {
735
+                this.$message.error("图片大小不能超过 2MB!");
736
+                return false;
737
+         }
738
+      
739
+         var date = new Date()
740
+            var ext = getFileExtension(file.name)
741
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
742
+            const _self = this
743
+            return new Promise((resolve, reject) => {
744
+                getToken().then(response => {
745
+                    const token= response.data.data.uptoken
746
+                    console.log("联系我们轮播图token是什么?",token)
747
+                    _self._data.rotationData.token = token;
748
+                    _self._data.rotationData.key = key;
749
+                    resolve(true)
750
+                }).catch(err => {
751
+                    reject(false)
752
+                })
753
+            })
754
+          return isJPG && isLt2M;
755
+      },
735 756
     
736 757
       //新增医院地址
737 758
       addHospital(formName){
@@ -742,6 +763,7 @@ export default {
742 763
             if(valid){
743 764
              addHospital(this.hospitalform).then(response=>{
744 765
                 if(response.data.state ==1){
766
+                  this.hostaddress = false;
745 767
                   var hosaddress =  response.data.data.hosaddress;
746 768
                   console.log('新增医院地址数据',hosaddress);
747 769
                   this.$emit('getOrderModel');
@@ -830,6 +852,7 @@ export default {
830 852
             if(valid){
831 853
               addContract(this.contractform).then(response=>{
832 854
                   if(response.data.state == 1){
855
+                    this.contact = false;
833 856
                    var connectway = response.data.data.connectway;
834 857
                    var ordmodel = response.data.data.ordmodel;
835 858
                     this.$emit('getOrderModel');
@@ -850,6 +873,7 @@ export default {
850 873
           if(valid){
851 874
             addWorkTime(this.woketimeform).then(response=>{
852 875
                   if(response.data.state==1){
876
+                    this.time = false;
853 877
                     var ordmodel = response.data.data.ordmodel;
854 878
                     var patientWorktime = response.data.data.patientWorktime
855 879
                     // console.log("返回数据",ordmodel);
@@ -893,6 +917,7 @@ export default {
893 917
          if(valid){
894 918
             addrotationpic(this.picform).then(response=>{
895 919
                if(response.data.state ==1){
920
+                 this.addVisible = false;
896 921
                  var conrotation  = response.data.data.conrotation;
897 922
                  var total = response.data.data.total;
898 923
                  this.totalImages = total;
@@ -965,6 +990,60 @@ export default {
965 990
           }
966 991
       })
967 992
     },
993
+    editRotationEmages(id){
994
+       editRotationEmages(id).then(response=>{
995
+           if(response.data.state == 1){
996
+             var conrotation =  response.data.data.conrotation;
997
+             this.editrotationform = conrotation;
998
+            //  console.log("conrotation是什么",conrotation)
999
+           }
1000
+       })
1001
+    },
1002
+    getOutRotationlink(linkid){
1003
+       GetOutRotationlink(linkid).then(response=>{
1004
+          if(response.data.state == 1){
1005
+             var conlinkaddress =  response.data.data.conlinkaddress;
1006
+             console.log("conlinkaddress",conlinkaddress)
1007
+             this.rotationformTwo.defineaddress =   conlinkaddress.defineaddress;
1008
+             this.rotationformTwo.id = conlinkaddress.id;
1009
+             console.log("hh",this.rotationformTwo.defineaddress)
1010
+             console.log(this.rotationformTwo.id)
1011
+          }
1012
+       })
1013
+    },
1014
+   
1015
+   
1016
+
1017
+    UpdatedRolinkAddress(formName){
1018
+        this.$refs[formName].validate((valid)=>{
1019
+          if(valid){
1020
+             UpdatedRolinkAddress(this.rotationformTwo.id,this.rotationformTwo).then(response=>{
1021
+                 if(response.data.state == 1){
1022
+                   this.linkVisible = false;
1023
+                    var conlinkaddress =   response.data.data.conlinkaddress;
1024
+                    this.editrotationform.linkaddress = conlinkaddress.defineaddress;
1025
+                 }
1026
+             })
1027
+          }
1028
+        })
1029
+    },
1030
+
1031
+    UpdatedConrotation(formName){
1032
+        var sort =  this.editrotationform.sort;
1033
+         var sorts =  parseInt(sort);
1034
+         this.editrotationform.sort  = sorts;
1035
+       this.$refs[formName].validate((valid)=>{
1036
+         if(valid){
1037
+            UpdatedConrotation(this.editrotationform.id,this.editrotationform).then(response=>{
1038
+                 if(response.data.state == 1){
1039
+                   this.editcenterDialogVisible = false;
1040
+                    var conrotation =  response.data.data.conrotation;
1041
+                    conrotation.log("conrotation",conrotation)                   
1042
+                 }
1043
+            })
1044
+         }
1045
+       })
1046
+    }
968 1047
   },   
969 1048
         created(){
970 1049
           this.queryConnetion();
@@ -1038,7 +1117,26 @@ export default {
1038 1117
 
1039 1118
    .avatar-uploader-icon{
1040 1119
      margin-top: 30px;
1120
+     margin-left: 25px;
1041 1121
    }
1122
+   .avatar-uploader{
1123
+     border-color: #409EFF;
1124
+     border:dashed 1px #409eff;
1125
+     width: 100px;
1126
+     height: 100px;
1127
+  }
1128
+
1129
+  .avatar-uploader-icon {
1130
+    font-size: 28px;
1131
+    color: #8c939d;
1132
+    width: 50px;
1133
+    height: 50px;
1134
+    line-height: 50px;
1135
+    margin-left: 25px;
1136
+    margin-top: 25px;
1137
+    text-align: center;
1138
+  }  
1139
+
1042 1140
    
1043 1141
 .used {
1044 1142
   ul {

+ 33 - 34
src/scrm_pages/site/components/new-feature.vue View File

@@ -845,7 +845,7 @@
845 845
           <el-input v-model="editrotationform.linkaddress"  style="width:300px"></el-input>
846 846
         </el-col>
847 847
         <el-col :span="4">
848
-          <el-button size="medium"  v-show="selectone" @click="rotationVisible = true">设置链接</el-button>
848
+          <el-button size="medium"  v-show="selectone" @click="rotationVisible = true;GetRotationVisibleByLinkId(editrotationform.linkid)">设置链接</el-button>
849 849
         </el-col>
850 850
     </el-form-item>
851 851
   </el-form>
@@ -862,42 +862,14 @@
862 862
   :visible.sync="rotationVisible"
863 863
   width="30%"
864 864
   center>
865
-  <el-form label-width="90px">
866
-     <el-form-item label="连接类型">
867
-         <el-radio-group v-model="form.gender">
868
-            <el-radio :label="item.id" :value="item.id" v-for="(item,index) in defineOptions" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
869
-         </el-radio-group>
870
-     </el-form-item>  
871
-        <el-form-item label="链接类型:" v-show="definetwo">
872
-       <el-select v-model="value" placeholder="请选择">
873
-        <el-option
874
-        v-for="item in options"
875
-        :key="item.value"
876
-        :label="item.label"
877
-        :value="item.value">
878
-       </el-option>
879
-      </el-select>
880
-     </el-form-item>
881
-     <el-form-item label="文章分类" v-show="definetwo">
882
-       <el-select v-model="value" placeholder="请选择">
883
-        <el-option
884
-        v-for="item in options"
885
-        :key="item.value"
886
-        :label="item.label"
887
-        :value="item.value">
888
-       </el-option>
889
-      </el-select>
890
-     </el-form-item>
891
-     <el-form-item label="电话号码:" v-show="definethree">
892
-       <el-input></el-input>
893
-     </el-form-item>
894
-     <el-form-item label="站外链接:" v-show="definefour">
895
-       <el-input></el-input>
865
+  <el-form label-width="90px"  ref="rotationvisibleform" :model="rotationvisibleform">
866
+     <el-form-item label="站外链接:">
867
+       <el-input v-model="rotationvisibleform.defineaddress"></el-input>
896 868
      </el-form-item>
897 869
   </el-form>
898 870
   <span slot="footer" class="dialog-footer">
899 871
     <el-button @click="rotationVisible = false">取 消</el-button>
900
-    <el-button type="primary" @click="rotationVisible = false">确 定</el-button>
872
+    <el-button type="primary" @click="AddRotationVisibleForm('rotationvisibleform');rotationVisible = false">确 定</el-button>
901 873
   </span>
902 874
 </el-dialog>
903 875
 </div>
@@ -908,7 +880,7 @@
908 880
    getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
909 881
    deleteRotations,editRotationImages,updateRotionImages,addActiveform,deleteMargin,getEditImagesDetail,UpdateEditMacgin,getArticleType
910 882
    ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
911
-   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID} from '@/api/site/site'  
883
+   getMacLinkAddress,getCountImages,getAllModelTitle, GetMagicLinkAddressByID,GetRotationVisibleByLinkId,AddRotationVisibleForm} from '@/api/site/site'  
912 884
    import { getToken } from '@/api/qiniu'
913 885
    import { getFileExtension} from '@/utils/tools'
914 886
    import { isIP, isIPv4 } from 'net';
@@ -944,6 +916,10 @@ export default {
944 916
        }
945 917
      }     
946 918
     return {
919
+      rotationvisibleform:{
920
+         id:"",
921
+         defineaddress:"",
922
+      },
947 923
        genderPicLink:[
948 924
          {id:1,name:"无"},
949 925
          {id:2,name:"自定义"},
@@ -2367,6 +2343,29 @@ export default {
2367 2343
               this.modelTtile.id = magiclink.linkaddress;
2368 2344
              }
2369 2345
         })
2346
+     },
2347
+
2348
+     GetRotationVisibleByLinkId(id){
2349
+      GetRotationVisibleByLinkId(id).then(response=>{
2350
+          if(response.data.state == 1){
2351
+             var conlinkaddress =  response.data.data.conlinkaddress;
2352
+             console.log("conlikaddress",conlinkaddress)
2353
+            this.rotationvisibleform =  conlinkaddress;
2354
+          }
2355
+      })
2356
+     },
2357
+     AddRotationVisibleForm(formName){
2358
+       this.$refs[formName].validate((valid)=>{
2359
+         if(valid){
2360
+          AddRotationVisibleForm(this.rotationvisibleform.id,this.rotationvisibleform).then(response=>{
2361
+               if(response.data.state == 1){
2362
+                 var linkaddress =  response.data.data.linkaddress;
2363
+                 console.log("linkaddress",linkaddress);
2364
+                 this.editrotationform.linkaddress = linkaddress.defineaddress;
2365
+               }
2366
+          })
2367
+         }
2368
+       })
2370 2369
      }
2371 2370
   },  
2372 2371
   

+ 62 - 3
src/scrm_pages/site/index.vue View File

@@ -11,14 +11,23 @@
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" @click="GetDefaultData()">进入微官网后台</el-button>
14
+                  <el-button type="primary">进入微官网后台</el-button>
15 15
                 </router-link>
16 16
               </div>
17 17
             </el-col>
18 18
             <el-col :span="12">
19
-                 
19
+               <div class="phone">
20
+                 <div class="phonetwo">9:42</div>
21
+                 <div class="phonethree"><img src="static/images/u189.png" style="width:100%;height:100%"></div>
22
+                 <div class="phonefour"><img src="static/images/u187.png" style="width:100%;height:100%"></div>
23
+                 <div class="phonefive"><img src="static/images/u188.png" style="width:100%;height:100%"></div>
24
+                 <div class="phoneone">
25
+                   <iframe :src = this.url width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe>
26
+                 </div>          
27
+               </div>   
20 28
             </el-col>
21 29
           </el-row>
30
+
22 31
       </div>
23 32
    </div>
24 33
 </template>
@@ -38,6 +47,8 @@ export default {
38 47
       crumbs: [{ path: false, name: "微网站" }],
39 48
       codeImg: require("../../assets/home/wei.jpg"),
40 49
       usreOrgID:"",
50
+      // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
51
+      url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
41 52
     };
42 53
   },
43 54
   methods:{
@@ -45,7 +56,7 @@ export default {
45 56
       let qrcode = new QRCode('qrcode', {
46 57
         width: 100,
47 58
         height: 100, // 高度
48
-        text: 'http://microweb.kuyicloud.com/#/qrcode?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
59
+        text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
49 60
         // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
50 61
         // background: '#f0f'
51 62
         // foreground: '#ff0'
@@ -112,4 +123,52 @@ export default {
112 123
     height: 100px;
113 124
   }
114 125
 }
126
+
127
+ .phone{
128
+   width: 380px;
129
+   height: 750px;
130
+   background: url(../../assets/img/phone.png) 50% no-repeat;
131
+  }
132
+
133
+  .phoneone{
134
+    position: absolute;
135
+    width: 320px;
136
+    height: 660px;
137
+    // border: solid 1px red;
138
+    margin-top: 60px;
139
+    margin-left: 30px; 
140
+    text-align: center;
141
+  }
142
+
143
+  .phonetwo{
144
+    position: absolute;
145
+    width: 50px;
146
+    height: 20px;
147
+    // border:solid 1px blue;
148
+    margin-left: 55px;
149
+    margin-top: 40px;
150
+  }
151
+
152
+  .phonethree{
153
+    position: absolute;
154
+    width: 20px;
155
+    height: 20px;
156
+    margin-left: 280px;
157
+    margin-top: 40px;
158
+  }
159
+
160
+  .phonefour{
161
+     position: absolute;
162
+    width: 20px;
163
+    height: 20px;
164
+    margin-left: 300px;
165
+    margin-top: 40px;
166
+  }
167
+   .phonefive{
168
+    position: absolute;
169
+    width: 20px;
170
+    height: 20px;
171
+    margin-left: 325px;
172
+    margin-top: 40px;
173
+  }
115 174
 </style>

File diff suppressed because it is too large
+ 339 - 387
src/scrm_pages/site/preview.vue


BIN
static/images/u187.png View File


BIN
static/images/u188.png View File


BIN
static/images/u189.png View File