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

Fixbug zyw

See merge request !139

src/component/productListStyleOne/productListStyleOne.wxml

 <!--component/productListStyleOne/productListStyleOne.wxml-->
+<wxs src="../../wxs/utils.wxs" module="utils" />
+
 <view class="water-wrap">
     <view class="left">
       <block wx:for="{{imageData}}" wx:key="">
@@ -21,12 +23,12 @@
         <view class="pro-price-wrap">
           <view class="pro-plus-price">
             <text>￥</text>
-            <text class="plus-price">{{memberPrice ? memberPrice : (minSalePrice / 100)}}</text>
+            <text class="plus-price">{{memberPrice ? utils.numberFormat(memberPrice) : utils.numberFormat(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>
-            <text class="member-price">{{plusPrice / 100}}</text>
+            <text class="member-price">{{utils.numberFormat(plusPrice / 100)}}</text>
             <image mode="widthFix" src="/assets/imgs/7_1_0/plus-sm.png"></image>
           </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}}">
   <navigator hover-class="none" url="/pages/productDetail/productDetail?id={{menuSec.productId}}">
     <view class="hot-item border_box" >
@@ -20,7 +22,7 @@
               wx:if="{{item.memberPrice}}"
               />
             </view>
-            <text class="vip-sale-price border_box">￥{{item.memberPrice ? item.memberPrice : (item.minSalePrice / 100)}}</text>
+            <text class="vip-sale-price border_box">￥{{item.memberPrice ? utils.numberFormat(item.memberPrice) : 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}}">
@@ -34,7 +36,7 @@
               bindload=""
               />
             </view>
-            <text class="vip-plus-price vip-sale-price border_box">￥{{item.plusPrice / 100}}</text>
+            <text class="vip-plus-price vip-sale-price border_box">￥{{utils.numberFormat(item.plusPrice / 100)}}</text>
           </view>
         
           <view/>

src/component/skuPopup/skuPopup.wxml

 <!--component/skuPopup/skuPopup.wxml-->
+<wxs src="../../wxs/utils.wxs" module="utils" />
+
 <view class="popup-container{{show ? ' active' : ''}}" bindtap="hidePopup" />
 <view class="popup-content{{show ? ' active' : ''}}">
 	<image
@@ -11,7 +13,7 @@
 		<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>
+			<view class="price-text">￥{{utils.numberFormat(salePrice /100)}}</view>
 			<view class="stock-text">库存：{{skuStock}}</view>
 			<view class="sku-text">规格：
 				<block wx:for="{{skuText}}" wx:key="{{index}}">{{item}} </block>

src/pages/productDetail/productDetail.wxml

 <!--pages/productDetail/productDetail.wxml-->
 <import src="../../wxParser/index.wxml" />
+<wxs src="../../wxs/utils.wxs" module="utils" />
+
 <view
  class="page-product-detail product-container"
  bindtouchstart="pageTouchStart"
@@ -27,7 +29,7 @@
 		<view class="product-price">
 			<view class="price-wrap">
 				<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
-				<text class="price">￥{{productInfo.minSalePrice / 100}}</text>
+				<text class="price">￥{{utils.numberFormat(productInfo.minSalePrice / 100)}}</text>
 				<!-- <text class="cost-price">￥888</text> -->
 			</view>
 			<button
@@ -54,7 +56,7 @@
 		<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">￥{{productInfo.plusPrice ? (productInfo.plusPrice / 100) : (productInfo.minSalePrice / 100)
+				<text class="before-reduce-price">￥{{productInfo.plusPrice ? utils.numberFormat(productInfo.plusPrice / 100) : utils.numberFormat(productInfo.minSalePrice / 100)
         }}</text>
 				<!-- <text class="reduce-price">本次立减￥60</text> -->
 			</view>

src/subPackage/page/pages/friendShareList/friendShareList.wxml

+<wxs src="../../../../wxs/utils.wxs" module="utils" />
+
 <view class='page-friend-share'>
   <view class="swiper-image-wrap">
 		<!-- <buy-image-swiper  image-data="{{imageData}}"/>
@@ -28,7 +30,7 @@
 							<view class="prod-name">{{item.productName}}</view>
 							<!-- <view class="sale-btn">限时特价</view> -->
 							<view class="bottom-price">
-								<text class="price">￥{{item.minSalePrice}}</text>
+								<text class="price">￥{{utils.numberFormat(item.minSalePrice / 100)}}</text>
 								<!-- <text class="cost-price">￥456</text> -->
 								<view class="look-over">查看详情</view>
 							</view>

src/subPackage/page/pages/grassCommunity/grassCommunity.js

@@ -23,7 +23,8 @@ wxService.page({
     },
     video:'',
     pageNo:1,
-    pageSize:100
+    pageSize:100,
+    requesting: false
   },
 
   /**
@@ -254,6 +255,10 @@ wxService.page({
 
   // 发布笔记
   formSubmit(e){
+    console.log('requesting', this.data.requesting)
+    if (this.data.requesting){
+      return;
+    } 
     if (!this.data.params.sspList || this.data.params.sspList.length < 1) {
       wx.showToast({
         title: '请上传至少一张图片',
@@ -285,13 +290,22 @@ wxService.page({
         item.cover = 1;
       }
     });
+    this.setData({
+      requesting: true
+    })
 
     wxService.post(`/merchant/contentMobileTerminal/contentSave`, this.data.params).then(res => {
       const { result, data } = res.data
       if (result == 0) {
+        this.setData({
+          requesting: false
+        })
         wxService.router('/subPackage/page/pages/myRelease/myRelease')
       }
     }).finally(() => {
+      this.setData({
+        requesting: false
+      })
     })
   }
 

src/subPackage/page/pages/myInvite/myInvite.wxss

 /* subPackage/page/pages/myInvite/myInvite.wxss */
 @import './../../../../base/base.wxss';
+page{
+  padding-bottom: 80rpx;
+}
 
 .release-num {
   height: 120rpx;

src/subPackage/page/pages/myRelease/myRelease.wxss

@@ -14,16 +14,16 @@
 }
 .diy-banner {
   width: 712rpx;
-  height: 200rpx;
+  /* height: 200rpx; */
   border-radius: 17rpx;
   box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
   margin: 10rpx auto;
   text-align: center;
-  line-height: 200rpx;
+  /* line-height: 200rpx; */
 }
 .diy-banner image{
   width: 712rpx;
-  height: 200rpx;
+  /* height: 200rpx; */
   border-radius: 17rpx;
 }
 .num {