From 3a1f257bc4f7ed3aa18d7b22cfd5d923a5383ee3 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Sun, 23 Mar 2025 15:43:12 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/api/actSp.js                                             |   8 ++++++++
 admin-web-master/src/utils/request.js                                         |   4 ++--
 admin-web-master/src/views/activity/activityHis.vue                           | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 admin-web-master/src/views/atmosphere/atmosphereHis.vue                       | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------
 admin-web-master/src/views/serve/actSp.vue                                    |  72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 ceres-uniapp-master/components/canvasShow/basics/banner.vue                   |   2 +-
 ceres-uniapp-master/config/api.js                                             |  14 +++++++-------
 ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue        |   2 +-
 ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue         |   4 ++--
 ceres-uniapp-master/pages_category_page1/store/index.vue                      |   4 ++--
 lvdao-miniapp/pages.json                                                      |   2 +-
 lvdao-miniapp/pages/activityDetail/activityDetail.scss                        |  30 ++++++++++++++++++++++++++++++
 lvdao-miniapp/pages/activityDetail/activityDetail.vue                         |  92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 lvdao-miniapp/pages/workbench/workbench.vue                                   |   6 ++++--
 lvdao-miniapp/pagesA/application/application.vue                              |   2 +-
 lvdao-miniapp/utils/request.js                                                |   6 +++---
 merchant-web-master/dist.zip                                                  | Bin 2924447 -> 0 bytes
 merchant-web-master/src/utils/request.js                                      |   3 ++-
 merchant-web-master/src/utils/request2.js                                     |   6 +++---
 merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue |   2 +-
 merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue      |   5 +++--
 merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue      |   4 ++--
 merchant-web-master/src/views/salesSta/dataSta.vue                            |   2 +-
 merchant-web-master/src/views/stockControl/inventory/addCommodity.vue         |   5 +++--
 merchant-web-master/src/views/stockControl/inventory/addComponent.vue         |   4 ++--
 merchant-web-master/src/views/stockControl/stocksForewarn/index.vue           |   4 ++--
 26 files changed, 426 insertions(+), 240 deletions(-)
 delete mode 100644 merchant-web-master/dist.zip

diff --git a/admin-web-master/src/api/actSp.js b/admin-web-master/src/api/actSp.js
index 3bf2725..36435c5 100644
--- a/admin-web-master/src/api/actSp.js
+++ b/admin-web-master/src/api/actSp.js
@@ -35,3 +35,11 @@ export function QRcode(data) {
     data
   })
 }
+//获取活动名单
+export function Registration(data) {
+  return request({
+    url: '/cereActivityApplicationSignUp/queryByPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index b492344..4911a3d 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue
index befc2a6..639d44d 100644
--- a/admin-web-master/src/views/activity/activityHis.vue
+++ b/admin-web-master/src/views/activity/activityHis.vue
@@ -1206,15 +1206,17 @@
 		<el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
 			:close-on-press-escape="false">
 			<div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
-				<el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
-					<el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
-						:value="index">
+				<!-- @change="lichangeOne" -->
+				<el-input v-model="ListOne"  style="width: 26%;" disabled/>
+				<!-- <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" >
+					<el-option  :label="effectivenessListOne.planName" :value="effectivenessListOne.planName">
 					</el-option>
-				</el-select>
+				</el-select> -->
+			
 				<div style="line-height:200%;">
 					<img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
 				</div>
-				<el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
+				<el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;width: 26%;" @change="lichangeTwo">
 					<el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
 						:value="index">
 					</el-option>
@@ -2335,7 +2337,8 @@
 
 			},
 			xiaoguo(item) {
-
+this.effectivenessListOne = item
+this.ListOne = item.planName
 				this.xiaoDui = true
 				this.duibiOne = item
 				console.log(item)
@@ -2350,9 +2353,9 @@
 						this.effectivenessList[index].operationType = actName[0]
 					})
 				})
-				this.ListOne = ''
+				// this.ListOne = ''
 				this.ListTwo = ''
-				this.effectivenessListOne = {}
+				// this.effectivenessListOne = {}
 				this.effectivenessListTwo = {}
 
 				// actPage({
@@ -2549,90 +2552,90 @@
 				this.duibiList = JSON.parse(msg.modifiedData)
 
 			},
-			lichangeOne(e) {
-				let msg = this.effectivenessList[e]
-				if (typeof msg.modifiedData == 'string') {
-					this.effectivenessListOne = JSON.parse(msg.modifiedData)
-				} else {
-					this.effectivenessListOne = msg.modifiedData
-				}
-
-				if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
-					.internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
-					'' && this.effectivenessListTwo
-					.internalLaborCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
-						.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
-						.internalLaborCostEstimation) * 100
-					this.effectivenessListOne.sumNei = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
-					.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
-					'' && this.effectivenessListTwo
-					.externalLaborCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
-						.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
-						.externalLaborCostEstimation) * 100
-					this.effectivenessListOne.sumWai = sum.toFixed(2)
+			// lichangeOne(e) {
+			// 	let msg = this.effectivenessList[e]
+			// 	if (typeof msg.modifiedData == 'string') {
+			// 		this.effectivenessListOne = JSON.parse(msg.modifiedData)
+			// 	} else {
+			// 		this.effectivenessListOne = msg.modifiedData
+			// 	}
 
-				}
-				if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
-					.costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
-					.effectivenessListTwo
-					.costEstimationGoods != '') {
-					let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
-						.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
-					this.effectivenessListOne.sumShop = sum.toFixed(2)
+			// 	if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
+			// 		.internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
+			// 		'' && this.effectivenessListTwo
+			// 		.internalLaborCostEstimation != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
+			// 			.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
+			// 			.internalLaborCostEstimation) * 100
+			// 		this.effectivenessListOne.sumNei = sum.toFixed(2)
+			// 	}
+			// 	if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
+			// 		.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
+			// 		'' && this.effectivenessListTwo
+			// 		.externalLaborCostEstimation != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
+			// 			.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+			// 			.externalLaborCostEstimation) * 100
+			// 		this.effectivenessListOne.sumWai = sum.toFixed(2)
 
-				}
-				if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
-					undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
-					.setCostEstimate != '') {
-					let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
-						.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
-					this.effectivenessListOne.sumSe = sum.toFixed(2)
+			// 	}
+			// 	if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
+			// 		.costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
+			// 		.effectivenessListTwo
+			// 		.costEstimationGoods != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
+			// 			.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
+			// 		this.effectivenessListOne.sumShop = sum.toFixed(2)
 
-				}
-				if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
-					.estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
-					'' && this.effectivenessListTwo
-					.estimatedPromotionalExpenses != '') {
-					let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
-						.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
-						.estimatedPromotionalExpenses) * 100
+			// 	}
+			// 	if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
+			// 		undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
+			// 		.setCostEstimate != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
+			// 			.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
+			// 		this.effectivenessListOne.sumSe = sum.toFixed(2)
 
-					this.effectivenessListOne.sumXuan = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
-					.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
-					this.effectivenessListTwo
-					.otherNecessaryEstimates != '') {
-					let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
-					this.effectivenessListOne.sumQi = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
-					.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
-					.effectivenessListTwo
-					.totalCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
-					this.effectivenessListOne.sumAll = sum.toFixed(2)
-				}
-				// sumNei
-				// sumWai
-				// sumShop
-				// sumSe
-				// sumXuan
-				// sumQi
-				// sumAll
-				// internalLaborCostEstimation
-				// externalLaborCostEstimation
-				// costEstimationGoods
-				// setCostEstimate
-				// estimatedPromotionalExpenses
-				// otherNecessaryEstimates
-				// totalCostEstimation
+			// 	}
+			// 	if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
+			// 		.estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
+			// 		'' && this.effectivenessListTwo
+			// 		.estimatedPromotionalExpenses != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
+			// 			.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+			// 			.estimatedPromotionalExpenses) * 100
+
+			// 		this.effectivenessListOne.sumXuan = sum.toFixed(2)
+			// 	}
+			// 	if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
+			// 		.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
+			// 		this.effectivenessListTwo
+			// 		.otherNecessaryEstimates != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+			// 		this.effectivenessListOne.sumQi = sum.toFixed(2)
+			// 	}
+			// 	if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
+			// 		.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
+			// 		.effectivenessListTwo
+			// 		.totalCostEstimation != '') {
+			// 		let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+			// 		this.effectivenessListOne.sumAll = sum.toFixed(2)
+			// 	}
+			// 	// sumNei
+			// 	// sumWai
+			// 	// sumShop
+			// 	// sumSe
+			// 	// sumXuan
+			// 	// sumQi
+			// 	// sumAll
+			// 	// internalLaborCostEstimation
+			// 	// externalLaborCostEstimation
+			// 	// costEstimationGoods
+			// 	// setCostEstimate
+			// 	// estimatedPromotionalExpenses
+			// 	// otherNecessaryEstimates
+			// 	// totalCostEstimation
 
-			},
+			// },
 			lichangeTwo(e) {
 				let msg = this.effectivenessList[e]
 				if (typeof msg.modifiedData == 'string') {
@@ -2646,7 +2649,7 @@
 					'' && this.effectivenessListTwo
 					.internalLaborCostEstimation != '') {
 					let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
-						.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
+						.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListOne
 						.internalLaborCostEstimation) * 100
 					this.effectivenessListOne.sumNei = sum.toFixed(2)
 				}
@@ -2654,11 +2657,9 @@
 					.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
 					'' && this.effectivenessListTwo
 					.externalLaborCostEstimation != '') {
-						
 					let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
-						.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+						.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListOne
 						.externalLaborCostEstimation) * 100
-						console.log(sum.toFixed(2),'console.log(sum.toFixed(2))')
 					this.effectivenessListOne.sumWai = sum.toFixed(2)
 				
 				}
@@ -2667,7 +2668,7 @@
 					.effectivenessListTwo
 					.costEstimationGoods != '') {
 					let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
-						.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
+						.costEstimationGoods)) / Number(this.effectivenessListOne.costEstimationGoods) * 100
 					this.effectivenessListOne.sumShop = sum.toFixed(2)
 				
 				}
@@ -2675,7 +2676,7 @@
 					undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
 					.setCostEstimate != '') {
 					let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
-						.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
+						.setCostEstimate)) / Number(this.effectivenessListOne.setCostEstimate) * 100
 					this.effectivenessListOne.sumSe = sum.toFixed(2)
 				
 				}
@@ -2684,7 +2685,7 @@
 					'' && this.effectivenessListTwo
 					.estimatedPromotionalExpenses != '') {
 					let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
-						.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+						.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListOne
 						.estimatedPromotionalExpenses) * 100
 				
 					this.effectivenessListOne.sumXuan = sum.toFixed(2)
@@ -2693,14 +2694,14 @@
 					.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
 					this.effectivenessListTwo
 					.otherNecessaryEstimates != '') {
-					let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+					let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListOne.otherNecessaryEstimates) * 100
 					this.effectivenessListOne.sumQi = sum.toFixed(2)
 				}
 				if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
 					.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
 					.effectivenessListTwo
 					.totalCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+					let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListOne.totalCostEstimation) * 100
 					this.effectivenessListOne.sumAll = sum.toFixed(2)
 				}
 				// sumNei
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
index b35ef11..6a52a0b 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -1203,15 +1203,16 @@
 		<el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
 			:close-on-press-escape="false">
 			<div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
-				<el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
+				<el-input v-model="ListOne"  style="width: 26%;" disabled/>
+				<!-- <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
 					<el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
 						:value="index">
 					</el-option>
-				</el-select>
+				</el-select> -->
 				<div style="line-height:200%;">
 					<img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
 				</div>
-				<el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
+				<el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;width: 26%;" @change="lichangeTwo">
 					<el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
 						:value="index">
 					</el-option>
@@ -2316,7 +2317,8 @@
 
 			},
 			xiaoguo(item) {
-
+this.effectivenessListOne = item
+this.ListOne = item.planName
 				this.xiaoDui = true
 				this.duibiOne = item
 				console.log(item)
@@ -2330,9 +2332,9 @@
 						this.effectivenessList[index].operationType = actName[0]
 					})
 				})
-				this.ListOne = ''
+				// this.ListOne = ''
 				this.ListTwo = ''
-				this.effectivenessListOne = {}
+				// this.effectivenessListOne = {}
 				this.effectivenessListTwo = {}
 
 				// this.xiaoDui = true
@@ -2522,7 +2524,7 @@
 				this.searchShow = true
 			},
 			lichange(e) {
-				console.log(e)
+				
 				// this.lishiList = e
 				// let msg = this.liData[e]
 				// this.duibiList = JSON.parse(msg.modifyContent)
@@ -2530,91 +2532,91 @@
 				let msg = this.effectivenessList[e]
 				this.duibiList = JSON.parse(msg.modifiedData)
 			},
-			lichangeOne(e) {
-				let msg = this.effectivenessList[e]
-				if (typeof msg.modifiedData == 'string') {
-					this.effectivenessListOne = JSON.parse(msg.modifiedData)
-				} else {
-					this.effectivenessListOne = msg.modifiedData
-				}
-
-				if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
-					.internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
-					'' && this.effectivenessListTwo
-					.internalLaborCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
-						.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
-						.internalLaborCostEstimation) * 100
-					this.effectivenessListOne.sumNei = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
-					.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
-					'' && this.effectivenessListTwo
-					.externalLaborCostEstimation != '') {
+	// 		lichangeOne(e) {
+	// 			let msg = this.effectivenessList[e]
+	// 			if (typeof msg.modifiedData == 'string') {
+	// 				this.effectivenessListOne = JSON.parse(msg.modifiedData)
+	// 			} else {
+	// 				this.effectivenessListOne = msg.modifiedData
+	// 			}
+
+	// 			if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
+	// 				.internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
+	// 				'' && this.effectivenessListTwo
+	// 				.internalLaborCostEstimation != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
+	// 					.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
+	// 					.internalLaborCostEstimation) * 100
+	// 				this.effectivenessListOne.sumNei = sum.toFixed(2)
+	// 			}
+	// 			if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
+	// 				.externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
+	// 				'' && this.effectivenessListTwo
+	// 				.externalLaborCostEstimation != '') {
 	
-					let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
-						.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
-						.externalLaborCostEstimation) * 100
-					this.effectivenessListOne.sumWai = sum.toFixed(2)
+	// 				let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
+	// 					.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+	// 					.externalLaborCostEstimation) * 100
+	// 				this.effectivenessListOne.sumWai = sum.toFixed(2)
 				
-				}
-				if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
-					.costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
-					.effectivenessListTwo
-					.costEstimationGoods != '') {
-					let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
-						.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
-					this.effectivenessListOne.sumShop = sum.toFixed(2)
+	// 			}
+	// 			if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
+	// 				.costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
+	// 				.effectivenessListTwo
+	// 				.costEstimationGoods != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
+	// 					.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
+	// 				this.effectivenessListOne.sumShop = sum.toFixed(2)
 				
-				}
-				if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
-					undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
-					.setCostEstimate != '') {
-					let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
-						.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
-					this.effectivenessListOne.sumSe = sum.toFixed(2)
+	// 			}
+	// 			if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
+	// 				undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
+	// 				.setCostEstimate != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
+	// 					.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
+	// 				this.effectivenessListOne.sumSe = sum.toFixed(2)
 				
-				}
-				if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
-					.estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
-					'' && this.effectivenessListTwo
-					.estimatedPromotionalExpenses != '') {
-					let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
-						.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
-						.estimatedPromotionalExpenses) * 100
+	// 			}
+	// 			if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
+	// 				.estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
+	// 				'' && this.effectivenessListTwo
+	// 				.estimatedPromotionalExpenses != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
+	// 					.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+	// 					.estimatedPromotionalExpenses) * 100
 				
-					this.effectivenessListOne.sumXuan = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
-					.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
-					this.effectivenessListTwo
-					.otherNecessaryEstimates != '') {
-					let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
-					this.effectivenessListOne.sumQi = sum.toFixed(2)
-				}
-				if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
-					.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
-					.effectivenessListTwo
-					.totalCostEstimation != '') {
-					let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
-					this.effectivenessListOne.sumAll = sum.toFixed(2)
-				}
-				// sumNei
-				// sumWai
-				// sumShop
-				// sumSe
-				// sumXuan
-				// sumQi
-				// sumAll
-				// internalLaborCostEstimation
-				// externalLaborCostEstimation
-				// costEstimationGoods
-				// setCostEstimate
-				// estimatedPromotionalExpenses
-				// otherNecessaryEstimates
-				// totalCostEstimation
-
-			},
+	// 				this.effectivenessListOne.sumXuan = sum.toFixed(2)
+	// 			}
+	// 			if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
+	// 				.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
+	// 				this.effectivenessListTwo
+	// 				.otherNecessaryEstimates != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+	// 				this.effectivenessListOne.sumQi = sum.toFixed(2)
+	// 			}
+	// 			if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
+	// 				.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
+	// 				.effectivenessListTwo
+	// 				.totalCostEstimation != '') {
+	// 				let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+	// 				this.effectivenessListOne.sumAll = sum.toFixed(2)
+	// 			}
+	// 			// sumNei
+	// 			// sumWai
+	// 			// sumShop
+	// 			// sumSe
+	// 			// sumXuan
+	// 			// sumQi
+	// 			// sumAll
+	// 			// internalLaborCostEstimation
+	// 			// externalLaborCostEstimation
+	// 			// costEstimationGoods
+	// 			// setCostEstimate
+	// 			// estimatedPromotionalExpenses
+	// 			// otherNecessaryEstimates
+	// 			// totalCostEstimation
+
+	// 		},
 			lichangeTwo(e) {
 				let msg = this.effectivenessList[e]
 				if (typeof msg.modifiedData == 'string') {
@@ -2627,7 +2629,7 @@
 				'' && this.effectivenessListTwo
 				.internalLaborCostEstimation != '') {
 				let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
-					.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
+					.effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListOne
 					.internalLaborCostEstimation) * 100
 				this.effectivenessListOne.sumNei = sum.toFixed(2)
 			}
@@ -2636,7 +2638,7 @@
 				'' && this.effectivenessListTwo
 				.externalLaborCostEstimation != '') {
 				let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
-					.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
+					.effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListOne
 					.externalLaborCostEstimation) * 100
 				this.effectivenessListOne.sumWai = sum.toFixed(2)
 			
@@ -2646,7 +2648,7 @@
 				.effectivenessListTwo
 				.costEstimationGoods != '') {
 				let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
-					.costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
+					.costEstimationGoods)) / Number(this.effectivenessListOne.costEstimationGoods) * 100
 				this.effectivenessListOne.sumShop = sum.toFixed(2)
 			
 			}
@@ -2654,7 +2656,7 @@
 				undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
 				.setCostEstimate != '') {
 				let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
-					.setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
+					.setCostEstimate)) / Number(this.effectivenessListOne.setCostEstimate) * 100
 				this.effectivenessListOne.sumSe = sum.toFixed(2)
 			
 			}
@@ -2663,7 +2665,7 @@
 				'' && this.effectivenessListTwo
 				.estimatedPromotionalExpenses != '') {
 				let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
-					.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
+					.effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListOne
 					.estimatedPromotionalExpenses) * 100
 			
 				this.effectivenessListOne.sumXuan = sum.toFixed(2)
@@ -2672,14 +2674,14 @@
 				.otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
 				this.effectivenessListTwo
 				.otherNecessaryEstimates != '') {
-				let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
+				let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListOne.otherNecessaryEstimates) * 100
 				this.effectivenessListOne.sumQi = sum.toFixed(2)
 			}
 			if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
 				.totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
 				.effectivenessListTwo
 				.totalCostEstimation != '') {
-				let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
+				let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListOne.totalCostEstimation) * 100
 				this.effectivenessListOne.sumAll = sum.toFixed(2)
 			}
 			// sumNei
diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue
index 3b1d4b1..02ff7f0 100644
--- a/admin-web-master/src/views/serve/actSp.vue
+++ b/admin-web-master/src/views/serve/actSp.vue
@@ -59,13 +59,15 @@
             <template slot-scope="scope">
               <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
               <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
+			  <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
               <div @click="Qcode(scope.row)" class="tableBtn greens"  >活动二维码</div>
             </template>
           </el-table-column>
         </el-table>
         <div class="fenye">
+			<div style="line-height: 200%;">共{{total}}条</div>
           <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]"  layout="total,prev, pager,next" :total="total "
+            :page-sizes="[10, 20, 50, 100]"  layout="prev, pager,next" :total="total "
             @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
@@ -276,6 +278,42 @@
                              </div>
 
                            </el-dialog>
+						   <!-- 报名名单 -->
+						   <el-dialog :visible.sync="baoming" title="报名名单"  style="padding: 0;" width="55%" center
+						     :close-on-click-modal="false" :show-close="false">
+						     <div style="padding:20px;">
+						       <div style="padding:20px;">
+						         <el-table :data="mingList"
+						           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+						           <el-table-column label="序号" min-width="150">
+						             <template slot-scope="scope">
+						               {{scope.$index +1 }}
+						             </template>
+						           </el-table-column>
+						           <el-table-column label="联系人" prop="signUpName" min-width="150">
+						   
+						           </el-table-column>
+						           <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
+						   
+						           </el-table-column>
+								   <el-table-column label="报名时间" prop="signUpTime" min-width="150">
+								   						   
+								   </el-table-column>
+						         </el-table>
+						         <div class="fenye">
+									 <div style="line-height: 200%;">共{{mingtotal}}条</div>
+						           <el-pagination :hide-on-single-page='flag' background  :current-page="actPage.pageNumber"
+						             layout="prev, pager, next" :total="mingtotal"
+						             @current-change="mingChange" />
+						         </div>
+						       </div>
+						       <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+						         <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+						           @click="baoming =false">返回</el-button>
+						       </div>
+						     </div>
+						   
+						   </el-dialog>
   </div>
 </template>
 
@@ -285,7 +323,8 @@
    actSpAdd,
    actSpEdit,
    actSpDel,
-   QRcode
+   QRcode,
+   Registration
   } from '../../api/actSp.js'
   import wangEditor from "@/components/editor/index"
   import upimg from "@/components/ImageUpload/index"
@@ -329,7 +368,16 @@
          liuYe:3,//3通过or4驳回
        Liunie:false,
        showQF:false,
-       qfUrl:''
+       qfUrl:'',
+	   mingList:[],
+	   mingtotal:0,
+	   baoming:false,
+	   actPage:{
+		   activityApplicationId:'',
+		   pageNumber:0,
+		   pageSize:10,
+	   }
+	   
       }
     },
 
@@ -415,6 +463,22 @@ this.total = res.data.content.length
             this.qfUrl = res.data
          })
       },
+	  async getMing(ids) {
+	    this.actPage.activityApplicationId=ids
+		this.actPage.pageNumber = 0
+	    const res = await Registration(this.actPage)
+	    this.mingList = res.data.content
+	    this.mingtotal = res.totalElements
+		  
+	    this.baoming = true
+	  
+	  },
+	  async mingChange(val){
+		  this.actPage.pageNumber = val
+		  const res = await Registration(this.actPage)
+		  this.mingList = res.data.content
+		  this.mingtotal = res.totalElements
+	  }
     }
   }
 </script>
@@ -453,7 +517,7 @@ this.total = res.data.content.length
   .fenye {
     margin-top: 20px;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
     position: relative;
   }
 
diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
index b2af145..12836a0 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="banner" :class="'terminal' + terminal">
     <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
-      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('item.imageUrl +')'}"  @click="jumpLink(item.jumpUrl)">
+      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url(item.imageUrl)'}"  @click="jumpLink(item.jumpUrl)">
         <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
       </swiper-item>
     </swiper>
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index a8a0d04..079e493 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,16 +1,16 @@
 
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-// 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/'
+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/'
 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
 // const DOMAIN_PREFIXPING = 'http://128.10.249.8:9003' 
 // const DOMAIN_PREFIX = 'http://128.10.249.8:9007'
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
-const TIAOZHUAN = `${host}/cdwlMall/`
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
+// const TIAOZHUAN = `${host}/cdwlMall/`
 
 	
 
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
index a1e0789..1b68631 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
@@ -35,7 +35,7 @@ export default {
   methods: {
     goToOrder() {
       uni.navigateTo({
-        url: '../orderModule/index?type=0'
+        url: '/pages_category_page1/orderModule/index'
       })
     },
     goToHome() {
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
index 65b546a..a598285 100644
--- a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
+++ b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
@@ -31,7 +31,7 @@
           >
             <view class="evaluate-content flex-items flex-row flex-sp-between ">
               <view class="flex-items">
-                <image class="user-headSmallImg u-skeleton-circle" v-if="item.headImage" :src="item.headImage"></image>
+                <image class="user-headSmallImg u-skeleton-circle" v-if="item.headImage" :src="$baseURL+item.headImage"></image>
                 <image class="user-headSmallImg u-skeleton-circle" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image>
                 <view class="skuValue u-skeleton-fillet">
                   <label class="fs28" v-if="item.name">{{item.name}}</label>
@@ -95,7 +95,7 @@
           >
             <view class="evaluate-content flex-column" @click="commentDetails(index)" >
               <view class="flex-items">
-                <image class="user-headSmallImg" v-if="item.headImage" :src="item.headImage"></image>
+                <image class="user-headSmallImg" v-if="item.headImage" :src="$baseURL+item.headImage"></image>
                 <image class="user-headSmallImg" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image>
                 <label class="fs28 mar-left-20" v-if="item.name">{{item.name}}</label>
                 <label class="fs28 mar-left-20" v-else>匿名</label>
diff --git a/ceres-uniapp-master/pages_category_page1/store/index.vue b/ceres-uniapp-master/pages_category_page1/store/index.vue
index a83e152..9539041 100644
--- a/ceres-uniapp-master/pages_category_page1/store/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/store/index.vue
@@ -41,7 +41,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="distributorBox flex-items flex-sp-between" @click="applyForRecruit">
+				<!-- <view class="distributorBox flex-items flex-sp-between" @click="applyForRecruit">
 					<view class="distributor">
 						<view class="flex-display flex-items">
 							<image class="item-btn-icon" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/fenxiao2.png"
@@ -52,7 +52,7 @@
 					<view class="rightArrow">
 						<image src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/arrowRight.png"></image>
 					</view>
-				</view>
+				</view> -->
 		<!-- 		<scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true">
 					<view style="display: inline-block;" v-for="item of conlist" @click="couponshow = true">
 						<view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;" >
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index 05ac50b..feb99b6 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -163,7 +163,7 @@
 		{
 			"path": "pages/mycreated/mycreated",
 			"style": {
-				"navigationBarTitleText": "我的活动申请",
+				"navigationBarTitleText": "我的活动",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"enablePullDownRefresh": true
 			}
diff --git a/lvdao-miniapp/pages/activityDetail/activityDetail.scss b/lvdao-miniapp/pages/activityDetail/activityDetail.scss
index 77d5665..94b07d7 100644
--- a/lvdao-miniapp/pages/activityDetail/activityDetail.scss
+++ b/lvdao-miniapp/pages/activityDetail/activityDetail.scss
@@ -33,6 +33,9 @@
 // 活动信息
 .info-box {
 	margin-top: 30rpx;
+	background-color: #FFFFFF;
+	padding: 20px;
+	border-radius: 10px;
 	.title {
 		font-weight: 700;
 		color: #3D3D3D;
@@ -45,3 +48,30 @@
 	}
 }
 
+/* 底部 */
+.page-footer{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	// display: flex;
+	// align-items: center;
+	// justify-content: center;
+	width: 100%;
+	height: 125rpx;
+	background-color: #FFFFFF;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	.footer-btn {
+	 padding: 0 20px;
+		margin-top: 20rpx;
+	}
+	.footer-service {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		text {
+			margin-top: 6rpx;
+			line-height: 42rpx;
+		}
+	}
+}
diff --git a/lvdao-miniapp/pages/activityDetail/activityDetail.vue b/lvdao-miniapp/pages/activityDetail/activityDetail.vue
index a8fda67..2398ba4 100644
--- a/lvdao-miniapp/pages/activityDetail/activityDetail.vue
+++ b/lvdao-miniapp/pages/activityDetail/activityDetail.vue
@@ -22,6 +22,25 @@
 			<view class="info-item">活动类型：{{tableData.activityType}}</view>
 		</view>
 	</view>
+	<!-- 底部 -->
+	<!-- <view style="height: 125rpx;"></view> -->
+	<view class="page-footer" v-if="tableData.auditStatus == 3">
+		<view class="footer-btn">
+			<u-button type="success" @click="baoShow">报名参加</u-button>
+		</view>
+	</view>
+	<u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
+		<view style="padding: 30rpx;">
+			<u-form class="form-box" :model="form" ref="uForm" :label-width="120" >
+				<view style="padding: 10rpx;">
+					<view class="title">请填写您的报名信息</view>
+					<u-form-item label="*姓名"><u-input v-model="form.signUpName" /></u-form-item>
+					<u-form-item label="*电话"><u-input v-model="form.signUpPhone" /></u-form-item>
+					<u-button type="success" @click="submit">提交</u-button>
+				</view>
+			</u-form>
+		</view>
+	</u-popup>
   </view>
 </template>
 
@@ -40,8 +59,8 @@ export default {
 		],
 		joinShow: false,
 		form: {
-			name: '',
-			pahone: '',
+			signUpName: '',
+			signUpPhone: '',
 		},
 		pagesize: {
 			id:'',
@@ -88,17 +107,74 @@ export default {
       
   },
   methods: {
-		submit() {
-			this.joinShow = false;
-			uni.switchTab({
-				url: '/pages/home/home'
-			})
-		},
+	  baoShow(){
+	  		  this.joinShow = true
+	  		  this.form.signUpName = ''
+	  		  this.form.signUpPhone = ''
+	  },
+	  submit() {
+	  	if (!this.form.signUpName) {
+	  		uni.showToast({
+	  			icon: 'none',
+	  			title: '请输入姓名'
+	  		});
+	  		return
+	  	}
+	  	
+	  	
+	  	if (!this.form.signUpPhone) {
+	  		uni.showToast({
+	  			icon: 'none',
+	  			title: '请输入联系电话'
+	  		});
+	  		return 
+	  	}
+	  	this.form.signUpTime = this.getCurrentDateTime()
+	  	this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,3).then(res => {
+			console.log('res',res.data)
+			if(res.data.code == '200'){
+			setTimeout(()=>{
+				uni.switchTab({
+					url: '/pages/home/home'
+				})
+			},1000)
+			}else{
+				
+			}
+	  		// uni.showToast({
+	  		// 	title: res.data.data,
+	  		// 	duration: 2000,
+	  			
+	  		// })
+	  		// this.$refs.uToast.show({
+	  		// 					title: res.data.data,
+	  		// 					url: '/pages/home/home'
+	  		// 				})
+	  	     // uni.switchTab({
+	  	     // 	url: '/pages/home/home'
+	  	     // })
+	  	})
+	  	this.joinShow = false
+	  	
+	  
+	  },
+
 		leaseAdd(){
 			uni.navigateTo({
 				url: '/pages/leaseAdd/leaseAdd'
 			})
 		},
+		getCurrentDateTime() {
+		  const now = new Date();
+		  const year = now.getFullYear();
+		  const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
+		  const day = String(now.getDate()).padStart(2, '0');
+		  const hours = String(now.getHours()).padStart(2, '0');
+		  const minutes = String(now.getMinutes()).padStart(2, '0');
+		  const seconds = String(now.getSeconds()).padStart(2, '0');
+		
+		  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+		},
   }
 };
 </script>
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index 34b26e6..90ef544 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -180,9 +180,11 @@
 						},
 						// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
 						{
-							name: '活动参与',
+							name: '我的活动',
 							img: '/wdhd.png',
-							path: '/pages/participation/participation'
+							path: '/pages/mycreated/mycreated'
+							
+							// path: '/pages/participation/participation'
 						},
 						{
 							name: '活动申请',
diff --git a/lvdao-miniapp/pagesA/application/application.vue b/lvdao-miniapp/pagesA/application/application.vue
index 899f725..4730d94 100644
--- a/lvdao-miniapp/pagesA/application/application.vue
+++ b/lvdao-miniapp/pagesA/application/application.vue
@@ -12,7 +12,7 @@
 						<view class="voucher-img">
 							<view class="voucher-list" style="width: 100%;">
 								<view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
-									<textarea name="" id="" cols="30" rows="7" placeholder="请输入"
+									<textarea name="" id="" cols="30" rows="4" placeholder="请输入"
 										style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;"
 										v-model="rulform.schemeTitle"></textarea>
 								</view>
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index bbdd772..22682f0 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,8 +1,8 @@
 
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
@@ -24,7 +24,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://128.10.249.20:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
-		// bases = c1 + 'cdwlMall/meserver/admin-server' + url;
+		bases = c1 + 'cdwlMall/meserver/admin-server' + url;
 		
 	}else if(baseUrl == 3){
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
diff --git a/merchant-web-master/dist.zip b/merchant-web-master/dist.zip
deleted file mode 100644
index 35adf29..0000000
Binary files a/merchant-web-master/dist.zip and /dev/null differ
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 6a7e308..f9bc6d9 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -19,7 +19,8 @@ let PREFIX;
  if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
   // 其他情况的默认值
   // PREFIX = 'http://8.130.38.56:8027/business-server';
-  PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
+  PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
+  // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
   // PREFIX = 'http://128.10.249.8:9004';
 }else{
   // PREFIX = '/merchant-business';
diff --git a/merchant-web-master/src/utils/request2.js b/merchant-web-master/src/utils/request2.js
index 6f2f0c7..29c1d46 100644
--- a/merchant-web-master/src/utils/request2.js
+++ b/merchant-web-master/src/utils/request2.js
@@ -18,10 +18,10 @@ let hostall = window.location.href;
 let PREFIX;
  if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
   // 其他情况的默认值
-  // PREFIX = 'http://8.130.38.56:8027/business-server';
-  //  PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
-  PREFIX = 'http://128.10.249.48:9007';
+  PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
+  
+  // PREFIX = 'http://128.10.249.48:9007';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
index e48b205..c1d9b1b 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
@@ -85,7 +85,7 @@
             <el-form-item class="form-item-long" label="供应商">
               <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
             </el-form-item>
-            <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+            <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
               <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
             </el-form-item>
             <el-form-item label="需要物流" prop="ifLogistics">
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
index de933e8..4cde654 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
@@ -72,7 +72,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+              <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
                 <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
               </el-form-item>
             </el-col>
@@ -148,8 +148,9 @@
     <div style="padding: 20px;">
       <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
       <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+	  <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
       <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
-      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
+      
     </div>
   </div>
 </template>
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
index fd78335..b7dad98 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
@@ -43,13 +43,13 @@
               <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
             </template>
           </el-table-column>
-          <el-table-column label="售价(/元)">
+          <el-table-column label="售价（元）">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
             </template>
           </el-table-column>
-          <el-table-column label="原价(/元)">
+          <el-table-column label="原价（元）">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
diff --git a/merchant-web-master/src/views/salesSta/dataSta.vue b/merchant-web-master/src/views/salesSta/dataSta.vue
index 640cfe0..41c14ca 100644
--- a/merchant-web-master/src/views/salesSta/dataSta.vue
+++ b/merchant-web-master/src/views/salesSta/dataSta.vue
@@ -29,7 +29,7 @@
 
                 销售总额
               </template>
-              ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}}
+              ￥{{(tongji.transactionsCompleted + tongji.invalidOrderAmount).toFixed(2)}}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
diff --git a/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue b/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
index 7382558..3a0baad 100644
--- a/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
@@ -72,7 +72,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item class="form-item-long" label="成本价(/元)" prop="cost">
+              <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
                 <el-input  v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
               </el-form-item>
             </el-col>
@@ -148,8 +148,9 @@
     <div style="padding: 20px;">
       <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
       <el-button v-if="active"  style="background-color: #3F9B6A;color: #fff"  @click="next">下一步</el-button>
+	  <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
       <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="save">保存</el-button>
-      <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff"   @click="last">上一步</el-button>
+      
     </div>
   </div>
 </template>
diff --git a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
index fd78335..b7dad98 100644
--- a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
@@ -43,13 +43,13 @@
               <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
             </template>
           </el-table-column>
-          <el-table-column label="售价(/元)">
+          <el-table-column label="售价（元）">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
             </template>
           </el-table-column>
-          <el-table-column label="原价(/元)">
+          <el-table-column label="原价（元）">
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
               <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
diff --git a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
index 4b405d9..4ddac42 100644
--- a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -61,7 +61,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" min-width="10%" />
-          <el-table-column
+          <!-- <el-table-column
             prop="stockNumber"
             label="属性"
             show-overflow-tooltip
@@ -69,7 +69,7 @@
           <template slot-scope="scope">
             属性:1
             </template>
-              </el-table-column>
+              </el-table-column> -->
           <el-table-column
             prop="stockNumber"
             label="库存数量"
--
libgit2 0.21.4