1.优化会员扫码充值订单状态查询

src/views/home/components/cartOperation.vue

@@ -203,13 +203,15 @@
     <el-dialog v-model="showPackModal" title="打包数量" @open="packModalOpen" width="350">
         <div class="dialog">
             <div class="el-popover__title content">
-                <el-form ref="packNumerFormRef" :model="packNumberForm" :rules="packNumberFormRules" label-width="60px"
+                <el-form ref="packNumerFormRef" :model="packNumberForm" :rules="packNumberFormRules" label-width="100px"
                     label-position="left">
-                    <el-form-item label="数量" prop="number">
-                        <el-input v-model="packNumberForm.number"
+                    <el-form-item :label="`数量（${packItem.unitName}）`" prop="number">
+                        <!-- <el-input v-model="packNumberForm.number"
                             :placeholder="`最多输入${+packItem.number}${packItem.unitName}`" @input="packNumberInput">
-                            <template #append>{{ packItem.unitName }}</template>
-                        </el-input>
+                            <template #append></template>
+                        </el-input> -->
+                        <el-input-number v-model="packNumberForm.number" :min="1"
+                            :max="+packItem.number"></el-input-number>
                     </el-form-item>
                 </el-form>
             </div>
@@ -347,12 +349,17 @@ async function returnOrderItemAjax(num = 1) {
 function packHandle() {
     let item = goodsStore.cartList[goodsStore.cartActiveIndex]
     if (item && item.id) {
-        if (item.number > 1) {
-            // 大于1时需要编辑
-            showPackModal.value = true
+        if (!item.pack_number || item.pack_number <= 0) {
+            if (item.number > 1) {
+                // 大于1时需要编辑
+                showPackModal.value = true
+            } else {
+                // 小于1时直接提交
+                goodsStore.operateCart({ ...item, pack_number: item.number }, 'edit')
+            }
         } else {
-            // 小于1时直接提交
-            goodsStore.operateCart({ ...item, pack_number: item.number }, 'edit')
+            // 取消打包
+            goodsStore.operateCart({ ...item, pack_number: 0 }, 'edit')
         }
     }
 }
@@ -576,14 +583,9 @@ function validatePackNumber(rule, value, callback) {
     }
 }
 
-function packNumberInput(e) {
-    setTimeout(() => {
-        packNumberForm.value.number = inputFilterFloat(e)
-    }, 50)
-}
-
 // modal打开时
 function packModalOpen() {
+    packNumberForm.value.number = 1
     packItem.value = goodsStore.cartList[goodsStore.cartActiveIndex]
 }
 
@@ -616,6 +618,10 @@ function packFormSubmit() {
         background-color: #efefef;
         border-radius: 6px;
 
+        &:active {
+            background-color: #d3d3d3;
+        }
+
         &.disabled {
 
             .t {