Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !162

src/component/buyImageSwiper/buyImageSwiper.wxml

@@ -12,7 +12,7 @@
   >
     <block wx:for="{{imageData}}" wx:key="{{item}}">
       <swiper-item class="swiper-item">
-        <image src="{{item.url}}" wx:if="{{!item.videoUrl}}" data-appid="{{item.id}}" data-path="{{item.link.url}}" data-link="{{item.link}}"  data-item="{{item}}" bindtap='preview' class="slide-image" />
+        <image src="{{item.url}}" wx:if="{{!item.videoUrl}}" data-appid="{{item.id}}" data-path="{{item.link.url}}" data-link="{{item.link}}"  data-item="{{item}}" bindtap='preview' class="slide-image" mode="aspectFit"/>
         <video  class="slide-image" src="{{utils.formateUrl(item.videoUrl,baseImgUrl)}}" wx:if="{{item.videoUrl}}"  controls="true" autoplay="true"></video>
       </swiper-item>
     </block>

src/component/productListStyleOne/productListStyleOne.wxss

@@ -80,6 +80,6 @@
   margin-left: 13rpx;
 }
 .pro-member-price image{
-  width: 30rpx;
+  width: 51rpx;
   margin-left: 13rpx;
 }
\ No newline at end of file

src/component/productListStyleTwo/productListStyleTwo.wxml

@@ -11,6 +11,7 @@
           <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>
             <view class="" >
               <image
               class="item-vip"
@@ -22,10 +23,10 @@
               wx:if="{{item.memberPrice}}"
               />
             </view>
-            <text class="vip-sale-price border_box">￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}</text>
             <!-- <text class="vip-original-price">￥189</text> -->
           </view>
           <view class="item-plus-price weui-flex" wx:if="{{item.plusPrice}}">
+            <text class="vip-plus-price vip-sale-price border_box">￥{{utils.numberFormat(item.plusPrice / 100)}}</text>
             <view class="">
               <image
               class="item-plus"
@@ -36,7 +37,6 @@
               bindload=""
               />
             </view>
-            <text class="vip-plus-price vip-sale-price border_box">￥{{utils.numberFormat(item.plusPrice / 100)}}</text>
           </view>
         
           <view/>

src/component/productListStyleTwo/productListStyleTwo.wxss

@@ -61,7 +61,7 @@
   margin-top: 12rpx;
 }
 .vip-sale-price {
-  padding: 0 10rpx;
+  padding: 0 10rpx 0 0;
 }
 .vip-original-price {
 	width: 62rpx;

src/component/waterFlowLayout/waterFlowLayout.wxss

@@ -29,6 +29,7 @@
   align-items: center;
 }
 .item-img{
+  max-height: 480rpx;
   width: 100%;
   border-top-left-radius: 10rpx;
   border-top-right-radius: 10rpx;

src/pages/extendProduct/extendProduct.js

@@ -263,6 +263,7 @@ wxService.page({
 
   // 获取我的推广订单列表
   getMyExtendOrderList(pageNum, pageSize){
+    console.log('pageNum----', pageNum)
     wx.showLoading({
       title: '加载中',
       mask: true
@@ -276,7 +277,7 @@ wxService.page({
             wxService.getContentByContentType(item.tentacleContent)  
           })
           this.setData({
-            myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],
+            myExtendList: pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],
             myTotalPages: data.totalPages,
             noMoreFlag: data.content.length < pageSize ? true : false,
           }, () => {
@@ -366,6 +367,7 @@ wxService.page({
         })
       }
     }else{
+      console.log('11111111111', this.data.pageNum)
       if (this.data.pageNum < this.data.myTotalPages) {
         this.setData({
           pageNum: this.data.pageNum + 1,

src/pages/wantToBuyDetail/wantToBuyDetail.js

@@ -194,6 +194,9 @@ wxService.page({
 
   //获取内容下商品列表
   getProList(){
+
+
+    
     var params = {
       productIds: this.data.contentInfo.productIds
     }

src/subPackage/page/pages/categoryPro/categoryPro.json

 {
-  "navigationBarTitleText": "聚FUN",
+  "navigationBarTitleText": "商品列表",
   "usingComponents": {
     "product-list-style-one": "/component/productListStyleOne/productListStyleOne",
     "product-list-style-two": "/component/productListStyleTwo/productListStyleTwo",

src/subPackage/page/pages/myInvite/myInvite.js

@@ -54,7 +54,7 @@ wxService.page({
       const { result, data } = res.data
       if (result == 0) {
         this.setData({
-          isGoToInvite: data
+          isGoToInvite: data || ''
         })
       }
     }).finally(() => {
@@ -123,7 +123,7 @@ wxService.page({
         if (result == 0) {
           wx.hideLoading()
           this.setData({
-            inviteBanner: data.gradientAwardPage
+            inviteBanner: data && data.gradientAwardPage || ''
           }, () => {
           })
           // let now = new Date().getTime() 

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js

@@ -108,7 +108,7 @@ wxService.page({
 
   //跳转商品详情
   onTapToGoodsInfo(e) {
-    console.log(e)
+    console.log('0000',e)
     let item = e.currentTarget.dataset.item;
     let productId = e.currentTarget.dataset.productid;
     //组装一个临时触点信息对象到本地

src/subPackage/page/pages/orderBenefit/orderBenefit.js

@@ -70,7 +70,7 @@ wxService.page({
         if (result == 0) {
           wx.hideLoading()
           this.setData({
-            orderBenefitList: this.data.pageNum == 1 ? [...data.content] : [...this.data.orderBenefitList, ...data.content],
+            orderBenefitList: pageNum == 1 ? [...data.content] : [...this.data.orderBenefitList, ...data.content],
             totalPages: data.totalPages
           }, () => {
           })