1

pages/guidecar/orderDetail.vue

@@ -332,6 +332,9 @@
 		onLoad(option) {
 			this.u = uni.getStorageSync("mall_UserInfo");
 			this.msg.OrderId = option.OrderId;
+			if(option.NewUserId){
+				this.msg.NewUserId = option.NewUserId;
+			}
 			this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
 			this.getData();
 		},

pages/school/courseContent.vue

@@ -20,9 +20,9 @@
 				</view>
 			</view>
 		    <view  v-if="selectcourse && selectcourse.Type!=1" class="studyimg">
-			   <image @click="previewImage()" 
+			   <image @click="previewImage(index)" 
 			   v-if="selectcourse && selectcourse.ImageList.length>0 && selectcourse.ImageList[0].Path"  
-			   style="width:100%;height:100%;" :src="selectcourse.ImageList[0].Path" mode="aspectFill"></image>
+			   style="width:100%;height:100%;" :src="selectcourse.ImageList[0].Path" mode=""></image>
 			   <image style="width:100%;height:100%;" v-else src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xuexibanner%20.png" mode=""></image>
 			   
 		    </view>

pages/school/personal/orderDetail.vue

@@ -282,6 +282,7 @@
 				mainColor: '',
 				msg: {
 					OrderId: 0,
+					NewUserId:0,
 				},
 				dataList: {},
 				showAfter: false,
@@ -328,6 +329,9 @@
 		onLoad(option) {
 			this.u = uni.getStorageSync("mall_UserInfo");
 			this.msg.OrderId = option.OrderId;
+			if(option.NewUserId){
+				this.msg.NewUserId = option.NewUserId;
+			}
 			this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
 			this.getData();
 		},

pages/share-order/share-order.vue

@@ -182,9 +182,21 @@
 			  }
 			},
 			redirectToDetail(item) {
-			  uni.navigateTo({
-			    url: "/pages/order/order-detail?id=" + item.OrderId+'&NewUserId='+item.UserId,
-			  });
+				// OrderClassify  0商品   1司导   2网课
+				if(item.OrderClassify==0){
+					uni.navigateTo({
+					  url: "/pages/order/order-detail?id=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}else if(item.OrderClassify==1){
+					uni.navigateTo({
+					  url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}else if(item.OrderClassify==2){
+					uni.navigateTo({
+					  url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}
+			
 			},
 		}
 	}

pages/share-team/share-detail.vue

@@ -371,7 +371,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="buy_List" v-for="(subItem,subIndex) in item.DetailList" :key="subIndex" @click="redirectToDetail(item.OrderId)">
+								<view class="buy_List" v-for="(subItem,subIndex) in item.DetailList" :key="subIndex" @click="redirectToDetail(item)">
 									<view class="bug_GoodImg">
 										<img :src="subItem.CoverImagePath" alt="" />
 									</view>
@@ -583,10 +583,24 @@
 		},
 		methods: {
 			//跳转至订单详情
-			redirectToDetail(id) {
-				uni.navigateTo({
-					url: "/pages/order/order-detail?id=" + id + '&NewUserId=' + this.headMsg.UserId
-				});
+			redirectToDetail(item) {
+				// uni.navigateTo({
+				// 	url: "/pages/order/order-detail?id=" + item.OrderId + '&NewUserId=' + this.headMsg.UserId
+				// });
+				// OrderClassify  0商品   1司导   2网课
+				if(item.OrderClassify==0){
+					uni.navigateTo({
+					  url: "/pages/order/order-detail?id=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}else if(item.OrderClassify==1){
+					uni.navigateTo({
+					  url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}else if(item.OrderClassify==2){
+					uni.navigateTo({
+					  url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId,
+					});
+				}
 			},
 			//跳转至商品详情
 			openGood(item) {