From b24af1f71fa01fed71b74a9719a405a1b3c8cebb Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 5 Dec 2024 15:38:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE:=20Title?=
 =?UTF-8?q?Bar=20=E6=A0=B7=E5=BC=8F=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-title-block/s-title-block.vue           | 61 ++++++++-----------
 1 file changed, 27 insertions(+), 34 deletions(-)

diff --git a/sheep/components/s-title-block/s-title-block.vue b/sheep/components/s-title-block/s-title-block.vue
index 58f999db..e9544662 100644
--- a/sheep/components/s-title-block/s-title-block.vue
+++ b/sheep/components/s-title-block/s-title-block.vue
@@ -7,11 +7,31 @@
   >
     <view class="title-content">
       <!-- 主标题 -->
-      <view v-if="data.title" class="title-text" :style="[titleStyles]">{{ data.title }}</view>
+      <view
+        v-if="data.title"
+        :style="{
+          fontSize: `${data.titleSize}px`,
+          fontWeight: data.titleWeight,
+          color: data.titleColor,
+          textAlign: data.textAlign
+      }"
+        class="title-text"
+      >
+        {{ data.title }}
+      </view>
       <!-- 副标题 -->
-      <view v-if="data.description" :style="[descStyles]" class="sub-title-text">{{
-        data.description
-      }}</view>
+      <view
+        v-if="data.description"
+        :style="{
+          fontSize: `${data.descriptionSize}px`,
+          fontWeight: data.descriptionWeight,
+          color: data.descriptionColor,
+          textAlign: data.textAlign
+        }"
+        class="sub-title-text"
+      >
+        {{ data.description }}
+      </view>
     </view>
     <!-- 查看更多 -->
     <view
@@ -20,7 +40,7 @@
       @tap="sheep.$router.go(data.more.url)"
       :style="{ color: data.descriptionColor }"
     >
-      <view class="more-text" v-if="data.more.type !== 'icon'">{{ data.more.text }} </view>
+      <view v-if="data.more.type !== 'icon'" class="more-text">{{ data.more.text }}</view>
       <text class="_icon-forward" v-if="data.more.type !== 'text'"></text>
     </view>
   </view>
@@ -30,7 +50,7 @@
   /**
    * 标题栏
    */
-  import { reactive, computed } from 'vue';
+  import { computed, reactive } from 'vue';
   import sheep from '@/sheep';
 
   // 数据
@@ -64,40 +84,13 @@
       background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor,
     };
   });
-
-  // 标题样式
-  const titleStyles = {
-    color: props.data.titleColor,
-    fontSize: `${props.data.titleSize}px`,
-    textAlign: props.data.textAlign,
-  };
-
-  // 副标题
-  const descStyles = {
-    color: props.data.descriptionColor,
-    textAlign: props.data.textAlign,
-    fontSize: `${props.data.descriptionSize}px`,
-    fontWeight: `${props.data.descriptionWeight}`,
-  };
 </script>
 
 <style lang="scss" scoped>
   .ss-title-wrap {
-    height: 80rpx;
+    min-height: 80rpx;
     position: relative;
 
-    .title-content {
-      .title-text {
-        font-size: 30rpx;
-        color: #333;
-      }
-
-      .sub-title-text {
-        font-size: 22rpx;
-        color: #999;
-      }
-    }
-
     .more-box {
       white-space: nowrap;
       font-size: 22rpx;

From b92bf484dfe8d5194ebc0851cefc5d4527afe64f Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 6 Dec 2024 11:26:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE:=20?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F-=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=93=BE=E6=8E=A5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-custom-navbar/components/navbar-item.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sheep/components/s-custom-navbar/components/navbar-item.vue b/sheep/components/s-custom-navbar/components/navbar-item.vue
index fce7ce72..7d299b2e 100644
--- a/sheep/components/s-custom-navbar/components/navbar-item.vue
+++ b/sheep/components/s-custom-navbar/components/navbar-item.vue
@@ -6,6 +6,7 @@
       v-if="data.type === 'text'"
       class="nav-title inline"
       :style="[{ color: data.textColor, width: width }]"
+      @tap="sheep.$router.go(data.url)"
     >
       {{ data.text }}
     </view>

From bfde5df0cd5a8dc8880c9913f9571ffa7bde2b57 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 6 Dec 2024 14:37:41 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=BC=82=E6=AD=A5=E7=BB=91=E5=AE=9A=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/platform/share.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 9c76ba1d..21c530f0 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -168,12 +168,11 @@ const decryptSpm = (spm) => {
   shareParams.platform = platformMap[shareParamsArray[3] - 1];
   shareParams.from = fromMap[shareParamsArray[4] - 1];
   if (shareParams.shareId !== 0) {
+    // 记录分享者编号
+    uni.setStorageSync('shareId', shareParams.shareId);
     // 已登录 绑定推广员
-    if (user.isLogin) {
+    if (!!user.isLogin) {
       bindBrokerageUser(shareParams.shareId);
-    } else {
-      // 记录分享者编号
-      uni.setStorageSync('shareId', shareParams.shareId);
     }
   }
 
@@ -190,7 +189,11 @@ const bindBrokerageUser = async (val = undefined) => {
     if (!shareId) {
       return;
     }
-    await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
+    const { data } = await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
+    if (!data) {
+      return;
+    }
+    // 绑定成功后清除缓存
     uni.removeStorageSync('shareId');
   } catch (e) {
     console.error(e);

From cde0de43ff7796d5b7f2f98e731d5696bddeb95d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 6 Dec 2024 15:05:14 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=8A=B6=E6=80=81=E6=90=BA=E5=B8=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/order.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pages/commission/order.vue b/pages/commission/order.vue
index a00981fc..7c14b383 100644
--- a/pages/commission/order.vue
+++ b/pages/commission/order.vue
@@ -72,10 +72,9 @@
 
 <script setup>
   import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
   import _ from 'lodash-es';
-  import { onPageScroll } from '@dcloudio/uni-app';
   import { resetPagination } from '@/sheep/util';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
   import { fen2yuan } from '../../sheep/hooks/useGoods';
@@ -104,15 +103,15 @@
   const tabMaps = [
     {
       name: '全部',
-      value: 'all',
+      value: -1,
     },
     {
       name: '待结算',
-      value: '0', // 待结算
+      value: 0, // 待结算
     },
     {
       name: '已结算',
-      value: '1', // 已结算
+      value: 1, // 已结算
     },
   ];
 
@@ -126,12 +125,17 @@
   // 获取订单列表
   async function getOrderList() {
     state.loadStatus = 'loading';
-    let { code, data } = await BrokerageApi.getBrokerageRecordPage({
+    const tab = tabMaps[state.currentTab];
+    const queryParams = {
       pageSize: state.pagination.pageSize,
       pageNo: state.pagination.pageNo,
       bizType: 1, // 获得推广佣金
-      status: state.currentTab > 0 ? state.currentTab : undefined,
-    });
+      status: tab.value,
+    }
+    if (tab.value < 0) {
+      delete queryParams.status;
+    }
+    const { code, data } = await BrokerageApi.getBrokerageRecordPage(queryParams);
     if (code !== 0) {
       return;
     }

From 25fc972833cb9f2d3d00196e9b07144dc65e8496 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 6 Dec 2024 15:10:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E8=87=AA=E5=B7=B1=E6=9F=A5=E7=9C=8B=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E7=9A=84=E5=88=86=E4=BA=AB=E6=97=B6=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20shareId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/platform/share.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 21c530f0..7f47213c 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -189,12 +189,12 @@ const bindBrokerageUser = async (val = undefined) => {
     if (!shareId) {
       return;
     }
-    const { data } = await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
-    if (!data) {
-      return;
-    }
+    const { data, msg } = await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
     // 绑定成功后清除缓存
-    uni.removeStorageSync('shareId');
+    if (!!data || msg.includes('不能绑定自己')) {
+      uni.removeStorageSync('shareId');
+    }
+
   } catch (e) {
     console.error(e);
   }