bug修改

src/api/site/site.js

@@ -541,9 +541,10 @@ export function addrotationImage(data){
     })
 }
 
-export function AddImageslink(data){
+export function AddImageslink(id,data){
+    console.log("id是多少呢法阿发",id)
    return request({
-       url:"/api/site/addimageslink",
+       url:"/api/site/addimageslink?id="+id,
        method:"Post",
        data:data,
    })
@@ -557,9 +558,10 @@ export function getEditImages(params){
     })
 }
 
-export function AddMagicNavi(data){
+export function AddMagicNavi(id,data){
+    console.log("id是什么呢",id)
    return request({
-       url:"/api/site/addmagicnavi",
+       url:"/api/site/addmagicnavi?id="+id,
        method:"Post",
        data:data,
    })
@@ -1009,7 +1011,7 @@ export function getEnImagesThree(params){
 }
 
 export function AddMagiclinkData(data){
-    console.log("data是什么",data)
+    console.log("中秋节快乐",data)
     return request({
         url:"/api/site/addmagiclinkdata",
         method:"Post",
@@ -1023,4 +1025,102 @@ export function getMacLinkAddress(params){
         method:"Get",
         params:params,
     })
+}
+
+export function AddMacgicform(id,data){
+    return request({
+        url:"/api/site/addmacgicform?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getMacImagesDetail(id,params){
+   return request({
+       url:"/api/site/getmacimagesdetail?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function deleteMacImagesDetail(id,data){
+   return request({
+       url:"/api/site/deletemaciamgesdetail?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function UpdateMacform(id,data){
+   return request({
+       url:"/api/site/updatemacform?id="+id,
+       method:"Post",
+       data:data,
+   }) 
+}
+
+export function getEditMacImageDetail(id,params){
+    return request({
+        url:"/api/site/geteditmacimagedetail?id="+id,
+        method:"Get",
+        params:params,
+    })
+}
+
+export function UpdateEditMacform(id,data){
+   return request({
+       url:"/api/site/updateeditmacform?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function getLikeMacAddressById(id,params){
+    return request({
+        url:"/api/site/getLikeMacAddressById?id="+id,
+        method:"Get",
+        params:params,
+    })
+}
+
+export function GetArticleName(id,params){
+   return request({
+       url:"/api/site/getarticlename?id="+id,
+       method:"Get",
+       params:params,
+   })
+}
+
+export function GetAllArticelist(params){
+    return request({
+        url:"/api/site/getallarticelist",
+        method:"Get",
+        params:params,
+    })
+}
+
+export function UpdateLinkAddress(id,data){
+    
+   return request({
+       url:"/api/site/updatelinkaddress?id="+id,
+       method:"Post",
+       data:data,
+   })
+}
+
+export function AddMacLinkAddress(data){
+    console.log("data是什么",data)
+   return request({
+       url:"/api/site/addmaclinkaddress",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function GetLinkAddress(id,params){
+   return request({
+       url:"/api/site/getlinkaddress?id="+id,
+       method:"Get",
+       params:params,
+   })
 }

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

@@ -110,14 +110,24 @@
   <el-form ref="picform" :model="picform" label-width="90px" :rules="rules">
     <el-form-item label="图片编辑:" required prop="imageUrl">
       <el-col :span="5">
-         <div class="addrot" @click="addpicdialogVisible = true">
+         <el-upload
+           :data="imageData"
+           class="avatar-uploader"
+           action="https://upload.qiniup.com"
+          :show-file-list="false"
+          :on-success="rotationSuccess"
+          :before-upload="rotationUpload">
+          <img v-if="picform.imageUrl" :src="picform.imageUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload> 
+         <!-- <div class="addrot" @click="addpicdialogVisible = true">
              <div class="addrotone">
              <i class="el-icon-plus"></i>
             </div>  
              <div class="addrotwo">
                <span>新增图片</span>
              </div>
-        </div>
+        </div> -->
       </el-col>
       <el-col :span="19" v-show="isImages">   
           <div class="tpic"> 
@@ -140,7 +150,7 @@
       <el-input v-model="picform.linkaddress" style="width:300px"></el-input>
       </el-col>
       <el-col :span="4">
-       <el-button size="medium" @click="addlink()">设置链接</el-button>
+       <el-button size="medium" @click="linkVisible = true">设置链接</el-button>
       </el-col>
     </el-form-item>
     
@@ -151,7 +161,7 @@
   </span>
 </el-dialog>
 
-   <el-dialog
+   <!-- <el-dialog
      title="添加图片"
      :visible.sync="addpicdialogVisible"
      width="30%"
@@ -174,7 +184,7 @@
     <el-button @click="addpicdialogVisible = false">取 消</el-button>
     <el-button type="primary" @click="addpicdialogVisible = false">确 定</el-button>
   </span>
-</el-dialog>
+</el-dialog> -->
   
   <!-- 设置图片链接地址 -->
   <el-dialog
@@ -655,7 +665,7 @@
   </el-dialog>
   <!-- 新增魔方导航 -->
     <el-dialog
-    title="新增魔方导航1"
+    title="新增魔方导航"
     :visible.sync="eight"
     width="550px"
     center>
@@ -706,11 +716,11 @@
     :visible.sync="EditMacDialogVisible"
     width="30%"
     center>
-    <el-form label-width="90px" ref="editmacform" :model="editmacform">
-      <el-form-item label="导航标题:">
+    <el-form label-width="90px" ref="editmacform" :model="editmacform" :rules="rules">
+      <el-form-item label="导航标题:" required prop="margtitle">
           <el-input v-model="editmacform.margtitle"></el-input>
       </el-form-item>
-      <el-form-item label="导航图标:">
+      <el-form-item label="导航图标:" required prop="margimage">
         <el-upload
           :data="rotationData"
           class="avatar-uploader"
@@ -722,7 +732,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>     
        </el-upload>
       </el-form-item>
-      <el-form-item label="跳转设置:">
+      <el-form-item label="跳转设置:" required="jumpset">
          <el-radio-group v-model="editmacform.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>
@@ -738,7 +748,7 @@
     </el-form>
    <span slot="footer" class="dialog-footer">
     <el-button @click="EditMacDialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="UpdateEditMacgin('editmacform');EditMacDialogVisible = false">确 定</el-button>
+    <el-button type="primary" @click="UpdateEditMacgin('editmacform');">确 定</el-button>
    </span>
   </el-dialog>
 
@@ -808,7 +818,7 @@
          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
        </el-upload>
        </el-form-item>
-       <el-form-item label="跳转设置">
+       <el-form-item label="跳转设置" required prop="jumpset">
          <el-radio-group v-model="editmarginform.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>
@@ -824,7 +834,7 @@
      </el-form>
     <span slot="footer" class="dialog-footer">
     <el-button @click="MagicNavigation = false">取 消</el-button>
-    <el-button type="primary" @click="AddMagicNavi('editmarginform');MagicNavigation = false">确 定</el-button>
+    <el-button type="primary" @click="AddMagicNavi('editmarginform');">确 定</el-button>
   </span>
 </el-dialog> 
 
@@ -833,14 +843,14 @@
   :visible.sync="magicVisible"
   width="30%"
   center>
-  <el-form label-width="90px" ref="maclinkform" model="maclinkform">
+  <el-form label-width="90px" ref="maclinkform" :model="maclinkform">
      <el-form-item label="连接类型">
          <el-radio-group v-model="maclinkform.linkType">
             <el-radio :label="item.id" :value="item.id" v-for="(item,index) in defineOptions" :key="index" @change="selectItemtwo(item.id)">{{item.name}}</el-radio>
          </el-radio-group>
      </el-form-item>  
        <el-form-item label="链接类型:" v-show="definetwo">
-       <el-select v-model="maclinkform.instationlink" placeholder="请选择"
+       <el-select v-model="maclinkform.instationlink" placeholder="请选择" clearable
        @change="changeArticeType">
         <el-option
         v-for="item in options"
@@ -851,14 +861,28 @@
       </el-select>
      </el-form-item>
      <el-form-item label="文章分类" v-show="definetwo">
-       <el-select v-model="maclinkform.articeType" placeholder="请选择">
-        <el-option
-        v-for="item in articeTypelist"
-        :key="item.id"
-        :label="item.name"
-        :value="item.id">
-       </el-option>
+       <el-col :span="8">
+         <el-select v-model="maclinkform.articeType" placeholder="请选择" clearable
+         @change="GetArticleById">
+          <el-option
+          v-for="item in articeTypelist"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+         </el-option>
+       </el-select>
+       </el-col>
+       <el-col :span="8">
+        <el-select v-model="maclinkform.title" placeholder="请选择" clearable>
+          <el-option
+           v-for="item in articeNamelist"
+           :key="item.id"
+           :label="item.title"
+           :value="item.id">
+        </el-option>
       </el-select>
+       </el-col>
+      
      </el-form-item>
      <el-form-item label="电话号码:" v-show="definethree">
        <el-input v-model="maclinkform.phone"></el-input>
@@ -869,7 +893,7 @@
   </el-form>
   <span slot="footer" class="dialog-footer">
     <el-button @click="magicVisible = false">取 消</el-button>
-    <el-button type="primary" @click="AddMagiclinkData('maclinkform');magicVisible = false">确 定</el-button>
+    <el-button type="primary" @click="AddMagiclinkData('maclinkform');">确 定</el-button>
   </span>
 </el-dialog>
 
@@ -967,7 +991,8 @@
    import { AddRotationChart, saveHispital,addOffices,AddDoctor,AddDoctorInfo,AddImages,AddOfficeEnvironment,getQueryDocInfo,change,
    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} from '@/api/site/site'  
+   ,AddArticeList,getEnImages,EditEnvirImages,AddtwoImages,deleteOfficeById,GetArticleById,GetAllActivity,AddLinkAddress,AddMagiclinkData,
+   getMacLinkAddress} from '@/api/site/site'  
    import { getToken } from '@/api/qiniu'
    import { getFileExtension} from '@/utils/tools'
    import { isIP, isIPv4 } from 'net';
@@ -1046,12 +1071,13 @@ export default {
           defineAddress:"",
        },
        maclinkform:{
-         linkType:"",
-         instationlink:"",
-         articeType:"",
-         phone:"",
-         outstationlink:"",
-         linkaddress:"",
+         linkType:'',
+         instationlink:'',
+         articeType:'',
+         title:'',
+         phone:'',
+         outstationlink:'',
+         linkaddress:'',
        },
        articeTypelist:[],
        acticeNamelist:[],
@@ -1188,6 +1214,7 @@ export default {
          ids:[],
       }, 
       editmarginform:{
+        id:"",
         margtitle:"",
         margImage:"",
         marginaddress:"",
@@ -1200,6 +1227,7 @@ export default {
         ids:[],
       },
       picform:{
+        id:"",
         imageUrl:"",
         sort:"",
         imagelink:"",
@@ -1248,8 +1276,8 @@ export default {
          image: [{required: true,message:"请填写新增名医"}],
          docname: [{required:true,message:"请填写医生姓名"}],
          doc_name:[{required:true,message:"请填写医生姓名"}],
-         docHead: [{required: true,message:"请填写医生头像"}],
-         dochead: [{required: true,message:"请填写医生头像"}],
+         docHead: [{required: true,message:"请上传医生头像"}],
+         dochead: [{required: true,message:"请上传医生头像"}],
          docpositional:[{required:true,message:"请填写医生职位"}],
          doc_postion:[{required:true,message:"请填写医生职位"}],
          docintroduction:[{required:true,message:"请填写医生简介"}],
@@ -1263,7 +1291,9 @@ export default {
          address:[{required:true,message:"请填写链接地址"}],
          number:[{required:true,message:"请填写活动条数"},{validator:checkSortRule}],
          enviroimages:[{required:true,message:"请上传图片"}],
-         marginImages:[{required:true,message:"请添加图片"}]
+         marginImages:[{required:true,message:"请添加图片"}],
+         jumpset:[{required:true,message:"请选择跳转设置"}],
+         margImage:[{required:true,message:"请上传导航图标"}],
       },
     };
   },
@@ -1323,6 +1353,7 @@ export default {
                 var patientLinkaddress =  response.data.data.patientLinkaddress;
                 var address = response.data.data.address;
                 this.picform.linkaddress = address.linkaddress;
+                this.picform.id = address.id;
                 console.log("返回地址是多少",address)
                 console.log("数据返回",patientLinkaddress)
               }
@@ -1334,9 +1365,6 @@ export default {
     OpenCreate(){
        this.$refs.newfeature.Open();
     },
-      addlink(){
-        this.linkVisible = true;
-      },
      //轮播图
      rotationEditImages(){
         this.dialogRotationVisible = true;
@@ -2027,41 +2055,42 @@ export default {
         }
      },
       selectItemtwo(id){
-        alert(id)
        if(id == 1){
          this.definetwo = false;
          this.definethree = false;
          this.definefour = false;
-         this.maclinkform.instationlink = "";
-         this.maclinkform.articeType = "";
-         this.maclinkform.phone = "";
-         this.maclinkform.outstationlink = "";
+         this.maclinkform.instationlink = '';
+         this.maclinkform.articeType = '';
+         
+         this.maclinkform.phone = '';
+         this.maclinkform.outstationlink = '';
+        
        }
 
        if(id==2){
           this.definetwo = true;
           this.definethree = false;
           this.definefour = false;
-          this.maclinkform.phone = "";
-          this.maclinkform.outstationlink = "";
+          this.maclinkform.phone = '';
+          this.maclinkform.outstationlink = '';
        }
 
        if(id==3){
          this.definethree = true;
          this.definetwo = false;
          this.definefour = false;
-         this.maclinkform.instationlink = "";
-         this.maclinkform.articeType = "";
-         this.maclinkform.outstationlink = "";
+         this.maclinkform.instationlink = '';
+         this.maclinkform.articeType = '';
+         this.maclinkform.outstationlink = '';
        }
 
        if(id==4){
          this.definefour = true;
          this.definetwo = false;
          this.definethree = false;
-         this.maclinkform.instationlink = "";
-         this.maclinkform.articeType = "";
-         this.maclinkform.phone = "";
+         this.maclinkform.instationlink = '';
+         this.maclinkform.articeType = '' ;
+         this.maclinkform.phone = '';
        }
      },
         
@@ -2075,7 +2104,7 @@ export default {
          
         this.$refs[formName].validate((valid)=>{
           if(valid){
-             AddImageslink(this.picform).then(response=>{
+             AddImageslink(this.picform.id,this.picform).then(response=>{
                 if(response.data.state ==1){
                   var editpiclink = response.data.data.editpiclink;
                   console.log("数据返回",editpiclink)
@@ -2106,15 +2135,17 @@ export default {
      AddMagicNavi(formName){
         this.$refs[formName].validate((valid)=>{
           if(valid){
-            AddMagicNavi(this.editmarginform).then(response=>{
+            AddMagicNavi(this.editmarginform.id,this.editmarginform).then(response=>{
               if(response.data.state == 1){
+               this.editmarginform.marginaddress = "";
+               this.getMagicImages();
                var editmargin  = response.data.data.editmargin;
-                this.getMagicImages();
                 this.isEmpty = true;
                 this.editmarginform.margtitle = "";
                 this.editmarginform.margImage = "";
-                this.editmarginform.marginaddress = "";
                 this.editmarginform.jumpset = "";
+                this.MagicNavigation = false;
+                
               }
             })
           }
@@ -2153,6 +2184,7 @@ export default {
               this.marginform.sort = "";
               this.marginform.marginImages = [];
               this.marginform.margintTitle = [];
+              this.marginform.ids = [];
               this.isEmpty = false;
              }
           })
@@ -2240,12 +2272,17 @@ export default {
       })
     },
 
-    UpdateEditMacgin(){
-      UpdateEditMacgin(this.editmacform.id,this.editmacform).then(response=>{
+    UpdateEditMacgin(formName){
+      this.$refs[formName].validate((valid)=>{
+        if(valid){
+         UpdateEditMacgin(this.editmacform.id,this.editmacform).then(response=>{
           if(response.data.state ==1){
             var editmargin = response.data.data.editmargin;
+            this.EditMacDialogVisible = false;
             this.getMagicImages();
-          }
+           }
+         })
+        }
       })
     },
 
@@ -2291,48 +2328,67 @@ export default {
         }
         if(id == 2){
           
-          this.maclinkform.articeType = "";
+         
         }
         if(id == 3){
          
-          this.maclinkform.articeType = "";
+          
         }
        if(id == 4){
          
-          this.maclinkform.articeType = "";
+          
         }
        if(id == 5){
           
-          this.maclinkform.articeType = "";
+        
         }
        if(id == 6){
          
-          this.maclinkform.articeType = "";
+          
         }
        if(id == 7){
          
-          this.maclinkform.articeType = "";
+         
         }
      },
+  
      AddMagiclinkData(formName){
-        this.$refs[formName].validate((valid)=>{
+         if(this.maclinkform.instationlink == ""){
+            this.maclinkform.instationlink = 0;
+         }
          var instationlink =  this.maclinkform.instationlink;
          var instationlinks = parseInt(instationlink);
          this.maclinkform.instationlink = instationlinks;
-         console.log("站内链接",this.maclinkform.instationlink)
-          
-      
+        if(this.maclinkform.articeType == ""){
+          this.maclinkform.articeType = 0;
+        }
          var articeType = this.maclinkform.articeType;
          var articeTypes =  parseInt(articeType);
          this.maclinkform.articeType = articeTypes;
-         console.log("站外链接",this.maclinkform.articeType)
-         this.maclinkform.linkaddress = "www.baidu.com";
-          console.log("电话号码是啥",this.maclinkform.phone)
+
+       if(this.maclinkform.title == ""){
+          this.maclinkform.title = 0;
+       }
+       var articeTitle =  this.maclinkform.title;
+       var articeTitle =  parseInt(articeTitle);
+       this.maclinkform.title = articeTitle;
+
+         this.maclinkform.linkaddress = "/articles/createArticle/?id="+this.maclinkform.title;
+        this.$refs[formName].validate((valid)=>{
           if(valid){
             AddMagiclinkData(this.maclinkform).then(response=>{
                 if(response.data.state == 1){
                   var magiclink =  response.data.data.magiclink;
+                  var patientMagiclink  = response.data.data.patientMagiclink;
+                 this.editmarginform.marginaddress = patientMagiclink.linkaddress;
+                 this.editmarginform.id =  patientMagiclink.id
+                  this.magicVisible = false;
                   console.log("链接返回数据",magiclink)
+                  this.maclinkform.articeType = "";
+                  this.maclinkform.instationlink = "";
+                  this.maclinkform.phone = "";
+                  this.maclinkform.outstationlink = "";
+                  this.maclinkform.title = "";
                 }
             })
           }
@@ -2342,6 +2398,7 @@ export default {
        getMacLinkAddress().then(response=>{
           if(response.data.state ==1){
              var magiclink =  response.data.data.magiclink;
+            //  this.editmarginform.marginaddress = magiclink.linkaddress;
              console.log("返回链接数据",magiclink)
           }
        })