From 240b458757295872424e1fc84da07c60f53d787b Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Sun, 23 Mar 2025 15:37:24 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/utils/request.js      | 4 ++--
 admin-web-master/src/utils/request2.js     | 4 ++--
 lvdao-miniapp/pages/field/field.vue        | 2 +-
 lvdao-miniapp/pages/home/home.vue          | 2 +-
 lvdao-miniapp/pages/my/my.vue              | 2 +-
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue | 2 +-
 lvdao-miniapp/utils/request.js             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

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/utils/request2.js b/admin-web-master/src/utils/request2.js
index fbf4ee6..f788a54 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/admin-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.20:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/lvdao-miniapp/pages/field/field.vue b/lvdao-miniapp/pages/field/field.vue
index 54f49e9..734bee3 100644
--- a/lvdao-miniapp/pages/field/field.vue
+++ b/lvdao-miniapp/pages/field/field.vue
@@ -158,7 +158,7 @@
 			reconciliationdetail(item) {
 				let items = JSON.stringify(item)
 				uni.navigateTo({
-					url: `/pages/details/details?item=${items}`
+					url: `/pages/details/details?item=${encodeURIComponent(items)}`
 				})
 			},
 			search(){
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index 8ffe9e7..078f7d7 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -639,7 +639,7 @@
 				let items = JSON.stringify(item)
 				if (this.current == 0 || this.current == 1) {
 					uni.navigateTo({
-						url: `/pages/details/details?item=${items}`
+						url: `/pages/details/details?item=${encodeURIComponent(items)}`
 					})
 				} else {
 					uni.navigateTo({
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 7588071..9431b63 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -222,7 +222,7 @@
 						</view>
 						<view class="data">
 							<view class="title">
-								<text>投诉建议</text>
+								<text>意见反馈</text>
 							</view>
 						</view>
 					</view>
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 41254e5..5d7a178 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -3,7 +3,7 @@
 		<view class="screen-list">
 			<view class="list">
 				<u-input type="select" @click="typeShow = true"
-					:placeholder="pageindex.dataStatus == '1'?'申请中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" />
+					:placeholder="pageindex.dataStatus == '1'?'租赁中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" />
 			</view>
 		</view>
 		<!-- 记录列表 -->
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 88023f7..22682f0 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -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;
--
libgit2 0.21.4