1004749546@qq.com 4 years ago
parent
commit
10802ec6e0

+ 1 - 1
pages/index/index.vue

@@ -46,7 +46,7 @@
 						<view class="do-btn">去处理</view>
 					</view>
 					 <view class="greey-font flex align_center justify_between">
-						 <view class="dizhi">{{item.contactAddress}}</view>
+						 <view class="dizhi">{{item.contactAddress+(item.houseAddress||'')}}</view>
 						 <view @click.stop="openLocation(item)" class="flex align_center">
 							 <u-icon class="icon" name="icon_coordinate1" custom-prefix="custom-icon" size="20" color="#999999"></u-icon>
 							 <text>{{item.distance}}KM</text>

+ 2 - 0
pages/login/phoneLogin.vue

@@ -6,9 +6,11 @@
 		</view>
 		<form class="login-form" @submit="formSubmit">
 			<view class="form-item">
+				<u-image src="/static/user_icon_number.png" width="44" height="44" class="logo_user_icon"></u-image>
 				<input v-model="form.loginName" class="item-inp" name="loginName" type="text" maxlength="30" placeholder="请输入用户名" />
 			</view>
 			<view class="form-item">
+				<u-image src="/static/user_icon_password.png" width="44" height="44" class="logo_pwd_icon"></u-image>
 				<input v-model="form.password" class="item-inp" name="password" password type="text" maxlength="12" placeholder="请输入密码" />
 			</view>
 			<view class="flex-box" style="margin-top: 40upx;">

+ 2 - 2
pages/order/hisOrderDetail.vue

@@ -20,7 +20,7 @@
 			<view class="info-main flex flex_column">
 				<view class="flex flex_1 align_center">
 					<view class="new-left">
-						{{orderInfo.contactAddress || '--'}}
+						{{orderInfo.contactAddress +(orderInfo.houseAddress||'')}}
 					</view>
 				</view>
 				<view class="time flex align_center justify_between">
@@ -35,7 +35,7 @@
 			<view class="item-info">
 				<view class="item flex justify_between">
 					<text>预约品类</text>
-					<text>{{typeNames}}</text>
+					<text>{{orderInfo.reserveRubbishType}}</text>
 				</view>
 				<view class="item flex justify_between">
 					<text>预约重量</text>

+ 1 - 1
pages/order/waitOrderDetail.vue

@@ -54,7 +54,7 @@
 			<view class="info-main flex flex_column">
 				<view class="flex flex_1 align_center">
 					<view class="new-left">
-						{{orderInfo.contactAddress}}
+						{{orderInfo.contactAddress + (orderInfo.houseAddress||'')}}
 					</view>
 				</view>
 				<view class="time flex align_center justify_between">

+ 8 - 4
pages/recoveryTotal/index.vue

@@ -89,7 +89,8 @@
 			refresh(params){
 				this.searchForm = params
 				this.listdata = []
-				this.total = 0
+				this.totalWeight = 0
+				this.totalMoney = 0
 				this.searchHandle(1)
 				this.getTotal()
 			},
@@ -136,9 +137,12 @@
 				recycleOrderReserveSum({
 					beginRecycleDate: this.searchForm.beginDate?moment(this.searchForm.beginDate).format('YYYY-MM-DD 00:00:00'):'',
 					endRecycleDate: this.searchForm.endDate ? moment(this.searchForm.endDate).format('YYYY-MM-DD 23:59:59'):''}).then(res=>{
-						if(res.status==200){
-							this.totalWeight = res.data.totalAllWeight/1000
-							this.totalMoney = res.data.originalAllAmount
+						if(res.status==200 && res.data){
+							this.totalWeight = res.data.totalAllWeight/1000 || 0
+							this.totalMoney = res.data.originalAllAmount || 0
+						} else {
+							this.totalWeight = 0
+							this.totalMoney = 0
 						}
 					console.log(res)
 				})

BIN
static/user_icon_number.png


BIN
static/user_icon_password.png