Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 88c4c9b7 1b558969
Showing 6 changed files with 175 additions and 57 deletions
packageA/pages/myGift/myGift.wxml
packageA/pages/myGiftDetails/myGiftDetails.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageA/pages/myGiftDetails/myGiftDetails.wxss
packageA/pages/my_service2/appment_main.js
pages/index/index/index.wxml
@@ -17,18 +17,18 @@
 							<view class="flex ai-center">
 								<view class="c-red fs28">
 									<block wx:if="{{item.lbprice>0 && item.lbintegral}}">
-										<text class="rmb">{{item.lbprice}}</text>/{{item.lbintegral}}积分
+										<text class="rmb">{{filter.toFix(item.lbprice,2)}}</text>/{{item.lbintegral}}积分
 									</block>
 									<block wx:elif="{{item.lbprice>0 || item.lbintegral}}">
 										<block wx:if="{{item.lbprice>0}}" >
-										   <text class="rmb">{{item.lbprice}}</text>
+										   <text class="rmb">{{filter.toFix(item.lbprice,2)  }}</text>
 										</block>
 										<block wx:if="{{item.lbintegral>0}}">
 										   {{item.lbintegral}}积分
 										</block>
 									</block>
 								</view>
-								<view class="fs22 c-a4 line-through mgl10">零售价{{item.oldprice}}</view>
+								<view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(item.oldprice,2)}}</view>
 							</view>
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
@@ -57,7 +57,7 @@ Page({
 				// 	store_id: app.globalData.setting.stoid,
 				// 	user_id: app.globalData.user_id,
 				// };
-				
+				//购买的时候是0，购买后是1
 				if(this.data.index == 0) {
 					// data.lbid = this.data.id;
 					// 请求数据
@@ -68,60 +68,100 @@ Page({
 						},
 						isShowLoading: true,
 					}).then(function(res) {
-						self.setData({
-							details: res.data.data.pageData[0],
-						});
-					});
-					
-					app.request.promiseGet('/api/weshop/libao/libaoList/page', {
-						data: {
-							store_id: app.globalData.setting.stoid,
-							lbid: this.data.id,
-						},
-						isShowLoading: true,
-					}).then(function(res) {
-						self.setData({
-							list: res.data.data.pageData,
-						});
+
+						if(res.data.code==0 &&  res.data.data  &&  res.data.data.pageData &&  res.data.data.pageData.length>0){
+							var da= res.data.data.pageData[0]
+                            self.setData({ details:da, });
+
+							//礼包有俩种类型
+							if(da.lbtype==1){
+                                app.request.promiseGet('/api/weshop/libao/libaoList/page', {
+                                    data: {
+                                        store_id: app.globalData.setting.stoid,
+                                        lbid: self.data.id,pageSize:500
+                                    },
+                                    isShowLoading: true,
+                                }).then(function(res) {
+                                    self.setData({
+                                        list: res.data.data.pageData,
+                                    });
+                                });
+							}else{
+                                app.request.promiseGet('/api/weshop/libao/libaoList/listLQ', {
+                                    data: {
+                                        store_id: app.globalData.setting.stoid,
+                                        lbid: self.data.id,
+                                    },
+                                    isShowLoading: true,
+                                }).then(function(res) {
+                                	if(res.data.code==0){
+                                        self.setData({
+                                            list: res.data.data,
+                                        });
+									}
+                                });
+							}
+
+						}
 					});
+
 				} else if(this.data.index == 1) {
 					app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', {
 						data: {
 							store_id: app.globalData.setting.stoid,
 							user_id: app.globalData.user_id,
-							id: this.data.id,
+							id: this.data.id
 						},
 						isShowLoading: true,
 					}).then(function(res) {
 						// console.log('res3-->', res);
 						if(res.data.code==0  && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+
+							var da= res.data.data.pageData[0]
 							self.setData({
-								details: res.data.data.pageData[0],
+								details:da,
 							});
-						}
-					});
-					
-					app.request.promiseGet('/api/weshop/libao/libaoListvip/page', {
-						data: {
-							store_id: app.globalData.setting.stoid,
-							lbvipid: this.data.id,
-						},
-						isShowLoading: true,
-					}).then(function(res) {
-						// console.log('res4-->', res);
-						if(res.data.code==0  && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
-							var list_arr=res.data.data.pageData;
-							for(var i in list_arr){
-								list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
+
+							if(da.lbtype==1){
+                                app.request.promiseGet('/api/weshop/libao/libaoListvip/page', {
+                                    data: {
+                                        store_id: app.globalData.setting.stoid,
+                                        lbvipid: self.data.id,pageSize:500
+                                    },
+                                    isShowLoading: true,
+                                }).then(function(res) {
+                                    // console.log('res4-->', res);
+                                    if(res.data.code==0  && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
+                                        var list_arr=res.data.data.pageData;
+                                        for(var i in list_arr){
+                                            list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
+                                        }
+                                        self.setData({
+                                            list: res.data.data.pageData,
+                                        });
+                                    }
+                                });
+							}else{
+                                app.request.promiseGet('/api/weshop/libao/libaoListvip/listLQ', {
+                                    data: {
+                                        store_id: app.globalData.setting.stoid,
+                                        lbvipid: self.data.id,
+                                        user_id:app.globalData.user_id
+                                    },
+                                    isShowLoading: true,
+                                }).then(function(res) {
+                                    // console.log('res4-->', res);
+                                    if(res.data.code==0  && res.data.data) {
+                                        self.setData({
+                                            list: res.data.data,
+                                        });
+                                    }
+                                });
 							}
-							self.setData({
-								list: res.data.data.pageData,
-							});
+
 						}
 					});
 				};
-				
-			
 			};
 		};
   },
@@ -260,14 +300,38 @@ Page({
 					   icon: 'none',
 					   duration: 2000
 				   })
-
-
-
+				   
 			   }
 		   }
 	   })
-	}
+	},
+
+	//一键领取券
+    show_get_quan:function (e) {
+		var th=this;
+        var json = {
+            store_id:os.stoid,
+            user_id:getApp().globalData.user_id,
+			id:this.data.id
+        };
+        var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
+        getApp().request.post(url,{
+            data:json,
+            success:function(res) {
+                if (res.data.code == 0) {
+                    th.setData({'details.isget':1});
+                } else {
+                    wx.showToast({
+                        title: res.data.msg,
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            },
+        })
+
+    }
 })
 \ No newline at end of file
@@ -2,6 +2,8 @@
 <view class="pdb80">
 	<!-- 图片 -->
 	<view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
+
+	<view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
@@ -11,11 +13,11 @@
 			<view class="flex ai-center">
 				<view class="c-red fs36">
 					<block wx:if="{{details.lbprice>0 && details.lbintegral>0 }}">
-						<text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分
+						<text class="rmb">{{filter.toFix(details.lbprice,2)}}</text>/{{details.lbintegral}}积分
 					</block>
 					<block wx:elif="{{details.lbprice>0 || details.lbintegral>0 }}">
 						<block wx:if="{{details.lbprice>0}}" >
-					    	<text class="rmb">{{details.lbprice}}</text>
+					    	<text class="rmb">{{filter.toFix(details.lbprice,2)}}</text>
 						</block>
 						<block wx:if="{{details.lbintegral>0}}" >
 						    {{details.lbintegral}}积分
@@ -23,15 +25,18 @@
 					</block>
 				</view>
-				<view class="fs22 c-a4 line-through mgl10">零售价{{details.oldprice}}</view>
+				<view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(details.oldprice,2)}}</view>
 			</view>
 			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
 		</view>
 		<!-- 时间 -->
 		<view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view>
 	</view>
+
+
+	<!-- 领券和兑换商品 -->
 	<!-- 单品 -->
-	<view class="goods-container">
+	<view class="goods-container" wx:if="{{details.lbtype==1}}">
 		<view class="pd20 bold bdb">可到线下门店兑换以下单品</view>
 		<view wx:if="{{index==1 && details.codetype==1}}" class="">
 			<view class="flex pd20 jc_sb">
@@ -53,7 +58,6 @@
 			</view>
 		</view>
-
 		<view wx:else class="">
 			<view class="flex pd20 jc_sb">
 				<view>单品名称</view>
@@ -65,15 +69,48 @@
 			</view>
 		</view>
 	</view>
-	
+
+	<view wx:if="{{details.lbtype==2}}" class="flex" style="flex-wrap: wrap;">
+		<block wx:for="{{list}}">
+			<block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
+				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
+					 <view class="flex fs28 fir_view">
+						 <view>满1000.00使用</view>
+						 <view class="fs38" style="text-align: right">￥1000</view>
+					 </view>
+					 <view style="font-size: 16rpx; text-align: center">活动结束日期： 2022-06-02 00:00:00 </view>
+				</view>
+			</block>
+		</block>
+	</view>
+
+	<view style="height: 20rpx"></view>
 	<!-- 按钮 -->
-	<view class="btn-container">
+	<view class="btn-container" wx:if="{{details.lbtype==1}}">
 		<block wx:if="{{index == 0}}">
 			<view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
 			<view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice"  class="btn pink">立即购买</view>
 		</block>
-		<view wx:else bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
+
+		<block wx:else>
+			<view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">
+				已领取{{list[0].freebh}}
+		    </view>
+			<view wx:elif="{{details.codetype!=1}}" bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
+		</block>
 	</view>
+
+	<view class="btn-container" wx:if="{{details.lbtype==2}}">
+		<block wx:if="{{index == 0}}">
+			<view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
+			<view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice"  class="btn pink">立即购买</view>
+		</block>
+		<block wx:else>
+		   <view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领</view>
+		   <view wx:else bindtap="show_get_quan" data-type="1" class="btn red">一键领取优惠券→</view>
+		</block>
+	</view>
+
 </view>
 <!-- 引入提示组件 -->
@@ -81,4 +81,21 @@ page {
 .ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
 	display: inline-block; line-height: 50rpx; border-radius: 10rpx}
-.ling_btn.c_a{ background: darkgrey}
 \ No newline at end of file
+.ling_btn.c_a{ background: darkgrey}
+
+.lb_quan{
+	width: 48%;
+	height: 120rpx;
+	background-size: 100% 100%;
+	background-position: center;
+	background-repeat: no-repeat;
+	color: #fff;
+	font-size: 22rpx;
+	text-align: center;
+	margin-top:20rpx;
+	margin-left:10rpx;
+}
+.fir_view{
+	justify-content: space-between; height: 98rpx; line-height: 98rpx; padding: 0 8rpx;
+}
+.exp_title{text-align: center;height: 60rpx; line-height: 60rpx;background-color: #cccdce;color: #c0283a}
 \ No newline at end of file
@@ -329,7 +329,7 @@ Page({
       is_textea: 0
     })
     var itemId = th.data.itemId; //服务id
-    var url = "/api/weshop/marketing/reservation/storage/pageAll";
+    var url = "/api/weshop/marketing/reservation/service/storage/page";
     var key_word = th.data.key_word;
     key_word = key_word.replace(/\s+/g, "");
     getApp().request.promiseGet(url, {
@@ -344,7 +344,7 @@ Page({
       }
     }).then(res => {
       wx.hideLoading();
-      if (res.data.code == 0) {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
         th.data.curpage++;
         var arr1 = th.data.store_list;
         var arr2 = res.data.data.pageData;
@@ -212,7 +212,7 @@
         <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
           <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
             <view class="kill-item">
-              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
+              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
                 <view class="kill-pic">
                   <image class="wh100" src="{{url+aitem.original_img}}" data-val="{{aitem.original_img}}" data-errorimg="pindGoods[{{pix}}][{{aind}}].original_img" binderror="bind_bnerr2" lazy-load="true">
                   </image>