bug修改

package-lock.json

@@ -13639,9 +13639,9 @@
       }
     },
     "swiper": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
-      "integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.1.tgz",
+      "integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==",
       "requires": {
         "dom7": "^2.1.3",
         "ssr-window": "^1.0.1"

package.json

@@ -67,7 +67,7 @@
     "simplemde": "1.11.2",
     "sortablejs": "1.7.0",
     "spark-md5": "^3.0.0",
-    "swiper": "^4.5.0",
+    "swiper": "^4.5.1",
     "vue": "2.5.16",
     "vue-baidu-map": "^0.21.22",
     "vue-count-to": "1.0.13",

src/api/site/site.js

@@ -435,6 +435,7 @@ export function docmore(id,data){
 }
 
 export function kemore(id,data){
+    console.log('香港回归',id)
    return request({
        url:"/api/site/kemore?id="+id,
        method:'Get',
@@ -458,9 +459,10 @@ export function Activitiesmore(id,data){
     })
 }
 
-export function addNavigation(data){
+export function addNavigation(id,data){
+    console.log("id是什么",id)
     return request({
-        url:"/api/site/addnavigation",
+        url:"/api/site/addnavigation?id="+id,
         method:"Post",
         data:data,
     })
@@ -542,7 +544,6 @@ export function addrotationImage(data){
 }
 
 export function AddImageslink(id,data){
-    console.log("id是多少呢法阿发",id)
    return request({
        url:"/api/site/addimageslink?id="+id,
        method:"Post",
@@ -1123,4 +1124,38 @@ export function GetLinkAddress(id,params){
        method:"Get",
        params:params,
    })
-}
+}
+
+export function getCountImages(params){
+    return request({
+        url:"/api/site/getcountimages",
+        method:"Get",
+        params:params,
+    })
+}
+
+export function addNavigationlinkform(data){
+    return request({
+        url:"/api/site/addNavigationlinkform",
+        method:"Post",
+        data:data,
+    })
+}
+
+
+export function getNavgitionlinkAddress(id,params){
+   return request({
+       url:"/api/site/getnavigationlinkaddress?id="+id,
+       method:"Get",
+       params:params
+   })
+}
+
+export function UpdateEditNavigationLinkform(id,data){
+    return request({
+        url:"/api/site/updateditnavigationlinkform?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+

src/main.js

@@ -22,7 +22,8 @@ import './xt_permission'
 // import './mock' // simulation data
 
 import * as filters from './filters' // global filters
-
+import 'swiper/dist/css/swiper.css'
+import 'swiper/dist/css/swiper.min.css';
 //引入mint-ui
 import Mint from 'mint-ui';
 Vue.use(Mint);
@@ -30,7 +31,6 @@ Vue.use(Mint);
 //引入无线滚条
 
 import { read } from 'fs';
-import 'swiper/dist/css/swiper.min.css'
 import BaiduMap from 'vue-baidu-map'
 Vue.use(Element, {
   size: 'medium', // set element-ui default size

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

@@ -46,7 +46,7 @@
         <el-input v-model="rotationform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="rotationform.sort"></el-input>
+        <el-input v-model="rotationform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
      <el-form-item label="添加图片:">
@@ -65,7 +65,7 @@
                     </span>
                    </div>         
                 </div>     
-                <div class="addrot" @click="addVisible = true;showpic = false">
+                <div class="addrot" @click="addVisible = true;showpic = false" v-show="isNoEpity">
                  <div class="docone">
                   <li class="el-icon-plus"></li>  
                    <div class="doctwo">
@@ -74,6 +74,7 @@
                   </div>  
                 </div>
              </div>
+            <p class="tips">图片已上传{{totalImages}}张,最多上传9张</p>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -94,7 +95,7 @@
         <el-input v-model="hospitalform.title" ></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="hospitalform.sort"></el-input>
+        <el-input v-model="hospitalform.sort" type="number"></el-input>
         <!-- <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p> -->
       </el-form-item>
        <el-form-item label="医院地址:" required prop="address">
@@ -127,7 +128,7 @@
         <el-input v-model="contractform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="contractform.sort"></el-input>
+        <el-input v-model="contractform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="联系方式:">
@@ -238,7 +239,7 @@
         <el-input v-model="woketimeform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="woketimeform.sort"></el-input>
+        <el-input v-model="woketimeform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="工作时间:" required prop="worktime">
@@ -268,7 +269,7 @@
         <el-input v-model="rideform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="rideform.sort" ></el-input>
+        <el-input v-model="rideform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="乘车方式:" required prop="content">
@@ -298,15 +299,28 @@
      center>
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
     <el-form-item label="图片编辑:" required prop="Images">
-      <el-col :span="5">    
-          <div class="addrot" @click="addVisibletwo = true">
+      <el-col :span="5">  
+         <el-upload
+         :data="Data"   
+          class="avatar-uploader"
+          action="https://upload.qiniup.com/"
+          :show-file-list="false"
+          :on-success="RotationSuccess"
+          :before-upload="RotationUpload"
+          :limit="9">
+          <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>  
+          <!-- <div class="addrot" @click="addVisibletwo = true">
              <div class="docone">
                 <li class="el-icon-plus"></li>  
                 <div class="doctwo">
                  <span>新增图片</span>
                </div>
             </div>  
-         </div>  
+         </div>   -->
       </el-col>
       <el-col :span="19">
           <div class="tpic" v-show="showpic"> 
@@ -316,7 +330,7 @@
     </el-form-item>
     <el-form-item label="排序值:" required prop="sort">
        <el-col :span="24">
-         <el-input v-model="picform.sort"></el-input>
+         <el-input v-model="picform.sort" type="number"></el-input>
        </el-col>   
     </el-form-item>
     <el-form-item label="图片链接:">
@@ -570,6 +584,8 @@ export default {
        define:false,
        articeTypelist:[],
        articeNamelist:[],
+       isNoEpity:true,
+       totalImages:0,
     };
   },
   methods:{
@@ -878,6 +894,14 @@ export default {
             addrotationpic(this.picform).then(response=>{
                if(response.data.state ==1){
                  var conrotation  = response.data.data.conrotation;
+                 var total = response.data.data.total;
+                 this.totalImages = total;
+                 if(total >=9){
+                   this.isNoEpity = false;
+                 }
+                 this.picform.Images = "";
+                 this.picform.sort = "";
+                 this.picform.linkaddress = "";
                  this.GetRotationImages();
                }
             })
@@ -911,15 +935,23 @@ export default {
                    var oldrotation  = response.data.data.oldrotation;
                    this.slideshow = false;
                     this.$emit('getOrderModel');
+                    this.rotationform.title = "";
+                    this.rotationform.sort = "";
+                    this.rotationdata = [];
+                    this.rotationform.ids = [];
+                    this.totalImages = 0;
                  } 
             })
           }
         })
       },
-      deleteImages(id,index){
+      deleteImages(id,imgshow,index){
         deleteImages(id).then(response=>{
            if(response.data.state == 1){
-               this.rotationdata.splice(index,1)
+               this.rotationdata.splice(index,1);
+              var total =  response.data.data.total;
+              this.totalImages = total;
+               this.isNoEpity = true;
            }
         })
       },
@@ -943,7 +975,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
- 
+   .tpic{
+     margin-left: 50px;
+   }
    .map {
         width: 100%;
         height: 400px;

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

@@ -57,14 +57,14 @@
   <el-dialog
     title="新增轮播图"
     :visible.sync="dialogVisible"
-    width="35%"
+    width="36%"
     center>
     <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="rotationform.title" @input="changeInput($event)"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="rotationform.sort" @input="changeInput($event)"></el-input>
+        <el-input v-model="rotationform.sort" @input="changeInput($event)" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
         <el-form-item label="添加图片:">
@@ -92,8 +92,8 @@
                    </div>
                 </div>
              </div>
+             <p class="tips">图片已上传{{totalImages}}张,最多上传9张</p>
       </el-form-item>
-       <!-- <span class="uploadfont">图片已上传0张,最多上传9张图片</span> -->
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -103,7 +103,7 @@
 
    <!-- 编辑图片 -->
    <el-dialog
-     title="编辑图片"
+     title="添加图片"
      :visible.sync="addpicVisible"
      width="35%"
      center>
@@ -116,7 +116,8 @@
            action="https://upload.qiniup.com"
           :show-file-list="false"
           :on-success="rotationSuccess"
-          :before-upload="rotationUpload">
+          :before-upload="rotationUpload"
+          :limit="9">
           <img v-if="picform.imageUrl" :src="picform.imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload> 
@@ -137,12 +138,12 @@
     </el-form-item>
     <el-form-item label="排序值:" required prop="sort">
        <el-col :span="24">
-         <el-input v-model="picform.sort" style="width:410px"></el-input>
+         <el-input v-model="picform.sort" style="width:410px" type="number"></el-input>
        </el-col>   
     </el-form-item>
     <el-form-item label="图片链接:">
         <el-radio-group v-model="picform.imagelink">
-          <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 :label="gender.id" :value="gender.id" v-for="(gender, index) in genderPicLink" :key="index" @change="select(gender.id)">{{gender.name}}</el-radio>
         </el-radio-group>
     </el-form-item>
     <el-form-item label="链接地址:"  v-show="selectone">
@@ -260,7 +261,7 @@
         <el-input v-model="hispitalform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="hispitalform.sort"></el-input>
+        <el-input v-model="hispitalform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="医院介绍:" required prop="introduction">
@@ -289,7 +290,7 @@
         <el-input v-model="administform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="administform.sort" ></el-input>
+        <el-input v-model="administform.sort" type="number" ></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="科室介绍:" required prop="introduction">
@@ -318,7 +319,7 @@
         <el-input v-model="doctorform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="doctorform.sort"></el-input>
+        <el-input v-model="doctorform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="新增名医:" v-model="doctorform.image">
@@ -403,7 +404,7 @@
                    </el-col>
                    <el-col :span="16">
                     <el-form-item label="排序值:" required prop="sort">
-                      <el-input v-model="eidtDoctorform.sort"></el-input>
+                      <el-input v-model="eidtDoctorform.sort" type="number"></el-input>
                     </el-form-item>
                   </el-col>
                </el-form-item>  
@@ -466,7 +467,7 @@
                    </el-col>
                    <el-col :span="12">
                     <el-form-item label="排序值:" required prop="doc_sort">
-                      <el-input v-model="editdocfrom.doc_sort"></el-input>
+                      <el-input v-model="editdocfrom.doc_sort" type="number"></el-input>
                     </el-form-item>
                   </el-col>
                </el-form-item>  
@@ -499,12 +500,12 @@
         <el-input v-model="keform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值: " required prop="sort">
-        <el-input v-model="keform.sort"></el-input>
+        <el-input v-model="keform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="新增科室环境:" required prop="keImages" v-model="keform.keImages">
+      <el-form-item label="新增科室环境:"  v-model="keform.keImages" >
            <div class="flex-img">
-              <div class="el-upload-list el-upload-list--picture-card">            
+              <div class="el-upload-list el-upload-list--picture-card" v-show="isEmpty">            
                   <div class="el-upload-list__item is-success"  v-for="(it,index) in this.rotationdata" :key="it.id">             
                     <img class="flex-img__image" :src="it.enviroimages">              
                     <label class="el-upload-list__item-status-label">
@@ -607,7 +608,7 @@
         <el-input v-model="articeform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="articeform.sort"></el-input>
+        <el-input v-model="articeform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="文章分类: ">
@@ -649,7 +650,7 @@
         <el-input v-model="activeform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值: " required prop="sort">
-        <el-input v-model="activeform.sort"></el-input>
+        <el-input v-model="activeform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
      
@@ -674,7 +675,7 @@
         <el-input v-model="marginform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="marginform.sort"></el-input>
+        <el-input v-model="marginform.sort" type="number"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
        <el-form-item label="添加图片:" v-model="marginform.marginImages" required prop="marginImages">
@@ -917,7 +918,7 @@
         </el-upload>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-          <el-input v-model="editrotationform.sort"></el-input> 
+          <el-input v-model="editrotationform.sort" type="number"></el-input> 
       </el-form-item>
       <el-form-item label="图片链接:">
           <el-radio-group v-model="editrotationform.piclink">
@@ -992,7 +993,7 @@
    getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor,AddImageslink,getEditImages,AddMagicNavi,getMagicImages,AddMarginChart,
    deleteRotations,editRotationImages,updateRotionImages,addActiveform,deleteMargin,getEditImagesDetail,UpdateEditMacgin,getArticleType
    ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
-   getMacLinkAddress} from '@/api/site/site'  
+   getMacLinkAddress,getCountImages} from '@/api/site/site'  
    import { getToken } from '@/api/qiniu'
    import { getFileExtension} from '@/utils/tools'
    import { isIP, isIPv4 } from 'net';
@@ -1028,6 +1029,10 @@ export default {
        }
      }     
     return {
+       genderPicLink:[
+         {id:1,name:"无"},
+         {id:2,name:"自定义"},
+       ],
       genderOptions:[
         {id:1, name:'自定义'},
         {id:2, name:'不跳转'},
@@ -1269,6 +1274,7 @@ export default {
       },
       articeNamelist:[],
       patientRotation:[],
+      totalImages:0,
        rules: {
          title: [{required: true, message: "请填写模块标题",},],
          sort: [{required: true,message:"请填写排序值"},{validator:checkNumberRule}],
@@ -1448,6 +1454,7 @@ export default {
         handleRemove() {
             this.file = '';
       },
+     
       define(){
          alert("aa")
       },
@@ -1660,7 +1667,9 @@ export default {
                     this.rotationform.title = "";
                     this.rotationform.sort = "";
                     this.rotationform.rotationImages = [];  
+                    this.rotationform.ids=[];
                     this.isEmpty = false;
+                    this.totalImages = 0;
                   }
               })
             }
@@ -1954,6 +1963,9 @@ export default {
           if(valid){
           AddImages(this.officeform).then(response=>{
              this.getEnImages();
+             this.officeform.sort = "";
+             this.officeform.enviroimages = "";
+             this.isEmpty = true;
            })
           }
         })
@@ -2005,6 +2017,11 @@ export default {
                   if(response.data.state == 1){
                     var offenvironment = response.data.data.offenvironment;
                     this.five = false;
+                    this.keform.sort = "";
+                    this.keform.title = "";
+                    this.keform.keImages = [];
+                    this.keform.ids=[];
+                    this.isEmpty = false;
                     console.log("返回数据",offenvironment);
                      this.$emit('getHospitaldata')
                   }
@@ -2047,11 +2064,11 @@ export default {
      },
      select(id){
         if(id == 1){
-          this.selectone = true;
+          this.selectone = false;
         }
 
         if(id == 2){
-          this.selectone = false;
+          this.selectone = true;
         }
      },
       selectItemtwo(id){
@@ -2107,6 +2124,11 @@ export default {
              AddImageslink(this.picform.id,this.picform).then(response=>{
                 if(response.data.state ==1){
                   var editpiclink = response.data.data.editpiclink;
+                  var total = response.data.data.total;
+                  this.totalImages = total;
+                  if(total>=9){
+                     this.isNoEmpty = false;
+                  }
                   console.log("数据返回",editpiclink)
                   this.picform.linkaddress = "",
                   this.getEditImages();
@@ -2201,7 +2223,10 @@ export default {
        }).then(()=>{
          deleteRotations(id).then(response=>{
              if(response.data.state == 1){
+               var total = response.data.data.total;
+               this.totalImages = total;
                this.rotationdatatwo.splice(index,1)
+               this.isNoEmpty = true;
              }
          })
        })
@@ -2402,6 +2427,15 @@ export default {
              console.log("返回链接数据",magiclink)
           }
        })
+     },
+     getCountImages(){
+       getCountImages().then(response=>{
+          if(response.data.state == 1){
+           var total =  response.data.data.total;
+           this.totalImages = total;
+           console.log("total是什么",total)
+          }
+       })
      } 
   },  
   
@@ -2413,6 +2447,7 @@ export default {
      this.getArticleType();
      this.getEnImages();
      this.getMacLinkAddress();
+    //  this.getCountImages();
    },
  
  };