From 4e6d5598b73380744d6a98bc6f547ba9d7a30b92 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Sun, 16 Jun 2024 14:09:21 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E5=88=86=E9=94=80=E8=AF=A6=E6=83=85):[#173?=
 =?UTF-8?q?8]=E5=88=86=E9=94=80=E8=AF=A6=E6=83=85=E7=9A=84=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E6=96=87=E6=9C=AC=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                                  |  7 +++
 pages/user/promotion/PromoterOrder/index.vue | 53 ++++++++++++--------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/api/user.js b/api/user.js
index a8729e9..1a1b3e0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -554,3 +554,10 @@ export function getUserPointInfo(param) {
 export function getUserPointBill(param) {
     return request.get('/user/points/bill', param, { login: true })
 }
+
+/*
+ * 用户分销说明
+ */
+export function getUserSpreadRule(param) {
+    return request.get('/userSpreadRule', param, { login: false })
+}
diff --git a/pages/user/promotion/PromoterOrder/index.vue b/pages/user/promotion/PromoterOrder/index.vue
index 17cbf40..17aafc9 100644
--- a/pages/user/promotion/PromoterOrder/index.vue
+++ b/pages/user/promotion/PromoterOrder/index.vue
@@ -10,7 +10,7 @@
           </view>
         </view>
 		<view class="" style="flex-grow: 1;font-size: 24rpx;">
-			返佣说明：1.下线客户下单成功后，平台设置为默认7天收货成功，佣金便自动计算添加到上线的返佣；2.如过程中下单客户有退货退款，则此订单返佣无效，会自动取消或相应扣除。
+			{{ ruleText }}
 		</view>
       </view>
     </view>
@@ -60,7 +60,7 @@
   </view>
 </template>
 <script>
-import { getSpreadOrder } from "@/api/user";
+import { getSpreadOrder, getUserSpreadRule } from "@/api/user";
 import Loading from "@/components/Loading";
 export default {
   name: "PromoterOrder",
@@ -77,39 +77,48 @@ export default {
       },
       loaded: false,
       loading: false,
-      loadTitle: "",
-      count: ""
-    };
+      loadTitle: '',
+      count: '',
+      ruleText: ''
+    }
   },
-  mounted: function() {
-    this.getIndex();
+  mounted() {
+    this.getIndex()
+    this.getRuleText()
   },
   onReachBottom() {
-    !this.loading && this.getIndex();
+    !this.loading && this.getIndex()
   },
   methods: {
-    getIndex: function() {
-      let there = this;
-      if (there.loaded == true || there.loading == true) return;
-      there.loading = true;
+    getRuleText() {
+      getUserSpreadRule().then(res => {
+        const { success, data } = res
+        if (success) {
+          this.ruleText = data.userSpreadRule || ''
+        }
+      })
+    },
+    getIndex() {
+      let there = this
+      if (there.loaded == true || there.loading == true) return
+      there.loading = true
       getSpreadOrder(there.where).then(
         res => {
-          there.loading = false;
-          there.loaded = res.data.list.length < there.where.limit;
-          there.loadTitle = there.loaded ? "人家是有底线的" : "上拉加载更多";
-          there.where.page = there.where.page + 1;
-          there.list.push.apply(there.list, res.data.list);
-          there.count = res.data.count;
+          there.loading = false
+          there.loaded = res.data.list.length < there.where.limit
+          there.loadTitle = there.loaded ? "人家是有底线的" : "上拉加载更多"
+          there.where.page = there.where.page + 1
+          there.list.push.apply(there.list, res.data.list)
+          there.count = res.data.count
         },
         err => {
           uni.showToast({
             title: err.msg || err.response.data.msg|| err.response.data.message,
             icon: "none",
             duration: 2000
-          });
-        },
-        300
-      );
+          })
+        }
+      )
     }
   }
 };