一些bug修改

manager/src/config/index.js

@@ -17,10 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'http://192.168.0.103:8890/',
+    // common: 'http://192.168.0.103:8890/',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'http://192.168.0.103:8887'
+    common: 'https://common-api.pickmall.cn',
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
-    manager: 'http://192.168.0.103:8887'
+    manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

manager/src/views/lili-dialog/template/marketing.vue

@@ -147,7 +147,7 @@ export default {
               {
                 style: {},
               },
-              this.$options.filters.unitPrice(params.row.price)
+              this.$options.filters.unitPrice(params.row.price, '￥')
             );
           },
         },

manager/src/views/promotion/coupon/coupon.vue

@@ -174,7 +174,6 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
-          width: 100,
           render: (h, params) => {
             return h(
               "div", params.row.receivedNum + "/" + params.row.publishNum)
@@ -214,7 +213,6 @@ export default {
         },
         {
           title: "活动时间",
-          minWidth: 120,
           render: (h, params) => {
             return h("div", {
               domProps:

manager/src/views/promotion/coupon/couponInfo.vue

@@ -14,7 +14,7 @@
               }}</span>
             </FormItem>
             <FormItem label="面额">
-              <span class="goods-category-name"> ￥{{ form.price }}</span>
+              <span class="goods-category-name"> ￥{{ form.price | unitPrice }}</span>
             </FormItem>
             <FormItem label="活动说明">
               <span class="goods-category-name">{{ form.description }}</span>

manager/src/views/promotion/coupon/couponPublish.vue

@@ -49,11 +49,15 @@
             <FormItem label="领取限制" prop="couponLimitNum">
               <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
             </FormItem>
-            <FormItem label="有效期" prop="startTime">
-              <DatePicker type="datetime" v-model="form.startTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" 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">
+            <FormItem label="有效期" prop="rangeTime">
+              <DatePicker
+                type="datetimerange"
+                v-model="form.rangeTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                style="width: 260px"
+              >
               </DatePicker>
             </FormItem>
             <FormItem label="使用范围" prop="scopeType">
@@ -135,20 +139,6 @@ export default {
         callback();
       }
     };
-    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 {
       modalType: 0, // 是否编辑
       form: {
@@ -186,34 +176,11 @@ export default {
           { required: true, message: "请输入面额" },
           { validator: checkPrice },
         ],
+        rangeTime: [{ required: true, message: "请选择优惠券有效期" }],
         consumeThreshold: [
           { required: true, message: "请输入消费门槛" },
           { validator: checkWeight },
         ],
-        startTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择开始时间",
-          },
-          {
-            trigger: "change",
-            message: "开始时间要小于结束时间",
-            validator: isLtEndDate,
-          },
-        ],
-        endTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择结束时间",
-          },
-          {
-            trigger: "change",
-            message: "结束时间要大于开始时间",
-            validator: isGtStartDate,
-          },
-        ],
         couponDiscount: [
           { required: true, message: "请输入折扣" },
           {
@@ -337,6 +304,8 @@ export default {
           next(this.goodsCategoryList, []);
           data.scopeIdGoods = prevCascader;
         }
+        data.rangeTime = [];
+        data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
         this.form = data;
       });
     },
@@ -345,15 +314,14 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(this.form));
-          const strat = this.$options.filters.unixToDate(
-            this.form.startTime / 1000
+          params.startTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[0] / 1000
           );
-          const end = this.$options.filters.unixToDate(
-            this.form.endTime / 1000
+          params.endTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[1] / 1000
           );
+          delete params.rangeTime
           let scopeId = [];
-          params.startTime = strat;
-          params.endTime = end;
 
           if (
             params.scopeType == "PORTION_GOODS" &&

manager/src/views/promotion/pointsGoods/editPointsGoods.vue

@@ -15,7 +15,7 @@
               <div>{{ form.goodsSku.sellerName }}</div>
             </FormItem>
             <FormItem label="商品价格" prop="goodsPrice">
-              <div>{{ form.goodsSku.price }}</div>
+              <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
             </FormItem>
             <FormItem label="库存" prop="quantity">
               <div>{{ form.goodsSku.quantity }}</div>

manager/src/views/statistics/goods.vue

@@ -54,7 +54,7 @@ export default {
           render: (h, params) => {
             return h(
               "div",
-              this.$options.filters.unitPrice(params.row.price)
+              this.$options.filters.unitPrice(params.row.price, '￥')
             );
           },
         },