Merge branch 'mall_dev_7.5.0' into 'mall_dev_7.9.0'

Mall dev 7.5.0

See merge request !179

src/component/imageSwiper/imageSwiper.wxml

@@ -27,6 +27,7 @@
 					 id="swiperImg{{index}}"
 					 mode="widthFix"
 					 class="slide-image"
+           lazy-load
 					/>
 				</button>
 				<view wx:if="{{currentHasUserInfo}}">
@@ -43,6 +44,7 @@
 						 id="swiperImg{{index}}"
 						 mode="widthFix"
 						 class="slide-image"
+             lazy-load
 						/>
 					</view>
 				</view>
@@ -62,6 +64,7 @@
 					 id="swiperImg{{index}}"
 					 mode="widthFix"
 					 class="slide-image"
+           lazy-load
 					/>
 				</view>
 			</view>

src/component/picNav/picNav.wxml

@@ -29,6 +29,7 @@
 				 bindload="imageLoad"
 				 bindtap='preview'
          mode="widthFix"
+         lazy-load
 				/>
 			</button>
 
@@ -44,7 +45,7 @@
 			 bindload="imageLoad"
 			 bindtap='preview'
        mode="widthFix"
-
+       lazy-load="true"
 			/>
 		</view>
 		<view wx:else>
@@ -59,6 +60,7 @@
 			 bindload="imageLoad"
 			 bindtap='preview'
        mode="widthFix"
+       lazy-load
 			/>
 		</view> 
 	</view>

src/component/productListStyleOne/productListStyleOne.wxml

@@ -16,7 +16,7 @@
 <template name="water-list">
     <navigator hover-class="none" url="/pages/productDetail/productDetail?id={{productId}}">
       <view class="item">
-        <image class="item-img" src="{{indexUrl}}" mode="widthFix"></image>
+        <image class="item-img" src="{{indexUrl}}" mode="widthFix" lazy-load></image>
         <view class="item-title-box">
           <view class="item-title">{{productName}}</view> 
         </view>

src/component/productListStyleTwo/productListStyleTwo.wxml

 <!--component/productListStyleTwo/productListStyleTwo.wxml-->
 <wxs src="../../wxs/utils.wxs" module="utils" />
 
-<block wx:for="{{imageData}}" wx:key="{{index}}">
+<block wx:for="{{imageData}}" wx:key="*this">
   <navigator hover-class="none" url="/pages/productDetail/productDetail?id={{menuSec.productId}}">
     <view class="hot-item border_box" >
         <view class="hot-img-box">
-          <image class="hot-img" src="{{item.indexUrl}}" mode="widthFix" lazy-load="false" binderror="" bindload="" />
+          <image class="hot-img" src="{{item.indexUrl}}" mode="widthFix" lazy-load />
         </view>
         <view class="hot-item-desc border_box">
           <view class="item-name">{{item.productName}}</view>
          <!-- <view class="item-desc">{{item.productStatusDesc}}</view>-->
           <view class="item-vip-price weui-flex"> 
-            <text class="vip-sale-price border_box">￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}</text>
+            <text class="vip-sale-price border_box">
+            ￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}
+            </text>
             <view class="" >
               <image
               class="item-vip"
               src="./../../assets/imgs/7_1_0/vip.png"
               mode="widthFix"
-              lazy-load="false"
-              binderror=""
-              bindload=""
               wx:if="{{item.memberPrice}}"
               />
             </view>
@@ -33,12 +32,9 @@
               src="./../../assets/imgs/7_1_0/plus.png"
               mode="widthFix"
               lazy-load="false"
-              binderror=""
-              bindload=""
               />
             </view>
           </view>
-        
           <view/>
         </view>
     </view>

src/config/index.js

@@ -21,7 +21,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2015 花在花园
 //2016 阿吉豆
 //2017 ACTREE wx2aae34874e88cdf5
-const BRANCH_ID = 2006
+const BRANCH_ID = 3001
 const isMall = true
 
 // const needMock = '' //

src/pages/confirmOrder/confirmOrder.wxml

@@ -228,19 +228,22 @@
 			</view>
 		</view>
 
-		<view class="pro-footer">
+		<!-- <view class="pro-footer">
 			<view class="cost">
 				<text class="cost-label">实付款：</text>
 				<text class="cost-price">￥{{utils.numberFormat(orderPrice)}}</text>
 			</view>
-			<view class="theme-color buy-btn positionRe">
-        <!-- <button wx:if="{{!currentHasUserInfo}}" 
-        bindgetuserinfo="_getUserInfo" 
-        open-type='getUserInfo' 
-        class='positionAbs' ></button> -->
-				<button form-type="submit" style="display: inline;" class="theme-color buy-btn">立即购买</button>
+			<view class="theme-color buy-btn">
+				<button form-type="submit" class="theme-color">立即购买</button>
 			</view>
-		</view>
+		</view> -->
+    <view class="footer-btns">
+      <view class="order-price-info">
+        <text class="cost-label">实付款：</text>
+				<text class="cost-price">￥{{utils.numberFormat(orderPrice)}}</text>
+      </view>
+      <button form-type="submit" class="theme-color">立即购买</button>
+    </view>
 	</form>
 </view>
 <!--goHome-->

src/pages/confirmOrder/confirmOrder.wxss

@@ -215,18 +215,54 @@
   height: 88rpx;
   z-index: 2;
   background: #ffffff;
+  width: 100%;
   /* margin-top: 100rpx; */
 }
-.cost{
-  width: 497rpx;
+
+.footer-btns{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
   height: 88rpx;
-  line-height: 80rpx;
-  display: inline-block;
+  background: #ffffff;
+  z-index: 2;
+  display: flex;
+}
+
+.footer-btns .order-price-info{
+  flex: 1;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 40rpx;
   border-top: 1px solid rgba(151, 151, 151, 0.3);
-  text-align: right;
-  padding-right: 39rpx;
-  background-color: #ffffff;
 }
+
+.footer-btns button{
+  width: 100%;
+  height: 100%;
+  color: #ffffff;
+  flex: 0;
+  min-width: 214rpx;
+  max-width: 214rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 25rpx;
+  appearance: none;
+
+}
+
+.button-hover, .button-active{
+  background-color: #cb3c3c !important;
+}
+
+.footer-btns button:active{
+  opacity: 0.7;
+}
+
 .cost-label{
   font-size: 26rpx;
   color: #808080;
@@ -235,15 +271,7 @@
   color: #cb3c3c;
   font-size: 32rpx;
 }
-.buy-btn{
-  width: 214rpx;
-  height: 88rpx;
-  text-align: center;
-  line-height: 88rpx;
-  color: #ffffff;
-  display: inline-block;
-  font-size: 25rpx;
-}
+
 .vip-desc{
   font-size: 22rpx;
   color: #aaaaaa;

src/pages/coupons/coupons.js

@@ -74,7 +74,9 @@ wxService.page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad () {},
+  onLoad () {
+    wx.hideShareMenu();
+  },
   /**
    * 生命周期函数--监听页面显示
    */

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx40fec8944623c8b3",
+	"appid": "wx313ec36b710125d4",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []