feat: fix

components.d.ts

@@ -54,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']
+    NutOverlay: typeof import('uniapp-nutui/components/overlay/overlay.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']
@@ -61,6 +62,7 @@ declare module '@vue/runtime-core' {
     NutTable: typeof import('uniapp-nutui/components/table/table.vue')['default']
     NutTabPane: typeof import('uniapp-nutui/components/tabpane/tabpane.vue')['default']
     NutTabs: typeof import('uniapp-nutui/components/tabs/tabs.vue')['default']
+    NutUploader: typeof import('uniapp-nutui/components/uploader/uploader.vue')['default']
     ProductCard: typeof import('./src/components/ProductCard/ProductCard.vue')['default']
     ProductList: typeof import('./src/components/ProductList/ProductList.vue')['default']
     SignInGiftBag: typeof import('./src/components/CXBDialogSignIn/SignInGiftBag.vue')['default']

src/apis/common.ts

@@ -5,6 +5,7 @@ import type {ArticleCategoryModel, ArticleModel, ArticleResult} from "~/apis/mod
 import type {HomeQuickLinkModel} from "~/apis/model/common.model";
 import type {IntegralProductModel, IntegralProductParams} from "~/apis/model/integral.model";
 import type {AnnouncementResult} from "~/apis/model/announcement.model";
+import type {FeedbackRequestModel} from "~/apis/model/feedback.model";
 // import {a} from "unocss-preset-weapp/dist/utilities-46c43da7";
 // 引入
 // import amap from '~/libs/amap-wx.130.js';
@@ -37,10 +38,31 @@ enum API {
     USER_LOGOUT = '/gateway/userCenter_service/userCenterService/userLogout',
 
     // 上传图片
-    UPLOAD_IMAGE_FIELD = '/api/upload/image/field'
+    UPLOAD_IMAGE_FIELD = '/api/upload/image/field',
+    // 意见反馈-类型
+    FEEDBACK_TYPE_NEW = '/api/common/feedback_type_new',
+    // 意见反馈提交
+    FEEDBACK = '/api/user/feedback'
 }
 
 /**
+ * 添加反馈
+ * @param params
+ */
+export function createFeedback(params: FeedbackRequestModel) {
+    return defHttp.post({
+        url: API.FEEDBACK,
+        data: {
+            ...params
+        }
+    })
+}
+export function getFeedbackType() {
+    return defHttp.get({
+        url: API.FEEDBACK_TYPE_NEW,
+    })
+}
+/**
  * 注销账号
  * @param phone
  */
@@ -48,9 +70,6 @@ export function closeAccount(phone: string) {
 
     return defHttp.post({
         url: API.USER_LOGOUT,
-        data: {
-            phone
-        }
     })
 }
 

src/apis/merchant.ts

@@ -45,7 +45,7 @@ export function getMerchantDetail(id: string): Promise<MerchantDetailModel> {
     return defHttp.get({
         url: API.GET_DETAIL + `/${id}`
     }, {
-        withToken: false
+        // withToken: false
     })
 }
 

src/apis/model/feedback.model.ts

@@ -0,0 +1,21 @@
+export interface FeedbackTypeModel {
+    // 分类id
+    feedback_category_id: string
+    // 名称
+    cate_name: string
+    // 是否选中
+    selected: boolean
+}
+
+export interface FeedbackRequestModel {
+    // 反馈类型 id
+    type: string
+    // 内容
+    content: string
+    // 图片
+    images: Array<string>
+    // 联系人姓名
+    realname: string
+    // 电话
+    contact: string
+}

src/apis/model/myRelationProductModel.ts

@@ -1,7 +1,7 @@
 export interface MyRelationProductPrams {
     page: number
     limit: number
-    keyword: string
+    keywords: string
 }
 export interface MyRelationProductResult {
     count: number

src/apis/model/order.model.ts

@@ -6,6 +6,24 @@ export interface OrderListObligationResult {
     list: Array<OrderListObligationModel>
 }
 
+export interface OrderQuantityModel {
+    // 评价
+    noComment: string
+    done: string
+    // 退款售后
+    refund: string
+    // 待收货
+    noDeliver: string
+    // 待付款
+    noPay: string
+    // 待发货
+    noPostage: string
+    orderPrice: string
+    orderCount: string
+    // 全部
+    all: string
+}
+
 export interface OrderListObligationModel {
      group_order_id: string//订单id
      group_order_sn: string

src/apis/model/product.model.ts

@@ -15,11 +15,23 @@ export interface ProductParams {
     limit: number
 }
 
+/**
+ * 请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
+ *
+ */
 export interface SearchProductParams {
-    mer_keyword: string
+    mer_id?: string
+    mer_keyword?: string
     pageNum: number
     pageSize: number
     order: ORDER
+    //请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
+    is_best?: number
+    sales?: number
+    is_new?: number
+    priceType?: number
+    type?: number
+    category_id?: string
     // order: 'sales' | 'is_new' | 'price_asc'
 }
 

src/apis/model/userShareProductModel.ts

@@ -4,6 +4,9 @@ export interface UserShareProductParams {
     uid: string
     pageNum: number
     pageSize: number
+    start_time?: string
+    end_time?: string
+
 }
 
 export interface UserShareProductListModel {

src/apis/order.api.ts

@@ -2,7 +2,7 @@ import {defHttp} from "~/utils/http"
 
 import type {
     IntegralOrderCreateModel, OrderCheckModel, OrderCreateModel,
-    OrderCreateShoppingModel, OrderListDataModel, OrderListObligationResult, OrderListResult
+    OrderCreateShoppingModel, OrderListDataModel, OrderListObligationResult, OrderListResult, OrderQuantityModel
 } from "~/apis/model/order.model"
 import type {ThirdOrderResult} from "~/apis/model/third-order.model";
 
@@ -68,6 +68,14 @@ enum API {
 }
 
 /**
+ * 订单统计
+ */
+export function totalOrderNumber(): Promise<OrderQuantityModel> {
+    return defHttp.get({
+        url: API.ORDER_NUMBER,
+    })
+}
+/**
  * 三方订单
  * @param params
  */
@@ -148,10 +156,14 @@ export function orderCheck(params: {
 /**
  * 修改购物车数量
  * @param cart_id
+ * @param cart_num
  */
-export function cartChange(cart_id: string) {
+export function cartChange(cart_id: string, cart_num: number) {
     return defHttp.post({
-        url: `${API.USER_CART_CHANGE}/${cart_id}`
+        url: `${API.USER_CART_CHANGE}/${cart_id}`,
+        data: {
+            cart_num
+        }
     })
 }
 

src/apis/product.ts

@@ -102,6 +102,8 @@ export function searchProductList(params: SearchProductParams): Promise<SearchPr
         data: {
             ...params
         }
+    }, {
+        withToken: false
     })
 }
 

src/apis/user.ts

@@ -111,6 +111,11 @@ enum API {
     USER_APPLY_BANG_FU = '/api/user/apply_bang_fu',
 
     /**
+     * 第三方账号绑定状态
+     */
+    USER_GET_ACCOUNT = '/api/user/getAccount',
+
+    /**
      * 邀请好友分享图片分类接口
      */
     USER_SHARE_PRODUCT_SERVICE_CLASSIFY_LIST = `/gateway/userCenter_service/userShareProductService/classifyList`,
@@ -154,19 +159,61 @@ enum API {
 
     USER_ADD_CERTIFICATION = '/api/user/add_certification',
 
-   // 关注商铺
+    // 关注商铺
     USER_RELATION_CREATE = '/api/user/relation/create',
     // getCertification
+    // 邀请码绑定接口
+    SPREAD_NUMBER = '/gateway/userCenter_service/userShareProductService/spreadNumber',
+
+    // 分享二维码图片
+    SPREAD_IMAGE = '/api/user/spread_image?type=wechat'
+}
+
+export function getSpreadImage() {
+    return defHttp.get({
+        url: API.SPREAD_IMAGE,
+
+    })
+}
+/**
+ * 绑定邀请码
+ *
+ * @param params
+ */
+export function getSpreadNumber(params: { uid: string, number: string }) {
+    return defHttp.post({
+        url: API.SPREAD_NUMBER,
+        data: {
+            ...params
+        },
+    }, {
+        withToken: false
+    })
+}
+
+/**
+ * 第三方账号绑定状态
+ */
+export function getBindingState() {
+    return defHttp.post({
+        url: API.USER_GET_ACCOUNT
+    }).catch(error => {
+        uni.showToast({
+            title: error,
+            icon: 'none'
+        })
+    })
 }
 
 /**
  * 公证处养老金余额
  */
-export function getAmountFromGzc(): Promise<{amount: string}> {
+export function getAmountFromGzc(): Promise<{ amount: string }> {
     return defHttp.get({
         url: API.GET_AMOUNT_FROM_GZC,
     })
 }
+
 /**
  * PHP 我的邀请
  */
@@ -175,11 +222,12 @@ export function getAgentInfo(): Promise<InvitePHPModel> {
         url: API.GET_AGENT_INFO
     })
 }
+
 /**
  * JAVA 我的邀请
  * @param params
  */
-export function getSelectUserInviteProfit(params: {uid: string}): Promise<IntegralResult>{
+export function getSelectUserInviteProfit(params: { uid: string }): Promise<IntegralResult> {
     return defHttp.get({
         url: API.SELECT_USER_INVITE_PROFIT,
         data: {
@@ -189,6 +237,7 @@ export function getSelectUserInviteProfit(params: {uid: string}): Promise<Integr
         withToken: false
     })
 }
+
 /**
  * 提现配置
  */
@@ -207,11 +256,12 @@ export function getBandAccountInfo(params: {
         url: API.GET_BAND_ACCOUNT_INFO
     })
 }
+
 /**
  * 获取红积分列表
  * @param params
  */
-export function getRedIntegralList(params: {page: number, limit: number}) {
+export function getRedIntegralList(params: { page: number, limit: number }) {
     return defHttp.get({
         url: API.USER_RED_LOG,
         data: {
@@ -219,6 +269,7 @@ export function getRedIntegralList(params: {page: number, limit: number}) {
         }
     })
 }
+
 /* 关注/收藏
  */
 export function relation(params: RelationRequest) {
@@ -229,6 +280,7 @@ export function relation(params: RelationRequest) {
         }
     })
 }
+
 /**
  * 删除地址
  * @param id
@@ -251,6 +303,7 @@ export function getCityNewFiveList(pid: number) {
         }
     })
 }
+
 /**
  * 实名认证
  */
@@ -268,13 +321,14 @@ export function getCertificationInfo(type: string) {
  * @param params
  */
 export function submitCertification(params: CertificationRequest) {
-   return defHttp.get({
-       url: API.USER_ADD_CERTIFICATION,
-       data: {
-           ...params
-       }
-   })
+    return defHttp.get({
+        url: API.USER_ADD_CERTIFICATION,
+        data: {
+            ...params
+        }
+    })
 }
+
 /// 地址相关
 
 /**
@@ -286,6 +340,7 @@ export function getUserAddressDetail(id: string) {
         url: API.USER_ADDRESS_DETAIL + `/${id}`
     })
 }
+
 export function addressNewCreate(params: {
     province: string,
     city: string,
@@ -310,6 +365,7 @@ export function addressNewCreate(params: {
         }
     })
 }
+
 /**
  * 获取地址列表
  */
@@ -327,6 +383,7 @@ export function getCityList(): Promise<Array<OneAddressModel>> {
         url: API.CITY_NEW_LIST
     })
 }
+
 /**
  * 地址添加或者修改
  * @param params
@@ -340,11 +397,12 @@ export function getCityList(): Promise<Array<OneAddressModel>> {
 //     })
 // }
 
-export function getCartCount(): Promise<Array<{count: number}>> {
+export function getCartCount(): Promise<Array<{ count: number }>> {
     return defHttp.get({
         url: API.USER_CART_COUNT
     })
 }
+
 /**
  * 获取购物车列表
  */
@@ -363,6 +421,7 @@ export function deleteCartItem(cart_id: any[]) {
         }
     })
 }
+
 /**
  * 获取我的评价（评论）
  */
@@ -495,6 +554,7 @@ export function getApplicationWithdrawal(params: {
         }
     })
 }
+
 /**
  * 获取用户养老金信息
  */
@@ -517,6 +577,7 @@ export function getUserYanglaoJinLogXx(params: {
         url: API.GET_YANGLAO_LOG
     })
 }
+
 /**
  * 获线上取养老金记录
  */
@@ -526,7 +587,7 @@ export function getYanglaoJinLogXs(params: {
     // 1 线下 0 线上
     // 1 拼多多， 2 唯品会， 3 苏宁， 5 淘宝， 6 京东， 90 线上， 99 线下
     source: ''
-}):Promise<YanglaoLogXsResult> {
+}): Promise<YanglaoLogXsResult> {
     return defHttp.get({
         url: API.GET_YANGLAO_LOG,
         data: {
@@ -534,6 +595,7 @@ export function getYanglaoJinLogXs(params: {
         }
     })
 }
+
 /**
  * 获取平台服务费计算
  */
@@ -646,6 +708,7 @@ export function updateUserInfo(params: UpdateUserInfoRequestModel) {
         }
     })
 }
+
 /**
  * 获取协议内容
  */
@@ -774,7 +837,7 @@ export function login(key: string) {
 /**
  * 新签到信息
  */
-export function getNewSignInInfo():Promise<SignInInfoModel> {
+export function getNewSignInInfo(): Promise<SignInInfoModel> {
     return defHttp.get({
         url: API.NEW_SIGN_INFO,
     })

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -102,7 +102,7 @@ function handleCountChange(value) {
       v-model:show="showValue"
       @close="onCancel"
       position="bottom"
-      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-[40%]"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[40%] h-fit"
 
   >
     <div class="flex flex-col justify-between h-full">
@@ -129,28 +129,43 @@ function handleCountChange(value) {
                   剩余库存{{currentSku.stock}}
                 </div>
                 <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
-                  {{ currentSku.price * 30 }} 积分
+                  {{ currentSku.ot_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/>
+                  <FPrice v-if="currentSku.ot_price" :price="currentSku.ot_price" :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through/>
                 </div>
               </div>
 
             </div>
           </div>
 
-          <div class="flex flex-row gap-2  flex-wrap">
-            <div
-                v-for="(item, index) in skuList"
-                :key="index"
-                @tap="handleSelectedSku(item)"
-                class="text-[12px] border border-solid rounded p-1 px-2 "
-                :class="currentSku.unique === item.unique ? 'border-primary text-primary' : 'border-gray-500 text-gray-500'"
-            >
-              {{ item.sku }}
+<!--          <template v-if="skuList && skuList.length > 0"></template>-->
+<!--          <scroll-view-->
+<!--              :scroll-y="true"-->
+<!--              class="h-20"-->
+<!--          >-->
+
+            <div class="text-xs flex" v-if="skuList && skuList.length > 0">规格</div>
+            <div class="flex flex-row gap-2  flex-wrap ">
+              <div
+                  v-for="(item, index) in skuList"
+                  :key="index"
+                  @tap="handleSelectedSku(item)"
+
+              >
+                <div
+                    v-if="item.sku && item.sku !== ''"
+                    class="text-[12px] border border-solid rounded p-1 px-2 "
+                    :class="currentSku.unique === item.unique ? 'border-primary text-primary' : 'border-gray-500 text-gray-500'"
+                >
+                  {{ item.sku }}
+
+                </div>
+              </div>
             </div>
-          </div>
+
+<!--          </scroll-view>-->
         </div>
         <div class="p-3">
           <div class="flex  justify-between text-sm">

src/components/CXBYaojinTag/CXBYaojinTag.vue

@@ -7,8 +7,8 @@ const props = defineProps({
 })
 </script>
 <template>
-  <div class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
-    <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
+  <div class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit h-4">
+    <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
            mode="widthFix" class="!w-7"></image>
     <div class="px-2 flex items-center jusitify-center text-[11px]">
       <div>

src/components/ProductCard/ProductCard.vue

@@ -30,8 +30,8 @@ const emit = defineEmits<{
         {{item.name}}
       </div>
       <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
-        <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
-               mode="widthFix" class="!w-8 "></image>
+        <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
+               mode="widthFix" class="!w-8 h-4"></image>
         <div class="px-2 flex items-center jusitify-center">
           <div v-if="item.type == 5">
             养老金 ¥{{item.yanglao}}

src/components/ProductList/ProductList.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 const props = defineProps({
   list: {
@@ -35,5 +36,6 @@ function handleClickItem(item) {
     </grid-view>
 
   </div>
+  <CXBEmpty v-else/>
   <!--  </scroll-view>-->
 </template>

src/pages/after-sales-order-list/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <CXBBasePage>
+    <nut-tabs v-model="state.tabvalue">
+      <nut-tab-pane title="全部">
+
+        <div v-if="state.allOrderList.length > 0" class="flex flex-col gap-3">
+          <div v-for="(orderItem, index) in state.allOrderList" :key="index">
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+            <OtherOrderItem :item="orderItem" v-else/>
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+
+      </nut-tab-pane>
+      <nut-tab-pane title="待付款">
+        <div v-if="state.obligationOrderList.length > 0">
+          <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
+            <OrderItem :order-item="orderItem"/>
+            <!--            <OtherOrderItem :item="orderItem" v-else/>-->
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+      </nut-tab-pane>
+      <nut-tab-pane title="待发货">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem"/>
+            <!--            <OtherOrderItem :item="orderItem" v-else/>-->
+            <!--            <OtherOrderItem :item="orderItem"/>-->
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+
+      </nut-tab-pane>
+      <nut-tab-pane title="待收货">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem"/>
+            <!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
+            <!--            <OtherOrderItem :item="orderItem" v-else/>-->
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+
+      </nut-tab-pane>
+      <nut-tab-pane title="待评价">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem"/>
+            <!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
+            <!--            <OtherOrderItem :item="orderItem" v-else/>-->
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+      </nut-tab-pane>
+    </nut-tabs>
+
+  </CXBBasePage>
+</template>
+<script lang="ts" setup>
+// import { reactive } from 'vue';
+// export default {
+//   setup() {
+import {getOrderListFromStatus, getAllOrder, getGroupOrderList} from "~/apis/order.api";
+import type {OrderListModel} from "~/apis/model/order.model";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import FButton from "~/components/FButton/FButton.vue";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import amapWx from "~/libs/amap-wx";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
+
+const state = reactive({
+  tabvalue: 0,
+
+  allOrderTotal: 0,
+  allOrderList: [],
+
+  // 待付款订单列表
+  obligationOrderList: [],
+
+  orderList: [],
+});
+
+onLoad(options => {
+  if (options && options.tabIndex) {
+    state.tabvalue = options.tabIndex
+  }
+  loadAllOrderList()
+
+  // 监听事件
+  uni.$on('orderCancelFromList', () => {
+    loadAllOrderList()
+    state.tabvalue = 0
+  })
+})
+function  	splitArray(list, sp) {
+  if (typeof list != 'object') return [];
+  if (sp == undefined) sp = [];
+  for (var i = 0; i < list.length; i++) {
+    sp.push(list[i]);
+  }
+  return sp;
+}
+function loadAllOrderList() {
+  // 获取全部订单
+  getAllOrder({
+    page: 1,
+    limit: 10
+  }).then(res => {
+    // console.log(res)
+    state.allOrderTotal = res.total
+    state.allOrderList = res.list
+    // console.log(res)
+  })
+}
+watch(() => state.tabvalue, (val) => {
+  switch (val) {
+    case '0': {
+      loadAllOrderList()
+      break;
+    }
+    case '1': {
+      getGroupOrderList({
+        page: 1,
+        limit: 10
+      }).then(res => {
+        // console.log(res)
+        // state.obligationOrderList = splitArray(res.list, state.obligationOrderList)
+        state.obligationOrderList = res.list
+      })
+      break;
+      // getOrderListFromStatus({
+      //   page: 1,
+      //   limit: 10,
+      //   status: 0
+      // }).then(res => {
+      //   state.obligationOrderList = res.list
+      // })
+    }
+      // 待发货
+    case '2': {
+      getOrderListFromStatus({
+        page: 1,
+        limit: 10,
+        status: 0
+      }).then(res => {
+        state.orderList = res.list
+      })
+      break;
+    }
+    case '3': {
+      getOrderListFromStatus({
+        page: 1,
+        limit: 10,
+        status: 1
+      }).then(res => {
+        state.orderList = res.list
+      })
+      break;
+    }
+    case '4': {
+      getOrderListFromStatus({
+        page: 1,
+        limit: 10,
+        status: 2
+      }).then(res => {
+        state.orderList = res.list
+      })
+      break;
+    }
+  }
+})
+
+
+</script>
+<route lang="yaml">
+style:
+navigationBarTitleText: 我的订单
+enablePullDownRefresh: true
+</route>
+
+<style>
+.nut-tab-pane {
+  background: #f5f5f5 !important;
+}
+</style>

src/pages/annuity/index.vue

@@ -101,6 +101,11 @@ function handleToCitic() {
     }
   })
 }
+function handleShowAgreement(type) {
+  uni.navigateTo({
+    url: '/pages/webview/agreement?type=' + type
+  })
+}
 </script>
 
 <template>
@@ -108,6 +113,9 @@ function handleToCitic() {
     <div class="h-20 bg-[#fe0032] absolute w-screen top-0"></div>
 
     <div class="px-4 flex flex-col relative gap-3">
+      <div @click="handleShowAgreement(8)" class="flex justify-end text-white">
+        <div class="text-sm">养老金规则</div>
+      </div>
       <div class="flex flex-col bg-white rounded  p-4">
         <div class="flex items-center w-full gap-2">
           <image v-if="userStore.userInfo && userStore.userInfo.avatar"
@@ -128,7 +136,7 @@ function handleToCitic() {
               @tap="handleRealName"
               class="text-xs underline text-[#fe0032]"
           >
-            {{userStore.userInfo.is_ertification ? '已认证' : '实名认证'}}
+            {{userStore.userInfo.is_ertification == 1 ? '已认证' : '实名认证'}}
 
           </div>
         </div>
@@ -140,7 +148,7 @@ function handleToCitic() {
           <div class=" flex justify-around w-full">
             <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
               <div class="font-bold">
-                ￥ {{yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a}}
+                ￥ {{(yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2)}}
               </div>
               <div class="text-xs text-gray-400">预估养老金</div>
             </div>
@@ -213,7 +221,7 @@ function handleToCitic() {
     </div>
 
     <div class="text-xs p-4 justify-center items-center rounded">
-      <div class="bg-yellow/10  flex gap-1 items-center p-3">
+      <div class="bg-yellow/10  flex gap-1 items-center p-3" @click="handleShowAgreement(7)">
         <div class="text-[#ff6010]">个人消费养老金规范管理计划合规管理 有计划养老</div>
         <image :src="get_to_know_buttons_220713Image" mode="widthFix" class="w-15"></image>
       </div>

src/pages/bangfuzhongxin/index.vue

@@ -2,7 +2,7 @@
 import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
 
 import {useUserStore} from "~/stores/userStore";
-import {applyBangFu, getRules, getUserInfo} from "~/apis/user";
+import {applyBangFu, getAgentInfo, getRules, getUserInfo} from "~/apis/user";
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -14,6 +14,8 @@ const ruleDetail = ref<{
   status: string
   title: string
 }>()
+
+const agentInfo = ref({})
 onShow(() => {
   if (uni.getStorageSync('UID')) {
     getUserInfo().then(userInfoResult => {
@@ -31,6 +33,10 @@ onShow(() => {
       icon: 'none'
     })
   })
+
+  getAgentInfo().then(res => {
+    agentInfo.value = res
+  })
 })
 
 const ruleId = computed(() => {
@@ -117,7 +123,8 @@ function handleShowMyInvitation() {
           <div
               @tap="handleShowMyInvitation"
               class="w-1/3  flex flex-col justify-center items-center">
-            <div>{{ userStore.userInfo.member_brokerage_price }}</div>
+<!--            <div>{{ userStore.userInfo.member_brokerage_price || '0.00' }}</div>-->
+            <div>{{ agentInfo.brokerage_price }}</div>
             <div class="text-sm">我的佣金</div>
           </div>
           <div class="w-1/3  flex flex-col justify-center items-center">

src/pages/dacang/list/index.vue

@@ -11,23 +11,37 @@ const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
 
 const state = reactive({
   tabs: [],
-  productList: <Array<DcProductModel>>[]
+  productList: <Array<DcProductModel>>[],
+
+  currentClassify: '',
+  keyword: '',
+
+  status: 'noMore',
+
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1
 })
 
 const dacangStore = useDacangStore()
+
+const currentTab = ref()
 const classifyId = computed(() => {
   return useDacangStore().$state.currentClassify
 })
 
-watch(() => classifyId.value, () => {
-  loadDcProductList(classifyId.value)
+watch(() => classifyId.value, (val) => {
+  currentTab.value = val
+  // loadDcProductList(classifyId.value)
+  loadList('reload')
 })
 onLoad((options) => {
   // console.log(classifyId.value)
 
   // if (options.id) {
   if (!classifyId.value) {
-    loadDcProductList(dacangStore.currentClassify)
+    // loadDcProductList(dacangStore.currentClassify)
+    loadList('reload')
   }
   // } else {
   // }
@@ -38,21 +52,43 @@ onLoad((options) => {
 
 })
 
-function loadDcProductList(classify) {
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize,
+    classify: state.currentClassify,
+    keyword: state.keyword
+  }
+  if (action === 'reload') {
+    params.page = 1
+  }
+
   getDcProductList({
-    page: 1,
-    limit: 10,
-    classify,
-    keyword: ''
+    ...params
+    // page: state.currentPage,
+    // limit: state.pageSize,
+    // classify,
+    // keyword: ''
   }).then(res => {
-    state.productList = res
+    if (action === 'page') {
+      state.productList = state.productList.concat(res)
+    }
+    if (action === 'reload') {
+      state.productList = res
+    }
+
+    if (callback) {
+      callback(res)
+    }
+    // state.productList = res
   })
 }
 
-function handleTabItemClick(currentTab) {
-
+function handleTabItemClick(tabItem) {
+  state.currentClassify = tabItem
   // if (!currentTab || currentTab == '') {
-    loadDcProductList(currentTab)
+  //   loadList(tabItem)
+  loadList('reload')
   // }
 }
 
@@ -66,6 +102,33 @@ onPageScroll((page) => {
     headerClass.value = ''
   }
 })
+
+onReachBottom(() => {
+  console.log(classifyId)
+  uni.showLoading()
+  console.log(state.currentClassify)
+  if (!state.currentClassify) {
+    state.currentClassify = classifyId
+  }
+
+  state.status = 'loading'
+  state.currentPage += 1
+  loadList('page', (items) => {
+    uni.hideLoading()
+    console.log(items)
+    if (!items.length > 0) {
+      console.log('没有更多了')
+      state.status = 'noMore'
+    }
+  })
+})
+onPullDownRefresh(() => {
+  uni.showLoading()
+  loadList('reload', (items) => {
+    uni.hideLoading()
+    uni.stopPullDownRefresh()
+  })
+})
 </script>
 <template>
   <div class="h-screen">
@@ -108,6 +171,14 @@ onPageScroll((page) => {
 
 
     <ProductList :list="state.productList" />
+      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" v-if="state.productList.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
     </div>
 
   </div>

src/pages/feedback/index.vue

@@ -1,7 +1,154 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {CDN_URL} from "~/config/app";
+import {createFeedback, getFeedbackType} from "~/apis/common";
+import {UPLOAD_URL} from "~/utils/http";
+import {getToken} from "~/utils/auth";
+
 const add_photos_220711Image = CDN_URL + '/static/assets/add_photos_220711.png'
+const state = reactive({
+  isUploading: false,
+})
+
+const headers = {
+  "Content-Type": "multipart/form-data",
+  'X-Token': 'Bearer ' + getToken()
+}
+function upload(filePath) {
+  const inputName = 'field';
+
+  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,
+    // filePath: tempFiles[curIndex],
+    success: uploadFileRes => {
+      state.isUploading = false;
+      // if (uploadFileRes && uploadFileRes.data) {
+      //
+      // }
+      data.images.push(uploadFileRes.data)
+    },
+    fail: err => {
+      state.isUploading = false;
+      // console.log(err, '上传失败');
+      uni.showToast({
+        title: '上传失败，请重试'
+      })
+    },
+
+  })
+
+}
+
+function chooseImage(e) {
+  let curIndex = 0
+
+  uni.chooseMedia({
+    count: 9,
+    mediaType: ['image'],
+    sourceType: ['album', 'camera'],
+    maxDuration: 30,
+    camera: 'back',
+    sizeType: ['original', 'compressed'],
+    success: (res) => {
+      const {tempFiles, type} = res
+      state.isUploading = true;
+      // if (tempFiles.length > 0) {
+      for (let file of tempFiles) {
+        upload(file.tempFilePath)
+      }
+      // }
+
+    }
+  })
+}
+
+const formData = reactive({
+  type: '',
+  content: '',
+  images: [],
+  realname: '',
+  contact: ''
+})
+
+const defaultFileList = ref([])
+const currentTypeId = ref('')
+const feedbackTypes = ref([])
+onLoad(() => {
+  getFeedbackType().then(res => {
+    console.log(res)
+    feedbackTypes.value = res
+    formData.type = res[0].feedback_category_id
+    currentTypeId.value = res[0].feedback_category_id
+  })
+})
+
+function handleItemClick(item) {
+  currentTypeId.value = item.feedback_category_id
+  formData.type = currentTypeId.value
+}
+
+function handleUploadSuccess({ data, option, fileItem }) {
+  console.log(data.data.path)
+  if (data && data.data && data.data.path) {
+    formData.images.push(data.data.path)
+  }
+
+  console.log(fileItem)
+}
+
+function handleSubmit() {
+  if (!formData.content) {
+    return uni.showToast({
+      title: '详情不能为空'
+    })
+  }
+  if (!formData.realname) {
+    return uni.showToast({
+      title: '姓名不能为空',
+      icon: 'none'
+    })
+  }
+  if (!formData.content) {
+    return uni.showToast({
+      title: '手机号或邮箱不能为空'
+    })
+  }
+  createFeedback({
+    type: formData.type,
+    contact: formData.content,
+    images: formData.images,
+    realname: formData.realname,
+    content: formData.content
+  }).then(res => {
+    uni.showToast({
+      title: '提交成功',
+      icon: 'none'
+    }).then(() => {
+      setTimeout(() => {
+        uni.navigateBack()
+
+      }, 500)
+    })
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: "none"
+    })
+  })
+}
 </script>
 
 <template>
@@ -10,16 +157,22 @@ const add_photos_220711Image = CDN_URL + '/static/assets/add_photos_220711.png'
       <div class="text-sm">
         反馈类型
       </div>
-      <div class="flex py-2 gap-2">
-        <button class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 border-red text-red text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini">
-          操作问题
-        </button>
-        <button class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 border-red text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini">
-          金额相关
-        </button>
-        <button class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 border-red text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini">
-          货物相关
+      <div class="flex flex-row py-2 gap-2">
+        <button
+            v-for="(item, index) in feedbackTypes" :key="index"
+            @click="handleItemClick(item)"
+            class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini"
+            :class="currentTypeId === item.feedback_category_id ? ' border-red text-primary ' : ''"
+        >
+
+          {{ item.cate_name }}
         </button>
+        <!--        <button class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 border-red text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini">-->
+        <!--          金额相关-->
+        <!--        </button>-->
+        <!--        <button class="box-border flex items-center justify-center text-center rounded-full border-solid border-1 border-red text-xs gap-2 m-0 f-button-wrapper-reset f-button-mini">-->
+        <!--          货物相关-->
+        <!--        </button>-->
       </div>
 
     </div>
@@ -30,11 +183,19 @@ const add_photos_220711Image = CDN_URL + '/static/assets/add_photos_220711.png'
       <div class="flex flex-col my-2 gap-2 bg-gray-100">
         <textarea placeholder="您填写的信息越详细，问题越可有效解决哦～"
                   class="p-2 text-xs"
+                  v-model="formData.content"
         />
         <div class="flex p-2 text-gray">
           <div class="flex flex-col justify-center items-center text-xs gap-2">
-            <image :src="add_photos_220711Image" mode="widthFix" class="w-6 h-6"></image>
-            <div>添加照片</div>
+            <nut-uploader :url="UPLOAD_URL"
+                          :headers="headers"
+                          :name="'field'"
+                          :timeout="1000*50"
+                          :data="{ filename: 'field'}"
+                          v-model:file-list="defaultFileList" maximum="3"
+                          @success="handleUploadSuccess"
+            >
+            </nut-uploader>
           </div>
         </div>
 
@@ -48,10 +209,10 @@ const add_photos_220711Image = CDN_URL + '/static/assets/add_photos_220711.png'
       </div>
       <div class="flex flex-col py-2 gap-2 text-sm">
         <div class="bg-gray-100 rounded p-2">
-          <input placeholder="请填写您的姓名"/>
+          <input placeholder="请填写您的姓名" v-model="formData.realname"/>
         </div>
         <div class="bg-gray-100 rounded p-2">
-          <input placeholder="请填写您的手机号或邮箱"/>
+          <input placeholder="请填写您的手机号或邮箱" v-model="formData.contact"/>
         </div>
       </div>
 
@@ -59,9 +220,12 @@ const add_photos_220711Image = CDN_URL + '/static/assets/add_photos_220711.png'
 
     <div class="fixed bottom-0 pb-safe w-full">
       <div class="px-10 ">
-        <div class="text-center text-white bg-red rounded-full text-sm p-2">
-          提交
-        </div>
+        <nut-button
+            @click="handleSubmit"
+            type="primary" block>提交
+        </nut-button>
+        <!--        <div class="text-center text-white bg-red rounded-full text-sm p-2">-->
+        <!--        </div>-->
       </div>
 
     </div>

src/pages/home/components/header.vue

@@ -43,7 +43,7 @@ const props = defineProps({
   }
 })
 function handleClick() {
-  if (userStore.userInfo) {
+  if (userStore.userInfo && userStore.uid) {
     uni.navigateTo({
       url: '/pages/annuity/index'
     })

src/pages/home/index.vue

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

src/pages/immediate-withdrawal/index.vue

@@ -10,6 +10,7 @@ import {
 import {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
 import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
 import {CDN_URL} from "~/config/app";
+import {isNumber} from "~/utils";
 const zfb_logoImage = CDN_URL + '/static/assets/zfb_logo.png'
 const wx_logoImage = CDN_URL + '/static/assets/wx_logo.png'
 const userStore = useUserStore()
@@ -22,44 +23,51 @@ const widthdrawalConfig = ref({})
 
 const cashWithdrawalAmount = ref(0)
 // userSpreadInfo.value.brokerage_price
-onLoad(() => {
-  userStore.getUserInfo().then(res => {})
+onLoad(async () => {
+  await userStore.getUserInfo()
   // 佣金信息
-  getUserSpreadInfo().then((res: SpreadInfoModel) => {
-    userSpreadInfo.value = res
-  })
+  userSpreadInfo.value = await getUserSpreadInfo()
 
-  getUserYangLaoJin().then(res => {
-    yanglaojin.value = res
-    // console.log('加载养老金数据')
-    // console.log(res)
-  })
+  yanglaojin.value = getUserYangLaoJin()
 
   // 提现配置
-  getWithdrawalConfig().then(res => {
-    // console.log(res)
-    widthdrawalConfig.value = res
-  })
+  widthdrawalConfig.value = await getWithdrawalConfig()
 })
 
-function handleInputChange(e) {
-  if (e.detail.value) {
-    cashWithdrawalAmount.value = e.detail.value
-    console.log(cashWithdrawalAmount.value)
+watch(() => cashWithdrawalAmount.value, (val) => {
+  if (val && isNumber(Number.parseFloat(val))) {
     getWithdrawalService({
-      money: e.detail.value
+      money: val
     }).then(res => {
       // console.log(res)
       withdrawalCal.value = res
       console.log(res)
     })
+  } else {
+    withdrawalCal.value = {}
+  }
+})
+function handleInputAll() {
+  console.log(userSpreadInfo.value?.brokerage_price)
+  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && Number.parseFloat(userSpreadInfo.value?.brokerage_price) >= 100 ) {
+    cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
+  } else {
+    uni.showToast({
+      title: '可用余额太少，未满足提现要求',
+      icon: 'none'
+    })
   }
 }
-
 /**
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+  // 1 判断是否需要实名
+  if (!yanglaojin.value?.is_certification == 1) {
+    return uni.navigateTo({
+      url: '/pages/real-name-authentication/index'
+    })
+  }
 
   if (widthdrawalConfig.value.withdrawal_status == '0') {
     return uni.showToast({
@@ -85,12 +93,7 @@ function handleImmediateWithdrawal() {
   }
 
 
-  // 1 判断是否需要实名
-  if (!yanglaojin.value?.is_certification == 1) {
-    return uni.navigateTo({
-      url: '/pages/real-name-authentication/index'
-    })
-  }
+
 
   getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
     // uni.showToast({
@@ -117,6 +120,12 @@ function handleWithdrawalRecord() {
     url: '/pages/withdrawal-record/index'
   })
 }
+
+function handleShowAgreement(type) {
+  uni.navigateTo({
+    url: '/pages/webview/agreement?type=' + type
+  })
+}
 </script>
 <template>
   <div class="p-3 flex flex-col gap-3">
@@ -126,16 +135,17 @@ function handleWithdrawalRecord() {
     <div class="bg-white rounded-lg text-sm p-3 flex flex-col gap-4">
       <div class="flex justify-between">
         <div class="font-bold">提现金额</div>
-        <div class="text-xs text-gray">提现规则</div>
+        <div class="text-xs text-gray" @click="handleShowAgreement(12)">提现规则</div>
       </div>
       <div class="flex justify-center items-center pt-4 f-hairline-bottom">
         <div class="text-lg font-bold">￥</div>
         <div class="flex-1">
           <input placeholder="请输入金额" class="w-full"
-                 @change="handleInputChange"
+                 type="number"
+                 v-model="cashWithdrawalAmount"
           />
         </div>
-        <div class="text-xs text-red">全部提现</div>
+        <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
       </div>
       <div class="flex text-gray items-center gap-3 text-sm">
         <div v-if="userSpreadInfo">

src/pages/invite-friends/index.vue

@@ -5,6 +5,9 @@ import {
 } from "~/apis/user";
 import type {SharePosterImageResult, SharePostersClassify} from "~/apis/model/inviteFriendsModel";
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
+import {call} from "dayjs";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {CDN_URL} from "~/config/app";
 const state = reactive<any>({
   // 列表高度
   scrollHeight: 0,
@@ -12,20 +15,36 @@ const state = reactive<any>({
   curIndex: 0,
   // 内容区垂直滚动条位置
   scrollTop: 0,
+  triggered: false,
+  categoryId: 0,
+  currentCategoryId: 0,
 
-  merchantCategory: [],
-  merchantList: [],
-  merchantPageNum: 1,
-  merchantPageSize: 10,
-  merchantKeyword: '',
-  lat: '',
-  lng: ''
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+
+  showTip: false,
+  list: [],
+  // merchantCategory: [],
+  // merchantList: [],
+  // merchantPageNum: 1,
+  // merchantPageSize: 10,
+  // merchantKeyword: '',
+  // lat: '',
+  // lng: ''
   // merchantPageInfo: {}
 })
 
+const show = ref(false)
+const currentItem = ref({})
 const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight
 
+const wechatImg = CDN_URL + '/static/assets/share_wechat.png'
+const pyqImg = CDN_URL + '/static/assets/share_circlefriends.png'
+const bctpImg = CDN_URL + '/static/assets/bctp_221023.png'
+
 const categoryList = ref<Array<SharePostersClassify>>()
 const sharePosterImageResult = ref<SharePosterImageResult>()
 
@@ -36,15 +55,119 @@ onLoad(() => {
     }
   })
 
-  getUserSharePostersImagesList({
-    pageNum: 1,
-    pageSize: 10,
+  // pageNum: number
+  // pageSize: number
+  // 分类 id
+  // classify?: string
+  // 推荐 = 1
+  // type: string
+  // getUserSharePostersImagesList({
+  //   pageNum: 1,
+  //   pageSize: 10,
+  //   type: '1'
+  // }).then(res => {
+  //   sharePosterImageResult.value = res
+  //   // console.log(res)
+  // })
+  loadList('reload')
+})
+
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // if (state.categoryId == 0) {
+  //   state.currentCategoryId = 0
+  // }
+  const params = {
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
     type: '1'
-  }).then(res => {
-    sharePosterImageResult.value = res
-    // console.log(res)
+  }
+  if (state.currentCategoryId > 0) {
+    params.classify = state.currentCategoryId
+  }
+
+  getUserSharePostersImagesList(params).then(res => {
+    state.triggered = false
+    // sharePosterImageResult.value = res
+    if (action === 'page') {
+      state.list = state.list.concat(res.pageInfo.list)
+    }
+    if (action === 'reload') {
+      state.list = res.pageInfo.list
+    }
+
+    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
+    state.status = 'more'
+    if (callback) {
+      callback(res.pageInfo.list)
+    }
   })
-})
+}
+
+function handleCategoryItemClick(item) {
+  state.currentCategoryId = item.id
+  loadList('reload')
+}
+const onRefresherPulling = e => {
+  state.triggered = true;
+  loadList('reload')
+
+};
+// 下拉刷新被复位
+const onRefresherRestore = e => {
+  state.triggered = false;
+};
+// 下拉刷新被中止
+const onRefresherAbort = e => {
+  state.triggered = false;
+}
+// 下拉刷新被触发
+const onRefresherRefresh = e => {
+  // loadSelectMerchant(0)
+  loadList('reload')
+
+};
+function handleScrollToLower() {
+
+  state.status = 'loading';
+  state.currentPage += 1;
+  if (state.currentPage >= state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    // queryFavorites('page');
+    loadList('page')
+  }
+}
+
+function loadAll() {
+  state.currentCategoryId = 0
+  loadList('reload')
+}
+function handleItemClick(item) {
+  currentItem.value = item
+  show.value = true
+}
+
+function shareImage() {
+  wx.downloadFile({
+    url: currentItem.value.image_fake,
+    success: (res) => {
+      wx.showShareImageMenu({
+        path: res.tempFilePath
+      })
+    }
+  })
+}
+
+function shareTimeline() {
+  // state.showTip = !state.showTip
+  state.showTip = true
+}
+
+function handleClose() {
+  state.showTip = false
+  show.value = false
+}
 </script>
 <template>
   <div class="flex">
@@ -55,14 +178,24 @@ onLoad(() => {
         class="flex w-25 h-full bg-[#f8f8f8]"
     >
       <div
-          class="relative h-15 block text-sm flex justify-center items-center"
-      >
-        推荐
+          @tap="loadAll"
+          :class="state.currentCategoryId == 0 ? 'bg-white font-bold' : ''"
+          class="relative w-25 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" v-if="state.currentCategoryId == 0"></div>
+          <div>推荐</div>
+        </div>
+
       </div>
       <div v-for="(item, index) in categoryList" :key="index"
+           @click="handleCategoryItemClick(item)"
+           :class="state.currentCategoryId == item.id ? 'bg-white font-bold' : ''"
            class="relative h-15 block text-sm flex justify-center items-center"
       >
-        {{item.name}}
+        <div class="flex items-center gap-1">
+          <div class="h-4 bg-primary w-1" v-if="state.currentCategoryId == item.id"></div>
+          <div>{{ item.name }}</div>
+        </div>
 
       </div>
     </scroll-view>
@@ -71,20 +204,65 @@ onLoad(() => {
         :scroll-y="true"
         :style="{ height: `${state.scrollHeight}px` }"
         class="flex flex-1  flex-col h-full  p-3 gap-3 pb-safe"
+        :refresher-enabled="true"
+        refresher-background="#f5f5f5"
+        refresher-default-style="black"
+        :refresher-triggered="state.triggered"
+        @scrolltolower="handleScrollToLower"
+        @refresherPulling="onRefresherPulling"
+        @refresherRestore="onRefresherRestore"
+        @refresherAbort="onRefresherAbort"
+        @refresherrefresh="onRefresherRefresh"
+        v-if="state.list && state.list.length > 0"
     >
       <grid-view
-          v-if="sharePosterImageResult && sharePosterImageResult.pageInfo"
           type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px"
       >
-        <div v-for="(item, index) in sharePosterImageResult.pageInfo.list"
+        <div v-for="(item, index) in state.list"
              :key="index"
+             @click="handleItemClick(item)"
         >
-          <image :src="item.image" mode="widthFix" class="w-30 h-full rounded-lg"></image>
+          <image
+              :src="item.image_fake"
+              mode="widthFix" class="w-30 h-full rounded-lg"></image>
         </div>
       </grid-view>
     </scroll-view>
+    <div class="flex flex-col justify-center items-center w-full" v-else>
+      <CXBEmpty />
+    </div>
 
   </div>
+
+  <nut-overlay v-model:visible="show" :lock-scroll="true">
+<!--    <image src="https://cdn.bjtdba.com/vod/image/2023-09-16/20230916070524825.png"-->
+<!--           mode="widthFix" class="absolute top-0 right-0"-->
+<!--           @tap.stop="handleClose"-->
+<!--           v-if="state.showTip"-->
+<!--    ></image>-->
+
+    <div class="flex flex-col justify-center items-center w-full h-full"
+    >
+      <div class="bg-white">
+        <image :src="currentItem.image_fake" mode="widthFix" class="w-60"></image>
+        <div class="bg-white p-3 flex justify-around gap-3">
+          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
+            <image :src="wechatImg" mode="widthFix" class="w-8 h-8"></image>
+            <div>微信</div>
+          </div>
+          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
+            <image :src="pyqImg" mode="widthFix" class="w-8 h-8"></image>
+            <div>朋友圈</div>
+          </div>
+          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
+            <image :src="bctpImg" mode="widthFix" class="w-8 h-8"></image>
+            <div>保存图片</div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </nut-overlay>
 </template>
 
 <route lang="yaml">

src/pages/invite-partners/index.vue

@@ -3,6 +3,7 @@ import {getUserInviteList} from "~/apis/user";
 import type {InvitePartnerModel} from "~/apis/model/invitePartnerModel";
 import {Ref} from "vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {encodePhone} from "../../utils";
 const userStore = useUserStore()
 const invitePartnerModel: Ref<InvitePartnerModel | undefined> = ref<InvitePartnerModel>() || undefined
 onLoad(() => {
@@ -45,7 +46,8 @@ function handleSearch() {
           商户
         </div>
         <div class="font-bold text-[24px]" v-if="invitePartnerModel">
-          {{ invitePartnerModel.userCount }}
+          {{ invitePartnerModel.MerchantCount }}
+
         </div>
       </div>
       <div class="flex flex-col justify-center items-center gap-4">
@@ -53,7 +55,8 @@ function handleSearch() {
           伙伴
         </div>
         <div class="font-bold text-[24px]" v-if="invitePartnerModel">
-          {{ invitePartnerModel.MerchantCount }}
+          {{ invitePartnerModel.userCount }}
+
         </div>
       </div>
     </div>
@@ -64,19 +67,23 @@ function handleSearch() {
     </nut-searchbar>
 
     <div class="pb-safe">
-      <div class="grid grid-cols-3 bg-white rounded-tl-lg rounded-tr-lg text-center text-sm p-3">
+      <div class="grid grid-cols-3 bg-white rounded-tl-lg rounded-tr-lg text-center text-xs p-3">
         <div class="text-left">用户</div>
         <div>身份</div>
         <div class="text-right">加入时间</div>
       </div>
       <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">
         <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">
-          <div class="text-left">{{ item.nickname || '无昵称' }}</div>
+          <div class="flex flex-col">
+            <div class="text-left">{{ item.nickname || '无昵称' }}</div>
+            <div class="text-left text-[11px] text-gray-500">{{ item.phone ? encodePhone(item.phone) : '' }}</div>
+          </div>
+
           <div>{{ item.statusType }}</div>
           <div class="text-right">{{ item.promoterTime }}</div>
         </div>
       </div>
-      <div else>
+      <div v-else>
         <CXBEmpty />
       </div>
     </div>

src/pages/my-integral/index.vue

@@ -39,6 +39,17 @@ if (userStore.userInfo) {
   })
 }
 
+function handleSign() {
+  console.log(state.signToday)
+  if (state.signToday == 0)  {
+    state.isShowSignIn = true
+  } else {
+    return uni.showToast({
+      title: '今日已签到过',
+      icon: 'none'
+    })
+  }
+}
 function handleShowIntegralDetail() {
   uni.navigateTo({
     url: '/pages/my-integral/detail'
@@ -52,15 +63,27 @@ function handleToZibuyangsheng() {
 }
 
 function handleToPoster() {
-  uni.showToast({
-    title: '待开发',
-    icon: 'none'
+  // uni.showToast({
+  //   title: '待开发',
+  //   icon: 'none'
+  // })
+  uni.navigateTo({
+    url: '/pages/my-integral/user-invation'
+  })
+}
+
+function handleShowAgreement() {
+  uni.navigateTo({
+    url: '/pages/webview/agreement?type=16'
   })
 }
 </script>
 <template>
   <div class="flex flex-col p-3 gap-3">
-    <div class="bg-red-500 rounded-lg flex flex-col items-center text-white h-30 p-3">
+    <div @click="handleShowAgreement" class="flex justify-end">
+      <div class="text-sm">积分规则</div>
+    </div>
+    <div class="bg-red-500 rounded-lg flex flex-col items-center text-white h-30 p-3 gap-3">
       <div class="">我的积分</div>
       <div class="font-bold text-[32px]">
         {{ userStore.userInfo.score }}
@@ -69,14 +92,14 @@ function handleToPoster() {
 
     <div class="bg-white rounded-md text-sm flex justify-between p-3">
       <div class="">滋补保健 {{ userStore.userInfo.score_beishengtang}}</div>
-
-      <nut-button
-          size="mini"
-          type="primary"
+      <FButton
           @tap="handleToZibuyangsheng"
+          size="mini"
+          :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
+
       >
         去兑换
-      </nut-button>
+      </FButton>
     </div>
 
     <div
@@ -96,25 +119,28 @@ function handleToPoster() {
             <div class="text-xs">每日签到</div>
             <div class="text-xs text-gray-500">每日签到得奖励</div>
           </div>
-          <nut-button
+          <FButton
+              @click="handleSign"
               size="mini"
-              :class="state.signToday ? 'bg-gray text-white' : ''"
+              :exClass="['rounded-full','!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray' }`, 'w-full']"
           >
-            {{ state.signToday ? '已签到' : '去签到' }}
-          </nut-button>
+            {{ !state.isShowSignIn ? '已签到' : '去签到' }}
+          </FButton>
         </div>
         <div class="flex  justify-between items-center">
           <div class="flex flex-col gap-2">
             <div class="text-xs">邀请好友得积分</div>
             <div class="text-xs text-gray-500">邀请好友赚奖励</div>
           </div>
-          <nut-button
-              size="mini"
-              type="primary"
+          <FButton
               @tap="handleToPoster"
+              size="mini"
+              :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
+
           >
             去邀请
-          </nut-button>
+
+          </FButton>
         </div>
       </div>
 

src/pages/my-integral/meet-scan-code.vue

@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import {CDN_URL} from "~/config/app";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {getSpreadImage} from "~/apis/user";
+// const meet_scan_code_bg = CDN_URL + '/static/assets/meet_scan_code_bg.png'
+const saoyisao_bg = 'https://cdn.bjtdba.com/vod/image/2023-09-16/20230916141128334.png'
+// 获得奖励
+const huodejiangli = 'https://cdn.bjtdba.com/vod/image/2023-09-16/20230916141155242.png'
+const spreadImage = ref({})
+const isLoading = ref(false)
+onShow(() => {
+  uni.showLoading({
+    title: '二维码加载中',
+  })
+  getSpreadImage().then(res => {
+    spreadImage.value = res[0]
+    uni.hideLoading()
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+    uni.hideLoading()
+  })
+})
+</script>
+
+<template>
+  <CXBBasePage :show="true" title="">
+    <div class="scan_bg flex items-center">
+      <div class="w-full px-5 flex flex-col items-center justify-center gap-4">
+        <div class="saoyisao_bg flex justify-center">
+          <image :src="spreadImage.attachment_src" mode="widthFix" class="w-56 h-56 mt-20"></image>
+        </div>
+        <div class="process"></div>
+      </div>
+    </div>
+  </CXBBasePage>
+
+</template>
+<style>
+.scan_bg {
+  width: 750rpx;
+  height: 1624rpx;
+  background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-16/20230916141109846.png');
+  background-size: 100% 100%;
+}
+
+.saoyisao_bg {
+  width: 100%;
+  height: 875rpx;
+  background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-16/20230916141128334.png');
+  background-size: 100% 100%;
+}
+
+.process {
+  width: 658rpx;
+  height: 256rpx;
+  background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-16/20230916141155242.png');
+  background-size: 100% 100%;
+}
+page {
+  background: #ffcb75;
+}
+
+</style>
+
+<route lang="yaml" >
+style:
+  navigationBarTitleText: 邀请好友
+  navigationStyle: custom
+</route>
+

src/pages/my-integral/user-invation.vue

@@ -0,0 +1,269 @@
+<script setup lang="ts">
+import {CDN_URL} from "~/config/app";
+import {getSpreadImage, getSpreadNumber, getUserInviteList} from "~/apis/user";
+import {encodePhone} from "../../utils";
+const userStore = useUserStore()
+
+const invite_friends_bg = CDN_URL + '/static/assets/invite_friends_bg_220826.png'
+const meet_scan_code_bg = CDN_URL + '/static/assets/meet_scan_code_bg_220826.png'
+const huodongshuomingImg = CDN_URL + '/static/assets/huodongshuoming.png'
+const buttonImg = CDN_URL + '/static/assets/invitation_button_220826.png'
+
+const integral_bg = CDN_URL + '/static/assets/integral_bg_220826.png'
+const goodFriendImg = CDN_URL + '/static/assets/my_good_friend_220826.png'
+
+const wexinLogo = CDN_URL + '/static/assets/wx_logo_220826.png'
+const smLogo = CDN_URL + '/static/assets/sm_logo_220826.png'
+
+const invitePartnerModel = ref({})
+
+const spreadData = ref(null)
+onLoad(() => {
+  getUserInviteList({
+    uid: userStore.uid ? userStore.uid : '',
+    // nickname: '',
+    pageNum: 1,
+    pageSize: 1000
+  }).then(res => {
+    if (res) {
+      invitePartnerModel.value = res
+      console.log(res)
+    }
+  })
+
+  getSpreadImage().then(res => {
+    spreadData.value = res[0]
+    console.log(spreadData.value)
+    // uni.hideLoading()
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+    // uni.hideLoading()
+  })
+})
+
+
+function handleShowAgreement(type) {
+  uni.navigateTo({
+    url: '/pages/webview/agreement?type=' + type
+  })
+}
+
+onLoad(() => {
+  userStore.getUserInfo()
+})
+
+const showDialog = ref(false)
+const inviteCode = ref('')
+function onCancel() {
+  inviteCode.value = ''
+}
+function onOk() {
+  if (inviteCode.value === '') {
+    return uni.showToast({
+      title: '邀请码不能为空',
+      icon: 'none'
+    })
+  }
+  getSpreadNumber({uid: userStore.uid, number: inviteCode.value}).then(res => {
+    // console.log(res)
+    inviteCode.value = ''
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+    inviteCode.value = ''
+  })
+}
+
+function handleShowCode() {
+  uni.navigateTo({
+    url: '/pages/my-integral/meet-scan-code'
+  })
+}
+
+function shareWeixin() {
+  wx.downloadFile({
+    url: spreadData.value.wap_poster,
+    success: (res) => {
+      wx.showShareImageMenu({
+        path: res.tempFilePath
+      })
+    }
+  })
+}
+function shareImage() {
+  if (!spreadData.value) {
+    uni.showLoading({
+      title: '二维码获取中'
+    })
+    getSpreadImage().then(res => {
+      spreadData.value = res[0]
+      console.log(spreadData.value)
+      shareWeixin()
+      uni.hideLoading()
+    }).catch(error => {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+      uni.hideLoading()
+    })
+  } else {
+    shareWeixin()
+  }
+}
+</script>
+<template>
+  <div class="relative top-0 left-0 min-h-screen h-full w-full bg-[#FFCB75] z-0 ">
+    <image :src="invite_friends_bg" mode="widthFix" class="w-full h-full absolute"></image>
+    <image
+        @click="handleShowAgreement(17)"
+        :src="huodongshuomingImg" mode="widthFix" class="w-10 absolute top-0 right-3"></image>
+    <div
+        @click="showDialog = true"
+        class="text-sm text-black absolute top-3 left-3 px-2">
+      邀请码
+    </div>
+
+    <nut-dialog title="邀请码"  v-model:visible="showDialog" @cancel="onCancel" @ok="onOk" >
+      <template>
+        <input v-model="inviteCode" class="border border-solid border-1px rounded h-10" placeholder="请输入推荐人邀请码"/>
+      </template>
+    </nut-dialog>
+
+    <div class="relative top-120 text-white flex flex-col items-center justify-center pb-30">
+      <div class=" w-full h-10 relative flex justify-center items-center">
+        <div class="relative w-60 text-center z-1 h-10 absolute top-2">
+          立即邀请
+        </div>
+        <image :src="buttonImg" mode="widthFix" class="w-60 h-10 absolute top-0"></image>
+      </div>
+      <div class="text-primary text-[12px] relative py-3">我的邀请码：{{ userStore && userStore.userInfo && userStore.userInfo.user_number }}</div>
+      <div class="relative w-full flex items-center">
+        <div class="w-full px-3 flex justify-center items-center  text-gray-600 text-[12px]">
+          <div class="integral_bg">
+            <div class="pt-20 flex flex-col gap-3 px-5 h-48 ">
+              <div class="bg-[#ffedc6] flex justify-around items-center flex-1 ">
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center gap-2">
+                  <div>首次邀请好友</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">99</text>积分</text>
+                  </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友首次获得养老金</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">350</text>积分</text>
+                  </div>
+                </div>
+              </div>
+
+              <div class="bg-[#ffedc6] flex justify-around items-center flex-1">
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到3天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">50</text>积分</text>
+                  </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到14天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">100</text>积分</text>
+                  </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到30天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">300</text>积分</text>
+                  </div>
+                </div>
+              </div>
+
+            </div>
+
+          </div>
+
+
+<!--          <image :src="integral_bg" mode="widthFix" class="w-full h-full relative"></image>-->
+
+        </div>
+      </div>
+      <div class="relative w-full">
+        <div class="px-4">
+          <div class="bg-[#F8F8F8] rounded-lg h-60 text-gray-500">
+            <div class="bg-[#FDF5E8] rounded-t-lg flex items-center justify-center py-2">
+              <image :src="goodFriendImg" mode="widthFix" class="w-50"></image>
+            </div>
+            <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList && invitePartnerModel.userInviteVoList.list.length > 0">
+              <swiper autoplay vertical :circular="true" :display-multiple-items="4" class="w-auto h-46">
+                <swiper-item  v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index" class="w-auto text-[12px] h-auto">
+                  <div class="p-3 h-30 flex justify-between  f-hairline-bottom">
+                    <div class="flex gap-2">
+                      <image :src="item.avatar" mode="widthFix" class="w-8 h-8"></image>
+                      <div class="flex flex-col">
+                        <div class="font-bold">{{ item.nickname }}</div>
+                        <div>{{ encodePhone( item.phone ) }}</div>
+                      </div>
+                    </div>
+
+                    <div class="text-gray">{{ item.promoterTime }}</div>
+
+
+                  </div>
+                </swiper-item>
+              </swiper>
+            </div>
+
+            <div v-else class="flex justify-center items-center text-[12px] text-gray h-48">
+              竟然没有好友
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+      <div class="relative w-full text-[12px] py-5 text-black flex justify-center items-center">
+        <div class="flex gap-4">
+          <div
+              @click="shareImage"
+              class="flex flex-col justify-center items-center gap-3">
+            <image :src="wexinLogo" mode="widthFix" class="w-10 h-10"></image>
+            <div>微信</div>
+          </div>
+          <div
+              @click="handleShowCode"
+              class="flex flex-col justify-center items-center gap-3">
+            <image :src="smLogo" mode="widthFix" class="w-10 h-10"></image>
+            <div>面对面扫码</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<style>
+.integral_bg {
+  width: 710rpx;
+  height: 591rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/integral_bg_220826.png');
+  background-size: 100% 100%;
+}
+page {
+  background: #ffcb75;
+}
+
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 邀请好友
+</route>
+

src/pages/my-invitation/index.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import FCellGroup from "~/components/FCellGroup/FCellGroup.vue";
 import FCell from "~/components/FCell/FCell.vue";
+import {getAgentInfo, getSelectUserInviteProfit} from "~/apis/user";
+const userStore = useUserStore()
 const list = [{
   title: '邀请伙伴',
   url: '/pages/invite-partners/index'
@@ -18,45 +20,101 @@ const list = [{
   url: '/pages/immediate-withdrawal/index'
 }]
 
+
+const data = ref({
+  // state.nickname = res.nickname
+  // state.avatar = res.avatar
+  // state.brokerage_price = res.brokerage_price
+  // state.yesterday = res.yesterday
+  // state.cumulative = res.cumulative
+  // state.extract = res.extract
+  nickname: '',
+  avatar: '',
+  brokerage_price: '' ,
+  yesterday: '' ,
+  cumulative: '' ,
+  extract: ''
+})
+
+const userInviteProfit = reactive({
+  numberSun: '',
+  UserUnsettledInviteProfit: '' ,
+  UserYesterdayInviteProfit: ''
+})
+onLoad(() => {
+  console.log('load...')
+  getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
+    console.log(res)
+    const inviteData = res.data
+    userInviteProfit.numberSun = res.numberSun
+    userInviteProfit.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit
+    userInviteProfit.UserYesterdayInviteProfit = res.UserYesterdayInviteProfit
+  })
+  getAgentInfo().then(res => {
+    console.log(res)
+    if (res) {
+      data.value = res
+    }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+})
+
 function handleClick(item: { url: string, title: string }) {
   uni.navigateTo({
     url: item.url
   })
 }
+
+function handleShowAgreement() {
+  uni.navigateTo({
+    url: '/pages/webview/agreement?type=6'
+  })
+}
 </script>
 <template>
   <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0 z--1"></div>
 
   <div class="px-3 py-3 flex flex-col gap-3">
+    <div @click="handleShowAgreement" class="flex justify-end text-white">
+      <div class="text-sm">规则</div>
+    </div>
     <div class="bg-white rounded-lg p-4 flex flex-col gap-4 ">
       <div class="flex justify-around">
         <div class="flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">
             当前收益（元）
           </div>
-          <div class="font-bold text-[28px]">0.00</div>
+          <div class="font-bold text-[28px]">
+            {{ data.brokerage_price }}
+          </div>
         </div>
         <div class="flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">
             未结算（元）
           </div>
-          <div class="font-bold text-[28px]">0.00</div>
+          <div class="font-bold text-[28px]">
+            {{ userInviteProfit.UserUnsettledInviteProfit ? userInviteProfit.UserUnsettledInviteProfit : '0.00' }}
+          </div>
         </div>
       </div>
       <div class="flex justify-around">
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">昨日收益（元）</div>
-          <div class="font-bold text-red">0.00</div>
+          <div class="font-bold text-red">{{ data.yesterday }}</div>
         </div>
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">累计收益（元）</div>
-          <div class="font-bold">0.00</div>
+          <div class="font-bold">{{ data.cumulative }}</div>
         </div>
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">累计已提（元）</div>
-          <div class="font-bold">0.00</div>
+          <div class="font-bold">{{ data.extract }}</div>
         </div>
       </div>
 
@@ -76,7 +134,7 @@ page {
   background: #f8f8f8;
 }
 </style>
-<route lang="yaml" >
+<route lang="yaml">
 style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"

src/pages/my-relation-merchant/index.vue

@@ -6,12 +6,13 @@ const list = ref<any[]>()
 onLoad((option: any) => {
   loadMyRelationMerchantList()
 })
+const searchValue = ref('')
 
-function loadMyRelationMerchantList() {
+function loadMyRelationMerchantList(keywords = '') {
   getMyRelationMerchantList({
     page: 1,
     limit: 10,
-    keywords: ''
+    keywords,
   }).then(res => {
     if (res) {
       console.log(res)
@@ -27,18 +28,25 @@ function handleRemoveMyRelation(item: any, index: number) {
     success: (res) =>  {
       if (res.confirm) {
         removeMyRelation({
-          type: 1,
+          type: 10,
           type_id: item.type_id
         }).then(delRes => {
-          return uni.showToast({
+          loadMyRelationMerchantList()
+
+          uni.showToast({
             title: '取消收藏成功',
             icon: 'success'
           }).then(() => {
-            loadMyRelationMerchantList()
             // if (list) {
             //   list.value.splice(index, 1)
             // }
           })
+
+        }).catch(error => {
+          uni.showToast({
+            title: error,
+            icon: 'none'
+          })
         })
       }
     }
@@ -49,7 +57,16 @@ function handleRemoveMyRelation(item: any, index: number) {
 <template>
   <div>
     <div class="bg-white p-3 mb-3">
-      <FSearch />
+      <nut-searchbar
+          class="absolute top-0"
+          v-model="searchValue" @search="loadMyRelationMerchantList( searchValue)" @clear="loadMyRelationMerchantList( '')">
+        <template v-slot:rightout>
+          <div @tap="loadMyRelationMerchantList(searchValue)">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
+      <!--      <FSearch />-->
     </div>
     <div v-if="list && list.length > 0" class="flex flex-col gap-3">
       <div class="bg-white flex p-3" v-for="(item, index) in list" :key="index">

src/pages/my-relation-product/index.vue

@@ -8,17 +8,25 @@ onLoad((option: any) => {
   loadMyFavorite()
 })
 
-function loadMyFavorite() {
+const searchValue = ref('')
+function loadMyFavorite(keywords= '') {
   getMyRelationProduct({
     page: 1,
     limit: 10,
-    keyword: ''
+    keywords,
   }).then(res => {
     if (res) {
       list.value = res.list
     }
   })
 }
+
+function handleShowDetail(item) {
+  console.log(item)
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
 function handleRemoveMyRelationProduct(item: MyRelationProductModel, index: number) {
   console.log(item)
   uni.showModal({
@@ -48,25 +56,37 @@ function handleRemoveMyRelationProduct(item: MyRelationProductModel, index: numb
 
 <template>
   <div>
-    <div class="bg-white p-3">
-      <FSearch />
+    <div class="bg-white ">
+<!--      <FSearch />-->
+      <nut-searchbar
+          class="absolute top-0"
+          v-model="searchValue" @search="loadMyFavorite( searchValue)" @clear="loadMyFavorite( '')">
+        <template v-slot:rightout>
+          <div @tap="loadMyFavorite(searchValue)">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
     </div>
     <div v-if="list && list.length > 0">
      <div class="bg-white flex p-3" v-for="(item, index) in list" :key="index">
-       <div>
-         <image :src="item.image" mode="widthFix" class="w-15 h-15 rounded "></image>
-       </div>
-       <div class="flex flex-col text-sm px-3 justify-between">
-         <div>{{ item.store_name }}</div>
-         <div class="flex items-center justify-between">
-           <div class=" text-red font-bold">￥{{ item.price }}</div>
-           <div
-               @tap="handleRemoveMyRelationProduct(item, index)"
-               class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
-             取消收藏
+       <div class="w-full flex">
+         <div>
+           <image :src="item.image" mode="widthFix" class="w-15 h-15 rounded "></image>
+         </div>
+         <div class="flex flex-col text-sm px-3 justify-between w-full">
+           <div @click="handleShowDetail(item)">{{ item.store_name }}</div>
+           <div class="flex items-center justify-between">
+             <div class=" text-red font-bold">￥{{ item.price }}</div>
+             <div
+                 @tap="handleRemoveMyRelationProduct(item, index)"
+                 class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
+               取消收藏
+             </div>
            </div>
          </div>
        </div>
+
      </div>
     </div>
     <div v-else>

src/pages/my-rules/index.vue

@@ -3,7 +3,7 @@
 import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
 
 import {encodePhone} from "../../utils";
-import {getRules, getUserInfo} from "~/apis/user";
+import {getAgentInfo, getRules, getUserInfo} from "~/apis/user";
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -19,6 +19,7 @@ const ruleDetail = ref<{
 const showUpgradeInfo = ref(false)
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+
   // 创始人
   if (userRichType == 3) {
     return '创始人'
@@ -31,15 +32,30 @@ const userType = computed(() => {
   if (userRichType == 1) {
     return '会员'
   }
+  if (userRichType == 3) {
+    return '创始人'
+  }
   // 合伙人
-  if (userRichType == 2) {
-    return '合伙人'
+  if (userRichType == 4) {
+    // return '合伙人(VIP)'
+    return 'VIP'
+  }
+  if (userRichType == 5) {
+    return '初始级合伙人'
+  }
+  if (userRichType == 6) {
+    return '中级合伙人'
+  }
+  if (userRichType == 7) {
+    return '高级合伙人'
   }
   if (!userRichType) {
     return '用户'
   }
 })
 
+
+
 onLoad(async () => {
   await userStore.getUserInfo()
   await userStore.getUserYanglaoJin()
@@ -74,11 +90,13 @@ function handleShowAnnuityDetail() {
 }
 const ruleId = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+
+  console.log(userRichType)
   // 创始人
   if (userRichType === 3) {
     return 21
   }
-  // 普通用户
+  // 用户
   if (userRichType === 0) {
     return 18
   }
@@ -87,22 +105,30 @@ const ruleId = computed(() => {
     return 19
   }
   // 合伙人
-  if (userRichType === 2) {
+  if (userRichType === 2 || userRichType == 4) {
     return 20
   }
 
   return 18
 })
+const agentInfo = ref({})
 
 onShow(() => {
 
-  getRules(ruleId.value).then(res => {
-    ruleDetail.value = res
-  }).catch(error => {
-    uni.showToast({
-      title: error,
-      icon: 'none'
+  if (ruleId.value) {
+    console.log(ruleId.value)
+    getRules(ruleId.value).then(res => {
+      ruleDetail.value = res
+    }).catch(error => {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
     })
+  }
+
+  getAgentInfo().then(res => {
+    agentInfo.value = res
   })
 })
 
@@ -124,9 +150,9 @@ function handleToVipPage() {
 </script>
 <template>
   <div>
-    <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
+    <div class="bg-[#FD1642] h-25 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="pt-5 ">
         <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"
@@ -145,8 +171,8 @@ function handleToVipPage() {
               </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 || '用户' }}
+                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
+              {{ userType }}
             </div>
           </div>
 
@@ -166,7 +192,7 @@ function handleToVipPage() {
             <div
                 @tap="handleShowMyInvitation"
                 class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ userStore.userInfo.member_brokerage_price }}</div>
+              <div>{{ agentInfo.brokerage_price }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
             <div
@@ -210,7 +236,7 @@ function handleToVipPage() {
         <div class="flex justify-center items-center">
           <nut-button
               @click="handleToVipPage"
-              type="primary" size="small">立即升级</nut-button>
+              type="primary" size="small">立即开通</nut-button>
 
         </div>
       </div>
@@ -238,8 +264,11 @@ function handleToVipPage() {
 
 <route lang="yaml">
 style:
+  navigationBarBackgroundColor: "#FD1642"
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true
+  navigationBarTextStyle: "white"
+
 </route>
 
 <style>

src/pages/order-confirm/index.vue

@@ -13,9 +13,12 @@ import {watchThrottled} from "@vueuse/core";
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 // const addressInfo = ref({})
 const addressStore = useAddressStore()
+const userStore = useUserStore()
+
 const data = reactive({
   cartOrder: [],
 
+  type: '',
   addressInfo: {},
   cartId: '',
   addressId: '',
@@ -31,6 +34,9 @@ const data = reactive({
 })
 onLoad((options) => {
 
+  if (options && options.type) {
+    data.type = options.type
+  }
   // console.log(options.cartId)
   if (options && options.cartId) {
     data.cartId = options.cartId
@@ -60,9 +66,9 @@ onLoad((options) => {
     data.vipType = res.da_type
   })
   /// 检查商品
-  checkProductDaCang(data.productId).then(res => {
-    console.log(res)
-  })
+  // checkProductDaCang(data.productId).then(res => {
+  //   console.log(res)
+  // })
   /// 获取订单商品数据
   orderCheck({
     cart_id: data.cartId.split(','),
@@ -74,6 +80,12 @@ onLoad((options) => {
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
+  }).catch(error => {
+    console.log(error + '----')
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 })
 
@@ -116,7 +128,9 @@ function handleSubmit() {
     address_id: data.addressId,
     // 优惠券
     // coupon:
-    pay_type: 'weixin',
+    // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
+    pay_type:  data.type && data.type == '3' ? '5' : 'weixin',
+    mer_id: data.type && data.type == '3' ? '148': '',
     // 用户留言
     mark: '',
     // take: [],
@@ -201,6 +215,7 @@ function handleAddressSelect() {
           <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
             <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
             <div>{{ item.mer_name }}</div>
+<!--            <div>{{ item.mer_id}}</div>-->
           </div>
 
           <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
@@ -214,19 +229,28 @@ function handleAddressSelect() {
                   {{ orderProductItem.product.store_name }}
                   <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
                 </div>
-                <FPrice :price="orderProductItem.productAttr.price"></FPrice>
-                <CXBYaojinTag :amount="orderProductItem.yanglao"/>
+                <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
+                <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"></FPrice>
+                <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
+
               </div>
 
             </div>
 
             <div>
               <FCell
+                  v-if="item.mer_id != '148'"
                   title="优惠劵"
                   :value="item.order.coupon_price ? item.order.coupon_price : '暂无优惠券'"
                   arrow
               ></FCell>
               <FCell
+                  v-if="item.mer_id == '148'"
+                  title="积分"
+                  :value="userStore.userInfo.score ? userStore.userInfo.score : '暂无积分'"
+                  arrow
+              ></FCell>
+              <FCell
                   title="运费"
                   :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
                   arrow
@@ -246,7 +270,9 @@ function handleAddressSelect() {
     <div class="fixed bottom-0 pb-safe w-full bg-white">
       <div class="flex justify-between items-center p-3">
         <div class="flex-1 flex text-sm font-bold">
-          应付金额：<FPrice :price="data.totalPrice"></FPrice>
+          应付金额：
+          <FPrice v-if="data.type && data.type == '3'" :price="data.totalPrice * 30"></FPrice>
+         <FPrice  v-else :price="data.totalPrice"></FPrice>
         </div>
         <div class="flex">
           <nut-button type="primary" size="small" @click="handleSubmit">提交订单</nut-button>

src/pages/order/components/OrderItem.vue

@@ -39,7 +39,7 @@
 
             </div>
             <div class="flex justify-end gap-2">
-              <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
+              <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
               <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
 
             </div>
@@ -71,7 +71,7 @@
 
           </div>
           <div class="flex justify-end gap-2">
-            <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
+            <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
             <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
           </div>
         </div>

src/pages/order/components/OtherOrderItem.vue

@@ -94,7 +94,7 @@ function handleClick() {
       </div>
       <div class="flex justify-center items-center gap-2">
         <div class="flex items-center">
-          补贴养老金：<FPrice :price="item.yanlao"></FPrice>
+          预估养老金：<FPrice :price="item.yanlao"></FPrice>
         </div>
         <div class="border border-solid border-1px border-gray-500 text-gray rounded px-1">{{ item.status_name }}</div>
       </div>

src/pages/order/detail.vue

@@ -28,18 +28,18 @@ onLoad((options) => {
 
 function handleCancelOrder() {
   console.log('取消订单操作')
-  cancelOrder(detail.order_id).then(res => {
+  cancelOrder(detail.value.group_order_id).then(res => {
+    uni.showToast({
+      title: '取消成功',
+      icon: 'none'
+    })
     setTimeout(() => {
-      uni.showToast({
-        title: '取消成功',
-        icon: 'none'
-      })
-
       uni.$emit('orderCancelFromList')
-
+      uni.navigateBack()
     }, 300)
 
   }).catch(error => {
+
     uni.navigateTo({
       url: '/pages/user/login/index?key=30'
     })
@@ -47,9 +47,11 @@ function handleCancelOrder() {
 }
 
 function handlePayment() {
-  const {detail: orderItem} = props
+  // const {detail: orderItem} = props
+  // const { orderItem } = detail.value
+  // console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.order_id}&OrderList=${JSON.stringify( detail.value)}`
     // url: `/pages/payment/index`
   })
 }
@@ -162,7 +164,7 @@ function handlePayment() {
 
     <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
       <div class="flex justify-end gap-2 p-3">
-        <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
+        <nut-button size="small" type="default" @click="handleCancelOrder" class="text-black"><div class="text-black">取消订单</div></nut-button>
         <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
 
       </div>

src/pages/order/index.vue

@@ -2,9 +2,10 @@
   <CXBBasePage>
     <nut-tabs v-model="state.tabvalue">
       <nut-tab-pane title="全部">
+
         <div v-if="state.allOrderList.length > 0" class="flex flex-col gap-3">
           <div v-for="(orderItem, index) in state.allOrderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source = 7"/>
+            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
             <OtherOrderItem :item="orderItem" v-else/>
           </div>
         </div>
@@ -23,8 +24,9 @@
       <nut-tab-pane title="待发货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-            <OtherOrderItem :item="orderItem" v-else/>
+            <OrderItem :order-item="orderItem"/>
+<!--            <OtherOrderItem :item="orderItem" v-else/>-->
+<!--            <OtherOrderItem :item="orderItem"/>-->
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -33,8 +35,9 @@
       <nut-tab-pane title="待收货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-            <OtherOrderItem :item="orderItem" v-else/>
+            <OrderItem :order-item="orderItem"/>
+<!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
+<!--            <OtherOrderItem :item="orderItem" v-else/>-->
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -43,8 +46,9 @@
       <nut-tab-pane title="待评价">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-            <OtherOrderItem :item="orderItem" v-else/>
+            <OrderItem :order-item="orderItem"/>
+<!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
+<!--            <OtherOrderItem :item="orderItem" v-else/>-->
           </div>
         </div>
         <CXBEmpty v-else/>
@@ -68,7 +72,7 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 
 const state = reactive({
-  tabvalue: '0',
+  tabvalue: 0,
 
   allOrderTotal: 0,
   allOrderList: [],
@@ -88,10 +92,10 @@ onLoad(options => {
   // 监听事件
   uni.$on('orderCancelFromList', () => {
     loadAllOrderList()
-    state.tabvalue = '0'
+    state.tabvalue = 0
   })
 })
-function  	splitArray(list, sp) {
+function splitArray(list, sp) {
   if (typeof list != 'object') return [];
   if (sp == undefined) sp = [];
   for (var i = 0; i < list.length; i++) {

src/pages/order/third-order.vue

@@ -1,69 +1,73 @@
 <template>
-  <nut-tabs v-model="state.tabvalue">
-    <nut-tab-pane title="京东">
-      <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>
+  <CXBBasePage>
+    <nut-tabs v-model="state.tabvalue">
+      <nut-tab-pane title="京东">
+        <div v-if="state.jdOrderList && state.jdOrderList.length > 0" 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 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 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 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 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>
+          <!--        <div>{{ item.status_name }}</div>-->
+
         </div>
-<!--        <div>{{ item.status_name }}</div>-->
-
-      </div>
-      <CXBEmpty v-else/>
-
-    </nut-tab-pane>
-    <nut-tab-pane title="唯品会">
-      <CXBEmpty />
-    </nut-tab-pane>
-    <nut-tab-pane title="苏宁易购">
-      <CXBEmpty />
-    </nut-tab-pane>
-    <nut-tab-pane title="淘宝">
-      <CXBEmpty />
-    </nut-tab-pane>
-    <nut-tab-pane title="拼多多">
-      <CXBEmpty />
-    </nut-tab-pane>
-    <nut-tab-pane title="抖音">
-      <CXBEmpty />
-    </nut-tab-pane>
-  </nut-tabs>
+        <CXBEmpty v-else/>
+
+      </nut-tab-pane>
+      <nut-tab-pane title="唯品会">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="苏宁易购">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="淘宝">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="拼多多">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="抖音">
+        <CXBEmpty />
+      </nut-tab-pane>
+    </nut-tabs>
+
+  </CXBBasePage>
 </template>
 <script setup lang="ts">
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {getThirdOrder} from "~/apis/order.api";
 import FPrice from "~/components/FPrice/FPrice.vue";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 enum TYPE {
   JD = '6',
   TB = '5',

src/pages/order_addcart/index.vue

@@ -15,6 +15,8 @@ import {
 import {DcProductModel} from "~/apis/model/dacang.model";
 import {encodeBase64} from "~/utils/http/helper";
 import {CDN_URL} from "~/config/app";
+import {uniq} from "lodash-es";
+import {cartChange} from "~/apis/order.api";
 const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 const state = reactive({
@@ -31,6 +33,7 @@ const state = reactive({
 const shopping = ref<ShoppingResult>()
 
 onShow(() => {
+  state.cart_id = []
   loadCartList()
   if (!state.isManage) {
     state.isManage = true
@@ -47,14 +50,23 @@ onShow(() => {
 function loadCartList() {
   getCartList().then(res => {
     shopping.value = res
+
+    console.log(res)
     shopping.value?.list.forEach((shopItem, index) => {
-      shopItem.allCheck = true
+      // shopItem.allCheck = true
+
+      shopItem.allCheck = false
       shopItem.list.forEach(goodItem => {
-        goodItem.check = true
-        state.cart_id.push(goodItem.cart_id)
+        goodItem.check = false
+        // state.cart_id.push(goodItem.cart_id)
         // if (goodItem.cart_num === 1) {}
       })
+      console.log(shopItem)
     })
+    // cartAllCheck("all")
+    // if (shopping.value) {
+    //   handleSelectAll()
+    // }
   })
 }
 const hasShopping = computed(() => {
@@ -87,6 +99,18 @@ function handleGoodsItemCheck() {
   cartAllCheck('single')
 }
 
+function shopCheck(shopItem) {
+  if (shopItem.allCheck) {
+    console.log(shopItem)
+    shopItem.list.forEach((good, index) => {
+      good.check = true
+    })
+  } else {
+    shopItem.list.forEach((good, index) => {
+      good.check = false
+    })
+  }
+}
 function cartAllCheck(type: 'single' | 'all') {
   let allArr = []
   let totalMoney = 0
@@ -120,6 +144,7 @@ function cartAllCheck(type: 'single' | 'all') {
       if (goodItem.check) {
         totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
         totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
       }
     })
   })
@@ -129,6 +154,26 @@ function cartAllCheck(type: 'single' | 'all') {
   state.totalPrice = totalMoney
 }
 
+function reTotal() {
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+
+  shopping.value?.list.forEach((goods, index) => {
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        // state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
 function handleSelectAll(checked: boolean) {
   // console.log('000')
   // isAllSelect.value = !isAllSelect.value
@@ -143,9 +188,12 @@ function handleManageCart() {
 
 function handleSubmit() {
   console.log(state.isManage)
+
   if (!state.isManage) {
     handleDelete()
   } else { // submit
+    state.cart_id = uniq(state.cart_id)
+
     // console.log(state.cart_id)
     if (state.cart_id && state.cart_id.length > 0) {
       uni.navigateTo({
@@ -170,6 +218,7 @@ function handleDelete() {
       }
     })
   })
+  state.cart_id = uniq(state.cart_id)
 
   // console.log(cart_id)
   if (state.cart_id.length === 0) {
@@ -178,12 +227,24 @@ function handleDelete() {
       icon: "none"
     })
   } else {
-    deleteCartItem(state.cart_id).then(res => {
-      uni.showToast({
-        title: '删除成功'
-      })
+    uni.showModal({
+      title: '温馨提示',
+      content: '确认将宝贝删除?',
+      success: (res) => {
+        if (res.confirm) {
+          deleteCartItem(state.cart_id).then(res => {
+            uni.showToast({
+              title: '删除成功'
+            })
+            state.isManage = true
+            state.cart_id = []
+            state.totalPrice = ''
+            loadCartList()
+          })
 
-      loadCartList()
+        } else if (res.cancel) {
+        }
+      }
     })
   }
 }
@@ -209,6 +270,21 @@ function handleProductItemClick(
       url: `/pages/store/product/detail?id=${item.product_id}`
     })
 }
+
+function handleNumberChange(num, goodItem) {
+  console.log(goodItem)
+  uni.showLoading()
+  console.log(num)
+  cartChange(goodItem.cart_id, num).then(res => {
+    reTotal()
+    uni.hideLoading()
+  })
+  // console.log(goodItem)
+  // console.log(num)
+  // const
+  // goodItem.productAttr.price = goodItem.productAttr.price * num
+  // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
+}
 </script>
 <template>
   <div class="">
@@ -248,7 +324,7 @@ function handleProductItemClick(
           <div
               class="f-hairline-bottom flex  items-center font-bold p-3"
           >
-            <nut-checkbox v-model="shopItem.allCheck" label="全选"
+            <nut-checkbox v-model="shopItem.allCheck" @change="shopCheck(shopItem)" label="全选"
                           class="!text-primary"
             >
               {{ shopItem.mer_name }}
@@ -261,32 +337,34 @@ function handleProductItemClick(
             <div class="flex">
               <nut-checkbox v-model="goodItem.check"
                             @change="handleGoodsItemCheck"
-                            label="全选"
+                            label="单选"
                             class="!text-primary"
               ></nut-checkbox>
-
               <image
                   :src="goodItem.product.image"
                   mode="aspectFill" class="w-18 h-18 rounded"
               ></image>
             </div>
 
-            <div class="flex flex-col gap-3 w-full">
+            <div class="flex flex-col gap-1 w-full">
               <div
                   @click="handleProductItemClick(goodItem)"
                   class="text-overflow line-clamp-1">{{ goodItem.product.store_name }}</div>
-              <div class="flex items-center gap-2">
+              <div class="flex flex-col justify-start gap-1">
                 <div
-                    class="text-[10px] bg-gray-100 text-gray rounded-full min-w-5 text-center p-1 justify-center items-center">
+                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
                   {{ goodItem.productAttr.sku }}
                 </div>
-                <CXBYaojinTag :amount="goodItem.yanglao"/>
+                <div class="flex">
+                  <CXBYaojinTag :amount="goodItem.yanglao"/>
+
+                </div>
               </div>
               <div class="flex  justify-between ">
                 <FPrice :price="goodItem.productAttr.price"
                         ex-class="font-bold text-dark"
                 />
-                <nut-input-number v-model="goodItem.cart_num"/>
+                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)"/>
               </div>
             </div>
           </div>
@@ -335,6 +413,7 @@ function handleProductItemClick(
         <div class="flex text-[12px]">
           合计：
           <FPrice :price="state.totalPrice"></FPrice>
+<!--          {{totalCartInfo.totalPrice}}-->
         </div>
         <FButton
             @click="handleSubmit"

src/pages/pension_account/index.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import {CDN_URL} from "~/config/app";
 import {getUserYangLaoJin} from "~/apis/user";
+import dayjs from "dayjs";
 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()
@@ -12,11 +13,20 @@ onLoad(() => {
     userYangLaoJin.value = res
   })
 })
+
+function handleClick() {
+  uni.navigateTo({
+    url: '/pages/immediate-withdrawal/index'
+  })
+}
+
 </script>
 
 <template>
   <div class=" w-screen max-w-lg mx-auto">
     <div class="p-4 flex flex-col gap-3">
+
+
       <div class="rounded-lg bg-[#FE2C46] p-3 text-white">
         <div class="flex items-center w-full gap-2  top-5 left-8">
           <image src="https://app.bjtdba.com/uploads/logo.jpg"
@@ -32,6 +42,7 @@ onLoad(() => {
             <div class="flex gap-1">
               <div>养老金账号余额</div>
               <div
+                  @click="handleClick"
                   class="text-[#d88700] bg-[#feebcd] rounded-full text-[10px] h-4 px-2"
               >去提现</div>
             </div>
@@ -47,7 +58,7 @@ onLoad(() => {
                   <div>￥</div>
                   <div>{{ userStore.yanglao.all_yanglao }}</div>
                 </div>
-                <div class="text-xs text-light-100">补贴养老金</div>
+                <div class="text-xs text-light-100">预估养老金</div>
               </div>
               <div class="flex flex-col justify-center items-center ">
                 <div class="font-bold">￥{{ userStore.yanglao.all_yanglao_a }}</div>
@@ -77,7 +88,9 @@ onLoad(() => {
               </div>
               <div class="block mt-3">
                 <div>加入时间</div>
-                <div class="text-gray">2023-07-31</div>
+                <div class="text-gray">
+                  {{userYangLaoJin.create_time && dayjs(userYangLaoJin.create_time).format('YYYY-MM-DD')}}
+                </div>
               </div>
             </div>
             <div class="text-center">

src/pages/product/zibuyangsheng.vue

@@ -3,6 +3,7 @@ import {getEntropyProductList} from "~/apis/common";
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {getProductList} from "~/apis/merchant";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 const list = ref()
 onLoad((options) => {
   getProductList(options.id).then(res => {
@@ -12,7 +13,8 @@ onLoad((options) => {
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}&mer_id=148`
+    // url: `/pages/store/product/detail?id=${item.product_id}&mer_id=148`
+    url: `/pages/store/product/detail?id=${item.product_id}`
   })
 }
 </script>
@@ -28,15 +30,22 @@ function handleItemClick(item) {
             <div v-for="(item, index) in list"
                  :key="index"
             >
+
               <div class="bg-white rounded-lg">
                 <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
                 <div class="text-sm p-2 flex flex-col gap-2">
                   <div class="line-clamp-2">
                     {{ item.store_name }}
                   </div>
+                  <CXBYaojinTag :amount="item.yanglao" />
                   <div class="text-[#fe0032] flex items-end gap-2">
-                    <div class="text-[20px]">{{ Number(item.price * 30).toFixed(2) }}</div>
-                    <div class="text-xs">积分</div>
+                    <div class="text-[20px]">{{ Number(item.price).toFixed(2) }}</div>
+<!--                    <div class="text-xs">积分</div>-->
+                  </div>
+                  <div class="line-through text-xs font-bold text-gray-400 flex ">
+                    <div>
+                      ¥ {{item.ot_price}}
+                    </div>
                   </div>
                 </div>
               </div>

src/pages/real-name-authentication/index.vue

@@ -48,7 +48,7 @@ onLoad(async () => {
       state.isCertified = true
 
       formData.user_card = res.user_card.replace(/^(\d{4})\d+(\d{4})$/, '$1********$2')
-      formData.user_name = res.user_name
+      formData.user_name = formatName(res.user_name)
       // formData.card_positive = res.card_positive
       // formData.card_reverse = res.card_reverse
 
@@ -127,22 +127,22 @@ function validateForm() {
     return state.isFormValidate = false
   }
 
-  if (formData.mobile === '') {
-    uni.showToast({
-      title: '请填写手机号',
-      icon: 'none'
-    })
-    return state.isFormValidate = false
-  }
-
-  if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.mobile)) {
-     uni.showToast({
-      title: '请填写正确的手机号',
-      icon: 'none'
-    })
-    return state.isFormValidate = false
-
-  }
+  // if (formData.mobile === '') {
+  //   uni.showToast({
+  //     title: '请填写手机号',
+  //     icon: 'none'
+  //   })
+  //   return state.isFormValidate = false
+  // }
+
+  // if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.mobile)) {
+  //    uni.showToast({
+  //     title: '请填写正确的手机号',
+  //     icon: 'none'
+  //   })
+  //   return state.isFormValidate = false
+  //
+  // }
 
   if (formData.user_card === '') {
      uni.showToast({
@@ -214,6 +214,10 @@ function handleSubmit () {
     return false
   }
 }
+function formatName (str) {
+  return new Array(str.length).join('*') + str.substr(-1);
+
+}
 </script>
 
 <template>
@@ -230,15 +234,15 @@ function handleSubmit () {
                :class="state.isCertified && 'text-gray'"
         />
       </div>
-      <div class="f-hairline-bottom py-3 flex" v-if="!state.isCertified">
-        <div>手机号码：</div>
-        <input v-model="formData.mobile"
-               :disabled="state.isCertified"
-               placeholder="请输入证件号码" class="text-sm"
-               :class="state.isCertified && 'text-gray'"
-
-        />
-      </div>
+<!--      <div class="f-hairline-bottom py-3 flex" v-if="!state.isCertified">-->
+<!--        <div>手机号码：</div>-->
+<!--        <input v-model="formData.mobile"-->
+<!--               :disabled="state.isCertified"-->
+<!--               placeholder="请输入证件号码" class="text-sm"-->
+<!--               :class="state.isCertified && 'text-gray'"-->
+
+<!--        />-->
+<!--      </div>-->
       <div class="f-hairline-bottom py-3 flex">
         <div>证件号码：</div>
         <input v-model="formData.user_card"
@@ -289,7 +293,6 @@ function handleSubmit () {
     <div class=" px-3">
       <nut-button
           @tap="handleSubmit"
-          :disabled="!state.isFormValidate"
           :loading="state.isLoading"
           type="primary" block>确认提交</nut-button>
     </div>

src/pages/red-integral/index.vue

@@ -3,36 +3,84 @@ import {useUserStore} from "~/stores/userStore";
 import {encodePhone} from "../../utils";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {getRedIntegralList} from "~/apis/user";
+import dayjs from "dayjs";
 
 const userStore = useUserStore();
 onLoad((options) => {
   userStore.getUserInfo()
+  getRedIntegralList({page: 1, limit: 20}).then(res => {
+    console.log(res)
+    if (res && res.length > 0) {
+      for (let item of res) {
+        // data.value = res
+        data.value = {
+          red: res.red,
+          mark: res.mark,
+          time: dayjs(res.time).format('YYYY-MM-DD')
+        }
+      }
+    }
+  })
 })
+const data = ref([])
+// 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 userType = computed(() => {
-  const userRichType = userStore.userInfo.user_rich_type
+  const userRichType = userStore.userInfo?.user_rich_type
+
   // 创始人
-  if (userRichType === 3) {
+  if (userRichType == 3) {
     return '创始人'
   }
   // 普通用户
-  if (userRichType === 0) {
+  if (userRichType == 0) {
     return '用户'
   }
   // 会员
-  if (userRichType === 1) {
+  if (userRichType == 1) {
     return '会员'
   }
+  if (userRichType == 3) {
+    return '创始人'
+  }
   // 合伙人
-  if (userRichType === 2) {
-    return '合伙人'
+  if (userRichType == 4) {
+    return 'VIP'
+  }
+  if (userRichType == 5) {
+    return '初始级合伙人'
+  }
+  if (userRichType == 6) {
+    return '中级合伙人'
+  }
+  if (userRichType == 7) {
+    return '高级合伙人'
   }
   if (!userRichType) {
     return '用户'
   }
-
-  getRedIntegralList({page: 1, limit: 20}).then(res => {
-    console.log(res)
-  })
 })
 
 const state = reactive({
@@ -64,10 +112,10 @@ function handleImmediateWithdrawal() {
 
 <template>
   <CXBBasePage>
-    <div class="bg-[#FD1642] h-30 w-full absolute top-0 left-0"></div>
+    <div class="bg-[#FD1642] h-25 w-full absolute top-0 left-0"></div>
 
     <div class="flex flex-col gap-4 relative px-3">
-      <div class="pt-10 ">
+      <div class="pt-5 ">
         <div class="flex gap-2 mb-2 text-white mb-3">
           <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
                  class="w-9 h-9 rounded-full"
@@ -85,7 +133,7 @@ function handleImmediateWithdrawal() {
                   <div class="text-sm" v-if="userStore.userInfo">
                     {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                   </div>
-                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center">
+                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center px-2">
                     {{userType}}
                   </div>
                 </div>

src/pages/revenue-sharing/detail.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import FPrice from "~/components/FPrice/FPrice.vue";
+import {decodeBase64} from "~/utils/http/helper";
+
+const detail = ref({
+})
+// 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.number" 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">推广佣金获取</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="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.mark }}</div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 推广佣金收益详情
+</route>

src/pages/revenue-sharing/index.vue

@@ -6,6 +6,7 @@ import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {getAgentInfo, getRevenueSharing, getSelectUserInviteProfit} from "~/apis/user";
 import type {RevenueSharingModel} from "~/apis/model/revenueSharingModel";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {encodeBase64} from "~/utils/http/helper";
 const userStore = useUserStore()
 const state = reactive({
   numberSun: '',
@@ -18,7 +19,7 @@ const state = reactive({
   cumulative: '',
   extract: '',
 
-  currentTab: 1,
+  currentTab: 0,
   list: [
   //     {
   //   order_sn: '11111',
@@ -57,9 +58,10 @@ function loadList(type: number) {
     limit: 20,
     type
   }).then((res: Array<RevenueSharingModel>) => {
-    if (res && res.length > 0) {
+    // if (res && res.length > 0) {
+    console.log(res)
       state.list = res
-    }
+    // }
   })
 
 }
@@ -79,93 +81,112 @@ function getStatusText(status: number) {
     return '失效'
   }
 }
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: '/pages/revenue-sharing/detail?detail=' + encodeBase64(Object.assign({}, item))
+  })
+}
 </script>
 
 <template>
-  <CXBBasePage>
+  <div class="flex flex-col px-3">
     <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
 
-    <div class="px-3 py-3 flex flex-col gap-3">
-      <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
-        <div class="flex justify-around py-8">
-          <div class="flex-1 flex flex-col justify-center items-center gap-2">
-            <div class="text-[11px] text-gray">累计佣金（元）</div>
-            <div class="font-bold ">
-              {{ state.cumulative }}
+    <div class=" py-3 flex flex-col gap-3 fixed top-0 z-2 w-full">
+      <div class="w-full">
+        <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
+          <div class="flex justify-around py-8">
+            <div class="flex-1 flex flex-col justify-center items-center gap-2">
+              <div class="text-[11px] text-gray">累计佣金（元）</div>
+              <div class="font-bold ">
+                {{ state.cumulative }}
+              </div>
             </div>
-          </div>
 
-          <div class="flex-1 flex flex-col justify-center items-center gap-2">
-            <div class="text-[11px] text-gray">已提现（元）</div>
-            <div class="font-bold">{{ state.extract }}</div>
-          </div>
+            <div class="flex-1 flex flex-col justify-center items-center gap-2">
+              <div class="text-[11px] text-gray">已提现（元）</div>
+              <div class="font-bold">{{ state.extract }}</div>
+            </div>
 
-          <div class="flex-1 flex flex-col justify-center items-center gap-2">
-            <div class="text-[11px] text-gray">佣金余额（元）</div>
-            <div class="font-bold">{{ state.brokerage_price }}</div>
-          </div>
+            <div class="flex-1 flex flex-col justify-center items-center gap-2">
+              <div class="text-[11px] text-gray">佣金余额（元）</div>
+              <div class="font-bold">{{ state.brokerage_price }}</div>
+            </div>
 
-          <div class="flex-1 flex flex-col justify-center items-center gap-2">
-            <div class="text-[11px] text-gray">未结算（元）</div>
-            <div class="font-bold">{{ state.UserUnsettledInviteProfit }}</div>
+            <div class="flex-1 flex flex-col justify-center items-center gap-2">
+              <div class="text-[11px] text-gray">未结算（元）</div>
+              <div class="font-bold">{{ state.UserUnsettledInviteProfit }}</div>
+            </div>
           </div>
-        </div>
-
-      </div>
 
-      <div>
-        <div class="flex justify-around text-center text-sm pb-3">
+        </div>
+        <div class="flex justify-around text-center text-sm py-3 bg-gray-300">
           <div
-              @click="handleTabClick(1)"
-              :class="state.currentTab === 1? 'text-primary' : ''"
+              @click="handleTabClick(0)"
+              :class="state.currentTab === 0? 'text-primary' : ''"
           >线上商城明细</div>
           <div
-              :class="state.currentTab === 2? 'text-primary' : ''"
-              @click="handleTabClick(2)"
+              :class="state.currentTab === 1? 'text-primary' : ''"
+              @click="handleTabClick(1)"
           >线下实体明细</div>
         </div>
-        <div>
-          <div v-if="state.list && state.list.length > 0" class="bg-white p-3 gap-3">
-            <div v-for="(item, index) in state.list" :key="index">
-              <div class="flex flex-col">
-                <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
-                  <div>订单号：{{ item.order_sn }}</div>
-                  <div>{{ getStatusText(item.status) }}</div>
+      </div>
+<!--      <div class="fixed top-50">-->
+
+<!--      </div>-->
+
+
+    </div>
+    <div class="px-3 py-3 flex flex-col gap-3 pt-50">
+      <div>
+        <div v-if="state.list && state.list.length > 0" class="bg-white p-3 gap-3">
+          <div v-for="(item, index) in state.list" :key="index"
+               @click="handleItemClick(item)"
+          >
+            <div class="flex flex-col">
+              <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
+                <div>订单号：{{ item.order_sn }}</div>
+                <div>{{ getStatusText(item.status) }}</div>
+              </div>
+              <div class="font-bold flex py-2 justify-between">
+                <div>
+                  {{ item.content }}
                 </div>
-                <div class="font-bold flex py-2 justify-between">
-                  <div>
-                    {{ item.content }}
-                  </div>
-                  <div class="text-primary">+{{ item.number.toFixed(2) }}</div>
+                <div class="text-primary">+{{ Number.parseFloat(item.number).toFixed(2) }}</div>
+              </div>
+              <div class="flex justify-between text-gray text-xs">
+                <div class="flex flex-col">
+                  <div>消费时间</div>
+                  <div class="text-black text-sm">{{ item.xiadan }}</div>
                 </div>
-                <div class="flex justify-between text-gray text-xs">
-                  <div class="flex flex-col">
-                    <div>消费时间</div>
-                    <div class="text-black text-sm">{{ item.xiadan }}</div>
-                  </div>
-                  <div class="flex flex-col">
-                    <div>结算时间</div>
-                    <div class="text-black text-sm">{{ item.jiesuan }}</div>
-                  </div>
+                <div class="flex flex-col">
+                  <div>结算时间</div>
+                  <div class="text-black text-sm">{{ item.jiesuan }}</div>
                 </div>
               </div>
+            </div>
 
 
 
-            </div>
           </div>
-
-          <CXBEmpty v-else/>
         </div>
+
+        <CXBEmpty v-else/>
       </div>
 
     </div>
 
-  </CXBBasePage>
+  </div>
 </template>
-<route lang="yaml" >
+<route lang="yaml"  type="home">
 style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
   navigationBarTitleText: 分享收益
 </route>
+<style>
+page {
+ background: #f8f8f8;
+}
+</style>

src/pages/search/index.vue

@@ -567,7 +567,7 @@ function handleScrollToLower() {
                 </div>
                 <div
                     class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
-                  <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
+                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                          mode="widthFix" class="!w-8.5"></image>
                   <div class="px-2 flex items-center jusitify-center text-xs">
                     <div>

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

@@ -17,7 +17,7 @@ const state = reactive({
     key: 'ctime'
   }, {
     title: '好友分享',
-    key: 'friendSum'
+    key: 'friendsSum'
   }, {
     title: '朋友圈分享',
     key: 'momentsSum'
@@ -32,17 +32,24 @@ const state = reactive({
   // showPicker: false,
   date: [],
   isVisible: false,
-  currentDate: ''
+  currentDate: dayjs().format('YYYY-MM-DD')
 })
 
 const openSwitch = param => {
   state[`${param}`] = true;
+  state.date = [
+    dayjs().format('YYYY-MM-DD'),  dayjs().format('YYYY-MM-DD')
+  ]
 };
 const closeSwitch = param => {
   state[`${param}`] = false;
+  state.date = []
 };
 const setChooseValue= param => {
   state.date = [...[param[0][3], param[1][3]]];
+  if (state.date.length > 0) {
+    loadList(state.date[0], state.date[1])
+  }
 };
 const select = (param: string) => {
   console.log(param);
@@ -52,6 +59,8 @@ const show = ref(false);
 const popupConfirm = ({ selectedValue, selectedOptions })=>{
   popupDesc.value = selectedOptions.map((val: any) => val.text).join('');
   show.value = false;
+  // console.log(popupDesc.value)
+
 }
 onLoad((option) => {
   if (userStore.uid) {
@@ -62,10 +71,28 @@ onLoad((option) => {
     }).then(res => {
       state.ctr = res.ctr
       state.buy = res.buy
+      console.log(res.pageInfo.list)
       state.data = res.pageInfo.list
     })
   }
 })
+
+function loadList(start_time: string, end_time: string) {
+  if (userStore.uid) {
+
+    getUserShareProductList({
+      uid: userStore.uid,
+      pageNum: 1,
+      pageSize: 20,
+      start_time,
+      end_time,
+    }).then(res => {
+      state.ctr = res.ctr
+      state.buy = res.buy
+      state.data = res.pageInfo.list
+    })
+  }
+}
 </script>
 
 <template>
@@ -76,12 +103,12 @@ onLoad((option) => {
       <div class="flex justify-around py-8">
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-[11px] text-gray">商品点击率</div>
-          <div class="font-bold text-[20px]">{{ state.ctr }}%</div>
+          <div class="font-bold text-[20px]">{{ state.ctr ? state.ctr : '0.00' }}%</div>
         </div>
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-[11px] text-gray">商品购买率</div>
-          <div class="font-bold text-[20px]">{{ state.buy }}%</div>
+          <div class="font-bold text-[20px]">{{ state.buy ? state.buy : '0.00' }}%</div>
         </div>
       </div>
     </div>
@@ -110,7 +137,7 @@ onLoad((option) => {
         v-model:visible="state.isVisible"
         :default-value="state.date"
         type="range"
-        :start-date="`2017-12-22`"
+        :start-date="`2017-01-01`"
         @close="closeSwitch('isVisible')"
         @choose="setChooseValue"
         @select="select"

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

@@ -1,6 +1,6 @@
 <template>
-  <div class="bg-light rounded-lg p-3 text-sm flex flex-col gap-4">
-    <div class="flex flex-row justify-between items-center">
+  <div class="bg-[#ededed] rounded-lg p-4 text-sm flex flex-col gap-4">
+    <div v-if="!isSearchHome" class="flex flex-row justify-between items-center">
       <div class="flex flex-row gap-3">
         <div class="rounded bg-white w-8 h-8">
           <image :src="model.mer_avatar" mode="widthFix" class="w-full"></image>
@@ -13,16 +13,17 @@
         </div>
 
       </div>
+      <!--      {{props.model.care}}-->
       <div
-          @tap="handleRelation"
+          @click.stop="handleRelation"
           v-if="!isCare"
           class="rounded-full text-white bg-gradient-to-r from-[#fe0032] to-[#fe7577] w-12 h-6 text-xs text-white flex justify-center items-center px-2 gap-1">
         <div class="i-tabler-heart"></div>
         关注
       </div>
       <div
-          v-if="isCare"
-          @tap="handleRemoveRelation"
+          v-else
+          @click="handleRemoveRelation"
           class="rounded-full text-gray text-[11px] flex justify-center items-center px-2 gap-1 border border-solid border-1px border-gray w-12 h-6 ">
         已关注
       </div>
@@ -30,11 +31,58 @@
       <!--        关注-->
       <!--      </CXBButton>-->
     </div>
-    <div class="flex flex-row items-center">
-      <div class="basis-1/4 text-left">推荐</div>
-      <div class="basis-1/4 text-center">销量</div>
-      <div class="basis-1/4 text-center">上新</div>
-      <div class="basis-1/4 text-right">价格</div>
+    <div class="flex flex-row items-center"
+         v-if="isCategory"
+    >
+      <div class="basis-1/4 text-left cx-menu">
+        <nut-menu>
+          <template #icon>
+            <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+          </template>
+          <nut-menu-item v-model="state.menuDefaultValue"
+                         :options="state.options"
+                         @change="handleProductTypeChange"
+          >
+
+          </nut-menu-item>
+        </nut-menu>
+      </div>
+        <div
+            @click="handleProductTypeChange(2)"
+            class="basis-1/4 text-center"
+            :class="state.currentSelected === 2 ? 'text-primary font-bold' : ''"
+        >销量</div>
+        <div
+            @click="handleProductTypeChange(3)"
+            :class="state.currentSelected === 3 ? 'text-primary font-bold' : ''"
+            class="basis-1/4 text-center">上新</div>
+        <div
+            @click="handleOrderPrice(state.priceType)"
+            class="basis-1/4 text-right">
+          <div class="flex flex-row justify-center items-center gap-1">
+            <div
+                :class="state.order ? 'text-primary font-bold' : ''"
+            >
+              价格
+            </div>
+            <div class="flex flex-col justify-center items-center">
+              <div v-if="!state.order"  class="h-fit flex flex-col items-center">
+                <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+                <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+              </div>
+              <div v-if="state.order"  class="h-fit flex flex-col items-center">
+                <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 1"></image>
+                <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
+
+                <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 0"></image>
+                <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
+
+              </div>
+
+            </div>
+          </div>
+
+        </div>
     </div>
 
   </div>
@@ -45,15 +93,79 @@ import type {PropType} from "vue";
 import {MerchantDetailModel} from "~/apis/model/storeModel";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
 import {relation, removeMyRelation} from "~/apis/user";
+import amapWx from "~/libs/amap-wx";
+import {getMerchantDetail} from "~/apis/merchant";
+import {CDN_URL} from "~/config/app";
+const upDefaultImg = CDN_URL + '/static/assets/tuijian_shangla.png'
+const downDefaultImg = CDN_URL + '/static/assets/tuijian_xiala.png'
+
+const downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
+const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
 
+const emit = defineEmits<{
+  (e: 'change', value: boolean): void,
+  (e: 'product-type-change', value: number): void,
+  (e: 'order-change', value: number): void
+}>()
 const props = defineProps({
   model: {
     type: Object as PropType<MerchantDetailModel>,
-    required: true
+  },
+  isCategory: {
+    type: Boolean,
+    default: true
+  },
+  isSearchHome: {
+    type: Boolean,
+    default: false
   }
 })
 
-const isCare = ref(props.model.care)
+const isCare = ref()
+if (props.model && props.model.care) {
+  isCare.value = props.model.care
+}
+
+const state = reactive({
+  options: [{
+    text: '推荐',
+    value: 1
+  }, {
+    text: '大仓商品',
+    value: 7,
+  }, {
+    text: '平台商品',
+    value: 6,
+  }],
+  menuDefaultValue: 1,
+  currentSelected: 1,
+  order: false,
+  priceType: 0
+})
+function handleOrderPrice(val) {
+  // state.order = !state.order
+  state.currentSelected = NaN
+  state.order = true
+  if (val === 0) {
+    state.priceType = 1
+  } else {
+    state.priceType = 0
+  }
+  emit('order-change', state.priceType)
+}
+function handleProductTypeChange(value) {
+  state.order = false
+
+  state.currentSelected = value
+  emit('product-type-change', value)
+}
+watch(() => props.model, (val) => {
+  console.log(val)
+  isCare.value = val.care
+}, {
+  deep: true
+})
+
 function handleRelation() {
   relation({
     type: '10',
@@ -63,6 +175,12 @@ function handleRelation() {
     uni.showToast({
       title: '已关注'
     })
+    // getMerchantDetail(props.model.mer_id).then((res: any) => {
+    //   // merchant.value = {...res}
+    //   console.log(res)
+    // })
+    emit('change', true)
+
   }).catch(error => {
     if (error === '请登录') {
       uni.navigateTo({
@@ -73,11 +191,37 @@ function handleRelation() {
 }
 
 function handleRemoveRelation() {
+  console.log('on....')
   removeMyRelation({type: 10, type_id: props.model.mer_id}).then(res => {
     isCare.value = false
     uni.showToast({
       title: '取消关注'
     })
+    emit('change', true)
+
   })
 }
 </script>
+<style lang="scss">
+
+//.nut-menu .nut-menu__bar{
+//  --nut-white: transparent;
+//  background-color: #008be8 !important;
+//}
+//
+:deep(.nut-menu__bar) {
+  --nut-white: none;
+  background: none;
+  background-color: transparent !important;
+}
+
+page {
+
+  //background: transparent;
+  --nut-menu-item-font-size: 14px;
+  --nut-menu-bar-line-height: 24px;
+  --nut-menu-bar-box-shadow: none;
+  --nut-menu-item-active-text-color: #FE0032;
+  --nut-white: #ededed;
+}
+</style>

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

@@ -54,7 +54,7 @@ const props = defineProps({
         {{item.store_name}}
       </div>
       <div class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
-        <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
+        <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                mode="widthFix" class="!w-8.5"></image>
         <div class="px-2 flex items-center jusitify-center text-xs">
           <div>

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

@@ -21,7 +21,7 @@ function handleItemClick (item) {
 </script>
 <template>
   <!--  <scroll-view type="custom">-->
-  <div  class="pb-safe" v-if="list && list.length > 0">
+  <div  class="" v-if="list && list.length > 0">
     <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
       <div v-for="(item, index) in list"
            :key="index"

src/pages/store/home/index.vue

@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-import {getMerchantCategory, getMerchantDetail, getProductList} from "~/apis/merchant";
+import {getMerchantCategory, getMerchantDetail} from "~/apis/merchant";
 import type {MerchantModel} from "~/apis/model/storeModel";
 import type {Ref} from "vue";
 import MerchantHeader from "~/pages/store/home/components/MerchantHeader.vue";
 import MerchantProductList from "~/pages/store/home/components/MerchantProductList.vue";
 import type {MerchantCategoryModel} from "~/apis/model/storeModel";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {searchProductList} from "~/apis/product";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import FSearch from "~/components/FSearch/FSearch.vue";
 
 let merchant: Ref<MerchantModel> = ref<MerchantModel>({
   mer_id: NaN,
@@ -16,27 +20,132 @@ let merchant: Ref<MerchantModel> = ref<MerchantModel>({
   service_phone: '',
   sales: NaN,
   care_count: NaN,
+
+})
+
+const state = reactive({
+  keyword: '',
+
+  status: 'noMore',
+  triggered: false,
+  priceType: NaN,
+  sales: NaN,
+  is_new: NaN,
+  type: 1,
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1
 })
-let productList: any[] = ref<any>([])
+const id = ref('')
+let productList = ref<any>([])
+
 const categoryList = ref<Array<MerchantCategoryModel>>()
+
 onLoad((options: any) => {
   if (options.id) {
-    const id = options.id
-    getMerchantDetail(id).then((res: any) => {
+    // console.log(options.id)
+    id.value = options.id
+    getMerchantDetail(id.value).then((res: any) => {
       merchant.value = {...res}
+      console.log(res)
     })
 
-    getProductList(id).then((res: any) => {
-      productList.value = res.list
-    })
-
-    getMerchantCategory(id).then(res => {
+    // 148 专用
+    // getProductList(id.value).then((res: any) => {
+    //   productList.value = res.list
+    // })
+    //
+    getMerchantCategory(id.value).then(res => {
       categoryList.value = res
       // console.log(res)
     })
+
+    loadList('reload')
+    // getStoreProductList()
   }
 })
 
+
+// function searchProduct() {
+//   searchProductList({
+//     mer_id: id.value
+//   })
+// }
+function handleProductTypeChange(typeValue) {
+  if (typeValue === 3) {
+    state.sales = NaN
+    state.is_new = 0
+  }
+  else if (typeValue === 2) {
+    state.sales = 0
+  } else {
+    state.type = typeValue
+  }
+  loadList('reload')
+}
+function handleOrderChange(priceType) {
+  state.priceType = priceType
+
+  // reset
+  state.sales = NaN
+  state.is_new =NaN
+
+  loadList('reload')
+}
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    mer_id: id.value,
+    // mer_keyword: '',
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+    // mer_id?: string
+    // mer_keyword?: string
+    // pageNum: number
+    // pageSize: number
+    // order: ORDER
+    //请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
+    // is_best?: number
+    // sales?: number
+    // is_new?: number
+    // priceType?: number
+    // type?: number
+    // category_id?: string
+  }
+  if (state.type) {
+    params.type = state.type
+  }
+  if (state.sales === 0) {
+    params.sales = state.sales
+  }
+  if (state.is_new === 0) {
+    params.is_new = state.is_new
+  }
+  if (state.priceType) {
+    params.priceType = state.priceType
+  }
+  if (action === 'reload') {
+    params.pageNum = 1
+  }
+  searchProductList({
+    ...params
+  }).then(res => {
+    state.triggered = false
+    if (action === 'page') {
+      productList.value = productList.value.contact(res.pageInfo.list)
+    }
+    if (action === 'reload') {
+      productList.value = res.pageInfo.list
+    }
+    console.log(res.pageInfo)
+    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
+    state.status = 'more'
+
+
+    if (callback) {
+      callback(res.pageInfo.list)
+    }
+  })
+}
 const navList = [{
   id: 1,
   text: '首页',
@@ -54,41 +163,145 @@ function handleNavItemClick(navItemId: any) {
   }
 }
 
+function handleFavoriteChange() {
+  getMerchantDetail(id.value).then((res: any) => {
+    merchant.value = {...res}
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  console.log('到底了。。。')
+
+  handleScrollToLower()
+
+})
+
+function handleOpenSearchPage(category?: {}) {
+  let url = `/pages/store/home/search?id=${id.value}`
+  if (category) {
+    // url.concat(`$category_id=${category_id}`)
+    url = url + `&category=${JSON.stringify(category)}`
+  }
+  uni.navigateTo({
+    url
+  })
+}
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
 </script>
 <template>
-  <div class="px-3 pb-safe pb-10">
-    <MerchantHeader :model="merchant"/>
-    <MerchantProductList
-        :list="productList"
-        v-if="currentItemId === 1"
-    />
-    <div v-if="currentItemId === 2"
-         class="w-full gap-3"
-    >
-      <div v-for="(categoryItem, index) in categoryList" :key="index"
-           class="flex items-center gap-1 text-sm font-bold bg-white p-3 mb-3 rounded"
-      >
-        <div class=" bg-gradient-to-b from-[#fe7577] to-[#fe0032] w-1 h-4 rounded"></div>
-        {{ categoryItem.cate_name }}
+    <div class="fixed top-0 w-full bg-white z-1">
+      <div class="p-3">
+        <div
+            @click="handleOpenSearchPage"
+
+            class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-gray-200"
+
+        >
+
+          <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 w-100%">
+            <div class="flex-1"></div>
+          </div>
+
+
+        </div>
+
       </div>
+<!--      <nut-searchbar-->
+<!--          v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">-->
+<!--        <template v-slot:rightout>-->
+<!--          <div @tap="loadSelectMerchant('reload')">-->
+<!--            搜索-->
+<!--          </div>-->
+<!--        </template>-->
+<!--      </nut-searchbar>-->
     </div>
-  </div>
-  <div class="fixed bottom-0 bg-white w-full">
-    <div class="pb-safe pt-1 shadow flex justify-around text-gray">
+
+    <div class="px-3 pb-25 mt-15 flex flex-col gap-3">
+      <MerchantHeader
+          :model="merchant"
+          @change="handleFavoriteChange"
+          @product-type-change="handleProductTypeChange"
+          @order-change="handleOrderChange"
+          :is-category="  currentItemId === 1"
+      />
       <div
-          @tap="handleNavItemClick(item.id)"
-          v-for="(item, index) in navList"
-          :key="item.id"
-          class="flex flex-col justify-center items-center gap-1"
-          :class="item.id === currentItemId ? '!text-[#fe0032]' : ''"
+          v-if="currentItemId === 1"
+
+      >
+        <MerchantProductList
+            :list="productList"
+            v-if="productList.length > 0"
+        />
+        <CXBEmpty v-else/>
+
+        <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="productList && productList.length > 0">
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
+      </div>
+
+      <div v-if="currentItemId === 2"
+           class="w-full gap-3"
       >
-        <div :class="item.icon"></div>
-        <div class="text-xs">
-          {{ item.text }}
+        <div v-for="(categoryItem, index) in categoryList" :key="index"
+             @click="handleOpenSearchPage(categoryItem)"
+             class="flex items-center gap-1 text-sm font-bold bg-white p-3 mb-3 rounded"
+        >
+          <div class=" bg-gradient-to-b from-[#fe7577] to-[#fe0032] w-1 h-4 rounded"></div>
+          {{ categoryItem.cate_name }}
         </div>
       </div>
+
     </div>
-  </div>
+
+
+    <div class="fixed bottom-0 bg-white w-full">
+      <div class="pb-safe pt-1 shadow flex justify-around text-gray">
+        <div
+            @tap="handleNavItemClick(item.id)"
+            v-for="(item, index) in navList"
+            :key="item.id"
+            class="flex flex-col justify-center items-center gap-1"
+            :class="item.id === currentItemId ? '!text-[#fe0032]' : ''"
+        >
+          <div :class="item.icon"></div>
+          <div class="text-xs">
+            {{ item.text }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+
 </template>
 <route lang="yaml">
 style:
@@ -100,6 +313,8 @@ style:
 <style>
 page {
   background-color: #f8f8f8;
+  --nut-searchbar-background: #fff;
+  --nut-searchbar-input-box-shadow: none;
 }
 
 </style>

src/pages/store/home/search.vue

@@ -0,0 +1,214 @@
+<script setup lang="ts">
+// const props = defineProps({
+//   keyword: {
+//     type
+//   }
+// })
+import MerchantHeader from "~/pages/store/home/components/MerchantHeader.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import MerchantProductList from "~/pages/store/home/components/MerchantProductList.vue";
+import {getMerchantCategory, getMerchantDetail} from "~/apis/merchant";
+import {searchProductList} from "~/apis/product";
+
+const state = reactive({
+  category_id: '',
+  mer_keyword: '',
+  category: null,
+  status: 'noMore',
+  triggered: false,
+  priceType: NaN,
+  sales: NaN,
+  is_new: NaN,
+  type: 1,
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  searchValue: ''
+})
+
+let productList = ref<any>([])
+const id = ref('')
+
+onLoad((options) => {
+  console.log(options)
+  if (options && options.keyword) {
+    state.mer_keyword = options.mer_keyword
+  }
+  if (options && options.category) {
+    // state.category_id = options.category_id
+    state.category = JSON.parse(options.category)
+    console.log(state.category)
+    state.category_id = state.category.store_category_id
+    state.searchValue = state.category.cate_name
+  }
+
+  if (options.id) {
+    id.value = options.id
+    loadList('reload')
+  }
+
+})
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    mer_id: id.value,
+    // mer_keyword: '',
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+    // mer_id?: string
+    // mer_keyword?: string
+    // pageNum: number
+    // pageSize: number
+    // order: ORDER
+    //请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
+    // is_best?: number
+    // sales?: number
+    // is_new?: number
+    // priceType?: number
+    // type?: number
+    // category_id?: string
+  }
+  if (state.type) {
+    params.type = state.type
+  }
+  if (state.sales === 0) {
+    params.sales = state.sales
+  }
+  if (state.is_new === 0) {
+    params.is_new = state.is_new
+  }
+  if (state.priceType) {
+    params.priceType = state.priceType
+  }
+  if (state.category_id) {
+    params.category_id = state.category_id
+  }
+
+  if (state.searchValue) {
+    params.mer_keyword = state.searchValue
+  }
+  if (action === 'reload') {
+    params.pageNum = 1
+  }
+
+  searchProductList({
+    ...params
+  }).then(res => {
+    state.triggered = false
+    if (action === 'page') {
+      productList.value = productList.value.contact(res.pageInfo.list)
+    }
+    if (action === 'reload') {
+      productList.value = res.pageInfo.list
+    }
+    console.log(res.pageInfo)
+    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
+    state.status = 'more'
+
+
+    if (callback) {
+      callback(res.pageInfo.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+  // loadPost(state.data.id, 'reload', items => {
+  //   if (items) {
+  //     setTimeout(() => {
+  //       uni.stopPullDownRefresh()
+  //     }, 300)
+  //   } else {
+  //     uni.stopPullDownRefresh()
+  //   }
+  // })
+})
+
+function handleProductTypeChange(typeValue) {
+  if (typeValue === 3) {
+    state.sales = NaN
+    state.is_new = 0
+  }
+  else if (typeValue === 2) {
+    state.sales = 0
+  } else {
+    state.type = typeValue
+  }
+  loadList('reload')
+}
+function handleOrderChange(priceType) {
+  state.priceType = priceType
+
+  // reset
+  state.sales = NaN
+  state.is_new =NaN
+
+  loadList('reload')
+}
+</script>
+<template>
+  <div class="fixed top-0 w-full bg-white z-1">
+    <nut-searchbar
+        v-model="state.searchValue" @search="loadList('reload')" @clear="loadList( 'reload')">
+      <template v-slot:rightout>
+        <div @tap="loadList('reload')">
+          搜索
+        </div>
+      </template>
+    </nut-searchbar>
+  </div>
+
+  <div class="p-3 pb-25 mt-15 flex flex-col gap-3">
+<!--    <MerchantHeader -->
+    <MerchantHeader :is-search-home="true"
+                    @product-type-change="handleProductTypeChange"
+                    @order-change="handleOrderChange"
+    />
+    <MerchantProductList
+        :list="productList"
+        v-if="productList.length > 0"
+
+    />
+    <CXBEmpty v-else/>
+  </div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 搜索
+  enablePullDownRefresh: true
+</route>
+
+
+<style>
+page {
+  background-color: #f8f8f8;
+  --nut-searchbar-background: #fff;
+  --nut-searchbar-input-box-shadow: none;
+}
+
+</style>

src/pages/store/nearby/index.vue

@@ -2,6 +2,7 @@
 import {getMerchantCategory, getSelectMerchant, getSelectMerchantSort} from "~/apis/merchant";
 import type {StoreResult} from "~/apis/model/storeModel";
 import {StoreParams} from "~/apis/model/storeModel";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 const state = reactive<any>({
   // 列表高度
@@ -87,6 +88,8 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
     if (action === 'reload') {
       state.merchantList = res.list
     }
+    // state.totalPage = Math.ceil(totalItems / state.pageSize);
+
     state.status = 'more'
 
     if (callback) {
@@ -96,6 +99,7 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
 }
 
 function handleShowMerchant(merchant) {
+  console.log(merchant)
   uni.navigateTo({
     url: '/pages/store/home/index?id=' + merchant.mer_id
   })
@@ -130,6 +134,7 @@ function handleScrollToLower() {
     loadSelectMerchant('page')
   }
 }
+
 </script>
 <template>
 <!--  <nut-category :category="state.merchantCategory" @change="change">-->
@@ -138,9 +143,9 @@ function handleScrollToLower() {
 <!--  </nut-category>-->
     <nut-searchbar
         class="absolute top-0"
-        v-model="searchValue" @search="loadSelectMerchant(0, searchValue)" @clear="loadSelectMerchant(0, '')">
+        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
       <template v-slot:rightout>
-        <div @tap="loadSelectMerchant(0, searchValue)">
+        <div @tap="loadSelectMerchant('reload')">
           搜索
         </div>
       </template>
@@ -151,12 +156,12 @@ function handleScrollToLower() {
     <scroll-view
         :scroll-y="true"
         :style="{ height: `${state.scrollHeight}px` }"
-        class="flex w-40 h-full bg-[#f8f8f8]"
+        class="w-25 h-full bg-[#f8f8f8]"
     >
       <div
           @tap="loadAll()"
           :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
-          class="relative h-15 block text-sm flex justify-center items-center">
+          class="relative w-25 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" v-if="state.currentMerchantCategoryId == 0"></div>
           <div>全部</div>
@@ -166,7 +171,7 @@ function handleScrollToLower() {
       <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 gap-1"
+           class="relative h-15 block text-sm flex justify-center items-center gap-1 w-25"
       >
         <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
 
@@ -183,7 +188,7 @@ function handleScrollToLower() {
         :scroll-y="true"
         :style="{ height: `${state.scrollHeight}px` }"
         scroll-with-animation
-        class="flex flex-1  flex-col h-full  p-3 gap-3"
+        class="flex flex-1  flex-col h-full w-full  p-3 gap-3"
         :refresher-enabled="true"
         refresher-background="#f5f5f5"
         refresher-default-style="black"
@@ -193,6 +198,7 @@ function handleScrollToLower() {
         @refresherRestore="onRefresherRestore"
         @refresherAbort="onRefresherAbort"
         @refresherrefresh="onRefresherRefresh"
+        v-if="state.merchantList && state.merchantList.length > 0"
 
     >
       <div
@@ -223,6 +229,10 @@ function handleScrollToLower() {
         </div>
       </div>
     </scroll-view>
+    <div class="flex-1 justify-center items-center" v-else>
+      <CXBEmpty />
+
+    </div>
   </div>
 </template>
 <route lang="yaml">

src/pages/store/product/detail.vue

@@ -6,9 +6,27 @@ import FCell from "~/components/FCell/FCell.vue";
 import type {SkuModel} from "~/apis/model/product.model";
 import CXBSkuPopup from "~/components/CXBSkuPopup/CXBSkuPopup.vue";
 import {createShopping} from "~/apis/order.api";
-import {getCartCount} from "~/apis/user";
-
+import {getAgentInfo, getCartCount, relation, removeMyRelation} from "~/apis/user";
+import {
+  DyProductModel,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import {DcProductModel} from "~/apis/model/dacang.model";
+import {CDN_URL} from "~/config/app";
+
+const shangpinxiangqing_dianpu = CDN_URL + '/static/assets/shangpinxiangqing_dianpu.png'
+const shangpinxiangqing_kefu = CDN_URL + '/static/assets/shangpinxiangqing_kefu.png'
+const shangpinxiangqing_gouwuche = CDN_URL + '/static/assets/shangpinxiangqing_gouwuche.png'
+const wx_shareImg = CDN_URL + '/static/assets/wx_share_221121.png'
+const pyqImg = CDN_URL + '/static/assets/pyq_221121.png'
+
+const shareShowTips = ref(false)
 const state = reactive({
+  id: '',
+  // 是否收藏
+  isRelation: false,
   indicatorDots: true,
   circular: true,
   autoplay: true,
@@ -27,7 +45,8 @@ const state = reactive({
     imagePath:
         '//img14.360buyimg.com/n4/jfs/t1/215845/12/3788/221990/618a5c4dEc71cb4c7/7bd6eb8d17830991.jpg'
   },
-
+//1表示立即购买;2表示加入购物车,3表示立即兑换
+  flag: '1',
   isNew: '0',
   cartNum: 1,
 
@@ -40,17 +59,35 @@ onShow(() => {
 
 })
 
+uni.showShareMenu({
+  withShareTicket: true,
+  menus: ['shareAppMessage', 'shareTimeline']
+})
 onLoad((option: any) => {
   // const id = '5491'
-  const id = option.id
-  getProductDetail(id).then(res => {
-    console.log(res)
+  state.id = option.id
+
+
+  getRecommendList({
+    page: 1,
+    limit: 10
+  }).then(res => {
+    state.recommendList = res.list
+  })
+
+  loadProductDetail()
+})
+
+function loadProductDetail() {
+  getProductDetail(state.id).then(res => {
+    // console.log(res)
     detail.value = res
     if (res && res.mer_id && res.mer_id === '148') {
       if (detail.value && detail.value.price ) {
         detail.value.price = detail.value.price * 30
       }
     }
+    state.isRelation = res.isRelation
     // if (detail.value.mer_id === '148') {
     // }
   }).catch(error => {
@@ -64,17 +101,23 @@ onLoad((option: any) => {
       }, 500)
     })
   })
+}
 
-  getRecommendList({
-    page: 1,
-    limit: 10
-  }).then(res => {
-    state.recommendList = res.list
-  })
-
+onShareAppMessage(() => {
+  return {
+    title: `${detail.value.store_name}`,
+    path: `pages/store/product/detail?id=${state.id}&from=share`
+  }
+})
 
+onShareTimeline(() => {
+  return {
+    title: `${detail.value.store_name}`,
+    query: `id=${state.id}&from=share`
+  }
 })
 
+
 function loadCartCount() {
   getCartCount().then(res => {
     console.log(res)
@@ -103,7 +146,7 @@ function loadCartCount() {
 //   }
 // })
 const is148Merchant = computed(() => {
-  return detail.value && detail.value.mer_id && detail.value.mer_id === '148'
+  return detail.value && detail.value.mer_id && detail.value.mer_id == '148'
 })
 //预览轮播图
 function previewImage(index: number) {
@@ -136,21 +179,25 @@ function onSelectedSku(item) {
 
 function handleAddCart() {
   state.isShowSku = true
+  state.flag = 2
+
 
 }
 
 function handleCreateShopping() {
+  console.log(state.flag)
   createShopping({
     product_id: detail.value.product_id,
     // product_attr_unique: JSON.stringify(state.currentSku),
     product_attr_unique: state.currentSku.unique,
     cart_num: state.cartNum,
-    is_new: state.isNew
+    is_new: (state.flag === '1' || state.flag === '3') ? '1': '0'
   }).then(res => {
     if (res.cart_id) {
-      if (state.isNew === '1') {
+      console.log(state.flag)
+      if (state.flag == '1' || state.flag == '3') {
         uni.navigateTo({
-          url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=1&product_id=${detail.value.product_id}`
+          url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
         })
       } else {
         uni.showToast({
@@ -162,19 +209,39 @@ function handleCreateShopping() {
       }
     }
   }).catch(error => {
-    uni.navigateTo({
-      url: '/pages/user/login/index'
-    })
-    // uni.showToast({
-    //   title: error,
-    //   icon: 'none'
-    // })
+    if (error === '会员礼包不能加入购物车') {
+      return uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    } else if (error === '库存不足')  {
+      return uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    }
+    else {
+      return uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
+
   })
 }
 
-function handleOrderConfirm() {
+/**
+ *
+ * @param flag //1表示立即购买;2表示加入购物车,3表示立即兑换
+ */
+function handleOrderConfirm(flag: '1' | '2'| '3') {
+  state.flag = flag
   state.isShowSku = true
-  state.isNew = '1'
+  // if (is148Merchant.value) {
+  //   state.isNew = '1'
+  // } else {
+  //   state.isNew = '3'
+  // }
+  // console.log(state.isNew)
 }
 function handleCountChange(val) {
   // console.log(val)
@@ -183,6 +250,93 @@ function handleCountChange(val) {
     state.cartNum = val
   // }
 }
+function handleProductItemClick(
+    item:
+        JdProductModel
+        & DcProductModel
+        & DyProductModel
+        & SuNingProductModel
+        & TaobaoProductThirdPartyWaresModel
+        & VipProductModel
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
+
+function handleRelation() {
+  relation({
+    type: '1',
+    type_id: state.id
+  }).then(res => {
+    // isCare.value = true
+    uni.showToast({
+      title: '已收藏'
+    })
+    state.isRelation = true
+
+    // getMerchantDetail(props.model.mer_id).then((res: any) => {
+    //   // merchant.value = {...res}
+    //   console.log(res)
+    // })
+    // emit('change', true)
+    // loadProductDetail()
+
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
+  })
+}
+
+function handleRemoveRelation() {
+  console.log('on....')
+  removeMyRelation({type: 1, type_id: state.id}).then(res => {
+    // isCare.value = false
+    state.isRelation = false
+
+    uni.showToast({
+      title: '取消关注'
+    })
+    // emit('change', true)
+
+  })
+}
+
+function toggleRelation() {
+  if (state.isRelation) {
+    handleRemoveRelation()
+
+  } else {
+    handleRelation()
+
+  }
+}
+
+function handleShowCustomer() {
+  return uni.openCustomerServiceChat({
+    extInfo: {
+      url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
+    },
+    corpId: 'wwaeb55681929a37ae',
+    success: (res => {
+      console.log(res)
+    }),
+    fail: (res => {
+      console.log(res)
+    })
+  })
+}
+
 </script>
 
 <template>
@@ -204,6 +358,14 @@ function handleCountChange(val) {
           </swiper-item>
         </swiper>
       </div>
+      <div class="bg-black bg-op-30 fixed top-3  rounded-full right-3 h-6 w-6 flex flex-col justify-center items-center"
+           @click="toggleRelation"
+      >
+        <div class="h4 w-4"
+             :class="state.isRelation ? 'bg-primary i-tabler-star-filled' : 'i-tabler-star text-white'"
+
+        ></div>
+      </div>
 
       <div
           class="flex flex-col p-3 gap-3">
@@ -227,8 +389,8 @@ function handleCountChange(val) {
         <div
             v-if="!is148Merchant"
             class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
-          <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
-                 mode="widthFix" class="!w-8 "></image>
+          <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
+                 mode="widthFix" class="!w-8 h-4"></image>
           <div class="px-2 flex items-center jusitify-center" v-if="detail.yanglao">
             <div>
               养老金 ¥{{ detail.yanglao }}
@@ -249,6 +411,20 @@ function handleCountChange(val) {
           </div>
         </div>
 
+        <div class="flex gap-3 text-[12px]">
+          <div>分享：</div>
+          <div class="flex-1  items-center flex  " @click="shareShowTips = true">
+            <div class="flex gap-2 w-1/2">
+              <image :src="wx_shareImg" mode="widthFix" class="w-5 h-5"></image>
+              <div>微信</div>
+            </div>
+            <div class="flex gap-2 w-1/2">
+              <image :src="pyqImg" mode="widthFix" class="w-5 h-5"></image>
+              <div>朋友圈</div>
+            </div>
+          </div>
+
+        </div>
       </div>
     </div>
 
@@ -258,7 +434,7 @@ function handleCountChange(val) {
     >
       <template #title>
         <div class="flex items-center" v-if="state.currentSku">
-          <div>规格：</div>
+          <div class="font-bold">规格：</div>
 <!--          <div v-for="(key, index) in Object.keys(detail.sku)"-->
 <!--               :key="index"-->
 <!--               class="pl-2 text-sm"-->
@@ -352,6 +528,7 @@ function handleCountChange(val) {
         <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
           <div v-for="(item, index) in state.recommendList"
                :key="index"
+               @click="handleProductItemClick(item)"
           >
             <MerchantProductCard :item="item"/>
 
@@ -367,26 +544,33 @@ function handleCountChange(val) {
       <div class=" flex justify-around">
         <div
             @tap="handleShowMerchant(detail.mer_id)"
-            class="flex flex-col justify-center items-center pl-3"
+            class="flex flex-col justify-center items-center pl-4"
         >
-          <div class="i-tabler-building-store"></div>
-          <div class="text-xs">店铺</div>
+<!--          <div class="i-tabler-building-store"></div>-->
+          <image :src="shangpinxiangqing_dianpu" mode="widthFix" class="w-6 h-6"></image>
+          <div class="text-[11px]">店铺</div>
         </div>
 
-        <div class="flex flex-col justify-center items-center pl-3">
-          <div class="i-tabler-headset"></div>
-          <div class="text-xs">客服</div>
+        <div
+            @tap="handleShowCustomer"
+            class="flex flex-col justify-center items-center pl-4">
+<!--          <div class="i-tabler-headset"></div>-->
+          <image :src="shangpinxiangqing_kefu" mode="widthFix" class="w-6 h-6"></image>
+
+          <div class="text-[11px]">客服</div>
         </div>
         <div
             @tap="handleShowShopCart"
-            class="flex flex-col justify-center items-center pl-3 relative">
+            class="flex flex-col justify-center items-center pl-4 relative">
           <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white justify-center items-center absolute top--1 right--1 text-center"
                v-if="state.cartCount"
           >
             {{state.cartCount}}
           </div>
-          <div class="i-tabler-shopping-cart"></div>
-          <div class="text-xs">购物车</div>
+          <image :src="shangpinxiangqing_gouwuche" mode="widthFix" class="w-6 h-6"></image>
+
+<!--          <div class="i-tabler-shopping-cart"></div>-->
+          <div class="text-[11px]">购物车</div>
         </div>
       </div>
       <div class="flex flex-row text-sm text-white gap-2 pr-3">
@@ -400,11 +584,11 @@ function handleCountChange(val) {
             class="bg-[#F94032] rounded-full w-25 flex justify-center items-center h-9"
         >
           <div v-if="is148Merchant"
-               @click="handleOrderConfirm"
+               @click="handleOrderConfirm('3')"
           >立即兑换</div>
           <div
               v-else
-              @click="handleOrderConfirm"
+              @click="handleOrderConfirm('1')"
           >立即购买</div>
         </div>
       </div>
@@ -433,6 +617,35 @@ function handleCountChange(val) {
 <!--      </div>-->
 <!--    </template>-->
 <!--  </nut-sku>-->
+
+
+  <nut-overlay v-model:visible="shareShowTips" :lock-scroll="true">
+        <image src="https://cdn.bjtdba.com/vod/image/2023-09-16/20230916194347287.png"
+               mode="widthFix" class="absolute top-0 right-0"
+        ></image>
+
+<!--    <div class="flex flex-col justify-center items-center w-full h-full"-->
+<!--    >-->
+<!--      <div class="bg-white">-->
+<!--        <image :src="currentItem.image_fake" mode="widthFix" class="w-60"></image>-->
+<!--        <div class="bg-white p-3 flex justify-around gap-3">-->
+<!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
+<!--            <image :src="wechatImg" mode="widthFix" class="w-8 h-8"></image>-->
+<!--            <div>微信</div>-->
+<!--          </div>-->
+<!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
+<!--            <image :src="pyqImg" mode="widthFix" class="w-8 h-8"></image>-->
+<!--            <div>朋友圈</div>-->
+<!--          </div>-->
+<!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">-->
+<!--            <image :src="bctpImg" mode="widthFix" class="w-8 h-8"></image>-->
+<!--            <div>保存图片</div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+
+<!--    </div>-->
+  </nut-overlay>
 </template>
 <style>
 page {

src/pages/store/product/other.vue

@@ -62,11 +62,13 @@ function loadProductDetail(product: Partial<IProductDetail>) {
   if (product.platform == 6) {
     getJdProductDetail(product.id).then(res => {
       const jdProduct = res[0]
+      console.log(jdProduct)
       mergeProductDetail({
         images: jdProduct.detail,
         coupon: {
           amount: jdProduct.couMoney
         },
+        ...jdProduct
       })
     })
   }
@@ -79,7 +81,8 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         coupon: {
           startTime: product.couponStartTime,
           endTime: product.couponEndTime
-        }
+        },
+        ...product
       })
     })
   }
@@ -87,13 +90,13 @@ function loadProductDetail(product: Partial<IProductDetail>) {
   // 拼多多
   if (product.platform == 1) {
     getPddProductDetail(product.id).then(res => {
-      console.log('拼多多')
-      console.log(res)
+      // detail.value = res
       mergeProductDetail({
         spreadUrl: res.pddlink.url,
         images: res.goods_gallery_urls,
         featured: res.goods_gallery_urls,
-        mallName: res.mall_name
+        mallName: res.mall_name,
+        ...res
         // allowance:
       })
       if (res.coupon_start_time > 0) {
@@ -117,10 +120,12 @@ function loadProductDetail(product: Partial<IProductDetail>) {
     getVipProductDetail(product.id).then(res => {
       // console.log(res.result[0])
       const product = res.result[0]
+      // detail.value = product
       mergeProductDetail({
         featured: product.goodsCarouselPictures,
         images: product.goodsDetailPictures,
-        mallName: '唯品自营'
+        mallName: '唯品自营',
+        ...product
       })
       if (product.couponInfo) {
         mergeProductDetail({
@@ -138,23 +143,27 @@ function loadProductDetail(product: Partial<IProductDetail>) {
     getSuProductDetail(product.id).then(res => {
       // const product = res
       mergeProductDetail({
-        images: res.detail
+        images: res.detail,
+        ...res
       })
     })
   }
   // 抖音
   if (product.platform == 9) {
     getDyProductDetail(product.id).then(res => {
+      console.log(res)
       mergeProductDetail({
         mallName: res.shopName,
         images: res.imgs,
+        ...res
       })
     })
   }
 }
 
 function handleBuyNow() {
-  if (detail.value?.platform == 6 || detail.value?.spreadUrl) {
+  console.log(detail.value)
+  if (detail.value?.platform == 6 && detail.value?.spreadUrl) {
     uni.navigateToMiniProgram({
       appId: 'wx91d27dbf599dff74',
       path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
@@ -171,6 +180,37 @@ function handleBuyNow() {
       }
     })
   }
+  if (detail.value?.platform == 1) {
+    // console.log(detail.value)
+    const pddWx = detail.value.pddlink.wx
+    // console.log(pddWx)
+    uni.navigateToMiniProgram({
+      appId: pddWx.app_id,
+      path: pddWx.page_path,
+      // extraData: {
+      //  foo: 'bar'
+      // },
+      envVersion: 'release',
+      success(res) {
+        // 打开成功
+        console.log(res);
+      },
+      fail: (error) => {
+        console.log(error);
+      }
+    })
+  }
+  if (detail.value?.platform == 3) {
+    // console.log('sunig')
+    // console.log(detail.value)
+  }
+
+  if (detail.value?.platform == 9) {
+    // console.log(detail.value)
+  }
+  if (detail.value?.platform == 2) {
+    console.log(detail.value)
+  }
 }
 
 /**
@@ -253,13 +293,13 @@ const hasCoupon = computed(() => {
         <div class="w-full bg-white pb-safe">
           <div class="flex justify-between items-center p-3">
             <div class="inline-flex items-center">
-              <div class="text-sm">补贴养老金</div>
-              <FPrice :price="detail.allowance" need-symbol/>
+              <div class="text-sm">预估养老金</div>
+              <FPrice :price="detail.allowance" need-symbol ex-class="text-[20px] font-bold"/>
             </div>
             <div>
-              <CXBButton @tap="handleBuyNow">
+              <nut-button type="primary" @tap="handleBuyNow">
                 立即购买
-              </CXBButton>
+              </nut-button>
             </div>
           </div>
         </div>

src/pages/third_party_binding/index.vue

@@ -1,33 +1,71 @@
 <script lang="ts" setup>
 import {CDN_URL} from "~/config/app";
+import {getBindingState} from "~/apis/user";
+import {findLast} from "lodash-es";
 
 const zfbImage = CDN_URL + '/static/assets/zfb_sf_220908.png'
 const wxImage = CDN_URL + '/static/assets/wx_sf_220908.png'
+
+const bindState = ref([])
+
+onLoad(() => {
+  getBindingState().then(res => {
+    console.log(res)
+    if (res) {
+      bindState.value = res
+    }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+})
+
+function getBindState(type) {
+  if (bindState.value) {
+    return findLast(bindState.value, (value) => {
+      return value.type === type
+    })
+    // return bindState.value.map(value => {
+    //   if (value.type === type){
+    //     console.log(value)
+    //     return value[0]
+    //   }
+    // })
+  }
+}
 </script>
 <template>
   <div class="flex flex-col">
-    <div class="flex flex-row  justify-between bg-white my-3 p-4">
+    <div class="flex flex-row  justify-between bg-white p-4">
+
       <div class="flex-1 flex text-sm items-center gap-2">
         <image :src="wxImage" mode="widthFix" class="w-4 h-4"></image>
         <div>
           微信授权
         </div>
       </div>
-      <div class="border border-solid rounded-full text-red text-xs px-2 h-4">
-        已授权
+      <div class="border border-solid rounded-full  text-xs px-2 h-4"
+           :class="getBindState('1') ? 'text-red' : 'text-gray border-gray'"
+      >
+        {{ getBindState('1') ? '已授权' : '未授权' }}
       </div>
     </div>
-    <div class="flex flex-row  justify-between bg-white p-4">
-      <div class="flex-1 flex text-sm items-center gap-2">
-        <image :src="zfbImage" mode="widthFix" class="w-4 h-4"></image>
-        <div>
-          支付宝授权
-        </div>
-      </div>
-      <div class="border border-solid rounded-full text-red text-xs px-2 h-4">
-        已授权
+  </div>
+  <div class="flex flex-row  justify-between bg-white p-4">
+    <div class="flex-1 flex text-sm items-center gap-2">
+      <image :src="zfbImage" mode="widthFix" class="w-4 h-4"></image>
+      <div>
+        支付宝授权
       </div>
     </div>
+    <div class="border border-solid rounded-full  text-xs px-2 h-4"
+         :class="getBindState('2') ? 'text-red' : 'text-gray border-gray'"
+    >
+      {{ getBindState('2') ? '已授权' : '未授权' }}
+
+    </div>
   </div>
 </template>
 

src/pages/user/address/edit.vue

@@ -222,15 +222,16 @@ const submit = () => {
         village: formData.village,
         address_id: formData.address_id
       }).then(res => {
-        console.log(res)
+        // console.log(res)
         if (res) {
           uni.showToast({
             title: '保存成功'
           })
           setTimeout(() => {
-            uni.redirectTo({
-              url: '/pages/user/address/index'
-            })
+          //   uni.redirectTo({
+          //     url: '/pages/user/address/index'
+          //   })
+            uni.navigateBack()
           }, 500)
         }
       }).catch(message => {

src/pages/user/address/index.vue

@@ -79,7 +79,7 @@ export default {
       // from.value =
       getUserAddressList().then(res => {
         if (res) {
-          console.log(res)
+          // console.log(res)
           data.value = res.list
         }
       })
@@ -102,7 +102,7 @@ export default {
     const handleClickItem = (item: AddressModel) => {
       // uni.navigateTo()
       addressStore.getCurrentAddress(item.address_id)
-      console.log(from.value)
+      // console.log(from.value)
       if (from.value && from.value === 'order') {
         setTimeout(() => {
           uni.navigateBack()

src/pages/user/index.vue

@@ -1,24 +1,34 @@
 <script lang="ts" setup>
 import {useUserStore} from "~/stores/userStore";
 import CXBAuthorize from "~/components/CXBAuthorize/CXBAuthorize.vue";
-import {getUserInfo} from "~/apis/user";
+import {getAgentInfo, getUserInfo} from "~/apis/user";
 import {CDN_URL} from "~/config/app";
 import Routine from "~/libs/routine";
+import {totalOrderNumber} from "~/apis/order.api";
+import type {OrderQuantityModel} from "~/apis/model/order.model";
+import type {Ref} from "vue";
 
 const myOrderList = [{
+  id: 'noPay',
   icon: CDN_URL + '/static/assets/obligation_220620.png',
   text: '待付款',
+  count: '',
   url: ''
 }, {
   icon: CDN_URL + '/static/assets/daifahuo_220620.png',
+  id: 'noPostage',
   text: '待发货',
+  count: '',
   url: ''
 }, {
   icon: CDN_URL + '/static/assets/daishouhuo_220620.png',
+  id: 'noDeliver',
   text: '待收货',
+  count: '',
   url: ''
 }, {
   icon: CDN_URL + '/static/assets/daipingjia_220620.png',
+  id: 'noComment',
   text: '待评价',
   url: ''
 }, {
@@ -83,7 +93,24 @@ const state = reactive({
   isLogin: false
 })
 const userStore = useUserStore();
+const orderQuantity: Ref<OrderQuantityModel> = ref()
+// const orderQuantity =reactive({
+//   noComment: '',
+//   done: '',
+//   // 退款售后
+//   refund: '',
+//   // 待收货
+//   noDeliver: '',
+//   // 待付款
+//   noPay: '',
+//   // 待发货
+//   noPostage: '',
+//   orderPrice: '',
+//   orderCount: ''
+// })
 
+const agentInfo = ref({})
+// onLoad(() => {})
 onShow(async () => {
   uni.showLoading({
     title: '登录中',
@@ -97,6 +124,13 @@ onShow(async () => {
     uni.hideLoading()
     await userStore.getUserInfo()
     await userStore.getUserYanglaoJin()
+    agentInfo.value = await getAgentInfo()
+    // console.log(agentInfo)
+    // await   loadProductDetail()
+    //
+    // getAgentInfo().then(res => {
+    //   console.log(res)
+    // })
 
   } else {
     uni.navigateTo({
@@ -104,6 +138,12 @@ onShow(async () => {
     })
     userStore.setUserInfo(null)
   }
+
+  totalOrderNumber().then(res => {
+    console.log(res)
+    orderQuantity.value = res
+    // orderQuantity
+  })
 })
 
 function checkAuth() {
@@ -183,6 +223,7 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+
   // 创始人
   if (userRichType == 3) {
     return '创始人'
@@ -195,9 +236,22 @@ const userType = computed(() => {
   if (userRichType == 1) {
     return '会员'
   }
+  if (userRichType == 3) {
+    return '创始人'
+  }
   // 合伙人
-  if (userRichType == 2) {
-    return '合伙人'
+  if (userRichType == 4) {
+    // return '高级会员'
+    return 'VIP'
+  }
+  if (userRichType == 5) {
+    return '初始级合伙人'
+  }
+  if (userRichType == 6) {
+    return '中级合伙人'
+  }
+  if (userRichType == 7) {
+    return '高级合伙人'
   }
   if (!userRichType) {
     return '用户'
@@ -219,9 +273,15 @@ function handleToContact(item) {
   if (item.type === 'customer') {
     return uni.openCustomerServiceChat({
       extInfo: {
-        url: item.url
+        url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
       },
-      corpId: ''
+      corpId: 'wwaeb55681929a37ae',
+      success: (res => {
+        console.log(res)
+      }),
+      fail: (res => {
+        console.log(res)
+      })
     })
   }
 }
@@ -269,8 +329,8 @@ function handleShowMyRulePage() {
             </div>
             <div
                 @click="handleShowMyRulePage"
-                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center">
-              {{ userType || '用户' }}
+                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
+              {{ userType }}
             </div>
           </div>
 
@@ -290,7 +350,7 @@ function handleShowMyRulePage() {
             <div
                 @tap="handleShowMyInvitation"
                 class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ userStore.userInfo.member_brokerage_price }}</div>
+              <div>{{ agentInfo.brokerage_price }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
             <div
@@ -322,10 +382,15 @@ function handleShowMyRulePage() {
       <div class="bg-white rounded px-3 text-sm">
         <div class="flex justify-between pt-4 mb-4">
           <div>我的订单</div>
-          <div
-              @click="handleShowMyAllOrder"
-              class="text-sm text-gray">查看全部
+          <div class="flex items-center">
+            <div
+                @click="handleShowMyAllOrder(0)"
+                class="text-sm text-gray">查看全部
+            </div>
+            <div class="f-text-color-2 i-tabler-chevron-right"></div>
           </div>
+
+
         </div>
         <div class="flex pb-4">
           <div
@@ -333,10 +398,41 @@ function handleShowMyRulePage() {
               v-for="(item, index) in myOrderList" :key="index"
               class="flex flex-col justify-center items-center w-1/5 gap-3"
           >
-            <image :src="item.icon"
-                   mode="widthFix"
-                   class="w-8 h-8 "
-            />
+            <div class="relative">
+              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                   v-if="
+                   item.id == 'noPay' && orderQuantity &&  orderQuantity.noPay != '0'"
+
+              >
+                {{ orderQuantity.noPay}}
+              </div>
+              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                   v-if="
+                   item.id == 'refund' && orderQuantity && orderQuantity.refund != '0'"
+
+              >
+                {{ orderQuantity.refund}}
+              </div>
+              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                   v-if="
+                   item.id == 'noDeliver' && orderQuantity && orderQuantity.noDeliver != '0'"
+
+              >
+                {{ orderQuantity.noDeliver}}
+              </div>
+              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                   v-if="
+                   item.id == 'noPostage' && orderQuantity && orderQuantity.noPostage != '0'"
+
+              >
+                {{ orderQuantity.noPostage}}
+              </div>
+              <image :src="item.icon"
+                     mode="widthFix"
+                     class="w-7 h-7 "
+              />
+            </div>
+
             <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>

src/pages/version-update/index.vue

@@ -14,6 +14,13 @@ onLoad(() => {
     console.log(res)
   })
 })
+
+function handelUpdate() {
+  uni.showToast({
+    title: '已是最新版本',
+    icon: 'none'
+  })
+}
 </script>
 <template>
   <CXBBasePage>
@@ -27,10 +34,11 @@ onLoad(() => {
       </div>
     </div>
     <div class="fixed bottom-0 pb-safe w-full">
-      <div class="px-10 ">
-        <div class="text-center text-white bg-red rounded-full text-sm p-2">
-          检查更新
-        </div>
+      <div class="px-10 pb-10">
+<!--        <div class="text-center text-white bg-red rounded-full text-sm p-2">-->
+<!--          检查更新-->
+<!--        </div>-->
+        <nut-button type="primary" block @click="handelUpdate">检查更新</nut-button>
       </div>
     </div>
   </CXBBasePage>

src/pages/vip/index.vue

@@ -35,11 +35,11 @@
               <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square"></image>
 
               <div class="text-sm p-2 flex flex-col gap-1">
-                <div class="line-clamp-2">
+                <div class="line-clamp-1">
                   {{item.store_name}}
                 </div>
                 <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
-                  <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
+                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                          mode="widthFix" class="!w-8 "></image>
                   <div class="px-2 flex items-center jusitify-center">
                     <div>

src/pages/webview/agreement.vue

@@ -8,7 +8,7 @@
 //     required: true
 //   }
 // })
-const url = ref('http://vod.bjtdba.com/agreement/')
+const url = ref('https://vod.bjtdba.com/agreement/')
 const PRIVACY_AGREEMENT = '1' // 隐私政策
 const SERVICE_AGREEMENT = '2' // 服务协议
 // 协议链接

src/pages/withdrawal-record/index.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import {getWithdrawal} from "~/apis/user";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import dayjs from "dayjs";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 const list = ref([])
 onLoad((option) => {
   getWithdrawal({
@@ -13,12 +15,29 @@ onLoad((option) => {
 })
 </script>
 <template>
-  <div>
-    <div v-if="list.length > 0"></div>
+  <CXBBasePage>
+    <div v-if="list.length > 0" class="flex flex-col gap-3  p-3">
+      <div v-for="(item, index) in list" :key="index" class="flex-1 text-xs f-hairline-bottom bg-white p-3">
+        <div class="flex justify-between">
+          <div>
+            <div>提现至{{ item.widthdrawal_type === '1' ? '微信' : '支付宝' }}</div>
+            <div class="text-gray text-[11px]">{{ dayjs(item.create_time).format('YYYY-MM-DD') }}</div>
+          </div>
+          <div>
+            <div>-{{ item.extract_price }}</div>
+            <div class="text-[11px]"
+                 :class="item.status === '0' ? 'text-primary' : 'text-gray'"
+            >{{ item.status === '-1' ? '已失败' : item.status === '0' ? '提现中' : item.status === '1'? '已到账' : ''}}</div>
+          </div>
+        </div>
+
+
+      </div>
+    </div>
     <div v-else>
       <CXBEmpty />
     </div>
-  </div>
+  </CXBBasePage>
 </template>
 
 <style>