1

pages.json

@@ -451,6 +451,8 @@
 					"path":"share_qrcode"
 				},{
 					"path":"offline-success"
+				},{
+					"path":"draw"
 				}
 		    ]
 		},

pages/index/index.vue

@@ -168,10 +168,6 @@
 		},
 		onLoad(options) {
 			let that = this;
-			options={
-				
-				storeId:8,id:6,JumpType:8,
-			}
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -246,7 +242,7 @@
 				this.getjump(options.scene);
 			}
 			if (options && options.storeId) {
-				this.fxstoreId = options.storeId
+				this.fxstoreId = options.storeId;
 			}
 			// #ifdef MP-WEIXIN
 			wx.showShareMenu({
@@ -307,48 +303,8 @@
 						};
 						that.updateuserinfo(msg);
 						that.getPageType()
+						that.sharejump();
 						// 如果登录的情况下直接跳转商品详情或者直播列表
-						setTimeout(() => {
-							if (that.JumpType == 1) {
-								//商品详情
-								uni.navigateTo({
-									url: "/pages/goods/goods?GoodsId=" + that.GoodsId,
-								});
-							} else if (that.JumpType == 2) {
-								//直播列表
-								uni.navigateTo({
-									url: "/pages/live/index"
-								});
-							} else if (that.JumpType == 3) {
-								//司导详情
-								that.goguidecar()
-							} else if (that.JumpType == 4) {
-								//代付页面
-								uni.navigateTo({
-									url: "/pages/order/payment-order?GoodsId=" + that.OrderId
-								});
-							} else if (that.JumpType == 5) {
-								//课程详情
-								uni.navigateTo({
-									url: "/pages/school/courseInfo?GoodsId=" + that.GoodsId
-								});
-							} else if (that.JumpType == 6) {
-								//课程代付页面
-								uni.navigateTo({
-									url: "/pages/school/personal/payment-order?OrderId=" + that.OrderId
-								});
-							} else if (that.JumpType == 7) {
-								//线下服务门店详情
-								uni.navigateTo({
-									url: "/pages/reserve/storeDetails?id="+that.GoodsId,
-								});
-							} else if (that.JumpType == 8) {
-								//服务人员详情
-								uni.navigateTo({
-									url: "/pages/reserve/designerDetail?ID="+that.GoodsId+'&storeId='+that.fxstoreId,
-								})
-							}
-						}, 500);
 					} else {
 						//静默登录操作
 						uni.login({
@@ -561,49 +517,9 @@
 								that.init()
 							}
 							// 如果登录的情况下直接跳转商品详情或者直播列表
-							setTimeout(() => {
-								if (that.JumpType == 1) {
-									//商品详情
-									uni.navigateTo({
-										url: "/pages/goods/goods?GoodsId=" + that.GoodsId,
-									});
-								} else if (that.JumpType == 2) {
-									//直播列表
-									uni.navigateTo({
-										url: "/pages/live/index"
-									});
-								} else if (that.JumpType == 3) {
-									//司导详情
-									that.goguidecar()
-								} else if (that.JumpType == 4) {
-									//代付页面
-									uni.navigateTo({
-										url: "/pages/order/payment-order?GoodsId=" + that.OrderId
-									});
-								} else if (that.JumpType == 5) {
-									//课程详情
-									uni.navigateTo({
-										url: "/pages/school/courseInfo?GoodsId=" + that.GoodsId
-									});
-								} else if (that.JumpType == 6) {
-									//课程代付页面
-									uni.navigateTo({
-										url: "/pages/school/personal/payment-order?OrderId=" + that.OrderId
-									});
-								} else if (that.JumpType == 7) {
-									//线下服务门店详情
-									
-									uni.navigateTo({
-										url: "/pages/reserve/storeDetails?id="+that.GoodsId,
-									});
-								} else if (that.JumpType == 8) {
-									//服务人员详情
-									uni.navigateTo({
-										url: "/pages/reserve/designerDetail?ID="+that.GoodsId+'&storeId='+that.fxstoreId,
-									})
-								}
-
-							}, 500);
+							that.sharejump()
+							
+							
 						} else {
 							if (!that.u) {
 								that.u = {
@@ -616,6 +532,60 @@
 					}
 				);
 			},
+			sharejump(){//分享的总跳转
+			let that = this
+				setTimeout(() => {
+					if (that.JumpType == 1) {
+						//商品详情
+						uni.navigateTo({
+							url: "/pages/goods/goods?GoodsId=" + that.GoodsId,
+						});
+					} else if (that.JumpType == 2) {
+						//直播列表
+						uni.navigateTo({
+							url: "/pages/live/index"
+						});
+					} else if (that.JumpType == 3) {
+						//司导详情
+						that.goguidecar()
+					} else if (that.JumpType == 4) {
+						//代付页面
+						uni.navigateTo({
+							url: "/pages/order/payment-order?GoodsId=" + that.OrderId
+						});
+					} else if (that.JumpType == 5) {
+						//课程详情
+						uni.navigateTo({
+							url: "/pages/school/courseInfo?GoodsId=" + that.GoodsId
+						});
+					} else if (that.JumpType == 6) {
+						//课程代付页面
+						uni.navigateTo({
+							url: "/pages/school/personal/payment-order?OrderId=" + that.OrderId
+						});
+					} else if (that.JumpType == 7) {
+						//线下服务门店详情
+						
+						uni.navigateTo({
+							url: "/pages/reserve/storeDetails?id="+that.GoodsId,
+						});
+					} else if (that.JumpType == 8) {
+						//服务人员详情
+						uni.navigateTo({
+							url: "/pages/reserve/designerDetail?ID="+that.GoodsId+'&storeId='+that.fxstoreId,
+						})
+					} else if (that.JumpType == 9) {
+						//线下服务商品
+						try {
+							uni.setStorageSync("storeId", {storeId:that.fxstoreId});
+						} catch (e) {
+						    console.log(e)
+						}
+						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + that.GoodsId });
+					} 
+				
+				}, 500);
+			},
 			updateuserinfo(msg) {
 				this.request2({
 						url: "/api/MemberUser/SetMemberPhoto",
@@ -979,48 +949,7 @@
 					this.init()
 				}
 				// 如果登录的情况下直接跳转商品详情或者直播列表
-				setTimeout(() => {
-					if (this.JumpType == 1) {
-						//商品详情
-						uni.navigateTo({
-							url: "/pages/goods/goods?GoodsId=" + this.GoodsId
-						});
-					} else if (this.JumpType == 2) {
-						//直播列表
-						uni.navigateTo({
-							url: "/pages/live/index"
-						});
-					} else if (this.JumpType == 3) {
-						//司导详情
-						this.goguidecar()
-					} else if (this.JumpType == 4) {
-						//代付页面
-						uni.navigateTo({
-							url: "/pages/order/payment-order?GoodsId=" + this.OrderId
-						});
-					} else if (this.JumpType == 5) {
-						//课程详情
-						uni.navigateTo({
-							url: "/pages/school/courseInfo?GoodsId=" + this.GoodsId
-						});
-					} else if (this.JumpType == 6) {
-						//课程代付页面
-						uni.navigateTo({
-							url: "/pages/school/personal/payment-order?OrderId=" + this.OrderId
-						});
-					} else if (this.JumpType == 7) {
-						//线下服务门店详情
-						uni.navigateTo({
-							url: "/pages/reserve/storeDetails?id="+this.GoodsId,
-						});
-					} else if (this.JumpType == 8) {
-						//服务人员详情
-						uni.navigateTo({
-							url: "/pages/reserve/designerDetail?ID="+this.GoodsId+'&storeId='+this.fxstoreId,
-						})
-					}
-
-				}, 500);
+				this.sharejump();
 			},
 			getPageType() {
 				this.request2({

pages/reserve/components/share/share.vue

@@ -113,7 +113,7 @@ export default {
     genernalHandler() {
       //this.goodId
       uni.navigateTo({
-        url: "/pages/goods/draw?id="+this.goodId,
+        url: "/pages/reserve/draw?id="+this.goodId,
       });
     },
     sendQuanHandler() {

pages/reserve/goodsDetails.vue

@@ -374,8 +374,7 @@ export default {
         this.g.app_share_title != null && this.g.app_share_title != ""
           ? this.g.app_share_title
           : this.g.name,
-      // path: "/pages/goods/goods?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId,
-      path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=1',
+      path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=9',
       imageUrl:
         this.g.app_share_pic != null && this.g.app_share_pic != ""
           ? this.g.app_share_pic
@@ -571,11 +570,14 @@ export default {
     getReceive() {
       //分享进入调取领券接口
       // 1-分享，2-购买并付款
+	  let storeId = uni.getStorageSync("storeId") && uni.getStorageSync("storeId").storeId ? uni.getStorageSync("storeId")
+	  	.storeId : 0;
       this.request2(
         {
-          url: "/api/AppletUser/ShareCoupon",
+          url: "/api/AppletStores/ShareEducationCoupon",
           data: {
             TriggerType: 1,
+			StoreId:storeId
           },
         },
         (res) => {
@@ -590,7 +592,7 @@ export default {
     goLook() {
       this.showCoupons = true;
       uni.navigateTo({
-        url: "/pages/coupon/index/index",
+        url: "/pages/reserve/personal/cardList",
       });
     },
     closeBtn() {

pages/reserve/storeDetails.vue

@@ -892,10 +892,9 @@
 			},
 			goLook() {
 			  this.showCoupons = true;
-			  // TODO套餐卡页面还没建
-			  // uni.navigateTo({
-			  //   url: "/pages/coupon/index/index",
-			  // });
+			  uni.navigateTo({
+			    url: "/pages/reserve/personal/cardList",
+			  });
 			},
 			closeBtn() {
 			  this.showCoupons = false;