1004749546@qq.com 4 years ago
parent
commit
74506b410d

+ 2 - 2
pages/index/index.vue

@@ -46,13 +46,13 @@
 						<view class="do-btn">去处理</view>
 						<view class="do-btn">去处理</view>
 					</view>
 					</view>
 					 <view class="greey-font flex align_center justify_between">
 					 <view class="greey-font flex align_center justify_between">
-						 <view class="dizhi ellipsis-one">{{item.contactAddress}}</view>
+						 <view class="dizhi">{{item.contactAddress}}</view>
 						 <view @click.stop="openLocation(item)" class="flex align_center">
 						 <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>
 							 <u-icon class="icon" name="icon_coordinate1" custom-prefix="custom-icon" size="20" color="#999999"></u-icon>
 							 <text>{{item.distance}}KM</text>
 							 <text>{{item.distance}}KM</text>
 						 </view>
 						 </view>
 					 </view>
 					 </view>
-					 <view class="greey-font">{{item.reserveTime}},预估{{item.reserveWeight}}kg</view>
+					 <view class="greey-font">{{item.reserveTime}},预估{{item.reserveWeightDictValue}}</view>
 					 <view class="flex">
 					 <view class="flex">
 						 <view v-for="key in item.orderReserveItemEntityList" :key="key.id" class="mark">
 						 <view v-for="key in item.orderReserveItemEntityList" :key="key.id" class="mark">
 						 	{{key.typeName}}
 						 	{{key.typeName}}

+ 1 - 1
pages/login/login.vue

@@ -22,7 +22,7 @@
 			</view>
 			</view>
 		<view class="authUserYs">
 		<view class="authUserYs">
 			<view class="xieyi">
 			<view class="xieyi">
-				首次登录会自动创建账号且代表同意
+				登录即代表同意
 				<text @click="toYsPage()">
 				<text @click="toYsPage()">
 				      《乐色超人(骑手端)用户协议》
 				      《乐色超人(骑手端)用户协议》
 				</text>
 				</text>

+ 1 - 1
pages/login/phoneLogin.vue

@@ -22,7 +22,7 @@
 		</form>
 		</form>
 		<view class="authUserYs">
 		<view class="authUserYs">
 			<view class="xieyi">
 			<view class="xieyi">
-				首次登录会自动创建账号且代表同意
+				登录即代表同意
 				<text @click="toYsPage()">
 				<text @click="toYsPage()">
 				      《乐色超人(骑手端)用户协议》
 				      《乐色超人(骑手端)用户协议》
 				</text>
 				</text>

+ 2 - 2
pages/order/hisOrderDetail.vue

@@ -19,7 +19,7 @@
 			<!-- 服务信息 -->
 			<!-- 服务信息 -->
 			<view class="info-main flex flex_column">
 			<view class="info-main flex flex_column">
 				<view class="flex flex_1 align_center">
 				<view class="flex flex_1 align_center">
-					<view class="new-left ellipsis-two">
+					<view class="new-left">
 						{{orderInfo.contactAddress || '--'}}
 						{{orderInfo.contactAddress || '--'}}
 					</view>
 					</view>
 				</view>
 				</view>
@@ -193,7 +193,6 @@
 				background-image: url(../../static/order_bg_stor.png);
 				background-image: url(../../static/order_bg_stor.png);
 				background-repeat: no-repeat;
 				background-repeat: no-repeat;
 				background-size: contain;
 				background-size: contain;
-				height: 260rpx;
 				.new-left{
 				.new-left{
 					width: 360rpx;
 					width: 360rpx;
 					font-size: 36rpx;
 					font-size: 36rpx;
@@ -201,6 +200,7 @@
 					font-weight: 600;
 					font-weight: 600;
 					line-height: 44rpx;
 					line-height: 44rpx;
 					margin-top: 30rpx;
 					margin-top: 30rpx;
+					min-height: 80rpx;
 				}
 				}
 				.time{
 				.time{
 					padding: 20rpx 0;
 					padding: 20rpx 0;

+ 2 - 2
pages/order/waitOrderDetail.vue

@@ -53,7 +53,7 @@
 			<!-- 服务信息 -->
 			<!-- 服务信息 -->
 			<view class="info-main flex flex_column">
 			<view class="info-main flex flex_column">
 				<view class="flex flex_1 align_center">
 				<view class="flex flex_1 align_center">
-					<view class="new-left ellipsis-two">
+					<view class="new-left">
 						{{orderInfo.contactAddress}}
 						{{orderInfo.contactAddress}}
 					</view>
 					</view>
 				</view>
 				</view>
@@ -312,7 +312,6 @@
 				background-image: url(../../static/order_bg_stor.png);
 				background-image: url(../../static/order_bg_stor.png);
 				background-repeat: no-repeat;
 				background-repeat: no-repeat;
 				background-size: contain;
 				background-size: contain;
-				height: 260rpx;
 				.new-left{
 				.new-left{
 					width: 360rpx;
 					width: 360rpx;
 					font-size: 36rpx;
 					font-size: 36rpx;
@@ -320,6 +319,7 @@
 					font-weight: 600;
 					font-weight: 600;
 					line-height: 44rpx;
 					line-height: 44rpx;
 					margin-top: 30rpx;
 					margin-top: 30rpx;
+					min-height: 80rpx;
 				}
 				}
 				.time{
 				.time{
 					padding: 20rpx 0;
 					padding: 20rpx 0;