Merge branch 'ma'

# Conflicts:
#	manager/src/config/index.js

seller/src/views/goods/goods-seller/draftGoods.vue

@@ -183,13 +183,14 @@ export default {
         {
           title: "商品价格",
           key: "price",
-          minWidth: 120
+          render: (h, params) => {
+            return h('div', this.$options.filters.unitPrice(params.row.price, '￥'))
+          }
         },
 
         {
           title: "商品库存",
           key: "quantity",
-          minWidth: 120
         },
         {
           title: "创建时间",
@@ -200,7 +201,7 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
-          width: 200,
+          width: 150,
           render: (h, params) => {
             return h("div", [
               h(

seller/src/views/home/home.vue

@@ -166,7 +166,7 @@
             <Icon class="icon" size="31" type="ios-card" />
           </div>
           <div>
-            <div class="counts">{{homeData.orderPrice ||0}}</div>
+            <div class="counts">{{homeData.orderPrice || 0 | unitPrice('￥')}}</div>
             <div>订单总额</div>
           </div>
 

seller/src/views/main-components/header.vue

@@ -2,7 +2,6 @@
   <div>
     <Row class="header">
       <img src="../../assets/lili.png" class="logo" width="220px">
-
     </Row>
   </div>
 </template>

seller/src/views/order/after-order/orderComplaintDetail.vue

@@ -173,7 +173,7 @@
                 </dt>
                 <dd>
                   <a>{{ complaintInfo.goodsName }}</a><br>
-                  <span>{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量)</span>
+                  <span>￥{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量)</span>
                 </dd>
               </dl>
 
@@ -201,7 +201,7 @@
                   订单金额
                 </dt>
                 <dd>
-                  {{ complaintInfo.orderPrice }}
+                  {{ complaintInfo.orderPrice | unitPrice('￥')}}
                 </dd>
               </dl>
 

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

@@ -90,26 +90,14 @@
                 style="width: 260px"
               />
             </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"
                 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"
+                style="width: 260px"
               >
               </DatePicker>
             </FormItem>
@@ -225,20 +213,7 @@ 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, // 判断是新增还是编辑优惠券 0 新增  1 编辑
       categoryId: 0, // 分类id
@@ -281,30 +256,7 @@ export default {
           { 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,
-          },
-        ],
+        rangeTime: [{ required: true, message: "请选择优惠券有效期" }],
         couponDiscount: [
           { required: true, message: "请输入折扣" },
           {
@@ -425,6 +377,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;
       });
     },
@@ -433,16 +387,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" &&
             (!params.promotionGoodsList ||

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");
     },
   },

seller/src/views/shop/ship/shipTemplate.vue

@@ -46,13 +46,13 @@
                     {{children.firstCompany}}
                   </td>
                   <td>
-                    <span class="yuan">￥</span><span class="integer">{{children.firstPrice}}</span>
+                    <span class="yuan">￥</span><span class="integer">{{children.firstPrice | unitPrice}}</span>
                   </td>
                   <td>
                     {{children.continuedCompany}}
                   </td>
                   <td class="bdr">
-                    <span class="yuan">￥</span><span class="integer">{{children.continuedPrice}}</span>
+                    <span class="yuan">￥</span><span class="integer">{{children.continuedPrice | unitPrice}}</span>
                   </td>
                 </tr>
               </tbody>

seller/src/views/statistics/order.vue

@@ -68,7 +68,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">退单金额</div>
-                  <div class="card-item-value">{{overViewList.refundOrderPrice || 0}}</div>
+                  <div class="card-item-value">{{overViewList.refundOrderPrice || 0 | unitPrice('￥')}}</div>
                 </div>
 
               </div>
@@ -333,9 +333,7 @@ export default {
           key: "applyRefundPrice",
           render: (h, params) => {
             return h(
-              "div",
-              "￥" +
-                (params.row.applyRefundPrice ? params.row.applyRefundPrice : 0)
+              "div", this.$options.filters.unitPrice(params.row.applyRefundPrice, '￥')
             );
           },
         },

seller/src/views/statistics/order/orderStatistics.vue

@@ -51,7 +51,7 @@
                 <span style="font-size: 14px;">总金额</span>
               </p>
               <p class="static-num">
-                {{ priceData.price | unitPrice }}
+                {{ priceData.price | unitPrice('￥') }}
               </p>
             </div>
           </div>