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

后端研发-苏泰源
2 parents 6194fb1d a532468f
Showing 5 changed files with 132 additions and 12 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/goods/search/search.js
pages/goods/search/search.wxml
@@ -28,7 +28,7 @@ Page({
         color_type: 0, //线条控制
         color_type_one: 0,
         color_type_two: 1,
-
+        is_no_plus:1,
         gid: "",
         stoid: o.stoid,
         url: o.url,
@@ -359,6 +359,22 @@ Page({
             th.data.c_guide_id = c_guide_id;
         }
  
+        //调用接口判断商家plus有没有过期
+        i.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+            if (res.data.code == 0) {
+                var arr = res.data.data.pageData;
+                if (arr.length > 0) {
+                    var item = arr[0];
+                    if (item.is_sy == 0) {
+                        var now = Date.parse(new Date()); now = now / 1000;
+                        if (item.end_time < now) {
+                            th.setData({ is_no_plus: 0 })
+                        }
+                    }
+                }
+            }
+        })
+
         getApp().getConfig(function (e) {
             ee.setData({sto_sele_name_1: e.store_name})
         })
@@ -3799,6 +3815,20 @@ Page({
         return param < 10 ? '0' + param : param;
     },
  
+    // 显示拼单规则
+	showRules: function() {
+		this.setData({
+			showRules: true,
+		});
+    },
+    
+    	// 关闭拼单规则
+	closeRules: function() {
+		this.setData({
+			showRules: false,
+		});
+	},
+
     //----倒计时函数-----
     countDown(time, prom_st) {
         if (!this.data.is_timer) return false;
@@ -6,6 +6,8 @@
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
 <block wx:if="{{isshow}}">
   <view class="container">
+  <!-- 拼单规则规则 -->
+    <view wx:if="{{prom_type== 6}}" class="rules" bindtap="showRules">规则</view>
     <view class="type-navbar">
       <view class="type-box" wx:for="{{categories}}" wx:key="id">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
@@ -324,7 +326,7 @@
             </view>
             <!-- 不是秒杀 -->
             <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && prom_type!=2 && prom_type!=4 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+            <view class="flex ai_and" wx:if="{{!card_field && is_no_plus && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && prom_type!=2 && prom_type!=4 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
               <view class="flex ai-center  grade-card-frame card-frame">
                 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                 <view class="fs24 white view card-name ellipsis-1">
@@ -336,7 +338,7 @@
               </view>
             </view>
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
-            <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
+            <block wx:if="{{g_filters.is_has_rank(rank_switch,data) && is_no_plus}}">
               <!-- 不是秒杀，且会员不是等级会员 -->
               <view wx:if="{{!card_field && prom_type!=1 && prom_type!=2  && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
@@ -1502,6 +1504,7 @@
     </view>
   </view>
 </view>
+<view class="mask" catchtouchmove="true" wx:if="{{showRules}}"></view>
 <!-- 选择门店的弹框，1.1版最新的 -->
 <block wx:if="{{store==1}}">
   <view class="mongolia-layer" bindtap="close_popup"></view>
@@ -1691,6 +1694,28 @@
   </view>
 </view>
  
+<view class="rule-pop-container" wx:if="{{showRules}}">
+			<view class="pop-title">规则详情
+					<text class="iconfont icon-guan" bindtap="closeRules"></text>
+			</view>
+					<view class="pdt40">
+							<view class="pdb20">活动时间</view>
+							<view class="">{{filters.format_time(prom_act.start_time,1)}} 至 {{filters.format_time(prom_act.end_time,1)}}
+							</view>
+					</view>
+					<view class="pdt40">
+							<view class="pdb20">活动内容</view>
+							<view class="popup-content">
+									<text class="pdb10">{{prom_act.remark}}</text>
+							</view>
+					</view>
+
+
+			<view class="pdv20">
+					<view class="btn" bindtap="closeRules">我知道了</view>
+			</view>
+	</view>
+
 <!-- 弹起来,购买预热商品的普通购买 -->
 <view hidden="{{!openSpecModal_flash_normal}}">
   <include src="buy_flash_normal.wxml" />
@@ -9,10 +9,62 @@
 image {
 	vertical-align: top;
 }
+.rules {
+	position: fixed;
+	background-color: rgba(0,0,0,.2);
+	color: white;
+	top: 22rpx;
+	right: 0;
+	z-index: 100;
+	font-size: 26rpx;
+	padding: 0 20rpx;
+	z-index: 99999;
+	border-radius: 20rpx 0 0 20rpx;
+}
+
+.rule-pop-container {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	background-color: white;
+	z-index: 99999;
+	border-radius: 16rpx 16rpx 0 0;
+	padding: 0 40rpx;
+	box-sizing: border-box;
+	font-size: 28rpx;
+	color: #444;
+}
+
+.pop-title {
+	padding: 20rpx 0;
+	text-align: center;
+	font-size: 32rpx;
+	position: relative;
+}
+.icon-guan {
+	position: absolute;
+	right: 0;
+	font-size: 26rpx;
+	top: 50%;
+	transform: translateY(-50%);
+	color: #ccc;
+}
+.btn {
+	color: white;
+	padding: 20rpx 0;
+	text-align: center;
+	border-radius: 40rpx;
+	background: -webkit-linear-gradient(left,#ff5000,#ff2000) no-repeat;
+}
  
 .goods-detail {
 	overflow: hidden
 }
+.popup-content {
+	max-height: 600rpx;
+	overflow-y: auto;
+}
  
 .type-navbar {
 	display: flex;
@@ -18,17 +18,14 @@ Page({
         requestUrl: "",
         //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
         hotWords: null,
-
+        is_no_plus:1,
         tabname: "sort",   //排序的字段
         adname: "asc",    //升降的字段
         rq_data:null,
-				
-				
-				searchRecord: [],
-				keyword: '',
-				is_his:0,
-				
-				hiddenClear: true,
+		searchRecord: [],
+		keyword: '',
+		is_his:0,
+		hiddenClear: true,
     },
  
     onLoad: function(t) {
@@ -45,6 +42,22 @@ Page({
             })
         }
  
+        //调用接口判断商家plus有没有过期
+        rq.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => {
+            if (res.data.code == 0) {
+                var arr = res.data.data.pageData;
+                if (arr.length > 0) {
+                    var item = arr[0];
+                    if (item.is_sy == 0) {
+                        var now = Date.parse(new Date()); now = now / 1000;
+                        if (item.end_time < now) {
+                            th.setData({ is_no_plus: 0 })
+                        }
+                    }
+                }
+            }
+        })
+
        var th=this;
        a.getConfig2(function(rs) {
          var arr=new Array(),arr2=new Array();
@@ -97,7 +97,7 @@
         </block>
         <block wx:else>
           <!-- 商品价格,先判断下是后又等级价-->
-          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+          <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
             <!-- 当会员是等级卡的时候 -->
             <block wx:if="{{card_field}}">
               <!-- 等级价>0 -->