From bfccec7127dd48d5777b5df82a06ea3d67bac2ef Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Fri, 11 Apr 2025 15:49:37 +0800
Subject: [PATCH] 拉去

---
 admin-web-master/src/components/add/addmap.vue          | 14 +++++++++++++-
 admin-web-master/src/components/chakan/fa.vue           |  6 ++++--
 admin-web-master/src/views/aaa/index.vue                | 10 +++++-----
 ceres-uniapp-master/components/canvasShow/config/api.js |  2 +-
 ceres-uniapp-master/config/api.js                       |  4 ++--
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 0db9e4a..dd26e4d 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -11,7 +11,7 @@
         <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
       </el-form-item>
       <el-form-item label="所属端" prop="affiliation" >
-        <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;">
+        <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;"  @change="affiliationChange">
           <!-- <el-option label="游客小程序" value="游客小程序"></el-option>
           <el-option label="商家客户端" value="商家客户端"></el-option> -->
           <el-option v-for="(item,index) in owningEndList"
@@ -371,6 +371,18 @@
 			        this.formInline.rotationOrder = '第' + (selectedIndex + 1) + '张';
 			      }
 		},
+		async affiliationChange(value){
+				let arList = []
+			let res= await bannerGet({pageNumber: 1,pageSize: 20})
+			arList = res.data.content
+				if(value == '在线商城'){
+					 this.tableData =  arList.filter(item => item.type === 1);
+					 this.$forceUpdate()
+				}else{
+					  this.tableData = arList.filter(item => item.type === 2);
+				}
+				
+		},
       validateNumber(field, value) {
       // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
         const regex = /^\d+(\.\d{1,2})?$/;
diff --git a/admin-web-master/src/components/chakan/fa.vue b/admin-web-master/src/components/chakan/fa.vue
index 4ed9d6e..e9178a7 100644
--- a/admin-web-master/src/components/chakan/fa.vue
+++ b/admin-web-master/src/components/chakan/fa.vue
@@ -49,9 +49,11 @@
                     {{scope.row.shopinfo.policyName}}
                   </template>
                 </el-table-column>
-                <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
+                <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}
+                    
+					<span v-if="scope.row.type!='广告位'">{{scope.row.shopinfo.rentalPrice}} 元/m²</span>
+					<span v-else>{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
diff --git a/admin-web-master/src/views/aaa/index.vue b/admin-web-master/src/views/aaa/index.vue
index 1a92232..27c5a6e 100644
--- a/admin-web-master/src/views/aaa/index.vue
+++ b/admin-web-master/src/views/aaa/index.vue
@@ -12,14 +12,14 @@
           </el-button>
         </div>
         <!-- 表格 -->
-        <el-table :data="tableData"
+        <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
           style="width: 100%">
-          <el-table-column label="序号" min-width="5%" prop="id">
+          <!-- <el-table-column label="序号" min-width="5%" prop="id">
             <template slot-scope="scope">
               {{scope.$index +1 }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="轮播图" prop="" min-width="20%">
             <template slot-scope="scope">
               <el-image  style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image>
@@ -162,8 +162,8 @@
       handleSizeChange() {
 
       },
-      handleCurrentChange() {
-
+      handleCurrentChange(val) {
+	this.currentPage = val
       },
        addCheck() {
 		   this.$refs.ruleForm.validate((valid) => {
diff --git a/ceres-uniapp-master/components/canvasShow/config/api.js b/ceres-uniapp-master/components/canvasShow/config/api.js
index 51fdd7a..8e7347b 100644
--- a/ceres-uniapp-master/components/canvasShow/config/api.js
+++ b/ceres-uniapp-master/components/canvasShow/config/api.js
@@ -7,7 +7,7 @@
 const host = `${window.location.protocol}//${window.location.host}`
 const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
 // const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.28:9007'
+const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.9:9007'
 
 
 
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 4cda051..02ddab3 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -2,8 +2,8 @@
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
 const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
-const DOMAIN_PREFIXPING = 'http://128.10.249.28:9003' 
-const DOMAIN_PREFIX = 'http://128.10.249.28:9007'
+const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003' 
+const DOMAIN_PREFIX = 'http://128.10.249.9:9007'
 // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
 // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
--
libgit2 0.21.4