From 05d35c3974d692ce0d158d4608759c153dd55ed8 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 21 May 2021 17:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/build/webpack.base.conf.js              |  8 ++
 buyer/src/components/coupon/Coupon.vue        |  2 +-
 buyer/src/components/drawer/Drawer.vue        |  2 +-
 .../goodsDetail/ShowGoodsDetail.vue           |  4 +-
 buyer/src/components/header/Header.vue        | 28 +++----
 buyer/src/components/nav/GoodsClassNav.vue    | 38 +++++-----
 buyer/src/pages/Cart.vue                      |  2 +-
 buyer/src/pages/couponCenter.vue              |  2 +-
 buyer/src/pages/payment/Pay.vue               |  2 +-
 manager/src/config/index.js                   |  8 +-
 .../views/lili-dialog/template/marketing.vue  |  2 +-
 manager/src/views/promotion/coupon/coupon.vue |  2 -
 .../src/views/promotion/coupon/couponInfo.vue |  2 +-
 .../views/promotion/coupon/couponPublish.vue  | 66 +++++------------
 .../promotion/pointsGoods/editPointsGoods.vue |  2 +-
 manager/src/views/statistics/goods.vue        |  2 +-
 .../views/goods/goods-seller/draftGoods.vue   |  7 +-
 seller/src/views/home/home.vue                |  2 +-
 seller/src/views/main-components/header.vue   |  1 -
 .../after-order/orderComplaintDetail.vue      |  4 +-
 .../views/promotion/coupon/couponPublish.vue  | 74 ++++---------------
 .../views/promotion/pintuan/newPintuan.vue    | 71 ++++--------------
 .../views/promotion/pintuan/pintuanGoods.vue  | 26 ++-----
 seller/src/views/shop/ship/shipTemplate.vue   |  4 +-
 seller/src/views/statistics/order.vue         |  6 +-
 .../statistics/order/orderStatistics.vue      |  2 +-
 26 files changed, 120 insertions(+), 249 deletions(-)

diff --git a/buyer/build/webpack.base.conf.js b/buyer/build/webpack.base.conf.js
index 1642bb12..11e004fc 100644
--- a/buyer/build/webpack.base.conf.js
+++ b/buyer/build/webpack.base.conf.js
@@ -85,6 +85,14 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
+      },
+      {
+        test: /\.(cur)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('cur/[name].[hash:7].[ext]')
+        }
       }
     ]
   },
diff --git a/buyer/src/components/coupon/Coupon.vue b/buyer/src/components/coupon/Coupon.vue
index a54e8ead..bad97edc 100644
--- a/buyer/src/components/coupon/Coupon.vue
+++ b/buyer/src/components/coupon/Coupon.vue
@@ -6,7 +6,7 @@
         <div class="c-left">
           <div>
             <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
             <span class="describe">满{{item.consumeThreshold}}元可用</span>
           </div>
           <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
diff --git a/buyer/src/components/drawer/Drawer.vue b/buyer/src/components/drawer/Drawer.vue
index d9c3e9b8..54db455f 100644
--- a/buyer/src/components/drawer/Drawer.vue
+++ b/buyer/src/components/drawer/Drawer.vue
@@ -38,7 +38,7 @@
             <div class="c-left">
               <div>
                 <span v-if="coupon.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{coupon.price | unitPrice}}</span></span>
-                <span v-if="coupon.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{coupon.discount}}</span>折</span>
+                <span v-if="coupon.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{coupon.couponDiscount}}</span>折</span>
                 <span class="describe">满{{coupon.consumeThreshold}}元可用</span>
               </div>
               <p>使用范围：{{useScope(coupon.scopeType, coupon.storeName)}}</p>
diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index 99c878ae..30513434 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -56,8 +56,8 @@
                       <Rate disabled :value="Number(item.descriptionScore)" allow-half class="remarks-star"></Rate>
                     </p>
                     <p class="remarks-content">{{item.content}}</p>
-                    <div class="comment-img" v-if="item.image">
-                      <div v-for="(img, imgIndex) in item.image.split(',')"
+                    <div class="comment-img" v-if="item.images">
+                      <div v-for="(img, imgIndex) in item.images.split(',')"
                        @click="previewImg(img, item)"
                        :class="{borderColor:img === item.previewImg}"
                        :key="imgIndex">
diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index 79ef6eb0..0c621781 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -53,16 +53,19 @@
         </li>
         <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
         <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
-        <li v-if="$route.name !== 'Cart'" style="position:relative;" @mouseenter="getCartList">
+        <li v-if="$route.name !== 'Cart'" style="position:relative;" >
           <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
           <Dropdown placement="bottom-start">
-            <router-link to="cart" target="_blank">
-              <Icon
-                size="18"
-                class="cart-icon"
-                type="ios-cart-outline"
-              ></Icon>
-              购物车
+            <router-link to="cart" target="_blank" >
+              <span @mouseenter="getCartList">
+                <Icon
+                  size="18"
+                  class="cart-icon"
+                  type="ios-cart-outline"
+                ></Icon>
+                购物车
+              </span>
+              
             </router-link>
 
             <DropdownMenu slot="list">
@@ -115,7 +118,7 @@
 
 <script>
 import storage from '@/plugins/storage.js';
-import {cartGoodsAll, cartCount} from '@/api/cart.js'
+import {cartGoodsAll} from '@/api/cart.js'
 export default {
   name: 'M-Header',
   created () {
@@ -211,12 +214,11 @@ export default {
     },
     getCartList () { // 获取购物车列表
       if (this.userInfo.username) {
-        cartCount().then(res => {
-          this.$store.commit('SET_CARTNUM', res.result)
-          this.Cookies.setItem('cartNum', res.result)
-        })
+          
         cartGoodsAll().then(res => {
           this.shoppingCart = res.result.skuList
+          this.$store.commit('SET_CARTNUM', this.shoppingCart.length)
+          this.Cookies.setItem('cartNum', this.shoppingCart.length)
         })
       }
     }
diff --git a/buyer/src/components/nav/GoodsClassNav.vue b/buyer/src/components/nav/GoodsClassNav.vue
index b7bd5308..134de723 100644
--- a/buyer/src/components/nav/GoodsClassNav.vue
+++ b/buyer/src/components/nav/GoodsClassNav.vue
@@ -31,7 +31,7 @@
       <template v-else>
         <div style="font-size:14px">全部结果</div>
         <Icon type="ios-arrow-forward" />
-        <div>{{params.keyword}}</div>
+        <div style="font-weight:bold;" class="mr_10">“{{params.keyword}}”</div>
       </template>
       <!-- 所选分类 -->
       <a
@@ -41,8 +41,7 @@
         :key="index"
         :title="item.name"
       >
-        <span>{{ item.type }}：</span><span>{{ item.name }}</span
-        ><Icon type="md-close" />
+        <span>{{ item.type }}：</span><span>{{ item.name }}</span><Icon type="md-close" />
       </a>
     </div>
 
@@ -190,23 +189,21 @@ export default {
     selectedItem: {
       // 监听已选条件，来调用列表接口
       handler (val) {
+        console.log(val);
         let classification = [];
-        if (val.length) {
-          val.forEach((item) => {
-            if (item.type === '品牌') {
-              this.params.brandId = this.brandIds.join('@');
-            } else {
-              const nameArr = item.name.split('、');
-              nameArr.forEach((name) => {
-                classification.push(item.type + '_' + name);
-              });
-            }
-          });
-          this.params.prop = classification.join('@');
-        } else {
-          this.params.prop = ''
-          this.params.brandId = ''
-        }
+        this.params.brandId = ''
+        this.params.prop = ''
+        val.forEach((item) => {
+          if (item.type === '品牌') {
+            this.params.brandId = this.brandIds.join('@');
+          } else {
+            const nameArr = item.name.split('、');
+            nameArr.forEach((name) => {
+              classification.push(item.type + '_' + name);
+            });
+          }
+        });
+        this.params.prop = classification.join('@');
         this.getFilterList(this.params);
         this.$emit('getParams', this.params);
       },
@@ -251,7 +248,7 @@ export default {
         this.$set(this.tabBar, 'second', second)
       }
     },
-    cateClick (item, index) {
+    cateClick (item, index) {  // 点选分类
       switch (index) {
         case 1:
           this.$router.push({
@@ -299,7 +296,6 @@ export default {
 
           brands.forEach((val) => {
             if (val.name === item) this.brandIds.push(val.value);
-            console.log(this.brandIds);
           });
         }
       }
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index f7c056a2..fc7c3f0c 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -50,7 +50,7 @@
               <div v-if="couponAvailable === index">
                 <div class="coupon-item" v-for="(item, index) in shop.couponList" :key="index">
                   <span v-if="item.couponType === 'PRICE'">￥{{ item.price }}</span>
-                  <span v-if="item.couponType === 'DISCOUNT'">{{ item.discount }}折</span>
+                  <span v-if="item.couponType === 'DISCOUNT'">{{ item.couponDiscount }}折</span>
                   <span>满{{item.consumeThreshold}}元可用</span>
                   <Button class="coupon-btn" size="small" type="primary" @click="receiveShopCoupon(item)" :disabled="item.disabled">{{ item.disabled ? "已领取" : "领取" }}</Button>
                 </div>
diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue
index 3423f20a..3c71aa07 100644
--- a/buyer/src/pages/couponCenter.vue
+++ b/buyer/src/pages/couponCenter.vue
@@ -19,7 +19,7 @@
             <div class="c-left">
               <div>
                 <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
                 <span class="describe">满{{item.consumeThreshold}}元可用</span>
               </div>
               <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index e1b711f6..79dcbc9a 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -113,7 +113,7 @@
                         <div class="c-left">
                         <div>
                             <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-                            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
+                            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
                             <span class="describe">满{{item.consumeThreshold}}元可用</span>
                         </div>
                         <p>使用范围：{{useScope(item.scopeType)}}</p>
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 851ed1eb..266a2481 100644
--- a/manager/src/config/index.js
+++ b/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',
diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue
index 34dfc3cf..4b89cd6d 100644
--- a/manager/src/views/lili-dialog/template/marketing.vue
+++ b/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, '￥')
             );
           },
         },
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index 46bf3eae..18ee967b 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/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:
diff --git a/manager/src/views/promotion/coupon/couponInfo.vue b/manager/src/views/promotion/coupon/couponInfo.vue
index f183fa64..e1f75856 100644
--- a/manager/src/views/promotion/coupon/couponInfo.vue
+++ b/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>
diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue
index a58aee0e..cc017088 100644
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/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" &&
diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
index 6d9b13c4..d8646b58 100644
--- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
+++ b/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>
diff --git a/manager/src/views/statistics/goods.vue b/manager/src/views/statistics/goods.vue
index 09006c59..88d1c73a 100644
--- a/manager/src/views/statistics/goods.vue
+++ b/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, '￥')
             );
           },
         },
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index 5fe1e771..5b7e6b91 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/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(
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index dca6a50e..3511cd8e 100644
--- a/seller/src/views/home/home.vue
+++ b/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>
 
diff --git a/seller/src/views/main-components/header.vue b/seller/src/views/main-components/header.vue
index aabf3f79..e3727242 100644
--- a/seller/src/views/main-components/header.vue
+++ b/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>
diff --git a/seller/src/views/order/after-order/orderComplaintDetail.vue b/seller/src/views/order/after-order/orderComplaintDetail.vue
index 1d45b900..c59c4d34 100644
--- a/seller/src/views/order/after-order/orderComplaintDetail.vue
+++ b/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>
 
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 013b3424..9d3d5cb9 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/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 ||
diff --git a/seller/src/views/promotion/pintuan/newPintuan.vue b/seller/src/views/promotion/pintuan/newPintuan.vue
index 96e580ff..ad8e3dbe 100644
--- a/seller/src/views/promotion/pintuan/newPintuan.vue
+++ b/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;
         }
       });
     },
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index 8d2dcf0a..b523b5f8 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/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");
     },
   },
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index 47ca9744..e86405e8 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/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>
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 066deed2..64e96abb 100644
--- a/seller/src/views/statistics/order.vue
+++ b/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, '￥')
             );
           },
         },
diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue
index 884e6247..2330a69d 100644
--- a/seller/src/views/statistics/order/orderStatistics.vue
+++ b/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>