Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/pages/home/memberCenter/Distribution.vue

@@ -47,7 +47,8 @@
                 <span> ￥{{ row.commission | unitPrice }}</span>
               </template>
               <template slot-scope="{ row }" slot="action">
-                <Button type="primary" size="small" style="margin-right: 5px" @click="fenxiao(row)">分销商品</Button>
+                <Button type="success" size="small" style="margin-right: 5px" @click="fenxiao(row)">分销商品</Button>
+                <Button type="error" size="small" @click="selectGoods(row.id, false)">取消选择</Button>
               </template>
             </Table>
             <div class="page-size">
@@ -74,7 +75,7 @@
                 <span> ￥{{ row.commission | unitPrice }}</span>
               </template>
               <template slot-scope="{ row }" slot="action">
-                <Button type="primary" size="small" style="margin-right: 5px" @click="selectGoods(row.id)">选择商品</Button>
+                <Button type="primary" size="small" style="margin-right: 5px" @click="selectGoods(row.id, true)">选择商品</Button>
               </template>
             </Table>
             <div class="page-size">
@@ -158,7 +159,7 @@
 </template>
 
 <script>
-import {distribution, applyDistribution, distCash, distCashHistory, getDistOrderList, getDistGoodsList, selectDistGoods} from '@/api/member.js'
+import {distribution, applyDistribution, distCash, distCashHistory, getDistGoodsList, selectDistGoods} from '@/api/member.js'
 import { IDCard } from '@/plugins/RegExp.js';
 import vueQr from 'vue-qr';
 export default {
@@ -187,7 +188,7 @@ export default {
         {title: '商品名称', slot: 'name', width: 400},
         {title: '商品价格', slot: 'price'},
         {title: '佣金', slot: 'commission'},
-        {title: '操作', slot: 'action', width: 120}
+        {title: '操作', slot: 'action', minWidth: 120}
       ],
       logColumns: [ // 日志表头
         {title: '编号', slot: 'sn'},
@@ -262,9 +263,6 @@ export default {
       } else if (tab === 'goodsUncheck') {
         this.params.checked = false
         this.getGoodsData()
-      } else if (tab === 'order') {
-        this.orderParams.pageNumber = 1
-        this.getOrderData()
       } else if (tab === 'log') {
         this.logParams.pageNumber = 1
         this.getLog()
@@ -278,10 +276,14 @@ export default {
       this.logParams.pageNumber = val;
       this.getLog()
     },
-    selectGoods (id) { // 选择商品
-      selectDistGoods(id).then(res => {
+    selectGoods (id, checked) { // 选择商品
+      let params = {
+        distributionGoodsId: id,
+        checked: checked
+      }
+      selectDistGoods(params).then(res => {
         if (res.success) {
-          this.$Message.success('分销商品选择成功，请在已选商品中查看')
+          this.$Message.success('操作成功！')
           this.getGoodsData()
         }
       })
@@ -296,11 +298,6 @@ export default {
         if (res.success) this.goodsData = res.result
       })
     },
-    getOrderData () { // 订单数据
-      getDistOrderList(this.orderParams).then(res => {
-        if (res.success) this.goodsData = res.result
-      })
-    },
     getLog () { // 提现历史
       distCashHistory(this.logParams).then(res => {
         if (res.success) this.logData = res.result

buyer/src/pages/home/memberCenter/Point.vue

@@ -8,7 +8,7 @@
     <h3>积分日志</h3>
     <Table :columns="logColumns" :data="logData.records">
       <template slot-scope="{ row }" slot="point">
-        <div><span>{{row.pointType == "INCREASE" ? '+' : '-'}}</span>{{ row.variablePoint }}</div>
+        <div :style="{color:row.pointType === 'INCREASE' ? 'green' : 'red'}"><span>{{row.pointType === "INCREASE" ? '+' : ''}}</span>{{ row.variablePoint }}</div>
       </template>
     </Table>
     <!-- 分页 -->

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

@@ -50,10 +50,12 @@
             </div>
             <div>
               <!-- 订单基础操作 -->
-              <Button @click="goDetail(order.sn)" size="small">售后详情</Button>
-              <Button @click="openModal(order)" v-if="order.serviceStatus == 'PASS' &&
-                  order.serviceType != 'RETURN_MONEY'" size="small">提交物流</Button>
-              <Button @click="cancel(order.sn)" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
+              <Button @click="goDetail(order.sn)" type="info" size="small">售后详情</Button>
+              <Button @click="openModal(order)"
+                v-if="order.serviceStatus == 'PASS' &&
+                order.serviceType != 'RETURN_MONEY'"
+                type="warning" size="small">提交物流</Button>
+              <Button @click="cancel(order.sn)" type="error" v-if="order.afterSaleAllowOperationVO.cancel" size="small">取消售后</Button>
             </div>
           </div>
         </div>

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

@@ -65,10 +65,10 @@
           </div>
           <div>
             <!-- 订单基础操作 -->
-            <Button @click="orderDetail(order.sn)" size="small">订单详情</Button>
-            <Button @click="handleCancelOrder(order.sn)" v-if="order.allowOperationVO.cancel" size="small">取消订单</Button>
-            <Button @click="goPay(order.sn)" size="small" v-if="order.allowOperationVO.pay">去支付</Button>
-            <Button @click="received(order.sn)" size="small" v-if="order.allowOperationVO.rog">确认收货</Button>
+            <Button @click="orderDetail(order.sn)" type="info" size="small">订单详情</Button>
+            <Button @click="handleCancelOrder(order.sn)" type="error" v-if="order.allowOperationVO.cancel" size="small">取消订单</Button>
+            <Button @click="goPay(order.sn)" size="small" type="success" v-if="order.allowOperationVO.pay">去支付</Button>
+            <Button @click="received(order.sn)" size="small" type="warning" v-if="order.allowOperationVO.rog">确认收货</Button>
             <!-- 售后 -->
             <Button v-if="order.groupAfterSaleStatus.includes('NOT_APPLIED')" @click="applyAfterSale(order.orderItems)" size="small">申请售后</Button>
           </div>

buyer/src/pages/home/userCenter/Coupons.vue

@@ -14,7 +14,7 @@
           <p>有效期：{{item.endTime}}</p>
         </div>
         <b></b>
-        <a class="c-right" @click="go(item)">立即使用</a>
+        <a class="c-right" :class="{'canot-use':params.memberCouponStatus !== 'NEW'}" @click="go(item)">立即使用</a>
         <i class="circle-top"></i>
         <i class="circle-bottom"></i>
       </li>
@@ -66,9 +66,12 @@ export default {
     // 切换优惠券状态
     change (index) {
       this.params.memberCouponStatus = this.statusList[index]
+      this.params.pageNumber = 1;
       this.getList()
     },
     go (item) { // 根据使用条件跳转商品列表页面
+      if (this.params.memberCouponStatus !== 'NEW') return;
+
       if (item.storeId !== 'platform') {
         this.$router.push({path: '/merchant', query: {id: item.storeId}})
       } else {
@@ -127,10 +130,15 @@ export default {
     width: 43px;
     font-size: 14px;
   }
+  .canot-use{
+    color: #999;
+    background-color: #eee;
+  }
   i {
     right: 34px;
   }
 }
+
 .pageration {
   text-align: right;
 }