开单

ghsApp/src/admin/billing/affirm.vue

@@ -48,7 +48,7 @@
               <view class="describe-view">
                 共<text style="color:red;">{{ selectList.length }}种</text>，
                 <text v-if="Number(totalItemNum.big)>0">{{totalItemNum.big?parseFloat(totalItemNum.big):0}}扎</text>
-                <text v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>，{{ allCount.weight }}公斤，合计<text class="price">¥{{ allPrice }}</text>
+                <text v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>，{{ allCount.weight }}公斤，<text class="price">¥{{ allPrice }}</text>
               </view>
             </view>
             <view class="summary-bar">
@@ -100,6 +100,10 @@
             <view class="tui-title">客户</view>
             <view class="tui-input">{{ form.customName }}</view>
           </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
+            <view class="tui-title">打包费</view>
+            <input type="digit" placeholder="请填写打包费" v-model="form.packCost" placeholder-class="tui-placeholder"/>
+          </tui-list-cell>
 
 <block v-if="currentShop.pfLevel && currentShop.pfLevel == 1">
   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -129,11 +133,6 @@
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
-            <view class="tui-title">打包费</view>
-            <input type="digit" placeholder="请填写打包费" v-model="form.packCost" placeholder-class="tui-placeholder"/>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">付款方式</view>
             <button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
@@ -412,9 +411,12 @@ export default {
     finalPrice(){
       let totalPrice = this.allPrice.toFixed(2)
       let finalPrice = Number(totalPrice)
-      if(this.form.sendType == 2){
+      if(this.displaySendCost == true){
         finalPrice = Number(finalPrice) + Number(this.form.sendCost)
       }
+      if(this.displayPackCost == true){
+        finalPrice = Number(finalPrice) + Number(this.form.packCost)
+      }
       let currentPrice = parseFloat(finalPrice)
       this.modifyPrice = currentPrice 
       return currentPrice
@@ -725,10 +727,11 @@ export default {
           display: flex;
           align-items: center;
           color: #333;
-          font-size: 30upx;
+          font-size: 29upx;
           font-weight:bold;
           .price {
             margin-left:8upx;
+            color:red;
           }
         }
       }