Merge branch 'dev' into 'test'

Dev See merge request !777

Merge branch 'dev' into 'test'
Dev See merge request !777
后端研发-苏明海
2 parents a68ff39c 556d1d45
Showing 8 changed files with 60 additions and 19 deletions
components/my_confirm/my_confirm.wxml
components/my_confirm/my_confirm.wxss
packageA/pages/myGift/myGift.js
packageA/pages/myGift/myGift.wxml
packageA/pages/myGiftDetails/myGiftDetails.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageA/pages/myGiftDetails/myGiftDetails.wxss
pages/cart/cart/cart.wxss
@@ -3,12 +3,14 @@
   <view class="xc-obscuration" bindtap='close_yu_e' catchtouchmove="ture"></view>
   <view> 
 		<view class="xc-qr-frame">
-		<view class="shut" bindtap="close_yu_e">ⅹ</view>
-			<view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
-		 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
-			   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
-		     <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
-		  </view>
+			<view style="position: relative">
+				 <view class="shut" bindtap="close_yu_e">ⅹ</view>
+				 <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
+				 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
+					   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
+					 <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
+				  </view>
+			</view>
 		</view>
   </view>
 </view>
@@ -32,10 +32,10 @@
     font-size: 40rpx;
     color: #fff;
     text-align: center;
-    position: fixed;
+    position: absolute;
     z-index: 66666;
-    right: 75rpx;
-    top: 465rpx;
+    right: -20rpx;
+    top: -20rpx;
    background: #c8162c;
 }
 .xc-qr-frame{ 
@@ -122,7 +122,17 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-		this.scrollToLower('/api/weshop/libao/libaoFormvip/page', {
+
+      var url="";
+      var index=this.data.currentIndex;
+      if(index == 0) {
+          url = '/api/weshop/libao/libaoForm/page';
+      } else if(index == 1) {
+          url = '/api/weshop/libao/libaoFormvip/page';
+      };
+
+
+		this.scrollToLower(url, {
 			store_id: app.globalData.setting.stoid,
 			user_id: app.globalData.user_id,
 		});
@@ -33,7 +33,7 @@
 								</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 class="fs24 c-a4">已售{{item.salenum+item.virtualsales}}件</view>
 						</view>
 						<!-- 时间 -->
 						<view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
@@ -2,6 +2,7 @@
 const app = getApp();
 let self = null;
 var os = app.globalData.setting;
+var ut = require("../../../utils/util.js");
 Page({
@@ -72,6 +73,14 @@ Page({
 						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.startime>ut.gettimestamp()){
+                                self.setData({ is_not_start:1, });
+							}
+
+
+
 							console.log(da);
 							//礼包有俩种类型
 							if(da.lbtype==1){
@@ -5,7 +5,8 @@
 	 <!-- 未买 -->    
     <block wx:if="{{index==0}}">
-	  <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
+	  <view wx:if="{{is_not_start}}" class="fs26 exp_title">活动开始时间：{{filter.format_time(details.startime,1)}}</view>
+	  <view wx:else class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
 	 </block>
 	 <!-- 已买 -->
      <block wx:else>
@@ -37,7 +38,7 @@
 				</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 class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view>
 		</view>
 		<!-- 时间 -->
 		<!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> -->
@@ -86,7 +87,8 @@
 				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
 					 <view class="flex fs28 fir_view">
 						 <view>满{{item.condition}}使用</view>
-						 <view class="fs8" style="text-align: right">￥{{item.money}}</view>
+						 <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view>
+						 <view wx:else class="fs8" style="text-align: right">￥{{item.money}}</view>
 					 </view>
@@ -122,8 +124,13 @@
 	<!-- 按钮 -->
 	<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 wx:if="{{is_not_start}}">
+				<view class="btn gray">活动还未开始</view>
+			</block>
+			<block wx:else>
+			    <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>
 		<block wx:else>
@@ -136,8 +143,14 @@
 	<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 wx:if="{{is_not_start}}">
+				<view class="btn gray">活动还未开始</view>
+			</block>
+			<block wx:else>
+			   <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>
 		<block wx:else>
 		   <view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领取</view>
@@ -78,6 +78,13 @@ page {
 	color: #FF6768;
 }
+.btn.gray{
+	background-color: #cccccc;
+	color:#fff
+}
+
+
+
 .ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
 	display: inline-block; line-height: 50rpx; border-radius: 10rpx}
@@ -157,7 +157,7 @@ radio {
   font-size: 28rpx;
   color: #666;
   background-color: rgb(255, 255, 255);
-  z-index: 2;
+  z-index: 1999;
   border-top: 1rpx solid rgb(236, 236, 236);
   border-bottom: 1rpx solid rgb(236, 236, 236);