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

season
2 parents ef57080b 90a9d285
Showing 18 changed files with 250 additions and 34 deletions
app.json
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/details_serviceCard/details_serviceCard.wxml
packageE/pages/cart/cart2/cart2.js
packageG/pages/plus_agreement/plus_agreement.js
packageG/pages/plus_agreement/plus_agreement.json
packageG/pages/plus_agreement/plus_agreement.wxml
packageG/pages/plus_agreement/plus_agreement.wxss
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/giftpack/mygiftpack/mygiftpack.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/user/index/index.js
pages/user/index/index.wxml
pages/user/index/index.wxss
pages/user/plus/plus.js
pages/user/plus/plus.wxml
pages/user/plus/plus.wxss
@@ -242,7 +242,8 @@
           "pages": [
               "pages/store/index",
               "pages/user/express/express",
-              "pages/team/team_success/team_success"
+              "pages/team/team_success/team_success",
+              "pages/plus_agreement/plus_agreement"
           ]
       }
     ],
@@ -654,6 +654,7 @@ Page({
 		// 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购
 		let list =  this.data.details.list;
 		var pt_act=null;  //-- 拼团活动的优化 --
+		var presell=null;  //-- 预售活动 --
 		//秒杀活动和拼团活动要重新计算一下
 		for (const it of list) {
@@ -896,6 +897,7 @@ Page({
 							flag = 0;
 							return false;
 						}
+						presell=act_data;
 					}
 				})
@@ -956,7 +958,13 @@ Page({
 						wx.redirectTo({
 							url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn
 						});
-					}else{
+					}else if(presell && presell.presell_type==0){
+
+						wx.redirectTo({
+							url: 	"/packageC/pages/presell/cart/cart?is_fwk=1&order_sn=" + order_sn
+						});
+					}
+					else{
 						wx.reLaunch({
 							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
 						})
@@ -81,7 +81,7 @@
 	<!-- 底部按钮栏 -->
 	<view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
 		<!-- 待支付 -->
-		<block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6  }}">
+		<block wx:if="{{details.pay_status == 0 && details.order_status==0 && details.prom_type!=6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
 			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
 		</block>
@@ -963,23 +963,6 @@ Page({
       //如果有购买活动
       item1.promgoodsbuynum = promgoodsbuynum;
-      //默认是包邮和优惠的
-      item1.is_order_yh=1;
-      item1.is_post_temp=1;
-
-      //如果是秒杀,团购的时候
-      if([1,2,3,6].indexOf(item1.prom_type)>-1){
-        var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
-            + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
-        await app.request.promiseGet(url,{}).then(res=>{
-          if(res.data.code==0){
-            console.log(res.data.data,"111");
-            item1.is_order_yh=res.data.data.is_order_yh;
-            item1.is_post_temp=res.data.data.is_post_temp;
-          }
-        })
-      }
-
       if(is_change){
         carr[i].collocationList=null;
       }
@@ -1415,6 +1398,23 @@ Page({
           }
         }
+        //默认是包邮和优惠的
+        item1.is_order_yh=1;
+        item1.is_post_temp=1;
+        //如果是秒杀,团购的时候,优惠促销和搭配购的时候
+        if([1,2,3,5,6].indexOf(item1.prom_type)>-1){
+          var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
+              + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
+          await app.request.promiseGet(url,{}).then(res=>{
+            if(res.data.code==0){
+              console.log(res.data.data,"111");
+              item1.is_order_yh=res.data.data.is_order_yh;
+              item1.is_post_temp=res.data.data.is_post_temp;
+            }
+          })
+        }
+
+
       }
@@ -2915,7 +2915,7 @@ Page({
         o_price += item[jc].goods_price * item[jc].goods_num;
         //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 ---
-        if( [1,2,3,6].indexOf(item[jc].prom_type)>-1){
+        if( [1,2,3,5,6].indexOf(item[jc].prom_type)>-1){
           var gd_price=item[jc].goods_price;
           if(item[jc].account_fir) gd_price=item[jc].account_fir;
+const w = require("../../../utils/wxParse/wxParse.js");
+var os=getApp().globalData.setting;
+var ut = require("../../../utils/util.js");
+Page({
+  data:{
+  },	
+
+  //调用视频接口
+  onLoad:function(e){
+	  var that = this;
+	  //-----------商家配置信息----- 等级卡规则，是否又开邀请码，营业员------------
+	  getApp().request.get("/api/weshop/storeconfig/get/" + os.stoid, {
+		  success: function (res) {
+			  var is_cardrule = res.data.data.cardrules;
+			  w.wxParse("content", "html", ut.format_content(is_cardrule), that, 6);
+		  }
+	  })
+  },
+
+  
+})
 \ No newline at end of file
+{
+    "navigationBarTitleText": "PLUS会员用户协议",
+    "enablePullDownRefresh": false
+}
 \ No newline at end of file
+<import src="../../../utils/wxParse/wxParse.wxml"></import>
+<view class="wxParse" style="padding:0 20rpx">
+	<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+</view>
 \ No newline at end of file
+@import "../../../utils/wxParse/wxParse.wxss";
 \ No newline at end of file
 var i = require("../../../utils/util.js")
+const ut = require("../../../utils/util.js");
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
@@ -108,6 +109,34 @@ Page({
           th.data.curpage++;
           var arr1 = th.data.wareCard;
           var arr2 = res.data.data.pageData;
+
+          for (let j = 0; j <arr2.length ; j++) {
+
+            var t_now = ut.gettimestamp();
+
+            //---获取日期的时间戳---
+            var t_endtime = arr2[j].endTime;
+            t_endtime = t_endtime.replace(/-/g, '/');
+            var t_date = new Date(t_endtime) / 1000;
+
+
+            var t_starttime = arr2[j].starTime;
+            t_starttime = t_starttime.replace(/-/g, '/');
+            var t_sdate = new Date(t_starttime) / 1000;
+
+            if (!arr2[j].iswarelbtype)
+              arr2[j].c_state=-2  //无核销商品
+            else if (arr2[j].goodsUseState)
+              arr2[j].c_state=1   //已核销
+            else if (t_date <= t_now)
+              arr2[j].c_state=2   //已过期
+            else if (t_sdate > t_now)
+              arr2[j].c_state=-1  //未开始
+            else
+              arr2[j].c_state=0   //正常
+          }
+
+
           var arr3 = [...arr1, ...arr2];
           var ismore = 0;
           if (arr3.length == res.data.data.total) ismore = 1
@@ -94,7 +94,11 @@
         </view>
       </view>
       <view wx:if="{{item.is_back !=1}}"  class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.orderSn}}">
-        <button>立即使用</button>
+          <button class="overdue" wx:if="{{item.c_state==-2}}">无核销商品</button>
+          <button class="overdue" wx:if="{{item.c_state==-1}}">兑换未开始</button>
+          <button wx:if="{{item.c_state==0}}">立即使用</button>
+          <button class="overdue" wx:if="{{item.c_state==1}}" >商品已核销</button>
+          <button class="overdue" wx:if="{{item.c_state==2}}">商品兑换时间已过</button>
       </view>
       <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view>
     </view>
@@ -178,12 +178,13 @@
 .content_box_button button {
   display: inline-block;
-  width: 160rpx;
+  min-width: 160rpx;
   height: 50rpx;
   font-size: 25rpx;
   background: #d41c34;
   color: #fff;
   line-height: 50rpx;
+  padding: 0 8rpx;
 }
 .foot_box {
@@ -251,3 +252,16 @@ page {
 .After_all .end {
   margin: 0rpx 15rpx;
 }
+
+button{
+  border-radius: 8rpx !important; overflow: hidden;
+}
+
+.overdue{
+  background-color: rgb(153,153,153) !important;
+}
+
+
+button::after{
+  border: none;
+}
@@ -4697,6 +4697,12 @@ Page({
                                         gg = "规格" + gb;
                                         gb++;
                                       }
+
+                                      if (item.spec_img)
+                                        item.original_img = os.imghost + item.spec_img;
+                                      else
+                                        item.original_img = os.imghost + item.original_img;
+
                                       item.gg = gg;
                                       item.prom_id = item.prom_id;
                                       item.prom_type = 1;
@@ -200,6 +200,18 @@ Page({
 		if (e != undefined && e != null && e.mobile) {
+			if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) {
+				var now = ut.gettimestamp();
+				var str = e.card_expiredate.replace(/-/g, '/');;
+				var end = new Date(str);
+				end = Date.parse(end) / 1000;
+				if (now < end) {
+					this.puls_user();
+				}
+			}
+
+
+
 			if(this.data.has_rj==0){
 				var portrait_req = {
 					ApiName:'api.slimming.member.portrait',
@@ -1137,6 +1149,27 @@ Page({
 		});
 	},
+	//-----Plus会员获取-----------
+	puls_user: function() {
+		var th = this;
+		getApp().request.get("/api/weshop/plus/vip/mem/list", {
+			data: {
+				storeId: os.stoid,
+				userId: getApp().globalData.user_id,
+			},
+			success: function(su) {
+
+				if (su.data.code == 0) {
+					var cardname = su.data.data[0].MemCardName;
+					if(cardname.length>5) cardname=cardname.substring(0,5); //保留5个字
+					th.setData({
+						pulscardname: cardname
+					});
+				}
+			}
+		});
+	},
+
@@ -9,7 +9,16 @@
       <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
         <view class="flex-space-between  abs xc-user-frame">
           <view class="xc-user-left  flex" wx:if="{{userInfo}}">
-            <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+            <view style="position:relative;">
+              <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+              <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 }}">
+                <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax">
+                  <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                  <view>{{pulscardname}}</view>
+                </view>
+              </block>
+            </view>
+
             <view class="xc-uesr-name">
               <view class="flex ai-center">
                 <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
@@ -18,6 +27,9 @@
                 </view>
               </view>
+
+
+
               <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
                 <block wx:if="{{cz_val<full_cz_val}}">
                   {{" "}}
@@ -752,8 +752,30 @@ button::after {
 }
-
 .action .icon-guan {
   left: auto !important;
   right: 20rpx !important;
+}
+
+.plusMax {
+  background: linear-gradient(to bottom, #4c3217, #010100);
+  height: 40rpx;
+  border-radius: 20rpx;
+  line-height: 40rpx;
+  padding-left: 15rpx;
+  padding-right: 15rpx;
+  font-size: 20rpx;
+  position: absolute;
+	left: 50%;
+  bottom: -20rpx;
+  white-space: nowrap;
+  transform: translate(-50%, 0);
+  color: #fff;
+  
+}
+
+.fuls {
+  width: 25rpx;
+  height: 25rpx;
+  margin-right: 5rpx;
 }
 \ No newline at end of file
@@ -30,8 +30,10 @@ Page({
     open_yq: 0, //显示打开邀请码的弹窗
     by_index: null, //购买卡的下班
-    isyaoqingma: 0, //是否邀请码
-    is_salesman: 0, //是否营业员
+    isyaoqingma: 0, //是否显示邀请码
+    is_salesman: 0, //是否显示营业员
+    is_must_staff_yqma: 0, //是否必填
+
     inp_recommon: null, //输入的邀请码
     inp_serviceman: null, //输入的营业员
     is_fengxiang: 0, //是不是分享过来的
@@ -43,7 +45,8 @@ Page({
     is_select: false, //是否选择营业员过
     is_buy_card_id:"",//是否是链接直接过来购买的卡号id
-    is_fir_open:0 //防止多次打开
+    is_fir_open:0, //防止多次打开
+    check_py_val:0
   },
   swiperChange: function (e) {
@@ -112,6 +115,7 @@ Page({
           is_card_rule: is_cardrule,
           isyaoqingma: parseInt(swi_arr.isyaoqingma),
           is_salesman: parseInt(swi_arr.is_staffno),
+          is_must_staff_yqma: parseInt(swi_arr.is_must_staff_yqma),
           plus_bg_color: swi_arr.plus_bg_color,
         });
       }
@@ -438,6 +442,12 @@ Page({
       return false;
     }
+    //有显示弹出框，才要求要显示用户协议
+    if(!this.data.check_py_val  && (th.data.isyaoqingma || th.data.is_salesman) ){
+      ut.m_toast('请先同意PLUS会员用户协议')
+      return false;
+    }
+
     var item = th.data.is_plusCard[th.data.by_index];
     var req = {};
     req.cardId = item.CardId;
@@ -449,7 +459,7 @@ Page({
     } else {
       //---后台要求要输入邀请码---
       if (th.data.isyaoqingma) {
-        if (!th.data.inp_recommon) {
+        if (!th.data.inp_recommon && th.data.is_must_staff_yqma) {
           getApp().my_warnning("请输入邀请码", 0, th);
           return false;
         }
@@ -459,22 +469,26 @@ Page({
           getApp().my_warnning("邀请人不能填自已", 0, th);
           return false;
         }
-        req.recommon = th.data.inp_recommon
+        if(th.data.inp_recommon) req.recommon = th.data.inp_recommon
       }
       //--后台要求要输入营业员--
       if (th.data.is_salesman) {
-        if (!th.data.inp_serviceman) {
+        if (!th.data.inp_serviceman && th.data.is_must_staff_yqma) {
           getApp().my_warnning("请输入营业员", 0, th);
           th.setData({
             focus:true
           })
           return false;
         }
-        req.serviceman = th.data.inp_serviceman
+        if(th.data.inp_serviceman) req.serviceman = th.data.inp_serviceman
       }
     }
     req.storeId = os.stoid;
     req.userId = getApp().globalData.user_id;
+
+
+
+
     //--如果有邀请码，和营业员的情况下--
     if (req.recommon || req.serviceman) {
@@ -704,5 +718,21 @@ Page({
         })
       }
     }
+  },
+
+  //用户协议的同意的优化
+  handleCheckboxChange:function (){
+    console.log('this.data.checkboxValue ==> ' , this.data.checkboxValue);
+    this.setData({
+      // 点击之后进行取反
+      check_py_val : !this.data.check_py_val
+    })
+  },
+
+  //显示协议的内容
+  show_more_xy:function (){
+      getApp().goto("/packageG/pages/plus_agreement/plus_agreement");
   }
+
+
 })
 \ No newline at end of file
@@ -144,7 +144,7 @@
         <view class="flex ai_and enter_SalesClerk" wx:if="{{is_salesman}}">
           <image class="SalesClerk_image" src="{{url}}/miniapp/images/plus/Sales_Clerk.png"></image>
           <view class="SalesClerk">
-            <input bindinput="b_input" bindconfirm="buy_card" class="fs30" focus="{{focus}}" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
+            <input bindinput="b_input" bindconfirm="buy_card" class="fs30" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
           </view>
         </view>
         <!-- 确认购买 -->
@@ -153,6 +153,12 @@
             确认购买
           </view>
         </view>
+
+        <view style="padding-bottom:20rpx">
+          <checkbox id="check_py" class="m_checkbox"  checked="{{check_py_val}}"  bindtap="handleCheckboxChange" />
+             <label for="check_py" style="color:#333;font-size:23rpx">请详细阅读并同意 <text catchtap="show_more_xy" style="color:#ff9278">《PLUS会员用户协议》</text> </label>
+        </view>
+
       </view>
     </view>
@@ -384,7 +384,8 @@ swiper {
   height: 50rpx;
   border-radius: 25rpx;
   color: rgb(255, 255, 255);
-  margin: 55rpx 0rpx;
+  margin-top: 55rpx;
+  margin-bottom: 15rpx;
   background-position: center;background-repeat: no-repeat;background-size: cover
 }
@@ -423,4 +424,24 @@ swiper-item{
   left: -20%;
   top: -2rpx;
   border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
+}
+
+.m_checkbox .wx-checkbox-input {
+  border-radius: 50%;
+  width: 23rpx !important;
+  height: 23rpx !important;
+}
+
+.m_checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+  background: #c4192e;
+}
+.m_checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+  width: 20rpx; height: 22rpx;
+  line-height: 23rpx;
+  text-align: center;
+  font-size: 20rpx;
+  color: #fff;
+  background: transparent;
+  transform: translate(-50%, -50%) scale(1);
+  -webkit-transform: translate(-50%, -50%) scale(1);
 }
 \ No newline at end of file