From cdf6c4c97c273561f435591a8d4df846fcc57331 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Fri, 21 Mar 2025 18:03:02 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/App.vue                                   |  6 +++---
 admin-web-master/src/utils/request.js                          |  2 +-
 admin-web-master/src/views/aaa/index.vue                       |  3 ++-
 admin-web-master/src/views/activity/activityHis.vue            | 12 ++++--------
 admin-web-master/src/views/activity/activitySp.vue             | 12 ++++--------
 admin-web-master/src/views/activity/index.vue                  | 12 ++++--------
 admin-web-master/src/views/atmosphere/atmosphereGl.vue         | 22 +++++++++-------------
 admin-web-master/src/views/atmosphere/atmosphereHis.vue        | 57 ++++++++++++++++++++++++++++++++++-----------------------
 admin-web-master/src/views/atmosphere/atmosphereSp.vue         | 28 ++++++++++++----------------
 admin-web-master/src/views/promotion/account.vue               |  4 ++--
 admin-web-master/src/views/promotion/audit.vue                 |  5 ++---
 admin-web-master/src/views/promotion/contentMant.vue           | 30 ++++++++++++++++++++++++++++++
 admin-web-master/src/views/serve/Merchant/index.vue            | 12 +++++++++---
 admin-web-master/src/views/serve/procedure.vue                 | 10 ++++++----
 ceres-uniapp-master/components/canvasShow/basics/banner.vue    |  4 ++--
 ceres-uniapp-master/pages_category_page1/orderModule/index.vue |  4 ++--
 ceres-uniapp-master/pages_category_page1/question/question.vue |  4 +++-
 ceres-uniapp-master/pages_category_page1/question/succe.vue    |  4 +++-
 lvdao-miniapp/pages/home/home.vue                              |  2 +-
 lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue                  |  3 ++-
 lvdao-miniapp/pagesA/projectManagement/projectDetails.vue      |  2 +-
 lvdao-miniapp/utils/request.js                                 |  4 ++--
 merchant-web-master/src/utils/request.js                       |  4 ++--
 23 files changed, 140 insertions(+), 106 deletions(-)

diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue
index a848400..9d84bba 100644
--- a/admin-web-master/src/App.vue
+++ b/admin-web-master/src/App.vue
@@ -387,7 +387,7 @@ export default {
            border: none;
            margin-right: 10px;
            background-color: #F2F2F2;
-           font-size:12px;
+           font-size:14px;
             border-top-left-radius: 8px;
              border-top-right-radius: 8px;
            padding:0 15px;
@@ -426,7 +426,7 @@ export default {
               border: none;
               margin-right: 10px;
               background-color: #F2F2F2;
-              font-size:12px;
+              font-size:14px;
                border-top-left-radius: 8px;
                 border-top-right-radius: 8px;
               padding:0 15px;
@@ -466,7 +466,7 @@ export default {
               border: none;
               margin-right: 10px;
               background-color: #F2F2F2;
-              font-size:12px;
+              font-size:14px;
                border-top-left-radius: 8px;
                 border-top-right-radius: 8px;
               padding:0 15px;
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index b7f2536..b492344 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  // baseURL = 'http://128.10.249.20:9003';
+  // baseURL = 'http://128.10.249.26:9003';
 
 
 } else {
diff --git a/admin-web-master/src/views/aaa/index.vue b/admin-web-master/src/views/aaa/index.vue
index bf62ade..1a92232 100644
--- a/admin-web-master/src/views/aaa/index.vue
+++ b/admin-web-master/src/views/aaa/index.vue
@@ -22,7 +22,7 @@
           </el-table-column>
           <el-table-column label="轮播图" prop="" min-width="20%">
             <template slot-scope="scope">
-              <el-image  style="height: 80px;" :src="$baseURL+scope.row.imageUrl" fit="contain"></el-image>
+              <el-image  style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image>
             </template>
           </el-table-column>
 
@@ -168,6 +168,7 @@
        addCheck() {
 		   this.$refs.ruleForm.validate((valid) => {
 		            if (valid) {
+						this.formInline.imageUrl = this.$baseURL+this.formInline.imageUrl
 						bannerAdd(this.formInline).then(()=>{
 							this.$message({
 							    message: '保存成功',
diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue
index e5af0fd..befc2a6 100644
--- a/admin-web-master/src/views/activity/activityHis.vue
+++ b/admin-web-master/src/views/activity/activityHis.vue
@@ -191,7 +191,7 @@
 								<div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
 								<div style="padding: 10px 20px;">
 									<el-table :data="tableData2"
-										:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+					:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
 										<el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
@@ -263,7 +263,7 @@
 								<div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
 								<div style="padding:10px 20px;">
 									<el-table :data="tableData6"
-										:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+							:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
 										<el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
@@ -1854,13 +1854,9 @@
 						return '待提交';
 					case '1':
 						return '待审核';
-					case '2':
-						return '业务部审核';
-					case '3':
-						return '品牌审核';
-					case '4':
-						return '审核通过';
 					case '5':
+						return '审核通过';
+					case '6':
 						return '审核不通过'
 				}
 			},
diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue
index 5045cff..d85df11 100644
--- a/admin-web-master/src/views/activity/activitySp.vue
+++ b/admin-web-master/src/views/activity/activitySp.vue
@@ -645,7 +645,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
 							<div style="padding: 10px 20px;">
 								<el-table :data="tableData2"
-									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -717,7 +717,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData6"
-									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -1250,13 +1250,9 @@
 						return '待提交';
 					case '1':
 						return '待审核';
-					case '2':
-						return '业务部审核';
-					case '3':
-						return '品牌审核';
-					case '4':
-						return '审核通过';
 					case '5':
+						return '审核通过';
+					case '6':
 						return '审核不通过'
 				}
 			},
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index d500820..8cd4000 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -648,7 +648,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
 							<div style="padding: 10px 20px;">
 								<el-table :data="tableData2"
-									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+						:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -719,7 +719,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData6"
-									:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+						:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -1331,13 +1331,9 @@
 						return '待提交';
 					case '1':
 						return '待审核';
-					case '2':
-						return '业务部审核';
-					case '3':
-						return '品牌审核';
-					case '4':
-						return '审核通过';
 					case '5':
+						return '审核通过';
+					case '6':
 						return '审核不通过'
 				}
 			},
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index 2ada9ac..153550f 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -151,7 +151,7 @@
 							<el-form-item label="明细项名称" class="grid-content bg-purple device-from" prop="planName">
 								<el-input v-model="mingFrom.detailLtemName" placeholder="请输入" />
 							</el-form-item>
-							<el-form-item label="实际数量" class="grid-content bg-purple" prop=" planType">
+							<el-form-item label="实际数量(元)" class="grid-content bg-purple" prop=" planType">
 								<el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
 							</el-form-item>
 
@@ -617,7 +617,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">基本信息</div>
 							<div style="padding: 10px 20px;">
 								<el-table :data="tableData1"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column class-name="first-column-bg" label="方案编号" prop="name"
 										min-width="15%">
@@ -641,7 +641,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
 							<div style="padding: 10px 20px;">
 								<el-table :data="tableData2"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -665,7 +665,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动成本信息</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData3"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
 										min-width="15%">
@@ -689,7 +689,7 @@
 							<div style="font-size: 14px;padding:10px 20px 0px 20px;">预估效果</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData4"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column class-name="first-column-bg" label="预计吸引流量" prop="name"
 										min-width="15%">
@@ -712,7 +712,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData6"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column label="序号" min-width="5%" align='center'>
 										<template slot-scope="scope">
@@ -736,7 +736,7 @@
 							<div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>
 							<div style="padding:10px 20px;">
 								<el-table :data="tableData5"
-									:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
+									:header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
 									style="width: 100%;margin: auto;">
 									<el-table-column class-name="first-column-bg" label="创建人" prop="name"
 										min-width="15%">
@@ -1379,13 +1379,9 @@
 						return '待提交';
 					case '1':
 						return '待审核';
-					case '2':
-						return '业务部审核';
-					case '3':
-						return '品牌审核';
-					case '4':
-						return '审核通过';
 					case '5':
+						return '审核通过';
+					case '6':
 						return '审核不通过'
 				}
 			},
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
index 17255d3..b35ef11 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -191,7 +191,7 @@
 								<div style="font-size: 14px;padding: 10px 20px 0px 20px;">氛围明细信息</div>
 								<div style="padding: 10px 20px;">
 									<el-table :data="tableData2"
-										:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+								:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
 										<el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
@@ -263,7 +263,7 @@
 								<div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
 								<div style="padding:10px 20px;">
 									<el-table :data="tableData6"
-										:header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
+							:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
 										style="width: 100%;margin: auto;">
 										<el-table-column label="序号" min-width="5%" align='center'>
 											<template slot-scope="scope">
@@ -1778,20 +1778,25 @@
 					staut: false,
 				},
 				lishiList: null,
-				labelStyle: {
-					width: '197px',
-					height: '42px',
-				},
-				labelStyleOne: {
-					width: '110px',
-					height: '42px',
-					color: '#000',
-				},
-				contentClassNameOne: {
-					width: '219px',
-					padding: '9px 10px',
-					// height:'42px',
-				},
+			labelStyle: {
+				width: '250px',
+				height: '42px',
+			},
+			contentStyle: {
+				width: '300px',
+			
+				// height:'42px',
+			},
+			labelStyleOne: {
+				width: '94px',
+				height: '42px',
+				color: '#000',
+			},
+			contentClassNameOne: {
+				width: '219px',
+				padding: '9px 10px',
+				// height:'42px',
+			},
 				lidata: [],
 				lixiang: {},
 				duibiList: {},
@@ -1845,13 +1850,9 @@
 						return '待提交';
 					case '1':
 						return '待审核';
-					case '2':
-						return '业务部审核';
-					case '3':
-						return '品牌审核';
-					case '4':
-						return '审核通过';
 					case '5':
+						return '审核通过';
+					case '6':
 						return '审核不通过'
 				}
 			},
@@ -2183,6 +2184,16 @@
 					});
 				}
 			},
+			formatTimestampToDate(timestamp) {
+				const date = new Date(timestamp);
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				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}`;
+			},
 			tableAll() {
 				this.$refs.mulTable.clearSelection(); // 清除所有选项
 				const allRows = this.$refs.mulTable.data; // 获取所有行数据
@@ -2511,7 +2522,7 @@
 				this.searchShow = true
 			},
 			lichange(e) {
-
+				console.log(e)
 				// this.lishiList = e
 				// let msg = this.liData[e]
 				// this.duibiList = JSON.parse(msg.modifyContent)
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 1e60732..1dd65e2 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -807,7 +807,7 @@
               <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
               <div style="padding: 10px 20px;">
                 <el-table :data="tableData2"
-                 	:header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
+                 	:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                    style="width: 100%;margin: auto;">
                   <el-table-column label="序号" min-width="5%" align='center'>
                     <template slot-scope="scope">
@@ -872,7 +872,7 @@
               <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
               <div style="padding:10px 20px;">
                 <el-table :data="tableData6"
-                 	:header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
+                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                    style="width: 100%;margin: auto;">
                   <el-table-column label="序号" min-width="5%" align='center'>
                     <template slot-scope="scope">
@@ -1343,20 +1343,16 @@
     },
     methods: {
       getStatus(state) {
-      switch (state) {
-        case '':
-          return '待提交';
-        case '1':
-          return '待审核';
-        case '2':
-          return '业务部审核';
-        case '3':
-          return '品牌审核';
-        case '4':
-          return '审核通过';
-          case '5':
-          return '审核不通过'
-      }
+     switch (state) {
+     	case '':
+     		return '待提交';
+     	case '1':
+     		return '待审核';
+     	case '5':
+     		return '审核通过';
+     	case '6':
+     		return '审核不通过'
+     }
       },
       //查询全数据
       async getAll() {
diff --git a/admin-web-master/src/views/promotion/account.vue b/admin-web-master/src/views/promotion/account.vue
index cf665ae..ab6a7bb 100644
--- a/admin-web-master/src/views/promotion/account.vue
+++ b/admin-web-master/src/views/promotion/account.vue
@@ -83,9 +83,9 @@
 							</el-table-column>
 							<el-table-column label="渠道名称" prop="channelName" min-width="150" show-overflow-tooltip>
 							</el-table-column>
-							<el-table-column label="类型" prop="channelType" min-width="120">
+							<!-- <el-table-column label="类型" prop="channelType" min-width="120">
 
-							</el-table-column>
+							</el-table-column> -->
 							<el-table-column label="备注" prop="notes" min-width="200">
 
 							</el-table-column>
diff --git a/admin-web-master/src/views/promotion/audit.vue b/admin-web-master/src/views/promotion/audit.vue
index be531b6..6e7e2f3 100644
--- a/admin-web-master/src/views/promotion/audit.vue
+++ b/admin-web-master/src/views/promotion/audit.vue
@@ -93,8 +93,8 @@
 								  <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" /> 
 	                     </div>
 	                 </el-form-item>
-	                 <el-form-item label="宣传内容" class="grid-content bg-purple" prop="updateUser">
-	                   <div style="padding:20px;" v-html="secondData.updateUser"></div>
+	                 <el-form-item label="宣传内容" class="grid-content bg-purple" prop="promotionContent">
+	                   <div style="padding:20px;" v-html="secondData.promotionContent"></div>
 	                   
 	                 </el-form-item>
 	                 <!-- <el-form-item label="跳转链接" class="grid-content bg-purple" prop="eventAddrs">
@@ -503,7 +503,6 @@ components: { wangEditor},
         pageindex: {
           pageNumber: 0,
           pageSize: 10,
-		  state:'2'
         },
         options: [{
                   value: 1,
diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue
index 327cd4d..1e6b072 100644
--- a/admin-web-master/src/views/promotion/contentMant.vue
+++ b/admin-web-master/src/views/promotion/contentMant.vue
@@ -755,6 +755,36 @@ this.currentPage  =val
 	                   }
 	                   })
 	          },
+			  shiyong(val,item) {
+			  	const h = this.$createElement;
+			  	this.$msgbox({
+			  		title: '消息',
+			  		message: h('p', null, [
+			  			h('span', null, '是否使用 '),
+			  		]),
+			  		showCancelButton: true,
+			  		showClose: false,
+			  		confirmButtonText: '确定',
+			  		cancelButtonText: '取消',
+			  		customClass: 'oe-dialog-btn',
+			  		beforeClose: (action, instance, done) => {
+			  			if (action === 'confirm') {
+			  				contentEdit({
+			  					id: item.id,
+			  					draftStatus: 1,
+			  				}).then(res => {
+			  					this.getAll()
+			  					  this.caogaoshow =false
+			  					done();
+			  				})
+			  			} else {
+			  				done();
+			  			}
+			  		}
+			  	})
+			  
+			  
+			  },
     }
   }
 </script>
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index 3b0b86d..e88ae96 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -3,7 +3,7 @@
     <div class="zhuti" v-if="ggXin == false && detbox==false">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">商户合作</span></div>
+            style="color:#000000e6">商务合作</span></div>
       </div>
       <div>
         <!-- 搜索 -->
@@ -86,8 +86,9 @@
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
+			<div>共{{total}}条</div>
+          <el-pagination :hide-on-single-page='flag' background  :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next" :total="total "
             @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
@@ -773,6 +774,11 @@
 </script>
 
 <style scoped>
+	.fenye {
+	  margin-top: 20px;
+	  display: flex;
+	  justify-content: space-between;
+	}
   .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue
index 90b27d8..ac08aed 100644
--- a/admin-web-master/src/views/serve/procedure.vue
+++ b/admin-web-master/src/views/serve/procedure.vue
@@ -192,7 +192,9 @@
 					</div>
 					<div style="padding: 0 20px 20px 20px">
 						<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
-							<el-form-item label="公告标题">
+							<el-form-item label="公告标题" prop="announcementTitle">
+								
+								
 								<el-input v-model="ruleForm.announcementTitle" placeholder="请输入" size="mini" />
 							</el-form-item>
 							<el-form-item label="信息类型" prop="informationType">
@@ -203,7 +205,7 @@
 									<el-option label="活动信息" value="活动信息" />
 								</el-select>
 							</el-form-item>
-							<el-form-item label="公告内容">
+							<el-form-item label="公告内容" >
 								<div>
 									<wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
 
@@ -216,7 +218,7 @@
 							style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
 							@click="closeFn(2)">取 消</el-button>
 						<el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-							@click="addCheck('ruleForm')">确 定</el-button>
+							@click="addCheck">确 定</el-button>
 					</span>
 				</el-dialog>
 
@@ -368,7 +370,7 @@
 			},
 			// 新增确定
 			 addCheck() {
-				this.$refs[formName].validate((valid) => {
+				this.$refs.ruleForm.validate((valid) => {
 						if (valid) {
 							this.ruleForm.publisher = localStorage.getItem('roleName')
 							this.ruleForm.releaseTime = this.updateCurrentTime();
diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
index f6eb203..b2af145 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
@@ -1,8 +1,8 @@
 <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('+$hostUrl+ item.imageUrl +')'}"  @click="jumpLink(item.jumpUrl)">
-        <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src=" $hostUrl+ item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
+      <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>
     <view class="swiper-dots" v-if="bannerList && bannerList.length > 1">
diff --git a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
index 07a056d..af0a668 100644
--- a/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/orderModule/index.vue
@@ -83,12 +83,12 @@
                         @click.stop="goEvaluate(skuItem,orderItem.orderId)"
                     >立即评价
                     </view>
-                    <view
+                    <!-- <view
                         v-if="skuItem.commentId !== 0 && orderItem.state === 4 && orderItem.skus[0].ifAdd !== 1"
                         class="evaluate2"
                         @click.stop="goAdditionalEvaluation(orderIndex,skuItem.commentId)"
                     >追加评价
-                    </view>
+                    </view> -->
                   </view>
                 </view>
               </view>
diff --git a/ceres-uniapp-master/pages_category_page1/question/question.vue b/ceres-uniapp-master/pages_category_page1/question/question.vue
index f712295..bfb4fab 100644
--- a/ceres-uniapp-master/pages_category_page1/question/question.vue
+++ b/ceres-uniapp-master/pages_category_page1/question/question.vue
@@ -232,7 +232,9 @@
 			}
 		},
 		onLoad(options) {
-
+uni.setNavigationBarTitle({
+	title: '问卷调查'
+});
 			if (options.ids != '') {
 				if (options.src && options.token) {
 
diff --git a/ceres-uniapp-master/pages_category_page1/question/succe.vue b/ceres-uniapp-master/pages_category_page1/question/succe.vue
index d388812..3a4a02b 100644
--- a/ceres-uniapp-master/pages_category_page1/question/succe.vue
+++ b/ceres-uniapp-master/pages_category_page1/question/succe.vue
@@ -25,7 +25,9 @@
 			}
 	},
 			onLoad(options) {
-			
+			uni.setNavigationBarTitle({
+				title: '问卷调查'
+			});
 				if (options.ids) {
 					this.wenjuanID = options.ids
 						this.yuan = true
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index a012c01..370eb43 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -17,7 +17,7 @@
 				<swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true"
 					interval="5000" duration="500">
 					<swiper-item v-for="(item,index) in swiperList" :key="index">
-						<image :src="imgurl+item.imageUrl" mode="aspectFill"></image>
+						<image :src="item.imageUrl" mode="aspectFill"></image>
 						<!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
 					</swiper-item>
 				</swiper>
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
index 36907bf..5361b94 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
@@ -29,7 +29,8 @@
 			</view>
 			<view class="form-item">
 				<view class="label">租金</view>
-				<text>{{heData.contractAmount || '无'}}</text>
+				<text v-if="heData.contractAmount&&heData.contractAmount!=''">{{heData.contractAmount}}元</text>
+				<text v-else>无</text>
 			</view>
 			<view class="form-item">
 				<view class="label">付款日</view>
diff --git a/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue b/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue
index a493edb..f2df3af 100644
--- a/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue
+++ b/lvdao-miniapp/pagesA/projectManagement/projectDetails.vue
@@ -65,7 +65,7 @@
 				},
 				pagesize: {
 					id: '',
-					pageNumber: 1,
+					pageNumber: 0,
 					pageSize: 10,
 				},
 				imgurl: '',
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 54daaf6..833aaf8 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,10 +21,10 @@ 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.8:9003'+ url;
+		bases = 'http://128.10.249.26: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/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 14f11c7..6a7e308 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -19,8 +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 = 'http://128.10.249.8:9004';
+  PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
+  // PREFIX = 'http://128.10.249.8:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
--
libgit2 0.21.4