Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/place_order.vue

@@ -170,7 +170,8 @@
 					<view class="order_carBg" style="margin-top:10px;">
 						<view style="margin-bottom:5px;">天数：{{mchs[0].goods_list[0].goods_attr.advance_day}}天</view>
 						<view style="margin-bottom:5px;">颜色：{{mchs[0].goods_list[0].goods_attr.carcolor_name}}</view>
-						<view>类型：{{mchs[0].goods_list[0].goods_attr.car_model}}/{{mchs[0].goods_list[0].goods_attr.ride_num}}座</view>
+						<view>类型：{{mchs[0].goods_list[0].goods_attr.car_model}}/{{mchs[0].goods_list[0].goods_attr.ride_num}}座
+						{{mchs[0].goods_list[0].goods_attr.car_class}}</view>
 					</view>
 				</view>
 				<view style="text-align: right;">
@@ -466,7 +467,6 @@
 
 		onLoad(options) {
 			if (options) {
-				console.log(options,'options');
 				this.msg.DetailList[0].GoodsId = options.GoodsId;
 				this.msg.DetailList[0].Number = options.Number;
 				this.msg.ShoppingAddress = options.ShoppingAddress;
@@ -509,7 +509,6 @@
 				});
 				this.amapPlugin.getRegeo({
 					success: (data) => {
-						console.log(data, 'data');
 						this.Pickcar = data[0].regeocodeData.addressComponent.city;
 						this.latitude = data[0].latitude;
 						this.longitude = data[0].longitude;
@@ -523,7 +522,6 @@
 					latitude: this.latitude,
 					longitude: this.longitude,
 					success: function(res) {
-						console.log(res,'地址');
 						if(that.isShowStart==1){
 							that.latitude = res.latitude;
 							that.longitude = res.longitude;
@@ -570,7 +568,6 @@
 				})
 			},
 			gotimeconfirm(StartTime, EndTime) { //选择时间返回的参数
-				console.log(StartTime, EndTime)
 				this.STime = this.getTime(StartTime)
 				this.StartTime = StartTime
 				this.ETime = this.getTime(EndTime)
@@ -656,7 +653,6 @@
 			closeCouponHandler(e) {
 				if (e != -1) {
 					this.msg.User_Coupon_Id = e;
-					console.log(e, 'e');
 					this.getData();
 				}
 				this.showCoupon = false;
@@ -693,7 +689,6 @@
 					res => {
 						if (res.resultCode == 1) {
 							this.couponList = res.data;
-							console.log(this.couponList, '优惠券');
 						}
 					}
 				);
@@ -712,8 +707,6 @@
 					this.orderMsg.Use_Integral = this.msg.Use_Integral;
 					this.orderMsg.CarType = this.dataList.mch_list[0].goods_list[0].goods_attr.car_type;
 					this.orderMsg.AnchorName = uni.getStorageSync("AnchorName")?uni.getStorageSync("AnchorName").AnchorName:''; //直播名称
-					
-					console.log(this.orderMsg,'orderMsg');
 					this.request2({
 							url: '/api/AppletOrder/SetAppletSDGoodsOrderInfo',
 							data: this.orderMsg

pages/user-center/user-center.vue

@@ -126,23 +126,23 @@
 							<image :src="item.icon_url" style="width: 60rpx;height: auto" mode ='widthFix'></image>
 							<Text style="margin-top: 10rpx;">{{ item.name }}</Text>
 							<!-- 待付款 -->
-							<view v-if="user_info.MyGuideCarOrder.NonPayment > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/orderList?status=1' && user_info.MyGuideCarOrder.NonPayment > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.NonPayment }}
 							</view>
 							<!-- 待发货 -->
-							<view v-if="user_info.MyGuideCarOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.WaitSendGoods }}
 							</view>
 							<!-- 待收货 -->
-							<view v-if="user_info.MyGuideCarOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/orderList?status=3' && user_info.MyGuideCarOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.WaitReceiving }}
 							</view>
 							<!-- 待评价 -->
-							<view v-if="user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
 							</view>
 							<!-- 售后 -->
-							<view v-if="user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/orderList?status=5' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.Completed }}
 							</view>
 						</view>