合并Master

buyer/src/api/common.js

@@ -33,7 +33,7 @@ export function sendSms (params) {
   });
 }
 /**
- * 发送短信验证码
+ * 获取logo图标
  */
 export function getLogo () {
   return request({

buyer/src/components/nav/GoodsClassNav.vue

@@ -95,7 +95,7 @@
 
       <!-- 其他筛选项 -->
       <template v-for="(tag, tagIndex) in tagsContent">
-        <div class="other" v-if="tag.show && tagIndex !== 0" :key="tagIndex">
+        <div class="other" v-if="tag.show && tagIndex !== 0" v-show="tagIndex < showTagCount" :key="tagIndex">
           <div>
             <strong>{{ tag.key }}：</strong>
           </div>
@@ -153,6 +153,7 @@
           </div>
         </div>
       </template>
+      <div @click="moreOptions" v-if="tagsContent.length>4" class="more-options">{{showTagCount===5?'更多筛选项':'收起筛选项'}}<Icon :type="showTagCount===5?'ios-arrow-down':'ios-arrow-up'" /></div>
     </div>
   </div>
 </template>
@@ -168,6 +169,7 @@ export default {
         first: {},
         second: {}
       },
+      showTagCount: 5, // 展示的搜索项数量
       multiple: false, // 多选
       tagsContent: [
         // 标签
@@ -369,6 +371,10 @@ export default {
           });
         }
       });
+    },
+    // 展示更多搜索项
+    moreOptions () {
+      this.showTagCount = this.showTagCount === 5 ? 100 : 5
     }
   },
   mounted () {
@@ -502,8 +508,8 @@ export default {
 /** 筛选主体 */
 .content {
   background: #fff;
-  border-top: 1px solid #999;
-  border-bottom: 1px solid #999;
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
   margin: 10px 0;
 }
 /** 品牌 start */
@@ -700,6 +706,13 @@ export default {
     }
   }
 }
+.more-options{
+  margin: 5px;
+  color: #2d8cf0;
+  font-size: 12px;
+  cursor: pointer;
+  text-align: right;
+}
 
 /** 其他筛选项  end */
 </style>

buyer/src/pages/couponCenter.vue

@@ -5,7 +5,7 @@
       <div>
         <div class="coupon-title">
           <router-link to="/">
-            <img src="../assets/images/logo.png" width="120" alt="">
+            <img src="../assets/images/logo1.png" width="120" alt="">
           </router-link>
           <p>领券中心</p>
           <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />

buyer/src/pages/home/enumeration.js

@@ -75,5 +75,9 @@ export const afterSaleStatusList = [
   {
     name: '完成售后',
     status: 'COMPLETE'
+  },
+  {
+    name: '等待平台退款',
+    status: 'WAIT_REFUND'
   }
 ]

buyer/src/pages/home/orderCenter/AfterSale.vue

@@ -235,6 +235,7 @@ export default {
         this.submitLoading = false
       })
     },
+    // 提交物流modal
     openModal (row) {
       console.log(row);
       this.singleOrder = row;

buyer/src/pages/home/orderCenter/AfterSaleDetail.vue

@@ -2,7 +2,7 @@
   <div class="order-detail">
     <card _Title="售后详情" :_Size="16"></card>
     <div class="order-card">
-      <h3>{{filterOrderStatus(afterSale.serviceStatus)}}</h3>
+      <h3>{{afterSale.serviceName}}</h3>
       <p class="global_color fontsize_18">{{ afterSale.orderStatusValue }}</p>
       <p>售后单号：{{ afterSale.sn }} &nbsp;&nbsp;&nbsp;订单号：{{afterSale.orderSn}}</p>
       <div style="color:#999;" class="operation-time">创建时间：{{afterSale.createTime}}</div>
@@ -31,8 +31,22 @@
       <h3 class="mb_10">服务单信息</h3>
       <table border="1" cellpadding='0' cellspacing="0">
         <tr>
-          <td>退款方式</td><td>{{afterSale.refundWay == 'ORIGINAL' ? '原路退回' : '账号退款'}}{{afterSale.applyRefundPrice | unitPrice('￥')}}</td>
+          <td>退款方式</td><td>{{afterSale.refundWay == 'ORIGINAL' ? '原路退回' : '账号退款'}}</td>
         </tr>
+        <tr>
+          <td>退款金额</td><td>{{afterSale.actualRefundPrice | unitPrice('￥')}}</td>
+        </tr>
+        <template v-if="afterSale.refundWay === 'OFFLINE'">
+          <tr>
+            <td>退款开户行</td><td>{{afterSale.bankDepositName}}</td>
+          </tr>
+          <tr>
+            <td>退款开户名</td><td>{{afterSale.bankAccountName}}</td>
+          </tr>
+          <tr>
+            <td>退款卡号</td><td>{{afterSale.bankAccountNumber}}</td>
+          </tr>
+        </template>
         <tr>
           <td>商品处理方式</td><td>{{afterSale.serviceType == 'RETURN_MONEY' ? '退款' : '退货'}}</td>
         </tr>
@@ -53,7 +67,7 @@
   </div>
 </template>
 <script>
-import { afterSaleDetail, afterSaleReason, afterSaleLog } from '@/api/member.js';
+import { afterSaleDetail, afterSaleLog } from '@/api/member.js';
 import { afterSaleStatusList } from '../enumeration.js'
 export default {
   name: 'aftersale-detail',
@@ -62,7 +76,6 @@ export default {
       afterSale: {}, // 售后详情数据
       logList: [], // 日志
       afterSaleStatusList // 售后状态列表
-
     };
   },
   methods: {
@@ -70,14 +83,7 @@ export default {
       afterSaleDetail(this.$route.query.sn).then(res => {
         if (res.success) {
           this.afterSale = res.result;
-
-          afterSaleReason(this.afterSale.serviceType).then(res => {
-            res.result.forEach(element => {
-              if (element.id === this.afterSale.reason) {
-                this.$set(this.afterSale, 'reason', element.reason)
-              }
-            });
-          })
+          this.afterSale.serviceName = this.filterOrderStatus(this.afterSale.serviceStatus)
         }
       })
     },
@@ -88,7 +94,7 @@ export default {
     },
     filterOrderStatus (status) { // 获取订单状态中文
       const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
-      return ob[0].name
+      if (ob.length) return ob[0].name
     },
     perviewImg (img) {
       window.open(img, '_blank')

buyer/src/vuex/store.js

@@ -12,7 +12,7 @@ export default new Vuex.Store({
     category: [], // 全部分类
     navList: [],
     cartNum: storage.getItem('cartNum') || 0,
-    logoImg: 'https://lili-system.oss-cn-beijing.aliyuncs.com/logo.png'
+    logoImg: require('@/assets/images/logo2.png')
   },
   getters,
   actions,

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

@@ -27,8 +27,9 @@
       </Row>
       <Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
         <template slot-scope="{ row }" slot="action">
-          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 5px" @click="edit(row)">编辑</Button>
+          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" :style="{'marginRight': row.promotionStatus !== 'CLOSE'?'5px':'0'}" @click="edit(row)">编辑</Button>
           <Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
+          <!-- <Button v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'" type="success" size="small" @click="open(row)">上架</Button> -->
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
@@ -257,6 +258,29 @@ export default {
     edit(v) {
       this.$router.push({ name: "add-coupon", query: { id: v.id } });
     },
+    // 开启优惠券
+    open(v) {
+      this.$Modal.confirm({
+        title: "确认",
+        content: "确认要上架此优惠券么?",
+        loading: true,
+        onOk: () => {
+          this.loading = false;
+          let params = {
+            couponIds: v.id,
+            promotionStatus: "START",
+          };
+          updateCouponStatus(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("上架成功");
+              this.clearSelectAll();
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
     // 下架优惠券
     remove(v) {
       this.$Modal.confirm({
@@ -280,6 +304,7 @@ export default {
         },
       });
     },
+
     // 批量下架
     delAll() {
       if (this.selectCount <= 0) {

seller/src/views/promotion/fullCut/newFullCut.vue

@@ -12,7 +12,7 @@
                 :disabled="form.promotionStatus != 'NEW'"
                 placeholder="活动名称"
                 clearable
-                style="width: 260px"
+                style="width: 280px"
               />
             </FormItem>
             <FormItem label="活动时间" prop="rangeTime">
@@ -23,7 +23,7 @@
                 format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择"
                 :options="options"
-                style="width: 320px"
+                style="width: 280px"
               >
               </DatePicker>
             </FormItem>
@@ -34,7 +34,7 @@
                 type="textarea"
                 :rows="4"
                 clearable
-                style="width: 260px"
+                style="width: 280px"
               />
             </FormItem>
           </div>
@@ -48,7 +48,7 @@
                 :disabled="form.promotionStatus != 'NEW'"
                 placeholder="优惠门槛"
                 clearable
-                style="width: 260px"
+                style="width: 280px"
               />
               <span class="describe">消费达到当前金额可以参与优惠</span>
             </FormItem>
@@ -77,7 +77,7 @@
                 v-model="form.fullMinus"
                 placeholder="优惠金额"
                 clearable
-                style="width: 260px"
+                style="width: 280px"
               />
             </FormItem>
             <FormItem
@@ -91,7 +91,7 @@
                 v-model="form.fullRate"
                 placeholder="优惠折扣"
                 clearable
-                style="width: 260px"
+                style="width: 280px"
               />
               <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
             </FormItem>
@@ -127,7 +127,7 @@
                 :remote-method="getCouponList"
                 placeholder="输入优惠券名称搜索"
                 :loading="couponLoading"
-                style="width: 260px"
+                style="width: 280px"
               >
                 <Option
                   v-for="item in couponList"
@@ -145,7 +145,7 @@
                 :remote-method="getGiftList"
                 placeholder="输入赠品名称搜索"
                 :loading="giftLoading"
-                style="width: 260px"
+                style="width: 280px"
               >
                 <Option
                   v-for="item in giftList"
@@ -161,7 +161,7 @@
                 v-model="form.point"
                 type="number"
                 :min="0"
-                style="width: 260px"
+                style="width: 280px"
               />
             </FormItem>
             <FormItem label="使用范围" prop="scopeType">