订单完善

pages/bookShop/orderLCont.vue

@@ -180,7 +180,7 @@
 						<h4 style="margin-bottom: 10rpx;">包裹 {{index+1}}</h4>
 						<view class="">运单号：{{item.expressOrderSn}} 
 						<u-tag @click="copyData(item.expressOrderSn)" size="mini" class="copyCode" text="复制单号" plain type="success" /></view>
-						<view class="">发货时间：{{item.createTime}}</view>
+						<view class="">发货时间：{{item.createTime}}</view>						
 					</view>
 				</view>
 				
@@ -574,7 +574,7 @@
 			orderTabCLi(e) {
 				this.orderListTab = e
 			},
-			// 获取订单列表
+			// 获取订单详情
 			getOrderList() {
 				console.log('this.orderType',this.orderType)
 				this.$http

pages/bookShop/orderList.vue

@@ -42,7 +42,7 @@
 					</view>
 					<br clear="both">
 				</view>
-				<view class="orderContent" v-if="ifex.orderType=='point'" @click="goOrdiCont(ifex)">
+				<view class="orderContent" v-if="ifex.orderType=='point'" @click.stop="goOrdiCont(ifex)">
 					<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
 					<view class="itemJian">
 						<view class="orderTitle">
@@ -56,7 +56,7 @@
 					</view>
 					<br clear="both">
 				</view>
-				<view class="orderContent" v-if="ifex.orderType=='vip'" @click="goOrdiCont(ifex)">
+				<view class="orderContent" v-if="ifex.orderType=='vip'" @click.stop="goOrdiCont(ifex)">
 					<image src="../../static/icon/oder_vip.png" mode="" style="height: 150rpx;"></image>
 					<view class="itemJian">
 						<view class="orderTitle">
@@ -282,9 +282,16 @@
 			goOrdiCont(e) {
 				console.log(e, 'e')
 				//let orderId = e.orderId ? e.orderId : e.id
-				uni.navigateTo({
-					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn
-				});
+				if(e.orderType == 'point'){      // 充值订单	
+					console.log('跳转到充值页面')
+					uni.navigateTo({
+						url: '/pages/peanut/chargeDetaill?orderId=' + e.orderId + '&orderSn=' + e.orderSn
+					});
+				}else if(e.orderType == 'order'){	 // 实体订单			
+					uni.navigateTo({
+						url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+					});
+				}
 			},
 
 			// 跳转到支付页面