Merge branch 'dev' into 'test'

Dev See merge request !864

Merge branch 'dev' into 'test'
Dev See merge request !864
后端研发-苏明海
2 parents 8732be92 8e31ab1b
Showing 13 changed files with 77 additions and 61 deletions
components/diy_store_select/diy_store_select.wxml
packageA/pages/distribution/myteam/myteam.js
packageA/pages/distribution/order/order.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/prom_list/prom_list.js
packageA/pages/prom_list/prom_list.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/buy_integral_normal.wxml
pages/goods/goodsInfo/buy_pt.wxml
pages/team/team_show/team_show.wxml
@@ -25,9 +25,9 @@
            <view>
               <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
            </view>
-           <view class="felx choose_more" bindtap="more_store">
-              <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
-              <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+           <view class="felx choose_more" bindtap="more_store"  wx:if="{{is_show_sto_cat}}">
+              <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+              <view class="bg_rights"></view>
            </view>
           </view>
        </view>
@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-		tabArr: ['A级分销','B级分销','C级分销'],
+		tabArr: ['A级分销','B级分销'],//'分销'
 		currentTabIndex: 0, //记录当前点击的Tab索引
 		list: null,
@@ -10,7 +10,7 @@ Page({
   data: {
 		tabArr: ['未付款','已付款','已完成'],
 		statusArr: ['未付款','已付款','等待分成(已收货)','已完成'],
-		commisionArr: ['一级分成','二级分成','三级分成'],
+		commisionArr: ['一级分成','二级分成'],//,'分成'
 		currentTabIndex: 0, //记录当前点击的Tab索引
 		imghost: '',
 		status: 0,
@@ -55,10 +55,7 @@
                       <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                       <view class="fs30" style="color:black;">选择门店</view>
                     </view>
-                    <view class="red_bb fs26">
-                         更多门店
-                         <text class="bg_jj"></text>
-                    </view>
+                    <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
                   </view>
                   <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
@@ -229,10 +226,7 @@
 	                      <view class="fs30" style="color:black;">选择门店</view>						  
 	                 </view>
-	                 <view class="red-co fs28" bindtap="choice_store" >
-	                    更多门店
-	                    <text class="right-arrow"></text>
-	                 </view>
+	                 <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
 	              </view>
 	   		   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 	   		   <block wx:else>
@@ -1721,7 +1721,15 @@ Page({
 		var gid=e.currentTarget.dataset.gid;
 		var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
 		getApp().goto(url);
-	}
+	},
+
+    // 返回按钮
+    returns: function () {
+        this.setData({
+            sort_store: 0,
+            choice_sort_store: 0
+        });
+    },
@@ -106,10 +106,7 @@
                         <view class="fs28 xc-ash-9f">选择门店</view>
                     </view>
-                    <view class="red-co fs28" bindtap="choice_store" >
-                        更多门店
-                        <text class="right-arrow"></text>
-                    </view>
+                    <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
                 </view>
                 <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
                 <block wx:else>
@@ -828,6 +828,10 @@ Page({
 	},
   start () {
+		// self.data.start = true;
+		if(this.data.start) return;
+		this.data.start = true;
+		
 		if(!this.data.luckInfo) {
 			wx.showToast({
 				title: this.data.msg,
@@ -836,14 +840,21 @@ Page({
 			return;
 		};
-		if(self.data.luckInfo.msgInfo) {
+		if(this.data.luckInfo.msgInfo) {
 			wx.showToast({
 				title: self.data.luckInfo.msgInfo,
 				icon: 'none',
+				success: function() {
+					self.setData({
+						start: false
+					});
+				}
 			});
 			return;
 		};
-		
+		wx.showLoading({
+			title: '抽奖中'
+		});
 		// 获取积分
 		app.request.promisePost('/api/weshop/marketing/marketingLuckForm/startLuckIntegral', {
 			isShowLoading: false,
@@ -856,10 +867,14 @@ Page({
 		.then(function(res) {
 			if(res.data.code == -1) {
 				//积分不足，弹出提示
+				wx.hideLoading();
 				self.data.luckInfo.msgInfo = res.data.msg
 				wx.showToast({
 					title: res.data.msg,
 					icon: 'none',
+					success: function() {
+						self.data.start = false;
+					}
 				});
 				return;
 			};
@@ -869,13 +884,12 @@ Page({
 				if(self.data.luckInfo.user_LuckNumDay > 0 || self.data.luckInfo.vip_act_num == 0) {
 					// console.log('start choujiang');
 					// let start = false;
-					if(!self.data.start) {
-						self.data.start = true;
+					if(self.data.start) {
+						// self.data.start = true;
 						// 获取抽奖组件实例
 						const $lucky = self.selectComponent('#myLucky');
 						// 调用play方法开始旋转
 						$lucky.play();
-						
 						// 获取抽奖结果
 						app.request.post('/api/weshop/marketing/marketingLuckForm/startLuck', {
 							isShowLoading: false,
@@ -910,10 +924,15 @@ Page({
 									let random = Math.random() * indexArr.length >> 0;
 									// console.log('random', random);
 									let index = indexArr[random];
-									setTimeout(() => {
-										$lucky.stop(index);
-										self.data.start = false;
-									}, 3000);
+									
+									$lucky.stop(index);
+
+									// setTimeout(() => {
+									// 	Promise.resolve($lucky.stop(index)).then(()=>{
+									// 			self.data.start = false;
+									// 	});
+									
+									// }, 2000);
 									//获取兑奖记录
@@ -942,10 +961,12 @@ Page({
 									const index = thxIndexArr[random];
 									// console.log('谢谢参与数组', thxIndexArr);
 									// console.log('请求出错产生谢谢参与的随机数', index);
-									setTimeout(() => {
-										$lucky.stop(index);
-										self.data.start = false;
-									}, 3000);
+									$lucky.stop(index);
+									// setTimeout(() => {
+									// 	Promise.resolve($lucky.stop(index)).then(()=>{
+									// 			self.data.start = false;
+									// 	});
+									// }, 2000);
@@ -954,6 +975,11 @@ Page({
 										wx.showToast({
 											title: res.data.msg,
 											icon: 'none',
+											success: function() {
+												self.setData({
+													start: false
+												});
+											}
 										});
 										self.data.luckInfo.msgInfo = res.data.msg;
 										return;
@@ -982,10 +1008,12 @@ Page({
 								let thxIndexArr = self.data.thxIndexArr;
 								const random = Math.random() * thxIndexArr.length >> 0;
 								const index = thxIndexArr[random];
-								setTimeout(() => {
-									$lucky.stop(index);
-									self.data.start = false;
-								}, 3000);
+								$lucky.stop(index);
+								// setTimeout(() => {
+								// 	Promise.resolve($lucky.stop(index)).then(()=>{
+								// 			self.data.start = false;
+								// 	});
+								// }, 2000);
 							},
@@ -999,6 +1027,11 @@ Page({
 					wx.showToast({
 						title: '你今天的抽奖次数已用完啦！~',
 						icon: 'none',
+						success: function() {
+							self.setData({
+								start: false
+							});
+						}
 					});
 				};
@@ -1012,8 +1045,9 @@ Page({
   },
   end (event) {
+		wx.hideLoading();
     // 中奖奖品详情
-    console.log('抽奖结果：',event.detail);
+    // console.log('抽奖结果：',event.detail);
 		let no_luck_urltype = this.data.luckInfo.no_luck_urltype;
 		let lbtype = null;
 		// let good_id = null;
@@ -1148,6 +1182,7 @@ Page({
 			showResult: false,
 			showMask: false,
 			hiddenCanvas: false,
+			start: false,
 		});
 	},
@@ -130,7 +130,7 @@
 <view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
 <!-- 弹窗 -->
-<view class="popup-container" wx:if="{{showPopup}}">
+<view class="popup-container" wx:if="{{showPopup}}" catchtouchmove="true">
 	<scroll-view class="popup-list" scroll-y bindscrolltolower="loadmore">
 		<view class="popup-item" wx:for="{{list.pageData}}">
 				<view class="img-container">
@@ -138,10 +138,7 @@
               <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
               <view class="fs30" style="color:black;">选择门店</view>
             </view>
-            <view class="red_bb fs26">
-              更多门店
-              <text class="bg_jj"></text>
-            </view>
+            <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
           </view>
           <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
             <view class="flex-space-between address ai_end pdv10">
@@ -583,10 +580,7 @@
             <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
             <view class="fs30" style="color:black;">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store">
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
         </view>
         <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
         <block wx:else>
@@ -40,10 +40,7 @@
 		                                 <view class="fs30" style="color:black;">选择门店</view>						  
 		                            </view>
-		                            <view class="red-co fs28" bindtap="choice_store" >
-		                               更多门店
-		                               <text class="right-arrow"></text>
-		                            </view>
+		                            <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
 		                         </view>
 		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 		      				   <block wx:else>
@@ -42,10 +42,7 @@
 		                                 <view class="fs30" style="color:black;">选择门店</view>						  
 		                            </view>
-		                            <view class="red-co fs28" bindtap="choice_store" >
-		                               更多门店
-		                               <text class="right-arrow"></text>
-		                            </view>
+		                            <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
 		                         </view>
 		      				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
 		      				   <block wx:else>
@@ -63,10 +63,7 @@
             <view class="fs28 xc-ash-9f">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store" >
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
@@ -229,10 +229,7 @@
 								<view class="fs28 xc-ash-9f">选择门店</view>
 					    </view>
-						<view class="red-co fs28" bindtap="choice_store">
-							更多门店
-							<text class="right-arrow"></text>
-						</view>		
+						<view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
 					</view>