From bfa2ad53dabe61846a074949a4635b9c4a7ac7b6 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Thu, 3 Apr 2025 10:26:00 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/components/add/addmap.vue   | 26 +++++++++++++++++++++++++-
 admin-web-master/src/utils/request.js            |  2 +-
 admin-web-master/src/utils/request2.js           |  2 +-
 admin-web-master/src/views/serve/salesReport.vue |  2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 8f718df..e1344f0 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -43,6 +43,12 @@
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
+	  <!-- <el-form-item label="广告位位置" prop="carouselId"  v-if="formInline.advertisingType == '线上广告位'">
+	    <el-select v-model="formInline.carouselId" placeholder="请选择" style="width: 100%;">
+	      <el-option :label="`${item.type==1?'商城端':'商家端'}第${index+1}个广告位`" :value="item.id" v-for="(item,index) in bannerList"
+	        :key="index"></el-option>
+	    </el-select>
+	  </el-form-item> -->
       <el-form-item label="介绍" prop="memo">
         <wangEditor v-model="formInline.memo" ref="editor" :height="200"></wangEditor>
         <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
@@ -119,6 +125,7 @@
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
+	  
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -152,6 +159,9 @@
 	parkTrails,
   gongyuan
   } from '@/api/information.js';
+  import {
+    bannerGet,
+  } from '@/api/banner';
   export default {
     components: {
       upimg,
@@ -207,9 +217,9 @@
           onlineType: '' ,// 线上类型
           belongingGreenwaySection: '', // 所属绿道段
           belongingParkTrail: '', // 所属公园/步道
+		  // carouselId:'',//选择租赁广告位置
         },
         rules: {
-          
           advertisingType: [{
             required: true,
             message: '请选择广告类型',
@@ -230,11 +240,17 @@
             message: '请选择轮播顺序',
             trigger: ['change']
           }],
+		  // carouselId:[{
+		  // 			  required: true,
+		  // 			  message: '请选择广告位位置',
+		  // 			  trigger: ['change']
+		  // }],
           locationDiagram: [{
             required: true,
             message: '请上传位置示意图',
             trigger: ['change']
           }],
+		  
         },
         rulesSt: {
           belongingGreenwaySection: [{
@@ -286,6 +302,7 @@
         edit: true,
         iShsow:true,
         lvdaoList: [],
+		bannerList:[]
       };
     },
     computed: {
@@ -341,6 +358,13 @@
       const lvdao = await lvdaoduan()
 	const gongyua  = await parkTrails() 
 	  this.lvdaoList = lvdao.data.concat(gongyua.data)
+	  let obj = {
+		  pageNumber: 1,
+		  pageSize: 10
+	  }
+	  const banner  = await bannerGet(obj) 
+	  this.bannerList = banner.data.content
+	  
     },
     methods: {
       validateNumber(field, value) {
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 5a33e6c..04160ad 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  baseURL = 'http://128.10.249.39:9003';
+  baseURL = 'http://128.10.249.37:9003';
 
 
 } else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index e3e1f58..c17b4e3 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
   // baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-    baseURL = 'http://128.10.249.44:9004';
+    baseURL = 'http://128.10.249.37:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/serve/salesReport.vue b/admin-web-master/src/views/serve/salesReport.vue
index 66bc396..5fd50ac 100644
--- a/admin-web-master/src/views/serve/salesReport.vue
+++ b/admin-web-master/src/views/serve/salesReport.vue
@@ -93,7 +93,7 @@
 
       </div>
     </div>
-<iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" />
+<!-- <iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
 <!-- <iframe v-if="show" src="https://zhgw-uat.028wlkj.com/cdwlMall/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
   </div>
 </template>
--
libgit2 0.21.4