feat: 养老金页面

components.d.ts

@@ -40,15 +40,23 @@ declare module '@vue/runtime-core' {
     FTag: typeof import('./src/components/FTag/FTag.vue')['default']
     FTransition: typeof import('./src/components/FTransition/FTransition.vue')['default']
     NutButton: typeof import('uniapp-nutui/components/button/button.vue')['default']
+    NutCalendar: typeof import('uniapp-nutui/components/calendar/calendar.vue')['default']
     NutCascader: typeof import('uniapp-nutui/components/cascader/cascader.vue')['default']
     NutCheckbox: typeof import('uniapp-nutui/components/checkbox/checkbox.vue')['default']
+    NutDatePicker: typeof import('uniapp-nutui/components/datepicker/datepicker.vue')['default']
     NutDialog: typeof import('uniapp-nutui/components/dialog/dialog.vue')['default']
     NutForm: typeof import('uniapp-nutui/components/form/form.vue')['default']
     NutFormItem: typeof import('uniapp-nutui/components/formitem/formitem.vue')['default']
+    NutIcon: typeof import('uniapp-nutui/components/icon/icon.vue')['default']
     NutInput: typeof import('uniapp-nutui/components/input/input.vue')['default']
     NutInputNumber: typeof import('uniapp-nutui/components/inputnumber/inputnumber.vue')['default']
+    NutMenu: typeof import('uniapp-nutui/components/menu/menu.vue')['default']
+    NutMenuItem: typeof import('uniapp-nutui/components/menuitem/menuitem.vue')['default']
     NutNoticebar: typeof import('uniapp-nutui/components/noticebar/noticebar.vue')['default']
+    NutPopup: typeof import('uniapp-nutui/components/popup/popup.vue')['default']
+    NutSearchbar: typeof import('uniapp-nutui/components/searchbar/searchbar.vue')['default']
     NutSwitch: typeof import('uniapp-nutui/components/switch/switch.vue')['default']
+    NutTable: typeof import('uniapp-nutui/components/table/table.vue')['default']
     NutTabPane: typeof import('uniapp-nutui/components/tabpane/tabpane.vue')['default']
     NutTabs: typeof import('uniapp-nutui/components/tabs/tabs.vue')['default']
     ProductCard: typeof import('./src/components/ProductCard/ProductCard.vue')['default']

src/apis/auth.api.ts

@@ -22,6 +22,12 @@ enum API {
     USER_EXTRACT_BAND_OPENID = '/api/user/extract/band_openid',
 }
 
+
+export function getUpdateAccount(): Promise<{wechat_user_id: string, ali_user_id: string}> {
+    return defHttp.post({
+        url: API.USER_UPDATE_ACCOUNT,
+    })
+}
 /**
  * 短信验证码
  * @param phone

src/apis/model/auth.model.ts

@@ -0,0 +1,9 @@
+/**
+ * 第三方账号绑定
+ */
+export interface UpdateAccountModel {
+    //绑定微信返回这个参数（openid）
+    wechat_user_id: string
+    //绑定支付宝返回这个参数（userId）
+    ali_user_id: string
+}

src/apis/model/invite.model.ts

@@ -0,0 +1,14 @@
+export interface InviteResult {
+    numberSun: string
+    UserYesterdayInviteProfit: string
+    UserUnsettledInviteProfit: string
+}
+
+export interface InvitePHPModel {
+    nickname: string//昵称
+    avatar: string//头像
+    brokerage_price: string//当前佣金
+    yesterday: string//昨日收益
+    cumulative: string//累计收益
+    extract: string//	累计已提现
+}

src/apis/model/redIntegral.model.ts

@@ -0,0 +1,14 @@
+export interface RedIntegralResult {
+    status: number
+    message: string
+    data: Array<RedIntegralModel>
+}
+
+export interface RedIntegralModel {
+    uid: string
+    red: string
+    pm: string
+    time: string
+    create_time: string
+    mark: string
+}

src/apis/model/revenueSharingModel.ts

@@ -17,7 +17,7 @@ export interface RevenueSharingModel {
     // 金额
     number: string
     //状态：0-未结算。1-已结算。-1-失效
-    status: string
+    status: number
     create_time: string
     uid: string
     // 订单号

src/apis/model/withdrawal.model.ts

@@ -0,0 +1,7 @@
+export interface WithdrawalConfigurationModel {
+      withdrawal_alipay : string//支付宝提现0:关闭,1:开启
+      withdrawal_card : string
+      withdrawal_money : string//最低金额
+      withdrawal_status : string//提现功能0:关闭 ,1:开启
+      withdrawal_wchat : string//微信提现0:关闭 , 1:开启
+}

src/apis/user.ts

@@ -29,6 +29,7 @@ import type {UserVipInfoModel} from "~/apis/model/user-vip-info.model";
 import type {CertificationRequest} from "~/apis/model/certification.model";
 import type {RelationRequest} from "~/apis/model/relation.model";
 import type {YanglaoLogXsResult, YanglaoLogXxResult} from "~/apis/model/yanglao-log.model";
+import type {InvitePHPModel} from "~/apis/model/invite.model";
 
 // 会员中心的提现
 // export function entropy(data) {
@@ -41,6 +42,8 @@ enum API {
 
     // 养老金信息
     GET_YANGLAO = '/api/user/get_yanglao',
+    // 公证处养老金余额
+    GET_AMOUNT_FROM_GZC = '/api/user/getAmountFromGzc',
     // 养老金记录
     GET_YANGLAOJIN_STATISTICS = '/api/user/get_yanglao_statistics',
     // 养老金明细
@@ -61,17 +64,27 @@ enum API {
     USER_WITHDRAWAL = '/api/user/withdrawal',
     // 提现配置
     WITHDRAWAL_CONFIG = '/api/withdrawal/config',
+    // 提现检测是否绑定提交账户接口
+    GET_BAND_ACCOUNT_INFO = '/api/user/extract/get_band_account_info',
+    // 绑定账号
+    // USER_BAND_ACCOUNT = '/api/user/extract/band_account',
+    // 提现申请
+    USER_EXTRACT_CREATE = '/api/user/extract/create',
+
     // 佣金信息
     USER_SPREAD_INFO = '/api/user/spread_info',
 
     // JAVA 累计收益列表 use by accumulateIncome
     USER_INVITE_PROFIT_LIST = '/gateway/userCenter_service/userInviteService/userInviteProfitList',
     // 分享收益
-    GET_COMMISSION_LIST = '/api/get_commission_list',
+    GET_COMMISSION_LIST = '/api/user/get_commission_list',
 
     // 评论列表
     GET_REPLY_LIST = '/api/reply/list',
-
+    // java 我的邀请
+    SELECT_USER_INVITE_PROFIT = '/gateway/userCenter_service/userInviteService/selectUserInviteProfit',
+    // PHP 我的邀请
+    GET_AGENT_INFO = '/api/user/get_agent_info',
     // java 邀请商户+伙伴个数 列表
     USER_INVITE_LIST = '/gateway/userCenter_service/userInviteService/userInviteList',
     // java 用户分享产品列表
@@ -144,6 +157,66 @@ enum API {
     // getCertification
 }
 
+/**
+ * 公证处养老金余额
+ */
+export function getAmountFromGzc(): Promise<{amount: string}> {
+    return defHttp.get({
+        url: API.GET_AMOUNT_FROM_GZC,
+    })
+}
+/**
+ * PHP 我的邀请
+ */
+export function getAgentInfo(): Promise<InvitePHPModel> {
+    return defHttp.get({
+        url: API.GET_AGENT_INFO
+    })
+}
+/**
+ * JAVA 我的邀请
+ * @param params
+ */
+export function getSelectUserInviteProfit(params: {uid: string}): Promise<IntegralResult>{
+    return defHttp.get({
+        url: API.SELECT_USER_INVITE_PROFIT,
+        data: {
+            ...params
+        }
+    }, {
+        withToken: false
+    })
+}
+/**
+ * 提现配置
+ */
+export function getWithdrawalConfig() {
+    return defHttp.get({
+        url: API.WITHDRAWAL_CONFIG
+    })
+}
+
+// 提现检测是否绑定提交账户接口
+export function getBandAccountInfo(params: {
+    // 1微信
+    type: string
+}) {
+    return defHttp.post({
+        url: API.GET_BAND_ACCOUNT_INFO
+    })
+}
+/**
+ * 获取红积分列表
+ * @param params
+ */
+export function getRedIntegralList(params: {page: number, limit: number}) {
+    return defHttp.get({
+        url: API.USER_RED_LOG,
+        data: {
+            ...params
+        }
+    })
+}
 /* 关注/收藏
  */
 export function relation(params: RelationRequest) {
@@ -407,6 +480,20 @@ export function getWithdrawal(params: {
 }
 
 /**
+ * 提现申请
+ */
+export function getApplicationWithdrawal(params: {
+    extract_price: string,
+    extract_type: string
+}) {
+    return defHttp.post({
+        url: API.USER_EXTRACT_CREATE,
+        data: {
+            ...params
+        }
+    })
+}
+/**
  * 获取用户养老金信息
  */
 export function getUserYangLaoJin(): Promise<UserYanglaoJinModel> {
@@ -662,7 +749,12 @@ export function reLogin() {
     uni.switchTab({
         url: '/pages/home/index'
     })
+}
 
+export function login(key: string) {
+    uni.navigateTo({
+        url: '/pages/user/login/index?key=' + key
+    })
 }
 
 /**

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -102,7 +102,7 @@ function handleCountChange(value) {
       v-model:show="showValue"
       @close="onCancel"
       position="bottom"
-      exClass="rounded-rt-xl rounded-lt-xl flex flex-col p-safe h-[40%]"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-[40%]"
 
   >
     <div class="flex flex-col justify-between h-full">
@@ -111,7 +111,7 @@ function handleCountChange(value) {
           <div class="flex flex-row gap-3">
             <image :src="detail.image"
                    v-if="currentSku"
-                   mode="widthFix" class="w-25 h-25 rounded"></image>
+                   mode="aspectFit" class="w-25 h-25 rounded"></image>
             <div class="flex flex-col w-full">
 
               <div class="flex gap-2 justify-between w-full">
@@ -140,12 +140,12 @@ function handleCountChange(value) {
             </div>
           </div>
 
-          <div class="flex flex-row gap-2">
+          <div class="flex flex-row gap-2  flex-wrap">
             <div
                 v-for="(item, index) in skuList"
                 :key="index"
                 @tap="handleSelectedSku(item)"
-                class="text-[12px] border border-solid rounded p-1 px-2"
+                class="text-[12px] border border-solid rounded p-1 px-2 "
                 :class="currentSku.unique === item.unique ? 'border-primary text-primary' : 'border-gray-500 text-gray-500'"
             >
               {{ item.sku }}
@@ -162,7 +162,7 @@ function handleCountChange(value) {
         </div>
       </div>
 
-      <div class="px-3">
+      <div class="px-3 ">
         <FButton
             @click="handleAddCart"
             size="small"

src/pages/account-cancel/index.vue

@@ -13,6 +13,10 @@ function onCancel() {
   modalVisible.value = false
 }
 
+function handleCancel() {
+  modalVisible.value = true
+}
+
 function onOk() {
   closeAccount(userStore.userInfo.phone).then(res => {
     reLogin()
@@ -46,7 +50,9 @@ function onOk() {
     </div>
 
     <div class="fixed bottom-0 pb-safe w-full">
-      <div class="px-10 ">
+      <div
+          @click="handleCancel"
+          class="px-10 ">
         <div class="text-center text-white bg-primary rounded-full text-sm p-2">
           注销账户
         </div>

src/pages/accumulate-income/index.vue

@@ -5,20 +5,44 @@ import type {AccumulateIncomeModel} from "~/apis/model/accumulateIncomeModel";
 import {Ref} from "vue";
 const userStore = useUserStore()
 const accumulateIncome: Ref<AccumulateIncomeModel | undefined> = ref<AccumulateIncomeModel>()
+const state = reactive({
+  options: [{
+    text: '全部类型',
+    value: ''
+  }, {
+    text: '分享收益',
+    value: 0
+  }, {
+    text: '奖励收益',
+    value: 8
+  }],
+  selectValue: '',
+  list: [{
+    // number: 0.19,
+    // title: '分享收益',
+    // createTime: '202020'
+  }],
+})
 
 onLoad((option: any) => {
   if (userStore.uid) {
     getUserInviteProfitList({
       pageNum: 1,
-      pageSize: 10,
+      pageSize: 20,
       uid: userStore.uid,
     }).then(res => {
       accumulateIncome.value = res
+      state.list = res.pageInfo.list
+
     })
   }
 })
+
+// function loadList()
 </script>
 <template>
+  <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
+
   <div class="px-3 py-3 flex flex-col gap-3">
     <div class="bg-white rounded-lg p-4 flex flex-col gap-4 ">
       <div class="flex justify-around">
@@ -54,15 +78,31 @@ onLoad((option: any) => {
     </div>
     <div class="bg-white rounded-lg p-3 flex flex-col gap-4 text-sm">
       <div class="flex justify-between">
-        <div class="border border-solid border-1 border-red px-4 text-xs rounded text-red">
-          全部类型
-        </div>
+<!--        <div class="border border-solid border-1 border-red px-4 text-xs rounded text-red">-->
+<!--          全部类型-->
+<!--        </div>-->
+        <nut-menu>
+          <nut-menu-item v-model="state.selectValue" :options="state.options" />
+        </nut-menu>
         <div class="text-xs">金额</div>
       </div>
     </div>
 
     <div class="pb-safe">
-        <CXBEmpty />
+      <div v-if="state.list && state.list.length > 0" class="text-[12px]">
+        <div v-for="(item, index) in state.list" :key="index" class="bg-white p-3 f-hairline-bottom">
+          <div class="flex items-center">
+            <div class="flex flex-col gap-3 flex-1">
+              <div>{{ item.title }}</div>
+              <div class="text-gray">{{ item.createTime }}</div>
+            </div>
+            <div class="text-sm">+{{ item.number }}</div>
+          </div>
+
+        </div>
+
+      </div>
+        <CXBEmpty v-else/>
     </div>
 
   </div>
@@ -71,9 +111,14 @@ onLoad((option: any) => {
 <style>
 page {
   background: #f8f8f8;
+  --nut-menu-item-font-size: 12px;
+  --nut-menu-bar-line-height: 24px;
+  --nut-menu-bar-box-shadow: none
 }
 </style>
 <route lang="yaml">
 style:
+  navigationBarBackgroundColor: "#FD1642"
+  navigationBarTextStyle: "white"
   navigationBarTitleText: 累计收益
 </route>

src/pages/annuity/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getYanglaojinStatistics} from "~/apis/user";
+import {getAmountFromGzc, getYanglaojinStatistics} from "~/apis/user";
 import {CDN_URL} from "~/config/app";
 const get_to_know_buttons_220713Image = CDN_URL + '/static/assets/get_to_know_buttons_220713.png'
 const ylj_fh_220914Image = CDN_URL + '/static/assets/ylj_fh_220914.png'
@@ -40,6 +40,9 @@ const progress = [{
 const state = reactive({
   all_yanglao: 0,
   all_num: 0,
+  amountFromGzc: {
+    amount: 0
+  }
 })
 
 const yanglaoStatistics = ref()
@@ -54,6 +57,10 @@ onLoad(() => {
       })
     }
   })
+
+  getAmountFromGzc().then(res => {
+    state.amountFromGzc = res
+  })
 })
 function handleThirdBind() {
   uni.navigateTo({
@@ -120,12 +127,15 @@ function handleToCitic() {
           <div
               @tap="handleRealName"
               class="text-xs underline text-[#fe0032]"
-          >实名认证</div>
+          >
+            {{userStore.userInfo.is_ertification ? '已认证' : '实名认证'}}
+
+          </div>
         </div>
         <div class="flex-1 flex flex-col justify-between items-center py-4 gap-4">
           <div class="flex flex-col justify-center items-center">
             <div class="text-xs">总养老金</div>
-            <div class="text-[#F94032] font-bold text-[28px]">￥{{yanglaoStatistics.all_yanglao}}</div>
+            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{yanglaoStatistics.all_yanglao}}</div>
           </div>
           <div class=" flex justify-around w-full">
             <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
@@ -142,7 +152,7 @@ function handleToCitic() {
             <div
                 @tap="handleToCitic"
                 class="flex flex-col justify-center items-center pl-3">
-              <div>￥0.00</div>
+              <div>￥{{ state.amountFromGzc.amount }}</div>
               <div class="text-xs text-gray-400">中信公证处</div>
             </div>
           </div>

src/pages/bangfuzhongxin/index.vue

@@ -24,8 +24,12 @@ onShow(() => {
   }
 
   getRules(ruleId.value).then(res => {
-    console.log(res)
     ruleDetail.value = res
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 })
 
@@ -65,6 +69,18 @@ function handleApplyBangFu() {
     })
   })
 }
+
+function handleShowAnnuityDetail() {
+  uni.navigateTo({
+    url: '/pages/annuity/index'
+  })
+}
+
+function handleShowMyInvitation() {
+  uni.navigateTo({
+    url: '/pages/my-invitation/index'
+  })
+}
 </script>
 
 <template>
@@ -95,7 +111,7 @@ function handleApplyBangFu() {
           <div
               @tap="handleShowAnnuityDetail"
               class="w-1/3 flex flex-col justify-center items-center">
-            <div>{{ userStore.userInfo.annuity }}</div>
+            <div>{{ userStore.yanglao.all_yanglao }}</div>
             <div class="text-sm">养老金</div>
           </div>
           <div
@@ -124,18 +140,20 @@ function handleApplyBangFu() {
 
     </div>
 
-    <div class="p-3 bg-white text-sm text-gray-500">
-      <div v-if="ruleDetail && ruleDetail.content">
+    <div
+        v-if="ruleDetail && ruleDetail.content"
+        class="p-3 bg-white text-sm text-gray-500"
+    >
         <mpHtml :content="ruleDetail.content"></mpHtml>
-      </div>
     </div>
 
     <div class="flex flex-col justify-center items-center">
-      <div
+      <nut-button
           @tap="handleApplyBangFu"
-          class="w-fit h-8 rounded-full bg-red text-white text-xs px-2 flex flex-col justify-center items-center">
+          type="primary"
+      >
         立即开通
-      </div>
+      </nut-button>
     </div>
   </div>
 </template>

src/pages/home/index.vue

@@ -162,7 +162,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml"  type="home">
+<route lang="yaml"   type="home">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/immediate-withdrawal/index.vue

@@ -1,5 +1,12 @@
 <script setup lang="ts">
-import {getUserSpreadInfo, getUserYangLaoJin, getWithdrawalService} from "~/apis/user";
+import {
+  getApplicationWithdrawal,
+  getBandAccountInfo,
+  getUserSpreadInfo,
+  getUserYangLaoJin,
+  getWithdrawalConfig,
+  getWithdrawalService
+} from "~/apis/user";
 import {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
 import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
 import {CDN_URL} from "~/config/app";
@@ -10,23 +17,35 @@ const userSpreadInfo = ref<SpreadInfoModel>()
 
 const withdrawalCal = ref({})
 const yanglaojin = ref<UserYanglaoJinModel>()
+
+const widthdrawalConfig = ref({})
+
+const cashWithdrawalAmount = ref(0)
 // userSpreadInfo.value.brokerage_price
 onLoad(() => {
   userStore.getUserInfo().then(res => {})
+  // 佣金信息
   getUserSpreadInfo().then((res: SpreadInfoModel) => {
     userSpreadInfo.value = res
   })
 
   getUserYangLaoJin().then(res => {
     yanglaojin.value = res
-    console.log('加载养老金数据')
-    console.log(res)
+    // console.log('加载养老金数据')
+    // console.log(res)
   })
 
+  // 提现配置
+  getWithdrawalConfig().then(res => {
+    // console.log(res)
+    widthdrawalConfig.value = res
+  })
 })
 
 function handleInputChange(e) {
   if (e.detail.value) {
+    cashWithdrawalAmount.value = e.detail.value
+    console.log(cashWithdrawalAmount.value)
     getWithdrawalService({
       money: e.detail.value
     }).then(res => {
@@ -41,13 +60,54 @@ function handleInputChange(e) {
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+
+  if (widthdrawalConfig.value.withdrawal_status == '0') {
+    return uni.showToast({
+      title: '提现功能关闭',
+      icon: 'none'
+    })
+  }
+  if (widthdrawalConfig.value.withdrawal_wchat == '0') {
+    return uni.showToast({
+      title: '微信提现功能关闭',
+      icon: 'none'
+    })
+  }
+
+  if (userSpreadInfo.value?.brokerage_price) {
+    if (userSpreadInfo.value?.brokerage_price < widthdrawalConfig.value.withdrawal_money) {
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现'
+      })
+    }
+  } else {
+    return
+  }
+
+
   // 1 判断是否需要实名
-  if (yanglaojin.value?.is_certification === 1) {}
-  else {
-    uni.navigateTo({
+  if (!yanglaojin.value?.is_certification == 1) {
+    return uni.navigateTo({
       url: '/pages/real-name-authentication/index'
     })
   }
+
+  getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
+    // uni.showToast({
+    //   title: res,
+    //   icon: 'none'
+    // })
+    uni.showToast({
+      title: '提现成功',
+      icon: 'none'
+    }).then(res => {
+      uni.navigateTo({
+        url: '/pages/immediate-withdrawal/index'
+      })
+    })
+  })
+
+
   // if (yanglaojin.value) {
   // }
 }
@@ -98,29 +158,29 @@ function handleWithdrawalRecord() {
             <div>微信支付</div>
           </div>
           <div>
-            <radio/>
+            <radio checked/>
           </div>
         </div>
 
-        <div class="flex items-center justify-between py-3">
-          <div class="flex items-center gap-2">
-            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>
-            <div>支付宝支付</div>
-            </div>
-            <div>
-              <radio />
-            </div>
-          </div>
+<!--        <div class="flex items-center justify-between py-3">-->
+<!--          <div class="flex items-center gap-2">-->
+<!--            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>-->
+<!--            <div>支付宝支付</div>-->
+<!--            </div>-->
+<!--            <div>-->
+<!--              <radio />-->
+<!--            </div>-->
+<!--          </div>-->
       </div>
     </div>
 
     <div class="flex flex-col">
       <div class=" flex rounded-full bg-red-300">
-        <div class="h-10 flex justify-center items-center text-sm text-white  w-full"
+        <nut-button type="primary" block
              @tap="handleImmediateWithdrawal"
         >
           立即提现
-        </div>
+        </nut-button>
       </div>
 
       <div class="flex flex-col text-sm text-gray leading-8 py-4">

src/pages/invite-partners/index.vue

@@ -18,9 +18,26 @@ onLoad(() => {
     }
   })
 })
+
+const searchValue = ref('')
+function handleSearch() {
+  getUserInviteList({
+    uid: userStore.uid ? userStore.uid : '',
+    nickname: searchValue.value,
+    pageNum: 1,
+    pageSize: 100
+  }).then(res => {
+    if (res) {
+      invitePartnerModel.value = res
+      console.log(res)
+    }
+  })
+}
 </script>
 
 <template>
+  <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
+
   <div class="px-3 flex flex-col gap-3">
     <div class="flex justify-around text-xs bg-white rounded-lg mt-3 h-40">
       <div class="flex flex-col justify-center items-center gap-4">
@@ -40,6 +57,12 @@ onLoad(() => {
         </div>
       </div>
     </div>
+    <nut-searchbar v-model="searchValue" @search="handleSearch">
+      <template v-slot:leftin>
+        <nut-icon  name="search2"  />
+      </template>
+    </nut-searchbar>
+
     <div class="pb-safe">
       <div class="grid grid-cols-3 bg-white rounded-tl-lg rounded-tr-lg text-center text-sm p-3">
         <div class="text-left">用户</div>
@@ -66,5 +89,7 @@ page {
 </style>
 <route lang="yaml">
 style:
+  navigationBarBackgroundColor: "#FD1642"
+  navigationBarTextStyle: "white"
   navigationBarTitleText: 邀请伙伴
 </route>

src/pages/miaosha/index.vue

@@ -5,6 +5,7 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 const currentSeckillDate = ref()
 
 const list = ref<Array<DcSeckillModel>>()
@@ -12,7 +13,7 @@ const currentProductList = ref([])
 onLoad((options) => {
   getDcSeckill().then(res => {
     list.value = res
-    if (res) {
+    if (list.value && list.value?.length > 0) {
       currentSeckillDate.value = list.value[0].seckill_date
       currentProductList.value = list.value[0].product_data
 
@@ -33,24 +34,28 @@ function handleItemClick(seckillItem) {
 </script>
 <template>
   <CXBBasePage>
-    <scroll-view
-        class=" whitespace-nowrap  w-screen  text-sm py-3"
-        :scroll-with-animation="true"
-        :scroll-x="true"
-        :show-scrollbar="false"
+    <div
+        v-if="list && list.length > 0"
+
     >
-      <div
-          @tap="handleSeckillDateClick(item)"
-          v-for="(item, index) in list"
-          :key="index"
-          class="flex inline-flex items-center justify-center relative pl-5"
-          :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
+      <scroll-view
+          class=" whitespace-nowrap  w-screen  text-sm py-3"
+          :scroll-with-animation="true"
+          :scroll-x="true"
+          :show-scrollbar="false"
       >
-        {{item.seckill_date}}
-      </div>
-      <!--      </div>-->
-    </scroll-view>
-    <div class="p-3 pb-safe">
+        <div
+            @tap="handleSeckillDateClick(item)"
+            v-for="(item, index) in list"
+            :key="index"
+            class="flex inline-flex items-center justify-center relative pl-5"
+            :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
+        >
+          {{item.seckill_date}}
+        </div>
+        <!--      </div>-->
+      </scroll-view>
+      <div class="p-3 pb-safe">
         <div class="flex flex-col gap-3">
           <div
               @tap="handleItemClick(seckillItem)"
@@ -88,7 +93,10 @@ function handleItemClick(seckillItem) {
           </div>
 
         </div>
+      </div>
     </div>
+    <CXBEmpty v-else/>
+
   </CXBBasePage>
 
 </template>

src/pages/my-integral/index.vue

@@ -1,12 +1,15 @@
 <script setup lang="ts">
 import {useUserStore} from "~/stores/userStore";
-import {getUserInfo} from "~/apis/user";
+import {getNewSignInInfo, getUserInfo} from "~/apis/user";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
+import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 
 const userStore = useUserStore();
 const state = reactive({
-  isLogin: false
+  isLogin: false,
+  signToday: NaN,
+  isShowSignIn: false,
 })
 
 onShow(() => {
@@ -20,11 +23,40 @@ onShow(() => {
   }
 })
 
+if (userStore.userInfo) {
+  // 2 检查用户签到信息
+  getNewSignInInfo().then(res => {
+    const {today, day} = res
+    state.signToday = today
+    if (today === 0) {
+      state.isShowSignIn = true
+    }
+    // // if (today === 0) {
+    //   2.1 弹出签到窗口
+    // }
+  }).catch(error => {
+    console.error(error + '->GetNewsSignInInfo')
+  })
+}
+
 function handleShowIntegralDetail() {
   uni.navigateTo({
     url: '/pages/my-integral/detail'
   })
 }
+
+function handleToZibuyangsheng() {
+  uni.navigateTo({
+    url: '/pages/product/zibuyangsheng?id=430'
+  })
+}
+
+function handleToPoster() {
+  uni.showToast({
+    title: '待开发',
+    icon: 'none'
+  })
+}
 </script>
 <template>
   <div class="flex flex-col p-3 gap-3">
@@ -38,12 +70,13 @@ function handleShowIntegralDetail() {
     <div class="bg-white rounded-md text-sm flex justify-between p-3">
       <div class="">滋补保健 {{ userStore.userInfo.score_beishengtang}}</div>
 
-      <CXBButton
+      <nut-button
           size="mini"
-          type="fill"
+          type="primary"
+          @tap="handleToZibuyangsheng"
       >
         去兑换
-      </CXBButton>
+      </nut-button>
     </div>
 
     <div
@@ -63,30 +96,38 @@ function handleShowIntegralDetail() {
             <div class="text-xs">每日签到</div>
             <div class="text-xs text-gray-500">每日签到得奖励</div>
           </div>
-          <CXBButton
+          <nut-button
               size="mini"
-              type="fill"
+              :class="state.signToday ? 'bg-gray text-white' : ''"
           >
-            去签到
-          </CXBButton>
+            {{ state.signToday ? '已签到' : '去签到' }}
+          </nut-button>
         </div>
         <div class="flex  justify-between items-center">
           <div class="flex flex-col gap-2">
             <div class="text-xs">邀请好友得积分</div>
             <div class="text-xs text-gray-500">邀请好友赚奖励</div>
           </div>
-          <CXBButton
+          <nut-button
               size="mini"
-              type="fill"
+              type="primary"
+              @tap="handleToPoster"
           >
             去邀请
-          </CXBButton>
+          </nut-button>
         </div>
       </div>
 
 
     </div>
   </div>
+
+  <CXBDialogSIgnIn
+      :show="state.isShowSignIn"
+      :today="state.signToday"
+      @confirm="state.isShowSignIn = false"
+      @close="state.isShowSignIn = false"
+  />
 </template>
 
 <style>

src/pages/my-invitation/index.vue

@@ -12,9 +12,10 @@ const list = [{
   url: '/pages/share-the-product/index'
 }, {
   title: '累计收益',
-  url: ''
+  url: '/pages/accumulate-income/index'
 }, {
-  title: '去提现'
+  title: '去提现',
+  url: '/pages/immediate-withdrawal/index'
 }]
 
 function handleClick(item: { url: string, title: string }) {
@@ -24,6 +25,8 @@ function handleClick(item: { url: string, title: string }) {
 }
 </script>
 <template>
+  <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0 z--1"></div>
+
   <div class="px-3 py-3 flex flex-col gap-3">
     <div class="bg-white rounded-lg p-4 flex flex-col gap-4 ">
       <div class="flex justify-around">
@@ -73,7 +76,9 @@ page {
   background: #f8f8f8;
 }
 </style>
-<route lang="yaml">
+<route lang="yaml" >
 style:
+  navigationBarBackgroundColor: "#FD1642"
+  navigationBarTextStyle: "white"
   navigationBarTitleText: 我的邀请
 </route>

src/pages/order-confirm/index.vue

@@ -171,7 +171,7 @@ function handleAddressSelect() {
             <div class="flex text-sm text-gray-500 justify-between items-center w-full">
               <div class="flex-1 flex items-center gap-2">
                 <div class="w-fit flex">
-                  <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
+                  <image :src="addressIcon" mode="aspectFit" class="w-4 h-4"></image>
                 </div>
                 <div class="flex-1 flex">
                   {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district }}
@@ -206,7 +206,7 @@ function handleAddressSelect() {
           <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
             <div class="p-3 flex gap-3 f-hairline-bottom">
               <div>
-                <image :src="orderProductItem.product.image" mode="widthFix" class="rounded w-20 h-20"></image>
+                <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
 
               </div>
               <div class="flex flex-col ">

src/pages/order/index.vue

@@ -14,8 +14,8 @@
       <nut-tab-pane title="待付款">
         <div v-if="state.obligationOrderList.length > 0">
           <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-            <OtherOrderItem :item="orderItem" v-else/>
+            <OrderItem :order-item="orderItem"/>
+<!--            <OtherOrderItem :item="orderItem" v-else/>-->
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -105,10 +105,10 @@ function loadAllOrderList() {
     page: 1,
     limit: 10
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     state.allOrderTotal = res.total
     state.allOrderList = res.list
-    console.log(res)
+    // console.log(res)
   })
 }
 watch(() => state.tabvalue, (val) => {
@@ -122,7 +122,7 @@ watch(() => state.tabvalue, (val) => {
         page: 1,
         limit: 10
       }).then(res => {
-        console.log(res)
+        // console.log(res)
         // state.obligationOrderList = splitArray(res.list, state.obligationOrderList)
         state.obligationOrderList = res.list
       })

src/pages/product/integral.vue

@@ -2,6 +2,7 @@
 import {getEntropyProductList} from "~/apis/common";
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {login, reLogin} from "~/apis/user";
 const list = ref()
 onLoad(() => {
   getEntropyProductList({
@@ -11,6 +12,10 @@ onLoad(() => {
     limit: 10
   }).then(res => {
     list.value = res
+  }).catch(error => {
+    if (error === '请登录') {
+      return login('30')
+    }
   })
 })
 

src/pages/red-integral/index.vue

@@ -0,0 +1,143 @@
+<script setup lang="ts">
+import {useUserStore} from "~/stores/userStore";
+import {encodePhone} from "../../utils";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {getRedIntegralList} from "~/apis/user";
+
+const userStore = useUserStore();
+onLoad((options) => {
+  userStore.getUserInfo()
+})
+const userType = computed(() => {
+  const userRichType = userStore.userInfo.user_rich_type
+  // 创始人
+  if (userRichType === 3) {
+    return '创始人'
+  }
+  // 普通用户
+  if (userRichType === 0) {
+    return '用户'
+  }
+  // 会员
+  if (userRichType === 1) {
+    return '会员'
+  }
+  // 合伙人
+  if (userRichType === 2) {
+    return '合伙人'
+  }
+
+  getRedIntegralList({page: 1, limit: 20}).then(res => {
+    console.log(res)
+  })
+})
+
+const state = reactive({
+  striped: false,
+  columns: [{
+    title: '消耗积分数',
+    key: 'red'
+  }, {
+    title: '说明',
+    key: 'mark'
+  }, {
+    title: '时间',
+    key: 'time'
+  }]
+})
+
+function handleToVipPage() {
+  uni.navigateTo({
+    url: '/pages/vip/index'
+  })
+}
+
+function handleImmediateWithdrawal() {
+  uni.navigateTo({
+    url: '/pages/immediate-withdrawal/index'
+  })
+}
+</script>
+
+<template>
+  <CXBBasePage>
+    <div class="bg-[#FD1642] h-30 w-full absolute top-0 left-0"></div>
+
+    <div class="flex flex-col gap-4 relative px-3">
+      <div class="pt-10 ">
+        <div class="flex gap-2 mb-2 text-white mb-3">
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+                 class="w-9 h-9 rounded-full"
+          ></image>
+          <image
+              v-else
+              src="https://app.bjtdba.com/uploads/logo.jpg"
+              mode="widthFix"
+              class="w-9 h-9 rounded-full"
+          />
+          <div class="flex">
+            <div class="flex flex-col">
+              <div class="flex text-sm">
+                <div class="flex gap-3">
+                  <div class="text-sm" v-if="userStore.userInfo">
+                    {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
+                  </div>
+                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center">
+                    {{userType}}
+                  </div>
+                </div>
+
+              </div>
+              <div class="flex text-xs" v-if="userStore.userInfo && userStore.userInfo.phone">
+                {{ encodePhone(userStore.userInfo.phone) }}
+              </div>
+              <div class="flex justify-between items-center text-[12px] gap-20">
+                <div class="flex">
+                  红积分：{{ userStore.userInfo.red }}
+                </div>
+                <div
+                    @click="handleToVipPage"
+                    class="flex bg-white text-primary px-1">复购增加红积分</div>
+              </div>
+
+
+            </div>
+
+          </div>
+        </div>
+        <div class="bg-white rounded flex flex-col gap-6 py-4 text-[12px] px-3">
+          <div class="flex justify-between">
+            <div>
+              红积分记录
+            </div>
+            <div
+                @click="handleImmediateWithdrawal"
+                class="border border-solid border-1px text-gray-600 border-gray rounded px-2">
+              提现
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+
+      <div>
+        <nut-table :columns="state.columns"
+                   :data="data"
+                   :bordered="false"
+        ></nut-table>
+      </div>
+
+    </div>
+    </CXBBasePage>
+</template>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 储蓄保
+  enablePullDownRefresh: true
+</route>
+<style>
+page {
+  --nut-table-border-color: none
+}
+</style>

src/pages/revenue-sharing/index.vue

@@ -3,71 +3,169 @@
 import FCell from "~/components/FCell/FCell.vue";
 import FCellGroup from "~/components/FCellGroup/FCellGroup.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {getRevenueSharing} from "~/apis/user";
+import {getAgentInfo, getRevenueSharing, getSelectUserInviteProfit} from "~/apis/user";
+import type {RevenueSharingModel} from "~/apis/model/revenueSharingModel";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+const userStore = useUserStore()
+const state = reactive({
+  numberSun: '',
+  UserYesterdayInviteProfit: '',
+  UserUnsettledInviteProfit: '',
+  nickname: '',
+  avatar: '',
+  brokerage_price: '',
+  yesterday: '',
+  cumulative: '',
+  extract: '',
 
+  currentTab: 1,
+  list: [
+  //     {
+  //   order_sn: '11111',
+  //   status: 0,
+  //   content: '预估用户1502111',
+  //   xiadan: '2023-08-04',
+  //   jiesuan: '2023-08-05',
+  //   number: 0.10
+  // }
+  ]
+})
 onLoad((option: any) => {
+  // 未结算收益
+  getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
+    console.log(res)
+    state.numberSun = res.numberSun
+    state.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit
+    state.UserYesterdayInviteProfit = res.UserYesterdayInviteProfit
+  })
+
+  getAgentInfo().then(res => {
+    console.log(res)
+    state.nickname = res.nickname
+    state.avatar = res.avatar
+    state.brokerage_price = res.brokerage_price
+    state.yesterday = res.yesterday
+    state.cumulative = res.cumulative
+    state.extract = res.extract
+  })
+  loadList(0)
+})
+
+function loadList(type: number) {
   getRevenueSharing({
-    type: 0,
     page: 1,
-    limit: 10
-  }).then(res => {
-    if (res && res.length) {
-      console.log(res)
+    limit: 20,
+    type
+  }).then((res: Array<RevenueSharingModel>) => {
+    if (res && res.length > 0) {
+      state.list = res
     }
   })
-})
+
+}
+function handleTabClick(type) {
+  state.currentTab = type
+  loadList(type)
+}
+function getStatusText(status: number) {
+  ////状态：0-未结算。1-已结算。-1-失效
+  if (status == 0) {
+    return '未结算'
+  }
+  if (status == 1) {
+    return '已结算'
+  }
+  if (status == -1) {
+    return '失效'
+  }
+}
 </script>
 
 <template>
-  <div class="px-3 py-3 flex flex-col gap-3">
-    <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
-      <div class="flex justify-around py-8">
-        <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-[11px] text-gray">累计佣金（元）</div>
-          <div class="font-bold ">0.00</div>
-        </div>
+  <CXBBasePage>
+    <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
 
-        <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-[11px] text-gray">已提现（元）</div>
-          <div class="font-bold">0.00</div>
-        </div>
+    <div class="px-3 py-3 flex flex-col gap-3">
+      <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
+        <div class="flex justify-around py-8">
+          <div class="flex-1 flex flex-col justify-center items-center gap-2">
+            <div class="text-[11px] text-gray">累计佣金（元）</div>
+            <div class="font-bold ">
+              {{ state.cumulative }}
+            </div>
+          </div>
 
-        <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-[11px] text-gray">佣金余额（元）</div>
-          <div class="font-bold">0.00</div>
-        </div>
+          <div class="flex-1 flex flex-col justify-center items-center gap-2">
+            <div class="text-[11px] text-gray">已提现（元）</div>
+            <div class="font-bold">{{ state.extract }}</div>
+          </div>
 
-        <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-[11px] text-gray">未结算（元）</div>
-          <div class="font-bold">0.00</div>
-        </div>
-      </div>
+          <div class="flex-1 flex flex-col justify-center items-center gap-2">
+            <div class="text-[11px] text-gray">佣金余额（元）</div>
+            <div class="font-bold">{{ state.brokerage_price }}</div>
+          </div>
 
-    </div>
+          <div class="flex-1 flex flex-col justify-center items-center gap-2">
+            <div class="text-[11px] text-gray">未结算（元）</div>
+            <div class="font-bold">{{ state.UserUnsettledInviteProfit }}</div>
+          </div>
+        </div>
 
-    <div>
-      <div class="flex justify-around text-center text-sm">
-        <div class="text-red">线上商城明细</div>
-        <div>线下实体明细</div>
       </div>
+
       <div>
-        <CXBEmpty />
+        <div class="flex justify-around text-center text-sm pb-3">
+          <div
+              @click="handleTabClick(1)"
+              :class="state.currentTab === 1? 'text-primary' : ''"
+          >线上商城明细</div>
+          <div
+              :class="state.currentTab === 2? 'text-primary' : ''"
+              @click="handleTabClick(2)"
+          >线下实体明细</div>
+        </div>
+        <div>
+          <div v-if="state.list && state.list.length > 0" class="bg-white p-3 gap-3">
+            <div v-for="(item, index) in state.list" :key="index">
+              <div class="flex flex-col">
+                <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
+                  <div>订单号：{{ item.order_sn }}</div>
+                  <div>{{ getStatusText(item.status) }}</div>
+                </div>
+                <div class="font-bold flex py-2 justify-between">
+                  <div>
+                    {{ item.content }}
+                  </div>
+                  <div class="text-primary">+{{ item.number.toFixed(2) }}</div>
+                </div>
+                <div class="flex justify-between text-gray text-xs">
+                  <div class="flex flex-col">
+                    <div>消费时间</div>
+                    <div class="text-black text-sm">{{ item.xiadan }}</div>
+                  </div>
+                  <div class="flex flex-col">
+                    <div>结算时间</div>
+                    <div class="text-black text-sm">{{ item.jiesuan }}</div>
+                  </div>
+                </div>
+              </div>
+
+
+
+            </div>
+          </div>
+
+          <CXBEmpty v-else/>
+        </div>
       </div>
+
     </div>
-<!--    <div class="bg-white rounded-lg py-3">
-      <FCellGroup divider arrow>
-        <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold" @click="handleClick(item)"/>
-      </FCellGroup>
-    </div>-->
 
-  </div>
+  </CXBBasePage>
 </template>
-<style>
-page {
-  background: #f8f8f8;
-}
-</style>
-<route lang="yaml">
+<route lang="yaml" >
 style:
+  navigationBarBackgroundColor: "#FD1642"
+  navigationBarTextStyle: "white"
   navigationBarTitleText: 分享收益
 </route>

src/pages/share-the-product/index.vue

@@ -7,32 +7,81 @@ import dayjs from "dayjs";
 import {getUserShareProductList} from "~/apis/user";
 import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
+const popupDesc = ref();
+const state = reactive({
+  ctr: '',
+  buy: '',
+  list: [],
+  columns: [{
+    title: '日期',
+    key: 'ctime'
+  }, {
+    title: '好友分享',
+    key: 'friendSum'
+  }, {
+    title: '朋友圈分享',
+    key: 'momentsSum'
+  }, {
+    title: '商品点击',
+    key: 'clickNum'
+  }, {
+    title: '商品购买',
+    key: 'buyNum'
+  }],
+  data: [],
+  // showPicker: false,
+  date: [],
+  isVisible: false,
+  currentDate: ''
+})
+
+const openSwitch = param => {
+  state[`${param}`] = true;
+};
+const closeSwitch = param => {
+  state[`${param}`] = false;
+};
+const setChooseValue= param => {
+  state.date = [...[param[0][3], param[1][3]]];
+};
+const select = (param: string) => {
+  console.log(param);
+};
 
+const show = ref(false);
+const popupConfirm = ({ selectedValue, selectedOptions })=>{
+  popupDesc.value = selectedOptions.map((val: any) => val.text).join('');
+  show.value = false;
+}
 onLoad((option) => {
   if (userStore.uid) {
     getUserShareProductList({
       uid: userStore.uid,
       pageNum: 1,
-      pageSize: 10
+      pageSize: 20
     }).then(res => {
-      console.log(res)
+      state.ctr = res.ctr
+      state.buy = res.buy
+      state.data = res.pageInfo.list
     })
   }
 })
 </script>
 
 <template>
+  <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
+
   <div class="px-3 py-3 flex flex-col gap-3">
     <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
       <div class="flex justify-around py-8">
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-[11px] text-gray">商品点击率</div>
-          <div class="font-bold ">0.00%</div>
+          <div class="font-bold text-[20px]">{{ state.ctr }}%</div>
         </div>
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-[11px] text-gray">商品购买率</div>
-          <div class="font-bold">0.00%</div>
+          <div class="font-bold text-[20px]">{{ state.buy }}%</div>
         </div>
       </div>
     </div>
@@ -42,28 +91,62 @@ onLoad((option) => {
         <div class="text-xs">单位/次</div>
       </div>
       <div class="flex justify-end">
-        <div class="border border-solid border-1 border-gray-300 px-4 text-xs">
-          {{ dayjs().format('YYYY-MM-DD')}}
+        <div class="border border-solid border-1 border-gray-300 px-4 text-xs"
+             @click="openSwitch('isVisible')"
+        >
+
+          {{ state.date && state.date[0] ? `${state.date[0]}至${state.date[1]}` : '请选择日期'}}
         </div>
+<!--        <nut-cell-->
+<!--            :showIcon="true"-->
+<!--            title="选择日期区间"-->
+<!--            :desc="date && date[0] ? `${date[0]}至${date[1]}` : '请选择'"-->
+<!--            @click="openSwitch('isVisible')"-->
+<!--        >-->
+<!--        </nut-cell>-->
       </div>
     </div>
-
+    <nut-calendar
+        v-model:visible="state.isVisible"
+        :default-value="state.date"
+        type="range"
+        :start-date="`2017-12-22`"
+        @close="closeSwitch('isVisible')"
+        @choose="setChooseValue"
+        @select="select"
+    >
+    </nut-calendar>
+    <nut-popup position="bottom" v-model:visible="show">
+      <nut-date-picker
+          v-model="state.currentDate"
+          @confirm="popupConfirm"
+          :is-show-chinese="true"
+      >
+<!--        <nut-button block type="primary" @click="alwaysFun">永远有效</nut-button>-->
+      </nut-date-picker>
+    </nut-popup>
     <div class="pb-safe">
-      <div class="flex justify-around bg-white rounded-tl-lg rounded-tr-lg text-center text-[11px] p-3">
-        <div class="">日期</div>
-        <div>好友分享</div>
-        <div class="">朋友圈分享</div>
-        <div class="">商品点击</div>
-        <div class="">商品购买</div>
-      </div>
-      <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">
-        <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">
-          <div class="text-left">{{ item.nickname || '无昵称' }}</div>
-          <div>{{ item.statusType }}</div>
-          <div class="text-right">{{ item.promoterTime }}</div>
-        </div>
+<!--      <div class="flex justify-around bg-white rounded-tl-lg rounded-tr-lg text-center text-[11px] p-3">-->
+<!--        <div class="">日期</div>-->
+<!--        <div>好友分享</div>-->
+<!--        <div class="">朋友圈分享</div>-->
+<!--        <div class="">商品点击</div>-->
+<!--        <div class="">商品购买</div>-->
+<!--      </div>-->
+<!--      <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">-->
+<!--        <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">-->
+<!--          <div class="text-left">{{ item.nickname || '无昵称' }}</div>-->
+<!--          <div>{{ item.statusType }}</div>-->
+<!--          <div class="text-right">{{ item.promoterTime }}</div>-->
+<!--        </div>-->
+<!--      </div>-->
+      <div class="bg-white p-3" v-if="state.data && state.data.length > 0">
+        <nut-table :columns="state.columns"
+                   :data="state.data"
+                   :bordered="true"
+        ></nut-table>
       </div>
-      <div else>
+      <div v-else>
         <CXBEmpty />
       </div>
     </div>
@@ -71,11 +154,18 @@ onLoad((option) => {
   </div>
 </template>
 <style>
+
 page {
   background: #f8f8f8;
+  --nut-table-cols-padding: 2px
+}
+.nut-table {
+  font-size: 12px !important;
 }
 </style>
 <route lang="yaml">
 style:
+  navigationBarBackgroundColor: "#FD1642"
+  navigationBarTextStyle: "white"
   navigationBarTitleText: 分享产品
 </route>

src/pages/store/home/index.vue

@@ -56,7 +56,7 @@ function handleNavItemClick(navItemId: any) {
 
 </script>
 <template>
-  <div class="px-3">
+  <div class="px-3 pb-safe pb-10">
     <MerchantHeader :model="merchant"/>
     <MerchantProductList
         :list="productList"

src/pages/store/product/detail.vue

@@ -35,6 +35,10 @@ const state = reactive({
 })
 const detail: any = ref(null)
 
+onShow(() => {
+  loadCartCount()
+
+})
 
 onLoad((option: any) => {
   // const id = '5491'
@@ -68,13 +72,12 @@ onLoad((option: any) => {
     state.recommendList = res.list
   })
 
-  loadCartCount()
 
 })
 
 function loadCartCount() {
   getCartCount().then(res => {
-    // console.log(res)
+    console.log(res)
     state.cartCount = res[0].count
   }).catch(error => {
     console.log(error)
@@ -269,7 +272,9 @@ function handleCountChange(val) {
     </FCell>
 
     <!-- 店铺信息 -->
-    <div class="flex gap-3 p-3 bg-white">
+    <div
+        @tap="handleShowMerchant(detail.mer_id)"
+        class="flex gap-3 p-3 bg-white">
       <div v-if="detail && detail.merchant">
         <image :src="detail.merchant.mer_avatar" mode="widthFix" class=" h-12 w-12"></image>
       </div>
@@ -279,7 +284,6 @@ function handleCountChange(val) {
           <div class="i-tabler-chevron-right text-gray"></div>
         </div>
         <div
-            @tap="handleShowMerchant(detail.mer_id)"
             class="border border-solid border-red text-red text-xs px-1 rounded-full w-fit"
         >
           进入店铺

src/pages/user/index.vue

@@ -192,6 +192,12 @@ const userType = computed(() => {
       return '合伙人'
     }
 })
+
+function handleToRedIntegral() {
+  uni.navigateTo({
+    url: '/pages/red-integral/index'
+  })
+}
 </script>
 <template>
   <div v-if="state.isLogin">
@@ -254,7 +260,9 @@ const userType = computed(() => {
           <div
               v-if="userStore.userInfo"
               class="flex">
-            <div class="w-1/2 flex flex-col justify-center items-center">
+            <div
+                @click="handleToRedIntegral"
+                class="w-1/2 flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.red }}</div>
               <div class="text-xs">红积分提现</div>
             </div>
@@ -278,7 +286,7 @@ const userType = computed(() => {
         </div>
         <div class="flex pb-4">
           <div
-              @click="handleShowMyAllOrder(index)"
+              @click="handleShowMyAllOrder(index + 1)"
               v-for="(item, index) in myOrderList" :key="index"
               class="flex flex-col justify-center items-center w-1/5 gap-3"
           >

src/stores/userStore.ts

@@ -13,6 +13,7 @@ interface UserStoreState {
     permissionList: Array<string> | null
     yanglao: number
 }
+
 export const useUserStore = defineStore('userStore', {
     state: () => ({
         menus: [{}],
@@ -37,7 +38,14 @@ export const useUserStore = defineStore('userStore', {
         //     return !!this.token
         // },
         async getUserInfo() {
-            this.userInfo = await getUserInfo();
+            try {
+                this.userInfo = await getUserInfo();
+
+            } catch (error) {
+                uni.navigateTo({
+                    url: '/pages/user/login/index'
+                })
+            }
         },
         login(token: string, exp: number) {
             this.token = token