1

pages.json

@@ -422,6 +422,8 @@
 					}
 				},{
 					"path":"personalList"
+				},{
+					"path":"subscribe"
 				}
 		    ]
 		},

pages/reserve/storeDetails.vue

@@ -130,7 +130,7 @@
 	.storeDetails .setmeal-item{
 		width: 200px;
 		/* height: 98px; */
-		margin-left: 15px;
+		
 		background: #FFF;
 		border-radius: 6px;
 		box-shadow:0 6px 10px 1px #F2F2F2;
@@ -142,8 +142,20 @@
 		background: #221818;
 		padding: 8px 15px;
 		color: #EFDCCB;
+		background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cpoun.png');
+		background-repeat: no-repeat;
+		background-size: cover;
+		position: relative;
 		
 	}
+	.storeDetails .setmeal-pl{
+		position: absolute;
+		top:28.5px;
+		width: 18px;
+		height: 18px;
+		border-radius: 9px;
+		background: #FFF;
+	}
 	.storeDetails .setmeal-item-bottom{
 		display: flex;
 		align-items: center;
@@ -278,6 +290,11 @@
 					<view class="right u-skeleton-rect" @click="openShare">
 					  <image src="@/static/images/icon/icon-share.png" class="share-icon" />
 					  <text>分享</text>
+					  <button 
+					  v-if="u"
+						style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;opacity: 0;"
+						open-type="share"
+					  ></button>
 					</view>
 				</view>
 				<!-- location-o -->
@@ -310,7 +327,7 @@
 			</view>
 			<view class="setmeal-box">
 				<view v-for="(cl, ci) in list" :key="ci">
-					<view class="setmeal-item u-skeleton-rect" >
+					<view class="setmeal-item u-skeleton-rect" :style="{'margin-left':ci==0?'15px':'0','margin-right': ci+1==list.length?'15px':'5px'}">
 						<view class="setmeal-item-top">
 							<view style="font-size: 14px;margin-bottom: 3px;" class="setmeal-name">剪发卡</view>
 							<view style="font-size: 11px;color: rgba(239, 220, 203, 0.6);" class="setmeal-name">总监精剪+造型+洗吹</view>
@@ -319,6 +336,8 @@
 								<text style="font-size: 20px;font-weight: bold;">78.4</text>
 								<text style="font-size: 13px;">/次  3次¥235.2</text>
 							</view>
+							<view class="setmeal-pl" style="left: -9px;"></view>
+							<view class="setmeal-pl" style="right: -9px;"> </view>
 						</view>
 						<view class="setmeal-item-bottom">
 							有效期：2020.10.05  18:00
@@ -355,7 +374,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="designer-btn" :style="{'background':mc}" >
+					<view class="designer-btn" :style="{'background':mc}" @click.stop="gosubscribe">
 						预约
 					</view>
 				</view>
@@ -391,6 +410,7 @@
 		  @goLook="goLook"
 		  @closeBtn="closeBtn"
 		></coupon>
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</scroll-view>
 </template>
 
@@ -404,6 +424,7 @@
 		},
 		data(){
 			return{
+				showAuth:false,
 				pageTitle: "门店详情",
 				scrollTop:0,
 				headStyle:{},
@@ -476,6 +497,7 @@
 			this.u = uni.getStorageSync("mall_UserInfo");
 			this.init();
 			this.getSPList()//获取服务人员列表
+			this.getAllCPList()//获取门店套餐卡
 			wx.showShareMenu({
 			  withShareTicket: true,
 			  menus: ["shareAppMessage", "shareTimeline"],
@@ -496,10 +518,8 @@
 				if(SmallShopId == 0){//如果微店id为0 去找所属微店id
 					SmallShopId = mall_UserInfo ? mall_UserInfo.UserSmallShopId : 0;
 				}
-		  let title =
-		    this.g.app_share_title != null && this.g.app_share_title != "" ? this.g.app_share_title : this.g.name;
-		  let imageUrl =
-		    this.g.app_share_pic != null && this.g.app_share_pic != "" ? this.g.app_share_pic : this.g.cover_pic;
+		  let title =this.g.storeName;
+		  let imageUrl =this.g.storeCoverImg;
 		  let id = this.id;
 		  return {
 		    title: title,
@@ -522,9 +542,9 @@
 				SmallShopId = u.UserSmallShopId? u.UserSmallShopId:0
 			}
 		  return {
-		    title: this.g.app_share_title != null && this.g.app_share_title != "" ? this.g.app_share_title  : this.g.name,
+		    title: this.g.storeName,
 		    path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=5',
-		    imageUrl:this.g.app_share_pic != null && this.g.app_share_pic != ""  ? this.g.app_share_pic  : this.g.cover_pic,
+		    imageUrl:this.g.storeCoverImg,
 		  };
 		},
 		created() {
@@ -553,7 +573,7 @@
 					this.designerH = data.top
 				}
 			}).exec();
-			uni.createSelectorQuery().select(".richtext").boundingClientRect(data=>{
+			uni.createSelectorQuery().select(".wxParse").boundingClientRect(data=>{
 				if(data && data.top){
 					this.richtextH = data.top
 				}
@@ -608,6 +628,19 @@
 					}
 				);
 			},
+			getAllCPList(){
+				this.request2({
+						url: '/api/AppletStores/GetAllCouponPageList',
+						data: {pageIndex:1,pageSize:999,StoreId:this.id}
+					},
+					res => {
+						
+						if (res.resultCode == 1) {
+							this.allCoupon = res.data.pageData
+						}
+					}
+				);
+			},
 			scrollHandler(e) {
 				console.log(e.detail.scrollTop)
 			  this.scrollTop = e.detail.scrollTop;
@@ -617,6 +650,15 @@
 			  if(this.stickyH-this.headH>this.scrollTop){
 				  this.showSticky=false
 			  }
+			  // if(this.scrollTop >this.setmealH+40 &&this.scrollTop<this.designerH){
+				 //  this.current= 0;
+			  // }else if(this.scrollTop >this.designerH+40 && this.scrollTop<this.richtextH){
+				 //  this.current= 1;
+			  // }else if(this.scrollTop >this.richtextH+40 && this.scrollTop<this.commentH){
+				 //  this.current= 2;
+			  // }else if(this.scrollTop >this.commentH+40 ){
+				 //  this.current= 3;
+			  // }
 			  //this.$forceUpdate();
 			},
 			scrollTopHandler() {
@@ -683,7 +725,30 @@
 				uni.navigateTo({
 					url: "/pages/reserve/personalList?id="+this.id,
 				})
+			},
+			gosubscribe(){
+				if (this.u) {
+				  uni.navigateTo({
+				  	url: "/pages/reserve/subscribe?id="+this.id,
+				  })
+				} else {
+				  this.showAuth = true;
+				}
+			},
+			openShare(){
+				if (!this.u) {
+					this.showAuth = true;
 				} 
+			},
+			reloadUserinfo() {
+			  this.u = uni.getStorageSync("mall_UserInfo");
+			  
+			  
+			},
+			//关闭登录窗口
+			gbAuth() {
+			  this.showAuth = false;
+			},
 		}
 	}
 </script>