From 2067568a59137e8c7139a05207b96b87b95b143b Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Fri, 7 Feb 2025 17:47:06 +0800
Subject: [PATCH] '租金缴费'

---
 admin-web-master/src/components/add/addremoveht.vue             |   5 +++--
 admin-web-master/src/utils/request.js                           |   4 ++--
 admin-web-master/src/views/order/after/index.vue                |   2 +-
 admin-web-master/src/views/order/orderany/index.vue             |  13 +++++++++++++
 admin-web-master/src/views/order/ordersel/index.vue             |   2 +-
 admin-web-master/src/views/order/pending/index.vue              |   2 +-
 lvdao-miniapp/App.vue                                           |   2 +-
 lvdao-miniapp/manifest.json                                     | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/activityAdd/activityAdd.vue                 |   5 +++--
 lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue |   2 +-
 lvdao-miniapp/pages/details/details.vue                         |   2 +-
 lvdao-miniapp/pages/field/field.vue                             |   1 +
 lvdao-miniapp/pages/login/login.vue                             |   2 +-
 lvdao-miniapp/pages/message/message.vue                         |   2 +-
 lvdao-miniapp/pages/my/my.vue                                   |   2 +-
 lvdao-miniapp/pages/mycreated/mycreated.vue                     |   5 +++--
 lvdao-miniapp/pages/workbench/workbench.vue                     |   2 +-
 lvdao-miniapp/pagesA/rentPay/goPay.vue                          |  31 +++++++++++++++++++++++++++----
 lvdao-miniapp/pagesA/rentPay/rentPay.vue                        | 387 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue                 |  36 +++++++++++++++++++++++-------------
 lvdao-miniapp/pagesA/rentPay/webView.vue                        |  24 +++++++++++-------------
 lvdao-miniapp/utils/request.js                                  |  14 ++++++++------
 merchant-web-master/src/utils/request.js                        |   6 +++---
 23 files changed, 452 insertions(+), 377 deletions(-)

diff --git a/admin-web-master/src/components/add/addremoveht.vue b/admin-web-master/src/components/add/addremoveht.vue
index e60fd6c..df5154f 100644
--- a/admin-web-master/src/components/add/addremoveht.vue
+++ b/admin-web-master/src/components/add/addremoveht.vue
@@ -82,7 +82,7 @@
         <el-col :span="12">
           <el-form-item label="付款日" prop="paymentDay">
             <el-select v-model="formInline.paymentDay" placeholder="请选择" style="width: 100%;">
-              <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31"></el-option>
+              <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31" :key="val"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -481,7 +481,7 @@
               contractChangeReason: this.contractChangeReason,
               dataStatus: dataStatus,
               originalContractCode: this.info.contractNumber,
-
+              id: this.info.id,
               relatedMerchants: this.info.relatedMerchants,
               tenantName: this.info.tenantName,
               tenantTelephone: this.info.tenantTelephone,
@@ -492,6 +492,7 @@
             if (valid) {
               cereContractInformation({
                 ...this.formInline,
+                id: this.info.id,
                 relatedMerchants: this.shopId,
                 contractChangeReason: this.contractChangeReason,
                 dataStatus: dataStatus,
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index c4ca789..e5e121e 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,9 +17,9 @@ let baseURL =  ''
 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://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
-  // baseURL = 'http://10.0.0.51:9003';
+  baseURL = 'http://192.168.2.107:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 
diff --git a/admin-web-master/src/views/order/after/index.vue b/admin-web-master/src/views/order/after/index.vue
index 21b8d4c..16eb34e 100644
--- a/admin-web-master/src/views/order/after/index.vue
+++ b/admin-web-master/src/views/order/after/index.vue
@@ -52,7 +52,7 @@
           <el-table-column prop="shopCode" label="店铺编码" width="220" />
           <el-table-column prop="number" label="退款商品数量" width="220" />
           <el-table-column prop="refundMoney" label="退款金额（元）" width="220" />
-          <el-table-column label="操作" show-overflow-tooltip>
+          <el-table-column label="操作" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
               <div class="btnList">
                 <div
diff --git a/admin-web-master/src/views/order/orderany/index.vue b/admin-web-master/src/views/order/orderany/index.vue
index d3cec41..aeff043 100644
--- a/admin-web-master/src/views/order/orderany/index.vue
+++ b/admin-web-master/src/views/order/orderany/index.vue
@@ -209,6 +209,19 @@
       search(){
       this.getTotalData()
       },
+      clear(){
+        this.formParams={
+          searchType: '1',
+          search: '', // 搜索字段
+          state: '',
+          // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
+          dates: [], // 下单时间数组
+          page: 1,
+          shopName: '',
+          pageSize: 10
+        }
+        this.getTotalData()
+      },
      async  getTotalData() {
            const res = await orderGetAll(this.formParams)
         const Orderlist = await orderStatistics(res.data.list)
diff --git a/admin-web-master/src/views/order/ordersel/index.vue b/admin-web-master/src/views/order/ordersel/index.vue
index a2450b2..1091663 100644
--- a/admin-web-master/src/views/order/ordersel/index.vue
+++ b/admin-web-master/src/views/order/ordersel/index.vue
@@ -93,7 +93,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" show-overflow-tooltip>
+            <el-table-column label="操作" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
                 <div class="btnList">
                   <div class="tableBtn greens" @click="seeMore(scope.row)">查看</div>
diff --git a/admin-web-master/src/views/order/pending/index.vue b/admin-web-master/src/views/order/pending/index.vue
index 2f57b59..8f8fd4f 100644
--- a/admin-web-master/src/views/order/pending/index.vue
+++ b/admin-web-master/src/views/order/pending/index.vue
@@ -92,7 +92,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" show-overflow-tooltip>
+            <el-table-column label="操作" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
                 <div class="btnList">
                   <div class="tableBtn greens" @click="seeMore(scope.row)">查看</div>
diff --git a/lvdao-miniapp/App.vue b/lvdao-miniapp/App.vue
index d42b1d4..189f66b 100644
--- a/lvdao-miniapp/App.vue
+++ b/lvdao-miniapp/App.vue
@@ -17,7 +17,7 @@ export default {
 </script>
 
 <style lang="scss">
-	@import "uview-ui/index.scss";
+@import "uview-ui/index.scss";
 /*每个页面公共css */
 @import 'colorui/main.css';
 
diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json
index ac3b56a..00a708f 100644
--- a/lvdao-miniapp/manifest.json
+++ b/lvdao-miniapp/manifest.json
@@ -1,140 +1,140 @@
 {
-    "name" : "绿道",
-    "appid" : "__UNI__F034047",
-    "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "android" : {
-                    "hdpi" : "",
-                    "xhdpi" : "",
-                    "xxhdpi" : ""
-                },
-                "androidStyle" : "default"
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx005c61919377e6af",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : false,
-            "minified" : true
-        },
-        "usingComponents" : true,
-        "permission" : {}
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
-        },
-        "title" : "商城",
-        "devServer" : {
-            "https" : false
-        },
-        "domain" : "",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
-                }
-            }
-        },
-        "template" : "home.vue"
-    }
-}
+	"name": "绿道",
+	"appid": "__UNI__F034047",
+	"description": "",
+	"versionName": "1.0.2",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"android": {
+					"hdpi": "",
+					"xhdpi": "",
+					"xxhdpi": ""
+				},
+				"androidStyle": "default"
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx005c61919377e6af",
+		"setting": {
+			"urlCheck": false,
+			"es6": true,
+			"postcss": false,
+			"minified": true
+		},
+		"usingComponents": true,
+		"permission": {}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"h5": {
+		"router": {
+			"mode": "hash",
+			"base": "./"
+		},
+		"title": "商城",
+		"devServer": {
+			"https": false
+		},
+		"domain": "",
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
+				}
+			}
+		},
+		"template": "home.vue"
+	}
+}
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/activityAdd/activityAdd.vue b/lvdao-miniapp/pages/activityAdd/activityAdd.vue
index 4c74b9d..2530dfb 100644
--- a/lvdao-miniapp/pages/activityAdd/activityAdd.vue
+++ b/lvdao-miniapp/pages/activityAdd/activityAdd.vue
@@ -197,13 +197,14 @@
 							}
 							if(this.typeEdit){
 								this.$http.sendRequest('/cereActivityApplication/edit', 'POST',info,1).then(res => {
-								     uni.navigateTo({
+								     uni.redirectTo({
 								     	url: '/pages/mycreated/mycreated'
 								     })
 								})
 							}else{
+								
 								this.$http.sendRequest('/cereActivityApplication/add', 'POST',info,1).then(res => {
-								     uni.navigateTo({
+								     uni.redirectTo({
 								     	url: '/pages/mycreated/mycreated'
 								     })
 								}).catch(err => {
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index 454924b..df52acc 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -129,7 +129,7 @@ export default {
   methods: {
 	  leaseAdd(url){
 		  
-		  	this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
+		  	this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
 		  		if(res.data.code == '20004' || res.data.code == '20003'){
 		  								 uni.navigateTo({
 		  								 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index 50ae6d3..f324edb 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -183,7 +183,7 @@ export default {
   },
   methods: {
 		leaseAdd(url){
-			this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
+			this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
 				if(res.data.code == '20004' || res.data.code == '20003'){
 										 uni.navigateTo({
 										 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/field/field.vue b/lvdao-miniapp/pages/field/field.vue
index 7b1a635..a5d4a79 100644
--- a/lvdao-miniapp/pages/field/field.vue
+++ b/lvdao-miniapp/pages/field/field.vue
@@ -107,6 +107,7 @@
 	export default {
 		data() {
 			return {
+				$img: this.$root.$img,
 				query:{
 					venueName:'',
 					pageNumber: 0,
diff --git a/lvdao-miniapp/pages/login/login.vue b/lvdao-miniapp/pages/login/login.vue
index 0468203..7bc216f 100644
--- a/lvdao-miniapp/pages/login/login.vue
+++ b/lvdao-miniapp/pages/login/login.vue
@@ -110,7 +110,7 @@
 					username:this.phone,
 					 code:this.code
 				}
-				this.$http.sendRequest('/business/login', 'POST', data, 2).then(res => {
+				this.$http.sendRequest('/business/login', 'POST', data,2).then(res => {
 					if (res.data.code == '' || res.data.code == '200') {
 						uni.setStorageSync('token', res.data.data.token);
 						uni.setStorageSync('user', res.data.data);
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index 00241ae..b496267 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -228,7 +228,7 @@
 				})
 			} else {
 
-				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
 					 if(res.data.code == '20004' || res.data.code == '20003'){
 						 uni.navigateTo({
 						 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 795723e..1d13fd2 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -284,7 +284,7 @@
 				})
 			} else {
 
-				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
 					 if(res.data.code == '20004' || res.data.code == '20003'){
 						 uni.navigateTo({
 						 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/mycreated/mycreated.vue b/lvdao-miniapp/pages/mycreated/mycreated.vue
index dbb0481..8a67fbd 100644
--- a/lvdao-miniapp/pages/mycreated/mycreated.vue
+++ b/lvdao-miniapp/pages/mycreated/mycreated.vue
@@ -10,7 +10,8 @@
 			<u-button type="success" @click="search">搜索</u-button>
 		</view> -->
 		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" 
+			 bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
 		</view>
 		<view class="goods-data">
 			<view class="goods-list">
@@ -33,7 +34,7 @@
 								</view>
 								<view class="info-item">
 									<view class="label">活动状态：</view>
-									<text>{{v.auditStatus =='1'?'待提交':v.auditStatus =='2'?'待审核':v.auditStatus =='3'?'审核通过':v.auditStatus =='4'?'审核驳回':''}}</text>
+									<text>{{v.auditStatus =='1'?'待提交':v.auditStatus =='2'?'待审核':v.auditStatus =='3'&&v.activeState==null?'审核通过':v.auditStatus =='3'&&v.activeState==0?'未开始':v.auditStatus =='3'&&v.activeState==1?'进行中':v.auditStatus =='3'&&v.activeState==2?'已结束':v.auditStatus =='4'?'审核驳回':''}}</text>
 								</view>
 							</view>
 						</view>
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index 21ce9c6..bf19911 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -178,7 +178,7 @@
 				})
 			} else {
 
-				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
 					 if(res.data.code == '20004' || res.data.code == '20003'){
 						 uni.navigateTo({
 						 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pagesA/rentPay/goPay.vue b/lvdao-miniapp/pagesA/rentPay/goPay.vue
index 6eb7e85..d30db92 100644
--- a/lvdao-miniapp/pagesA/rentPay/goPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/goPay.vue
@@ -4,7 +4,7 @@
 			<view class="msgtitle">您正在成都锦江绿道有限公司支付金额</view>
 			<view class="price">
 				<u-icon name="rmb" style="font-size: 24rpx;" />
-				800
+				{{allPay}}
 			</view>
 		</view>
 		<view style="height: 120rpx;"></view>
@@ -18,8 +18,19 @@
 	export default {
 		data() {
 			return {
+				receivedMsg:[],
+				allPay:0
 				}
 		},
+		onLoad(options) {
+		 if(options.msg){
+			let receivedMsg = JSON.parse(options.msg)
+			this.receivedMsg = receivedMsg
+			receivedMsg.map(item=>{
+				this.allPay += item.paymentAmount
+			})
+		 }
+		},
 		onShow() {
 				const isLogin = uni.getStorageSync('token');
 				if (isLogin == '') {
@@ -29,7 +40,7 @@
 					})
 				} else {
 		
-					this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
+					this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
 						 if(res.data.code == '20004' || res.data.code == '20003'){
 							 uni.navigateTo({
 							 	url: '/pages/login/login'
@@ -41,9 +52,21 @@
 			},
 				methods: {
 					submit(){
-						uni.navigateTo({
-							url: '/pagesA/rentPay/webView'
+						console.log(this.receivedMsg)
+						
+						let obj = [{
+							orderId:this.receivedMsg[0].tenementOrder,
+							money:this.receivedMsg[0].paymentAmount,
+						}]
+						this.$http.sendRequest('/order/rentAggregatePayment','POST',obj,3).then(res => {
+							console.log(JSON.parse(res.data.data).data.codeUrl)
+							 if(res.data.data){
+								 uni.navigateTo({
+								 	url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
+								 })
+							 }
 						})
+					
 					}
 				}
 }				
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.vue b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
index 18eedc1..95b45eb 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
@@ -2,53 +2,52 @@
 	<view class="page">
 		<view class="search-box">
 			<view>
-				<u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;" placeholder="-"  :border="false"/>
-				<u-select v-model="show" :list="list1" @confirm="confirm"></u-select>
+				<u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;"
+					placeholder="-" :border="false" />
+				<u-select v-model="show" :list="list1" @confirm="confirm($event)"></u-select>
 			</view>
-			
+
 		</view>
 		<view class="search-total">
-				<view class="left">
-					<view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</view>
-					<view>（当前租金欠费金额)</view>
-				</view>
-				<div class="right" @click='toDetail'>
-					<view>缴费记录 <u-icon name="arrow-right"  size="28" /></view>
-				</div> 
-	
+			<view class="left">
+				<view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />{{yingPayAll}}</view>
+				<view>（当前租金欠费金额)</view>
+			</view>
+			<div class="right" @click='toDetail'>
+				<view>缴费记录 <u-icon name="arrow-right" size="28" /></view>
+			</div>
+
 		</view>
-		<view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">每月1日为付款日</view>
+		<view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">{{etTimePeriodDesc(payNum,dayMsg)}}为付款日</view>
 		<!-- 记录列表 -->
 		<view class="record-list">
 			<view class="record-list-box" v-for="(item,index) in recordList" :key="index">
-				<u-checkbox-group class="list-group" style="width: 100%;" >
-						<view class="list">
-							<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" active-color="#0EBB5A" 	@change="xuanAll(item,$event)"/>
-								
-							<view class="list-item">
-								<view class="list-info">
-									<view class="info-items">
-										<view class="info-title">{{item.name}}：</view>
-										<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.price}}</view>
-									</view>
+				<u-checkbox-group class="list-group" style="width: 100%;">
+					<view class="list">
+						<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false"
+							active-color="#0EBB5A" @change="xuanAll(item,$event)" />
+
+						<view class="list-item">
+							<view class="list-info">
+								<view class="info-items">
+									<view class="info-title">{{formatTime(payNum,item.tenementOrderDate)}}应缴租金：</view>
+									<view class="price"><u-icon name="rmb"
+											style="font-size: 24rpx;" />{{item.paymentAmount}}</view>
 								</view>
 							</view>
 						</view>
-			
+					</view>
+
 				</u-checkbox-group>
 			</view>
 		</view>
 		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
 			<view class="footer-buy">
-					<u-checkbox-group >
-							<u-checkbox 
-							shape="circle"
-								@change="quanxuan" 
-								v-model="showAll"
-								active-color="#0EBB5A"
-							>全选</u-checkbox>
-						</u-checkbox-group>
+				<u-checkbox-group>
+					<u-checkbox shape="circle" @change="quanxuan" v-model="showAll"
+						active-color="#0EBB5A">全选</u-checkbox>
+				</u-checkbox-group>
 				<view class="cart-add">
 					合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view>
 				</view>
@@ -57,106 +56,34 @@
 		</view>
 		<!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
 	</view>
-	
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				payNum: 1,
+				dayMsg: '',
 				show: false,
-				payAll:0,
+				payAll: 0,
+				yingPayAll: 0,
 				value: '',
-				list1: [{ value: '0', label: '全部' },{ value: '1', label: '物业费' }, { value: '2', label: '水费' },{ value: '3', label: '卫生费' }, { value: '4', label: '燃气费' },{ value: '5', label: '电费' }	],
+				list1: [],
 				checked: [],
-				recordList:[
-					{
-						img: '',
-						name: '物业费',
-						price: 1500,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '卫生费',
-						price: 5000,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '水费',
-						price: 2000,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					}
-				],
-				recordList1:[
-					{
-						img: '',
-						name: '物业费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '卫生费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '水费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '电费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '燃气费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-				],
-							
-							loadShow:false,
-							showAll:false,
-							
+				recordList: [],
+				loadShow: false,
+				showAll: false,
+				ListIndex: 0,
+
 			};
 		},
-		watch:{
-			recordList:{
-				deep:true,
-				handler(newVal){ 
-					 const allTrue = this.recordList.every(item => item.gouxuan)
-					 this.showAll = allTrue
+		watch: {
+			recordList: {
+				deep: true,
+				handler(newVal) {
+					const allTrue = this.recordList.every(item => item.gouxuan)
+					this.showAll = allTrue
 				}
 			}
 		},
@@ -169,89 +96,187 @@
 				})
 			} else {
 
-				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
-					 if(res.data.code == '20004' || res.data.code == '20003'){
-						 uni.navigateTo({
-						 	url: '/pages/login/login'
-						 })
-					 }
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					pageSize: 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}).then(res => {
+
+					if (res.data.code == '20004' || res.data.code == '20003') {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					} else {
+
+						this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', {
+							relatedMerchants: res.data.data.content[0].id
+						}, 1).then(res => {
+							if (res.data.data.length > 0) {
+								const listNew = []
+								res.data.data.map((item, index) => {
+
+									const newObj = {
+										label: item.shopName,
+										value: index,
+										list: []
+									}
+									newObj.list = item.cerePropertyOrderList
+
+									listNew.push(newObj)
+
+								})
+
+								this.list1 = listNew
+
+								this.value = res.data.data[0].shopName
+								this.ListIndex = 0
+								const redList = []
+								this.payAll = 0
+								this.yingPayAll = 0
+								res.data.data[0].cerePropertyOrderList.map(item => {
+									if (item.payState == 0) {
+										this.yingPayAll += item.paymentAmount
+										this.payNum = item.payType
+										this.dayMsg = item.payDay
+										const zujin = {
+											...item,
+											showItem: false,
+											gouxuan: false,
+
+										}
+										redList.push(zujin)
+									}
+								})
+								this.recordList = redList
+
+
+							}
+						})
+					}
 				})
 			}
 
 		},
 		methods: {
-			quanxuan(e){	
-				
-			  const allTrue = this.recordList.every(item => item.gouxuan)
-			  if(allTrue){
-				  this.payAll= 0
-				  this.showAll = !this.showAll
-				  this.recordList.forEach(item => {
-				    item.gouxuan = !allTrue;
-					
-				  });
-			  }else{
-				 this.showAll = true
-				 
-				  this.recordList.forEach(item => {
-				    item.gouxuan = !allTrue;
-					this.payAll += item.price
-				  });
-			  }
-	
-				
+			quanxuan(e) {
+				this.payAll = 0
+				const allTrue = this.recordList.every(item => item.gouxuan)
+				if (allTrue) {
+					this.showAll = !this.showAll
+					this.recordList.forEach(item => {
+						item.gouxuan = !allTrue;
+					});
+				} else {
+					this.showAll = true
+					this.recordList.forEach(item => {
+						item.gouxuan = !allTrue;
+						this.payAll += item.paymentAmount
+					});
+				}
+
+
 			},
-			xuanAll(item,e){
-				
-				if(e.value){
-					this.payAll += item.price
-				}else{
-					this.payAll -= item.price
+			xuanAll(item, e) {
+				if (e.value) {
+					this.payAll += item.paymentAmount
+				} else {
+					this.payAll -= item.paymentAmount
 				}
 			},
-			recordXq(item){
-				 const encodedItem = encodeURIComponent(JSON.stringify(item));
+			recordXq(item) {
+				const encodedItem = encodeURIComponent(JSON.stringify(item))
 				uni.navigateTo({
-				 url: `/pages/accepting/accepting?item=${encodedItem}`,
-				 })
+					url: `/pages/accepting/accepting?item=${encodedItem}`,
+				})
 			},
 			toDetail() {
+				const msg = JSON.stringify(this.list1[this.ListIndex])
 				uni.navigateTo({
-					url: '/pagesA/rentPay/rentPayDetails'
+					url: `/pagesA/rentPay/rentPayDetails?msg=${msg}`
 				})
 			},
-			joinShow(){
-				 if(this.payAll == 0){
-					 uni.showToast({
-					 	icon: 'error',
-					 	title: '请选择支付订单'
-					 })
-				 }else{
-					 uni.navigateTo({
-					 	url: '/pagesA/rentPay/goPay'
-					 })
-				 }
-			},
-			confirm(e){
-				console.log(e)
-				let arr =[]
-				if(e[0].label == '全部'){
-					this.recordList  = this.recordList1
-				}else{
-					this.recordList1.map(item =>{
-						if(item.name == e[0].label){
-							arr.push(item)
+			joinShow() {
+				if (this.payAll == 0) {
+					uni.showToast({
+						icon: 'error',
+						title: '请选择支付订单'
+					})
+				} else {
+
+					let payArr = []
+					this.recordList.map(item => {
+						if (item.gouxuan) {
+							payArr.push(item)
 						}
 					})
-					this.recordList = arr 
+					const msg = JSON.stringify(payArr)
+					uni.navigateTo({
+						url: `/pagesA/rentPay/goPay?msg=${msg}`
+					})
 				}
+			},
+			confirm(e) {
+
+				let arr = []
 				this.value = e[0].label
-				
+				const redList = []
+				let index = e[0].value
+				this.ListIndex = e[0].value
+				this.yingPayAll = 0
+				this.payAll = 0
+				this.list1[index].list.map(item => {
+					this.yingPayAll += item.paymentAmount
+					this.payNum = item.payType
+					this.dayMsg = item.payDay
+					const zujin = {
+						...item,
+						showItem: false,
+						gouxuan: false,
+					}
+					redList.push(zujin)
+				})
+				this.recordList = redList
+
+			},
+			etTimePeriodDesc(num, day) {
+				switch (num) {
+					case 1:
+						return '每日';
+					case 2:
+						return `每月${day}`;
+					case 3:
+						return `每季度${day}`;
+					case 4:
+						return `每年${day}`;
+					default:
+						return '';
+				}
 			},
+			formatTime(type, time) {
+				// 将传入的时间字符串转换为 Date 对象
+				const date = new Date(time);
+
+				const day = date.getDate();
+				const month = date.getMonth() + 1;
+				const quarter = Math.floor((month - 1) / 3) + 1;
+				const year = date.getFullYear();
+				switch (type) {
+					case 1:
+						return `${day}号`;
+					case 2:
+						return `${month}月${day}号`;
+					case 3:
+						return `${month}月${day}号`;
+					case 4:
+						return `${year}年`;
+					default:
+						return time;
+				}
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	@import 'rentPay.scss';
-</style> 
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
index e9c2a71..5b17300 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
@@ -5,22 +5,22 @@
 				<view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view>
 				<u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker>
 			</div>
-			<div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></div>
+			<div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />{{allPay}}</view></div>
 		</view>
 		<view class="record-list">
 			<view class="record-item" v-for="(item, index) in dataList" :key="index" >
 				<view class="info-title">
-					<view class="title">7月</view>
-					<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></view>
+					<view class="title">{{item.tenementOrderDate}}</view>
+					<!-- <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{orderPay}}</view></view> -->
 				</view>
-				<view class="info-items" v-for="(v, i) in item.children" :key="i">
+				<view class="info-items">
 					<view class="info-item">
-						<view class="left title">支付订单编号</view>
-						<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</view></view>
+						<view class="left title">{{item.tenementOrder}}</view>
+						<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.paymentAmount}}</view></view>
 					</view>
 					<view class="info-item">
 						<view class="left" style="color: #0FBB59;">支付成功</view>
-						<view class="right" style="color: #8A8A8A;">07.11 15:21</view>
+						<view class="right" style="color: #8A8A8A;">{{item.paymentTime}}</view>
 					</view>
 				</view>
 			</view>
@@ -33,12 +33,9 @@
 		data() {
 			return {
 				show: false,
-				dataList: [
-					{
-						children: [{}, {}]
-					}
-					
-				],
+				dataList: [],
+				orderPay:0,
+				allPay:0,
 				pageIndex:{
 					time:''
 				}
@@ -47,6 +44,19 @@
 			onShow() {
 			this.pageIndex.time = this.getCurrentYear()
 			},
+			  onLoad(options) {
+			   if(options.msg){
+				   this.orderPay = 0
+				   this.allPay = 0
+				   let receivedMsg = JSON.parse(options.msg)
+				   
+				   receivedMsg.list.map(item=>{
+					   this.orderPay+=item.paymentAmount
+					    this.allPay+=item.paymentAmount
+				   })
+				  this.dataList = receivedMsg.list
+			   }
+			  },
 		methods: {
 			getCurrentYear() {
 			    const year = new Date().getFullYear();
diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue
index 6c04275..535f98c 100644
--- a/lvdao-miniapp/pagesA/rentPay/webView.vue
+++ b/lvdao-miniapp/pagesA/rentPay/webView.vue
@@ -1,23 +1,21 @@
 <template>
 	  <view>
-		  <web-view src="https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F"></web-view>
+		  <web-view :src="url"></web-view>
 	  </view>
 </template>
 
 <script>
 	export default {
-	  props: {
-	    // 定义接收的 prop，类型为 String
-	    url: {
-	      type: String,
-	      required: true
-	    }
-	  },
-	  computed: {
-	    // 使用计算属性确保 url 被正确绑定到 web-view 的 src 属性
-	    webUrl() {
-	      return this.url;
-	    }
+	data() {
+		return {
+			url:'https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F'
+			}
+	},
+	
+	  onLoad(options) {
+			 if(options.urls){
+				 this.url = options.urls
+			 }
 	  },
 	  mounted() {
 	    // 可选：在组件挂载后进行一些验证或处理
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 82c4582..2c62a9f 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -17,23 +17,25 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://172.16.61.125:9003/' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
+		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
 
-		// bases = 'http://10.0.0.51:9003' + url;
+		bases = 'http://192.168.2.107:9003' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
 		
 		
+	}else if(baseUrl == 3){
+		bases = 'http://192.168.2.107:9007' + url;
+		
 	}else{
 		// bases = 'http://172.16.61.125:9004/' + url;
 		// bases = 'http://172.16.61.48/business-server' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
-		bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
-
-		// bases = 'http://10.0.0.51:9004' + url;
+		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+		
+		bases = 'http://192.168.2.107:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
-		
 	}
 	var token = uni.getStorageSync('token') || '';
 	var shopId = uni.getStorageSync('shopId') || '';
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 410c9cb..7d3b010 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -20,8 +20,8 @@ if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
 }else 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 = 'http://192.168.2.225:9004';
+   PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+  // PREFIX = 'http://192.168.2.225:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
@@ -40,7 +40,7 @@ const service = axios.create({
 export const uploadUrl = `${baseURL}/file/upload`
 export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
 //export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
-export const QYuploadUrl = `${baseURL}/file/upload` // 微信客服上传专用
+export const QYuploadUrl = `${baseURL}/file/upload`
 
 // request interceptor
 service.interceptors.request.use(
--
libgit2 0.21.4