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

后端研发-苏泰源
2 parents 3cb582aa 17d30b8a
Showing 4 changed files with 10 additions and 4 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,
                 })
             }
@@ -4371,6 +4371,7 @@ Page({
     sendsm: function (func) {
         let th =this;
         var template_id = this.data.template_id;
+        getApp().globalData.no_clear=1;
         // //授权订阅
         wx.requestSubscribeMessage({
             tmplIds: [template_id],
@@ -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; */
 }
@@ -408,7 +408,7 @@ Page({
                       }
                     }
-                    Promise.all(promisies).then((values) => {
+                    Promise.all(promisies).then(() => {
                       var arr = new Array();
                       //--三个三个一组---
                       for (var i = 0; i < flash_data.length; i += 3) {