Merge branch 'feture-subcommission' into dev

# Conflicts:
#	request.js

pages/personCenter/commissionSetting/commissionSetting.js

@@ -17,6 +17,7 @@ Page({
     nowCommissionRate: 0,  // 现在的'抽成比例', 用于传给弹窗
     nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗
     nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗 
+    isSub: false, // 用于区分是项目抽佣页面还是单个用户抽佣页面
   },
 
   // 获取项目列表

pages/personCenter/commissionSetting/commissionSetting.wxml

@@ -82,4 +82,5 @@
   projectDetailName="{{  nowProjectDetailName }}"
   detailId="{{ projectId }}"
   maxCommissionRate="{{ maxCommissionRate }}"
+  isSub="{{ isSub }}"
 />

pages/personCenter/component/commissionRatePop/commissionRatePop.js

@@ -37,6 +37,10 @@ Component({
     maxCommissionRate: {  // 最大抽佣比例
       type: Number,
       value: 0
+    },
+    isSub: {
+      type: Boolean,
+      value: false
     }
   },
 
@@ -57,7 +61,10 @@ Component({
       const id = this.data.detailId;
       const Rate = this.data.commissionRate;
       const maxRate = this.data.maxCommissionRate;
-      // console.log('maxRate---->', maxRate);
+      const isSub = this.data.isSub;
+      console.log('id---->', id);
+      console.log('Rate--->',Rate);
+      console.log('isSub---->',isSub);
       if (Rate > maxRate || Rate < 0) {
         wx.showModal({
           title: '抽佣比率错误',
@@ -71,29 +78,56 @@ Component({
         mask: true
       })
       // 发送请求
-      wx.request({
+      if (isSub) {
-        url: baseUrl + '/projectCommission/update/rate',
+        wx.request({
-        method: 'POST',
+          url: baseUrl + '/projectCommission/update/sub/rate',
-        header: {
+          method: 'POST',
-          Authorization: wx.getStorageSync('token'),
+          header: {
-        },
+            Authorization: wx.getStorageSync('token'),
-        data: {
+          },
-          id: id,
+          data: {
-          currentCommissionRate: Rate
+            id: id,
-        },
+            currentCommissionRate: Rate
-        success: res => {
+          },
-          console.log('后端结果---->',res.data);
+          success: res=> {
-          if (res.data.code === 1) {
+            console.log('用户抽用户----->',res.data);
-            wx.hideLoading()  // 加载框关闭
+            if ( res.data.code === 1 )  {
-            this.triggerEvent('confirm', {});
+              wx.hideLoading()  // 加载框关闭
-          } else {
+              this.triggerEvent('confirm', {});
-            wx.showToast({
+            } else {
-              title: '服务异常',
+              wx.showToast({
-              icon: 'error'
+                title: '服务异常',
-            })
+                icon: 'error'
+              })
+            }
           }
-        }
+        })
-      })
+      } else {
+        wx.request({
+          url: baseUrl + '/projectCommission/update/rate',
+          method: 'POST',
+          header: {
+            Authorization: wx.getStorageSync('token'),
+          },
+          data: {
+            id: id,
+            currentCommissionRate: Rate
+          },
+          success: res => {
+            console.log('项目抽佣结果---->',res.data);
+            if (res.data.code === 1) {
+              wx.hideLoading()  // 加载框关闭
+              this.triggerEvent('confirm', {});
+            } else {
+              wx.showToast({
+                title: '服务异常',
+                icon: 'error'
+              })
+            }
+          }
+        })
+      }
+      
       this.resetStatus();
     },
 

pages/personCenter/subCommissionSetting/subCommissionSetting.js

@@ -7,16 +7,30 @@ Page({
    * 页面的初始数据
    */
   data: {
-    items_1: [null, null, null],
+    showCommissionRatePop: false,  // 控制弹窗显隐
-    items: [null, null],
-    showCommissionRatePop: false,
     id: 0,  // 项目id
     subCommissionList: [],  // 下级抽佣列表
-
+    projectId: 0,  // 项目ID
+    maxCommissionRate: 0, //  最大抽佣比率
+    LodingHidden: true, // 控制加载框取消
+    nowMyUnitPrice: 0, // 现在的‘我的单价’，用于传给弹窗
+    nowCommissionRate: 0,  // 现在的'抽成比例', 用于传给弹窗
+    nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗
+    nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗 
+    isSub: true, // 用于区分是项目抽佣页面还是单个用户抽佣页面
   },
   
   // 点击“设价”按钮，显示弹窗
-  showCommissionRatePop() {
+  showCommissionRatePop(e) {
+    console.log('弹窗传值----->',e);
+    this.setData({
+      nowCommissionRate: e.currentTarget.dataset.currentcommissionrate,
+      nowMyUnitPrice: e.currentTarget.dataset.nowmyunitprice,
+      nowAgentUnitPrice: e.currentTarget.dataset.agentunitprice,
+      nowProjectDetailName: e.currentTarget.dataset.projectdetailname,
+      projectId: e.currentTarget.dataset.detailid,
+      maxCommissionRate: e.currentTarget.dataset.maxcommissionrate,
+    })
     this.setData({ showCommissionRatePop: true });
   },
 
@@ -27,8 +41,7 @@ Page({
 
   // 确认按钮回调
   handleCommissionRateConfirm(e) {
-    const { agentPrice, commissionRate, pricingMethod } = e.detail;
+    this.getSubCommissionList();
-    console.log('设置数据:', agentPrice, commissionRate, pricingMethod);
     this.closeCommissionRatePop();
   },
 

pages/personCenter/subCommissionSetting/subCommissionSetting.wxml

@@ -28,7 +28,7 @@
           >
             <text class="font_5 text_5">{{ DetailCommission.projectDetailName }}</text>
             <text class="shrink-0 font_2 text_8">{{ DetailCommission.agentUnitPrice }}/{{ DetailCommission.currentCommissionRate }}%</text>
-            <view class="flex-row shrink-0 group_2" bindtap="showCommissionRatePop">
+            <view class="flex-row shrink-0 group_2" bindtap="showCommissionRatePop" data-nowMyUnitPrice="{{ DetailCommission.myUnitPrice }} " data-currentCommissionRate="{{ DetailCommission.currentCommissionRate }}" data-agentUnitPrice="{{ DetailCommission.agentUnitPrice }}" data-projectDetailName="{{ DetailCommission.projectDetailName }}" data-detailid="{{ DetailCommission.id }}" data-maxCommissionRate="{{ DetailCommission.maxCommissionRate }}">
               <image
                 class="image_2"
                 src="./images/yjt.png"
@@ -47,4 +47,11 @@
   bind:cancel="closeCommissionRatePop"
   bind:close="closeCommissionRatePop"
   bind:confirm="handleCommissionRateConfirm"
+  pgencyPrice="{{ nowAgentUnitPrice }}"
+  commissionRate="{{ nowCommissionRate }}"
+  myUnitPrice="{{ nowMyUnitPrice }}"
+  projectDetailName="{{  nowProjectDetailName }}"
+  detailId="{{ projectId }}"
+  maxCommissionRate="{{ maxCommissionRate }}"
+  isSub="{{ isSub }}"
 />

request.js

@@ -1,6 +1,3 @@
 export const local='http://localhost:3456';
 export const ip = 'http://1.94.237.210:3457';
 export const baseUrl = local;
-
-
-export const globalImgUrl = baseUrl + '/file/download/'