From a18f16a903643db5bf779d714d8d3e2d1c38a597 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Mon, 24 Mar 2025 18:02:04 +0800
Subject: [PATCH] 提交1

---
 admin-web-master/src/utils/request.js                                  |  4 ++--
 admin-web-master/src/utils/request2.js                                 |  4 ++--
 admin-web-master/src/views/activity/activityHis.vue                    | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 admin-web-master/src/views/activity/activitySp.vue                     |  2 +-
 admin-web-master/src/views/activity/index.vue                          | 23 ++++++++++++++---------
 admin-web-master/src/views/atmosphere/atmosphereGl.vue                 | 12 +++++++-----
 admin-web-master/src/views/atmosphere/atmosphereHis.vue                | 20 +++++++++++---------
 admin-web-master/src/views/atmosphere/atmosphereSp.vue                 |  2 +-
 admin-web-master/src/views/online/summaryQuery/index.vue               |  4 ++--
 admin-web-master/src/views/order/ordersel/index.vue                    |  5 ++++-
 admin-web-master/src/views/order/ordersel/pendDetails.vue              |  3 +++
 admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue |  2 +-
 admin-web-master/src/views/serve/salesReport.vue                       |  3 ++-
 ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue |  2 +-
 ceres-uniapp-master/config/api.js                                      | 12 ++++++------
 ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue |  2 +-
 ceres-uniapp-master/pages_category_page1/orderModule/index.vue         |  6 ++++--
 ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue  |  1 +
 ceres-uniapp-master/pages_category_page1/question/question.vue         |  4 ++--
 lvdao-miniapp/pages/activityDetail/activityDetail.vue                  | 18 +++++++++---------
 lvdao-miniapp/pages/home/home.vue                                      | 13 ++++++++++---
 lvdao-miniapp/pages/procedure/procedure.vue                            |  6 +++---
 lvdao-miniapp/utils/request.js                                         | 12 ++++++------
 merchant-web-master/src/utils/request.js                               |  4 ++--
 merchant-web-master/src/utils/request2.js                              |  4 ++--
 merchant-web-master/src/views/order/pending/index.vue                  |  2 +-
 merchant-web-master/src/views/order/pending/pendDetails.vue            |  5 ++++-
 27 files changed, 163 insertions(+), 90 deletions(-)

diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index b492344..11f416c 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,13 +16,13 @@ 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://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;
 
 
-  // baseURL = 'http://128.10.249.26:9003';
+  baseURL = 'http://128.10.249.39:9003';
 
 
 } else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index f788a54..776afaa 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -17,10 +17,10 @@ let baseURL =  ''
 // || host === 'localhost:9528'
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
+  // 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.20:9004';
+    baseURL = 'http://128.10.249.39:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue
index 639d44d..a5e2c4a 100644
--- a/admin-web-master/src/views/activity/activityHis.vue
+++ b/admin-web-master/src/views/activity/activityHis.vue
@@ -580,13 +580,13 @@
 												活动名称
 											</template>
 
-											<span>{{duibiList.planName}}</span>
+											<span>{{duibiList.planName || ''}}</span>
 										</el-descriptions-item>
 										<el-descriptions-item>
 											<template slot="label">
 												实际举办地点
 											</template>
-											<span>{{duibiList.eventAddrs}}</span>
+											<span>{{duibiList.eventAddrs || ''}}</span>
 										</el-descriptions-item>
 										<el-descriptions-item>
 											<template slot="label">
@@ -741,7 +741,44 @@
 
 								</div>
 							</div>
-
+							<div style="width: 100%;">
+							
+								<div style="padding:10px 20px;">
+									<el-descriptions class="margin-top" title="系统信息" :column="2" border
+										:labelStyle="labelStyle" :contentStyle="contentStyle">
+										<el-descriptions-item>
+											<template slot="label">
+												创建人
+											</template>
+											<span>{{duibiList.createUser}}</span>
+							
+										</el-descriptions-item>
+										<el-descriptions-item>
+											<template slot="label">
+												创建时间
+											</template>
+											<span>{{duibiList.createDate}}</span>
+							
+										</el-descriptions-item>
+										<el-descriptions-item>
+											<template slot="label">
+												更新人
+											</template>
+											<span>{{duibiList.updateUser}}</span>
+							
+										</el-descriptions-item>
+										<el-descriptions-item>
+											<template slot="label">
+												更新时间
+											</template>
+											<span>{{duibiList.updateDate}}</span>
+							
+										</el-descriptions-item>
+							
+									</el-descriptions>
+							
+								</div>
+							</div>
 
 						</div>
 					</div>
@@ -768,8 +805,8 @@
 				<el-button @click="bianji" style="background-color: #3F9B6A;color: #fff"
 					v-if="zhixingBian && activeName=='second'">保存
 				</el-button>
-				<el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
-				</el-button>
+				<!-- <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
+				</el-button> -->
 
 			</div>
 		</div>
@@ -1229,7 +1266,7 @@
 				<div
 					style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
 					<div style="width: 38%;">
-						<div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
+						<div style="color:#3F9B6A;text-align: center;padding: 10px 0;">预估成本</div>
 						<div
 							style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
 							<div>内部人力</div>
@@ -1938,6 +1975,10 @@
 				this.tableData = res.data.content
 			},
 			formatTimestampToDate(timestamp) {
+				console.log(timestamp,'timestamp')
+				if(timestamp == undefined ){
+					return ''
+				}
 				const date = new Date(timestamp);
 				const year = date.getFullYear();
 				const month = String(date.getMonth() + 1).padStart(2, '0');
@@ -1945,7 +1986,7 @@
 				const hours = String(date.getHours()).padStart(2, '0');
 				const minutes = String(date.getMinutes()).padStart(2, '0');
 				const seconds = String(date.getSeconds()).padStart(2, '0');
-				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 			},
 			//重置按钮
 			resetting() {
@@ -1987,10 +2028,10 @@
 				}).then(res => {
 					this.effectivenessList = res.data
 					// let actName = this.effectivenessList.operationType.split('')
-					this.effectivenessList.map((item, index) => {
-						let actName = item.operationType.split(' ')
-						this.effectivenessList[index].operationType = actName[0]
-					})
+					// this.effectivenessList.map((item, index) => {
+					// 	let actName = item.operationType.split(' ')
+					// 	this.effectivenessList[index].operationType = actName[0]
+					// })
 					// console.log(this.effectivenessList.operationType,'actName')
 					// 	this.effectivenessList.operationType  = actName[0]
 				})
@@ -2026,7 +2067,7 @@
 				} //执行效果列表
 				actPage({
 					detailsId: item.id,
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				}).then(res => {
 					console.log(res.data.content)
@@ -2172,7 +2213,7 @@
 				const minutes = now.getMinutes().toString().padStart(2, '0');
 				const seconds = now.getSeconds().toString().padStart(2, '0');
 
-				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 			},
 
 			handleCurrentChange(val) {
@@ -2301,7 +2342,7 @@
 					let that = this
 					actPage({
 						detailsId: this.multipleSelection[0].id,
-						pageNumber: 1,
+						pageNumber: 0,
 						pageSize: 10,
 					}).then(res => {
 						this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
@@ -2360,7 +2401,7 @@ this.ListOne = item.planName
 
 				// actPage({
 				// 	detailsId: item.id,
-				// 	pageNumber: 1,
+				// 	pageNumber: 0,
 				// 	pageSize: 10,
 				// }).then(res => {
 				// 	this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
@@ -2548,7 +2589,7 @@ this.ListOne = item.planName
 				// this.lishiList = e
 				let msg = this.effectivenessList[e]
 				// this.duibiList = JSON.parse(msg.modifyContent)
-
+		
 				this.duibiList = JSON.parse(msg.modifiedData)
 
 			},
@@ -2756,6 +2797,7 @@ this.ListOne = item.planName
 							this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							this.zhixingList.detailsId = this.secondData.id
 							this.zhixingList.createDate = this.updateCurrentTime()
+							this.zhixingList.createUser = localStorage.getItem('roleName')
 							actAdd(this.zhixingList).then(res => {
 								for (let i = 0; i < this.tableDa.length; i++) {
 									this.tableDa[i].detailsId = res.data.id
@@ -2772,7 +2814,9 @@ this.ListOne = item.planName
 							this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
 							this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							Vue.delete(that.zhixingList, 'planTime')
-							this.zhixingList.updateDate = ''
+							// this.zhixingList.updateDate = ''
+							this.zhixingList.updateDate = this.updateCurrentTime()
+							this.zhixingList.updateUser = localStorage.getItem('roleName')
 							actEdit(this.zhixingList).then(() => {
 								this.ggXin = false
 								this.getAll()
diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue
index d85df11..c9f8c23 100644
--- a/admin-web-master/src/views/activity/activitySp.vue
+++ b/admin-web-master/src/views/activity/activitySp.vue
@@ -1524,7 +1524,7 @@
 				} //执行效果列表
 				actPage({
 					detailsId: item.id,
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				}).then(res => {
 					console.log(res.data.content)
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index 8cd4000..eb6435f 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -1503,7 +1503,7 @@
 				} //执行效果列表
 				actPage({
 					detailsId: item.id,
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				}).then(res => {
 					console.log(res.data.content)
@@ -1671,14 +1671,17 @@
 							  	this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							  	this.zhixingList.detailsId = this.secondData.id
 							  	this.zhixingList.createDate = this.updateCurrentTime()
+							  	this.zhixingList.createUser = localStorage.getItem('roleName')
 							  	actAdd(this.zhixingList).then(res => {
 							  		for (let i = 0; i < this.tableDa.length; i++) {
 							  			this.tableDa[i].detailsId = res.data.id
 							  			MingAdd(this.tableDa[i]).then(res => {
-							  				this.ggXin = false
-							  				this.getAll()
+							  			
 							  			})
 							  		}
+									this.ggXin = false
+									this.zhixingBian = false
+									this.getAll()
 							  	})
 							  
 							  } else {
@@ -1687,9 +1690,11 @@
 							  	this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
 							  	this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							  	Vue.delete(that.zhixingList, 'planTime')
-							  	this.zhixingList.updateDate = ''
+							  	this.zhixingList.updateDate = this.updateCurrentTime()
+							  	this.zhixingList.updateUser = localStorage.getItem('roleName')
 							  	 actEdit(this.zhixingList).then(()=>{
 									 this.ggXin = false
+									 this.zhixingBian = false
 									 this.getAll()
 								 })
 							  }
@@ -1870,7 +1875,7 @@
 					let that = this
 					actPage({
 						detailsId: this.multipleSelection[0].id,
-						pageNumber: 1,
+						pageNumber: 0,
 						pageSize: 10,
 					}).then(res => {
 						this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
@@ -2323,13 +2328,13 @@
 				const pdf = new jsPDF('p', 'mm', 'a4');
 
 				// 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
-				const imgWidth = 190; // 图像的宽度（mm）
-				const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+				const imgWidth = 190 // 图像的宽度（mm）
+				const imgHeight = (canvas.height * imgWidth) / canvas.width // 保持图像的宽高比
 
-				pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
+				pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight) // 10, 10 是图像在 PDF 中的位置（mm）
 
 				// 保存 PDF 文件
-				pdf.save('活动方案.pdf');
+				pdf.save('活动方案.pdf')
 			},
 			peizhi(item) {
 				this.peiForm = {
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index 153550f..90ab818 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -1553,9 +1553,10 @@
 									  	this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 									  	this.zhixingList.detailsId = this.secondData.id
 									  	this.zhixingList.createDate = this.updateCurrentTime()
+									  	this.zhixingList.createUser = localStorage.getItem('roleName')
 									  	 actAdd(this.zhixingList).then(()=>{
-											 this.ggXin = false
-											 this.getAll()
+										this.ggXin = false
+										this.getAll()
 										 })
 									  } else {
 									  	let that = this
@@ -1563,7 +1564,8 @@
 									  	this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
 									  	this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 									  	Vue.delete(that.zhixingList, 'planTime')
-									  	this.zhixingList.updateDate = ''
+									  	this.zhixingList.updateDate = this.updateCurrentTime()
+									  	this.zhixingList.updateUser = localStorage.getItem('roleName')
 									  	 actEdit(this.zhixingList).then(()=>{
 											 this.ggXin = false
 											 this.getAll()
@@ -1612,7 +1614,7 @@
 				} //执行效果列表
 				actPage({
 					detailsId: item.id,
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				}).then(res => {
 					console.log(res.data.content)
@@ -2167,7 +2169,7 @@
 					let that = this
 					actPage({
 						detailsId: this.multipleSelection[0].id,
-						pageNumber: 1,
+						pageNumber: 0,
 						pageSize: 10,
 					}).then(res => {
 						this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
index 6a52a0b..cae3332 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -1225,7 +1225,7 @@
 				<div
 					style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
 					<div style="width: 38%;">
-						<div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
+						<div style="color:#3F9B6A;text-align: center;padding: 10px 0;">预估成本</div>
 						<div
 							style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
 							<div>内部人力</div>
@@ -1972,10 +1972,10 @@
 					activityEffectivenessId: item.id
 				}).then(res => {
 					this.effectivenessList = res.data
-					this.effectivenessList.map((item, index) => {
-						let actName = item.operationType.split(' ')
-						this.effectivenessList[index].operationType = actName[0]
-					})
+					// this.effectivenessList.map((item, index) => {
+					// 	let actName = item.operationType.split(' ')
+					// 	this.effectivenessList[index].operationType = actName[0]
+					// })
 				})
 				this.liData = []
 				this.lixiang = {}
@@ -2006,7 +2006,7 @@
 				} //执行效果列表
 				actPage({
 					detailsId: item.id,
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				}).then(res => {
 					console.log(res.data.content)
@@ -2281,7 +2281,7 @@
 					let that = this
 					actPage({
 						detailsId: this.multipleSelection[0].id,
-						pageNumber: 1,
+						pageNumber: 0,
 						pageSize: 10,
 					}).then(res => {
 						this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
@@ -2343,7 +2343,7 @@ this.ListOne = item.planName
 				// let that = this
 				// actPage({
 				// 	detailsId: item.id,
-				// 	pageNumber: 1,
+				// 	pageNumber: 0,
 				// 	pageSize: 10,
 				// }).then(res => {
 				// 	this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
@@ -2736,6 +2736,7 @@ this.ListOne = item.planName
 							this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							this.zhixingList.detailsId = this.secondData.id
 							this.zhixingList.createDate = this.updateCurrentTime()
+							this.zhixingList.createUser = localStorage.getItem('roleName')
 							actAdd(this.zhixingList).then(() => {
 								this.ggXin = false
 								this.getAll()
@@ -2746,7 +2747,8 @@ this.ListOne = item.planName
 							this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
 							this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
 							Vue.delete(that.zhixingList, 'planTime')
-							this.zhixingList.updateDate = ''
+							this.zhixingList.updateDate = this.updateCurrentTime()
+							this.zhixingList.updateUser = localStorage.getItem('roleName')
 							actEdit(this.zhixingList).then(() => {
 								this.ggXin = false
 								this.getAll()
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 1dd65e2..4a5c5e2 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -1575,7 +1575,7 @@
                  }//执行效果列表
                  actPage({
                    detailsId:item.id,
-                   pageNumber: 1,
+                   pageNumber: 0,
                    pageSize: 10,
                    }).then(res=>{
                    console.log(res.data.content)
diff --git a/admin-web-master/src/views/online/summaryQuery/index.vue b/admin-web-master/src/views/online/summaryQuery/index.vue
index 1c8a82e..a5f65b6 100644
--- a/admin-web-master/src/views/online/summaryQuery/index.vue
+++ b/admin-web-master/src/views/online/summaryQuery/index.vue
@@ -124,7 +124,7 @@
                     >
                     </el-table-column>
                     
-                    <el-table-column
+                    <!-- <el-table-column
                       label="营业期间"
                       prop=""
                       width="auto"
@@ -133,7 +133,7 @@
 <template slot-scope="scope">
                       {{scope.row.businessStartDate}}-{{scope.row.businessEndDate}}
                     </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                       label="营业额(元)"
                       prop="price"
diff --git a/admin-web-master/src/views/order/ordersel/index.vue b/admin-web-master/src/views/order/ordersel/index.vue
index 1091663..a8dc9f3 100644
--- a/admin-web-master/src/views/order/ordersel/index.vue
+++ b/admin-web-master/src/views/order/ordersel/index.vue
@@ -89,7 +89,10 @@
                 <span v-if="scope.row.state == 2" >待发货</span>
                 <span v-if="scope.row.state == 3" >已发货</span>
                 <span v-if="scope.row.state == 4" >已完成</span>
-                <span v-if="scope.row.state == 5" >已关闭</span>
+                <span v-if="scope.row.state == 5">已关闭</span>
+                <span v-if="scope.row.state == 6">待成团</span>
+                <span v-if="scope.row.state == 7">待售后</span>
+                <span v-if="scope.row.state == 8">已退款</span>
               </template>
             </el-table-column>
 
diff --git a/admin-web-master/src/views/order/ordersel/pendDetails.vue b/admin-web-master/src/views/order/ordersel/pendDetails.vue
index ac1e7f6..7f682fe 100644
--- a/admin-web-master/src/views/order/ordersel/pendDetails.vue
+++ b/admin-web-master/src/views/order/ordersel/pendDetails.vue
@@ -27,6 +27,9 @@
                 <span v-if="order.state === 3">待收货</span>
                 <span v-if="order.state === 4">已完成</span>
                 <span v-if="order.state === 5">已取消</span>
+				<span v-if="order.state == 6">待成团</span>
+				<span v-if="order.state == 7">待售后</span>
+				<span v-if="order.state == 8">已退款</span>
               </p>
               <p>
                 <span>售后状态:</span>
diff --git a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
index 9526014..c986231 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
@@ -15,7 +15,7 @@
           <el-row class="detail-box">
             <el-col :span="12">
               <div>商品名称：{{ productItem.productName }}</div>
-              <div>商品卖点：{{ productItem.productBrief }}</div>
+              <div style="padding:0 10px 0 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">商品卖点：{{ productItem.productBrief }}</div>
               <div>
                 商品图片：
                 <div >
diff --git a/admin-web-master/src/views/serve/salesReport.vue b/admin-web-master/src/views/serve/salesReport.vue
index 40639a6..8d80aef 100644
--- a/admin-web-master/src/views/serve/salesReport.vue
+++ b/admin-web-master/src/views/serve/salesReport.vue
@@ -58,13 +58,14 @@
             tooltip-effect="dark"
 
           >
-            <el-table-column label="序号" width="150">
+            <el-table-column label="序号" width="50">
               <template slot-scope="scope">{{ scope.$index +1 }}</template>
             </el-table-column>
             <el-table-column prop="productName" label="商品名称" width="180" />
             <el-table-column prop="brand" label="品牌" width="180" show-overflow-tooltip />
             <el-table-column prop="productType" label="商品类型" show-overflow-tooltip />
             <el-table-column prop="price" label="单价" show-overflow-tooltip />
+			<el-table-column prop="salesQuantity" label="销售数量" show-overflow-tooltip />
             <el-table-column prop="saleTime" label="销售时间" show-overflow-tooltip />
 			<el-table-column prop="merchantId" label="上报人" show-overflow-tooltip />
             <!-- <el-table-column label="操作" fixed="right">
diff --git a/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue b/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
index 9adb803..300bb64 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
@@ -290,7 +290,7 @@
 			gonggao(item){
 				const items = JSON.stringify(item)
 				uni.navigateTo({
-					url: `/pages_category_page1/procedure/procedure?item=${items}`
+					url: `/pages_category_page1/procedure/procedure?item=${encodeURIComponent(items)}`
 				})
 			},
 			swiperChange(e) {
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 079e493..27761c9 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,12 +1,12 @@
 
 // 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 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 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.39:9003' 
+const DOMAIN_PREFIX = 'http://128.10.249.39:9007'
 // const host = `${window.location.protocol}//${window.location.host}`
 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
index 1b68631..d6e123e 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: '/pages_category_page1/orderModule/index'
+        url: '/pages_category_page1/orderModule/index?all=1'
       })
     },
     goToHome() {
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
index af0a668..943a089 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
@@ -180,7 +180,7 @@ export default {
 	  paymentState:'1',
       page: 1,
       pageSize: 20,
-      list: [{}, {}, {}, {}, {}, {}],
+      list: [],
       listTotal: 0, // 用户订单总数
       isEmpty: false, // 列表是否为空
       tabList: orderTabList, // 顶部tabs
@@ -201,7 +201,9 @@ export default {
     }else{
       this.orderState = ''
     }
-	this.handleGetOrderList()
+	if(options.all == '1'){
+		this.handleGetOrderList()
+	}
   },
   onShow() {
     // #ifdef H5
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue b/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
index ba6fde1..ddff1ee 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
@@ -1379,6 +1379,7 @@
 					data.shops.push(shopsobj)
 					data.shops[n].distribution.distributionPrice = this.settlement.shops[n].distribution.distributionPrice
 					data.shops[n].distribution.distributionName = this.settlement.shops[n].distribution.distributionName
+					data.shops[n].distribution.logisticsId = this.settlement.shops[n].distribution.logisticsId
 					let dataskuslen = this.settlement.shops[n].skus.length
 					for (let m = 0; m < dataskuslen; m++) {
 						let skusobj = {}
diff --git a/ceres-uniapp-master/pages_category_page1/question/question.vue b/ceres-uniapp-master/pages_category_page1/question/question.vue
index bfb4fab..f0e0821 100644
--- a/ceres-uniapp-master/pages_category_page1/question/question.vue
+++ b/ceres-uniapp-master/pages_category_page1/question/question.vue
@@ -118,11 +118,11 @@
 						<u-input v-model="model1.name" placeholder="请输入姓名"></u-input>
 					</u-form-item>
 					<u-form-item label="电话" prop="phone" borderBottom v-if="wenjuan.needPhone == '必填'"
-						style="padding: 0 20px;">
+						style="padding: 10px 20px;">
 						<u-input v-model="model1.phone" :maxlength="11" placeholder="请输入电话"></u-input>
 					</u-form-item>
 					<u-form-item label="性别" prop="sexl" borderBottom v-if="wenjuan.needGender == '必填'"
-						style="padding: 0 20px ;">
+						style="padding: 10px  20px;">
 						<!-- <u-input v-model="model1.sexl"  placeholder="请输入性别"></u-input> -->
 						<u-radio-group v-model="model1.sexl">
 							<u-radio active-color="#0FBB59" @change="radioChange" v-for="(item, index) in SexList"
diff --git a/lvdao-miniapp/pages/activityDetail/activityDetail.vue b/lvdao-miniapp/pages/activityDetail/activityDetail.vue
index 7236008..5fb73f9 100644
--- a/lvdao-miniapp/pages/activityDetail/activityDetail.vue
+++ b/lvdao-miniapp/pages/activityDetail/activityDetail.vue
@@ -81,7 +81,7 @@ export default {
 	  		// 使用 slice() 或 substring() 去除两端的单引号
 	  		let value = valueWithQuotes.slice(1, -1); 
 	  		this.pagesize.id = value
-	  	  console.log('olo',value)
+	  	  
 	  }else{
 	  	this.pagesize.id = option.item
 	  	
@@ -135,15 +135,13 @@ export default {
 		this.form.activityApplicationId = this.tableData.id
 	  	this.form.signUpTime = this.getCurrentDateTime()
 	  	this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,1).then(res => {
-			console.log('res',res.data)
+			
 			if(res.data.code == '200'){
-			setTimeout(()=>{
-				uni.switchTab({
-					url: '/pages/home/home'
-				})
-			},1000)
-			}else{
-				
+		uni.showToast({
+			icon: 'none',
+			title: '报名成功'
+		})
+		
 			}
 	  		// uni.showToast({
 	  		// 	title: res.data.data,
@@ -159,6 +157,8 @@ export default {
 	  	     // })
 	  	})
 	  	this.joinShow = false
+	  	this.form.signUpName = ''
+	  	this.form.signUpPhone = ''
 	  	
 	  
 	  },
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index 6592416..4f19003 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -696,9 +696,16 @@
 
 			},
 			wuye() {
-				uni.navigateTo({
-					url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
-				})
+				if(uni.getStorageSync('user').phone&&uni.getStorageSync('user').phone != ''){
+					uni.navigateTo({
+						url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${uni.getStorageSync('user').phone}`
+					})
+				}else{
+					uni.navigateTo({
+						url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
+					})
+				}
+				
 				// if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
 				// 	uni.navigateTo({
 				// 		url: `/pages/propertyPay/propertyPayList/propertyPayList`
diff --git a/lvdao-miniapp/pages/procedure/procedure.vue b/lvdao-miniapp/pages/procedure/procedure.vue
index 4678a47..292e018 100644
--- a/lvdao-miniapp/pages/procedure/procedure.vue
+++ b/lvdao-miniapp/pages/procedure/procedure.vue
@@ -23,9 +23,9 @@
 			};
 		},
 		onLoad(option){
-			console.error(option.item)
-			// console.error(JSON.parse(decodeURI(option.item)))
-			this.tableList = uni.getStorageSync('gghd')
+	this.tableList = JSON.parse(decodeURIComponent(option.item))
+			// console.error()
+			// this.tableList = uni.getStorageSync('gghd')
 		},
 		mounted(){
 	
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 39a2350..dee2aba 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,17 +21,17 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
 		
-		// bases = 'http://128.10.249.20:9003'+ url;
+		bases = 'http://128.10.249.39: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;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
-		// bases = 'http://128.10.249.20:9007' + url;
-		bases = c1 + 'cdwlMall/meserver/api' + url;
+		bases = 'http://128.10.249.39:9007' + url;
+		// bases = c1 + 'cdwlMall/meserver/api' + url;
 		
 	}else{
 		// bases = 'http://128.10.249.22:9004' + url;
@@ -39,9 +39,9 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
-		// bases = 'http://128.10.249.20:9004' + url;
+		bases = 'http://128.10.249.39:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
-		bases = c1 + 'cdwlMall/business-server' + url;
+		// bases = c1 + 'cdwlMall/business-server' + url;
 		
 	}
 	var token = uni.getStorageSync('token') || '';
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index ca83694..5760862 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -20,8 +20,8 @@ let PREFIX;
   // 其他情况的默认值
   // PREFIX = 'http://8.130.38.56:8027/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';
+  // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
+  PREFIX = 'http://128.10.249.39:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
diff --git a/merchant-web-master/src/utils/request2.js b/merchant-web-master/src/utils/request2.js
index 29c1d46..ee500f0 100644
--- a/merchant-web-master/src/utils/request2.js
+++ b/merchant-web-master/src/utils/request2.js
@@ -19,9 +19,9 @@ let PREFIX;
  if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
   // 其他情况的默认值
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
-  PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
+  // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
   
-  // PREFIX = 'http://128.10.249.48:9007';
+  PREFIX = 'http://128.10.249.39:9007';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
diff --git a/merchant-web-master/src/views/order/pending/index.vue b/merchant-web-master/src/views/order/pending/index.vue
index be86085..eeda03b 100644
--- a/merchant-web-master/src/views/order/pending/index.vue
+++ b/merchant-web-master/src/views/order/pending/index.vue
@@ -94,7 +94,7 @@
           <el-table-column label="操作" show-overflow-tooltip>
             <template slot-scope="scope">
               <div class="btnList">
-                <div v-if="scope.row.state === 1" @click="changePrice(scope.row)" class="tableBtn greens" >改价</div>
+                <!-- <div v-if="scope.row.state === 1" @click="changePrice(scope.row)" class="tableBtn greens" >改价</div> -->
                 <div v-if="scope.row.state == 2"  @click="view(scope.row)" class="tableBtn greens" >发货</div>
                 <div v-else  @click="view(scope.row)" class="tableBtn greens" >查看</div>
               </div>
diff --git a/merchant-web-master/src/views/order/pending/pendDetails.vue b/merchant-web-master/src/views/order/pending/pendDetails.vue
index a005c96..14ae5b8 100644
--- a/merchant-web-master/src/views/order/pending/pendDetails.vue
+++ b/merchant-web-master/src/views/order/pending/pendDetails.vue
@@ -24,7 +24,10 @@
                   <span v-if="order.state === 2">待发货</span>
                   <span v-if="order.state === 3">待收货</span>
                   <span v-if="order.state === 4">已完成</span>
-                  <span v-if="order.state === 5">已取消</span>
+             <span v-if="order.state == 5">已关闭</span>
+             <span v-if="order.state == 6">待成团</span>
+             <span v-if="order.state == 7">待售后</span>
+             <span v-if="order.state == 8">已退款</span>
                 </p>
                 <p>
                   <span>售后状态:</span>
--
libgit2 0.21.4