diff --git a/components/diy_store_select/diy_store_select.wxml b/components/diy_store_select/diy_store_select.wxml
index b56406c..2bcffc1 100644
--- a/components/diy_store_select/diy_store_select.wxml
+++ b/components/diy_store_select/diy_store_select.wxml
@@ -25,9 +25,9 @@
-
- {{choice_sort_store==0?'更多门店':'返回'}}
-
+
+ {{choice_sort_store==0?'更多门店':'返回'}}
+
diff --git a/packageA/pages/distribution/myteam/myteam.js b/packageA/pages/distribution/myteam/myteam.js
index a5f1b49..39bc012 100644
--- a/packageA/pages/distribution/myteam/myteam.js
+++ b/packageA/pages/distribution/myteam/myteam.js
@@ -8,7 +8,7 @@ Page({
* 页面的初始数据
*/
data: {
- tabArr: ['A级分销','B级分销','C级分销'],
+ tabArr: ['A级分销','B级分销'],//'分销'
currentTabIndex: 0, //记录当前点击的Tab索引
list: null,
diff --git a/packageA/pages/distribution/order/order.js b/packageA/pages/distribution/order/order.js
index 797fdd4..45b8fd4 100644
--- a/packageA/pages/distribution/order/order.js
+++ b/packageA/pages/distribution/order/order.js
@@ -10,7 +10,7 @@ Page({
data: {
tabArr: ['未付款','已付款','已完成'],
statusArr: ['未付款','已付款','等待分成(已收货)','已完成'],
- commisionArr: ['一级分成','二级分成','三级分成'],
+ commisionArr: ['一级分成','二级分成'],//,'分成'
currentTabIndex: 0, //记录当前点击的Tab索引
imghost: '',
status: 0,
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 9b55593..70b30e5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -55,10 +55,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店
@@ -229,10 +226,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店
(库存不足)
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index e3638ab..59a9bf2 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -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
+ });
+ },
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 6687e41..7beb3c3 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -106,10 +106,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店
(库存不足)
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js
index 6b3281e..55e611c 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.js
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js
@@ -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,
});
},
diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
index 0ecb734..1fe23a4 100644
--- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
+++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml
@@ -130,7 +130,7 @@
-
(库存不足)
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
index b57806c..e729d41 100644
--- a/pages/goods/goodsInfo/buy_integral_normal.wxml
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -42,10 +42,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店
(库存不足)
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 62168aa..662f1f3 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -63,10 +63,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店
(配送不匹配)
(库存不足)
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 05e6b00..bbe5d82 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -229,10 +229,7 @@
选择门店
-
- 更多门店
-
-
+ 更多门店