From 085e383a2aa61e8d61129b7c6187b37913aaaa12 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 25 Aug 2022 09:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my/my-menu.vue               |  2 +-
 package.json                            | 16 +++++++++++++++-
 pages.json                              |  2 +-
 pages/homemaking/homemaking.vue         |  2 +-
 pages/login/login.vue                   |  4 ++--
 pages/tempCarFee/tempCarFee.vue         |  7 +++++--
 pages/tempParkingFee/tempParkingFee.vue |  6 ++++--
 7 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/components/my/my-menu.vue b/components/my/my-menu.vue
index cfcf9d7..20ad1c1 100644
--- a/components/my/my-menu.vue
+++ b/components/my/my-menu.vue
@@ -11,7 +11,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- #ifdef H5 -->
+		<!-- #ifdef H5 || WUYE -->
 		<view class="order_box">
 			<view class="order_title">我的订单</view>
 			<view class="order_list">
diff --git a/package.json b/package.json
index 8f1d1c3..988b312 100755
--- a/package.json
+++ b/package.json
@@ -23,5 +23,19 @@
   "bugs": {
     "url": "https://github.com/java110/WechatOwnerService/issues"
   },
-  "homepage": "https://github.com/java110/WechatOwnerService#readme"
+  "homepage": "https://github.com/java110/WechatOwnerService#readme",
+  "uni-app": {
+  			"scripts": {
+  			"WUYE": {
+  				"title":"业主端不包含商城",
+  				"BROWSER":"",
+  				"env": {
+  					"UNI_PLATFORM": "h5"
+  				 },
+  				"define": {
+  					"WUYE": true
+  				}
+  			}
+  		}   
+  	}
 }
diff --git a/pages.json b/pages.json
index 6b7ce26..1022d30 100755
--- a/pages.json
+++ b/pages.json
@@ -600,7 +600,7 @@
 				"iconPath": "static/images/rent.png",
 				"selectedIconPath": "static/images/rent-selected.png"
 			},
-			// #ifdef H5
+			// #ifdef H5 || WUYE
 			{
 				"pagePath": "pages/mall/mall",
 				"text": "商圈",
diff --git a/pages/homemaking/homemaking.vue b/pages/homemaking/homemaking.vue
index 0e89988..498fc36 100644
--- a/pages/homemaking/homemaking.vue
+++ b/pages/homemaking/homemaking.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<service-property></service-property>
-		<!-- #ifdef H5 -->
+		<!-- #ifdef H5 || WUYE -->
 		<service-homemaking></service-homemaking>
 		<!-- #endif -->
 	</view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index fe8c1a0..694d69d 100755
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -60,8 +60,8 @@
 		data() {
 			return {
 				logoUrl: '',
-				username: 'test001',
-				password: 'wuxw2015',
+				username: '',
+				password: '',
 				appId: "",
 				code: "",
 				loginByPhone: false,
diff --git a/pages/tempCarFee/tempCarFee.vue b/pages/tempCarFee/tempCarFee.vue
index 9e85087..ac1e825 100644
--- a/pages/tempCarFee/tempCarFee.vue
+++ b/pages/tempCarFee/tempCarFee.vue
@@ -85,6 +85,7 @@
 			return {
 				paId: '',
 				carNum: '',
+				machineId:'',
 				stopTimeTotal: 0,
 				inTime: '',
 				amount: 0.0,
@@ -105,6 +106,7 @@
 			this.paId = options.paId;
 			this.carNum = options.carNum;
 			this.appId = options.appId;
+			this.machineId = options.machineId;
 			this._loadTempCarFee();
 		},
 		onShow: function(options) {
@@ -172,7 +174,8 @@
 					tradeType: _tradeType,
 					appId: this.appId,
 					inoutId: this.inoutId,
-					couponList: this.couponList
+					couponList: this.couponList,
+					machineId:this.machineId
 				};
 				toPayTempCarFee(_objData)
 				.then(_data=>{
@@ -201,7 +204,7 @@
 			},
 			onReQuery:function(){
 				uni.navigateTo({
-					url: '/pages/tempParkingFee/tempParkingFee?paId=' + _that.paId + "&appId=" + _that.appId + "&openId=" + _that.openId
+					url: '/pages/tempParkingFee/tempParkingFee?paId=' + _that.paId + "&appId=" + _that.appId + "&openId=" + _that.openId+"&machineId="+this.machineId
 				})
 			}
 			
diff --git a/pages/tempParkingFee/tempParkingFee.vue b/pages/tempParkingFee/tempParkingFee.vue
index f05487d..5a56575 100644
--- a/pages/tempParkingFee/tempParkingFee.vue
+++ b/pages/tempParkingFee/tempParkingFee.vue
@@ -95,6 +95,7 @@
 				paId: '',
 				appId: '',
 				openId: '',
+				machineId:'',
 			}
 		},
 		components: {
@@ -104,6 +105,7 @@
 			this.paId = options.paId;
 			this.appId = options.appId;
 			this.openId = options.openId;
+			this.machineId = options.machineId;
 			uni.setStorageSync(mapping.W_APP_ID,this.appId)
 			if (!isNotNull(this.openId)) {
 				//刷新 openId
@@ -114,7 +116,7 @@
 			if (isNotNull(this.carNum)) {
 				uni.navigateTo({
 					url: '/pages/tempCarFee/tempCarFee?paId=' + this.paId + '&carNum=' + this
-						.carNum + "&appId=" + this.appId + "&openId=" + this.openId
+						.carNum + "&appId=" + this.appId + "&openId=" + this.openId+"&machineId="+this.machineId
 				})
 				return;
 			}else{
@@ -189,7 +191,7 @@
 					}
 					uni.navigateTo({
 						url: '/pages/tempCarFee/tempCarFee?paId=' + _that.paId + '&carNum=' + _that
-							.carNum + "&appId=" + _that.appId + "&openId=" + _that.openId
+							.carNum + "&appId=" + _that.appId + "&openId=" + _that.openId+"&machineId="+this.machineId
 					})
 				})
 			},