满减

ghsApp/src/admin/shop/add.vue

@@ -156,11 +156,11 @@
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title " style="color:#3385FF;">整单满</view>
-					<input v-model="form.meetNum" @focus="form.meetNum=''" placeholder-class="phcolor" class="tui-input" name="meetNum" placeholder="多少笔" type="digit" />
+					<view class="tui-title " style="color:#3385FF;">整单满扎数</view>
+					<input v-model="form.meetNum" @focus="form.meetNum=''" placeholder-class="phcolor" class="tui-input" name="meetNum" placeholder="多少扎" type="digit" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title " style="color:#3385FF;">整单满</view>
+					<view class="tui-title " style="color:#3385FF;">整单满金额</view>
 					<input v-model="form.meetAmount" @focus="form.meetAmount=''" placeholder-class="phcolor" class="tui-input" name="meetAmount" placeholder="多少钱" type="digit" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">

hdApp/src/admin/home/workbench.vue

@@ -153,7 +153,18 @@
             </view>
             <view class="text-group_7 flex-col justify-between" @click="enterShop(ghsInfo)">
               <text class="text_8">{{ghsInfo.name}}</text>
-              <text class="text_9"></text>
+              <text class="text_9">
+                <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                  <text style="color:red;font-weight:bold;">
+                    满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                  </text>
+                </block>
+                <block v-else>
+                  <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                    满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                  </text>
+                </block>
+              </text>
             </view>
           </view>
           <view class="box_4 flex-col"></view>

hdApp/src/pagesPurchase/order.vue

@@ -18,7 +18,18 @@
                 </view>
                 <view class="text-group_7 flex-col justify-between">
                   <text class="text_8">{{ghsInfo.name}}</text>
-                  <text class="text_9"></text>
+                  <text class="text_9">
+                    <block v-if="ghsInfo.meetNum && ghsInfo.meetNum>0 && ghsInfo.cutAmount>0">
+                      <text style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                      </text>
+                    </block>
+                    <block v-else>
+                      <text v-if="ghsInfo.meetAmount && ghsInfo.meetAmount>0 && ghsInfo.cutAmount>0" style="color:red;font-weight:bold;">
+                        满{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                      </text>
+                    </block>
+                  </text>
                 </view>
               </view>
               <view class="box_4 flex-col"></view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -209,15 +209,19 @@
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
             <div class="tui-title"><text v-if="detailInfo.discountType == 4">红包优惠</text><text v-else>优惠</text></div>
-            <div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.discountAmount)||0}}</div>
+            <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.discountAmount?parseFloat(detailInfo.discountAmount):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.tkPrice > 0">
             <div class="tui-title">订单金额</div>
-            <div class="detail-price_box" style="font-size: 28upx;">¥{{ parseFloat(detailInfo.orderPrice)||0}}</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.orderPrice?parseFloat(detailInfo.orderPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.tkPrice > 0">
             <div class="tui-title">退款金额</div>
-            <div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.tkPrice)||0}}</div>
+            <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.reachDiscountPrice > 0">
+            <div class="tui-title">满减优惠</div>
+            <div class="detail-price_box" style="font-size: 28upx;">-¥{{ detailInfo.reachDiscountPrice?parseFloat(detailInfo.reachDiscountPrice):0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title">实际金额</div>

hdApp/src/pagesPurchase/wechatPay.vue

@@ -11,7 +11,7 @@
         <view class="wait">待付款</view>
         <block>
           <div class="price" v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">
-            <span class="app-size-36 app-bold" style="text-decoration:line-through;">￥{{ parseFloat((Number(info.reachDiscountPrice)+Number(realPrice)).toFixed(2)) }}</span>
+            <span class="app-size-36 app-bold" style="text-decoration:line-through;color:#8a7f7f;">￥{{ parseFloat((Number(info.reachDiscountPrice)+Number(realPrice)).toFixed(2)) }}</span>
           </div>
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">满减优惠 ￥{{ parseFloat(info.reachDiscountPrice) }}</div>
           <div class="price">