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

yvan.ni
2 parents d3ed7be1 a80d5376
Showing 4 changed files with 46 additions and 12 deletions
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/index/index/index.js
@@ -2977,7 +2977,7 @@ Page({
                 console.log("index.js wx.request CheckCallUser fail");
             },
             complete: function () {
-                this.setData({
+                th.setData({
                     submit:0,
                 })
             }
@@ -274,6 +274,7 @@
               </view>
             </view>
             <view class="goods-title">
+              <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
               <view class="goods-name elli">{{data.goods_name}}</view>
             </view>
             <view class="goods-num">
@@ -388,9 +389,11 @@
                 </view>
               </view>
             </block>
+
             <!-- 许程商品名字 -->
             <view wx:if="{{prom_type!=1 && prom_type!=2 }}">
               <view class="goods-title">
+                <image wx:if="{{data.commission > 0}}" style="width: 25rpx;height: 25rpx;margin-right: 6rpx;" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/addmoney.png"></image>
                 <view class="goods-name elli">{{data.goods_name}}</view>
               </view>
             </view>
@@ -1707,9 +1710,9 @@
 							</view>
 					</view>
 					<view class="pdt40">
-							<view class="pdb20">活动内容</view>
+							<view class="pdb20">活动内容：</view>
 							<view class="popup-content">
-									<text class="pdb10">{{prom_act.remark}}</text>
+									<text class="pdb10">{{prom_act.remark?prom_act.remark:'暂无'}}</text>
 							</view>
 					</view>
  
@@ -127,6 +127,8 @@ image {
 .goods-title {
 	display: flex;
 	justify-content: space-between;
+	align-items: center;
+	vertical-align: middle;
 	/* overflow: hidden; */
 	/* height: 108rpx; */
 }
@@ -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);
   },
+	
+