From 1dab497470f36f847610d9cdcdb6b3cc050d1439 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 26 Oct 2023 18:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E5=AD=97=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E4=BF=9D=E8=AF=81=E9=87=91->=E6=8A=BC=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue    | 4 ++--
 api/api.js | 6 +++---
 pages.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/App.vue b/App.vue
index c084788..778f2a6 100644
--- a/App.vue
+++ b/App.vue
@@ -80,12 +80,12 @@
 			...uni.getStorageSync('GLOBAL_DATA') || {}
 		},
 		onLaunch(option) {
-			// console.log(option,'1111111111')
+			// #ifdef APP-PLUS
 			uni.sendHostEvent('log', option, (ret) => {
 				//发送消息成功回调
 				console.log('消息成功' + JSON.stringify(option));
-
 			});
+			// #endif
 
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
diff --git a/api/api.js b/api/api.js
index c382e10..4b95329 100644
--- a/api/api.js
+++ b/api/api.js
@@ -293,20 +293,20 @@ export function brigade(data) {
 }
 
 /*
-	生产 -- 获取商户保证金信息支付接口
+	生产 -- 获取商户押金信息支付接口
 */
 export function paymerchant() {
   return request.post(`user/margin`,{});
 }
 
 /*
-	生产 -- 获取商户保证金信息接口
+	生产 -- 获取商户押金信息接口
 */
 export function merchant(data) {
   return request.get(`store/merchant/margin`, data);
 }
 
-//获取保证金缴纳列表
+//获取押金缴纳列表
 export function marginlist(data) {
 	return request.get(`user/margin/list`,data);
 }
diff --git a/pages.json b/pages.json
index ab34caf..bc6c2e3 100644
--- a/pages.json
+++ b/pages.json
@@ -109,7 +109,7 @@
     }, {
       "path": "pages/margin/margin",
       "style": {
-        "navigationBarTitleText": "缴纳保证金",
+        "navigationBarTitleText": "缴纳押金",
         "enablePullDownRefresh": false
       }
     }, {