Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

src/component/productListStyleOne/productListStyleOne.wxml

@@ -19,10 +19,10 @@
           <view class="item-title">{{productName}}</view> 
         </view>
         <view class="pro-price-wrap">
-          <view class="pro-plus-price" wx:if="{{memberPrice}}">
+          <view class="pro-plus-price">
             <text>￥</text>
-            <text class="plus-price">{{memberPrice}}</text>
-            <image mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image>
+            <text class="plus-price">{{memberPrice ? memberPrice : (minSalePrice / 100)}}</text>
+            <image wx:if="{{memberPrice}}" mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image>
           </view>
           <view class="pro-member-price" wx:if="{{plusPrice}}">
             <text>￥</text>

src/component/productListStyleTwo/productListStyleTwo.wxml

@@ -8,7 +8,7 @@
         <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" wx:if="{{item.memberPrice}}">
+          <view class="item-vip-price weui-flex">
             <view class="" >
               <image
               class="item-vip"
@@ -17,10 +17,11 @@
               lazy-load="false"
               binderror=""
               bindload=""
+              wx:if="{{item.memberPrice}}"
               />
             </view>
-            <text class="vip-sale-price border_box">￥{{item.memberPrice}}</text>
-            <text class="vip-original-price">￥189</text>
+            <text class="vip-sale-price border_box">￥{{item.memberPrice ? item.memberPrice : (item.minSalePrice / 100)}}</text>
+            <!-- <text class="vip-original-price">￥189</text> -->
           </view>
           <view class="item-plus-price weui-flex" wx:if="{{item.plusPrice}}">
             <view class="">

src/component/skuPopup/skuPopup.js

@@ -107,6 +107,7 @@ Component({
     // this.setData({
     //   price
     // })
+
   },
 
   /**
@@ -123,6 +124,7 @@ Component({
     isOutStock: false, // 背景色
     clickDataStock: 0,
     salePrice:0,
+    picUrl:''
   },
 
   detached: function () {
@@ -262,11 +264,12 @@ Component({
       } else {
         return false
       }
+      console.log('........', clickData)
       // 有库存
       let btnText = '确定'
       let isOutStock = false
       // 没库存
-      if (!clickData.stock) {
+      if (!this.data.skuStock) {
         isOutStock = true
         btnText = "商品暂无库存" 
       }
@@ -312,6 +315,7 @@ Component({
           this.setData({
             skuStock: this.data.skuInfos[i].stock,
             salePrice: this.data.skuInfos[i].salePrice,
+            picUrl: this.data.skuInfos[i].picUrl,
             skuId: this.data.skuInfos[i].skuId
           })
         }
@@ -334,6 +338,7 @@ Component({
       var skuStock = 0
       var skuId = ''
       var salePrice = 0
+      var picUrl = ''
       var curSku = 0
       var curSkus = this.data.skuInfos.filter(function (item) {
         curSku = item
@@ -348,6 +353,7 @@ Component({
           skuStock = item.stock
           skuId = item.skuId
           salePrice = item.salePrice
+          picUrl = item.picUrl
         }
         console.log(flag)
         
@@ -371,7 +377,8 @@ Component({
         skuText: skuText,
         proNum: proNum,
         skuId: skuId,
-        salePrice: salePrice
+        salePrice: salePrice,
+        picUrl: picUrl
       }
       // if (!this.data.priceNoChange) {
       //   updateData.price = price// 拼团规格没有价格信息

src/component/skuPopup/skuPopup.wxml

@@ -7,9 +7,8 @@
 	 src="/images/close.png"
 	 bindtap="hidePopup"
 	/>
-
 	<view class="top-info clearfix">
-		<image mode="widthFix" src="{{curSku.sku_pic_url && curSku.sku_pic_url != 'undefined' ? (imageDomain + curSku.sku_pic_url) : indexImg}}" />
+		<image mode="widthFix" src="{{picUrl && picUrl != 'undefined' ? picUrl : indexImg}}" />
 		<view class="top-text">
 			<!-- <view class="price-text" wx:if="{{exchangePrice <= 0}}">￥{{price / 100}}</view> -->
 			<view class="price-text">￥{{salePrice /100}}</view>

src/pages/productDetail/productDetail.wxml

@@ -27,7 +27,7 @@
 		<view class="product-price">
 			<view class="price-wrap">
 				<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
-				<text class="price">￥{{productInfo.maxSalePrice / 100}}</text>
+				<text class="price">￥{{productInfo.minSalePrice / 100}}</text>
 				<!-- <text class="cost-price">￥888</text> -->
 			</view>
 			<button
@@ -54,8 +54,9 @@
 		<view class="member-price" wx:if="{{openPlusStatus}}">
 			<view class="member-price-info">
 				<image class="member-price-icon" src="/assets/imgs/7_1_0/plus.png" />
-				<text class="before-reduce-price">￥558,</text>
-				<text class="reduce-price">本次立减￥60</text>
+				<text class="before-reduce-price">￥{{productInfo.plusPrice ? (productInfo.plusPrice / 100) : (productInfo.minSalePrice / 100)
+        }}</text>
+				<!-- <text class="reduce-price">本次立减￥60</text> -->
 			</view>
 			<view class="open">
 				<text class="open-text">立即开通</text>
@@ -136,9 +137,8 @@
 					 bindsubmit="addCart"
 					 report-submit
 					 name='nav'
-					 wx:if="{{!fromZc}}"
 					>
-						<button class="cart-button get-formId--btn" formType="submit">加入购物车</button>
+						<button disabled="{{fromZc || productInfo.productStatus != 2}}" class="cart-button get-formId--btn  {{(fromZc || productInfo.productStatus != 2) ? 'btn-default' : 'btn-cart'}}" formType="submit">加入购物车</button>
 					</form>
 					<form
 					 class='get-formId get-formId--form'
@@ -146,7 +146,7 @@
 					 report-submit
 					 name='nav'
 					>
-						<button class="buy-button get-formId--btn" formType="submit">立即购买</button>
+						<button disabled="{{productInfo.productStatus != 2}}"  class="buy-button get-formId--btn {{productInfo.productStatus != 2 ? 'btn-default' : 'btn-buy'}}" formType="submit">立即购买</button>
 					</form>
 				</block>
 
@@ -159,7 +159,7 @@
  product-name="{{productInfo.productName}}"
  spec-item="{{productInfo.specItemList}}"
  good-type="{{productInfo.productType}}"
- index-img="{{productInfo.listUrls}}"
+ index-img="{{productInfo.indexUrl}}"
  sku-infos="{{productInfo.productSku}}"
  show="{{showSkuPopup}}"
  bind:skuselect="confirmClick"

src/pages/productDetail/productDetail.wxss

@@ -223,13 +223,18 @@ page{
   background: #cccccc; }
 
 .product-footer .footer-buttons button.cart-button {
-  background: rgba(203,60,60,0.71); 
   width: 240rpx;
   }
+.product-footer .footer-buttons button.btn-cart {
+  background: rgba(203,60,60,0.71); 
+  }
 
 .product-footer .footer-buttons button.buy-button {
-  background: #cb3c3c; 
   width: 214rpx;
+}
+
+.product-footer .footer-buttons button.btn-buy {
+  background: #cb3c3c; 
   }
 
 .product-footer .footer-buttons button::after {