修改

api/agencyCenter.js

@@ -92,3 +92,12 @@ export const agentWithdrawalInfo_Api = (id) => uni.$uv.http.get(`/agent/withdraw
 
 // 代理配置
 export const agentConfig_Api = (params) => uni.$uv.http.get(`/agent/agent/config`, { params });
+
+// 获取会员的时间范围内内的分销订单数
+export const distributionUserOrderGainsCount_Api = (dateRange) => uni.$uv.http.get(`/distributionUserOrderGains/count/${dateRange}`, {});
+
+// 查询会员分佣所得列表
+export const distributionUserOrderGainsPage_Api = (params) => uni.$uv.http.get(`/distributionUserOrderGains/page`, { params });
+
+// 获取会员分佣所得详细信息
+export const distributionUserOrderGainsInfo_Api = (id) => uni.$uv.http.get(`/distributionUserOrderGains/info/${id}`, {})

api/userInfo.js

@@ -99,3 +99,6 @@ export const isSetPayPassword_Api = (params) => uni.$uv.http.get(`/user/isSetPay
 
 // 第三方身份绑定信息
 export const thirdBindingInfo_Api = (params) => uni.$uv.http.get(`/user/thirdBindingInfo`, { params });
+
+// 查询直级下级分页
+export const partnerPage_Api = (params) => uni.$uv.http.get(`/user/partnerPage`, { params });

components/ldAddress/ldAddress.vue

@@ -1,57 +1,40 @@
 <template>
-  <view class="container">
-    <view
-      class="courierAddress u-flex-center-sb u-plr30"
-      @click="chonseAddress"
-    >
-      <view class="leftAddress u-flex-center">
-        <text class="iconfont u-02331F" style="color: #fa6138; font-size: 70rpx"
-          >&#xe6da;</text
-        >
-        <!-- 有地址 -->
-        <view
-          class="u-font30 u-ml20 u-flex-column-start"
-          v-if="
-            props.value &&
-            (props.value.id ||
-              props.value.userAddressId ||
-              props.value.orderSelfPickupAddressId)
-          "
-        >
-          <view class="u-flex-center u-font32">
-            <view class="lname u-font32">
-              <!-- <text>收货人：</text> -->
-              <text>{{
-                props.value.receiverName || props.value.receiver
-              }}</text>
-            </view>
-            <text
-              class="u-ml20"
-              v-if="props.value.receiverPhone || props.value.phone"
-              >{{ props.value.receiverPhone || props.value.phone }}</text
-            >
-            <!-- <text class="u-ml20" v-if="props.value.phone">{{
+  <view class="courierAddress u-flex-center-sb u-plr30" @click="chonseAddress">
+    <view class="leftAddress u-flex-center">
+      <text class="iconfont u-02331F" style="color: #fa6138; font-size: 70rpx">&#xe6da;</text>
+      <!-- 有地址 -->
+      <view class="u-font30 u-ml20 u-flex-column-start" v-if="
+        props.value &&
+        (props.value.id ||
+          props.value.userAddressId ||
+          props.value.orderSelfPickupAddressId)
+      ">
+        <view class="u-flex-center u-font32">
+          <view class="lname u-font32">
+            <!-- <text>收货人：</text> -->
+            <text>{{
+              props.value.receiverName || props.value.receiver
+            }}</text>
+          </view>
+          <text class="u-ml20" v-if="props.value.receiverPhone || props.value.phone">{{ props.value.receiverPhone ||
+            props.value.phone }}</text>
+          <!-- <text class="u-ml20" v-if="props.value.phone">{{
               props.value.phone
             }}</text> -->
-          </view>
-          <view class="u-font28 u-999">
-            <text v-if="showProvinces"
-              >{{ props.value.provinceName }}{{ props.value.cityName
-              }}{{ props.value.areaName }}</text
-            >
-            <text>{{ props.value.address || props.value.addressDetail }}</text>
-          </view>
         </view>
-        <!-- 默认没有地址 -->
-        <view class="u-font30 u-ml20" v-else>
-          暂无收货地址~
-          <view class="u-999 u-mt5"> 立即添加收货地址 </view>
+        <view class="u-font28 u-999">
+          <text v-if="showProvinces">{{ props.value.provinceName }}{{ props.value.cityName
+          }}{{ props.value.areaName }}</text>
+          <text>{{ props.value.address || props.value.addressDetail }}</text>
         </view>
       </view>
-      <text class="iconfont u-font24 u-CCC u-ml20" v-if="props.link"
-        >&#xe6c7;</text
-      >
+      <!-- 默认没有地址 -->
+      <view class="u-font30 u-ml20" v-else>
+        暂无收货地址~
+        <view class="u-999 u-mt5"> 立即添加收货地址 </view>
+      </view>
     </view>
+    <text class="iconfont u-font24 u-CCC u-ml20" v-if="props.link">&#xe6c7;</text>
   </view>
 </template>
 <script setup name="ldAddress">

components/ldAddress/ldAddresszt.vue

@@ -1,38 +1,25 @@
 <template>
-  <view class="container">
-    <view class="courierAddress u-flex-center-sb u-plr30">
-      <view class="leftAddress u-flex-center">
-        <!-- <text class="iconfont u-font44 u-02331F">&#xe655;</text> -->
-        <!-- 有地址 -->
-        <view
-          class="u-font30 u-999 u-flex-column-start"
-          v-if="value && value.orderSelfPickupAddressId"
-        >
-          <view
-            class="u-font28 u-181818 u-flex-center"
-            style="align-items: flex-start"
-          >
-            <text class="uw100">自提点：</text>
-            <text class="u-999 u-flex1">{{ value.pointName }}</text>
-          </view>
-          <view
-            class="u-font28 u-181818 u-flex-center"
-            style="align-items: flex-start"
-          >
-            <text class="uw100">地 <text class="pa10"></text>址：</text>
-            <text class="u-999 u-flex1"
-              >{{ value.provinceName }}{{ value.cityName }}{{ value.areaName
-              }}{{ value.address || value.allAddress }}</text
-            >
-          </view>
-          <view class="u-font28 u-181818 u-flex-center u-mt5">
-            <view class="uw100">店 <text class="pa10"></text>长：</view>
-            <text class="u-999 u-flex1">{{ value.receiver }}</text>
-          </view>
-          <view class="u-font28 u-181818 u-flex-center u-mt5">
-            <view class="uw100">电 <text class="pa10"></text>话：</view>
-            <text class="u-999 u-flex1">{{ value.phone }}</text>
-          </view>
+  <view class="courierAddress u-flex-center-sb u-plr30">
+    <view class="leftAddress u-flex-center">
+      <!-- <text class="iconfont u-font44 u-02331F">&#xe655;</text> -->
+      <!-- 有地址 -->
+      <view class="u-font30 u-999 u-flex-column-start" v-if="value && value.orderSelfPickupAddressId">
+        <view class="u-font28 u-181818 u-flex-center" style="align-items: flex-start">
+          <text class="uw100">自提点：</text>
+          <text class="u-999 u-flex1">{{ value.pointName }}</text>
+        </view>
+        <view class="u-font28 u-181818 u-flex-center" style="align-items: flex-start">
+          <text class="uw100">地 <text class="pa10"></text>址：</text>
+          <text class="u-999 u-flex1">{{ value.provinceName }}{{ value.cityName }}{{ value.areaName
+          }}{{ value.address || value.allAddress }}</text>
+        </view>
+        <view class="u-font28 u-181818 u-flex-center u-mt5">
+          <view class="uw100">店 <text class="pa10"></text>长：</view>
+          <text class="u-999 u-flex1">{{ value.receiver }}</text>
+        </view>
+        <view class="u-font28 u-181818 u-flex-center u-mt5">
+          <view class="uw100">电 <text class="pa10"></text>话：</view>
+          <text class="u-999 u-flex1">{{ value.phone }}</text>
         </view>
       </view>
     </view>
@@ -59,10 +46,12 @@ export default {
   background-color: #fff;
   padding: 36rpx 30rpx;
 }
+
 .uw100 {
   // width: 120rpx;
   flex-shrink: 0;
 }
+
 .pa10 {
   padding: 0 9rpx;
 }

components/ldAddress/ldMerchantAddress.vue

@@ -1,75 +1,72 @@
 <template>
-  <view class="container">
-    <view class="courierAddress u-flex-center-sb u-plr30">
-      <view class="leftAddress u-flex-center">
-        <text class="iconfont u-font44 u-02331F" style="color: #FA6138;">&#xe6da;</text>
+  <view class="courierAddress u-flex-center-sb u-plr30">
+    <view class="leftAddress u-flex-center">
+      <text class="iconfont u-font44 u-02331F" style="color: #FA6138;">&#xe6da;</text>
 
-        <!-- 有地址 -->
-        <view class="u-font30 u-ml20 u-flex-column-start" v-if="value.address">
-          <view class="u-flex-center u-font32">
-            <view class="lname u-font32">
-              <!-- <text>收货人：</text> -->
-              <text>{{value.realName}}</text>
-            </view>
-            <text class="u-ml20" v-if="value.mobile">{{value.mobile}}</text>
-            <text class="u-ml20" v-if="value.phone">{{value.phone}}</text>
-          </view>
-          <view class="u-font28 u-999">
-            <!-- <text>收货地址：</text> -->
-            <text>{{value.address}}</text>
+      <!-- 有地址 -->
+      <view class="u-font30 u-ml20 u-flex-column-start" v-if="value.address">
+        <view class="u-flex-center u-font32">
+          <view class="lname u-font32">
+            <!-- <text>收货人：</text> -->
+            <text>{{ value.realName }}</text>
           </view>
+          <text class="u-ml20" v-if="value.mobile">{{ value.mobile }}</text>
+          <text class="u-ml20" v-if="value.phone">{{ value.phone }}</text>
         </view>
-        <!-- 默认没有地址 -->
-        <view class="u-font30 u-ml20" v-else>
-          暂无收货地址~
-          <view class="u-999 u-mt5">
-            立即添加收货地址
-          </view>
+        <view class="u-font28 u-999">
+          <!-- <text>收货地址：</text> -->
+          <text>{{ value.address }}</text>
+        </view>
+      </view>
+      <!-- 默认没有地址 -->
+      <view class="u-font30 u-ml20" v-else>
+        暂无收货地址~
+        <view class="u-999 u-mt5">
+          立即添加收货地址
         </view>
       </view>
     </view>
-
   </view>
 </template>
 
 <script>
-  export default {
-    props: {
-      link: {
-        type: Boolean,
-        default: true
-      },
-      value: {
-        type: Object,
-        default: function() {
-          return {}
-        }
-      },
-      third: {
-        type: Boolean,
-        default: false
-      }
+export default {
+  props: {
+    link: {
+      type: Boolean,
+      default: true
     },
-    data() {
-      return {
-
+    value: {
+      type: Object,
+      default: function () {
+        return {}
       }
     },
-    methods: {
-      chonseAddress() {
-        if (this.link) {
-          uni.navigateTo({
-            url: '/pages/user/address/addressList'
-          })
-        }
+    third: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    chonseAddress() {
+      if (this.link) {
+        uni.navigateTo({
+          url: '/pages/user/address/addressList'
+        })
       }
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .courierAddress {
-    background-color: #fff;
-    padding: 36rpx 30rpx;
-  }
+.courierAddress {
+  background-color: #fff;
+  padding: 36rpx 30rpx;
+}
 </style>

pages.json

@@ -498,4 +498,4 @@
 		]
 	},
 	"uniIdRouter": {}
-}
+}

pages/distribution/index.vue

@@ -6,23 +6,15 @@
         <view class="u-plr30">
           <view class="head u-flex-center-sb">
             <view class="u-flex">
-              <image
-                v-if="accountInfo.head_photo"
-                :src="accountInfo.head_photo"
-              ></image>
-              <image v-else :src="$defaultAvatar()" mode=""></image>
+              <image v-if="accountInfo.headPhoto" :src="accountInfo.headPhoto"></image>
+              <image v-else :src="$defaultAvatar" class="pc-avatar" mode="aspectFill" />
               <view class="u-ml30 u-mt15">
                 <view class="u-font30 u-1A1A1A u-text1" style="width: 350rpx">{{
                   accountInfo.nickname
                 }}</view>
-                <view class="u-mt5 u-font24"
-                  >邀请码:
-                  <text class="u-mr30">{{ accountInfo.invitation_code }}</text>
-                  <text
-                    class="u-FF0000"
-                    @click="copy(accountInfo.invitation_code)"
-                    >复制</text
-                  >
+                <view class="u-mt5 u-font24">邀请码:
+                  <text class="u-mr30">{{ accountInfo.invitationCode }}</text>
+                  <text class="u-FF0000" @click="copy(accountInfo.invitationCode)">复制</text>
                 </view>
               </view>
             </view>
@@ -31,39 +23,33 @@
         <view class="u-plr30">
           <view class="list-item u-mt30">
             <view class="u-flex">
-              <view class="iconfont bg-E8F9EF">&#xeb99;</view>
+              <view class="iconfont bg-E8F9EF">&#xe634;</view>
               <!-- 可提现 -->
-              <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15"
-                >可提现金额</text
-              >
+              <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15">可提现金额</text>
             </view>
             <view class="bg-fff u-mt20 u-flex-center-sb">
               <view class="u-00BF5A u-bold u-font36 u-flex">
-                <rich-text
-                  :nodes="$mUtil.priceBigSmall(accountInfo.commission_able)"
-                ></rich-text>
+                <rich-text :nodes="$mUtil.priceBigSmall(accountInfo.balance)"></rich-text>
               </view>
               <view class="u-flex-center">
                 <view class="wd-btn" @click="goWithdrawDeposit">
                   <button class="u-font24">点击提现</button>
                 </view>
-                <view class="wd-btn u-ml10 bgc" @click="goWithdrawDeposittwo">
+                <!-- <view class="wd-btn u-ml10 bgc" @click="goWithdrawDeposittwo">
                   <button class="u-font24">转入余额</button>
-                </view>
+                </view> -->
               </view>
             </view>
           </view>
           <view class="list-item u-mt30">
             <view class="u-flex">
-              <view class="iconfont bg-E8F9EF">&#xe673;</view>
-              <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15"
-                >我的伙伴</text
-              >
+              <view class="iconfont bg-E8F9EF">&#xe614;</view>
+              <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15">我的伙伴</text>
             </view>
             <view class="bg-fff u-mt20 u-flex-center-sb" @click="goPartner">
               <view>直接伙伴</view>
               <view>
-                <text class="u-FF0000">{{ num }}</text> 人
+                <text class="u-FF0000">{{ accountInfo.partnerNum || 0 }}</text> 人
                 <text class="iconfont u-font24 u-999 u-ml15">&#xe6c7;</text>
               </view>
             </view>
@@ -71,14 +57,12 @@
           <view class="list-item u-mt30">
             <view class="u-flex-center-sb">
               <view class="u-flex-center">
-                <view class="iconfont bg-E8F9EF">&#xe63c;</view>
-                <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15"
-                  >分销订单</text
-                >
+                <view class="iconfont bg-E8F9EF">&#xe645;</view>
+                <text class="u-bold u-font28 u-1A1A1A u-ml15 u-mt15">分销订单</text>
               </view>
               <view class="u-flex-center" @click="getMoenyList">
                 <text class="u-font24 u-999">历史订单</text>
-                <text class="iconfont u-font24 u-999 u-mr30">&#xe6c7;</text>
+                <text class="iconfont u-font24 u-999 u-mr30">&#xe671;</text>
               </view>
             </view>
             <view class="bg-fff u-mt20 u-flex-center-sa">
@@ -86,7 +70,7 @@
                 <view>本周订单</view>
                 <view class="u-text-center u-mt10">
                   <text class="u-00BF5A u-bold">{{
-                    userordergains.week_user_order_gains_num
+                    userordergains.weekNum || 0
                   }}</text>
                   <text class="u-font20 u-666 u-ml5">单</text>
                 </view>
@@ -95,7 +79,7 @@
                 <view>本月订单</view>
                 <view class="u-text-center u-mt10">
                   <text class="u-00BF5A u-bold">
-                    {{ userordergains.month_user_order_gains_num }}
+                    {{ userordergains.monthNum || 0 }}
                   </text>
                   <text class="u-font20 u-666 u-ml5">单</text>
                 </view>
@@ -113,38 +97,42 @@
 <script setup>
 import { ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
-const $http = uni.$http;
-const $mUtil = uni.$mUtil;
+import { distributionUserOrderGainsCount_Api } from "@/api/agencyCenter.js";
+import { userInfo } from "@/api/login.js";
+
 
 const loading = ref(true);
 const accountInfo = ref({}); // 用户信息
-const num = ref(0); // 伙伴个数
 const userordergains = ref({}); // 分销订单
 
-// 生命周期
-onShow((options) => {
-    return
-  // 获取用户信息
-  $http.get("/account/getAccountInfo").then((res) => {
+// 获取用户信息
+const getUserInfo = () => {
+  userInfo().then((res) => {
+    uni.stopPullDownRefresh();
     if (res && res.code == 200) {
-      accountInfo.value = res.data;
+      accountInfo.value = res.data || {};
     }
   });
+}
 
-  // 获取伙伴个数
-  $http.get("/account/myPartnerNum").then((res) => {
+// 获取会员的时间范围内内的分销订单数
+const getCount_Api = (type) => {
+  distributionUserOrderGainsCount_Api(type).then((res) => {
     if (res && res.code == 200) {
-      num.value = res.data;
+      if (type == "week") {
+        userordergains.value.weekNum = res.data || 0;
+      } else if (type == "month") {
+        userordergains.value.monthNum = res.data || 0;
+      }
     }
   });
+}
 
-  // 获取分销订单
-  $http.get("/userordergains/slim-statistics").then((res) => {
-    loading.value = false;
-    if (res && res.code == 200) {
-      userordergains.value = res.data;
-    }
-  });
+// 生命周期
+onShow((options) => {
+  getUserInfo();
+  getCount_Api("week");
+  getCount_Api("month");
 });
 
 // 方法
@@ -158,7 +146,7 @@ const getMoenyList = () => {
 // 提现
 const goWithdrawDeposit = () => {
   uni.navigateTo({
-    url: "withdraw",
+    url: "/pages/user/wallet/reflect?pageType=2",
   });
 };
 
@@ -192,9 +180,11 @@ const copy = (code) => {
 <style lang="scss" scoped>
 .distribution {
   position: relative;
+
   view {
     font-size: 28rpx;
   }
+
   .bg {
     width: 100%;
     height: 185rpx;
@@ -235,6 +225,7 @@ const copy = (code) => {
       line-height: 50rpx;
       text-align: center;
       border-radius: 50%;
+      box-sizing: border-box;
     }
 
     .bg-fff {

pages/distribution/moneyList.vue

@@ -1,142 +1,77 @@
 <template>
   <view class="container">
-    <div class="tabB" :style="{ top: tabTop + 'px' }">
-      <view class="order-type u-flex-center-sb" v-if="selTabIndex == 0">
-        <view
-          class="type-name u-font26 u-181818"
-          :class="{ active: isChange == item.value }"
-          v-for="(item, index) in orderType"
-          :key="index"
-          @click="clickBtn(item.value)"
-        >
-          {{ item.label }}
+    <uv-sticky>
+      <view class="tabB">
+        <view class="order-type u-flex-center-sb" v-if="selTabIndex == 0">
+          <view class="type-name u-font26 u-181818" :class="{ active: isChange == item.value }"
+            v-for="(item, index) in orderType" :key="index" @click="clickBtn(item.value)">
+            {{ item.label }}
+          </view>
         </view>
       </view>
-    </div>
+    </uv-sticky>
+
     <view class="bigbox" :class="selTabIndex == 0 ? 'bigbox0' : 'bigbox3'">
-      <view v-if="listdata.length > 0">
-        <template v-if="selTabIndex == 0">
-          <view
-            class="u-bg-fff ppsPd umb20"
-            v-for="(item, index) in listdata"
-            :key="item.id"
-          >
-            <view
-              class="pt15-pb24 u-border-one-one"
-              style="padding-bottom: 30rpx"
-            >
-              <view class="u-flex-center-sb" style="align-items: center">
-                <view class="u-flex" style="align-items: center">
-                  <text
-                    class="iconfont2 u-font40"
-                    style="padding-top: 2rpx; color: #fa6138"
-                    >&#xe611;</text
-                  >
-                  <text class="u-1A1A1A u-font30 u-ml15">{{
-                    item.shop_name
-                  }}</text>
-                </view>
-                <text class="u-00BF5A u-font28">{{ item.order_status }}</text>
+      <view v-if="RowsList.length > 0">
+        <view class="u-bg-fff ppsPd umb20" v-for="(item, index) in RowsList" :key="item.id">
+          <view class="pt15-pb24 u-border-one-one" style="padding-bottom: 30rpx">
+            <view class="u-flex-center-sb" style="align-items: center">
+              <view class="u-flex" style="align-items: center">
+                <text class="iconfont2 u-font40" style="padding-top: 2rpx; color: #fa6138">&#xe611;</text>
+                <text class="u-1A1A1A u-font30 u-ml15">{{
+                  item.businessName
+                }}</text>
               </view>
+              <text class="u-00BF5A u-font28">{{ item.settlement ? '已结算' : '未结算' }}</text>
             </view>
-            <view>
-              <view class="goodsItem u-border-one-one u-flex">
-                <image
-                  :src="item.goods_img"
-                  class="u-goods200 u-ml15"
-                  mode=""
-                ></image>
-                <view class="u-flex1 u-flex-column-start rightText u-ml30">
-                  <view class="u-text2 u-1A1A1A u-font28">{{
-                    item.goods_title
-                  }}</view>
-                  <view class="bottext u-flex-column-start u-flex1">
-                    <text
-                      class="u-font22 u-999"
-                      style="width: 100%"
-                      v-if="item.sku_set_name"
-                      >规格：{{ item.sku_set_name }}</text
-                    >
-
-                    <view class="u-flex-center botPrice u-mt25">
-                      <view class="u-00BF5A u-font32 good-text">
-                        <rich-text
-                          :nodes="$mUtil.priceBigSmall(item.sale_price)"
-                        ></rich-text>
-                      </view>
-                      <text class="u-font26 u-999 u-ml15" v-if="item.number"
-                        >x {{ item.number }}</text
-                      >
+          </view>
+          <view>
+            <view class="goodsItem u-border-one-one u-flex">
+              <image :src="item.productCover" class="u-goods200 u-ml15" mode=""></image>
+              <view class="u-flex1 u-flex-column-start rightText u-ml30">
+                <view class="u-text2 u-1A1A1A u-font28">{{
+                  item.productTitle
+                }}</view>
+                <view class="bottext u-flex-column-start u-flex1">
+                  <text class="u-font22 u-999" style="width: 100%" v-if="item.skuSetName">规格：{{ item.skuSetName
+                  }}</text>
+
+                  <view class="u-flex-center botPrice u-mt25">
+                    <view class="u-00BF5A u-font32 good-text">
+                      <rich-text :nodes="$mUtil.priceBigSmall(item.realPrice)"></rich-text>
                     </view>
+                    <text class="u-font26 u-999 u-ml15" v-if="item.number">x {{ item.number }}</text>
                   </view>
                 </view>
               </view>
             </view>
-            <view class="botList">
-              <view class="u-flex-center-sb u-mt20">
-                <view class="u-font26 u-181818 opacity">购买人</view>
-                <text
-                  style="text-align: right"
-                  class="u-font26 u-999 u-text-width-two"
-                  >{{ item.user_info.nickname }}</text
-                >
-              </view>
-              <view class="u-flex-center-sb u-mt20">
-                <view class="u-font26 u-181818 opacity">下单时间</view>
-                <text class="u-font26 u-999">{{ item.create_time }}</text>
-              </view>
-              <view class="u-flex-center-sb u-mt20">
-                <view class="u-font26 u-181818 opacity">所得佣金</view>
-                <view class="u-font26 u-00BF5A u-bold">
-                  <rich-text
-                    :nodes="$mUtil.priceBigSmall(item.able_gains, false)"
-                  ></rich-text>
-                </view>
-              </view>
-              <view
-                class="u-flex-center-sb u-mt20"
-                v-if="item.balance_gains > 0"
-              >
-                <view class="u-font26 u-181818 opacity">所得金额</view>
-                <view class="u-font26 u-00BF5A u-bold">
-                  <rich-text
-                    :nodes="$mUtil.priceBigSmall(item.balance_gains, false)"
-                  ></rich-text>
-                </view>
-              </view>
-            </view>
           </view>
-        </template>
-        <template v-if="selTabIndex == 3">
-          <view class="offline">
-            <view class="order-item" v-for="item in listdata" :key="item.id">
-              <view class="order-item-head">
-                <view class="item-info">
-                  <view class="order-num">
-                    <text class="num">订单号：</text>
-                    <text class="">{{ item.offline_order.order_code }}</text>
-                  </view>
-                  <view class="order-time-price">
-                    <text class="time">{{ item.create_time }}</text>
-                    <text class=""
-                      >消费金额：{{ item.offline_order.sales_money }}</text
-                    >
-                  </view>
-                </view>
-              </view>
-              <view class="tip">
-                <view class="label">打赏积分：</view
-                >{{ item.offline_order.shop_consume_integral_able }}
+          <view class="botList">
+            <view class="u-flex-center-sb u-mt20">
+              <view class="u-font26 u-181818 opacity">购买人</view>
+              <text style="text-align: right" class="u-font26 u-999 u-text-width-two">{{ item.userNickname }}</text>
+            </view>
+            <view class="u-flex-center-sb u-mt20">
+              <view class="u-font26 u-181818 opacity">下单时间</view>
+              <text class="u-font26 u-999">{{ item.createTime }}</text>
+            </view>
+            <view class="u-flex-center-sb u-mt20">
+              <view class="u-font26 u-181818 opacity">所得佣金</view>
+              <view class="u-font26 u-00BF5A u-bold">
+                <rich-text :nodes="$mUtil.priceBigSmall(item.ableGains, false)"></rich-text>
               </view>
-              <view class="tip">
-                <view class="label">所得收益：</view>{{ item.income_point }}
+            </view>
+            <view class="u-flex-center-sb u-mt20" v-if="item.gains > 0">
+              <view class="u-font26 u-181818 opacity">所得金额</view>
+              <view class="u-font26 u-00BF5A u-bold">
+                <rich-text :nodes="$mUtil.priceBigSmall(item.gains, false)"></rich-text>
               </view>
             </view>
           </view>
-        </template>
-        <loadMore v-if="listdata.length > 0" :status="status"></loadMore>
+        </view>
+        <loadMore v-if="RowsList.length > 0" :status="LoadStatus"></loadMore>
       </view>
-      <nodata v-else :config="{ top: 20, content: '暂无数据~' }"></nodata>
+      <noData v-else :config="{ top: 20, content: '暂无数据~' }"></noData>
     </view>
   </view>
 </template>
@@ -144,9 +79,10 @@
 <script setup>
 import { ref } from "vue";
 import { onReachBottom, onPullDownRefresh, onLoad } from "@dcloudio/uni-app";
-const $http = uni.$http;
-const $mUtil = uni.$mUtil;
-const app = getApp();
+import { distributionUserOrderGainsPage_Api } from "@/api/agencyCenter";
+
+import { usePageData } from "@/hooks/usePageData";
+const { RowsList, LoadStatus, initData } = usePageData(distributionUserOrderGainsPage_Api);
 
 const isChange = ref(0);
 const orderType = ref([
@@ -155,113 +91,31 @@ const orderType = ref([
     value: "",
   },
   {
-    label: "已付款",
+    label: "未结算",
     value: 1,
   },
-  {
-    label: "已完成",
-    value: 2,
-  },
   {
     label: "已结算",
-    value: 3,
+    value: 2,
   },
 ]);
-const listdata = ref([]);
-const status = ref("more"); // more|loading|noMore
-const noData = ref(false);
-const parmas = ref({
-  page: 1,
-  limit: 10,
-  status: "",
-  // user_order_gains_type: 0
-});
-const tabTop = ref(0);
 const selTabIndex = ref(0);
 
 // 生命周期
 onLoad(() => {
-  tabTop.value = app.globalData.barHeight + 44;
-  listData();
+  initData();
 });
 
-// 上拉加载
-onReachBottom((e) => {
-  status.value = "loading";
-  parmas.value.page++;
-  if (selTabIndex.value == 0) {
-    listData();
-  } else {
-    getOfflineorderincome();
-  }
-});
-
-// 下拉刷新
-onPullDownRefresh(() => {
-  rest();
-  if (selTabIndex.value == 0) {
-    listData();
-  } else {
-    getOfflineorderincome();
-  }
-});
-
-// 重置
-const rest = () => {
-  parmas.value.page = 1;
-  listdata.value = [];
-};
-
-// 获取列表数据
-const listData = () => {
-  $http.get("/userordergains/pages", parmas.value).then(async (res) => {
-    if (res && res.code == 200) {
-      uni.stopPullDownRefresh();
-      listdata.value = listdata.value.concat(res.page.list);
-      if (listdata.value.length == 0) {
-        noData.value = true;
-      } else {
-        noData.value = false;
-      }
-      if (res.page.totalPage <= res.page.currPage) {
-        status.value = "noMore";
-      } else {
-        status.value = "more";
-      }
-    }
-  });
-};
-
-// 获取线下订单收益
-const getOfflineorderincome = () => {
-  $http.get("/offlineorderincome/page", parmas.value).then(async (res) => {
-    if (res && res.code == 200) {
-      uni.stopPullDownRefresh();
-      listdata.value = listdata.value.concat(res.page.list);
-      if (listdata.value.length == 0) {
-        noData.value = true;
-      } else {
-        noData.value = false;
-      }
-      if (res.page.totalPage <= res.page.currPage) {
-        status.value = "noMore";
-      } else {
-        status.value = "more";
-      }
-    }
-  });
-};
-
 // 点击按钮
 const clickBtn = (index) => {
   isChange.value = index;
-  if (index == 0) {
-    parmas.value.status = "";
-  } else {
-    parmas.value.status = index;
+  let settlement = undefined;
+  if (index == 1) {
+    settlement = false;
+  } else if (index == 2) {
+    settlement = true;
   }
-  rest();
-  listData();
+  initData({ settlement });
 };
 </script>
 
@@ -271,8 +125,9 @@ const clickBtn = (index) => {
   justify-content: space-around;
   padding: 0 30rpx;
   border-bottom: 1rpx solid #e6e6e6;
+  background: #ffffff;
 
-  > view {
+  >view {
     font-size: 30rpx;
     padding: 22rpx 0;
     color: #1a1a1a;
@@ -280,7 +135,7 @@ const clickBtn = (index) => {
     font-weight: 700;
   }
 
-  > .active {
+  >.active {
     color: #fa6138;
 
     &::after {
@@ -351,14 +206,6 @@ const clickBtn = (index) => {
   height: 30rpx;
 }
 
-.tabB {
-  width: 100%;
-  position: fixed;
-  left: 0;
-  z-index: 66;
-  background: #ffffff;
-}
-
 .order-type {
   height: 110rpx;
   width: 100%;

pages/distribution/partner.vue

@@ -1,74 +1,47 @@
 <template>
   <view class="container">
     <view class="partner">
-      <image
-        class="top-bg"
-        :src="$mConfig.staticUrl + '/distribution-top-bg.png'"
-      ></image>
+      <image class="top-bg" src="/static/image/distribution-top-bg.png"></image>
       <view class="userInfo">
         <view class="u-plr30">
           <view class="head u-flex-sb">
             <view class="u-flex">
-              <image
-                v-if="accountInfo.head_photo"
-                :src="accountInfo.head_photo"
-              ></image>
-              <image v-else :src="$defaultAvatar()" mode=""></image>
+              <image v-if="accountInfo.headPhoto" :src="accountInfo.headPhoto"></image>
+              <image v-else :src="$defaultAvatar" mode=""></image>
 
               <view class="u-ml30 u-mt10">
                 <view class="u-font30 u-1A1A1A nickname u-text1">{{
-                  accountInfo.nickname
+                  accountInfo.nickname || accountInfo.realName
                 }}</view>
               </view>
             </view>
-            <view class="u-font24 u-999 u-mt10"
-              >直接伙伴：<text class="u-FF0000">{{ num }}</text
-              >人
+            <view class="u-font24 u-999 u-mt10">直接伙伴：<text class="u-FF0000">{{ Total || 0 }}</text>人
             </view>
           </view>
         </view>
         <view class="partner-list">
-          <image
-            class="partner-bg"
-            :src="$mConfig.staticUrl + '/partner-bg.png'"
-          ></image>
+          <image class="partner-bg" src="/static/image/partner-bg.png"></image>
           <view class="position-ab">
-            <view v-if="partnerList.length > 0">
-              <view
-                class="item u-plr30"
-                v-for="(item, index) in partnerList"
-                :key="item.id"
-              >
+            <view v-if="RowsList.length > 0">
+              <view class="item u-plr30" v-for="(item, index) in RowsList" :key="item.id">
                 <view class="u-flex u-border-one-one pd44">
-                  <image
-                    class="u-avatar106"
-                    v-if="item.head_photo"
-                    :src="item.head_photo"
-                  ></image>
-                  <image
-                    class="u-avatar106"
-                    v-else
-                    :src="$defaultAvatar()"
-                  ></image>
+                  <image class="u-avatar106" v-if="item.headPhoto" :src="item.headPhoto"></image>
+                  <image class="u-avatar106" v-else :src="$defaultAvatar"></image>
                   <view class="u-font24 u-999">
                     <view class="u-font28 u-1A1A1A ht36 u-text-width">{{
                       item.nickname
                     }}</view>
                     <view>
-                      <rich-text
-                        :nodes="'*******' + $mUtil.cutOut(item.mobile)"
-                      ></rich-text>
+                      <rich-text :nodes="'*******' + $mUtil.cutOut(item.mobile)"></rich-text>
                     </view>
-                    <view>绑定时间：{{ item.register_time }}</view>
+                    <view>绑定时间：{{ item.createTime }}</view>
                   </view>
                 </view>
               </view>
             </view>
-            <view
-              class="nogoods u-mt30 u-flex-column-center"
-              v-if="partnerList.length == 0"
-            >
-              <nodata :config="{ top: 5, content: '暂无数据~' }"></nodata>
+            <view class="nogoods u-mt30 u-flex-column-center" v-if="RowsList.length == 0">
+              <noData :config="{ top: 5, content: '暂无数据~' }"></noData>
+              <loadMore v-if="RowsList.length > 0" :status="LoadStatus"></loadMore>
             </view>
           </view>
         </view>
@@ -80,25 +53,24 @@
 <script setup>
 import { ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
+import { userInfo } from "@/api/login.js";
+import { partnerPage_Api } from "@/api/userInfo.js";
+import { usePageData } from "@/hooks/usePageData"
 
-const num = ref(0);
-const partnerList = ref([]);
+const { RowsList, LoadStatus, initData, Total } = usePageData(partnerPage_Api);
 const accountInfo = ref({});
-
-onLoad(() => {
-  //获取用户信息
-  uni.$http.get("/account/getAccountInfo").then((res) => {
+const getUserInfo = () => {
+  userInfo().then((res) => {
     if (res && res.code == 200) {
       accountInfo.value = res.data;
     }
   });
-  //获取伙伴列表
-  uni.$http.get("/account/myPartner").then((res) => {
-    if (res && res.code == 200) {
-      num.value = res.num;
-      partnerList.value = res.data;
-    }
-  });
+}
+
+onLoad(() => {
+  //获取用户信息
+  getUserInfo();
+  initData();
 });
 </script>
 
@@ -106,14 +78,17 @@ onLoad(() => {
 .nickname {
   width: 300rpx;
 }
+
 .u-flex-sb {
   display: flex;
   justify-content: space-between;
 }
+
 .ht36 {
   height: 36rpx;
   line-height: 36rpx;
 }
+
 .partner {
   position: relative;
 

pages/login/components/register.vue

@@ -7,7 +7,8 @@
         <text class="close-text" @click="close()">取消</text>
       </view>
       <view class="register-content">
-        <button class="register-btn" type="default" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">获取手机号</button>
+        <button class="register-btn" type="default" open-type="getPhoneNumber"
+          @getphonenumber="getPhoneNumber">获取手机号</button>
         <!-- <view class="register-btn" @click.stop="handleRegister()">注册并登录</view> -->
         <view class="no-register-btn" @click.stop="close()">暂不注册</view>
       </view>
@@ -17,6 +18,7 @@
 
 <script setup>
 import { ref } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
 import { userInfo, authorizationRegister, authorizationLogin, userPhone } from "@/api/login.js"
 // const isRegister = ref(true);
 const mobile = ref(undefined);
@@ -68,15 +70,15 @@ const getPhoneNumberError = () => {
   })
 }
 const registerAndLogin = (phone) => {
-  // const sharerInfo = uni.getStorageSync('sharerInfo')
   let nickname = '小彩团' + phone.slice(-4);;
+  let invitationCode = uni.getStorageSync('invitationCode') || '';
   authorizationRegister({
     "mobile": phone,
     "openId": openId.value,
     nickname: nickname,
     clientType: 1,
-    gender: 0
-    // "invitation_code": sharerInfo.invitation_code
+    gender: 0,
+    invitationCode: invitationCode ? invitationCode : undefined
   }).then(res => {
     const {
       token
@@ -97,6 +99,11 @@ const getUser = (token) => {
     })
   })
 }
+
+onLoad((options) => {
+  
+})
+
 defineExpose({ open, close })
 </script>
 

pages/order/mallOrder/orderList.vue

@@ -2,6 +2,7 @@
   <view class="container">
     <uv-sticky bgColor="#f7f7f7">
       <uv-tabs
+        :current="isChange"
         :list="orderType"
         :lineColor="`url('${$handleImageUrl('/order/tabs_line.png')}') 100% 100%`"
         lineWidth="64rpx"
@@ -293,7 +294,7 @@ const cancelOrder = (item) => {
 };
 
 onLoad((options) => {
-  console.log(options);
+  // console.log(options);
   if (options.keys) {
     if (options.keys == -1) {
       isChange.value = 0;

pages/set/index.vue

@@ -1,8 +1,8 @@
 <template>
+    <!-- @click.stop="handleOperation({ type: 'userDetails', needToken: true })" -->
   <view
     class="header-user"
     v-if="userDetails.id"
-    @click.stop="handleOperation({ type: 'userDetails', needToken: true })"
   >
     <view class="user-photo">
       <image
@@ -14,7 +14,7 @@
       <view class="user-name">{{ userDetails.nickname || "" }}</view>
       <view class="user-phone">{{ userDetails.mobile || "" }}</view>
     </view>
-    <text class="iconfont icon-right1">&#xe671;</text>
+    <!-- <text class="iconfont icon-right1">&#xe671;</text> -->
   </view>
   <uv-gap height="12" bgColor="#F7F7F7"></uv-gap>
   <view class="body-operation">
@@ -309,7 +309,7 @@ onLoad(() => {
 
   // #ifndef MP-WEIXIN
   console.log("不是小程序");
-  getThirdBindingInfo()
+  // getThirdBindingInfo()
   // #endif
 
 });

pages/shop/goodSearch.vue

@@ -3,7 +3,7 @@
     <uv-navbar title="搜索" placeholder @leftClick="goBack"></uv-navbar>
     <div class="search-box">
       <div class="search-wap">
-        <text class="hxicon search-icon">&#xe65c;</text>
+        <text class="iconfont search-icon">&#xe618;</text>
         <input type="text" focus class="sput" placeholder-style="color: #999999;" confirm-type="search" v-model="inputValue" placeholder="请输入搜索内容" @confirm="goSearchConfirm" />
       </div>
       <div class="word" @click="goSearchConfirm">搜索</div>

pages/shop/goodsList.vue

@@ -6,7 +6,7 @@
         <div class="search-box">
           <div class="search-wap">
             <!-- <text class="iconfont search-icon">&#xe7a6;</text> -->
-            <text class="hxicon search-icon">&#xe65c;</text>
+            <text class="iconfont search-icon">&#xe618;</text>
             <input type="text" class="sput" placeholder-style="color: #ddd;" confirm-type="search" v-model="value" placeholder="请输入搜索关键字" @confirm="confirmSubmit" />
           </div>
           <div class="word" @click="search()">搜索</div>

pages/tabtar/home.vue

@@ -6,14 +6,8 @@
         <text class="titlt-txt">商城</text>
       </view>
       <view class="input-box">
-        <view
-          class="status-bar"
-          :style="[{ height: `${statusBarHeight}px` }]"
-          @click="searchClick"
-        ></view>
-        <view class="input-placeholder" @click="searchClick"
-          >请输入检索关键字</view
-        >
+        <view class="status-bar" :style="[{ height: `${statusBarHeight}px` }]" @click="searchClick"></view>
+        <view class="input-placeholder" @click="searchClick">请输入检索关键字</view>
         <view class="msgCenter" @click="goToMsg()">
           <!-- &#xe67c; -->
           <uv-icon name="chat" color="#ffffff" size="28"></uv-icon>
@@ -22,30 +16,14 @@
       </view>
     </view>
     <view class="u-skeleton">
-      <view
-        class="swiper u-skeleton-rect"
-        :class="showTopSearch ? '' : 'mt120'"
-        v-if="(shopBanner && shopBanner.length > 0) || skeletonShow"
-      >
+      <view class="swiper u-skeleton-rect" :class="showTopSearch ? '' : 'mt120'"
+        v-if="(shopBanner && shopBanner.length > 0) || skeletonShow">
         <view class="uni-margin-wrap">
-          <swiper
-            class="swiper"
-            :indicator-dots="true"
-            :autoplay="true"
-            :interval="2000"
-            :duration="1000"
-            circular="false"
-          >
-            <swiper-item
-              v-for="item in skeletonShow ? 1 : shopBanner"
-              :key="item.id"
-            >
+          <swiper class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="1000"
+            circular="false">
+            <swiper-item v-for="item in skeletonShow ? 1 : shopBanner" :key="item.id">
               <view class="swiper-item" @click="$mUtil.imgLink(item)">
-                <image
-                  class="bannersize"
-                  :src="`${item.image}`"
-                  mode="aspectFill"
-                ></image>
+                <image class="bannersize" :src="`${item.image}`" mode="aspectFill"></image>
               </view>
             </swiper-item>
           </swiper>
@@ -54,97 +32,48 @@
       <!-- 首页一级分类 -->
       <div class="one-cate">
         <!-- cateList.slice(0,4) -->
-        <div
-          class="item"
-          v-for="item in skeletonShow ? 4 : cateList"
-          @click="jumpHxCate(item, 0)"
-          :key="item.id"
-        >
+        <div class="item" v-for="item in skeletonShow ? 4 : cateList" @click="jumpHxCate(item, 0)" :key="item.id">
           <!-- ?x-oss-process=style/w_350 -->
-          <image
-            class="u-skeleton-fillet"
-            mode="widthFix "
-            :src="`${item.icon}`"
-          >
+          <image class="u-skeleton-fillet" mode="widthFix " :src="`${item.icon}`">
           </image>
           <div class="word u-skeleton-fillet u-font26">
             {{ item.name || "加载中" }}
           </div>
         </div>
       </div>
-      <view
-        v-if="(homeBanner1 && homeBanner1.image) || skeletonShow"
-        class="banner1Cls"
-        @click="$mUtil.imgLink(homeBanner1)"
-      >
+      <view v-if="(homeBanner1 && homeBanner1.image) || skeletonShow" class="banner1Cls"
+        @click="$mUtil.imgLink(homeBanner1)">
         <!-- ?x-oss-process=style/w_350 -->
-        <image
-          class="font u-skeleton-fillet"
-          :src="`${homeBanner1.image}`"
-          mode=""
-        ></image>
+        <image class="font u-skeleton-fillet" :src="`${homeBanner1.image}`" mode=""></image>
       </view>
       <!-- 惠选专区 hxCateList-->
-      <ChoiceZone
-        ref="choiceZoneRef"
-        :skeletonShow="skeletonShow"
-        @jumpHxCate="jumpHxCate"
-      />
+      <ChoiceZone ref="choiceZoneRef" :skeletonShow="skeletonShow" @jumpHxCate="jumpHxCate" />
 
       <!-- 限时秒杀 -->
-      <Seckill
-        ref="seckillRef"
-        :skeletonShow="skeletonShow"
-        @goDetail="goDetail"
-        @goProductDetails="goProductDetails"
-      />
+      <Seckill ref="seckillRef" :skeletonShow="skeletonShow" @goDetail="goDetail"
+        @goProductDetails="goProductDetails" />
 
       <!-- 拼团购 -->
-      <GroupBuy
-        ref="groupBuyRef"
-        :skeletonShow="skeletonShow"
-        :bgImage="bgImage.image2"
-        @goDetail="goDetail"
-        @goProductDetails="goProductDetails"
-      />
+      <GroupBuy ref="groupBuyRef" :skeletonShow="skeletonShow" :bgImage="bgImage.image2" @goDetail="goDetail"
+        @goProductDetails="goProductDetails" />
 
       <!-- 热门推荐 -->
-      <HotRecommend
-        ref="hotRecommendRef"
-        :skeletonShow="skeletonShow"
-        :bgImage="bgImage.image3"
-        @goDetail="goDetail"
-        @goProductDetails="goProductDetails"
-      />
+      <HotRecommend ref="hotRecommendRef" :skeletonShow="skeletonShow" :bgImage="bgImage.image3" @goDetail="goDetail"
+        @goProductDetails="goProductDetails" />
 
       <!-- 本月热销 -->
-      <MonthlyBestSeller
-        ref="monthlyBestSellerRef"
-        :skeletonShow="skeletonShow"
-        :bgImage="bgImage.image4"
-        @goDetail="goDetail"
-        @goProductDetails="goProductDetails"
-      />
+      <MonthlyBestSeller ref="monthlyBestSellerRef" :skeletonShow="skeletonShow" :bgImage="bgImage.image4"
+        @goDetail="goDetail" @goProductDetails="goProductDetails" />
 
       <!-- 猜你喜欢 -->
-      <GuessYouLike
-        ref="guessYouLikeRef"
-        :goodsList="goodsList"
-        :skeletonShow="skeletonShow"
-        :bgImage="bgImage.image5"
-        @goDetail="goDetail"
-        @goProductDetails="goProductDetails"
-      />
+      <GuessYouLike ref="guessYouLikeRef" :goodsList="goodsList" :skeletonShow="skeletonShow" :bgImage="bgImage.image5"
+        @goDetail="goDetail" @goProductDetails="goProductDetails" />
 
       <view class="cart-entrance" @click="toCartPage()">
         <!-- <image :src="imgUrl + '/static/czd/car.png'" alt=""></image> -->
         <uv-icon name="shopping-cart" color="#000" size="32"></uv-icon>
       </view>
-      <uv-skeleton
-        :loading="skeletonShow"
-        :animation="true"
-        bgColor="#FFF"
-      ></uv-skeleton>
+      <uv-skeleton :loading="skeletonShow" :animation="true" bgColor="#FFF"></uv-skeleton>
     </view>
   </view>
 </template>
@@ -156,7 +85,7 @@ import {
   onShow,
   onPullDownRefresh,
   onPageScroll,
-  onShareAppMessage,
+  onShareAppMessage
 } from "@dcloudio/uni-app";
 import { getAdList_Api, getQuickLinkList_Api } from "@/api/index.js";
 import { messageUnreadNum_Api } from "@/api/userInfo.js";
@@ -182,7 +111,7 @@ const menuButtonHeight = ref(44);
 // #ifdef APP-PLUS
 try {
   let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-    // console.log("menuButtonInfo", menuButtonInfo);
+  // console.log("menuButtonInfo", menuButtonInfo);
   menuButtonHeight.value = menuButtonInfo.height + 10;
 } catch (error) {
   console.log(error);
@@ -225,7 +154,7 @@ const getHomeBanner1 = () => {
   });
 };
 
-const init = () => {  
+const init = () => {
   getBanner();
   getOneCate();
   getHomeBanner1();
@@ -328,7 +257,9 @@ const toCartPage = () => {
 };
 
 // 生命周期钩子
-onLoad(() => {
+onLoad((e) => {
+  // uni.setStorageSync('invitationCode', 'UMMI5MDK');
+  // console.log("e===>", e);
   skeletonShow.value = false;
   init();
 });
@@ -339,11 +270,11 @@ onShow(() => {
 
 onPullDownRefresh(() => {
   init();
-  if(choiceZoneRef.value) choiceZoneRef.value.init();
-  if(seckillRef.value) seckillRef.value.init();
-  if(groupBuyRef.value) groupBuyRef.value.init();
-  if(hotRecommendRef.value) hotRecommendRef.value.init();
-  if(monthlyBestSellerRef.value) monthlyBestSellerRef.value.init();
+  if (choiceZoneRef.value) choiceZoneRef.value.init();
+  if (seckillRef.value) seckillRef.value.init();
+  if (groupBuyRef.value) groupBuyRef.value.init();
+  if (hotRecommendRef.value) hotRecommendRef.value.init();
+  if (monthlyBestSellerRef.value) monthlyBestSellerRef.value.init();
   // if(guessYouLikeRef.value) guessYouLikeRef.value.init();
 
   setTimeout(() => {
@@ -368,15 +299,11 @@ onPageScroll((e) => {
   }
 });
 
-onShareAppMessage((res) => {
-  let user = uni.getStorageSync("personal");
-  if (res.from === "button") {
-    // 来自页面内分享按钮
-    console.log(res.target);
-  }
+onShareAppMessage(() => {
+  const userInfo = uni.getStorageSync("personal") || {};
   return {
     title: "商城",
-    path: `/pages/tabtar/home?shareId=${user.id || ""}`,
+    path: `/pages/tabtar/home?invitationCode=${userInfo.invitationCode || ""}`,
   };
 });
 </script>
@@ -587,7 +514,7 @@ onShareAppMessage((res) => {
   width: 100%;
 
   &.hide {
-    background: linear-gradient(180deg,#fbbb1b, #fbbd1c);
+    background: linear-gradient(180deg, #fbbb1b, #fbbd1c);
   }
 
   .title {
@@ -690,6 +617,17 @@ onShareAppMessage((res) => {
         line-height: normal;
       }
     }
+
+    .shareBtn {
+      margin-left: 10rpx;
+      padding: 0;
+      background: transparent;
+      line-height: initial;
+    }
+
+    .shareBtn::after {
+      border: none;
+    }
   }
 
   .input-placeholder {
@@ -734,4 +672,4 @@ onShareAppMessage((res) => {
     height: 200rpx;
   }
 }
-</style>
+</style>

pages/tabtar/personalCenter.vue

@@ -166,9 +166,6 @@ import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 import { userInfo } from "@/api/login.js";
 import { messageUnreadNum_Api, totalIntegral_Api } from "@/api/userInfo.js";
 import utils from "@/util/index.js";
-const handleImageUrl = (url) => {
-  return `'/static/image${url}'`;
-};
 
 const userInformation = ref({});
 const myMsg = ref(0);
@@ -191,42 +188,42 @@ const orderStatusList = [
 const toolsList = ref([
   {
     label: "我的拼团",
-    icon: "/static/image/personalCenter/tool1.png",
+    icon: "/static/image/personalCenter/tool2.png",
     url: "/pages/groupBuying/myGbOrder/list",
     idNeedLogin: true,
     isPage: true,
   },
   {
     label: "收货地址",
-    icon: "/static/image/personalCenter/tool2.png",
+    icon: "/static/image/personalCenter/tool3.png",
     url: "/pages/user/address/addressList?formType=mine",
     idNeedLogin: true,
     isPage: true,
   },
   {
     label: "分销中心",
-    icon: "/static/image/personalCenter/tool3.png",
+    icon: "/static/image/personalCenter/tool1.png",
     url: "/pages/distribution/index",
     idNeedLogin: true,
     isPage: true,
   },
   {
     label: "我的收藏",
-    icon: "/static/image/personalCenter/tool4.png",
+    icon: "/static/image/personalCenter/tool5.png",
     url: "/pages/user/collection",
     idNeedLogin: true,
     isPage: true,
   },
   {
     label: "商家入驻",
-    icon: "/static/image/personalCenter/tool5.png",
+    icon: "/static/image/personalCenter/tool4.png",
     url: "/pages/user/merchant/settleIn?type=tenants_agreement",
     idNeedLogin: true,
     isPage: true,
   },
   {
     label: "官方客服",
-    icon: "/static/image/personalCenter/tool6.png",
+    icon: "/static/image/personalCenter/tool9.png",
     url: "",
     key: "kf",
     idNeedLogin: false,
@@ -234,21 +231,21 @@ const toolsList = ref([
   },
   {
     label: "常见问题",
-    icon: "/static/image/personalCenter/tool7.png",
+    icon: "/static/image/personalCenter/tool8.png",
     url: "/pages/user/faq",
     idNeedLogin: false,
     isPage: true,
   },
   {
     label: "领券中心",
-    icon: "/static/image/personalCenter/tool8.png",
+    icon: "/static/image/personalCenter/tool6.png",
     url: "/pages/couponCenter/index",
     idNeedLogin: false,
     isPage: true,
   },
   {
     label: "优惠券",
-    icon: "/static/image/personalCenter/tool9.png",
+    icon: "/static/image/personalCenter/tool7.png",
     url: "/pages/couponCenter/index?isMyCoupon=true",
     idNeedLogin: true,
     isPage: true,

pages/user/address/addEditAddress.vue

@@ -189,7 +189,7 @@ onLoad((options) => {
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 page {
   background-color: #f5f5f5;
 }
@@ -319,7 +319,6 @@ page {
     font-weight: 500;
     text-align: center;
     // background: linear-gradient(90deg, #ff6b35, #fa6138);
-    background: #e93534;
     box-shadow: 0 10rpx 20rpx rgba(250, 97, 56, 0.3);
   }
 

pages/user/address/addressList.vue

@@ -71,7 +71,7 @@ const addressList = ref([]);
 // 获取地址列表
 const getAddressList = async () => {
   useraddressList_Api().then(async (res) => {
-    console.log("res", res);
+    // console.log("res", res);
     if (res.code == 200) {
       addressList.value = res.data;
     }

pages/user/myMsg.vue

@@ -156,7 +156,7 @@ const goTodel = (type, name) => {
 const getMsg = () => {
   messageUnreadInfo_Api().then((res) => {
     if (res && res.code == 200) {
-      console.log(res);
+      // console.log(res);
       msg.value = res.data;
       res.data.forEach((v) => {
         if (v.type == 1) titleTwo.value = v;

pages/user/pointsList.vue

@@ -3,12 +3,7 @@
     <uv-navbar title="我的积分" placeholder autoBack></uv-navbar>
     <view class="points-main">
       <view class="points-main-item" v-for="v in pointsList" :key="v.id">
-        <image
-          class="item-img"
-          v-if="v.businessVo && v.businessVo.image"
-          :src="v.businessVo.image"
-          alt=""
-        />
+        <image class="item-img" v-if="v.businessVo && v.businessVo.image" :src="v.businessVo.image" alt="" />
         <view class="item-info">
           <view class="item-name" v-if="v.businessVo">{{ v.businessVo.businessName }}</view>
           <view class="item-address">
@@ -24,12 +19,9 @@
           </view>
         </view>
       </view>
+      <noData v-if="pointsList.length == 0" :config="{ top: 2, content: '暂无数据~' }"></noData>
+      <loadMore v-if="pointsList.length > 0" :status="status"></loadMore>
     </view>
-    <noData
-      v-if="pointsList.length == 0"
-      :config="{ top: 20, content: '暂无数据~' }"
-    ></noData>
-    <loadMore v-if="pointsList.length > 0" :status="status"></loadMore>
   </view>
 </template>
 
@@ -91,46 +83,59 @@ onPullDownRefresh(() => {
   getList();
 });
 </script>
-
+<style>
+page{
+  background: #f7f7f7;
+}
+</style>
 <style lang="scss" scoped>
 .points-main {
   padding: 30rpx;
   background: #f7f7f7;
-  min-height: 100vh;
+  // min-height: 100vh;
   box-sizing: border-box;
+
   .points-main-item {
     display: flex;
     background: #ffffff;
     border-radius: 20rpx;
     padding: 30rpx 20rpx;
     margin-bottom: 30rpx;
+
     .item-img {
       width: 210rpx;
       height: 210rpx;
       border-radius: 10rpx;
       flex-shrink: 0;
     }
+
     .item-info {
       flex: 1;
       padding-left: 30rpx;
+
       .item-name {
         font-size: 28rpx;
         font-weight: 700;
       }
+
       .item-address {
         font-size: 24rpx;
         color: #999999;
         margin: 6rpx 0;
       }
+
       .item-integral {
         font-size: 26rpx;
+
         .integral {
           color: #ff8000;
         }
       }
+
       .item-more {
         text-align: right;
         margin-top: 20rpx;
+
         .item-more-text {
           display: inline-block;
           width: 165rpx;

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 5064895 */
-  src: url('iconfont.woff2?t=1765763608477') format('woff2'),
-       url('iconfont.woff?t=1765763608477') format('woff'),
-       url('iconfont.ttf?t=1765763608477') format('truetype');
+  src: url('iconfont.woff2?t=1775530463365') format('woff2'),
+       url('iconfont.woff?t=1775530463365') format('woff'),
+       url('iconfont.ttf?t=1775530463365') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ketixianjine:before {
+  content: "\e634";
+}
+
+.icon-fenxiaodingdan:before {
+  content: "\e645";
+}
+
+.icon-hezuohuobanxianxing:before {
+  content: "\e614";
+}
+
 .icon-dizhi:before {
   content: "\e6da";
 }

static/style/common.scss

@@ -770,6 +770,13 @@
   height: 180rpx;
 }
 
+.u-avatar106{
+  width: 106rpx;
+  height: 106rpx;
+  border-radius: 20rpx;
+  margin-right: 10rpx;
+}
+
 .u-avatar104{
   width: 104rpx;
   height: 104rpx;