From 1fe7c050a4aba194e5fbb74d54939583a7ab00ce Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 6 Aug 2021 09:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E5=95=86=E5=93=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=BB=E9=99=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/api/member.js                       | 15 ++++++-----
 .../pages/home/memberCenter/Distribution.vue  | 27 +++++++++----------
 buyer/src/router/index.js                     |  5 ++--
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/buyer/src/api/member.js b/buyer/src/api/member.js
index 9ecdbb50..e963eaa2 100644
--- a/buyer/src/api/member.js
+++ b/buyer/src/api/member.js
@@ -346,14 +346,16 @@ export function getDistGoodsList (params) {
 }
 
 /**
- * 选择分销商品
+ * 绑定、解绑分销商品
  * @param distributionGoodsId 分销商品id
+ * @param checked 分销商品id,true为绑定，false为解绑
  */
-export function selectDistGoods (distributionGoodsId) {
+export function selectDistGoods (params) {
   return request({
-    url: `/buyer/distributionGoods/checked/${distributionGoodsId}`,
+    url: `/buyer/distributionGoods/checked/${params.distributionGoodsId}`,
     method: Method.GET,
-    needToken: true
+    needToken: true,
+    params
   });
 }
 
@@ -457,7 +459,8 @@ export function memberMsgList (params) {
  * 设置消息为已读
  * @param {String} messageId 消息id
  */
- export function readMemberMsg (id) {
+
+export function readMemberMsg (id) {
   return request({
     url: `/buyer/member/message/${id}`,
     method: Method.PUT,
@@ -468,7 +471,7 @@ export function memberMsgList (params) {
  * 删除会员消息
  * @param {String} messageId 消息id
  */
- export function delMemberMsg (id) {
+export function delMemberMsg (id) {
   return request({
     url: `/buyer/member/message/${id}`,
     method: Method.DELETE,
diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
index 10443df1..7f7a61db 100644
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/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
diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js
index 339f47a6..e307f72b 100644
--- a/buyer/src/router/index.js
+++ b/buyer/src/router/index.js
@@ -259,13 +259,14 @@ export default new Router({
     {
       path: 'Favorites',
       name: 'Favorites',
-      component: Favorites
+      component: Favorites,
+      meta: {title: '我的收藏'}
     },
     {
       path: 'Distribution',
       name: 'Distribution',
       component: Distribution,
-      meta: {title: '我的投诉'}
+      meta: {title: '分销推荐'}
     },
     {
       path: 'Point',