diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4500241..ae3b02a 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2977,7 +2977,7 @@ Page({
console.log("index.js wx.request CheckCallUser fail");
},
complete: function () {
- this.setData({
+ th.setData({
submit:0,
})
}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 63acebd..e489293 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -274,6 +274,7 @@
+
{{data.goods_name}}
@@ -388,9 +389,11 @@
+
+
{{data.goods_name}}
@@ -1707,9 +1710,9 @@
- 活动内容
+ 活动内容:
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 9d08642..05f5f42 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -127,6 +127,8 @@ image {
.goods-title {
display: flex;
justify-content: space-between;
+ align-items: center;
+ vertical-align: middle;
/* overflow: hidden; */
/* height: 108rpx; */
}
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 7c4b123..9768921 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -382,19 +382,46 @@ Page({
flash_data.forEach(function (val, ind) {
if(val.user_price) val.price=val.user_price;
- if (val.start_time > nt) flash_data[ind].status = 0;
- else if (val.end_time > nt) flash_data[ind].status = 1;
- if (val.buy_num >= val.goods_num) flash_data[ind].status = 2;
+ if (val.start_time > nt) {
+ flash_data[ind].status = 0;
+ } else if (val.end_time > nt) {
+ flash_data[ind].status = 1;
+ }
+
+ if (val.buy_num >= val.goods_num){
+ flash_data[ind].status = 2;
+ }
});
- var arr = new Array();
- //--三个三个一组---
- for (var i = 0; i < flash_data.length; i += 3) {
- arr.push(flash_data.slice(i, i + 3));
+ var promisies = [];
+ for (const key in flash_data) {
+ if (Object.hasOwnProperty.call(flash_data, key)) {
+ const val = flash_data[key];
+ promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+ os.stoid + "/1/" + val.id,
+ {}
+ ).then(res => {
+ if (res.data.code == 0) {
+ if (res.data.data <= 0) flash_data[key].status = 2;
+ };
+ });
+ }
}
- th.setData({
- saleGoods: arr
+
+ Promise.all(promisies).then((values) => {
+ var arr = new Array();
+ //--三个三个一组---
+ for (var i = 0; i < flash_data.length; i += 3) {
+ arr.push(flash_data.slice(i, i + 3));
+ }
+
+ th.setData({
+ saleGoods: arr
+ });
});
+
+
+
}
});
@@ -1179,6 +1206,8 @@ Page({
var url=e.currentTarget.dataset.url;
getApp().goto(url);
},
+
+