wxd / MShopWeApp

Commit 5e0ad3c36ada9a557e40c8dab1c365ec3d57cb8c

Authored by season
2 parents ef57080b 90a9d285

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

Inline Side-by-side
Showing 18 changed files with 250 additions and 34 deletions
app.json
  View file @5e0ad3c
... ... @@ -242,7 +242,8 @@
242 242 "pages": [
243 243 "pages/store/index",
244 244 "pages/user/express/express",
245   - "pages/team/team_success/team_success"
  245 + "pages/team/team_success/team_success",
  246 + "pages/plus_agreement/plus_agreement"
246 247 ]
247 248 }
248 249 ],
... ...
packageA/pages/details_serviceCard/details_serviceCard.js
  View file @5e0ad3c
... ... @@ -654,6 +654,7 @@ Page({
654 654 // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购
655 655 let list = this.data.details.list;
656 656 var pt_act=null; //-- 拼团活动的优化 --
  657 + var presell=null; //-- 预售活动 --
657 658  
658 659 //秒杀活动和拼团活动要重新计算一下
659 660 for (const it of list) {
... ... @@ -896,6 +897,7 @@ Page({
896 897 flag = 0;
897 898 return false;
898 899 }
  900 + presell=act_data;
899 901 }
900 902 })
901 903  
... ... @@ -956,7 +958,13 @@ Page({
956 958 wx.redirectTo({
957 959 url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn
958 960 });
959   - }else{
  961 + }else if(presell && presell.presell_type==0){
  962 +
  963 + wx.redirectTo({
  964 + url: "/packageC/pages/presell/cart/cart?is_fwk=1&order_sn=" + order_sn
  965 + });
  966 + }
  967 + else{
960 968 wx.reLaunch({
961 969 url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
962 970 })
... ...
packageA/pages/details_serviceCard/details_serviceCard.wxml
  View file @5e0ad3c
... ... @@ -81,7 +81,7 @@
81 81 <!-- 底部按钮栏 -->
82 82 <view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
83 83 <!-- 待支付 -->
84   - <block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6 }}">
  84 + <block wx:if="{{details.pay_status == 0 && details.order_status==0 && details.prom_type!=6 }}">
85 85 <text class="btn btn-border" bindtap="cancle">取消订单</text>
86 86 <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
87 87 </block>
... ...
packageE/pages/cart/cart2/cart2.js
  View file @5e0ad3c
... ... @@ -963,23 +963,6 @@ Page({
963 963 //如果有购买活动
964 964 item1.promgoodsbuynum = promgoodsbuynum;
965 965  
966   - //默认是包邮和优惠的
967   - item1.is_order_yh=1;
968   - item1.is_post_temp=1;
969   -
970   - //如果是秒杀,团购的时候
971   - if([1,2,3,6].indexOf(item1.prom_type)>-1){
972   - var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
973   - + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
974   - await app.request.promiseGet(url,{}).then(res=>{
975   - if(res.data.code==0){
976   - console.log(res.data.data,"111");
977   - item1.is_order_yh=res.data.data.is_order_yh;
978   - item1.is_post_temp=res.data.data.is_post_temp;
979   - }
980   - })
981   - }
982   -
983 966 if(is_change){
984 967 carr[i].collocationList=null;
985 968 }
... ... @@ -1415,6 +1398,23 @@ Page({
1415 1398 }
1416 1399 }
1417 1400  
  1401 + //默认是包邮和优惠的
  1402 + item1.is_order_yh=1;
  1403 + item1.is_post_temp=1;
  1404 + //如果是秒杀,团购的时候,优惠促销和搭配购的时候
  1405 + if([1,2,3,5,6].indexOf(item1.prom_type)>-1){
  1406 + var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
  1407 + + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
  1408 + await app.request.promiseGet(url,{}).then(res=>{
  1409 + if(res.data.code==0){
  1410 + console.log(res.data.data,"111");
  1411 + item1.is_order_yh=res.data.data.is_order_yh;
  1412 + item1.is_post_temp=res.data.data.is_post_temp;
  1413 + }
  1414 + })
  1415 + }
  1416 +
  1417 +
1418 1418 }
1419 1419  
1420 1420  
... ... @@ -2915,7 +2915,7 @@ Page({
2915 2915 o_price += item[jc].goods_price * item[jc].goods_num;
2916 2916  
2917 2917 //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 ---
2918   - if( [1,2,3,6].indexOf(item[jc].prom_type)>-1){
  2918 + if( [1,2,3,5,6].indexOf(item[jc].prom_type)>-1){
2919 2919  
2920 2920 var gd_price=item[jc].goods_price;
2921 2921 if(item[jc].account_fir) gd_price=item[jc].account_fir;
... ...
packageG/pages/plus_agreement/plus_agreement.js 0 → 100644
  View file @5e0ad3c
  1 +const w = require("../../../utils/wxParse/wxParse.js");
  2 +var os=getApp().globalData.setting;
  3 +var ut = require("../../../utils/util.js");
  4 +Page({
  5 + data:{
  6 + },
  7 +
  8 + //调用视频接口
  9 + onLoad:function(e){
  10 + var that = this;
  11 + //-----------商家配置信息----- 等级卡规则，是否又开邀请码，营业员------------
  12 + getApp().request.get("/api/weshop/storeconfig/get/" + os.stoid, {
  13 + success: function (res) {
  14 + var is_cardrule = res.data.data.cardrules;
  15 + w.wxParse("content", "html", ut.format_content(is_cardrule), that, 6);
  16 + }
  17 + })
  18 + },
  19 +
  20 +
  21 +})
0 22 \ No newline at end of file
... ...
packageG/pages/plus_agreement/plus_agreement.json 0 → 100644
  View file @5e0ad3c
  1 +{
  2 + "navigationBarTitleText": "PLUS会员用户协议",
  3 + "enablePullDownRefresh": false
  4 +}
0 5 \ No newline at end of file
... ...
packageG/pages/plus_agreement/plus_agreement.wxml 0 → 100644
  View file @5e0ad3c
  1 +<import src="../../../utils/wxParse/wxParse.wxml"></import>
  2 +<view class="wxParse" style="padding:0 20rpx">
  3 + <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
  4 +</view>
0 5 \ No newline at end of file
... ...
packageG/pages/plus_agreement/plus_agreement.wxss 0 → 100644
  View file @5e0ad3c
  1 +@import "../../../utils/wxParse/wxParse.wxss";
0 2 \ No newline at end of file
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @5e0ad3c
1 1 var i = require("../../../utils/util.js")
  2 +const ut = require("../../../utils/util.js");
2 3 var e = getApp(),
3 4 a = e.globalData.setting,
4 5 os = a,
... ... @@ -108,6 +109,34 @@ Page({
108 109 th.data.curpage++;
109 110 var arr1 = th.data.wareCard;
110 111 var arr2 = res.data.data.pageData;
  112 +
  113 + for (let j = 0; j <arr2.length ; j++) {
  114 +
  115 + var t_now = ut.gettimestamp();
  116 +
  117 + //---获取日期的时间戳---
  118 + var t_endtime = arr2[j].endTime;
  119 + t_endtime = t_endtime.replace(/-/g, '/');
  120 + var t_date = new Date(t_endtime) / 1000;
  121 +
  122 +
  123 + var t_starttime = arr2[j].starTime;
  124 + t_starttime = t_starttime.replace(/-/g, '/');
  125 + var t_sdate = new Date(t_starttime) / 1000;
  126 +
  127 + if (!arr2[j].iswarelbtype)
  128 + arr2[j].c_state=-2 //无核销商品
  129 + else if (arr2[j].goodsUseState)
  130 + arr2[j].c_state=1 //已核销
  131 + else if (t_date <= t_now)
  132 + arr2[j].c_state=2 //已过期
  133 + else if (t_sdate > t_now)
  134 + arr2[j].c_state=-1 //未开始
  135 + else
  136 + arr2[j].c_state=0 //正常
  137 + }
  138 +
  139 +
111 140 var arr3 = [...arr1, ...arr2];
112 141 var ismore = 0;
113 142 if (arr3.length == res.data.data.total) ismore = 1
... ...
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @5e0ad3c
... ... @@ -94,7 +94,11 @@
94 94 </view>
95 95 </view>
96 96 <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}}">
97   - <button>立即使用</button>
  97 + <button class="overdue" wx:if="{{item.c_state==-2}}">无核销商品</button>
  98 + <button class="overdue" wx:if="{{item.c_state==-1}}">兑换未开始</button>
  99 + <button wx:if="{{item.c_state==0}}">立即使用</button>
  100 + <button class="overdue" wx:if="{{item.c_state==1}}" >商品已核销</button>
  101 + <button class="overdue" wx:if="{{item.c_state==2}}">商品兑换时间已过</button>
98 102 </view>
99 103 <view class="content_box_button" style="color:#b9b5b5;" wx:else>已退款</view>
100 104 </view>
... ...
pages/giftpack/mygiftpack/mygiftpack.wxss
  View file @5e0ad3c
... ... @@ -178,12 +178,13 @@
178 178  
179 179 .content_box_button button {
180 180 display: inline-block;
181   - width: 160rpx;
  181 + min-width: 160rpx;
182 182 height: 50rpx;
183 183 font-size: 25rpx;
184 184 background: #d41c34;
185 185 color: #fff;
186 186 line-height: 50rpx;
  187 + padding: 0 8rpx;
187 188 }
188 189  
189 190 .foot_box {
... ... @@ -251,3 +252,16 @@ page {
251 252 .After_all .end {
252 253 margin: 0rpx 15rpx;
253 254 }
  255 +
  256 +button{
  257 + border-radius: 8rpx !important; overflow: hidden;
  258 +}
  259 +
  260 +.overdue{
  261 + background-color: rgb(153,153,153) !important;
  262 +}
  263 +
  264 +
  265 +button::after{
  266 + border: none;
  267 +}
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @5e0ad3c
... ... @@ -4697,6 +4697,12 @@ Page({
4697 4697 gg = "规格" + gb;
4698 4698 gb++;
4699 4699 }
  4700 +
  4701 + if (item.spec_img)
  4702 + item.original_img = os.imghost + item.spec_img;
  4703 + else
  4704 + item.original_img = os.imghost + item.original_img;
  4705 +
4700 4706 item.gg = gg;
4701 4707 item.prom_id = item.prom_id;
4702 4708 item.prom_type = 1;
... ...
pages/user/index/index.js
  View file @5e0ad3c
... ... @@ -200,6 +200,18 @@ Page({
200 200 if (e != undefined && e != null && e.mobile) {
201 201  
202 202  
  203 + if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) {
  204 + var now = ut.gettimestamp();
  205 + var str = e.card_expiredate.replace(/-/g, '/');;
  206 + var end = new Date(str);
  207 + end = Date.parse(end) / 1000;
  208 + if (now < end) {
  209 + this.puls_user();
  210 + }
  211 + }
  212 +
  213 +
  214 +
203 215 if(this.data.has_rj==0){
204 216 var portrait_req = {
205 217 ApiName:'api.slimming.member.portrait',
... ... @@ -1137,6 +1149,27 @@ Page({
1137 1149 });
1138 1150 },
1139 1151  
  1152 + //-----Plus会员获取-----------
  1153 + puls_user: function() {
  1154 + var th = this;
  1155 + getApp().request.get("/api/weshop/plus/vip/mem/list", {
  1156 + data: {
  1157 + storeId: os.stoid,
  1158 + userId: getApp().globalData.user_id,
  1159 + },
  1160 + success: function(su) {
  1161 +
  1162 + if (su.data.code == 0) {
  1163 + var cardname = su.data.data[0].MemCardName;
  1164 + if(cardname.length>5) cardname=cardname.substring(0,5); //保留5个字
  1165 + th.setData({
  1166 + pulscardname: cardname
  1167 + });
  1168 + }
  1169 + }
  1170 + });
  1171 + },
  1172 +
1140 1173  
1141 1174  
1142 1175  
... ...
pages/user/index/index.wxml
  View file @5e0ad3c
... ... @@ -9,7 +9,16 @@
9 9 <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
10 10 <view class="flex-space-between abs xc-user-frame">
11 11 <view class="xc-user-left flex" wx:if="{{userInfo}}">
12   - <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
  12 + <view style="position:relative;">
  13 + <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
  14 + <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 }}">
  15 + <view data-url="/pages/user/plus/plus" catchtap="goto" class="flex-center plusMax">
  16 + <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
  17 + <view>{{pulscardname}}</view>
  18 + </view>
  19 + </block>
  20 + </view>
  21 +
13 22 <view class="xc-uesr-name">
14 23 <view class="flex ai-center">
15 24 <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
... ... @@ -18,6 +27,9 @@
18 27 </view>
19 28 </view>
20 29  
  30 +
  31 +
  32 +
21 33 <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
22 34 <block wx:if="{{cz_val<full_cz_val}}">
23 35 {{" "}}
... ...
pages/user/index/index.wxss
  View file @5e0ad3c
... ... @@ -752,8 +752,30 @@ button::after {
752 752 }
753 753  
754 754  
755   -
756 755 .action .icon-guan {
757 756 left: auto !important;
758 757 right: 20rpx !important;
  758 +}
  759 +
  760 +.plusMax {
  761 + background: linear-gradient(to bottom, #4c3217, #010100);
  762 + height: 40rpx;
  763 + border-radius: 20rpx;
  764 + line-height: 40rpx;
  765 + padding-left: 15rpx;
  766 + padding-right: 15rpx;
  767 + font-size: 20rpx;
  768 + position: absolute;
  769 + left: 50%;
  770 + bottom: -20rpx;
  771 + white-space: nowrap;
  772 + transform: translate(-50%, 0);
  773 + color: #fff;
  774 +
  775 +}
  776 +
  777 +.fuls {
  778 + width: 25rpx;
  779 + height: 25rpx;
  780 + margin-right: 5rpx;
759 781 }
760 782 \ No newline at end of file
... ...
pages/user/plus/plus.js
  View file @5e0ad3c
... ... @@ -30,8 +30,10 @@ Page({
30 30 open_yq: 0, //显示打开邀请码的弹窗
31 31 by_index: null, //购买卡的下班
32 32  
33   - isyaoqingma: 0, //是否邀请码
34   - is_salesman: 0, //是否营业员
  33 + isyaoqingma: 0, //是否显示邀请码
  34 + is_salesman: 0, //是否显示营业员
  35 + is_must_staff_yqma: 0, //是否必填
  36 +
35 37 inp_recommon: null, //输入的邀请码
36 38 inp_serviceman: null, //输入的营业员
37 39 is_fengxiang: 0, //是不是分享过来的
... ... @@ -43,7 +45,8 @@ Page({
43 45 is_select: false, //是否选择营业员过
44 46 is_buy_card_id:"",//是否是链接直接过来购买的卡号id
45 47  
46   - is_fir_open:0 //防止多次打开
  48 + is_fir_open:0, //防止多次打开
  49 + check_py_val:0
47 50  
48 51 },
49 52 swiperChange: function (e) {
... ... @@ -112,6 +115,7 @@ Page({
112 115 is_card_rule: is_cardrule,
113 116 isyaoqingma: parseInt(swi_arr.isyaoqingma),
114 117 is_salesman: parseInt(swi_arr.is_staffno),
  118 + is_must_staff_yqma: parseInt(swi_arr.is_must_staff_yqma),
115 119 plus_bg_color: swi_arr.plus_bg_color,
116 120 });
117 121 }
... ... @@ -438,6 +442,12 @@ Page({
438 442 return false;
439 443 }
440 444  
  445 + //有显示弹出框，才要求要显示用户协议
  446 + if(!this.data.check_py_val && (th.data.isyaoqingma || th.data.is_salesman) ){
  447 + ut.m_toast('请先同意PLUS会员用户协议')
  448 + return false;
  449 + }
  450 +
441 451 var item = th.data.is_plusCard[th.data.by_index];
442 452 var req = {};
443 453 req.cardId = item.CardId;
... ... @@ -449,7 +459,7 @@ Page({
449 459 } else {
450 460 //---后台要求要输入邀请码---
451 461 if (th.data.isyaoqingma) {
452   - if (!th.data.inp_recommon) {
  462 + if (!th.data.inp_recommon && th.data.is_must_staff_yqma) {
453 463 getApp().my_warnning("请输入邀请码", 0, th);
454 464 return false;
455 465 }
... ... @@ -459,22 +469,26 @@ Page({
459 469 getApp().my_warnning("邀请人不能填自已", 0, th);
460 470 return false;
461 471 }
462   - req.recommon = th.data.inp_recommon
  472 + if(th.data.inp_recommon) req.recommon = th.data.inp_recommon
463 473 }
464 474 //--后台要求要输入营业员--
465 475 if (th.data.is_salesman) {
466   - if (!th.data.inp_serviceman) {
  476 + if (!th.data.inp_serviceman && th.data.is_must_staff_yqma) {
467 477 getApp().my_warnning("请输入营业员", 0, th);
468 478 th.setData({
469 479 focus:true
470 480 })
471 481 return false;
472 482 }
473   - req.serviceman = th.data.inp_serviceman
  483 + if(th.data.inp_serviceman) req.serviceman = th.data.inp_serviceman
474 484 }
475 485 }
476 486 req.storeId = os.stoid;
477 487 req.userId = getApp().globalData.user_id;
  488 +
  489 +
  490 +
  491 +
478 492 //--如果有邀请码，和营业员的情况下--
479 493 if (req.recommon || req.serviceman) {
480 494  
... ... @@ -704,5 +718,21 @@ Page({
704 718 })
705 719 }
706 720 }
  721 + },
  722 +
  723 + //用户协议的同意的优化
  724 + handleCheckboxChange:function (){
  725 + console.log('this.data.checkboxValue ==> ' , this.data.checkboxValue);
  726 + this.setData({
  727 + // 点击之后进行取反
  728 + check_py_val : !this.data.check_py_val
  729 + })
  730 + },
  731 +
  732 + //显示协议的内容
  733 + show_more_xy:function (){
  734 + getApp().goto("/packageG/pages/plus_agreement/plus_agreement");
707 735 }
  736 +
  737 +
708 738 })
709 739 \ No newline at end of file
... ...
pages/user/plus/plus.wxml
  View file @5e0ad3c
... ... @@ -144,7 +144,7 @@
144 144 <view class="flex ai_and enter_SalesClerk" wx:if="{{is_salesman}}">
145 145 <image class="SalesClerk_image" src="{{url}}/miniapp/images/plus/Sales_Clerk.png"></image>
146 146 <view class="SalesClerk">
147   - <input bindinput="b_input" bindconfirm="buy_card" class="fs30" focus="{{focus}}" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
  147 + <input bindinput="b_input" bindconfirm="buy_card" class="fs30" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
148 148 </view>
149 149 </view>
150 150 <!-- 确认购买 -->
... ... @@ -153,6 +153,12 @@
153 153 确认购买
154 154 </view>
155 155 </view>
  156 +
  157 + <view style="padding-bottom:20rpx">
  158 + <checkbox id="check_py" class="m_checkbox" checked="{{check_py_val}}" bindtap="handleCheckboxChange" />
  159 + <label for="check_py" style="color:#333;font-size:23rpx">请详细阅读并同意 <text catchtap="show_more_xy" style="color:#ff9278">《PLUS会员用户协议》</text> </label>
  160 + </view>
  161 +
156 162 </view>
157 163 </view>
158 164  
... ...
pages/user/plus/plus.wxss
  View file @5e0ad3c
... ... @@ -384,7 +384,8 @@ swiper {
384 384 height: 50rpx;
385 385 border-radius: 25rpx;
386 386 color: rgb(255, 255, 255);
387   - margin: 55rpx 0rpx;
  387 + margin-top: 55rpx;
  388 + margin-bottom: 15rpx;
388 389 background-position: center;background-repeat: no-repeat;background-size: cover
389 390 }
390 391  
... ... @@ -423,4 +424,24 @@ swiper-item{
423 424 left: -20%;
424 425 top: -2rpx;
425 426 border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
  427 +}
  428 +
  429 +.m_checkbox .wx-checkbox-input {
  430 + border-radius: 50%;
  431 + width: 23rpx !important;
  432 + height: 23rpx !important;
  433 +}
  434 +
  435 +.m_checkbox .wx-checkbox-input.wx-checkbox-input-checked {
  436 + background: #c4192e;
  437 +}
  438 +.m_checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
  439 + width: 20rpx; height: 22rpx;
  440 + line-height: 23rpx;
  441 + text-align: center;
  442 + font-size: 20rpx;
  443 + color: #fff;
  444 + background: transparent;
  445 + transform: translate(-50%, -50%) scale(1);
  446 + -webkit-transform: translate(-50%, -50%) scale(1);
426 447 }
427 448 \ No newline at end of file
... ...