Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into test

src/store/modules/api.js

@@ -19,7 +19,7 @@ const api = {
     // 文件上传
     fileUploadApi: baseUrl + '/api/localStorage',
     // 上传版本文件
-    versonUploadApi: baseUrl + '/api/uploadVersionFile',
+    versonUploadApi: baseUrl + '/api/qiNiuContent/uploadVersionFile',
     // baseUrl，
     baseApi: baseUrl
   }

src/views/product/add_shop.vue

@@ -103,8 +103,9 @@
         <el-table :data="form.skuList" border>
           <el-table-column label="售价" prop="salePrice">
             <template v-slot="scope">
-              <el-input-number @change="priceFormat(scope.row, 'salePrice')" @blur="priceFormat(scope.row, 'salePrice')"
-                v-model="scope.row.salePrice" controls-position="right"></el-input-number>
+              <el-input-number size="mini" @change="priceFormat(scope.row, 'salePrice')"
+                @blur="priceFormat(scope.row, 'salePrice')" v-model="scope.row.salePrice"
+                controls-position="right"></el-input-number>
             </template>
           </el-table-column>
           <el-table-column label="会员价" prop="memberPrice">
@@ -214,10 +215,9 @@
           </el-table-column>
           <el-table-column label="图片" prop="coverImg" width="80">
             <template v-slot="scope">
-              <uploadImg type="text" :limit="1" @success="res => (scope.row.coverImg = res[0])"
-                v-if="!scope.row.coverImg" />
+              <uploadImg v-if="!scope.row.coverImg" type="text" :limit="1" @success="res => (scope.row.coverImg = res[0])" />
               <el-image style="width:30px;height:30px;" :src="scope.row.coverImg" v-else />
-              <i class="el-icon-error " v-if="scope.row.coverImg" @click="scope.row.coverImg = ''"></i>
+              <i class="el-icon-error " v-if="scope.row.coverImg" @click="scope.row.coverImg = ''" />
             </template>
           </el-table-column>
           <el-table-column label="售价" prop="salePrice">
@@ -427,15 +427,15 @@ export default {
       selectSpec: [],
       selectSpecResult: false,
       defaultSku: {
-        salePrice: 0,
-        memberPrice: 0,
-        costPrice: 0,
-        originPrice: 0,
-        stockNumber: 0,
-        firstShared: 0,
+        salePrice: undefined,
+        memberPrice: undefined,
+        costPrice: undefined,
+        originPrice: undefined,
+        stockNumber: undefined,
+        firstShared: undefined,
         barCode: `${localStorage.getItem("shopId")}${dayjs().valueOf()}`,
         isGrounding: 1,
-        productId: this.$route.query.goods_id,
+        productId: this.$route.query.goods_id ? this.$route.query.goods_id : '',
         shopId: localStorage.getItem("shopId"),
         suit: 0
       },
@@ -690,8 +690,30 @@ export default {
         console.log(error);
       }
     },
+
     // 提交
     submitHandle() {
+      console.log(this.form.skuList)
+      const hasUndefined = this.form.skuList.some(obj => {
+        for (const key in obj) {
+          if (obj[key] === undefined) {
+            return true; // 如果找到undefined，立即停止搜索并返回true
+          }
+        }
+        return false; // 如果没有找到undefined，返回false
+      });
+      // 停止执行下面的数据
+      if (hasUndefined) {
+        this.$message({
+          message: '请完善规格属性的参数！',
+          type: 'warning'
+        });
+        return false;
+      }
+
+      this.imgList.forEach(ele => {
+        arr.push(ele.url)
+      })
       let arr = []
       this.imgList.forEach(ele => {
         arr.push(ele.url)

src/views/product/index.vue

@@ -52,6 +52,7 @@
         <el-table-column label="售价">
           <template v-slot="scope">
             <span>￥{{ scope.row.lowPrice }}</span>
+            <span v-if="scope.row.typeEnum == '多规格'">~￥{{ scope.row.maxPrice }}</span>
           </template>
         </el-table-column>
         <el-table-column label="商品规格" prop="typeEnum">

src/views/table/components/table-diancan.vue

@@ -250,7 +250,7 @@
                         type="success"
                         size="medium"
                         :disabled="!order.list.length"
-                        @click="toCreateOrder(false)"
+                        @click="toCreateOrderDebounce(false)"
                       >
                         仅下单
                       </el-button>
@@ -261,7 +261,7 @@
                     <el-button
                       size="medium"
                       :disabled="!order.list.length && !order.old.list.length"
-                      @click="toCreateOrder(true)"
+                      @click="toCreateOrderDebounce(true)"
                     >
                       去结账
                     </el-button>
@@ -373,14 +373,14 @@
 
             <div
               class="btn"
-              :class="{ disabled: !order.list.length ||key}"
+              :class="{ disabled: !order.list.length }"
               @click="saveOrder"
             >
               存单
             </div>
             <div
               class="btn relative"
-              :class="{ disabled: !prveOrder.list.length ||key}"
+              :class="{ disabled: !prveOrder.list.length }"
               @click="cacheOrderShow"
             >
               取单
@@ -1133,6 +1133,7 @@ export default {
       canUpdate: true,
       //下单
       createOrder: {
+        status: "",
         discount: 1,
         form: {},
         data: {},
@@ -1532,6 +1533,13 @@ export default {
       this.isCreateOrder = false;
     },
     //生成订单
+    toCreateOrderDebounce(isNowPay){
+      if(this.createOrder.status!=''&&this.createOrder.status!='success'){
+        return
+      }
+      this.createOrder.status='loading'
+      this.toCreateOrder(isNowPay)
+    },
     async toCreateOrder(isNowPay = false) {
       console.log(this.order)
       console.log(this.order.orderId)
@@ -1547,6 +1555,7 @@ export default {
       console.log(this.postPay);
       console.log(isNowPay);
       console.log(this.postPay && isNowPay);
+      this.createOrder.status='success'
       if (this.postPay && !isNowPay) {
         this.$notify({
           title: "下单成功",
@@ -1559,7 +1568,6 @@ export default {
         const { masterId } = await this.getMasterId();
         this.masterId = masterId;
       }
-
       this.isCreateOrder = true;
     },
 
@@ -2158,6 +2166,7 @@ export default {
       this.prveOrder.selIndex=-1
       this.order.old.selIndex = -1;
       this.isCreateOrder = false;
+      this.createOrder.status=""
       this.note.content = "";
       this.vipUser = { id: "" };
       this.allPack = false;
@@ -2175,10 +2184,10 @@ export default {
         masterId: this.masterId,
         tableId: this.table.tableId,
       });
+      this.order.list = res.records;
       if (this.key) {
-        this.order.old.list = res.records;
+        // this.order.old.list = res.records;
       } else {
-        this.order.list = res.records;
       }
       this.order.total = res.total;
     },