一些bug修改

seller/src/views/promotion/pintuan/newPintuan.vue

@@ -8,26 +8,14 @@
             活动名称将显示在对人拼团活动列表中，方便商家管理使用，最多输入25个字符
           </div>
         </FormItem>
-        <FormItem label="活动时间" prop="startTime">
+        <FormItem label="活动时间" prop="rangeTime">
           <DatePicker
-            type="datetime"
-            v-model="form.startTime"
+            type="datetimerange"
+            v-model="form.rangeTime"
             format="yyyy-MM-dd HH:mm:ss"
-            :options="options"
             placeholder="请选择"
-            clearable
-            style="width: 200px"
-          >
-          </DatePicker>
-          -
-          <DatePicker
-            type="datetime"
-            v-model="form.endTime"
-            format="yyyy-MM-dd HH:mm:ss"
             :options="options"
-            placeholder="请选择"
-            clearable
-            style="width: 200px"
+            style="width: 260px"
           >
           </DatePicker>
         </FormItem>
@@ -87,20 +75,6 @@
 import { savePintuan, editPintuan, getPintuanDetail } from "@/api/promotion";
 export default {
   data() {
-    const isLtEndDate = (rule, value, callback) => {
-      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
-        callback(new Error());
-      } else {
-        callback();
-      }
-    };
-    const isGtStartDate = (rule, value, callback) => {
-      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
-        callback(new Error());
-      } else {
-        callback();
-      }
-    };
     return {
       id: this.$route.query.id, // 拼团id
       form: {
@@ -131,33 +105,10 @@ export default {
             message: "限购数不合法",
           },
         ],
-        startTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择开始时间",
-          },
-          {
-            trigger: "change",
-            message: "开始时间要小于结束时间",
-            validator: isLtEndDate,
-          },
-        ],
-        endTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择结束时间",
-          },
-          {
-            trigger: "change",
-            message: "结束时间要大于开始时间",
-            validator: isGtStartDate,
-          },
-        ],
+        rangeTime: [{ required: true, message: "请选择活动时间" }],
       },
       submitLoading: false, // 添加或编辑提交状态
-      options: { // 不可选取的时间段
+      options: { // 不可选取时间
         disabledDate(date) {
           return date && date.valueOf() < Date.now() - 86400000;
         },
@@ -185,11 +136,12 @@ export default {
           this.submitLoading = true;
           let params = JSON.parse(JSON.stringify(this.form));
           params.startTime = this.$options.filters.unixToDate(
-            this.form.startTime / 1000
+            this.form.rangeTime[0] / 1000
           );
           params.endTime = this.$options.filters.unixToDate(
-            this.form.endTime / 1000
+            this.form.rangeTime[1] / 1000
           );
+          delete params.rangeTime
           if (!this.id) {
             // 添加 避免编辑后传入id等数据 记得删除
             delete params.id;
@@ -218,7 +170,10 @@ export default {
     getDetail() {
       getPintuanDetail(this.id).then((res) => {
         if (res.success) {
-          this.form = res.result;
+          const data = res.result;
+          data.rangeTime = [];
+          data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
+          this.form = data;
         }
       });
     },

seller/src/views/promotion/pintuan/pintuanGoods.vue

@@ -21,9 +21,6 @@
           <template slot-scope="{ row, index }" slot="price">
             <Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
           </template>
-          <template slot-scope="{ row }" slot="QRCode">
-            <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
-          </template>
           <template slot-scope="{ index }" slot="action">
             <Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
           </template>
@@ -107,11 +104,7 @@ export default {
             return h("div", [
               h(
                 "Tag",
-                {
-                  props: {
-                    color: color,
-                  },
-                },
+                {props: {color: color}},
                 text
               ),
             ]);
@@ -125,20 +118,17 @@ export default {
           key: "goodsName",
           minWidth: 120,
         },
-
         {
           title: "库存",
           key: "quantity",
           minWidth: 40,
         },
-
         {
           title: "拼团价格",
           key: "price",
           slot: "price",
           minWidth: 50,
         },
-
         {
           title: "操作",
           slot: "action",
@@ -188,23 +178,23 @@ export default {
         }
       });
     },
-    init() {
+    init() { // 初始化数据
       this.getDataList();
       this.getPintuanMsg();
     },
 
-    changePage(v) {
+    changePage(v) { // 分页 改变页数
       this.searchForm.pageNumber = v - 1;
       this.getDataList();
       this.clearSelectAll();
     },
 
-    changePageSize(v) {
+    changePageSize(v) { // 分页 改变每页数
       this.searchForm.pageSize = v;
       this.getDataList();
     },
 
-    handleSearch() {
+    handleSearch() { // 搜索
       this.searchForm.pageNumber = 0;
       this.searchForm.pageSize = 10;
       this.getDataList();
@@ -253,7 +243,7 @@ export default {
       // 删除商品
       this.goodsData.splice(index, 1);
     },
-    delAll() {
+    delAll() { // 批量删除商品
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
@@ -272,7 +262,7 @@ export default {
         },
       });
     },
-    selectedGoodsData(item) {
+    selectedGoodsData(item) { // 选择商品
       let ids = [];
       let list = [];
       this.goodsData.forEach((e) => {
@@ -295,7 +285,7 @@ export default {
       });
       this.goodsData.push(...list);
     },
-    openSkuList() {
+    openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
     },
   },