Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/orderManage/modules/edit.vue

@@ -13,7 +13,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.defaultamount,2)}}</b></span></p>
       </div>
         <div class="flex-align-center">
-        <p style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -18,7 +18,7 @@
 <!--        <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>-->
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-        <p style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -12,7 +12,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.defaultamount,2)}}</b></span></p>
       </div>
       <div class="flex-align-center">
-        <p style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
+        <p v-if="freefreightamount" style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${tool.formatAmount(freefreightamount,2)}元免运费,当前还差${tool.formatAmount(freefreightamount - data.amount,2)}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">

src/SDrpManagement/shopCart/modules/total.vue

@@ -7,7 +7,7 @@
       <div class="prcieInfo">
         <p>共&nbsp;{{data.length}}&nbsp;件商品&emsp;总价 : <span class="price">¥&nbsp;{{tool.formatAmount(total,2)}}</span></p>
         <!-- <p class="text-grey">订单满{{freefreightamount}}元,免运费</p> -->
-        <p>{{total > freefreightamount ?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${+freefreightamount - +total}元`}}</p>
+        <p v-if="freefreightamount">{{total > freefreightamount ?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${+freefreightamount - +total}元`}}</p>
       </div>
       <div class="submitBtn" @click="confirmOrder">生成订单</div>
     </div>