Merge branch 'dev' into 'test'

Dev See merge request !679

Merge branch 'dev' into 'test'
Dev See merge request !679
后端研发-苏明海
2 parents 86c5b521 450ad49c
Showing 15 changed files with 251 additions and 81 deletions
components/goods_list/goods_list.wxss
components/my-qrcode/my-qrcode.wxml
packageA/pages/jfbuy/jfbuy.js
packageA/pages/myGift/myGift.wxml
packageA/pages/myGift/myGift.wxss
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
pages/index/index/index.wxss
pages/team/team_show/team_show.wxml
pages/team/team_success/team_success.js
pages/team/team_success/team_success.json
pages/team/team_success/team_success.wxml
@@ -87,7 +87,8 @@
 .goods_name {
   height: 62rpx;
   /* margin-top: 6rpx; */
-  line-height: 30rpx;
+  line-height: 1.2;
+	margin-bottom: 10rpx;
 }
  
 .hang {
@@ -4,7 +4,6 @@
 			<canvas  class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"/>
 			<view class="q_code fs28">兑换码：{{object.val}}</view>
 			<view class="c-9 pdt10">请向店员出示二维码核销兑换</view>
-			<!-- <view class="c-9 fs28">有效期：{{object.now}} 至 {{object.validay}}</view> -->
 		</view>
 </view>
  
@@ -416,7 +416,7 @@ Page({
 	viewItemDetails:function(e){
 		 var index=e.currentTarget.dataset.index;
 		 var item=this.data.list2[index];
-		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id;
+		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&title="+item.goods_name;
 		 getApp().goto(url);
 	},
  
@@ -15,8 +15,20 @@
 						<!-- 价格 -->
 						<view class="flex jc_sb ai-center pdb10">
 							<view class="flex ai-center">
-								<view class="c-red fs28"><text class="rmb">{{item.lbprice}}</text>/{{item.lbintegral}}积分</view>
-								<view class="fs22 c-a4 line-through mgl10">零售价{{item.oldprice}}</view>
+								<view class="c-red fs28">
+									<block wx:if="{{item.lbprice>0 && 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">{{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">零售价{{filter.toFix(item.oldprice,2)}}</view>
 							</view>
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
@@ -26,8 +38,8 @@
 					</view>
 				</view>
 				<view class="btn-container pd20">
-					<view bindtap="GetBuyIntegral" data-index="{{index}}" class="btn red">立即兑换</view>
-					<view bindtap="GetBuyPrice" data-index="{{index}}" class="btn pink">立即购买</view>
+					<view wx:if="{{item.lbintegral>0}}" bindtap="GetBuyIntegral" data-index="{{index}}" class="btn red">立即兑换</view>
+					<view wx:if="{{item.lbprice>0}}" bindtap="GetBuyPrice" data-index="{{index}}" class="btn pink">立即购买</view>
 				</view>
 			</view>
 		</block>
@@ -138,7 +138,7 @@ page {
  
 .btn-container {
 	display: flex;
-	justify-content: space-around;
+	/*justify-content: space-around;*/
 	font-size: 26rpx;
 }
  
@@ -146,6 +146,7 @@ page {
 	padding: 20rpx;
 	flex: 1;
 	text-align: center;
+	max-width: 50%;
 }
  
 .btn.red {
@@ -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">
 		<!-- 标题 -->
@@ -9,16 +11,32 @@
 		<!-- 价格 -->
 		<view class="flex jc_sb ai-center pdb10">
 			<view class="flex ai-center">
-				<view class="c-red fs36"><text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分</view>
-				<view class="fs22 c-a4 line-through mgl10">零售价{{details.oldprice}}</view>
+				<view class="c-red fs36">
+					<block wx:if="{{details.lbprice>0 && details.lbintegral>0 }}">
+						<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">{{filter.toFix(details.lbprice,2)}}</text>
+						</block>
+						<block wx:if="{{details.lbintegral>0}}" >
+						    {{details.lbintegral}}积分
+				    	</block>
+					</block>
+
+				</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">
@@ -40,7 +58,6 @@
 			</view>
 		</view>
  
-
 		<view wx:else class="">
 			<view class="flex pd20 jc_sb">
 				<view>单品名称</view>
@@ -52,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 bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
-			<view bindtap="GetBuyPrice"  class="btn pink">立即购买</view>
+			<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">
+				已领取{{list[0].freebh}}
+		    </view>
+			<view wx:elif="{{details.codetype!=1}}" bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
 		</block>
-		<view wx:else bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
 	</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;
@@ -33,7 +33,7 @@
 		    <view class="search-img">
 		      <image class="wh100" src="{{url}}/miniapp/images/search.png"></image>
 		    </view>
-		    <input bindfocus="jumpSearch" class="search-cont" placeholder="搜索商品" type="text"/>
+				<input bindtap="jumpSearch" class="search-cont" placeholder="搜索商品" type="text" disabled/>
 		  </view>
 		  <view class="classify-frame t-c" bindtap="getScancode">
 		    <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image>
@@ -146,7 +146,7 @@
  
 	<!--秒杀-->
 	<view class="seckill" wx:if="{{saleGoods!=null && pindGoods.length!=0 }}">
-		<navigator url="/pages/activity/seckill_list/seckill_list">
+		<navigator url="/pages/activity/seckill_list/seckill_list" hover-class="none">
 			<view class="seckill-time">
 				<view class="classname flex ai_c">
 					<image class="clock-img" src="{{url}}/miniapp/images/clock.png"></image>
@@ -208,18 +208,18 @@
       </view>
     </navigator>
     <view class="seckill-lists rel">
-      <swiper class="s_proms" style="height:{{pindGoods[0].length>1?'580':'290'}}rpx" indicator-active-color='red' bindchange="ptSwiperChange">
+      <swiper class="s_proms" style="height:{{pindGoods[0].length>1?'580':'290'}}rpx" indicator-active-color='red' bindchange="ptSwiperChange" indicator-dots>
         <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>
                 </view>
  
                 <view class="kill-cont">
-                  <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}">
+                  <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
                     {{aitem.title}}
  
                   </navigator>
@@ -263,10 +263,10 @@
         </swiper-item>
       </swiper>
  
-      <view class="flex-center-around translations abs">
+      <!-- <view class="flex-center-around translations abs">
         <view class="circle spot" wx:for="{{pindGoods}}" wx:key="{{index}}" style="background:{{index==pt_index?'#fff':'#999'}}">
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
  
@@ -406,7 +406,7 @@
 .nav {
 	padding: 0 10rpx;
 	box-sizing: border-box;
-	flex: 1;
+	/* flex: 1; */
 }
  
 .p_swiper .un_line {
@@ -154,10 +154,10 @@
 		</view>
 	</view>
 	<!----//拼团玩法---->
-	<view class='pintuan' bindtap="cpd">
+	<!-- <view class='pintuan' bindtap="cpd">
 		<view class='pintuanzhou'>拼团玩法</view>
 		<view class='pintuanyou'>开团/参团＞邀请参团＞人满成团</view>
-	</view>
+	</view> -->
 	<!--大家都在团-->
 	<view class='goodslist'>
 		<view class='goodslisttop'>
@@ -807,7 +807,7 @@ Page({
             else
                 url+="?first_leader="+getApp().globalData.user_id;
         }
-        console.log(url);
+        // console.log('url+++++>>>>>', url, th.data.teamlist.title);
  
         return {
             path:url,
@@ -815,6 +815,24 @@ Page({
             imageUrl: img,
         }
     },
+		
+		clickShare() {
+			this.setData({
+				share_hidden: true,
+			});
+		},
+		
+		send() {
+			this.setData({
+				share_hidden:false,
+			});
+		},
+		
+		cancel() {
+			this.setData({
+				share_hidden:false,
+			});
+		},
  
  
 })
@@ -5,5 +5,8 @@
     "navigationBarTextStyle": "white",
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#eeeeee"
-  }
+  },
+	"usingComponents": {
+			"share": "/components/share/share"
+	}
 }
 \ No newline at end of file
@@ -165,7 +165,8 @@
  
       <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-        <button wx:if="{{p_status==1}}"  bindtap='cmeng'  style='background-color:#fab55a; color:#fff'>
+				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+        <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
           邀请好友参团
         </button>
         <button bindtap="go_pay_wk" style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
@@ -175,7 +176,7 @@
       <!-- <view wx:elif="{{teamlist.ct_num-ordertx.length>0}}" class='' bindtap='cmeng'> -->
  
         <!--会员团 商家团-->
-        <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='cmeng'
+        <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
                 wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
  
       <!-- </view> -->
@@ -261,7 +262,7 @@
 </view>
  
 <!----蒙板---->
-<view class='mtop' wx:if="{{meng}}">
+<!-- <view class='mtop' wx:if="{{meng}}">
   <view wx:if="{{teamlist.kttype==3}}" class='mt1'>
     <block wx:if="{{max_num-ordertx.length>0}}">
       还差
@@ -278,16 +279,17 @@
     <span class='mts'>{{teamlist.ct_num-ordertx.length}}</span>人，邀请好友参团吧
     <span class='mcou' bindtap='cmc'>⊗</span>
   </view>
-
   <view>点击分享，发送给
     <span class='mts'>朋友</span>和
     <span class='mts'>朋友圈</span>
-  </view>
+  </view> -->
   <!--底部-->
-  <view class='mfoot' bindtap='saveImageToPhotosAlbum'>
+  <!-- <view class='mfoot' bindtap='saveImageToPhotosAlbum'>
     <button class='mbtn'>查看分享二维码</button>
   </view>
-</view>
+</view> -->
+
+
 <!--二维码显示页面-->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas>
 <!--拼团玩法弹出框-->
@@ -317,3 +319,6 @@
     </view>
   </view>
 </block>
+
+<!-- 分享控件，底部弹出 -->
+<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>