update

src/api.js

@@ -497,4 +497,14 @@ export default {
 	getOplogList: params => {
 		return axios.get(`${baseURL}/api/admin/oplog/list`, { params: params });
 	},
+	// 会议、活动、文章搜索
+	getConferenceSearch: params => {
+		return axios.get(`${baseURL}/api/admin/conference/search`, { params: params });
+	},
+	getActivitySearch: params => {
+		return axios.get(`${baseURL}/api/admin/activity/search`, { params: params });
+	},
+	getArticleSearch: params => {
+		return axios.get(`${baseURL}/api/admin/article/search`, { params: params });
+	},
 }

src/views/activity/OldActivity.vue

@@ -223,7 +223,7 @@ export default {
       });
     },
     edit(row) {
-      this.$router.push({path:'/learning/oldactivity/add',query:{id:row.id}})
+      this.$router.push({path:'/learning/oldactivity/add',query:{id:row.id,type:1}})
     },
     save() {
       this.$refs["form1"].validate((valid) => {

src/views/conference/Apply.vue

@@ -146,7 +146,8 @@
                     prop="zip"  width="260" fixed="right"
                     label="操作">
                     <template slot-scope="scope">
-                        <el-button  @click="invoice=scope.row,dialogVisible2=true,invoice.reject_reason=''" class="edit"  type="text" >审核</el-button>
+                        <el-button  @click="invoice=scope.row,dialogVisible2=true,invoice.reject_reason=''" class="edit"  type="text" 
+                            :disabled="form.order_status==2||form.order_status==3||form.order_status==4">审核</el-button>
                         <el-button @click="invoice=scope.row,dialogVisible=true"  type="text">发票详情</el-button>
                         <el-button @click="proof_img=scope.row.proof_img,dialogVisible3=true"    type="text" >入住凭证</el-button>
                         <el-button @click="dialogVisible1=true,getReason(scope.row)"   type="text" >驳回原因</el-button>

src/views/conference/Manage.vue

@@ -127,7 +127,7 @@
                     prop="zip"  width="220" 
                     label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="dialogVisible=true,dialogTitle='编辑酒店',status='edit',h_id=scope.row.id"  type="text">编辑</el-button>
+                        <el-button @click="editHotel(scope.row.id)"  type="text">编辑</el-button>
                         <el-button @click="delHotel(scope.row.id)" type="text" class="del">删除</el-button>
                         <el-button @click="updown(scope.row.id,'up')" type="text" class="edit">上移</el-button>
                         <el-button @click="updown(scope.row.id,'down')" type="text" class="edit">下移</el-button>
@@ -244,6 +244,13 @@ export default {
                     })
                 })
         },
+        editHotel(id){
+            this.getHotel(this.cur_id)
+            this.dialogVisible=true
+            this.dialogTitle='编辑酒店'
+            this.status='edit'
+            this.h_id=id
+        }
   },
   created(){
     //   this.getPermissions()

src/views/system/Banners.vue

@@ -75,7 +75,7 @@
           </el-form-item>
           <el-form-item style="float: right">
             <el-button
-              @click="form1={},(dialogVisible = true), (dialogTitle = '新增Banner图')"
+              @click="add"
               type="primary"
               >新增Banner图</el-button
             >
@@ -162,8 +162,15 @@
           <el-radio v-model="form1.is_jump" :label="1">是</el-radio>
           <el-radio v-model="form1.is_jump" :label="0">否</el-radio>
         </el-form-item>
-        <el-form-item label="跳转地址">
-          <el-input v-model="form1.url" placeholder="请输入跳转地址"></el-input>
+        <el-form-item label="跳转地址" v-if="form1.is_jump">
+          <el-select v-model="form1.seltype" placeholder="请选择" @change="getSelData" style="display:inline-block;width:100px;">
+            <el-option label="会议" value="conference"></el-option>
+            <el-option label="活动" value="activity"></el-option>
+            <el-option label="文章" value="article"></el-option>
+          </el-select>
+          <el-select filterable v-model="form1.selval" placeholder="请选择" style="display:inline-block;width:85%;">
+            <el-option v-for="(item,index) in selData" :label="item.name" :value="item.id" :key="index"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -180,8 +187,8 @@ export default {
   },
   data() {
     return {
-      form: { name: "", page: 1, page_size: 20 },
-      form1: {is_active:1,is_jump:0,img:""},
+      form: { name: "", page: 1, page_size: 20,},
+      form1: {is_active:1,is_jump:1,img:"",seltype:"conference"},
       total: 1,
       list: [{ name: "2333" }],
       loading: false,
@@ -191,17 +198,48 @@ export default {
       defaultProps: {},
       data: [],
       selected: [],
+      selData:[]
     };
   },
   methods: {
     handleAvatarSuccess(res, file) {
-      // this.form1.img = file.response.data;
       this.$set(this.form1,"img",file.response.data)
     },
     search() {
       let parm = this.form;
       this.getData();
     },
+    getSelData(){
+      this.selData = []
+      if(this.form1.seltype=="conference"){
+        this.$api.getConferenceSearch().then((res)=>{
+          this.selData = res.data.data
+        })
+      }
+      if(this.form1.seltype=="activity"){
+        this.$api.getActivitySearch().then((res)=>{
+          this.selData = res.data.data
+        })
+      }
+      if(this.form1.seltype=="article"){
+        this.$api.getArticleSearch().then((res)=>{
+          this.selData = res.data.data
+        })
+      }
+    },
+    getUrl(){
+      let url = ""
+      if(this.form1.seltype=="conference"){
+        url = "../eventDetail/eventDetail?id="+this.form1.selval
+      }
+      if(this.form1.seltype=="activity"){
+        url = "../conference/conference?id="+this.form1.selval
+      }
+      if(this.form1.seltype=="article"){
+        url = "../actDetail/actDetail?id="+this.form1.selval
+      }
+      return url
+    },
     getData() {
       var parm = this.form;
       this.loading = true;
@@ -219,6 +257,11 @@ export default {
       this.form.page = this.$refs.pageButton.page;
       this.getData();
     },
+    add(){
+      this.form1={is_active:1,is_jump:1,img:"",seltype:"conference"},
+      this.dialogVisible = true
+      this.dialogTitle = '新增Banner图'
+    },
     edit(id){
       this.$api.getBanners({id:id}).then((res)=>{
         this.form1 = res.data.data
@@ -240,6 +283,8 @@ export default {
     },
     save() {
       let parm = this.form1;
+      let url = this.getUrl()
+      parm.url = url
       if (parm.id) {
         this.$api.updateBanners(parm).then((res) => {
           if (res.data.code == 0) {
@@ -270,6 +315,7 @@ export default {
   },
   created() {
     this.getData();
+    this.getSelData();
   },
 };
 </script>