1004749546@qq.com 4 years ago
parent
commit
0773af76fa

+ 2 - 2
pages/index/index.vue

@@ -40,10 +40,10 @@
 			</view>
 			<view class="list-item" v-for="item in listdata" :key="item.id">
 				<u-image class="img-icon" :src="item.icon?item.imageHeader:'/static/def_home_shop.png'" border-radius="16" width="160" height="160"></u-image>
-				<view class="cont-item-right flex_1 flex flex_column justify_between">
+				<view @click="intoWaitOrderDetail(item)" class="cont-item-right flex_1 flex flex_column justify_between">
 					<view class="flex align_center justify_between">
 						<view class="flex_1 bold ellipsis-one">{{item.contactName}}</view>
-						<view @click="intoWaitOrderDetail(item)" class="do-btn">去处理</view>
+						<view class="do-btn">去处理</view>
 					</view>
 					 <view class="greey-font flex align_center justify_between">
 						 <view class="dizhi ellipsis-one">{{item.contactAddress}}</view>

+ 4 - 3
pages/order/hisOrderDetail.vue

@@ -39,7 +39,7 @@
 				</view>
 				<view class="item flex justify_between">
 					<text>预约重量</text>
-					<text>{{orderInfo.reserveWeight}}</text>
+					<text>{{orderInfo.reserveWeightDictValue}}</text>
 				</view>
 			</view>
 			<!-- 订单信息 -->
@@ -67,7 +67,7 @@
 					<text>回收品类明细</text>
 				</view>
 				<view class="item flex">
-					<view :class="['item-type', curType == item.code ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id"  @click="curIndex=index" >
+					<view :class="['item-type', curIndex == index ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id"  @click="curIndex=index" >
 						{{item.name}}
 					</view>
 				</view>
@@ -80,7 +80,7 @@
 			<view class="item-info">
 				<view class="item flex justify_between">
 					<text>应付金额</text>
-					<text>{{orderInfo.originaAmount||0}} 元</text>
+					<text>{{orderInfo.originalAmount||0}} 元</text>
 				</view>
 				<view class="item flex justify_between">
 					<text>支付方式</text>
@@ -192,6 +192,7 @@
 				font-size: 28upx;
 				background-image: url(../../static/order_bg_stor.png);
 				background-repeat: no-repeat;
+				background-size: contain;
 				height: 260rpx;
 				.new-left{
 					width: 360rpx;

+ 13 - 7
pages/order/historyOrder.vue

@@ -15,10 +15,10 @@
 				<view class="cont">
 					<view class="cont-top flex align_center justify_between">
 						<text>{{item.contactName||'--'}}</text>
-						<text>{{item.payAmount?'¥'+item.payAmount:'--'}}</text>
+						<text>{{'¥'+(item.originalAmount || 0)}}</text>
 					</view>
 					<view class="cont-bot flex align_center justify_between">
-						<view class="flex align_center">
+						<view @click.stop="callPhone(item.contactMobile)" class="flex align_center">
 							<u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
 							<text>{{item.contactMobile}}</text>
 						</view>
@@ -70,6 +70,12 @@
 				this.getRow(1)
 				this.getTotalData()
 			},
+			// 打电话
+			callPhone(phone) {
+				uni.makePhoneCall({
+				    phoneNumber: phone
+				});
+			},
 			// 进入详情
 			intoDetail(item) {
 				uni.navigateTo({
@@ -194,7 +200,7 @@
 					}
 				}
 				.cont-bot{
-					font-size: 28rpx;
+					font-size: 30rpx;
 					color: #4C4C4C;
 					margin-top: 20rpx;
 					.phone{
@@ -202,10 +208,10 @@
 						height: 28rpx;
 						margin-right: 10rpx;
 					}
-					text:last-child{
-						font-size: 24rpx;
-						color: #666E75;
-					}
+					// text:last-child{
+					// 	font-size: 24rpx;
+					// 	color: #666E75;
+					// }
 				}
 			}
 		}

+ 13 - 9
pages/order/waitOrderDetail.vue

@@ -18,7 +18,7 @@
 					<view>回收品类明细</view>
 					<view class="care">(切换分类可输入不同回收物的价格和重量)</view>
 				</view>
-				<view class="item flex">
+				<view class="item flex justify_between">
 					<view :class="['item-type', curType == item.code ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id"  @click="getRow(item.code,index)">
 						{{item.dispName}}
 					</view>
@@ -59,7 +59,7 @@
 				</view>
 				<view class="time flex align_center justify_between">
 					<text>{{orderInfo.contactName}}</text>
-					<view class="flex align_center">
+					<view @click="callPhone(orderInfo.contactMobile)" class="flex align_center">
 						<u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
 						<text>{{orderInfo.contactMobile}}</text>
 					</view>
@@ -155,6 +155,12 @@
 				item.totalAmount = (item.customerPrice * item.rubbishWeight).toFixed(2)
 			  })
 			},
+			// 打电话
+			callPhone(phone) {
+				uni.makePhoneCall({
+				    phoneNumber: phone
+				});
+			},
 			// 获取订单详情
 			getOrderDetail() {
 				uni.showLoading({
@@ -305,6 +311,7 @@
 				font-size: 28upx;
 				background-image: url(../../static/order_bg_stor.png);
 				background-repeat: no-repeat;
+				background-size: contain;
 				height: 260rpx;
 				.new-left{
 					width: 360rpx;
@@ -382,7 +389,7 @@
 					border-bottom: 1px solid #EBEBEB;
 					.item-name{
 						max-width: 100rpx;
-						font-size: 28rpx;
+						font-size: 30rpx;
 					}
 					:first-child{
 						color: #7C7D7E;
@@ -398,16 +405,13 @@
 						border-bottom: 1px solid #707070;
 					}
 					.item-type{
-						padding: 0 20rpx;
-						height: 56rpx;
+						padding: 10rpx 14rpx;
 						border: 1px solid #979797;
 						opacity: 1;
-						border-radius: 28rpx;
-						font-size: 24rpx;
+						border-radius: 30rpx;
+						font-size: 30rpx;
 						color: #999999;
 						text-align: center;
-						line-height: 56rpx;
-						margin-right: 20rpx;
 					}
 					.item-type.active{
 						background-color: #4F88F7;

BIN
static/def_home_shop.png


BIN
static/def_result.png


BIN
static/order_bg_stor.png


BIN
static/price/bg__book.png


BIN
static/price/icon_acrylic.png


BIN
static/price/icon_aper_flower.png


BIN
static/price/icon_aper_miscellaneous.png


BIN
static/price/icon_aper_yellow.png


BIN
static/price/icon_book.png


BIN
static/price/icon_bottle.png


BIN
static/price/icon_clothes.png


BIN
static/price/icon_frame_black.png


BIN
static/price/icon_frame_white.png


BIN
static/price/icon_iron_thick.png


BIN
static/price/icon_iron_thin.png


BIN
static/price/icon_magazine.png


BIN
static/price/icon_newspaper.png


BIN
static/price/icon_steel.png