分类的跳转

components/cats/style11.vue

@@ -90,7 +90,8 @@
 					GoodsType: 0,
 					CategoryIds: '',
 					OrderBy: 1,
-					UserId: 0
+					UserId: 0,
+					StoreId:0,
 				},
 				CategoryIdsList: [],
 				CategoryIds1: '',
@@ -164,15 +165,18 @@
 						url: '/pages/school/courseInfo?GoodsId=' + item.id
 					});
 				} else {
-					uni.navigateTo({
-						url: '/pages/goods/goods?GoodsId=' + item.id
-					});
+					if (item.goodsclassify == 3) {
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + item.id});
+					} else {
+						uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
+					}
 				}
 			},
 			init() {
 				this.CategoryIdsList = [];
 				this.CategoryIdsList.push(this.CategoryIds1, this.CategoryIds2);
 				this.msg.CategoryIds = this.CategoryIdsList.join(',');
+				this.msg.StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
 				this.isover = false;
 				this.loading = true;
 				let url

components/cats/style3.vue

@@ -59,6 +59,7 @@
 					CategoryIds: '',
 					OrderBy: 1,
 					UserId: 0,
+					StoreId:0,
 				},
 				page_count: 1,
 				mh: 0,
@@ -95,15 +96,18 @@
 						url: '/pages/school/courseInfo?GoodsId=' + item.id
 					});
 				} else {
-					uni.navigateTo({
-						url: '/pages/goods/goods?GoodsId=' + item.id
-					});
+					if (item.goodsclassify == 3) {
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + item.id});
+					} else {
+						uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
+					}
 				}
 
 			},
 			init() {
 				this.isover = false;
 				this.loading = true;
+				this.msg.StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
 				let url
 				if (this.IsEducation == 1) {
 					url = '/api/AppletSchool/GetAppletCoursePageList'

components/cats/style4.vue

@@ -84,6 +84,7 @@
 					CategoryIds: '',
 					OrderBy: 1,
 					UserId: 0,
+					StoreId:0,
 				},
 				sku: {},
 				showSku: false,
@@ -136,14 +137,17 @@
 						url: '/pages/school/courseInfo?GoodsId=' + item.id
 					});
 				} else {
-					uni.navigateTo({
-						url: '/pages/goods/goods?GoodsId=' + item.id
-					});
+					if (item.goodsclassify == 3) {
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + item.id});
+					} else {
+						uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
+					}
 				}
 			},
 			init() {
 				this.isover = false;
 				this.loading = true;
+				this.msg.StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
 				let url
 				if (this.IsEducation == 1) {
 					url = '/api/AppletSchool/GetAppletCoursePageList'

components/cats/style7.vue

@@ -74,6 +74,7 @@
 					CategoryIds: '',
 					OrderBy: 1,
 					UserId: 0,
+					StoreId:0,
 				},
 				IsEducation: 0,
 			};
@@ -122,9 +123,11 @@
 						url: '/pages/school/courseInfo?GoodsId=' + item.id
 					});
 				} else {
-					uni.navigateTo({
-						url: '/pages/goods/goods?GoodsId=' + item.id
-					});
+					if (item.goodsclassify == 3) {
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + item.id});
+					} else {
+						uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
+					}
 				}
 			},
 			computSecondHeight() {
@@ -142,6 +145,7 @@
 				this.msg.CategoryIds = this.CategoryIdsList.join(',');
 				this.isover = false;
 				this.loading = true;
+				this.msg.StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
 				let url
 				if (this.IsEducation == 1) {
 					url = '/api/AppletSchool/GetAppletCoursePageList'

components/cats/style8.vue

@@ -89,6 +89,7 @@
 					CategoryIds: '',
 					OrderBy: 1,
 					UserId: 0,
+					StoreId:0,
 				},
 				CategoryIdsList: [],
 				CategoryIds1: '',
@@ -162,9 +163,12 @@
 						url: '/pages/school/courseInfo?GoodsId=' + item.id
 					});
 				} else {
-					uni.navigateTo({
-						url: '/pages/goods/goods?GoodsId=' + item.id
-					});
+					
+					if (item.goodsclassify == 3) {
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + item.id});
+					} else {
+						uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
+					}
 				}
 			},
 			init() {
@@ -173,6 +177,7 @@
 				this.msg.CategoryIds = this.CategoryIdsList.join(',');
 				this.isover = false;
 				this.loading = true;
+				this.msg.StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
 				let url
 				if (this.IsEducation == 1) {
 					url = '/api/AppletSchool/GetAppletCoursePageList'

pages/reserve/commentList.vue

@@ -154,7 +154,7 @@
 						data: {
 							GoodsId: this.msg.GoodsId,
 							StoreId:this.msg.GoodsId==0 && this.msg.ServicePersonalId==0?this.msg.StoreId:0,
-							ServicePersonalId:this.msg.ServicePersonalId,
+							ServicepersonalId:this.msg.ServicePersonalId,
 						},
 					},
 					(res) => {

pages/reserve/personal/orderDetails.vue

@@ -48,7 +48,7 @@
 							<view class="good-name" @click="redirectGoods(x.GoodsId)">{{x.GoodsName}}</view>
 							<view class="good-attr">
 								<text>人数/时间：{{x.Number}}人/{{x.ServiceDate+' '+(cx.ServiceTime?cx.ServiceTime:'')}}</text>
-								<text>服务人员：{{x.ServicepersonalName!=null?x.ServicepersonalName:'到店分配'}}</text>
+								<text>服务人员：{{x.ServicepersonalName!=null && x.ServicepersonalName !=''?x.ServicepersonalName:'到店分配'}}</text>
 							</view>
 							<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;" @click.native.stop="goUrl(x.FreeShippingUrl)"
 							 v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
@@ -121,7 +121,11 @@
 					</view>
 					<view class="field">
 						<view class="label">优惠</view>
-						<view class="content right">-￥{{ orders.CouponMoney	 }}</view>
+						<!-- <view class="content right">-￥{{ orders.CouponMoney	 }}</view> -->
+						<view class="content right" v-if="orders.DetailList[0].MemberEducationCouponList.length>0 &&orders.DetailList[0].MemberEducationCouponList[0].Name">
+							使用{{ orders.DetailList[0].MemberEducationCouponList[0].Name}}套餐卡
+						</view>
+						<view class="content right" v-else>暂无</view>
 					</view>
 					<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
 					<view class="field">

pages/reserve/personal/orderlist.vue

@@ -25,7 +25,7 @@
 									<view style="margin-left: 15px; flex: 1;min-height: 80px;">
 										<Text class="topic_cont_text">商品:{{cx.GoodsName}}</Text>
 										<Text class="topic_cont_text">时间:{{cx.ServiceDate+' '+(cx.ServiceTime?cx.ServiceTime:'')}}</Text>
-										<Text class="topic_cont_text">服务人员:{{cx.ServicepersonalName!=null ?cx.ServicepersonalName:'到店分配'}}</Text>
+										<Text class="topic_cont_text">服务人员:{{cx.ServicepersonalName!=null&& cx.ServicepersonalName!='' ?cx.ServicepersonalName:'到店分配'}}</Text>
 									</view>
 									<view style="margin-left: 15px;">
 										<text style="font-size: 10px;">￥</text>

pages/reserve/subscribe.vue

@@ -756,7 +756,6 @@
 							Number: that.value
 						}
 						form.DetailList.push(obj)
-						console.log(form)
 						that.request2(
 							{
 								url: '/api/AppletOrder/SetAppletOfflineGoodsOrderInfo',

pages/search/search.vue

@@ -182,6 +182,8 @@
 				this.showLoading = this.page != 1;
 				var UserPageType = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserPageType : 0;
 				let url
+				let StoreId = uni.getStorageSync("storeId")?uni.getStorageSync("storeId").storeId:0;
+				
 				if (this.IsEducation == 1) {
 					url = '/api/AppletSchool/GetAppletCoursePageList';
 				} else {
@@ -196,7 +198,8 @@
 							GoodsType: 0,
 							CategoryIds: '',
 							OrderBy: 1,
-							GoodsPageType: UserPageType
+							GoodsPageType: UserPageType,
+							StoreId:StoreId
 						},
 					},
 					(res) => {