Merge branch 'li-yi'

.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

components.d.ts

@@ -10,6 +10,7 @@ export {}
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     CXBAuthorize: typeof import('./src/components/CXBAuthorize/CXBAuthorize.vue')['default']
+    CXBBackTop: typeof import('./src/components/CXBBackTop/CXBBackTop.vue')['default']
     CXBBanner: typeof import('./src/components/CXBBanner/CXBBanner.vue')['default']
     CXBBasePage: typeof import('./src/components/CXBBasePage/CXBBasePage.vue')['default']
     CXBButton: typeof import('./src/components/CXBButton/CXBButton.vue')['default']

src/apis/auth.api.ts

@@ -1,5 +1,5 @@
 import {defHttp} from "~/utils/http";
-import type {LoginModel} from "~/apis/model/login.model";
+import type {AccountModel, LoginModel} from "~/apis/model/login.model";
 
 enum API {
     // 短信验证码
@@ -61,4 +61,21 @@ export function authSmsLogin(params: {
             ...params
         }
     })
+}
+
+/**
+ * 绑定提现账户
+ * 
+ */
+
+export function Accountbind(params: {
+    openid: string,
+    wx_type: string,
+}): Promise<AccountModel> {
+    return defHttp.post({
+        url: API.USER_EXTRACT_BAND_OPENID,
+        data: {
+            ...params
+        }
+    })
 }

src/apis/merchant.ts

@@ -1,9 +1,12 @@
-import { defHttp } from '~/utils/http'
+import { defHttp} from '~/utils/http'
 import type {MerchantCategoryModel, MerchantDetailModel, StoreParams, StoreResult} from "~/apis/model/storeModel";
 import type {PageModel} from "~/apis/model/pageModel";
 import type {ZibubaojianResult} from "~/apis/model/zibubaojian.model";
 import type {VipAreaResult} from "~/apis/model/vip-area.model";
 
+import {detailHttp} from '~/utils/http'
+
+
 enum API {
     GET_SELECT_MERCHANT = '/gateway/wares_service/waresServiceMerchant/selectMerchant',
     GET_SELECT_MERCHANT_SORT = '/gateway/wares_service/waresServiceMerchant/selectMerchantSort',
@@ -79,7 +82,7 @@ export function getProductList(id: string,page=1,limit=10): Promise<ZibubaojianR
  * @param id
  */
 export function getProductDetail(id: string) {
-    return defHttp.get({
+    return detailHttp.get({
         url: API.GET_PRODUCT_DETAIL + `/${id}`,
     })
 }

src/apis/model/dacang.model.ts

@@ -17,6 +17,7 @@ export interface QueryDcHomeParams {
 }
 // 大仓商品
 export type DcProductModel = {
+     banner:string
      product_id: string
      mer_id: string
      image: string//图片

src/apis/model/login.model.ts

@@ -6,6 +6,11 @@ export interface LoginModel {
     // 用户信息
     user: LoginUserModel
 }
+export interface AccountModel {
+    
+    openid: string
+    wx_type: string
+}
 
 export interface LoginUserModel {
     uid: string//用户id

src/apis/model/order.model.ts

@@ -275,6 +275,16 @@ export interface OrderCreateShoppingModel {
     cart_id: string
 }
 
+//
+export interface ProductSkustatusModel {
+   status:number
+   message:string
+}
+export interface ProductSkuModel {
+    cart_id: string,
+    unique : string
+}
+
 export interface OrderCheckModel {
     order_price: string
     total_price: string

src/apis/model/product.model.ts

@@ -54,7 +54,7 @@ export interface IProductDetail {
     // 现价销售价格
     salePrice: number
     // 原价
-    price: number
+    price: string
     // 分销URL
     spreadUrl: string
     // 商品图
@@ -100,6 +100,12 @@ export interface HomeProduct {
         getEndTime: string
     }[]
 }
+//抖音商品状态+商品详情
+export interface DyProductDetailsModel{
+    status:number
+    message:string
+    data:DyProductDetailModel
+}
 
 /**
  * 抖音商品详情
@@ -268,7 +274,12 @@ export type PDDProductDetailModel = {
     yanglao: string//养老金
     pddlink: PddLink//链接
 }
-
+//附加状态
+export type  PDDProductDetailModels= {
+    message:string
+    status:number
+    data:PDDProductDetailModel
+}
 export type PddLink = {
     mobile_url: string
     url: string
@@ -319,6 +330,13 @@ export type VipProductModel = {
     price: string
 }
 
+//唯品会商品状态+商品详情
+export interface VipProductResults{
+    status:number
+    message:string
+    data:VipProductResult
+} 
+
 export interface VipProductResult {
     returnCode: string
     result: Array<VipProductDetailModel>
@@ -327,13 +345,16 @@ export interface VipProductResult {
     wphlink: WphlinkModel
 }
 
+
 export interface WphlinkModel {
     url: string
     longUrl: string
     ulUrl: string
     vipQuickAppUrl: string
 }
-
+/**
+ * 唯品会商品详情
+ */
 export interface VipProductDetailModel {
     // 商品原价
     marketPrice: string
@@ -414,6 +435,13 @@ export interface PrepayInfoModel {
     isPrepay: string
 }
 
+//苏宁商品状态+商品详情
+export interface SuNingProductDetailsModel {
+    status:number
+    data:SuNingProductDetailModel
+    message:string
+} 
+
 /**
  * 苏宁商品详情
  */
@@ -470,7 +498,11 @@ export type SuNingProductModel = {
  * 淘宝商品详情
  */
 export interface TaobaoProductDetailModel {
-    waresDetail: TaobaoWaresDetail
+    status:number
+    message:string
+    data: {
+        waresDetail:TaobaoWaresDetail
+    }
 }
 
 export interface TaobaoWaresDetail {
@@ -519,6 +551,11 @@ export type TaobaoProductThirdPartyWaresModel = {
     coupon_share_url: string
 }
 
+export interface JdgProductDetailModel{
+    status:number
+    message:string
+    data:JdProductDetailModel[]
+}
 export interface JdProductDetailModel {
     // 京东商品原标题
     goodsName: string

src/apis/model/shopping.model.ts

@@ -1,5 +1,5 @@
 export interface ShoppingResult {
-    list: Array<ShopModel>
+    list?: Array<ShopModel>
 }
 
 export interface ShopModel {

src/apis/model/userInfoModel.ts

@@ -7,10 +7,15 @@ export interface UpdateUserInfoRequestModel {
     avatar: string
     // addres: string
 }
-export interface UserInfoModel{
+export interface UserInfoModel {
     /** 用户id */
     uid: string
     /** 微信用户 id */
+    /** 市/县代理 */
+    area_manage_type: string
+    area_manage: manageModel
+    /**股东 id */
+    stockholder: number
     wechat_user_id: string
     /** 支付宝用户 id */
     ali_user_id: string
@@ -140,4 +145,9 @@ export interface UserInfoModel{
     /** 团队人数 */
     team_number: number
     is_bangfu: boolean
+}
+export interface manageModel {
+    area_name: []
+    code_list: string
+    type: string
 }

src/apis/order.api.ts

@@ -1,8 +1,8 @@
-import {defHttp} from "~/utils/http"
+import {defHttp, detailHttp, skuhttp} from "~/utils/http"
 
 import type {
     IntegralOrderCreateModel, OrderCheckModel, OrderCreateModel,
-    OrderCreateShoppingModel, OrderListDataModel, OrderListObligationResult, OrderListResult, OrderQuantityModel
+    OrderCreateShoppingModel, ProductSkuModel, OrderListDataModel, OrderListObligationResult, OrderListResult, OrderQuantityModel, ProductSkustatusModel
 } from "~/apis/model/order.model"
 import type {ThirdOrderResult} from "~/apis/model/third-order.model";
 import type {CommentProductRequest} from "~/apis/model/comment-product";
@@ -33,6 +33,8 @@ enum API {
     ORDER_CHECK = '/api/order/check',
     // 修改购物车数量
     USER_CART_CHANGE = '/api/user/cart/change',
+    // 修改购物车商品的sku属性
+    CHANGE_PRODUCT_SKU = '/api/user/cart/changeUnique',
     // 创建订单 | 积分创建订单
     ORDER_CREATE = '/api/order/create',
     // 获取支付宝路径
@@ -75,7 +77,7 @@ enum API {
  * 申请退款
  */
 export function refundApply(id: string, request: RefundApplyRequest) {
-    return defHttp.post({
+    return detailHttp.post({
         url: API.REFUND_APPLY + `/${id}`,
         data: {
             ...request
@@ -206,6 +208,19 @@ export function createShopping(params: {
     })
 }
 
+/**
+ * 改变购物车商品sku
+ */
+export function changeProdoctSku(cart_id:string,unique:string): Promise<ProductSkustatusModel> {
+    console.log(unique,'order的api接收的unique')
+    console.log(cart_id,'order的api接收的unique')
+    return skuhttp.post({
+        url:API.CHANGE_PRODUCT_SKU + `/${cart_id}?`,
+        data:{
+            unique
+        }
+    })
+}
 
 /**
  * 选择订单商品
@@ -265,7 +280,7 @@ export function getIntegralOrderCreate(params: CreateOrderRequest): Promise<Inte
  */
 export function getOrderListFromStatus(params: {
     page: number
-    //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
+    //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消
     status: number
     limit: number
 }): Promise<OrderListResult> {

src/apis/product.ts

@@ -1,12 +1,13 @@
-import {defHttp} from "~/utils/http";
+import {defHttp, detailHttp} from "~/utils/http";
 import type {
     DyLiveModel, DyLiveProductModel, DyProductDetailModel,
+    DyProductDetailsModel,
     DyProductModel, JdProductDetailModel,
-    JdProductModel, PDDProductDetailModel, PDDProductModel, ProductDetailModel,
+    JdProductModel, JdgProductDetailModel, PDDProductDetailModel, PDDProductDetailModels, PDDProductModel, ProductDetailModel,
     ProductParams,
     SearchProductParams,
-    SearchProductResult, SuNingProductDetailModel, SuNingProductModel, TaobaoProductDetailModel,
-    TaobaoProductResult, VipProductModel, VipProductParams, VipProductResult
+    SearchProductResult, SuNingProductDetailModel, SuNingProductDetailsModel, SuNingProductModel, TaobaoProductDetailModel,
+    TaobaoProductResult, VipProductModel, VipProductParams, VipProductResult, VipProductResults
 } from "~/apis/model/product.model";
 import {resolveUnref} from "@vueuse/core";
 
@@ -52,7 +53,7 @@ enum API {
     // 拼多多商品列表
     PDD_LIST = '/api/pdd/list',
     // 拼多多商品搜索
-    PDD_SEARCH = '/api/pdd/search',
+    PDD_SEARCH = '/api/pdd/list',
     // 拼多多商品详情
     PDD_DETAIL = '/api/pdd/detail',
 
@@ -67,9 +68,20 @@ enum API {
     // 抖音商品列表搜索
     DY_SEARCH = '/api/dy/get_search',
     // 抖音商品详情
-    DY_DETAIL = '/api/dy/get_detail'
+    DY_DETAIL = '/api/dy/get_detail',
+    //大仓banner展示图片
+    DC_BANNER='/api/newhome/nologin/banner/da_cang'
 }
 
+
+/**获取大仓banner展示图片 */
+export function getBannerImg (){
+    return defHttp.get({
+        url:API.DC_BANNER
+    })
+}
+
+
 /**
  * 获取分享ID
  * @param params
@@ -123,8 +135,8 @@ export function searchProductList(params: SearchProductParams): Promise<SearchPr
  * 京东商品详情
  * @param skuId
  */
-export  function getJdProductDetail(skuId: string): Promise<Array<JdProductDetailModel>> {
-    return defHttp.get({
+export  function getJdProductDetail(skuId: string): Promise<JdgProductDetailModel> {
+    return detailHttp.get({
         url: API.JD_DETAIL,
         data: {
             skuId
@@ -187,8 +199,8 @@ export function searchVipProduct(params: ProductParams): Promise<Array<VipProduc
  * 唯品商品详情
  * @param params
  */
-export function getVipProductDetail(goodsId: string): Promise<VipProductResult> {
-    return defHttp.get({
+export function getVipProductDetail(goodsId: string): Promise<VipProductResults> {
+    return detailHttp.get({
         url: API.VIP_DETAIL,
         data: {
             goodsId
@@ -197,8 +209,8 @@ export function getVipProductDetail(goodsId: string): Promise<VipProductResult>
     })
 }
 
-export function getSuProductDetail(id: string): Promise<SuNingProductDetailModel> {
-    return defHttp.get({
+export function getSuProductDetail(id: string): Promise<SuNingProductDetailsModel> {
+    return detailHttp.get({
         url: `${API.SU_DETAIL}/${id}`,
 
     })
@@ -231,7 +243,7 @@ export function searchSuProduct(params: ProductParams): Promise<Array<SuNingProd
 }
 
 export function getTaobaoProductDetail(id: string): Promise<TaobaoProductDetailModel> {
-    return defHttp.post({
+    return detailHttp.post({
         url: API.TAOBAO_DETAIL,
         data: {
             id
@@ -276,8 +288,8 @@ export function getPddProductList(params: ProductParams): Promise<Array<PDDProdu
  * 拼多多商品详情
  * @param goodsId
  */
-export function getPddProductDetail(goodsId: string): Promise<PDDProductDetailModel> {
-    return defHttp.get({
+export function getPddProductDetail(goodsId: string): Promise<PDDProductDetailModels> {
+    return detailHttp.get({
         url: API.PDD_DETAIL,
         data: {
             goodsId
@@ -349,8 +361,8 @@ export function searchDyProduct(params: ProductParams):Promise<Array<DyProductMo
  * 抖音商品详情
  * @param goodsId
  */
-export function getDyProductDetail(goodsId: string): Promise<DyProductDetailModel> {
-    return defHttp.get({
+export function getDyProductDetail(goodsId: string): Promise<DyProductDetailsModel> {
+    return detailHttp.get({
         url: API.DY_DETAIL,
         data: {
             goodsId

src/apis/user.ts

@@ -1,35 +1,35 @@
-import {defHttp} from '~/utils/http'
-import type {UserUnionParams, UserUnionResult} from "~/apis/model/userUnionModel";
+import { defHttp } from '~/utils/http'
+import type { UserUnionParams, UserUnionResult } from "~/apis/model/userUnionModel";
 import Cache from '~/utils/cache'
-import {EXPIRES_TIME, LOGIN_STATUS, STATE_R_KEY, USER_INFO} from "~/constants";
-import {useUserStore} from "~/stores/userStore";
-import type {YanglaoStatisticsResult} from "~/apis/model/yanglaoStatisticsModel";
-import type {UpdateUserInfoRequestModel, UserInfoModel} from "~/apis/model/userInfoModel";
-import type {InvitePartnerModel, UserInviteParams} from "~/apis/model/invitePartnerModel";
-import type {UserShareProductListModel, UserShareProductParams} from "~/apis/model/userShareProductModel";
-import type {RevenueSharingModel, RevenueSharingParams} from "~/apis/model/revenueSharingModel";
-import type {AccumulateIncomeModel, UserInviteProfitParams} from "~/apis/model/accumulateIncomeModel";
-import type {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
-import type {WithdrawalParams, WithdrawalServiceModel} from "~/apis/model/withdrawalService";
-import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
-import type {WithdrawalModel} from "~/apis/model/withdrawalModel";
-import type {MyRelationMerchantParams, MyRelationMerchantResult} from "~/apis/model/myRelationMerchantModel";
-import type {MyRelationProductPrams, MyRelationProductResult} from "~/apis/model/myRelationProductModel";
-import type {IntegralParams, IntegralResult} from "~/apis/model/integralModel";
+import { EXPIRES_TIME, LOGIN_STATUS, OPEN_ID, STATE_R_KEY, USER_INFO } from "~/constants";
+import { useUserStore } from "~/stores/userStore";
+import type { YanglaoStatisticsResult } from "~/apis/model/yanglaoStatisticsModel";
+import type { UpdateUserInfoRequestModel, UserInfoModel } from "~/apis/model/userInfoModel";
+import type { InvitePartnerModel, UserInviteParams } from "~/apis/model/invitePartnerModel";
+import type { UserShareProductListModel, UserShareProductParams } from "~/apis/model/userShareProductModel";
+import type { RevenueSharingModel, RevenueSharingParams } from "~/apis/model/revenueSharingModel";
+import type { AccumulateIncomeModel, UserInviteProfitParams } from "~/apis/model/accumulateIncomeModel";
+import type { SpreadInfoModel } from "~/apis/model/spreadInfoModel";
+import type { WithdrawalParams, WithdrawalServiceModel } from "~/apis/model/withdrawalService";
+import type { UserYanglaoJinModel } from "~/apis/model/userYanglaoJinModel";
+import type { WithdrawalModel } from "~/apis/model/withdrawalModel";
+import type { MyRelationMerchantParams, MyRelationMerchantResult } from "~/apis/model/myRelationMerchantModel";
+import type { MyRelationProductPrams, MyRelationProductResult } from "~/apis/model/myRelationProductModel";
+import type { IntegralParams, IntegralResult } from "~/apis/model/integralModel";
 import type {
     SharePosterClassifyResult,
     SharePosterImageResult,
     SharePostersImagesListParams,
 } from "~/apis/model/inviteFriendsModel";
-import type {ReplyParams, ReplyResult} from "~/apis/model/replyModel";
-import type {SignInInfoModel, SignInModel} from "~/apis/model/signIninfo.model";
-import type {ShoppingResult} from "~/apis/model/shopping.model";
-import type {AddressResult, OneAddressModel} from "~/apis/model/address.model";
-import type {UserVipInfoModel} from "~/apis/model/user-vip-info.model";
-import type {CertificationRequest} from "~/apis/model/certification.model";
-import type {RelationRequest} from "~/apis/model/relation.model";
-import type {YanglaoLogXsResult, YanglaoLogXxResult} from "~/apis/model/yanglao-log.model";
-import type {InvitePHPModel} from "~/apis/model/invite.model";
+import type { ReplyParams, ReplyResult } from "~/apis/model/replyModel";
+import type { SignInInfoModel, SignInModel } from "~/apis/model/signIninfo.model";
+import type { ShoppingResult } from "~/apis/model/shopping.model";
+import type { AddressResult, OneAddressModel } from "~/apis/model/address.model";
+import type { UserVipInfoModel } from "~/apis/model/user-vip-info.model";
+import type { CertificationRequest } from "~/apis/model/certification.model";
+import type { RelationRequest } from "~/apis/model/relation.model";
+import type { YanglaoLogXsResult, YanglaoLogXxResult } from "~/apis/model/yanglao-log.model";
+import type { InvitePHPModel } from "~/apis/model/invite.model";
 
 // 会员中心的提现
 // export function entropy(data) {
@@ -187,7 +187,7 @@ export function xcxBanding(params: { mer_id: string, share_id: string }) {
  * 生成用户图片
  * @param params
  */
-export function getGenerateImage(params: {uid: string, img_id: string}) {
+export function getGenerateImage(params: { uid: string, img_id: string }) {
     return defHttp.post({
         url: API.POSTER_SERVICE_IMAGES,
         data: {

src/auto-imports.d.ts

@@ -96,7 +96,6 @@ declare global {
   const useCustomStyleProp: typeof import('./composables/useProps')['useCustomStyleProp']
   const useDacangStore: typeof import('./stores/dacangStore')['useDacangStore']
   const useDirectionProp: typeof import('./composables/useProps')['useDirectionProp']
-  const useOrderStore: typeof import('./stores/addressStore')['useOrderStore']
   const usePageStore: typeof import('./stores/page')['usePageStore']
   const usePageStoreWidthOut: typeof import('./stores/page')['usePageStoreWidthOut']
   const useSizeProp: typeof import('./composables/useProps')['useSizeProp']

src/components/CXBBackTop/CXBBackTop.vue

@@ -0,0 +1,74 @@
+<template>
+<div v-show="flag" class="backtop1" v-if="isShow" >
+  <img @click="scrollToTop" class="backTopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+</div>
+<div v-show="flag" class="backtop2" v-else >
+  <img @click="scrollToTop" class="backTopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+</div>
+</template>
+
+<script setup lang='ts'>
+import { ref, reactive ,defineProps} from 'vue'
+
+let flag = ref(false)
+let isShow = ref(true)
+
+const props = defineProps({
+  Scroll_X: Number,
+  isCss:Number
+})
+
+watch(()=>props.Scroll_X,()=>{
+  if(props.Scroll_X as number > 400){
+    flag.value = true
+  }
+  if(props.Scroll_X as number < 400){
+    flag.value = false
+  }
+})
+watch(()=>props.isCss,()=>{
+  if(props.isCss as number ===1){
+    isShow.value = true
+  }
+  if(props.isCss as number ===2){
+    isShow.value = false
+  }
+},
+{immediate:true}
+)
+
+const scrollToTop = function () {
+  console.log('返回顶部');
+  
+    uni.pageScrollTo({
+        scrollTop: 0
+    });
+}
+
+</script>
+
+<style scoped>
+.backtop1{
+  width: 100rpx;
+  height: 100rpx;
+  position: fixed;
+  border-radius: 50%;
+  z-index: 999;
+  right: 1%;
+  bottom: 8%;
+}
+.backtop2{
+  width: 100rpx;
+  height: 100rpx;
+  position: fixed;
+  border-radius: 50%;
+  z-index: 999;
+  right: 1%;
+  bottom: 14%;
+}
+.backTopImg{
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+</style>

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import {authAppletPhone, bindPhone, getUserUnionId} from "~/apis/user";
-import {useUserStore} from "~/stores/userStore";
+import { authAppletPhone, bindPhone, getUserUnionId } from "~/apis/user";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const userStore = useUserStore()
 const props = defineProps({
@@ -25,6 +25,10 @@ function getPhoneNumber(e) {
           code: result.code,
           source,
         }).then(unionRes => {
+          console.log(111111, unionRes)
+          // const shareId = Cache.get('SHARE_ID')
+          //存储openid
+          // userStore.setOpenid(unionRes.openid)
           // getShareId(shareI)
           const shareId = Cache.get('SHARE_ID')
 
@@ -37,7 +41,7 @@ function getPhoneNumber(e) {
             params.share_id = shareId
           }
 
-          let redirectPageObj: {page: string, type: 'page' | 'tab'}
+          let redirectPageObj: { page: string, type: 'page' | 'tab' }
           if (Cache.get('SHARE_REDIRECT_PAGE')) {
             redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
           }
@@ -128,21 +132,18 @@ function getPhoneNumber(e) {
 }
 </script>
 <template>
-  <div class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center">
-    <image
-        src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
-        class="w-4 h-4"
-    ></image>
-    <button
-        open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-    >
+  <div
+    class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center">
+    <image src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
+      class="w-4 h-4"></image>
+    <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
       {{ text }}
     </button>
   </div>
 </template>
 
 <style>
-button{
+button {
   margin: 0;
   padding: 0;
   outline: none;
@@ -150,7 +151,8 @@ button{
   background-color: transparent;
   line-height: inherit;
 }
-button::after{
+
+button::after {
   border: none;
 }
 </style>

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import FPopup from "~/components/FPopup/FPopup.vue";
-import {CANCEL_EVENT, CONFIRM_EVENT} from "~/constants/event";
+import { CANCEL_EVENT, CONFIRM_EVENT } from "~/constants/event";
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {SkuModel} from "~/apis/model/product.model";
-import {computed} from "vue";
-import {PopupProps} from "~/components/FPopup";
-import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
+import { SkuModel } from "~/apis/model/product.model";
+import { computed } from "vue";
+import { PopupProps } from "~/components/FPopup";
+import { CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT } from "~/components/constants";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
 import FButton from "~/components/FButton/FButton.vue";
-import {findLast} from "lodash-es";
+import { findLast } from "lodash-es";
 const emit = defineEmits()
 const props = defineProps({
   show: {
@@ -24,8 +24,15 @@ const props = defineProps({
     default: () => {
       return []
     }
+  },
+  isTo: {
+    type: Number,
+    required: true
   }
 })
+
+
+
 const show = ref(props.show || false)
 
 const showValue = computed<PopupProps['show']>({
@@ -47,6 +54,7 @@ const onConfirm = () => {
   emit(CONFIRM_EVENT)
 }
 
+
 const onCancel = () => {
   // show.value = false
   showValue.value = false
@@ -78,8 +86,12 @@ onMounted(() => {
 
 })
 
-function handleSelectedSku(skuItem) {
+function handleSelectedSku(skuItem: any) {
+  console.log(skuItem);
+
   currentSku.value = skuItem
+  console.log('我是数据', currentSku.value);
+
   emit('selected:item', currentSku)
 }
 function handleClose() {
@@ -91,9 +103,15 @@ function handleClose() {
 function handleAddCart() {
   emit('submit')
 }
-// function handleSelectedSku(item) {
-//
-// }
+function handleBuyNow() {
+  emit('subBuy')
+}
+function handleJiaCart() {
+  emit('subAdd')
+}
+function handleSubQg() {
+  emit('subQg')
+}
 
 function handleCountChange(value) {
   emit('count-change', value)
@@ -102,99 +120,127 @@ function handleCountChange(value) {
 </script>
 
 <template>
-  <FPopup
-      v-model:show="showValue"
-      @close="onCancel"
-      position="bottom"
-      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[70%] max-h-[80%] h-full"
-
-  >
+  <FPopup v-model:show="showValue" @close="onCancel" position="bottom"
+    exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[70%] max-h-[80%] h-full">
     <div class="flex flex-col justify-between h-full">
       <div class="flex-1">
         <div class="p-3 flex flex-col gap-3">
           <div class="flex flex-row gap-3">
-            <image :src="detail.image"
-                   v-if="currentSku"
-                   mode="aspectFit" class="w-25 h-25 rounded"></image>
+            <image :src="currentSku.image" v-if="currentSku" mode="aspectFit" class="w-25 h-25 rounded"></image>
             <div class="flex flex-col w-full">
 
               <div class="flex gap-2 justify-between w-full">
                 <div class="text-overflow text-xs flex-1 line-clamp-2 h-fit" v-if="detail && detail.store_name">
                   {{ detail.store_name }}
                 </div>
-                <div
-                    @tap="handleClose"
-                    class="i-tabler-x w-5 h-5 text-gray-500"></div>
+                <div @tap="handleClose" class="i-tabler-x w-5 h-5 text-gray-500"></div>
               </div>
 
 
               <div class="flex flex-col" v-if="currentSku">
                 <div class="text-[12px] text-right text-gray-500 ">
-                  剩余库存{{currentSku.stock}}
+                  剩余库存{{ currentSku.stock }}
                 </div>
                 <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
                   {{ (currentSku.price * 30).toFixed(2) }} 积分
                 </div>
                 <div class="flex items-end gap-2" v-else>
+<<<<<<< HEAD
                   <FPrice :price="detail.dc_price" v-if="detail.seckill == 1"/>
 
                   <FPrice :price="currentSku.price" v-else/>
                   <FPrice v-if="currentSku.ot_price" :price="currentSku.ot_price" :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through/>
+=======
+                  <FPrice :price="currentSku.price" />
+                  <FPrice v-if="currentSku.ot_price" :price="currentSku.ot_price"
+                    :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through />
+>>>>>>> li-yi
                 </div>
               </div>
 
             </div>
           </div>
 
-<!--          <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-[11px] border border-solid rounded p-1 px-1 "
-                    :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-[11px] border border-solid rounded p-1 px-1 "
+                :class="currentSku.unique === item.unique ? 'border-primary text-primary' : 'border-gray-500 text-gray-500'">
+                {{ item.sku }}
 
-                </div>
               </div>
+
+
+
             </div>
+          </div>
 
-<!--          </scroll-view>-->
+          <!--          </scroll-view>-->
         </div>
         <div class="p-3">
           <div class="flex  justify-between text-sm">
             数量
-            <nut-input-number v-model="count" @change="handleCountChange"/>
+            <nut-input-number v-model="count" @change="handleCountChange" />
           </div>
 
 
         </div>
       </div>
 
-      <div class="px-3 pb-10">
-        <FButton
-            @click="handleAddCart"
-            size="small"
-            :exClass="['!bg-primary', 'rounded-full', 'text-white']"
-            block
-        >
+      <div class="px-3 pb-10" v-if="isTo == 1">
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
           确定
         </FButton>
 
       </div>
+      <div class="px-3 pb-10" v-if="isTo == 4">
+        <FButton @click="handleSubQg" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即抢购
+        </FButton>
+
+      </div>
+      <div class="px-3 pb-10" v-if="isTo == 5">
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即抢购
+        </FButton>
+
+      </div>
+      <div class="px-3 pb-10" v-if="isTo == 3">
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即兑换
+        </FButton>
+
+      </div>
+      <div class="flex box_1 flex-row justify-between text-sm text-white gap-3 " v-if="isTo == 2">
+        <button @click="handleJiaCart" size="small"
+          class="bg-[#FFA319] rounded-full w-60 flex justify-center items-center h-9 clor">
+          加入购物车
+        </button>
+        <button @click="handleBuyNow" size="small"
+          class="bg-[#F94032] rounded-full w-60 flex justify-center items-center h-9 clor ">
+          立即购买
+        </button>
+
+      </div>
     </div>
 
   </FPopup>
-</template>
+</template>
+<style scoped>
+.box_1 {
+  padding-top: 10rpx;
+  padding-bottom: 30rpx;
+  border-top: 1px solid rgba(182, 185, 192, 50%);
+}
+
+.clor {
+  color: aliceblue;
+  font-size: 28rpx;
+}
+</style>

src/components/FButton/FButton.vue

@@ -6,6 +6,8 @@ const props = defineProps(buttonProps)
 const emit = defineEmits(buttonEmits)
 
 const { disabled, clickHandler } = useButton(props, emit)
+
+
 </script>
 
 <template>

src/components/FCell/FCell.vue

@@ -4,7 +4,12 @@ import { useCell } from './use-cell'
 
 const props = defineProps(cellProps)
 const emit = defineEmits(cellEmits)
-
+onLoad(
+  (options)=>{
+    // console.log('我是点击options',options);
+    
+  }
+)
 const { arrow, classes, clickHandler } = useCell(props, emit)
 </script>
 

src/components/FNavBar/FNavBar.vue

@@ -4,6 +4,7 @@ import { useNavBar } from './use-nav-bar'
 
 const props = defineProps(navBarProps)
 const emit = defineEmits(navBarEmits)
+console.log('props',props);
 
 const {
   navBarRef,

src/components/FPopup/FPopup.vue

@@ -7,7 +7,10 @@ import { usePopup } from './use-popup'
 const props = defineProps(popupProps)
 const emit = defineEmits(popupEmits)
 const { showValue, classes } = usePopup(props, emit)
-
+onLoad(()=>{
+  // console.log(showValue, classes);
+  
+})
 const animationName = {
   center: 'fade',
   top: 'slide-down',

src/components/FSearch/FSearch.vue

@@ -41,7 +41,7 @@ function handleClick() {
                  class="w-5 h-5  pl-2 py-1"
           ></image>
         <div class="flex flex-1 w-100%">
-          <div class="flex-1"></div>
+          <div class="flex-1  "></div>
           <div
               class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 "
           >
@@ -53,3 +53,7 @@ function handleClick() {
       </div>
 
 </template>
+<style scoped>
+
+
+</style>

src/config/app.ts

@@ -5,12 +5,13 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 // 网络接口修改此字符 小程序域名要求https
 
 // let httpApi = 'https://mer1.crmeb.net'
-// let httpApi = 'https://test.bjtdba.com'
-let httpApi = 'https://app.bjtdba.com'
+let httpApi = 'https://test.bjtdba.com'
+// let httpApi = 'https://app.bjtdba.com'
 // let httpApi = 'https://test.bjtdba.com'
 
 // let httpApi = 'http://192.168.1.77:8324'
 export const CDN_URL = 'https://cdn.bjtdba.com/chuxubao'
+export const CDM_URL = 'https://cdn.bjtdba.com/vod'
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 let wsApi = ''

src/constants/index.ts

@@ -9,6 +9,9 @@ export const  LOGIN_STATUS = 'LOGIN_STATUS_TOKEN'
     // uid
 export const UID = 'UID'
 export const USER_INFO = 'USER_INFO'
+export const  OPEN_ID= 'OPEN_ID'
+export const SHARE_REDIRECT_PAGE = 'SHARE_REDIRECT_PAGE'
+
     //token 过期时间
 export const  EXPIRES_TIME = 'EXPIRES_TIME'
     //�Ƿ���Ȩ

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "储蓄保",
-    "appid" : "__UNI__BCDA501",
+    "appid" : "__UNI__26118FF",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -50,22 +50,22 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "__usePrivacyCheck__": true, //隐私政策
+        "__usePrivacyCheck__" : true, //隐私政策
         "appid" : "wxfb755febdb800f23",
         "setting" : {
             "urlCheck" : false
         },
         "usingComponents" : true,
         "permission" : {
-            "scope.userLocation": {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             },
-            "scope.userFuzzyLocation": {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+            "scope.userFuzzyLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
         },
-        "lazyCodeLoading": "requiredComponents",
-        "requiredPrivateInfos": [
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [
             "chooseAddress",
             "chooseLocation",
             "choosePoi",
@@ -84,8 +84,8 @@
     "mp-toutiao" : {
         "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
     "vueVersion" : "3"
 }

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

@@ -109,13 +109,15 @@ function loadAllOrderList() {
     page: 1,
     limit: 10
   }).then(res => {
-    // console.log(res)
+    console.log('更新列表',res)
     state.allOrderTotal = res.total
     state.allOrderList = res.list
     // console.log(res)
   })
 }
 watch(() => state.tabvalue, (val) => {
+  console.log('我是val',val);
+  
   switch (val) {
     case '0': {
       loadAllOrderList()

src/pages/annuity/index.vue

@@ -1,9 +1,18 @@
 <script setup lang="ts">
-import {getAmountFromGzc, getYanglaojinStatistics} from "~/apis/user";
-import {CDN_URL} from "~/config/app";
+import { getAmountFromGzc, getYanglaojinStatistics, getUserYangLaoJin } from "~/apis/user";
+import { CDN_URL, CDM_URL } from "~/config/app";
+import dayjs from "dayjs";
+
 const get_to_know_buttons_220713Image = CDN_URL + '/static/assets/get_to_know_buttons_220713.png'
 const ylj_fh_220914Image = CDN_URL + '/static/assets/ylj_fh_220914.png'
 
+
+const annuity_yuan_220713Image = CDN_URL + '/static/assets/annuity_yuan_220713.png'
+const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
+const yrzImg = CDM_URL + '/image/2023-12-04/20231204124659874.png'
+const smrzImg = CDM_URL + '/image/2023-12-04/20231204124635512.png'
+
+
 const userStore = useUserStore()
 const progress = [{
   type: 'item',
@@ -18,24 +27,24 @@ const progress = [{
   title: '绑定微信支付宝',
   icon: CDN_URL + '/static/assets/ylj_bd_220914.png'
 },
-  {
-    type: 'separator',
-    icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
-  }, {
-    type: 'item',
-
-    title: '平台结算',
-    icon: CDN_URL + '/static/assets/ylj_js_220914.png'
-  },
-  {
-    type: 'separator',
-    icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
-  }, {
-    type: 'item',
-
-    title: '计入账号开通',
-    icon: CDN_URL + '/static/assets/ylj_kt_220914.png'
-  }]
+{
+  type: 'separator',
+  icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
+}, {
+  type: 'item',
+
+  title: '平台结算',
+  icon: CDN_URL + '/static/assets/ylj_js_220914.png'
+},
+{
+  type: 'separator',
+  icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
+}, {
+  type: 'item',
+
+  title: '计入账号开通',
+  icon: CDN_URL + '/static/assets/ylj_kt_220914.png'
+}]
 
 const state = reactive({
   all_yanglao: 0,
@@ -44,11 +53,13 @@ const state = reactive({
     amount: 0
   }
 })
+const userYangLaoJin = ref({})
 
 const yanglaoStatistics = ref()
 onLoad(() => {
   getYanglaojinStatistics().then(res => {
     // state.all_yanglao = res.all_yanglao
+
     yanglaoStatistics.value = res
   }).catch(error => {
     if (error === '未登录') {
@@ -61,7 +72,45 @@ onLoad(() => {
   getAmountFromGzc().then(res => {
     state.amountFromGzc = res
   })
+  //养老金账户
+  console.log('页面显示了');
+  getUserYangLaoJin().then(res => {
+    console.log('养老保险', res);
+
+    if (res.birthday60 === "未实名认证") {
+      console.log('触发条件');
+
+      setTimeout(() => {
+        uni.showModal({
+          title: '温馨提示',
+          content: '实名认证后才可查看获得的养老金哦~',
+          cancelText: "取消", // 取消按钮的文字
+          confirmText: "去认证", // 确认按钮的文字
+          showCancel: true, // 是否显示取消按钮，默认为 true
+          confirmColor: '#f55850',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('comfirm') //点击确定之后执行的代码
+              setTimeout(() => {
+                uni.navigateTo({
+                  url: '/pages/real-name-authentication/index'
+                })
+              }, 300);
+            } else {
+              console.log('cancel') //点击取消之后执行的代码
+            }
+          }
+        })
+      }, 300);
+    }
+    userYangLaoJin.value = res;
+  })
 })
+
+onShow(() => {
+
+})
+
 function handleThirdBind() {
   uni.navigateTo({
     url: '/pages/third_party_binding/index'
@@ -106,6 +155,22 @@ function handleShowAgreement(type) {
     url: '/pages/webview/agreement?type=' + type
   })
 }
+
+//展示图片
+const ImgType = computed(() => {
+  if (userStore.userInfo?.is_ertification) {
+    const img = userStore.userInfo.is_ertification
+    if (img == 1) {
+      return yrzImg
+    } else {
+      return smrzImg
+    }
+
+  }
+
+})
+
+
 </script>
 
 <template>
@@ -118,48 +183,37 @@ function handleShowAgreement(type) {
       </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"
-                 :src="userStore.userInfo.avatar"
-                 mode="widthFix"
-                 class="w-9 h-9 rounded-full"
-          />
-          <image
-              v-else
-              src="https://app.bjtdba.com/uploads/logo.jpg"
-              mode="widthFix"
-              class="w-9 h-9 rounded-full"
-          />
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+            class="w-9 h-9 rounded-full" />
+          <image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix" class="w-9 h-9 rounded-full" />
           <div>
             {{ userStore.userInfo.nickname }}
           </div>
-          <div
-              @tap="handleRealName"
-              class="text-xs underline text-[#fe0032]"
-          >
-            {{userStore.userInfo.is_ertification == 1 ? '已认证' : '实名认证'}}
-
+          <div @tap="handleRealName" class="box_img">
+            <!-- {{ userStore.userInfo.is_ertification == 1 ? '已认证' : '实名认证' }} -->
+            <image lazy-load :src="ImgType" class="w-full h-full"></image>
           </div>
         </div>
         <div class="flex-1 flex flex-col justify-between items-center py-4 gap-4">
           <div class="flex flex-col justify-center items-center">
             <div class="text-xs">总养老金</div>
-            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{yanglaoStatistics.all_yanglao}}</div>
+            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{ yanglaoStatistics.all_yanglao
+            }}
+            </div>
           </div>
           <div class=" flex justify-around w-full">
             <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
               <div class="font-bold">
-                ￥ {{(yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2)}}
+                ￥ {{ (yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2) }}
               </div>
               <div class="text-xs text-gray-400">预估养老金</div>
             </div>
 
             <div class="flex flex-col justify-center items-center pl-3" v-if="yanglaoStatistics">
-              <div>￥ {{yanglaoStatistics.all_yanglao_a}}</div>
+              <div>￥ {{ (yanglaoStatistics.all_yanglao_a).toFixed(2) }}</div>
               <div class="text-xs text-gray-400">已结算</div>
             </div>
-            <div
-                @tap="handleToCitic"
-                class="flex flex-col justify-center items-center pl-3">
+            <div @tap="handleToCitic" class="flex flex-col justify-center items-center pl-3">
               <div>￥{{ state.amountFromGzc.amount }}</div>
               <div class="text-xs text-gray-400">中信公证处</div>
             </div>
@@ -173,47 +227,73 @@ function handleShowAgreement(type) {
         <div>养老金账号开通流程</div>
         <div class="flex flex-row justify-center items-center w-full h-full">
           <div v-for="(item, index) in progress" :key="index" class="flex flex-1 justify-center">
-            <div
-                v-if="item.type === 'item'"
-                class="flex flex-col justify-between items-center w-12 text-center ">
+            <div v-if="item.type === 'item'" class="flex flex-col justify-between items-center w-12 text-center ">
               <image :src="item.icon" mode="widthFix" class="w-10 h-10"></image>
               <div class="text-xs h-8 flex flex-col justify-center items-center">{{ item.title }}</div>
             </div>
-            <div
-                v-if="item.type === 'separator'"
-                class="flex flex-col justify-start items-start h-10"
-            >
-              <image
-                  :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
+            <div v-if="item.type === 'separator'" class="flex flex-col justify-start items-start h-10">
+              <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
             </div>
 
           </div>
 
         </div>
       </div>
+      <!-- 养老金账户 -->
+      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3">
+        <div>养老金账号余额提取</div>
+
+        <div class="relative">
+          <div class="absolute top-0 left-0 mt-2 w-full  ">
+            <div class="px-9">
+              <div class="py-px bg-red"></div>
+            </div>
+          </div>
+          <div class="relative flex items-center justify-between">
+            <div class="text-center">
+              <div class="inline-block  rounded-full bg-white">
+                <image :src="annuity_yuan_220713Image" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="block mt-3">
+                <div>加入时间</div>
+                <div class="text-gray">
+                  {{ userYangLaoJin.create_time && dayjs(userYangLaoJin.create_time).format('YYYY-MM-DD') }}
+                </div>
+              </div>
+            </div>
+            <div class="text-center">
+              <div class="inline-block rounded-full bg-white">
+                <image :src="agreement_checkedImage" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="block mt-3">
+                <div>法定提取时间</div>
+                <div class="text-gray">
+                  {{ userYangLaoJin.birthday60 }}
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </div>
 
       <div class="flex flex-col bg-white rounded text-sm px-3">
-        <div
-            @tap="handleThirdBind"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        <!-- <div @tap="handleThirdBind"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>支付平台绑定</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
-        </div>
-        <div
-            @tap="handlePensionAccount"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        </div> -->
+        <!-- <div @tap="handlePensionAccount"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>养老金账户</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
-        </div>
-        <div
-            @tap="handlePensionRecord"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        </div> -->
+        <div @tap="handlePensionRecord"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>养老金记录</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
         </div>
-        <div
-            @tap="handleToCitic"
-            class="flex justify-between items-center py-3">
+        <div @tap="handleToCitic" class="flex justify-between items-center py-3">
           <div>中信公证处查看</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
         </div>
@@ -234,6 +314,11 @@ function handleShowAgreement(type) {
 page {
   background: #f8f8f8;
 }
+
+.box_img {
+  width: 144rpx;
+  height: 50rpx;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/article/detail.vue

@@ -7,7 +7,11 @@ const article: Ref<ArticleModel | undefined> = ref<ArticleModel>()
 onLoad((option: any) => {
   if (option.article_id) {
     getArticleDetail(option.article_id).then(res => {
+<<<<<<< HEAD
       // console.log(res)
+=======
+      console.log('~~~~~~~~',res)
+>>>>>>> li-yi
       uni.setNavigationBarTitle({
         title: res.title
       })

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

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import {computed, PropType} from "vue";
+import { computed, PropType } from "vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
-import {useUserStore} from "~/stores/userStore";
-import {useDacangStore} from "~/stores/dacangStore";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
+import { useUserStore } from "~/stores/userStore";
+import { useDacangStore } from "~/stores/dacangStore";
 // import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
 const dacangStore = useDacangStore()
@@ -74,7 +74,7 @@ function handleClick() {
 //
 // }
 const emit = defineEmits<{
-  (e: 'click:item', value:string): void
+  (e: 'click:item', value: string): void
 }>()
 function handleTabItemClick(currentTab) {
   emit('click:item', tabValue.value)
@@ -86,19 +86,15 @@ function handleShowSearchPage() {
 }
 </script>
 <template>
-  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20"
-       :style="navBarStyle"
-       :class="exClass"
-  >
+  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20" :style="navBarStyle" :class="exClass">
     <div class="pl-2 pt-2">
-      <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
+      <div
+        class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
 
-        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
-               mode="widthFix"
-               class="w-4 h-4  pl-2 py-1"
-        ></image>
+        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png" mode="widthFix"
+          class="w-4 h-4  pl-2 py-1"></image>
         <div class="flex flex-1 items-center w-100%" @tap.stop="handleShowSearchPage">
-          <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
+          <div class="flex-1 pl-2  font_size ">搜索商品关键词</div>
           <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
             搜索
           </div>
@@ -109,19 +105,17 @@ function handleShowSearchPage() {
 
     </div>
 
-<!--    <div class="p-3">-->
-      <div class=" ">
-       <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
-<!--         <nut-tab-panel :title="全部"></nut-tab-panel>-->
-          <nut-tab-pane v-for="item in tabs" :title="item.cate_name"
-                        :pane-key="item.store_category_id"
-                        :key="item.store_category_id"
-          >
-          </nut-tab-pane>
-       </nut-tabs>
+    <!--    <div class="p-3">-->
+    <div class=" ">
+      <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
+        <!--         <nut-tab-panel :title="全部"></nut-tab-panel>-->
+        <nut-tab-pane v-for="item in tabs" :title="item.cate_name" :pane-key="item.store_category_id"
+          :key="item.store_category_id">
+        </nut-tab-pane>
+      </nut-tabs>
 
-      </div>
-<!--    </div>-->
+    </div>
+    <!--    </div>-->
 
   </div>
 </template>
@@ -132,4 +126,11 @@ function handleShowSearchPage() {
   --nut-tabs-titles-item-color: #fff;
   --nut-tabs-titles-item-active-color: #fff;
 }
+
+
+.font_size {
+  font-size: 24rpx;
+  line-height: 42rpx;
+  color: #c0c5cc;
+}
 </style>

src/pages/dacang/list/index.vue

@@ -1,44 +1,52 @@
 <script lang="ts" setup>
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
-import {getDcProductClassify, getDcProductList} from "~/apis/dacang";
+import { getDcProductClassify, getDcProductList } from "~/apis/dacang";
 import FTabs from "~/components/FTabs/FTabs.vue";
 import ProductList from "~/components/ProductList/ProductList.vue";
-import type {DcProductModel} from "~/apis/model/dacang.model";
-import {useDacangStore} from "~/stores/dacangStore";
-import {CDN_URL} from "~/config/app";
+import type { DcProductModel } from "~/apis/model/dacang.model";
+import { useDacangStore } from "~/stores/dacangStore";
+import { CDN_URL } from "~/config/app";
 import DacangHeader from "~/pages/dacang/list/components/dacang-header.vue";
-import {getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+import { getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
-const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
+import { getBannerImg } from '~/apis/product'
+import Banner from "./components/banner.vue";
+
+
 const usePageStore = usePageStoreWidthOut()
 
 
 const state = reactive({
-  tabs: [{store_category_id: '-1', cate_name: '全部'}],
+  tabs: [],
+  lists: {},
   productList: <Array<DcProductModel>>[],
-
-  currentClassify: '',
+  currentClassify: '-1',
   keyword: '',
-
   status: 'noMore',
-
+  banner: '',
   currentPage: 1,
   pageSize: 10,
   totalPage: 1
 })
 
+// 距离顶部距离
+let Scroll_X = ref(0)
+
+let scrollPositions = reactive({})
 const dacangStore = useDacangStore()
 const userStore = useUserStore()
 
+
 onLoad(async (option) => {
-  state.tabs = [{store_category_id: '-1', cate_name: '全部'}]
+  state.tabs = [{ store_category_id: '-1', cate_name: '全部' }]
   const classifyRes = await getDcProductClassify()
   state.tabs.push(...classifyRes)
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/dacang/list/index'
+      url: '/pages/dacang/list/index'
     }
   })
 
@@ -50,10 +58,15 @@ onLoad(async (option) => {
       userStore.setShareId(res.share_id)
     }
   }).catch(message => {
-    // console.log(message)
+    console.log(message)
   })
   userStore.setRedirectPage(`/pages/dacang/list/index`, 'tab')
+  getBannerImg().then(res => {
+    console.log('banner', res);
+    state.banner = res[0].pic
+    console.log(state.banner);
 
+  })
 
 })
 
@@ -77,61 +90,100 @@ onShareTimeline(() => {
   }
 })
 
-onShow(async (options) => {
+onShow((options) => {
+
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/dacang/list/index'
+      url: '/pages/dacang/list/index'
     }
   })
   loadList('reload')
 })
 
-function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-
+const loadList = async (action: 'page' | 'reload', callback?: (items) => void) => {
+  console.log(action);
   let params: any = {
     page: state.currentPage,
     limit: state.pageSize,
     keyword: state.keyword
   }
-  if (dacangStore.currentClassify !== '-1') {
-    params.classify = dacangStore.currentClassify
+  console.log(params);
+  if (state.currentClassify !== '-1') {
+    params.classify = state.currentClassify
+  }
+  let res = await getDcProductList({
+    ...params
+  })
+  console.log('res>>>>', res);
+  if (action === 'page') {
+    state.lists[state.currentClassify] = state.lists[state.currentClassify].concat(res)
   }
-
   if (action === 'reload') {
-    params.page = 1
+    state.lists[state.currentClassify] = res
+  }
+
+  if (callback) {
+    callback(res)
   }
 
-  getDcProductList({
-    ...params
-  }).then(res => {
-    if (action === 'page') {
-      state.productList = state.productList.concat(res)
-    }
-    if (action === 'reload') {
-      state.productList = res
-    }
 
-    if (callback) {
-      callback(res)
-    }
-  })
 }
 
-function handleTabItemClick(classifyId) {
+function handleTabItemClick(classifyId: string) {
   state.currentClassify = classifyId
-  dacangStore.setClassify(classifyId)
+  // uni.pageScrollTo({
+  //   scrollTop: 0
+  // });
+  state.currentPage = 1
+  state.pageSize = 10
+
   setTimeout(() => {
     loadList('reload')
   }, 300)
-  // }
+
 }
 
+// function handleTabItemClick(classifyId) {
+//   // 保存当前分类页的滚动位置
+//   scrollPositions[state.currentClassify] = Scroll_X.value;
+
+//   console.log(111, scrollPositions[classifyId]);
+
+//   // 切换当前分类页
+//   state.currentClassify = classifyId;
+
+//   // 检查当前分类页是否有保存的滚动位置
+//   if (scrollPositions[classifyId] !== undefined) {
+//     // 如果有保存的滚动位置，恢复滚动位置
+//     uni.pageScrollTo({
+//       scrollTop: scrollPositions[classifyId],
+//     });
+//   } else {
+//     // 如果没有保存的滚动位置，重新加载数据
+//     state.currentPage = 1;
+//     state.pageSize = 10;
+//     loadList('reload');
+//   }
+// }
+
+function toHuiyuan() {
+  
+  uni.navigateTo({
+    url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
+  })
+}
+
+
 const headerClass = ref('')
 
 onPageScroll((page) => {
+
+
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+
   // page.scrollTop
-  if (page.scrollTop >= 76 ) {
+  if (page.scrollTop >= 76) {
     headerClass.value = '!bg-primary !text-white'
   } else {
     headerClass.value = ''
@@ -145,7 +197,7 @@ onReachBottom(() => {
   state.currentPage += 1
   loadList('page', (items) => {
     uni.hideLoading()
-    // console.log(items)
+    console.log(items)
     if (!items.length > 0) {
       // console.log('没有更多了')
       state.status = 'noMore'
@@ -153,23 +205,29 @@ onReachBottom(() => {
   })
 })
 onPullDownRefresh(() => {
-  uni.showLoading()
-  loadList('reload', (items) => {
-    uni.hideLoading()
-    uni.stopPullDownRefresh()
-  })
+  // uni.showLoading()
+  // state.currentPage = 1
+  // state.pageSize = 10
+  // loadList('reload', (items) => {
+  //   uni.hideLoading()
+  //   uni.stopPullDownRefresh()
+  // })
 })
 
 
 </script>
 <template>
   <div class="h-screen">
-    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick"/>
+    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick" />
 
     <div class="flex flex-col gap-2 ">
-      <image :src="headerImage" mode="widthFix" class="w-full h-50"></image>
-    <ProductList :list="state.productList" />
-      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" v-if="state.productList.length > 0">
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+      <image lazy-load :src="state.banner" mode="widthFix" @click="toHuiyuan" class="w-full h-50"></image>
+      <div>
+        <ProductList :list="state.lists[state.currentClassify]" />
+      </div>
+      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500"
+        v-if="state.lists[state.currentClassify]?.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -189,8 +247,6 @@ page {
 .nut-tab-pane {
   display: none !important;
 }
-
-
 </style>
 <route lang="yaml" >
 style:

src/pages/home/components/header.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import {computed, PropType} from "vue";
+import { computed, PropType } from "vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
-import {useUserStore} from "~/stores/userStore";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
+import { useUserStore } from "~/stores/userStore";
 // import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
 
@@ -68,30 +68,22 @@ function handleShowMessage() {
     url: '/pages/message/index'
   })
 }
+function handleClickser() {
+  uni.navigateTo({
+    url: '/pages/search/index'
+  })
+}
 </script>
 <template>
-  <div class="home-header fixed w-screen text-white z-10"
-       :style="navBarStyle"
-       :class="exClass"
-  >
+  <div class="home-header fixed w-screen text-white z-10" :style="navBarStyle" :class="exClass">
     <div class="flex">
-      <div
-          @click="handleClick"
-          class="flex gap-2 mb-2 pl-2 flex-1"
-      >
-        <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
-               :src="userStore.userInfo.avatar"
-               mode="widthFix"
-               class="w-9 h-9 rounded-full"
-        />
-        <image
-            v-else
-            src="https://app.bjtdba.com/uploads/logo.jpg"
-            mode="widthFix"
-            class="w-9 h-9 rounded-full"
-        />
+      <div @click="handleClick" class="flex gap-2 mb-2 pl-2 flex-1">
+        <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+          mode="widthFix" class="w-9 h-9 rounded-full" />
+        <image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix" class="w-9 h-9 rounded-full" />
         <div class="flex flex-col ">
-          <div class="text-sm" v-if="userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录'}}</div>
+          <div class="text-sm" v-if="userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ?
+            userStore.userInfo.nickname : '登录' }}</div>
           <div class="text-sm" v-else>登录</div>
           <div class="text-xs" v-if="!isNaN(yanglaojin) && userStore.userInfo">{{ yanglaojin }}元养老金</div>
           <div v-else class="text-xs">
@@ -100,7 +92,8 @@ function handleShowMessage() {
         </div>
 
       </div>
-      <div class=" right-26 flex flex-col text-[10px] justify-center items-center " @tap.stop="handleShowMessage" :style="{marginRight: `${menuButtonInfo.width + 15}px`}">
+      <div class=" right-26 flex flex-col text-[10px] justify-center items-center " @tap.stop="handleShowMessage"
+        :style="{ marginRight: `${menuButtonInfo.width + 15}px` }">
         <image src="/static/icon/message-dark.png" mode="widthFix" class="w-4 h-4" v-if="exClass"></image>
         <image src="/static/icon/message.png" mode="widthFix" class="w-4 h-4" v-else></image>
         <div>消息</div>
@@ -108,10 +101,36 @@ function handleShowMessage() {
 
 
     </div>
-    <div class="p-3">
-      <FSearch />
+    <div class="p_3">
+      <!-- 搜索 -->
+      <div @click="handleClickser"
+        class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red h-8">
+
+        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png" mode="widthFix"
+          class="w-5 h-5  pl-2 py-1"></image>
+        <div class="flex flex-1 w-100%">
+          <div class="flex-1 guand ">输入商品关键字</div>
+          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 ">
+            搜索
+          </div>
+        </div>
+
+
+      </div>
 
     </div>
 
   </div>
 </template>
+<style  scoped>
+.p_3 {
+  padding-left: 24rpx;
+  padding-right: 24rpx;
+}
+
+.guand {
+  padding-left: 10rpx;
+  line-height: 56rpx;
+  color: #9ca3af
+}
+</style>

src/pages/home/components/navs.vue

@@ -1,40 +1,45 @@
 <script lang="ts" setup>
-import {getHomeQuickLink} from "~/apis/common";
-import {PLATFORM_NAME} from "~/apis/model/common.model";
-import {useDacangStore} from "~/stores/dacangStore";
-import {CDN_URL} from "~/config/app";
+import { getHomeQuickLink } from "~/apis/common";
+import { PLATFORM_NAME } from "~/apis/model/common.model";
+import { useDacangStore } from "~/stores/dacangStore";
+import { CDN_URL, CDM_URL } from "~/config/app";
 
 const navList = ref([{
-  image: CDN_URL + '/static/home-nav/home_dacang_220614.png',
-  title: '精品大仓',
+  image: CDM_URL + '/image/2023-11-20/20231120155257975.png',
+  title: '精品商城',
   key: 'jingpin'
 }, {
   image: CDN_URL + '/static/home-nav/home_xianshimiaosha_220614.png',
   title: '限时秒杀',
   key: 'miaosha'
-}, {
-  image: CDN_URL + '/static/home-nav/jingdongshengqian_220920.png',
-  title: '京东',
-  key: PLATFORM_NAME.JD
-}, {
+},{
+  image: CDM_URL + '/image/2023-11-30/20231130092625318.png',
+  title: '会员专区',
+  key: 'user',
+},{
   image: '',
   title: '鼎盛联盟',
   key: 'dingsheng',
-  // categoryId: '430'
-  // 测试库
+  // https://cdn.bjtdba.com/vod/image/2023-11-30/20231130092553801.png  gc
+  // https://cdn.bjtdba.com/vod/image/2023-11-30/20231130092625318.png  会员
   // categoryId: '149'
 },{
-  image: CDN_URL + '/static/home-nav/pinduoduo_x.png',
-  title: '拼多多',
-  key: PLATFORM_NAME.PDD
+  image: CDN_URL + '/static/home-nav/icon_hmyh_221014.png',
+  title: '惠民专区',
+  key: PLATFORM_NAME.DC,
+  categoryId: '567',
+},{
+  image: CDN_URL + '/static/home-nav/jingdongshengqian_220920.png',
+  title: '京东',
+  key: PLATFORM_NAME.JD
 }, {
   image: CDN_URL + '/static/home-nav/home_taobaoyanglao_220920.png',
   title: '淘宝',
   key: PLATFORM_NAME.TB
 }, {
-  image: CDN_URL + '/static/home-nav/douyin_logo_230317.png',
-  title: '抖音',
-  key: PLATFORM_NAME.DY
+  image: CDM_URL + '/image/2023-11-24/20231124150424710.png',
+  title: '拼多多',
+  key: PLATFORM_NAME.PDD
 }, {
   image: CDN_URL + '/static/home-nav/home_weipinhui_220920.png',
   title: '唯品会',
@@ -43,43 +48,25 @@ const navList = ref([{
   image: CDN_URL + '/static/home-nav/home_suningyigou_220920.png',
   title: '苏宁易购',
   key: PLATFORM_NAME.SU
+},{
+  image: CDN_URL + '/static/home-nav/douyin_logo_230317.png',
+  title: '抖音',
+  key: PLATFORM_NAME.DY
 }, {
-  image: CDN_URL + '/static/home-nav/home_jinfentongdui_220615.png',
-  title: '积分通兑',
-  key: 'integral'
-}, {
-  image: CDN_URL + '/static/home-nav/elderly_zone_220920.png',
-  title: '老年专区',
-  key: PLATFORM_NAME.DC,
+  image: CDM_URL + '/image/2023-11-30/20231130092553801.png',
+  title: '工厂直供',
+  key: 'gongchang',
   categoryId: '571'
-}, 
- {
+},
+{
   image: '',
-  title: '滋补保健',
+  title: '滋补养生',
   key: 'zibu',
   categoryId: '430'
-  // 测试库
-  // categoryId: '149'
-},
-
-// {
-//   image: CDN_URL + '/static/home-nav/the_student_zone_220920.png',
-//   title: '学生专区',
-//   key: PLATFORM_NAME.DC,
-//   categoryId: '576'
-// }, 
-{
-  image: CDN_URL + '/static/home-nav/vip_img.png',
-  title: '会员专区',
-  key: 'member',
-  // key: PLATFORM_NAME.DC,
-  // categoryId: '567',
 }, {
-  image: CDN_URL + '/static/home-nav/icon_hmyh_221014.png',
-  title: '惠民专区',
-  key: PLATFORM_NAME.DC,
-  categoryId: '567',
-
+  image: CDN_URL + '/static/home-nav/home_jinfentongdui_220615.png',
+  title: '积分通兑',
+  key: 'integral'
 }, {
   image: CDN_URL + '/static/home-nav/home_gengduo.png',
   title: '更多',
@@ -88,10 +75,12 @@ const navList = ref([{
 
 onBeforeMount(() => {
   getHomeQuickLink().then(res => {
+    console.log('res>>>>>', res);
+
     if (res) {
-		navList.value[11] = res[0]
-		navList.value[3] = res[1]
-		// navList.value[3] = res[0]
+      navList.value[12] = res[0]
+      navList.value[3] = res[1]
+      // navList.value[3] = res[0]
       // console.log(res)
     }
   })
@@ -108,15 +97,12 @@ function handleItemClick(item: any) {
       uni.switchTab({
         url: '/pages/dacang/list/index'
       })
-      // uni.navigateTo({
-      //   url: '/pagesC/goods_details/index?id=4858'
-      // })
       break;
     }
     // 会员专区
-    case 'member': {
+    case 'user': {
       uni.navigateTo({
-        url: '/pages/vip/index'
+        url: `/pages/vip/index?type=`+item.key
       })
       break;
     }
@@ -135,18 +121,25 @@ function handleItemClick(item: any) {
       })
       break;
     }
-	case 'dingsheng': {
-	  uni.navigateTo({
-	    url: `/pages/product/dingshenglianmeng?type=`+item.key
-	  })
-	  break;
-	}
-	case 'jingpin': {
-	  uni.navigateTo({
-	    url: `/pages/product/dingshenglianmeng?type=`+item.key
-	  })
-	  break;
-	}
+    case 'dingsheng': {
+      uni.navigateTo({
+        url: `/pages/product/dingshenglianmeng?type=` + item.key
+      })
+      break;
+    }
+    //工厂直供
+    case 'gongchang': {
+      uni.navigateTo({
+        url: `/pages/vip/index?type=`+item.key
+      })
+      break;
+    }
+    case 'jingpin': {
+      uni.navigateTo({
+        url: `/pages/product/dingshenglianmeng?type=` + item.key
+      })
+      break;
+    }
     // 积分通兑
     case 'integral': {
       uni.navigateTo({
@@ -178,16 +171,11 @@ function handleItemClick(item: any) {
   <div class="">
     <div class="rounded bg-white pt-4 pb-2 px-5">
       <div class="flex justify-around flex-wrap ">
-        <div
-            @tap="handleItemClick(navItem)"
-            class="flex flex-col items-center justify-center gap-y-1 mb-2 flex-[0_0_20%]"
-             v-for="(navItem, index) in navList" :key="index">
-          <image :src="navItem.image"
-                 mode="widthFix"
-                 class="w-10 h-10"
-          ></image>
+        <div @tap="handleItemClick(navItem)" class="flex flex-col items-center justify-center gap-y-1 mb-2 flex-[0_0_20%]"
+          v-for="(navItem, index) in navList" :key="index">
+          <image :src="navItem.image" mode="widthFix" class="w-10 h-10"></image>
           <div class="text-xs">
-            {{navItem.title}}
+            {{ navItem.title }}
           </div>
         </div>
       </div>

src/pages/home/index.vue

@@ -18,6 +18,7 @@ import {getShareId} from "~/apis/product";
 // import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 import Cache from "~/utils/cache";
 
+import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
 const userStore = useUserStore()
 const usePageStore = usePageStoreWidthOut()
 usePageStore.setPageConfig({
@@ -54,6 +55,8 @@ const state = reactive({
   duration: 500,
   currents: "0",
 })
+// 距离顶部距离
+let Scroll_X = ref(0)
 onShow(() => {
   usePageStore.setPageConfig({
     currentPage: {
@@ -161,6 +164,8 @@ watch(() => state.isShowSignIn, (val) => {
 const headerClass = ref('')
 
 onPageScroll((page) => {
+  // console.log(page.scrollTop.toFixed(),'距离顶部的距离')
+  Scroll_X.value = Number(page.scrollTop.toFixed())
   // page.scrollTop
   if (page.scrollTop >= 76 ) {
     headerClass.value = 'bg-white !text-gray-900'
@@ -205,7 +210,7 @@ const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 function handleBannerClick(item) {
   if(item.url == 'rich') {
     uni.navigateTo({
-      url: '/pages/vip/index'
+      url: '/pages/vip/index?type=user'
     })
   }
 }
@@ -246,6 +251,7 @@ function getIsShow(){
 </script>
 <template>
   <div class="h-screen ">
+    <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
     <Header :yanglaojin="state.all_yanglao"
             :exClass="headerClass"
     />

src/pages/immediate-withdrawal/index.vue

@@ -7,16 +7,18 @@ import {
   getWithdrawalConfig,
   getWithdrawalService
 } from "~/apis/user";
-import {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
-import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
-import {CDN_URL} from "~/config/app";
-import {isNumber} from "~/utils";
+import { SpreadInfoModel } from "~/apis/model/spreadInfoModel";
+import type { UserYanglaoJinModel } from "~/apis/model/userYanglaoJinModel";
+import { CDN_URL } from "~/config/app";
+import { isNumber } from "~/utils";
+import { Accountbind } from "~/apis/auth.api";
 
 const zfb_logoImage = CDN_URL + '/static/assets/zfb_logo.png'
 const wx_logoImage = CDN_URL + '/static/assets/wx_logo.png'
 const userStore = useUserStore()
 const userSpreadInfo = ref<SpreadInfoModel>()
-
+//微信绑定标识
+const iswxshow = ref(false)
 const withdrawalCal = ref({})
 const yanglaojin = ref<UserYanglaoJinModel>()
 
@@ -27,7 +29,46 @@ const cashWithdrawalAmount = ref()
 const isDisabled = ref(true)
 const userBrokeragePrice = ref(0)
 // userSpreadInfo.value.brokerage_price
-onLoad(async () => {
+onShow(async () => {
+  cashWithdrawalAmount.value = null
+  getBandAccountInfo({ type: '1' }).then(res => {
+    iswxshow.value = true
+
+  }).catch((error) => {
+    setTimeout(() => {
+      uni.showModal({
+        title: '温馨提示',
+        content: '您还未绑定提现账号,是否绑定?',
+        cancelText: "取消", // 取消按钮的文字
+        confirmText: "确认绑定", // 确认按钮的文字
+        showCancel: true, // 是否显示取消按钮，默认为 true
+        confirmColor: '#f55850',
+        success: (res) => {
+          if (res.confirm) {
+            console.log('comfirm') //点击确定之后执行的代码
+            Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
+              console.log('我是resg', resg);
+
+              uni.showToast({
+                title: '绑定成功',
+                icon: 'none'
+              })
+              iswxshow.value = true
+            }).catch((error) => {
+              uni.showToast({
+                title: error,
+                icon: 'none'
+              })
+            })
+          } else {
+            console.log('cancel') //点击取消之后执行的代码
+            iswxshow.value = false
+          }
+        }
+      })
+    }, 300);
+
+  })
   await userStore.getUserInfo()
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
@@ -48,6 +89,7 @@ onLoad(async () => {
       icon: 'none'
     })
   }
+
   // }
 })
 
@@ -65,6 +107,37 @@ watch(() => cashWithdrawalAmount.value, (val) => {
   }
 })
 
+function Tochecked() {
+  iswxshow.value = !iswxshow.value
+  console.log(iswxshow.value);
+  if (iswxshow.value == true) {
+    Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
+      console.log('我是resg', resg);
+
+      uni.showToast({
+        title: '绑定成功',
+        icon: 'none'
+      })
+      iswxshow.value = true
+    }).catch((error) => {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+      if(error=='此微信已绑定其他账户'){
+        iswxshow.value=false
+      }
+    })
+  }else{
+    console.log(111);
+    
+  }
+}
+
+
+
+
+
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
   if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
@@ -81,6 +154,7 @@ function handleInputAll() {
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+  
   if (isDisabled.value) {
     return
   }
@@ -139,20 +213,25 @@ function handleImmediateWithdrawal() {
     })
   }
 
+  if(iswxshow.value==false){
+    uni.showToast({
+      title: '请先勾选提现方式',
+      icon: 'none'
+    })
+    return
+  }
+
+  getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1 }).then(res => {
 
-  getApplicationWithdrawal({extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
-    // uni.showToast({
-    //   title: res,
-    //   icon: 'none'
-    // })
     uni.showToast({
-      title: '提现成功',
+      title: '提现已申请',
       icon: 'none'
-    }).then(res => {
+    })
+    setTimeout(() => {
       uni.navigateTo({
-        url: '/pages/immediate-withdrawal/index'
+        url: '/pages/withdrawal-record/index'
       })
-    })
+    }, 300)
   }).catch(error => {
     uni.showToast({
       title: error,
@@ -190,10 +269,7 @@ function handleShowAgreement(type) {
       <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"
-                 type="number"
-                 v-model="cashWithdrawalAmount"
-          />
+          <input placeholder="请输入金额" class="w-full" type="digit" v-model="cashWithdrawalAmount" />
         </div>
         <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
       </div>
@@ -215,10 +291,11 @@ function handleShowAgreement(type) {
         <div class="flex items-center justify-between py-3">
           <div class="flex items-center gap-2">
             <image :src="wx_logoImage" mode="widthFix" class="w-8 h-8"></image>
-            <div>微信支付</div>
+            <div>微信</div>
           </div>
           <div>
-            <radio checked/>
+            <radio :checked="true" v-if="iswxshow==true" />
+            <radio :checked="false"  v-if="iswxshow==false" @click="Tochecked"  />
           </div>
         </div>
 
@@ -236,11 +313,8 @@ function handleShowAgreement(type) {
 
     <div class="flex flex-col">
       <div class=" flex rounded-full bg-red-300">
-        <nut-button type="primary" block
-                    :disabled="isDisabled"
-                    :class="isDisabled && 'bg-gray-800'"
-                    @tap="handleImmediateWithdrawal"
-        >
+        <nut-button type="primary" block :disabled="isDisabled" :class="isDisabled && 'bg-gray-800'"
+          @tap="handleImmediateWithdrawal">
           立即提现
         </nut-button>
       </div>
@@ -267,7 +341,6 @@ page {
   height: 16px !important;
   width: 16px !important;
 }
-
 </style>
 <route lang="yaml">
 style:

src/pages/miaosha/index.vue

@@ -12,7 +12,7 @@ const currentSeckillDate = ref()
 const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
 const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
 const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
-
+const userStore = useUserStore()
 // const list = ref<Array<DcSeckillModel>>()
 const currentProductList = ref([])
 
@@ -24,6 +24,7 @@ const state = reactive({
 
   list: []
 })
+
 onLoad((options) => {
   loadList('reload')
 })
@@ -43,33 +44,38 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   }).then( res => {
     if (action === 'reload') {
       if (res && res.length > 0) {
+<<<<<<< HEAD
         // console.log(res)
+=======
+        console.log('秒杀>>>',res)
+>>>>>>> li-yi
         const resList = res
         // const status3List = orderBy(list.value, (val) => {
         //   return val.status == 3
         // })
-        let status3FilterList = filter(resList, (val) => {
-          return val.status == 3
-        })
+        //val.status 1 开始抢 2 即将开始 3 已结束
+        // let status3FilterList = filter(resList, (val) => {
+        //   return val.status == 3
+        // })
         let status2FilterList = filter(resList, (val) => {
           return val.status == 2
         })
         let status1FilterList = filter(resList, (val) => {
           return val.status == 1
         })
-        if (status3FilterList.length >= 3) {
-          status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
-          console.log(status3FilterList)
-          state.list.push(...status3FilterList[0])
-          console.log(state.list)
-        } else {
-          state.list.push(...status3FilterList)
-        }
+        // if (status3FilterList.length >= 3) {
+        //   status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
+        //   console.log(status3FilterList)
+        //   state.list.push(...status3FilterList[0])
+        //   console.log(state.list)
+        // } else {
+        //   state.list.push(...status3FilterList)
+        // }
         if (status2FilterList.length > 0) {
           state.list.push(...status2FilterList)
         }
         if (status1FilterList.length > 0) {
-          state.list.push(...status1FilterList)
+          state.list.unshift(...status1FilterList)
         }
 
         if (state.list.length > 0) {

src/pages/my-integral/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import {useUserStore} from "~/stores/userStore";
-import {getNewSignInInfo, getUserInfo} from "~/apis/user";
+import { useUserStore } from "~/stores/userStore";
+import { getNewSignInInfo, getUserInfo } from "~/apis/user";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
@@ -26,8 +26,13 @@ onShow(() => {
 function loadSignInInfo() {
   // 2 检查用户签到信息
   getNewSignInInfo().then(res => {
+<<<<<<< HEAD
     // console.log(res)
     const {today, day} = res
+=======
+    console.log(res)
+    const { today, day } = res
+>>>>>>> li-yi
     state.signToday = today
     // console.log(res)
     if (today == 0) {
@@ -68,7 +73,7 @@ if (userStore.userInfo) {
 function handleSign() {
   // console.log(state.signToday)
   // if (state.signToday == 0)  {
-    state.isShowSignIn = true
+  state.isShowSignIn = true
   // } else {
   //   return uni.showToast({
   //     title: '今日已签到过',
@@ -117,27 +122,19 @@ function handleShowAgreement() {
         {{ userStore.userInfo.score }}
       </div>
     </div>
-
+    <div @tap="handleShowIntegralDetail" class="bg-white rounded-md text-sm flex justify-between p-3">
+      <div class="">积分明细</div>
+      <div class="f-text-color-2 i-tabler-chevron-right transform transition-300" />
+    </div>
     <div class="bg-white rounded-md text-sm flex justify-between p-3">
       <div class="">积分通兑</div>
-      <FButton
-          @tap="handleToZibuyangsheng"
-          size="mini"
-          :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
-
-      >
+      <FButton @tap="handleToZibuyangsheng" size="mini"
+        :exClass="['rounded-full', '!text-[12px]', 'text-white', `bg-primary`, 'w-full']">
         去兑换
       </FButton>
     </div>
 
-    <div
-        @tap="handleShowIntegralDetail"
-        class="bg-white rounded-md text-sm flex justify-between p-3">
-      <div class="">积分明细</div>
-      <div
-          class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-      />
-    </div>
+
 
     <div class="bg-white rounded-md text-sm flex flex-col p-3">
       <div class="f-hairline-bottom pb-3">积分任务</div>
@@ -147,11 +144,8 @@ function handleShowAgreement() {
             <div class="text-xs">每日签到</div>
             <div class="text-xs text-gray-500">每日签到得奖励</div>
           </div>
-          <FButton
-              @click="handleSign"
-              size="mini"
-              :exClass="['rounded-full','!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray' }`, 'w-full']"
-          >
+          <FButton @click="handleSign" size="mini"
+            :exClass="['rounded-full', '!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray'}`, 'w-full']">
             {{ state.signToday === 0 ? '去签到' : '已签到' }}
           </FButton>
         </div>
@@ -160,12 +154,8 @@ function handleShowAgreement() {
             <div class="text-xs">邀请好友得积分</div>
             <div class="text-xs text-gray-500">邀请好友赚奖励</div>
           </div>
-          <FButton
-              @tap="handleToPoster"
-              size="mini"
-              :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
-
-          >
+          <FButton @tap="handleToPoster" size="mini"
+            :exClass="['rounded-full', '!text-[12px]', 'text-white', `bg-primary`, 'w-full']">
             去邀请
 
           </FButton>
@@ -176,13 +166,8 @@ function handleShowAgreement() {
     </div>
   </div>
 
-  <CXBDialogSIgnIn
-      :show="state.isShowSignIn"
-      :today="state.signToday"
-      :day="state.day"
-      @confirm="state.isShowSignIn = false"
-      @close="state.isShowSignIn = false"
-  />
+  <CXBDialogSIgnIn :show="state.isShowSignIn" :today="state.signToday" :day="state.day"
+    @confirm="state.isShowSignIn = false" @close="state.isShowSignIn = false" />
 </template>
 
 <style>

src/pages/my-invitation/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import FCellGroup from "~/components/FCellGroup/FCellGroup.vue";
 import FCell from "~/components/FCell/FCell.vue";
-import {getAgentInfo, getSelectUserInviteProfit} from "~/apis/user";
+import {getAgentInfo, getSelectUserInviteProfit, getUserUnionId} from "~/apis/user";
 const userStore = useUserStore()
 const list = [{
   title: '邀请伙伴',
@@ -18,6 +18,9 @@ const list = [{
 }, {
   title: '去提现',
   url: '/pages/immediate-withdrawal/index'
+},{
+  title: '支付平台绑定',
+  url: '/pages/third_party_binding/index'
 }]
 
 
@@ -43,6 +46,24 @@ const userInviteProfit = reactive({
 })
 onLoad(() => {
   console.log('load...')
+  uni.login({
+    provider: 'weixin',
+    univerifyStyle: {
+      fullScreen: true
+    },
+    success: result => {
+      // console.log(result)
+      getUserUnionId({
+        code: result.code,
+        source: 'cxb'
+      }).then(unionRes => {
+        console.log(111111, unionRes)
+        // const shareId = Cache.get('SHARE_ID')
+        //存储openid
+        userStore.setOpenid(unionRes.openid)
+      })
+    }
+  })
   getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
     // console.log(res)
     const inviteData = res.data

src/pages/my-rules/index.vue

@@ -2,8 +2,8 @@
 // import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
 
-import {encodePhone} from "../../utils";
-import {getAgentInfo, getRules, getUserInfo} from "~/apis/user";
+import { encodePhone } from "../../utils";
+import { getAgentInfo, getRules, getUserInfo } from "~/apis/user";
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -19,119 +19,205 @@ const ruleDetail = ref<{
 const currentType = ref<any>([])
 
 const showUpgradeInfo = ref(false)
+
+// const userType = computed(() => {
+//   const userRichType = userStore.userInfo?.user_rich_type
+//   // console.log(userStore.userInfo)
+//   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
+//   // 创始人
+//   if (userRichType == 3) {
+//     if (bangfu) {
+//       return ['创始人', bangfu]
+//     }
+//     return ['创始人']
+//     // return [].push()
+//   }
+//   // 普通用户
+//   if (userRichType == 0) {
+//     if (bangfu) {
+//       return ['用户', bangfu]
+//     }
+//     return ['用户']
+//   }
+//   // 会员
+//   if (userRichType == 1) {
+//     if (bangfu) {
+//       return ['会员', bangfu]
+//     }
+//     return ['会员']
+
+//   }
+//   if (userRichType == 3) {
+//     if (bangfu) {
+//       return ['创始人', bangfu]
+//     }
+//     return ['创始人']
+//   }
+//   // 合伙人
+//   if (userRichType == 4) {
+//     // return '高级会员'
+//     if (bangfu) {
+//       return ['VIP', bangfu]
+//     }
+//     return ['VIP']
+//   }
+//   if (userRichType == 5) {
+//     if (bangfu) {
+//       return ['初始级合伙人', bangfu]
+//     }
+//     return ['初始级合伙人']
+//   }
+//   if (userRichType == 6) {
+//     if (bangfu) {
+//       return ['中级合伙人', bangfu]
+//     }
+//     return ['中级合伙人']
+//   }
+//   if (userRichType == 7) {
+//     if (bangfu) {
+//       return ['高级合伙人', bangfu]
+//     }
+//     return ['高级合伙人']
+//   }
+//   if (!userRichType) {
+//     if (bangfu) {
+//       return ['用户', bangfu]
+//     }
+//     return ['用户']
+//   }
+// })
+// /*
+// const userType = computed(() => {
+//   const userRichType = userStore.userInfo?.user_rich_type
+
+//   // 创始人
+//   if (userRichType == 3) {
+//     return '创始人'
+//   }
+//   // 普通用户
+//   if (userRichType == 0) {
+//     return '用户'
+//   }
+//   // 会员
+//   if (userRichType == 1) {
+//     return '会员'
+//   }
+//   if (userRichType == 3) {
+//     return '创始人'
+//   }
+//   // 合伙人
+//   if (userRichType == 4) {
+//     // return '合伙人(VIP)'
+//     return 'VIP'
+//   }
+//   if (userRichType == 5) {
+//     return '初始级合伙人'
+//   }
+//   if (userRichType == 6) {
+//     return '中级合伙人'
+//   }
+//   if (userRichType == 7) {
+//     return '高级合伙人'
+//   }
+//   if (!userRichType) {
+//     return '用户'
+//   }
+// })
+// */
+
+//0:普通用户 1:会员  3:创始人 4:高级会员  8合伙人 9联合创始人
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
-  // console.log(userStore.userInfo)
+  // console.log('我是大哥',userStore.userInfo)
   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
-  // 创始人
-  if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
-    // return [].push()
-  }
+  // console.log('我是帮扶',bangfu);
+  
   // 普通用户
   if (userRichType == 0) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/用户.png']
   }
   // 会员
   if (userRichType == 1) {
-    if (bangfu) {
-      return ['会员', bangfu]
-    }
-    return ['会员']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/会员.png']
 
   }
+    // 创始人
   if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/创始人.png']
   }
   // 合伙人
   if (userRichType == 4) {
     // return '高级会员'
-    if (bangfu) {
-      return ['VIP', bangfu]
-    }
-    return ['VIP']
-  }
-  if (userRichType == 5) {
-    if (bangfu) {
-      return ['初始级合伙人', bangfu]
-    }
-    return ['初始级合伙人']
-  }
-  if (userRichType == 6) {
-    if (bangfu) {
-      return ['中级合伙人', bangfu]
-    }
-    return ['中级合伙人']
-  }
-  if (userRichType == 7) {
-    if (bangfu) {
-      return ['高级合伙人', bangfu]
-    }
-    return ['高级合伙人']
-  }
-  if (!userRichType) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
-  }
-})
-/*
-const userType = computed(() => {
-  const userRichType = userStore.userInfo?.user_rich_type
-
-  // 创始人
-  if (userRichType == 3) {
-    return '创始人'
-  }
-  // 普通用户
-  if (userRichType == 0) {
-    return '用户'
-  }
-  // 会员
-  if (userRichType == 1) {
-    return '会员'
-  }
-  if (userRichType == 3) {
-    return '创始人'
-  }
-  // 合伙人
-  if (userRichType == 4) {
-    // return '合伙人(VIP)'
-    return 'VIP'
-  }
-  if (userRichType == 5) {
-    return '初始级合伙人'
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/高级会员.png']
   }
-  if (userRichType == 6) {
-    return '中级合伙人'
+  if (userRichType == 8) {
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/合伙人.png']
   }
-  if (userRichType == 7) {
-    return '高级合伙人'
+  if (userRichType == 9) {
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/联合创始人.png']
   }
   if (!userRichType) {
-    return '用户'
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['']
   }
 })
-*/
-
+//0:普通用户 1:股东
+// const AlholderType = computed(() => {
+//   const stockholder = userStore.userInfo?.stockholder
+//   console.log('我是stockholder',userStore.userInfo.stockholder)
+//   // 普通用户
+//   if (stockholder == 0) {
+//     return ['']
+//   }
+//   // 股东
+//   if (stockholder == 1) {
+//     return ['../../static/img-hy/股东.png']
+//   }
+  
+// })
+// '':普通用户 district-区/县代 city-市代',
+// const areaType = computed(() => {
+//   const areamanage = userStore.userInfo?.area_manage_type
+//   console.log('我是area_manage_type',userStore.userInfo.area_manage_type)
+//   // 县/区代理
+//   if (areamanage == 'district') {
+//     return ['../../static/img-hy/district.png']
+//   }
+//   // 市代理
+//   if (areamanage == 'city') {
+//     return ['../../static/img-hy/city.png']
+//   }
+//   //普通用户
+//   if(!areamanage){
+//     return['']
+//   }
+  
+// })
+
+
+
+onLoad(async () => {
 
-onLoad(async (option) => {
-  // console.log(option)
-  if (option && option.userType) {
-    currentType.value = [option.userType]
-  } else {
-    currentType.value = userType
-  }
   await userStore.getUserInfo()
   await userStore.getUserYanglaoJin()
 })
@@ -166,25 +252,32 @@ function handleShowAnnuityDetail() {
 const ruleId = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
 
-  // console.log(userRichType)
+  console.log('我是》》》',userRichType)
   // 创始人
-  if (userRichType === 3) {
+  if (userRichType == 3) {
     return 21
   }
   // 用户
-  if (userRichType === 0) {
+  if (userRichType == 0) {
     return 18
   }
   // 会员
-  if (userRichType === 1) {
+  if (userRichType ==1) {
     return 19
   }
-  // 合伙人
-  if (userRichType === 2 || userRichType == 4) {
+  // 高级会员
+  if (userRichType == 4) {
     return 20
   }
-
-  return 18
+  // 合伙人
+  if (userRichType == 8 ) {
+    return 24
+  }
+  //联合创始人
+  if (userRichType == 9 ) {
+    return 22
+  }
+  
 })
 const agentInfo = ref({})
 
@@ -193,6 +286,8 @@ onShow(() => {
   if (ruleId.value) {
     // console.log(ruleId.value)
     getRules(ruleId.value).then(res => {
+      console.log(1111111222,res);
+      
       ruleDetail.value = res
     }).catch(error => {
       uni.showToast({
@@ -208,9 +303,21 @@ onShow(() => {
 })
 
 function handleUserUpgrade() {
-  if (ruleId.value < 21) {
+  console.log('ruleid',ruleId.value);
+  
+  if (ruleId.value < 20) {
     const id = ruleId.value + 1
     getRules(id).then(res => {
+      console.log('woshi111',res);
+      
+      ruleDetail.value = res
+      showUpgradeInfo.value = true
+    })
+  }else if(ruleId.value = 20){
+    const id = ruleId.value + 4
+    getRules(id).then(res => {
+      console.log('我是合伙人',res);
+      
       ruleDetail.value = res
       showUpgradeInfo.value = true
     })
@@ -229,10 +336,8 @@ function handleToVipPage() {
     <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <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"
-                 class="w-9 h-9 rounded-full"
-          ></image>
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+            class="w-9 h-9 rounded-full"></image>
 
           <div class="flex">
             <div class="flex flex-col">
@@ -246,51 +351,38 @@ function handleToVipPage() {
               </div>
             </div>
             <div class="flex gap-1 items-center px-1">
-              <div
-                  v-for="(item, index) in currentType"
-                  :key="index"
-                  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">
-                {{ item }}
+              <div class="flex rounded-full  text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
+                <image class="vip_img" :src="userType" v-if="userType"></image>
+                <!-- <image class="vip_img" :src="AlholderType" v-if="AlholderType
+                  "></image>
+                <image class="vip_img" :src="areaType" v-if="areaType"></image> -->
               </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 w-fit px-1">-->
-<!--              {{ userType }}-->
-<!--            </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 w-fit px-1">-->
+            <!--              {{ userType }}-->
+            <!--            </div>-->
           </div>
 
 
         </div>
         <div class="bg-white rounded flex flex-col gap-6 py-4 text-xl">
-          <div
-              v-if="userStore.userInfo"
-              class="flex flex-wrap">
-            <div
-                @tap="handleShowAnnuityDetail"
-                class="w-1/3 flex flex-col justify-center items-center"
-            >
+          <div v-if="userStore.userInfo" class="flex flex-wrap">
+            <div @tap="handleShowAnnuityDetail" class="w-1/3 flex flex-col justify-center items-center">
               <div>{{ userStore.yanglao.all_yanglao }}</div>
               <div class="text-xs">养老金</div>
             </div>
-            <div
-                @tap="handleShowMyInvitation"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0' }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
-            <div
-                @tap="handleShowMyIntegral"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.score }}</div>
               <div class="text-xs">我的积分</div>
             </div>
           </div>
-          <div
-              v-if="userStore.userInfo"
-              class="flex">
-            <div
-                @click="handleToRedIntegral"
-                class="w-1/2 flex flex-col justify-center items-center">
+          <div v-if="userStore.userInfo" class="flex">
+            <div @click="handleToRedIntegral" class="w-1/2 flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.red }}</div>
               <div class="text-xs">红积分提现</div>
             </div>
@@ -304,22 +396,14 @@ function handleToVipPage() {
 
       </div>
 
-      <div
-          v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo"
-          class="p-3 bg-white text-sm text-gray-500"
-      >
+      <div v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo" class="p-3 bg-white text-sm text-gray-500">
         <mpHtml :content="ruleDetail.content"></mpHtml>
       </div>
-      <div
-          v-else
-          class="p-3 bg-white text-sm text-gray-500"
-      >
+      <div v-else class="p-3 bg-white text-sm text-gray-500">
         <mpHtml :content="ruleDetail.content" v-if="ruleDetail && ruleDetail.content"></mpHtml>
 
         <div class="flex justify-center items-center">
-          <nut-button
-              @click="handleToVipPage"
-              type="primary" size="small">立即开通</nut-button>
+          <nut-button @click="handleToVipPage" type="primary" size="small">立即开通</nut-button>
 
         </div>
       </div>
@@ -330,10 +414,8 @@ function handleToVipPage() {
         <div class="font-bold">还有更多奖励权益</div>
         <div class="flex justify-end">
 
-          <div
-              @click="handleUserUpgrade"
-              class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600"
-          >了解更多奖励</div>
+          <div @click="handleUserUpgrade"
+            class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600">了解更多奖励</div>
         </div>
       </div>
 
@@ -341,8 +423,6 @@ function handleToVipPage() {
 
     </div>
   </div>
-
-
 </template>
 
 <route lang="yaml">
@@ -355,7 +435,13 @@ style:
 </route>
 
 <style>
-page{
+page {
   background: #f5f5f5;
 }
+
+.vip_img {
+  width: 48px;
+  height: 24px;
+  margin-left: 2px;
+}
 </style>

src/pages/order-confirm/index.vue

@@ -60,6 +60,7 @@ onLoad(async (options) => {
   //   })
   // }
   const res = await getUserAddressList()
+  console.log('我可是res啊',res)
   if (res.list && res.list.length > 0) {
     data.addressInfo = res.list[0]
     data.addressId = res.list[0].address_id
@@ -226,6 +227,11 @@ function handleAddressSelect() {
     url: '/pages/user/address/index?from=order'
   })
 }
+function gotoCoupon() {
+  uni.navigateTo({
+    url: '/pages/to-coupon/to-coupon'
+  })
+}
 function handleNumberChange(num, goodItem) {
   console.log(goodItem)
   uni.showLoading()
@@ -241,9 +247,12 @@ function reTotal() {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log(res)
+    console.log('我可是res啊',res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
+    console.log('data.cartOrder',data.cartOrder);
+    
+    
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
@@ -331,7 +340,7 @@ function reTotal() {
               </div>
               <div class="flex flex-col w-full">
                 <div class="flex flex-col ">
-                  <div class="line-clamp-2 text-xs">
+                  <div class="line-clamp-1 text-xs">
                     {{ orderProductItem.product.store_name }}
                   </div>
                   <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
@@ -352,16 +361,18 @@ function reTotal() {
 
           </div>
           <div>
+            <!-- 优惠券数据 先写死 -->
             <FCell
                 v-if="item.mer_id != '148'"
                 title="优惠劵"
-                :value="item.order.coupon_price ? item.order.coupon_price : '暂无优惠券'"
+                :value="item.order.youhui_price!=0 ? item.order.youhui_price : '暂无优惠券'"
                 arrow
+                @click="gotoCoupon"
             ></FCell>
             <FCell
                 v-if="item.mer_id == '148'"
                 title="积分"
-                :value="userStore.userInfo.score ? userStore.userInfo.score : '暂无积分'"
+                :value="userStore.userInfo.score!='0' ? userStore.userInfo.score : '暂无积分'"
                 arrow
             ></FCell>
             <FCell

src/pages/order/components/AllItemList.vue

@@ -14,7 +14,6 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-
   list: []
 })
 
@@ -35,7 +34,11 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize
   }).then(res => {
+<<<<<<< HEAD
     // console.log(res)
+=======
+    console.log('>>>>>',res)
+>>>>>>> li-yi
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/components/OrderItem.vue

@@ -1,16 +1,17 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {OrderListModel} from "~/apis/model/order.model";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {encodeBase64} from "~/utils/http/helper";
-import {deleteAddress} from "~/apis/user";
+import { OrderListModel } from "~/apis/model/order.model";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { encodeBase64 } from "~/utils/http/helper";
+import { deleteAddress } from "~/apis/user";
 import {
   DyProductModel,
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
+import { DcProductModel } from "~/apis/model/dacang.model";
+import { error } from "console";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -38,7 +39,10 @@ const props = defineProps({
 //     }
 //   }
 // })
+//全部订单页面
 function getStatusText(orderItem: OrderListModel) {
+  // console.log('我是》',orderItem.status);
+
   // if (props.status === 5) {
   //   return '未支付'
   // }
@@ -65,7 +69,14 @@ function getStatusText(orderItem: OrderListModel) {
   if (orderItem.status == 4) {
     return '已申请退款'
   }
+<<<<<<< HEAD
   if (orderItem.status == 5) {
+=======
+  if (orderItem.status === 5) {
+    return '已取消订单'
+  }
+  if (orderItem.status === '5') {
+>>>>>>> li-yi
     return '待付款'
   }
 }
@@ -79,23 +90,39 @@ function handleHeaderClick() {
 /**
  * 取消订单
  */
-function handleCancelOrder() {
-  console.log('取消订单操作')
-  cancelOrder(props.orderItem.group_order_id).then(res => {
-    setTimeout(() => {
-      uni.showToast({
-        title: '取消成功',
-        icon: 'none'
-      })
-
-      // if (props.tabValue)
-      uni.$emit('orderCancelFromList', props.tabValue)
-
-    }, 300)
 
-  })
+function handleCancelOrder() {
+  uni.showModal({
+    title: '取消订单',
+    content: '您确定要取消订单吗？',
+    confirmColor: '#FE0032',
+    success: function (modalRes) {
+      if (modalRes.confirm) {
+        console.log('用户点击确定', props.orderItem.group_order_id);
+        cancelOrder(props.orderItem.group_order_id)
+          .then(res => {
+            uni.showToast({
+              title: '取消成功',
+              icon: 'none'
+            });
+            // 如果需要刷新订单列表，可以触发事件
+            // if (props.tabValue)
+            uni.$emit('orderCancelFromList', props.tabValue);
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error, // 或者使用 error 信息
+              icon: 'none'
+            });
+          });
+      } else if (modalRes.cancel) {
+        console.log('用户点击取消', props.orderItem.group_order_id);
+      }
+    }
+  });
 }
 
+
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
@@ -159,7 +186,7 @@ function handleComment(orderItem) {
 }
 
 function handleProductItemClick(
-    item
+  item
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -167,15 +194,17 @@ function handleProductItemClick(
   //     url: `${otherDetailUrl}?params=${params}`
   //   })
   // }
-  // console.log(item)
+  console.log('我是item', item)
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+    url: `/pages/store/product/detail?id=${(item.orderProduct[0])?.product_id}`
   })
 }
 
 
 function handeRefund(orderItem) {
+  console.log('申请售后', orderItem);
+
   uni.navigateTo({
     // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
     url: `/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
@@ -191,9 +220,7 @@ function handleShowObligationOrderDetail(orderItem) {
 
 <template>
   <div class="bg-white rounded p-3">
-    <div
-        @tap.stop="handleHeaderClick"
-        class="flex items-center justify-between f-hairline-bottom pb-3">
+    <div @tap.stop="handleHeaderClick" class="flex items-center justify-between f-hairline-bottom pb-3">
       <div class="flex items-center font-bold gap-2 text-sm justify-between">
         <div class="flex-1 flex items-center gap-2">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
@@ -237,18 +264,23 @@ function handleShowObligationOrderDetail(orderItem) {
 
             </div>
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 5">
-              <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+              <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+                <div class="text-black">取消订单</div>
+              </nut-button>
               <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
             </div>
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 0">
-              <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+              <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery">
+                <div class="text-black">提醒发货</div>
+              </nut-button>
               <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
             </div>
 
 
             <div class="flex justify-end gap-2" v-if="orderProduct.type == 1">
-              <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
+              <nut-button size="small" plain type="default"
+                @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
               <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
 
               <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderProduct)">确认收货</nut-button>
@@ -256,7 +288,8 @@ function handleShowObligationOrderDetail(orderItem) {
             </div>
 
             <div class="flex justify-end gap-2" v-if="orderProduct.status == 2">
-              <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderProduct)">再次购买</nut-button>
+              <nut-button size="small" plain type="default"
+                @tap.stop="handleProductItemClick(orderProduct)">再次购买</nut-button>
               <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderProduct)">去评价</nut-button>
 
             </div>
@@ -265,8 +298,9 @@ function handleShowObligationOrderDetail(orderItem) {
 
       </div>
 
-      <div v-else  @tap.stop="handleShowOrderDetail(orderItem)">
-        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex" class="flex flex-col gap-3">
+      <div v-else @tap.stop="handleShowOrderDetail(orderItem)">
+        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex"
+          class="flex flex-col gap-3">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
               <div class="flex w-20">
@@ -284,7 +318,7 @@ function handleShowObligationOrderDetail(orderItem) {
             </div>
 
             <div class="flex flex-col justify-center items-center">
-<!--              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
+              <!--              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
               <FPrice :price="orderProduct.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
@@ -293,13 +327,22 @@ function handleShowObligationOrderDetail(orderItem) {
 
         </div>
 
-        <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
-          <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+        <div class="flex justify-end gap-2" v-if="orderItem.status === '5'">
+          <!-- <div class="title-line">09:02:00后订单将关闭</div> -->
+          <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+            <div class="text-black">取消订单</div>
+          </nut-button>
           <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
         </div>
+        <div class="flex justify-end gap-2" v-if="orderItem.status === 5">
+
+
+        </div>
         <div class="flex justify-end gap-2" v-if="orderItem.status == 0">
-          <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+          <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery">
+            <div class="text-black">提醒发货</div>
+          </nut-button>
           <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
         </div>
 
@@ -320,6 +363,13 @@ function handleShowObligationOrderDetail(orderItem) {
     </div>
 
   </div>
-
-
 </template>
+<style  scoped>
+.title-line {
+  font-size: 24rpx;
+  /* 字体大小 */
+  color: #333;
+  line-height: 56rpx;
+  margin-right: 80rpx;
+}
+</style> 

src/pages/order/components/OrderObligationItem.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {OrderListModel} from "~/apis/model/order.model";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {encodeBase64} from "~/utils/http/helper";
-import {deleteAddress} from "~/apis/user";
+import { OrderListModel } from "~/apis/model/order.model";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { encodeBase64 } from "~/utils/http/helper";
+import { deleteAddress } from "~/apis/user";
 import {
   DyProductModel,
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
+import { DcProductModel } from "~/apis/model/dacang.model";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -24,6 +24,9 @@ const props = defineProps({
   }
 })
 
+
+
+
 // function detailOrderList(p) {}
 // const dealOrderList =computed(() => {
 //   if (props.orderItem) {
@@ -63,8 +66,16 @@ function getStatusText(orderItem: OrderListModel) {
   if (orderItem.status == 4) {
     return '已申请退款'
   }
+<<<<<<< HEAD
   if (orderItem.status == 5) {
     return '待付款'
+=======
+  if (orderItem.status === 5) {
+    return '待付款'
+  }
+  if (orderItem.status === '5') {
+    return '已取消'
+>>>>>>> li-yi
   }
 }
 
@@ -78,19 +89,34 @@ function handleHeaderClick() {
  * 取消订单
  */
 function handleCancelOrder() {
-  console.log('取消订单操作')
-  cancelOrder(props.orderItem.group_order_id).then(res => {
-    setTimeout(() => {
-      uni.showToast({
-        title: '取消成功',
-        icon: 'none'
-      })
-
-      uni.$emit('orderCancelFromList')
-
-    }, 300)
-
-  })
+  uni.showModal({
+    title: '取消订单',
+    content: '您确定要取消订单吗？',
+    confirmColor: '#FE0032',
+    success: function (modalRes) {
+      if (modalRes.confirm) {
+        console.log('用户点击确定', props.orderItem.group_order_id);
+        cancelOrder(props.orderItem.group_order_id)
+          .then(res => {
+            uni.showToast({
+              title: '取消成功',
+              icon: 'none'
+            });
+            // 如果需要刷新订单列表，可以触发事件
+            // if (props.tabValue)
+            uni.$emit('orderCancelFromList', props.tabValue);
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error, // 或者使用 error 信息
+              icon: 'none'
+            });
+          });
+      } else if (modalRes.cancel) {
+        console.log('用户点击取消', props.orderItem.group_order_id);
+      }
+    }
+  });
 }
 
 function handlePayment() {
@@ -156,7 +182,7 @@ function handleComment(orderItem) {
 }
 
 function handleProductItemClick(
-    item
+  item
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -184,13 +210,56 @@ function handleShowObligationOrderDetail(orderItem) {
     url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}&type=1`
   })
 }
+
+
+
+// const remainingTime: any = ref({
+//   hours: 0,
+//   minutes: 0,
+//   seconds: 0
+// })
+// //计算取消时间
+// function updateRemainingTime(detail: any) {
+//   const currentTime = new Date().getTime();
+//   const endTime = new Date(detail.close_time).getTime();
+//   const timeDifference = endTime - currentTime;
+
+//   // 计算剩余时间
+//   const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+//   const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+//   const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+
+//   // 更新数据
+//   remainingTime.value = {
+//     hours: hours < 10 ? '0' + hours : hours,
+//     minutes: minutes < 10 ? '0' + minutes : minutes,
+//     seconds: seconds < 10 ? '0' + seconds : seconds
+//   }
+// }
+
+
+// // 每秒更新剩余时间
+// const timer = setInterval(() => {
+//   if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
+//     // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+//     clearInterval(timer);
+//     console.log('自动关闭');
+//   }
+//   updateRemainingTime(props.orderItem)
+// }, 1000);
+
+// onUnload(() => {
+//   clearInterval(timer);
+//   console.log('卸载关闭');
+// })
+
+
+
 </script>
 
 <template>
   <div class="mb-3 bg-white rounded p-3">
-    <div
-        @click.stop="handleHeaderClick"
-        class="flex items-center justify-between f-hairline-bottom pb-3">
+    <div @click.stop="handleHeaderClick" class="flex items-center justify-between f-hairline-bottom pb-3">
       <div class="flex items-center font-bold gap-2 text-sm justify-between">
         <div class="flex-1 flex items-center gap-2">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
@@ -214,7 +283,7 @@ function handleShowObligationOrderDetail(orderItem) {
               <div class="flex-1 flex gap-2">
                 <div class="flex w-20 h-20">
 
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                  <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
                 </div>
                 <div class="flex flex-col">
                   <div class="line-clamp-2 text-[12px]">
@@ -236,7 +305,11 @@ function handleShowObligationOrderDetail(orderItem) {
           </div>
         </div>
         <div class="flex justify-end gap-2">
-          <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+          <!-- <div class="title-line">{{ remainingTime.hours }}:{{ remainingTime.minutes }}:{{ remainingTime.seconds }}后订单将关闭
+          </div> -->
+          <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+            <div class="text-black">取消订单</div>
+          </nut-button>
           <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
         </div>
@@ -245,6 +318,14 @@ function handleShowObligationOrderDetail(orderItem) {
     </div>
 
   </div>
-
-
 </template>
+
+<style scoped>
+.title-line {
+  font-size: 24rpx;
+  /* 字体大小 */
+  color: #333;
+  line-height: 56rpx;
+  margin-right: 80rpx;
+}
+</style>

src/pages/order/components/OtherOrderItem.vue

@@ -51,7 +51,7 @@ function handleClick() {
   //   id: product.goods_id,
   //   featured: [product.goods_img]
   // })
-  console.log(product)
+  console.log('woshi111',product)
   // if (product.source == '6') {
   const productId = props.item.source == '1' ? product.goods_sign : product.goods_id
   // console.log(productId)

src/pages/order/components/RefundOrderItem.vue

@@ -48,14 +48,14 @@ function getStatusText(orderItem) {
   }
   if (orderItem.status == 0) {
     // return '待审核'
-    return '退款中'
+    return '审核中'
   }
   if (orderItem.status == 1) {
     // return '待退货'
-    return '退款中'
+    return '审核中'
   }
   if (orderItem.status == 2) {
-    return '退款中'
+    return '审核中'
     // return '待收货'
   }
   if (orderItem.status == 3) {
@@ -192,8 +192,8 @@ function handleShowDetail(orderItem) {
           <div class="f-text-color-2 i-tabler-chevron-right"></div>
 
       </div>
-      <div class=" text-xs flex w-15 justify-end"
-           :class="(orderItem.status == 3 || orderItem.status == -1) ? 'text-gray' : 'text-primary'"
+      <div class=" text-xs flex w-15 justify-end  'text-primary'"
+           
       >
         {{ getStatusText(orderItem) }}
       </div>

src/pages/order/detail.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {encodePhone} from "~/utils";
-import {CDN_URL} from "~/config/app";
-import {useAddressStore} from "~/stores/addressStore";
+import { encodePhone } from "~/utils";
+import { CDN_URL } from "~/config/app";
+import { useAddressStore } from "~/stores/addressStore";
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {decodeBase64, encodeBase64} from "~/utils/http/helper";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { decodeBase64, encodeBase64 } from "~/utils/http/helper";
 
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 const addressStore = useAddressStore()
@@ -25,7 +25,7 @@ onLoad((options) => {
   // console.log(options.detail)
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
-  // detail.value = JSON.parse(decodeBase64(base64Json))
+    // detail.value = JSON.parse(decodeBase64(base64Json))
   }
   if (options.type) {
     state.type = options.type
@@ -64,6 +64,8 @@ onLoad((options) => {
 function handleCancelOrder() {
   console.log('取消订单操作')
   cancelOrder(detail.value.group_order_id).then(res => {
+    console.log('RES',res);
+    
     uni.showToast({
       title: '取消成功',
       icon: 'none'
@@ -73,11 +75,15 @@ function handleCancelOrder() {
       uni.navigateBack()
     }, 300)
 
-  }).catch(error => {
-
-    uni.navigateTo({
-      url: '/pages/user/login/index?key=30'
-    })
+  })
+  .catch(error => {
+    // uni.showToast({
+    //   title: error,
+    //   icon: 'none'
+    // })
+    // uni.navigateTo({
+    //   url: '/pages/user/login/index?key=30'
+    // })
   })
 }
 
@@ -86,7 +92,7 @@ function handlePayment() {
   // const { orderItem } = detail.value
   // console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.group_order_id}&OrderList=${JSON.stringify( detail.value)}`
+    url: '/pages/payment/index?' + `pay_price=${detail.value.pay_price}&order_id=${detail.value.group_order_id}&OrderList=${JSON.stringify(detail.value)}`
     // url: `/pages/payment/index`
   })
 }
@@ -181,14 +187,14 @@ const payType = computed(() => {
 })
 
 const getSymbol = (pay_type: string) => {
-    if (pay_type === '5') {
-      return '积分'
-    } else {
-      return '¥'
-    }
+  if (pay_type === '5') {
+    return '积分'
+  } else {
+    return '¥'
+  }
 }
 function handleProductItemClick(
-    item
+  item
 ) {
   console.log(item.product_id)
   // 大仓
@@ -200,167 +206,165 @@ function handleProductItemClick(
 
 </script>
 <template>
-    <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
-      <div
-          class="rounded bg-white p-3 flex">
-        <div class="flex flex-col flex-1 gap-2">
-          <div class="flex items-center gap-2">
-            <div class="flex text-sm text-gray-500 justify-between items-center w-full">
-              <div class="flex-1 flex items-center gap-2">
-                <div class="w-fit flex">
-                  <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
-                </div>
-                <div class="flex-1 flex">
-                  {{ detail.user_address }}
-                </div>
+  <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
+    <div class="rounded bg-white p-3 flex">
+      <div class="flex flex-col flex-1 gap-2">
+        <div class="flex items-center gap-2">
+          <div class="flex text-sm text-gray-500 justify-between items-center w-full">
+            <div class="flex-1 flex items-center gap-2">
+              <div class="w-fit flex">
+                <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="flex-1 flex">
+                {{ detail.user_address }}
               </div>
+            </div>
 
-              <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
+            <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
 
-            </div>
           </div>
-          <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
-          <div class="flex gap-2 items-center text-xs text-gray-500">
-            <div>
-              {{ detail.real_name }}
-            </div>
-            <div v-if="detail.user_phone">
-              {{ encodePhone(detail.user_phone) }}
-            </div>
+        </div>
+        <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
+        <div class="flex gap-2 items-center text-xs text-gray-500">
+          <div>
+            {{ detail.real_name }}
+          </div>
+          <div v-if="detail.user_phone">
+            {{ encodePhone(detail.user_phone) }}
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="bg-white rounded">
-        <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3" v-if="detail.merchant">
-          <image :src="detail.merchant.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
-          <div>{{ detail.merchant.mer_name }}</div>
-        </div>
+    <div class="bg-white rounded">
+      <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3" v-if="detail.merchant">
+        <image :src="detail.merchant.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
+        <div>{{ detail.merchant.mer_name }}</div>
+      </div>
 
-        <div v-for="(productItem, productIndex) in detail.orderProduct" :key="productIndex" class="p-3">
-          <div class="flex gap-2">
-            <div  @tap.stop="handleProductItemClick(productItem)">
-              <image :src="productItem.cart_info.product.image" mode="widthFix" class="rounded w-20 h-20"></image>
+      <div v-for="(productItem, productIndex) in detail.orderProduct" :key="productIndex" class="p-3">
+        <div class="flex gap-2">
+          <div @tap.stop="handleProductItemClick(productItem)">
+            <image :src="productItem.cart_info.product.image" mode="widthFix" class="rounded w-20 h-20"></image>
 
-            </div>
-            <div class="flex flex-col w-full">
-              <div class="flex flex-col text-sm ">
-                <div class="flex justify-between" @tap.stop="handleProductItemClick(productItem)">
-                  <div class="flex">
-                    {{ productItem.cart_info.product.store_name }}
-                  </div>
-                  <div class="flex">¥{{ productItem.product_price }}</div>
+          </div>
+          <div class="flex flex-col w-full">
+            <div class="flex flex-col text-sm ">
+              <div class="flex justify-between" @tap.stop="handleProductItemClick(productItem)">
+                <div class="flex">
+                  {{ productItem.cart_info.product.store_name }}
                 </div>
+                <div class="flex">¥{{ productItem.product_price }}</div>
+              </div>
 
 
-                <div class="text-[11px] text-gray-500 flex justify-between">
-                  <div class="">{{ productItem.cart_info.productAttr.sku }}</div>
-                  <div class="">共{{ productItem.product_num }}件</div>
-                </div>
-
+              <div class="text-[11px] text-gray-500 flex justify-between">
+                <div class="">{{ productItem.cart_info.productAttr.sku }}</div>
+                <div class="">共{{ productItem.product_num }}件</div>
               </div>
+
             </div>
           </div>
         </div>
+      </div>
 
 
-        <div class=" flex flex-col gap-3 p-3">
-          <div class="flex justify-end" v-if="detail.status == 1 || detail.status == 2 || detail.status == 3 || detail.status == 0">
-            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
-          </div>
-<!--          <div class="flex justify-end" v-if="detail.status == 0">-->
-<!--            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请退款</nut-button>-->
-<!--          </div>-->
+      <div class=" flex flex-col gap-3 p-3">
+        <div class="flex justify-end"
+          v-if="detail.status == 1 || detail.status == 2 || detail.status == 3 || detail.status == 0">
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
+        </div>
+        <!--          <div class="flex justify-end" v-if="detail.status == 0">-->
+        <!--            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请退款</nut-button>-->
+        <!--          </div>-->
 
-          <div class="flex justify-between">
-            <div>商品总额</div>
-            <div class="text-gray">{{getSymbol(detail.pay_type)}}{{ detail.total_price }}</div>
-          </div>
-          <div class="flex justify-between">
-            <div>优惠金额</div>
-            <div class="text-gray">{{getSymbol(detail.pay_type)}}{{ detail.coupon_price }}</div>
-          </div>
-          <div class="flex justify-between">
-            <div>运费</div>
-            <div class="text-gray">
-              {{getSymbol(detail.pay_type)}}{{ detail.pay_postage }}
-            </div>
+        <div class="flex justify-between">
+          <div>商品总额</div>
+          <div class="text-gray">{{ getSymbol(detail.pay_type) }}{{ detail.total_price }}</div>
+        </div>
+        <div class="flex justify-between">
+          <div>优惠金额</div>
+          <div class="text-gray">{{ getSymbol(detail.pay_type) }}{{ detail.coupon_price }}</div>
+        </div>
+        <div class="flex justify-between">
+          <div>运费</div>
+          <div class="text-gray">
+            {{ getSymbol(detail.pay_type) }}{{ detail.pay_postage }}
           </div>
-          <div class="flex justify-between">
+        </div>
+        <div class="flex justify-between">
 
-            <div>实付款</div>
-            <div class="text-gray">
-              <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" symbol="积分" v-if="detail.pay_type == 5"></FPrice>
-              <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" v-else></FPrice>
-            </div>
+          <div>实付款</div>
+          <div class="text-gray">
+            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" symbol="积分" v-if="detail.pay_type == 5">
+            </FPrice>
+            <FPrice :price="detail.pay_price" ex-class="font-bold text-xl" v-else></FPrice>
           </div>
+        </div>
 
-          <div class="h-0.2 bg-gray-100 my-2"></div>
+        <div class="h-0.2 bg-gray-100 my-2"></div>
 
-<!--          <div class="flex justify-between">-->
+        <!--          <div class="flex justify-between">-->
 
-<!--            <div>订单编号</div>-->
-<!--            <div class="text-gray">{{ detail.order_sn }}</div>-->
-<!--          </div>-->
-          <div class="flex justify-between">
-            <div>订单编号</div>
-            <div class="flex gap-2">
-              <div class="text-gray-400">{{ detail.order_sn }}</div>
-              <div @click="handleClipboard">复制</div>
-            </div>
+        <!--            <div>订单编号</div>-->
+        <!--            <div class="text-gray">{{ detail.order_sn }}</div>-->
+        <!--          </div>-->
+        <div class="flex justify-between">
+          <div>订单编号</div>
+          <div class="flex gap-2">
+            <div class="text-gray-400">{{ detail.order_sn }}</div>
+            <div @click="handleClipboard">复制</div>
           </div>
-          <div class="flex justify-between">
+        </div>
+        <div class="flex justify-between">
 
-            <div>支付方式</div>
+          <div>支付方式</div>
 
-            <div class="text-gray">{{ payType }}</div>
-<!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
-          </div>
+          <div class="text-gray">{{ payType }}</div>
+          <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
+        </div>
 
-          <div class="flex justify-between">
+        <div class="flex justify-between">
 
-            <div>下单时间</div>
-            <div class="text-gray">{{ detail.create_time }}</div>
-          </div>
+          <div>下单时间</div>
+          <div class="text-gray">{{ detail.create_time }}</div>
+        </div>
 
-          <div class="flex justify-between" v-if="detail.status != 5">
+        <div class="flex justify-between" v-if="detail.status != 5">
 
-            <div>支付时间</div>
-            <div class="text-gray">{{ detail.pay_time }}</div>
-            <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
-          </div>
+          <div>支付时间</div>
+          <div class="text-gray">{{ detail.pay_time }}</div>
+          <!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
         </div>
-
       </div>
+
     </div>
+  </div>
 
-    <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
-      <div class="flex justify-end gap-2 p-3"
-           v-if="detail.status == 5 || detail.type == 5"
-      >
-        <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
-        <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+  <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 5 || detail.type == 5">
+      <nut-button size="small" type="default" @tap.stop="handleCancelOrder">
+        <div class="text-black">取消订单</div>
+      </nut-button>
+      <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
-      </div>
-      <div class="flex justify-end gap-2 p-3"
-           v-if="detail.status == 0 || detail.type == 0"
-      >
-        <nut-button size="small" type="primary" plain
-                    @tap.stop="handleRemindTheDelivery">提醒发货</nut-button>
+    </div>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 0 || detail.type == 0">
+      <nut-button size="small" type="primary" plain @tap.stop="handleRemindTheDelivery">提醒发货</nut-button>
 
-      </div>
-      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 1 || detail.type == 1">
-        <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics">查看物流</nut-button>
+    </div>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 1 || detail.type == 1">
+      <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics">查看物流</nut-button>
 
-        <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder">确认收货</nut-button>
+      <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder">确认收货</nut-button>
 
-      </div>
+    </div>
 
-      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 2 || detail.type == 2">
-        <nut-button size="small" plain type="primary" @tap.stop="handleComment">去评价</nut-button>
+    <div class="flex justify-end gap-2 p-3" v-if="detail.status == 2 || detail.type == 2">
+      <nut-button size="small" plain type="primary" @tap.stop="handleComment">去评价</nut-button>
 
-      </div>
     </div>
+  </div>
 </template>
 
 <route lang="yaml">

src/pages/order/index.vue

@@ -80,6 +80,7 @@ const getStatusVal = () => {
   }
 }
 onLoad(options => {
+<<<<<<< HEAD
   // console.log(options)
   if (uni.getStorageSync('UID')) {
     if (options && options.tabIndex) {
@@ -96,6 +97,14 @@ onLoad(options => {
         url: '/pages/user/login/index'
       })
     })
+=======
+  console.log('我是options》》',options)
+  if (options && options.tabIndex) {
+    state.tabvalue = options.tabIndex
+  }
+  if (options && options.from) {
+    state.from = options.from
+>>>>>>> li-yi
   }
   // loadAllOrderList()
 

src/pages/order/logistics.vue

@@ -196,7 +196,7 @@ function handleMakePhoneCall() {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          大家都在买
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index-bak.vue

@@ -569,7 +569,7 @@ function handleNumberChange(num, goodItem) {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+      精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index-new.vue

@@ -439,7 +439,7 @@ function handleNumberChange(num, goodItem) {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import {getRecommendList} from "~/apis/merchant";
+import { getRecommendList, getProductDetail } from "~/apis/merchant";
 import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
-import {deleteCartItem, getCartCount, getCartList} from "~/apis/user";
-import type {ShoppingResult} from "~/apis/model/shopping.model";
+import { deleteCartItem, getCartCount, getCartList, xcxBanding } from "~/apis/user";
+import type { ShoppingResult } from "~/apis/model/shopping.model";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
@@ -12,11 +12,14 @@ import {
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-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";
+import { DcProductModel } from "~/apis/model/dacang.model";
+import { createShopping, changeProdoctSku } from "~/apis/order.api";
+import { encodeBase64 } from "~/utils/http/helper";
+import { CDN_URL } from "~/config/app";
+import { uniq } from "lodash-es";
+import { cartChange } from "~/apis/order.api";
+import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+import CXBSkuPopup from "~/components/CXBSkuPopup/CXBSkuPopup.vue";
 const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 const pageStore = usePageStoreWidthOut()
@@ -31,18 +34,99 @@ const state = reactive({
 
 
   totalCartCount: 0,
-  totalPrice: 0,
+  totalPrice: '',
   selectAllIndeterminate: false,
 
   cart_id: [],
+  changeSkuCart_id: '0',
   isManage: true,
 
   currentType: '',
+
+  isShowSku: false,
+  cartNum: 1,
+  currentSku: {
+    unique: ''
+  },
+  //新增
+  shareImage: '',
+  isRelation: '',
+  shareId: '',
+  status: '',
 })
+let uniqueclone = ref('')
+const detail: any = ref(null)
 
-const shopping = ref<ShoppingResult>()
 
+function onSelectedSku(currentSku: any) {
+  console.log("item", currentSku);
+
+  state.currentSku = currentSku
+
+}
+
+
+function handleCreateShopping() {
+  // console.log(state.flag)
+  console.log(state.currentSku.unique, '切换sku展示的商品', state.changeSkuCart_id)
+  uniqueclone.value = state.currentSku.unique
+  changeProdoctSku(
+    // product_attr_unique: JSON.stringify(state.currentSku),
+    // detail.value.unique
+    state.changeSkuCart_id,
+    state.currentSku.unique
+  ).then(res => {
+    console.log('我是res123', res)
+
+    // if (res.cart_id) {
+    //   // console.log(state.flag)
+    //   if (state.flag == '1' || state.flag == '3') {
+    //     uni.navigateTo({
+    //       url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
+    //     })
+    //   } else {
+    //     uni.$emit('cart-reload')
+    //     uni.showToast({
+    //       title: '添加购物车成功',
+    //       icon: 'none'
+    //     })
+    //     loadCartCount()
+    //     state.isShowSku = false
+    //   }
+    // }
+
+    if (res.status === 200) {
+      state.isShowSku = false
+      console.log("修改后", state.currentSku);
+      console.log('我是uniqueclone', uniqueclone);
+      detail.value.unique = uniqueclone.value
+    }
+
+    uni.$on('cart-reload', () => {
+      // console.log('新商品添加...')
+      state.cart_id = []
+      loadCartList()
+    })
+
+    state.cart_id = []
+    loadCartList()
+  })
+}
+
+function handleCountChange(val) {
+  // console.log(val)
+  // detail.value.
+  // if (val > 0) {
+  state.cartNum = val
+  // }
+}
+
+// 距离顶部距离
+let Scroll_X = ref(0)
+
+const shopping = ref<ShoppingResult>()
 onBeforeMount(() => {
+<<<<<<< HEAD
 
   if (!userStore.uid) {
 
@@ -50,17 +134,30 @@ onBeforeMount(() => {
       url: '/user/login/index'
     })
   }
+=======
+  userStore.setRedirectPage(`/pages/order_addcart/index`, 'tab')
+>>>>>>> li-yi
 })
 
 // nextTick(() => {
 //   loadCartList()
 // })
 onLoad((options) => {
+<<<<<<< HEAD
   userStore.setRedirectPage(`/pages/order_addcart/index`, "tab");
 
 
+=======
+
+  if (!userStore.uid) {
+    return uni.redirectTo({
+      url: '/pages/user/login/index'
+    })
+  }
+>>>>>>> li-yi
   uni.$on('cart-reload', () => {
     // console.log('新商品添加...')
+    state.recommendList = []
     state.cart_id = []
     loadCartList()
   })
@@ -82,6 +179,7 @@ onShow(() => {
     state.isManage = true
   }
   loadCartCount()
+  loadCartList()
   loadList('reload')
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -130,8 +228,21 @@ onReachBottom(() => {
 
 })
 
+//监视用户变化
+// watch(() => userStore.uid, (newUid, oldUid) => {
+//   // 在这里处理 uid 变化的逻辑
+//   console.log('uid 变化了，新值:', newUid, '旧值:', oldUid);
+//   if (newUid != oldUid && newUid != null) {
+//     loadCartList()
+//   }
+
+//   // 你可以在这里执行其他操作，例如发起网络请求等
+// })
+
+
 // 加载购物车数据
 function loadCartList() {
+
   uni.showLoading({
     title: '加载中',
     icon: 'none'
@@ -139,9 +250,11 @@ function loadCartList() {
   // state.totalCartCount = 0
   getCartList().then(res => {
     uni.hideLoading()
+    console.log('我是初始化gwc数据', res);
+
     shopping.value = res
 
-    // console.log(res)
+    // console.log('shoping',res)
     shopping.value?.list.forEach((shopItem, index) => {
       // shopItem.allCheck = true
 
@@ -212,14 +325,16 @@ function shopCheck(shopItem) {
 }
 
 function handleShopTitleClick(shopItem) {
+  console.log('shopItem', shopItem);
+
   if (shopItem.allCheck) {
-        shopItem.list.forEach((good, index) => {
-          good.check = true
-        })
+    shopItem.list.forEach((good, index) => {
+      good.check = true
+    })
   } else {
-        shopItem.list.forEach((good, index) => {
-          good.check = false
-        })
+    shopItem.list.forEach((good, index) => {
+      good.check = false
+    })
   }
 }
 function cartAllCheck(type: 'single' | 'all') {
@@ -359,7 +474,7 @@ function handleSubmit() {
   }
 
 }
-
+//删除功能
 function handleDelete() {
   // const cart_id = <any>[]
   shopping.value?.list.forEach(shopItem => {
@@ -402,13 +517,13 @@ function handleDelete() {
 
 
 function handleProductItemClick(
-    item:
-        JdProductModel
-        & DcProductModel
-        & DyProductModel
-        & SuNingProductModel
-        & TaobaoProductThirdPartyWaresModel
-        & VipProductModel
+  item:
+    JdProductModel
+    & DcProductModel
+    & DyProductModel
+    & SuNingProductModel
+    & TaobaoProductThirdPartyWaresModel
+    & VipProductModel
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -436,24 +551,76 @@ function handleNumberChange(num, goodItem) {
   // goodItem.productAttr.price = goodItem.productAttr.price * num
   // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
 }
+const headerClass = ref('')
+onPageScroll((page) => {
+  // console.log('滚轮事件触发了',page.scrollTop.toFixed());
+
+  // console.log(page.scrollTop.toFixed(),'距离顶部的距离')
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+  if (page.scrollTop >= 76) {
+    headerClass.value = 'bg-white !text-gray-900'
+  } else {
+    headerClass.value = ''
+  }
+})
+
+function openTestLog(element) {
+  state.isShowSku = true
+  state.changeSkuCart_id = element.cart_id
+  console.log('用户点击sku', element.product_attr_unique)
+  uniqueclone.value = ''
+  getProductDetail(element.product_id).then(res => {
+    console.log('res>>>', res);
+    uniqueclone.value = element.product_attr_unique
+    detail.value = res.data
+    detail.value.unique = uniqueclone.value
+    console.log(detail.value, '点击sku获取的商品信息，存储的detail')
+    state.shareImage = detail.value.image
+    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 (res.merchant_type == 2) {
+      xcxBanding({
+        mer_id: res.mer_id,
+        share_id: state.shareId
+      }).then(res => {
+        console.info(res)
+      })
+    }
+    uni.hideLoading()
+  }).catch(error => {
+    uni.showToast({
+      icon: "none",
+      title: error
+    }).then(() => {
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 500)
+    })
+  })
+}
+
+//卸载
+onUnload(() => {
+  state.recommendList = []
+  state.cart_id = []
+})
+
 </script>
 <template>
   <div class="">
-    <div
-        v-if="hasShopping"
-        class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end "
-    >
+    <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+    <div v-if="hasShopping" class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end ">
       <div class="pr-3">
-        <FButton size="small"
-                 @click="handleManageCart"
-        >
-          <div>{{ state.isManage ? '管理' : '完成'}}</div>
+        <FButton size="small" @click="handleManageCart">
+          <div>{{ state.isManage ? '管理' : '完成' }}</div>
         </FButton>
       </div>
     </div>
-    <div
-        v-if="!hasShopping"
-        class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
+    <div v-if="!hasShopping" class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
       <div>
         <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
       </div>
@@ -461,68 +628,52 @@ function handleNumberChange(num, goodItem) {
         暂无商品，去添加喜欢的商品
       </div>
     </div>
-    <div v-else class="mt-10">
-
-      <div
-          v-if="shopping && shopping.list"
-          class="flex flex-col gap-4 p-3"
-      >
-        <div
-            v-for="(shopItem, index) in shopping.list"
-            :key="index"
-            class="bg-white rounded-lg  "
-        >
-          <div
-              class="f-hairline-bottom flex  items-center font-bold p-3"
-          >
+    <div v-else class="mt-10 pb-10 ">
+
+      <div v-if="shopping && shopping.list" class="flex flex-col gap-4 px-3 pt-3 pb-8 ">
+        <div v-for="(shopItem, index) in shopping.list" :key="index" class="bg-white rounded-lg  ">
+          <div class="f-hairline-bottom flex  items-center font-bold p-3">
             <div @tap.stop="handleShopTitleClick(shopItem)">
 
-            <nut-checkbox v-model="shopItem.allCheck"
-                          @change="(checked) => shopCheck( shopItem)"
-                          label="全选"
-                          class="!text-primary"
-            >
-              {{ shopItem.mer_name }}
-            </nut-checkbox>
+              <nut-checkbox v-model="shopItem.allCheck" @change="(checked) => shopCheck(shopItem)" label="全选"
+                class="!text-primary">
+                {{ shopItem.mer_name }}
+              </nut-checkbox>
             </div>
 
           </div>
-          <div v-for="(goodItem, goodIndex) in shopItem.list"
-               :key="goodIndex"
-               class="flex f-hairline-bottom p-3 gap-2"
-          >
+          <div v-for="(goodItem, goodIndex) in shopItem.list" :key="goodIndex" class="flex f-hairline-bottom p-3 gap-2">
             <div class="flex">
-              <nut-checkbox v-model="goodItem.check"
-                            @change="handleGoodsItemCheck"
-                            label="单选"
-                            class="!text-primary"
-              ></nut-checkbox>
-              <image
-                  @click="handleProductItemClick(goodItem)"
-                  :src="goodItem.product.image"
-                  mode="aspectFill" class="w-18 h-18 rounded"
-              ></image>
+              <nut-checkbox v-model="goodItem.check" @change="handleGoodsItemCheck" label="单选"
+                class="!text-primary"></nut-checkbox>
+              <image @click="handleProductItemClick(goodItem)" :src="goodItem.productAttr.image" mode="aspectFill"
+                class="w-18 h-18 rounded"></image>
             </div>
 
             <div class="flex flex-col gap-1 w-full">
-              <div
-                  @click="handleProductItemClick(goodItem)"
-                  class="text-overflow line-clamp-2 text-xs">{{ goodItem.product.store_name }}</div>
+              <div @click="handleProductItemClick(goodItem)" class="  text-overflow line-clamp-1 text-xs">{{
+                goodItem.product.store_name }}</div>
               <div class="flex flex-col justify-start gap-1">
-                <div
-                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
-                  {{ goodItem.productAttr.sku }}
+                <div class="text-[10px] text-gray min-w-5  p-1  items-center flex " v-if="goodItem.productAttr.sku"
+                  @click="openTestLog(goodItem)">
+                  <div class="skushadow">
+                    <span class="m-live">
+                      {{ goodItem.productAttr.sku }}
+                    </span>
+                    <span class="m-lift">
+                      <img class="thumbnail_1" referrerpolicy="no-referrer" src="../../static/icon/下拉.png" />
+                    </span>
+                  </div>
                 </div>
                 <div class="flex">
-                  <CXBYaojinTag :amount="goodItem.yanglao"/>
+                  <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" @change="(num) => handleNumberChange(num, goodItem)"/>
+                <!-- <FPrice :price="goodItem.productAttr.price" ex-class="font-bold text-dark" /> -->
+                <div class="font-bold text-dark" >￥{{ goodItem.productAttr.price }}</div>
+                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)" />
               </div>
             </div>
           </div>
@@ -531,28 +682,24 @@ function handleNumberChange(num, goodItem) {
       </div>
     </div>
 
-    <div class="pb-12">
+    <div class="pb-12" v-if="!hasShopping">
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>
 
       <div class="pb-3 px-3" v-if="state.recommendList">
         <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)"
-          >
+          <div v-for="(item, index) in state.recommendList" :key="index" @click="handleProductItemClick(item)">
             <MerchantProductCard :item="item" />
 
           </div>
         </grid-view>
 
-        <div class=" flex justify-center items-center text-[12px] text-gray-500"
-        >
+        <div class=" flex justify-center items-center text-[12px] text-gray-500">
           <div v-if="state.status === 'loading'">
             加载中...
           </div>
@@ -564,15 +711,12 @@ function handleNumberChange(num, goodItem) {
       </div>
     </div>
   </div>
-
-  <div v-if="hasShopping"
-       class="fixed bottom-0 w-full z-3">
+  <CXBSkuPopup :isTo=1 v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
+    @submit="handleCreateShopping" @count-change="handleCountChange" />
+  <div v-if="hasShopping" class="fixed bottom-0 w-full z-3">
     <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
       <div class="flex justify-center items-center gap-2 pl-3" @tap.stop="handleSelectAll">
-        <nut-checkbox v-model="isAllSelect"
-                      label="全选"
-                      class="!text-primary"
-        >全选
+        <nut-checkbox v-model="isAllSelect" label="全选" class="!text-primary">全选
         </nut-checkbox>
         <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
       </div>
@@ -583,12 +727,9 @@ function handleNumberChange(num, goodItem) {
           <FPrice :price="state.totalPrice"></FPrice>
           <!--          {{totalCartInfo.totalPrice}}-->
         </div>
-        <FButton
-            @click="handleSubmit"
-            size="small"
-            :exClass="['rounded-full','!text-[14px]', 'text-white', 'bg-primary', 'w-full']"
-        >
-          {{ state.isManage? '去结算' : '删除'}}
+        <FButton @click="handleSubmit" size="small"
+          :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
+          {{ state.isManage ? '去结算' : '删除' }}
         </FButton>
       </div>
     </div>
@@ -598,6 +739,39 @@ function handleNumberChange(num, goodItem) {
 page {
   background-color: #f8f8f8;
 }
+
+.skushadow {
+  background-color: rgb(240, 240, 240);
+  border-radius: 10px;
+  height: 38rpx;
+  line-height: 38rpx;
+  font-size: 24rpx;
+  color: #919191;
+  display: flex;
+}
+
+.m-live {
+  max-width: 350rpx;
+  margin-left: 8rpx;
+  margin-right: 4rpx;
+  overflow: hidden;
+  /* 溢出内容隐藏 */
+  white-space: nowrap;
+  /* 不换行 */
+  text-overflow: ellipsis;
+  /* 超出部分显示省略号 */
+}
+
+.m-lift {
+  margin-left: 8rpx;
+  margin-right: 8rpx;
+}
+
+.thumbnail_1 {
+  width: 12rpx;
+  height: 7rpx;
+  margin-bottom: 6rpx;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/payment/index.vue

@@ -27,7 +27,7 @@
 
 
     <div class="fixed bottom-0 pb-safe  w-full">
-      <div class="px-3">
+      <div class="p-4">
         <nut-button block type="primary" @click="handleConfirm">立即支付</nut-button>
       </div>
 
@@ -61,6 +61,7 @@ const state = reactive({
   tabIndex: NaN,
 })
 onLoad((options) => {
+	// console.log('我是options',options)
   if (options) {
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
@@ -71,15 +72,15 @@ onLoad((options) => {
       state.tabIndex = options.tabIndex
     }
 
-    // uni.login({
-    //   success: (res) => {
-    //     state.code = res.code
-    //   }
-    // })
+    uni.login({
+      success: (res) => {
+        state.code = res.code
+      }
+    })
 
-    // checkGroupOrder(state.orderId).then(res => {
-    //   state.memberType = res.message
-    // })
+    checkGroupOrder(state.orderId).then(res => {
+      state.memberType = res.message
+    })
   }
 })
 
@@ -101,7 +102,11 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
+<<<<<<< HEAD
     envVersion: 'trial', // develop（开发版）,trial（体验版） release（正式版）
+=======
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+>>>>>>> li-yi
     // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功

src/pages/payment/success.vue

@@ -18,12 +18,12 @@ function goHome() {
 </script>
 
 <template>
-<!--<CXBBasePage>-->
-<!--  <FNavBar-->
-<!--      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"-->
-<!--      ex-class="bg-white w-screen"-->
-<!--      @click-left="onClickLeft"-->
-<!--  />-->
+<!-- <CXBBasePage> -->
+ <FNavBar
+     title="支付成功" :left-arrow="false" fixed placeholder z-index="999"
+     ex-class="bg-white w-screen"
+     @click-left="onClickLeft"
+ />
 
 
   <div class="flex flex-col h-screen w-screen items-center mt-20 pt-20">

src/pages/pension_account/index.vue

@@ -10,6 +10,8 @@ const userYangLaoJin = ref({})
 
 onLoad(() => {
   getUserYangLaoJin().then(res => {
+    console.log('养老保险',res);
+    
     userYangLaoJin.value = res
   })
 })

src/pages/product/dingshenglianmeng.vue

@@ -1,6 +1,7 @@
 <template>
 
     <scroll-view>
+<<<<<<< HEAD
 		<div class="h-45">
 		  <swiper
 		      v-if="state.banners"
@@ -18,15 +19,25 @@
 		  </swiper>
 		</div>
       <div class="p-3" v-if="list && list.length > 0">
+=======
+      <div class="h-45">
+        <swiper v-if="state.banners" :indicator-dots="state.indicatorDots" indicator-active-color="#e93323"
+          :autoplay="state.autoplay" :circular="state.circular" :interval="state.interval" :duration="state.duration"
+          class=" h-full">
+          <swiper-item v-for="(item, index) in state.banners" :key="index">
+            <image :src="item.pic" class="!w-full !h-full" mode="aspectFill" />
+          </swiper-item>
+        </swiper>
+      </div>
+      <div class="p-3">
+        <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+>>>>>>> li-yi
         <div>
-          <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
-            <div v-for="(item, index) in list"
-                 @tap="handleItemClick(item)"
-                 :key="index"
-            >
+          <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+            <div v-for="(item, index) in list" @tap="handleItemClick(item)" :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" />
+                <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 }}
@@ -37,7 +48,7 @@
                   </div>
                   <div class="line-through text-xs font-bold text-gray-400 flex ">
                     <div>
-                      ¥ {{item.ot_price}}
+                      ¥ {{ item.ot_price }}
                     </div>
                   </div>
                 </div>
@@ -61,15 +72,15 @@
 
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {getTypeProductList} from "~/apis/merchant";
-import {getHomeBanner} from "~/apis/common";
-
+import { getTypeProductList } from "~/apis/merchant";
+import { getHomeBanner } from "~/apis/common";
+import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
   banners: [],
-  keyword: '' ,
+  keyword: '',
   status: 'noMore',
   indicatorDots: false,
   circular: true,
@@ -77,35 +88,43 @@ const state = reactive({
   interval: 5000,
   duration: 500,
   currents: "0",
-  title:'',
-  type:'',
+  title: '',
+  type: '',
 })
-const list = ref()
+const list = ref([])
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=`+item.product_id
+    url: `/pages/store/product/detail?id=` + item.product_id
   })
 }
 
 onLoad((option) => {
-	state.type=option.type;	//获取url参数
-	if(state.type=='jingpin'){
-		state.title='精品大仓'
-	}else if(state.type=='dingsheng'){
-		state.title='鼎盛联盟'
-	}
+  state.type = option.type;	//获取url参数
+  if (state.type == 'jingpin') {
+    state.title = '精品商城'
+  } else if (state.type == 'dingsheng') {
+    state.title = '鼎盛联盟'
+  } 
 
 
+<<<<<<< HEAD
 	getHomeBanner(state.type+"_banner").then(res => {
 		state.banners = res
 	})
 	loadList('reload')
+=======
+  getHomeBanner(state.type + "_banner").then(res => {
+    state.banners = res
+  })
+  loadList('reload')
+>>>>>>> li-yi
 
 })
 
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+<<<<<<< HEAD
 	if (action === 'reload') {
 	  state.currentPage = 1
 	}
@@ -132,6 +151,34 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 			}
 		}
 	})
+=======
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+
+  const params = {
+    type: state.type,
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  getTypeProductList({
+    ...params
+  }).then(res => {
+    if (res) {
+      if (action === 'reload') {
+        list.value = res.list
+      } else if (action === 'page') {
+        list.value = list.value.concat(res.list)
+      }
+      state.totalPage = Math.ceil(res.count / state.pageSize);
+      state.status = 'more'
+
+      if (callback) {
+        callback(res.list)
+      }
+    }
+  })
+>>>>>>> li-yi
 }
 
 
@@ -158,20 +205,33 @@ onReachBottom(() => {
 })
 
 onPullDownRefresh(() => {
-  loadList('reload', function() {
+  loadList('reload', function () {
     setTimeout(() => {
       uni.stopPullDownRefresh()
     }, 300)
   })
 })
 
-onShow(() =>{
-    uni.setNavigationBarTitle({
-      title: state.title // 设置新的导航栏标题
-    });
+onShow(() => {
+  uni.setNavigationBarTitle({
+    title: state.title // 设置新的导航栏标题
+  });
 })
 
 
+// 距离顶部距离
+let Scroll_X = ref(0)
+const headerClass = ref('')
+onPageScroll((page) => {
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+  // page.scrollTop
+  if (page.scrollTop >= 76) {
+    headerClass.value = '!bg-primary !text-white'
+  } else {
+    headerClass.value = ''
+  }
+})
+
 </script>
 
 <route lang="yaml">

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

@@ -263,7 +263,7 @@ function formatName (str) {
           <image  v-if="formData.card_positive && !state.isCertified"
                   :src="formData.card_positive"
                   @tap="handleUploadImg('positive')"
-                  mode="aspectFit" class="w-60 h-40"></image>
+                  mode="scaleToFill" class="w-60 h-40"></image>
           <image v-else
                  :src="front_220714Image"
                  @tap="handleUploadImg('positive')"
@@ -279,7 +279,7 @@ function formatName (str) {
           <image  v-if="formData.card_reverse && !state.isCertified"
                   :src="formData.card_reverse"
                   @tap="handleUploadImg('reverse')"
-                  mode="widthFix" class="w-60"></image>
+                  mode="scaleToFill" class="w-60 h-40 "></image>
           <image v-else
                  :src="verso_220714Image"
                  @tap="handleUploadImg('reverse')"

src/pages/refund/drawback.vue

@@ -90,7 +90,10 @@ function handleSubmit() {
       if (res.confirm) {
         refundApply(state.orderId.toString(), formData).then(res => {
           // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
-          uni.showToast({
+          console.log('申请退款成功',res);
+          
+          if(res.status===200){
+             uni.showToast({
             title: '申请退款成功',
             icon: 'none'
           })
@@ -99,10 +102,26 @@ function handleSubmit() {
               url: `/pages/refund/index?from=${state.from}`
             })
           }, 300)
+          }else{
+            uni.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+          setTimeout(() => {
+            uni.navigateTo({
+              url: `/pages/refund/index?from=${state.from}`
+            })
+          }, 300)
+          }
+         
         })
 
       }
-    }
+    },
+    fail: function (error) {
+    // 模态框显示失败，可能是因为参数不合法等原因
+    console.log('模态框显示失败', error);
+  }
   })
   // if (state.orderId) {
   // }

src/pages/refund/option.vue

@@ -91,7 +91,7 @@ function handleChooseType(refund_type) {
             <image :src="woyaotuihuotuikuanIcon" mode="widthFix" class="w-5 h-5"></image>
             <div>
               <div class="font-bold">我要退货退款</div>
-              <div class="text-gray-500">已收到货，需要退还已收到饿货物</div>
+              <div class="text-gray-500">已收到货，需要退还已收到货物</div>
             </div>
           </div>
         </div>

src/pages/setting/index.vue

@@ -64,7 +64,7 @@ function onOk() {
     </div>
 
     <div class="fixed bottom-0 pb-safe w-full">
-      <div class="px-10 ">
+      <div class="px-10 py-4 ">
         <div
             @tap="handleLogout"
             class="text-center text-white bg-primary rounded-full text-sm p-2"

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

@@ -57,15 +57,18 @@ const is148Merchant = computed(() => {
       <div class="line-clamp-2">
         {{item.store_name}}
       </div>
-      <div v-if="!is148Merchant" class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
+      <div v-if="item.type!=15" >
+        <div v-if="!is148Merchant" 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-09-15/20230915160858609.png"
                mode="widthFix" class="!w-8.5"></image>
-        <div class="px-2 flex items-center jusitify-center text-xs">
+        <div class="px-2 flex items-center jusitify-center text-xs"  >
           <div>
             养老金 ¥{{item.yanglao || item.yanglao_price}}
           </div>
         </div>
       </div>
+      </div>
+      
       <div class="flex flex-row items-center gap-2">
         <div v-if="is148Merchant && item.price" class="flex justify-end items-end gap-2 text-[#FE0032]">
           <div class="!text-[24px]">{{ Number.parseFloat(item.price * 30).toFixed(2) }} </div>

src/pages/store/nearby/index.vue

@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import {getMerchantCategory, getSelectMerchant, getSelectMerchantSort} from "~/apis/merchant";
-import type {StoreResult} from "~/apis/model/storeModel";
-import {StoreParams} from "~/apis/model/storeModel";
+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";
-import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
-import {getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { USER_LATITUDE, USER_LONGITUDE } from "~/constants";
+import { getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const usePageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
@@ -48,9 +48,12 @@ const state = reactive({
   menuDefaultValue: 1
   // merchantPageInfo: {}
 })
+//返回顶部标识
+let flag = ref(false)
+
 const searchValue = ref('')
 
-const {windowHeight} = uni.getSystemInfoSync()
+const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 45
 
 onLoad((option) => {
@@ -99,7 +102,7 @@ onShow(() => {
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/store/nearby/index'
+      url: '/pages/store/nearby/index'
     }
   })
   // console.log('onshow...')
@@ -206,6 +209,11 @@ const onRefresherRefresh = e => {
   loadSelectMerchant('reload')
 };
 
+//小火箭滚动事件
+const onscroll = e => {
+  state.scrollTop = e.detail.scrollTop
+}
+
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
@@ -217,6 +225,24 @@ function handleScrollToLower() {
   }
 }
 
+//返回顶部事件
+const scrollToTop = function () {
+  console.log('返回顶部');
+  state.scrollTop = 0
+
+}
+//监视
+watch(() => state.scrollTop, () => {
+  if (state.scrollTop as number > 400) {
+    flag.value = true
+  }
+  if (state.scrollTop as number < 400) {
+    flag.value = false
+  }
+})
+
+
+
 </script>
 <template>
   <!--  <nut-category :category="state.merchantCategory" @change="change">-->
@@ -225,8 +251,7 @@ function handleScrollToLower() {
   <!--  </nut-category>-->
   <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white w-full">
 
-    <nut-searchbar
-        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
+    <nut-searchbar v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant('reload')">
       <template v-slot:rightout>
         <div @tap="loadSelectMerchant('reload')">
           搜索
@@ -236,30 +261,22 @@ function handleScrollToLower() {
 
 
   </div>
-  <div class="flex pt-10 "
-  >
+  <div class="flex pt-10 ">
     <!-- 左侧 一级分类 -->
     <div class="w-1/4">
-      <scroll-view
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight}px` }"
-          class="w-full h-full bg-[#f8f8f8]"
-      >
-        <div
-            @tap="loadAll()"
-            :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
-            class="relative w-25 h-12 block text-sm flex justify-center items-center">
+      <scroll-view ref="ToTop" :scroll-y="true" :style="{ height: `${state.scrollHeight}px` }"
+        class="w-full h-full bg-[#f8f8f8]">
+        <div @tap="loadAll()" :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
+          class="relative w-25 h-12 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>
           </div>
 
         </div>
-        <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-12 block text-sm flex justify-center items-center gap-1 w-25"
-        >
+        <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-12 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>
 
           <div>
@@ -276,42 +293,25 @@ function handleScrollToLower() {
     <div class="w-3/4 ">
       <div class="fixed z-3 flex flex-col justify-center h-10 pl-3 top-10">
         <nut-menu>
-          <nut-menu-item v-model="state.menuDefaultValue"
-                         :options="state.options"
-                         @change="loadSelectMerchant('reload')"
-          >
+          <nut-menu-item v-model="state.menuDefaultValue" :options="state.options" @change="loadSelectMerchant('reload')">
 
           </nut-menu-item>
         </nut-menu>
       </div>
-
-      <scroll-view
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight -60}px` }"
-          scroll-with-animation
-          class="flex flex-1  flex-col   p-3 gap-3 mt-10"
-          :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.merchantList && state.merchantList.length > 0"
-
-      >
-        <div
-            v-for="(item, index) in state.merchantList" :key="index"
-            @click="handleShowMerchant(item)"
-            class="mb-3 ">
+      <!-- 返回顶部 -->
+      <div v-show="flag" class="back-top">
+        <img @click="scrollToTop" class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+      </div>
+      <scroll-view :scroll-y="true" :style="{ height: `${state.scrollHeight - 60}px` }" :scroll-top="state.scrollTop"
+        class="flex flex-1  flex-col   p-3 gap-3 mt-10" :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.merchantList && state.merchantList.length > 0"
+        @scroll="onscroll">
+        <div v-for="(item, index) in state.merchantList" :key="index" @click="handleShowMerchant(item)" class="mb-3 ">
           <div class="flex">
             <div class="flex ">
-              <image :src="item.mer_avatar"
-                     mode="aspectFill"
-                     class="w-20 h-20 rounded-lg"
-              ></image>
+              <image :src="item.mer_avatar" mode="aspectFill" class="w-20 h-20 rounded-lg"></image>
             </div>
 
             <div class="flex flex-col justify-between px-2">
@@ -329,9 +329,7 @@ function handleScrollToLower() {
 
           </div>
         </div>
-
-        <div class=" flex justify-center items-center text-[12px] text-gray-500"
-        >
+        <div class=" flex justify-center items-center text-[12px] text-gray-500">
           <div v-if="state.status === 'loading'">
             加载中...
           </div>
@@ -341,7 +339,7 @@ function handleScrollToLower() {
         </div>
       </scroll-view>
       <div class="flex justify-center items-center w-full h-[60%]" v-else>
-        <CXBEmpty/>
+        <CXBEmpty />
 
       </div>
     </div>
@@ -356,15 +354,33 @@ style:
 
 <style lang="scss">
 page {
+  height: 100%;
   overflow: hidden;
   --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;
 
+  .back-top {
+    width: 100rpx;
+    height: 100rpx;
+    position: fixed;
+    border-radius: 50%;
+    z-index: 999;
+    right: 1%;
+    bottom: 60px;
+  }
+
+  .back-TopImg {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
+  }
+
   .nut-menu {
     background: none !important;
   }
+
   .nut-menu__bar {
     box-shadow: none !important;
     border: 1px solid #FE0032;

src/pages/store/product/other.vue

@@ -9,26 +9,40 @@ import {
   getVipProductDetail
 } from "~/apis/product";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
 import type {
+  DyProductModel,
   IProductDetail,
   JdProductDetailModel,
+  JdProductModel,
+  SuNingProductModel,
   TaobaoProductThirdPartyWaresModel,
-  TaobaoWaresDetail
+  TaobaoWaresDetail,
+  VipProductModel
 } from "~/apis/model/product.model";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
-import {debounce, merge} from "lodash-es";
-
-import {useDebounceFn} from '@vueuse/core';
+import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+import { debounce, merge } from "lodash-es";
 
+import { useDebounceFn } from '@vueuse/core';
 import dayjs from "dayjs";
-import {decodeBase64} from "~/utils/http/helper";
-import {CDN_URL} from "~/config/app";
+import { decodeBase64 } from "~/utils/http/helper";
+import { CDN_URL, CDM_URL } from "~/config/app";
+import { getRecommendList } from "~/apis/merchant";
+import type { DcProductModel } from "~/apis/model/dacang.model";
 
 const discount_coupon_bg_220804Image = CDN_URL + '/static/assets/discount_coupon_bg_220804.png'
 const productId = ref('')
-//
+//推荐商品列表
+let skuInfo = reactive({
+  recommendList: [],
+  totalPage: 0,
+  pageSize: 10,
+  status: '',
+  currentPage: 1
+})
 
 const userStore = useUserStore()
 const isSubmit = ref(false)
@@ -54,149 +68,226 @@ const state = reactive({
   data: {},
   shareId: ''
 })
+const isShow = ref(false)
 const detail = ref<IProductDetail>()
+const detailclone = ref<IProductDetail>()
 onLoad((options: any) => {
 
   const data: Partial<IProductDetail> = JSON.parse(decodeBase64(options.params))
-  // console.log(data)
-  mergeProductDetail(data)
+  // console.log('我是options数据', data)
+
   // if (options.platform && options.id) {
   uni.showLoading({
     title: '数据加载中',
     icon: 'none'
   })
+  mergeProductDetail(data)
   loadProductDetail(data)
   // }
 })
+
 onShow(() => {
   isSubmit.value = false
 })
 
+//精品推荐
+function YouLike() {
+  getRecommendList({
+    page: 1,
+    limit: 10
+  }).then(res => {
+    skuInfo.recommendList = res.list
+    // console.log(skuInfo.recommendList);
+
+  })
+}
 
+//商品不存在详情
+function soldOut() {
+  isShow.value = true
+  uni.setNavigationBarTitle({
+    title: '商品下架不存在'
+  })
+  loadList('reload')
+  uni.hideLoading()
+}
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {
-  detail.value = merge(detail.value, data)
+  detailclone.value = merge(detailclone.value, data)
+
+}
+function mergeProductDetailclone(data: Partial<IProductDetail> = {}) {
+  detail.value = merge(detailclone.value, data)
+  // console.log(detail.value);
+
 }
 
 function loadProductDetail(product: Partial<IProductDetail>) {
-  // console.log('产品id')
-  // console.log(product.id)
+  // console.log('产品id')  // console.log(product.id)
+
   // 京东
   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
-      })
+      console.log(res);
+      let { data, status } = res
+      if (status === 200) {
+        const jdProduct = data[0]
+        // console.log(jdProduct)
+        mergeProductDetailclone({
+          images: jdProduct.detail,
+          coupon: {
+            amount: jdProduct.couMoney
+          },
+          ...jdProduct
+        })
 
-      uni.hideLoading()
+        uni.hideLoading()
+      } else {
+        soldOut()
+      }
     })
   }
-  // 淘宝
+  // 淘宝 *
   if (product.platform === 5) {
     getTaobaoProductDetail(product.id).then(res => {
-      const product = res.waresDetail
-      mergeProductDetail({
-        images: product.small_images,
-        coupon: {
-          startTime: product.couponStartTime,
-          endTime: product.couponEndTime
-        },
-        ...product
-      })
-      uni.hideLoading()
+      // console.log('taobao>>>',res);
+      let { status, data } = res
+      if (status === 200) {
+        const product = data.waresDetail
+        mergeProductDetailclone({
+          images: product.small_images,
+          coupon: {
+            startTime: product.couponStartTime,
+            endTime: product.couponEndTime
+          },
+          ...product
+        })
+        uni.hideLoading()
+      } else {
+        soldOut()
+      }
+
 
     })
   }
 
-  // 拼多多
+  // 拼多多 *
   if (product.platform == 1) {
     getPddProductDetail(product.id).then(res => {
+      // console.log(res);
+      let { status, data } = res
       // detail.value = res
-      mergeProductDetail({
-        spreadUrl: res.pddlink.url,
-        images: res.goods_gallery_urls,
-        featured: res.goods_gallery_urls,
-        mallName: res.mall_name,
-        ...res
-        // allowance:
-      })
-
-      if (res.coupon_start_time > 0) {
-        mergeProductDetail({
-          coupon: {
-            // amount: (res.extra_coupon_amount / 100).toString(),
-            startTime: dayjs.unix(res.coupon_start_time).format('YYYY-MM-DD'),
-            endTime: dayjs.unix(res.coupon_end_time).format('YYYY-MM-DD')
-          },
-        })
+      if (status !== 200) {
+        soldOut()
       } else {
-        mergeProductDetail({
-          coupon: null
+        mergeProductDetailclone({
+          spreadUrl: data.pddlink.url,
+          images: data.goods_gallery_urls,
+          featured: data.goods_gallery_urls,
+          mallName: data.mall_name,
+          ...data
+          // allowance:
         })
+
+        if (data.coupon_start_time > 0) {
+          mergeProductDetailclone({
+            coupon: {
+              // amount: (res.extra_coupon_amount / 100).toString(),
+              startTime: dayjs.unix(data.coupon_start_time).format('YYYY-MM-DD'),
+              endTime: dayjs.unix(data.coupon_end_time).format('YYYY-MM-DD')
+            },
+          })
+        } else {
+          mergeProductDetailclone({
+            coupon: null
+          })
+        }
+
+        uni.hideLoading()
       }
 
-      uni.hideLoading()
 
     })
   }
 
-  // 唯品会
+  // 唯品会 *
   if (product.platform == 2) {
     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: '唯品自营',
-        ...product,
-        ...res
-      })
-      if (product.couponInfo) {
-        mergeProductDetail({
-          coupon: {
-            amount: product.couponInfo.activedAmount,
-            startTime: product.couponInfo.useBeginTime,
-            endTime: product.couponInfo.useEndTime
-          }
+      let { data, status } = res
+      if (status === 200) {
+        const product = data.result[0]
+        // detail.value = product
+        mergeProductDetailclone({
+          featured: product.goodsCarouselPictures,
+          images: product.goodsDetailPictures,
+          mallName: '唯品自营',
+          ...product,
+          ...res
         })
+        if (product.couponInfo) {
+          mergeProductDetailclone({
+            coupon: {
+              amount: product.couponInfo.activedAmount,
+              startTime: product.couponInfo.useBeginTime,
+              endTime: product.couponInfo.useEndTime
+            }
+          })
+        }
+
+        uni.hideLoading()
+      } else {
+        soldOut()
       }
 
-      uni.hideLoading()
 
     })
   }
-  // 苏宁
+  // 苏宁 *
   if (product.platform == 3) {
     getSuProductDetail(product.id).then(res => {
       // const product = res
-      mergeProductDetail({
-        images: res.detail,
-        ...res
-      })
+      let { status, data } = res
+      if (status === 200) {
+        mergeProductDetailclone({
+          images: data.detail,
+          ...data
+        })
 
-      uni.hideLoading()
+        uni.hideLoading()
+
+      } else {
+        soldOut()
+      }
 
     })
   }
-  // 抖音
+  // 抖音 *
   if (product.platform == 9) {
     getDyProductDetail(product.id).then(res => {
+<<<<<<< HEAD
       // console.log(res)
       mergeProductDetail({
         mallName: res.shopName,
         images: res.imgs,
         ...res
       })
+=======
+      console.log(res)
+      let { status, data } = res
+      if (status === 200) {
+        mergeProductDetailclone({
+          mallName: data.shopName,
+          images: data.imgs,
+          ...data
+        })
+
+        uni.hideLoading()
+      } else {
+        soldOut()
+      }
+>>>>>>> li-yi
 
-      uni.hideLoading()
 
     })
 
@@ -270,39 +361,39 @@ function handleBuyNow() {
       // console.log(detail.value.pddlink)
       // console.log(pddWx)
     } else {
-/*      let platformName = ''
-      let clipboardData = ''
-      if (detail.value?.platform == 5) {
-        platformName = '淘宝'
-        clipboardData = detail.value?.spreadUrl
-      }
-      if (detail.value?.platform == 9) {
-        platformName = '抖音'
-        clipboardData = detail.value?.dyZlink
-      }
-      if (detail.value?.platform == 2) {
-        platformName = '唯品会'
-        clipboardData = detail.value?.destUrl
-      }
-      if (detail.value?.platform == 3) {
-        platformName = '苏宁易购'
-        clipboardData = detail.value?.productUrlWap
-      }
-      return uni.setClipboardData({
-        data: clipboardData,
-        success(res) {
-          return uni.showToast({
-            title: `链接已复制，去【${platformName}】打开即可。`,
-            icon: 'none'
-          })
-        },
-        fail(res) {
-          return uni.showToast({
-            title: '请更新隐私协议',
-            icon: 'none'
-          })
-        }
-      })*/
+      /*      let platformName = ''
+            let clipboardData = ''
+            if (detail.value?.platform == 5) {
+              platformName = '淘宝'
+              clipboardData = detail.value?.spreadUrl
+            }
+            if (detail.value?.platform == 9) {
+              platformName = '抖音'
+              clipboardData = detail.value?.dyZlink
+            }
+            if (detail.value?.platform == 2) {
+              platformName = '唯品会'
+              clipboardData = detail.value?.destUrl
+            }
+            if (detail.value?.platform == 3) {
+              platformName = '苏宁易购'
+              clipboardData = detail.value?.productUrlWap
+            }
+            return uni.setClipboardData({
+              data: clipboardData,
+              success(res) {
+                return uni.showToast({
+                  title: `链接已复制，去【${platformName}】打开即可。`,
+                  icon: 'none'
+                })
+              },
+              fail(res) {
+                return uni.showToast({
+                  title: '请更新隐私协议',
+                  icon: 'none'
+                })
+              }
+            })*/
 
       // }
       return uni.showToast({
@@ -369,7 +460,7 @@ function handleBuyNow() {
 
     return {
       title: `${detail.value.store_name}`,
-      imageUrl:  state.shareImage,
+      imageUrl: state.shareImage,
       query: `id=${state.id}&from=share&shareID=${state.shareId}`
     }
 
@@ -383,56 +474,127 @@ function handleBuyNow() {
 const hasCoupon = computed(() => {
   return detail.value?.coupon && detail.value?.coupon.startTime
 })
+
+//跳转大仓商品详情
+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}`
+  })
+}
+
+const outImg = computed(() => {
+  if (isShow) {
+    return CDM_URL + '/image/2023-11-24/20231124182002679.png'
+  }
+
+})
+
+// 距离顶部距离
+let Scroll_X = ref(0)
+
+const headerClass = ref('')
+onPageScroll((page) => {
+  // console.log('滚轮事件触发了',page.scrollTop.toFixed());
+
+  // console.log(page.scrollTop.toFixed(),'距离顶部的距离')
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+  if (page.scrollTop >= 76) {
+    headerClass.value = 'bg-white !text-gray-900'
+  } else {
+    headerClass.value = ''
+  }
+})
+
+
+//列表加载
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: skuInfo.currentPage,
+    limit: skuInfo.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
+
+  getRecommendList({
+    ...params
+  }).then(res => {
+    if (action === 'page') {
+      skuInfo.recommendList = skuInfo.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      skuInfo.recommendList = res.list
+    }
+    skuInfo.totalPage = Math.ceil(res.count / skuInfo.pageSize);
+    skuInfo.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  skuInfo.status = 'loading';
+  skuInfo.currentPage += 1;
+  // console.log(state.totalPage)
+  if (skuInfo.currentPage > skuInfo.totalPage) {
+    skuInfo.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+
 </script>
 <template>
   <CXBBasePage>
     <div class="relative w-screen " v-if="detail">
-      <swiper
-          v-if="detail.featured"
-          :indicator-dots="false"
-          :circular="true"
-          :autoplay="true"
-          :interval="5000"
-          :duration="500"
-          class="h-95"
-      >
-        <swiper-item
-            v-for="(item, index) in detail.featured"
-            :key="index"
-        >
-          <image
-              :key="index"
-              :src="item"
-              mode="aspectFill" class="h-full w-full"
-          />
+      <swiper v-if="detail.featured" :indicator-dots="false" :circular="true" :autoplay="true" :interval="5000"
+        :duration="500" class="h-95">
+        <swiper-item v-for="(item, index) in detail.featured" :key="index">
+          <image :key="index" :src="item" mode="aspectFill" class="h-full w-full" />
         </swiper-item>
       </swiper>
       <div>
         <div class="relative p-3 bg-white">
           <div class="flex gap-2 items-end">
             <FPrice v-if="detail && detail.salePrice" :price="detail.salePrice" need-symbol :size="'large'"
-                    ex-class="!text-[24px]"/>
+              ex-class="!text-[24px]" />
             <FPrice v-if="detail && detail.price" :price="detail.price" :ex-class="'!text-gray'" need-symbol
-                    strike-through/>
+              strike-through />
           </div>
 
           <div class="font-bold py-2">{{ detail.title }}</div>
         </div>
 
-        <div class="relative"
-             v-if="hasCoupon"
-
-        >
-          <div
-              class="px-3 relative"
-              @tap="handleBuyNow"
-          >
-            <image :src="discount_coupon_bg_220804Image"
-                   mode="widthFix"
-                   class="w-full"
-            ></image>
-            <div class="absolute top-2 left-15 h-full w-fit text-white"
-            >
+        <div class="relative" v-if="hasCoupon">
+          <div class="px-3 relative" @tap="handleBuyNow">
+            <image lazy-load :src="discount_coupon_bg_220804Image" mode="widthFix" class="w-full"></image>
+            <div class="absolute top-2 left-15 h-full w-fit text-white">
               <div class=" inline-flex justify-center items-end w-full py-2">
                 <div class="text-[28px]">{{ detail.coupon.amount }}</div>
                 元代金劵
@@ -448,12 +610,8 @@ const hasCoupon = computed(() => {
             {{ detail.mallName }}
           </div>
           <!--          <mpHtml :content=""></mpHtml>-->
-          <image v-for="(imgItem, index) in detail.images"
-                 :key="index"
-                 mode="widthFix"
-                 :src="imgItem"
-                 class="w-full h-full"
-          ></image>
+          <image v-for="(imgItem, index) in detail.images" :key="index" mode="widthFix" :src="imgItem"
+            class="w-full h-full"></image>
         </div>
       </div>
       <div class="fixed bottom-0  w-full h-15 shadow">
@@ -461,7 +619,7 @@ const hasCoupon = computed(() => {
           <div class="flex justify-between items-center p-3">
             <div class="inline-flex items-center">
               <div class="text-sm">预估养老金</div>
-              <FPrice :price="detail.yanglao || detail.commission" need-symbol ex-class="text-[20px] font-bold"/>
+              <FPrice :price="detail.yanglao || detail.commission" need-symbol ex-class="text-[20px] font-bold" />
             </div>
             <div>
               <nut-button type="primary" @tap="handleBuyNow" :disabled="isSubmit">
@@ -472,10 +630,81 @@ const hasCoupon = computed(() => {
         </div>
       </div>
     </div>
+    <!-- 商品下架展示 -->
+    <div class="relative w-screen " v-if="isShow">
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+      <div class="box-out">
+        <div class="flex-box pb-3 px-3 ">
+          <div class="img-div">
+            <image lazy-load :src="outImg" mode="widthFix" class=" top-0 right-0 sold-out ">
+            </image>
+          </div>
+          <div class="out-conter">该商品下架不存在</div>
+        </div>
+
+      </div>
+      <div class="flex flex-col pb-safe gap-3">
+        <div class="p-3 bg-white">
+          <div
+            class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
+            <div class="pl-2">
+              精品推荐
+            </div>
+          </div>
+        </div>
+        <div class="pb-3 px-3" v-if="skuInfo.recommendList.length != 0">
+          <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+            <div v-for="(item, index) in skuInfo.recommendList" :key="index" @click="handleProductItemClick(item)">
+              <MerchantProductCard :item="item" />
+
+            </div>
+          </grid-view>
+          <div class=" flex justify-center items-center text-[12px] text-gray-500">
+            <div v-if="skuInfo.status === 'loading'">
+              加载中...
+            </div>
+            <div v-if="skuInfo.status === 'noMore'">
+              没有更多了～
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
 
   </CXBBasePage>
 </template>
+<style scoped>
+.box-out {
+  background: #f8f8f8;
+  height: 200px;
+}
 
+.flex-box {
+  background: #ffffff;
+  box-shadow: 3px;
+  height: 80%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+}
+
+.img-div {
+  width: 100%;
+
+}
+
+.sold-out {
+  display: block;
+  width: 120px;
+  height: 120px;
+  margin: 0 auto;
+}
+
+.out-conter {
+  text-align: center;
+}
+</style>
 <route lang="yaml">
 style:
   navigationBarTitleText: 商品详情

src/pages/to-coupon/to-coupon.vue

@@ -0,0 +1,80 @@
+<template>
+	<div class="box_2 flex-col" v-if="isShow" >
+		<div class="block_1 flex-col"></div>
+		<div class="flex-box">
+			<div class="img-div">
+				<image lazy-load class="image_2" mode="widthFix" :src="outImg" />
+			</div>
+
+			<div class="text_3">暂无可用优惠券</div>
+		</div>
+
+	</div>
+</template>
+
+<script lang="ts" setup >
+
+import { ref, reactive } from 'vue'
+import { CDN_URL,CDM_URL } from "~/config/app";
+const isShow = ref(true)
+
+const outImg = computed(() => {
+  if(isShow){
+    return  CDM_URL+'/image/2023-11-24/20231124181903347.png'
+  }
+
+})
+
+</script>
+
+<style>
+.box_2 {
+	height: 100%;
+}
+
+.block_1 {
+	width: 100%;
+	height: 18rpx;
+	background-size: 100% 100%;
+}
+
+.image_2 {
+	width:206rpx;
+	height:206rpx;
+	display: block;
+	margin-top: 400rpx;
+	margin-bottom: 40rpx;
+}
+
+.text_3 {
+	height: 30rpx;
+	overflow-wrap: break-word;
+	color: rgba(51, 51, 51, 1);
+	font-size: 30rpx;
+	font-weight: NaN;
+	text-align: center;
+	white-space: nowrap;
+	line-height: 30rpx;
+	
+}
+
+.flex-box {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+}
+
+.img-div {
+	width: 100%;
+	display: flex;
+	justify-content: space-evenly;
+}
+
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 优惠券
+  enablePullDownRefresh: false
+</route>

src/pages/user/address/index.vue

@@ -37,7 +37,7 @@
       <CXBEmpty text="您还没有收货地址" type="address" v-else/>
 
       <div class="fixed bottom-0 p-safe w-full bg-white ">
-        <div class="px-3">
+        <div class="p-3">
           <nut-button block type="primary" @click="handleCreateAddress">新建收货地址</nut-button>
         </div>
       </div>

src/pages/user/index.vue

@@ -1,12 +1,14 @@
 <script lang="ts" setup>
-import {useUserStore} from "~/stores/userStore";
+import { useUserStore } from "~/stores/userStore";
 import CXBAuthorize from "~/components/CXBAuthorize/CXBAuthorize.vue";
-import {getAgentInfo, getUserInfo} from "~/apis/user";
-import {CDN_URL} from "~/config/app";
+import { getAgentInfo, getUserInfo } from "~/apis/user";
+import { CDN_URL,CDM_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";
+import { totalOrderNumber } from "~/apis/order.api";
+import type { OrderQuantityModel } from "~/apis/model/order.model";
+import FPopup from "~/components/FPopup/FPopup.vue";
+import { CANCEL_EVENT, OPEN_EVENT } from "~/constants/event";
+import type { Ref } from "vue";
 const pageStore = usePageStoreWidthOut()
 const currentType = ref('')
 const myOrderList = [{
@@ -42,13 +44,22 @@ const contactUsList = [{
   icon: '/static/icon/kefu_icon.png',
   text: '联系客服',
   url: 'https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0'
-},{
+}, {
   type: 'link',
   icon: CDN_URL + '/static/assets/bangzhuzhongxin_220620.png',
   text: '帮助中心',
   url: '/pages/help-center/index'
 }]
 
+
+//市/区代表弹框标识
+const showValue = ref(false)
+
+//https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154421388.png
+
+
+//https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154612477.png
+
 const myServiceList = [{
   icon: CDN_URL + '/static/assets/wodeyaoqing_220620.png',
   text: '我的邀请',
@@ -81,11 +92,7 @@ const myServiceList = [{
   icon: CDN_URL + '/static/assets/dianpuruzhu_220620.png',
   text: '商铺入驻',
   url: ''
-}, {
-  icon: '/static/icon/bangfu.png',
-  text: '帮扶中心',
-  url: '/pages/bangfuzhongxin/index'
-}, {
+},  {
   icon: CDN_URL + '/static/assets/mine_setting_220620.png',
   text: '设置',
   url: '/pages/setting/index'
@@ -194,9 +201,7 @@ function handleService(item: {
   })
 }
 
-// onShow(async () => {
-// await userStore.getUserInfo()
-// })
+
 
 function encodePhone(phone: string) {
   // let tel = '13600136000';
@@ -236,71 +241,111 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+ 
   // console.log(userStore.userInfo)
-  const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
-  // 创始人
-  if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
-    // return [].push()
-  }
   // 普通用户
   if (userRichType == 0) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
+
+    return '../../static/img-hy/用户.png'
   }
   // 会员
   if (userRichType == 1) {
-    if (bangfu) {
-      return ['会员', bangfu]
-    }
-    return ['会员']
+
+    return '../../static/img-hy/会员.png'
 
   }
   if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
+
+    return '../../static/img-hy/创始人.png'
   }
-  // 合伙人
+  // 高级会员
   if (userRichType == 4) {
-    // return '高级会员'
-    if (bangfu) {
-      return ['VIP', bangfu]
-    }
-    return ['VIP']
+
+    return '../../static/img-hy/高级会员.png'
   }
-  if (userRichType == 5) {
-    if (bangfu) {
-      return ['初始级合伙人', bangfu]
-    }
-    return ['初始级合伙人']
+  if (userRichType == 8) {
+
+    return '../../static/img-hy/合伙人.png'
   }
-  if (userRichType == 6) {
-    if (bangfu) {
-      return ['中级合伙人', bangfu]
-    }
-    return ['中级合伙人']
+  if (userRichType == 9) {
+
+    return '../../static/img-hy/联合创始人.png'
   }
-  if (userRichType == 7) {
-    if (bangfu) {
-      return ['高级合伙人', bangfu]
+  if (!userRichType) {
+
+    return ''
+  }
+})
+
+//0:普通用户 1:股东
+const AlholderType = computed(() => {
+  const stockholder = userStore.userInfo?.stockholder
+  // 普通用户
+  if (stockholder == 0) {
+    return ''
+  }
+  // 股东
+  if (stockholder == 1) {
+    return '../../static/img-hy/股东.png'
+  }
+
+})
+// '':普通用户 district-区/县代 city-市代',
+const areaType = computed(() => {
+  if (userStore.userInfo?.area_manage?.area_name) {
+    const areamanage = userStore.userInfo?.area_manage_type
+    // 县/区代理
+    if (areamanage == 'district') {
+      return '../../static/img-hy/district.png'
+    }
+    // 市代理
+    if (areamanage == 'city') {
+      return '../../static/img-hy/city.png'
+    }
+    //普通用户
+    if (!areamanage) {
+      return ''
     }
-    return ['高级合伙人']
+
   }
-  if (!userRichType) {
-    if (bangfu) {
-      return ['用户', bangfu]
+
+})
+
+//弹框展示
+function openPopup() {
+  showValue.value = true
+}
+//关闭弹框
+const onCancel = () => {
+  // show.value = false
+  showValue.value = false
+}
+
+//计算市区县展示图片
+const backImg = computed(() => {
+  if (userStore.userInfo?.area_manage_type) {
+    const areamanage = userStore.userInfo?.area_manage_type
+    // 县/区代理
+    if (areamanage == 'district') {
+      return CDM_URL+'/image/2023-11-24/20231124154421388.png'
+    }
+    // 市代理
+    if (areamanage == 'city') {
+      return CDM_URL+'/image/2023-11-24/20231124154612477.png'
     }
-    return ['用户']
   }
+
+})
+const textType = computed(() => {
+  if (userStore.userInfo?.area_manage?.area_name) {
+    const areamanage = userStore.userInfo?.area_manage.area_name
+    let res = areamanage.join("");
+    return res
+  }
+
 })
 
+
 function handleToRedIntegral() {
   uni.navigateTo({
     url: '/pages/red-integral/index'
@@ -335,9 +380,9 @@ function handleShowMyProfile() {
   })
 }
 
-function handleShowMyRulePage(item) {
+function handleShowMyRulePage() {
   uni.navigateTo({
-    url: `/pages/my-rules/index?userType=${item}`
+    url: `/pages/my-rules/index`
   })
 }
 </script>
@@ -348,72 +393,91 @@ function handleShowMyRulePage(item) {
       <div class="pt-15 ">
         <div class="flex gap-2 mb-2 text-white mb-6">
           <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
-                 @click="handleShowMyProfile"
-                 mode="widthFix"
-                 class="w-9 h-9 rounded-full"
-          ></image>
-          <image
-              v-else
-              @click="checkAuth"
-              src="https://app.bjtdba.com/uploads/logo.jpg"
-              mode="widthFix"
-              class="w-9 h-9 rounded-full"
-          />
-          <div class="flex">
-            <div class="flex flex-col">
+            @click="handleShowMyProfile" mode="widthFix" class="w-9 h-9 rounded-full"></image>
+          <image v-else @click="checkAuth" src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix"
+            class="w-9 h-9 rounded-full" />
+          <div class="flex flex-col">
+            <div class="flex">
               <div class="text-sm">
                 <div class="text-sm" v-if="userStore.userInfo">
                   {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                 </div>
               </div>
-              <div class="text-xs" v-if="userStore.userInfo && userStore.userInfo.phone">
+              <div class="text-sm flex-height " v-if="userStore.userInfo && userStore.userInfo.phone">
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div class="flex gap-1 items-center px-1">
-            <div
-                v-for="(item, index) in userType"
-                :key="index"
-                @click="handleShowMyRulePage(item)"
-                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">
-              {{ item }}
-            </div>
+            <div class="btm flex gap-1 ">
+              <!-- 用户 -->
+              <div v-if="userType" @click="handleShowMyRulePage()"
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
+                <image mode="heightFix" lazy-load class="vip_img" :src="userType"></image>
+              </div>
+              <!-- 市区县代理 -->
+              <div @click="openPopup" v-if="areaType"
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
+                <image mode="heightFix" lazy-load class="vip_img" :src="areaType"></image>
+              </div>
+              <!-- 股东 -->
+              <div v-if="AlholderType" 
+                class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
+                <image mode="heightFix" lazy-load class="vip_img" :src="AlholderType"></image>
+              </div>
             </div>
           </div>
-
+          <FPopup v-model:show="showValue" position="center" exClass="box_2 ">
+            <div class="box_2 flex-row">
+              <div class="box_2" v-if="backImg" >
+                <image  lazy-load class="img_1" :src="backImg"></image>
+              </div>
+              <div class="group_2 flex-col lolr ">
+                <div class="div_box pong1 ">
+                  <div class="blue_1">
+                    <image lazy-load class="off_3" src="../../static/img-hy/DLqy.png" />
+                    <span class="pan">代理区域</span>
+                  </div>
+                  <div class="blue_2 height1 ">
+                    {{ textType }}
+                  </div>
+                </div>
+                <div class="div_box pong2 ">
+                  <div class="blue_1">
+                    <image lazy-load class="off_3" src="../../static/img-hy/QYDL.png" />
+                    <span class="pan">代理权益</span>
+                  </div>
+                  <div class="block_1 flex-col blue_2 height2 ">
+                    <div class="text-group_4 flex-col justify-between">
+                      <div class=" pend">所辖区域的区域管理分红</div>
+                      <div class="text_5 pand ">(参照会员系统佣金逻辑）</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div @click="onCancel" class="off_1">
+              <image lazy-load class="off_2" src="../../static/img-hy/关闭.png" />
+            </div>
+          </FPopup>
 
         </div>
         <div class="bg-white rounded flex flex-col gap-6 py-4 text-xl">
-          <div
-              v-if="userStore.userInfo"
-              class="flex flex-wrap">
-            <div
-                @tap="handleShowAnnuityDetail"
-                class="w-1/3 flex flex-col justify-center items-center"
-            >
+          <div v-if="userStore.userInfo" class="flex flex-wrap">
+            <div @tap="handleShowAnnuityDetail" class="w-1/3 flex flex-col justify-center items-center">
               <div>{{ userStore.yanglao.all_yanglao }}</div>
               <div class="text-xs">养老金</div>
             </div>
-            <div
-                @tap="handleShowMyInvitation"
-                class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0.00'}}</div>
+            <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
+              <div>{{ agentInfo.brokerage_price}}</div>
               <div class="text-xs">我的佣金</div>
             </div>
-            <div
-                @tap="handleShowMyIntegral"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.score }}</div>
               <div class="text-xs">我的积分</div>
             </div>
           </div>
-          <div
-              v-if="userStore.userInfo"
-              class="flex">
-            <div
-                @click="handleToRedIntegral"
-                class="w-1/2 flex flex-col justify-center items-center">
-              <div>{{ userStore.userInfo.red }}</div>
+          <div v-if="userStore.userInfo" class="flex">
+            <div @click="handleToRedIntegral" class="w-1/2 flex flex-col justify-center items-center">
+              <div>{{ userStore.userInfo.member_brokerage_price}}</div>
               <div class="text-xs">红积分提现</div>
             </div>
             <div class="w-1/2 flex flex-col  justify-center items-center">
@@ -430,9 +494,7 @@ function handleShowMyRulePage(item) {
         <div class="flex justify-between pt-4 mb-4">
           <div>我的订单</div>
           <div class="flex items-center">
-            <div
-                @click="handleShowMyAllOrder(0)"
-                class="text-sm text-gray">查看全部
+            <div @click="handleShowMyAllOrder(0)" class="text-sm text-gray">查看全部
             </div>
             <div class="f-text-color-2 i-tabler-chevron-right"></div>
           </div>
@@ -440,51 +502,35 @@ function handleShowMyRulePage(item) {
 
         </div>
         <div class="flex pb-4">
-          <div
-              @click="handleShowMyAllOrder(index + 1)"
-              v-for="(item, index) in myOrderList" :key="index"
-              class="flex flex-col justify-center items-center w-1/5 gap-3"
-          >
+          <div @click="handleShowMyAllOrder(index + 1)" v-for="(item, index) in myOrderList" :key="index"
+            class="flex flex-col justify-center items-center w-1/5 gap-3">
             <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
+                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
+                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
+                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
+                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>
-              <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 == 'noComment' && orderQuantity && orderQuantity.noComment != '0'"
-
-              >
-                {{ orderQuantity.noComment}}
+              <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 == 'noComment' && orderQuantity && orderQuantity.noComment != '0'">
+                {{ orderQuantity.noComment }}
               </div>
-              <image :src="item.icon"
-                     mode="widthFix"
-                     class="w-7 h-7 "
-              />
+              <image :src="item.icon" mode="widthFix" class="w-7 h-7 " />
             </div>
 
             <div class="text-xs">{{ item.text }}</div>
@@ -497,15 +543,9 @@ function handleShowMyRulePage(item) {
           <div>我的服务</div>
         </div>
         <div class="flex flex-wrap ">
-          <div
-              v-for="(item, index) in myServiceList" :key="index"
-              @tap="handleService(item)"
-              class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
-          >
-            <image :src="item.icon"
-                   mode="widthFix"
-                   class="w-6 h-6 "
-            />
+          <div v-for="(item, index) in myServiceList" :key="index" @tap="handleService(item)"
+            class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4">
+            <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
             <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>
@@ -517,15 +557,9 @@ function handleShowMyRulePage(item) {
           <div>联系我们</div>
         </div>
         <div class="flex flex-wrap ">
-          <div
-              v-for="(item, index) in contactUsList" :key="index"
-              @tap="handleToContact(item)"
-              class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
-          >
-            <image :src="item.icon"
-                   mode="widthFix"
-                   class="w-6 h-6 "
-            />
+          <div v-for="(item, index) in contactUsList" :key="index" @tap="handleToContact(item)"
+            class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4">
+            <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
             <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>
@@ -541,6 +575,113 @@ function handleShowMyRulePage(item) {
 page {
   background-color: #f8f8f8;
 }
+
+.flex-height {
+  margin-left: 3px;
+}
+
+.btm {
+  margin-top: 1px;
+}
+
+.vip_img {
+  height: 56rpx;
+}
+
+.box_2 {
+  background-color: #ffffff00;
+}
+
+.img_1 {
+  width: 560rpx;
+  height: 660rpx;
+}
+
+.off_1 {
+  width: 72rpx;
+  height: 72rpx;
+  position: absolute;
+  margin-top: 40rpx;
+  left: 50%;
+  margin-left: -36rpx;
+}
+
+.off_2 {
+  width: 100%;
+  height: 100%;
+}
+
+.off_3 {
+  width: 34rpx;
+  height: 34rpx;
+}
+
+.div_box {
+  width: 496rpx;
+  height: 152rpx;
+  background: #E5F9FF;
+  border-radius: 16rpx;
+  margin-left: 32rpx;
+}
+
+.blue_1 {
+  height: 80rpx;
+  line-height: 80rpx;
+}
+
+.blue_1 image {
+  margin-left: 26rpx;
+  margin-top: 14rpx;
+}
+
+.pan {
+  font-size: 28rpx;
+  margin-left: 10rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: 500;
+  color: #4D4D69;
+
+}
+
+.blue_2 {
+  font-size: 30rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: bold;
+  color: #4D4D69;
+  background: #C2F0FF;
+  padding-left: 26rpx;
+}
+
+.pand {
+  font-size: 22rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: bold;
+  color: black;
+}
+
+.height1 {
+  height: 74rpx;
+  line-height: 74rpx;
+}
+
+.pend {
+  padding-top: 14rpx
+}
+
+.height2 {
+  height: 90rpx;
+  border-radius: 0rpx 0rpx 16rpx 16rpx;
+}
+
+.pong1 {
+  position: absolute;
+  top: 255rpx
+}
+
+.pong2 {
+  position: absolute;
+  top: 447rpx
+}
 </style>
 <route lang="yaml">
 style:

src/pages/user/login/index.vue

@@ -54,8 +54,10 @@ async function handleWexinLogin() {
         code: result.code,
         source: 'cxb'
       }).then(unionRes => {
-        // console.log(unionRes)
+        console.log(111111,unionRes)
         // const shareId = Cache.get('SHARE_ID')
+        //存储openid
+        // userStore.setOpenid(unionRes.openid)
         let redirectPageObj: {page: string, type: 'page' | 'tab'}
         if (Cache.get('SHARE_REDIRECT_PAGE')) {
           redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
@@ -66,19 +68,21 @@ async function handleWexinLogin() {
           // params = Object.assign({}, params, { shareId })
         // }
         wechatCheck(unionRes.unionid).then(checkRes => {
-          // console.log(checkRes)
+          
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)
           // console.log(checkRes)
           uni.hideLoading();
-
+          console.log('我存在吗111',redirectPageObj);
             uni.showToast({
               title: '登录成功'
             }).then(() => {
               setTimeout(() => {
-
+                console.log('我存在吗222',redirectPageObj);
+                
                 if (redirectPageObj) {
+                  console.log('我存在吗333',redirectPageObj);
                   if (redirectPageObj.type === 'page') {
                     return uni.redirectTo({
                       url: redirectPageObj.page
@@ -90,6 +94,8 @@ async function handleWexinLogin() {
                     })
                   }
                 } else {
+                  console.log('我是key>>>aaa',state.key);
+                  
                   switch (state.key) {
                     case '10': {
                       uni.switchTab({
@@ -105,7 +111,7 @@ async function handleWexinLogin() {
                     }
                     case '1': {
                       uni.switchTab({
-                        url: '/pages/order_addcart/order_addcart'
+                        url: '/pages/order_addcart/index'
                       })
                       break;
                     }

src/pages/user/login/other-phone.vue

@@ -1,33 +1,26 @@
 <template>
   <div>
-    <CXBBanner/>
+    <CXBBanner />
 
-    <nut-input
-        v-model="state.phone"
-        placeholder="请输入手机号"
-    >
+    <nut-input v-model="state.phone" placeholder="请输入手机号" type="number">
       <template #right>
         <nut-button type='primary' size="small" @click="handleGetCode" :loading="state.isAuthVerify">
-        {{ state.buttonText }}
-      </nut-button>
+          {{ state.buttonText }}
+        </nut-button>
       </template>
     </nut-input>
-    <nut-input
-        v-model="state.code"
-        placeholder="请输入验证码"
-        clearable
-    >
+    <nut-input v-model="state.code" placeholder="请输入验证码" clearable type="number">
     </nut-input>
 
     <div class="flex w-full">
       <div class="p-3 w-full">
         <nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">登录</nut-button>
-<!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
-<!--          <div>-->
-<!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
-<!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
-<!--          </div>-->
-<!--        </div>-->
+        <!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
+        <!--          <div>-->
+        <!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+        <!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+        <!--          </div>-->
+        <!--        </div>-->
 
       </div>
 
@@ -38,8 +31,9 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
-import {authSmsLogin, authVerify} from "~/apis/auth.api";
+import { authSmsLogin, authVerify } from "~/apis/auth.api";
 import Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
 
 const state = reactive({
@@ -104,8 +98,28 @@ function handleViewXieyi(type: number) {
 }
 
 function handleLogin() {
+  uni.showLoading({
+    title: '登录中'
+  });
   const shareId = Cache.get('SHARE_ID')
-
+  // uni.login({
+  //   provider: 'weixin',
+  //   univerifyStyle: {
+  //     fullScreen: true
+  //   },
+  //   success: result => {
+  //     // console.log(result)
+  //     getUserUnionId({
+  //       code: result.code,
+  //       source: 'cxb'
+  //     }).then(unionRes => {
+  //       console.log(111111, unionRes)
+  //       // const shareId = Cache.get('SHARE_ID')
+  //       //存储openid
+  //       userStore.setOpenid(unionRes.openid)
+  //     })
+  //   }
+  // })
   let params = {
     phone: state.phone,
     sms_code: state.code,
@@ -118,17 +132,18 @@ function handleLogin() {
   authSmsLogin({
     ...params
   }).then(authRes => {
-    console.log(authRes)
+    console.log(111111, authRes)
     userStore.login(authRes.token, authRes.exp)
     userStore.setUID(authRes.user.uid)
     userStore.setUserInfo(authRes.user)
+    uni.hideLoading();
     uni.showToast({
       title: '登录成功',
       icon: 'none'
     })
     Cache.clear('SHARE_ID')
     state.isAuthVerify = false
-    let redirectPageObj: {page: string, type: 'page' | 'tab'}
+    let redirectPageObj: { page: string, type: 'page' | 'tab' }
     if (Cache.get('SHARE_REDIRECT_PAGE')) {
       redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
     }

src/pages/vip/index.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
 <!--  <CXBBasePage :show="true" title="">-->
   <div
       class="overflow-hidden fixed  w-full z-10 f-nav-bar-base"
@@ -28,101 +29,123 @@
 
     <div class="flex flex-col gap-3 ">
 <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
+=======
+  <!--  <CXBBasePage :show="true" title="">-->
+
+  <div class="flex flex-col gap-3 ">
+    <div style="height: 80rpx;">
+      <div style="background-color: transparent  " class="overflow-hidden fixed top-0 w-full z-10">
+        <nut-searchbar v-model="state.keyword" @search="searchkwd" @clear="clearSearch">
+          <!--      <template v-slot:leftout>-->
+          <!--        <div @tap="navBack">-->
+          <!--          <nut-icon name="left"></nut-icon>-->
+          <!--        </div>-->
+          <!--      </template>-->
+          <template v-slot:rightout>
+            <div @tap="searchkwd">
+              搜索
+            </div>
+          </template>
+        </nut-searchbar>
+      </div>
+    </div>
+>>>>>>> li-yi
+
+
+    <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
-      <div class="w-screen h-65">
-        <swiper
-            v-if="state.banners"
-            :indicator-dots="state.indicatorDots"
-            indicator-active-color="#e93323"
-            :autoplay="state.autoplay"
-            :circular="state.circular"
-            :interval="state.interval"
-            :duration="state.duration"
-            class="w-full h-full"
-        >
+    <div class="w-screen h-32">
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+      <div class="px-3 h-32">
+        <swiper v-if="state.banners" :indicator-dots="state.indicatorDots" indicator-active-color="#e93323"
+          :autoplay="state.autoplay" :circular="state.circular" :interval="state.interval" :duration="state.duration"
+          class="w-full h-full rounded-md overflow-hidden ">
           <swiper-item v-for="(item, index) in state.banners" :key="index">
-            <image :src="item.pic" class="!w-full !h-full" mode="aspectFill"/>
+            <image :src="item.pic" class="w-full h-full object-cover" mode="aspectFill" />
           </swiper-item>
         </swiper>
       </div>
+    </div>
 
-      <div class="flex px-3">
-        会员专区
-      </div>
-      <div  class="px-3" 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"
-               @click="handleItemClick(item)"
-          >
-            <div
-                class="bg-white rounded-lg"
-            >
-              <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-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-09-15/20230915160858609.png"
-                         mode="widthFix" class="!w-8 "></image>
-                  <div class="px-2 flex items-center jusitify-center">
-                    <div>
-                      养老金 ¥{{item.yanglao}}
-                    </div>
+
+    <div class="flex px-3" v-if="state.type == 'user'">
+      会员专区
+    </div>
+    <div class="px-3" 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" @click="handleItemClick(item)">
+          <div class="bg-white rounded-lg">
+            <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-1">
+                {{ item.store_name }}
+              </div>
+              <div v-if="item.type != 15"
+                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-09-15/20230915160858609.png" mode="widthFix"
+                  class="!w-8 "></image>
+                <div class="px-2 flex items-center jusitify-center">
+                  <div>
+                    养老金 ¥{{ item.yanglao }}
                   </div>
                 </div>
-                <div class="flex flex-row items-center gap-2">
-                  <div class="flex text-[#FE0032] font-bold text-lg">
-                    <div>
-                      ￥
-                    </div>
-                    <div>
-                      {{ item.price }}
-                    </div>
-
+              </div>
+              <div class="flex flex-row items-center gap-2">
+                <div class="flex text-[#FE0032] font-bold text-lg">
+                  <div>
+                    ￥
                   </div>
-
-                  <div class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
-
-                    <div>
-                      大仓
-                    </div>
+                  <div>
+                    {{ item.price }}
                   </div>
 
                 </div>
 
-                <div class="line-through text-xs font-bold flex ">
-                  <div>
-                    ¥ {{item.ot_price}}
-                  </div>
+              </div>
+
+              <div class="line-through text-xs font-bold flex ">
+                <div>
+                  ¥ {{ item.ot_price }}
                 </div>
               </div>
             </div>
-
-          </div>
-        </grid-view>
-        <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" >
-          <div v-if="state.status === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.status === 'noMore'">
-            没有更多了～
           </div>
+
+        </div>
+      </grid-view>
+      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
         </div>
       </div>
-      <CXBEmpty v-else/>
     </div>
+    <CXBEmpty v-else />
+  </div>
 
-<!--  </CXBBasePage>-->
+  <!--  </CXBBasePage>-->
 </template>
 
 <script setup lang="ts">
+<<<<<<< HEAD
 import {computed} from "vue";
 import {getVipAreaList} from "~/apis/merchant";
 import {getHomeBanner, getProductShare} from "~/apis/common";
 import {useUserStore} from "~/stores/userStore";
+=======
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import FSearch from "~/components/FSearch/FSearch.vue";
+import { computed } from "vue";
+import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+import { getTypeProductList, getVipAreaList } from "~/apis/merchant";
+import { CDN_URL } from "~/config/app";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import { getHomeBanner, getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
+>>>>>>> li-yi
 import Cache from "~/utils/cache";
 
 
@@ -141,8 +164,8 @@ const state = reactive({
   pageSize: 10,
   totalPage: 1,
   banners: [],
-
-  keyword: '' ,
+  count: 0,
+  keyword: '',
   status: 'noMore',
   indicatorDots: false,
   circular: true,
@@ -150,10 +173,20 @@ const state = reactive({
   interval: 5000,
   duration: 500,
   currents: "0",
+  title: '',
+  type: '',
 })
-const list = ref()
+const list = ref([])
+const count = ref()
 
 onLoad((option) => {
+
+  state.type = option.type
+  if (state.type == 'user') {
+    state.title = '一壶茶会员中心'
+  } else if (state.type == 'gongchang') {
+    state.title = '工厂直供'
+  }
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
@@ -162,12 +195,22 @@ onLoad((option) => {
       userStore.setShareId(res.share_id)
     }
   }).catch(message => {
-    // console.log(message)
+    console.log(message)
+    // if (message == '请登录') {
+    //   uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }
   })
-  userStore.setRedirectPage(`/pages/vip/index`, 'page')
+  userStore.setRedirectPage(`/pages/vip/index?type` + state.type, 'page')
 
+<<<<<<< HEAD
   getHomeBanner("user_banner").then(res => {
     // console.log(res)
+=======
+  getHomeBanner(state.type + "_banner").then(res => {
+    console.log(state.type + "_banner>>", res)
+>>>>>>> li-yi
     state.banners = res
   })
   loadList('reload')
@@ -175,6 +218,20 @@ onLoad((option) => {
 
 })
 
+//搜索全部筛选
+function searchkwd() {
+  if (!state.keyword) {
+    return uni.showToast({
+      title: '请输入搜索关键字',
+      icon: 'none'
+    })
+  }
+  state.currentPage = 1
+  state.pageSize = 10
+  state.pageSize = state.count
+  console.log("1111111111", state.currentPage, state.pageSize);
+  loadList('reload')
+}
 
 onShareAppMessage(() => {
   const shareId = Cache.get('SHARE_ID')
@@ -211,6 +268,7 @@ onPageScroll((page) => {
 
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+<<<<<<< HEAD
   if (action === 'reload') {
     state.currentPage=1;
   }
@@ -243,7 +301,85 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     }
 
   })
+=======
+  if (state.type == 'user') {
+    const params = {
+      page: state.currentPage,
+      limit: state.pageSize
+    }
+    if (state.keyword) {
+      params.keyword = state.keyword
+    }
+    console.log('我是会员params>>', params)
+    getVipAreaList({
+      ...params
+    }).then(res => {
+      console.log(res.count)
+      // console.log(res.list)
+      count.value = res.count
+      console.log(action);
+      if (action === 'page') {
+        list.value = list.value.concat(res.list)
+      }
+      if (action === 'reload') {
+        list.value = res.list
+      }
+      if (callback) {
+        callback(res)
+      }
+    })
+  } else if (state.type == 'gongchang') {
+    if (action === 'reload') {
+      state.currentPage = 1
+    }
+
+    const params = {
+      type: state.type,
+      page: state.currentPage,
+      limit: state.pageSize
+    }
+    if (state.keyword) {
+      params.keyword = state.keyword
+    }
+    getTypeProductList({
+      ...params
+    }).then(res => {
+      if (res) {
+        if (action === 'reload') {
+          list.value = res.list
+        } else if (action === 'page') {
+          list.value = list.value.concat(res.list)
+        }
+        state.totalPage = Math.ceil(res.count / state.pageSize);
+        state.status = 'more'
+
+        if (callback) {
+          callback(res.list)
+        }
+      }
+    })
+
+  }
+  // getVipAreaList({
+  //   ...params
+  // }).then(res => {
+  //   console.log(res.count)
+  //   // console.log(res.list)
+  //   count.value = res.count
+  //   console.log(action);
+  //   if (action === 'page') {
+  //     list.value = list.value.concat(res.list)
+  //   }
+  //   if (action === 'reload') {
+  //     list.value = res.list
+  //   }
+  //   if (callback) {
+  //     callback(res)
+  //   }
+  // })
+>>>>>>> li-yi
 }
+
 function handleItemClick(item) {
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${item.product_id}`
@@ -253,6 +389,7 @@ function handleItemClick(item) {
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
+<<<<<<< HEAD
   // console.log(state.totalPage)
   if (state.currentPage > state.totalPage) {
     state.status = 'noMore';
@@ -261,31 +398,83 @@ function handleScrollToLower() {
       loadList('page')
     }, 300)
   }
+=======
+  loadList('page', (items) => {
+    console.log('items', items);
+    if (!items.length > 0) {
+      // console.log('没有更多了')
+      state.status = 'noMore'
+    }
+  })
+>>>>>>> li-yi
 }
 
 onReachBottom(() => {
   console.log('到底了。。。')
   handleScrollToLower()
-
 })
 
+//关闭搜索重新加载页面
+function clearSearch() {
+  console.log(222);
+  uni.showLoading()
+  state.currentPage = 1
+  state.pageSize = 10
+  loadList('reload', (items) => {
+    uni.hideLoading()
+    // uni.stopPullDownRefresh()
+  })
+
+}
+
 onPullDownRefresh(() => {
-  loadList('reload', items => {
-    setTimeout(() => {
-      uni.stopPullDownRefresh()
-    }, 300)
+  console.log(111);
+  uni.showLoading()
+  state.currentPage = 1
+  state.pageSize = 10
+  loadList('reload', (items) => {
+    uni.hideLoading()
+    uni.stopPullDownRefresh()
   })
 })
 
+<<<<<<< HEAD
 function clickLeftHandler() {
   uni.navigateBack()
 }
+=======
+
+// 距离顶部距离
+let Scroll_X = ref(0)
+const headerClass = ref('')
+onPageScroll((page) => {
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+  // page.scrollTop
+  if (page.scrollTop >= 76) {
+    headerClass.value = '!bg-primary !text-white'
+  } else {
+    headerClass.value = ''
+  }
+})
+
+
+onShow(() => {
+  uni.setNavigationBarTitle({
+    title: state.title // 设置新的导航栏标题
+  });
+})
+
+>>>>>>> li-yi
 </script>
 
 <route lang="yaml">
 style:
+<<<<<<< HEAD
   navigationStyle: custom
   navigationBarTitleText: 储蓄保会员
+=======
+  navigationBarTitleText: 储蓄保
+>>>>>>> li-yi
   enablePullDownRefresh: true
 </route>
 <style lang="scss">
@@ -299,6 +488,7 @@ page {
 //var(--nut-searchbar-width, 100%)
   --nut-searchbar-input-box-shadow: none;
 }
+<<<<<<< HEAD
 .nut-searchbar {
   background: transparent !important;
 
@@ -310,3 +500,11 @@ page {
   --at-apply: 'text-lg'
 }
 </style>
+=======
+
+
+.box_y {
+  border-radius: 20rpx;
+}
+</style>
+>>>>>>> li-yi

src/pages/withdrawal-record/index.vue

@@ -16,7 +16,7 @@ onLoad((option) => {
 </script>
 <template>
   <CXBBasePage>
-    <div v-if="list.length > 0" class="flex flex-col gap-3  p-3">
+    <!-- <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>
@@ -33,6 +33,25 @@ onLoad((option) => {
 
 
       </div>
+    </div> -->
+    <!-- 提现日期添加时分秒  -->
+    <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.title}}</div>
+            <div class="text-gray text-[11px]">{{ dayjs(item.create_time).format('YYYY-MM-DD HH:mm:ss') }}</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 />

src/stores/dacangStore.ts

@@ -1,16 +1,13 @@
-import {defineStore} from "pinia";
+import { defineStore } from "pinia";
 
 export const useDacangStore = defineStore('dacangStore', {
     state: () => ({
-        currentClassify: '-1'
+        currentClassify: '-1',
     }),
     actions: {
         setClassify(classify: string) {
             // console.log('class' + classify)
             this.currentClassify = classify
-        },
-        loadList() {
-
-        }
+        },  
     }
 })

src/stores/userStore.ts

@@ -1,8 +1,8 @@
-import {defineStore} from "pinia";
-import {getUserInfo, getYanglaojinStatistics} from "~/apis/user";
+import { defineStore } from "pinia";
+import { getUserInfo, getYanglaojinStatistics } from "~/apis/user";
 import Cache from '~/utils/cache'
-import {LOGIN_STATUS, UID, USER_INFO} from "~/constants";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
+import { LOGIN_STATUS, SHARE_REDIRECT_PAGE, UID, USER_INFO,OPEN_ID } from "~/constants";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
 
 interface UserStoreState {
     userInfo: UserInfoModel
@@ -14,6 +14,7 @@ interface UserStoreState {
     yanglao: number,
     redirectPage: string | null,
     shareId: string | null
+    openid:string
 }
 
 export const useUserStore = defineStore('userStore', {
@@ -27,7 +28,8 @@ export const useUserStore = defineStore('userStore', {
         yanglao: 0,
         shareId: null,
         redirectPage: null,
-        permissionList: null // 权限列表
+        permissionList: null, // 权限列表
+        openid:Cache.get(OPEN_ID) || null
     }) as UserStoreState,
     actions: {
         // getYanglaojinStatistics().then(res => {
@@ -35,7 +37,7 @@ export const useUserStore = defineStore('userStore', {
         // })
         setRedirectPage(page: string, type: 'page' | 'tab') {
             this.redirectPage = page
-            Cache.set('SHARE_REDIRECT_PAGE', JSON.stringify({page, type}))
+            Cache.set('SHARE_REDIRECT_PAGE', JSON.stringify({ page, type }))
         },
         setShareId(shareId: string) {
             this.shareId = shareId
@@ -70,8 +72,12 @@ export const useUserStore = defineStore('userStore', {
             this.token = null
             this.uid = null
             this.userInfo = null
+            //清空登录信息
+            Cache.clear(USER_INFO);
+            Cache.clear(OPEN_ID);
             Cache.clear(LOGIN_STATUS)
             Cache.clear(UID)
+            Cache.clear(SHARE_REDIRECT_PAGE)
         },
         setUID(uid: string) {
             this.uid = uid
@@ -80,7 +86,13 @@ export const useUserStore = defineStore('userStore', {
         setUserInfo(userInfo: UserInfoModel) {
             this.userInfo = userInfo
             // 这个是存储的对象数据
-            Cache.set('USERINFO', userInfo)
+            Cache.set('USER_INFO', userInfo)
+            // Cache.set(USER_INFO, JSON.stringify(userInfo))
+        },
+        setOpenid(openid: string) {
+            this.openid = openid
+            // 这个是存储的对象数据
+            Cache.set('OPEN_ID', openid)
             // Cache.set(USER_INFO, JSON.stringify(userInfo))
         },
         setToken(token: string) {

src/utils/http/detailhttp.ts

@@ -0,0 +1,111 @@
+import { cloneDeep } from 'lodash-es'
+import { joinTimestamp } from './helper'
+import { checkStatus } from './checkStatus'
+import type { RequestOptions, Result } from './types'
+import { isString } from '~/utils/is'
+import { getToken } from '~/utils/auth'
+import { RequestEnum, ResultEnum } from '~/enums/httpEnum'
+import { setObjToUrlParams } from '~/utils'
+
+// const { showNotify } = usePageStoreWidthOut()
+
+type UniRequestOptions = UniApp.RequestOptions & { params?: any }
+
+export interface CreateRequestOptions extends UniRequestOptions {
+    authenticationScheme?: string
+    authenticationHeader: string
+    urlPrefix?: string
+    requestOptions?: RequestOptions
+}
+
+export class vRequest {
+    private readonly options: CreateRequestOptions
+
+    constructor(options: CreateRequestOptions) {
+        this.options = options
+    }
+
+    request<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        const configTemp: CreateRequestOptions = cloneDeep(Object.assign({}, this.options, config))
+        const optionsTemp: RequestOptions = Object.assign({}, this.options.requestOptions, options)
+
+        const {
+            urlPrefix, apiUrl, joinPrefix, joinTime = true, withToken, joinParamsToUrl,
+            isReturnNativeResponse, isTransformResponse,
+        } = optionsTemp
+
+        // token header
+        const token = getToken()
+        if (token && withToken !== false) {
+            // jwt token
+            Object.assign(configTemp.header, {
+                [configTemp.authenticationHeader]: configTemp.authenticationScheme
+                    ? `${configTemp.authenticationScheme} ${token}`
+                    : token,
+            })
+        }
+
+        // add prefix
+        if (joinPrefix)
+            configTemp.url = `${urlPrefix}${configTemp.url}`
+
+        const params = configTemp.params || {}
+        if (params) {
+            if (configTemp.method?.toUpperCase() === RequestEnum.GET) {
+                // add timestamp avoid cache
+                if (!isString(params)) {
+                    configTemp.params = Object.assign(params || {}, joinTimestamp(joinTime, false))
+                    if (joinParamsToUrl && configTemp.params) {
+                        configTemp.url = setObjToUrlParams(
+                            configTemp.url,
+                            Object.assign({}, configTemp.params, configTemp.data))
+                        configTemp.params = undefined
+                    }
+                }
+                else {
+                    // compatible with restful style
+                    configTemp.url = `${config.url + params}${joinTimestamp(joinTime, true)}`
+                    configTemp.params = undefined
+                }
+            }
+        }
+
+        if (apiUrl && isString(apiUrl))
+            configTemp.url = `${apiUrl}${configTemp.url}`
+
+        return new Promise((resolve, reject) => {
+            uni.request({
+                url: configTemp.url,
+                data: configTemp.data || {},
+                method: configTemp.method?.toUpperCase() as UniApp.RequestOptions['method'],
+                header: configTemp.header || {},
+                success: (res) => {
+                    // console.log('我是商品res啊', res);
+
+                    resolve(res.data as any)
+
+                },
+                fail: (e) => {
+                    reject(e.errMsg)
+                },
+                complete() { },
+            })
+        })
+    }
+
+    post<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'POST' }, options)
+    }
+
+    get<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'GET' }, options)
+    }
+
+    put<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'PUT' }, options)
+    }
+
+    delete<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'DELETE' }, options)
+    }
+}

src/utils/http/http.ts

@@ -80,6 +80,8 @@ export class VRequest {
                 method: configTemp.method?.toUpperCase() as UniApp.RequestOptions['method'],
                 header: configTemp.header || {},
                 success: (res) => {
+                    // console.log('我是res数据',res);
+                    
                     const data = res.data as Result
                     const _message: string = data?.message ?? ''
                     if (res.statusCode && res.statusCode !== 200) {

src/utils/http/index.ts

@@ -1,4 +1,6 @@
 import { VRequest } from './http'
+import { vRequest } from './detailhttp'
+import { kRequest } from './skuhttp'
 import { deepMerge } from '~/utils'
 import { ContentTypeEnum } from '~/enums/httpEnum'
 
@@ -41,6 +43,82 @@ function createRequest(options?: any) {
 
 export const defHttp = createRequest()
 
+
+//商品下架
+function onRequest(options?: any) {
+    return new vRequest(deepMerge(
+        {
+            url: '',
+            timeout: 5 * 1000,
+            authenticationScheme: 'Bearer',
+            authenticationHeader: 'X-Token',
+            // authenticationHeader: 'Authorization',
+            // authenticationScheme: '',
+
+            header: { 'Content-Type': ContentTypeEnum.JSON },
+            // 配置项，下面的选项都可以在独立的接口请求中覆盖
+            requestOptions: {
+                urlPrefix: '',
+                joinPrefix: false,
+                // 接口地址
+                apiUrl,
+                // 消息提示类型
+                errorMessageMode: 'message',
+                // 请求参数拼接到url
+                joinParamsToUrl: true,
+                //  是否加入时间戳
+                joinTime: true,
+                // 请求头是否携带token
+                withToken: true,
+                // 是否返回原生响应头 比如：需要获取响应头时使用该属性
+                isReturnNativeResponse: false,
+                // 需要对返回数据进行处理
+                isTransformResponse: true,
+            },
+        },
+        options || {},
+    ))
+}
+
+export const detailHttp = onRequest()
+//sku
+function skuRequest(options?: any) {
+    return new vRequest(deepMerge(
+        {
+            url: '',
+            timeout: 5 * 1000,
+            authenticationScheme: 'Bearer',
+            authenticationHeader: 'X-Token',
+            // authenticationHeader: 'Authorization',
+            // authenticationScheme: '',
+
+            header: { 'Content-Type': ContentTypeEnum.JSON },
+            // 配置项，下面的选项都可以在独立的接口请求中覆盖
+            requestOptions: {
+                urlPrefix: '',
+                joinPrefix: false,
+                // 接口地址
+                apiUrl,
+                // 消息提示类型
+                errorMessageMode: 'message',
+                // 请求参数拼接到url
+                joinParamsToUrl: true,
+                //  是否加入时间戳
+                joinTime: true,
+                // 请求头是否携带token
+                withToken: true,
+                // 是否返回原生响应头 比如：需要获取响应头时使用该属性
+                isReturnNativeResponse: false,
+                // 需要对返回数据进行处理
+                isTransformResponse: true,
+            },
+        },
+        options || {},
+    ))
+}
+
+export const skuhttp = skuRequest()
+
 // other api url
 // export const otherHttp = createRequest({
 //   requestOptions: {

src/utils/http/skuhttp.ts

@@ -0,0 +1,111 @@
+import { cloneDeep } from 'lodash-es'
+import { joinTimestamp } from './helper'
+import { checkStatus } from './checkStatus'
+import type { RequestOptions, Result } from './types'
+import { isString } from '~/utils/is'
+import { getToken } from '~/utils/auth'
+import { RequestEnum, ResultEnum } from '~/enums/httpEnum'
+import { setObjToUrlParams } from '~/utils'
+
+// const { showNotify } = usePageStoreWidthOut()
+
+type UniRequestOptions = UniApp.RequestOptions & { params?: any }
+
+export interface CreateRequestOptions extends UniRequestOptions {
+    authenticationScheme?: string
+    authenticationHeader: string
+    urlPrefix?: string
+    requestOptions?: RequestOptions
+}
+
+export class vRequest {
+    private readonly options: CreateRequestOptions
+
+    constructor(options: CreateRequestOptions) {
+        this.options = options
+    }
+
+    request<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        const configTemp: CreateRequestOptions = cloneDeep(Object.assign({}, this.options, config))
+        const optionsTemp: RequestOptions = Object.assign({}, this.options.requestOptions, options)
+
+        const {
+            urlPrefix, apiUrl, joinPrefix, joinTime = true, withToken, joinParamsToUrl,
+            isReturnNativeResponse, isTransformResponse,
+        } = optionsTemp
+
+        // token header
+        const token = getToken()
+        if (token && withToken !== false) {
+            // jwt token
+            Object.assign(configTemp.header, {
+                [configTemp.authenticationHeader]: configTemp.authenticationScheme
+                    ? `${configTemp.authenticationScheme} ${token}`
+                    : token,
+            })
+        }
+
+        // add prefix
+        if (joinPrefix)
+            configTemp.url = `${urlPrefix}${configTemp.url}`
+
+        const params = configTemp.params || {}
+        if (params) {
+            if (configTemp.method?.toUpperCase() === RequestEnum.GET) {
+                // add timestamp avoid cache
+                if (!isString(params)) {
+                    configTemp.params = Object.assign(params || {}, joinTimestamp(joinTime, false))
+                    if (joinParamsToUrl && configTemp.params) {
+                        configTemp.url = setObjToUrlParams(
+                            configTemp.url,
+                            Object.assign({}, configTemp.params, configTemp.data))
+                        configTemp.params = undefined
+                    }
+                }
+                else {
+                    // compatible with restful style
+                    configTemp.url = `${config.url + params}${joinTimestamp(joinTime, true)}`
+                    configTemp.params = undefined
+                }
+            }
+        }
+
+        if (apiUrl && isString(apiUrl))
+            configTemp.url = `${apiUrl}${configTemp.url}`
+
+        return new Promise((resolve, reject) => {
+            uni.request({
+                url: configTemp.url,
+                data: configTemp.data || {},
+                method: configTemp.method?.toUpperCase() as UniApp.RequestOptions['method'],
+                header: configTemp.header || {},
+                success: (res) => {
+                    // console.log('我是商品res啊', res);
+
+                    resolve(res as any)
+
+                },
+                fail: (e) => {
+                    reject(e.errMsg)
+                },
+                complete() { },
+            })
+        })
+    }
+
+    post<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'POST' }, options)
+    }
+
+    get<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'GET' }, options)
+    }
+
+    put<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'PUT' }, options)
+    }
+
+    delete<T = any>(config: UniRequestOptions, options?: RequestOptions): Promise<T> {
+        return this.request({ ...config, method: 'DELETE' }, options)
+    }
+}