feat: 我的养老金信息

.env.development

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

src/apis/model/loginrespone.json

@@ -1,64 +0,0 @@
-{
-  "status": 200,
-  "message": "success",
-  "data": {
-    "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ0ZXN0LmJqdGRiYS5jb20iLCJhdWQiOiJ0ZXN0LmJqdGRiYS5jb20iLCJpYXQiOjE2OTM3MzgzNjQsIm5iZiI6MTY5MzczODM2NCwiZXhwIjoxNzA0NTM4MzY0LCJqdGkiOls5OTI5LCJ1c2VyIl19.l37RvPq47-HK6Hay5FJCLnRef9ELVukVmPU59kCt6l8",
-    "exp": 10800000,
-    "user": {
-      "uid": "9929",
-      "wechat_user_id": "0",
-      "ali_user_id": "2088002106217164",
-      "account": "13488689885",
-      "sex": "0",
-      "nickname": "134****9885",
-      "avatar": "https:\/\/app.bjtdba.com\/uploads\/logo.jpg",
-      "phone": "13488689885",
-      "now_score": "0.00",
-      "now_money": "0.00",
-      "member_brokerage_price": "0.00",
-      "user_type": "APP",
-      "promoter_time": null,
-      "is_promoter": "0",
-      "pay_count": "0",
-      "pay_price": "0.00",
-      "spread_count": "0",
-      "adr_id": null,
-      "identity": "0",
-      "mer_id": "0",
-      "mer_topping": null,
-      "user_name": null,
-      "annuity_frozen": "0.00",
-      "annuity_num": "0",
-      "annuity": "0.00",
-      "agent_rebate": "0.00",
-      "mer_rebate": "0.00",
-      "promoter_rebate": "0.00",
-      "cross_store": "0.00",
-      "jurisdiction": "0.00",
-      "other_jurisdictions": "0.00",
-      "adv_fee": "0.00",
-      "xqxiaofei": "0.00",
-      "birthday60": null,
-      "card_number": null,
-      "annuity_yiqu": "0.00",
-      "is_new": "1",
-      "admin_agent_rate": "0.00",
-      "locktime": null,
-      "user_number": "C000009929",
-      "im": "0",
-      "im_uuid": null,
-      "test_user": "0",
-      "is_channel": "0",
-      "score": "2.00",
-      "annuity_once": "0",
-      "first_sign": "1",
-      "is_del": "0",
-      "first_shopping": "0",
-      "external": "1",
-      "external_id": null,
-      "score_beishengtang": "0.00",
-      "level_id": "9542",
-      "level": "5"
-    }
-  }
-}

src/apis/model/third-order.model.ts

@@ -0,0 +1,28 @@
+/**
+ * 三方订单查询结果
+ */
+export interface ThirdOrderResult {
+    list: Array<ThirdOrderModel>
+}
+
+export interface ThirdOrderModel {
+    id: string
+    goods_id: string
+    goods_sign: string//拼多多id
+    order_sn: string//订单号
+    goods_num: string//商品数量
+    goods_img: string//图片
+    goods_name: string//名称
+    goods_price: string//价格
+    other_status: string//订单状态
+    other_status_desc: string//状态名称
+    order_money: string//订单金额
+    pay_money: string//支付金额
+    create_time: string//创建时间
+    commission: string//佣金
+    bill_status: string//结算状态
+    bill_end_time: string//结算时间
+    source: string
+    status_name: string//状态名称
+    yanglao: string//养老金
+}

src/apis/model/yanglao-log.model.ts

@@ -0,0 +1,112 @@
+/**
+ * 养老金线上
+ */
+export interface YanglaoLogXsResult {
+    count: number
+    list: Array<YanglaoLogXsModel>
+}
+
+/**
+ * 养老金线下
+ */
+export interface YanglaoLogXxResult {
+    count: number
+    list: Array<YanglaoLogXxModel>
+}
+
+export interface YanglaoLogXsModel {
+    bill_id: string
+    uid: string
+    link_id: string
+    pm: string
+    title: string
+    category: string
+    type: string
+    number: string//金额
+    balance: string
+    mark: string//备注
+    create_time: string//时间
+    status: string//0 = 预估 1 = 有效 -1 = 无效
+    commission_type: string
+    order_sn: string//订单号
+    tripartite: string
+    type_shop: string
+    mer_id: string
+    source: string
+    order_type: string
+    gzc: string
+    mer_name: string
+    mer_avatar: string
+    product: {
+        product: {
+            product_id: string
+            image: string//商品图片
+            store_name: string//	商品名称
+            is_show: string
+            status: string
+            is_del: string
+            unit_name: string
+            price: string
+            mer_status: string
+            temp_id: string
+            give_coupon_ids: Array<string>
+            is_gift_bag: string
+            is_used: string
+            product_type: string
+            old_product_id: string
+            temp: {
+                shipping_template_id: string
+                name: string
+                type: string
+                appoint: string
+                undelivery: string
+                mer_id: string
+                is_default: string
+                sort: string
+                create_time: string
+//                    regionAddress: string
+                undelives: string
+            }
+            // private Temp temp: string
+        }
+        productAttr: {
+            product_id: string
+            stock: string
+            price: string
+            unique: string
+            sku: string
+            volume: string
+            weight: string
+            ot_price: string
+            dacang_price: string
+            cost: string
+            bc_extension_one: string
+            bc_extension_two: string
+        }
+        product_type: string
+    }
+}
+export interface YanglaoLogXxModel {
+    bill_id: string
+    uid: string
+    link_id: string
+    pm: string
+    title: string
+    category: string
+    type: string
+    number: string//	金额
+    balance: string
+    mark: string//备注
+    create_time: string//时间
+    status: string//0 = 预估 1 = 有效 -1 = 无效
+    commission_type: string
+    order_sn: string//订单号
+    tripartite: string
+    type_shop: string
+    mer_id: string
+    source: string
+    order_type: string
+    gzc: string
+    mer_name: string//商户名称
+    mer_avatar: string//商户头像
+}

src/apis/order.api.ts

@@ -4,6 +4,7 @@ import type {
     IntegralOrderCreateModel, OrderCheckModel, OrderCreateModel,
     OrderCreateShoppingModel, OrderListDataModel, OrderListObligationResult, OrderListResult
 } from "~/apis/model/order.model"
+import type {ThirdOrderResult} from "~/apis/model/third-order.model";
 
 export interface CartIdRequest {
     cart_id: Array<string>
@@ -70,7 +71,7 @@ enum API {
  * 三方订单
  * @param params
  */
-export function getThirdOrder(params: { type: string, page: number, limit: 10 | number}) {
+export function getThirdOrder(params: { type: string, page: number, limit: 20 | number}): Promise<ThirdOrderResult> {
     return defHttp.get({
         url: API.USER_THIRD_ORDER,
         data: {

src/apis/user.ts

@@ -28,6 +28,7 @@ import type {AddressResult, OneAddressModel} from "~/apis/model/address.model";
 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";
 
 // 会员中心的提现
 // export function entropy(data) {
@@ -42,6 +43,8 @@ enum API {
     GET_YANGLAO = '/api/user/get_yanglao',
     // 养老金记录
     GET_YANGLAOJIN_STATISTICS = '/api/user/get_yanglao_statistics',
+    // 养老金明细
+    GET_YANGLAO_LOG = '/api/user/yanglaolog',
     // 获取用户信息
     USER = '/api/user',
     // 获取协议
@@ -413,7 +416,37 @@ export function getUserYangLaoJin(): Promise<UserYanglaoJinModel> {
 }
 
 /**
- * 获取平台服务纪晓岚计算
+ * 获取线下养老金记录
+ */
+export function getUserYanglaoJinLogXx(params: {
+    page: number
+    limit: number
+    // 1 线下 0 线上
+    source: '99'
+}): Promise<YanglaoLogXxResult> {
+    return defHttp.get({
+        url: API.GET_YANGLAO_LOG
+    })
+}
+/**
+ * 获线上取养老金记录
+ */
+export function getYanglaoJinLogXs(params: {
+    page: number
+    limit: number
+    // 1 线下 0 线上
+    // 1 拼多多， 2 唯品会， 3 苏宁， 5 淘宝， 6 京东， 90 线上， 99 线下
+    source: ''
+}):Promise<YanglaoLogXsResult> {
+    return defHttp.get({
+        url: API.GET_YANGLAO_LOG,
+        data: {
+            ...params
+        }
+    })
+}
+/**
+ * 获取平台服务费计算
  */
 export function getWithdrawalService(params: WithdrawalParams): Promise<WithdrawalServiceModel> {
     return defHttp.post({

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -60,7 +60,9 @@ const skuList = computed(() => {
   if (props.detail && props.detail.sku) {
     for (let key in props.detail.sku) {
       const skuItem: SkuModel = props.detail.sku[key]
+      // if (skuItem.sku !== '') {
       skuData.push(skuItem)
+      // }
       currentSku.value = skuData[0]
     }
   }
@@ -92,6 +94,7 @@ function handleAddCart() {
 function handleCountChange(value) {
   emit('count-change', value)
 }
+
 </script>
 
 <template>
@@ -125,7 +128,10 @@ function handleCountChange(value) {
                 <div class="text-[12px] text-right text-gray-500 ">
                   剩余库存{{currentSku.stock}}
                 </div>
-                <div class="flex items-end gap-2" >
+                <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
+                  {{ currentSku.price * 30 }} 积分
+                </div>
+                <div class="flex items-end gap-2" v-else>
                   <FPrice :price="currentSku.price"/>
                   <FPrice v-if="detail && detail.ot_price" :price="detail.ot_price" :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through/>
                 </div>

src/components/FTabs/FTabs.vue

@@ -10,6 +10,10 @@ const props = defineProps({
   current: {
     type: String,
     default: ''
+  },
+  exClass: {
+    type: String,
+    default: ''
   }
 })
 
@@ -35,6 +39,7 @@ function handleClick(currentTab: string) {
 
   <scroll-view
       class=" whitespace-nowrap  w-screen absolute top-25 text-white text-sm"
+      :class="exClass"
       :scroll-with-animation="true"
       :scroll-x="true"
       :show-scrollbar="false"

src/pages/annuity/index.vue

@@ -47,6 +47,12 @@ onLoad(() => {
   getYanglaojinStatistics().then(res => {
     // state.all_yanglao = res.all_yanglao
     yanglaoStatistics.value = res
+  }).catch(error => {
+    if (error === '未登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
   })
 })
 function handleThirdBind() {
@@ -119,17 +125,17 @@ function handleToCitic() {
         <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]">￥0.00</div>
+            <div class="text-[#F94032] font-bold text-[28px]">￥{{yanglaoStatistics.all_yanglao}}</div>
           </div>
           <div class=" flex justify-around w-full">
-            <div class="flex flex-col justify-center items-center ">
+            <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
               <div class="font-bold">
                 ￥ {{yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a}}
               </div>
               <div class="text-xs text-gray-400">预估养老金</div>
             </div>
 
-            <div class="flex flex-col justify-center items-center pl-3">
+            <div class="flex flex-col justify-center items-center pl-3" v-if="yanglaoStatistics">
               <div>￥ {{yanglaoStatistics.all_yanglao_a}}</div>
               <div class="text-xs text-gray-400">已结算</div>
             </div>

src/pages/dacang/list/components/dacang-header.vue

@@ -0,0 +1,107 @@
+<script lang="ts" setup>
+import {computed, PropType} from "vue";
+import FSearch from "~/components/FSearch/FSearch.vue";
+import type {UserInfoModel} from "~/apis/model/userInfoModel";
+import {useUserStore} from "~/stores/userStore";
+// import {useUserStore} from "~/stores/userStore";
+const userStore = useUserStore()
+
+const systemInfo = uni.getSystemInfoSync()
+const statusBarHeight = systemInfo.statusBarHeight ?? 0
+const navBarHeight = computed(() => {
+  // const propsHeight = Number(props.height)
+  let defaultHeight = 44
+  // #ifdef MP
+  // if (props.fixed) {
+  const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+  const menuHeight = menuButtonInfo.height
+  const menuTop = menuButtonInfo.top
+  defaultHeight = (menuTop - statusBarHeight) * 2 + menuHeight
+  // }
+  // #endif
+  // return propsHeight || defaultHeight
+  return defaultHeight
+})
+
+const navBarStyle = computed(() => {
+  return {
+    paddingTop: `${statusBarHeight}px`,
+  }
+})
+
+const props = defineProps({
+  exClass: {
+    type: String
+  },
+  tabs: {
+    type: Array
+  },
+  // userInfo: {
+  //   type: Object as PropType<UserInfoModel>,
+  //   required: true
+  // },
+  yanglaojin: {
+    type: Number,
+    default: NaN
+  },
+  current: {
+    type: String
+  }
+})
+function handleClick() {
+  if (userStore.userInfo) {
+    uni.navigateTo({
+      url: '/pages/annuity/index'
+    })
+  } else {
+    uni.navigateTo({
+      url: '/pages/user/login/index?key=30'
+    })
+  }
+}
+
+// function handleShowSearchPage() {
+//
+// }
+const emit = defineEmits<{
+  (e: 'click:item', value:string): void
+}>()
+function handleTabItemClick(currentTab) {
+  emit('click:item', currentTab)
+}
+
+</script>
+<template>
+  <div class="home-header fixed w-screen text-white z-10 w-full h-32"
+       :class="exClass"
+  >
+    <div class="pl-2 pt-2"
+         :style="navBarStyle"
+    >
+      <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
+
+        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
+               mode="widthFix"
+               class="w-4 h-4  pl-2 py-1"
+        ></image>
+        <div class="flex flex-1 items-center w-100%">
+          <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
+          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
+            搜索
+          </div>
+        </div>
+
+
+      </div>
+
+    </div>
+
+<!--    <div class="p-3">-->
+      <div class=" mr-6 mb-3">
+        <FTabs :tabs="tabs" :ex-class="exClass" @click:item="handleTabItemClick"/>
+
+      </div>
+<!--    </div>-->
+
+  </div>
+</template>

src/pages/dacang/list/components/header.vue

@@ -1,46 +0,0 @@
-<script lang="ts" setup>
-import {computed} from "vue";
-import FSearch from "~/components/FSearch/FSearch.vue";
-
-const systemInfo = uni.getSystemInfoSync()
-const statusBarHeight = systemInfo.statusBarHeight ?? 0
-const navBarHeight = computed(() => {
-  // const propsHeight = Number(props.height)
-  let defaultHeight = 44
-  // #ifdef MP
-  // if (props.fixed) {
-  const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-  const menuHeight = menuButtonInfo.height
-  const menuTop = menuButtonInfo.top
-  defaultHeight = (menuTop - statusBarHeight) * 2 + menuHeight
-  // }
-  // #endif
-  // return propsHeight || defaultHeight
-  return defaultHeight
-})
-
-const navBarStyle = computed(() => {
-  return {
-    paddingTop: `${statusBarHeight}px`,
-  }
-})
-</script>
-<template>
-  <div class="home-header fixed w-screen "
-       :style="navBarStyle"
-  >
-    <div class="flex gap-2 mb-2 pl-2">
-      <image src="https://app.bjtdba.com/uploads/logo.jpg"
-             mode="widthFix"
-             class="w-9 h-9 rounded-full"
-      />
-      <div class="flex flex-col text-white">
-        <div class="text-sm">134****9885</div>
-        <div class="text-xs">0.00 元养老金</div>
-      </div>
-    </div>
-
-    <FSearch />
-
-  </div>
-</template>

src/pages/dacang/list/index.vue

@@ -6,6 +6,9 @@ import ProductList from "~/components/ProductList/ProductList.vue";
 import type {DcProductModel} from "~/apis/model/dacang.model";
 import {useDacangStore} from "~/stores/dacangStore";
 import {CDN_URL} from "~/config/app";
+import DacangHeader from "~/pages/dacang/list/components/dacang-header.vue";
+const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
+
 const state = reactive({
   tabs: [],
   productList: <Array<DcProductModel>>[]
@@ -52,34 +55,57 @@ function handleTabItemClick(currentTab) {
     loadDcProductList(currentTab)
   // }
 }
-const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
+
+const headerClass = ref('')
+
+onPageScroll((page) => {
+  // page.scrollTop
+  if (page.scrollTop >= 76 ) {
+    headerClass.value = '!bg-primary !text-white'
+  } else {
+    headerClass.value = ''
+  }
+})
 </script>
 <template>
-  <div>
-    <FNavBar :fixed="true" exClass="pl-2">
-      <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
-
-      >
-
-        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
-               mode="widthFix"
-               class="w-4 h-4  pl-2 py-1"
-        ></image>
-        <div class="flex flex-1 items-center w-100%">
-          <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
-          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
-            搜索
-          </div>
-        </div>
+  <div class="h-screen">
+    <DacangHeader fixed
+                  :tabs="state.tabs"
+                  :ex-class="headerClass"
+                  :current="classifyId"
+                  @click:item="handleTabItemClick"
+    />
+    <!--
+    <div class=" z-10"  >
+      <div :class="headerClass">
+        <FNavBar :fixed="true" exClass="pl-2">
+          <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
+
+            <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
+                   mode="widthFix"
+                   class="w-4 h-4  pl-2 py-1"
+            ></image>
+            <div class="flex flex-1 items-center w-100%">
+              <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
+              <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
+                搜索
+              </div>
+            </div>
 
 
+          </div>
+
+        </FNavBar>
+        <FTabs :tabs="state.tabs" :current="classifyId" @click:item="handleTabItemClick"/>
       </div>
-    </FNavBar>
+
+    </div>
+-->
+
 <!--    <FSearch :fixed="true"/>-->
     <div class="flex flex-col gap-2 ">
       <image :src="headerImage" mode="widthFix" class="w-full h-50"></image>
 
-    <FTabs :tabs="state.tabs" :current="classifyId" @click:item="handleTabItemClick"/>
 
     <ProductList :list="state.productList" />
     </div>

src/pages/home/components/header.vue

@@ -2,7 +2,9 @@
 import {computed, PropType} from "vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
 import type {UserInfoModel} from "~/apis/model/userInfoModel";
+import {useUserStore} from "~/stores/userStore";
 // import {useUserStore} from "~/stores/userStore";
+const userStore = useUserStore()
 
 const systemInfo = uni.getSystemInfoSync()
 const statusBarHeight = systemInfo.statusBarHeight ?? 0
@@ -31,19 +33,25 @@ const props = defineProps({
   exClass: {
     type: String
   },
-  userInfo: {
-    type: Object as PropType<UserInfoModel>,
-    required: true
-  },
+  // userInfo: {
+  //   type: Object as PropType<UserInfoModel>,
+  //   required: true
+  // },
   yanglaojin: {
     type: Number,
     default: NaN
   }
 })
 function handleClick() {
-  uni.navigateTo({
-    url: '/pages/annuity/index'
-  })
+  if (userStore.userInfo) {
+    uni.navigateTo({
+      url: '/pages/annuity/index'
+    })
+  } else {
+    uni.navigateTo({
+      url: '/pages/user/login/index?key=30'
+    })
+  }
 }
 
 // function handleShowSearchPage() {
@@ -59,8 +67,8 @@ function handleClick() {
         @click="handleClick"
         class="flex gap-2 mb-2 pl-2"
     >
-      <image v-if="userInfo && userInfo.avatar"
-             :src="userInfo.avatar"
+      <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
+             :src="userStore.userInfo.avatar"
              mode="widthFix"
              class="w-9 h-9 rounded-full"
       />
@@ -71,9 +79,10 @@ function handleClick() {
              class="w-9 h-9 rounded-full"
       />
       <div class="flex flex-col ">
-        <div class="text-sm" v-if="userInfo">{{ userInfo.nickname ? userInfo.nickname : '登录'}}</div>
-        <div class="text-xs" v-if="!isNaN(yanglaojin)">{{ yanglaojin }}元养老金</div>
-        <div v-else class="text-sm">
+        <div class="text-sm" v-if="userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录'}}</div>
+        <div class="text-sm" v-else>登录</div>
+        <div class="text-xs" v-if="!isNaN(yanglaojin) && userStore.userInfo">{{ yanglaojin }}元养老金</div>
+        <div v-else class="text-xs">
           领取养老金
         </div>
       </div>

src/pages/home/index.vue

@@ -56,17 +56,21 @@ onLoad(() => {
   getNoticeList().then(res => {
     state.announcementList = res.list
   })
-  // 2 检查用户签到信息
-  getNewSignInInfo().then(res => {
-    const { today, day } = res
-    state.signToday = today
-    if (today === 0) {
-      state.isShowSignIn = true
-    }
-    // // if (today === 0) {
-    //   2.1 弹出签到窗口
-    // }
-  })
+  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')
+    })
+  }
   state.page = 1
   loadProductList()
 })
@@ -75,8 +79,7 @@ watch(() => state.isShowSignIn, (val) => {
   val ? uni.hideTabBar() : uni.showTabBar()
 })
 const headerClass = ref('')
-// const headerClass = computed(() => {
-// })
+
 onPageScroll((page) => {
   // page.scrollTop
   if (page.scrollTop >= 76 ) {
@@ -113,14 +116,15 @@ function loadProductList() {
       }, 300)
     }
     uni.hideLoading()
+  }).catch(error => {
+    console.error(error + '->getProduct')
   })
 }
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 </script>
 <template>
   <div class="h-screen ">
-    <Header :user-info="userStore.userInfo"
-            :yanglaojin="state.all_yanglao"
+    <Header :yanglaojin="state.all_yanglao"
             :exClass="headerClass"
     />
     <div class="flex flex-col gap-3 ">
@@ -148,7 +152,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml">
+<route lang="yaml"  type="home">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/order/test.json

@@ -1,121 +0,0 @@
-{
-  "status": 200,
-  "message": "success",
-  "data": {
-    "count": 1,
-    "list": [
-      {
-        "group_order_id": "4345",
-        "group_order_sn": "wx1693385272076388560",
-        "uid": "10086",
-        "total_postage": "0.00",
-        "total_price": "9.90",
-        "total_num": "1",
-        "coupon_price": "0.00",
-        "real_name": "刘",
-        "user_phone": "13488689885",
-        "user_address": "北京顺义区光明街道 好",
-        "pay_price": "9.90",
-        "pay_postage": "0.00",
-        "cost": "8.52",
-        "give_coupon_ids": "",
-        "paid": "0",
-        "pay_time": null,
-        "pay_type": "0",
-        "create_time": "2023-08-30 16:47:52",
-        "is_remind": "1",
-        "is_del": "0",
-        "rand": "",
-        "split": "0",
-        "serialNumber": "",
-        "test_order": "0",
-        "hf_pay_id": "",
-        "pay_wx": null,
-        "mer_id": "321",
-        "orderList": [
-          {
-            "order_id": "3917",
-            "orderProduct": [
-              {
-                "order_product_id": "4194",
-                "order_id": "3917",
-                "uid": "10086",
-                "cart_id": "10103",
-                "product_id": "5596",
-                "extension_one": "0.00",
-                "extension_two": "0.00",
-                "product_sku": "ca0315e5d940",
-                "is_refund": "0",
-                "product_num": "1",
-                "refund_num": "1",
-                "is_reply": "0",
-                "product_price": "9.90",
-                "cart_info": {
-                  "product": {
-                    "product_id": "5596",
-                    "image": "https:\/\/img.funengscm.com\/9cd5c46fd77ad01148262061098311bf",
-                    "store_name": "LP-363071蓝漂压缩毛巾1袋",
-                    "is_show": "1",
-                    "status": "1",
-                    "is_del": "0",
-                    "unit_name": "个",
-                    "price": "9.90",
-                    "mer_status": "1",
-                    "temp_id": "105",
-                    "give_coupon_ids": [],
-                    "is_gift_bag": "0",
-                    "is_used": "1",
-                    "product_type": "0",
-                    "old_product_id": "710",
-                    "temp": {
-                      "shipping_template_id": "105",
-                      "name": "包邮",
-                      "type": "0",
-                      "appoint": "0",
-                      "undelivery": "0",
-                      "mer_id": "0",
-                      "is_default": "0",
-                      "sort": "0",
-                      "create_time": "2020-07-13 17:30:51",
-                      "regionAddress": null,
-                      "undelives": null,
-                      "freeAddress": null
-                    }
-                  },
-                  "productAttr": {
-                    "gong_mer_profit": "0.69",
-                    "gong_pension": "0.34",
-                    "gong_market_price": "9.90",
-                    "cost_price": "8.52",
-                    "product_id": "5596",
-                    "stock": "97",
-                    "price": "9.90",
-                    "unique": "ca0315e5d940",
-                    "sku": "1袋*20颗",
-                    "volume": "0.00",
-                    "weight": "0.00",
-                    "ot_price": "12.50",
-                    "dacang_price": "0.00",
-                    "cost": "8.52",
-                    "bc_extension_one": 0,
-                    "bc_extension_two": 0,
-                    "seckill": 0
-                  },
-                  "product_type": "0"
-                },
-                "create_time": "2023-08-30 16:47:52",
-                "type": "5"
-              }
-            ],
-            "group_order_id": "4345"
-          }
-        ],
-        "merchant": {
-          "mer_id": "321",
-          "mer_name": "大仓创客",
-          "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/d616961db8aefbe92f72972a1d7db88a.png"
-        }
-      }
-    ]
-  }
-}

src/pages/order/third-order.vue

@@ -1,7 +1,46 @@
 <template>
   <nut-tabs v-model="state.tabvalue">
     <nut-tab-pane title="京东">
-      <CXBEmpty />
+      <div v-if="state.jdOrderList" class="flex flex-col gap-3">
+        <div v-for="(item, index) in state.jdOrderList" :key="index">
+          <div class="bg-white rounded p-2 flex flex-col gap-2">
+            <div class="flex justify-between items-center text-[12px] f-hairline-bottom py-2">
+              <div>订单号：{{ item.order_sn }}</div>
+              <div class="text-primary">{{ item.other_status_desc }}</div>
+            </div>
+
+            <div class="flex  gap-2">
+              <div class="flex">
+                <image :src="item.goods_img" mode="widthFix" class="w-16 h-16 rounded"></image>
+
+              </div>
+              <div class="flex items-center">
+                <div class="flex flex-col gap-1">
+                  <div class="bg-primary text-[10px] rounded text-white px-1 w-fit">
+                    京东
+                  </div>
+                  <div class="text-[12px] line-clamp-2">
+                    {{ item.goods_name }}
+                  </div>
+                </div>
+                <div class="flex text-[11px] w-15 justify-end">{{ 'X' + item.goods_num }}</div>
+              </div>
+            </div>
+            <div class="flex justify-between text-[11px] items-center">
+              <div>{{ item.create_time }}</div>
+              <div class="flex justify-center items-center">
+                补贴养老金：<FPrice :price="item.yanlao"></FPrice>
+                <div class="border border-solid border-1px border-gray-500 text-gray rounded">{{ item.status_name }}</div>
+              </div>
+            </div>
+          </div>
+
+
+        </div>
+<!--        <div>{{ item.status_name }}</div>-->
+
+      </div>
+      <CXBEmpty v-else/>
 
     </nut-tab-pane>
     <nut-tab-pane title="唯品会">
@@ -24,6 +63,7 @@
 <script setup lang="ts">
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {getThirdOrder} from "~/apis/order.api";
+import FPrice from "~/components/FPrice/FPrice.vue";
 enum TYPE {
   JD = '6',
   TB = '5',
@@ -41,7 +81,12 @@ const state = reactive({
   // 待付款订单列表
   obligationOrderList: [],
 
-  orderList: [],
+  jdOrderList: [],
+  tbOrderList: [],
+  pddOrderList: [],
+  dyOrderList: [],
+  vipOrderList: [],
+  suOrderList: []
 });
 
 onLoad(() => {
@@ -77,10 +122,41 @@ watch(() => state.tabvalue, (val) => {
     }
   }
 })
-function loadOrderList(type: string) {
+function loadOrderList(type: TYPE) {
 
   getThirdOrder({type, page: 1, limit: 10}).then(res => {
-    state.orderList = res
+    switch (type) {
+      case TYPE.JD: {
+        state.jdOrderList = res.list
+        break
+      }
+      case TYPE.VIP: {
+        state.vipOrderList = res.list
+        break
+      }
+      case TYPE.PDD: {
+        state.pddOrderList = res.list
+        break
+      }
+      case TYPE.DY: {
+        state.dyOrderList = res.list
+        break
+      }
+      case TYPE.SU: {
+        state.suOrderList = res.list
+        break
+      }
+      case TYPE.TB: {
+        state.tbOrderList = res.list
+        break
+      }
+    }
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.redirectTo({
+        url: '/pages/user/login/index'
+      })
+    }
   })
 }
 </script>
@@ -90,3 +166,10 @@ style:
   navigationBarTitleText: 三方订单
   enablePullDownRefresh: true
 </route>
+<style>
+
+.nut-tab-pane {
+  background: #f5f5f5 !important;
+}
+
+</style>

src/pages/pension_account/index.vue

@@ -1,7 +1,17 @@
 <script lang="ts" setup>
 import {CDN_URL} from "~/config/app";
+import {getUserYangLaoJin} from "~/apis/user";
 const annuity_yuan_220713Image = CDN_URL + '/static/assets/annuity_yuan_220713.png'
 const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
+const userStore = useUserStore()
+
+const userYangLaoJin = ref({})
+
+onLoad(() => {
+  getUserYangLaoJin().then(res => {
+    userYangLaoJin.value = res
+  })
+})
 </script>
 
 <template>
@@ -13,7 +23,7 @@ const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
                  mode="widthFix"
                  class="w-9 h-9 rounded"
           />
-          <div>用户</div>
+          <div>{{ userStore.userInfo.nickname }}</div>
         </div>
 
         <div class="">
@@ -28,19 +38,19 @@ const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
 
             <div class="flex content-end items-end">
               <div class="">￥</div>
-              <div class="text-[32px] font-bold ">0.00</div>
+              <div class="text-[32px] font-bold ">{{ userStore.yanglao.all_yanglao}}</div>
             </div>
 
             <div class="flex justify-around w-full divide-gray divide-gray-1 h-15">
               <div class="flex flex-col justify-center items-center ">
                 <div class="font-bold flex ">
                   <div>￥</div>
-                  <div>0.00</div>
+                  <div>{{ userStore.yanglao.all_yanglao }}</div>
                 </div>
                 <div class="text-xs text-light-100">补贴养老金</div>
               </div>
               <div class="flex flex-col justify-center items-center ">
-                <div class="font-bold">￥0.00</div>
+                <div class="font-bold">￥{{ userStore.yanglao.all_yanglao_a }}</div>
                 <div class="text-xs text-light-100">已结算养老金</div>
               </div>
             </div>
@@ -76,7 +86,9 @@ const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
               </div>
               <div class="block mt-3">
                 <div>法定提取时间</div>
-                <div class="text-gray">未实名认证</div>
+                <div class="text-gray">
+                  {{ userYangLaoJin.birthday60 }}
+                </div>
               </div>
             </div>
 

src/pages/pension_choice_platform/index.vue

@@ -3,32 +3,48 @@ import {CDN_URL} from "~/config/app";
 
 const list = [{
   title: '京东',
-  icon: CDN_URL + '/static/assets/jingdong_d.png'
+  icon: CDN_URL + '/static/assets/jingdong_d.png',
+  type: '6'
 }, {
+  type: '2',
   title: '唯品会',
   icon: CDN_URL + '/static/assets/weipinhui_d.png'
 }, {
+  type: '3',
   title: '苏宁易购',
   icon: CDN_URL + '/static/assets/suningyigou_d.png'
 }, {
+  type: '5',
   title: '淘宝',
   icon: CDN_URL + '/static/assets/taobaoyanglao_d.png'
 }, {
+  type: '9',
   title: '抖音',
   icon: CDN_URL + '/static/assets/douyin_d_230313.png'
 }, {
+  type: '1',
   title: '拼多多',
   icon: CDN_URL + '/static/assets/pinduoduo_d.png'
 }, {
+  type: '90',
   title: '储蓄宝',
   icon: CDN_URL + '/static/assets/cxb_logo_230316.png'
 }]
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: '/pages/pension_record/list?type=' + item.type
+  })
+}
 </script>
 <template>
   <div class="py-3">
     <div class="bg-white py-2">
       <div class=" grid grid-cols-4 gap-4">
-        <div v-for="(item, index) in list" :key="index" class="flex flex-col justify-center items-center gap-1">
+        <div
+            @tap="handleItemClick(item)"
+            v-for="(item, index) in list" :key="index" class="flex flex-col justify-center items-center gap-1"
+        >
           <image :src="item.icon" mode="widthFix" class="w-12 h-12"></image>
           <div class="text-xs">{{ item.title }}</div>
         </div>

src/pages/pension_record/detail.vue

@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import FPrice from "~/components/FPrice/FPrice.vue";
+import {decodeBase64} from "~/utils/http/helper";
+
+const detail = ref({
+  yanglao: '',
+  trading_hour: '',
+  status_name: '',
+  shop_name: '',
+  order_no: '',
+  remark: '',
+  tradeType: ''
+})
+// const props = defineProps({
+//   detail: {
+//     type: Object,
+//     required: true
+//   }
+// })
+onLoad((options) => {
+  if (options.detail) {
+    detail.value = JSON.parse(decodeBase64(options.detail))
+    if (detail.value && detail.value.tradeType) {
+      uni.setNavigationBarTitle({
+        title: '推广佣金获取详情'
+      })
+    }
+  }
+})
+</script>
+
+<template>
+  <div>
+    <div class="flex flex-col f-hairline-bottom py-4 justify-center items-center text-[12px] gap-3">
+      <div>金额</div>
+      <FPrice :price="detail.yanglao" ex-class="text-xl font-bold !text-black"></FPrice>
+    </div>
+
+    <div class="flex flex-col text-[12px] p-4 gap-3">
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">交易类型</div>
+        <div class="w-4/5">{{ detail.tradeType ? '推广佣金获取' : '养老金获取'}}</div>
+      </div>
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">交易时间</div>
+        <div class="w-4/5">{{ detail.create_time}}</div>
+      </div>
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">交易状态</div>
+        <div class="4/5">{{ detail.other_status_desc }}</div>
+      </div>
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">商品名称</div>
+        <div class="line-clamp-2 w-4/5">{{ detail.goods_name }}</div>
+      </div>
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">流水单号</div>
+        <div class="w-4/5">{{ detail.order_sn }}</div>
+      </div>
+      <div class="flex gap-4">
+        <div class="text-gray w-1/5">备注</div>
+        <div class="w-4/5">{{ detail.remark }}</div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 养老金详情
+</route>

src/pages/pension_record/index.vue

@@ -8,6 +8,12 @@ onLoad(() => {
   getYanglaojinStatistics().then(res => {
     // state.all_yanglao = res.all_yanglao
     yanglaoStatistics.value = res
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
   })
 })
 
@@ -16,6 +22,12 @@ function handleChoicePlatform() {
     url: '/pages/pension_choice_platform/index'
   })
 }
+
+function handleShow99List() {
+  uni.navigateTo({
+    url: '/pages/pension_record/list?type=99'
+  })
+}
 const dianshang_yanglaojinImage = CDN_URL + '/static/assets/dianshang_yanglaojin.png'
 const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin.png'
 </script>
@@ -31,7 +43,9 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
             </div>
 
             <div class="flex content-end items-end">
-              <div class="text-[32px] font-bold ">0</div>
+              <div class="text-[32px] font-bold " v-if="yanglaoStatistics">
+                {{ yanglaoStatistics.all_num }}
+              </div>
             </div>
 
             <div class="flex justify-around w-full divide-gray divide-gray-1 h-15">
@@ -39,14 +53,16 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
                 <div class="text-xs text-light-100">
                   未结算（补贴）养老金：
                 </div>
-                <div class="font-bold flex ">
+                <div class="font-bold flex " v-if="yanglaoStatistics">
                   <div>￥</div>
-                  <div>0.00</div>
+                  <div>
+                    {{ yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a}}
+                  </div>
                 </div>
               </div>
-              <div class="flex flex-col justify-center items-center ">
+              <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
                 <div class="text-xs text-light-100">已结算养老金：</div>
-                <div class="font-bold">￥0.00</div>
+                <div class="font-bold">￥{{ yanglaoStatistics.all_yanglao_a }}</div>
 
               </div>
             </div>
@@ -57,15 +73,15 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
         </div>
 
       </div>
-      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3">
-        <div class=" border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b pb-2">电商平台消费（单）：0</div>
-        <div class="flex justify-between text-xs">
-          <div>已结算（单）：{{ yanglaoStatistics.all_yanglao_a }}</div>
-          <div>未结算（单）：{{ yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a }}</div>
+      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3" v-if="yanglaoStatistics && yanglaoStatistics.third_party_num">
+        <div class=" border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b pb-2">电商平台消费（单）：{{ yanglaoStatistics.third_party_num.all_num}}</div>
+        <div class="flex justify-between text-xs" v-if="yanglaoStatistics">
+          <div>已结算（单）：{{ yanglaoStatistics.all_yanglao_a.all_num_a }}</div>
+          <div v-if="yanglaoStatistics.third_party_num_n">未结算（单）：{{ yanglaoStatistics.third_party_num_n.all_num_n }}</div>
         </div>
       </div>
 
-      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3">
+      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3" v-if="yanglaoStatistics">
         <div class=" border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b pb-2">
           实体店消费（单）：{{ yanglaoStatistics.offLine.num }}
         </div>
@@ -74,7 +90,7 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
         </div>
       </div>
 
-      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3">
+      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3" v-if="yanglaoStatistics">
         <div class=" border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b pb-2">
           线上店铺消费（单）：{{ yanglaoStatistics.onLine.num + yanglaoStatistics.onLine_take_no.num }}
         </div>
@@ -88,7 +104,7 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
       <div @tap="handleChoicePlatform">
         <image :src="dianshang_yanglaojinImage" mode="widthFix"></image>
       </div>
-      <div>
+      <div @tap="handleShow99List">
         <image :src="shitidian_yanglaojinImage" mode="widthFix"></image>
       </div>
     </div>

src/pages/pension_record/list.json

@@ -0,0 +1,65 @@
+{
+  "status": 200,
+  "message": "获取订单列表成功",
+  "data": {
+    "list": [
+      {
+        "id": "2096",
+        "goods_id": "10084616549984",
+        "order_sn": "276234094041",
+        "goods_num": "1",
+        "goods_img": "http:\/\/img11.360buyimg.com\/n0\/jfs\/t1\/88262\/35\/44262\/195824\/64f1604bF93e732bd\/f8469c7ee60b618b.jpg",
+        "goods_name": "盾王石材返碱清洗剂户外大理石返碱地铺石墙面去泛黄反碱花岗岩清洁剂 500ml",
+        "pay_money": "29.00",
+        "goods_price": "39.00",
+        "status": "15",
+        "create_time": "2023-09-06 09:55:14",
+        "commission": "13.83",
+        "bill_status": "0",
+        "bill_end_time": "2023-11-05 09:55:14",
+        "other_status_desc": "待付款",
+        "source": 6,
+        "status_name": "未结算",
+        "yanglao": "6.88"
+      },
+      {
+        "id": "2095",
+        "goods_id": "10064758193491",
+        "order_sn": "276223809915",
+        "goods_num": "1",
+        "goods_img": "http:\/\/img11.360buyimg.com\/n0\/jfs\/t1\/95514\/16\/36892\/100040\/640ec344Fe2619bfb\/22c5f8fe5891c82b.png",
+        "goods_name": "赫尼庄园（HERNIY MANOR）古堡干红葡萄酒 6瓶整箱木箱装 法国进口15度AOP超重型瓶红酒送礼",
+        "pay_money": "760.00",
+        "goods_price": "3800.00",
+        "status": "3",
+        "create_time": "2023-09-06 09:51:11",
+        "commission": "0.00",
+        "bill_status": "2",
+        "bill_end_time": "2023-11-05 09:51:11",
+        "other_status_desc": "已取消",
+        "source": 6,
+        "status_name": "失效",
+        "yanglao": "173.75"
+      },
+      {
+        "id": "2094",
+        "goods_id": "65444556247",
+        "order_sn": "276256475345",
+        "goods_num": "1",
+        "goods_img": "http:\/\/img11.360buyimg.com\/n0\/jfs\/t1\/218187\/17\/24760\/82551\/64ef6153Fb8c3367d\/b30c1875138ab597.jpg",
+        "goods_name": "泊泉雅蜗牛水润爽肤水补水保湿控油收缩毛孔 130ml",
+        "pay_money": "79.00",
+        "goods_price": "129.00",
+        "status": "3",
+        "create_time": "2023-09-06 09:51:43",
+        "commission": "0.00",
+        "bill_status": "2",
+        "bill_end_time": "2023-11-05 09:51:43",
+        "other_status_desc": "已取消",
+        "source": 6,
+        "status_name": "失效",
+        "yanglao": "21.24"
+      }
+    ]
+  }
+}

src/pages/pension_record/list.vue

@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import {getYanglaoJinLogXs, getUserYanglaoJinLogXx} from "~/apis/user";
+import {getThirdOrder} from "~/apis/order.api";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+import {encodeBase64} from "~/utils/http/helper";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+const list = ref([])
+onLoad((options) => {
+  const type = options.type
+  if (type === '99') {
+    getUserYanglaoJinLogXx({
+      page: 1,
+      limit: 20,
+      source: '1'
+    }).then(res => {
+      list.value = res.list
+    }).catch(error => {
+      if (error === '请登录') {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }
+    })
+  }
+
+  if (type === '90') {
+    getYanglaoJinLogXs({
+      page: 1,
+      limit: 20,
+      source: '0'
+    }).then(res => {
+      list.value = res.list
+    }).catch(error => {
+      if (error === '请登录') {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }
+    })
+  }
+
+  if (type !== 90 && type !== 99) {
+    getThirdOrder({
+      page: 1,
+      limit: 20,
+      type
+    }).then(res => {
+      list.value = res.list
+    }).catch(error => {
+      if (error === '请登录') {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }
+    })
+  }
+})
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: '/pages/pension_record/detail?detail=' + encodeBase64(Object.assign({}, item, { tradeType: '', remark: ''}))
+  })
+}
+</script>
+
+<template>
+  <CXBBasePage>
+    <div v-if="list && list.length > 0" class="flex flex-col gap-3 p-3">
+      <div
+          @tap="handleItemClick(item)"
+          v-for="(item, index) in list" :key="index" class="bg-white rounded p-3 text-[12px]">
+        <div class="flex items-center gap-3 text-[12px]">
+          <image :src="item.goods_img" mode="widthFix" class="w-15 h-15"></image>
+          <div class="flex flex-col">
+            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.goods_name }}</div>
+            <CXBYaojinTag :amount="item.yanglao" />
+          </div>
+        </div>
+        <div class="flex text-gray text-[12px] f-hairline-bottom py-3">
+          订单号：{{ item.order_sn }}
+        </div>
+        <div class="flex flex-col gap-2 pt-3">
+          <div class="flex">
+            下单时间：{{ item.create_time }}
+          </div>
+          <div class="flex justify-between items-center">
+            <div>
+              养老金来源：购买商品
+            </div>
+            <div class="flex items-center text-gray">
+              <div>详情</div>
+              <div class="f-text-color-2 i-tabler-chevron-right"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <CXBEmpty v-else />
+  </CXBBasePage>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 养老金
+  enablePullDownRefresh: true
+</route>

src/pages/store/home/components/MerchantHeader.vue

@@ -63,6 +63,12 @@ function handleRelation() {
     uni.showToast({
       title: '已关注'
     })
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
   })
 }
 

src/pages/store/home/index.vue

@@ -90,7 +90,7 @@ function handleNavItemClick(navItemId: any) {
     </div>
   </div>
 </template>
-<route lang="yaml"  type="home">
+<route lang="yaml">
 style:
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true

src/pages/store/product/detail.vue

@@ -385,7 +385,9 @@ function handleCountChange(val) {
         <div
             class="bg-[#F94032] rounded-full w-25 flex justify-center items-center h-9"
         >
-          <div v-if="is148Merchant">立即兑换</div>
+          <div v-if="is148Merchant"
+               @click="handleOrderConfirm"
+          >立即兑换</div>
           <div
               v-else
               @click="handleOrderConfirm"

src/pages/store/product/other.vue

@@ -219,6 +219,7 @@ const hasCoupon = computed(() => {
         >
           <div
               class="px-3 relative"
+              @tap="handleBuyNow"
           >
             <image :src="discount_coupon_bg_220804Image"
                    mode="widthFix"

src/pages/user/index.vue

@@ -88,6 +88,8 @@ onShow(async () => {
     // })
     uni.hideLoading()
     await userStore.getUserInfo()
+    await userStore.getUserYanglaoJin()
+
   } else {
     uni.navigateTo({
       url: '/pages/user/login/index?key=3'
@@ -138,8 +140,8 @@ function handleService(item: {
   })
 }
 
-// onLoad(async () => {
-//   await userStore.getUserInfo()
+// onShow(async () => {
+  // await userStore.getUserInfo()
 // })
 
 function encodePhone(phone: string) {
@@ -170,6 +172,26 @@ function handleShowMyAllOrder(tab?: number) {
     url: '/pages/order/index?tabIndex=' + tab
   })
 }
+
+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 '合伙人'
+    }
+})
 </script>
 <template>
   <div v-if="state.isLogin">
@@ -187,16 +209,23 @@ function handleShowMyAllOrder(tab?: number) {
               mode="widthFix"
               class="w-9 h-9 rounded-full"
           />
-          <div class="flex flex-col">
-            <div class="text-sm">
-              <div class="text-sm" v-if="userStore.userInfo">
-                {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
+          <div class="flex">
+            <div class="flex flex-col">
+              <div class="text-sm">
+                <div class="text-sm" v-if="userStore.userInfo">
+                  {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
+                </div>
+              </div>
+              <div class="text-xs" v-if="userStore.userInfo && userStore.userInfo.phone">
+                {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div class="text-xs" v-if="userStore.userInfo && userStore.userInfo.phone">
-              {{ encodePhone(userStore.userInfo.phone) }}
+            <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="bg-white rounded flex flex-col gap-6 py-4 text-xl">
           <div
@@ -206,7 +235,7 @@ function handleShowMyAllOrder(tab?: number) {
                 @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

src/pages/user/login/index.vue

@@ -139,7 +139,7 @@ async function handleWexinLogin() {
             class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>
         </div>
       </div>
-      <navigator url="/pages/user/login/orght-phone"
+      <navigator url="/pages/user/login/other-phone"
           class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm">
         <div>其他手机号登录</div>
       </navigator>

src/stores/addressStore.ts

@@ -23,11 +23,16 @@ export const useAddressStore = defineStore('addressStore', {
                     // data.addressInfo = res
                     // data.addressId = res.address_id || 0
                     this.address = address
+                }).catch(error => {
+                    console.error(error + '->getUserAddressDetail')
                 })
             } else {
                 getUserAddressList().then(res => {
                     this.address = res.list.length > 0 ? res.list[0] : {}
                     // this.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
+                }).catch(error => {
+                    console.error(error + '->getUserAddressList')
+
                 })
             }
             // this.currentAddress = address

src/stores/userStore.ts

@@ -1,5 +1,5 @@
 import {defineStore} from "pinia";
-import {getUserInfo} from "~/apis/user";
+import {getUserInfo, getYanglaojinStatistics} from "~/apis/user";
 import Cache from '~/utils/cache'
 import {LOGIN_STATUS, UID, USER_INFO} from "~/constants";
 import type {UserInfoModel} from "~/apis/model/userInfoModel";
@@ -11,6 +11,7 @@ interface UserStoreState {
     uid: string | null
     mer_id: number
     permissionList: Array<string> | null
+    yanglao: number
 }
 export const useUserStore = defineStore('userStore', {
     state: () => ({
@@ -20,9 +21,18 @@ export const useUserStore = defineStore('userStore', {
         // isLogin: !!token,
         uid: Cache.get(UID) || null,
         mer_id: 0, // 店铺 ID
+        yanglao: 0,
         permissionList: null // 权限列表
     }) as UserStoreState,
     actions: {
+        // getYanglaojinStatistics().then(res => {
+        //     state.all_yanglao = res.all_yanglao
+        // })
+        async getUserYanglaoJin() {
+            const res = await getYanglaojinStatistics()
+            // this.yanglao = res.all_yanglao
+            this.yanglao = res
+        },
         // isLogin() {
         //     return !!this.token
         // },
@@ -36,6 +46,7 @@ export const useUserStore = defineStore('userStore', {
         logout() {
             this.token = null
             this.uid = null
+            this.userInfo = null
             Cache.clear(LOGIN_STATUS)
             Cache.clear(UID)
         },