wxd / MShopWeApp

Commit c1462ef7cdce3584c28f6b2c55216c339644559b

Authored by 后端研发-苏明海
2 parents 6332c657 f551d054

Merge branch 'qa' into 'master' 

Qa

See merge request !866
Inline Side-by-side
Showing 13 changed files with 77 additions and 61 deletions
components/diy_store_select/diy_store_select.wxml
  View file @c1462ef
... ... @@ -25,9 +25,9 @@
25 25 <view>
26 26 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
27 27 </view>
28   - <view class="felx choose_more" bindtap="more_store">
29   - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
30   - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
  28 + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat}}">
  29 + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
  30 + <view class="bg_rights"></view>
31 31 </view>
32 32 </view>
33 33 </view>
... ...
packageA/pages/distribution/myteam/myteam.js
  View file @c1462ef
... ... @@ -8,7 +8,7 @@ Page({
8 8 * 页面的初始数据
9 9 */
10 10 data: {
11   - tabArr: ['A级分销','B级分销','C级分销'],
  11 + tabArr: ['A级分销','B级分销'],//'分销'
12 12 currentTabIndex: 0, //记录当前点击的Tab索引
13 13  
14 14 list: null,
... ...
packageA/pages/distribution/order/order.js
  View file @c1462ef
... ... @@ -10,7 +10,7 @@ Page({
10 10 data: {
11 11 tabArr: ['未付款','已付款','已完成'],
12 12 statusArr: ['未付款','已付款','等待分成(已收货)','已完成'],
13   - commisionArr: ['一级分成','二级分成','三级分成'],
  13 + commisionArr: ['一级分成','二级分成'],//,'分成'
14 14 currentTabIndex: 0, //记录当前点击的Tab索引
15 15 imghost: '',
16 16 status: 0,
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @c1462ef
... ... @@ -55,10 +55,7 @@
55 55 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
56 56 <view class="fs30" style="color:black;">选择门店</view>
57 57 </view>
58   - <view class="red_bb fs26">
59   - 更多门店
60   - <text class="bg_jj"></text>
61   - </view>
  58 + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
62 59 </view>
63 60  
64 61 <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
... ... @@ -229,10 +226,7 @@
229 226 <view class="fs30" style="color:black;">选择门店</view>
230 227 </view>
231 228  
232   - <view class="red-co fs28" bindtap="choice_store" >
233   - 更多门店
234   - <text class="right-arrow"></text>
235   - </view>
  229 + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
236 230 </view>
237 231 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
238 232 <block wx:else>
... ...
packageA/pages/prom_list/prom_list.js
  View file @c1462ef
... ... @@ -1721,7 +1721,15 @@ Page({
1721 1721 var gid=e.currentTarget.dataset.gid;
1722 1722 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
1723 1723 getApp().goto(url);
1724   - }
  1724 + },
  1725 +
  1726 + // 返回按钮
  1727 + returns: function () {
  1728 + this.setData({
  1729 + sort_store: 0,
  1730 + choice_sort_store: 0
  1731 + });
  1732 + },
1725 1733  
1726 1734  
1727 1735  
... ...
packageA/pages/prom_list/prom_list.wxml
  View file @c1462ef
... ... @@ -106,10 +106,7 @@
106 106 <view class="fs28 xc-ash-9f">选择门店</view>
107 107 </view>
108 108  
109   - <view class="red-co fs28" bindtap="choice_store" >
110   - 更多门店
111   - <text class="right-arrow"></text>
112   - </view>
  109 + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
113 110 </view>
114 111 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
115 112 <block wx:else>
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @c1462ef
... ... @@ -828,6 +828,10 @@ Page({
828 828 },
829 829  
830 830 start () {
  831 + // self.data.start = true;
  832 + if(this.data.start) return;
  833 + this.data.start = true;
  834 +
831 835 if(!this.data.luckInfo) {
832 836 wx.showToast({
833 837 title: this.data.msg,
... ... @@ -836,14 +840,21 @@ Page({
836 840 return;
837 841 };
838 842  
839   - if(self.data.luckInfo.msgInfo) {
  843 + if(this.data.luckInfo.msgInfo) {
840 844 wx.showToast({
841 845 title: self.data.luckInfo.msgInfo,
842 846 icon: 'none',
  847 + success: function() {
  848 + self.setData({
  849 + start: false
  850 + });
  851 + }
843 852 });
844 853 return;
845 854 };
846   -
  855 + wx.showLoading({
  856 + title: '抽奖中'
  857 + });
847 858 // 获取积分
848 859 app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', {
849 860 isShowLoading: false,
... ... @@ -856,10 +867,14 @@ Page({
856 867 .then(function(res) {
857 868 if(res.data.code == -1) {
858 869 //积分不足，弹出提示
  870 + wx.hideLoading();
859 871 self.data.luckInfo.msgInfo = res.data.msg
860 872 wx.showToast({
861 873 title: res.data.msg,
862 874 icon: 'none',
  875 + success: function() {
  876 + self.data.start = false;
  877 + }
863 878 });
864 879 return;
865 880 };
... ... @@ -869,13 +884,12 @@ Page({
869 884 if(self.data.luckInfo.user_LuckNumDay > 0 || self.data.luckInfo.vip_act_num == 0) {
870 885 // console.log('start choujiang');
871 886 // let start = false;
872   - if(!self.data.start) {
873   - self.data.start = true;
  887 + if(self.data.start) {
  888 + // self.data.start = true;
874 889 // 获取抽奖组件实例
875 890 const $lucky = self.selectComponent('#myLucky');
876 891 // 调用play方法开始旋转
877 892 $lucky.play();
878   -
879 893 // 获取抽奖结果
880 894 app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', {
881 895 isShowLoading: false,
... ... @@ -910,10 +924,15 @@ Page({
910 924 let random = Math.random() * indexArr.length >> 0;
911 925 // console.log('random', random);
912 926 let index = indexArr[random];
913   - setTimeout(() => {
914   - $lucky.stop(index);
915   - self.data.start = false;
916   - }, 3000);
  927 +
  928 + $lucky.stop(index);
  929 +
  930 + // setTimeout(() => {
  931 + // Promise.resolve($lucky.stop(index)).then(()=>{
  932 + // self.data.start = false;
  933 + // });
  934 +
  935 + // }, 2000);
917 936  
918 937  
919 938 //获取兑奖记录
... ... @@ -942,10 +961,12 @@ Page({
942 961 const index = thxIndexArr[random];
943 962 // console.log('谢谢参与数组', thxIndexArr);
944 963 // console.log('请求出错产生谢谢参与的随机数', index);
945   - setTimeout(() => {
946   - $lucky.stop(index);
947   - self.data.start = false;
948   - }, 3000);
  964 + $lucky.stop(index);
  965 + // setTimeout(() => {
  966 + // Promise.resolve($lucky.stop(index)).then(()=>{
  967 + // self.data.start = false;
  968 + // });
  969 + // }, 2000);
949 970  
950 971  
951 972  
... ... @@ -954,6 +975,11 @@ Page({
954 975 wx.showToast({
955 976 title: res.data.msg,
956 977 icon: 'none',
  978 + success: function() {
  979 + self.setData({
  980 + start: false
  981 + });
  982 + }
957 983 });
958 984 self.data.luckInfo.msgInfo = res.data.msg;
959 985 return;
... ... @@ -982,10 +1008,12 @@ Page({
982 1008 let thxIndexArr = self.data.thxIndexArr;
983 1009 const random = Math.random() * thxIndexArr.length >> 0;
984 1010 const index = thxIndexArr[random];
985   - setTimeout(() => {
986   - $lucky.stop(index);
987   - self.data.start = false;
988   - }, 3000);
  1011 + $lucky.stop(index);
  1012 + // setTimeout(() => {
  1013 + // Promise.resolve($lucky.stop(index)).then(()=>{
  1014 + // self.data.start = false;
  1015 + // });
  1016 + // }, 2000);
989 1017 },
990 1018  
991 1019  
... ... @@ -999,6 +1027,11 @@ Page({
999 1027 wx.showToast({
1000 1028 title: '你今天的抽奖次数已用完啦！~',
1001 1029 icon: 'none',
  1030 + success: function() {
  1031 + self.setData({
  1032 + start: false
  1033 + });
  1034 + }
1002 1035 });
1003 1036 };
1004 1037  
... ... @@ -1012,8 +1045,9 @@ Page({
1012 1045  
1013 1046 },
1014 1047 end (event) {
  1048 + wx.hideLoading();
1015 1049 // 中奖奖品详情
1016   - console.log('抽奖结果：',event.detail);
  1050 + // console.log('抽奖结果：',event.detail);
1017 1051 let no_luck_urltype = this.data.luckInfo.no_luck_urltype;
1018 1052 let lbtype = null;
1019 1053 // let good_id = null;
... ... @@ -1148,6 +1182,7 @@ Page({
1148 1182 showResult: false,
1149 1183 showMask: false,
1150 1184 hiddenCanvas: false,
  1185 + start: false,
1151 1186 });
1152 1187 },
1153 1188  
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @c1462ef
... ... @@ -130,7 +130,7 @@
130 130 <view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
131 131  
132 132 <!-- 弹窗 -->
133   -<view class="popup-container" wx:if="{{showPopup}}">
  133 +<view class="popup-container" wx:if="{{showPopup}}" catchtouchmove="true">
134 134 <scroll-view class="popup-list" scroll-y bindscrolltolower="loadmore">
135 135 <view class="popup-item" wx:for="{{list.pageData}}">
136 136 <view class="img-container">
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @c1462ef
... ... @@ -138,10 +138,7 @@
138 138 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
139 139 <view class="fs30" style="color:black;">选择门店</view>
140 140 </view>
141   - <view class="red_bb fs26">
142   - 更多门店
143   - <text class="bg_jj"></text>
144   - </view>
  141 + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
145 142 </view>
146 143 <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
147 144 <view class="flex-space-between address ai_end pdv10">
... ... @@ -583,10 +580,7 @@
583 580 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
584 581 <view class="fs30" style="color:black;">选择门店</view>
585 582 </view>
586   - <view class="red-co fs28" bindtap="choice_store">
587   - 更多门店
588   - <text class="right-arrow"></text>
589   - </view>
  583 + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
590 584 </view>
591 585 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
592 586 <block wx:else>
... ...
pages/goods/goodsInfo/buy_integral.wxml
  View file @c1462ef
... ... @@ -40,10 +40,7 @@
40 40 <view class="fs30" style="color:black;">选择门店</view>
41 41 </view>
42 42  
43   - <view class="red-co fs28" bindtap="choice_store" >
44   - 更多门店
45   - <text class="right-arrow"></text>
46   - </view>
  43 + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
47 44 </view>
48 45 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
49 46 <block wx:else>
... ...
pages/goods/goodsInfo/buy_integral_normal.wxml
  View file @c1462ef
... ... @@ -42,10 +42,7 @@
42 42 <view class="fs30" style="color:black;">选择门店</view>
43 43 </view>
44 44  
45   - <view class="red-co fs28" bindtap="choice_store" >
46   - 更多门店
47   - <text class="right-arrow"></text>
48   - </view>
  45 + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
49 46 </view>
50 47 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
51 48 <block wx:else>
... ...
pages/goods/goodsInfo/buy_pt.wxml
  View file @c1462ef
... ... @@ -63,10 +63,7 @@
63 63 <view class="fs28 xc-ash-9f">选择门店</view>
64 64 </view>
65 65  
66   - <view class="red-co fs28" bindtap="choice_store" >
67   - 更多门店
68   - <text class="right-arrow"></text>
69   - </view>
  66 + <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
70 67 </view>
71 68 <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
72 69 <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
... ...
pages/team/team_show/team_show.wxml
  View file @c1462ef
... ... @@ -229,10 +229,7 @@
229 229 <view class="fs28 xc-ash-9f">选择门店</view>
230 230 </view>
231 231  
232   - <view class="red-co fs28" bindtap="choice_store">
233   - 更多门店
234   - <text class="right-arrow"></text>
235   - </view>
  232 + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
236 233  
237 234  
238 235 </view>
... ...