From cff964f80b8545c9e7ee00a708aa7ba83d3f50d4 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Wed, 9 Apr 2025 11:22:35 +0800
Subject: [PATCH] 最新1

---
 admin-web-master/src/views/atmosphere/atmosphereBz.vue            |  5 +++--
 admin-web-master/src/views/couponmanagement/capitalpool.vue       | 10 +++++-----
 ceres-uniapp-master/config/api.js                                 |  4 ++--
 ceres-uniapp-master/pages_category_page1/customer/chatBox.vue     | 33 +++++++++++++++++++++++----------
 ceres-uniapp-master/pages_category_page1/question/succe.vue       |  6 +++---
 settled-merchant-master/src/api/index.js                          |  5 +++--
 settled-merchant-master/src/main.js                               |  2 +-
 settled-merchant-master/src/views/SettleIn/enterprisesApply.vue   |  4 ++--
 settled-merchant-master/src/views/SettleIn/individualBusiness.vue |  4 ++--
 settled-merchant-master/src/views/SettleIn/organization.vue       |  4 ++--
 settled-merchant-master/src/views/SettleIn/personal.vue           |  4 ++--
 settled-merchant-master/src/views/moblie/mEnterprise.vue          |  8 ++++++--
 settled-merchant-master/src/views/moblie/mOtherOrg.vue            |  4 ++--
 settled-merchant-master/src/views/moblie/mPersonal.vue            |  4 ++--
 settled-merchant-master/src/views/moblie/mUinitBusiness.vue       | 12 ++++++++----
 15 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
index 6584c2d..815266c 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
@@ -372,10 +372,11 @@
 
 			</div>
 			<div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-				<el-button plain @click="minSev" size="mini" style="background-color: #3F9B6A;color: #fff;">确定
-				</el-button>
 				<el-button plain @click="addMing=false" size="mini" style="background-color: #3F9B6A;color: #fff;">取消
 				</el-button>
+				<el-button plain @click="minSev" size="mini" style="background-color: #3F9B6A;color: #fff;">确定
+				</el-button>
+				
 				
 
 			</div>
diff --git a/admin-web-master/src/views/couponmanagement/capitalpool.vue b/admin-web-master/src/views/couponmanagement/capitalpool.vue
index 81f6b1a..efaf08a 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpool.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpool.vue
@@ -84,7 +84,7 @@
           </el-table>
           <div style="display: flex;justify-content: space-between;" class="bom">
             <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
-            <el-pagination :current-page="query.pageNumber" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
+            <el-pagination :current-page="query.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
               small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
               @current-change="handleCurrentChange">
             </el-pagination>
@@ -219,7 +219,7 @@
           activityName: '', // 活动名称
           // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
           state: '',
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10
         },
         total: 0,
@@ -573,12 +573,12 @@
         this.getAll()
       },
       handleCurrentChange(val) {
-        this.query.pageNumber = val
+        this.query.pageNumber = val - 1 
         this.getAll()
       },
       search() {
         this.total = 1
-        this.query.pageNumber = 1
+        this.query.pageNumber = 0
         this.getAll()
       },
       // 重置
@@ -586,7 +586,7 @@
         this.query = {
           activityName: '',
           state: '',
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10
         }
         this.getAll()
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 8fe8762..e28e4e1 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -45,9 +45,9 @@ const TERMINAL = 1
 
 module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
-	SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
+	// SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
 	// 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
-	// SettledMerchantPrefix:'http://localhost:8082',
+	SettledMerchantPrefix:'http://localhost:8081',
 	shareLink: TIAOZHUAN + 'meh5', // 分享地址
 	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
 	
diff --git a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
index ac3917d..33f11a7 100644
--- a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
+++ b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
@@ -15,10 +15,11 @@
 				<view   style="text-align: right;margin-top: 10rpx;"	v-if="item.messageType==1">
 					<view class="uni-comment-top" style="margin-right: 10px;">
 						<view>{{item.userName==''||item.userName==null?'匿名':item.userName}}</view>
-						<view class="uni-comment-date">{{item.chatTime}}</view>
+						
 						
 					</view>				
 					<view class="uni-comment-content ziji" style="margin-right: 10px;text-align: right;padding-right: 15px;">{{item.chatContent}}</view>
+					<view class="uni-comment-date">{{item.chatTime}}</view>
 				</view>
 				<view class="uni-comment-face" v-if="item.messageType==1">
 					<image :src="$baseURL+user.headImage" mode="widthFix"></image>
@@ -30,9 +31,10 @@
 				<view class="uni-comment-body" v-if="item.messageType==2">
 					<view class="uni-comment-top">
 						<view>{{item.shopName==''||item.shopName==null?'匿名':item.shopName}}</view>
-						<view class="uni-comment-date">{{item.chatTime}}</view>
+						
 					</view>				
 					<view class="uni-comment-content kehu" style="text-align: left;padding-left: 15px;">{{item.chatContent}}</view>
+					<view class="uni-comment-date">{{item.chatTime}}</view>
 				</view>
 			</view>
 			
@@ -45,9 +47,10 @@
 				<view class="uni-comment-body">
 					<view class="uni-comment-top">
 						<view>商家</view>
-						<view class="uni-comment-date"></view>
+						
 					</view>				
 						<view class="uni-comment-content kehu" style="text-align: left;padding-left: 15px;">您好！请问有什么问题呢？</view>
+						<view class="uni-comment-date"></view>
 				</view>
 			</view>
 		</view>
@@ -237,7 +240,7 @@
  
 	.uni-comment-body {
 		margin-top: 10rpx;
-		// width: 100%;
+		width: 100%;
 	}
  
 	.uni-comment-top {
@@ -254,16 +257,26 @@
 	}
  
 	.uni-comment-top{
-		.uni-comment-date {
-				color: #666666;
-				font-size: 20upx;
-		}
+		
 	}
- 
+ .uni-comment-date {
+ 		color: #666666;
+ 		font-size: 24upx;
+ }
 	.uni-comment-content {
 		line-height: 1.6em;
 		font-size: 28upx;
-		padding: 8rpx 0;
+		padding: 8rpx 10px;
+		margin:8rpx 0;
+		 /* 移除固定高度和宽度 */
+		  height: auto;
+		  width: auto;
+		  /* 使用 inline-block 或 flex 让盒子根据内容自动调整大小 */
+		  display: inline-block; 
+		   max-width: 70%; /* 大致限制宽度为父元素的 70% */
+		    word-wrap: break-word; /* 允许长单词换行 */
+		    overflow-wrap: break-word; /* 同 word-wrap，更标准的写法 */
+		    display: inline-block; /* 让盒子根据内容自适应宽度 */
 	}
  
 	.uni-comment-replay-btn {
diff --git a/ceres-uniapp-master/pages_category_page1/question/succe.vue b/ceres-uniapp-master/pages_category_page1/question/succe.vue
index 3a4a02b..c29422c 100644
--- a/ceres-uniapp-master/pages_category_page1/question/succe.vue
+++ b/ceres-uniapp-master/pages_category_page1/question/succe.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="questionnaire">
-		<view  style="position: absolute;top:35%;width:80%;left:10%" v-if="yuan">
+		<view  style="position: absolute;top:30%;width:80%;left:10%" v-if="yuan">
 			<image src="../../static/images/tijiao.png" style="width:100%;" mode="aspectFit"></image>
 			<button class="submit-btn" @click="guanbi">关闭</button>
 		</view>
-		<view  style="position: absolute;top:35%;width:80%;left:10%" v-if="chong">
+		<view  style="position: absolute;top:30%;width:80%;left:10%" v-if="chong">
 			<image src="../../static/images/tijiaoTwo.png" style="width:100%;" mode="aspectFit"></image>
 		</view>
-		<view  style="position: absolute;top:35%;width:80%;left:10%" v-if="yuan == false && chong == false">
+		<view  style="position: absolute;top:30%;width:80%;left:10%" v-if="yuan == false && chong == false">
 			<image src="../../static/images/tijiaoThree.png" style="width:100%;" mode="aspectFit"></image>
 			 <view style="text-align: center;font-size: 20px;color: grey;">{{msg}}</view>
 		</view>
diff --git a/settled-merchant-master/src/api/index.js b/settled-merchant-master/src/api/index.js
index 3caf5c6..94b4719 100644
--- a/settled-merchant-master/src/api/index.js
+++ b/settled-merchant-master/src/api/index.js
@@ -3,13 +3,14 @@ import home from './home'
 const host = `${window.location.protocol}//${window.location.host}`
 const TIAOZHUAN = `${host}/cdwlMall/meserver/`
 // 获取当前环境变量 true => 生产环境 false => 开发环境
-const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'http://128.10.249.28:9007'
+const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'http://128.10.249.28:9003'
 export const api = {
 	// 登录模块
 	...home(BASEURL),
 	// 图片上传
 	upload: `${upUrl}/miniio/uploadQuestion`,
+	// upload: `http://172.16.61.237:9000/miniio/uploadQuestion`,
 	// 商家入驻
 	enterpriseCheck: `${BASEURL}/check/enterpriseCheck`,
 	individualCheck: `${BASEURL}/check/individualCheck`,
diff --git a/settled-merchant-master/src/main.js b/settled-merchant-master/src/main.js
index ff606ed..3c8720b 100644
--- a/settled-merchant-master/src/main.js
+++ b/settled-merchant-master/src/main.js
@@ -17,7 +17,7 @@ Vue.prototype.$message = ElementUI.Message
 let host = window.location.host
 if (host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528' || host === '192.168.31.45:9528' || host === 'localhost:9529') {
   Vue.prototype.$baseURL = 'https://jy.scjysm.asia:18086/cdwlMall'
-  Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
+  // Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
 } else {
   Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
 }
diff --git a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue
index c3be8f8..4ccf8ff 100644
--- a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue
+++ b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue
@@ -232,8 +232,8 @@ export default {
         enterpriseCardStartTime: '', // 证件有效开始时间
         enterpriseCardEndTime: '', // 证件有效结束时间
         enterpriseCardPositive: '', // 身份证正面照
-        enterpriseCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        enterpriseCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue
index a5fe56a..d1e473f 100644
--- a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue
+++ b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue
@@ -232,8 +232,8 @@ export default {
         subjectCardStartTime: '', // 证件有效开始时间
         subjectCardEndTime: '', // 证件有效结束时间
         subjectCardPositive: '', // 身份证正面照
-        subjectCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        subjectCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/SettleIn/organization.vue b/settled-merchant-master/src/views/SettleIn/organization.vue
index fd28980..808c4d2 100644
--- a/settled-merchant-master/src/views/SettleIn/organization.vue
+++ b/settled-merchant-master/src/views/SettleIn/organization.vue
@@ -230,8 +230,8 @@ export default {
         otherCardStartTime: '', // 证件有效开始时间
         otherCardEndTime: '', // 证件有效结束时间
         otherCardPositive: '', // 身份证正面照
-        otherCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        otherCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/SettleIn/personal.vue b/settled-merchant-master/src/views/SettleIn/personal.vue
index 35005ca..2b3087e 100644
--- a/settled-merchant-master/src/views/SettleIn/personal.vue
+++ b/settled-merchant-master/src/views/SettleIn/personal.vue
@@ -186,8 +186,8 @@ export default {
         personalCardEndTime: '', // 证件有效结束时间
         personalCardPositive: '', // 身份证正面照
         personalCardSide: '', // 身份证反面照
-        personalCardHand: '' ,// 手持证件照
-		merchantType: '线上商家' 
+        personalCardHand: '', // 手持证件照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/moblie/mEnterprise.vue b/settled-merchant-master/src/views/moblie/mEnterprise.vue
index 1dc5ad0..15b8ad1 100644
--- a/settled-merchant-master/src/views/moblie/mEnterprise.vue
+++ b/settled-merchant-master/src/views/moblie/mEnterprise.vue
@@ -284,8 +284,8 @@ export default {
         enterpriseCardStartTime: '', // 证件有效开始时间
         enterpriseCardEndTime: '', // 证件有效结束时间
         enterpriseCardPositive: '', // 身份证正面照
-        enterpriseCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        enterpriseCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
@@ -344,15 +344,19 @@ export default {
       this.show = false
     },
     selectStartDateBtn () {
+		this.startDate = new Date()
       this.startDateShow = true
     },
     selectEndDateBtn () {
+		this.endDate = new Date()
       this.endDateShow = true
     },
     selectIdStartDateBtn () {
+		this.idCardStartDate = new Date()
       this.idCardStartShow = true
     },
     selectIdEndDateBtn () {
+		this.idCardEndDate = new Date()
       this.idCardEndShow = true
     },
     dateTime (value) {
diff --git a/settled-merchant-master/src/views/moblie/mOtherOrg.vue b/settled-merchant-master/src/views/moblie/mOtherOrg.vue
index d3b6dd8..a139cfc 100644
--- a/settled-merchant-master/src/views/moblie/mOtherOrg.vue
+++ b/settled-merchant-master/src/views/moblie/mOtherOrg.vue
@@ -283,8 +283,8 @@ export default {
         otherCardStartTime: '', // 证件有效开始时间
         otherCardEndTime: '', // 证件有效结束时间
         otherCardPositive: '', // 身份证正面照
-        otherCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        otherCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/moblie/mPersonal.vue b/settled-merchant-master/src/views/moblie/mPersonal.vue
index da26548..cc72495 100644
--- a/settled-merchant-master/src/views/moblie/mPersonal.vue
+++ b/settled-merchant-master/src/views/moblie/mPersonal.vue
@@ -206,8 +206,8 @@ export default {
         personalCardEndTime: '', // 证件有效结束时间
         personalCardPositive: '', // 身份证正面照
         personalCardSide: '', // 身份证反面照
-        personalCardHand: '' ,// 手持证件照
-		merchantType: '线上商家' 
+        personalCardHand: '', // 手持证件照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
diff --git a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue
index 59a77b4..e0f1d28 100644
--- a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue
+++ b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue
@@ -247,8 +247,8 @@ export default {
       areaRegionList: AreaList,
       show: false,
       regionShow: false,
-      minDate: new Date(1960, 1, 1),
-      maxDate: new Date(2077, 12, 31),
+      minDate: new Date(1980, 1, 1),
+      maxDate: new Date(2100, 12, 31),
       startDate: '',
       endDate: '',
       idCardStartDate: '',
@@ -287,8 +287,8 @@ export default {
         subjectCardStartTime: '', // 证件有效开始时间
         subjectCardEndTime: '', // 证件有效结束时间
         subjectCardPositive: '', // 身份证正面照
-        subjectCardSide: '' ,// 身份证反面照
-		merchantType: '线上商家' 
+        subjectCardSide: '', // 身份证反面照
+		merchantType: '线上商家'
       },
       idCardList: [],
       dictName: '证件类型',
@@ -417,15 +417,19 @@ export default {
       this.show = false
     },
     selectStartDateBtn () {
+	this.startDate = new Date()
       this.startDateShow = true
     },
     selectEndDateBtn () {
+	this.endDate = new Date()
       this.endDateShow = true
     },
     selectIdStartDateBtn () {
+		this.idCardStartDate = new Date()
       this.idCardStartShow = true
     },
     selectIdEndDateBtn () {
+		this.idCardEndDate = new Date()
       this.idCardEndShow = true
     },
     dateTime (value) {
--
libgit2 0.21.4