li-yi合并至master

src/apis/dacang.ts

@@ -17,6 +17,8 @@ enum API {
 	DC_SECKILL_INDEX_TIME ='/api/store/product/seckill/select',
 	// 大仓商品列表
 	DC_PRODUCT_LIST = '/api/dacang/nologin/da_cang_product_lst',
+	// 大仓搜索商品列表
+	DC_SEARCH_LIST = '/gateway/wares_service/waresService/selectProductList',
 	// 大仓会员商品
 	DC_MEMBER_PRODUCT_LIST = '/api/store/product/dacang_lst',
 	// 大仓列表
@@ -82,6 +84,18 @@ export function getDcProductList(params: QueryDcProductListParams): Promise<Arra
 		}
 	})
 }
+/**
+ * 大仓搜索商品列表
+ *
+ */
+export function getDcSearchList(params: any): Promise<Array<any>> {
+	return defHttp.get({
+		url: API.DC_SEARCH_LIST,
+		data: {
+			...params
+		}
+	})
+}
 
 /**
  * 大仓秒杀商品
@@ -92,7 +106,7 @@ export function getDcSeckill(params: { page: number, limit: number }): Promise<A
 		data: {
 			...params
 		}
-	})
+	    })
 }
 
 /**

src/apis/model/myRelationProductModel.ts

@@ -23,4 +23,5 @@ export interface MyRelationProductModel {
     care_count: string
     // 原价（划线价格）
     ot_price: string
+    isSelected?:boolean
 }

src/apis/model/spreadInfoModel.ts

@@ -6,7 +6,7 @@ export interface SpreadInfoModel {
     yesterday_brokerage: number
     total_extract: number
     total_brokerage: number
-
+    member_brokerage_price:string
    // 佣金余额（可提现）
     brokerage_price: string
     now_money: string

src/apis/order.api.ts

@@ -1,13 +1,13 @@
-import {defHttp, detailHttp, skuhttp} from "~/utils/http"
+import { defHttp, detailHttp, skuhttp } from "~/utils/http"
 
 import type {
     IntegralOrderCreateModel, OrderCheckModel, OrderCreateModel,
     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";
-import type {AfterSalesOrderResult} from "~/apis/model/after-sales-order.model";
-import type {RefundApplyRequest} from "~/apis/model/refund.model";
+import type { ThirdOrderResult } from "~/apis/model/third-order.model";
+import type { CommentProductRequest } from "~/apis/model/comment-product";
+import type { AfterSalesOrderResult } from "~/apis/model/after-sales-order.model";
+import type { RefundApplyRequest } from "~/apis/model/refund.model";
 
 export interface CartIdRequest {
     cart_id: Array<string>
@@ -59,6 +59,14 @@ enum API {
     REFUND_APPLY = '/api/refund/apply',
     // 退款订单详情
     REFUND_DETAIL = '/api/refund/detail',
+    //快递列表
+    REFUND_KDLIST = '/api/common/express',
+    //退货订单
+    REFUND_OUTDL = '/api/refund/back_goods',
+    //退换货物流信息
+    REFUND_WLLIST = '/api/refund/express',
+    //协商记录
+    REFUND_XSLIST = '/api/refund/consult_list',
     // 售后-订单列表
     REFUND_LIST = '/api/refund/list',
     // 三方订单
@@ -94,6 +102,62 @@ export function getRefundDetail(id: string) {
     })
 }
 
+
+/**
+ * 快递列表/api/common/express
+ * @param params 
+ * 
+ * @returns 
+ */
+
+
+export function getRefundKdlist() {
+    return defHttp.get({
+        url: API.REFUND_KDLIST,
+    })
+}
+/**
+ * 提交退货订单
+ * @param params 
+ * 
+ * @returns 
+ */
+
+
+export function getRefundOutDl(id: any, data: any) {
+    return defHttp.post({
+        url: API.REFUND_OUTDL + `/${id}`,
+        data: { ...data }
+    })
+}
+/**
+ * 获取退换货物流信息
+ * @param params 
+ * 
+ * @returns 
+ */
+
+
+export function getRefundWlList(id: any) {
+    return defHttp.get({
+        url: API.REFUND_WLLIST + `/${id}`
+    })
+}
+/**
+ * 获取协商记录
+ * @param params 
+ * 
+ * @returns 
+ */
+
+
+export function getRefundXSlist(id: any) {
+    return defHttp.post({
+        url: API.REFUND_XSLIST + `/${id}`
+    })
+}
+
+
 /**
  * 售后-订单列表
  */
@@ -150,7 +214,7 @@ export function totalOrderNumber(): Promise<OrderQuantityModel> {
  * 三方订单
  * @param params
  */
-export function getThirdOrder(params: { type: string, page: number, limit: 20 | number}): Promise<ThirdOrderResult> {
+export function getThirdOrder(params: { type: string, page: number, limit: 20 | number }): Promise<ThirdOrderResult> {
     return defHttp.get({
         url: API.USER_THIRD_ORDER,
         data: {
@@ -211,12 +275,12 @@ 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')
+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:{
+        url: API.CHANGE_PRODUCT_SKU + `/${cart_id}?`,
+        data: {
             unique
         }
     })

src/apis/user.ts

@@ -1,4 +1,4 @@
-import { defHttp } from '~/utils/http'
+import { defHttp, detailHttp } from '~/utils/http'
 import type { UserUnionParams, UserUnionResult } from "~/apis/model/userUnionModel";
 import Cache from '~/utils/cache'
 import { EXPIRES_TIME, LOGIN_STATUS, OPEN_ID, STATE_R_KEY, USER_INFO } from "~/constants";
@@ -98,6 +98,8 @@ enum API {
     USER_RELATION_PRODUCT_LIST = '/api/user/relation/product/lst',
     // 取消收藏
     USER_RELATION_DELETE = '/api/user/relation/delete',
+    // 批量取消收藏
+    BATCH_RELATION_DELETE = '/api/user/relation/batch/delete',
     // 我关注的店铺
     USER_RELATION_MERCHANT_LIST = '/api/user/relation/merchant/lst',
 
@@ -106,7 +108,9 @@ enum API {
 
     // 红积分列表
     USER_RED_LOG = '/api/user/red_log',
-
+    //https://test.bjtdba.com/api/user/red_log?page=1&limit=20 红积分明细 
+    //https://test.bjtdba.com/api/user/bill?page=1&limit=20&is_red=true 红积分奖金明细
+    USER_BILL_LOG = '/api/user/bill',
     // 获取规则信息
     GET_RULES = '/api/notice/detail',
 
@@ -142,6 +146,7 @@ enum API {
     USER_CART_LIST = `/api/user/cart/lst`,
     // 购物车删除
     USER_CART_DELETE = `/api/user/cart/delete`,
+    USER_CART_REMOVE = `/api/user/relation/batch/create_remove_cart`,
     // 购物车数量
     USER_CART_COUNT = `/api/user/cart/count`,
 
@@ -297,6 +302,18 @@ export function getRedIntegralList(params: { page: number, limit: number }) {
         }
     })
 }
+/**
+ * 获取会员奖金列表
+ * @param params
+ */
+export function getBillIntegralList(params: any) {
+    return defHttp.get({
+        url: API.USER_BILL_LOG,
+        data: {
+            ...params
+        }
+    })
+}
 
 /* 关注/收藏
  */
@@ -449,6 +466,15 @@ export function deleteCartItem(cart_id: any[]) {
         }
     })
 }
+//移入收藏  USER_CART_REMOVE = `/api/user/relation/batch/create_remove_cart`,
+export function removeCartItem(type_id: any[]) {
+    return detailHttp.post({
+        url: API.USER_CART_REMOVE,
+        data: {
+            type_id
+        }
+    })
+}
 // 删除评论
 export function removeReply(reply_id: string) {
     return defHttp.post({
@@ -545,6 +571,18 @@ export function removeMyRelation(params: { type: number, type_id: string }) {
         }
     })
 }
+/**
+ * 批量取消我的收藏 user/relation/batch/delete
+ * @param type 1
+ */
+export function batchremoveMyRelation(params: { type: number, type_id:any[]}) {
+    return defHttp.post({
+        url: API.BATCH_RELATION_DELETE,
+        data: {
+            ...params
+        }
+    })
+}
 
 /**
  * 获取我的收藏
@@ -587,6 +625,21 @@ export function getApplicationWithdrawal(params: {
         }
     })
 }
+/**
+ * 提现申请
+ */
+export function getApplicationredWithdrawal(params: {
+    extract_price: string,
+    extract_type: string,
+    type:number
+}) {
+    return defHttp.post({
+        url: API.USER_EXTRACT_CREATE,
+        data: {
+            ...params
+        }
+    })
+}
 
 /**
  * 获取用户养老金信息

src/components/CXBBanner/CXBBanner.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 </script>
 <template>
-  <div class="flex flex-col justify-center items-center py-20">
+  <div class="flex flex-col justify-center items-center py-22">
     <image
         src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png"
         mode="widthFix"

src/components/CXBEmpty/CXBEmpty.vue

@@ -14,7 +14,7 @@ const props = defineProps({
   },
   text: {
     type: String,
-    default: '暂无数据'
+    default: '暂无相关数据'
   }
 })
 

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -67,7 +67,7 @@ function getPhoneNumber(e) {
               Cache.clear('SHARE_ID')
               if (redirectPageObj) {
                 if (redirectPageObj.type === 'page') {
-                  return uni.redirectTo({
+                  return uni.reLaunch({
                     url: redirectPageObj.page
                   })
                 }

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -121,7 +121,7 @@ function handleCountChange(value) {
 
 <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">
+    exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[55%] max-h-[70%] h-full">
     <div class="flex flex-col justify-between h-full">
       <div class="flex-1">
         <div class="p-3 flex flex-col gap-3">
@@ -142,10 +142,10 @@ function handleCountChange(value) {
                   剩余库存{{ currentSku.stock }}
                 </div>
                 <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
-                  {{ (currentSku.price * 30).toFixed(2) }} 积分
+                  {{  Math.round(currentSku.price * 30) }} 积分
                 </div>
                 <div class="flex items-end gap-2" v-else>
-                  <FPrice :price="currentSku.price" />
+                  <FPrice :price="detail.seckill_s==0? currentSku.price:currentSku.dacang" />
                   <FPrice v-if="currentSku.ot_price" :price="currentSku.ot_price"
                     :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through />
                 </div>
@@ -186,7 +186,7 @@ function handleCountChange(value) {
         </div>
       </div>
 
-      <div class="px-3 pb-10" v-if="isTo == 1">
+      <div class="px-3 pb-12" v-if="isTo == 1">
         <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
           确定
         </FButton>
@@ -210,13 +210,13 @@ function handleCountChange(value) {
         </FButton>
 
       </div>
-      <div class="flex box_1 flex-row justify-between text-sm text-white gap-3 " v-if="isTo == 2">
+      <div class="px-4 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">
+          class="bg-[#FFA319] rounded-full w-50 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 ">
+          class="bg-[#F94032] rounded-full w-50 flex justify-center items-center h-9 clor ">
           立即购买
         </button>
 

src/components/FNavBar/FNavBar.vue

@@ -36,7 +36,7 @@ const {
         <div v-if="hasLeft" class="f-nav-bar-left" :class="clickableClassName" :hover-class="props.clickable ? 'f-nav-bar-clickable-hover' : ''" @click="clickLeftHandler">
           <slot v-if="$slots.left" name="left" />
           <template v-else>
-            <div v-if="props.leftArrow" class="f-nav-bar-icon mr-1 i-tabler-chevron-left" />
+            <div v-if="props.leftArrow" class="f-nav-bar-icon mr-1 "><nut-icon name="rect-left" size="20"></nut-icon></div>
             <span v-if="props.leftText" class="f-nav-bar-text">{{ props.leftText }}</span>
           </template>
         </div>

src/components/ProductCard/ProductCard.vue

@@ -36,22 +36,29 @@ function handleClick() {
       @tap.stop="handleClick"
       class="bg-white rounded-lg"
   >
-    <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 5"></image>
-    <image :src="item.thumb" mode="widthFix" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 6"></image>
+    <image :src="item.image" style="width: 341rpx; height: 341rpx;" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 5"></image>
+    <image :src="item.thumb" style="width: 341rpx; height: 341rpx;"   :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 6"></image>
+    <image :src="item.image" style="width: 341rpx; height: 341rpx;"   :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16"></image>
 
     <div class="text-sm p-2 flex flex-col gap-1">
       <div v-if="item.type == 5" class="line-clamp-2">
         {{ item.store_name }}
       </div>
+      <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16" class="line-clamp-2">
+        {{ item.store_name }}
+      </div>
       <div v-if="item.type == 6" class="line-clamp-2">
         {{ item.name }}
       </div>
       <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
         <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                mode="widthFix" class="!w-8 h-4"></image>
-        <div class="px-2 flex items-center jusitify-center">
+        <div class="px-2 flex items-center jusitify-center"  >
           <div v-if="item.type == 5">
-            养老金 ¥{{item.yanglao}}
+            养老金 ¥{{item.yanglao||item.yanglao_price}}
+          </div>
+          <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
+            养老金 ¥{{item.yanglao_price}}
           </div>
 
           <div v-if="item.type==6">
@@ -67,17 +74,25 @@ function handleClick() {
           <div v-if="item.type == 5">
             {{ item.price }}
           </div>
+          <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
+            {{ item.price }}
+          </div>
           <div v-if="item.type == 6">
             {{item.lowestCouponPrice}}
           </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  v-if="item.type == 5" 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 v-if="item.type == 5">
+          <div >
             大仓
           </div>
-          <div v-if="item.type == 6">
+          
+        </div>
+        <div v-if="item.type == 6"  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>
@@ -88,6 +103,9 @@ function handleClick() {
         <div v-if="item.type == 5">
           ¥ {{item.ot_price}}
         </div>
+        <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
+          ¥ {{item.ot_price}}
+        </div>
         <div v-if="item.type == 6">
           ¥ {{item.price}}
         </div>

src/components/ProductList/ProductList.vue

@@ -2,9 +2,9 @@
 
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {debounce} from "lodash-es";
-import {useThrottleFn} from "@vueuse/core";
-import {throttle} from "~/utils/throttle";
+import { debounce } from "lodash-es";
+import { useThrottleFn } from "@vueuse/core";
+import { throttle } from "~/utils/throttle";
 
 const props = defineProps({
   list: {
@@ -18,45 +18,22 @@ const props = defineProps({
 
 function handleClickItem(item) {
   // console.log(item)
-  if (item.type === 5 || item.type === '5') {
-  // _.debounce(() => {
-  // debounce(() => {
-  // return useThrottleFn(() => {
-  //   uni.navigateTo({
-  //     url: `/pages/store/product/detail?id=${item.product_id}`
-  //   })
-  // }, 100)
-  //   throttle()
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
 
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
-    // throttle(() => {
-    //   uni.navigateTo({
-    //     url: `/pages/store/product/detail?id=${item.product_id}`
-    //   })
-    // })
-  // }, 200)
-
-  // })
-
-  }
-  // uni.navigateTo({
-  // })
 }
 </script>
 <template>
   <!--  <scroll-view type="custom">-->
-  <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"
-      >
-        <ProductCard  :item="item" @click:item="handleClickItem"/>
+  <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">
+        <ProductCard :item="item" @click:item="handleClickItem" />
       </div>
     </grid-view>
 
   </div>
-  <CXBEmpty v-else/>
+  <CXBEmpty v-else />
   <!--  </scroll-view>-->
 </template>

src/pages/accumulate-income/index.vue

@@ -68,7 +68,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   getUserInviteProfitList({
     ...params
   }).then(res => {
-    accumulateIncome.value = res
+	      accumulateIncome.value = res
     if (action === 'page') {
       state.list = state.list.concat(res.pageInfo.list)
     }

src/pages/annuity/index.vue

@@ -185,7 +185,7 @@ const ImgType = computed(() => {
         <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-else src="https://app.bjtdba.com/uploads/logo.jpg" style="width:74rpx; height:74rpx;"  class=" rounded-full" />
           <div>
             {{ userStore.userInfo.nickname }}
           </div>
@@ -197,20 +197,20 @@ const ImgType = computed(() => {
         <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 class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{parseFloat(Number( yanglaoStatistics.all_yanglao)).toFixed(2).replace(/\.?0+$/, '')
             }}
             </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) }}
+                ￥ {{ parseFloat(Number(yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a)).toFixed(2).replace(/\.?0+$/, '') }}
               </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).toFixed(2) }}</div>
+              <div>￥ {{parseFloat(Number(yanglaoStatistics.all_yanglao_a)).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-xs text-gray-400">已结算</div>
             </div>
             <div @tap="handleToCitic" class="flex flex-col justify-center items-center pl-3">

src/pages/home/components/announcement.vue

@@ -15,7 +15,8 @@ function go(item) {
   const data = findLast(props.list, (val: any) => {
     return item === val.title
   })
-
+  console.log(data);
+  
   uni.navigateTo({
     url: `/pages/announcement/index?data=${encodeBase64(data)}`
   })

src/pages/home/components/banner.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import {CDN_URL} from "~/config/app";
+import {CDM_URL, CDN_URL} from "~/config/app";
 const userStore = useUserStore()
 
 function handleGuestMemberNew() {
@@ -14,7 +14,8 @@ function handleGuestMemberNew() {
     })
   }
 }
-const image = CDN_URL + '/static/assets/chuxubao_huiyuan_220818.png'
+//https://cdn.bjtdba.com/vod/image/2023-12-08/20231208174609605.png
+const image = CDM_URL + '/image/2023-12-08/20231208174609605.png'
 </script>
 <template>
   <div class="px-3">

src/pages/home/components/header.vue

@@ -77,7 +77,7 @@ function handleClickser() {
     <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" />
+          style="width:74rpx; height:74rpx;" class="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 ?

src/pages/home/components/navs.vue

@@ -75,7 +75,7 @@ const navList = ref([{
 
 onBeforeMount(() => {
   getHomeQuickLink().then(res => {
-    console.log('res>>>>>', res);
+    // console.log('res>>>>>', res);
 
     if (res) {
       navList.value[12] = res[0]
@@ -109,7 +109,7 @@ function handleItemClick(item: any) {
     // 秒杀
     case 'miaosha': {
       uni.navigateTo({
-        url: '/pages/miaosha/index'
+        url: '/pages/miaosha/index?type_show=1'
       })
       break;
     }

src/pages/home/index.vue

@@ -1,34 +1,60 @@
 <script lang="ts" setup>
-import {getNewSignInInfo, getUserInfo, getYanglaojinStatistics} from "~/apis/user";
-import {getProduct} from "~/apis/home";
+import { getNewSignInInfo, getUserInfo, getYanglaojinStatistics } from "~/apis/user";
+import { getProduct } from "~/apis/home";
 
 import Navs from "~/pages/home/components/navs.vue";
 import Announcement from "~/pages/home/components/announcement.vue";
 import Banner from "~/pages/home/components/banner.vue";
 import Header from "~/pages/home/components/header.vue";
 import ProductList from "~/pages/home/components/product-list.vue";
-import {getHomeBanner, getHomeQuickLink, getLocal, getNoticeList, getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { getHomeBanner, getHomeQuickLink, getLocal, getNoticeList, getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
-import {CDN_URL} from "~/config/app";
+import { CDM_URL, CDN_URL } from "~/config/app";
 import CXBPrivacyPopup from "~/components/CXBPrivacyPopup/CXBPrivacyPopup.vue";
-import {getShareId} from "~/apis/product";
+import { getShareId } from "~/apis/product";
 // import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 // import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 import Cache from "~/utils/cache";
 
 import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+import { getDcSeckill } from "~/apis/dacang";
 const userStore = useUserStore()
 const usePageStore = usePageStoreWidthOut()
 usePageStore.setPageConfig({
   currentPage: {
     type: 'tab',
-    url:  '/pages/home/index'
+    url: '/pages/home/index'
   }
 })
 
+// 限时秒杀  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208174028968.png
+// 秒杀背景  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208174007505.png
+// 秒杀价格  https://cdn.bjtdba.com/vod/image/2023-12-08/20231208173948533.png
 
+
+const msbkImg = CDM_URL + '/image/2023-12-08/20231208174007505.png'
+const xsmsImg = CDM_URL + '/image/2023-12-08/20231208174028968.png'
+const mspcImg = CDM_URL + '/image/2023-12-08/20231208173948533.png'
+
+
+
+const msData = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  list: [],
+  duration: 60 * 60 * 1000, //秒杀活动时长
+})
+
+const remainingTime: any = ref({
+  hours: "00",
+  minutes: "00",
+  seconds: "00"
+})
+const msProductList = ref([])
+const msSeckillDate = ref('')
+const msStatus = ref('')
 // const list = ref([])
 const state = reactive({
   shareId: '',
@@ -61,7 +87,7 @@ onShow(() => {
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/home/index'
+      url: '/pages/home/index'
     }
   })
   if (!userStore.uid) {
@@ -74,6 +100,8 @@ onShow(() => {
     getYanglaojinStatistics().then(res => {
       state.all_yanglao = res.all_yanglao
     })
+    //加载秒杀数据
+    loadList('reload')
   }
 
 
@@ -81,22 +109,22 @@ onShow(() => {
 
 function checkSignIn() {
   // if (userStore.uid && state.isEject === 1) {
-    // 2 检查用户签到信息
-    getNewSignInInfo().then(res => {
-      // console.log(res)
-      const {today, day} = res
-      state.signToday = today
-      if (today === 0) {
-        state.isShowSignIn = true
-      }
-      state.day = day
+  // 2 检查用户签到信息
+  getNewSignInInfo().then(res => {
+    // console.log(res)
+    const { today, day } = res
+    state.signToday = today
+    if (today === 0) {
+      state.isShowSignIn = true
+    }
+    state.day = day
 
-      // // if (today === 0) {
-      //   2.1 弹出签到窗口
-      // }
-    }).catch(error => {
-      console.error(error + '->GetNewsSignInInfo')
-    })
+    // // if (today === 0) {
+    //   2.1 弹出签到窗口
+    // }
+  }).catch(error => {
+    console.error(error + '->GetNewsSignInInfo')
+  })
   // }
 }
 onLoad((option) => {
@@ -112,14 +140,10 @@ onLoad((option) => {
   // 加载地址数据
   // orderStore.getCurrentAddress()
   // 1加载首页数据
-  getHomeQuickLink().then(res => {})
-
-  getNoticeList().then(res => {
-    state.announcementList = res.list
-  })
+  getHomeQuickLink().then(res => { })
   state.page = 1
   loadProductList()
-
+  loadList('reload')
   getProductShare().then(res => {
     if (res) {
       userStore.setShareId(res.share_id)
@@ -153,9 +177,102 @@ onShareTimeline(() => {
 })
 
 
-// onShow(() => {
-//
-// })
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action === 'reload') {
+    msData.currentPage = 1
+  }
+  const params = {
+    page: msData.currentPage,
+    limit: msData.pageSize
+  }
+
+  getDcSeckill({
+    ...params
+  }).then(res => {
+    console.log('秒杀', res);
+    // status 1 开始抢 2 即将开始 3 已结束
+    let status2FilterList = res.filter((val) => {
+      return val.status == 2
+    })
+    let status1FilterList = res.filter((val) => {
+      return val.status == 1
+    })
+    // console.log('秒杀', ...res);
+    if (status2FilterList.length > 0) {
+      msData.list.push(...status2FilterList)
+    }
+    if (status1FilterList.length > 0) {
+      msData.list.unshift(...status1FilterList)
+    }
+    if (msData.list.length > 0) {
+      msProductList.value = msData.list[0].product_data
+      msSeckillDate.value = msData.list[0].seckill_date.slice(0, 5);
+      msStatus.value = msData.list[0].status
+      // console.log(11221111, msProductList.value);
+      // console.log(11221111, msSeckillDate.value);
+    }
+  })
+}
+
+//计算秒杀
+function getCountdown() {
+  const now = new Date();
+  const startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), parseHours(msSeckillDate.value), 0, 0);
+  // const startDate = new Date('2023-12-26 10:55:00');
+  const endDate = new Date(startDate.getTime() + 60 * 60 * 1000); // 结束时间为开始时间的一小时后
+
+  if (now > startDate && now < endDate) {
+    let milliseconds = endDate - now;
+
+    const hours = Math.floor(milliseconds / (1000 * 60 * 60));
+    const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000);
+
+    // 更新数据
+    remainingTime.value = {
+      hours: hours < 10 ? '0' + hours : hours,
+      minutes: minutes < 10 ? '0' + minutes : minutes,
+      seconds: seconds < 10 ? '0' + seconds : seconds
+    }
+  } else if (now >= endDate) {
+    clearInterval(timer);
+    //加载秒杀数据
+    console.log('时间到,自动关闭');
+    // loadList('reload')
+    uni.reLaunch({
+      url: '/pages/home/index'
+    })
+  } else if (now < startDate) {
+    console.log(111);
+
+  } else if (now == startDate) {
+    clearInterval(timer);
+    //加载秒杀数据
+    console.log('时间到,自动关闭');
+    // loadList('reload')
+    uni.reLaunch({
+      url: '/pages/home/index'
+    })
+  }
+}
+
+function parseHours(time: any) {
+  const [hours, minutes] = time.split(":");
+  return parseInt(hours);
+}
+
+// 每秒更新剩余时间
+const timer = setInterval(() => {
+  getCountdown()
+}, 1000);
+
+onUnload(() => {
+  clearInterval(timer);
+  console.log('卸载关闭');
+})
+
+
+
 watch(() => state.isShowSignIn, (val) => {
   val ? uni.hideTabBar() : uni.showTabBar()
 })
@@ -165,7 +282,7 @@ onPageScroll((page) => {
   // console.log(page.scrollTop.toFixed(),'距离顶部的距离')
   Scroll_X.value = Number(page.scrollTop.toFixed())
   // page.scrollTop
-  if (page.scrollTop >= 76 ) {
+  if (page.scrollTop >= 76) {
     headerClass.value = 'bg-white !text-gray-900'
   } else {
     headerClass.value = ''
@@ -175,6 +292,7 @@ onPageScroll((page) => {
 onPullDownRefresh(() => {
   state.page = 1
   loadProductList()
+  loadList('reload')
 })
 
 onReachBottom(() => {
@@ -206,18 +324,18 @@ function loadProductList() {
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 
 function handleBannerClick(item) {
-  if(item.url == 'rich') {
+  if (item.url == 'rich') {
     uni.navigateTo({
       url: '/pages/vip/index?type=user'
     })
   }
 }
 
-function getIsShow(){
+function getIsShow() {
   //首先获取是否执行过
   uni.getStorage({
     key: 'today',
-    success: function(res) {
+    success: function (res) {
       // console.log(res.data)
       // console.log('----')
       //成功的话 说明之前执行过，再判断时间是否是当天
@@ -229,7 +347,7 @@ function getIsShow(){
         uni.setStorageSync("today", new Date().toLocaleDateString()); //把新得日期更新到本地
       }
     },
-    fail: function(res) {
+    fail: function (res) {
       // console.log(res + 'FAIL...')
       //没有执行过的话 先存一下当前的执行时间
       // console.log(res);
@@ -244,65 +362,232 @@ function getIsShow(){
 
 }
 
+function Tomsindex() {
+  uni.navigateTo({
+    url: '/pages/miaosha/index?type_show=2'
+  })
+  // uni.navigateTo({
+  //   url: `/pages/user/login/invite-login`
+  // })
+}
 
+//秒杀跳转详情页
+function handleToDeatil(product_id: any) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${product_id}`
+  })
+}
 
 </script>
 <template>
   <div class="h-screen ">
     <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-    <Header :yanglaojin="state.all_yanglao"
-            :exClass="headerClass"
-    />
+    <Header :yanglaojin="state.all_yanglao" :exClass="headerClass" />
     <div class="flex flex-col gap-3 ">
-<!--      <image-->
-<!--          @click="handleBannerClick"-->
-<!--          :src="homeBanner"-->
-<!--             mode="widthFix" class="h-60 w-full "-->
-<!--      ></image>-->
+      <!--      <image-->
+      <!--          @click="handleBannerClick"-->
+      <!--          :src="homeBanner"-->
+      <!--             mode="widthFix" class="h-60 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"
-        >
+        <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">
           <swiper-item v-for="(item, index) in state.banners" :key="index">
-            <image :src="item.pic" @tap="handleBannerClick(item)" class="!w-full !h-full" mode="aspectFill"/>
+            <image :src="item.pic" @tap="handleBannerClick(item)" class="!w-full !h-full" mode="aspectFill" />
           </swiper-item>
         </swiper>
       </div>
+      <Navs />
+      <div class="px-3 relative " style="width: 700rpx; height: 458rpx;" v-if="msProductList.length > 0">
+        <!-- 秒杀大图 -->
+        <image lazy-load style="width: 100%;height: 100%; " :src="msbkImg"></image>
+        <!-- 限时秒杀 -->
+        <image lazy-load class="xsmsimg" style="width: 185rpx;height: 41rpx; " :src="xsmsImg"></image>
+        <!-- scroll 秒杀list -->
+        <scroll-view class="scroll-view_H" :scroll-x="true">
+          <div v-for="(item, index) in msProductList" :key="index" style="background-color: #FFFFFF; position: relative; "
+            class="scroll-view-item_H">
+            <!-- img  -->
+            <div @click="handleToDeatil(item.product_id)">
+              <div class="scroll-view-item_O">
+                <div style="width: 202rpx; height: 202rpx; margin-bottom: 23rpx; border-radius: 16rpx; ">
+                  <image :src="item.image" style="border-radius: 16rpx; width: 100%; height: 100%; "></image>
+                </div>
+                <div class="px-1">
+                  <div class="text_image_d mt-1 ">
+                    {{ item.store_name }}
+                  </div>
+                  <div
+                    class="mt-1 border border-solid border-1 border-red rounded flex  items-center text-[#FE0032] w-fit">
+                    <image src="https://cdn.bjtdba.com/vod/image/2023-12-11/20231211115513936.png" mode="widthFix"
+                      style="width: 46rpx; height: 28rpx;"></image>
+                    <div class="ylj_d flex items-center jusitify-center">
+                      <div>
+                        养老金 ¥{{ item.yanglao }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+              <!-- 价格 -->
+              <div class="jg_img" :style="{ background: 'url(' + mspcImg + ')', backgroundSize: 'cover' }">
+                <div class="jg_price">￥{{ item.seckill_price }}</div>
+              </div>
+            </div>
+
+          </div>
+
+        </scroll-view>
+        <!-- 倒计时 -->
+        <div class="ms_time" v-if="msStatus == '1'">
+          <span class="ms_span">{{ remainingTime.hours }}</span> :
+          <span class="ms_span">{{ remainingTime.minutes }}</span> :
+          <span class="ms_span">{{ remainingTime.seconds }}</span>
+        </div>
+        <div class="ckgdtext" @click="Tomsindex">
+          查看更多
+          <span>
+            <image style="width: 10rpx; height: 17rpx; " src="../../static/icon/ckgd.png"></image>
+          </span>
+        </div>
 
-      <Navs/>
 
-      <Announcement :list="state.announcementList"/>
-<!--      {{userStore.userInfo}}-->
 
-      <Banner/>
+      </div>
+      <!-- <Announcement :list="state.announcementList" /> -->
+      <!--      {{userStore.userInfo}}-->
 
-      <ProductList :list="state.productList"/>
+      <Banner />
+
+      <ProductList :list="state.productList" />
     </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" />
 
   <CXBPrivacyPopup />
 </template>
-<style>
+<style  >
 page {
   background-color: #f8f8f8;
 }
+
+.xsmsimg {
+  position: absolute;
+  top: 27rpx;
+  left: 56rpx;
+  z-index: 2;
+}
+
+
+
+.scroll-view_H {
+  white-space: nowrap;
+  width: 700rpx;
+  overflow: hidden;
+  position: absolute;
+  top: 96rpx;
+  left: 24rpx;
+  z-index: 1;
+}
+
+
+.ckgdtext {
+  position: absolute;
+  top: 28rpx;
+  left: 588rpx;
+  color: #FFFFFF;
+  height: 40rpx;
+  font-size: 22rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  line-height: 40rpx
+}
+
+.jg_img {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  margin-left: -65rpx;
+  z-index: 2;
+  min-width: 129rpx;
+  height: 38rpx;
+}
+
+.jg_price {
+  height: 38rpx;
+  line-height: 38rpx;
+  margin-left: 42rpx;
+  font-size: 20rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+}
+
+.scroll-view-item_H {
+  margin-top: 5rpx;
+  display: inline-block;
+  font-size: 36rpx;
+  width: 202rpx;
+  height: 342rpx;
+  margin-left: 24rpx;
+}
+
+.ms_time {
+  position: absolute;
+  top: 20rpx;
+  left: 260rpx
+}
+
+.ms_span {
+  display: inline-block;
+  height: 36rpx;
+  width: 36rpx;
+  text-align: center;
+  border-radius: 8rpx;
+  font-size: 20rpx;
+  line-height: 36rpx;
+  background: #333333;
+  color: white
+}
+
+.text_image_d {
+  height: 33rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 33rpx;
+  white-space: nowrap;
+  /* 防止文本换行 */
+  overflow: hidden;
+  /* 隐藏超出的部分 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
+
+.ylj_d {
+  height: 25rpx;
+  font-size: 18rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FE0032;
+  line-height: 25rpx;
+  padding-left: 6rpx;
+  padding-right: 6rpx;
+}
+
+.scroll-view-item_O {
+  height: 323rpx;
+  width: 100%;
+  border: 1rpx soild;
+  border-radius: 16rpx;
+  box-shadow: 2rpx 2rpx 12rpx 2rpx #FFC8CE;
+}
 </style>
 <route lang="yaml"   type="home">
 style:

src/pages/immediate-withdrawal/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  getApplicationredWithdrawal,
   getApplicationWithdrawal,
   getBandAccountInfo,
   getUserSpreadInfo,
@@ -25,10 +26,20 @@ const yanglaojin = ref<UserYanglaoJinModel>()
 const widthdrawalConfig = ref({})
 
 const cashWithdrawalAmount = ref()
-
+const isshow = ref(0)
 const isDisabled = ref(true)
 const userBrokeragePrice = ref(0)
+const member_brokerage_price = ref(0)
 // userSpreadInfo.value.brokerage_price
+onLoad((options) => {
+  if (options && options.type) {
+    if (options.type == 1) {
+      isshow.value = 1
+    } else if (options.type == 2) {
+      isshow.value = 2
+    }
+  }
+})
 onShow(async () => {
   cashWithdrawalAmount.value = null
   getBandAccountInfo({ type: '1' }).then(res => {
@@ -72,6 +83,7 @@ onShow(async () => {
   await userStore.getUserInfo()
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
+  console.log(99999, userSpreadInfo.value);
 
   yanglaojin.value = await getUserYangLaoJin()
 
@@ -81,15 +93,29 @@ onShow(async () => {
   console.log(widthdrawalConfig.value)
   userBrokeragePrice.value = userSpreadInfo.value?.brokerage_price ? parseFloat(userSpreadInfo.value?.brokerage_price) : 0
   console.log(userBrokeragePrice.value)
+  member_brokerage_price.value = userSpreadInfo.value?.member_brokerage_price ? parseFloat(userSpreadInfo.value?.member_brokerage_price) : 0
+  console.log(member_brokerage_price.value)
   // if (userSpreadInfo.value?.brokerage_price) {
-  if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
-    isDisabled.value = true
-    return uni.showToast({
-      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
-      icon: 'none'
-    })
+  if (isshow.value == 1) {
+    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
+  } else if (isshow.value == 2) {
+
+    if (member_brokerage_price.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
   }
 
+
   // }
 })
 
@@ -113,24 +139,27 @@ function Tochecked() {
   if (iswxshow.value == true) {
     Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
       console.log('我是resg', resg);
+      setTimeout(() => {
+        uni.showToast({
+          title: '绑定成功',
+          icon: 'none'
+        })
+      }, 300)
 
-      uni.showToast({
-        title: '绑定成功',
-        icon: 'none'
-      })
       iswxshow.value = true
     }).catch((error) => {
-      uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-      if(error=='此微信已绑定其他账户'){
-        iswxshow.value=false
-      }
+      setTimeout(() => {
+        uni.showToast({
+          title: error,
+          icon: 'none'
+        })
+      }, 300)
+
+      iswxshow.value = false
     })
-  }else{
+  } else {
     console.log(111);
-    
+
   }
 }
 
@@ -140,21 +169,33 @@ function Tochecked() {
 
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
-  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
-    cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
-  } else {
-    uni.showToast({
-      title: '可用余额太少，未满足提现要求',
-      icon: 'none'
-    })
+  if (isshow.value == 1) {
+    if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
+      cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
+    } else {
+      uni.showToast({
+        title: '可用余额太少，未满足提现要求',
+        icon: 'none'
+      })
+    }
+  } else if (isshow.value == 2) {
+    if (userSpreadInfo.value && userSpreadInfo.value.member_brokerage_price && userSpreadInfo.value?.member_brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
+      cashWithdrawalAmount.value = userSpreadInfo.value.member_brokerage_price
+    } else {
+      uni.showToast({
+        title: '可用余额太少，未满足提现要求',
+        icon: 'none'
+      })
+    }
   }
+
 }
 
 /**
  * 立即提现
  */
 function handleImmediateWithdrawal() {
-  
+
   if (isDisabled.value) {
     return
   }
@@ -213,7 +254,7 @@ function handleImmediateWithdrawal() {
     })
   }
 
-  if(iswxshow.value==false){
+  if (iswxshow.value == false) {
     uni.showToast({
       title: '请先勾选提现方式',
       icon: 'none'
@@ -243,6 +284,99 @@ function handleImmediateWithdrawal() {
   // if (yanglaojin.value) {
   // }
 }
+/**
+ * 立即提现
+ */
+function handleImmediateredWithdrawal() {
+
+  if (isDisabled.value) {
+    return
+  }
+  if (widthdrawalConfig.value.withdrawal_status == '0') {
+    isDisabled.value = true
+    return uni.showToast({
+      title: '提现功能关闭',
+      icon: 'none'
+    })
+  }
+  if (widthdrawalConfig.value.withdrawal_wchat == '0') {
+    isDisabled.value = true
+
+    return uni.showToast({
+      title: '微信提现功能关闭',
+      icon: 'none'
+    })
+  }
+
+  // 1.用户可提现余额≤最低提现额
+  if (member_brokerage_price.value < widthdrawalConfig.value.withdrawal_money) {
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
+
+  // 2 当输入金额≤可提现余额＜最低提现额度
+  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(member_brokerage_price.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
+
+  // 当输入金额＞可提现余额且输入金额≥最低提现额度
+  if ((Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(member_brokerage_price.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+
+
+    return uni.showToast({
+      title: '输入金额超过可提现余额',
+      icon: 'none'
+    })
+  }
+
+  if (iswxshow.value == false) {
+    uni.showToast({
+      title: '请先勾选提现方式',
+      icon: 'none'
+    })
+    return
+  }
+
+  getApplicationredWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: "1", type: 2 }).then(res => {
+
+    uni.showToast({
+      title: '提现已申请',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.navigateTo({
+        url: '/pages/withdrawal-record/index'
+      })
+    }, 300)
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+
+
+  // if (yanglaojin.value) {
+  // }
+}
 
 function handleWithdrawalRecord() {
   uni.navigateTo({
@@ -257,7 +391,8 @@ function handleShowAgreement(type) {
 }
 </script>
 <template>
-  <div class="p-3 flex flex-col gap-3">
+  <!-- 佣金提现 -->
+  <div class="p-3 flex flex-col gap-3" v-if="isshow == 1">
     <div class="flex justify-end">
       <div class=" text-sm" @tap="handleWithdrawalRecord">提现记录</div>
     </div>
@@ -294,8 +429,8 @@ function handleShowAgreement(type) {
             <div>微信</div>
           </div>
           <div>
-            <radio :checked="true" v-if="iswxshow==true" />
-            <radio :checked="false"  v-if="iswxshow==false" @click="Tochecked"  />
+            <radio :checked="true" v-if="iswxshow == true" />
+            <radio :checked="false" v-if="iswxshow == false" @click="Tochecked" />
           </div>
         </div>
 
@@ -321,9 +456,79 @@ function handleShowAgreement(type) {
 
       <div class="flex flex-col text-sm text-gray leading-8 py-4">
         <div>详细说明</div>
-        <div>平台服务费 {{ withdrawalCal.service }}</div>
-        <div>本次提取将扣除服务费 ¥{{ withdrawalCal.service_money }}</div>
-        <div>本次提取实际到账额度 ¥{{ withdrawalCal.money }}</div>
+        <div>平台服务费 {{ cashWithdrawalAmount ? withdrawalCal.service : '0' }}</div>
+        <div>本次提取将扣除服务费 ¥{{ cashWithdrawalAmount ? withdrawalCal.service_money : '0.00' }}</div>
+        <div>本次提取实际到账额度 ¥{{ cashWithdrawalAmount ? withdrawalCal.money : '0.00' }}</div>
+      </div>
+
+    </div>
+
+  </div>
+  <!-- 红积分提现 -->
+  <div class="p-3 flex flex-col gap-3" v-if="isshow == 2">
+    <div class="bg-white rounded-lg text-sm p-3 flex flex-col gap-4">
+      <div class="flex justify-between">
+        <div class="font-bold">提现金额</div>
+        <div class="text-xs text-gray" @click="handleShowAgreement(6)">提现规则</div>
+      </div>
+      <div class="flex justify-center items-center pt-4 f-hairline-bottom">
+        <div class="text-lg font-bold">￥</div>
+        <div class="flex-1">
+          <input placeholder="请输入金额" class="w-full" type="digit" v-model="cashWithdrawalAmount" />
+        </div>
+        <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
+      </div>
+      <div class="flex text-gray items-center gap-3 text-sm">
+        <div v-if="userSpreadInfo">
+          可用余额￥：{{ userStore.userInfo.member_brokerage_price }}
+        </div>
+        <div v-if="userStore.userInfo">
+          可用红积分：{{ parseFloat(Number(userStore.userInfo.red)).toFixed(2).replace(/\.?0+$/, '') }}
+        </div>
+      </div>
+
+    </div>
+    <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
+      <div class="flex f-hairline-bottom font-bold text-sm pb-2">
+        提现至
+      </div>
+      <div>
+        <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>
+            <radio :checked="true" v-if="iswxshow == true" />
+            <radio :checked="false" v-if="iswxshow == false" @click="Tochecked" />
+          </div>
+        </div>
+
+        <!--        <div class="flex items-center justify-between py-3">-->
+        <!--          <div class="flex items-center gap-2">-->
+        <!--            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>-->
+        <!--            <div>支付宝支付</div>-->
+        <!--            </div>-->
+        <!--            <div>-->
+        <!--              <radio />-->
+        <!--            </div>-->
+        <!--          </div>-->
+      </div>
+    </div>
+
+    <div class="flex flex-col">
+      <div class=" flex rounded-full bg-red-300">
+        <nut-button type="primary" block :disabled="isDisabled" :class="isDisabled && 'bg-gray-800'"
+          @tap="handleImmediateredWithdrawal">
+          立即提现
+        </nut-button>
+      </div>
+
+      <div class="flex flex-col text-sm text-gray leading-8 py-4">
+        <div>详细说明</div>
+        <div>平台服务费 {{ cashWithdrawalAmount ? withdrawalCal.service : '0' }}</div>
+        <div>本次提取将扣除服务费 ¥{{ cashWithdrawalAmount ? withdrawalCal.service_money : '0.00' }}</div>
+        <div>本次提取实际到账额度 ¥{{ cashWithdrawalAmount ? withdrawalCal.money : '0.00' }}</div>
       </div>
 
     </div>

src/pages/invite-friends/index.vue

@@ -4,11 +4,11 @@ import {
   getUserSharePostersClassifyList,
   getUserSharePostersImagesList,
 } from "~/apis/user";
-import type {SharePosterImageResult, SharePostersClassify} from "~/apis/model/inviteFriendsModel";
+import type { SharePosterImageResult, SharePostersClassify } from "~/apis/model/inviteFriendsModel";
 import ProductCard from "~/components/ProductCard/ProductCard.vue";
-import {call} from "dayjs";
+import { call } from "dayjs";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {CDN_URL} from "~/config/app";
+import { CDN_URL } from "~/config/app";
 const state = reactive<any>({
   // 列表高度
   scrollHeight: 0,
@@ -97,6 +97,9 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 
   getUserSharePostersImagesList(params).then(res => {
     state.triggered = false
+    console.log(action);
+    console.log(res);
+    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
     // sharePosterImageResult.value = res
     if (action === 'page') {
       state.list = state.list.concat(res.pageInfo.list)
@@ -104,8 +107,10 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     if (action === 'reload') {
       state.list = res.pageInfo.list
     }
+    setTimeout(() => {
+      state.triggered = false
+    }, 300)
 
-    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
     state.status = 'more'
     if (callback) {
       callback(res.pageInfo.list)
@@ -115,12 +120,13 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 
 function handleCategoryItemClick(item) {
   state.currentCategoryId = item.id
+  state.scrollTop = 0
   loadList('reload')
 }
+// 下拉刷新被下拉
 const onRefresherPulling = e => {
   state.triggered = true;
   loadList('reload')
-
 };
 // 下拉刷新被复位
 const onRefresherRestore = e => {
@@ -140,7 +146,7 @@ function handleScrollToLower() {
 
   state.status = 'loading';
   state.currentPage += 1;
-  if (state.currentPage >= state.totalPage) {
+  if (state.currentPage > state.totalPage) {
     state.status = 'noMore';
   } else {
     // queryFavorites('page');
@@ -150,6 +156,7 @@ function handleScrollToLower() {
 
 function loadAll() {
   state.currentCategoryId = 0
+  state.scrollTop = 0
   loadList('reload')
 }
 function handleItemClick(item) {
@@ -164,7 +171,7 @@ function handleItemClick(item) {
     uid: userStore.uid,
     imgId: item.id
   }).then(res => {
-    console.log(res)
+    console.log('生成的二维码', res)
     if (res && res.shareImgs) {
       state.currentImg = res.shareImgs
     }
@@ -206,26 +213,18 @@ function handleClose() {
 <template>
   <div class="flex">
     <!-- 左侧 -->
-    <scroll-view
-        :scroll-y="true"
-        :style="{ height: `${state.scrollHeight}px` }"
-        class="flex w-25 h-full bg-[#f8f8f8]"
-    >
-      <div
-          @tap="loadAll"
-          :class="state.currentCategoryId == 0 ? 'bg-white font-bold' : ''"
-          class="relative w-25 h-15 block text-sm flex justify-center items-center">
+    <scroll-view :scroll-y="true" :style="{ height: `${state.scrollHeight}px` }" class="flex w-25 h-full bg-[#f8f8f8]">
+      <div @tap="loadAll" :class="state.currentCategoryId == 0 ? 'bg-white font-bold' : ''"
+        class="relative w-25 h-15 block text-sm flex justify-center items-center">
         <div class="flex items-center gap-1">
           <div class="h-4 bg-primary w-1" v-if="state.currentCategoryId == 0"></div>
           <div>推荐</div>
         </div>
 
       </div>
-      <div v-for="(item, index) in categoryList" :key="index"
-           @click="handleCategoryItemClick(item)"
-           :class="state.currentCategoryId == item.id ? 'bg-white font-bold' : ''"
-           class="relative h-15 block text-sm flex justify-center items-center"
-      >
+      <div v-for="(item, index) in categoryList" :key="index" @click="handleCategoryItemClick(item)"
+        :class="state.currentCategoryId == item.id ? 'bg-white font-bold' : ''"
+        class="relative h-15 block text-sm flex justify-center items-center">
         <div class="flex items-center gap-1">
           <div class="h-4 bg-primary w-1" v-if="state.currentCategoryId == item.id"></div>
           <div>{{ item.name }}</div>
@@ -233,34 +232,25 @@ function handleClose() {
 
       </div>
     </scroll-view>
-    <scroll-view
-        :scroll-top="true"
-        :scroll-y="true"
-        :style="{ height: `${state.scrollHeight}px` }"
-        class="flex flex-1  flex-col h-full  p-3 gap-3 pb-safe"
-        :refresher-enabled="true"
-        refresher-background="#f5f5f5"
-        refresher-default-style="black"
-        :refresher-triggered="state.triggered"
-        @scrolltolower="handleScrollToLower"
-        @refresherPulling="onRefresherPulling"
-        @refresherRestore="onRefresherRestore"
-        @refresherAbort="onRefresherAbort"
-        @refresherrefresh="onRefresherRefresh"
-        v-if="state.list && state.list.length > 0"
-    >
-      <grid-view
-          type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px"
-      >
-        <div v-for="(item, index) in state.list"
-             :key="index"
-             @click="handleItemClick(item)"
-        >
-          <image
-              :src="item.image_fake"
-              mode="widthFix" class="w-30 h-full rounded-lg"></image>
+    <scroll-view :scroll-y="true" :scroll-top="state.scrollTop" :style="{ height: `${state.scrollHeight}px` }"
+      class="flex flex-1  flex-col h-full  p-3 gap-3 pb-safe" :refresher-enabled="true" refresher-background="#f5f5f5"
+      refresher-default-style="black" :refresher-triggered="state.triggered" @scrolltolower="handleScrollToLower"
+      @refresherPulling="onRefresherPulling" @refresherRestore="onRefresherRestore" @refresherAbort="onRefresherAbort"
+       @refresherrefresh="onRefresherRefresh" v-if="state.list && state.list.length > 0">
+      <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+        <div v-for="(item, index) in state.list" :key="index" @click="handleItemClick(item)">
+          <image :src="item.image_fake" mode="widthFix" class="w-30 h-full rounded-lg"></image>
         </div>
+        <!-- <div class=" 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>
+
     </scroll-view>
     <div class="flex flex-col justify-center items-center w-full" v-else>
       <CXBEmpty />
@@ -269,14 +259,13 @@ function handleClose() {
   </div>
 
   <nut-overlay v-model:visible="show" :lock-scroll="true">
-<!--    <image src="https://cdn.bjtdba.com/vod/image/2023-09-16/20230916070524825.png"-->
-<!--           mode="widthFix" class="absolute top-0 right-0"-->
-<!--           @tap.stop="handleClose"-->
-<!--           v-if="state.showTip"-->
-<!--    ></image>-->
-
-    <div class="flex flex-col justify-center items-center w-full h-full"
-    >
+    <!--    <image src="https://cdn.bjtdba.com/vod/image/2023-09-16/20230916070524825.png"-->
+    <!--           mode="widthFix" class="absolute top-0 right-0"-->
+    <!--           @tap.stop="handleClose"-->
+    <!--           v-if="state.showTip"-->
+    <!--    ></image>-->
+
+    <div class="flex flex-col justify-center items-center w-full h-full">
       <div class="bg-white">
         <image :src="state.currentImg" mode="widthFix" class="w-60"></image>
         <div class="bg-white p-3 flex justify-around gap-3">
@@ -284,7 +273,7 @@ function handleClose() {
             <image :src="wechatImg" mode="widthFix" class="w-8 h-8"></image>
             <div>微信</div>
           </div>
-<!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
+          <!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
             <image :src="pyqImg" mode="widthFix" class="w-8 h-8"></image>
             <div>朋友圈</div>
           </div>-->
@@ -306,10 +295,11 @@ style:
 
 </route>
 <style>
-
 page {
+  /* height: 100%; */
   overflow: hidden;
 }
+
 image {
 
   image-rendering: -moz-crisp-edges;

src/pages/message/index.vue

@@ -1,12 +1,30 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
+import { findLast } from "lodash-es";
+import { getNoticeList } from "~/apis/common";
+import { encodeBase64 } from "~/utils/http/helper";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+const announcementList = ref()
+onLoad(async (options) => {
+  let res = await getNoticeList()
+  console.log(res);
+  announcementList.value = res.list
+})
+
+function go(item: any) {
+  uni.navigateTo({
+    url: `/pages/announcement/index?data=${encodeBase64(item)}`
+  })
+}
 
-const icon = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
 </script>
 <template>
-  <div class="h-screen w-screen flex flex-col justify-center items-center">
-    <CXBEmpty type="message"/>
+  <div class="px-3" v-if="announcementList != undefined">
+    <div v-for="(item, index) in announcementList" :key="index">
+      <div @click="go(item)" class="py-2 text_gg " style="border-bottom: 1rpx solid #c0c4cc;">{{ item.title }}</div>
+    </div>
+  </div>
+  <div v-else class="h-screen w-screen flex flex-col justify-center items-center">
+    <CXBEmpty type="message" />
   </div>
 </template>
 
@@ -14,3 +32,12 @@ const icon = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
 style:
   navigationBarTitleText: 消息
 </route>
+<style scoped>
+.text_gg {
+  height: 42rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+</style>

src/pages/miaosha/index.vue

@@ -1,21 +1,41 @@
 <script setup lang="ts">
-import {getDcSeckill} from "~/apis/dacang";
-import {DcSeckillModel} from "~/apis/model/dacang.model";
+import { getDcSeckill } from "~/apis/dacang";
+import { DcSeckillModel } from "~/apis/model/dacang.model";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {CDN_URL} from "~/config/app";
-import {filter, orderBy} from "lodash-es";
-const currentSeckillDate = ref()
+import { CDM_URL, CDN_URL } from "~/config/app";
+import { filter, orderBy } from "lodash-es";
+
 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([])
+const currentstatus = ref(0)
+const currentSeckillDate = ref(null)
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222162545839.png 
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222162527655.png 
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222162507598.png 
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222162442860.png 
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222162410289.png
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222181803737.png
+const myshowcimg = CDM_URL + '/image/2023-12-22/20231222181803737.png'  // 秒杀back
+const ms_backimg = CDM_URL + '/image/2023-12-22/20231222162410289.png'  // 秒杀back
+const ms_titleimg = CDM_URL + '/image/2023-12-22/20231222162442860.png'  //秒杀title
+const jjksimg = CDM_URL + '/image/2023-12-22/20231222162507598.png '    //即将开始
+const xsgimg = CDM_URL + '/image/2023-12-22/20231222162527655.png '    //限时购
+const ms_textimg = CDM_URL + '/image/2023-12-22/20231222162545839.png'   //小喇叭
+
 
+const remainingTime: any = ref({
+  hours: "00",
+  minutes: "00",
+  seconds: "00"
+})
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
@@ -26,7 +46,25 @@ const state = reactive({
 })
 
 onLoad((options) => {
-  loadList('reload')
+  if (options.type_show == 1) {
+    if (!userStore.uid) {
+      userStore.setRedirectPage(`/pages/miaosha/index`, 'page')
+      return uni.redirectTo({
+        url: '/pages/user/login/index?key=4'
+      })
+
+    }
+    loadList('reload')
+  } else {
+    loadList('reload')
+  }
+  if (state.list.length > 0) {
+    uni.setNavigationBarStyle({
+      backgroundColor: '#00BFFF', // 北极颜色
+      color: '#ffffff', // 导航栏文字颜色，可根据实际需求调整
+    });
+  }
+
 })
 
 
@@ -41,10 +79,10 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 
   getDcSeckill({
     ...params
-  }).then( res => {
+  }).then(res => {
     if (action === 'reload') {
       if (res && res.length > 0) {
-        console.log('秒杀>>>',res)
+        console.log('秒杀>>>', res)
         const resList = res
         // const status3List = orderBy(list.value, (val) => {
         //   return val.status == 3
@@ -78,14 +116,69 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
           // list.value = orderBy(list.value, )
           currentSeckillDate.value = state.list[0].seckill_date
           currentProductList.value = state.list[0].product_data
+          currentstatus.value = state.list[0].status
         }
       }
     }
   })
 }
+
+
+//计算秒杀
+function getCountdown() {
+  if (currentSeckillDate.value) {
+    const now = new Date();
+    const startDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), parseHours(currentSeckillDate.value.slice(0, 5)), 0, 0);
+    const endDate = new Date(startDate.getTime() + 60 * 60 * 1000);
+    // 结束时间为开始时间的一小时后
+
+    if (now < endDate) {
+      let milliseconds = endDate - now;
+
+      const hours = Math.floor(milliseconds / (1000 * 60 * 60));
+      const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60));
+      const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000);
+
+      // 更新数据
+      remainingTime.value = {
+        hours: hours < 10 ? '0' + hours : hours,
+        minutes: minutes < 10 ? '0' + minutes : minutes,
+        seconds: seconds < 10 ? '0' + seconds : seconds
+      }
+    }
+  }
+
+}
+
+function parseHours(time: any) {
+  const [hours, minutes] = time.split(":");
+  return parseInt(hours);
+}
+
+// 每秒更新剩余时间
+const timer = setInterval(() => {
+  if (remainingTime.hours <= 0 && remainingTime.minutes <= 0 && remainingTime.seconds <= 0) {
+    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+    clearInterval(timer);
+    //加载秒杀数据
+    console.log('自动关闭');
+    loadList('reload')
+
+  }
+  getCountdown()
+}, 1000);
+
+onUnload(() => {
+  clearInterval(timer);
+  console.log('卸载关闭');
+})
+
+
+
 function handleSeckillDateClick(seckill) {
   currentProductList.value = seckill.product_data
   currentSeckillDate.value = seckill.seckill_date
+  currentstatus.value = seckill.status
 }
 
 function handleItemClick(seckillItem) {
@@ -99,41 +192,50 @@ function handleItemClick(seckillItem) {
     url: `/pages/store/product/detail?id=${seckillItem.product_id}`
   })
 }
+
+// 下拉刷新
+onPullDownRefresh(() => {
+  // uni.reLaunch({
+  //     url: '/pages/miaosha/index',
+  //   })
+  state.list = []
+  currentProductList.value = []
+  currentstatus.value = 0
+  currentSeckillDate.value = null
+  loadList('reload')
+  uni.stopPullDownRefresh();
+
+})
+
+function onClickLeft() {
+  const pages = getCurrentPages()
+  if (pages.length > 1) {
+    uni.navigateBack()
+  }
+  else {
+    uni.switchTab({
+      url: '/pages/home/index',
+    })
+  }
+}
 </script>
 <template>
-  <CXBBasePage>
-    <div
-        v-if="state.list && state.list.length > 0"
-
-    >
-      <scroll-view
-          class=" whitespace-nowrap  w-screen  text-sm py-3"
-          :scroll-with-animation="true"
-          :scroll-x="true"
-          :show-scrollbar="false"
-      >
-        <div
-            @tap="handleSeckillDateClick(item)"
-            v-for="(item, index) in state.list"
-            :key="index"
-            class="flex inline-flex items-center justify-center relative pl-5"
-            :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
-        >
-          {{item.seckill_date}}
+  <!-- <CXBBasePage>
+    <div v-if="state.list && state.list.length > 0">
+      <scroll-view class=" whitespace-nowrap  w-screen  text-sm py-3" :scroll-with-animation="true" :scroll-x="true"
+        :show-scrollbar="false">
+        <div @tap="handleSeckillDateClick(item)" v-for="(item, index) in state.list" :key="index"
+          class="flex inline-flex items-center justify-center relative pl-5"
+          :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''">
+          {{ item.seckill_date }}
         </div>
-        <!--      </div>-->
+        
       </scroll-view>
       <div class="p-3 pb-safe">
         <div class="flex flex-col gap-3">
-          <div
-              @tap="handleItemClick(seckillItem)"
-              v-for="(seckillItem, itemIndex) in currentProductList"
-              :key="itemIndex"
-              class="bg-white rounded p-3"
-          >
-            <div
-                class="bg-white flex gap-3"
-            >
+          <div @tap="handleItemClick(seckillItem)" v-for="(seckillItem, itemIndex) in currentProductList" :key="itemIndex"
+            class="bg-white rounded p-3">
+            <div class="bg-white flex gap-3">
               <div>
                 <image :src="seckillItem.image" mode="widthFix" class="w-30"></image>
               </div>
@@ -143,20 +245,14 @@ function handleItemClick(seckillItem) {
                   {{ seckillItem.store_name }}
                 </div>
                 <div class="text-gray text-xs">
-                  即将恢复原价￥{{ seckillItem.ot_price}}
+                  即将恢复原价￥{{ seckillItem.ot_price }}
                 </div>
                 <CXBYaojinTag :amount="Number.parseFloat(seckillItem.yanglao)" />
                 <div class="flex items-center justify-between">
-                  <FPrice :price="seckillItem.seckill_price"/>
-                  <image
-                      v-if="seckillItem.status == 1"
-                      :src="status1Icon" mode="widthFix" class="w-16 h-7" ></image>
-                  <image
-                      v-if="seckillItem.status == 2"
-                      :src="status2Icon" mode="widthFix" class="w-16 h-7" ></image>
-                  <image
-                      v-if="seckillItem.status == 3"
-                      :src="status3Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <FPrice :price="seckillItem.seckill_price" />
+                  <image v-if="seckillItem.status == 1" :src="status1Icon" mode="widthFix" class="w-16 h-7"></image>
+                  <image v-if="seckillItem.status == 2" :src="status2Icon" mode="widthFix" class="w-16 h-7"></image>
+                  <image v-if="seckillItem.status == 3" :src="status3Icon" mode="widthFix" class="w-16 h-7"></image>
                 </div>
               </div>
 
@@ -166,17 +262,200 @@ function handleItemClick(seckillItem) {
         </div>
       </div>
     </div>
-    <CXBEmpty v-else/>
+    <CXBEmpty v-else />
 
-  </CXBBasePage>
+  </CXBBasePage> -->
+  <FNavBar title="" :left-arrow="true" fixed placeholder z-index="999" ex-class="bg-transparent w-screen"
+    @click-left="onClickLeft" />
+  <div v-if="state.list && state.list.length > 0" style="position: relative;">
+    <div style="width: 750rpx; height: 490rpx;position: relative; ">
+      <image style="width: 100%;height: 100%;" :src="ms_backimg"></image>
+      <image class="ms_titleimg" :src="ms_titleimg"></image>
+    </div>
+    <div class="pb-safe list_d ">
+      <!-- <scroll-view class=" whitespace-nowrap  w-screen  text-sm py-3" :scroll-with-animation="true" :scroll-x="true"
+        :show-scrollbar="false">
+        <div @tap="handleSeckillDateClick(item)" v-for="(item, index) in state.list" :key="index"
+          class="flex inline-flex flex-col items-center justify-center relative pl-5 text-[#FFFFFF]">
+          <div>{{ item.seckill_date?.slice(0, 5) }}</div>
+          <div style="padding: 1rpx 16rpx;" :class="currentSeckillDate === item.seckill_date ? 'broder_s' : ''">{{
+            item.seckill_date?.slice(5) }}</div>
+        </div>
+
+      </scroll-view> -->
+      <scroll-view class=" whitespace-nowrap  w-screen  text-sm py-3" :scroll-with-animation="true" :scroll-x="true"
+        :show-scrollbar="false">
+        <div class="flex  items-center justify-center ">
+          <div @tap="handleSeckillDateClick(item)" v-for="(item, index) in state.list" :key="index"
+            class="basis-1/3   relative px-3 text-[#FFFFFF]" style="text-align: center;">
+            <div>{{ item.seckill_date?.slice(0, 5) }}</div>
+            <div style="padding: 1rpx 32rpx; ">
+              <div style="width: 100%;height: 100%;" :class="currentSeckillDate === item.seckill_date ? 'broder_s' : ''">
+                {{ item.seckill_date?.slice(5) }}</div>
+            </div>
+          </div>
+        </div>
 
+
+      </scroll-view>
+      <div class=" bg-white flex flex-col gap-3 mx-3 rounded">
+        <div v-if="currentstatus == 1" class="ms_title_gg mx-3 flex flex-1 justify-between">
+          <div>距本场结束
+            <span class="ms_span">{{ remainingTime.hours }}</span> :
+            <span class="ms_span">{{ remainingTime.minutes }}</span> :
+            <span class="ms_span">{{ remainingTime.seconds }}</span>
+          </div>
+          <div class="flex items-center justify-center">
+            <image style="width: 36rpx;height: 36rpx;margin-right:12rpx " :src="ms_textimg"></image>
+            <span style="height: 36rpx;line-height: 36rpx; color: #999999;">抓紧时间抢购哦~</span>
+          </div>
+        </div>
+        <div v-if="currentstatus == 2" class="ms_title_gg mx-3 flex flex-1 justify-between">
+          <div>
+            秒杀即将开始，请耐心等待~
+          </div>
+
+        </div>
+        <div @tap="handleItemClick(seckillItem)" v-for="(seckillItem, itemIndex) in currentProductList" :key="itemIndex"
+          class="bg-white  mx-3 p-3">
+          <div class="bg-white flex gap-3">
+            <div>
+              <image :src="seckillItem.image" style="width: 240rpx; height: 240rpx;"></image>
+            </div>
+            <div class="flex-1 flex flex-col gap-2 justify-between">
+              <div class="text-ellipsis">
+                {{ seckillItem.store_name }}
+              </div>
+              <CXBYaojinTag :amount="Number.parseFloat(seckillItem.yanglao)" />
+              <div class="flex items-center justify-between">
+                <div style="color: red;">￥{{ seckillItem.seckill_price }}</div>
+                <div class="line-through text-xs font-bold flex text-gray-600">
+                  ￥{{ seckillItem.ot_price }}
+                </div>
+                <image v-if="seckillItem.status == 1" :src="xsgimg" mode="widthFix" class="w-16 h-7"></image>
+                <image v-if="seckillItem.status == 2" :src="jjksimg" mode="widthFix" class="w-16 h-7"></image>
+              </div>
+            </div>
+
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+  <div v-else>
+    <div style="width: 750rpx; height: 176rpx;background-color: #ffffff;">
+      <div class="un_title">限时秒杀</div>
+    </div>
+    <div class="h-full unshowsc  flex flex-col justify-between items-center"
+      style="margin-top:115rpx ;  background-color: #f8f8f8;">
+      <div class="img_d mb-2">
+        <image :src="myshowcimg" style="width: 100%; height: 100%;"></image>
+      </div>
+      <div class="text_t">
+        暂未开放，敬请期待
+      </div>
+    </div>
+  </div>
 </template>
 <route lang="yaml">
 style:
   navigationBarTitleText: 限时秒杀
+  navigationStyle: custom
+  enablePullDownRefresh: true
 </route>
 <style>
 page {
   background: #f8f8f8;
 }
+
+.un_title {
+  width: 144rpx;
+  height: 50rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 50rpx;
+  position: absolute;
+  top: 107rpx;
+  left: 50%;
+  margin-left: -72rpx;
+}
+
+.ms_titleimg {
+  width: 182rpx;
+  height: 48rpx;
+  position: absolute;
+  top: 20%;
+  left: 284rpx;
+}
+
+.list_d {
+  position: absolute;
+  z-index: 2;
+  top: 200rpx;
+}
+
+.ms_title_gg {
+  height: 90rpx;
+  border-bottom: 1rpx solid #E5E5E5;
+  line-height: 90rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+}
+
+.text-ellipsis {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  -webkit-line-clamp: 2;
+  /* 设置显示的行数 */
+  text-overflow: ellipsis;
+}
+
+.ms_span {
+  display: inline-block;
+  height: 36rpx;
+  width: 36rpx;
+  text-align: center;
+  border-radius: 19rpx;
+  font-size: 20rpx;
+  line-height: 36rpx;
+  background: #fe0a3e;
+  color: white
+}
+
+.broder_s {
+  color: #fe0a3e;
+  background-color: #ffffff;
+  border-radius: 22rpx;
+}
+
+.unshowsc {
+  width: 350rpx;
+  height: 350rpx;
+  position: absolute;
+  top: 25%;
+  left: 50%;
+  margin-left: -175rpx;
+  text-align: center;
+}
+
+.img_d {
+  width: 206rpx;
+  height: 206rpx;
+}
+
+.text_t {
+  width: 300rpx;
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
 </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, getUserUnionId} from "~/apis/user";
+import { getAgentInfo, getSelectUserInviteProfit, getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
 const list = [{
   title: '邀请伙伴',
@@ -16,9 +16,6 @@ const list = [{
   title: '累计收益',
   url: '/pages/accumulate-income/index'
 }, {
-  title: '去提现',
-  url: '/pages/immediate-withdrawal/index'
-},{
   title: '支付平台绑定',
   url: '/pages/third_party_binding/index'
 }]
@@ -33,15 +30,15 @@ const data = ref({
   // state.extract = res.extract
   nickname: '',
   avatar: '',
-  brokerage_price: '' ,
-  yesterday: '' ,
-  cumulative: '' ,
+  brokerage_price: '',
+  yesterday: '',
+  cumulative: '',
   extract: ''
 })
 
 const userInviteProfit = reactive({
   numberSun: '',
-  UserUnsettledInviteProfit: '' ,
+  UserUnsettledInviteProfit: '',
   UserYesterdayInviteProfit: ''
 })
 onLoad(() => {
@@ -90,6 +87,37 @@ function handleClick(item: { url: string, title: string }) {
   })
 }
 
+function handleClickTomo() {
+  if (userStore.userInfo.is_ertification == 1) {
+    uni.navigateTo({
+      url: '/pages/immediate-withdrawal/index?type=1'
+    })
+  } else {
+    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);
+  }
+}
+
 function handleShowAgreement() {
   uni.navigateTo({
     url: '/pages/webview/agreement?type=6'
@@ -104,7 +132,7 @@ function handleShowAgreement() {
       <div class="text-sm">规则</div>
     </div>
     <div class="bg-white rounded-lg p-4 flex flex-col gap-4 ">
-      <div class="flex justify-around">
+      <div class="flex justify-between">
         <div class="flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">
             当前收益（元）
@@ -112,21 +140,22 @@ function handleShowAgreement() {
           <div class="font-bold text-[28px]">
             {{ data.brokerage_price ? data.brokerage_price : '0.00' }}
           </div>
+          <div class="text-xs text-gray">昨日收益 <span class="text-red">+ {{ data.yesterday }}</span></div>
         </div>
-        <div class="flex flex-col justify-center items-center gap-2">
-          <div class="text-xs text-gray">
-            未结算（元）
-          </div>
-          <div class="font-bold text-[28px]">
-            {{ userInviteProfit.UserUnsettledInviteProfit ? userInviteProfit.UserUnsettledInviteProfit : '0.00' }}
-          </div>
+        <div  class="flex flex-col justify-center items-center gap-2">
+          <div @click="handleClickTomo" class="text_qtx">去提现</div>
         </div>
       </div>
       <div class="flex justify-around">
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
-          <div class="text-xs text-gray">昨日收益（元）</div>
-          <div class="font-bold text-red">{{ data.yesterday }}</div>
+          <div class="text-xs text-gray">未结算（元）</div>
+          <div class="font-bold">{{ userInviteProfit.UserUnsettledInviteProfit ?
+            userInviteProfit.UserUnsettledInviteProfit : '0' }}</div>
         </div>
+        <!-- {
+                title: '去提现',
+                  url: '/pages/immediate-withdrawal/index?type=1'
+        },-->
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">累计收益（元）</div>
@@ -143,7 +172,8 @@ function handleShowAgreement() {
 
     <div class="bg-white  ">
       <FCellGroup divider arrow :ex-class="['rounded-xl']">
-        <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold" @click="handleClick(item)"/>
+        <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold"
+          @click="handleClick(item)" />
       </FCellGroup>
     </div>
 
@@ -155,6 +185,19 @@ page {
   background: #f8f8f8;
   overflow: hidden;
 }
+
+.text_qtx {
+  width: 168rpx;
+  height: 63rpx;
+  background: linear-gradient(179deg, #FE7577 0%, #FE0032 100%);
+  border-radius: 32rpx;
+  line-height: 63rpx;
+  font-size: 28rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/my-profile/index.vue

@@ -131,7 +131,7 @@ function handleSubmit() {
       <div class="">头像</div>
       <div class="flex items-center">
         <button class="btn-normal" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-          <image :src="formData.avatar ? formData.avatar : 'https://app.bjtdba.com/mp/zjx_image/logo.png'" mode="widthFix" class="w-9 h-9 rounded-full" />
+          <image :src="formData.avatar ? formData.avatar : 'https://app.bjtdba.com/mp/zjx_image/logo.png'" class=" rounded-full"  style="width:74rpx; height:74rpx;"/>
         </button>
         <div
             class="f-text-color-2 i-tabler-chevron-right transform transition-300"

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

@@ -1,14 +1,27 @@
 <script setup lang="ts">
 import FSearch from "~/components/FSearch/FSearch.vue";
-import {getMyRelationMerchantList, removeMyRelation} from "~/apis/user";
+import { batchremoveMyRelation, getMyRelationMerchantList, removeMyRelation } from "~/apis/user";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import { CDM_URL } from "~/config/app";
 const list = ref<any[]>()
+//https://cdn.bjtdba.com/vod/image/2023-12-22/20231222142806941.png
+const myshowcimg = CDM_URL + "/image/2023-12-22/20231222142806941.png"
 onShow(() => {
+  uni.showLoading({
+    title: '加载中',
+    icon: 'none'
+  })
   loadMyRelationMerchantList()
+  uni.hideLoading()
 
 })
 const searchValue = ref('')
-
+const state = reactive({
+  isManage: false,
+  totalNum: 0
+})
+let type_ids = ref<string[]>([])
+const isAllSelect = ref(false)
 function loadMyRelationMerchantList(keywords = '') {
   getMyRelationMerchantList({
     page: 1,
@@ -21,90 +34,162 @@ function loadMyRelationMerchantList(keywords = '') {
     }
   })
 }
-function handleRemoveMyRelation(item: any, index: number) {
+
+
+function handleItemClick(item) {
   console.log(item)
+  uni.navigateTo({
+    url: '/pages/store/home/index?id=' + item.mer_id
+  })
+}
+
+function handleTodacang() {
+  uni.reLaunch({
+    url: '/pages/store/nearby/index' // tabBar 页面路径
+  });
+}
+
+function handleManage() {
+  state.isManage = !state.isManage
+  state.totalNum = 0
+  isAllSelect.value = false
+  // 如果单选的情况下, 获取已选中的
+  list.value.map(item => ({ ...item, isSelected: false }))
+  console.log(list.value);
+  type_ids.value = []
+  console.log(list.value);
+  console.log(type_ids.value);
+
+}
+
+function handleSelectAll(checked: boolean) {
+
+  cartAllCheck('all')
+
+}
+function cartAllCheck(type: 'single' | 'all') {
+  let totalNum = 0
+  if (type === 'single') {
+    // 如果单选的情况下, 获取已选中的
+    let tempArr = list.value.filter(Item => {
+      // if (goodItem.check) {
+      return Item.isSelected === true
+      // }
+    })
+    // console.log(tempArr)
+    type_ids.value = tempArr?.map((item) => item.type_id) || [];
+    if (list.value.length === tempArr.length) {
+      isAllSelect.value = true
+      // goods.indeterminate = false
+    }
+    if (tempArr.length < list.value.length) {
+      isAllSelect.value = false
+    }
+    if (tempArr.length <= 0) {
+      isAllSelect.value = false
+    }
+
+  } else {
+    list.value.forEach(goodItem => {
+      goodItem.isSelected = isAllSelect.value
+    })
+    if (isAllSelect.value) {
+      type_ids.value = list.value?.map((item) => item.type_id) || [];
+      console.log(type_ids.value);
+
+
+    }
+  }
+
+  // 总金额｜总数
+  list.value.filter(goodItem => {
+    if (goodItem.isSelected) {
+      totalNum += 1
+    }
+  })
+
+  state.totalNum = totalNum
+  // console.log(type_ids);
+  // console.log(state.totalNum);
+
+}
+//批量取消收藏
+function handleBatch() {
+  console.log(type_ids.value);
+  // batchremoveMyRelation
   uni.showModal({
     title: '提示',
-    content: '确定取消收藏吗？',
-    success: (res) =>  {
+    content: `确定取消关注这${state.totalNum}家店铺吗？`,
+    success: (res) => {
       if (res.confirm) {
-        removeMyRelation({
+        batchremoveMyRelation({
           type: 10,
-          type_id: item.type_id
+          type_id: type_ids.value
         }).then(delRes => {
-          loadMyRelationMerchantList()
-
-          uni.showToast({
-            title: '取消收藏成功',
+          return uni.showToast({
+            title: '取消关注成功',
             icon: 'success'
           }).then(() => {
+            loadMyRelationMerchantList()
             // if (list) {
             //   list.value.splice(index, 1)
             // }
           })
-
-        }).catch(error => {
-          uni.showToast({
-            title: error,
-            icon: 'none'
-          })
         })
       }
     }
   })
 }
 
-function handleItemClick(item) {
-  console.log(item)
-  uni.navigateTo({
-    url: '/pages/store/home/index?id=' + item.mer_id
-  })
+//单选添加type_id
+function handleGoodsItemCheck(type_id: any) {
+  cartAllCheck('single')
 }
+
+onPullDownRefresh(() => {
+  uni.showLoading({
+    title: '加载中',
+    icon: 'none'
+  })
+  loadMyRelationMerchantList()
+  uni.stopPullDownRefresh()
+  uni.hideLoading()
+})
 </script>
 
 <template>
-  <div>
-    <div class="bg-white p-3 mb-3">
-      <nut-searchbar
-          class="absolute top-0"
-          v-model="searchValue" @search="loadMyRelationMerchantList( searchValue)" @clear="loadMyRelationMerchantList( '')">
-        <template v-slot:rightout>
-          <div @tap="loadMyRelationMerchantList(searchValue)">
-            搜索
-          </div>
-        </template>
-      </nut-searchbar>
-      <!--      <FSearch />-->
+  <div v-if="list && list.length > 0">
+    <div class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end ">
+      <div class="pr-3">
+        <FButton size="small" @click="handleManage">
+          <div>{{ state.isManage ? '完成' : '管理' }}</div>
+        </FButton>
+      </div>
     </div>
-    <div v-if="list && list.length > 0" class="flex flex-col gap-3 ">
-      <div class="bg-white flex p-3 " v-for="(item, index) in list" :key="index"
-           @tap="handleItemClick(item)"
-      >
+    <div style="background-color: #f8f8f8;" class="mt-14 flex flex-col gap-3 ">
+      <div class="bg-white flex p-3 " v-for="(item, index) in list" :key="index">
+
         <div class="flex w-full">
           <div class="flex flex-1 w-full">
-            <div>
-              <image :src="item.mer_avatar" mode="widthFix" class="w-15 h-15 rounded "></image>
-            </div>
-            <div class="flex flex-col text-sm  justify-between w-full">
-              <div class="flex flex-col px-3 gap-2 flex-1">
-                <div>
-                  {{ item.mer_name }}
-                </div>
-                <div class="text-xs text-gray">
-                  {{ item.care_count }} 人关注
-                </div>
+            <nut-checkbox v-if="state.isManage == true" v-model="item.isSelected" @change="handleGoodsItemCheck(item)"
+              label="单选" class="!text-primary"></nut-checkbox>
+            <div class="flex flex-1 " @tap="handleItemClick(item)">
+              <div>
+                <image :src="item.mer_avatar" mode="widthFix" class="w-15 h-15 rounded "></image>
               </div>
-
-              <!--
-              <div class="flex items-center justify-end">
-                <div
-                    @tap="handleRemoveMyRelation(item, index)"
-                    class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
-                  取消收藏
+              <div class="flex flex-col text-sm  justify-between w-full">
+                <div class="flex flex-col px-3 gap-2 flex-1">
+                  <div>
+                    {{ item.mer_name }}
+                  </div>
+                  <div class="text-xs text-gray">
+                    {{ item.care_count }} 人关注
+                  </div>
                 </div>
               </div>
-              -->
+
             </div>
+
           </div>
           <div class="list-bg ">
           </div>
@@ -113,8 +198,35 @@ function handleItemClick(item) {
       </div>
 
     </div>
-    <div v-else>
-      <CXBEmpty />
+    <div v-if="state.isManage == true" class="bg-white fixed bottom-0 w-full z-3 pb-10">
+      <div class="bg-white h-10 flex justify-between">
+        <div class="flex justify-center items-center gap-2 pl-3" @click="handleSelectAll">
+          <nut-checkbox v-model="isAllSelect" label="全选" class="!text-primary">全选
+          </nut-checkbox>
+          <!-- <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div> -->
+        </div>
+
+        <div class="flex justify-center items-center gap-2 pr-3">
+          <div class="flex text-[12px]" v-if="state.isManage">
+            <span v-if="state.totalNum != 0 && state.isManage">已选{{ state.totalNum }}家店铺</span>
+          </div>
+          <FButton :disabled="state.totalNum == 0" @click="handleBatch" size="small"
+            :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
+            取消关注
+          </FButton>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div v-else class="unshowsc  flex flex-col justify-between items-center">
+    <div class="img_d mb-2">
+      <image :src="myshowcimg" style="width: 100%; height: 100%;"></image>
+    </div>
+    <div class="text_t">
+      您还没有关注任何店铺
+    </div>
+    <div @click="handleTodacang" class="mt-6 button_t ">
+      去逛逛
     </div>
   </div>
 </template>
@@ -123,6 +235,7 @@ function handleItemClick(item) {
 page {
   background-color: #f8f8f8;
 }
+
 .list-bg {
   width: 124rpx;
   height: 124rpx;
@@ -130,8 +243,50 @@ page {
   background-size: 100% 100%;
 }
 
+page {
+  background-color: #f8f8f8;
+}
+
+.unshowsc {
+  width: 350rpx;
+  height: 350rpx;
+  position: absolute;
+  top: 25%;
+  left: 50%;
+  margin-left: -175rpx;
+  text-align: center;
+}
+
+.img_d {
+  width: 206rpx;
+  height: 206rpx;
+}
+
+.text_t {
+  width: 300rpx;
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.button_t {
+  width: 350rpx;
+  height: 82rpx;
+  background: linear-gradient(179deg, #FE7577 0%, #FE0032 100%);
+  border-radius: 42rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 82rpx;
+  text-align: center;
+}
 </style>
 <route lang="yaml">
 style:
   navigationBarTitleText: 我的关注
+  enablePullDownRefresh: true
 </route>

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

@@ -1,21 +1,35 @@
 <script setup lang="ts">
 import FSearch from "~/components/FSearch/FSearch.vue";
-import {getMyRelationProduct, removeMyRelation} from "~/apis/user";
-import type {MyRelationProductModel} from "~/apis/model/myRelationProductModel";
+import { getMyRelationProduct, removeMyRelation, batchremoveMyRelation } from "~/apis/user";
+import type { MyRelationProductModel } from "~/apis/model/myRelationProductModel";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import { CDM_URL } from "~/config/app";
 const list = ref<MyRelationProductModel[]>()
 onLoad((option: any) => {
+  uni.showLoading({
+    title: '加载中',
+    icon: 'none'
+  })
   loadMyFavorite()
+  uni.hideLoading()
 })
-
+//https://cdn.bjtdba.com/vod/image/2023-12-21/20231221100048578.png
 const searchValue = ref('')
-function loadMyFavorite(keywords= '') {
+const myshowcimg = CDM_URL + '/image/2023-12-21/20231221100048578.png'
+const state = reactive({
+  isManage: false,
+  totalNum: 0
+})
+let type_ids = ref<string[]>([])
+const isAllSelect = ref(false)
+function loadMyFavorite(keywords = '') {
   getMyRelationProduct({
     page: 1,
     limit: 10,
     keywords,
   }).then(res => {
     if (res) {
+      console.log(res);
       list.value = res.list
     }
   })
@@ -27,12 +41,12 @@ function handleShowDetail(item) {
     url: `/pages/store/product/detail?id=${item.product_id}`
   })
 }
-function handleRemoveMyRelationProduct(item: MyRelationProductModel, index: number) {
+function handleRemoveMyRelationProduct(item: any, index: number) {
   console.log(item)
   uni.showModal({
     title: '提示',
     content: '确定取消收藏吗？',
-    success: (res) =>  {
+    success: (res) => {
       if (res.confirm) {
         removeMyRelation({
           type: 1,
@@ -52,45 +66,184 @@ function handleRemoveMyRelationProduct(item: MyRelationProductModel, index: numb
     }
   })
 }
+
+function handleManage() {
+  state.isManage = !state.isManage
+  state.totalNum = 0
+  isAllSelect.value = false
+  // 如果单选的情况下, 获取已选中的
+  list.value.map(item => ({ ...item, isSelected: false }))
+  console.log(list.value);
+  type_ids.value = []
+  console.log(list.value);
+  console.log(type_ids.value);
+
+}
+
+function handleTodacang() {
+  uni.reLaunch({
+    url: '/pages/dacang/list/index' // tabBar 页面路径
+  });
+}
+
+function handleSelectAll(checked: boolean) {
+
+  cartAllCheck('all')
+
+}
+function cartAllCheck(type: 'single' | 'all') {
+  let totalNum = 0
+  if (type === 'single') {
+    // 如果单选的情况下, 获取已选中的
+    let tempArr = list.value.filter(Item => {
+      // if (goodItem.check) {
+      return Item.isSelected === true
+      // }
+    })
+    // console.log(tempArr)
+    type_ids.value = tempArr?.map((item) => item.type_id) || [];
+    if (list.value.length === tempArr.length) {
+      isAllSelect.value = true
+      // goods.indeterminate = false
+    }
+    if (tempArr.length < list.value.length) {
+      isAllSelect.value = false
+    }
+    if (tempArr.length <= 0) {
+      isAllSelect.value = false
+    }
+
+  } else {
+    list.value.forEach(goodItem => {
+      goodItem.isSelected = isAllSelect.value
+    })
+    if (isAllSelect.value) {
+      type_ids.value = list.value?.map((item) => item.type_id) || [];
+      console.log(type_ids.value);
+
+
+    }
+  }
+
+  // 总金额｜总数
+  list.value.filter(goodItem => {
+    if (goodItem.isSelected) {
+      totalNum += 1
+    }
+  })
+
+  state.totalNum = totalNum
+  // console.log(type_ids);
+  // console.log(state.totalNum);
+
+}
+//批量取消收藏
+function handleBatch() {
+  console.log(type_ids.value);
+  // batchremoveMyRelation
+  uni.showModal({
+    title: '提示',
+    content: `确定取消收藏这${state.totalNum}种商品吗？`,
+    success: (res) => {
+      if (res.confirm) {
+        batchremoveMyRelation({
+          type: 1,
+          type_id: type_ids.value
+        }).then(delRes => {
+          return uni.showToast({
+            title: '取消收藏成功',
+            icon: 'success'
+          }).then(() => {
+            loadMyFavorite()
+            // if (list) {
+            //   list.value.splice(index, 1)
+            // }
+          })
+        })
+      }
+    }
+  })
+}
+
+//单选添加type_id
+function handleGoodsItemCheck(type_id: any) {
+  cartAllCheck('single')
+}
+
+
+// 下拉刷新
+onPullDownRefresh(() => {
+  uni.showLoading({
+    title: '加载中',
+    icon: 'none'
+  })
+  loadMyFavorite()
+  uni.stopPullDownRefresh()
+  uni.hideLoading()
+})
+
 </script>
 
 <template>
-  <div>
-    <div class="bg-white ">
-<!--      <FSearch />-->
-      <nut-searchbar
-          class="absolute top-0"
-          v-model="searchValue" @search="loadMyFavorite( searchValue)" @clear="loadMyFavorite( '')">
-        <template v-slot:rightout>
-          <div @tap="loadMyFavorite(searchValue)">
-            搜索
+  <div v-if="list && list.length > 0">
+    <div class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end ">
+      <div class="pr-3">
+        <FButton size="small" @click="handleManage">
+          <div>{{ state.isManage ? '完成' : '管理' }}</div>
+        </FButton>
+      </div>
+    </div>
+    <div style="background-color: #f8f8f8;" class="mt-14">
+      <div class="bg-white flex  p-3" v-for="(item, index) in list" :key="index">
+        <div class="w-full flex">
+          <nut-checkbox v-if="state.isManage == true" v-model="item.isSelected" @change="handleGoodsItemCheck(item)"
+            label="单选" class="!text-primary"></nut-checkbox>
+          <div>
+            <image :src="item.image" mode="widthFix" class="w-15 h-15 rounded "></image>
+          </div>
+          <div class="flex flex-col text-sm px-3 justify-between w-full">
+            <div @click="handleShowDetail(item)">{{ item.store_name }}</div>
+            <div class="flex items-center justify-between">
+              <div class=" text-red font-bold">￥{{parseFloat(Number(item.price)).toFixed(2).replace(/\.?0+$/, '')  }}</div>
+              <div v-if="state.isManage == false" @tap="handleRemoveMyRelationProduct(item, index)"
+                class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
+                取消收藏
+              </div>
+            </div>
           </div>
-        </template>
-      </nut-searchbar>
+        </div>
+
+      </div>
+    </div>
+    <div v-if="state.isManage == true" class="bg-white fixed bottom-0 w-full z-3 pb-10">
+      <div class="bg-white h-10 flex justify-between">
+        <div class="flex justify-center items-center gap-2 pl-3" @click="handleSelectAll">
+          <nut-checkbox v-model="isAllSelect" label="全选" class="!text-primary">全选
+          </nut-checkbox>
+          <!-- <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div> -->
+        </div>
+
+        <div class="flex justify-center items-center gap-2 pr-3">
+          <div class="flex text-[12px]" v-if="state.isManage">
+            <span v-if="state.totalNum != 0 && state.isManage">已选{{ state.totalNum }}件</span>
+          </div>
+          <FButton :disabled="state.totalNum == 0" @click="handleBatch" size="small"
+            :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
+            取消收藏
+          </FButton>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div v-else class="unshowsc  flex flex-col justify-between items-center">
+    <div class="img_d mb-2">
+      <image :src="myshowcimg" style="width: 100%; height: 100%;"></image>
     </div>
-    <div v-if="list && list.length > 0">
-     <div class="bg-white flex p-3" v-for="(item, index) in list" :key="index">
-       <div class="w-full flex">
-         <div>
-           <image :src="item.image" mode="widthFix" class="w-15 h-15 rounded "></image>
-         </div>
-         <div class="flex flex-col text-sm px-3 justify-between w-full">
-           <div @click="handleShowDetail(item)">{{ item.store_name }}</div>
-           <div class="flex items-center justify-between">
-             <div class=" text-red font-bold">￥{{ item.price }}</div>
-             <div
-                 @tap="handleRemoveMyRelationProduct(item, index)"
-                 class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
-               取消收藏
-             </div>
-           </div>
-         </div>
-       </div>
-
-     </div>
+    <div class="text_t">
+      您还没有收藏任何商品
     </div>
-    <div v-else>
-      <CXBEmpty />
+    <div @click="handleTodacang" class="mt-6 button_t ">
+      去逛逛
     </div>
   </div>
 </template>
@@ -99,8 +252,47 @@ function handleRemoveMyRelationProduct(item: MyRelationProductModel, index: numb
 page {
   background-color: #f8f8f8;
 }
+
+.unshowsc {
+  width: 350rpx;
+  height: 350rpx;
+  position: absolute;
+  top: 25%;
+  left: 50%;
+  margin-left: -175rpx;
+  text-align: center;
+}
+
+.img_d {
+  width: 206rpx;
+  height: 206rpx;
+}
+
+.text_t {
+  width: 300rpx;
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.button_t {
+  width: 350rpx;
+  height: 82rpx;
+  background: linear-gradient(179deg, #FE7577 0%, #FE0032 100%);
+  border-radius: 42rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 82rpx;
+  text-align: center;
+}
 </style>
 <route lang="yaml">
 style:
   navigationBarTitleText: 我的收藏
-</route>
+  enablePullDownRefresh: true
+</route>

src/pages/my-rules/index.vue

@@ -4,6 +4,7 @@ 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 { CDM_URL } from '~/config/app';
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -15,123 +16,29 @@ const ruleDetail = ref<{
   status: string
   title: string
 }>()
+const nextRuleDetail = ref<{
+  admin_id: string
+  content: string
+  create_time: string
+  is_del: string
+  notice_id: string
+  status: string
+  title: string
+}>()
 
-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 ['会员']
+const backImg = CDM_URL + '/image/2023-12-13/20231213140615288.png'
+const vipicon = CDM_URL + '/image/2023-12-13/20231213140633462.png '
+// https://cdn.bjtdba.com/vod/image/2023-12-13/20231213140615288.png  卡片
+// https://cdn.bjtdba.com/vod/image/2023-12-13/20231213140633462.png  卡片
+const showUpgradeInfo = ref(true)
 
-//   }
-//   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)
   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
   // console.log('我是帮扶',bangfu);
-  
+
   // 普通用户
   if (userRichType == 0) {
     // if (bangfu) {
@@ -147,7 +54,7 @@ const userType = computed(() => {
     return ['../../static/img-hy/会员.png']
 
   }
-    // 创始人
+  // 创始人
   if (userRichType == 3) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
@@ -181,6 +88,7 @@ const userType = computed(() => {
     return ['']
   }
 })
+
 //0:普通用户 1:股东
 // const AlholderType = computed(() => {
 //   const stockholder = userStore.userInfo?.stockholder
@@ -193,7 +101,7 @@ const userType = computed(() => {
 //   if (stockholder == 1) {
 //     return ['../../static/img-hy/股东.png']
 //   }
-  
+
 // })
 // '':普通用户 district-区/县代 city-市代',
 // const areaType = computed(() => {
@@ -211,10 +119,11 @@ const userType = computed(() => {
 //   if(!areamanage){
 //     return['']
 //   }
-  
+
 // })
 
 
+const showValue = ref(false)  //标识展示下一等级
 
 onLoad(async () => {
 
@@ -252,9 +161,10 @@ function handleShowAnnuityDetail() {
 const ruleId = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
 
-  console.log('我是》》》',userRichType)
+  console.log('我是》》》', userRichType)
   // 创始人
   if (userRichType == 3) {
+    showUpgradeInfo.value = false
     return 21
   }
   // 用户
@@ -262,7 +172,7 @@ const ruleId = computed(() => {
     return 18
   }
   // 会员
-  if (userRichType ==1) {
+  if (userRichType == 1) {
     return 19
   }
   // 高级会员
@@ -270,14 +180,16 @@ const ruleId = computed(() => {
     return 20
   }
   // 合伙人
-  if (userRichType == 8 ) {
+  if (userRichType == 8) {
+    showUpgradeInfo.value = false
     return 24
   }
   //联合创始人
-  if (userRichType == 9 ) {
+  if (userRichType == 9) {
+    showUpgradeInfo.value = false
     return 22
   }
-  
+
 })
 const agentInfo = ref({})
 
@@ -286,8 +198,8 @@ onShow(() => {
   if (ruleId.value) {
     // console.log(ruleId.value)
     getRules(ruleId.value).then(res => {
-      console.log(1111111222,res);
-      
+      console.log(1111111222, res);
+
       ruleDetail.value = res
     }).catch(error => {
       uni.showToast({
@@ -303,71 +215,78 @@ onShow(() => {
 })
 
 function handleUserUpgrade() {
-  console.log('ruleid',ruleId.value);
-  
+  showValue.value = true
+  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
+      console.log('woshi111', res);
+
+      nextRuleDetail.value = res
     })
-  }else if(ruleId.value = 20){
+  } else if (ruleId.value = 20) {
     const id = ruleId.value + 4
     getRules(id).then(res => {
-      console.log('我是合伙人',res);
-      
-      ruleDetail.value = res
-      showUpgradeInfo.value = true
+      console.log('我是合伙人', res);
+
+      nextRuleDetail.value = res
     })
   }
 }
 
 function handleToVipPage() {
   uni.navigateTo({
-    url: '/pages/vip/index'
+    url: '/pages/vip/index?type=user'
   })
 }
+
+
+
+//关闭弹框
+function onCancel() {
+  // show.value = false
+
+  // console.log(showValue.value);
+
+  showValue.value = false
+  // console.log(showValue.value);
+}
+
+
 </script>
 <template>
   <div>
-    <div class="bg-[#FD1642] h-25 w-full absolute top-0 left-0"></div>
-    <div class="flex flex-col gap-4 relative px-3 pb-safe">
-      <div class="pt-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>
+
+    <div class="flex flex-col gap-4 relative  pb-safe">
+      <div class="">
+        <!-- 头像 -->
+        <div class="flex gap-2 mb-2 px-3 mb-6">
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+            class=" rounded-full" style="width: 102rpx; height: 102rpx;"></image>
 
           <div class="flex">
-            <div class="flex flex-col">
+            <div class="flex flex-col justify-between ">
               <div class="text-sm">
-                <div class="text-sm" v-if="userStore.userInfo">
+                <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_xs" v-if="userStore.userInfo && userStore.userInfo.phone">
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div class="flex gap-1 items-center px-1">
-              <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 class="flex gap-1  px-1">
+              <image class="vip_img" :src="userType" v-if="userType"></image>
             </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 style="width: 750rpx; height: 366rpx;" class="rounded flex flex-col gap-6  text-xl"
+          :style="{ background: 'url(' + backImg + ')', backgroundSize: 'cover' }">
+          <!-- <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>
@@ -390,36 +309,81 @@ function handleToVipPage() {
               <div>{{ userStore.userInfo.team_number }}</div>
               <div class="text-xs">团队人数</div>
             </div>
+          </div> -->
+          <div v-if="userStore.userInfo" class="flex " style="padding-top: 60rpx; color: #ffffff; ">
+            <div @tap="handleShowAnnuityDetail" class="w-1/2 flex flex-col justify-center" style="padding-left: 68rpx;">
+              <div class="text-xs">养老金</div>
+              <div>{{ userStore.yanglao.all_yanglao }}</div>
+            </div>
+            <div @tap="handleShowMyInvitation" class="w-1/2  flex flex-col justify-center " style="padding-left: 48rpx;">
+              <div class="text-xs">我的佣金</div>
+              <div>{{ agentInfo.brokerage_price }}</div>
+            </div>
+          </div>
+          <div v-if="userStore.userInfo" class="flex" style="padding-top: 30rpx; color: #ffffff; ">
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center " style="padding-left: 68rpx;">
+              <div class="text-xs">我的积分</div>
+              <div>{{ userStore.userInfo.score }}</div>
+            </div>
+            <div class="icon_d"></div>
+            <div @click="handleToRedIntegral" class="w-1/3 flex flex-col justify-center " style="padding-left: 48rpx;">
+              <div class="text-xs">红积分提现</div>
+              <div>{{ userStore.userInfo.member_brokerage_price }}</div>
+            </div>
+            <div class="icon_d"></div>
+            <div class="w-1/3 flex flex-col  justify-center" style="padding-left: 48rpx;">
+              <div class="text-xs">团队人数</div>
+              <div>{{ userStore.userInfo.team_number }}</div>
+            </div>
           </div>
-
         </div>
 
       </div>
-
-      <div v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo" class="p-3 bg-white text-sm text-gray-500">
-        <mpHtml :content="ruleDetail.content"></mpHtml>
-      </div>
-      <div v-else class="p-3 bg-white text-sm text-gray-500">
-        <mpHtml :content="ruleDetail.content" v-if="ruleDetail && ruleDetail.content"></mpHtml>
-
-        <div class="flex justify-center items-center">
-          <nut-button @click="handleToVipPage" type="primary" size="small">立即开通</nut-button>
-
+      <div class="px-4 p_abls " style="border-radius: 16rpx; background: #f8f3f3;">
+        <div v-if="ruleDetail && ruleDetail.content" class="p-3 bg-white text-sm text-gray-500"
+          style="border-radius: 16rpx;">
+          <mpHtml :content="ruleDetail.content"></mpHtml>
+        </div>
+        <div class="text_more px-3 bg-white text-sm flex flex-col" style="margin-top: 26rpx; padding-top: 40rpx;"
+          v-if="showUpgradeInfo == true">
+          <div class="font-jlqy " style="margin-bottom: 30rpx;">更多奖励权益</div>
+          <div class="flex justify-between">
+            <div class="flex">
+              <div style="width: 78rpx; height: 78rpx;">
+                <image style="width: 100%;height: 100%;" :src="vipicon"></image>
+              </div>
+              <div>
+                <div class="viplevel">会员权益升级</div>
+                <div class="viplevels">享受福利翻倍</div>
+              </div>
+            </div>
+            <div @click="handleUserUpgrade" class="rewards">
+              了解更多
+            </div>
+          </div>
         </div>
       </div>
+      <FPopup v-if="showValue==true" v-model:show="showValue" @close="onCancel" position="bottom"
+        exClass="rounded-rt-xl rounded-lt-xl  min-h-[55%] max-h-[70%] h-full">
+        <div v-if="nextRuleDetail && nextRuleDetail.content" class="flex flex-col flex-1 justify-between px-3 h-full ">
+          <div>
+            <div class="pt-2 pr-1 flex justify-end flex-1">
+              <div style=" text-align: center; width: 42rpx; height: 42rpx;" @click="onCancel">
+                <image style="width: 100%; height: 100%" src="../../static/icon/guanbi.png"></image>
+              </div>
+            </div>
+            <div class="mt-6" v-html="nextRuleDetail.content"></div>
+          </div>
 
+          <div class="px-3 pb-10">
+            <FButton @click="handleToVipPage" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+              立即升级
+            </FButton>
 
-
-      <div class="p-3 bg-white text-sm flex flex-col" v-if="!showUpgradeInfo">
-        <div class="font-bold">还有更多奖励权益</div>
-        <div class="flex justify-end">
-
-          <div @click="handleUserUpgrade"
-            class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600">了解更多奖励</div>
+          </div>
         </div>
-      </div>
-
 
+      </FPopup>
 
     </div>
   </div>
@@ -427,10 +391,9 @@ function handleToVipPage() {
 
 <route lang="yaml">
 style:
-  navigationBarBackgroundColor: "#FD1642"
+  navigationBarBackgroundColor: "#f8f3f3"
   navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
-  navigationBarTextStyle: "white"
+  enablePullDownRefresh: false
 
 </route>
 
@@ -439,9 +402,87 @@ page {
   background: #f5f5f5;
 }
 
+.text_sm {
+  height: 45rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 45rpx
+}
+
+.text_xs {
+  height: 33rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 33rpx;
+}
+
+.p_abls {
+  position: absolute;
+  top: 468rpx;
+}
+
 .vip_img {
-  width: 48px;
-  height: 24px;
+  width: 124rpx;
+  height: 56rpx;
   margin-left: 2px;
 }
+
+.icon_d {
+  width: 1rpx;
+  height: 40rpx;
+  background: rgba(255, 255, 255, 0.4);
+  ;
+}
+
+
+.text_more {
+  height: 202rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 7rpx 33rpx 0rpx rgba(229, 183, 183, 0.34);
+  border-radius: 16rpx;
+}
+
+.font-jlqy {
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 700;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.viplevel {
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.viplevels {
+  height: 30rpx;
+  font-size: 25rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 30rpx;
+}
+
+.rewards {
+  width: 148rpx;
+  height: 58rpx;
+  border-radius: 30rpx;
+  border: 1rpx solid #FE0032;
+  color: #FE0032;
+  line-height: 58rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  text-align: center;
+}
 </style>

src/pages/order-confirm/index.vue

@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import {getUserAddressDetail, getUserAddressList, getUserVipInfo} from "~/apis/user";
-import {reactive} from "vue";
-import {cartChange, checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate} from "~/apis/order.api";
+import { getUserAddressDetail, getUserAddressList, getUserVipInfo } from "~/apis/user";
+import { reactive } from "vue";
+import { cartChange, checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate } from "~/apis/order.api";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FCell from "~/components/FCell/FCell.vue";
-import {encodePhone} from "~/utils";
-import {CDN_URL} from "~/config/app";
-import {useAddressStore} from "~/stores/addressStore";
-import {useThrottle} from "@vueuse/core";
+import { encodePhone } from "~/utils";
+import { CDN_URL } from "~/config/app";
+import { useAddressStore } from "~/stores/addressStore";
+import { useThrottle } from "@vueuse/core";
 import FField from "~/components/FField/FField.vue";
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 // const addressInfo = ref({})
@@ -60,7 +60,7 @@ onLoad(async (options) => {
   //   })
   // }
   const res = await getUserAddressList()
-  console.log('我可是res啊',res)
+  console.log('我可是res啊', res)
   if (res.list && res.list.length > 0) {
     data.addressInfo = res.list[0]
     data.addressId = res.list[0].address_id
@@ -90,7 +90,7 @@ onLoad(async (options) => {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log(res)
+    console.log(15999999, res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
     data.totalPrice = res.order_price
@@ -147,9 +147,9 @@ function handleSubmit() {
     // 优惠券
     // coupon:
     // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
-    pay_type:  data.type && data.type == '3' ? '5' : '2',
+    pay_type: data.type && data.type == '3' ? '5' : '2',
     // pay_type: data.type,
-    mer_id: data.type && data.type == '3' ? '148': '',
+    mer_id: data.type && data.type == '3' ? '148' : '',
     // 用户留言
     mark: data.mark,
     // take: [],
@@ -189,8 +189,8 @@ function payment(createOrderData: CreateOrderRequest) {
           }, 500)
         })
         // uni.navigateTo({
-          //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-          // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
+        //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
+        // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
         // })
       }
     }).catch(err => {
@@ -247,12 +247,12 @@ function reTotal() {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log('我可是res啊',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);
-    
-    
+    console.log('data.cartOrder', data.cartOrder);
+
+
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
@@ -287,124 +287,110 @@ function reTotal() {
 }
 </script>
 <template>
-    <div class="p-3 flex flex-col gap-3 pb-safe">
-      <div
-          @click="handleAddressSelect"
-          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="aspectFit" class="w-4 h-4"></image>
-                </div>
-                <div class="flex-1 flex" v-if="data.addressId">
-                  {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' + data.addressInfo.detail }}
-                </div>
-                <div v-else class="flex-1 flex">
-                  请选择收货地址
-                </div>
+  <div class="p-3 flex flex-col gap-3 pb-safe">
+    <div @click="handleAddressSelect" 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="aspectFit" class="w-4 h-4"></image>
+              </div>
+              <div class="flex-1 flex" v-if="data.addressId">
+                {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' +
+                  data.addressInfo.detail }}
               </div>
+              <div v-else class="flex-1 flex">
+                请选择收货地址
+              </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>
-              {{ data.addressInfo.real_name }}
-            </div>
-            <div v-if="data.addressInfo && data.addressInfo.phone">
-              {{ encodePhone(data.addressInfo.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>
+            {{ data.addressInfo.real_name }}
+          </div>
+          <div v-if="data.addressInfo && data.addressInfo.phone">
+            {{ encodePhone(data.addressInfo.phone) }}
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="pb-15">
-        <div v-for="(item, index) in data.cartOrder" :key="index"
-             class=" bg-white rounded"
-        >
-          <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
-            <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
-            <div>{{ item.mer_name }}</div>
-<!--            <div>{{ item.mer_id}}</div>-->
-          </div>
-
-          <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
-            <div class="p-3 flex gap-3 f-hairline-bottom">
-              <div>
-                <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
+    <div class="pb-15">
+      <div v-for="(item, index) in data.cartOrder" :key="index" class=" bg-white rounded">
+        <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
+          <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
+          <div>{{ item.mer_name }}</div>
+          <!--            <div>{{ item.mer_id}}</div>-->
+        </div>
 
-              </div>
-              <div class="flex flex-col w-full">
-                <div class="flex flex-col ">
-                  <div class="line-clamp-1 text-xs">
-                    {{ orderProductItem.product.store_name }}
-                  </div>
-                  <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
-                </div>
-                <div class="flex">
-                  <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
+        <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
+          <div class="p-3 flex gap-3 f-hairline-bottom">
+            <div>
+              <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
 
+            </div>
+            <div class="flex flex-col w-full">
+              <div class="flex flex-col ">
+                <div class="line-clamp-1 text-xs">
+                  {{ orderProductItem.product.store_name }}
                 </div>
-                <div class="flex justify-between ">
-                  <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
-                  <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"  symbol="积分" position="after"></FPrice>
-                  <nut-input-number v-model="orderProductItem.cart_num" @change="(num) => handleNumberChange(num, orderProductItem)"/>
+                <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
+              </div>
+              <div class="flex">
+                <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'" />
 
-                </div>
               </div>
+              <div class="flex justify-between ">
+                <div v-if="item.mer_id != '148'" style="color:#fa4032">￥{{ orderProductItem.productAttr.price }}</div>
+                <div v-if="item.mer_id == '148'" style="color:#fa4032">{{ Math.round(orderProductItem.productAttr.price *
+                  30) }}积分</div>
+                <nut-input-number v-model="orderProductItem.cart_num"
+                  @change="(num) => handleNumberChange(num, orderProductItem)" />
 
+              </div>
             </div>
 
           </div>
-          <div>
-            <!-- 优惠券数据 先写死 -->
-            <FCell
-                v-if="item.mer_id != '148'"
-                title="优惠劵"
-                :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!='0' ? userStore.userInfo.score : '暂无积分'"
-                arrow
-            ></FCell>
-            <FCell
-                title="运费"
-                :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
-                arrow
-            ></FCell>
-<!--            <FCell-->
-<!--                title="留言"-->
-<!--                value="建议留言前先与商家沟通确认"-->
-<!--                arrow-->
-<!--            ></FCell>-->
-            <FField label="留言" placeholder="建议留言前先与商家沟通确认" v-model="data.mark" :exClass="['text-right']"/>
-          </div>
 
         </div>
+        <div>
+          <!-- 优惠券数据 先写死 -->
+          <FCell v-if="item.mer_id != '148'" title="优惠劵"
+            :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 != '0' ? userStore.userInfo.score : '暂无积分'" arrow></FCell>
+          <FCell title="运费" :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'" arrow></FCell>
+          <!--            <FCell-->
+          <!--                title="留言"-->
+          <!--                value="建议留言前先与商家沟通确认"-->
+          <!--                arrow-->
+          <!--            ></FCell>-->
+          <FField label="留言" placeholder="建议留言前先与商家沟通确认" v-model="data.mark" :exClass="['text-right']" />
+        </div>
+
       </div>
     </div>
+  </div>
 
-    <div class="fixed bottom-0 pb-safe w-full bg-white">
-      <div class="flex justify-between items-center p-3">
-        <div class="flex-1 flex text-sm font-bold">
-          应付金额：
-          <FPrice v-if="data.type && data.type == '3'" :price="data.totalPrice * 30" symbol="积分" position="after"></FPrice>
-         <FPrice  v-else :price="data.totalPrice"></FPrice>
-        </div>
-        <div class="flex">
-          <nut-button type="primary" @click="handleSubmit">提交订单</nut-button>
-        </div>
+  <div class="fixed bottom-0 pb-safe w-full bg-white">
+    <div class="flex justify-between items-center p-3">
+      <div class="flex-1 flex text-sm font-bold">
+        应付金额：
+        <div style="color:#fa4032" v-if="data.type && data.type == '3'">{{  Math.round(data.totalPrice * 30) }}积分</div>
+        <div style="color:#fa4032" v-else>￥{{ data.totalPrice }}</div>
+      </div>
+      <div class="flex">
+        <nut-button type="primary" @click="handleSubmit">提交订单</nut-button>
       </div>
-
     </div>
+
+  </div>
 </template>
 
 <route lang="yaml">

src/pages/order/components/AllItemList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getAllOrder} from "~/apis/order.api";
+import { getAllOrder } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
@@ -14,7 +14,8 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-  list: []
+  list: [],
+  status: ''
 })
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -34,7 +35,15 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize
   }).then(res => {
-    console.log('>>>>>',res)
+    console.log('>>>>>', res)
+    if (res.list.length <= 0) {
+      uni.$emit('changeShowLike')
+      console.log('没有数据');
+      return
+    }
+    if(res.count< state.pageSize){
+      uni.$emit('changeShowLike')
+    }
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -42,13 +51,19 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
       state.list = res.list
     }
     state.totalPage = Math.ceil(res.total / state.pageSize);
-
     state.status = 'more'
     if (callback) {
       callback(res.list)
     }
   })
 }
+watch(() => state.status, (newStatus, oldStatus) => {
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+
+  if (newStatus === 'noMore') {
+    uni.$emit('changeShowLike');
+  }
+});
 
 function handleScrollToLower() {
   state.status = 'loading';
@@ -56,6 +71,7 @@ function handleScrollToLower() {
 
   if (state.currentPage > state.totalPage) {
     state.status = 'noMore';
+
   } else {
     setTimeout(() => {
       loadList('page')
@@ -82,6 +98,9 @@ function handleScrollToLower() {
 //   })
 // })
 onMounted(() => {
+  uni.showLoading({
+    title: '加载中'
+  });
   loadList('reload')
   uni.$on('orderCancelFromList', () => {
     // loadAllOrderList()
@@ -101,6 +120,13 @@ onMounted(() => {
       }, 300)
     })
   })
+  uni.$on('AllreloadList', () => {
+    console.log('收到事件 reloadList');
+    // 在这里可以执行你的逻辑，比如调用 loadList 函数
+    // 请注意，这里的 this 指向当前页面实例
+    loadList('reload');
+  });
+  uni.hideLoading()
 })
 
 onUnmounted(() => {
@@ -116,11 +142,10 @@ onUnmounted(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
-        <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-        <OtherOrderItem :item="orderItem" v-else/>
+        <OrderItem :receivegoods="0" :order-item="orderItem" v-if="orderItem.source == 7" />
+        <OtherOrderItem :item="orderItem" v-else />
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500"
-           v-if="state.list && state.list.length > 0">
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -130,10 +155,8 @@ onUnmounted(() => {
       </div>
     </div>
     <div v-else class="flex flex-col  justify-center items-center w-full">
-      <CXBEmpty/>
+      <CXBEmpty />
 
     </div>
   </div>
-
-
 </template>

src/pages/order/components/ObligationOrderList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getAllOrder, getGroupOrderList} from "~/apis/order.api";
+import { getAllOrder, getGroupOrderList } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
@@ -14,7 +14,7 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-  status: 'noMore',
+  status: '',
 
   list: []
 })
@@ -35,6 +35,15 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize
   }).then(res => {
+    console.log('>>>>>>111', res);
+    if (res.list.length <= 0) {
+      uni.$emit('changeShowLike')
+      console.log('没有数据');
+      return
+    }
+    if(res.count< state.pageSize){
+      uni.$emit('changeShowLike')
+    }
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -49,6 +58,13 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     }
   })
 }
+watch(() => state.status, (newStatus, oldStatus) => {
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+
+  if (newStatus === 'noMore') {
+    uni.$emit('changeShowLike');
+  }
+});
 
 function handleScrollToLower() {
   state.status = 'loading';
@@ -80,6 +96,12 @@ onMounted(() => {
       }, 300)
     })
   })
+  uni.$on('dfkreloadList', () => {
+    console.log('收到事件 reloadList');
+    // 在这里可以执行你的逻辑，比如调用 loadList 函数
+    // 请注意，这里的 this 指向当前页面实例
+    loadList('reload');
+  });
 })
 
 onUnmounted(() => {
@@ -91,12 +113,11 @@ onUnmounted(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col">
       <div v-for="(orderItem, index) in state.list" :key="index">
-<!--        <OrderItem :order-item="orderItem" />-->
-<!--        <OtherOrderItem :item="orderItem" v-else/>-->
-        <OrderObligationItem :order-item="orderItem" :tab-value="props.tabValue"/>
+        <!--        <OrderItem :order-item="orderItem" />-->
+        <!--        <OtherOrderItem :item="orderItem" v-else/>-->
+        <OrderObligationItem :order-item="orderItem" :tab-value="props.tabValue" />
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500"
-           v-if="state.list && state.list.length > 0">
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -110,6 +131,4 @@ onUnmounted(() => {
 
     </div>
   </div>
-
-
 </template>

src/pages/order/components/Order2List.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getOrderListFromStatus} from "~/apis/order.api";
+import { getOrderListFromStatus } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
@@ -12,7 +12,7 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-
+  status: '',
   list: []
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -34,6 +34,14 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     status: props.status,
   }).then(res => {
     console.log(res)
+    if (res.list.length <= 0) {
+      uni.$emit('changeShowLike')
+      console.log('没有数据');
+      return
+    }
+    if(res.count< state.pageSize){
+      uni.$emit('changeShowLike')
+    }
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -49,6 +57,14 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   })
 }
 
+watch(() => state.status, (newStatus, oldStatus) => {
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+
+  if (newStatus === 'noMore') {
+    uni.$emit('changeShowLike');
+  }
+});
+
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
@@ -91,8 +107,7 @@ onUnload(() => {
         <OrderItem :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500"
-           v-if="state.list && state.list.length > 0">
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -106,6 +121,4 @@ onUnload(() => {
 
     </div>
   </div>
-
-
 </template>

src/pages/order/components/Order3List.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getOrderListFromStatus} from "~/apis/order.api";
+import { getOrderListFromStatus } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
@@ -12,7 +12,7 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-
+  status: '',
   list: []
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -34,6 +34,14 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     status: props.status,
   }).then(res => {
     console.log(res)
+    if (res.list.length <= 0) {
+      uni.$emit('changeShowLike')
+      console.log('没有数据');
+      return
+    }
+    if(res.count< state.pageSize){
+      uni.$emit('changeShowLike')
+    }
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -69,6 +77,14 @@ function handleScrollToLower() {
   // }, 300)
 }
 
+watch(() => state.status, (newStatus, oldStatus) => {
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+
+  if (newStatus === 'noMore') {
+    uni.$emit('changeShowLike');
+  }
+});
+
 // onReachBottom(() => {
 //   handleScrollToLower()
 //
@@ -105,11 +121,10 @@ onUnload(() => {
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
-        <OrderItem :order-item="orderItem" />
+        <OrderItem :receivegoods="3" :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500"
-           v-if="state.list && state.list.length > 0">
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -123,6 +138,4 @@ onUnload(() => {
 
     </div>
   </div>
-
-
 </template>

src/pages/order/components/Order4List.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getOrderListFromStatus} from "~/apis/order.api";
+import { getOrderListFromStatus } from "~/apis/order.api";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
@@ -12,7 +12,7 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-
+  status: "",
   list: []
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -34,6 +34,14 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     status: props.status,
   }).then(res => {
     console.log(res)
+    if (res.list.length <= 0) {
+      uni.$emit('changeShowLike')
+      console.log('没有数据');
+      return
+    }
+    if(res.count< state.pageSize){
+      uni.$emit('changeShowLike')
+    }
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }
@@ -48,7 +56,13 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     }
   })
 }
+watch(() => state.status, (newStatus, oldStatus) => {
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
 
+  if (newStatus === 'noMore') {
+    uni.$emit('changeShowLike');
+  }
+});
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
@@ -113,8 +127,7 @@ onUnload(() => {
         <OrderItem :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500"
-           v-if="state.list && state.list.length > 0">
+      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -128,6 +141,4 @@ onUnload(() => {
 
     </div>
   </div>
-
-
 </template>

src/pages/order/components/OrderItem.vue

@@ -11,7 +11,7 @@ import {
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
 import { DcProductModel } from "~/apis/model/dacang.model";
-import { error } from "console";
+import { error, log } from "console";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -23,6 +23,10 @@ const props = defineProps({
   tabValue: {
     type: Number,
     default: 0
+  },
+  receivegoods: {
+    type: Number,
+    default: 0
   }
 
 })
@@ -58,19 +62,19 @@ function getStatusText(orderItem: OrderListModel) {
     return '待收货'
   }
   if (orderItem.status == 2) {
-    return '已完成, 待评价'
+    return '待评价'
   }
   if (orderItem.status == 3) {
     return '已完成'
   }
   if (orderItem.status == -1) {
-    return '已退款'
+    return '已完成'
   }
   if (orderItem.status == 4) {
-    return '已申请退款'
+    return '售后中'
   }
   if (orderItem.status === 5) {
-    return '已取消订单'
+    return '已取消'
   }
   if (orderItem.status === '5') {
     return '待付款'
@@ -128,10 +132,18 @@ function handlePayment() {
 }
 
 function handleShowOrderDetail(order) {
-  console.log(order)
+  console.log(111212121, order)
   uni.navigateTo({
-    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}&type=${order.status}`
+    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
+  // if (order.status === '5') {
+  //   uni.navigateTo({
+  //     url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(order)}&type=1`
+  //   })
+  // } else {
+
+  // }
+
 }
 
 function handleRemindTheDelivery() {
@@ -159,10 +171,19 @@ function handleTakeOrder(orderItem) {
       if (res.confirm) {
         takeOrder(orderItem.order_id).then(res => {
           // console.log(res)
+
           uni.showToast({
             title: '确认收货成功'
           })
-          uni.$emit('orderTakeFromList')
+          if (props.receivegoods == 0) {
+            console.log('全部订单');
+
+            uni.$emit('AllreloadList')
+          } else if (props.receivegoods == 3) {
+            console.log('待收货订单');
+            uni.$emit('onTab3PullDownRefresh')
+          }
+
 
         }).catch(error => {
           uni.showToast({
@@ -199,7 +220,7 @@ function handleProductItemClick(
 
 
 function handeRefund(orderItem) {
-  console.log('申请售后', orderItem);
+  console.log('售后详情', orderItem);
 
   uni.navigateTo({
     // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
@@ -207,11 +228,76 @@ function handeRefund(orderItem) {
   })
 }
 
+function handeDetail(orderItem: any) {
+  uni.navigateTo({
+    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+  })
+}
 function handleShowObligationOrderDetail(orderItem) {
+  console.log("hhhhhhhh", orderItem)
   uni.navigateTo({
     url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
   })
 }
+
+const remainingTime: any = ref({
+  hours: "00",
+  minutes: "00",
+  seconds: "00"
+})
+//计算取消时间
+function updateRemainingTime(detail: any) {
+  if (props.orderItem.status === '5') {
+    const currentTime = new Date().getTime();
+    const endTime = new Date(detail.close_time).getTime();
+    const timeDifference = endTime - currentTime;
+
+    if (timeDifference > 0) {
+      // 计算剩余时间
+      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
+      }
+    } else {
+      clearInterval(timer);
+      remainingTime.value = {
+        hours: "00",
+        minutes: "00",
+        seconds: "00"
+      }
+      //   //重新刷新页面
+      uni.$emit('AllreloadList')
+      console.log('自动关闭>>>');
+    }
+  }
+
+}
+
+
+// 每秒更新剩余时间
+const timer = setInterval(() => {
+  updateRemainingTime(props.orderItem)
+}, 1000);
+
+onUnload(() => {
+  clearInterval(timer);
+  console.log('卸载关闭');
+})
+
+function handleShowDetail(orderItem: any) {
+  console.log(orderItem)
+  uni.navigateTo({
+    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+  })
+}
+
 </script>
 
 <template>
@@ -254,7 +340,9 @@ function handleShowObligationOrderDetail(orderItem) {
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.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="font-bold text-[12px] !text-[#000]"> ￥{{
+                  parseInt(parseFloat(orderProduct.product_price)) }}</div>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 
@@ -299,8 +387,8 @@ function handleShowObligationOrderDetail(orderItem) {
           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">
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+              <div class="flex w-20 h-20">
+                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20"></image>
 
               </div>
               <div class="flex flex-col">
@@ -315,22 +403,36 @@ function handleShowObligationOrderDetail(orderItem) {
 
             <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.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+              <div class="font-bold text-[12px] !text-[#000]" v-if="orderItem.pay_type==5"> 积分{{
+                Math.round(parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '')*30)  }}</div>
+              <div class="font-bold text-[12px] !text-[#000]" v-if="orderItem.pay_type!=5" > ￥{{
+                parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
 
           </div>
 
         </div>
-
-        <div class="flex justify-end gap-2" v-if="orderItem.status === '5'">
-          <!-- <div class="title-line">09:02:00后订单将关闭</div> -->
+        <!-- 待支付 -->
+        <div class="flex flex-1 justify-between" v-if="orderItem.status === '5'">
+          <div class="title-line"><span style="color: #FE0032;">{{ remainingTime.hours }}:{{ remainingTime.minutes }}:{{
+            remainingTime.seconds }}</span> 后订单将关闭
+          </div>
+          <div class="flex justify-end gap-2" style="margin-top: 4rpx;">
+            <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>
+        <!-- <div class="flex justify-end gap-2" v-if="orderItem.status === '5'">
+          <div class="title-line"><span>09:02:00</span>后订单将关闭</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> -->
         <div class="flex justify-end gap-2" v-if="orderItem.status === 5">
 
 
@@ -339,22 +441,43 @@ function handleShowObligationOrderDetail(orderItem) {
           <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 v-if="orderItem.refund_order_id &&orderItem.pay_type!=5">
+            <nut-button size="small" plain type="default" @tap.stop="handeDetail(orderItem)">售后详情</nut-button>
+          </div>
+          <div v-else-if="!orderItem.refund_order_id &&orderItem.pay_type!=5">
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+          </div>
+
         </div>
 
         <div class="flex justify-end gap-2" v-if="orderItem.status == 1">
           <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
-          <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+          <div v-if="orderItem.refund_order_id &&orderItem.pay_type!=5">
+            <nut-button size="small" plain type="default" @tap.stop="handeDetail(orderItem)">售后详情</nut-button>
+          </div>
+          <div v-else-if="!orderItem.refund_order_id &&orderItem.pay_type!=5">
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+          </div>
 
           <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
 
         </div>
 
         <div class="flex justify-end gap-2" v-if="orderItem.status == 2">
+          <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
           <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderItem)">再次购买</nut-button>
           <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderItem)">去评价</nut-button>
 
         </div>
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 4">
+          <nut-button size="small" plain type="default" @tap.stop="handleShowDetail(orderItem)">售后详情</nut-button>
+
+        </div>
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 3">
+          <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
+          <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderItem)">再次购买</nut-button>
+        </div>
       </div>
     </div>
 
@@ -362,10 +485,12 @@ function handleShowObligationOrderDetail(orderItem) {
 </template>
 <style  scoped>
 .title-line {
-  font-size: 24rpx;
-  /* 字体大小 */
   color: #333;
   line-height: 56rpx;
-  margin-right: 80rpx;
+  width: 262rpx;
+  height: 56rpx;
+  font-size: 25rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
 }
 </style> 

src/pages/order/components/OrderObligationItem.vue

@@ -55,7 +55,7 @@ function getStatusText(orderItem: OrderListModel) {
     return '待收货'
   }
   if (orderItem.status == 2) {
-    return '已完成, 待评价'
+    return '待评价'
   }
   if (orderItem.status == 3) {
     return '已完成'
@@ -208,45 +208,55 @@ function handleShowObligationOrderDetail(orderItem) {
 
 
 
-// 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 remainingTime: any = ref({
+  hours: "00",
+  minutes: "00",
+  seconds: "00"
+})
+//计算取消时间
+function updateRemainingTime(detail: any) {
+  const currentTime = new Date().getTime();
+  const endTime = new Date(detail.close_time).getTime();
+  const timeDifference = endTime - currentTime;
+
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    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
+    }
+  } else {
+    clearInterval(timer);
+    remainingTime.value = {
+      hours: "00",
+      minutes: "00",
+      seconds: "00"
+    }
+    //   //重新刷新页面
+    uni.$emit('dfkreloadList')
+    console.log('自动关闭>>>');
+  }
+}
 
 
-// // 每秒更新剩余时间
-// const timer = setInterval(() => {
-//   if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-//     // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-//     clearInterval(timer);
-//     console.log('自动关闭');
-//   }
-//   updateRemainingTime(props.orderItem)
-// }, 1000);
+// 每秒更新剩余时间
+const timer = setInterval(() => {
 
-// onUnload(() => {
-//   clearInterval(timer);
-//   console.log('卸载关闭');
-// })
+  updateRemainingTime(props.orderItem)
+}, 1000);
+
+
+onUnload(() => {
+  clearInterval(timer);
+  console.log('卸载关闭');
+})
 
 
 
@@ -278,7 +288,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" ></image>
                 </div>
                 <div class="flex flex-col">
                   <div class="line-clamp-2 text-[12px]">
@@ -291,7 +301,9 @@ function handleShowObligationOrderDetail(orderItem) {
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.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="font-bold text-[12px] !text-[#000]"> ￥{{
+                  parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '') }}</div>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 
@@ -299,16 +311,19 @@ function handleShowObligationOrderDetail(orderItem) {
 
           </div>
         </div>
-        <div class="flex justify-end gap-2">
-          <!-- <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 class="flex flex-1 justify-between">
+          <div v-if="props.orderItem" class="title-line"><span style="color: #FE0032;">{{ remainingTime.hours }}:{{
+            remainingTime.minutes }}:{{ remainingTime.seconds }}</span> 后订单将关闭
+          </div>
+          <div class="flex justify-end gap-2" style="margin-top: 4rpx;">
+            <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>
 
+
       </div>
     </div>
 
@@ -317,10 +332,12 @@ function handleShowObligationOrderDetail(orderItem) {
 
 <style scoped>
 .title-line {
-  font-size: 24rpx;
-  /* 字体大小 */
   color: #333;
   line-height: 56rpx;
-  margin-right: 80rpx;
+  width: 262rpx;
+  height: 56rpx;
+  font-size: 25rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
 }
 </style>

src/pages/order/components/RefundOrderItem.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,
@@ -42,20 +42,27 @@ function getStatusText(orderItem) {
   // }
   // switch (orderItem.status) {
   // }
-  if (orderItem.status == -1) {
-    // return '审核未通过'
+  console.log(orderItem);
+  
+  if (orderItem.status == -1 && orderItem.refund_type == 2) {
+    // return '退款失败'
+    return '审核未通过'
+  }
+  if (orderItem.status == -1 && orderItem.refund_type == 1) {
     return '退款失败'
+
   }
+
   if (orderItem.status == 0) {
     // return '待审核'
     return '审核中'
   }
   if (orderItem.status == 1) {
     // return '待退货'
-    return '审核中'
+    return '待退货'
   }
   if (orderItem.status == 2) {
-    return '审核中'
+    return '退货中'
     // return '待收货'
   }
   if (orderItem.status == 3) {
@@ -152,7 +159,7 @@ function handleComment(orderItem) {
 }
 
 function handleProductItemClick(
-    item
+  item
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -178,9 +185,7 @@ function handleShowDetail(orderItem) {
 
 <template>
   <div class="mb-3 bg-white rounded p-3" v-if="orderItem">
-    <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-1 flex items-center font-bold gap-2 text-sm justify-between ">
         <div class="flex-1 flex items-center gap-2 w-full">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
@@ -189,12 +194,10 @@ function handleShowDetail(orderItem) {
           </div>
         </div>
 
-          <div class="f-text-color-2 i-tabler-chevron-right"></div>
+        <div class="f-text-color-2 i-tabler-chevron-right"></div>
 
       </div>
-      <div class=" text-xs flex w-15 justify-end  'text-primary'"
-           
-      >
+      <div class=" text-xs flex w-15 justify-end  'text-primary'">
         {{ getStatusText(orderItem) }}
       </div>
     </div>
@@ -202,29 +205,30 @@ function handleShowDetail(orderItem) {
 
 
     <div @tap.stop="handleShowDetail(orderItem)">
-        <div v-for="(orderProduct, orderProductIndex) in orderItem.refundProduct" :key="orderProductIndex">
-          <div class="flex py-2 gap-3">
-            <div class="flex-1 flex gap-2">
-              <image :src="orderProduct.product.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
-              <div class="flex flex-col flex-1">
-                <div class="line-clamp-2 text-[12px]">
-                  {{ orderProduct.product.cart_info.product.store_name }}
-                </div>
-                <div class="text-gray-500 text-[10px]">
-                  {{ orderProduct.product.cart_info.productAttr.sku }}
-                </div>
+      <div v-for="(orderProduct, orderProductIndex) in orderItem.refundProduct" :key="orderProductIndex">
+        <div class="flex py-2 gap-3">
+          <div class="flex-1 flex gap-2">
+            <image :src="orderProduct.product.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+            <div class="flex flex-col flex-1">
+              <div class="line-clamp-2 text-[12px]">
+                {{ orderProduct.product.cart_info.product.store_name }}
               </div>
-                <div class="justify-end flex">
-                  <div class="flex flex-col ">
-                    <div class="text-[12px] font-bold">
-                      <FPrice :price="orderProduct.product.product_price" ex-class="font-bold text-black"/>
-                    </div>
-                    <div class="text-gray-500 text-[11px]">共{{ orderProduct.product.product_num }}件</div>
-                  </div>
+              <div class="text-gray-500 text-[10px]">
+                {{ orderProduct.product.cart_info.productAttr.sku }}
+              </div>
+            </div>
+            <div class="justify-end flex">
+              <div class="flex flex-col ">
+                <div class="text-[12px] font-bold">
+                  <!-- <FPrice :price="orderProduct.product.product_price" ex-class="font-bold text-black" /> -->
+                  <span>￥{{ parseFloat(Number(orderProduct.product.product_price)).toFixed(2).replace(/\.?0+$/, '') }}</span>
                 </div>
+                <div class="text-gray-500 text-[11px]">共{{ orderProduct.product.product_num }}件</div>
+              </div>
             </div>
           </div>
         </div>
+      </div>
       <div class="flex justify-end">
         <nut-button size="small" plain type="primary" @tap.stop="handleShowDetail(orderItem)">查看详情</nut-button>
 
@@ -233,6 +237,4 @@ function handleShowDetail(orderItem) {
     </div>
 
   </div>
-
-
 </template>

src/pages/order/index.vue

@@ -1,41 +1,9 @@
-<template>
-<!--  <CXBBasePage>-->
-  <div class="bg-white">
-  <FNavBar
-      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
-      ex-class="bg-white w-screen"
-      @click-left="onClickLeft"
-  />
-
-
-  <!--    <nut-navbar>-->
-    <!--      <template #content>-->
-    <div class="fixed top-18 bg-white w-full z-2">
-      <nut-tabs v-model="state.tabvalue" class="bg-white">
-        <nut-tab-pane title="全部"></nut-tab-pane>
-        <nut-tab-pane title="待付款"></nut-tab-pane>
-        <nut-tab-pane title="待发货"></nut-tab-pane>
-        <nut-tab-pane title="待收货"></nut-tab-pane>
-        <nut-tab-pane title="待评价"></nut-tab-pane>
-      </nut-tabs>
-    </div>
-
-    <div class="mt-30  pb-safe bg-[#f8f8f8]">
-      <AllItemList v-if="state.tabvalue == 0" :tab-value="0"/>
-      <ObligationOrderList v-if="state.tabvalue == 1" :tab-value="1"/>
-      <Order2List v-if="state.tabvalue == 2" :status="'0'"/>
-      <Order3List v-if="state.tabvalue == 3" :status="'1'"/>
-      <Order4List v-if="state.tabvalue == 4" :status="'2'"/>
-    </div>
-</div>
-<!--  </CXBBasePage>-->
-</template>
 <script lang="ts" setup>
 // import { reactive } from 'vue';
 // export default {
 //   setup() {
-import {getOrderListFromStatus, getAllOrder, getGroupOrderList} from "~/apis/order.api";
-import type {OrderListModel} from "~/apis/model/order.model";
+import { getOrderListFromStatus, getAllOrder, getGroupOrderList } from "~/apis/order.api";
+import type { OrderListModel } from "~/apis/model/order.model";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
@@ -45,13 +13,23 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 import AllItemList from "~/pages/order/components/AllItemList.vue";
 import ObligationOrderList from "~/pages/order/components/ObligationOrderList.vue";
+import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
 import Order2List from "~/pages/order/components/Order2List.vue";
 import Order3List from "~/pages/order/components/Order3List.vue";
 import Order4List from "~/pages/order/components/Order4List.vue";
+import {
+  DyProductModel,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import { DcProductModel } from "~/apis/model/dacang.model";
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
+import { CDN_URL } from "~/config/app";
+import { getRecommendList } from "~/apis/merchant";
 const pageStore = usePageStoreWidthOut()
 
-
+const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 const state = reactive({
   tabvalue: 0,
 
@@ -62,23 +40,19 @@ const state = reactive({
   obligationOrderList: [],
 
   orderList: [],
-  from: null
+  from: null,
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+  totalPage: 0,
+  list: [],
+  statusLike: '',
 });
 
-const getStatusVal = () => {
-  // state.tabvalue == 2 ? '0' : state.tabvalue == 3 ? '1' : state.tabvalue == 4 ? '2' : ''
-  if (state.tabvalue == 2) {
-    return '0'
-  }
-  if (state.tabvalue == 3) {
-    return '1'
-  }
-  if (state.tabvalue == 4) {
-    return '2'
-  }
-}
+const nomore = ref('')
+const toshow = ref(false)
 onLoad(options => {
-  console.log('我是options》》',options)
+  console.log('我是options》》', options)
   if (options && options.tabIndex) {
     state.tabvalue = options.tabIndex
   }
@@ -86,35 +60,58 @@ onLoad(options => {
     state.from = options.from
   }
   // loadAllOrderList()
-
-  // 监听事件
-  // uni.$on('orderCancelFromList', () => {
-  //   loadAllOrderList()
-  //   state.tabvalue = 0
-  // })
-  //
-  // uni.$on('orderTakeFromList', () => {
-  //   loadAllOrderList()
-  //   state.tabvalue = 3
-  // })
+  loadList('reload')
 })
 
-// uni.$on('orderCancelFromList', (tabValue) => {
-//   if (!tabValue) {
-//     state.tabvalue = 0
-//   } else {
-//     state.tabvalue = tabValue
-//   }
-//   // loadAllOrderList()
-// })
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
+
+  getRecommendList({
+    ...params
+  }).then(res => {
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+    state.statusLike = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
 
-// uni.$on('orderTakeFromList', () => {
-//   state.tabvalue = 3
-// })
-//
-// uni.$on('orderComment', () => {
-//   state.tabvalue = 4
-// })
+
+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}`
+  })
+}
 
 onReachBottom(() => {
   // handleScrollToLower()
@@ -133,7 +130,11 @@ onReachBottom(() => {
   if (state.tabvalue == 4) {
     uni.$emit('onTab4ReachBottom')
   }
+  if (toshow.value == true) {
+    handleScrollToLower()
+  }
 })
+
 onPullDownRefresh(() => {
   if (state.tabvalue == 0) {
     uni.$emit('onTab0PullDownRefresh')
@@ -150,94 +151,44 @@ onPullDownRefresh(() => {
   if (state.tabvalue == 4) {
     uni.$emit('onTab4PullDownRefresh')
   }
+  if (nomore.value == 'nomore') {
+    handleScrollToLower()
+  }
   // loadList('reload', items => {
   //   setTimeout(() => {
   //     uni.stopPullDownRefresh()
   //   }, 300)
   // })
 })
-// function splitArray(list, sp) {
-//   if (typeof list != 'object') return [];
-//   if (sp == undefined) sp = [];
-//   for (var i = 0; i < list.length; i++) {
-//     sp.push(list[i]);
-//   }
-//   return sp;
-// }
-//
-// function loadAllOrderList() {
-//   // 获取全部订单
-//   getAllOrder({
-//     page: 1,
-//     limit: 10
-//   }).then(res => {
-//     // console.log(res)
-//     state.allOrderTotal = res.total
-//     state.allOrderList = res.list
-//     // console.log(res)
-//   })
-// }
-//
-// watch(() => state.tabvalue, (val) => {
-//   // status: string//订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
-//
-//   switch (val) {
-//     case '0': {
-//       loadAllOrderList()
-//       break;
-//     }
-//     case '1': {
-//       getGroupOrderList({
-//         page: 1,
-//         limit: 10
-//       }).then(res => {
-//         // console.log(res)
-//         // state.obligationOrderList = splitArray(res.list, state.obligationOrderList)
-//         state.obligationOrderList = res.list
-//       })
-//       break;
-//       // getOrderListFromStatus({
-//       //   page: 1,
-//       //   limit: 10,
-//       //   status: 0
-//       // }).then(res => {
-//       //   state.obligationOrderList = res.list
-//       // })
-//     }
-//       // 待发货
-//     case '2': {
-//       getOrderListFromStatus({
-//         page: 1,
-//         limit: 10,
-//         status: 0
-//       }).then(res => {
-//         state.orderList = res.list
-//       })
-//       break;
-//     }
-//     case '3': {
-//       getOrderListFromStatus({
-//         page: 1,
-//         limit: 10,
-//         status: 1
-//       }).then(res => {
-//         state.orderList = res.list
-//       })
-//       break;
-//     }
-//     case '4': {
-//       getOrderListFromStatus({
-//         page: 1,
-//         limit: 10,
-//         status: 2
-//       }).then(res => {
-//         state.orderList = res.list
-//       })
-//       break;
-//     }
-//   }
-// })
 
+watch(() => state.tabvalue, (newStatus, oldStatus) => {
+  console.log('state.tabvalue,新状态：', newStatus, '旧状态：', oldStatus);
+  if (newStatus != oldStatus) {
+    uni.pageScrollTo({
+      scrollTop: 0,
+    });
+    toshow.value=false
+  }
+});
+
+function handleScrollToLower() {
+  state.statusLike = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.statusLike = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+onMounted(() => {
+  uni.$on('changeShowLike', () => {
+    console.log('触发');
+    toshow.value = true
+  })
+})
 function onClickLeft() {
 
   if (state.tabvalue == 1 && state.from && state.from == 'payment') {
@@ -264,6 +215,65 @@ function onClickLeft() {
   }
 }
 </script>
+
+<template>
+  <!--  <CXBBasePage>-->
+  <div class="bg-white">
+    <FNavBar title="我的订单" :left-arrow="true" fixed placeholder z-index="999" ex-class="bg-white w-screen"
+      @click-left="onClickLeft" />
+
+
+    <!--    <nut-navbar>-->
+    <!--      <template #content>-->
+    <div class="fixed top-18 bg-white w-full z-2">
+      <nut-tabs v-model="state.tabvalue" class="bg-white">
+        <nut-tab-pane title="全部"></nut-tab-pane>
+        <nut-tab-pane title="待付款"></nut-tab-pane>
+        <nut-tab-pane title="待发货"></nut-tab-pane>
+        <nut-tab-pane title="待收货"></nut-tab-pane>
+        <nut-tab-pane title="待评价"></nut-tab-pane>
+      </nut-tabs>
+    </div>
+
+    <div class="mt-30  pb-safe bg-[#f8f8f8]">
+      <AllItemList v-if="state.tabvalue == 0" :tab-value="0" />
+      <ObligationOrderList v-if="state.tabvalue == 1" :tab-value="1" />
+      <Order2List v-if="state.tabvalue == 2" :status="'0'" />
+      <Order3List v-if="state.tabvalue == 3" :status="'1'" />
+      <Order4List v-if="state.tabvalue == 4" :status="'2'" />
+    </div>
+    <!-- 商品推荐 -->
+    <div v-if="toshow == true">
+      <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 pb-safe" v-if="state.list">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in state.list" :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="state.statusLike === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.statusLike === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+  <!--  </CXBBasePage>-->
+</template>
+
 <route lang="yaml">
 style:
   navigationStyle: custom
@@ -272,12 +282,6 @@ style:
 </route>
 
 <style lang="scss">
-//.nut-tab-pane {
-//  background: #f5f5f5 !important;
-//}
-//.nut-tabs {
-//  background: white;
-//}
 .nut-tabs__titles {
   background: white !important;
 }

src/pages/order/logistics.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-import {getRecommendList} from "~/apis/merchant";
+import { CDN_URL } from "~/config/app";
+import { getRecommendList } from "~/apis/merchant";
 import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
 import {
   DyProductModel,
@@ -8,12 +8,12 @@ import {
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
-import {getLogistics} from "~/apis/order.api";
-import {encodePhone} from "../../utils";
+import { DcProductModel } from "~/apis/model/dacang.model";
+import { getLogistics } from "~/apis/order.api";
+import { encodePhone } from "../../utils";
 
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
-
+const takeshow = ref(false)
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
@@ -30,20 +30,20 @@ onLoad((options) => {
     icon: 'none'
   })
   if (options && options.id) {
-  getLogistics(options.id).then(res => {
-  // getLogistics(4127).then(res => {
-    console.log(res)
-    if (res && res.order) {
-      state.orderDetail = res.order
-    }
-    if (res && res.express) {
-      state.express = res.express
-    }
+    getLogistics(options.id).then(res => {
+      // getLogistics(4127).then(res => {
+      console.log(res)
+      if (res && res.order) {
+        state.orderDetail = res.order
+      }
+      if (res && res.express) {
+        state.express = res.express
+      }
 
-    uni.hideLoading()
-  })
+      uni.hideLoading()
+    })
 
-}
+  }
   // }
 })
 onShow(() => {
@@ -79,13 +79,13 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 }
 
 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`
@@ -135,34 +135,49 @@ function handleMakePhoneCall() {
     phoneNumber: state.orderDetail.user_phone
   })
 }
+
+const statusimg = computed(() => {
+  if (takeshow.value == false) {
+    return '../../static/icon/展开.png'
+  } else {
+    return '../../static/icon/收起.png'
+  }
+})
+const statustext = computed(() => {
+  if (takeshow.value == false) {
+    return '展开'
+  } else {
+    return '收起'
+  }
+})
+function transformStatus() {
+  takeshow.value = !takeshow.value
+  if (takeshow.value == false) {
+    uni.pageScrollTo({
+      scrollTop: 0,
+    });
+  }
+}
 </script>
 
 <template>
-
-
   <div>
 
-    <div
-        v-if="state.orderDetail"
-        class="flex flex-col text-[12px] p-3 ">
+    <div v-if="state.orderDetail" class="flex flex-col text-[12px] p-3 ">
       <div class=" rounded-lg bg-white p-3 flex flex-col gap-4">
         <div>
-          <div class="text-gray-400">物流公司：{{ state.orderDetail.delivery_name }}</div>
           <div class="flex justify-between items-center ">
-            <div class="flex">
-              快递单号：{{ state.orderDetail.delivery_id }}
+            <div class="flex" style="line-height: 38rpx;">
+              <image style="width: 38rpx;height: 38rpx; margin-right: 17rpx;" src="../../static/icon/快递.png"></image>
+              {{ state.orderDetail.delivery_name }} {{ state.orderDetail.delivery_id }}
             </div>
             <div class="flex gap-2 items-center">
-              <div
-                  @click="handleClipboard"
-                  class="flex items-center border border-solid border-gray-200 text-[12px] rounded min-w-6 text-center  max-w-fit px-2 bg-white"
-              >
+              <div @click="handleClipboard"
+                class="flex items-center border border-solid border-gray-200 text-[12px] rounded min-w-6 text-center  max-w-fit px-2 bg-white">
                 复制
               </div>
-              <div
-                  @tap="handleMakePhoneCall"
-                  class="flex items-center border border-solid border-gray-200 text-[12px] rounded min-w-6 text-center  max-w-fit px-2 bg-white"
-              >
+              <div @tap="handleMakePhoneCall"
+                class="flex items-center border border-solid border-gray-200 text-[12px] rounded min-w-6 text-center  max-w-fit px-2 bg-white">
                 电话
               </div>
               <!--          <nut-button size="mini" type="default">复制</nut-button>-->
@@ -173,11 +188,43 @@ function handleMakePhoneCall() {
 
         <div class="flex items-center gap-2 ">
           <div class="rounded-full w-4 h-4 bg-gray-400 text-white flex flex-col justify-center items-center">收</div>
-          <div class="text-gray-400">{{ state.orderDetail.user_address + ' ' + state.orderDetail.real_name + ' ' + encodePhone(state.orderDetail.user_phone)}}</div>
+          <div class="text-gray-400">{{ state.orderDetail.user_address + ' ' + state.orderDetail.real_name + ' ' +
+            encodePhone(state.orderDetail.user_phone) }}</div>
         </div>
 
         <!-- 物流动态 -->
-        <div class="logis-detail" v-if="state.express && state.express.length > 0">
+        <div class="text_div mb-2 w-full " style="color: #333333;" v-if="state.express.length > 0">
+          <nut-steps v-if="takeshow == true" :current="1" progress-dot direction="vertical">
+            <nut-step v-for="(item, index) in state.express" :key="index" style="width: 578rpx;" :title="item?.status"
+              :content="item.time">
+              <template #title>
+                <div :style="{ color: index === 0 ? '#333' : '#999' }" class="mt-2 custom-title">{{ item?.status }}
+                </div>
+              </template>
+              <template #content>
+                <div class="custom-content">{{ item.time }}</div>
+              </template>
+            </nut-step>
+          </nut-steps>
+          <nut-steps v-if="takeshow == false" :current="1" progress-dot direction="vertical">
+            <nut-step style="width: 578rpx;" :title="state.express[0].status" :content="state.express[0].time">
+              <template #title>
+                <div :style="{ color: '#333' }" class="mt-2 custom-title">{{ state.express[0].status }}</div>
+              </template>
+              <template #content>
+                <div class="custom-content">{{ state.express[0].time }}</div>
+              </template>
+            </nut-step>
+          </nut-steps>
+        </div>
+        <div class="flex w-full" @click="transformStatus"
+          style="height:36rpx;  justify-content: center; align-items: center; ">
+          <div class="text_dew">{{ statustext }}</div>
+          <div style="width: 36rpx; height: 36rpx; ">
+            <image style="width: 36rpx; height: 36rpx;" :src="statusimg"></image>
+          </div>
+        </div>
+        <!-- <div class="logis-detail" v-if="state.express && state.express.length > 0">
           <div class="logis-item" :class="{ first: index === 0 }" v-for="(item, index) in state.express" :key="index">
             <div class="logis-item-content">
               <div class="logis-item-content__describe">
@@ -188,7 +235,7 @@ function handleMakePhoneCall() {
               </div>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <!-- 商品推荐 -->
@@ -202,17 +249,13 @@ function handleMakePhoneCall() {
       </div>
       <div class="pb-3 px-3 pb-safe" v-if="state.list">
         <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
-          <div v-for="(item, index) in state.list"
-               :key="index"
-               @click="handleProductItemClick(item)"
-          >
-            <MerchantProductCard :item="item"/>
+          <div v-for="(item, index) in state.list" :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>
@@ -225,17 +268,17 @@ function handleMakePhoneCall() {
     </div>
 
   </div>
-
 </template>
 <route lang="yaml" >
 style:
-  navigationBarTitleText: 已发货
+  navigationBarTitleText: 物流信息
 </route>
 
 <style lang="scss">
 page {
   background: #f8f8f8;
 }
+
 .nut-tab-pane {
   background: #f5f5f5 !important;
 }
@@ -300,4 +343,18 @@ page {
   }
 }
 
+.text_div {
+  font-size: 26rpx;
+  color: #666;
+}
+.custom-title {
+  // 设置 title 的宽度样式
+  text-align: left;
+  width: 578rpx; // 你可以根据需要设置宽度值
+}
+
+.custom-content {
+  width: 578rpx; // 你可以根据需要设置宽度值
+  font-size: 26rpx;
+}
 </style>

src/pages/order/obligation-detail.vue

@@ -59,28 +59,36 @@ 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
+  if (timeDifference > 0) {
+    // 计算剩余时间
+    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
+    }
+  } else {
+    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+    clearInterval(timer);
+    uni.showToast({
+      title: '已自动取消订单',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.navigateBack()
+    }, 300)
+    console.log('自动关闭');
   }
+
 }
 
 
 // 每秒更新剩余时间
 const timer = setInterval(() => {
-  if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
-    // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
-    clearInterval(timer);
-    console.log('自动关闭');
-  }
   updateRemainingTime(detail.value)
 }, 60000);
 
@@ -88,6 +96,8 @@ onUnload(() => {
   clearInterval(timer);
   console.log('卸载关闭');
 })
+
+
 function handlePayment() {
   // const {detail: orderItem} = props
   // const { orderItem } = detail.value
@@ -257,7 +267,8 @@ function handleProductItemClick(
 
             <div class="flex flex-col justify-center items-center">
               <!--                <FPrice :price="orderProduct.cart_info.productAttr.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="font-bold text-[12px] !text-[#000]"> ￥{{
+                parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
 

src/pages/order_addcart/index.vue

@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import { ref } from 'vue';
 import { getRecommendList, getProductDetail } from "~/apis/merchant";
 import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
-import { deleteCartItem, getCartCount, getCartList, xcxBanding } from "~/apis/user";
+import { deleteCartItem, getCartCount, getCartList, removeCartItem, 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";
@@ -16,7 +17,7 @@ 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 { uniq, values } from "lodash-es";
 import { cartChange } from "~/apis/order.api";
 import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
 import CXBSkuPopup from "~/components/CXBSkuPopup/CXBSkuPopup.vue";
@@ -24,7 +25,7 @@ const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 const pageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
-
+const u_id = ref('')
 const state = reactive({
   recommendList: [],
   currentPage: 1,
@@ -34,9 +35,10 @@ const state = reactive({
 
 
   totalCartCount: 0,
-  totalPrice: '',
+  totalPrice: 0,
+  totalNum: 0,
   selectAllIndeterminate: false,
-
+  product_id: [],
   cart_id: [],
   changeSkuCart_id: '0',
   isManage: true,
@@ -117,6 +119,8 @@ function handleCountChange(val) {
   // console.log(val)
   // detail.value.
   // if (val > 0) {
+  console.log(val);
+
   state.cartNum = val
   // }
 }
@@ -131,32 +135,50 @@ onBeforeMount(() => {
 onLoad((options) => {
 
   if (!userStore.uid) {
+    pageStore.setPageConfig({
+      currentPage: {
+        type: 'tab',
+        url: '/pages/home/index'
+      }
+    })
     return uni.redirectTo({
       url: '/pages/user/login/index'
     })
   }
+
   uni.$on('cart-reload', () => {
     // console.log('新商品添加...')
     state.recommendList = []
     state.cart_id = []
     loadCartList()
   })
-
+  u_id.value = userStore.uid
   state.cart_id = []
   loadCartList()
 })
 onShow(() => {
-  // pageStore.setPageConfig({
-  //   orderBack: {
-  //     type: 'tab',
-  //     url:  '/pages/order_addcart/index'
-  //   }
-  // })
+  Buttonshow.value = null
+  if (!userStore.uid) {
+    pageStore.setPageConfig({
+      currentPage: {
+        type: 'tab',
+        url: '/pages/home/index'
+      }
+    })
+    return uni.redirectTo({
+      url: '/pages/user/login/index'
+    })
+  }
   if (!state.isManage) {
     state.isManage = true
   }
+
+  if (u_id.value != userStore.uid) {
+    u_id.value = userStore.uid
+    loadCartList()
+
+  }
   loadCartCount()
-  loadCartList()
   loadList('reload')
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -369,7 +391,7 @@ function cartAllCheck(type: 'single' | 'all') {
   })
 
   isAllSelect.value = allArr.length === shopping.value?.list.length
-  // state.totalCartCount = totalNum
+  state.totalNum = totalNum
   state.totalPrice = totalMoney
 }
 
@@ -395,6 +417,8 @@ function reTotal() {
   // state.totalCartCount = totalNum
   loadCartCount()
   state.totalPrice = totalMoney
+  state.totalNum = totalNum
+
 }
 function handleSelectAll(checked: boolean) {
 
@@ -428,6 +452,9 @@ function loadCartCount() {
 function handleManageCart() {
   state.isManage = !state.isManage
 }
+// function handleromoveCollect() {
+//   state.isManage = !state.isManage
+// }
 
 function handleSubmit() {
   // console.log(state.isManage)
@@ -439,6 +466,12 @@ function handleSubmit() {
 
     // console.log(state.cart_id)
     if (state.cart_id && state.cart_id.length > 0) {
+      pageStore.setPageConfig({
+        orderBack: {
+          type: 'tab',
+          url: '/pages/order_addcart/index'
+        }
+      })
       uni.navigateTo({
         url: `/pages/order-confirm/index?cartId=${state.cart_id.join(',')}`
       })
@@ -491,6 +524,51 @@ function handleDelete() {
     })
   }
 }
+//收藏功能
+function handleromoveCollect() {
+  // const cart_id = <any>[]
+  shopping.value?.list.forEach(shopItem => {
+    shopItem.list.forEach(goodItem => {
+      if (goodItem.check) {
+        state.product_id.push(goodItem.product_id)
+      }
+    })
+  })
+  state.product_id = uniq(state.product_id)
+
+  // console.log(cart_id)
+  if (state.cart_id.length === 0) {
+    return uni.showToast({
+      title: '请选择产品',
+      icon: "none"
+    })
+  } else {
+    uni.showModal({
+      title: '温馨提示',
+      content: '确认将宝贝移入收藏吗?',
+      success: (res) => {
+        if (res.confirm) {
+          console.log(state.product_id);
+          removeCartItem(state.product_id).then(res => {
+            console.log(res);
+            uni.showToast({
+              title: '收藏成功'
+            })
+            state.isManage = true
+            state.product_id = []
+            state.totalPrice = ''
+            loadCartList()
+          }).catch(error => {
+            console.log('error>>>', error);
+
+          })
+
+        } else if (res.cancel) {
+        }
+      }
+    })
+  }
+}
 
 
 function handleProductItemClick(
@@ -585,129 +663,209 @@ onUnload(() => {
   state.recommendList = []
   state.cart_id = []
 })
+function handleoneCollect(goodItem: any) {
+  console.log(goodItem);
+  uni.showModal({
+    title: '温馨提示',
+    content: '确认将宝贝移入收藏吗?',
+    success: (res) => {
+      if (res.confirm) {
+        console.log(goodItem.product_id);
+        removeCartItem([goodItem.product_id]).then(res => {
+          console.log(res);
+          uni.showToast({
+            title: '收藏成功'
+          })
+          Buttonshow.value = null
+          loadCartList()
+        }).catch(error => {
+          console.log('error>>>', error);
+
+        })
+
+      } else if (res.cancel) {
+      }
+    }
+  })
 
+}
+function handleoneDelete(goodItem: any) {
+  console.log(goodItem);
+
+  uni.showModal({
+    title: '温馨提示',
+    content: '确认将宝贝删除?',
+    success: (res) => {
+      if (res.confirm) {
+        deleteCartItem([goodItem.cart_id]).then(res => {
+          uni.showToast({
+            title: '删除成功'
+          })
+          Buttonshow.value = null
+          loadCartList()
+        })
+
+      } else if (res.cancel) {
+      }
+    }
+  })
+}
+// 暴露给模板的方法
+const Buttonshow = ref(null)
+const showButtons = (goodItem) => {
+  // 设置当前项的 showButtons 为 true，显示按钮
+  Buttonshow.value = goodItem;
+  goodItem.check = true
+};
+
+function handlePageClick() {
+  if (Buttonshow.value) {
+    Buttonshow.value = null;
+  } else {
+    return
+  }
+
+}
 </script>
 <template>
-  <div class="">
-    <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>
-      </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>
-        <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
+  <div @tap="handlePageClick">
+    <div class="">
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+      <div v-if="hasShopping" class="bg-white h-10 fixed top-0 w-full z-999 flex justify-end ">
+        <div class="pr-3">
+          <FButton size="small" @click="handleManageCart">
+            <div>{{ state.isManage ? '管理' : '完成' }}</div>
+          </FButton>
+        </div>
       </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>
+          <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
+        </div>
+        <div>
+          暂无商品，去添加喜欢的商品
+        </div>
       </div>
-    </div>
-    <div v-else class="mt-10 pb-10 ">
+      <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)">
+        <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>
-            </div>
+                <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 class="flex">
-              <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 v-for="(goodItem, goodIndex) in shopItem.list" :key="goodIndex">
+              <div @longpress="showButtons(goodItem)" class="flex f-hairline-bottom p-3 gap-2"
+                :style="Buttonshow === goodItem ? { backgroundColor: '#919191' } : {}">
 
-            <div class="flex flex-col gap-1 w-full">
-              <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 " 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 class="flex">
+                  <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 flex-1">
+                  <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 " 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" />
+
+                    </div>
+                  </div>
+                  <div class="flex  justify-between ">
+                    <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 class="flex">
-                  <CXBYaojinTag :amount="goodItem.yanglao" />
-
+                <div class="del_sc" v-if="Buttonshow == goodItem">
+                  <div class="collect-btn" @click.stop="handleoneCollect(goodItem)">
+                    移入收藏
+                  </div>
+                  <div class="delete-btn" @click.stop="handleoneDelete(goodItem)">
+                    删除
+                  </div>
                 </div>
-              </div>
-              <div class="flex  justify-between ">
-                <!-- <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>
-        </div>
 
+        </div>
       </div>
-    </div>
 
-    <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 class="pb-12" >
+        <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>
-        <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)">
-            <MerchantProductCard :item="item" />
+        <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)">
+              <MerchantProductCard :item="item" />
 
-          </div>
-        </grid-view>
+            </div>
+          </grid-view>
 
-        <div class=" flex justify-center items-center text-[12px] text-gray-500">
-          <div v-if="state.status === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.status === 'noMore'">
-            没有更多了～
+          <div class=" 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>
-        </div>
 
+        </div>
       </div>
     </div>
-  </div>
-  <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>
-        <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
-      </div>
+    <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>
+          <!-- <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div> -->
+        </div>
 
-      <div class="flex justify-center items-center gap-2 pr-3">
-        <div class="flex text-[12px]" v-if="state.isManage">
-          合计：
-          <FPrice :price="state.totalPrice"></FPrice>
-          <!--          {{totalCartInfo.totalPrice}}-->
+        <div class="flex justify-center items-center gap-2 pr-3">
+          <div class="flex text-[12px]" v-if="state.isManage">
+            <span v-if="state.totalNum != 0 && state.isManage">已选{{ state.totalNum }}件，</span>合计：<span
+              style="color: red;">￥{{ parseFloat(Number(state.totalPrice)).toFixed(2).replace(/\.?0+$/, '') }}</span>
+          </div>
+          <button v-if="!state.isManage" @click="handleromoveCollect"
+            class="['rounded-full', '!text-[14px]', 'text-black',remove_sc]">
+            移入收藏
+          </button>
+          <FButton @click="handleSubmit" size="small"
+            :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
+            {{ state.isManage ? '去结算' : '删除' }}
+          </FButton>
         </div>
-        <FButton @click="handleSubmit" size="small"
-          :exClass="['rounded-full', '!text-[14px]', 'text-white', 'bg-primary', 'w-full']">
-          {{ state.isManage ? '去结算' : '删除' }}
-        </FButton>
       </div>
     </div>
   </div>
@@ -749,6 +907,50 @@ page {
   height: 7rpx;
   margin-bottom: 6rpx;
 }
+
+
+.remove_sc {
+  background-color: #ffffff;
+  border: 1rpx solid #b7b7b7;
+  height: 64rpx;
+  line-height: 64rpx;
+  text-align: center;
+}
+
+
+/* 1111 */
+.del_sc {
+  position: absolute;
+  top: 50%;
+  margin-top: -60rpx;
+  left: 50%;
+  margin-left: -150rpx;
+  bottom: 0;
+  display: flex;
+}
+
+.delete-btn,
+.collect-btn {
+  width: 120rpx;
+  /* 调整按钮宽度 */
+  height: 120rpx;
+  border-radius: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ff4d4f;
+  /* 删除按钮背景色 */
+  color: #fff;
+  font-size: 14px;
+  z-index: 1;
+}
+
+.collect-btn {
+  margin-right: 60rpx;
+  background-color: #ffa319;
+  /* 移入收藏按钮背景色 */
+  /* 调整移入收藏按钮位置 */
+}
 </style>
 <route lang="yaml">
 style:

src/pages/payment/index.vue

@@ -140,6 +140,8 @@ function onClickLeft() {
         // if (usePageStore.orderBack) {
         //   url += `&from=${usePageStore.orderBack}`
         // }
+        console.log(state.tabIndex);
+        
         if (state.tabIndex) {
           pageStore.setPageConfig({
             orderBack: {

src/pages/pension_record/index.vue

@@ -51,7 +51,7 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
             <div class="flex justify-around w-full divide-gray divide-gray-1 h-15">
               <div class="flex flex-col justify-center items-center ">
                 <div class="text-xs text-light-100">
-                  未结算（补贴）养老金：
+                  未结算（预估）养老金：
                 </div>
                 <div class="font-bold flex " v-if="yanglaoStatistics">
                   <div>￥</div>

src/pages/product/integral.vue

@@ -111,7 +111,7 @@ function handleItemClick(item) {
                     {{ item.store_name }}
                   </div>
                   <div class="text-[#fe0032] flex items-end gap-2">
-                    <div class="text-[20px]">{{ Number(item.price * 30).toFixed(2) }}</div>
+                    <div class="text-[20px]">{{  Math.round(item.price * 30)}}</div>
                     <div class="text-xs">积分</div>
                   </div>
                 </div>

src/pages/product/zibuyangsheng.vue

@@ -114,7 +114,7 @@ onPullDownRefresh(() => {
                   </div>
                   <CXBYaojinTag :amount="item.yanglao" />
                   <div class="text-[#fe0032] flex items-end gap-2">
-                    <div class="text-[20px]">{{ Number(item.price).toFixed(2) }}</div>
+                    <div class="text-[20px]">{{parseFloat(Number(item.price)).toFixed(2).replace(/\.?0+$/, '') }}</div>
 <!--                    <div class="text-xs">积分</div>-->
                   </div>
                   <div class="line-through text-xs font-bold text-gray-400 flex ">

src/pages/red-integral/index.vue

@@ -1,150 +1,93 @@
 <script setup lang="ts">
-import {useUserStore} from "~/stores/userStore";
-import {encodePhone} from "../../utils";
+import { useUserStore } from "~/stores/userStore";
+import { CDM_URL, CDN_URL } from "~/config/app";
+import { encodePhone } from "../../utils";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {getRedIntegralList} from "~/apis/user";
+import { getRedIntegralList, getBillIntegralList } from "~/apis/user";
 import dayjs from "dayjs";
-
+//https://cdn.bjtdba.com/vod/image/2023-12-11/20231211164924523.png
+//https://cdn.bjtdba.com/chuxubao/static/assets/search_zanwuxiangguan_220617.png
 const userStore = useUserStore();
 const data = ref([])
-
+//css颜色
+const activeTab = ref('bonus')
+const hjfImg = CDM_URL + '/image/2023-12-11/20231211164924523.png'
+const undataImg = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
 onLoad((options) => {
   userStore.getUserInfo()
-  getRedIntegralList({page: 1, limit: 20}).then(res => {
+  let params = {
+    page: 1,
+    limit: 20,
+    is_red: true
+  }
+  getBillIntegralList(params).then(res => {
     console.log(res)
-    if (res && res.length > 0) {
-      for (let item of res) {
-        // data.value = res
-        console.log(item.red)
-        data.value.push({
-          red: item.red,
-          mark: item.mark,
-          time: dayjs.unix(item.time).format('YYYY-MM-DD')
-        })
-      }
-    }
+    data.value = res.list
   })
 })
-// const userType = computed(() => {
-//   const userRichType = userStore.userInfo.user_rich_type
-//   // 创始人
-//   if (userRichType === 3) {
-//     return '创始人'
-//   }
-//   // 普通用户
-//   if (userRichType === 0) {
-//     return '用户'
-//   }
-//   // 会员
-//   if (userRichType === 1) {
-//     return '会员'
-//   }
-//   // 合伙人
-//   if (userRichType === 2) {
-//     return '合伙人'
-//   }
-//   if (!userRichType) {
-//     return '用户'
-//   }
-//
-//
-// })
-const userType = computed(() => {
-  const userRichType = userStore.userInfo?.user_rich_type
-  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]
+function changeTab(tab: any) {
+  activeTab.value = tab;
+  data.value = []
+  if (activeTab.value == 'bonus') {
+    let params = {
+      page: 1,
+      limit: 20,
+      is_red: true
     }
-    return ['用户']
+    getBillIntegralList(params).then(res => {
+      console.log(res)
+      data.value = res.list
+    })
+  } else if (activeTab.value == 'points') {
+    getRedIntegralList({ page: 1, limit: 20 }).then(res => {
+      console.log(res)
+      data.value = res
+    })
   }
-})
-
-const state = reactive({
-  striped: false,
-  columns: [{
-    title: '消耗积分数',
-    key: 'red'
-  }, {
-    title: '说明',
-    key: 'mark'
-  }, {
-    title: '时间',
-    key: 'time'
-  }]
-})
+}
 
 function handleToVipPage() {
   uni.navigateTo({
-    url: '/pages/vip/index'
+    url: '/pages/vip/index?type=user'
   })
 }
 
 function handleImmediateWithdrawal() {
-  uni.navigateTo({
-    url: '/pages/immediate-withdrawal/index'
-  })
+  if (userStore.userInfo.is_ertification == 1) {
+    uni.navigateTo({
+      url: '/pages/immediate-withdrawal/index?type=2'
+    })
+  }else{
+    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);
+  }
+
 }
 </script>
 
 <template>
-  <CXBBasePage>
+  <!-- <CXBBasePage>
     <div class="bg-[#FD1642] h-25 w-full absolute top-0 left-0"></div>
 
     <div class="flex flex-col gap-4 relative px-3">
@@ -166,9 +109,6 @@ function handleImmediateWithdrawal() {
                   <div class="text-sm" v-if="userStore.userInfo">
                     {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                   </div>
-<!--                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-fit h-5 justify-center items-center px-2">-->
-<!--                    {{userType}}-->
-<!--                  </div>-->
                   <div class="flex gap-1 items-center px-1">
                     <div
                         v-for="(item, index) in userType"
@@ -221,17 +161,244 @@ function handleImmediateWithdrawal() {
       </div>
 
     </div>
-    </CXBBasePage>
+    </CXBBasePage> -->
+
+  <div class="card_d" :style="{ background: 'url(' + hjfImg + ')', backgroundSize: 'cover' }">
+    <div class="flex p_gps flex-col justify-center ">
+      <div class="text_jjye">奖金余额</div>
+      <div class="jj_num">{{ userStore.userInfo.member_brokerage_price }}</div>
+    </div>
+    <div @click="handleImmediateWithdrawal" class="flex p_tx justify-center">
+      <div class="text_tx">提现</div>
+    </div>
+    <div class="flex p_hjf flex-col justify-center ">
+      <div class="text_hjf">红积分</div>
+      <div class="hjf_num">{{ parseFloat(Number(userStore.userInfo.red)).toFixed(2).replace(/\.?0+$/, '') }}</div>
+    </div>
+    <div @click="handleToVipPage" class="flex p_add justify-center">
+      <div class="text_add">复购增加红积分</div>
+    </div>
+  </div>
+  <div class="px-3">
+
+    <div>
+      <div class="flex justify-around  flex-1  items-center" style="padding-top: 10rpx; padding-bottom: 10rpx">
+        <div class="text_jl" :class="{ 'selected': activeTab === 'bonus' }" @click="changeTab('bonus')">会员奖金记录</div>
+        <div class="text_jl" :class="{ 'selected': activeTab === 'points' }" @click="changeTab('points')">红积分记录</div>
+      </div>
+      <!-- 会员奖金记录 -->
+      <div class="px-4" style="border-radius: 16rpx; background-color: #ffffff;"
+        v-if="activeTab === 'bonus' && data.length > 0">
+        <div class="flex justify-between flex-1 py-4 " style=" border-bottom: 1rpx solid #f0f0f0;"
+          v-for="(item, index) in data" :key="index">
+          <div>
+            <div class="text_mark" style="margin-bottom: 12rpx;">{{ item.mark }}</div>
+            <div class="text_c_time">{{ item.create_time }}</div>
+          </div>
+          <div class="text_price" :class="{ 'add_price': item.pm == '1' }">
+            {{ item.pm == 1 ? '+' : '-' }}{{ item.number }}
+          </div>
+        </div>
+      </div>
+      <div v-if="activeTab === 'bonus' && data.length <= 0" class=" flex flex-1 justify-center items-center ">
+        <div>
+          <div style="width: 206rpx; height:206rpx; margin-top: 206rpx;  margin-bottom: 60rpx;">
+            <image :src="undataImg" style="width: 100%; height: 100%;"></image>
+          </div>
+          <div class="none_data">暂无相关数据</div>
+        </div>
+
+
+      </div>
+
+      <!-- 红积分记录 -->
+      <div class="px-4" style="border-radius: 16rpx; background-color: #ffffff;"
+        v-if="activeTab === 'points' && data.length > 0">
+
+        <div class="flex justify-between flex-1 py-4 " style=" border-bottom: 1rpx solid #f0f0f0;"
+          v-for="(item, index) in data" :key="index">
+          <div>
+            <div class="text_mark" style="margin-bottom: 12rpx;">{{ item.mark }}</div>
+            <div class="text_c_time">{{ item.create_time }}</div>
+          </div>
+          <div class="text_price" :class="{ 'add_price': item.pm == '1' }">
+            {{ item.pm == 1 ? '+' : '-' }}{{ item.red }}
+          </div>
+        </div>
+      </div>
+      <div v-if="activeTab === 'points' && data.length <= 0" class=" flex flex-1 justify-center items-center ">
+        <div>
+          <div style="width: 206rpx; height:206rpx; margin-top: 206rpx;  margin-bottom: 60rpx;">
+            <image :src="undataImg" style="width: 100%; height: 100%;"></image>
+          </div>
+          <div class="none_data">暂无相关数据</div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <route lang="yaml">
 style:
-  navigationBarTitleText: ""
+  navigationBarTitleText: 红积分提现
   enablePullDownRefresh: false
-  navigationBarBackgroundColor: "#fe0032"
-  navigationBarTextStyle: "white"
 </route>
 <style>
 page {
-  --nut-table-border-color: none
+  background-color: #f8f8f8;
+}
+
+.card_d {
+  width: 750rpx;
+  height: 366rpx;
+}
+
+.p_gps {
+  position: absolute;
+  top: 66rpx;
+  left: 68rpx;
+}
+
+.p_hjf {
+  position: absolute;
+  top: 214rpx;
+  left: 68rpx;
+}
+
+.text_jjye {
+  height: 26rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 26rpx;
+}
+
+.text_hjf {
+  width: 78rpx;
+  height: 26rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 26rpx;
+}
+
+.jj_num {
+  height: 75rpx;
+  font-size: 54rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 75rpx;
+}
+
+.hjf_num {
+  width: 89rpx;
+  height: 42rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 42rpx;
+}
+
+
+.p_tx {
+  position: absolute;
+  top: 88rpx;
+  right: 80rpx;
+  width: 141rpx;
+  height: 63rpx;
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0.58) 0%, rgba(255, 255, 255, 0.29) 100%);
+  border-radius: 32rpx;
+  text-align: center;
+}
+
+.p_add {
+  position: absolute;
+  top: 225rpx;
+  right: 66rpx;
+  width: 210rpx;
+  height: 47rpx;
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0.58) 0%, rgba(255, 255, 255, 0.29) 100%);
+  border-radius: 24rpx;
+  text-align: center;
+}
+
+.text_tx {
+  height: 63rpx;
+  font-size: 28rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 63rpx;
+}
+
+.text_add {
+  width: 168rpx;
+  height: 47rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 47rpx;
+}
+
+
+.text_jl {
+  text-align: center;
+  height: 50rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 50rpx;
+}
+
+.selected {
+  color: #FE0032;
+  border-bottom: 6rpx solid #FE0032;
+  ;
+}
+
+.text_mark {
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.text_c_time {
+  height: 26rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+  line-height: 26rpx
+}
+
+.text_price {
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 30rpx;
+}
+
+.add_price {
+  color: #FE0032;
+}
+
+.none_data {
+  height: 30rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+  line-height: 30rpx;
+  text-align: center;
 }
 </style>

src/pages/refund/components/RefundReasonPopup.vue

@@ -82,7 +82,7 @@ function handleFinished() {
   >
     <div class="flex flex-col  h-full relative">
       <div class="flex p-3 f-hairline-bottom">
-        <div class="w-full text-center font-bold">货物状态</div>
+        <div class="w-full text-center font-bold">退款原因</div>
         <div class="absolute right-3"
              @tap.stop="handleClose"
         >

src/pages/refund/detail.vue

@@ -1,64 +1,200 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-import {getRefundDetail} from "~/apis/order.api";
+import { CDN_URL } from "~/config/app";
+import { getRefundDetail, getRefundWlList } from "~/apis/order.api";
 import FPrice from "~/components/FPrice/FPrice.vue";
 
-// const bgImg = CDN_URL + '/static/assets/shouhoudingdanbeijing.png'
-const getStatusText = computed(() => {
-  // 商家已处理
-  // 退款成功， 系统已退款
-  const status = state.detail.status
-  // const status = -1
-  if (status == 0) {
-    return ['提交退款申请', '提交退款申请成功，等待处理']
-  }
-  if (status == -1) {
-    return ['退款失败', '请联系商家']
-  }
-  // 待退货
-  if (status == 1) {
-    return ['商家处理中', '72小时内商家未处理将自动退款']
-  }
-  // 待收货
-  if (status == 2) {
-    return ['商家处理中', '72小时内商家未处理将自动退款']
-  }
-  // 已退款
-  if (status == 3) {
-    return ['退款成功', '系统已退款']
-
-  }
-})
 const state = reactive({
+  refund_id: '',
   currentStep: 1,
   currentStepTitle: '退款申请',
-  detail: null
+  detail: {}
 })
+// const bgImg = CDN_URL + '/static/assets/shouhoudingdanbeijing.png'
+
+const isshow = ref(false)
+const takeshow = ref(false)
+const wldata = ref([])
+
 // const detail = ref({})
 onLoad((options) => {
-  getRefundDetail(options.id).then(res => {
-  // getRefundDetail(657).then(res => {
+  if (options && options.id) {
+    // refundDetail(options.id)
+    // refundWlList(options.id)
+    state.refund_id = options.id
+  }
+})
+
+function refundDetail(id: any) {
+  getRefundDetail(id).then(res => {
+    // getRefundDetail(657).then(res => {
     console.log(res)
     state.detail = res
     // res.status = -1
-    if (res.status == 0) {
-      state.currentStep = 1
-    }
-    if (res.status == 1 || res.status == 2) {
-      state.currentStep = 2
+    //三步骤
+    if (res.refund_type == 1) {
+      if (res.status == 0) {
+        state.currentStep = 1
+      }
+      if (res.status == 1) {
+        state.currentStep = 2
+      }
+      if (res.status == 3) {
+        state.currentStep = 3
+      }
     }
-    if (res.status == 3) {
-      state.currentStep = 3
+    if (res.refund_type == 2) {
+      if (res.status == 0) {
+        state.currentStep = 1
+      }
+      if (res.status == 1) {
+        state.currentStep = 2
+      }
+      if (res.status == 2) {
+        state.currentStep = 3
+      }
+      if (res.status == 3) {
+        state.currentStep = 4
+      }
     }
-    if (res.status == -1) {
-      state.currentStep = 2
+
+
+  })
+}
+function refundWlList(id: any) {
+  getRefundWlList(id).then((res) => {
+    // getRefundDetail(657).then(res => {
+    console.log(res)
+    if (res.length > 0) {
+      wldata.value = res
+    } else {
+      wldata.value = [{
+        status: '运输中',
+        time: state.detail.create_time
+      }]
     }
+
+
   })
+}
+onShow(() => {
+  if (state.refund_id) {
+    refundDetail(state.refund_id)
+    refundWlList(state.refund_id)
+
+  }
+})
+const getStatusshow = computed(() => {
+  // 商家已处理
+  // 退款成功， 系统已退款
+  if (state.detail.refund_status) {
+    const status = state.detail.refund_status
+    // const status = -1
+    //待审核
+    if (status != 2 || status != 1 || status != 0) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+})
+
+const getshowKd = computed(() => {
+  if (state.detail.refund_type == 2) {
+    if (state.detail.refund_status) {
+      const status = state.detail.refund_status
+      // const status = -1
+      //待审核
+      if (status == 3 || status == 5 || status == 2) {
+        return true
+      } else {
+        return false
+      }
+    }
+  } else if (state.detail.refund_type == 1) {
+    return false
+  }
+
+
+})
+
+const getStatusText = computed(() => {
+  // 商家已处理
+  // 退款成功， 系统已退款
+  if (state.detail.refund_status) {
+    const status = state.detail.refund_status
+    // const status = -1
+    //待审核
+    if (status == 0) {
+      return ['审核中', '售后申请已提交，请耐心等待']
+    }
+
+    // 待退货
+    if (status == 1) {
+      return ['待退货', '72小时内未寄回，将自动取消申请']
+    }
+    // 待收货
+    if (status == 2) {
+      return ['退货中', '商品已寄出，请等待商家处理']
+    }
+    // 已退款
+    if (status == 3 || status == 5) {
+      return ['退款成功', '退货服务已完成，如有疑问请联系商家']
+
+    }
+    // 超时
+    if (status == 6) {
+      return ['超时未发货，申请已取消', '因您超时未发货，申请已自动取消，若有问题请联系商家']
+
+    }
+    //退款失败
+    if (status == -1 && state.detail.refund_type == 1) {
+      return ['退款失败', '退款失败，请联系商家', '查看失败原因']
+    }
+    // 审核未通过
+    if (status == -1 && state.detail.refund_type == 2) {
+      return ['审核未通过', '您的售后申请未通过，若有问题请联系商家', '查看原因']
+
+    }
+  }
+
 })
 
 function handleClipboard() {
   uni.setClipboardData({
-    data: state.detail.refund_order_sn,
+    data: state.detail.order.order_sn,
+    success(res) {
+      // wx.getClipboardData({
+      //   success (res) {
+      //     console.log(res.data) // data
+      //   }
+      // })
+    }
+  })
+}
+//收件人信息复制
+function handleCopy1() {
+  let copyData = state.detail.mer_delivery_user + ' ' + state.detail.phone + ' ' + state.detail.mer_delivery_address
+  console.log(copyData);
+
+  uni.setClipboardData({
+    data: copyData,
+    success(res) {
+      // wx.getClipboardData({
+      //   success (res) {
+      //     console.log(res.data) // data
+      //   }
+      // })
+    }
+  })
+}
+//退货快递信息复制
+function handleCopy2() {
+  let copyData = state.detail.delivery_id
+  console.log(copyData);
+
+  uni.setClipboardData({
+    data: copyData,
     success(res) {
       // wx.getClipboardData({
       //   success (res) {
@@ -74,134 +210,419 @@ function handleHeaderClick() {
     url: `/pages/store/home/index?id=${state.detail.merchant.mer_id}`
   })
 }
+
+
+function handleTosCancode() {
+  uni.navigateTo({
+    url: `/pages/refund/scancode/scancode?refund_order_id=${state.detail.refund_order_id}&&phone=${state.detail.phone}`
+  })
+}
+function handleTophone() {
+
+  if (state.detail.order.douhuomall == 1) {
+    uni.openCustomerServiceChat({
+      extInfo: {
+        url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
+      },
+      corpId: 'wwaeb55681929a37ae',
+      success: (res => {
+        console.log(res)
+      }),
+      fail: (res => {
+        console.log(res)
+      })
+    })
+  } else {
+    const phone = state.detail.merchant.service_phone
+    uni.makePhoneCall({
+      phoneNumber: phone, // 替换成实际的电话号码
+      success: function () {
+        console.log('拨打电话成功');
+      },
+      fail: function (err) {
+        console.log('拨打电话失败', err);
+      },
+    });
+
+  }
+}
+
+function toShowValue() {
+  isshow.value = true
+}
+function onCancel() {
+  isshow.value = false
+}
+
+function transformStatus() {
+  takeshow.value = !takeshow.value
+  if (takeshow.value == false) {
+    uni.pageScrollTo({
+      scrollTop: 0,
+    });
+  }
+}
+
+
+//去协商记录
+function toXSlist() {
+  uni.navigateTo({
+    url: `/pages/refund/scancode/xsjllist?refund_order_id=${state.detail.refund_order_id}`
+  })
+}
+
+const statusimg = computed(() => {
+  if (takeshow.value == false) {
+    return '../../static/icon/展开.png'
+  } else {
+    return '../../static/icon/收起.png'
+  }
+})
+const statustext = computed(() => {
+  if (takeshow.value == false) {
+    return '展开'
+  } else {
+    return '收起'
+  }
+})
 </script>
 <template>
+  <div v-if="getStatusText != undefined">
+    <div class="px-3 pt-3 relative h-full"
+      v-if="state.detail.refund_status == -1 || state.detail.refund_status == 4 || state.detail.refund_status == 6">
+      <div class="bg-white  rounded-lg p-3 flex justify-center items-center ">
+        <div class="w-full">
+          <div class="items-center">
+            <div class="flex items-center font-bold gap-2 text-sm mb-3 w-full">
+              <div class="flex-1 flex items-center gap-2 ">
+                <div class="line-clamp-1 text_font ">
+                  {{ getStatusText[0] }}
+                </div>
+              </div>
+              <div v-if="state.detail.refund_status != 6" class="line_hei " @click="toShowValue">
+                <span class="text_lok">{{ getStatusText[2] }}</span>
+                <span class="f-text-color-2 i-tabler-chevron-right"></span>
+              </div>
 
-    <div class=" ">
-      <div class="top-bg relative">
-        <div class="text-white p-3">
-          <div class="text-md">{{ getStatusText[0]}}</div>
-          <div class="text-[12px] text-gray-50">{{ getStatusText[1]}}</div>
+            </div>
+            <div class="text_dis">
+              {{ getStatusText[1] }}
+            </div>
+          </div>
         </div>
+      </div>
+    </div>
+    <div class="top-bg relative" v-else>
+      <div class="text-white p-3">
+        <div class="text-md">{{ getStatusText[0] }}</div>
+        <div class="text-[12px] text-gray-50">{{ getStatusText[1] }}</div>
+      </div>
+      <div class="p-3">
+        <div class="bg-white rounded-lg h-18 flex justify-center items-center w-full ">
+          <div class="w-full">
+            <nut-steps :current="state.currentStep" progress-dot v-if="state.detail.refund_type == 2">
+              <nut-step title="退款申请">
+
+                <template #title>退款申请</template>
+              </nut-step>
+              <nut-step title="商家处理">
+
+                <template #title>商家处理</template>
+              </nut-step>
+              <nut-step title="商品寄回">
+
+                <template #title>商品寄回</template>
+              </nut-step>
+              <nut-step title="退款成功">
 
-        <div class="p-3">
-          <div class="bg-white rounded-lg h-18 flex justify-center items-center w-full ">
-            <div class="w-full">
-              <nut-steps :current="state.currentStep" progress-dot  v-if="state.detail.status == -1">
-                <nut-step title="退款申请"></nut-step>
-                <nut-step title="商家处理"></nut-step>
-                <nut-step title="退款失败"></nut-step>
+                <template #title>退款成功</template>
+              </nut-step>
+            </nut-steps>
+            <nut-steps :current="state.currentStep" progress-dot v-if="state.detail.refund_type == 1">
+              <nut-step title="售后申请">
+
+                <template #title>售后申请</template>
+              </nut-step>
+              <nut-step title="商家处理">
+                <template #title>商家处理</template>
+              </nut-step>
+              <nut-step title="退款成功">
+
+                <template #title>退款成功</template>
+              </nut-step>
+            </nut-steps>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+    <!-- 退款商品详情 -->
+    <div class="p-3 relative h-full" style="padding-bottom:160rpx;">
+      <!-- 物流信息 -->
+      <div class="bg-white mb-3 rounded-lg p-3 flex justify-center items-center " v-if="getshowKd">
+        <div class="w-full">
+          <div class="items-center mb-3">
+            <div class="flex items-center  gap-2 text-sm w-full">
+              <div class="flex-1 flex justify-between items-center gap-2 ">
+                <div class="text_box">
+                  快递公司
+                </div>
+                <div class="text_box">
+                  {{ state.detail.delivery_type }}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="">
+            <div class="justify-between flex-1 flex items-center gap-2 ">
+              <div class="text_box">
+                快递单号
+              </div>
+              <div style="color: #999999; font-size: 28rpx; display: flex; " @click="handleCopy2">
+                <div>{{ state.detail.delivery_id }}</div>
+                <div style="font-size: 26rpx; margin-left: 26rpx; ">复制</div>
+              </div>
+            </div>
+            <div class="justify-between mt-2 flex-1 flex items-center gap-2 ">
+              <div style="24rpx" class="rounded-full w-4 h-4 bg-gray-400 text-white flex flex-col justify-center items-center">收</div>
+              <div class="text_div flex-1 ">
+                {{ state.detail.mer_delivery_address + ' ' + state.detail.mer_delivery_user + ' ' + state.detail.phone }}
+              </div>
+            </div>
+            <div class="text_div mb-2 w-full " style="color: #333333;" v-if="wldata.length > 0">
+              <nut-steps v-if="takeshow == true" :current="1" progress-dot direction="vertical">
+                <nut-step v-for="(item, index) in wldata" :key="index" style="width: 578rpx;" :title="item?.status"
+                  :content="item.time">
+                  <template #title>
+                    <div :style="{ color: index === 0 ? '#333' : '#999' }" class="mt-2 custom-title">{{ item?.status }}
+                    </div>
+                  </template>
+                  <template #content>
+                    <div class="custom-content">{{ item.time }}</div>
+                  </template>
+                </nut-step>
               </nut-steps>
-              <nut-steps :current="state.currentStep" progress-dot  v-else>
-                <nut-step title="退款申请"></nut-step>
-                <nut-step title="商家处理"></nut-step>
-                <nut-step title="退款成功"></nut-step>
+              <nut-steps v-if="takeshow == false" :current="1" progress-dot direction="vertical">
+                <nut-step style="width: 578rpx;" :title="wldata[0].status" :content="wldata[0].time">
+                  <template #title>
+                    <div :style="{ color: '#333' }" class="mt-2 custom-title">{{ wldata[0].status }}</div>
+                  </template>
+                  <template #content>
+                    <div class="custom-content">{{ wldata[0].time }}</div>
+                  </template>
+                </nut-step>
               </nut-steps>
             </div>
+            <div class="flex w-full" @click="transformStatus"
+              style="height:36rpx;  justify-content: center; align-items: center; ">
+              <div class="text_dew">{{ statustext }}</div>
+              <div style="width: 36rpx; height: 36rpx; ">
+                <image style="width: 36rpx; height: 36rpx;" :src="statusimg"></image>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 商家收件信息 -->
+      <div class="bg-white mb-3 rounded-lg p-3 flex justify-center items-center " v-if="state.detail.refund_status == 1">
+        <div class="w-full">
+          <div class="items-center mb-3 pb-3 f-hairline-bottom">
+            <div class="flex items-center font-bold gap-2 text-sm w-full">
+              <div class="flex-1 flex items-center gap-2 ">
+                <div class="text_div">
+                  请填写快递单号，请勿邮寄到付
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="">
+            <div class="justify-between flex-1 flex items-center gap-2 ">
+              <div class="line-clamp-1 font-bold text-sm">
+                商家收件信息
+              </div>
+              <div style="color: #333; font-size: 26rpx; display: flex; " @click="handleCopy1">
+                <div class="copy_img">
+                  <image src="../../static/icon/复制.png"></image>
+                </div>
+                <div>复制</div>
+              </div>
+            </div>
+            <div class="justify-between mt-2 flex-1 flex items-center gap-2 ">
+              <div class="text_div">{{ state.detail.mer_delivery_user }}</div>
+              <div class="text_div">{{ state.detail.phone }}</div>
+            </div>
+            <div class="text_div my-2 ">
+              {{ state.detail.mer_delivery_address }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 退货需知  -->
+      <div class="bg-white mb-3 rounded-lg p-3 flex justify-center items-center " v-if="getStatusshow">
+        <div class="w-full">
+          <div class="items-center">
+            <div class="flex items-center font-bold gap-2 text-sm w-full">
+              <div class="flex-1 flex items-center gap-2 ">
+                <div class="line-clamp-1">
+                  退货需知
+                </div>
+              </div>
+            </div>
+            <div class="text_div">
+              请确保商品不影响二次销售 (质量问题除外)
+            </div>
+          </div>
+        </div>
 
+
+      </div>
+
+      <!-- 协商记录 -->
+      <div @click="toXSlist" class="bg-white mb-3 rounded-lg p-3 flex justify-center items-center ">
+        <div class="w-full">
+          <div class="flex items-center  ">
+            <div class="flex items-center font-bold gap-2 text-sm w-full">
+              <div class="flex-1 flex items-center gap-2 ">
+                <div class="line-clamp-1">
+                  协商记录
+                </div>
+              </div>
+              <div class="f-text-color-2 i-tabler-chevron-right"></div>
+            </div>
           </div>
         </div>
       </div>
 
-      <!-- 退款商品详情 -->
-      <div class="p-3 relative h-full">
-        <div class="bg-white rounded-lg p-3 flex justify-center items-center ">
-          <div class="w-full">
-            <div
-                @click.stop="handleHeaderClick"
-                class="flex items-center f-hairline-bottom pb-3 px-3">
-              <div class="flex items-center font-bold gap-2 text-sm w-full">
-                <div class="flex-1 flex items-center gap-2 ">
-                  <image :src="state.detail.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
-                  <div class="line-clamp-1">
-                    {{ state.detail.merchant.mer_name }}
-                  </div>
+      <div class="bg-white rounded-lg p-3 flex justify-center items-center ">
+        <div class="w-full">
+          <div class="flex items-center f-hairline-bottom  pb-3 px-3">
+            <div class="flex items-center font-bold gap-2 text-sm w-full">
+              <div class="flex-1 flex items-center gap-2 ">
+                <image :src="state.detail.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
+                <div class="line-clamp-1">
+                  {{ state.detail.merchant.mer_name }}
                 </div>
+              </div>
 
-                <div class="f-text-color-2 i-tabler-chevron-right"></div>
+              <!-- <div class="f-text-color-2 i-tabler-chevron-right"></div> -->
 
-              </div>
             </div>
+          </div>
 
-            <div>
-              <div v-for="(orderProduct, orderProductIndex) in state.detail.refundProduct" :key="orderProductIndex">
-                <div class="flex py-2 gap-3 f-hairline-bottom pb-3">
-                  <div class="flex-1 flex gap-2">
-                    <image :src="orderProduct.product.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
-                    <div class="flex flex-col flex-1">
-                      <div class="line-clamp-2 text-[12px]">
-                        {{ orderProduct.product.cart_info.product.store_name }}
-                      </div>
-                      <div class="text-gray-500 text-[10px]">
-                        {{ orderProduct.product.cart_info.productAttr.sku }}
-                      </div>
+          <div>
+            <div v-for="(orderProduct, orderProductIndex) in state.detail.refundProduct" :key="orderProductIndex">
+              <div class="flex py-2 gap-3 f-hairline-bottom pb-3">
+                <div class="flex-1 flex gap-2">
+                  <image :src="orderProduct.product.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                  <div class="flex flex-col flex-1">
+                    <div class="line-clamp-2 text-[12px]">
+                      {{ orderProduct.product.cart_info.product.store_name }}
                     </div>
-                    <div class="justify-end flex">
-                      <div class="flex flex-col ">
-                        <div class="text-[12px] font-bold">
-                          <FPrice :price="orderProduct.product.product_price" ex-class="font-bold text-black"/>
-                        </div>
-                        <div class="text-gray-500 text-[11px] text-right">共{{ orderProduct.product.product_num }}件</div>
+                    <div class="text-gray-500 text-[10px]">
+                      {{ orderProduct.product.cart_info.productAttr.sku }}
+                    </div>
+                  </div>
+                  <div class="justify-end flex">
+                    <div class="flex flex-col ">
+                      <div class="text-[12px] font-bold">
+                        <FPrice :price="orderProduct.product.product_price" ex-class="font-bold text-black" />
                       </div>
+                      <div class="text-gray-500 text-[11px] text-right">共{{ orderProduct.product.product_num }}件</div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
+          </div>
 
-            <div class="pt-3 flex flex-col justify-end text-[14px]">
+          <div class="pt-3 flex flex-col justify-end text-[14px]">
 
-              <div class="f-hairline-bottom py-3 flex flex-col gap-3">
-                <div class="flex justify-between">
-                  <div>退款总额</div>
-                  <div>
-                    <FPrice :price="state.detail.refund_price" :ex-class="['text-gray-400']"></FPrice>
-                  </div>
-                </div>
-                <div class="flex justify-between">
-                  <div>申请件数</div>
-                  <div class="text-gray-400">{{ state.detail.refund_num }}</div>
-                </div>
-                <div class="flex justify-between">
-                  <div>收货状态</div>
-                  <div class="text-gray-400">{{ state.detail.take_status }}</div>
+            <div class="f-hairline-bottom py-3 flex flex-col gap-3">
+              <div class="flex justify-between">
+                <div>退款金额</div>
+                <div>
+                  <FPrice :price="state.detail.refund_price" :ex-class="['text-gray-400']"></FPrice>
                 </div>
               </div>
+              <!-- <div class="flex justify-between">
+                <div>申请件数</div>
+                <div class="text-gray-400">{{ state.detail.refund_num }}</div>
+              </div> -->
+              <div class="flex justify-between">
+                <div>退货原因</div>
+                <div class="text-gray-400">{{ state.detail.refund_message }}</div>
+              </div>
+            </div>
 
-              <div class="py-3 flex flex-col gap-3">
-                <div class="flex justify-between">
-                  <div>订单编号</div>
-                  <div class="flex gap-2">
-                    <div class="text-gray-400">{{ state.detail.refund_order_sn }}</div>
-                   <div @click="handleClipboard">复制</div>
-                  </div>
-                </div>
-                <div class="flex justify-between">
-                  <div>申请时间</div>
-                  <div class="text-gray-400">{{ state.detail.create_time }}</div>
-                </div>
-                <div class="flex justify-between">
-                  <div>备注说明</div>
-                  <div class="text-gray-400">{{ state.detail.mark ? state.detail.mark : '暂无说明' }}</div>
+            <div class="py-3 flex flex-col gap-3">
+              <div class="flex justify-between">
+                <div>订单编号</div>
+                <div class="flex gap-2">
+                  <div class="text-gray-400">{{ state.detail.order.order_sn }}</div>
+                  <div @click="handleClipboard">复制</div>
                 </div>
-
               </div>
+              <div class="flex justify-between">
+                <div>申请时间</div>
+                <div class="text-gray-400">{{ state.detail.create_time }}</div>
+              </div>
+              <!-- <div class="flex justify-between">
+                <div>备注说明</div>
+                <div class="text-gray-400">{{ state.detail.mark ? state.detail.mark : '暂无说明' }}</div>
+              </div> -->
 
             </div>
 
           </div>
 
-
         </div>
 
+
       </div>
+    </div>
+    <!-- 查看失效原因 -->
+    <FPopup v-model:show="isshow" position="bottom"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[70%] max-h-[80%] h-full">
+      <div class="section_1">
+        <div class="flex_mar">
+          <div class="text_span1">{{ getStatusText[0] }}原因</div>
+        </div>
+      </div>
+      <div class="img_box" @click="onCancel">
+        <image class="label_img" src="../../static/icon/close.png" />
+      </div>
+      <div class="text1_2 px-4 ">
+        {{ state.detail.fail_message }}
+      </div>
+    </FPopup>
+  </div>
+  <!-- 待退货，跳转退货快递单号页面 -->
+  <div class="flexd_div  " v-if="state.detail.refund_status == 1">
+    <div class="flexd_box">
+      <button @click="handleTosCancode" style="width: 686rpx;
+height: 82rpx;font-size: 30rpx; " class="['!bg-primary', 'rounded-full', 'text-white']">
+        我已退回，填写快递单号
+      </button>
+    </div>
 
+  </div>
+  <!-- 待退货，跳转退货快递单号页面 -->
+  <div class="flexd_div  " v-if="state.detail.refund_status == -1 && state.detail.refund_type == 1">
+    <div class="flexd_box">
+      <button @click="handleTophone" style="width: 686rpx;
+height: 82rpx;font-size: 30rpx; " class="['!bg-primary', 'rounded-full', 'text-white']">
+        <image style="width: 30rpx; height: 30rpx; vertical-align: middle;" src="../../static/icon/联系商家.png"></image>
+        <span style="vertical-align: middle; margin-left: 8rpx; ">联系商家</span>
+      </button>
     </div>
+
+  </div>
 </template>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 售后订单
+  navigationBarTitleText: 售后详情                                                                                                                         
 </route>
 
 <style lang="scss">
@@ -217,9 +638,137 @@ page {
   --nut-steps-base-title-font-size: 12px;
   background: #f8f8f8;
 }
+
 .nut-step-title {
   min-width: 100rpx;
   width: 100rpx;
   text-align: center;
 }
+
+.text_font {
+  font-size: 36rpx;
+  color: #333333;
+}
+
+.text_div {
+  font-size: 26rpx;
+  color: #666;
+}
+
+.text_box {
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.text_dis {
+  font-size: 28rpx;
+  color: #666;
+}
+
+.text_dew {
+  width: 48rpx;
+  height: 36rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 36rpx;
+}
+
+.text_lok {
+  font-size: 26rpx;
+  color: #FE0032;
+  height: 1.2em;
+}
+
+.line_hei {
+  height: 1.2em;
+}
+
+.section_1 {
+  margin: 40rpx 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* 垂直居中 */
+  align-items: center;
+  /* 水平居中 */
+}
+
+.flex_mar {
+  display: flex;
+}
+
+.text_span1 {
+  font-size: 36rpx;
+  color: #333333;
+}
+
+.img_box {
+  position: fixed;
+  top: 40rpx;
+  left: 682rpx;
+  width: 36rpx;
+  height: 36rpx;
+  line-height: 48rpx;
+}
+
+.label_img {
+  width: 100%;
+  height: 100%;
+  margin-top: 6rpx;
+}
+
+
+
+.text1_2 {
+  font-size: 30rpx;
+}
+
+.copy_img {
+  margin-top: 5rpx;
+  margin-right: 6rpx;
+  width: 24rpx;
+  height: 24rpx;
+}
+
+.copy_img image {
+  width: 100%;
+  height: 100%;
+}
+
+.flexd_div {
+  border-top: 2rpx solid rgba(170, 171, 172, 0.5);
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 161rpx;
+  position: fixed;
+  background: #FFFFFF;
+  justify-content: center;
+}
+
+.flexd_box {
+
+  width: 686rpx;
+  margin-top: 12rpx;
+  margin-left: 32rpx;
+}
+
+.custom-title {
+  // 设置 title 的宽度样式
+  text-align: left;
+  width: 578rpx; // 你可以根据需要设置宽度值
+}
+
+.custom-content {
+  width: 578rpx; // 你可以根据需要设置宽度值
+  font-size: 24rpx;
+}
+
+
+.custom-icon-color .nut-step-icon {
+  background-color: white;
+  /* 将小圆点的背景颜色设置为白色 */
+}
 </style>

src/pages/refund/drawback.vue

@@ -1,10 +1,13 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {UPLOAD_URL} from "~/utils/http";
+import closeIcon from "~/static/icon/close.png";
+import radioOffIcon from "~/static/icon/radio-off.png";
+import radioOnIcon from "~/static/icon/radio-on.png";
+import { UPLOAD_URL } from "~/utils/http";
 import GoodStatusPopup from "~/pages/refund/components/GoodStatusPopup.vue";
 import RefundReasonPopup from "~/pages/refund/components/RefundReasonPopup.vue";
-import {getToken} from "~/utils/auth";
-import {refundApply, takeOrder} from "~/apis/order.api";
+import { getToken } from "~/utils/auth";
+import { refundApply, takeOrder } from "~/apis/order.api";
 const headers = {
   "Content-Type": "multipart/form-data",
   'X-Token': 'Bearer ' + getToken()
@@ -33,14 +36,16 @@ const formData = reactive({
   refund_message: '',
   // 退款金额
   refund_price: '',
+  pay_price: '',
   type: '',
   // 1退款， 2退款退货
   refund_type: '',
   // 收货状态
-  goods: ''
+  goods: '',
+  delivery_type: ''
 })
 const defaultFileList = ref([])
-
+const radioValue = ref('')
 const radioVal = ref(false)
 function handleUploadSuccess({ data, option, fileItem }) {
   // console.log(data.data.path)
@@ -61,17 +66,31 @@ onLoad(async (options) => {
     state.from = options.from
   }
   await userStore.getUserInfo()
+  if (options.refund_type == '1') {
+    uni.setNavigationBarTitle({
+      title: '申请退款'
+    })
+  }
+  if (options.refund_type == '2') {
+    uni.setNavigationBarTitle({
+      title: '申请退货退款'
+    })
+    formData.goods = '已收到货'
+  }
   formData.refund_type = options.refund_type
   formData.ids = options.ids
   formData.refund_price = options.total_price
+  formData.pay_price = options.pay_price
   formData.num = options.total_num
   formData.phone = userStore.userInfo.phone
   formData.type = options.type || 1
-
+  formData.delivery_type = options.delivery_type
   state.orderId = options.orderId
+
+  console.log('>>>>>>>>', formData);
 })
 function handleSubmit() {
-  if(!formData.goods) {
+  if (!formData.goods) {
     return uni.showToast({
       title: '请选择收货状态',
       icon: "none"
@@ -90,38 +109,38 @@ function handleSubmit() {
       if (res.confirm) {
         refundApply(state.orderId.toString(), formData).then(res => {
           // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
-          console.log('申请退款成功',res);
-          
-          if(res.status===200){
-             uni.showToast({
-            title: '申请退款成功',
-            icon: 'none'
-          })
-          setTimeout(() => {
-            uni.navigateTo({
-              url: `/pages/refund/index?from=${state.from}`
+          console.log('申请退款成功', res);
+
+          if (res.status === 200) {
+            uni.showToast({
+              title: '申请退款成功',
+              icon: 'none'
             })
-          }, 300)
-          }else{
+            setTimeout(() => {
+              uni.navigateTo({
+                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}`
+              title: res.message,
+              icon: 'none'
             })
-          }, 300)
+            setTimeout(() => {
+              uni.navigateTo({
+                url: `/pages/refund/index?from=${state.from}`
+              })
+            }, 300)
           }
-         
+
         })
 
       }
     },
     fail: function (error) {
-    // 模态框显示失败，可能是因为参数不合法等原因
-    console.log('模态框显示失败', error);
-  }
+      // 模态框显示失败，可能是因为参数不合法等原因
+      console.log('模态框显示失败', error);
+    }
   })
   // if (state.orderId) {
   // }
@@ -129,8 +148,13 @@ function handleSubmit() {
   console.log(formData)
 }
 
-function handleChooseGoodStatus () {
-  state.showGoodStatusPopup = true
+function handleChooseGoodStatus() {
+  if (formData.refund_type == '1') {
+    state.showGoodStatusPopup = true
+    console.log(111);
+  } else {
+    return
+  }
 }
 
 function getGoodsStatus(radioVal) {
@@ -174,110 +198,144 @@ function onRefundReasonConfirm(val) {
   formData.refund_message = getRefundMessage(val)
   console.log(formData.refund_message)
 }
+const allowPopup = ref(true)
+function handleTextareaInput(event) {
+  // 在输入时禁止调起其他组件
+  console.log('Textarea input:', event.target.value);
+  state.showReasonPopup = false
+  allowPopup.value = false;
+}
+function handleshowReasonPopup() {
+  state.showReasonPopup = true
+}
+
+
+
 
 
 </script>
 <template>
-<div>
-  <nut-cell-group>
-    <nut-cell :desc="formData.goods == '' ? '请选择' : `${formData.goods}`" is-link @click="handleChooseGoodStatus">
-      <template #title>
-        <div class="flex font-bold gap-1 items-center">
-          <div>收货状态</div>
-          <div class="text-primary">*</div>
-        </div>
-      </template>
-    </nut-cell>
-    <nut-cell :desc="formData.refund_message == '' ? '请选择' : `${formData.refund_message}`" is-link @click="state.showReasonPopup = true">
-      <template #title>
-        <div class="flex font-bold gap-1 items-center">
-          <div>退款原因</div>
-          <div class="text-primary">*</div>
-        </div>
-      </template>
-    </nut-cell>
-    <nut-cell >
-      <div class="flex flex-col">
-        <div class="flex font-bold gap-1 items-center">
-          <div>退款金额</div>
-          <div class="text-primary">*</div>
-        </div>
-        <FPrice :price="formData.refund_price" :ex-class="['font-bold text-xl']"></FPrice>
-        <div class="text-gray-500 text-[12px]">
-          不可修改，最多￥{{ formData.refund_price }},含发货邮费￥{{state.total_price}}
+  <div>
+    <nut-cell-group>
+      <nut-cell>
+        <template #title>
+          <div class="flex_div">
+            <div class="flex font-bold gap-1 items-center">
+              <div>申请类型</div>
+              <div class="text-primary">*</div>
+            </div>
+            <div style="color: #cccccc;">{{ formData.refund_type == '1' ? '我要退款(无需退货)' : '我要退货退款' }}</div>
+          </div>
+        </template>
+      </nut-cell>
+
+      <nut-cell :desc="formData.goods == '' ? '请选择' : `${formData.goods}`"
+        :is-link="formData.refund_type == '1' ? true : false" @click="handleChooseGoodStatus">
+        <template #title>
+          <div class="flex font-bold gap-1 items-center">
+            <div>收货状态</div>
+            <div class="text-primary">*</div>
+          </div>
+        </template>
+      </nut-cell>
+
+      <nut-cell :desc="formData.refund_message == '' ? '请选择' : `${formData.refund_message}`" is-link
+        @click.stop="handleshowReasonPopup">
+        <template #title>
+          <div class="flex font-bold gap-1 items-center">
+            <div>退款原因</div>
+            <div class="text-primary">*</div>
+          </div>
+        </template>
+      </nut-cell>
+      <nut-cell>
+        <div class="flex flex-col">
+          <div class="flex flex-1 justify-between ">
+            <div class="flex font-bold  gap-1 items-center">
+              <div>退款金额</div>
+              <div class="text-primary">*</div>
+            </div>
+            <div class="['font-bold text-xl']" style="color: rgb(253, 33, 76);">
+              ￥ {{ parseFloat(formData.delivery_type !== 'null' ? formData.refund_price :
+                formData.pay_price).toFixed(2).replace(/\.?0+$/, '') }}
+            </div>
+          </div>
+
+          <div class="text-gray-500 text-[12px]">
+            <div>退款金额说明</div>
+            <div>1.未发货的订单发起退款，退款金额=支付金额</div>
+            <div>2.已发货的订单发起退款，根据收货地址不同，可能会产生不同金额的快递拦截费，以实际情况未准；</div>
+            <div>退款金额=支付金额-快递拦截费或运费</div>
+          </div>
         </div>
-      </div>
 
-    </nut-cell>
-  </nut-cell-group>
+      </nut-cell>
+    </nut-cell-group>
 
-  <div class="bg-white p-3">
-    <div class="text-sm">
-      补充描述和凭证
-    </div>
-    <div class="flex flex-col my-2 gap-2 bg-gray-100">
-        <textarea placeholder="补充描述，有助于商家更好的处理售后问题"
-                  class="p-2 text-xs rounded-lg"
-                  v-model="formData.mark"
-        />
-      <div class="flex p-2 text-gray">
-        <div class="flex flex-col justify-center items-center text-xs gap-2">
-          <nut-uploader :url="UPLOAD_URL"
-                        :headers="headers"
-                        :name="'field'"
-                        :timeout="1000*50"
-                        :data="{ filename: 'field'}"
-                        v-model:file-list="defaultFileList" maximum="3"
-                        @success="handleUploadSuccess"
-          >
-          </nut-uploader>
+    <div class="bg-white p-3">
+      <div class="text-sm">
+        补充描述和凭证
+      </div>
+      <div class="flex flex-col my-2 gap-2 bg-gray-100">
+        <textarea @input="handleTextareaInput" placeholder="您填写的信息越详细，问题越可有效解决哦~" class="p-2 text-xs rounded-lg"
+          v-model="formData.mark"></textarea>
+        <div class="flex p-2 text-gray">
+          <div class="flex flex-col justify-center items-center text-xs gap-2">
+            <nut-uploader :url="UPLOAD_URL" :headers="headers" :name="'field'" :timeout="1000 * 50"
+              :data="{ filename: 'field' }" v-model:file-list="defaultFileList" maximum="3"
+              @success="handleUploadSuccess">
+            </nut-uploader>
+          </div>
         </div>
+
       </div>
 
     </div>
+    <div class="fixed bottom-0 pb-safe w-full">
+      <div class="px-3 ">
+        <nut-button @click="handleSubmit" type="primary" block>提交
+        </nut-button>
+
+        <!--      <FButton-->
+        <!--          @click="handleSubmit"-->
+        <!--          :exClass="['!bg-primary', 'rounded-full', 'text-white']"-->
+        <!--          block-->
+        <!--      >-->
+        <!--        提交-->
+        <!--      </FButton>-->
+        <!--        <div class="text-center text-white bg-red rounded-full text-sm p-2">-->
+        <!--        </div>-->
+      </div>
 
-  </div>
-  <div class="fixed bottom-0 pb-safe w-full">
-    <div class="px-3 ">
-      <nut-button
-          @click="handleSubmit"
-          type="primary" block>提交
-      </nut-button>
-
-<!--      <FButton-->
-<!--          @click="handleSubmit"-->
-<!--          :exClass="['!bg-primary', 'rounded-full', 'text-white']"-->
-<!--          block-->
-<!--      >-->
-<!--        提交-->
-<!--      </FButton>-->
-      <!--        <div class="text-center text-white bg-red rounded-full text-sm p-2">-->
-      <!--        </div>-->
     </div>
 
-  </div>
+    <GoodStatusPopup v-model:show="state.showGoodStatusPopup" @confirm="onGoodStatusConfirm" />
+    <RefundReasonPopup v-model:show="state.showReasonPopup" @confirm="onRefundReasonConfirm" />
 
-  <GoodStatusPopup v-model:show="state.showGoodStatusPopup"
-                   @confirm="onGoodStatusConfirm"
-  />
-  <RefundReasonPopup v-model:show="state.showReasonPopup"
-                     @confirm="onRefundReasonConfirm"
-  />
-</div>
+  </div>
 </template>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 售后订单
+  navigationBarTitleText: 储蓄保
 </route>
 
 <style lang="scss">
 page {
   background: #f8f8f8;
 }
+
 .nut-radio-group {
   width: 100%;
 }
+
+.flex_div {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+}
+
 //.nut-radio {
 //  display: flex !important;
 //  width: 100%;

src/pages/refund/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {refundList} from "~/apis/order.api";
+import { refundList } from "~/apis/order.api";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import RefundOrderItem from "~/pages/order/components/RefundOrderItem.vue";
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
@@ -27,7 +27,7 @@ onLoad((options) => {
 })
 
 
-function loadList(action: 'page' | 'reload',  callback?: (items) => void) {
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   if (action == 'reload') {
     state.list = []
   }
@@ -68,8 +68,16 @@ onReachBottom(() => {
   handleScrollToLower()
 
 })
+onPullDownRefresh(() => {
+   uni.showLoading({
+    title: '加载中'
+  })
+  loadList('reload');
+  uni.hideLoading()
+  uni.stopPullDownRefresh();
+})
 // watch(() => state.t)
-function handleTabChange(	{title,paneKey,disabled}) {
+function handleTabChange({ title, paneKey, disabled }) {
 
   console.log(paneKey)
   if (paneKey == 0) {
@@ -101,44 +109,42 @@ function onClickLeft() {
 }
 </script>
 <template>
-  <FNavBar
-      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
-      ex-class="bg-white w-screen"
-      @click-left="onClickLeft"
-  />
-  <div class="fixed top-18 bg-white w-screen z-2">
-    <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
-      <nut-tab-pane title="全部"></nut-tab-pane>
-      <nut-tab-pane title="退款中"></nut-tab-pane>
-      <nut-tab-pane title="退款完成"></nut-tab-pane>
-    </nut-tabs>
-  </div>
-  <div v-if="state.list.length > 0" class="mt-30 flex flex-col p-3">
-    <div v-for="(orderItem, index) in state.list" :key="index">
-      <RefundOrderItem :order-item="orderItem"/>
+  <div class="bg-white">
+    <FNavBar title="我的订单" :left-arrow="true" fixed placeholder z-index="999" ex-class="bg-white w-screen"
+      @click-left="onClickLeft" />
+    <div class="fixed top-18 bg-white w-screen z-2">
+      <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
+        <nut-tab-pane title="全部"></nut-tab-pane>
+        <nut-tab-pane title="处理中"></nut-tab-pane>
+        <nut-tab-pane title="已完成"></nut-tab-pane>
+      </nut-tabs>
     </div>
-    <div class=" flex justify-center items-center text-[12px] text-gray-500" >
-      <div v-if="state.status === 'loading'">
-        加载中...
+    <div v-if="state.list.length > 0" class="mt-30 flex flex-col p-3" style="background-color: #f8f8f8;">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <RefundOrderItem :order-item="orderItem" />
       </div>
-      <div v-if="state.status === 'noMore'">
-        没有更多了～
+      <div class=" 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>
     </div>
+    <div class="flex h-full flex-col pt-50" v-else>
+      <CXBEmpty />
+    </div>
   </div>
-  <div class="flex h-full flex-col pt-50" v-else>
-    <CXBEmpty />
-  </div>
-
 </template>
 <route lang="yaml">
 style:
   navigationBarTitleText: 退款/售后
   navigationStyle: custom
-
+  enablePullDownRefresh: true
 </route>
 
-<style>
+<style  >
 page {
   background: #f8f8f8;
 }
@@ -150,6 +156,4 @@ page {
 .nut-tab-pane {
   display: none !important;
 }
-
-
 </style>

src/pages/refund/option.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-import {decodeBase64} from "~/utils/http/helper";
+import { CDN_URL } from "~/config/app";
+import { decodeBase64 } from "~/utils/http/helper";
 import FPrice from "~/components/FPrice/FPrice.vue";
 
 const woyaotuikuanIcon = CDN_URL + '/static/assets/woyaotuikuan.png'
@@ -19,14 +19,14 @@ onLoad((options) => {
   state.detail = JSON.parse(decodeBase64(options.detail))
   // state.detail = JSON.parse(decodeBase64(base64Detail))
   console.log(state.detail)
-  {{state.detail.orderProduct}}
+  { { state.detail.orderProduct } }
 })
 //1:退款 2:退款退货
 
 const getProductIds = computed(() => {
   const ids = []
   if (state.detail && state.detail.orderProduct) {
-    for(let item of state.detail.orderProduct) {
+    for (let item of state.detail.orderProduct) {
       ids.push(item.order_product_id)
     }
   }
@@ -36,7 +36,7 @@ const getProductIds = computed(() => {
 function handleChooseType(refund_type) {
   // console.log(getProductIds.value)
   uni.navigateTo({
-    url: `/pages/refund/drawback?orderId=${state.detail.order_id}&refund_type=${refund_type}&ids=${getProductIds.value.toString()}&total_price=${state.detail.total_price}&total_postage=${state.detail.total_postage}&total_num=${state.detail.total_num}&type=${getProductIds.value.length > 1 ? 2 : 1}&from=${state.from}`
+    url: `/pages/refund/drawback?orderId=${state.detail.order_id}&refund_type=${refund_type}&ids=${getProductIds.value.toString()}&total_price=${state.detail.total_price}&total_postage=${state.detail.total_postage}&total_num=${state.detail.total_num}&type=${getProductIds.value.length > 1 ? 2 : 1}&from=${state.from}&&pay_price=${state.detail.pay_price}&&delivery_type=${state.detail.delivery_type}`
   })
 }
 </script>
@@ -45,13 +45,12 @@ function handleChooseType(refund_type) {
     <div class="p-3 flex flex-col gap-3">
       <div class="bg-white rounded-lg flex p-3 flex flex-col" v-if="state.detail && state.detail.orderProduct">
         <div class="font-bold">退款商品</div>
-        <div v-for="(orderProduct, orderProductIndex) in state.detail.orderProduct"
-             :key="orderProductIndex">
+        <div v-for="(orderProduct, orderProductIndex) in state.detail.orderProduct" :key="orderProductIndex">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
-<!--              <div class="flex">-->
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20 rounded" mode="widthFix"></image>
-<!--              </div>-->
+              <!--              <div class="flex">-->
+              <image :src="orderProduct.cart_info.product.image" class="w-20 h-20 rounded" mode="widthFix"></image>
+              <!--              </div>-->
 
               <div class="flex flex-col flex-1">
                 <div class="line-clamp-2 text-[14px]">
@@ -64,7 +63,9 @@ function handleChooseType(refund_type) {
             </div>
 
             <div class="flex flex-col justify-center items-center">
-              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[14px] !text-[#000]"></FPrice>
+              <!-- <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[14px] !text-[#000]"></FPrice> -->
+              <div class="font-bold text-[14px] !text-[#000]">￥{{
+                parseFloat(orderProduct.product_price).toFixed(2).replace(/\.?0+$/, '') }}</div>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
 
@@ -75,9 +76,7 @@ function handleChooseType(refund_type) {
       <div class="bg-white rounded-lg flex flex-col text-[14px] p-3">
         <div class="font-bold py-3">选择服务类型</div>
         <div class="flex flex-col gap-3">
-          <div
-              @click="handleChooseType(1)"
-              class="flex items-center gap-3">
+          <div @click="handleChooseType(1)" class="flex items-center gap-3">
             <image :src="woyaotuikuanIcon" mode="widthFix" class="w-5 h-5"></image>
             <div>
               <div class="font-bold">我要退款（无需退货）</div>
@@ -85,9 +84,7 @@ function handleChooseType(refund_type) {
             </div>
           </div>
 
-          <div
-              @click="handleChooseType(2)"
-              class="flex items-center gap-3">
+          <div @click="handleChooseType(2)" class="flex items-center gap-3">
             <image :src="woyaotuihuotuikuanIcon" mode="widthFix" class="w-5 h-5"></image>
             <div>
               <div class="font-bold">我要退货退款</div>

src/pages/refund/scancode/kdlist.vue

@@ -0,0 +1,103 @@
+<template>
+	<div class="pt-3">
+		<div v-for="(item, index) in kdlist" :key="index">
+			<div @click="handleToscan(item.value)"
+				class="bg-white  rounded-lg p-3 flex justify-center f-hairline-bottom items-center ">
+				<div class="w-full">
+					<div class="flex items-center  ">
+						<div class="flex items-center font-bold gap-2 text-sm w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1">
+									{{ item.label }}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { getRefundKdlist } from "~/apis/order.api";
+const emit = defineEmits()
+//快递列表
+const kdlist = ref([])
+const state = reactive({
+	orderId: '',
+	refund_order_id: '',
+
+})
+
+onLoad((options) => {
+	//id
+	if (options && options.refund_order_id !== '') {
+		state.refund_order_id = options.refund_order_id
+	}
+	getRefundKdlist().then((res) => {
+		console.log(res);
+		kdlist.value = res
+	})
+})
+
+function handleToscan(value: any) {
+
+
+	// 通过 $emit 发送自定义事件，并传递数据
+	// 注意：在 Vue 3 中，通过 $emit 传递事件需要使用 `emit` 函数
+	if (value) {
+        if (value == "31") {
+            value = '中国邮政'
+        }
+        if (value == "188") {
+            value = '顺丰速运'
+        }
+        if (value == "221") {
+            value = '天天快递'
+        }
+        if (value == "243") {
+            value = '圆通快递'
+        }
+        if (value == "252") {
+            value = '中通快递'
+        }
+        if (value == "254") {
+            value = 'EMS'
+        }
+        if (value == "266") {
+            value = '申通快递'
+        }
+        if (value == "286") {
+            value = '韵达快运'
+        }
+        if (value == "290") {
+            value = '快捷速递'
+        }
+        if (value == "428") {
+            value = '重磅快递'
+        }
+        if (value == "429") {
+            value = '众邦快递'
+        }
+    }
+	uni.$emit('send-data-to-b', value);
+	uni.navigateBack({
+		delta: 1 // 返回上一层页面
+	})
+
+}
+
+
+</script>
+
+<style>
+page {
+
+	background: #F8F8F8;
+}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 快递公司
+</route>

src/pages/refund/scancode/scancode.vue

@@ -0,0 +1,280 @@
+<script setup lang="ts">
+// import FPrice from "~/components/FPrice/FPrice.vue";
+import { UPLOAD_URL } from "~/utils/http";
+// import GoodStatusPopup from "~/pages/refund/components/GoodStatusPopup.vue";
+// import RefundReasonPopup from "~/pages/refund/components/RefundReasonPopup.vue";
+import { getToken } from "~/utils/auth";
+import { getRefundOutDl } from "~/apis/order.api";
+const headers = {
+    "Content-Type": "multipart/form-data",
+    'X-Token': 'Bearer ' + getToken()
+}
+const state = reactive({
+    showGoodStatusPopup: false,
+    showReasonPopup: false,
+    // detail: {}
+    total_price: '0.00',
+    orderId: '',
+    refund_order_id: '',
+
+})
+const userStore = useUserStore()
+
+let formData = reactive({
+
+    delivery_type: '',  //快递名称
+    // 申请说明
+    delivery_id: '', //快递单号
+    delivery_mark: '', //快递备注
+    // 联系电话
+    delivery_phone: '',
+    // 图片
+    delivery_pics: [], //图片
+})
+const defaultFileList = ref([])
+
+const radioVal = ref(false)
+function handleUploadSuccess({ data, option, fileItem }) {
+    // console.log(data)
+
+    if (data && data.data) {
+        const resData = JSON.parse(data.data).data
+        const path = resData.path
+        formData.delivery_pics.push(path)
+    }
+    console.log(formData.delivery_pics);
+
+    // if (data && data.path) {
+    //   formData.pics.push(data.path)
+    // }
+    //
+    // console.log(fileItem)
+}
+onLoad(async (options) => {
+    await userStore.getUserInfo()
+    //手机号
+     if (options && options.phone !== '') {
+        formData.delivery_phone = options.phone
+    }
+    console.log(formData.delivery_phone);
+    //refund_order_id
+   
+    //refund_order_id
+    if (options && options.refund_order_id !== '') {
+        state.refund_order_id = options.refund_order_id
+    }
+    console.log(state.refund_order_id);
+    //delivery_type
+
+})
+onShow((options) => {
+    uni.$on('send-data-to-b', handleReceivedData)
+})
+//提交
+function handleSubmit() {
+    console.log(formData)
+    if (!formData.delivery_id) {
+        return uni.showToast({
+            title: '快递单号不能为空',
+            icon: "none"
+        })
+    }
+    if (!formData.delivery_type) {
+        return uni.showToast({
+            title: '请选择物流公司',
+            icon: "none"
+        })
+    }
+    getRefundOutDl(state.refund_order_id,formData).then((res) => {
+        uni.showToast({
+            title: '提交成功',
+            icon: "none"
+        })
+
+    }).catch((error)=>{
+        uni.showToast({
+            title: error,
+            icon: "none"
+        })
+    })
+    uni.navigateBack({
+		delta: 1 // 返回上一层页面
+	})
+
+}
+
+
+
+// 定义处理接收到数据的方法
+const handleReceivedData = (value: any) => {
+    // 处理接收到的数据
+    formData.delivery_type = value;
+};
+
+
+function handleTokdList() {
+
+    uni.navigateTo({
+        url: `/pages/refund/scancode/kdlist?refund_order_id=${state.refund_order_id}`
+    })
+}
+//扫描二维码
+function showScancode() {
+
+    // 调起条码扫描
+    uni.scanCode({
+        scanType: ['barCode'],
+        success: function (res) {
+            console.log('res：' + res);
+            console.log('条码类型：' + res.scanType);
+            console.log('条码内容：' + res.result);
+            formData.delivery_id = res.result
+        }
+    });
+}
+
+</script>
+<template>
+    <div class="px-3">
+        <div style="border-radius: 16rpx;">
+            <nut-cell-group>
+                <nut-cell>
+                    <template #title>
+                        <div class="flex_div">
+                            <div class="flex font-bold gap-1 items-center">
+                                <div style="font-size: 30rpx; color: #333333;">填写物流信息</div>
+                            </div>
+                        </div>
+                    </template>
+                </nut-cell>
+                <nut-cell>
+                    <template #title>
+                        <div style="line-height: 42rpx;" class="flex font-bold gap-1 justify-between">
+                            <div class="font-bold">物流单号</div>
+
+                            <input class="flex-1" type="number" v-model="formData.delivery_id" placeholder="点击填写或扫码退货快递单号">
+
+                            <div @click="showScancode" style="width: 42rpx; height: 42rpx;">
+                                <image class="image_sm" src="../../../static/icon/扫码.png"></image>
+                            </div>
+                        </div>
+                    </template>
+                </nut-cell>
+                <nut-cell>
+                    <template #title>
+                        <div class="flex font-bold gap-1 justify-between">
+                            <div>物流公司</div>
+
+                            <div @click="handleTokdList()" class="flex-1"
+                                :class="formData.delivery_type == '' ? 'col_9' : 'col_3'">
+                                {{ formData.delivery_type == '' ? '请选择物流公司' : formData.delivery_type }}
+                            </div>
+                            <div class="f-text-color-2 i-tabler-chevron-right"></div>
+
+
+                        </div>
+
+                    </template>
+                </nut-cell>
+
+            </nut-cell-group>
+        </div>
+        <!-- 退货留言 -->
+        <div class="bg-white p-3 mb-3" style="border-radius: 16rpx;">
+            <div class="text-sm">
+                退货留言
+            </div>
+            <div class="flex flex-col my-2 gap-2 bg-gray-50">
+                <textarea :maxlength="200" style="height: 150rpx;" placeholder="请详细填写您的退货留言" class="p-2 text-xs rounded-lg"
+                    v-model="formData.delivery_mark" />
+            </div>
+
+        </div>
+        <!-- 上传凭证 -->
+        <div class="bg-white p-3" style="border-radius: 16rpx;">
+            <div class="text-sm">
+                上传凭证
+            </div>
+            <div class="flex p-2 text-gray">
+                <div class="flex flex-col justify-center items-center text-xs gap-2">
+                    <nut-uploader :url="UPLOAD_URL" :headers="headers" :name="'field'" :timeout="1000 * 50"
+                        :data="{ filename: 'field' }" v-model:file-list="defaultFileList" maximum="3"
+                        @success="handleUploadSuccess">
+                    </nut-uploader>
+                </div>
+            </div>
+
+        </div>
+
+
+        <!-- <div class="fixed bottom-0 pb-safe w-full">
+            <div class="">
+                <nut-button @click="handleSubmit" type="primary" block>提交
+                </nut-button>
+            </div>
+        </div> -->
+        <div class="flexd_div f-hairline-top ">
+            <div class="flexd_box">
+                <button style="font-size: 30rpx; width: 686rpx;height: 82rpx;" @click="handleSubmit"
+                    class="['!bg-primary',  'rounded-full', 'text-white']">
+                    提交
+                </button>
+            </div>
+
+        </div>
+
+    </div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 填写退货快递单号
+</route>
+
+<style >
+page {
+    background: #f8f8f8;
+}
+
+.nut-radio-group {
+    width: 100%;
+}
+
+.flex_div {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+}
+
+.image_sm {
+    width: 100%;
+    height: 100%;
+}
+
+.col_3 {
+    color: #333333
+}
+
+.col_9 {
+    color: #999999
+}
+
+
+.flexd_div {
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 161rpx;
+    position: fixed;
+    background: #FFFFFF;
+    z-index: 999;
+    justify-content: center;
+}
+
+.flexd_box {
+    width: 686rpx;
+    margin-top: 12rpx;
+    margin-left: 32rpx;
+}
+</style>

src/pages/refund/scancode/xsjllist.vue

@@ -0,0 +1,305 @@
+<template>
+	<div class="px-3 pt-3 pb-10 relative h-full" v-if="state.length > 0">
+		<!-- 申请已取消-->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white  mb-3 rounded-lg p-3 flex justify-center items-center" v-if="item.type == 6 ">
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1" style="font-size: 30rpx;" >
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 ">
+							<div>{{ item.fail_message }}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 商户拒绝仅退款-->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white  mb-3 rounded-lg p-3 flex justify-center items-center" v-if="item.type==2">
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1" style="font-size: 30rpx;" >
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 ">
+							<div>拒绝原因：{{ item.fail_message }}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 退款成功 5 -->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white  mb-3 rounded-lg p-3 flex justify-center items-center " v-if="item.type == 5">
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1"   style="font-size: 30rpx;">
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 ">
+							<div>退款金额：￥{{ item.refund_price }}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- 买家寄出商品 4 -->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white  mb-3 rounded-lg p-3 flex justify-center items-center "
+				v-if="item.type == 4 && item.refund_type == 2">
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class=" line-clamp-1"   style="font-size: 30rpx;">
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 ">
+							<div>商家收件信息：{{ item.delivery_type }}</div>
+						</div>
+						<div class="text_dis mt-3 flex ">
+							<div>快递单号：</div>
+							<div style="color: #333; font-size: 26rpx; display: flex; ">
+								<div style="border-right: 1rpx solid #D8D8D8; padding-right: 12rpx; margin-right: 13rpx;">
+									{{ item.delivery_id }}
+								</div>
+								<div @click="handleCopy1(item)">复制</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- 商家同意退货 3 -->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white  mb-3 rounded-lg p-3 flex justify-center items-center "
+				v-if="item.type == 3 && item.refund_type == 2">
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1 "   style="font-size: 30rpx;">
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 flex">
+							<div>商家收件信息</div>
+							<div style=" margin-left: 12rpx; color: #333; font-size: 26rpx; display: flex; "
+								@click="handleCopy2(item)">
+								<div class="copy_img">
+									<image src="../../static/icon/复制.png"></image>
+								</div>
+								<div>复制</div>
+							</div>
+						</div>
+						<div class="text_dis mt-3 ">
+							{{ item.mer_delivery_user }} {{ item.mer_delivery_phone }}
+						</div>
+						<div class="text_dis mt-3 ">
+							{{ item.mer_delivery_address }}
+						</div>
+
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- 用户申请退款退货 1-->
+		<div v-for="(item, index) in state" :key="index">
+			<div class="bg-white mb-3 rounded-lg p-3 flex justify-center items-center " v-if="item.type == 1" >
+				<div class="w-full">
+					<div class="items-center">
+						<div style="border-bottom: 1rpx solid #e6e6e6;"
+							class=" items-center font-bold gap-2 text-sm pb-3 w-full">
+							<div class="flex-1 flex items-center gap-2 ">
+								<div class="line-clamp-1 "   style="font-size: 30rpx;">
+									{{ item.title }}
+								</div>
+							</div>
+							<div>
+								<span class="text_lok">{{ item.time }}</span>
+							</div>
+
+						</div>
+						<div class="text_dis mt-3 ">
+							退款金额：￥{{ item.refund_price }}
+						</div>
+						<div class="text_dis mt-3 ">
+							退款原因：{{ item.refund_message }}
+						</div>
+						<div class="text_dis mt-3 ">
+							联系方式：{{ item.refund_phone }}
+						</div>
+						<div class="text_dis mt-3 ">
+							问题描述：{{ item.refund_mark }}
+						</div>
+						<div class="flex mt-3" v-if="item.refund_pics.length>0" >
+							<div class="text_image mr-2 "  v-for="(i,k) in item.refund_pics" :key="k"  >
+								<image lazy-load style="width: 100%; height: 100%; "  :src="i" ></image>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</template>
+
+<script lang="ts" setup >
+import { getRefundXSlist } from "~/apis/order.api";
+
+onLoad((options) => {
+	if (options && options.refund_order_id) {
+		getRefundXSlist(options.refund_order_id).then(res => {
+			console.log(res);
+			if (res.length > 0) {
+				state.value = res
+			} else {
+
+			}
+		})
+	}
+})
+
+//存储
+
+const state = ref([])
+
+//复制商家收件信息
+function handleCopy2(item:any) {
+	let copyData = item.mer_delivery_user + ' ' + item.mer_delivery_phone + ' ' + item.mer_delivery_address
+
+	console.log(copyData);
+
+	uni.setClipboardData({
+		data: copyData,
+		success(res) {
+			// wx.getClipboardData({
+			//   success (res) {
+			//     console.log(res.data) // data
+			//   }
+			// })
+		}
+	})
+}
+
+//复制快递单号00
+function handleCopy1(item:any) {
+	let copyData = item.delivery_id
+	console.log(copyData);
+
+	uni.setClipboardData({
+		data: copyData,
+		success(res) {
+			// wx.getClipboardData({
+			//   success (res) {
+			//     console.log(res.data) // data
+			//   }
+			// })
+		}
+	})
+}
+
+
+</script>
+
+<style>
+page {
+	background: #f8f8f8;
+}
+
+.text_font {
+	height: 42rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	line-height: 42rpx;
+}
+
+.text_lok {
+	height: 28rpx;
+	font-size: 24rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	line-height: 28rpx;
+}
+
+.text_dis {
+	font-size: 28rpx;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	line-height: 40rpx;
+	word-wrap: break-word;
+}
+
+
+.copy_img {
+	margin-top: 5rpx;
+	margin-right: 6rpx;
+	width: 24rpx;
+	height: 24rpx;
+}
+
+.copy_img image {
+	width: 100%;
+	height: 100%;
+}
+
+.text_image{
+	width:80rpx ;
+	height:80rpx ;
+}
+
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 协商记录
+</route>

src/pages/search/index.vue

@@ -383,7 +383,10 @@ function handleProductItemClick(
         & TaobaoProductThirdPartyWaresModel
         & VipProductModel
 ) {
+console.log(5);
+console.log("5");
 
+console.log(item.type);
 
   function navigateToDetail(params) {
     let otherDetailUrl = `/pages/store/product/other`
@@ -392,7 +395,7 @@ function handleProductItemClick(
     })
   }
   // 大仓
-  if (state.currentTab === PLATFORM_NAME.DC && item.type === '5') {
+  if (state.currentTab === PLATFORM_NAME.DC && item.type === 5) {
     uni.navigateTo({
       url: `/pages/store/product/detail?id=${item.product_id}`
     })
@@ -417,8 +420,8 @@ function handleProductItemClick(
     }
     return navigateToDetail(encodeBase64(productParams))
   }
-  // 淘宝
-  if (item.type === 5) {
+  // 淘宝PLATFORM_NAME.TB
+  if ( state.currentTab === PLATFORM_NAME.TB && item.type === 5) {
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
       id: item.id,
@@ -643,7 +646,7 @@ onReachBottom(() => {
         <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"
-               @tap="handleProductItemClick(item)"
+               @click="handleProductItemClick(item)"
           >
             <div class="bg-white rounded-lg text-dark">
               <image :src="item.image"

src/pages/search/search-dacang.vue

@@ -1,19 +1,20 @@
 <script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-import {getHotkeyWord} from "~/apis/common";
+import { CDN_URL } from "~/config/app";
+import { getHotkeyWord } from "~/apis/common";
 import ProductList from "~/components/ProductList/ProductList.vue";
-import {getDcProductList} from "~/apis/dacang";
-import {useDacangStore} from "~/stores/dacangStore";
+import { getDcProductList, getDcSearchList } from "~/apis/dacang";
+import { searchProductList } from "~/apis/product";
+import { useDacangStore } from "~/stores/dacangStore";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {StoreParams, StoreResult} from "~/apis/model/storeModel";
-import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
-import {getSelectMerchant} from "~/apis/merchant";
-import {remove, uniq} from "lodash-es";
+import { StoreParams, StoreResult } from "~/apis/model/storeModel";
+import { USER_LATITUDE, USER_LONGITUDE } from "~/constants";
+import { getSelectMerchant } from "~/apis/merchant";
+import { remove, uniq } from "lodash-es";
 
 const deleteIcon = CDN_URL + '/static/assets/search_del_220616.png'
 const upDefaultImg = CDN_URL + '/static/assets/tuijian_shangla.png'
 const downDefaultImg = CDN_URL + '/static/assets/tuijian_xiala.png'
-
+const undataImg = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
 const downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
 const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
 const searchValue = ref()
@@ -67,7 +68,7 @@ const state = reactive({
   currentKeyword: '',
   order: false,
   keyword: '',
-  currentSelected: 1,
+  currentSelected: 0,
   status: 'noMore',
   priceType: NaN,
   sales: NaN,
@@ -86,6 +87,7 @@ const classifyId = computed(() => {
 
 
 onLoad(async () => {
+  state.currentSelected = 1
   loadProductList('reload')
   const historyKeywords = await uni.getStorageSync('HISTORY_KEYWORDS')
   if (historyKeywords) {
@@ -104,34 +106,19 @@ watch(() => state.tabvalue, (val) => {
   }
 })
 
-function handleProductTypeChange(typeValue) {
-  state.currentSelected = typeValue
-  if (typeValue === 3) {
-    state.sales = NaN
-    state.is_new = 0
-  } else if (typeValue === 2) {
-    state.sales = 0
-  } else {
-    state.type = typeValue
-  }
-  loadProductList('reload')
-}
 
 
 function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
   const params = {
-    page: state.currentPage,
-    limit: state.pageSize,
-    // classify: state.currentClassify,
-    // classify: classifyId.value,
-    // keyword: state.keyword
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
   }
   if (action === 'reload') {
     state.currentPage = 1
-    params.page = 1
+    params.pageNum = 1
   }
   if (searchValue.value) {
-    params.keyword = searchValue.value
+    params.mer_keyword = searchValue.value
   }
   // if (state.currentSelected === 2) {
   //   params.sales = state.sales
@@ -139,32 +126,35 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
   // if (state.currentSelected === 3) {
   //   params.is_new = state.is_new
   // }
-  if (state.sales === 0) {
+  if (state.sales == 0) {
     params.sales = state.sales
   }
-  if (state.is_new === 0) {
+  if (state.is_new == 0) {
     params.is_new = state.is_new
   }
-  if (state.priceType) {
+  if (state.priceType==0||state.priceType==1) {
     params.priceType = state.priceType
   }
+  console.log('我是params', params);
 
-  getDcProductList({
+  searchProductList({
     ...params
-    // page: state.currentPage,
-    // limit: state.pageSize,
-    // classify,
-    // keyword: ''
+
   }).then(res => {
+    console.log('>>>>>>>>', res.pageInfo);
+    if (state.totalPage != res.pageInfo.total) {
+      state.totalPage = res.pageInfo.total
+    }
+
     if (action === 'page') {
-      state.productList = state.productList.concat(res)
+      state.productList = state.productList.concat(res.pageInfo.list)
     }
     if (action === 'reload') {
-      state.productList = res
+      state.productList = res.pageInfo.list
     }
 
     if (callback) {
-      callback(res)
+      callback(res.pageInfo.list)
     }
     // state.productList = res
   }).catch(error => {
@@ -250,9 +240,34 @@ onShow(() => {
     state.hotkeyWords = res
   })
 })
+function handleProductTypeChange(typeValue) {
+  console.log('单击传进来的', typeValue);
+  uni.pageScrollTo({
+    scrollTop: 0,
+    duration: 300
+  })
+  //综合上新 1 3   销量2
+  state.currentSelected = typeValue
+  state.order = false
+  state.sales = NaN
+  state.is_new = NaN
+  state.priceType =NaN
+  if (typeValue == 3 || typeValue == 1) {
+    state.is_new = 0
+  } else if (typeValue == 2) {
+    state.sales = 0
+  }
+  console.log(state);
+  loadProductList('reload')
+}
 
 function handleOrderPrice(val) {
   // state.order = !state.order
+  console.log('价格传进来的', val);
+  uni.pageScrollTo({
+    scrollTop: 0,
+    duration: 300
+  })
   state.currentSelected = NaN
   state.order = true
   if (val === 0) {
@@ -260,14 +275,17 @@ function handleOrderPrice(val) {
   } else {
     state.priceType = 0
   }
-  emit('order-change', state.priceType)
+  // console.log(state);
+
+  loadProductList('reload')
 }
 
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
-  // console.log(state.totalPage)
-  if (state.currentPage > state.totalPage) {
+  console.log(state.currentPage)
+  console.log(state.totalPage)
+  if ((state.currentPage-1)*10 > state.totalPage) {
     state.status = 'noMore';
   } else {
     setTimeout(() => {
@@ -321,12 +339,12 @@ async function handleRemoveAllKeyword() {
 async function handleHistoryKeywordSearch(keywordItem) {
   // keywordItem.keyword
   // if (keywordItem.keyword) {
-    searchValue.value = keywordItem
-    // state.historyKeyWords.push(searchValue.value)
-    // state.historyKeyWords = uniq(state.historyKeyWords)
-    // await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
-    loadProductList('reload')
-    isSearchMode.value = true
+  searchValue.value = keywordItem
+  // state.historyKeyWords.push(searchValue.value)
+  // state.historyKeyWords = uniq(state.historyKeyWords)
+  // await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
+  loadProductList('reload')
+  isSearchMode.value = true
   // }
 }
 async function handleKeywordSearch(keywordItem) {
@@ -351,8 +369,7 @@ function handleShowMerchant(merchant) {
 <template>
   <div>
     <div class="fixed  h-fit z-1 bg-white top-0 w-full">
-      <nut-searchbar
-          v-model="searchValue" @search="handleSearch" @clear="handleSearch">
+      <nut-searchbar v-model="searchValue" @search="handleSearch" @clear="handleSearch">
         <template v-slot:rightout>
           <div @tap="handleSearch">
             搜索
@@ -376,9 +393,7 @@ function handleShowMerchant(merchant) {
               <div class="text-gray-300">｜</div>
               <div @click="state.isDel = false" class="text-primary">完成</div>
             </div>
-            <image
-                v-else
-                :src="deleteIcon" @click="state.isDel = !state.isDel" mode="widthFix" class="w-3 h-3"></image>
+            <image v-else :src="deleteIcon" @click="state.isDel = !state.isDel" mode="widthFix" class="w-3 h-3"></image>
 
           </div>
 
@@ -386,12 +401,9 @@ function handleShowMerchant(merchant) {
         <!--tags -->
         <div class="flex gap-3  flex-wrap">
           <div v-for="(tagItem, index) in state.historyKeyWords" :key="index"
-               class="flex justify-center items-center border border-solid border-gray-200 text-[12px] rounded-full min-w-6 text-center  max-w-fit px-2 py-1 bg-white"
-               :class="state.isDel ? 'gap-2': ''"
-          >
-            <div class="flex-1"
-                 @click="handleHistoryKeywordSearch(tagItem)"
-            >
+            class="flex justify-center items-center border border-solid border-gray-200 text-[12px] rounded-full min-w-6 text-center  max-w-fit px-2 py-1 bg-white"
+            :class="state.isDel ? 'gap-2' : ''">
+            <div class="flex-1" @click="handleHistoryKeywordSearch(tagItem)">
               {{ tagItem }}
             </div>
             <div class="flex" v-if="state.isDel" @click="handleRemoveKeyword(tagItem)">
@@ -405,10 +417,8 @@ function handleShowMerchant(merchant) {
         <div class="font-bold">热门搜索</div>
         <!--tags -->
         <div class="flex gap-3">
-          <div v-for="(tagItem, index) in state.hotkeyWords" :key="index"
-               @click="handleKeywordSearch(tagItem)"
-               class="flex items-center border border-solid border-gray-200 text-[12px] rounded-full min-w-6 text-center  max-w-fit px-2 bg-white py-1"
-          >
+          <div v-for="(tagItem, index) in state.hotkeyWords" :key="index" @click="handleKeywordSearch(tagItem)"
+            class="flex items-center border border-solid border-gray-200 text-[12px] rounded-full min-w-6 text-center  max-w-fit px-2 bg-white py-1">
             <div>
               {{ tagItem.keyword }}
             </div>
@@ -418,52 +428,23 @@ function handleShowMerchant(merchant) {
     </div>
 
     <div v-if="isSearchMode">
-      <div class="fixed top-10 z-3 w-full">
+      <div class="fixed top-11 z-3 w-full">
         <nut-tabs v-model="state.tabvalue">
           <nut-tab-pane title="商品" class="bg-gray-50">
             <div class="text-[14px]">
               <div class="flex flex-row items-center">
-                <div class="basis-1/4 text-left ">
-                  <div
-                      @click="handleProductTypeChange(1)"
-
-                      class="flex flex-row justify-center items-center gap-1">
-                    <div
-
-                        :class="state.currentSelected === 1 ? 'text-primary font-bold' : ''"
-                    >
-                      综合
-                    </div>
-                    <div class="flex flex-col justify-center items-center">
-                      <div v-if="state.currentSelected !== 1 " class="h-fit flex flex-col items-center">
-                        <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
-                      </div>
-                      <div v-if="state.currentSelected === 1" class="h-fit flex flex-col items-center">
-                        <image :src="downRedImg" mode="widthFix" class="w-2 h-2"></image>
-                      </div>
-
-                    </div>
-                  </div>
-
+                <div @click="handleProductTypeChange(1)" class="basis-1/4 text-center"
+                  :class="state.currentSelected === 1 ? 'text-primary font-bold' : ''">综合
                 </div>
-                <div
-                    @click="handleProductTypeChange(2)"
-                    class="basis-1/4 text-center"
-                    :class="state.currentSelected === 2 ? 'text-primary font-bold' : ''"
-                >销量
+                <div @click="handleProductTypeChange(2)" class="basis-1/4 text-center"
+                  :class="state.currentSelected === 2 ? 'text-primary font-bold' : ''">销量
                 </div>
-                <div
-                    @click="handleProductTypeChange(3)"
-                    :class="state.currentSelected === 3 ? 'text-primary font-bold' : ''"
-                    class="basis-1/4 text-center">上新
+                <div @click="handleProductTypeChange(3)"
+                  :class="state.currentSelected === 3 ? 'text-primary font-bold' : ''" class="basis-1/4 text-center">上新
                 </div>
-                <div
-                    @click="handleOrderPrice(state.priceType)"
-                    class="basis-1/4 text-right">
+                <div @click="handleOrderPrice(state.priceType)" class="basis-1/4 text-right">
                   <div class="flex flex-row justify-center items-center gap-1">
-                    <div
-                        :class="state.order ? 'text-primary font-bold' : ''"
-                    >
+                    <div :class="state.order ? 'text-primary font-bold' : ''">
                       价格
                     </div>
                     <div class="flex flex-col justify-center items-center">
@@ -472,10 +453,10 @@ function handleShowMerchant(merchant) {
                         <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
                       </div>
                       <div v-if="state.order" class="h-fit flex flex-col items-center">
-                        <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 1"></image>
+                        <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 1"></image>
                         <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
 
-                        <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 0"></image>
+                        <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 0"></image>
                         <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
 
                       </div>
@@ -492,26 +473,20 @@ function handleShowMerchant(merchant) {
               <div class="flex flex-row items-center">
                 <div class="basis-1/3 text-left ">
                   <div class="flex flex-row justify-center items-center gap-1">
-                    <div
-                        :class="merchantState.currentSelected === 0 ? 'text-primary font-bold' : ''"
-                        @click="handleMerchantTabChange(0)"
-                    >
+                    <div :class="merchantState.currentSelected === 0 ? 'text-primary font-bold' : ''"
+                      @click="handleMerchantTabChange(0)">
                       距离
                     </div>
                   </div>
 
                 </div>
-                <div
-                    @click="handleMerchantTabChange(1)"
-                    class="basis-1/3 text-center"
-                    :class="merchantState.currentSelected === 1 ? 'text-primary font-bold' : ''"
-                >
+                <div @click="handleMerchantTabChange(1)" class="basis-1/3 text-center"
+                  :class="merchantState.currentSelected === 1 ? 'text-primary font-bold' : ''">
                   人气
                 </div>
-                <div
-                    @click="handleMerchantTabChange(2)"
-                    :class="merchantState.currentSelected === 2 ? 'text-primary font-bold' : ''"
-                    class="basis-1/3 text-center">最新
+                <div @click="handleMerchantTabChange(2)"
+                  :class="merchantState.currentSelected === 2 ? 'text-primary font-bold' : ''"
+                  class="basis-1/3 text-center">最新
                 </div>
               </div>
             </div>
@@ -524,9 +499,9 @@ function handleShowMerchant(merchant) {
       <!-- 商品列表 -->
       <div class="mt-40 pb-10" v-if="state.tabvalue == 0">
         <div v-if="state.productList.length > 0">
-          <ProductList :list="state.productList"/>
+          <ProductList :list="state.productList" />
           <div class=" flex justify-center items-center text-[12px] text-gray-500"
-               v-if="state.productList && state.productList.length > 0">
+            v-if="state.productList && state.productList.length > 0">
             <div v-if="state.status === 'loading'">
               加载中...
             </div>
@@ -535,22 +510,23 @@ function handleShowMerchant(merchant) {
             </div>
           </div>
         </div>
-        <CXBEmpty v-else/>
-
+        <!-- <CXBEmpty v-else/> -->
+        <div v-else class=" flex flex-1 justify-center items-center ">
+          <div>
+            <div style="width: 206rpx; height:206rpx; margin-top: 206rpx;  margin-bottom: 60rpx;">
+              <image :src="undataImg" style="width: 100%; height: 100%;"></image>
+            </div>
+            <div class="none_data">没有搜索到相关内容</div>
+          </div>
+        </div>
       </div>
       <!-- 店铺列表 -->
       <div class="mt-40 pb-10" v-if="state.tabvalue == 1">
         <div v-if="merchantState.list.length > 0" class="p-3 bg-white">
-          <div
-              v-for="(item, index) in merchantState.list" :key="index"
-              @click="handleShowMerchant(item)"
-              class="mb-3 ">
+          <div v-for="(item, index) in merchantState.list" :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">
@@ -577,8 +553,15 @@ function handleShowMerchant(merchant) {
             </div>
           </div>
         </div>
-        <CXBEmpty v-else/>
-
+        <!-- <CXBEmpty v-else/> -->
+        <div v-else class=" flex flex-1 justify-center items-center ">
+          <div>
+            <div style="width: 206rpx; height:206rpx; margin-top: 206rpx;  margin-bottom: 60rpx;">
+              <image :src="undataImg" style="width: 100%; height: 100%;"></image>
+            </div>
+            <div class="none_data">没有搜索到相关内容</div>
+          </div>
+        </div>
 
       </div>
 
@@ -603,6 +586,17 @@ page {
   --nut-menu-item-active-text-color: #FE0032;
   --nut-white: #fff;
 }
+
+
+.none_data {
+  height: 30rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+  line-height: 30rpx;
+  text-align: center;
+}
 </style>
 
 <route lang="yaml">

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

@@ -1,9 +1,9 @@
 <template>
-  <div class="bg-[#ededed] rounded-lg p-4 text-sm flex flex-col gap-4">
+  <div class="bg-[#f8f8f8] rounded-lg p-4 text-sm flex flex-col gap-4 mt-9">
     <div v-if="!isSearchHome" class="flex flex-row justify-between items-center">
       <div class="flex flex-row gap-3">
-        <div class="rounded bg-white w-8 h-8">
-          <image :src="model.mer_avatar" mode="widthFix" class="w-full"></image>
+        <div class="rounded bg-white " style="width: 80rpx;height:80rpx;">
+          <image :src="model.mer_avatar" style="width: 100%;height:100%;"></image>
         </div>
         <div class="flex flex-col justify-between">
           <div>
@@ -31,59 +31,7 @@
       <!--        关注-->
       <!--      </CXBButton>-->
     </div>
-    <div class="flex flex-row items-center"
-         v-if="isCategory"
-    >
-      <div class="basis-1/4 text-left cx-menu">
-        <nut-menu>
-          <template #icon>
-            <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
-          </template>
-          <nut-menu-item v-model="state.menuDefaultValue"
-                         :options="state.options"
-                         @change="handleProductTypeChange"
-          >
-
-          </nut-menu-item>
-        </nut-menu>
-      </div>
-        <div
-            @click="handleProductTypeChange(2)"
-            class="basis-1/4 text-center"
-            :class="state.currentSelected === 2 ? 'text-primary font-bold' : ''"
-        >销量</div>
-        <div
-            @click="handleProductTypeChange(3)"
-            :class="state.currentSelected === 3 ? 'text-primary font-bold' : ''"
-            class="basis-1/4 text-center">上新</div>
-        <div
-            @click="handleOrderPrice(state.priceType)"
-            class="basis-1/4 text-right">
-          <div class="flex flex-row justify-center items-center gap-1">
-            <div
-                :class="state.order ? 'text-primary font-bold' : ''"
-            >
-              价格
-            </div>
-            <div class="flex flex-col justify-center items-center">
-              <div v-if="!state.order"  class="h-fit flex flex-col items-center">
-                <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2"></image>
-                <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
-              </div>
-              <div v-if="state.order"  class="h-fit flex flex-col items-center">
-                <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 1"></image>
-                <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
-
-                <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType === 0"></image>
-                <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
-
-              </div>
-
-            </div>
-          </div>
-
-        </div>
-    </div>
+    
 
   </div>
 </template>
@@ -96,11 +44,7 @@ import {relation, removeMyRelation} from "~/apis/user";
 import amapWx from "~/libs/amap-wx";
 import {getMerchantDetail} from "~/apis/merchant";
 import {CDN_URL} from "~/config/app";
-const upDefaultImg = CDN_URL + '/static/assets/tuijian_shangla.png'
-const downDefaultImg = CDN_URL + '/static/assets/tuijian_xiala.png'
 
-const downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
-const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
 
 const emit = defineEmits<{
   (e: 'change', value: boolean): void,
@@ -126,39 +70,6 @@ if (props.model && props.model.care) {
   isCare.value = props.model.care
 }
 
-const state = reactive({
-  options: [{
-    text: '推荐',
-    value: 1
-  }, {
-    text: '大仓商品',
-    value: 7,
-  }, {
-    text: '平台商品',
-    value: 6,
-  }],
-  menuDefaultValue: 1,
-  currentSelected: 1,
-  order: false,
-  priceType: 0
-})
-function handleOrderPrice(val) {
-  // state.order = !state.order
-  state.currentSelected = NaN
-  state.order = true
-  if (val === 0) {
-    state.priceType = 1
-  } else {
-    state.priceType = 0
-  }
-  emit('order-change', state.priceType)
-}
-function handleProductTypeChange(value) {
-  state.order = false
-
-  state.currentSelected = value
-  emit('product-type-change', value)
-}
 watch(() => props.model, (val) => {
   // console.log(val)
   isCare.value = val.care
@@ -209,11 +120,7 @@ function handleRemoveRelation() {
 //  background-color: #008be8 !important;
 //}
 //
-:deep(.nut-menu__bar) {
-  --nut-white: none;
-  background: none;
-  background-color: transparent !important;
-}
+
 
 page {
 

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

@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import type {PropType} from "vue";
-import {useCustomClassProp, useCustomStyleProp} from "~/composables";
+import type { PropType } from "vue";
+import { useCustomClassProp, useCustomStyleProp } from "~/composables";
 import {
   DyProductModel, IProductDetail,
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
-import {encodeBase64} from "~/utils/http/helper";
+import { DcProductModel } from "~/apis/model/dacang.model";
+import { encodeBase64 } from "~/utils/http/helper";
 
 interface ProductDetail {
   mer_id: '',
@@ -46,32 +46,30 @@ const is148Merchant = computed(() => {
 </script>
 
 <template>
-  <div class="bg-white rounded-lg text-dark"
-       :class="[ props.exClass]"
-       :style="[ props.exStyle]"
-  >
+  <div class="bg-white rounded-lg text-dark" :class="[props.exClass]" :style="[props.exStyle]">
 
-    <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" ></image>
+    <image :src="item.image" class="rounded-t-lg" style="width: 342rpx;height: 342rpx;" :fade-in="true"></image>
 
     <div class="text-sm p-2 flex flex-col gap-1">
-      <div class="line-clamp-2">
-        {{item.store_name}}
+      <div class=" text_unshow">
+        {{ item.store_name }}
       </div>
-      <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>
-            养老金 ¥{{item.yanglao || item.yanglao_price}}
+      <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>
+              养老金 ¥{{ item.yanglao || item.yanglao_price }}
+            </div>
           </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>
+          <div class="!text-[24px]">{{  Math.round(item.price * 30) }} </div>
           <div class="text-sm">积分</div>
         </div>
         <div class="flex text-[#FE0032] font-bold text-lg" v-else>
@@ -85,10 +83,20 @@ const is148Merchant = computed(() => {
 
       </div>
       <div class="line-through text-xs font-bold flex " v-if="item.ot_price && !is148Merchant">
-        ¥ {{item.ot_price}}
+        ¥ {{ item.ot_price }}
       </div>
 
 
     </div>
   </div>
 </template>
+<style scoped>
+.text_unshow {
+  white-space: nowrap;
+  /* 禁止换行 */
+  overflow: hidden;
+  /* 隐藏溢出内容 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
+</style>

src/pages/store/home/index.vue

@@ -1,22 +1,27 @@
 <script lang="ts" setup>
-import {getMerchantCategory, getMerchantDetail} from "~/apis/merchant";
-import type {MerchantModel} from "~/apis/model/storeModel";
-import type {Ref} from "vue";
+import { getMerchantCategory, getMerchantDetail } from "~/apis/merchant";
+import type { MerchantModel } from "~/apis/model/storeModel";
+import type { Ref } from "vue";
 import MerchantHeader from "~/pages/store/home/components/MerchantHeader.vue";
 import MerchantProductList from "~/pages/store/home/components/MerchantProductList.vue";
-import type {MerchantCategoryModel} from "~/apis/model/storeModel";
+import type { MerchantCategoryModel } from "~/apis/model/storeModel";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {searchProductList} from "~/apis/product";
+import { searchProductList } from "~/apis/product";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import {usePageStoreWidthOut} from "~/stores/page";
-import {getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { usePageStoreWidthOut } from "~/stores/page";
+import { getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
+import { CDN_URL } from "~/config/app";
 const usePageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
 
+const upDefaultImg = CDN_URL + '/static/assets/tuijian_shangla.png'
+const downDefaultImg = CDN_URL + '/static/assets/tuijian_xiala.png'
 
+const downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
+const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
 let merchant: Ref<MerchantModel> = ref<MerchantModel>({
   mer_id: NaN,
   mer_name: '',
@@ -44,7 +49,23 @@ const state = reactive({
   type: NaN,
   currentPage: 1,
   pageSize: 10,
-  totalPage: 1
+  totalPage: 1,
+  options: [{
+    text: '全部',
+    value: 0,
+  }, {
+    text: '推荐',
+    value: 1,
+  }, {
+    text: '大仓',
+    value: 7,
+  }, {
+    text: '平台',
+    value: 6,
+  }],
+  menuDefaultValue: 0,
+  currentSelected: 1,
+  order: false,
 })
 const id = ref('')
 let productList = ref<any>([])
@@ -61,7 +82,7 @@ onLoad((options: any) => {
     // console.log(options.id)
     id.value = options.id
     getMerchantDetail(id.value).then((res: any) => {
-      merchant.value = {...res}
+      merchant.value = { ...res }
       // console.log(res)
     })
 
@@ -150,10 +171,16 @@ const is148Merchant = computed(() => {
 // }
 //
 
-function handleProductTypeChange(typeValue) {
+function handleProductTypeChange(typeValue: any) {
+  console.log('传入的值', typeValue);
+  state.order = false
+  state.currentSelected = typeValue
+  if (typeValue == 0) {
+    state.params = {}
+  }
   if (typeValue == 1) {
     state.params = {
-      is_best: 0
+      is_good: 1
     }
   }
   if (typeValue == 2) {
@@ -198,12 +225,17 @@ function handleProductTypeChange(typeValue) {
   // }
   loadList('reload')
 }
-function handleOrderChange(priceType) {
-  // console.log(priceType)
-  state.priceType = priceType
-
+function handleOrderChange(priceType: any) {
+  console.log(priceType)
+  state.currentSelected = NaN
+  state.order = true
+  if (priceType == 0) {
+    state.priceType = 1
+  } else {
+    state.priceType = 0
+  }
   state.params = {
-    priceType,
+    priceType: state.priceType,
   }
   // reset
   // state.sales = NaN
@@ -282,7 +314,7 @@ function handleNavItemClick(navItemId: any) {
 
 function handleFavoriteChange() {
   getMerchantDetail(id.value).then((res: any) => {
-    merchant.value = {...res}
+    merchant.value = { ...res }
   })
 }
 
@@ -324,101 +356,158 @@ onPullDownRefresh(() => {
     }, 300)
   })
 })
+
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
 </script>
 <template>
-    <div class="fixed top-0 w-full bg-white z-1">
-      <div class="p-3">
-        <div
-            @click="handleOpenSearchPage"
+  <div class="fixed top-0 w-full bg-white z-1">
+    <div class="flex flex-row items-center pt-2 pb-1">
+      <div class="basis-2/9 text-left cx-menu">
+        <nut-menu class="custom-menu">
+          <template #icon>
+            <image :src="downDefaultImg" mode="widthFix" class="w-1 h-1"></image>
+          </template>
+          <nut-menu-item v-model="state.menuDefaultValue" :options="state.options" @change="handleProductTypeChange">
+
+          </nut-menu-item>
+        </nut-menu>
+      </div>
+      <div @click="handleProductTypeChange(2)" class="basis-2/9 text-center"
+        :class="state.currentSelected == 2 ? 'text-primary font-bold' : ''" style="font-size: 28rpx;">销量</div>
+      <div @click="handleProductTypeChange(3)" style="font-size: 28rpx;"
+        :class="state.currentSelected == 3 ? 'text-primary font-bold' : ''" class="basis-2/9 text-center">上新</div>
+      <div @click="handleOrderChange(state.priceType)" style="font-size: 28rpx;" class="basis-2/9 text-right">
+        <div class="flex flex-row justify-center items-center gap-1">
+          <div :class="state.order ? 'text-primary font-bold' : ''">
+            价格
+          </div>
+          <div class="flex flex-col justify-center items-center">
+            <div v-if="!state.order" class="h-fit flex flex-col items-center">
+              <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+              <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+            </div>
+            <div v-if="state.order" class="h-fit flex flex-col items-center">
+              <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 1"></image>
+              <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
 
-            class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-gray-200 h-8"
+              <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 0"></image>
+              <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
 
-        >
+            </div>
 
-          <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
-                 mode="widthFix"
-                 class="w-4 h-4  pl-2 py-1"
-          ></image>
-          <div class="flex flex-1 w-100%">
-            <div class="flex-1"></div>
           </div>
+        </div>
 
-
+      </div>
+      <div class="basis-1/9 text-center">
+        <div @click="handleOpenSearchPage">
+          <image src="../../../static/icon/search_ck.png" mode="widthFix"
+            style="width: 36rpx;height: 36rpx; margin-top: 6rpx;"></image>
         </div>
 
       </div>
-<!--      <nut-searchbar-->
-<!--          v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">-->
-<!--        <template v-slot:rightout>-->
-<!--          <div @tap="loadSelectMerchant('reload')">-->
-<!--            搜索-->
-<!--          </div>-->
-<!--        </template>-->
-<!--      </nut-searchbar>-->
     </div>
-
-    <div class="px-3 pb-25 mt-15 flex flex-col gap-3">
-      <MerchantHeader
-          :model="merchant"
-          @change="handleFavoriteChange"
-          @product-type-change="handleProductTypeChange"
-          @order-change="handleOrderChange"
-          :is-category="  currentItemId === 1"
-      />
-      <div
-          v-if="currentItemId === 1"
-
-      >
-        <MerchantProductList
-            :list="productList"
-            v-if="productList.length > 0"
-        />
-        <CXBEmpty v-else/>
-
-        <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="productList && productList.length > 0">
-          <div v-if="state.status === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.status === 'noMore'">
-            没有更多了～
+  </div>
+  <MerchantHeader :model="merchant" @change="handleFavoriteChange" @product-type-change="handleProductTypeChange"
+    @order-change="handleOrderChange" :is-category="currentItemId === 1" />
+  <div class="px-5 pb-25 mt-3 flex flex-col gap-3">
+    <div v-if="currentItemId === 1">
+      <!-- <MerchantProductList :list="productList" v-if="productList.length > 0" /> -->
+      <div class="" v-if="productList && productList.length > 0">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in productList" :key="index" @tap="handleItemClick(item)">
+            <!-- <MerchantProductCard :item="item" /> -->
+            <!-- 11111 -->
+            <div class="bg-white rounded-lg text-dark">
+
+              <image :src="item.image" class="rounded-t-lg" style="width: 324rpx;height: 324rpx;" :fade-in="true"></image>
+
+              <div class="text-sm p-2 flex flex-col gap-1">
+                <div class=" text_unshow">
+                  {{ item.store_name }}
+                </div>
+                <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>
+                        养老金 ¥{{ 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]">{{ Math.round(item.price * 30) }} </div>
+                    <div class="text-sm">积分</div>
+                  </div>
+                  <div class="flex text-[#FE0032] font-bold text-lg" v-else>
+                    <div>
+                      ￥
+                    </div>
+                    <div>
+                      {{ item.price }}
+                    </div>
+                  </div>
+
+                </div>
+                <div class="line-through text-xs font-bold flex " v-if="item.ot_price && !is148Merchant">
+                  ¥ {{ item.ot_price }}
+                </div>
+
+
+              </div>
+            </div>
+            <!-- 2222 -->
           </div>
-        </div>
+        </grid-view>
+
       </div>
+      <CXBEmpty v-else />
 
-      <div v-if="currentItemId === 2"
-           class="w-full gap-3"
-      >
-        <div v-for="(categoryItem, index) in categoryList" :key="index"
-             @click="handleOpenSearchPage(categoryItem)"
-             class="flex items-center gap-1 text-sm font-bold bg-white p-3 mb-3 rounded"
-        >
-          <div class=" bg-gradient-to-b from-[#fe7577] to-[#fe0032] w-1 h-4 rounded"></div>
-          {{ categoryItem.cate_name }}
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+        v-if="productList && productList.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
         </div>
       </div>
-
     </div>
 
-
-    <div class="fixed bottom-0 bg-white w-full">
-      <div class="pb-safe pt-1 shadow flex justify-around text-gray">
-        <div
-            @tap="handleNavItemClick(item.id)"
-            v-for="(item, index) in navList"
-            :key="item.id"
-            class="flex flex-col justify-center items-center gap-1"
-            :class="item.id === currentItemId ? '!text-[#fe0032]' : ''"
-        >
-          <div :class="item.icon"></div>
-          <div class="text-xs">
-            {{ item.text }}
-          </div>
-        </div>
+    <div v-if="currentItemId === 2" class="w-full gap-3">
+      <div v-for="(categoryItem, index) in categoryList" :key="index" @click="handleOpenSearchPage(categoryItem)"
+        class="flex items-center gap-1 text-sm font-bold bg-white p-3 mb-3 rounded">
+        <div class=" bg-gradient-to-b from-[#fe7577] to-[#fe0032] w-1 h-4 rounded"></div>
+        {{ categoryItem.cate_name }}
       </div>
     </div>
 
+  </div>
 
 
+  <div class="fixed bottom-0 bg-white w-full">
+    <div class="pb-safe pt-1 shadow flex justify-around text-gray">
+      <div @tap="handleNavItemClick(item.id)" v-for="(item, index) in navList" :key="item.id"
+        class="flex flex-col justify-center items-center gap-1"
+        :class="item.id === currentItemId ? '!text-[#fe0032]' : ''">
+        <div :class="item.icon"></div>
+        <div class="text-xs">
+          {{ item.text }}
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <route lang="yaml">
 style:
@@ -434,4 +523,22 @@ page {
   --nut-searchbar-input-box-shadow: none;
 }
 
+:deep(.nut-menu__bar) {
+  --nut-white: none;
+  background: none;
+  background-color: transparent !important;
+}
+
+.custom-menu {
+  background-color: #ffffff;
+}
+
+.text_unshow {
+  white-space: nowrap;
+  /* 禁止换行 */
+  overflow: hidden;
+  /* 隐藏溢出内容 */
+  text-overflow: ellipsis;
+  /* 显示省略号 */
+}
 </style>

src/pages/store/home/search.vue

@@ -7,9 +7,14 @@
 import MerchantHeader from "~/pages/store/home/components/MerchantHeader.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import MerchantProductList from "~/pages/store/home/components/MerchantProductList.vue";
-import {getMerchantCategory, getMerchantDetail} from "~/apis/merchant";
-import {searchProductList} from "~/apis/product";
+import { getMerchantCategory, getMerchantDetail } from "~/apis/merchant";
+import { searchProductList } from "~/apis/product";
+import { CDN_URL } from "~/config/app";
+const upDefaultImg = CDN_URL + '/static/assets/tuijian_shangla.png'
+const downDefaultImg = CDN_URL + '/static/assets/tuijian_xiala.png'
 
+const downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
+const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
 const state = reactive({
   category_id: '',
   mer_keyword: '',
@@ -19,17 +24,31 @@ const state = reactive({
   priceType: NaN,
   sales: NaN,
   is_new: NaN,
-  type: 1,
+  type: NaN,
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
   params: {},
   // priceType: NaN,
   is_best: NaN,
-  // sales: NaN,
-  // is_new: NaN,
-  // type: NaN,
-  searchValue: ''
+
+  searchValue: '',
+  options: [{
+    text: '全部',
+    value: 0,
+  }, {
+    text: '推荐',
+    value: 1,
+  }, {
+    text: '大仓',
+    value: 7,
+  }, {
+    text: '平台',
+    value: 6,
+  }],
+  menuDefaultValue: 0,
+  currentSelected: 1,
+  order: false,
 })
 
 let productList = ref<any>([])
@@ -55,53 +74,10 @@ onLoad((options) => {
 
 })
 
-function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-  const params = {
-    mer_id: id.value,
-    // mer_keyword: '',
-    pageNum: state.currentPage,
-    pageSize: state.pageSize,
-    // mer_id?: string
-    // mer_keyword?: string
-    // pageNum: number
-    // pageSize: number
-    // order: ORDER
-    //请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
-    // is_best?: number
-    // sales?: number
-    // is_new?: number
-    // priceType?: number
-    // type?: number
-    // category_id?: string
-  }
-  if (state.searchValue) {
-    params.mer_keyword = state.searchValue
-  }
-  if (action === 'reload') {
-    params.pageNum = 1
-  }
 
-  searchProductList({
-    ...params,
-    ...state.params
-  }).then(res => {
-    state.triggered = false
-    if (action === 'page') {
-      productList.value = productList.value.concat(res.pageInfo.list)
-    }
-    if (action === 'reload') {
-      productList.value = res.pageInfo.list
-    }
-    console.log(res.pageInfo)
-    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
-    state.status = 'more'
 
 
-    if (callback) {
-      callback(res.pageInfo.list)
-    }
-  })
-}
+
 
 function handleScrollToLower() {
   state.status = 'loading';
@@ -129,10 +105,16 @@ onPullDownRefresh(() => {
   })
 })
 
-function handleProductTypeChange(typeValue) {
+function handleProductTypeChange(typeValue: any) {
+  console.log('传入的值', typeValue);
+  state.order = false
+  state.currentSelected = typeValue
+  if (typeValue == 0) {
+    state.params = {}
+  }
   if (typeValue == 1) {
     state.params = {
-      is_best: 0
+      is_good: 1
     }
   }
   if (typeValue == 2) {
@@ -161,21 +143,33 @@ function handleProductTypeChange(typeValue) {
     }
   }
   // if (typeValue === 3) {
+  //   state.priceType = NaN
   //   state.sales = NaN
   //   state.is_new = 0
   // }
   // else if (typeValue === 2) {
+  //   state.priceType = NaN
+  //   state.is_new = NaN
   //   state.sales = 0
   // } else {
   //   state.type = typeValue
+  //   state.priceType = NaN
+  //   state.is_new = NaN
+  //   state.sales = NaN
   // }
   loadList('reload')
 }
-function handleOrderChange(priceType) {
-  state.priceType = priceType
-
+function handleOrderChange(priceType: any) {
+  console.log(priceType)
+  state.currentSelected = NaN
+  state.order = true
+  if (priceType == 0) {
+    state.priceType = 1
+  } else {
+    state.priceType = 0
+  }
   state.params = {
-    priceType,
+    priceType: state.priceType,
   }
   // reset
   // state.sales = NaN
@@ -183,31 +177,116 @@ function handleOrderChange(priceType) {
 
   loadList('reload')
 }
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    mer_id: id.value,
+    // mer_keyword: '',
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+  }
+  if (state.searchValue) {
+    params.mer_keyword = state.searchValue
+  }
+  // if (state.type) {
+  //   params.type = state.type
+  // }
+  // if (state.sales === 0) {
+  //   params.sales = state.sales
+  // }
+  // // console.log(state.is_new)
+  // if (state.is_new === 0) {
+  //   params.is_new = state.is_new
+  // }
+  // if (state.priceType === 1 || state.priceType === 0) {
+  //   params.priceType = state.priceType
+  // }
+  if (action === 'reload') {
+    params.pageNum = 1
+  }
+  searchProductList({
+    ...params,
+    ...state.params
+  }).then(res => {
+    // console.log(res)
+    if (res && res.pageInfo) {
+      state.triggered = false
+      if (action === 'page') {
+        productList.value = productList.value.concat(res.pageInfo.list)
+      }
+      if (action === 'reload') {
+        productList.value = res.pageInfo.list
+      }
+      // console.log(res.pageInfo)
+      state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
+      state.status = 'more'
+
+
+      if (callback) {
+        callback(res.pageInfo.list)
+      }
+    }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: "none"
+    })
+  })
+}
 </script>
 <template>
   <div class="fixed top-0 w-full bg-white z-1">
-    <nut-searchbar
-        v-model="state.searchValue" @search="loadList('reload')" @clear="loadList( 'reload')">
+    <nut-searchbar v-model="state.searchValue" @search="loadList('reload')" @clear="loadList('reload')">
       <template v-slot:rightout>
         <div @tap="loadList('reload')">
           搜索
         </div>
       </template>
     </nut-searchbar>
-  </div>
+    <div class="flex flex-row items-center" >
+      <div class="basis-1/4 text-center cx-menu">
+        <nut-menu class="custom-menu">
+          <template #icon>
+            <image :src="downDefaultImg" mode="widthFix" class="w-1 h-1"></image>
+          </template>
+          <nut-menu-item v-model="state.menuDefaultValue" :options="state.options" @change="handleProductTypeChange">
+
+          </nut-menu-item>
+        </nut-menu>
+      </div>
+      <div @click="handleProductTypeChange(2)" class="basis-1/4 text-center"
+        :class="state.currentSelected == 2 ? 'text-primary font-bold' : ''" style="font-size: 28rpx;">销量</div>
+      <div @click="handleProductTypeChange(3)" style="font-size: 28rpx;"
+        :class="state.currentSelected == 3 ? 'text-primary font-bold' : ''" class="basis-1/4 text-center">上新</div>
+      <div @click="handleOrderChange(state.priceType)" style="font-size: 28rpx;" class="basis-1/4 text-right">
+        <div class="flex flex-row justify-center items-center gap-1">
+          <div :class="state.order ? 'text-primary font-bold' : ''">
+            价格
+          </div>
+          <div class="flex flex-col justify-center items-center">
+            <div v-if="!state.order" class="h-fit flex flex-col items-center">
+              <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+              <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2"></image>
+            </div>
+            <div v-if="state.order" class="h-fit flex flex-col items-center">
+              <image :src="upRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 1"></image>
+              <image :src="upDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
 
-  <div class="p-3 pb-25 mt-15 flex flex-col gap-3">
-<!--    <MerchantHeader -->
-    <MerchantHeader :is-search-home="true"
+              <image :src="downRedImg" mode="widthFix" class="w-2 h-2" v-if="state.priceType == 0"></image>
+              <image :src="downDefaultImg" mode="widthFix" class="w-2 h-2" v-else></image>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="p-3 pb-25 mt-21 flex flex-col gap-3">
+    <!--    <MerchantHeader -->
+    <!-- <MerchantHeader :is-search-home="true"
                     @product-type-change="handleProductTypeChange"
                     @order-change="handleOrderChange"
-    />
-    <MerchantProductList
-        :list="productList"
-        v-if="productList.length > 0"
-
-    />
-    <CXBEmpty v-else/>
+    /> -->
+    <MerchantProductList :list="productList" v-if="productList.length > 0" />
+    <CXBEmpty v-else />
   </div>
 </template>
 
@@ -225,4 +304,12 @@ page {
   --nut-searchbar-input-box-shadow: none;
 }
 
+:deep(.nut-menu__bar) {
+  --nut-white: none;
+  background: none;
+  background-color: transparent !important;
+}
+.custom-menu {
+  background: white;
+}
 </style>

src/pages/store/product/detail.vue

@@ -70,6 +70,15 @@ const state = reactive({
 const detail: any = ref(null)
 const isTo = ref(3)
 let isShow = ref(false)
+
+//展开收起
+const isExpanded = ref(false)
+
+const remainingTime: any = ref({
+  hours: "00",
+  minutes: "00",
+  seconds: "00"
+})
 onShow(() => {
   uni.showLoading({
     title: '数据加载中',
@@ -137,15 +146,16 @@ onLoad((option: any) => {
     userStore.setShareId(fromShareId)
 
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${fromShareId}`, 'page')
+    getShareId({ pid: state.id, type: 1 }).then(res => {
+      state.shareId = res.share_id
+      userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
+
+    })
 
   }
 
 
-  getShareId({ pid: state.id, type: 1 }).then(res => {
-    state.shareId = res.share_id
-    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
 
-  })
 
 
 
@@ -166,7 +176,7 @@ function loadProductDetail() {
           detail.value.price = detail.value.price * 30
         }
       }
-      state.isRelation = res.isRelation
+      state.isRelation = detail.value.isRelation
       if (res.merchant_type == 2) {
         xcxBanding({
           mer_id: res.mer_id,
@@ -205,11 +215,15 @@ onShareAppMessage(async () => {
     icon: 'none'
   })
   return await getShareId({ pid: state.id, type: 1 }).then(res => {
+    console.log(99999999, res);
     if (res) {
+
+
       state.shareId = res.share_id
       uni.hideLoading()
       return {
         title: `${detail.value.store_name}`,
+        imageUrl: res.url,
         path: `pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`
       }
     }
@@ -347,7 +361,7 @@ function previewImage(index: number) {
   //uniapp预览轮播图
   uni.previewImage({
     current: index, // 预览图片的下标
-    urls: state.detail.imgUrls // 预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+    urls: detail.value.slider_image // 预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
   })
 }
 
@@ -360,7 +374,7 @@ function handleShowMerchant(merId: string) {
 }
 
 function handleShowShopCart() {
-  uni.switchTab({
+  uni.reLaunch({
     url: `/pages/order_addcart/index`
   })
 }
@@ -391,7 +405,7 @@ function handleCreateShopping() {
     // product_attr_unique: JSON.stringify(state.currentSku),
     product_attr_unique: state.currentSku.unique,
     cart_num: state.cartNum,
-    is_new: (state.flag === '1' || state.flag === '3'|| state.flag == '5') ? '1' : '0'
+    is_new: (state.flag === '1' || state.flag === '3' || state.flag == '5') ? '1' : '0'
   }).then(res => {
     console.log('resres', res)
 
@@ -416,30 +430,7 @@ function handleCreateShopping() {
       }
     }
   }).catch(error => {
-    // if (error === '会员礼包不能加入购物车') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // } else if (error === '库存不足') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // }
-    // else if(error==='您已是高级会员，分红满额后可再次购买~') {
-    //   uni.showToast({
-    //         title: error,
-    //         icon: 'none'
-    //       })
-
-    // }else{
-    //   console.log('我是error>>>',error);
-    //   uni.showToast({
-    //         title: error,
-    //         icon: 'none'
-    //       })
-    // }
+
     console.log('我是error>>>', error);
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
@@ -448,7 +439,7 @@ function handleCreateShopping() {
         icon: 'none'
       })
       setTimeout(() => {
-        uni.redirectTo({
+        uni.navigateTo({
           url: '/pages/user/login/index?key=4'
         })
       }, 500)
@@ -478,22 +469,7 @@ function handleBuyshow() {
       })
     }
   }).catch(error => {
-    // if (error === '会员礼包不能加入购物车') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // } else if (error === '库存不足') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // }
-    // else {
-    //   return uni.navigateTo({
-    //     url: '/pages/user/login/index'
-    //   })
-    // }
+
     console.log('我是error>>>', error);
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
@@ -502,7 +478,7 @@ function handleBuyshow() {
         icon: 'none'
       })
       setTimeout(() => {
-        uni.redirectTo({
+        uni.navigateTo({
           url: '/pages/user/login/index?key=4'
         })
       }, 500)
@@ -539,22 +515,7 @@ function handleAddshow() {
       state.isShowSku = false
     }
   }).catch(error => {
-    // if (error === '会员礼包不能加入购物车') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // } else if (error === '库存不足') {
-    //   return uni.showToast({
-    //     title: error,
-    //     icon: 'none'
-    //   })
-    // }
-    // else {
-    //   return uni.navigateTo({
-    //     url: '/pages/user/login/index'
-    //   })
-    // }
+
     console.log('我是error>>>', error);
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
@@ -564,7 +525,7 @@ function handleAddshow() {
         icon: 'none'
       })
       setTimeout(() => {
-        uni.redirectTo({
+        uni.navigateTo({
           url: '/pages/user/login/index?key=4'
         })
       }, 500)
@@ -590,10 +551,13 @@ function notStarted() {
 
 // 规格显示双按钮
 function handleTwobtn() {
+  console.log(state.currentSku);
   isTo.value = 2
   state.isShowSku = !state.isShowSku
 }
 function handleQgbtn() {
+  console.log(state.currentSku);
+
   isTo.value = 4
   state.isShowSku = !state.isShowSku
 }
@@ -613,9 +577,9 @@ function handleOrderConfirm(flag: '1' | '2' | '3' | '5') {
         icon: 'none'
       }).then(() => {
         setTimeout(() => {
-          uni.redirectTo({
-          url: '/pages/user/login/index?key=4'
-        })
+          uni.navigateTo({
+            url: '/pages/user/login/index?key=4'
+          })
         }, 500)
 
       })
@@ -729,6 +693,15 @@ function handleShowCustomer() {
   })
 }
 
+//查看更多》
+function handleTomoreProduct(merId: string) {
+  console.log(merId)
+  uni.navigateTo({
+    url: `/pages/store/home/index?id=${merId}`
+  })
+}
+
+
 // 距离顶部距离
 let Scroll_X = ref(0)
 
@@ -744,6 +717,57 @@ onPageScroll((page) => {
     headerClass.value = ''
   }
 })
+
+function handleisExpanded() {
+  isExpanded.value = !isExpanded.value
+}
+
+//计算秒杀
+function getCountdown() {
+  if (detail.value.seckill_date_end) {
+    const now = new Date();
+    const endDate = new Date(detail.value.seckill_date_end).getTime();
+    console.log(endDate);
+
+    if (now < endDate) {
+      let milliseconds = endDate - now;
+
+      const hours = Math.floor(milliseconds / (1000 * 60 * 60));
+      const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60));
+      const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000);
+
+      // 更新数据
+      remainingTime.value = {
+        hours: hours < 10 ? '0' + hours : hours,
+        minutes: minutes < 10 ? '0' + minutes : minutes,
+        seconds: seconds < 10 ? '0' + seconds : seconds
+      }
+    } else {
+      clearInterval(timer);
+      //加载秒杀数据
+      console.log('自动关闭');
+      loadProductDetail()
+      console.log(111);
+
+    }
+  }
+
+}
+
+
+// 每秒更新剩余时间
+const timer = setInterval(() => {
+  getCountdown()
+}, 1000);
+
+onUnload(() => {
+  clearInterval(timer);
+  console.log('卸载关闭');
+})
+
+
+
+
 </script>
 
 <template>
@@ -755,29 +779,30 @@ onPageScroll((page) => {
           indicator-active-color="#e93323" :autoplay="state.autoplay" :circular="state.circular"
           :interval="state.interval" :duration="state.duration" class="w-full h-94">
           <swiper-item v-for="(item, index) in detail.slider_image" :key="index">
-            <image :src="item" @tap="previewImage(index)" class="!w-full !h-full" mode="aspectFill" />
+            <image :src="item" @tap="previewImage(index)" style="width: 750rpx; height:750rpx;"  />
           </swiper-item>
         </swiper>
       </div>
-      <div class="bg-gradient-to-r from-[#fe7577] to-[#fe0032] h-20 mt-3 flex items-center p-3 justify-between"
+      <div class="bg-gradient-to-r from-[#fe7577] to-[#fe0032] h-20  flex items-center p-3 justify-between"
         v-if="detail.seckill == 1">
-        <div class="flex flex-col">
+        <div class="flex justify-center items-center">
           <div class="flex gap-2 items-center text-white">
             <div class="text-[30px] font-bold">
               <text class="text-[20px]">￥</text>{{ detail.seckill_s == 0 ? detail.price : detail.dc_price }}
             </div>
-            <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
           </div>
-          <div class="text-white text-xs">
-            即将恢复原价 ￥{{ detail.ot_price }}
+          <div style="font-size: 24rpx;" class="ml-3 text-white text-xs line-through  font-bold flex text-gray-600">
+            ￥{{ detail.ot_price }}
           </div>
         </div>
         <div class="flex flex-col items-center gap-2 justify-center">
           <image :src="xiaoshimiaoshaIcon" class="w-17 h-4" model="widthFix"></image>
           <div class="text-white " v-if="detail.seckill_s == 1">
-            <div class="text-xs">
-              距秒杀结束</div>
-            <nut-countdown :end-time="new Date(detail.seckill_date_end).getTime() + 60 * 1000"></nut-countdown>
+            <!-- <div class="text-xs"></div> -->
+            <!-- <nut-countdown :end-time="new Date(detail.seckill_date_end).getTime() + 60 * 1000"></nut-countdown> -->
+            <span class="ms_span">{{ remainingTime.hours }}</span> :
+            <span class="ms_span">{{ remainingTime.minutes }}</span> :
+            <span class="ms_span">{{ remainingTime.seconds }}</span>
           </div>
           <div class="text-white" v-if="detail.seckill_s == 2">
             <div class="">
@@ -798,9 +823,9 @@ onPageScroll((page) => {
       </div>
 
       <div class="flex flex-col p-3 gap-3">
-        <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
+        <div v-if="detail.seckill_s == 0" class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
-            <div class="!text-[24px]">{{ Number.parseFloat(detail.price).toFixed(2) }} </div>
+            <div class="!text-[24px]">{{  Math.round(detail.price * 30) }} </div>
             <div class="text-sm">积分</div>
           </div>
           <div v-else>
@@ -832,13 +857,26 @@ onPageScroll((page) => {
             <div class="flex bg-primary text-white rounded text-[10px] text-center" v-if="detail.type == 5">
               <div class=" h-4 w-4 ">仓</div>
             </div>
-            <div class=" justify-center items-center" v-html="detail.store_name">
+            <div class="text-ellipsis justify-center items-center" v-html="detail.store_name">
             </div>
           </div>
           <div v-if="detail.store_info" class="text-gray-600 text-sm w-fit px-1"
             :class="is148Merchant ? 'border border-solid border-gray' : ''">
-            {{ detail.store_info }}
+            <div v-if="isExpanded == false">
+              {{ detail.store_info.length <= 50 ? detail.store_info : detail.store_info.slice(0, 50) + '...' }} <span
+                @click="handleisExpanded" v-if="detail.store_info.length > 50" style="color:red">
+                展开
+                </span>
+            </div>
+            <div v-else-if="isExpanded == true">
+              {{ detail.store_info }}
+              <span @click="handleisExpanded" style="color:red">
+                收起
+              </span>
+            </div>
+
           </div>
+
         </div>
 
         <div class="flex gap-3 text-[12px]">
@@ -902,12 +940,16 @@ onPageScroll((page) => {
       </div>
 
     </div>
-    <div class="flex flex-col bg-white" v-if="detail.merchant.recommend.length>=3" >
+    <!-- v-if="detail.merchant.recommend.length>=3" -->
+    <div class="flex flex-col bg-white" v-if="detail.merchant.recommend.length >= 3">
       <div class="p-3">
-        <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 class="flex flex-1 justify-between items-center ">
+          <div class="" style="vertical-align:bottom">
+            <image style="width:7rpx ;height: 28rpx; margin-right: 8rpx;" src="../../../static/icon/title_1.png"></image>
+            <span class="text_dptj">店铺推荐</span>
+          </div>
+          <div class="text_ckgd" @click="handleTomoreProduct(detail.mer_id)">
+            查看更多 ＞
           </div>
         </div>
       </div>
@@ -915,9 +957,54 @@ onPageScroll((page) => {
         <scroll-view class=" whitespace-nowrap  w-screen  text-white text-sm" :scroll-with-animation="true"
           :scroll-x="true" :show-scrollbar="false">
           <div class="pl-3" v-if="detail && detail.merchant">
-            <div v-for="(item, index) in detail.merchant.recommend" :key="index" @click="handleProductItemClick(item)"
+            <div v-for="(item, index) in detail.merchant.recommend" :key="index"
               class="flex inline-flex items-center justify-center relative ">
-              <MerchantProductCard :item="item" exClass="w-40 border border-solid border-gray-200 mr-3" />
+              <!-- <MerchantProductCard :item="item" exClass="w-30 border border-solid border-gray-200 mr-3" /> -->
+              <div @click="handleProductItemClick(item)" style="width: 233rpx;" class="bg-white rounded-lg text-dark">
+
+                <image :src="item.image" style="width: 202rpx;height: 202rpx;border-radius: 16rpx; " :fade-in="true">
+                </image>
+
+                <div class="text-sm p-2 flex flex-col gap-1">
+                  <div class="text-hidden">
+                    {{ item.store_name }}
+                  </div>
+                  <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"
+                        style="width: 46rpx; height: 28rpx;">
+                      </image>
+                      <div class="ylj_d flex items-center jusitify-center ">
+                        <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]">{{  Math.round(item.price * 30) }} </div>
+                      <div class="text-sm">积分</div>
+                    </div>
+                    <div class="flex text-[#FE0032] font-bold text-lg" v-else>
+                      <div>
+                        ￥
+                      </div>
+                      <div>
+                        {{ item.price }}
+                      </div>
+                    </div>
+
+                  </div>
+                  <div class="line-through text-xs font-bold flex " v-if="item.ot_price && !is148Merchant">
+                    ¥ {{ item.ot_price }}
+                  </div>
+
+
+                </div>
+              </div>
             </div>
 
           </div>
@@ -928,10 +1015,10 @@ onPageScroll((page) => {
 
     <div class="flex flex-col justify-center bg-white">
       <div class="p-3">
-        <div
-          class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-800 before:rounded relative inline-block">
-          <div class="pl-2">
-            图文详情
+        <div class="flex flex-1 justify-start items-center ">
+          <div class="" style="vertical-align:bottom">
+            <image style="width:7rpx ;height: 28rpx; margin-right: 8rpx;" src="../../../static/icon/title_1.png"></image>
+            <span class="text_dptj">图片详情</span>
           </div>
         </div>
       </div>
@@ -946,10 +1033,10 @@ onPageScroll((page) => {
 
     <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 class="flex flex-1 justify-start items-center ">
+          <div class="" style="vertical-align:bottom">
+            <image style="width:7rpx ;height: 28rpx; margin-right: 8rpx;" src="../../../static/icon/title_1.png"></image>
+            <span class="text_dptj">精品推荐</span>
           </div>
         </div>
       </div>
@@ -1165,6 +1252,68 @@ button::after {
 .out-conter {
   text-align: center;
 }
+
+.text_dptj {
+  height: 28rpx;
+  font-size: 28rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 600;
+  color: #333333;
+  line-height: 28rpx;
+}
+
+.text_ckgd {
+  height: 22rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+  line-height: 22rpx;
+}
+
+
+.text-hidden {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.ylj_d {
+  height: 25rpx;
+  font-size: 18rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #FE0032;
+  line-height: 25rpx;
+  padding-left: 6rpx;
+  padding-right: 6rpx;
+}
+
+.text-container {
+  overflow: hidden;
+}
+
+.clamp-expanded {
+  overflow: visible;
+}
+
+
+.text-ellipsis {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  /* 控制显示行数 */
+}
+
+.ms_span {
+  width: 40rpx;
+  height: 36rpx;
+  background: #FFFFFF;
+  border-radius: 6rpx;
+  color: #FE0032;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/store/product/other.vue

@@ -28,7 +28,7 @@ import { debounce, merge } from "lodash-es";
 
 import { useDebounceFn } from '@vueuse/core';
 import dayjs from "dayjs";
-import { decodeBase64 } from "~/utils/http/helper";
+import { decodeBase64, encodeBase64 } 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";
@@ -74,8 +74,8 @@ const detailclone = ref<IProductDetail>()
 onLoad((options: any) => {
 
   const data: Partial<IProductDetail> = JSON.parse(decodeBase64(options.params))
-  // console.log('我是options数据', data)
-
+  // console.log('我是options数据', data)  url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
+  userStore.setRedirectPage(`/pages/store/product/other?params=${encodeBase64(data)}`, 'page')
   // if (options.platform && options.id) {
   uni.showLoading({
     title: '数据加载中',
@@ -104,12 +104,25 @@ function YouLike() {
 
 //商品不存在详情
 function soldOut() {
-  isShow.value = true
-  uni.setNavigationBarTitle({
-    title: '商品下架不存在'
-  })
-  loadList('reload')
-  uni.hideLoading()
+  if (userStore.uid) {
+    isShow.value = true
+    uni.setNavigationBarTitle({
+      title: '商品下架不存在'
+    })
+    loadList('reload')
+    uni.hideLoading()
+  } else {
+    uni.showToast({
+      title: '请登录',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.redirectTo({
+        url: '/pages/user/login/index?key=4'
+      })
+    }, 500)
+  }
+
 }
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {

src/pages/user/index.vue

@@ -2,7 +2,7 @@
 import { useUserStore } from "~/stores/userStore";
 import CXBAuthorize from "~/components/CXBAuthorize/CXBAuthorize.vue";
 import { getAgentInfo, getUserInfo } from "~/apis/user";
-import { CDN_URL,CDM_URL } from "~/config/app";
+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";
@@ -10,6 +10,7 @@ import FPopup from "~/components/FPopup/FPopup.vue";
 import { CANCEL_EVENT, OPEN_EVENT } from "~/constants/event";
 import type { Ref } from "vue";
 const pageStore = usePageStoreWidthOut()
+const userStore = useUserStore();
 const currentType = ref('')
 const myOrderList = [{
   id: 'noPay',
@@ -90,9 +91,9 @@ const myServiceList = [{
   url: '/pages/invite-friends/index'
 }, {
   icon: CDN_URL + '/static/assets/dianpuruzhu_220620.png',
-  text: '商铺入驻',
+  text: userStore.userInfo?.is_merchant=="-1"?'商铺入驻':'我的商铺',
   url: ''
-},  {
+}, {
   icon: CDN_URL + '/static/assets/mine_setting_220620.png',
   text: '设置',
   url: '/pages/setting/index'
@@ -100,7 +101,7 @@ const myServiceList = [{
 const state = reactive({
   isLogin: false
 })
-const userStore = useUserStore();
+
 const orderQuantity: Ref<OrderQuantityModel> = ref()
 // const orderQuantity =reactive({
 //   noComment: '',
@@ -180,7 +181,7 @@ function handleService(item: {
   text: string
   url: string
 }) {
-  if (item.text === '商铺入驻') {
+  if (item.text === '商铺入驻'||item.text === '我的店铺') {
     return uni.navigateToMiniProgram({
       appId: 'wx9a3e4ab07f8a9ba2',
       path: 'pages/index/index',
@@ -239,7 +240,7 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
- 
+
   // console.log(userStore.userInfo)
   // 普通用户
   if (userRichType == 0) {
@@ -325,11 +326,11 @@ const backImg = computed(() => {
     const areamanage = userStore.userInfo?.area_manage_type
     // 县/区代理
     if (areamanage == 'district') {
-      return CDM_URL+'/image/2023-11-24/20231124154421388.png'
+      return CDM_URL + '/image/2023-11-24/20231124154421388.png'
     }
     // 市代理
     if (areamanage == 'city') {
-      return CDM_URL+'/image/2023-11-24/20231124154612477.png'
+      return CDM_URL + '/image/2023-11-24/20231124154612477.png'
     }
   }
 
@@ -391,9 +392,9 @@ function handleShowMyRulePage() {
       <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" />
+            @click="handleShowMyProfile" style="width:74rpx; height:74rpx;" class="rounded-full"></image>
+          <image v-else @click="checkAuth" src="https://app.bjtdba.com/uploads/logo.jpg" 
+            class="rounded-full" style="width:74rpx; height:74rpx;" />
           <div class="flex flex-col">
             <div class="flex">
               <div class="text-sm">
@@ -412,21 +413,19 @@ function handleShowMyRulePage() {
                 <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 ">
+              <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">
+              <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 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 ">
@@ -458,29 +457,31 @@ function handleShowMyRulePage() {
           </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>{{ userStore.yanglao.all_yanglao }}</div>
+        <div style="border-radius: 16rpx;" class="bg-white flex flex-col gap-6 py-4 text-xl">
+          <div v-if="userStore.userInfo" class="flex ">
+            <div @tap="handleShowAnnuityDetail" class="w-1/2 flex flex-col justify-center" style="padding-left: 48rpx;">
               <div class="text-xs">养老金</div>
+              <div>{{ userStore.yanglao.all_yanglao }}</div>
             </div>
-            <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price}}</div>
+            <div @tap="handleShowMyInvitation" class="w-1/2  flex flex-col justify-center " style="padding-left: 48rpx;">
               <div class="text-xs">我的佣金</div>
-            </div>
-            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ userStore.userInfo.score }}</div>
-              <div class="text-xs">我的积分</div>
+              <div>{{ agentInfo.brokerage_price }}</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.member_brokerage_price}}</div>
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center " style="padding-left: 48rpx;">
+              <div class="text-xs">我的积分</div>
+              <div>{{ userStore.userInfo.score }}</div>
+            </div>
+            <div class="icon_d"></div>
+            <div @click="handleToRedIntegral" class="w-1/3 flex flex-col justify-center " style="padding-left: 48rpx;">
               <div class="text-xs">红积分提现</div>
+              <div>{{ userStore.userInfo.member_brokerage_price }}</div>
             </div>
-            <div class="w-1/2 flex flex-col  justify-center items-center">
-              <div>{{ userStore.userInfo.team_number }}</div>
+            <div class="icon_d"></div>
+            <div class="w-1/3 flex flex-col  justify-center" style="padding-left: 48rpx;">
               <div class="text-xs">团队人数</div>
+              <div>{{ userStore.userInfo.team_number }}</div>
             </div>
           </div>
 
@@ -680,6 +681,13 @@ page {
   position: absolute;
   top: 447rpx
 }
+
+
+.icon_d {
+  width: 1rpx;
+  height: 40rpx;
+  background: #D8D8D8;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/user/login/index.vue

@@ -84,7 +84,7 @@ async function handleWexinLogin() {
                 if (redirectPageObj) {
                   console.log('我存在吗333',redirectPageObj);
                   if (redirectPageObj.type === 'page') {
-                    return uni.redirectTo({
+                    return uni.reLaunch({
                       url: redirectPageObj.page
                     })
                   }

src/pages/user/login/invite-login.vue

@@ -0,0 +1,237 @@
+<template>
+	<div v-if="showPage == true">
+		<div class="page_title">手机号登录</div>
+		<div class="flex flex-col justify-center items-center py-25">
+			<image src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png" mode="widthFix"
+				class="w-35 h-35"></image>
+		</div>
+
+		<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>
+			</template>
+		</nut-input>
+		<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>
+
+		</div>
+
+	</div>
+</template>
+<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 Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
+const userStore = useUserStore()
+const pageStore = usePageStoreWidthOut()
+const state = reactive({
+	phone: '',
+	code: '',
+	spread: '',
+	isAuthVerify: false,
+	buttonText: '获取验证码',
+})
+const showPage = ref(false)
+onLoad((options: any) => {
+	uni.showLoading({
+		title: '加载中',
+	});
+	console.log(userStore.uid);
+	pageStore.setPageConfig({
+		currentPage: {
+			type: 'tab',
+			url: '/pages/home/index'
+		}
+	})
+	if (userStore.uid) {
+		uni.hideLoading()
+		return uni.switchTab({
+			url: '/pages/home/index'
+		})
+	}
+	showPage.value = true
+	console.log(options);
+	uni.setNavigationBarTitle({
+		title: '手机登录'
+	})
+	if (options.scene) {
+		let queryString = decodeURIComponent(options.scene)
+		console.log(queryString);
+
+		// 将字符串按 '&' 分割成数组
+		state.spread = queryString.split('=')[1];
+		console.log(state.spread);
+	}
+	uni.hideLoading()
+})
+function sendCode() {
+	if (state.isAuthVerify) return
+	// if (this.disabled) return;
+	// this.disabled = true;
+	state.isAuthVerify = true
+	let n = 60;
+	state.buttonText = "剩余 " + n + "s";
+	const run = setInterval(() => {
+		n = n - 1;
+		if (n < 0) {
+			clearInterval(run);
+			n = 0
+		}
+		state.buttonText = "剩余 " + n + "s";
+		if (state.buttonText === "剩余 " + 0 + "s") {
+			state.isAuthVerify = false;
+			state.buttonText = "重新获取";
+		}
+	}, 1000);
+}
+
+const isFormVerify = computed(() => {
+	if (state.phone !== '' && state.code !== '') {
+		return true
+	}
+})
+function handleGetCode() {
+	if (!state.phone) {
+		return uni.showToast({
+			title: '请填写手机号码',
+			icon: 'none'
+		})
+	}
+	if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(state.phone)) {
+		return uni.showToast({
+			title: '请输入正确的手机号码',
+			icon: 'none'
+		})
+	}
+
+	state.isAuthVerify = true
+	authVerify(state.phone).then(res => {
+		state.isAuthVerify = false
+		sendCode()
+	}).catch(res => {
+	})
+}
+function handleViewXieyi(type: number) {
+	uni.navigateTo({
+		url: `/pages/user/login/user-agreement?type=${type}`
+	})
+}
+
+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,
+		// share_id:
+	}
+	if (shareId && shareId !== '') {
+		params.share_id = shareId
+	}
+	if (state.spread && state.spread !== '' && state.spread != '0') {
+		params.spread = state.spread
+	}
+	authSmsLogin({
+		...params
+	}).then(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' }
+		if (Cache.get('SHARE_REDIRECT_PAGE')) {
+			redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+		}
+		setTimeout(() => {
+			if (redirectPageObj) {
+				if (redirectPageObj.type === 'page') {
+					return uni.redirectTo({
+						url: redirectPageObj.page
+					})
+				}
+				if (redirectPageObj.type === 'tab') {
+					return uni.switchTab({
+						url: redirectPageObj.page
+					})
+				}
+			} else {
+				uni.switchTab({
+					url: '/pages/home/index'
+				})
+			}
+		}, 200)
+
+
+	}).catch((errorMsg) => {
+		console.log(errorMsg)
+		uni.showToast({
+			title: errorMsg,
+			icon: 'none'
+		})
+	})
+}
+</script>
+  
+<route lang="yaml">
+style:
+  navigationBarTitleText: 手机号登录
+  navigationStyle: custom
+  enablePullDownRefresh: false
+</route>
+  
+<style>
+page {
+	background: #f8f8f8;
+}
+
+.page_title {
+	width: 182rpx;
+	height: 48rpx;
+	position: absolute;
+	top: 20%;
+	left: 284rpx;
+}
+</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="showPage == true">
     <CXBBanner />
 
     <nut-input v-model="state.phone" placeholder="请输入手机号" type="number">
@@ -35,15 +35,49 @@ import { authSmsLogin, authVerify } from "~/apis/auth.api";
 import Cache from "~/utils/cache";
 import { getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
-
+const pageStore = usePageStoreWidthOut()
 const state = reactive({
   phone: '',
   code: '',
-
+  spread: '',
   isAuthVerify: false,
   buttonText: '获取验证码',
 })
+const showPage = ref(false)
+onLoad((options: any) => {
+  uni.showLoading({
+    title: '加载中',
+  });
+
+  console.log(userStore.uid);
+
+  if (userStore.uid) {
+    pageStore.setPageConfig({
+      currentPage: {
+        type: 'tab',
+        url: '/pages/home/index'
+      }
+    })
+    uni.hideLoading()
+    return uni.switchTab({
+      url: '/pages/home/index'
+    })
+  }
+  showPage.value = true
+  console.log(options);
+  uni.setNavigationBarTitle({
+    title: '手机登录'
+  })
+  if (options.scene) {
+    let queryString = decodeURIComponent(options.scene)
+    console.log(queryString);
 
+    // 将字符串按 '&' 分割成数组
+    state.spread = queryString.split('=')[1];
+    console.log(state.spread);
+  }
+  uni.hideLoading()
+})
 function sendCode() {
   if (state.isAuthVerify) return
   // if (this.disabled) return;
@@ -128,6 +162,9 @@ function handleLogin() {
   if (shareId && shareId !== '') {
     params.share_id = shareId
   }
+  if (state.spread && state.spread !== '' && state.spread != '0') {
+    params.spread = state.spread
+  }
   authSmsLogin({
     ...params
   }).then(authRes => {
@@ -149,7 +186,7 @@ function handleLogin() {
     setTimeout(() => {
       if (redirectPageObj) {
         if (redirectPageObj.type === 'page') {
-          return uni.redirectTo({
+          return uni.reLaunch({
             url: redirectPageObj.page
           })
         }
@@ -178,7 +215,7 @@ function handleLogin() {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 手机登录
+  navigationBarTitleText: 储蓄保
 </route>
 
 <style>

src/pages/user/login/register-agreement.vue

@@ -1,2 +1,239 @@
-<script lang="ts" setup></script>
-<template></template>
+<template>
+	<div v-if="showPage == true">
+		<div class="page_title">手机号登录</div>
+		<div class="flex flex-col justify-center items-center py-25">
+			<image src="https://test.bjtdba.com/applet/static/home/404986b1e3aeaf4b3829efa2c2ac6bf.png" mode="widthFix"
+				class="w-35 h-35"></image>
+		</div>
+
+		<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>
+			</template>
+		</nut-input>
+		<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>
+
+		</div>
+
+	</div>
+</template>
+<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 Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
+const userStore = useUserStore()
+const pageStore = usePageStoreWidthOut()
+const state = reactive({
+	phone: '',
+	code: '',
+	spread: '',
+	isAuthVerify: false,
+	buttonText: '获取验证码',
+})
+const showPage = ref(false)
+onLoad((options: any) => {
+	uni.showLoading({
+		title: '加载中',
+	});
+	console.log(userStore.uid);
+	pageStore.setPageConfig({
+		currentPage: {
+			type: 'tab',
+			url: '/pages/home/index'
+		}
+	})
+	if (userStore.uid) {
+		uni.hideLoading()
+		return uni.switchTab({
+			url: '/pages/home/index'
+		})
+	}
+	showPage.value = true
+	console.log(options);
+	uni.setNavigationBarTitle({
+		title: '手机登录'
+	})
+	if (options.scene) {
+		let queryString = decodeURIComponent(options.scene)
+		console.log(queryString);
+
+		// 将字符串按 '&' 分割成数组
+		state.spread = queryString.split('=')[1];
+		console.log(state.spread);
+	}
+	uni.hideLoading()
+})
+function sendCode() {
+	if (state.isAuthVerify) return
+	// if (this.disabled) return;
+	// this.disabled = true;
+	state.isAuthVerify = true
+	let n = 60;
+	state.buttonText = "剩余 " + n + "s";
+	const run = setInterval(() => {
+		n = n - 1;
+		if (n < 0) {
+			clearInterval(run);
+			n = 0
+		}
+		state.buttonText = "剩余 " + n + "s";
+		if (state.buttonText === "剩余 " + 0 + "s") {
+			state.isAuthVerify = false;
+			state.buttonText = "重新获取";
+		}
+	}, 1000);
+}
+
+const isFormVerify = computed(() => {
+	if (state.phone !== '' && state.code !== '') {
+		return true
+	}
+})
+function handleGetCode() {
+	if (!state.phone) {
+		return uni.showToast({
+			title: '请填写手机号码',
+			icon: 'none'
+		})
+	}
+	if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(state.phone)) {
+		return uni.showToast({
+			title: '请输入正确的手机号码',
+			icon: 'none'
+		})
+	}
+
+	state.isAuthVerify = true
+	authVerify(state.phone).then(res => {
+		state.isAuthVerify = false
+		sendCode()
+	}).catch(res => {
+	})
+}
+function handleViewXieyi(type: number) {
+	uni.navigateTo({
+		url: `/pages/user/login/user-agreement?type=${type}`
+	})
+}
+
+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,
+		// share_id:
+	}
+	if (shareId && shareId !== '') {
+		params.share_id = shareId
+	}
+	if (state.spread && state.spread !== '' && state.spread != '0') {
+		params.spread = state.spread
+	}
+	authSmsLogin({
+		...params
+	}).then(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' }
+		if (Cache.get('SHARE_REDIRECT_PAGE')) {
+			redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+		}
+		setTimeout(() => {
+			if (redirectPageObj) {
+				if (redirectPageObj.type === 'page') {
+					return uni.redirectTo({
+						url: redirectPageObj.page
+					})
+				}
+				if (redirectPageObj.type === 'tab') {
+					return uni.switchTab({
+						url: redirectPageObj.page
+					})
+				}
+			} else {
+				uni.switchTab({
+					url: '/pages/home/index'
+				})
+			}
+		}, 200)
+
+
+	}).catch((errorMsg) => {
+		console.log(errorMsg)
+		uni.showToast({
+			title: errorMsg,
+			icon: 'none'
+		})
+	})
+}
+</script>
+  
+<route lang="yaml">
+style:
+  navigationBarTitleText: 手机号登录
+  navigationStyle: custom
+  enablePullDownRefresh: false
+</route>
+  
+<style>
+page {
+	background: #f8f8f8;
+}
+
+.page_title {
+	width: 180rpx;
+	height: 48rpx;
+	position: absolute;
+	margin-top: 110rpx;
+	left: 50%;
+    text-align: center;
+    margin-left: -90rpx;
+}
+</style>

src/pages/vip/index.vue

@@ -43,7 +43,7 @@
       <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>
+            <image :src="item.image" style="width: 340rpx; height: 340rpx; " :fade-in="true" class="rounded-t-lg aspect-square"></image>
 
             <div class="text-sm p-2 flex flex-col gap-1">
               <div class="line-clamp-1">

src/stores/userStore.ts

@@ -57,6 +57,8 @@ export const useUserStore = defineStore('userStore', {
         async getUserInfo() {
             try {
                 this.userInfo = await getUserInfo();
+                console.log(this.userInfo);
+                
 
             } catch (error) {
                 uni.navigateTo({

src/utils/http/index.ts

@@ -10,7 +10,7 @@ function createRequest(options?: any) {
     return new VRequest(deepMerge(
         {
             url: '',
-            timeout: 5 * 1000,
+            timeout: 20 * 1000,
             authenticationScheme: 'Bearer',
             authenticationHeader: 'X-Token',
             // authenticationHeader: 'Authorization',