feat: 增加会员详情页

components.d.ts

@@ -20,6 +20,7 @@ declare module '@vue/runtime-core' {
     CXBNotLoginButton: typeof import('./src/components/CXBNotLoginButton/CXBNotLoginButton.vue')['default']
     CXBPhoneLoginButton: typeof import('./src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue')['default']
     CXBSkuPopup: typeof import('./src/components/CXBSkuPopup/CXBSkuPopup.vue')['default']
+    CXBUserINdexHeader: typeof import('./src/components/CXBUserIndexHeader/CXBUserINdexHeader.vue')['default']
     CXBYaojinTag: typeof import('./src/components/CXBYaojinTag/CXBYaojinTag.vue')['default']
     FButton: typeof import('./src/components/FButton/FButton.vue')['default']
     FCell: typeof import('./src/components/FCell/FCell.vue')['default']
@@ -53,6 +54,7 @@ declare module '@vue/runtime-core' {
     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']
+    NutPicker: typeof import('uniapp-nutui/components/picker/picker.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']

src/apis/model/storeModel.ts

@@ -89,7 +89,7 @@ export interface StoreParams {
     // 经度
     lng: ''
     // 关键字（检索内容）
-    mer_keyword: ''
+    mer_keyword: string
     // 距离排序（升序）0
     distanceAsc?: number
     // 商品分类 id

src/apis/model/userInfoModel.ts

@@ -1,3 +1,12 @@
+export interface UpdateUserInfoRequestModel {
+    nickname: string;
+    // 1男 2女
+    sex: number
+    birthday: string
+    mark: string
+    avatar: string
+    // addres: string
+}
 export interface UserInfoModel{
     /** 用户id */
     uid: string

src/apis/user.ts

@@ -4,7 +4,7 @@ import Cache from '~/utils/cache'
 import {EXPIRES_TIME, LOGIN_STATUS, STATE_R_KEY, USER_INFO} from "~/constants";
 import {useUserStore} from "~/stores/userStore";
 import type {YanglaoStatisticsResult} from "~/apis/model/yanglaoStatisticsModel";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
+import type {UpdateUserInfoRequestModel, UserInfoModel} from "~/apis/model/userInfoModel";
 import type {InvitePartnerModel, UserInviteParams} from "~/apis/model/invitePartnerModel";
 import type {UserShareProductListModel, UserShareProductParams} from "~/apis/model/userShareProductModel";
 import type {RevenueSharingModel, RevenueSharingParams} from "~/apis/model/revenueSharingModel";
@@ -50,6 +50,8 @@ enum API {
     GET_YANGLAO_LOG = '/api/user/yanglaolog',
     // 获取用户信息
     USER = '/api/user',
+    // 个人资料编辑
+    UPDATE_USER = '/api/user/update/user',
     // 获取协议
     GET_XIEYI = '/api/xieyi/detail',
     GET_USER_UNION_ID = '/api/userMp/getUserUnionid',
@@ -633,6 +635,18 @@ export function getUserInfo(): Promise<UserInfoModel> {
 }
 
 /**
+ * 更新用户信息
+ * @param params
+ */
+export function updateUserInfo(params: UpdateUserInfoRequestModel) {
+    return defHttp.post({
+        url: API.UPDATE_USER,
+        data: {
+            ...params
+        }
+    })
+}
+/**
  * 获取协议内容
  */
 export function getXieYi(type: number) {

src/components/FNavBar/FNavBar.vue

@@ -84,7 +84,7 @@ const {
 }
 
 .f-nav-bar-title {
-  --at-apply: 'line-clamp-1 m-auto max-w-60% text-base text-lg font-bold f-bg-2'
+  --at-apply: 'line-clamp-1 m-auto max-w-60% text-base text-sm font-bold '
 }
 
 .f-nav-bar-right {

src/pages/mine/my-address.vue

@@ -8,6 +8,7 @@ import FField from "~/components/FField/FField.vue";
 // })
 const userAddress = ref<any>({})
 const checked = ref(false)
+
 </script>
 <template>
 <CXBBasePage>

src/pages/my-profile/index.vue

@@ -0,0 +1,263 @@
+<script setup lang="ts">
+
+import {UPLOAD_URL} from "~/utils/http";
+import {getToken} from "~/utils/auth";
+import {updateUserInfo} from "~/apis/user";
+
+const userStore = useUserStore()
+const showSexPicker = ref(false)
+const sexPopupValue = ref()
+const sexColumns = ref([
+  { text: '男', value: '1' },
+  { text: '女', value: '2' },
+])
+
+const formData = reactive({
+  phone: '',
+  nickname: '',
+  sex: '1',
+  birthday: '',
+  avatar: '',
+  // avatarUrl: '',
+  tempFile: { path: '' },
+  mark: ''
+})
+// const sex
+const sexPopupConfirm = ({ selectedValue, selectedOptions }) => {
+  console.log(selectedValue)
+  formData.sex = selectedValue[0]
+  showSexPicker.value = false
+}
+
+const showDatePicker = ref(false)
+const birthdayPopupValue = ref()
+const minDate = new Date(1900, 0, 1);
+const maxDate = new Date(2025, 10, 1);
+const currentDate = new Date()
+
+const birthdayPopupConfirm = ({ selectedValue, selectedOptions }) => {
+  console.log(selectedValue.join('-'))
+  formData.birthday = selectedValue.join('-')
+  showDatePicker.value = false
+}
+onLoad(async () => {
+  await userStore.getUserInfo()
+  // console.log(userStore.userInfo)
+  if (userStore.userInfo) {
+    const userInfo = userStore.userInfo
+    formData.nickname = userInfo.nickname
+    formData.birthday = userInfo.birthday
+    formData.sex = userInfo.sex
+    formData.avatar = userInfo.avatar
+    formData.mark = userInfo.mark
+    formData.phone = userInfo.phone
+  }
+})
+
+function onChooseAvatar({ detail }) {
+  console.log()
+  formData.avatar = detail.avatarUrl
+  formData.tempFile = { path: detail.avatarUrl }
+  const inputName = 'field';
+
+  uni.showLoading()
+  uni.uploadFile({
+    url: UPLOAD_URL,
+    name: 'field',
+    formData: {
+      'filename': inputName
+    },
+    header: {
+      // #ifdef MP
+      "Content-Type": "multipart/form-data",
+      // #endif
+      'X-Token':'Bearer ' + getToken()
+      // [TOKENNAME]: 'Bearer ' + store.state.app.token
+
+    },
+    filePath: formData.tempFile.path,
+    success: res => {
+      uni.hideLoading()
+      const { data } = res
+      const assetData = JSON.parse(data)
+      console.log(assetData)
+      if (assetData && assetData.data) {
+        formData.avatar = assetData.data.path
+      }
+    }
+  })
+}
+
+function handleSubmit() {
+  // console.log(formData)
+  updateUserInfo({
+    avatar: formData.avatar,
+    nickname: formData.nickname,
+    sex: formData.sex,
+    birthday: formData.birthday,
+    mark: formData.mark
+  }).then(res => {
+    if (res) {
+      uni.showToast({
+        title: '保存成功',
+        icon: 'none'
+      }).then(() => {
+        uni.navigateBack()
+      })
+    }
+  }).catch(error => {
+    // if (error == '未做任何修改') {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    // }
+  })
+}
+// const show
+</script>
+<template>
+  <div v-if="userStore && userStore.userInfo">
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3 f-hairline-bottom items-center">
+      <div class="">头像</div>
+      <div class="flex items-center">
+        <button class="btn-normal" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+          <image :src="formData.avatar ? formData.avatar : 'https://app.bjtdba.com/mp/zjx_image/logo.png'" mode="widthFix" class="w-9 h-9 rounded-full" />
+        </button>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+
+    </div>
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
+      <div class="">昵称</div>
+      <div class="flex items-center">
+        <div><input placeholder="请填写昵称" v-model="formData.nickname" class="text-right"/></div>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+    </div>
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
+      <div class="">性别</div>
+      <div class="flex items-center" @click="showSexPicker = true">
+        <div>{{ formData.sex ? formData.sex == '1' ? '男' : '女' : '请选择' }}</div>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+
+      <nut-popup position="bottom"  v-model:visible="showSexPicker">
+        <nut-picker
+            v-model="sexPopupValue"
+            :columns="sexColumns"
+            title="请选择性别"
+            @confirm="sexPopupConfirm"
+            @cancel="showSexPicker=false"
+        >
+          <nut-button block type="primary">完成</nut-button>
+        </nut-picker>
+      </nut-popup>
+    </div>
+
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
+      <div class="">生日</div>
+      <div class="flex items-center" @click="showDatePicker = true">
+        <div>请选择</div>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+
+      <nut-popup position="bottom" v-model:visible="showDatePicker">
+        <nut-date-picker
+            v-model="currentDate"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="birthdayPopupConfirm"
+            :is-show-chinese="true"
+        >
+<!--          <nut-button block type="primary" @click="alwaysFun">永远有效</nut-button>-->
+        </nut-date-picker>
+      </nut-popup>
+    </div>
+
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
+      <div class="">手机号</div>
+      <div class="flex items-center">
+        <div><input placeholder="请填写昵称" :value="formData.phone" class="text-right"/></div>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+    </div>
+
+
+
+    <div
+        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
+      <div class="">签名</div>
+      <div class="flex items-center">
+        <div><input placeholder="请填写您的人个性签名" :value="formData.mark" class="text-right"/></div>
+        <div
+            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
+        />
+      </div>
+    </div>
+
+    <div class=" fixed bottom-0 w-full p-safe">
+
+      <div class="px-3 text-white">
+        <nut-button type="primary" block @click="handleSubmit">完成</nut-button>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+
+<style>
+page {
+  background-color: #f8f8f8;
+}
+/* 无样式button (用于伪submit) */
+
+.btn-normal {
+  display: block;
+  margin: 0;
+  padding: 0;
+  line-height: normal;
+  background: none;
+  border-radius: 0;
+  box-shadow: none;
+  border: none;
+  font-size: unset;
+  text-align: unset;
+  overflow: visible;
+  color: inherit;
+}
+
+.btn-normal:after {
+  border: none;
+}
+
+.btn-normal.button-hover {
+  color: inherit;
+}
+
+button:after {
+  content: none;
+  border: none;
+}
+
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 个人资料
+</route>

src/pages/my-rules/index.vue

@@ -0,0 +1,249 @@
+<script setup lang="ts">
+// import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
+
+import {encodePhone} from "../../utils";
+import {getRules, getUserInfo} from "~/apis/user";
+
+const userStore = useUserStore()
+const ruleDetail = ref<{
+  admin_id: string
+  content: string
+  create_time: string
+  is_del: string
+  notice_id: string
+  status: string
+  title: string
+}>()
+
+const showUpgradeInfo = ref(false)
+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 '合伙人'
+  }
+  if (!userRichType) {
+    return '用户'
+  }
+})
+
+onLoad(async () => {
+  await userStore.getUserInfo()
+  await userStore.getUserYanglaoJin()
+})
+
+
+function handleShowMyInvitation() {
+  uni.navigateTo({
+    url: '/pages/my-invitation/index'
+  })
+}
+function handleShowMyIntegral() {
+  uni.navigateTo({
+    url: '/pages/my-integral/index'
+  })
+}
+function handleShowMyAllOrder(tab?: number) {
+  uni.navigateTo({
+    url: '/pages/order/index?tabIndex=' + tab
+  })
+}
+function handleToRedIntegral() {
+  uni.navigateTo({
+    url: '/pages/red-integral/index'
+  })
+}
+
+function handleShowAnnuityDetail() {
+  uni.navigateTo({
+    url: '/pages/annuity/index'
+  })
+}
+const ruleId = computed(() => {
+  const userRichType = userStore.userInfo?.user_rich_type
+  // 创始人
+  if (userRichType === 3) {
+    return 21
+  }
+  // 普通用户
+  if (userRichType === 0) {
+    return 18
+  }
+  // 会员
+  if (userRichType === 1) {
+    return 19
+  }
+  // 合伙人
+  if (userRichType === 2) {
+    return 20
+  }
+
+  return 18
+})
+
+onShow(() => {
+
+  getRules(ruleId.value).then(res => {
+    ruleDetail.value = res
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+})
+
+function handleUserUpgrade() {
+  if (ruleId.value < 21) {
+    const id = ruleId.value + 1
+    getRules(id).then(res => {
+      ruleDetail.value = res
+      showUpgradeInfo.value = true
+    })
+  }
+}
+
+function handleToVipPage() {
+  uni.navigateTo({
+    url: '/pages/vip/index'
+  })
+}
+</script>
+<template>
+  <div>
+    <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
+    <div class="flex flex-col gap-4 relative px-3 pb-safe">
+      <div class="pt-15 ">
+        <div class="flex gap-2 mb-2 text-white mb-6">
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+                 mode="widthFix"
+                 class="w-9 h-9 rounded-full"
+          ></image>
+
+          <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="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
+              v-if="userStore.userInfo"
+              class="flex flex-wrap">
+            <div
+                @tap="handleShowAnnuityDetail"
+                class="w-1/3 flex flex-col justify-center items-center"
+            >
+              <div>{{ userStore.yanglao.all_yanglao }}</div>
+              <div class="text-xs">养老金</div>
+            </div>
+            <div
+                @tap="handleShowMyInvitation"
+                class="w-1/3  flex flex-col justify-center items-center">
+              <div>{{ userStore.userInfo.member_brokerage_price }}</div>
+              <div class="text-xs">我的佣金</div>
+            </div>
+            <div
+                @tap="handleShowMyIntegral"
+                class="w-1/3  flex flex-col justify-center items-center">
+              <div>{{ userStore.userInfo.score }}</div>
+              <div class="text-xs">我的积分</div>
+            </div>
+          </div>
+          <div
+              v-if="userStore.userInfo"
+              class="flex">
+            <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>
+            <div class="w-1/2 flex flex-col  justify-center items-center">
+              <div>{{ userStore.userInfo.team_number }}</div>
+              <div class="text-xs">团队人数</div>
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+
+      <div
+          v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo"
+          class="p-3 bg-white text-sm text-gray-500"
+      >
+        <mpHtml :content="ruleDetail.content"></mpHtml>
+      </div>
+      <div
+          v-else
+          class="p-3 bg-white text-sm text-gray-500"
+      >
+        <mpHtml :content="ruleDetail.content"></mpHtml>
+
+        <div class="flex justify-center items-center">
+          <nut-button
+              @click="handleToVipPage"
+              type="primary" size="small">立即升级</nut-button>
+
+        </div>
+      </div>
+
+
+
+      <div class="p-3 bg-white text-sm flex flex-col" v-if="!showUpgradeInfo">
+        <div class="font-bold">还有更多奖励权益</div>
+        <div class="flex justify-end">
+
+          <div
+              @click="handleUserUpgrade"
+              class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600"
+          >了解更多奖励</div>
+        </div>
+      </div>
+
+
+
+    </div>
+  </div>
+
+
+</template>
+
+<route lang="yaml" type="home">
+style:
+  navigationBarTitleText: 储蓄保
+  enablePullDownRefresh: true
+</route>
+
+<style>
+page{
+  background: #f5f5f5;
+}
+</style>

src/pages/search/index.vue

@@ -5,20 +5,26 @@ import {
   getDyProductList,
   getJdProductList,
   getPddProductList,
-  getSuProductList, getTaobaoProductList, getVipProductList,
-  searchProductList
+  getSuProductList,
+  getTaobaoProductList,
+  getVipProductList,
+  searchDyProduct,
+  searchJdProduct,
+  searchPddProduct,
+  searchSuProduct, searchVipProduct
 } from "~/apis/product";
 import type {
-  DyProductModel, IProductDetail,
-  JdProductModel, SuNingProductModel,
-  TaobaoProductDetailModel,
-  TaobaoProductThirdPartyWaresModel, VipProductModel
+  DyProductModel,
+  IProductDetail,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel,
+  VipProductModel
 } from "~/apis/model/product.model";
 import {getDcProductList} from "~/apis/dacang";
 import type {DcProductModel} from "~/apis/model/dacang.model";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import {encodeBase64} from "~/utils/http/helper";
-import FCell from "~/components/FCell/FCell.vue";
 import CXBDyLiveRecommend from "~/components/CXBDyLive/CXBDyLiveRecommend.vue";
 import {PLATFORM_NAME} from "~/apis/model/common.model";
 import {CDN_URL} from "~/config/app";
@@ -70,15 +76,24 @@ const tabList = <Array<TabItem>>[{
   selectedIconPath: CDN_URL + '/static/assets/suningyigou_d.png',
 }]
 const state = reactive({
-  currentTab: PLATFORM_NAME.JD
+  currentTab: PLATFORM_NAME.JD,
+  // 列表高度
+  scrollHeight: 0,
+  triggered: false,
+  status: 'none',
+  currentPage: 1,
+  totalPage: 1
 })
+const { windowHeight } = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 195
+const searchValue = ref('')
 
 onLoad((options) => {
   const platform = options.platform
   if (platform) {
     state.currentTab = platform
   }
-  loadProductList(state.currentTab)
+  loadProductList('reload')
 
 })
 const list = ref<Array<
@@ -92,14 +107,80 @@ const list = ref<Array<
 >>()
 
 const dyLiveList = ref<Array<DyProductModel>>()
-function loadProductList(platform: PLATFORM_NAME) {
-  switch (platform) {
+
+function searchProduct() {
+  switch (state.currentTab) {
     case PLATFORM_NAME.JD: {
-      getJdProductList({
+      searchJdProduct({keyword: searchValue.value, page: 1, limit: 20}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.DC: {
+      getDcProductList({
         page: 1,
-        limit: 10
+        limit: 10,
+        classify: '',
+        keyword: searchValue.value
       }).then(res => {
         list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.DY: {
+      searchDyProduct({keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.PDD: {
+      searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.SU: {
+      searchSuProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.TB: {
+      getTaobaoProductList({
+        pageNum: `1`,
+        pageSize: '10',
+        title: searchValue.value
+      }).then(res => {
+        list.value = res.thirdPartyWaresList
+      })
+      break;
+    }
+    case PLATFORM_NAME.VIP: {
+      searchVipProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+  }
+}
+function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
+
+  switch (state.currentTab) {
+    case PLATFORM_NAME.JD: {
+      getJdProductList({
+        page: state.currentPage,
+        limit: 10
+      }).then(res => {
+        state.triggered = false
+
+        // list.value = res
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        // state.totalPage = Math.ceil()
         // res[0].
         // console.log(res)
       })
@@ -107,19 +188,20 @@ function loadProductList(platform: PLATFORM_NAME) {
     }
     case PLATFORM_NAME.DC: {
       getDcProductList({
-        page: 1,
+        page: state.currentPage,
         limit: 10,
         classify: '',
         keyword: ''
       }).then(res => {
         list.value = res
+        state.triggered = false
 
       })
       break;
     }
     case PLATFORM_NAME.DY: {
       getDyLiveList({
-        page: 1,
+        page: state.currentPage,
         limit: 4,
         // keyword: ''
       }).then(res => {
@@ -134,16 +216,18 @@ function loadProductList(platform: PLATFORM_NAME) {
             }
           })
       getDyProductList({
-        page: 1,
+        page: state.currentPage,
         limit: 10,
       }).then(res => {
         list.value = res
+        state.triggered = false
+
       })
       break;
     }
     case PLATFORM_NAME.PDD: {
       getPddProductList({
-        page: 1,
+        page: state.currentPage,
         limit: 10
       }).then(res => {
         list.value = res
@@ -152,18 +236,20 @@ function loadProductList(platform: PLATFORM_NAME) {
     }
     case PLATFORM_NAME.SU: {
       getSuProductList({
-        page: 1,
+        page: state.currentPage,
         limit: 10
       }).then(res => {
         list.value = res
         console.log(res)
+        state.triggered = false
+
 
       })
       break;
     }
     case PLATFORM_NAME.TB: {
       getTaobaoProductList({
-        pageNum: '1',
+        pageNum: `${state.currentPage}`,
         pageSize: '10'
       }).then(res => {
         list.value = res.thirdPartyWaresList
@@ -172,10 +258,12 @@ function loadProductList(platform: PLATFORM_NAME) {
     }
     case PLATFORM_NAME.VIP: {
       getVipProductList({
-        page: 1,
+        page: state.currentPage,
         limit: 10
       }).then(res => {
         list.value = res
+        state.triggered = false
+
 
       })
       break;
@@ -190,6 +278,7 @@ function loadProductList(platform: PLATFORM_NAME) {
     // }
   }
 
+
 }
 
 function handleCategoryItemClick(item: TabItem) {
@@ -352,10 +441,49 @@ function handleLiveRecommendTitleClick() {
     url: `/pages/store/product/dy-live`
   })
 }
+
+// 下拉刷新被下拉
+const onRefresherPulling = e => {
+  state.triggered = true;
+};
+// 下拉刷新被复位
+const onRefresherRestore = e => {
+  state.triggered = false;
+};
+// 下拉刷新被中止
+const onRefresherAbort = e => {
+  state.triggered = false;
+}
+
+const onRefresherRefresh = e => {
+  loadProductList('reload')
+};
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // if (state.currentPage > state.totalPage) {
+  //   state.status = 'noMore';
+  // } else {
+  //   // queryFavorites('page');
+  //   // loadSelectMerchant('page')
+  //   loadProductList(state.currentTab)
+  //
+  // }
+}
 </script>
 <template>
   <CXBBasePage>
-    <div class="flex overflow-hidden">
+
+    <div class="flex flex-col overflow-hidden fixed  h-fit z-1 bg-white">
+      <nut-searchbar
+          v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">
+        <template v-slot:rightout>
+          <div @tap="searchProduct">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
       <div class="py-3">
         <scroll-view
             class="flex flex-row w-full gap-2 overflow-x whitespace-nowrap w-screen"
@@ -378,7 +506,22 @@ function handleLiveRecommendTitleClick() {
         </scroll-view>
       </div>
     </div>
-    <div class="">
+    <div class="pt-36 ">
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          scroll-with-animation
+          :refresher-enabled="true"
+          refresher-background="#f5f5f5"
+          refresher-default-style="black"
+          :refresher-triggered="state.triggered"
+          @scrolltolower="handleScrollToLower"
+          @refresherPulling="onRefresherPulling"
+          @refresherRestore="onRefresherRestore"
+          @refresherAbort="onRefresherAbort"
+          @refresherrefresh="onRefresherRefresh"
+
+      >
       <div
           v-if="state.currentTab === PLATFORM_NAME.DY"
       >
@@ -476,6 +619,7 @@ function handleLiveRecommendTitleClick() {
 
       </div>
 
+      </scroll-view>
     </div>
   </CXBBasePage>
 
@@ -484,5 +628,13 @@ function handleLiveRecommendTitleClick() {
 <route lang="yaml">
 style:
   navigationBarTitleText: 搜索
+  disableScroll: true
 </route>
 
+<style>
+page {
+  overflow: hidden;
+  position: fixed;
+
+}
+</style>

src/pages/store/nearby/index.vue

@@ -11,6 +11,15 @@ const state = reactive<any>({
   // 内容区垂直滚动条位置
   scrollTop: 0,
 
+  tabCurrent: 0,
+  status: 'loading',
+  currentPage: 1,
+  totalPage: 1,
+  total: 1,
+  pageSize: 10,
+  triggered: false,
+
+  category_id: 0,
   merchantCategory: [],
   merchantList: [],
   merchantPageNum: 1,
@@ -25,7 +34,7 @@ const state = reactive<any>({
 const searchValue = ref('')
 
 const { windowHeight } = uni.getSystemInfoSync()
-state.scrollHeight = windowHeight
+state.scrollHeight = windowHeight - 70
 
 onLoad(() => {
   // getMerchantCategory()
@@ -33,50 +42,56 @@ onLoad(() => {
     state.merchantCategory = res.merchantCategory
   })
 
-  getSelectMerchant({
-    pageNum: 1,
-    pageSize: 10,
-    mer_keyword: '',
-    lat: '',
-    lng: '',
-    // distanceAsc: 0,
-    // category_id: '',
-  }).then((res: StoreResult) => {
-    // console.log(res.pageInfo)
-    // console.log(res.list)
-    state.merchantList = res.list
-  })
+  // loadSelectMerchant('reload')
+  loadAll()
 })
 
+function loadAll() {
+  state.category_id = 0
+  loadSelectMerchant('reload')
+}
 function handleCategoryChange(category) {
-  // console.log(category)
+  console.log(category)
   state.currentMerchantCategoryId = category.merchant_category_id
   // console.log(category)
   // loadSelectMerchant()
-  loadSelectMerchant(category.merchant_category_id)
+  state.category_id = category.merchant_category_id
+  loadSelectMerchant('reload')
 }
-function loadSelectMerchant(category_id: number, mer_keyword?: string) {
-  if (category_id == 0) {
-    state.currentMerchantCategoryId = category_id
+function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => void) {
+  if (state.category_id == 0) {
+    state.currentMerchantCategoryId = state.category_id
   }
   let params: StoreParams = {
-    pageNum: 1,
-    pageSize: 10,
-    mer_keyword: mer_keyword ? mer_keyword : '',
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+    mer_keyword: searchValue.value,
     // mer_keyword: mer_keyword,
     lat: '',
     lng: '',
   }
-  if (category_id !== 0) {
+  if (state.category_id !== 0) {
     // params.category_id = category_id
     params = Object.assign({}, params, {
-      category_id
+      category_id: state.category_id
     })
   }
   getSelectMerchant(params).then((res: StoreResult) => {
-    // console.log(res.pageInfo)
-    // console.log(res.list)
-    state.merchantList = res.list
+    state.total = res.total
+    state.totalPage = Math.ceil(state.total / state.pageSize);
+    console.log(state.totalPage)
+    // state.merchantList = res.list
+    if (action === 'page') {
+      state.merchantList = state.merchantList.concat(res.list)
+    }
+    if (action === 'reload') {
+      state.merchantList = res.list
+    }
+    state.status = 'more'
+
+    if (callback) {
+      callback(res.list)
+    }
   })
 }
 
@@ -89,19 +104,48 @@ function handleShowMerchant(merchant) {
 
 function change() {}
 function onChange() {}
+// 下拉刷新被下拉
+const onRefresherPulling = e => {
+  state.triggered = true;
+};
+// 下拉刷新被复位
+const onRefresherRestore = e => {
+  state.triggered = false;
+};
+// 下拉刷新被中止
+const onRefresherAbort = e => {
+  state.triggered = false;
+}
+// 下拉刷新被触发
+const onRefresherRefresh = e => {
+  loadSelectMerchant(0)
+};
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    // queryFavorites('page');
+    loadSelectMerchant('page')
+  }
+}
 </script>
 <template>
 <!--  <nut-category :category="state.merchantCategory" @change="change">-->
 <!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
 <!--    </nut-category-pane>-->
 <!--  </nut-category>-->
-  <nut-searchbar v-model="searchValue" @search="loadSelectMerchant(0, searchValue)" @clear="loadSelectMerchant(0, '')">
-    <template v-slot:rightout>
-      <div @tap="loadSelectMerchant(0, searchValue)">
-        搜索
-      </div>
-    </template>
-  </nut-searchbar>
+    <nut-searchbar
+        class="absolute top-0"
+        v-model="searchValue" @search="loadSelectMerchant(0, searchValue)" @clear="loadSelectMerchant(0, '')">
+      <template v-slot:rightout>
+        <div @tap="loadSelectMerchant(0, searchValue)">
+          搜索
+        </div>
+      </template>
+    </nut-searchbar>
+
   <div class="flex">
     <!-- 左侧 一级分类 -->
     <scroll-view
@@ -110,11 +154,11 @@ function onChange() {}
         class="flex w-40 h-full bg-[#f8f8f8]"
     >
       <div
-          @tap="loadSelectMerchant(0)"
+          @tap="loadAll()"
           :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
           class="relative h-15 block text-sm flex justify-center items-center">
         <div class="flex items-center gap-1">
-          <div class="h-4 bg-primary w-1"></div>
+          <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == 0"></div>
           <div>全部</div>
         </div>
 
@@ -122,10 +166,11 @@ function onChange() {}
       <div v-for="(item, index) in state.merchantCategory" :key="index"
            @tap="handleCategoryChange(item)"
            :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
-           class="relative h-15 block text-sm flex justify-center items-center"
+           class="relative h-15 block text-sm flex justify-center items-center gap-1"
       >
-        <div
-        >
+        <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
+
+        <div>
           {{item.category_name}}
 
         </div>
@@ -135,10 +180,20 @@ function onChange() {}
 
 
     <scroll-view
-        :scroll-top="true"
         :scroll-y="true"
         :style="{ height: `${state.scrollHeight}px` }"
+        scroll-with-animation
         class="flex flex-1  flex-col h-full  p-3 gap-3"
+        :refresher-enabled="true"
+        refresher-background="#f5f5f5"
+        refresher-default-style="black"
+        :refresher-triggered="state.triggered"
+        @scrolltolower="handleScrollToLower"
+        @refresherPulling="onRefresherPulling"
+        @refresherRestore="onRefresherRestore"
+        @refresherAbort="onRefresherAbort"
+        @refresherrefresh="onRefresherRefresh"
+
     >
       <div
           v-for="(item, index) in state.merchantList" :key="index"
@@ -170,7 +225,7 @@ function onChange() {}
     </scroll-view>
   </div>
 </template>
-<route lang="yaml" type="home">
+<route lang="yaml">
 style:
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true

src/pages/user/index.vue

@@ -26,6 +26,18 @@ const myOrderList = [{
   text: '退款/售后',
   url: ''
 }]
+const contactUsList = [{
+  type: 'customer',
+  icon: '/static/icon/kefu_icon.png',
+  text: '联系客服',
+  url: 'https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0'
+},{
+  type: 'link',
+  icon: CDN_URL + '/static/assets/bangzhuzhongxin_220620.png',
+  text: '帮助中心',
+  url: '/pages/help-center/index'
+}]
+
 const myServiceList = [{
   icon: CDN_URL + '/static/assets/wodeyaoqing_220620.png',
   text: '我的邀请',
@@ -47,10 +59,6 @@ const myServiceList = [{
   text: '三方订单',
   url: '/pages/order/third-order'
 }, {
-  icon: CDN_URL + '/static/assets/bangzhuzhongxin_220620.png',
-  text: '帮助中心',
-  url: '/pages/help-center/index'
-}, {
   icon: CDN_URL + '/static/assets/wodepingjia_220620.png',
   text: '我的评价',
   url: '/pages/my-reply/index'
@@ -141,7 +149,7 @@ function handleService(item: {
 }
 
 // onShow(async () => {
-  // await userStore.getUserInfo()
+// await userStore.getUserInfo()
 // })
 
 function encodePhone(phone: string) {
@@ -174,26 +182,26 @@ function handleShowMyAllOrder(tab?: number) {
 }
 
 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 '合伙人'
-    }
-    if (!userRichType) {
-      return '用户'
-    }
+  const userRichType = userStore.userInfo?.user_rich_type
+  // 创始人
+  if (userRichType == 3) {
+    return '创始人'
+  }
+  // 普通用户
+  if (userRichType == 0) {
+    return '用户'
+  }
+  // 会员
+  if (userRichType == 1) {
+    return '会员'
+  }
+  // 合伙人
+  if (userRichType == 2) {
+    return '合伙人'
+  }
+  if (!userRichType) {
+    return '用户'
+  }
 })
 
 function handleToRedIntegral() {
@@ -201,14 +209,38 @@ function handleToRedIntegral() {
     url: '/pages/red-integral/index'
   })
 }
+
+function handleToContact(item) {
+  if (item.type === 'link') {
+    return uni.navigateTo({
+      url: item.url
+    })
+  }
+  if (item.type === 'customer') {
+    return uni.openCustomerServiceChat({
+      extInfo: {
+        url: item.url
+      },
+      corpId: ''
+    })
+  }
+}
+
+function handleShowMyProfile() {
+  uni.navigateTo({
+    url: '/pages/my-profile/index'
+  })
+}
 </script>
 <template>
   <div v-if="state.isLogin">
     <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
-    <div class="flex flex-col gap-4 relative px-3">
+    <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <div class="pt-15 ">
         <div class="flex gap-2 mb-2 text-white mb-6">
-          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+                 @click="handleShowMyProfile"
+                 mode="widthFix"
                  class="w-9 h-9 rounded-full"
           ></image>
           <image
@@ -229,8 +261,9 @@ function handleToRedIntegral() {
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </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
+                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>
 
@@ -322,10 +355,30 @@ function handleToRedIntegral() {
 
       </div>
 
+      <div class="bg-white rounded px-3">
+        <div class="flex justify-between pt-4 mb-4">
+          <div>联系我们</div>
+        </div>
+        <div class="flex flex-wrap ">
+          <div
+              v-for="(item, index) in contactUsList" :key="index"
+              @tap="handleToContact(item)"
+              class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
+          >
+            <image :src="item.icon"
+                   mode="widthFix"
+                   class="w-6 h-6 "
+            />
+            <div class="text-xs">{{ item.text }}</div>
+          </div>
+        </div>
+
+      </div>
+
     </div>
   </div>
 
-<!--  <CXBAuthorize v-else/>-->
+  <!--  <CXBAuthorize v-else/>-->
 </template>
 <style>
 page {

src/pages/user/info.vue

@@ -1,98 +0,0 @@
-<script setup lang="ts">
-</script>
-<template>
-  <div>
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3 f-hairline-bottom">
-      <div class="">头像</div>
-      <div
-          class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-      />
-    </div>
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">昵称</div>
-      <div class="flex items-center">
-        <div>用户4578</div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">性别</div>
-      <div class="flex items-center">
-        <div>请选择</div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">生日</div>
-      <div class="flex items-center">
-        <div>请选择</div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">手机号</div>
-      <div class="flex items-center">
-        <div>13488689885</div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">注册地</div>
-      <div class="flex items-center">
-        <div>省，市</div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div
-        class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
-      <div class="">签名</div>
-      <div class="flex items-center">
-        <div><input placeholder="请填写您的人个性签名"/></div>
-        <div
-            class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-        />
-      </div>
-    </div>
-
-    <div class=" fixed bottom-0 w-full p-safe">
-      <div class="px-3 text-white">
-        <div class="bg-red rounded-full h-10 flex flex-col justify-center items-center text-sm">
-          保存修改
-        </div>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-
-<style>
-page {
-  background-color: #f8f8f8;
-}
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 个人资料
-</route>

src/pages/vip/index.vue

@@ -1,7 +1,25 @@
 <template>
-  <CXBBasePage>
+  <CXBBasePage :show="true" title="">
+
     <div class="flex flex-col gap-3 ">
-      <image :src="homeBanner" mode="widthFix" class="h-full w-full "></image>
+<!--      <div-->
+<!--          class="overflow-hidden fixed top-0 w-full"-->
+<!--      >-->
+<!--        <nut-searchbar-->
+<!--            v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">-->
+<!--          &lt;!&ndash;      <template v-slot:leftout>&ndash;&gt;-->
+<!--          &lt;!&ndash;        <div @tap="navBack">&ndash;&gt;-->
+<!--          &lt;!&ndash;          <nut-icon name="left"></nut-icon>&ndash;&gt;-->
+<!--          &lt;!&ndash;        </div>&ndash;&gt;-->
+<!--          &lt;!&ndash;      </template>&ndash;&gt;-->
+<!--          <template v-slot:rightout>-->
+<!--            <div @tap="searchProduct">-->
+<!--              搜索-->
+<!--            </div>-->
+<!--          </template>-->
+<!--        </nut-searchbar>-->
+<!--      </div>-->
+      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>
       <div class="flex px-3">
         会员专区
       </div>
@@ -108,6 +126,7 @@ function handleItemClick(item) {
 
 <route lang="yaml">
 style:
+  navigationStyle: custom
   navigationBarTitleText: 储蓄保会员
   enablePullDownRefresh: true
 </route>