显示更新

hdApp/src/admin/home/workbench.vue

@@ -384,14 +384,16 @@
                       <block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
                         <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
                           <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                            <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
                           </text>
                         </block>
                       </block>
                       <block v-else>
                         <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
                           <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                            满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                            <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
                           </text>
                         </block>
                       </block>

hdApp/src/pagesPurchase/order.vue

@@ -23,14 +23,16 @@
                     <block v-if="ghsInfo.cutStyle && ghsInfo.cutStyle == 1">
                       <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
                         <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
+                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                          <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount*100).toString().replace(/0/g,''):0}}折
                         </text>
                       </block>
                     </block>
                     <block v-else>
                       <block v-if="ghsInfo.meetNum>0 || ghsInfo.meetAmount>0">
                         <text style="color:red;font-weight:bold;" v-if="ghsInfo.cutAmount>0">
-                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text><text v-if="ghsInfo.meetAmount>0">{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
+                          满<text v-if="ghsInfo.meetNum>0">{{ghsInfo.meetNum?ghsInfo.meetNum:0}}扎</text>
+                          <text v-if="ghsInfo.meetAmount>0"><text v-if="ghsInfo.meetNum>0">和</text>{{ghsInfo.meetAmount?ghsInfo.meetAmount:0}}元</text>优惠{{ghsInfo.cutAmount?parseFloat(ghsInfo.cutAmount):0}}元
                         </text>
                       </block>
                     </block>