更新

config/dev.env.js

@@ -1,13 +1,12 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
-  BASE_API:'"http://localhost:9534"',
-
-  // SSO_HOST: '"http://testsso.sgjyun.com"',
-  // SRCM_HOST: '"http://test1.sgjyun.com"',
-  // XT_HOST: '"http://xt.test.sgjyun.com"',
-  // MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
-  // CDM_HOST: '"http://cdm.test.sgjyun.com"',
+  BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
+  
+   SSO_HOST: '"https://testsso.sgjyun.com"',
+   SRCM_HOST: '"http://test1.sgjyun.com"',
+   XT_HOST: '"http://xt.test.sgjyun.com"',
+   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+   CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }
 

config/index.js

@@ -17,8 +17,7 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-   // host: 'test1.sgjyun.com',
-    host:'localhost',
+    host: 'test1.sgjyun.com',
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // host: 'test1.sgjyun.com',
     autoOpenBrowser: true,

config/prod.env.js

@@ -4,7 +4,7 @@ module.exports = {
   // BASE_API: '"http://api.scrm.kuyicloud.com"',
   BASE_API: '"http://api.test1.sgjyun.com"',
 
-  SSO_HOST: '"http://sso.kuyicloud.com"',
+  SSO_HOST: '"https://sso.kuyicloud.com"',
   SRCM_HOST: '"http://jk.kuyicloud.com"',
   XT_HOST: '"http://xt.kuyicloud.com"',
   MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',

config/sit.env.js

@@ -3,9 +3,9 @@ module.exports = {
   ENV_CONFIG: '"sit"',
   BASE_API: '"http://api.test1.sgjyun.com"',
 
-  SSO_HOST: '"http://testsso.sgjyun.com"',
+  SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
-  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"htts://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }

src/api/act/submitinfo.js

@@ -140,21 +140,20 @@ export function deleteArticle (id,data){
     })
 }
 
-export function getEditArticle(id,param){
-    console.log("params是啥?",param)
+export function getEditArticle(id,params){
+    console.log("id是什么",id)
     return request({
         url:"/api/acticle/getEditArticle?id="+id,
-        method:"Get",
-        param:param,
+        method:"Post",
+        params:params,
     })
 }
 
-export function getEditVidoInfo(id,param){
-    console.log("params是啥?",param)
+export function getEditVidoInfo(id,params){
     return request({
         url:"/api/acticle/getEditVidoInfo?id="+id,
         method:"Get",
-        param:param,
+        params:params,
     })
 }
 
@@ -354,3 +353,12 @@ export function deleteAllArticles(data){
     })
 }
 
+export function GetAllCategory(params){
+    return request({
+        url:"/api/aritcle/getallcategory",
+        method:"Get",
+        params:params,
+    })
+}
+
+

src/api/site/site.js

@@ -362,7 +362,6 @@ export function editOfficeEnviroment(id,data){
 }
 
 export function  SaveOfficeEnvironment(id,data){
-    console.log("科室环境我爱你中",id)
      return request({
          url:"/api/site/saveofficeenvironment?id="+id,
          method:"Post",
@@ -516,3 +515,60 @@ export function AddMarginChart(data){
    })
 }
 
+export function deleteRotations(id,data){
+    console.log("id",id)
+   return request({
+       url:"/api/site/deleteRotations?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function editRotationImages (id,data){
+    return request({
+        url:"/api/site/editRotationImages?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function updateRotionImages (id,data){
+   return request({
+       url:"/api/site/updaterotaionimages?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function editNavigation (id,data){
+   return request({
+       url:"/api/site/editnavigation?id="+id,
+       method:"Post",
+       data: data,
+   })
+}
+
+export function SaveNavigation (id,data) {
+    console.log("id是什么呢",id)
+    return request({
+        url:"/api/site/savenavigation?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function deleteImages(id,data){
+    return request({
+        url:"/api/site/deletimages?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function addHospital(data){
+    return request({
+        url:"/api/site/addhospital",
+        method:"Post",
+        data:data,
+    })
+}

src/main.js

@@ -28,12 +28,10 @@ import Mint from 'mint-ui';
 Vue.use(Mint);
 
 //引入无线滚条
-import vuescroll from 'vuescroll'
+
 import { read } from 'fs';
-import 'vuescroll/dist/vuescroll.css';
 import 'swiper/dist/css/swiper.min.css'
 import BaiduMap from 'vue-baidu-map'
-Vue.use(vuescroll)
 Vue.use(Element, {
   size: 'medium', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)
@@ -56,6 +54,6 @@ new Vue({
 
 Vue.prototype.Base64 = require('js-base64').Base64
 Vue.use(BaiduMap, {
-  // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */
   ak: 'YOUR_APP_KEY'
 })
+

src/router/modules/article.js

@@ -49,14 +49,14 @@ export default {
       meta: { title: 'articlePreview', noCache: true }
     },
     {
-      path: '/articles/editArticle/:id',
+      path: '/articles/editArticle',
       component: () => import('@/scrm_pages/article/editArticle'),
       name: 'editArticle',
       hidden:true,
       meta: { title: 'editArticle', noCache: true }
     },
     {
-      path: '/articles/editVido/:id',
+      path: '/articles/editVido',
       component:() => import('@/scrm_pages/article/editVido'),
       name:'editVido',
       hidden:true,

src/scrm_pages/article/articleList.vue

@@ -62,7 +62,7 @@
                   size="mini"
                   type="primary"
                   icon="el-icon-edit-outline"
-                  @click="editArticles(article.id,article.type)">
+                 @click="editArticles(article.id,article.type)">
                 </el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
@@ -99,7 +99,7 @@
 
 <script>
   import BreadCrumb from '../components/bread-crumb'
-  import { GetAllArticles,deleteArticle,deleteAllArticles} from '@/api/act/submitinfo'
+  import { GetAllArticles,deleteArticle,deleteAllArticles,GetAllCategory} from '@/api/act/submitinfo'
   import PublishedCell from "@/scrm_pages/article/components/published_cell"
   export default {
     name: 'commentList',
@@ -148,13 +148,13 @@
                         this.total = response.data.data.total;
                         console.log("文章列表",this.articsData)
                         console.log("total",this.total)
-                        this.orgName =  response.data.data.OrgName;
-                        console.log("机构姓名",this.orgName)
-                     }
-                     if(typeof(response.data.data.category != 'undefined')){
-                       this.tagOptions = response.data.data.category
-                        console.log("分类列表",this.tagOptions)
+                        // this.orgName =  response.data.data.OrgName;
+                        // console.log("机构姓名",this.orgName)
                      }
+                    //  if(typeof(response.data.data.category != 'undefined')){
+                    //    this.tagOptions = response.data.data.category
+                    //     console.log("分类列表",this.tagOptions)
+                    //  }
               })
          },
          selectsign(id){
@@ -226,18 +226,18 @@
                return false
             });
            },
-           editArticles(articleid,articletype){
-               console.log("文章id",articleid);
+           editArticles(id,articletype){
+               console.log("文章id",id);
                console.log("文章内型",articletype)
                if(articletype == 1){
-                  this.$router.push({path:'/articles/editArticle/'+articleid});
+                  this.$router.push({path:"/articles/editArticle/"+id});                                  
                }
-
-               if(articletype ==2){
-                   this.$router.push({path:'/articles/editVido/'+articleid});
+               if(articletype == 2){
+                  //  this.$router.push({path:"/articles/editVido/"+id});   
+                   this.$router.push({name:'editVido',params: {id:id}})             
                }
            },
-
+          
           selectProduct(val){
             var ids =[];
             for(let i=0,len=this.articsData.length;i<len;i++){
@@ -304,9 +304,19 @@
                });
           })
         },
+        GetAllCategory(){
+          GetAllCategory().then(response=>{
+            if(response.data.state == 1){
+             var categorys = response.data.data.categorys;
+             this.tagOptions = response.data.data.categorys;
+             console.log("标签是什么",categorys)
+            }
+          })
+        },
     },
     created(){
       this.GetAllArticles();
+      this.GetAllCategory();
     },
 
      

src/scrm_pages/article/components/CreateArticleForm.vue

@@ -49,8 +49,8 @@
              type: Array,
              default: function () {
              return [];
-        }
-      }
+                 }
+              }
            },
             data(){
                 return {

src/scrm_pages/article/createArticle.vue

@@ -7,7 +7,7 @@
     <div class="app-container">
     <el-tabs type="border-card">
       <el-tab-pane label="文章">
-        <el-form label-width="100px" class="clearfix" :model="form" ref="arctileform"  :element-loading-text="loadingText" :rules="artilcrules">
+        <el-form label-width="100px" class="clearfix" :model="form" ref="form"  :element-loading-text="loadingText" :rules="artilcrules">
           <el-row>
             <el-col :span="23">
                 <el-form-item label="文章标题:" required prop="act_name">
@@ -94,9 +94,9 @@
           <el-row :span="24">
             <el-col :span="24">
                 <el-form-item>
-                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm('arctileform');centerDialogVisible=false">发布</el-button>
-                      <el-button size="small" style="width: 100px" @click="preview('arctileform')">预览</el-button>
-                      <el-button size="small" style="width: 100px" @click="save('arctileform');centerdraftVisible = false">保存草稿</el-button>
+                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm('form');centerDialogVisible=false">发布</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>
                 </el-form-item>
             </el-col>
@@ -268,9 +268,7 @@
          centerDialogVisible: false,
          centerdraftVisible:false,
          centercancelVisible:false,
-         formLabelAlign:true,
          modlevidel:'',
-         filsListArray:[],
          show:true,
          shows:false,
          rules: {

src/scrm_pages/article/editArticle.vue

@@ -1,22 +1,21 @@
 
-
 <template>
     <div class="main-contain">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
         <div class="app-container">
-             <el-form label-width="100px" class="clearfix" :model="form" ref="arctileform"  :element-loading-text="loadingText" :rules="artilcrules">
+             <el-form label-width="100px" class="clearfix" :model="arctileform" ref="arctileform"  :rules="rules">
           <el-row>
             <el-col :span="23">
                 <el-form-item label="文章标题:" required prop="title">
-                    <el-input v-model="form.title"></el-input>
+                    <el-input v-model="arctileform.title"></el-input>
                 </el-form-item>
               <el-form-item label="文章内容:" required prop="content">
                 <keep-alive>
                   <neditor ref="neditor"
                            id="editor"
-                           v-bind:r_content="form.content"  @content_changed="paragraphContentChanged">
+                           v-bind:r_content="arctileform.content"  @content_changed="paragraphContentChanged">
                   </neditor>
                 </keep-alive>
               </el-form-item>
@@ -28,16 +27,14 @@
                 <el-col :span="3">
                   <div>
                     <el-upload
-                      v-loading="uploading"
-                      :element-loading-text="loadingText"
                       class="avatar-uploader"
-                      :data="uploadData"
+                      :data="imageData"
                       action="https://upload.qiniup.com"
                       :show-file-list="false"
                       :on-error="handleAvatarError"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">
-                      <img v-if="form.imgs" :src="form.imgs" class="avatar">
+                      <img v-if="arctileform.imgs" :src="arctileform.imgs" class="avatar">
                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
                   </div>
@@ -47,8 +44,6 @@
                 <el-col :span="3">
                   <div v-if="picshow">
                     <el-upload
-                      v-loading="uploading"
-                      :element-loading-text="loadingText"
                       class="avatar-uploader"
                       :data="uploadData"
                       action="https://upload.qiniup.com"
@@ -66,8 +61,6 @@
                 <el-col :span="3">
                   <div v-if="picshow">
                     <el-upload
-                      v-loading="uploading"
-                      :element-loading-text="loadingText"
                       class="avatar-uploader"
                       :data="uploadData"
                       action="https://upload.qiniup.com"
@@ -82,7 +75,7 @@
                 </el-col>
               </el-form-item>
                <el-form-item label="所属分类:" prop="class_id">
-                 <el-select v-model="form.class_id" placeholder="请先选择文章所属分类"  @change="changeActtype()">
+                 <el-select v-model="arctileform.class_id" placeholder="请先选择文章所属分类"  @change="changeActtype()">
                    <el-option
                      v-for="item in options"
                      :key="item.id"
@@ -111,7 +104,6 @@
            :visible.sync="dialogVisible"
             width="30%"
             center>
-           <span>这是一段信息</span>
            <span slot="footer" class="dialog-footer">
            <el-button @click="gobackList()">返回文章列表</el-button>
            </span>
@@ -173,12 +165,11 @@
         editorOption: {},
         company:"",
         fileList: [],
-        form:{
-          class_id:'', 
-          content:'',                        
-          imgs:'',                
-          title:'',                 
-          file:'',
+        arctileform:{
+            title:"",
+            content:"",
+            imgs:"",
+            class_id:"",
         },
          picshow:false,
          acttypes:[],
@@ -191,34 +182,28 @@
          uploading:false,
          loadingText:'',
          uploadData: { token: '', key: '' },
+         imageData: { token:'',key:''},
          uploadFileData:{token:'',key:''},
          uploadvidoData:{token:'',key:''},
          centerDialogVisible: false,
          centerdraftVisible:false,
          centercancelVisible:false,
          formLabelAlign:true,
-         modlevidel:'',
-         filsListArray:[],
          show:true,
          shows:false,
-         rules: {
-            vid_name: [{required: true, message: "视频标题不能为空"},],
-            vio_upload: [{required: true,message:"请上传视频"}],
-            vid_type: [{required: true,message:"所属分类不能为空"}]
-          },
-        artilcrules:{
+        rules:{
             title: [{required: true, message: "文章标题不能为空"},],
             content: [{required: true,message:"文章内容不能为空"}],
             class_id: [{required: true,message:"所属分类不能为空"}]
         },
-        vidoform:[],
+        // vidoform:[],
         dialogVisible:false,
         }
     },
          methods:{
              //第一个图片
       handleAvatarSuccess(res, file) {
-       this.form.imgs = this.qiniuDomain + res.url;      
+       this.arctileform.imgs = this.qiniuDomain + res.url;      
       },
        handleAvatarError(err, file, fileList) {
             this.$message.error(err);
@@ -226,35 +211,38 @@
             return false
       },
       beforeAvatarUpload(file) {
-        const isJPG = file.type === 'image/jpeg';
-        const isLt2M = file.size / 1024 / 1024 < 2;
-
-        if (!isJPG) {
-          this.$message.error('上传头像图片只能是 JPG 格式!');
-        }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!');
-        }
+         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;
             this.uploading = true;
-            this.loadingText = '封面图片上传中'
+            // this.loadingText = '封面图片上传中'
 
             const _self = this
             return new Promise((resolve, reject) => {
                 getToken().then(response => {
                     const token = response.data.data.uptoken
-                    console.log("token是什么?",token)
-                    _self._data.uploadData.token = token
-                    _self._data.uploadData.key = key
+                    console.log("第一张图片token是什么?",token)
+                    _self._data.imageData.token = token;
+                    _self._data.imageData.key = key;
                     resolve(true)
                 }).catch(err => {
                     reject(false)
                     
                 })
             })
+          return isJPG && isLt2M;
       },
       //第二个图片
       handleAvatartwoSuccess(res, file) {
@@ -266,21 +254,22 @@
             return false
       },
       beforeAvatartwoUpload(file) {
-        const isJPG = file.type === 'image/jpeg';
-        const isLt2M = file.size / 1024 / 1024 < 2;
-
-        if (!isJPG) {
-          this.$message.error('上传头像图片只能是 JPG 格式!');
-        }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!');
-        }
-
+         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;
             this.uploading = true;
-            this.loadingText = '封面图片上传中'
+            // this.loadingText = '封面图片上传中'
 
             const _self = this
             return new Promise((resolve, reject) => {
@@ -308,15 +297,17 @@
             return false
       },
       beforeAvatarlastUpload(file) {
-        const isJPG = file.type === 'image/jpeg';
-        const isLt2M = file.size / 1024 / 1024 < 2;
-
-        if (!isJPG) {
-          this.$message.error('上传头像图片只能是 JPG 格式!');
-        }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!');
-        }
+            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)
@@ -336,16 +327,21 @@
                 })
             }) 
         },
-        getEditArticle(id){
-           getEditArticle(id,this.form).then(response=>{
+        getEditArticle(){
+            const id = this.$route.params && this.$route.params.id;
+            console.log("编辑文章id是什么?",id)
+           getEditArticle(id,this.arctileform).then(response=>{
                  if(response.data.state == 1){
-                     var articles = response.data.data.articles;
-                     this.form.title = articles.title;
-                     this.form.content = articles.content;
-                     this.form.imgs = articles.imgs;
-                     this.form.class_id = articles.class_id;
+                     var articles = response.data.data.articles;                      
+                                     
+                     console.log("articles是什么",articles)            
+                     this.arctileform.title = articles.title;
+                     this.arctileform.content = articles.content;
+                     this.arctileform.imgs = articles.imgs;
+                     console.log("ww",this.arctileform.imgs)
+                     this.arctileform.class_id = articles.class_id;
                      console.log(articles.title)
-                     console.log("文章内容",articles)
+                    
                  }
            });
         }, 
@@ -361,14 +357,16 @@
         },
         
         UpdataArticleInfo(forName){
-              this.form.content = this.$refs.neditor.content;
+              this.arctileform.content = this.$refs.neditor.content;
               const id = this.$route.params && this.$route.params.id;
-             console.log("发布文章内容",this.$refs.neditor.content);
+             console.log("发布文章内容",this.arctileform.content);
              console.log("id是多少?",id)
              this.$refs[forName].validate((valid)=>{
                  if(valid){
-                    UpdataArticleInfo(id,this.form).then(response=>{
+                    UpdataArticleInfo(id,this.arctileform).then(response=>{
                          if(response.data.state == 1){
+                          var aritcls = response.data.data.articls;
+                          console.log("更新内容是多少",aritcls)
                              this.dialogVisible = true;      
                          }
                     }); 
@@ -377,12 +375,10 @@
         },
         saveArticleDraft(forName){
           const id = this.$route.params && this.$route.params.id;
-           this.form.content = this.$refs.neditor.content;
-           console.log("id是多少?",id);
-           console.log("文章内容",this.$refs.neditor.content);
+           this.arctileform.content = this.$refs.neditor.content;
            this.$refs[forName].validate((valid)=>{
              if(valid){
-               saveArticleDraft(id,this.form).then(response=>{
+               saveArticleDraft(id,this.arctileform).then(response=>{
                   if(response.data.state ==1 ){
                       this.dialogVisible = true;
                   }
@@ -393,19 +389,19 @@
         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(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")
+        //            }
+        //          })
+        //       }
+        //     })
+        // },
         select(){
         this.picshow = false
         },
@@ -415,28 +411,26 @@
         //监听图片获取富文本前三张图片
        paragraphContentChanged: function(content) {
             var images = [],temp;
-            console.log("监听获取的文章内容是什么?",content)
+            // console.log("监听获取的文章内容是什么?",content)
             var patt = /<img[^>]+src=['"]([^'"]+)['"]+/g;
             while ((temp = patt.exec(content)) != null) {
             images.push(temp[1]);
             }                 
-             console.log("图片数组",images);
-             this.form.imgs = images[0];
+            //  console.log("图片数组",images);
+             this.arctileform.imgs = images[0];
              this.imageUrl = images[1];
              this.imageUrlLast = images [2];           
         },
       },
       created(){
-         const id = this.$route.params && this.$route.params.id;
-         console.log("id是什么?",id)
-          this.getEditArticle(id)
-          this.getMenus()
+          this.getEditArticle();
+          this.getMenus();
       },
     }
 </script>
 
 <style scoped>
-     .avatar-uploader{
+ .avatar-uploader{
     border: 1px solid #d9d9d9;
     border-radius: 6px;
     cursor: pointer;

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

@@ -39,7 +39,7 @@
    <el-dialog
     title="新增轮播图"
     :visible.sync="slideshow"
-    width="550px"
+    width="40%"
      center>
     <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
@@ -60,16 +60,20 @@
                      <span class="el-upload-list__item-actions">
                     <span class="el-upload-list__item-delete">
                     <i class="el-icon-edit-outline" @click="editImages(item.id);editcenterDialogVisible = true"></i>
-                    <i class="el-icon-delete" @click="deleteDoctor(item.id,index)"></i>
+                    <i class="el-icon-delete" @click="deleteImages(item.id,index)"></i>
                     </span>
                     </span>
                    </div>         
                 </div>     
-                <img src="static/images/u679.png" @click="addVisible = true">   
+                <div class="addrot" @click="addVisible = true">
+                 <div class="docone">
+                  <li class="el-icon-plus"></li>  
+                   <div class="doctwo">
+                    <span>新增名医</span>
+                  </div>
+                 </div>  
+              </div>
              </div>
-              <!-- <div class="addrot">
-
-              </div> -->
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -83,30 +87,31 @@
   <el-dialog
     title="新增医院地址"
     :visible.sync="hostaddress"
-    width="550px"
-   >
-    <el-form ref="hospitalform" :model="hospitalform" label-width="80px">
-      <el-form-item label="模块标题: ">
+    width="35%"
+    center>
+    <el-form ref="hospitalform" :model="hospitalform" label-width="90px" :rules="rules">
+      <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="hospitalform.title" ></el-input>
       </el-form-item>
-      <el-form-item label="排序值: ">
+      <el-form-item label="排序值:" required prop="sort">
         <el-input v-model="hospitalform.sort"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
+        <!-- <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p> -->
       </el-form-item>
-      
-       <el-form-item label="医院地址:">
-         <div id="all">
-          <el-input  v-model="hospitalform.address" id="suggestId"></el-input>
-        </div>
+       <el-form-item label="医院地址:" required prop="address">
+         <el-input v-model="hospitalform.address"></el-input>
        </el-form-item>
        <el-form-item label="医院地图:">  
-        <div id="allmap"></div>
+           <baidu-map>
+              <bm-overview-map anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :isOpen="true"></bm-overview-map>
+              <bm-local-search :keyword="hospitalform.address" :auto-viewport="true" style="display:none" :center="location"  :zoom="zoom"></bm-local-search>
+              <bm-view class="map"></bm-view>
+         </baidu-map>
        </el-form-item>
     
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="address = false">取 消</el-button>
-      <el-button type="primary" @click="address = false">确 定</el-button>
+      <el-button @click="hostaddress=false">取 消</el-button>
+      <el-button type="primary" @click="addHospital('hospitalform');hostaddress = false">确 定</el-button>
     </span>
   </el-dialog>
 
@@ -116,7 +121,7 @@
     title="新增联系方式"
     :visible.sync="contact"
     width="550px"
-    >
+    center>
     <el-form ref="contractform" :model="contractform" label-width="90px" :rules="rules">
       <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="contractform.title"></el-input>
@@ -297,8 +302,12 @@
           :show-file-list="false"
           :on-success="RotationSuccess"
           :before-upload="RotationUpload">
-          <img v-if="picform.Images" :src="picform.Images" class="avatar">
-          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          <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>
       <el-col :span="19">
@@ -325,6 +334,7 @@
        <el-button size="medium" @click="addlink()">设置链接</el-button>
       </el-col>
     </el-form-item>
+    
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="addVisible = false">取 消</el-button>
@@ -339,13 +349,19 @@
 <script>
  import { getToken } from '@/api/qiniu'
  import { getFileExtension} from '@/utils/tools'
- import { addRotationUpload,addRideWay,addWorkTime,addconnection,queryConnetion,deleteConnecWay,editConnecWay,
- saveConnecform,addContract,addrotationpic,GetRotationImages,addrotationImage} from '@/api/site/site'  
+ import { addRotationUpload,addHospital,addRideWay,addWorkTime,addconnection,queryConnetion,deleteConnecWay,editConnecWay,
+ saveConnecform,addContract,addrotationpic,GetRotationImages,addrotationImage,deleteImages} from '@/api/site/site'  
 import { truncateSync } from 'fs';
 export default {
   name: "addcontact",
   data() {
     return {
+       location: {
+        lng: 116.404,
+        lat: 39.915
+      },
+      zoom: 12.8,
+      keyword:"",
       show:false,
       imageUrl:false,
       dialogshow:false,
@@ -422,7 +438,8 @@ export default {
         content:[{required:true,message:"请填写乘车方式"}],
         worktime:[{required:true,message:"请填写工作时间"}],
         connecway:[{required:true,message:"请选择联系方式"}],
-        linkaddress:[{required:true,message:"请填写链接地址"}]
+        linkaddress:[{required:true,message:"请填写链接地址"}],
+        address:[{required:true,message:"请填写医院地址"}]
       },
      addVisible:false,  
        picform:{
@@ -529,6 +546,23 @@ export default {
         
       },
 
+      //新增医院地址
+      addHospital(formName){
+            var sorts = this.hospitalform.sort
+             var sort = parseInt(sorts)
+             this.hospitalform.sort = sort
+            this.$refs[formName].validate((valid)=>{
+            if(valid){
+             addHospital(this.hospitalform).then(response=>{
+                if(response.data.state ==1){
+                  var hosaddress =  response.data.data.hosaddress;
+                  console.log('新增医院地址数据',hosaddress);
+                }
+             })
+            }
+         })
+      },
+
       //新增联系方式
       addconnection(formName){
         this.$refs[formName].validate((valid)=>{
@@ -708,127 +742,62 @@ export default {
             })
           }
         })
+      },
+      deleteImages(id,index){
+        deleteImages(id).then(response=>{
+           if(response.data.state == 1){
+               this.rotationdata.splice(index,1)
+           }
+        })
       }
-  },
-       mounted(){
-          this.$nextTick(function () {
-                var th = this
-                // 创建Map实例
-                var map = new BMap.Map("allmap");
-                // 初始化地图,设置中心点坐标，
-                var point = new BMap.Point(121.160724,31.173277); // 创建点坐标，汉得公司的经纬度坐标
-                map.centerAndZoom(point, 15);
-                map.enableScrollWheelZoom();
-                var ac = new BMap.Autocomplete(    //建立一个自动完成的对象
-                    
-                    {
-                        "input":"suggestId", 
-                        "location": map,
-                    })
-                var myValue
-                ac.addEventListener("onconfirm", function (e) {    //鼠标点击下拉列表后的事件
-                    var _value = e.item.value;
-                    myValue = _value.province + _value.city + _value.district + _value.street + _value.business;
-                    this.address_detail = myValue
-                    setPlace();
-                });
-
-                function setPlace() {
-                    map.clearOverlays();    //清除地图上所有覆盖物
-                    function myFun() {
-                        th.userlocation = local.getResults().getPoi(0).point;    //获取第一个智能搜索的结果
-                        map.centerAndZoom(th.userlocation, 18);
-                        map.addOverlay(new BMap.Marker(th.userlocation));    //添加标注
-                    }
-
-                    var local = new BMap.LocalSearch(map, { //智能搜索
-                        onSearchComplete: myFun
-                    });
-                    local.search(myValue);
-
-                    //测试输出坐标（指的是输入框最后确定地点的经纬度）
-                    map.addEventListener("click",function(e){
-                        //经度
-                        console.log(th.userlocation.lng);
-                        //维度
-                        console.log(th.userlocation.lat);
-
-                    })
-                }
-
-            })
-        },
-        
+  },   
         created(){
           this.queryConnetion();
           this.GetRotationImages();
         },
-
-       updated(){
-          this.$nextTick(function () {
-                var th = this
-                // 创建Map实例
-                var map = new BMap.Map("allmap");
-                // 初始化地图,设置中心点坐标，
-                var point = new BMap.Point(121.160724,31.173277); // 创建点坐标，汉得公司的经纬度坐标
-                map.centerAndZoom(point, 15);
-                map.enableScrollWheelZoom();
-                var ac = new BMap.Autocomplete(    //建立一个自动完成的对象
-                    
-                    {
-                        "input":"suggestId", 
-                        "location": map,
-                    })
-                   
-                var myValue
-                ac.addEventListener("onconfirm", function (e) {    //鼠标点击下拉列表后的事件
-                    var _value = e.item.value;
-                    
-                    myValue = _value.province + _value.city + _value.district + _value.street + _value.business;
-                    this.address_detail = myValue
-                    setPlace();
-                });
-
-                function setPlace() {
-                    map.clearOverlays();    //清除地图上所有覆盖物
-                    function myFun() {
-                        th.userlocation = local.getResults().getPoi(0).point;    //获取第一个智能搜索的结果
-                        map.centerAndZoom(th.userlocation, 18);
-                        map.addOverlay(new BMap.Marker(th.userlocation));    //添加标注
-                    }
-
-                    var local = new BMap.LocalSearch(map, { //智能搜索
-                        onSearchComplete: myFun
-                    });
-                    local.search(myValue);
-
-                    //测试输出坐标（指的是输入框最后确定地点的经纬度）
-                    map.addEventListener("click",function(e){
-                        //经度
-                        console.log(th.userlocation.lng);
-                        //维度
-                        console.log(th.userlocation.lat);
-
-                    })
-                }
-
-            })
-        },
 };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  #allmap{
-        width: 200px;
-        height: 200px;
-        font-family: "微软雅黑";
-        margin-top: 20px;
-      //  border:1px solid green;
+ 
+   .map {
+        width: 100%;
+        height: 400px;
     }
   .tips {
     font-size: 12px;
     line-height: 18px;
    }
+
+   .addrot{
+     width: 146px;
+     height: 146px;
+     border: dashed 1px #409EFF;
+   }
+
+  .docone{
+    width: 50px;
+    height: 50px;
+    // border: solid 1px red;
+    margin-top: 50px;
+    margin-left: 50px;
+    font-size: 50px;
+  }
+   .doctwo{
+    width: 60px;
+    height: 30px;
+    font-size: 14px;
+  }
+
+  .pic{
+    width: 60px;
+    height: 60px;
+    border: dashed 1px #409EFF;
+  }
+  .picspan{
+     font-size: 20px;
+     padding-top: 10px;
+  }
 .used {
   ul {
     li {
@@ -850,41 +819,5 @@ export default {
       }
     }
   }
-  
-   .avatar-uploader{
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-      width: 100px;
-      height: 100px;
-     }
-  .avatar-uploader{
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 14px;
-    color: #8c939d;
-    width: 50px;
-    height: 50px;
-    line-height: 50px;
-    margin-left: 25px;
-    margin-top: 25px;
-    text-align: center;
-  }
-
-   .tpic{
-     width:200px;
-     height:200px;
-     border:solid 1px red;
-   }
-
-  //  .addrot{
-  //    width: 146px;
-  //    height: 146px;
-  //    border: dashed 1px red;
-  //  }
-  
 }
 </style>

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

@@ -7,10 +7,8 @@
                      <img src="static/images/a.jpg" style="width:315px;height:200px">
                  </div>
               </div>
-                <div class="modelone" v-if="item.mode_type == 2">
-                 <div>
-                    
-                 </div>
+                <div class="modetwo" v-if="item.mode_type == 2">  
+                <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Hosaddress.address}}</span></div> 
               </div>
               <div  v-if="item.mode_type == 3">
                  <div class="modeone">
@@ -19,7 +17,7 @@
                    <span>{{item.title}}:&nbsp;&nbsp;13318464642</span><br>
                   </div>
               </div>
-               <div class="modetwo" v-if="item.mode_type == 4">
+               <div class="modefour" v-if="item.mode_type == 4">
                  <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Worktime.worktime}}</span></div>
               </div>
                <div class="modethree" v-if="item.mode_type == 5">
@@ -31,7 +29,7 @@
 </template>
 
 <script>
-     import { getOrderModel } from '@/api/site/site' 
+import { getOrderModel } from '@/api/site/site' 
 import { fchown } from 'fs';
     export default {
         name: "contact-us",
@@ -58,14 +56,15 @@ import { fchown } from 'fs';
                     console.log("images是什么?",images)              
                   }
                   console.log(images)
-                  console.log("马文强",ordmodel)
+                  console.log("我爱你中国",ordmodel)
                  }
              })
            }
         },
         created(){
            this.getOrderModel();
-        },
+        },     
+       
     }
 </script>
 
@@ -140,8 +139,16 @@ import { fchown } from 'fs';
     font-size: 14px;
     margin-bottom: 5px;
   }
+
+  .modetwo{
+    width: 300px;
+    height: 100%;
+    /* border: solid 1px red; */
+    font-size: 14px;
+    margin-bottom: 5px;
+  }
   
-   .modetwo{
+   .modefour{
     width: 300px;
     height: 30px;
     color: black;

src/scrm_pages/site/components/new-feature.vue

@@ -78,8 +78,8 @@
                     </label>
                      <span class="el-upload-list__item-actions">
                     <span class="el-upload-list__item-delete">
-                    <i class="el-icon-edit-outline" @click="editImages(item.id);editcenterDialogVisible = true"></i>
-                    <i class="el-icon-delete" @click="deleteDoctor(item.id,index)"></i>
+                    <i class="el-icon-edit-outline" @click="editRotationImages(item.id);editRotionImages = true"></i>
+                    <i class="el-icon-delete" @click="deleteRotations(item.id,index)"></i>
                     </span>
                     </span>
                    </div>         
@@ -98,7 +98,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="AddRotationChart('rotationform')">确 定</el-button>
+      <el-button type="primary" @click="AddRotationChart('rotationform');OpenCreate()">确 定</el-button>
     </span>
   </el-dialog>
 
@@ -146,6 +146,7 @@
        <el-button size="medium" @click="addlink()" v-show="selectone">设置链接</el-button>
       </el-col>
     </el-form-item>
+    
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="addpicVisible = false">取 消</el-button>
@@ -232,7 +233,7 @@
     title="新增科室介绍"
     :visible.sync="three"
     width="50%"
-    :before-close="handleClose">
+    center>
     <el-form ref="administform" :model="administform" label-width="90px" :rules="rules">
       <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="administform.title"></el-input>
@@ -471,7 +472,7 @@
            v-if="!disabled"
            class="el-upload-list__item-delete"
          >
-         <i class="el-icon-edit-outline"></i>
+         <!-- <i class="el-icon-edit-outline"></i> -->
           </span> 
          <span
            v-if="!disabled"
@@ -680,12 +681,101 @@
   </span>
 </el-dialog>
 
+<!-- 编辑轮播图 -->
+ <el-dialog
+  title="编辑轮播图"
+  :visible.sync="editRotionImages"
+  width="35%"
+  center>
+  <el-form label-width="90px" ref="editrotationform" :model="editrotationform" :rules="rules">
+      <el-form-item label="图片编辑:">
+        <el-upload
+          :data="rotationdata"
+          class="avatar-uploader"
+          action="https://upload.qiniup.com"
+          :show-file-list="false"
+          :on-success="rotationAvatarSuccess"
+          :before-upload="rotationAvatarUpload">
+          <img v-if="editrotationform.images" :src="editrotationform.images" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="排序值:" required prop="sort">
+          <el-input v-model="editrotationform.sort"></el-input> 
+      </el-form-item>
+      <el-form-item label="图片链接:">
+          <el-radio-group v-model="editrotationform.piclink">
+           <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in genderOptions" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+       <el-form-item label="链接地址:" required prop="linkaddress">
+        <el-col :span="15">
+          <el-input v-model="editrotationform.linkaddress" v-show="selectone" style="width:300px"></el-input>
+        </el-col>
+        <el-col :span="4">
+          <el-button size="medium"  v-show="selectone" @click="rotationVisible = true">设置链接</el-button>
+        </el-col>
+    </el-form-item>
+  </el-form>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="editRotionImages = false">取 消</el-button>
+    <el-button type="primary" @click="updateRotionImages('editrotationform');editRotionImages = false">确 定</el-button>
+  </span>
+</el-dialog>
+
+
+<!-- 设置轮播图链接地址 -->
+<el-dialog
+  title="设置链接地址"
+  :visible.sync="rotationVisible"
+  width="30%"
+  :before-close="handleClose"
+  center>
+  <el-form label-width="90px">
+     <el-form-item label="连接类型">
+         <el-radio-group v-model="form.gender">
+            <el-radio :label="item.id" :value="item.id" v-for="(item,index) in defineOptions" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
+         </el-radio-group>
+     </el-form-item>  
+       <el-form-item label="链接类型:" v-show="definetwo">
+       <el-select v-model="value" placeholder="请选择">
+        <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+       </el-option>
+      </el-select>
+     </el-form-item>
+     <el-form-item label="文章分类" v-show="definetwo">
+       <el-select v-model="value" placeholder="请选择">
+        <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+       </el-option>
+      </el-select>
+     </el-form-item>
+     <el-form-item label="电话号码:" v-show="definethree">
+       <el-input></el-input>
+     </el-form-item>
+     <el-form-item label="站外链接:" v-show="definefour">
+       <el-input></el-input>
+     </el-form-item>
+  </el-form>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="rotationVisible = false">取 消</el-button>
+    <el-button type="primary" @click="rotationVisible = false">确 定</el-button>
+  </span>
+</el-dialog>
 </div>
 </template>
 
 <script>
    import { AddRotationChart, saveHispital,addOffices,AddDoctor,AddDoctorInfo,AddOfficeEnvironment,getQueryDocInfo,change,
-   getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart} from '@/api/site/site'  
+   getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
+   deleteRotations,editRotationImages,updateRotionImages} from '@/api/site/site'  
    import { getToken } from '@/api/qiniu'
    import { getFileExtension} from '@/utils/tools'
    import { isIP } from 'net';
@@ -695,8 +785,8 @@
    import 'quill/dist/quill.snow.css'
    import 'quill/dist/quill.bubble.css'
    import { constants } from 'crypto';
-import { fail } from 'assert';
-import { get } from 'http';
+   import { fail } from 'assert';
+   import { get } from 'http';
 export default {
   name: "newfeature",
   components:{
@@ -735,6 +825,7 @@ export default {
        definethree:false,
        definefour:false,
        selectone:true,
+       rotationVisible:false,
        docnames:[],
        radio: '1',
        radiotwo:'2',
@@ -771,6 +862,7 @@ export default {
       addpicVisible:false,
       MagicNavigation:false,
       magicVisible:false,
+      editRotionImages:false,
       radio: '1',
       two: false,
       three: false,
@@ -805,7 +897,6 @@ export default {
         image:"",
       },
       docform:[],
-      
       hispitalform:{
         title:"",
         sort:"",
@@ -866,6 +957,13 @@ export default {
         linkaddress:"",
       },
 
+      editrotationform:{
+          images:"",
+          sort:"",
+          piclink:"",
+          linkaddress:"",
+      },
+
        rules: {
          title: [{required: true, message: "请填写模块标题",},],
          sort: [{required: true,message:"请填写排序值"}],
@@ -885,12 +983,16 @@ export default {
          docimages:[{required:true,message:"请填写新增名医"}],
          linkaddress:[{required:true,message:"请填写链接地址"}],
          imageUrl:[{required:true,message:"请填写图片编辑"}],
-         margtitle:[{required:true,message:"请填写导航标题"}]
+         margtitle:[{required:true,message:"请填写导航标题"}],
+         address:[{required:true,message:"请填写链接地址"}]
       },
     };
   },
   // 医院介绍模块
   methods:{  
+    OpenCreate(){
+       this.$refs.newfeature.Open();
+    },
       addlink(){
         this.linkVisible = true;
       },
@@ -1143,6 +1245,41 @@ export default {
           return isJPG && isLt2M;
       },
 
+      rotationAvatarSuccess(res,file){
+         this.editrotationform.images = this.qiniuDomain + res.url;
+      },
+      rotationAvatarUpload(file){
+            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;       
+            this.loadingText = '封面图片上传中'
+            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)                    
+                })
+            })
+          return isJPG && isLt2M;
+      },
+
       //新增轮播图
       AddRotationChart(formName){
             var sorts =  this.rotationform.sort;
@@ -1164,6 +1301,9 @@ export default {
             }
           })  
       },
+      OpenCreate(){
+        
+      },
 
     //医院介绍
      saveHispital(formName){
@@ -1176,7 +1316,7 @@ export default {
                     var hospital = response.data.data.hospital;
                     //console.log("返回数据",hospital)
                      this.$message.success("添加医院介绍成功");  
-                     this.two = false;                       
+                     this.two = false;                
                   }
              })
           }
@@ -1422,6 +1562,7 @@ export default {
                 if(response.data.state ==1){
                   var editpiclink = response.data.data.editpiclink;
                   console.log("数据返回",editpiclink)
+                  this.getEditImages();
                 }
              })
           }
@@ -1478,7 +1619,49 @@ export default {
           })
         }
       })
-  },
+    },
+
+    deleteRotations(id,index){
+       this.$confirm('确认要删除该组件吗?删除后该组件将无法恢复','删除提示!',{
+          dangerouslyUseHTMLString:true,
+             confirmButtonText: '确定',
+             cancelButtonText: '取消',
+             type: 'warning'
+       }).then(()=>{
+         deleteRotations(id).then(response=>{
+             if(response.data.state == 1){
+               this.rotationdata.splice(index,1)
+             }
+         })
+       })
+    },
+
+    editRotationImages(id){
+      editRotationImages(id).then(response=>{
+          if(response.data.state == 1){
+           var editpiclink = response.data.data.editpiclink;
+           this.editrotationform = response.data.data.editpiclink;
+           console.log("这是什么",editpiclink)
+          }
+      })
+    },
+    updateRotionImages(formName){
+       var sorts = this.editrotationform.sort;
+          var sort = parseInt(sorts);
+          this.editrotationform.sort = sort;
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+          updateRotionImages(this.editrotationform.id,this.editrotationform).then(response=>{
+                 if(response.data.state == 1){
+                   var editpiclink =  response.data.data.editpiclink;
+                   console.log("返回数据",editpiclink)
+                   this.getEditImages();
+                   
+                 }
+          })
+         }
+       })
+    }
   },  
    created(){
      this.getQueryDocInfo();

src/scrm_pages/site/preview.vue

@@ -421,7 +421,7 @@
 
                <!-- 编辑乘车方式 -->
                 <el-dialog
-                   title="提示"
+                   title="编辑乘车方式"
                    :visible.sync="dialogVisiblefive"
                    width="30%"
                   >
@@ -528,6 +528,105 @@
                   <el-button type="primary" @click="linkVisible = false">确 定</el-button>
                   </span>
                 </el-dialog>
+
+                <!-- 编辑导航 -->
+                <el-dialog
+                  title="编辑导航"
+                  :visible.sync="editNavigationVisible"
+                  width="30%"
+                 center>
+                 <el-form label-width="130px" ref="editNavigationform" :model="editNavigationform" :rules="rules">
+                    <el-form-item label="导航标题:" required prop="navtitle">
+                      <el-input v-model="editNavigationform.navtitle"></el-input>
+                    </el-form-item>
+                    <el-form-item label="导航图标选中:" required="checkImages">
+                       <el-upload
+                       :data="editcheckdata"
+                        class="avatar-uploader"
+                        action="https://upload.qiniup.com"
+                        :show-file-list="false"
+                        :on-success="editNaviAvatarSuccess"
+                        :before-upload="editNaviAvatarUpload">
+                        <img v-if="editNavigationform.navimages" :src="editNavigationform.navimages" class="avatar">
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                       </el-upload> 
+                    </el-form-item>
+                    <el-form-item label="导航图标未选中:">
+                       <el-upload
+                        :data="editcheckdata"
+                        class="avatar-uploader"
+                        action="https://upload.qiniup.com"
+                        :show-file-list="false"
+                        :on-success="editNaviAvatarSuccessone"
+                        :before-upload="editNaviAvatarUploadone">
+                        <img v-if="editNavigationform.noCheckImages" :src="editNavigationform.noCheckImages" class="avatar">
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                       </el-upload> 
+                    </el-form-item>
+                    <el-form-item label="跳转设置:">
+                        <el-radio-group v-model="editNavigationform.jumpset">
+                          <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>
+                      <el-col :span="18" >
+                        <el-input   v-show="define" v-model="editNavigationform.navaddress"></el-input> 
+                     </el-col>
+                    <el-col :span="4">
+                        <el-button size="medium" @click="dialogVisible=true"  v-show="define">设置链接</el-button>
+                    </el-col>
+                    </el-form-item>
+                 </el-form>
+                 <span slot="footer" class="dialog-footer">
+                <el-button @click="editNavigationVisible = false">取 消</el-button>
+                 <el-button type="primary" @click="SaveNavigation('editNavigationform');">确 定</el-button>
+                 </span>
+               </el-dialog>
+
+              <el-dialog
+                title="设置链接"
+                :visible.sync="dialogVisible"
+                 width="30%"
+                center>
+               <el-form>
+                    <el-form-item label="链接类型:" ref="linkform" :model="linkform">
+                        <el-radio-group v-model="navigationform.gender">
+                          <el-radio :label="item.id" :value="item.id" v-for="(item,index) in defineOptions" :key="index" @change="selectItem(item.id)">{{item.name}}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="链接类型:" v-show="definetwo">
+                       <el-select v-model="linkform.linktype" placeholder="请选择">
+                       <el-option
+                         v-for="item in option"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+                      </el-option>
+                     </el-select>
+                    </el-form-item>
+                     <el-form-item label="活动类型:" v-show="definetwo">
+                       <el-select v-model="linkform.actitype" placeholder="请选择">
+                       <el-option
+                         v-for="item in options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+                      </el-option>
+                     </el-select>
+                    </el-form-item>
+                    <el-form-item label="电话号码:" v-show="definethree">
+                      <el-input style="width:400px"></el-input>
+                    </el-form-item>
+                    <el-form-item label="站外链接:"  v-show="definefour">
+                      <el-input style="width:400px"></el-input>
+                    </el-form-item>
+                  </el-form>
+               <span slot="footer" class="dialog-footer">
+               <el-button @click="dialogVisible = false">取 消</el-button>
+               <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+               </el-dialog>
+
               
               <!-- 手机模拟页面 -->
                <el-col :span="10">
@@ -537,8 +636,8 @@
                    <div class="wifi"></div>
                    <div class="dian"></div>
                    <div class="scroll" v-show="show">
-                     <div class="swiper-container swiper-no-swiping" id="swiper1">
-                      <div class="swiper-wrapper" id="wrapper1">   
+                     <div class="swiper-container swiper-no-swiping swiperone">
+                      <div class="swiper-wrapper">   
                          <div v-for="item in this.patientModels" :key="item.id" v-show="modelshowtwo">
                            <!-- 轮播图 -->
                              <div v-if="item.mode_type == 1" class="modeone">                                                                 
@@ -593,33 +692,53 @@
                             <div class="more" @click="more()">查看更多</div>
                             <div class="logo"><img src="static\images\u216.png"></div>
                             <div class="swiperimages">
-                            <div class="swiper-container" id="swipertwo">
-                            <div class="swiper-wrapper" id="wrapper2">
-                            <div class="swiper-slide"  v-for="it in keEnvironmentImages" :key="it.id">
-                             <img :src="it" style="width:150px;height:140px;border-radius:5px;"/>
-                           </div>
-                           </div>
-                           </div>
+                               <div class="swiper-container swiperthree" >
+                                 <div class="swiper-wrapper" id="wrappertwo" >
+                                    <div class="swiper-slide"  v-for="it in keEnvironmentImages" :key="it.id">
+                                      <img :src="it" style="width:150px;height:140px;border-radius:5px;"/>
+                                     </div>
+                                </div>
+                              </div>
                             </div>
+                          
                            </div>
 
                            <!-- 魔方导航 -->
                            <div v-if="item.mode_type== 8" class="modeeight">
-                              {{item.title}}     
+                              <!-- {{item.title}}      -->
+                              <div class="mac">
+                                 <div class="macone">
+                                   <div class="picone"><img src="static/images/u289.png"></div>
+                                   <div class="pictwo"><span>微商城</span></div>
+                                 </div>
+                                 <div class="mactwo">
+                                   <div class="picone"><img src="static/images/u289.png"></div>
+                                   <div class="pictwo"><span>肾科资讯</span></div>
+                                 </div>
+                                 <div class="macthree">
+                                   <div class="picone"><img src="static/images/u289.png"></div>
+                                   <div class="pictwo"><span>在线客服</span></div>
+                                 </div>
+                                 <div class="macfour">
+                                   <div class="picone"><img src="static/images/u289.png"></div>
+                                   <div class="pictwo"><span>肾友故事</span></div>
+                                 </div>
+                              </div>
                            </div>
                           
                           <div class="box"></div>
+                                               
                          </div>  
-                          <contact-us  v-show="modelshow"></contact-us>                              
+                          <contact-us  v-show="modelshow"></contact-us>  
                       </div>         
                      </div>
                    </div>  
                       <!-- 医院介绍详情页-->                
                       <div class="xiangqing"  v-show="shows" v-html="hospitalform.introduction"></div> 
                       <!-- 科室介绍详情页 -->                        
-                       <div class="xiangqing" v-html="officeform.introduction" v-show="keshow"></div> 
+                       <!-- <div class="xiangqing" v-html="officeform.introduction" v-show="keshow"></div>  -->
                         <!--编辑名医介绍  -->
-                        <div class="xiangqing" v-show="docshow">
+                        <!-- <div class="xiangqing" v-show="docshow">
                           <div class="docone" v-for="item in this.editdocfrom" :key="item">
                              <div class="doctwo">
                                <img :src="item.dochead" style="width:80px;height:80px">
@@ -631,7 +750,7 @@
                                 <span class="docsix" v-html="item.docintroduction"></span>
                              </div>
                           </div>
-                        </div>
+                        </div> -->
                          
                        <!--返回首页-->
                      <div class="reback" v-show="showback">
@@ -648,7 +767,7 @@
                            <img src="static/images/u378.png">
                         </div>
                         <div class="reindextwo">
-                            <span>顶部</span>
+                            <span @click="returntop()">顶部</span>
                         </div>
                      </div>
                       
@@ -684,7 +803,7 @@
                           <span>{{item.navtitle}}</span>
                        </div>
                        <div class="navifour">
-                          <span class="el-icon-edit-outline"></span>
+                          <span class="el-icon-edit-outline" @click="editNavigationVisible = true;editNavigation(item.id);"></span>
                        </div>
                        <div class="navifive">
                           <span class="el-icon-delete" @click="deleteNavigation(item.id,index)"></span>
@@ -779,7 +898,7 @@ import 'mint-ui/lib/style.css';
 import {GetUserdModel,eidtmodel,editRideWay,SaveWorkTime,saverideway,editHospital,SaveHospital,editOffice,editDoc,
 deleteModleById,SaveOffice,editImages,saveDocInfo,deleteDoctor,SaveDocdata,editOfficeEnviroment,SaveOfficeEnvironment,
 getQueryNewModel,getHospital,getHospitaldata,hispitalmore,officemore,docmore,addNavigation,getNavigationList,
-AddShareInfo,getShareInfo,deleteNavigation,deletemodle } from '@/api/site/site'  
+AddShareInfo,getShareInfo,deleteNavigation,deletemodle,editNavigation,SaveNavigation } from '@/api/site/site'  
 import { IncomingMessage } from 'http';
 import { isIP, isIPv4 } from 'net';
 import Swiper from "swiper";
@@ -834,6 +953,7 @@ export default {
       dialogVisiblefour:false,
       dialogVisiblefive:false,
       hosipitalVisible:false,
+      dialogVisible:false,
       officeVisible:false,
       docVisible:false,
       comshow:false,
@@ -851,6 +971,7 @@ export default {
        disabled:true,
        showback:false,
        showindex:false,
+       editNavigationVisible:false,
       ellipsis:'',
       docnames:[],
        options: [{
@@ -894,12 +1015,6 @@ export default {
             background: 'red',
           }
         },
-        rules: {
-          title: [{required: true, message: "请填写模块标题",},],
-          sort: [{required: true,message:"请填写排序值"}],       
-          worktime:[{required:true,message:"请填写工作时间"}],
-          rideway:[{required:true,message:"请填写乘车方式"}]   
-      },
         keEnvironmentImages:[],
         qiniuDomain: 'https://images.shengws.com/',
         rotationData: { token:'',key: '' },
@@ -907,6 +1022,7 @@ export default {
         doctorData:{ token:'',key:'' },
         navigationData:{ token:'',key:''},
         sharedata:{ token:'',key:''},
+        editcheckdata: { token:'',key:''},
       officeform:{
         title:"",
         sort:"",
@@ -1018,6 +1134,13 @@ export default {
         phone:"",
         offsitelink:"",
       },  
+      editNavigationform:{
+         navtitle:"",
+         navimages:"",
+         noCheckImages:"",
+         jumpset:"",
+         navaddress:"",
+      },
       
        rules: {
          title: [{required: true, message: "请填写模块标题",},],
@@ -1036,6 +1159,10 @@ export default {
          docimages:[{required:true,message:"请填写新增名医"}],
          navtitle:[{required:true,message:"请填写导航标题"}],
          navigationImages:[{required:true,message:"请填写导航图标"}],  
+         worktime:[{required:true,message:"请填写工作时间"}],
+         rideway:[{required:true,message:"请填写乘车方式"}],
+         navigatitle:[{required:true,message:"请填写导航标题"}],
+         checkImages:[{required:true,message:"请填写导航图标选中"}],
       },
         keData: { token: '' ,key: ''},
         navigationdata:[],
@@ -1066,13 +1193,14 @@ export default {
                 }   
                 var  strs =  str.join(",")
                 var ss = strs.split(",")
+
                 this.rotatationImages = ss;
                 for(let i = 0; i<this.patientModels.length;i++){
                   if(this.patientModels[i].OfficeEnviroment.keimages !=""){
                      images.push(this.patientModels[i].OfficeEnviroment.keimages);
                   }       
                 }
-                var imgs =  str.join(",")
+                var imgs =  images.join(",")
                 var imgss = imgs.split(",")
                 this.keEnvironmentImages = imgss;
                 console.log("keimages是什么",imgss);
@@ -1247,6 +1375,82 @@ export default {
             })
           return isJPG && isLt2M;
       },
+
+      editNaviAvatarSuccess(res,file){
+          this.editNavigationform.navimages = this.qiniuDomain + res.url;
+      },
+      editNaviAvatarUpload(file){
+          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;
+            this.uploading = true;
+            this.loadingText = '封面图片上传中'
+
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token= response.data.data.uptoken
+                    console.log("医生头像token是什么?",token)
+                    _self._data.editcheckdata.token = token;
+                    _self._data.editcheckdata.key = key;
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                    this.uploading = false;
+                })
+            })
+          return isJPG && isLt2M;
+      },
+        editNaviAvatarSuccessone(res,file){
+          this.editNavigationform.noCheckImages = this.qiniuDomain + res.url;
+      },
+      editNaviAvatarUploadone(file){
+           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;
+            this.uploading = true;
+            this.loadingText = '封面图片上传中'
+
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token= response.data.data.uptoken
+                    console.log("医生头像token是什么?",token)
+                    _self._data.editcheckdata.token = token;
+                    _self._data.editcheckdata.key = key;
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                    this.uploading = false;
+                })
+            })
+          return isJPG && isLt2M;
+      },
+
       //添加轮播图
       addRotationUpload(formName){
         this.$refs[formName].validate((valid)=>{
@@ -1550,7 +1754,10 @@ export default {
        this.$refs[formName].validate((valid)=>{
          if(valid){
            SaveOfficeEnvironment(this.keform.id,this.keform).then(response=>{
-             
+               if(response.data.state == 1){
+                  var navigation = response.data.data.navigation;
+                  console.log("返回数据",navigation);
+               }
            })
          }
        })
@@ -1723,9 +1930,6 @@ export default {
         width: 100,
         height: 100, // 高度
         text: '56663159' // 二维码内容
-        // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
-        // background: '#f0f'
-        // foreground: '#ff0'
       })
       console.log(qrcode)
     },
@@ -1772,6 +1976,31 @@ export default {
         }).catch(e=>{});
       }).catch(e=>{});
     },
+   
+    editNavigation(id){
+       editNavigation(id).then(response=>{
+           if(response.data.state==1){
+            var navigation = response.data.data.navigation;
+             this.editNavigationform = response.data.data.navigation;
+            console.log("返回的导航数据",navigation);
+           }
+       })
+    },
+    SaveNavigation(formName){
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+            SaveNavigation(this.editNavigationform.id,this.editNavigationform).then(response=>{
+                 if(response.data.state == 1){
+                  var navigation = response.data.data.navigation;
+                  this.editNavigationVisible = false;
+                  console.log("更新的数据",navigation);
+                   this.getNavigationList();
+                 } 
+            })
+         }
+       })
+    },
+
     changbutton(){
        var content = document.getElementById('edit').innerHTML;
        if(content == "编辑"){
@@ -1784,7 +2013,10 @@ export default {
           this.disabled = true;
           this.shareshow = false;
            AddShareInfo(this.shareform).then(response=>{
-
+              if(response.data.state == 1){
+                var share = response.data.data.share;
+                console.log("数据返回",share);
+              }
           })
        }
     },
@@ -1797,17 +2029,23 @@ export default {
             console.log("返回分享数据",share)
           }
       })
+    },
+
+    returntop(){
+      alert("aaa");
     }
 
-   
   },
   created(){
     this.GetUserdModel();
     this.getQueryNewModel();
-    this.getHospitaldata();
     this.getHospital();
     this.getNavigationList();
     this.getShareInfo();
+    this.getHospitaldata();
+    },
+    beforeUpdate(){
+    
     },
     updated(){
        let obj = document.getElementById('content');
@@ -1830,7 +2068,7 @@ export default {
       },
     mounted(){
       this.qrcode();
-      var swiper = new Swiper('#swiper1', {
+      var swiper = new Swiper('.swiperone', {
           direction: 'vertical',
          slidesPerView: "auto",
          spaceBetween:5,
@@ -1843,28 +2081,30 @@ export default {
             el: '.swiper-pagination',
            clickable: true,
             },
-          });      
-          
-           var mySwiper = new Swiper('#swipertwo', {
-                direction:"horizontal",
-                loop: true, // 循环播放,
-                spaceBetween:10,
-                autoplay:true,
-                loopAdditionalSlides:10,
-                slidesPerView: 'auto', // 设置slider容器能够同时显示的slides数量
-                centeredSlides: true, // active slide 居中
-                observer:true,//动态加载图片
-                observeParents:false,
-                pagination: {
-                    el: '.swiper-pagination',
-                },
-            });
+          });    
+       
+         var swiper = new Swiper('.swiperthree', {
+          direction: 'vertical',
+          slidesPerView: "auto",
+          autoplay: true,
+          loop:true,
+          spaceBetween:5,
+          loopAdditionalSlides:10,
+          centeredSlides: false, // active slide 居中
+          observer:true,//动态加载图片
+          observeParents:true,
+          paginationClickable: true,
+          pagination: {
+             el: '.swiper-pagination',
+             clickable: true,
+            },
+        });      
     },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-     
+ 
      .done{
         width: 80px;
        height: 20px;
@@ -2198,13 +2438,13 @@ export default {
 
     .modetwo{
       width: 320px;
-      height: 220px;
+      height: 230px;
       /* border: solid 1px red;   */
       /* background-color: red; */
     }
     .modethree{
        width: 320px;
-      height: 220px;
+      height: 230px;
       /* border: solid 1px blue;   */
       /* background-color: blue; */
     }
@@ -2223,31 +2463,67 @@ export default {
 
     .modeeight{
       width: 320px;
-      height: 200px;
+      height: 160px;
       // border: solid 1px red;
     }
 
      .mac{
        position: absolute;
        width: 300px;
-       height: 100px;
-       border:solid 1px red;
+       height: 70px;
+      //  border:solid 1px red;
        margin-left: 5px;
-       margin-top: 5px;
     }   
-    #mactwo{
+    .mactwo{
+      position: absolute;
+      width: 60px;
+      height: 70px;
+      // border: solid 1px red;
+      left: 80px;
+    }
+
+    .macthree{
+      position: absolute;
+      width: 60px;
+      height: 70px;
+      // border: solid 1px red;
+      left: 155px;
+    }
 
+    .macfour{
+      position: absolute;
+      width: 60px;
+      height: 70px;
+      // border: solid 1px red;
+      left: 230px;
     }
 
     .macone{
       position: absolute;
-      width: 50px;
-      height: 90px;
-      border: solid 1px red;
-      top: 5px;
+      width: 60px;
+      height: 70px;
+      // border: solid 1px red;  
       left: 5px;
     }
 
+    .picone{
+      width: 45px;
+      height: 45px;
+      // border: solid 1px red;
+      margin-left: 8px;
+      margin-top: 5px;
+    }
+
+    .pictwo{
+      width:60px;
+      height: 20px;
+      // border: solid 1px red;
+      margin-top: 2px;
+      font-size: 14px;
+      text-align: center;
+    }
+   
+
      .logo{
        position: absolute;
        margin-left: 280px;
@@ -2291,10 +2567,10 @@ export default {
    }
 
     .zzcontent{
-     overflow: hidden;
+      overflow: hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
-     -webkit-line-clamp: 6;
+     -webkit-line-clamp: 5;
      -webkit-box-orient: vertical   
    }
 
@@ -2425,15 +2701,16 @@ export default {
       -webkit-box-orient: vertical   
    }   
 
-     #wrapper2{
+     #wrappertwo{
      width: 50%;
    }
 
    .swiperimages{
      width: 320px;
      height: 150;
-     /* border: solid 1px red; */
+    //  border: solid 1px red; 
      margin-top: 20px;
+     overflow: hidden;
    }
 
    .navigationone{

src/xt_permission.js

@@ -10,14 +10,14 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-   return
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  //  return
   // 线上注释
 
   NProgress.start()