魔方导航

build/webpack.base.conf.js

@@ -90,7 +90,8 @@ module.exports = {
       {
         test: /\.sass$/,
         loaders: ['style', 'css', 'sass']
-      }
+      },
+      
     ]
   },
   node: {

index.html

@@ -21,6 +21,8 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
     <script src='http://api.map.baidu.com/api?v=2.0&ak=？&callback=init'></script>
-    
+   
+    <link href="//vjs.zencdn.net/4.9/video-js.css" rel="stylesheet">
+    <script src="//vjs.zencdn.net/4.9/video.js"></script>
   </body>
 </html>

src/api/act/submitinfo.js

@@ -210,10 +210,11 @@ export function previewEditArticle(id,data){
    })
 }
 
-export function getPreviewInfo(params){
+export function getPreviewInfo(id,params){
+    console.log("我爱你中国",params)
     return request({
-        url:"/api/acticle/getPreviewInfo",
-        method:'Post',
+        url:"/api/acticle/getPreviewInfo?id="+id,
+        method:'Get',
         params:params,
     })
 }
@@ -361,4 +362,28 @@ export function GetAllCategory(params){
     })
 }
 
+export function getArticleDetail(id,params){
+    return request({
+        url:"/api/article/getarticledetail?id="+id,
+        method:"Get",
+        params:params,
+    })
+
+}
+
+export function getVidoDetail(id,params){
+     return request({
+         url:"/api/article/getvidodetail?id="+id,
+         method:"Get",
+         params:params,
+     })
+}
+
+export function getEditArticleContent(id,params){
+    return request({
+        url:"/api/article/geteditarticlecontent?id="+id,
+        method:"Get",
+        params:params,
+    })
+}
 

src/api/site/site.js

@@ -240,10 +240,9 @@ export function saverideway(id,data){
 }
 
 export function getQueryNewModel(params){
-  
    return request({
        url:"/api/site/getquerynewmodel",
-       method:"Post",
+       method:"Get",
        params:params,
    })
 }
@@ -306,6 +305,7 @@ export function deleteModleById(id,data){
 }
 
 export function SaveOffice(id,data){
+    console.log("data是什么",data)
     return request({
         url:"/api/site/saveoffice?id="+id,
         method:"Post",
@@ -361,6 +361,47 @@ export function editOfficeEnviroment(id,data){
     })
 }
 
+export function AddImages(data){
+    return request({
+        url:"/api/site/addimages",
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getEnImages(params){
+   return request({
+       url:"/api/site/getenimages",
+       method:"Post",
+       params:params,
+   })
+}
+
+export function getEnImagesTwo(params){
+   return request({
+       url:"/api/site/getenimagestwo",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function EditEnvirImages(id,data){
+ 
+    return request({
+        url:"/api/site/editenvirimages?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function AddtwoImages(id,data){
+    return request({
+        url:"/api/site/addtwoimages?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
 export function  SaveOfficeEnvironment(id,data){
      return request({
          url:"/api/site/saveofficeenvironment?id="+id,
@@ -393,6 +434,30 @@ export function docmore(id,data){
    })
 }
 
+export function kemore(id,data){
+   return request({
+       url:"/api/site/kemore?id="+id,
+       method:'Get',
+       data:data,
+   })
+}
+
+export function articlemore(id,data){
+     return request({
+         url:"/api/site/articlemore?id="+id,
+         method:"Get",
+         data:data,
+     })
+}
+
+export function Activitiesmore(id,data){
+    return request({
+       url:"/api/site/activitiesmore?id="+id,
+       method:"Get",
+       data:data, 
+    })
+}
+
 export function addNavigation(data){
     return request({
         url:"/api/site/addnavigation",
@@ -460,6 +525,7 @@ export function addrotationpic(data){
 }
 
 export function GetRotationImages(params){
+   
     return request({
         url:"/api/site/getrotationimages",
         method:"Post",
@@ -565,6 +631,14 @@ export function deleteImages(id,data){
     })
 }
 
+export function deleteSingleImages(id,data){
+    return request({
+        url:"/api/site/deletesingleimages?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
 export function addHospital(data){
     return request({
         url:"/api/site/addhospital",
@@ -580,3 +654,373 @@ export function addActiveform(data){
         data:data,
     })
 }
+
+export function getactivity(id,data){
+    return request({
+        url:"/api/site/getactivity?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function getMacImages(id,data){
+    console.log("id",id)
+    return request({
+        url:"/api/site/getMacImages?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function SaveActivit(id,data){
+  return request({
+      url:"/api/site/saveactivit?id="+id,
+      method:"Post",
+      data:data,
+  })
+}
+
+export function deleteMargin(id,data){
+   return request({
+       url:"/api/site/deleMargin?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getRotationImages(id,data){
+    
+   return request({
+       url:"/api/site/editRotationImages?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function getRotationDetail(id,data){
+   return request({
+       url:"/api/site/getrotationdetail?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function editVisibleByid(id,data){
+    return request({
+        url:"/api/site/editvisiblebyid?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function SaveEditPic(id,data){
+   return request({
+       url:"/api/site/saveditpic?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function addeditpic(id,data){
+   return request({
+       url:"/api/site/addeditpic?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function AddedialogVisible(id,data){
+   
+   return request({
+       url:"/api/site/addedialogvisible?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function geteditRotationImages(id,data){
+    
+    return request({
+        url:"/api/site/geteditrotationimages?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function editSingleVisible(id,data){
+  
+    return request({
+        url:"/api/site/editsinglevisible?id="+id,
+        method:"Get",
+        data:data,
+    })
+}
+
+export function UpdateSingleForm(id,data){
+
+    return request({
+        url:"/api/site/updatesingleform?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function addEditPicForm(id,data){
+  
+    return request({
+        url:"/api/site/addeditpicform?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function AddRotationVisible(id,data){
+   
+    return request({
+        url:"/api/site/addrotationvisible?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getEditImagesDetail(id,data){
+   return request({
+       url:"/api/site/geteditimagesdetail?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function UpdateEditMacgin(id,data){
+    return request({
+        url:"/api/site/updateeditmacgin?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getActivities(params){
+   
+   return request({
+       url:"/api/site/getactivities",
+       method:"Post",
+       params:params, 
+   })
+}
+
+export function getArticleType(params){ 
+    return request({
+        url:"/api/site/getArticleType",
+        method:"Post",
+        params:params,
+    })
+}
+
+export function AddArticeList(data){
+   return request({
+       url:"/api/site/addarticelist",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getArticlelist(data){
+   return request({
+       url:"/api/site/getarticlelist",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function editGetArticlistDetail(id,data){
+     return request({
+         url:"/api/site/editgetarticlistdetail?id="+id,
+         method:"Get",
+         data:data,
+     })
+}
+
+export function UpdatedArticeDetail(id,data){
+    return request({
+        url:"/api/site/updatearticedetail?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function AddOfficeThreeVisible(id,data){
+   return request({
+       url:"/api/site/addoffficethree?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function officetwoVisbile(id,params){
+   return request({
+       url:"/api/site/offcietwovisible?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function AddOfficetTwo(id,data){
+  return request({
+      url:"/api/site/addofficetwo?id="+id,
+      method:"Post",
+      data:data,
+  })
+}
+
+export function deleteOfficeById(id,data){
+   return request({
+       url:"/api/site/deleteofficebyid?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function GetArticleById(id,params){
+   return request({
+       url:"/api/site/getarticlebyid?id="+id,
+       method:"Get",
+       params:params,
+   })  
+}
+
+export function GetAllActivity(params){
+   return request({
+       url:"/api/site/getallactivity",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function AddLinkAddress (data){
+   return request({
+       url:"/api/site/addlinkaddress",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getLinkAddress(params){
+   return request({
+       url:"/api/site/getlinkaddress",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function getAllConnecWay(params){
+   return request({
+       url:"/api/site/getallconnecway",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function getConnecWay(id,params){
+   return request({
+       url:"/api/site/getconnecway?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function editConnecway(id,params){
+   return request({
+       url:"/api/site/editconnecway?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function UpdateConnectform(id,data){
+  return request({
+      url:"/api/site/updateconnectform?id="+id,
+      method:"Post",
+      data:data,
+  })
+}
+
+export function UpdateContactform(id,data){
+     return request({
+         url:"/api/site/updatecontactform?id="+id,
+         method:"Post",
+         data:data
+     })
+}
+
+export function addConnectways(data){
+  return request({
+      url:"/api/site/addconnectways",
+      method:"Post",
+      data:data,
+  })
+}
+
+export function getHospitalIntroduction(id,params){
+   return request({
+       url:"/api/site/gethostpitalintroduction?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function UpdateHospitalAddress(id,data){
+    return request({
+        url:"/api/site/updatehospitaladdress?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function AddPiCLink(data){
+   return request({
+       url:"/api/site/addpiclink",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getLinkAddressDetail(id,params){
+   return request({
+       url:"/api/site/getlinkaddressdetail?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function UpdatePicFormThree(id,data){
+   return request({
+       url:"/api/site/updatepicformthree?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getEnImagesThree(params){
+    return request({
+        url:"/api/site/getenimagesthree",
+        method:"Get",
+        params:params,
+    })
+}
+
+export function AddMagiclinkData(data){
+    console.log("data是什么",data)
+    return request({
+        url:"/api/site/addmagiclinkdata",
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getMacLinkAddress(params){
+    return request({
+        url:"/api/site/getmaclinkaddress",
+        method:"Get",
+        params:params,
+    })
+}

src/lang/zh.js

@@ -56,6 +56,9 @@ export default {
     articleList: '文章列表',
     articlePreview:'文章预览',
     editVido:'编辑视频',
+    articleDetail:'文章详情',
+    articleEditPreview:'文章编辑预览',
+    vidoDetail:'视频详情',
     errorPages: '错误页面',
     page401: '401',
     page404: '404',
@@ -175,7 +178,7 @@ export default {
     SMSManage: "短信管理",
     SMSSend: "群发短信",
     site:"微网站",
-    preview:"预览"
+    preview:"预览",
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/article.js

@@ -12,7 +12,7 @@ export default {
   },
   children: [
     {
-      path: '/articles/createArticle',
+      path: '/articles/createArticle/:id',
       component: () => import('@/scrm_pages/article/createArticle'),
       name: 'createArticle',
       meta: { title: 'createArticle', noCache: true }
@@ -43,9 +43,10 @@ export default {
     },
     {
       path: '/articles/articlePreview',
-      component: () => import('@/scrm_pages/article/articlePreview'),
+      component: () => import('@/scrm_pages/article/article_preview'),
       name: 'articlePreview',
       hidden:true,
+      is_menu: false,
       meta: { title: 'articlePreview', noCache: true }
     },
     {
@@ -57,25 +58,45 @@ export default {
       meta: { title: 'editArticle', noCache: true }
     },
     {
-      path: '/articles/editVido',
-      component:() => import('@/scrm_pages/article/editVido'),
+      path: '/articles/editVido/:id',
+      component:() => import('@/scrm_pages/article/edit_vido'),
       name:'editVido',
       hidden:true,
-      meta: { title:'editVido',noCache: true}
+      is_menu: false,
+      meta: { title: 'editVido', noCache: true}
     },
     {
-      path: '/articles/articleEditPreview',
+      path: '/articles/articleEditPreview/:id',
       component: () => import('@/scrm_pages/article/articleEditPreview'),
       name: 'articleEditPreview',
       hidden:true,
+      is_menu:false,
       meta: { title: 'articleEditPreview', noCache: true }
     },
     {
       path: '/articles/articleCommentDetail/:id',
-      component: () => import('@/scrm_pages/article/articleCommentDetail'),
+      component: () => import('@/scrm_pages/article/articlecomment_detail'),
       name: 'articleCommentDetail',
       hidden:true,
+      is_menu:false,
       meta: { title: 'articleCommentDetail', noCache: true }
     },
+    {
+      path:'/articles/articleDetail/:id',
+      component:() =>import('@/scrm_pages/article/article_detail'),
+      name:'articleDetail',
+      hidden:true,
+      is_menu:false,
+      meta:{ title:'articleDetail',noCache: true }
+
+    },
+    {
+      path:'/articles/vidoDetail/:id',
+      component:()=>import('@/scrm_pages/article/vido_detail'),
+      name:'vidoDetail',
+      hidden:true,
+      is_menu:false,
+      meta:{ title:'vidoDetail',noCache: true}
+    }
   ]
 }

src/scrm_pages/article/articleEditPreview.vue

@@ -4,29 +4,19 @@
             <bread-crumb :crumbs='crumbs'></bread-crumb>
          </div>
          <div class="app-container">
-            <el-form label-width="90px" class="clearfix" :model="form" ref="acticleform">
-                 <el-row :span=20>
-                    <el-form-item>
-                        <div class="title">
-                           {{form.title}}
-                        </div>
-                    </el-form-item>
-                 </el-row>
-                 <el-row :span=20>
-                     <el-form-item>
-                         <div  class="cont">
-                           <li v-html="form.content"></li>
-                         </div>
-                     </el-form-item>
-                 </el-row>
-                 <el-row :span=20>
-                 <el-form-item>
-                    <div class="but">
-                      <el-button type="primary" @click="clossPreview()">关闭预览</el-button>
-                    </div>    
-                 </el-form-item>
-          </el-row>        
-            </el-form>
+            <div class="title">
+                 <!-- {{form.title}} -->
+                 <div class="titletwo">{{form.title}}</div>
+            </div>
+            <!-- <div class="cont" v-html="form.content"> </div> -->
+            <div class="title">
+                <div class="titletwo">
+                  <li v-html="form.content"></li>
+                </div>
+            </div>
+            <div class="but">
+                 <el-button type="primary" @click="clossPreview()">关闭预览</el-button>
+            </div>          
        </div>
      </div>
 </template>
@@ -46,44 +36,52 @@
                      { path: '/articles/articleEditPreview', name: '文章编辑预览' }
                 ],
                 form:{
-                    title:'',
-                    content:'',
+                  title:"",
+                  content:"",
                 }
             }
         },
         methods:{
-            articleEditPreview(){
-                getPreviewInfo(this.form).then(response=>{
+            getPreviewInfo(){
+                  const id = this.$route.params && this.$route.params.id;
+                 console.log("这个id是什么",id)
+                getPreviewInfo(id,this.form).then(response=>{
                       if(response.data.state == 1){
                          this.form =  response.data.data.articles;
-                         var articles =  response.data.data.articles
-                         console.log("articles",articles)        
+                        //  var articles =  response.data.data.articles
+                         console.log("articles",this.form)        
                       }
                 })   
             },
             clossPreview(){
-              this.$router.push({path:'/articles/articleList'})
+               const id = this.$route.params && this.$route.params.id;
+              this.$router.push({path:'/articles/editArticle/'+id})
             }
         },
         created(){
-            this.articleEditPreview();
+            this.getPreviewInfo();
         }
     }
 </script>
       
 <style scoped>
     .title{
-       font-size: 20px;
-       position: relative;
-       left: 750px;
+        font-size: 20px;
+        text-align: center;
+        width: 100%;
+        height: 100%;
+        margin-bottom: 10px;
+    }
+    .titletwo{
+      display: inline-block;
     }
 
     .cont{
       position: relative;
-      left: 200px;
+      /* left: 200px; */
     }
     .but{
       position: relative;
-      left: 750px;
+      left: 900px;
     }
 </style>

src/scrm_pages/article/articleList.vue

@@ -51,7 +51,7 @@
           </div>
           <div class="activity-info-panel">
             <h3 class="title">
-              <a>{{article.title}}</a>
+              <span @click="articleDetail(article.id,article.type)">{{article.title}}</span>
             </h3>
             <div class="statistics">
               阅读：{{article.real_read_num}} 丨 评论：{{article.comment_num}} 丨 点赞：{{article.star_num}}
@@ -77,7 +77,7 @@
           </div>
           <div class="activity-time-panel">
             <span class="center">{{orgName}}</span>
-            <span class="time">2019-06-08</span>
+            <span class="time">{{articlecreatetime(article.ctime)}}</span>
           </div>
         </div>
       </div>
@@ -100,6 +100,7 @@
   import BreadCrumb from '../components/bread-crumb'
   import { GetAllArticles,deleteArticle,deleteAllArticles,GetAllCategory} from '@/api/act/submitinfo'
   import PublishedCell from "@/scrm_pages/article/components/published_cell"
+  import {uParseTime} from "@/utils/tools";
   export default {
     name: 'commentList',
     components:{
@@ -156,6 +157,9 @@
                     //  }
               })
          },
+         articlecreatetime(time){
+            return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+         },
          selectsign(id){
             console.log("id",id)
             this.listQuery.classid = id;
@@ -178,7 +182,7 @@
              return row.imgs
         },
         AddArticle(){
-           this.$router.push({path:'/articles/createArticle'})
+           this.$router.push({path:'/articles/createArticle/:id'})
         },
         changeSelectingStatus(status){
           console.log("status是多少?",status)
@@ -226,16 +230,13 @@
             });
            },
            editArticles(id,articletype){
-               console.log("文章id",id);
-               console.log("文章内型",articletype)
+              //  console.log("文章id",id);
+              //  console.log("文章内型",articletype)
                if(articletype == 1){
-                  this.$router.push("/articles/editArticle");
-                 // this.$router.push({name:'editArticle'})
-
+                  this.$router.push("/articles/editArticle/"+id);
                }
                if(articletype == 2){
-                  //  this.$router.push({path:"/articles/editVido/"+id});
-                   this.$router.push({name:'editVido',params: {id:id}})
+                 this.$router.push("/articles/editVido/"+id);
                }
            },
 
@@ -299,7 +300,7 @@
                                    this.articsData.splice(index,1)
                               }
                             }
-                             this.$message.success("删除评论成功");
+                             this.$message.success("删除成功");
                        }
                   })
                });
@@ -314,6 +315,15 @@
             }
           })
         },
+        articleDetail(id,articletype){
+        
+          if(articletype == 1){
+           this.$router.push("/articles/articleDetail/"+id);
+          }
+          if(articletype == 2){
+            this.$router.push("/articles/vidoDetail/"+id);
+          }
+        }
     },
     created(){
       this.GetAllArticles();

src/scrm_pages/article/article_detail.vue

@@ -0,0 +1,70 @@
+<template>
+   <div  class="main-contain">
+      <div class="position">
+         <bread-crumb :crumbs='crumbs'></bread-crumb>
+     </div> 
+     <div class="app-container">
+          <div class="articlename">
+              {{articleform.title}}
+          </div>
+           <div v-html="articleform.content" class="articlecontent">
+
+           </div>
+     </div>
+   </div>
+</template>
+
+<script>
+    import BreadCrumb from '../components/bread-crumb'
+     import { getArticleDetail } from '@/api/act/submitinfo'
+    export default {
+        name: "article_detail",
+         components:{
+           BreadCrumb,
+      },
+      data(){
+        return{
+            crumbs: [
+             { path: false, name: '文章管理' },
+             { path: '/articles/articleDetail', name: '文章详情' }
+          ],  
+          articleform:{
+            title:"",
+            content:"",
+          }
+        }  
+      },
+      methods:{
+         getArticleDetail(){
+            const id = this.$route.params && this.$route.params.id;
+            console.log("文章详情id是什么",id);
+           getArticleDetail(id,this.articleform).then(response=>{
+               if(response.data.state == 1){
+                 var articles =  response.data.data.articles;
+                this.articleform =  response.data.data.articles;
+                 console.log("articles",articles)
+               }
+           })
+         }
+      },
+      created(){
+        this.getArticleDetail();
+      }
+    }
+</script>
+
+<style scoped>
+    .articlename{
+      width: 500px;
+      height: 50px;
+      /* border: solid 1px red; */
+      margin-left: 600px;
+    }
+
+    .articlecontent{
+      width: 1000px;
+      height: 100%;
+      /* border:solid 1px red; */
+      /* margin-left: 300px; */
+    }
+</style>

src/scrm_pages/article/articlePreview.vue → src/scrm_pages/article/article_preview.vue

@@ -7,16 +7,21 @@
           <el-form label-width="90px" class="clearfix" :model="form" ref="acticleform">
            <el-row :span=20>
             <el-form-item>
-                <div class="title">
-                 {{form.title}}
-                </div>    
+              <div class="title">
+                 <!-- {{form.title}} -->
+                <div class="titletwo">
+                   {{form.title}}
+                </div>
+              </div>    
             </el-form-item>
           </el-row> 
            <el-row :span=20>
             <el-form-item>
-                <div class="cont">
-                   <!-- {{form.content}} -->
-                   <li v-html="form.content"></li>
+                <div class="title">
+                   <!-- <li v-html="form.content"></li> -->
+                   <div class="titletwo">
+                     <li v-html="form.content"></li>
+                   </div>
                 </div>    
             </el-form-item>
           </el-row>
@@ -62,7 +67,8 @@
               });
           },
           clossPreview(){
-            this.$router.push({path:'/articles/articleList'})
+            var id =  this.form.id
+            this.$router.push({path:'/articles/createArticle/'+id})
           }
     },
     created(){
@@ -74,10 +80,14 @@
 <style scoped>
     .title{
         font-size: 20px;
-        position: relative;
-        left: 750px;
+        text-align: center;
+        width: 100%;
+        height: 100%;
     }
-
+    .titletwo{
+      display: inline-block;
+    }
+  
     .cont{
       position: relative;
       left: 200px;
@@ -86,5 +96,5 @@
       position: relative;
       left: 750px;
     }
-
+   
 </style>

src/scrm_pages/article/components/CreateArticleForm.vue

@@ -29,6 +29,7 @@
 
               </el-input>
             </el-form-item>
+            <div class="tips"><p>请输入1-99的整数，数值越小，模块排序越靠前</p></div>
           </el-row>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -42,6 +43,7 @@
 
 <script>
     import { addCategory,getAritcleCount } from '@/api/act/submitinfo'
+    import {checkNumber} from "@/utils/tools";
     export default {
         name: "CreateArticleForm",       
            props:{
@@ -53,12 +55,20 @@
               }
            },
             data(){
+                 var checkNumberRule = (rule, value, callback) => {
+                    if (!checkNumber(value)) {
+                       callback(new Error('请输入1-99的整数'));
+                     }else {
+                       callback(); 
+                       }
+                    };
+
                 return {
-                    centerDialogVisible:false,
+                    centerDialogVisible:false,               
                     rules: {
                     name: [{required: true, message: "请填写分类名称",},],
                     summary: [{required: true,message:"请填写分类描述"}],
-                    order: [{required: true,message:"请填写排序"}],
+                    order: [{required: true,message:"请填写排序"},{validator:checkNumberRule}],
                  },
                 acticleform:[],
                  form:{
@@ -102,12 +112,19 @@
                             }).catch(e=>{})
                        }   
                    });         
-              },  
+              },    
           },
       }  
 </script>
 
 <style scoped>
-   
+  .tips {
+    font-size: 12px;
+    line-height: 18px;
+    width:100%;
+    height: 100px;
+    /* border:solid 1px red; */
+    margin-left: 86px;
+  }
 </style>
    

src/scrm_pages/article/components/EditArticleForm.vue

@@ -38,6 +38,7 @@
     </div>
 </template>
 <script>
+ import {checkNumber} from "@/utils/tools";
  import { EditArticleCategory } from '@/api/act/submitinfo'
 export default {
     name: "EditArticleForm",
@@ -60,12 +61,20 @@ export default {
       }
     },
      data(){
+            var checkNumberRule = (rule, value, callback) => {
+                  if (!checkNumber(value)) {
+                       callback(new Error('请输入1-99的整数'));
+                   }else {
+                      callback(); 
+                    }
+                };
+
           return {
           centerDialogVisible:false,
            rules: {
              name: [{required: true, message: "请填写分类名称",},],
              summary: [{required: true,message:"请填写分类描述"}],
-             order: [{required: true,message:"请填写排序"}]
+             order: [{required: true,message:"请填写排序"},{validator:checkNumberRule}]
               },
              }
           }, 

src/scrm_pages/article/createArticle.vue

@@ -94,7 +94,7 @@
           <el-row :span="24">
             <el-col :span="24">
                 <el-form-item>
-                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm('form');centerDialogVisible=false">发布</el-button>
+                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm('form');">发布</el-button>
                       <el-button size="small" style="width: 100px" @click="preview('form')">预览</el-button>
                       <el-button size="small" style="width: 100px" @click="save('form');centerdraftVisible = false">保存草稿</el-button>
                   <el-button size="small" style="width: 100px" @click="centercancelVisible = true">取消</el-button>
@@ -218,7 +218,7 @@
   import 'quill/dist/quill.snow.css'
   import 'quill/dist/quill.bubble.css'
   import Neditor from '@/components/Neditor'
-  import {submitForm,getArticleType,addVido,Savedraft,previewArticle,save} from '@/api/act/submitinfo'
+  import {submitForm,getArticleType,addVido,Savedraft,previewArticle,save,getEditArticleContent} from '@/api/act/submitinfo'
   import { getToken } from '@/api/qiniu'
   import { getFileExtension} from '@/utils/tools'
   export default {
@@ -249,10 +249,10 @@
           org_logo:'',
           act_type:'',
           file:'',
-          vid_pic:'',
-          vio_upload:'',
-          vid_name:'',
-          vid_type:'',
+          vid_pic:"",
+          vio_upload:"",
+          vid_name:"",
+          vid_type:"",
         },
          acttypes:[],
          imageUrl:'',
@@ -287,6 +287,7 @@
     },
     created(){
         this.getArticleType();
+        this.getEditArticleContent();
     },
     methods: {
       //第一个图片
@@ -339,9 +340,12 @@
             images.push(temp[1]);
             }                 
              console.log("图片数组",images);
-             this.form.org_logo = images[0];
-             this.imageUrl = images[1];
-             this.imageUrlLast = images [2];           
+             console.log("数组长度",images.length)
+             if(images.length != ""){
+                this.form.org_logo = images[0];
+                this.imageUrl = images[1];
+                this.imageUrlLast = images [2];    
+             }       
         },
 
 
@@ -471,14 +475,17 @@
             })
       },
       beforevidoFile(file){
-          const isJPG = file.type === 'png/jpg';
-          if (!isJPG) {
-          this.$message.error('上传头像图片只能是 png或者jpg格式!');
-        }
-          const isLt2M = file.size / 1024 / 1024 < 1;
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 1M!');
-        }
+            var fileType = file.type
+            const isJPG = fileType.indexOf("image") > -1;
+            const isLt2M = file.size / 1024 / 1024 < 2;
+            if (!isJPG) {
+                this.$message.error("只能上传图片");
+                return false;
+            }
+            if (!isLt2M) {
+                this.$message.error("图片大小不能超过 2MB!");
+                return false;
+         }
             var date = new Date()
             var ext = getFileExtension(file.name)
             var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
@@ -541,12 +548,22 @@
              //console.log("文章",this.options)
             }
         })
-      },
+      },    
       gotolink(){
-           this.centerDialogVisible = false;
-           this.form.act_name = "";
-           this.form.act_content = "";
-           this.form.act_picture = "";
+            this.centerDialogVisible = false;  
+            this.show=true;
+            this.form.act_name = "";
+            this.form.act_content = "";
+            this.form.act_picture = "";
+            this.form.act_category = '';
+            this.form.org_logo = "";
+            this.form.act_type = "";
+            this.form.file = "";
+            this.form.vid_pic = "";
+            this.form.vio_upload = "";
+            this.form.vid_name = "";
+            this.form.vid_type = "";
+            console.log("牛逼")
       },
       gobacklist(){
         this.$router.push({path:'/articles/articleList'})
@@ -611,6 +628,23 @@
       },
       confirm(){
          this.$router.push({path:"/articles/articleList"})
+      },
+
+      getEditArticleContent(){
+          const id = this.$route.params && this.$route.params.id;
+          // console.log("预览返回id是多少?",id)
+        getEditArticleContent(id,this.form).then(response=>{
+            if(response.data.state ==1){
+               var articles = response.data.data.articles;
+              this.form.act_name =  articles.title;
+              this.form.act_content = articles.content;
+              // this.form.vio_upload = articles.imgs;
+               this.form.act_type = articles.class_id;
+              this.form.org_logo =   articles.imgs;
+              console.log("预览返回的数据",articles)
+              console.log("预览返回的图片",this.form.vid_pic)
+            }
+        })
       }
     },
   }

src/scrm_pages/article/edit_article.vue

@@ -91,8 +91,8 @@
             <el-col :span="24">
                 <el-form-item>
                       <el-button size="small" type="primary" style="width: 100px"  @click="UpdataArticleInfo('arctileform');">发布</el-button>
-                      <!-- <el-button size="small" style="width: 100px" @click="preview('arctileform')">预览</el-button> -->
-                      <el-button size="small" style="width: 100px" @click="saveArticleDraft('arctileform');centerdraftVisible = false">保存草稿</el-button>
+                      <el-button size="small" style="width: 100px" @click="preview()">预览</el-button>
+                      <!-- <el-button size="small" style="width: 100px" @click="saveArticleDraft('arctileform');centerdraftVisible = false">保存草稿</el-button> -->
                   <el-button size="small" style="width: 100px" @click="centercancelVisible = true">取消</el-button>
                 </el-form-item>
             </el-col>
@@ -116,7 +116,7 @@
             center>
            <!-- <span>这是一段信息</span> -->
            <span slot="footer" class="dialog-footer">
-           <el-button @click="gobackList()">返回文章列表</el-button>
+           <el-button @click="gobackList()" type="primary">返回文章列表</el-button>
            </span>
          </el-dialog>
 
@@ -390,19 +390,24 @@
         gobackList(){
            this.$router.push({path:'/articles/articleList'})
         },
-        // preview(forName){
-        //     this.form.act_content = this.$refs.neditor.content;
-        //     const id = this.$route.params && this.$route.params.id;
-        //     this.$refs[forName].validate((valid)=>{
-        //       if(valid){
-        //          previewEditArticle(id,this.form).then(response=>{
-        //            if(response.data.state == 1){
-        //                this.$router.push("/articles/articleEditPreview")
-        //            }
-        //          })
-        //       }
-        //     })
-        // },
+        preview(){
+            const id = this.$route.params && this.$route.params.id;
+            console.log("id是什么",id)
+           this.$router.push("/articles/articleEditPreview/"+id)
+            // this.arctileform.content = this.$refs.neditor.content;
+            // console.log("内容",this.arctileform.content)
+            // const id = this.$route.params && this.$route.params.id;
+            // console.log("id是什么",id)
+            // this.$refs[forName].validate((valid)=>{
+            //   if(valid){
+            //      previewEditArticle(id,this.arctileform).then(response=>{
+            //        if(response.data.state == 1){
+            //            this.$router.push("/articles/articleEditPreview")
+            //        }
+            //      })
+            //   }
+            // })
+        },
         select(){
         this.picshow = false
         },
@@ -418,9 +423,11 @@
             images.push(temp[1]);
             }
             //  console.log("图片数组",images);
+            if(images.length!=""){
              this.arctileform.imgs = images[0];
              this.imageUrl = images[1];
              this.imageUrlLast = images [2];
+            }
         },
       },
       created(){

src/scrm_pages/article/editVido.vue → src/scrm_pages/article/edit_vido.vue

@@ -23,7 +23,7 @@
                              <div slot="tip" class="el-upload__tip" v-if="show">支持大多视频文件格式,大小不超过2G</div>
                         </el-upload>
                        </div>
-                         <div class="video" v-if="shows">
+                         <div class="video" v-if="shows"> 
                          <img v-if="form.vio_upload" :src="form.vio_upload+'?vframe/jpg/offset/1/w/300/h/200'" class="avatar" id="upvideo">
                        </div>
                         <div id="upvideo"></div>                  
@@ -78,7 +78,6 @@
            :visible.sync="dialogVisible"
             width="30%"
             center>
-           <span>这是一段信息</span>
            <span slot="footer" class="dialog-footer">
            <el-button @click="gobackList()">返回文章列表</el-button>
            </span>
@@ -130,9 +129,10 @@
           this.form.file =  file.raw
         }, 
         handleSuccess(res,file,fileList){  
-            this.$message.success("视频上传成功")               
+            this.$message.success("视频上传成功")       
+            this.form.vid_pic = "",        
              this.form.vio_upload = this.qiniuDomain + res.url;           
-             console.log("是什么",this.form.vio_upload)
+             console.log("上传之后是什么",this.form.vio_upload)
 
              this.show=false;
              this.shows = true;
@@ -241,6 +241,7 @@
        SumitVido(forName){
              const id = this.$route.params && this.$route.params.id;
              console.log("id是多少?",id)
+             this.form.vid_pic = this.form.vio_upload;
           this.$refs[forName].validate((valid)=>{
               if(valid){
                  updataVidoInfo(id,this.form).then(response=>{
@@ -268,6 +269,7 @@
         Savedraft(forName){
            const id = this.$route.params && this.$route.params.id;
            console.log("id是多少?",id);
+            this.form.vid_pic = this.form.vio_upload;
            this.$refs[forName].validate((valid)=>{
                if(valid){
                   SaveVidodraft(id,this.form).then(response=>{

src/scrm_pages/article/vido_detail.vue

@@ -0,0 +1,80 @@
+<template>
+    <div  class="main-contain">
+        <div class="position">
+             <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div  class="app-container">
+          <div class="title">{{videoform.title}}</div> 
+          <div class="video">            
+               <video id="example_video_1" class="video-js vjs-default-skin"
+                     controls preload="auto" width="640" height="300"
+                     poster="http://video-js.zencoder.com/oceans-clip.png"
+                     data-setup='{"example_option":true}' ref="video">
+                     <source :src="videoform.video_url" type='video/mp4' />
+              </video>            
+        </div>
+      </div>
+    </div>
+</template>
+ 
+<script>
+    import BreadCrumb from '../components/bread-crumb'
+     import { getVidoDetail } from '@/api/act/submitinfo'
+    export default {
+        name: "vido_detail",
+        components:{
+           BreadCrumb,
+      },
+      data(){
+         return{
+             crumbs: [
+              { path: false, name: '文章管理' },
+              { path: '/articles/vidoDetail', name: '视频详情' }
+           ], 
+            video: null, 
+            videoform:{
+                title:"",
+                video_url:"",
+            }
+         }
+      },
+       methods: {
+           getVidoDetail(){
+               const id = this.$route.params && this.$route.params.id;
+               console.log("视频详情id是什么",id);
+               getVidoDetail(id,this.videoform).then(response=>{
+                    if(response.data.state == 1){
+                      var articles =  response.data.data.articles;                     
+                      this.videoform =  response.data.data.articles;      
+                      this.$refs.video.src = articles.video_url;                 
+                      
+                    }
+               })
+           }
+        },
+        created(){
+            this.getVidoDetail();
+        }
+       
+    }
+</script>
+
+<style scoped>
+     .video {
+        position: relative;
+        margin-left: 200px;
+    }
+
+    .video__player {
+        width: 100%;
+        height: 100%;
+        display: flex;
+    }
+
+    .title{
+       margin-left: 200px;
+       margin-bottom: 20px;
+    }
+
+   
+</style>

src/scrm_pages/members/components/CreateMemberForm.vue

@@ -240,7 +240,7 @@ export default {
                 birthday:'',
                 city:[],
                 province_id:'',
-                city_id:0,
+                city_id:'',
                 district_id:0,
                 illness:[],
                 ill_date:'',
@@ -290,9 +290,14 @@ export default {
                                 }
                             }
                             this.membersData.unshift(member);
-                            this.resetForm("memberForm");
+                            this.resetForm(formName);
                             this.createMemberFormVisible = false;
                             this.$message.success("添加会员成功");
+                            this.form.province_id = "";
+                            this.form.city_id = "";
+                            this.form.district_id = "";
+
+                           
                         }else {
                             this.$message.error(res.msg);
                         }
@@ -301,8 +306,10 @@ export default {
                 } else {
                     return false;
                 }
+               
             });
         },
+        
         selectGender:function(gender) {
             if(gender == 2) {
                 this.form.avatar = 'https://images.shengws.com/201809182128222.png';

src/scrm_pages/members/components/EditMemberForm.vue

@@ -323,6 +323,7 @@ export default {
             this.GetDistrict(id);
         },
         GetProvince:function(id) {  
+            
             GetDistrictsByUpid({id:id}).then(response=>{
                 var res = response.data;
                 if (res.state===1) {

src/scrm_pages/site/components/add-contact.vue

@@ -39,7 +39,7 @@
    <el-dialog
     title="新增轮播图"
     :visible.sync="slideshow"
-    width="40%"
+    width="35%"
      center>
     <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
@@ -49,7 +49,7 @@
         <el-input v-model="rotationform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-     <el-form-item label="添加图片:" v-model="rotationform.rotationImages">
+     <el-form-item label="添加图片:">
          <div class="flex-img">
               <div class="el-upload-list el-upload-list--picture-card" >            
                   <div class="el-upload-list__item is-success" v-for="(item,index) in this.rotationdata" :key="item.id">             
@@ -65,14 +65,14 @@
                     </span>
                    </div>         
                 </div>     
-                <div class="addrot" @click="addVisible = true">
+                <div class="addrot" @click="addVisible = true;showpic = false">
                  <div class="docone">
                   <li class="el-icon-plus"></li>  
                    <div class="doctwo">
-                    <span>新增名医</span>
-                  </div>
-                 </div>  
-              </div>
+                    <span>新增图片</span>
+                   </div>
+                  </div>  
+                </div>
              </div>
       </el-form-item>
     </el-form>
@@ -232,7 +232,7 @@
     title="新增工作时间"
     :visible.sync="time"
     width="550px"
-   >
+   center>
     <el-form ref="woketimeform" :model="woketimeform" label-width="90px" :rules="rules">
       <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="woketimeform.title"></el-input>
@@ -260,7 +260,8 @@
  <el-dialog
     title="新增乘车方式"
     :visible.sync="type"
-    width="550px">
+    width="550px"
+    center>
     <el-form ref="rideform" :model="rideform" label-width="90px" :rules="rules" :label-position="labelPosition">
       <template>
       <el-form-item label="模块标题:" required prop="title">
@@ -286,29 +287,26 @@
     </span>
    </el-dialog>
 
+  
+
  <!-- 编辑图片 -->
  <el-dialog
      class="avatar-uploader"
      title="编辑图片"
      :visible.sync="addVisible"
-     width="35%"
+     width="32%"
      center>
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
     <el-form-item label="图片编辑:" required prop="Images">
-      <el-col :span="5">       
-       <el-upload
-          :data="Data"        
-          action="https://upload.qiniup.com"
-          :show-file-list="false"
-          :on-success="RotationSuccess"
-          :before-upload="RotationUpload">
-          <div class="pic">
-            <div class="picspan">  
-              <img v-if="picform.Images" :src="picform.Images">
-               <i v-else class="el-icon-plus"></i>
-           </div>
-          </div>
-      </el-upload>
+      <el-col :span="5">    
+          <div class="addrot" @click="addVisibletwo = true">
+             <div class="docone">
+                <li class="el-icon-plus"></li>  
+                <div class="doctwo">
+                 <span>新增图片</span>
+               </div>
+            </div>  
+         </div>  
       </el-col>
       <el-col :span="19">
           <div class="tpic" v-show="showpic"> 
@@ -321,20 +319,19 @@
          <el-input v-model="picform.sort"></el-input>
        </el-col>   
     </el-form-item>
-    <el-form-item label="图片链接:" required prop="piclink">
+    <el-form-item label="图片链接:">
         <el-radio-group v-model="picform.piclink">
            <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="selectGender(gender.id)">{{gender.name}}</el-radio>
         </el-radio-group>
     </el-form-item>
-    <el-form-item label="链接地址:" required prop="linkaddress">
+    <el-form-item label="链接地址:" v-show="define">
       <el-col :span="20">
-      <el-input v-model="picform.linkaddress"></el-input>
+      <el-input v-model="picform.linkaddress"  :disabled="true"></el-input>
       </el-col>
       <el-col :span="4">
-       <el-button size="medium" @click="addlink()">设置链接</el-button>
+       <el-button size="medium"  v-show="define" @click="addVisibleThree = true">设置链接</el-button>
       </el-col>
     </el-form-item>
-    
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="addVisible = false">取 消</el-button>
@@ -342,6 +339,88 @@
   </span>
 </el-dialog>
 
+   <el-dialog
+    title="添加图片"
+    :visible.sync="addVisibletwo"
+    width="30%"
+    center>
+    <el-form>
+      <el-form-item label="添加图片:">
+        <el-upload
+         :data="Data"   
+          class="avatar-uploader"
+          action="https://upload.qiniup.com/"
+          :show-file-list="false"
+          :on-success="RotationSuccess"
+          :before-upload="RotationUpload">
+          <div class="addimage">
+            <img v-if="picform.Images" :src="picform.Images" class="avatar" style="width:100px;height:98px">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </div>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+     <span slot="footer" class="dialog-footer">
+       <el-button @click="addVisibletwo = false">取 消</el-button>
+       <el-button type="primary" @click="addVisibletwo = false">确 定</el-button>
+   </span>
+  </el-dialog>
+
+  <el-dialog
+    title="设置图片链接地址:"
+    :visible.sync="addVisibleThree"
+    width="30%"
+    center>
+    <el-form label-width="120px" :model="linkform" ref="linkform">
+      <el-form-item label="链接类型:">
+         <el-radio-group v-model="linkform.linkType">
+            <el-radio :label="item.id" :value="item.id" v-for="(item,index) in linkType" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
+         </el-radio-group>
+      </el-form-item>
+        <el-form-item label="链接类型:" v-show="showone">
+      <el-col :span="8">
+          <el-select  placeholder="请选择"  v-model="linkform.linkTypeTwo"
+              @change="changeType">
+              <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+             :value="item.id" >
+            </el-option>
+          </el-select>
+      </el-col>
+      <el-col :span="8" v-show="showFour">
+         <el-select  placeholder="请选择" v-model="linkform.linkTypeThree"
+              @change="GetArticleById">
+              <el-option
+              v-for="item in articeTypelist"
+              :key="item.id"
+              :label="item.name"
+             :value="item.id" >
+            </el-option>
+          </el-select>
+      </el-col>
+    </el-form-item>
+    <el-form-item label="站内链接:" v-show="showFive">
+          <el-select  placeholder="请选择" v-model="linkform.linkTypeFour">
+              <el-option
+              v-for="item in articeNamelist"
+              :key="item.id"
+              :label="item.title"
+             :value="item.id" >
+            </el-option>
+          </el-select>
+    </el-form-item>
+    <el-form-item label="自定义链接地址:" v-show="showthree">
+       <el-input style="width:300px" v-model="linkform.defineAddress" @input="changeInput($event)"></el-input>
+    </el-form-item>
+    </el-form>
+   <span slot="footer" class="dialog-footer">
+     <el-button @click="addVisibleThree = false">取 消</el-button>
+     <el-button type="primary" @click="AddPiCLink('linkform');addVisibleThree = false">确 定</el-button>
+   </span>
+ </el-dialog>
+
   </div>
 </template>
 
@@ -350,11 +429,21 @@
  import { getToken } from '@/api/qiniu'
  import { getFileExtension} from '@/utils/tools'
  import { addRotationUpload,addHospital,addRideWay,addWorkTime,addconnection,queryConnetion,deleteConnecWay,editConnecWay,
- saveConnecform,addContract,addrotationpic,GetRotationImages,addrotationImage,deleteImages} from '@/api/site/site'  
+ saveConnecform,addContract,addrotationpic,GetRotationImages,addrotationImage,deleteImages,getArticleType,GetArticleById,GetAllActivity,
+ AddPiCLink} from '@/api/site/site'  
 import { truncateSync } from 'fs';
+import {checkNumber} from "@/utils/tools";
 export default {
   name: "addcontact",
   data() {
+        var checkNumberRule = (rule, value, callback) => {
+            if (!checkNumber(value)) {
+                 callback(new Error('请输入1-99的整数'));
+              }else {
+               callback(); 
+             }
+          };
+
     return {
        location: {
         lng: 116.404,
@@ -375,6 +464,11 @@ export default {
       type:false,
       disabled: false,
       dialogFormVisibleAdd:true,
+      showone:false,
+      showtwo:false,
+      showthree:false,
+      showFour:false,
+      showFive:false,
       labelPosition: 'left',
       qiniuDomain: 'https://images.shengws.com/',
       Data: { token:'',key: '' },
@@ -394,6 +488,7 @@ export default {
         title:"",
         sort:"",
         rotationImages:[],
+        ids:[],
       },
       rotationdata:[],
       rideform:{
@@ -429,19 +524,38 @@ export default {
       contractform:{
         title:"",
         sort:"",
-        connecWayId:[],
       },
+      linkform:{
+        linkType:"",
+        linkTypeTwo:"",
+        linkTypeThree:"",
+        linkTypeFour:"",
+        defineAddress:"",
+        linkAddress:"",
+      },
+      linkType:[
+        {id:1,name:'无'},
+        {id:2,name:'站内链接:'},
+        {id:3,name:'站外链接:'},
+      ],
+       options:[
+         {id:1,name:'文章'},
+         {id:2,name:'活动'},
+       ],
       rules: {
         title: [{required: true, message: "请填写模块标题",},],
-        sort: [{required: true,message:"请填写排序值"}],       
+        sort: [{required: true,message:"请填写排序值"},{validator:checkNumberRule}],
         rotationImages:[{required:true,message:"请填写添加图片"}],
         content:[{required:true,message:"请填写乘车方式"}],
         worktime:[{required:true,message:"请填写工作时间"}],
         connecway:[{required:true,message:"请选择联系方式"}],
         linkaddress:[{required:true,message:"请填写链接地址"}],
-        address:[{required:true,message:"请填写医院地址"}]
+        address:[{required:true,message:"请填写医院地址"}],
+        Images:[{required:true,message:"请上传图片"}]
       },
      addVisible:false,  
+     addVisibletwo:false,
+     addVisibleThree:false,
        picform:{
          sort:"",
          Images:"",
@@ -453,46 +567,121 @@ export default {
         {id:1, name:'无'},
         {id:2, name:'自定义'},
        ],
+       define:false,
+       articeTypelist:[],
+       articeNamelist:[],
     };
   },
   methods:{
-    
-       //轮播图
-      RotationchartSuccess(res,file,filelist){         
-         this.rotationform.rotationImages.push(this.qiniuDomain + res.url);  
-         console.log("双层地址",file.url)       
-         console.log("联系我们轮播图地址",this.rotationform.rotationImages); 
-      },
-         beforeRotationUpload(file){
-         console.log("尺寸",file.size)
-         const isJPG = file.type === 'image/jpeg';
-         const isLt2M = file.size / 1024 / 1024 < 2;
-       
-        if (!isJPG) {
-          this.$message.error('上传头像图片只能是 JPG 格式!');
+        changeInput(e){
+            this.$forceUpdate();
+          },
+        selectGender(id){
+        if(id == 1){
+          this.define = false;
         }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!');
+        if(id == 2){
+           this.define = true;
         }
-      
-         var date = new Date()
-            var ext = getFileExtension(file.name)
-            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
-            const _self = this
-            return new Promise((resolve, reject) => {
-                getToken().then(response => {
-                    const token= response.data.data.uptoken
-                    console.log("联系我们轮播图token是什么?",token)
-                    _self._data.rotationData.token = token;
-                    _self._data.rotationData.key = key;
-                    resolve(true)
-                }).catch(err => {
-                    reject(false)
-                })
+     },
+       selectItem(id){
+         if(id == 1){
+            this.showone = false;
+            this.showtwo = false;
+            this.showthree = false;
+            this.showFour = false;
+            this.showFive = false;
+         }
+         if(id == 2){
+           this.showone = true;
+           this.showtwo = false;
+           this.showthree = false;
+           this.showFive = true;
+         }
+         if(id == 3){
+           this.showone = false;
+           this.showtwo = false;
+           this.showthree = true;
+           this.showFive = false;
+         }
+       },
+       changeType(id){
+          if(id == 1){
+             this.showFour = true;
+
+          }
+          if(id == 2){
+            this.showFour = false;
+              GetAllActivity(this.articeNamelist).then(response=>{
+               if(response.data.state == 1){
+               var activtity = response.data.data.activtity;
+              this.articeNamelist = response.data.data.activtity;
+             }
             })
-          return isJPG && isLt2M;
-      },
+          }
+       },
+       GetArticleById(id){
+         GetArticleById(id,this.linkform).then(response=>{
+         if(response.data.state == 1){
+          var articlelist = response.data.data.articlelist;
+          this.articeNamelist = response.data.data.articlelist;        
+        }
+      })
+    },
+    AddPiCLink(formName){
+        var linkType = this.linkform.linkType;
+        console.log("数据1",linkType)
+         var linkTypes =   parseInt(linkType);
+        this.linkform.linkType = linkTypes;
+               
+       var linkTypeTwo = this.linkform.linkTypeTwo;
+       console.log("数据2",linkTypeTwo)
+       if(linkTypeTwo == ""){
+         this.linkform.linkTypeTwo = 1;
+       }else{
+          var linkTypeTwos =  parseInt(linkTypeTwo);
+          this.linkform.linkTypeTwo =  linkTypeTwos;
+       }
+      
+
+       var linkTypeThree =  this.linkform.linkTypeThree;
+       console.log("数据3",linkTypeThree)
+       if(linkTypeThree == ""){
+        this.linkform.linkTypeThree = 1;
+       }else{
+         var linkTypeThrees = parseInt(linkTypeThree);
+         this.linkform.linkTypeThree = linkTypeThrees;
+       }
+       
 
+        var linkTypeFour = this.linkform.linkTypeFour;
+        console.log("数据4",linkTypeFour)
+        if(linkTypeFour == ""){
+          this.linkform.linkTypeFour = 1;
+        }else{
+           var linkTypeFours =  parseInt(linkTypeFour);
+           this.linkform.linkTypeFour = linkTypeFours;
+        }
+        
+       if(this.linkform.linkTypeTwo == 1){
+        
+         this.linkform.linkAddress = "/articles/createArticle/?id="+this.linkform.linkTypeFour; 
+       } 
+       if(this.linkform.linkTypeTwo == 2){
+         this.linkform.linkAddress = "/activity/?id="+this.linkform.linkTypeFour;       
+       }
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+           AddPiCLink(this.linkform).then(response=>{
+             if(response.data.state == 1){
+               var patientConlinkaddress =   response.data.data.patientConlinkaddress;
+               console.log("这个数据是",patientConlinkaddress)
+               this.picform.linkaddress =  patientConlinkaddress.linkaddress;
+             }
+           })
+         }
+       })
+    },
        RotationSuccess(res,file,filelist){         
          this.picform.Images =this.qiniuDomain + res.url;
          this.showpic = true;
@@ -527,25 +716,7 @@ export default {
             })
           return isJPG && isLt2M;
       },
-      //添加轮播图
-      addRotationUpload(formName){
-        this.$refs[formName].validate((valid)=>{
-          if(valid){
-            addRotationUpload(this.rotationform).then(response=>{
-               if(response.data.state==1){
-                 var connecmodel = response.data.data.connecmodel;
-                 this.slideshow = false;
-                 console.log("返回值",connecmodel);
-               }
-            });   
-          }
-        })
-        
-      },
-      rotationEditImages(){
-        
-      },
-
+    
       //新增医院地址
       addHospital(formName){
             var sorts = this.hospitalform.sort
@@ -557,6 +728,7 @@ export default {
                 if(response.data.state ==1){
                   var hosaddress =  response.data.data.hosaddress;
                   console.log('新增医院地址数据',hosaddress);
+                  this.$emit('getOrderModel');
                 }
              })
             }
@@ -635,21 +807,16 @@ export default {
 
       //添加联系方式
       addContract(formName){
-          var connecWayId=[];
-          for (let index = 0; index < this.connectionway.length; index++) {
-            connecWayId.push(this.connectionway[index].id)         
-          }
-          this.contractform.connecWayId = connecWayId;
             var sorts = this.contractform.sort
              var sort = parseInt(sorts)
              this.contractform.sort = sort
-          console.log("联系方式id",this.contractform.connecWayId)
          this.$refs[formName].validate((valid)=>{
             if(valid){
               addContract(this.contractform).then(response=>{
                   if(response.data.state == 1){
                    var connectway = response.data.data.connectway;
                    var ordmodel = response.data.data.ordmodel;
+                    this.$emit('getOrderModel');
                   //  console.log("返回数据",connectway);
                   //  console.log("返回数据",ordmodel)    
                   }
@@ -672,6 +839,7 @@ export default {
                     // console.log("返回数据",ordmodel);
                     // console.log("返回数据",patientWorktime)
                     this.time = false;
+                     this.$emit('getOrderModel');
                 }
             })
           }
@@ -692,6 +860,7 @@ export default {
                  var ordemodel = response.data.data.ordemodel;
                 //  console.log("返回数据",ordemodel)
                  this.type = false;
+                     this.$emit('getOrderModel');
               }
             })
           }
@@ -709,7 +878,7 @@ export default {
             addrotationpic(this.picform).then(response=>{
                if(response.data.state ==1){
                  var conrotation  = response.data.data.conrotation;
-                //  console.log("返回数据",conrotation)
+                 this.GetRotationImages();
                }
             })
          }
@@ -718,8 +887,9 @@ export default {
       GetRotationImages(){
         GetRotationImages(this.picform.id).then(response=>{
            if(response.data.state == 1){
-             var conrotations =   response.data.data.conrotations
-             this.rotationdata =   response.data.data.conrotations
+             var conrotations =   response.data.data.conrotations;
+             console.log("获取轮播图片",conrotations)
+             this.rotationdata =   response.data.data.conrotations;
             
            }
         })
@@ -728,16 +898,19 @@ export default {
         var sorts =  this.rotationform.sort;
         var sort = parseInt(sorts);
         this.rotationform.sort = sort;
+        console.log("长度",this.rotationdata.length)
         for (let index = 0; index < this.rotationdata.length; index++) {
-          this.rotationform.rotationImages.push(this.rotationdata[index].images);       
+          this.rotationform.rotationImages.push(this.rotationdata[index].images);  
+          this.rotationform.ids.push(this.rotationdata[index].id);     
         }
+        console.log("this.rotationform.raotationimages",this.rotationform.rotationImages)
         this.$refs[formName].validate((valid)=>{
           if(valid){
             addrotationImage(this.rotationform).then(response=>{
                  if(response.data.state == 1){
                    var oldrotation  = response.data.data.oldrotation;
                    this.slideshow = false;
-                 
+                    this.$emit('getOrderModel');
                  } 
             })
           }
@@ -749,11 +922,22 @@ export default {
                this.rotationdata.splice(index,1)
            }
         })
-      }
+      },
+
+       getArticleType(){
+          getArticleType(this.articeTypelist).then(response=>{
+           if(response.data.state == 1){
+             var  category = response.data.data.category;
+             this.articeTypelist = response.data.data.category;
+            console.log("文章分类是什么",this.articeTypelist)
+          }
+      })
+    },
   },   
         created(){
           this.queryConnetion();
           this.GetRotationImages();
+          this.getArticleType();
         },
 };
 </script>
@@ -770,34 +954,58 @@ export default {
    }
 
    .addrot{
-     width: 146px;
-     height: 146px;
+     width: 100px;
+     height: 100px;
      border: dashed 1px #409EFF;
    }
 
   .docone{
-    width: 50px;
-    height: 50px;
+    width: 30px;
+    height: 30px;
     // border: solid 1px red;
-    margin-top: 50px;
-    margin-left: 50px;
-    font-size: 50px;
+    margin-top: 30px;
+    margin-left: 30px;
+    font-size: 30px;
   }
    .doctwo{
-    width: 60px;
+    width: 70px;
     height: 30px;
     font-size: 14px;
+    // border: solid 1px red;
+    margin-left: -8px;
+    margin-top: -10px;
   }
 
-  .pic{
-    width: 60px;
-    height: 60px;
-    border: dashed 1px #409EFF;
-  }
-  .picspan{
-     font-size: 20px;
-     padding-top: 10px;
-  }
+
+  .el-upload-list--picture-card .el-upload-list__item {
+    overflow: hidden; 
+    background-color: #fff; 
+    border: 1px solid #c0ccda;
+    border-radius: 6px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 100px;
+    height: 100px;
+    margin: 0 8px 8px 0;
+    display: inline-block;
+   }
+
+   .flex-img__image{
+     width: 100%;
+     height: 100%;
+   }
+
+   .addimage{
+     width: 100px;
+     height: 100px;
+     border: dashed 1px #409EFF;
+     font-size: 30px;
+   }
+
+   .avatar-uploader-icon{
+     margin-top: 30px;
+   }
+   
 .used {
   ul {
     li {

src/scrm_pages/sms/sms_send.vue

@@ -40,7 +40,7 @@
                                     <p class="desc">将该短信推送给系统里的所有客户</p>
                                 </div>
                                 <div class="btn">
-                                    <el-button type="primary" @click="sendToAllCustomersAction">发送</el-button>
+                                    <el-button type="primary" @click="sendToAllCustomersAction()">发送</el-button>
                                 </div>
                             </div>
                             <div class="tag-filter-panel">
@@ -139,7 +139,8 @@ export default {
             sendsInitData(this.action, this.id).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
-                    this.tags = resp.data.tags
+                    this.tags = resp.data.tags;
+                    // console.log("this.tags是什么",this.tags)
                     this.sms_content = resp.data.default_content
 
                 } else {
@@ -151,6 +152,7 @@ export default {
             })
         },
         getTagCustomerCount: function() {
+
             var tag_ids = []
             for (let index = 0; index < this.selecting_tags.length; index++) {
                 tag_ids.push(this.selecting_tags[index].id)
@@ -159,10 +161,15 @@ export default {
                 this.tag_filtered_count = 0
                 return
             }
+                
+            
             tagFilterCustomerCount(tag_ids.join(",")).then(rs => {
                 var resp = rs.data
+                
                 if (resp.state == 1) {
+                    console.log("这个数据是什么呢?",resp.data.count)
                     this.tag_filtered_count = resp.data.count
+                    
                 } else {
                     console.log(resp.msg)
                 }
@@ -187,6 +194,7 @@ export default {
             return false
         },
         selectTagAction: function(tag) {
+              console.log("tag是什么",tag)
             if (!this.isTagSelected(tag)) {
                 this.selecting_tags.push(tag)
                 this.getTagCustomerCount()
@@ -224,14 +232,17 @@ export default {
                 if (resp.state == 1) {
                     this.$message.success("发送成功")
                 } else {
-                    this.$message.error(resp.msg)
+                    // this.$message.error(resp.msg)
+                     this.$message.success("短信发送过于频繁，请稍后发送")
                 }
 
             }).catch(err => {
                 this.sending = false
-                this.$message.error(err)
+                // this.$message.error(err)
+                 this.$message.success("短信发送过于频繁，请稍后发送")
             })
         },
+
         sendToTagCustomersAction: function() {
             if (!this.isSMSContentValid()) {
                 return
@@ -245,6 +256,7 @@ export default {
             for (let index = 0; index < this.selecting_tags.length; index++) {
                 tag_ids.push(this.selecting_tags[index].id)
             }
+            console.log("数据",tag_ids)
 
             this.sending = true
             send2TagCustomers(this.sms_content, tag_ids.join(",")).then(rs => {
@@ -253,14 +265,17 @@ export default {
                 if (resp.state == 1) {
                     this.$message.success("发送成功")
                 } else {
-                    this.$message.error(resp.msg)
+                    // this.$message.error(resp.msg)
+                    this.$message.success("短信发送过于频繁，请稍后发送")
                 }
 
             }).catch(err => {
                 this.sending = false
-                this.$message.error(err)
+                // this.$message.error(err)
+                this.$message.success("短信发送过于频繁，请稍后发送")
             })
         },
+
         sendToDesignatedCustomersAction: function() {
             if (!this.isSMSContentValid()) {
                 return
@@ -277,12 +292,14 @@ export default {
                 if (resp.state == 1) {
                     this.$message.success("发送成功")
                 } else {
-                    this.$message.error(resp.msg)
+                    // this.$message.error(resp.msg)
+                    this.$message.success("短信发送过于频繁，请稍后发送")
                 }
 
             }).catch(err => {
                 this.sending = false
-                this.$message.error(err)
+                // this.$message.error(err)
+                this.$message.success("短信发送过于频繁，请稍后发送")
             })
         },
     },

src/utils/tools.js

@@ -187,4 +187,19 @@ export function uParseTime(time, cFormat) {
         return false; 
     } 
     return true;
-  } 
+  } 
+
+
+  export function checkNumber(number){
+    if(!(/^([1-9][0-9]{0,1}|99)$/.test(number))){
+        return false;
+    }
+    return true;
+  }
+
+  export function checkSort(sort){
+    if(!(/^(?:1|[1-9]?|9)$/.test(sort))){
+      return false;
+    }
+    return true; 
+  }

static/neditor/neditor.all.js

@@ -32970,6 +32970,8 @@ UE.ui = baidu.editor.ui = {};
     }
   };
 
+
+
   UE.registerUI = function(uiName, fn, index, editorId) {
     utils.each(uiName.split(/\s+/), function(name) {
       baidu.editor.ui[name] = {
@@ -32982,6 +32984,7 @@ UE.ui = baidu.editor.ui = {};
 })();
 
 
+
 // adapter/message.js
 UE.registerUI("message", function(editor) {
   var editorui = baidu.editor.ui;