收银完成

src/pages/manage/cashier/detail.vue

@@ -26,12 +26,25 @@
                 <!-- <div>{{ data.tradeNo }}</div> -->
             </div>
             <ul class="good-list">
-                <li class="item" v-for="item of data.orderItems" :key="item.id" :class="{invalid:item.status === 9}">
+                <li
+                    class="item"
+                    v-for="item of data.orderItems"
+                    :key="item.id"
+                    :class="{ invalid: item.status === 9 }"
+                >
                     <div class="name">{{ item.productName }}</div>
-                    <div class="num">
-                        <span class="refund" v-if="item.status === 9">已退货</span>
-                        {{ item.count }}
-                        </div>
+                    <div class="num" v-if="item.weighingGoods">
+                        <span class="refund" v-if="item.status === 9"
+                            >已退货</span
+                        >
+                        {{ item.count/100 }} kg
+                    </div>
+                    <div class="num" v-else>
+                        <span class="refund" v-if="item.status === 9"
+                            >已退货</span
+                        >
+                        x{{ item.count}}
+                    </div>
                 </li>
             </ul>
         </div>

src/pages/manage/cashier/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page shop-cart-page" :class="{ page_red: theme === 1 }">
         <div class="page__top">
-            <span class="quick-text" @click="addNumGood">无码商品</span>
+            <span class="quick-text" @click="addNumGood">{{viewWeighGood?'无码称重商品':'无码商品'}}</span>
             <span class="quick-text" @click="goCacheList">挂单列表</span>
             <div class="search">
                 <i class="iconfont icontubiao- search__icon"></i>

src/pages/manage/cashier/settlement.vue

@@ -418,8 +418,8 @@ export default {
                 return;
             }
             let sendData = {
-                totalAmount: parseInt(this.totalPrice * 100),
-                payAmount: parseInt(this.payAmount * 100),
+                totalAmount: Math.round(this.totalPrice * 100),
+                payAmount: Math.round(this.payAmount * 100),
                 discount: this.discount.show
                     ? Number(this.discount.ratio)
                     : 100, // 折扣
@@ -431,12 +431,12 @@ export default {
                     // 无码商品
                     sendData.orderItems.push({
                         count: item.isWeightGood
-                            ? parseInt(item.select_num * 1000)
+                            ? Math.round(item.select_num * 1000)
                             : item.select_num,
                         price: item.price,
                         weighingGoods: item.isWeightGood ? true : false,
                         weight: item.isWeightGood
-                            ? parseInt(item.select_num * 1000)
+                            ? Math.round(item.select_num * 1000)
                             : item.select_num,
                     });
                 } else {
@@ -444,11 +444,11 @@ export default {
                         productId: item.id,
                         skuId: item._sku ? item._sku.skuId : "",
                         count: item.isWeightGood
-                            ? parseInt(item.select_num * 1000)
+                            ? Math.round(item.select_num * 1000)
                             : item.select_num,
                         weighingGoods: item.isWeightGood ? true : false,
                         weight: item.isWeightGood
-                            ? parseInt(item.select_num * 1000)
+                            ? Math.round(item.select_num * 1000)
                             : item.select_num,
                     });
                 }
@@ -639,6 +639,7 @@ export default {
                 }
             }
             n = n.toFixed(2);
+            console.log(parseFloat(n));
             return parseFloat(n);
             // return 100;
         },
@@ -653,7 +654,6 @@ export default {
         // 收款金额
         payAmount() {
             let v = 0;
-            console.log(this.payType, this.curPayType);
             if (this.payType[this.curPayType]) {
                 v += Number(this.payType[this.curPayType]);
             }