feat: fix

components.d.ts

@@ -57,6 +57,7 @@ declare module '@vue/runtime-core' {
     NutOverlay: typeof import('uniapp-nutui/components/overlay/overlay.vue')['default']
     NutPicker: typeof import('uniapp-nutui/components/picker/picker.vue')['default']
     NutPopup: typeof import('uniapp-nutui/components/popup/popup.vue')['default']
+    NutRate: typeof import('uniapp-nutui/components/rate/rate.vue')['default']
     NutSearchbar: typeof import('uniapp-nutui/components/searchbar/searchbar.vue')['default']
     NutSwitch: typeof import('uniapp-nutui/components/switch/switch.vue')['default']
     NutTable: typeof import('uniapp-nutui/components/table/table.vue')['default']

src/apis/common.ts

@@ -42,9 +42,17 @@ enum API {
     // 意见反馈-类型
     FEEDBACK_TYPE_NEW = '/api/common/feedback_type_new',
     // 意见反馈提交
-    FEEDBACK = '/api/user/feedback'
+    FEEDBACK = '/api/user/feedback',
+    // 获取热门搜索关键词
+    HOT_KEYWORD = '/api/common/hot_keyword'
 }
 
+// 获取热门搜索关键ygnk
+export function getHotkeyWord() {
+    return defHttp.get({
+        url: API.HOT_KEYWORD,
+    })
+}
 /**
  * 添加反馈
  * @param params
@@ -79,19 +87,20 @@ export function getLocal() {
         content: '为了您更好的体验，请同意授权位置',
         success: (res) => {
             if (res.confirm) {
-                // uni.getLocation({
-                //     type: 'wgs84',
-                //     success(res) {
-                //         uni.setStorageSync(USER_LATITUDE, res.latitude)
-                //         uni.setStorageSync(USER_LONGITUDE, res.longitude)
-                //         getRegeo(res.latitude, res.longitude);
-                //     }
-                // })
-                amap.getWxLocation(async (loc) => {
-                    // 获取地址描述数据
-                    const regeoRes = await amap.getRegeo({location: loc});
-                    console.log(regeoRes.data.regeocode.addressComponent)
+                uni.getLocation({
+                    type: 'wgs84',
+                    success(res) {
+                        console.log(res)
+                        uni.setStorageSync(USER_LATITUDE, res.latitude)
+                        uni.setStorageSync(USER_LONGITUDE, res.longitude)
+                        // getRegeo(res.latitude, res.longitude);
+                    }
                 })
+                // amap.getWxLocation(async (loc) => {
+                    // 获取地址描述数据
+                    // const regeoRes = await amap.getRegeo({location: loc});
+                    // console.log(regeoRes.data.regeocode.addressComponent)
+                // })
             }
         }
     })

src/apis/merchant.ts

@@ -103,11 +103,13 @@ export function getRecommendList(pageParams: PageModel) {
  * @param pageParams
  */
 export function getVipAreaList(pageParams: PageModel): Promise<VipAreaResult> {
+
     return defHttp.get({
         url: API.GET_VIP_AREA_LIST,
         params: {
-            page: pageParams.page === undefined ? 1 : pageParams.page,
-            limit: pageParams.limit === undefined ? 20 : pageParams.limit
+            ...pageParams
+            // page: pageParams.page === undefined ? 1 : pageParams.page,
+            // limit: pageParams.limit === undefined ? 20 : pageParams.limit
         }
     })
 }

src/apis/model/after-sales-order.model.ts

@@ -0,0 +1,107 @@
+export interface AfterSalesOrderResult {
+    list: Array<AfterSalesOrderModel>
+    count: number
+}
+
+export interface AfterSalesOrderModel {
+    refund_order_id: string
+    refund_price: string
+    mer_id: number
+    status: string
+    merchant: MerchantModel
+    refundProduct: Array<RefundProductModel>
+}
+
+export interface MerchantModel {
+    mer_name: string
+    mer_id: number
+    mer_avatar: string
+}
+
+export interface RefundProductModel {
+    refund_product_id: string
+    refund_order_id: string
+    order_product_id: string
+    refund_num: string
+    create_time: string
+    product: ProductsModel
+}
+
+export interface ProductsModel {
+    order_product_id: number
+    order_id: number
+    uid: number
+    cart_id: number
+    product_id: number
+    extension_one: string
+    extension_two: string
+    product_sku: string
+    is_refund: number
+    product_num: number
+    refund_num: number
+    is_reply: number
+    product_price: string
+    cart_info: CartInfoModel
+    create_time: string
+    type: string
+}
+
+export interface CartInfoModel {
+    product: ProductModel
+    productAttr: ProductAttrModel
+    product_type: number
+}
+
+export interface ProductModel {
+    product_id: number
+    image: string
+    store_name: string
+    is_show: number
+    status: number
+    is_del: number
+    unit_name: string
+    price: string
+    mer_status: number
+    temp_id: number
+    give_coupon_ids: Array<string>
+    is_gift_bag: number
+    is_used: number
+    product_type: number
+    old_product_id: number
+    temp: TempModel
+}
+
+export interface TempModel {
+    shipping_template_id: number
+    name: string
+    type: number
+    appoint: number
+    undelivery: number
+    mer_id: number
+    is_default: number
+    sort: number
+    create_time: string
+    undelives: string
+    freeAddress: FreeAddressModel
+}
+
+export interface FreeAddressModel {
+    shipping_template_free_id: number
+    temp_id: number
+    city_id: string
+    number: number
+    price: string
+}
+export interface ProductAttrModel {
+    product_id: number
+    stock: number
+     price: string
+    unique: string
+    sku: string
+    volume: string
+    weight: string
+    ot_price: string
+    cost: string
+    bc_extension_one: string
+    bc_extension_two: string
+}

src/apis/model/comment-product.ts

@@ -0,0 +1,14 @@
+export interface CommentProductRequest {
+    // 评价内容
+    comment: string
+    // 订单 order_product_id
+    id: string
+    // 图片
+    pics: Array<string>
+    // 物流评分
+    postage_score: number
+    // 商品评分
+    product_score: number
+    // 服务态度
+    service_score: number
+}

src/apis/model/pageModel.ts

@@ -1,6 +1,7 @@
 export interface PageModel {
     page: number
     limit: number
+    keyword?: string
 }
 
 export interface PageResult {}

src/apis/order.api.ts

@@ -5,6 +5,8 @@ import type {
     OrderCreateShoppingModel, OrderListDataModel, OrderListObligationResult, OrderListResult, OrderQuantityModel
 } 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";
 
 export interface CartIdRequest {
     cart_id: Array<string>
@@ -68,6 +70,47 @@ enum API {
 }
 
 /**
+ * 售后-订单列表
+ */
+export function refundList(): Promise<AfterSalesOrderResult> {
+    return defHttp.get({
+        url: API.REFUND_LIST
+    })
+}
+
+/**
+ * 提交评价
+ * @param params
+ */
+export function submitReply(params: CommentProductRequest) {
+    return defHttp.post({
+        url: API.REPLY,
+        data: {
+            ...params
+        }
+    })
+}
+
+/**
+ * 确认收货
+ * @param id
+ */
+export function takeOrder(id: string) {
+    return defHttp.post({
+        url: API.ORDER_TAKE + `/${id}`
+    })
+}
+/**
+ * 获取订单物流信息
+ * @param id
+ */
+export function getLogistics(id: string) {
+    return defHttp.post({
+        url: API.ORDER_EXPRESS + `/${id}`
+    })
+}
+
+/**
  * 订单统计
  */
 export function totalOrderNumber(): Promise<OrderQuantityModel> {

src/components/CXBBasePage/CXBBasePage.vue

@@ -43,7 +43,7 @@ function onClickLeft() {
 </script>
 
 <template>
-  <FPage ex-class="font-sans pb-10 fixed inset-0 overflow-auto">
+  <FPage ex-class="font-sans pb-10  inset-0 overflow-auto">
     <FNavBar
         v-if="show" :title="title ?? titleText" :left-arrow="backArrow" fixed placeholder z-index="999"
         @click-left="onClickLeft"

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -102,7 +102,7 @@ function handleCountChange(value) {
       v-model:show="showValue"
       @close="onCancel"
       position="bottom"
-      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[40%] h-fit"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[40%] max-h-[80%]"
 
   >
     <div class="flex flex-col justify-between h-full">

src/pages/dacang/list/index.vue

@@ -31,18 +31,19 @@ const classifyId = computed(() => {
 })
 
 watch(() => classifyId.value, (val) => {
-  currentTab.value = val
+  // currentTab.value = val
+  // state.currentClassify = val
   // loadDcProductList(classifyId.value)
   loadList('reload')
 })
-onLoad((options) => {
+onShow((options) => {
   // console.log(classifyId.value)
 
   // if (options.id) {
-  if (!classifyId.value) {
+  // if (!classifyId.value) {
     // loadDcProductList(dacangStore.currentClassify)
     loadList('reload')
-  }
+  // }
   // } else {
   // }
   getDcProductClassify().then(res => {
@@ -56,7 +57,8 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   const params = {
     page: state.currentPage,
     limit: state.pageSize,
-    classify: state.currentClassify,
+    // classify: state.currentClassify,
+    classify: classifyId.value,
     keyword: state.keyword
   }
   if (action === 'reload') {
@@ -88,6 +90,7 @@ function handleTabItemClick(tabItem) {
   state.currentClassify = tabItem
   // if (!currentTab || currentTab == '') {
   //   loadList(tabItem)
+  dacangStore.setClassify(tabItem)
   loadList('reload')
   // }
 }
@@ -129,20 +132,28 @@ onPullDownRefresh(() => {
     uni.stopPullDownRefresh()
   })
 })
+
+function handleShowSearchPage() {
+  uni.navigateTo({
+    url: '/pages/search/search-dacang'
+  })
+}
 </script>
 <template>
   <div class="h-screen">
-    <DacangHeader fixed
-                  :tabs="state.tabs"
-                  :ex-class="headerClass"
-                  :current="classifyId"
-                  @click:item="handleTabItemClick"
-    />
-    <!--
+<!--    <DacangHeader fixed-->
+<!--                  :tabs="state.tabs"-->
+<!--                  :ex-class="headerClass"-->
+<!--                  :current="classifyId"-->
+<!--                  @click:item="handleTabItemClick"-->
+<!--    />-->
     <div class=" z-10"  >
       <div :class="headerClass">
         <FNavBar :fixed="true" exClass="pl-2">
-          <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
+          <div
+              @click="handleShowSearchPage"
+              class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
+          >
 
             <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
                    mode="widthFix"
@@ -163,7 +174,6 @@ onPullDownRefresh(() => {
       </div>
 
     </div>
--->
 
 <!--    <FSearch :fixed="true"/>-->
     <div class="flex flex-col gap-2 ">

src/pages/home/index.vue

@@ -47,7 +47,7 @@ onShow(() => {
   }
 })
 onLoad(() => {
-  // getLocal()
+  getLocal()
   // 加载地址数据
   // orderStore.getCurrentAddress()
   // 1加载首页数据
@@ -162,7 +162,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml" type="home">
+<route lang="yaml">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

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

@@ -254,7 +254,7 @@ function shareImage() {
 .integral_bg {
   width: 710rpx;
   height: 591rpx;
-  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/integral_bg_220826.png');
+  background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-18/20230918140610841.png');
   background-size: 100% 100%;
 }
 page {

src/pages/order/components/OrderItem.vue

@@ -1,8 +1,16 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
 import {OrderListModel} from "~/apis/model/order.model";
-import {cancelOrder} from "~/apis/order.api";
+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";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -29,6 +37,9 @@ function getStatusText(orderItem: OrderListModel) {
   if (props.status === 5) {
     return '未支付'
   }
+  if (props.status === 0) {
+    return '待发货'
+  }
   // switch (orderItem.status) {
   // }
   if (orderItem.status == 0) {
@@ -93,12 +104,77 @@ function handleShowOrderDetail(order) {
     url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
 }
+
+function handleRemindTheDelivery() {
+  uni.showToast({
+    title: '已告知商家尽快发货',
+    icon: 'none'
+  })
+}
+
+// 查看物流信息页
+function handleShowLogistics(orderItem) {
+  // console.log(orderItem)
+  // console.log('查看物流信息')
+  uni.navigateTo({
+    url: `/pages/order/logistics?id=${orderItem.order_id}`
+  })
+}
+
+// 确认收货
+function handleTakeOrder(orderItem) {
+  uni.showModal({
+    title: '确认收货',
+    content: '请确认你已收到货',
+    success: function (res) {
+      if (res.confirm) {
+        takeOrder(orderItem.order_id).then(res => {
+          // console.log(res)
+          uni.showToast({
+            title: '确认收货成功'
+          })
+          uni.$emit('orderTakeFromList')
+
+        }).catch(error => {
+          uni.showToast({
+            title: error,
+            icon: "none"
+          })
+        })
+      }
+    }
+  })
+}
+
+function handleComment(orderItem) {
+  uni.navigateTo({
+    url: '/pages/order/comment?detail=' + encodeBase64(orderItem)
+  })
+}
+
+function handleProductItemClick(
+    item
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  console.log(item)
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+  })
+}
+
+
 </script>
 
 <template>
   <div class="mb-3 bg-white rounded p-3">
     <div
-        @click="handleHeaderClick"
+        @click.stop="handleHeaderClick"
         class="flex items-center justify-between f-hairline-bottom pb-3">
       <div class="flex items-center font-bold gap-2 text-sm justify-between">
         <div class="flex-1 flex items-center gap-2">
@@ -140,11 +216,15 @@ function handleShowOrderDetail(order) {
               </div>
 
             </div>
-            <div class="flex justify-end gap-2">
+            <div class="flex justify-end gap-2" v-if="props.status === 5">
               <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
               <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
 
             </div>
+            <div class="flex justify-end gap-2" v-if="props.status === 0">
+              <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+              <nut-button size="small" plain type="default" @click="handlePayment">申请售后</nut-button>
+            </div>
           </div>
         </div>
 
@@ -172,9 +252,27 @@ function handleShowOrderDetail(order) {
             </div>
 
           </div>
-          <div class="flex justify-end gap-2">
+          <div class="flex justify-end gap-2" v-if="props.status === 5">
             <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
-            <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
+            <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+
+          </div>
+          <div class="flex justify-end gap-2" v-if="props.status === 0">
+            <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="handlePayment">申请售后</nut-button>
+          </div>
+
+          <div class="flex justify-end gap-2" v-if="props.status === 1">
+            <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
+            <nut-button size="small" plain type="default" @tap.stop="handlePayment">申请售后</nut-button>
+            <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
+
+          </div>
+
+          <div class="flex justify-end gap-2" v-if="props.status === 2">
+            <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>
       </div>

src/pages/order/components/RefundOrderItem.vue

@@ -0,0 +1,245 @@
+<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 {
+  DyProductModel,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import {DcProductModel} from "~/apis/model/dacang.model";
+const props = defineProps({
+  orderItem: {
+    type: Object,
+    required: true
+  },
+  status: {
+    type: Number,
+  }
+})
+
+// function detailOrderList(p) {}
+// const dealOrderList =computed(() => {
+//   if (props.orderItem) {
+//     const orderItem = props.orderItem
+//     if (orderItem?.orderList) {
+//       return orderItem.orderList
+//     }
+//     if (orderItem?.orderProduct) {
+//       return orderItem.orderProduct
+//     }
+//   }
+// })
+function getStatusText(orderItem) {
+  // if (props.status === 1) {
+  //   return '未支付'
+  // }
+  // if (props.status === 0) {
+  //   return '待发货'
+  // }
+  // switch (orderItem.status) {
+  // }
+  if (orderItem.status == -1) {
+    // return '审核未通过'
+    return '退款失败'
+  }
+  if (orderItem.status == 0) {
+    // return '待审核'
+    return '退款中'
+  }
+  if (orderItem.status == 1) {
+    // return '待退货'
+    return '退款中'
+  }
+  if (orderItem.status == 2) {
+    return '退款中'
+    // return '待收货'
+  }
+  if (orderItem.status == 3) {
+    // return '已退款'
+    return '退款完成'
+  }
+}
+
+function handleHeaderClick() {
+  uni.navigateTo({
+    url: `/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
+  })
+}
+
+/**
+ * 取消订单
+ */
+function handleCancelOrder() {
+  console.log('取消订单操作')
+  cancelOrder(props.orderItem.group_order_id).then(res => {
+    setTimeout(() => {
+      uni.showToast({
+        title: '取消成功',
+        icon: 'none'
+      })
+
+      uni.$emit('orderCancelFromList')
+
+    }, 300)
+
+  })
+}
+
+function handlePayment() {
+  const { orderItem } = props
+  uni.navigateTo({
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    // url: `/pages/payment/index`
+  })
+}
+
+function handleShowOrderDetail(order) {
+  console.log(order)
+  uni.navigateTo({
+    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+  })
+}
+
+function handleRemindTheDelivery() {
+  uni.showToast({
+    title: '已告知商家尽快发货',
+    icon: 'none'
+  })
+}
+
+// 查看物流信息页
+function handleShowLogistics(orderItem) {
+  // console.log(orderItem)
+  // console.log('查看物流信息')
+  uni.navigateTo({
+    url: `/pages/order/logistics?id=${orderItem.order_id}`
+  })
+}
+
+// 确认收货
+function handleTakeOrder(orderItem) {
+  uni.showModal({
+    title: '确认收货',
+    content: '请确认你已收到货',
+    success: function (res) {
+      if (res.confirm) {
+        takeOrder(orderItem.order_id).then(res => {
+          // console.log(res)
+          uni.showToast({
+            title: '确认收货成功'
+          })
+          uni.$emit('orderTakeFromList')
+
+        }).catch(error => {
+          uni.showToast({
+            title: error,
+            icon: "none"
+          })
+        })
+      }
+    }
+  })
+}
+
+function handleComment(orderItem) {
+  uni.navigateTo({
+    url: '/pages/order/comment?detail=' + encodeBase64(orderItem)
+  })
+}
+
+function handleProductItemClick(
+    item
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  console.log(item)
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+  })
+}
+
+
+</script>
+
+<template>
+  <div class="mb-3 bg-white rounded p-3">
+    <div
+        @click.stop="handleHeaderClick"
+        class="flex items-center justify-between f-hairline-bottom pb-3">
+      <div class="flex items-center font-bold gap-2 text-sm justify-between">
+        <div class="flex-1 flex items-center gap-2">
+          <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
+          {{ orderItem.merchant.mer_name }}
+        </div>
+
+        <div class="f-text-color-2 i-tabler-chevron-right"></div>
+
+      </div>
+      <div class="text-primary text-xs">
+        {{ getStatusText(orderItem) }}
+      </div>
+    </div>
+
+
+
+    <div @tap.stop="handleShowOrderDetail(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">
+                <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>
+
+            <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>-->
+              <div class="text-gray-500 text-[11px]">共{{ orderProduct.product.product_num }}件</div>
+            </div>
+
+          </div>
+          <div class="flex justify-end gap-2" >
+
+            <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">撤销售后</div></nut-button>
+            <nut-button size="small" plain type="primary" @tap.stop="handlePayment">查看详情</nut-button>
+          </div>
+
+          <div class="flex justify-end gap-2" v-if="props.status === 0">
+            <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="handlePayment">申请售后</nut-button>
+          </div>
+
+          <div class="flex justify-end gap-2" v-if="props.status === 1">
+            <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
+            <nut-button size="small" plain type="default" @tap.stop="handlePayment">申请售后</nut-button>
+            <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
+
+          </div>
+
+          <div class="flex justify-end gap-2" v-if="props.status === 2">
+            <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>
+    </div>
+
+  </div>
+
+
+</template>

src/pages/order/index.vue

@@ -24,7 +24,7 @@
       <nut-tab-pane title="待发货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem"/>
+            <OrderItem :order-item="orderItem" :status="0"/>
 <!--            <OtherOrderItem :item="orderItem" v-else/>-->
 <!--            <OtherOrderItem :item="orderItem"/>-->
           </div>
@@ -35,7 +35,7 @@
       <nut-tab-pane title="待收货">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem"/>
+            <OrderItem :order-item="orderItem" :status="1"/>
 <!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
 <!--            <OtherOrderItem :item="orderItem" v-else/>-->
           </div>
@@ -46,7 +46,7 @@
       <nut-tab-pane title="待评价">
         <div v-if="state.orderList.length > 0">
           <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem"/>
+            <OrderItem :order-item="orderItem" :status="2"/>
 <!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
 <!--            <OtherOrderItem :item="orderItem" v-else/>-->
           </div>
@@ -94,6 +94,11 @@ onLoad(options => {
     loadAllOrderList()
     state.tabvalue = 0
   })
+
+  uni.$on('orderTakeFromList', () => {
+    loadAllOrderList()
+    state.tabvalue = 3
+  })
 })
 function splitArray(list, sp) {
   if (typeof list != 'object') return [];
@@ -116,6 +121,8 @@ function loadAllOrderList() {
   })
 }
 watch(() => state.tabvalue, (val) => {
+  // status: string//订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
+
   switch (val) {
     case '0': {
       loadAllOrderList()

src/pages/order/logistics.vue

@@ -0,0 +1,295 @@
+<script setup lang="ts">
+import {CDN_URL} from "~/config/app";
+import {getRecommendList} from "~/apis/merchant";
+import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
+import {
+  DyProductModel,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import {DcProductModel} from "~/apis/model/dacang.model";
+import {getLogistics} from "~/apis/order.api";
+
+const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
+
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+  totalPage: 0,
+  list: [],
+
+  orderDetail: {},
+  express: []
+})
+onLoad((options) => {
+  uni.showLoading({
+    title: '加载中',
+    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
+    }
+
+    uni.hideLoading()
+  })
+
+}
+  // }
+})
+onShow(() => {
+  loadList('reload')
+})
+
+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.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleProductItemClick(
+    item:
+        JdProductModel
+        & DcProductModel
+        & DyProductModel
+        & SuNingProductModel
+        & TaobaoProductThirdPartyWaresModel
+        & VipProductModel
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+function handleClipboard() {
+  uni.setClipboardData({
+    data: state.orderDetail.delivery_id,
+    success(res) {
+      // wx.getClipboardData({
+      //   success (res) {
+      //     console.log(res.data) // data
+      //   }
+      // })
+    }
+  })
+}
+</script>
+
+<template>
+
+
+  <div>
+
+    <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>
+            <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>
+              <div
+                  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>-->
+              <!--          <nut-button size="mini" type="default">电话</nut-button>-->
+            </div>
+          </div>
+        </div>
+
+        <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 + ' ' + state.orderDetail.user_phone}}</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">
+                <text class="f-26">{{ item.status }}</text>
+              </div>
+              <div class="logis-item-content__time">
+                <text class="f-22">{{ item.time }}</text>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 商品推荐 -->
+    <div>
+      <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.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+<route lang="yaml" >
+style:
+navigationBarTitleText: 已发货
+</route>
+
+<style lang="scss">
+page {
+  background: #f8f8f8;
+}
+.nut-tab-pane {
+  background: #f5f5f5 !important;
+}
+
+.logis-detail {
+  padding: 30rpx;
+  background-color: #fff;
+
+  .logis-item {
+    position: relative;
+    padding: 10px 0 10px 25px;
+    box-sizing: border-box;
+    border-left: 1px solid #ccc;
+
+    &.first {
+      border-left: 1px solid #FE0032;
+
+      &:after {
+        background: #FE0032;
+      }
+
+      .logis-item-content {
+        background: #fff;
+        color: #000;
+
+        &:after {
+          border-bottom-color: #FE0032;
+        }
+      }
+    }
+
+    &:after {
+      content: ' ';
+      display: inline-block;
+      position: absolute;
+      left: -6px;
+      top: 30px;
+      width: 6px;
+      height: 6px;
+      border-radius: 10px;
+      background: #bdbdbd;
+      border: 2px solid #fff;
+    }
+
+    .logis-item-content {
+      position: relative;
+      background: #fff;
+      padding: 10rpx 20rpx;
+      box-sizing: border-box;
+      color: #666;
+
+      //&:after {
+      //  content: '';
+      //  display: inline-block;
+      //  position: absolute;
+      //  left: -10px;
+      //  top: 18px;
+      //  border-left: 10px solid #fff;
+      //  border-bottom: 10px solid #f3f3f3;
+      //}
+    }
+  }
+}
+
+</style>

src/pages/order/test.json

@@ -0,0 +1,158 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": {
+    "express": [],
+    "order": {
+      "order_id": "4127",
+      "group_order_id": "4545",
+      "order_sn": "wx1694771068127556531",
+      "uid": "10574",
+      "real_name": "潇潇",
+      "user_phone": "18513112593",
+      "user_address": "北京顺义区光明街道 月亮湾2",
+      "user_address_ids": "1,35,493,0",
+      "area_manage_address_ids": "",
+      "cart_id": "11091",
+      "total_num": "1",
+      "total_price": "10.00",
+      "total_postage": "10.00",
+      "pay_price": "20.00",
+      "pay_postage": "10.00",
+      "extension_one": "0.99",
+      "extension_two": "0.00",
+      "commission_rate": "2.0000",
+      "coupon_id": "",
+      "coupon_price": "0.00",
+      "order_type": "0",
+      "paid": "1",
+      "pay_time": "2023-09-15 17:44:28",
+      "pay_type": "5",
+      "create_time": "2023-09-15 17:44:28",
+      "status": "1",
+      "delivery_type": "1",
+      "delivery_name": "中通快递",
+      "delivery_id": "78367406471357",
+      "mark": "",
+      "remark": null,
+      "admin_mark": null,
+      "verify_code": null,
+      "verify_time": null,
+      "verify_service_id": "0",
+      "mer_id": "465",
+      "reconciliation_id": "0",
+      "cost": "180.00",
+      "is_del": "0",
+      "is_system_del": "0",
+      "remind": "0",
+      "remind_time": null,
+      "gzc": "0",
+      "trade_no": "",
+      "channel_trade_no": "",
+      "alipay_no": "",
+      "weixin_no": "",
+      "table_id": "0",
+      "mer_money": "18.00",
+      "last_status": null,
+      "share_id": "0",
+      "pay_mer_id": null,
+      "is_split_to_tomorrow": "0",
+      "service_money": "182.00",
+      "test_order": "0",
+      "dacang_id": "0",
+      "distribution_mode": "0",
+      "da_cang_profit": "0.00",
+      "recommended_merchants": "0.00",
+      "mer_fanyong": "2.00",
+      "is_dacang": "0",
+      "cost_price": null,
+      "douhuomall": null,
+      "douhuomall_status": null,
+      "douhuomall_msg": null,
+      "address_id": "273",
+      "douhuomall_order_no": null,
+      "supply_type": null,
+      "seckill": "1",
+      "orderProduct": [
+        {
+          "order_product_id": "4395",
+          "order_id": "4127",
+          "uid": "10574",
+          "cart_id": "11091",
+          "product_id": "6105",
+          "extension_one": "0.00",
+          "extension_two": "0.00",
+          "product_sku": "7b5cd1815c80",
+          "is_refund": "0",
+          "product_num": "1",
+          "refund_num": "1",
+          "is_reply": "0",
+          "product_price": "10.00",
+          "cart_info": {
+            "product": {
+              "product_id": "6105",
+              "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-12\/74d95202309120948354624.jpg",
+              "store_name": "蛋白肽测试",
+              "is_show": "1",
+              "status": "1",
+              "is_del": "0",
+              "unit_name": "的",
+              "price": "300.00",
+              "mer_status": "1",
+              "temp_id": "259",
+              "give_coupon_ids": [],
+              "is_gift_bag": "0",
+              "is_used": "1",
+              "product_type": "0",
+              "old_product_id": "0",
+              "temp": {
+                "shipping_template_id": "259",
+                "name": "测试001",
+                "type": "1",
+                "appoint": "0",
+                "undelivery": "0",
+                "mer_id": "465",
+                "is_default": "0",
+                "sort": "0",
+                "create_time": "2023-09-09 16:13:29",
+                "regionAddress": {
+                  "shipping_template_region_id": "611",
+                  "temp_id": "259",
+                  "city_id": "0",
+                  "first": "1.00",
+                  "first_price": "10.00",
+                  "continue": "1.00",
+                  "continue_price": "5.00"
+                },
+                "undelives": null,
+                "freeAddress": null
+              }
+            },
+            "productAttr": {
+              "gong_mer_profit": null,
+              "gong_pension": null,
+              "gong_market_price": null,
+              "cost_price": null,
+              "product_id": "6105",
+              "stock": "80",
+              "price": "10.00",
+              "unique": "7b5cd1815c80",
+              "sku": "",
+              "volume": "1.00",
+              "weight": "1.00",
+              "ot_price": "5000.00",
+              "dacang_price": "10.00",
+              "cost": "180.00",
+              "bc_extension_one": 0,
+              "bc_extension_two": 0,
+              "seckill": 1
+            },
+            "product_type": "0"
+          },
+          "create_time": "2023-09-15 17:44:28",
+          "type": "5"
+        }
+      ]
+    }
+  }
+}

src/pages/pension_record/index.vue

@@ -56,7 +56,7 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
                 <div class="font-bold flex " v-if="yanglaoStatistics">
                   <div>￥</div>
                   <div>
-                    {{ yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a}}
+                    {{ (yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2)}}
                   </div>
                 </div>
               </div>

src/pages/red-integral/index.vue

@@ -6,6 +6,8 @@ import {getRedIntegralList} from "~/apis/user";
 import dayjs from "dayjs";
 
 const userStore = useUserStore();
+const data = ref([])
+
 onLoad((options) => {
   userStore.getUserInfo()
   getRedIntegralList({page: 1, limit: 20}).then(res => {
@@ -13,16 +15,16 @@ onLoad((options) => {
     if (res && res.length > 0) {
       for (let item of res) {
         // data.value = res
-        data.value = {
-          red: res.red,
-          mark: res.mark,
-          time: dayjs(res.time).format('YYYY-MM-DD')
-        }
+        console.log(item.red)
+        data.value.push({
+          red: item.red,
+          mark: item.mark,
+          time: dayjs.unix(item.time).format('YYYY-MM-DD')
+        })
       }
     }
   })
 })
-const data = ref([])
 // const userType = computed(() => {
 //   const userRichType = userStore.userInfo.user_rich_type
 //   // 创始人

src/pages/refund/README.md

@@ -0,0 +1 @@
+售后管理

src/pages/refund/index.vue

@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import {refundList} from "~/apis/order.api";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import RefundOrderItem from "~/pages/order/components/RefundOrderItem.vue";
+
+const state = reactive({
+  tabvalue: 0,
+  list: []
+})
+
+onLoad(() => {
+  refundList().then(res => {
+    console.log(res)
+    state.list = res.list
+  })
+})
+</script>
+<template>
+  <div>
+    <nut-tabs v-model="state.tabvalue">
+      <nut-tab-pane title="全部">
+        <div v-if="state.list.length > 0" class="flex flex-col gap-3">
+          <div v-for="(orderItem, index) in state.list" :key="index">
+            <RefundOrderItem :order-item="orderItem"/>
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+      </nut-tab-pane>
+      <nut-tab-pane title="退款中">
+      </nut-tab-pane>
+      <nut-tab-pane title="退款完成">
+      </nut-tab-pane>
+    </nut-tabs>
+  </div>
+</template>
+<route lang="yaml"   type="home">
+style:
+  navigationBarTitleText: 退款/售后
+</route>

src/pages/search/search-dacang.vue

@@ -0,0 +1,602 @@
+<script setup lang="ts">
+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 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";
+
+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 downRedImg = CDN_URL + '/static/assets/tuijian_xiala_red.png'
+const upRedImg = CDN_URL + '/static/assets/search_red_shangla_220617.png'
+const searchValue = ref()
+const isSearchMode = ref(false)
+// const i
+const emit = defineEmits<{
+  (e: 'change', value: boolean): void,
+  (e: 'product-type-change', value: number): void,
+  (e: 'order-change', value: number): void
+}>()
+
+const merchantState = reactive({
+  total: 0,
+  totalPage: 0,
+  list: [],
+  currentPage: 1,
+  pageSize: 10,
+  is_new: NaN,
+  care_count: NaN,
+  distanceAsc: 0,
+  currentSelected: 0
+})
+
+function handleMerchantTabChange(tab) {
+  merchantState.currentSelected = tab
+  if (tab === 0) {
+    merchantState.distanceAsc = 0
+    merchantState.care_count = NaN
+    merchantState.is_new = NaN
+  }
+  if (tab === 1) {
+    merchantState.distanceAsc = NaN
+    merchantState.is_new = NaN
+    merchantState.care_count = 0
+  }
+  if (tab === 2) {
+    merchantState.care_count = NaN
+    merchantState.distanceAsc = NaN
+    merchantState.is_new = 0
+  }
+
+  loadSelectMerchant('reload')
+}
+
+const state = reactive({
+  tabvalue: 0,
+
+  isDel: false,
+  hotkeyWords: [],
+  historyKeyWords: [],
+  currentKeyword: '',
+  order: false,
+  keyword: '',
+  currentSelected: 1,
+  status: 'noMore',
+  priceType: NaN,
+  sales: NaN,
+  is_new: NaN,
+  type: 1,
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+  productList: [],
+  // merchantList: []
+
+})
+const classifyId = computed(() => {
+  return useDacangStore().$state.currentClassify
+})
+
+
+onLoad(async () => {
+  loadProductList('reload')
+  const historyKeywords = await uni.getStorageSync('HISTORY_KEYWORDS')
+  if (historyKeywords) {
+    state.historyKeyWords = historyKeywords
+  }
+
+})
+
+watch(() => state.tabvalue, (val) => {
+  console.log(val)
+  if (val == 1) {
+    loadSelectMerchant('reload')
+  }
+  if (val == 0) {
+    loadProductList('reload')
+  }
+})
+
+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
+  }
+  if (action === 'reload') {
+    state.currentPage = 1
+    params.page = 1
+  }
+  if (searchValue.value) {
+    params.keyword = searchValue.value
+  }
+  // if (state.currentSelected === 2) {
+  //   params.sales = state.sales
+  // }
+  // if (state.currentSelected === 3) {
+  //   params.is_new = state.is_new
+  // }
+  if (state.sales === 0) {
+    params.sales = state.sales
+  }
+  if (state.is_new === 0) {
+    params.is_new = state.is_new
+  }
+  if (state.priceType) {
+    params.priceType = state.priceType
+  }
+
+  getDcProductList({
+    ...params
+    // page: state.currentPage,
+    // limit: state.pageSize,
+    // classify,
+    // keyword: ''
+  }).then(res => {
+    if (action === 'page') {
+      state.productList = state.productList.concat(res)
+    }
+    if (action === 'reload') {
+      state.productList = res
+    }
+
+    if (callback) {
+      callback(res)
+    }
+    // state.productList = res
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+}
+
+// 店铺列表
+function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => void) {
+  // if (state.category_id == 0) {
+  //   state.currentMerchantCategoryId = state.category_id
+  // }
+
+  let params: StoreParams = {
+    pageNum: merchantState.currentPage,
+    pageSize: merchantState.pageSize,
+    // mer_keyword: searchValue.value,
+    // mer_keyword: mer_keyword,
+    lat: uni.getStorageSync(USER_LATITUDE),
+    lng: uni.getStorageSync(USER_LONGITUDE)
+  }
+
+  if (searchValue.value) {
+    params.mer_keyword = searchValue.value
+  }
+
+  if (action === 'reload') {
+    merchantState.currentPage = 1
+    params.pageNum = 1
+  }
+  // 人气
+  // care_count
+  // 最新 is_new
+  // 距离 distanceAsc
+  // if (state.)
+  // if (state.category_id !== 0) {
+  //   // params.category_id = category_id
+  //   params = Object.assign({}, params, {
+  //     category_id: state.category_id
+  //   })
+  // }
+  if (merchantState.distanceAsc === 0) {
+    params = Object.assign({}, params, {
+      distanceAsc: 0,
+
+    })
+  }
+
+  if (merchantState.care_count === 0) {
+    params.care_count = merchantState.care_count
+  }
+  if (merchantState.is_new === 0) {
+    params.is_new = merchantState.is_new
+  }
+  getSelectMerchant(params).then((res) => {
+    console.log(res)
+    merchantState.total = res.total
+    merchantState.totalPage = Math.ceil(merchantState.total / merchantState.pageSize);
+    console.log(merchantState.totalPage)
+    // state.merchantList = res.list
+    if (action === 'page') {
+      merchantState.list = state.list.concat(res.list)
+    }
+    if (action === 'reload') {
+      merchantState.list = res.list
+    }
+    // state.totalPage = Math.ceil(totalItems / state.pageSize);
+
+    merchantState.status = 'more'
+
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+onShow(() => {
+  getHotkeyWord().then(res => {
+    console.log(res)
+    state.hotkeyWords = res
+  })
+})
+
+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 handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadProductList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadProductList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
+
+async function handleSearch() {
+  isSearchMode.value = true
+  // state.historyKeyWords
+  if (searchValue.value) {
+    state.historyKeyWords.push(searchValue.value)
+    state.historyKeyWords = uniq(state.historyKeyWords)
+    await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
+  }
+  // state.historyKeyWords
+  if (state.tabvalue == 0) {
+    loadProductList('reload')
+  }
+  if (state.tabvalue == 1) {
+    loadSelectMerchant('reload')
+  }
+}
+
+async function handleRemoveKeyword(tag) {
+  state.historyKeyWords = state.historyKeyWords.filter((curVal, index) => {
+    return curVal !== tag
+  })
+  console.log(state.historyKeyWords)
+  await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
+}
+async function handleRemoveAllKeyword() {
+  state.historyKeyWords = []
+  await uni.setStorageSync('HISTORY_KEYWORDS', [])
+}
+
+async function handleKeywordSearch(keywordItem) {
+  // keywordItem.keyword
+  if (keywordItem.keyword) {
+    searchValue.value = keywordItem.keyword
+    state.historyKeyWords.push(searchValue.value)
+    state.historyKeyWords = uniq(state.historyKeyWords)
+    await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
+    loadProductList('reload')
+    isSearchMode.value = true
+  }
+}
+
+function handleShowMerchant(merchant) {
+  console.log(merchant)
+  uni.navigateTo({
+    url: '/pages/store/home/index?id=' + merchant.mer_id
+  })
+}
+</script>
+
+<template>
+  <div>
+    <div class="fixed  h-fit z-1 bg-white top-0 w-full">
+      <nut-searchbar
+          v-model="searchValue" @search="handleSearch" @clear="handleSearch">
+        <template v-slot:rightout>
+          <div @tap="handleSearch">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
+    </div>
+
+    <div class="mt-16 px-3 flex flex-col gap-6" v-if="!isSearchMode">
+      <div class="flex flex-col gap-3" v-if="state.historyKeyWords && state.historyKeyWords.length > 0">
+
+        <div class="flex justify-between items-center">
+          <div class="font-bold">搜索历史</div>
+          <!--          <div class="flex justify-end items-center">-->
+          <!--            <image :src="deleteIcon" mode="widthFix" class="w-3 h-3"></image>-->
+          <!--          </div>-->
+
+          <div class="text-[12px] flex ">
+            <div v-if="state.isDel" class="flex items-center">
+              <div @click="handleRemoveAllKeyword">全部删除</div>
+              <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>
+
+          </div>
+
+        </div>
+        <!--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">
+              {{ tagItem }}
+            </div>
+            <div class="flex" v-if="state.isDel" @click="handleRemoveKeyword(tagItem)">
+              <div class="i-tabler-x text-[8px] text-gray"></div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+      <div class="flex flex-col gap-3">
+        <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>
+              {{ tagItem.keyword }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div v-if="isSearchMode">
+      <div class="fixed top-10 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>
+                <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>
+          </nut-tab-pane>
+          <nut-tab-pane title="店铺">
+            <div class="text-[14px]">
+              <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>
+                  </div>
+
+                </div>
+                <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>
+              </div>
+            </div>
+
+          </nut-tab-pane>
+        </nut-tabs>
+
+      </div>
+
+      <!-- 商品列表 -->
+      <div class="mt-40 pb-10" v-if="state.tabvalue == 0">
+        <div v-if="state.productList.length > 0">
+          <ProductList :list="state.productList"/>
+          <div class=" flex justify-center items-center text-[12px] text-gray-500"
+               v-if="state.productList && state.productList.length > 0">
+            <div v-if="state.status === 'loading'">
+              加载中...
+            </div>
+            <div v-if="state.status === 'noMore'">
+              没有更多了～
+            </div>
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+
+      </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 class="flex">
+              <div class="flex ">
+                <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">
+                <div class="flex flex-col gap-2">
+                  <div class="truncate w-40 ">
+                    {{ item.mer_name }}
+                  </div>
+                  <div class="text-xs text-gray">
+                    {{ item.care_count }} 人关注
+                  </div>
+                </div>
+
+                <div class="text-xs">{{ (item.distance / 100).toFixed(1) }}km</div>
+              </div>
+
+            </div>
+          </div>
+          <div class=" flex justify-center items-center text-[12px] text-gray-500">
+            <div v-if="merchantState.status === 'loading'">
+              加载中...
+            </div>
+            <div v-if="merchantState.status === 'noMore'">
+              没有更多了～
+            </div>
+          </div>
+        </div>
+        <CXBEmpty v-else/>
+
+
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<style>
+.nut-searchbar__search-input {
+  border: 1px solid #FE0032;
+  background: white !important;
+  font-size: 13px;
+}
+
+page {
+  background: #f8f8f8;
+
+  --nut-menu-item-font-size: 14px;
+  --nut-menu-bar-line-height: 24px;
+  --nut-menu-bar-box-shadow: none;
+  --nut-menu-item-active-text-color: #FE0032;
+  --nut-white: #fff;
+}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 搜索
+  enablePullDownRefresh: true
+
+</route>
+

src/pages/store/home/index.vue

@@ -31,7 +31,7 @@ const state = reactive({
   priceType: NaN,
   sales: NaN,
   is_new: NaN,
-  type: 1,
+  type: NaN,
   currentPage: 1,
   pageSize: 10,
   totalPage: 1
@@ -47,7 +47,7 @@ onLoad((options: any) => {
     id.value = options.id
     getMerchantDetail(id.value).then((res: any) => {
       merchant.value = {...res}
-      console.log(res)
+      // console.log(res)
     })
 
     // 148 专用
@@ -73,10 +73,13 @@ onLoad((options: any) => {
 // }
 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
@@ -84,6 +87,7 @@ function handleProductTypeChange(typeValue) {
   loadList('reload')
 }
 function handleOrderChange(priceType) {
+  console.log(priceType)
   state.priceType = priceType
 
   // reset
@@ -117,10 +121,11 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   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) {
+  if (state.priceType === 1 || state.priceType === 0) {
     params.priceType = state.priceType
   }
   if (action === 'reload') {

src/pages/store/home/search.vue

@@ -116,7 +116,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
-  console.log(state.totalPage)
+  // console.log(state.totalPage)
   if (state.currentPage > state.totalPage) {
     state.status = 'noMore';
   } else {
@@ -137,15 +137,6 @@ onPullDownRefresh(() => {
       uni.stopPullDownRefresh()
     }, 300)
   })
-  // loadPost(state.data.id, 'reload', items => {
-  //   if (items) {
-  //     setTimeout(() => {
-  //       uni.stopPullDownRefresh()
-  //     }, 300)
-  //   } else {
-  //     uni.stopPullDownRefresh()
-  //   }
-  // })
 })
 
 function handleProductTypeChange(typeValue) {

src/pages/store/nearby/index.vue

@@ -3,6 +3,7 @@ import {getMerchantCategory, getSelectMerchant, getSelectMerchantSort} from "~/a
 import type {StoreResult} from "~/apis/model/storeModel";
 import {StoreParams} from "~/apis/model/storeModel";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
 
 const state = reactive<any>({
   // 列表高度
@@ -30,11 +31,20 @@ const state = reactive<any>({
   lng: '',
 
   currentMerchantCategoryId: 0,
+
+  options: [{
+    text: '智能推荐',
+    value: 1,
+  }, {
+    text: '距离优先',
+    value: 2
+  }],
+  menuDefaultValue: 1
   // merchantPageInfo: {}
 })
 const searchValue = ref('')
 
-const { windowHeight } = uni.getSystemInfoSync()
+const {windowHeight} = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 70
 
 onLoad(() => {
@@ -44,6 +54,9 @@ onLoad(() => {
   })
 
   // loadSelectMerchant('reload')
+})
+
+onShow(() => {
   loadAll()
 })
 
@@ -51,6 +64,7 @@ function loadAll() {
   state.category_id = 0
   loadSelectMerchant('reload')
 }
+
 function handleCategoryChange(category) {
   console.log(category)
   state.currentMerchantCategoryId = category.merchant_category_id
@@ -59,6 +73,7 @@ function handleCategoryChange(category) {
   state.category_id = category.merchant_category_id
   loadSelectMerchant('reload')
 }
+
 function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => void) {
   if (state.category_id == 0) {
     state.currentMerchantCategoryId = state.category_id
@@ -68,8 +83,9 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
     pageSize: state.pageSize,
     mer_keyword: searchValue.value,
     // mer_keyword: mer_keyword,
-    lat: '',
-    lng: '',
+    // lat: '',
+    // lng: '',
+
   }
   if (state.category_id !== 0) {
     // params.category_id = category_id
@@ -77,6 +93,13 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
       category_id: state.category_id
     })
   }
+  if (state.menuDefaultValue === 2) {
+    params = Object.assign({}, params, {
+      distanceAsc: 0,
+      lat: uni.getStorageSync(USER_LATITUDE),
+      lng: uni.getStorageSync(USER_LONGITUDE)
+    })
+  }
   getSelectMerchant(params).then((res: StoreResult) => {
     state.total = res.total
     state.totalPage = Math.ceil(state.total / state.pageSize);
@@ -106,8 +129,12 @@ function handleShowMerchant(merchant) {
 }
 
 
-function change() {}
-function onChange() {}
+function change() {
+}
+
+function onChange() {
+}
+
 // 下拉刷新被下拉
 const onRefresherPulling = e => {
   state.triggered = true;
@@ -124,6 +151,7 @@ const onRefresherAbort = e => {
 const onRefresherRefresh = e => {
   loadSelectMerchant(0)
 };
+
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
@@ -137,102 +165,119 @@ function handleScrollToLower() {
 
 </script>
 <template>
-<!--  <nut-category :category="state.merchantCategory" @change="change">-->
-<!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
-<!--    </nut-category-pane>-->
-<!--  </nut-category>-->
-    <nut-searchbar
-        class="absolute top-0"
-        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
-      <template v-slot:rightout>
-        <div @tap="loadSelectMerchant('reload')">
-          搜索
-        </div>
-      </template>
-    </nut-searchbar>
+  <!--  <nut-category :category="state.merchantCategory" @change="change">-->
+  <!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
+  <!--    </nut-category-pane>-->
+  <!--  </nut-category>-->
+  <nut-searchbar
+      class="absolute top-0"
+      v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
+    <template v-slot:rightout>
+      <div @tap="loadSelectMerchant('reload')">
+        搜索
+      </div>
+    </template>
+  </nut-searchbar>
 
   <div class="flex">
     <!-- 左侧 一级分类 -->
-    <scroll-view
-        :scroll-y="true"
-        :style="{ height: `${state.scrollHeight}px` }"
-        class="w-25 h-full bg-[#f8f8f8]"
-    >
-      <div
-          @tap="loadAll()"
-          :class="state.currentMerchantCategoryId == 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.currentMerchantCategoryId == 0"></div>
-          <div>全部</div>
+    <div>
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          class="w-25 h-full bg-[#f8f8f8]"
+      >
+        <div
+            @tap="loadAll()"
+            :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
+            class="relative w-25 h-12 block text-sm flex justify-center items-center">
+          <div class="flex items-center gap-1">
+            <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == 0"></div>
+            <div>全部</div>
+          </div>
+
         </div>
+        <div v-for="(item, index) in state.merchantCategory" :key="index"
+             @tap="handleCategoryChange(item)"
+             :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
+             class="relative h-12 block text-sm flex justify-center items-center gap-1 w-25"
+        >
+          <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
 
-      </div>
-      <div v-for="(item, index) in state.merchantCategory" :key="index"
-           @tap="handleCategoryChange(item)"
-           :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
-           class="relative h-15 block text-sm flex justify-center items-center gap-1 w-25"
-      >
-        <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
+          <div>
+            {{ item.category_name }}
 
-        <div>
-          {{item.category_name}}
+          </div>
 
         </div>
+      </scroll-view>
 
+    </div>
+
+
+    <div>
+      <div class="fixed z-3 flex flex-col justify-center h-10">
+        <nut-menu>
+          <nut-menu-item v-model="state.menuDefaultValue"
+                         :options="state.options"
+                         @change="loadSelectMerchant('reload')"
+          >
+
+          </nut-menu-item>
+        </nut-menu>
       </div>
-    </scroll-view>
-
-
-    <scroll-view
-        :scroll-y="true"
-        :style="{ height: `${state.scrollHeight}px` }"
-        scroll-with-animation
-        class="flex flex-1  flex-col h-full w-full  p-3 gap-3"
-        :refresher-enabled="true"
-        refresher-background="#f5f5f5"
-        refresher-default-style="black"
-        :refresher-triggered="state.triggered"
-        @scrolltolower="handleScrollToLower"
-        @refresherPulling="onRefresherPulling"
-        @refresherRestore="onRefresherRestore"
-        @refresherAbort="onRefresherAbort"
-        @refresherrefresh="onRefresherRefresh"
-        v-if="state.merchantList && state.merchantList.length > 0"
-
-    >
-      <div
-          v-for="(item, index) in state.merchantList" :key="index"
-          @click="handleShowMerchant(item)"
-          class="mb-3 ">
-        <div class="flex">
-          <div class="flex ">
-            <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">
-            <div class="flex flex-col gap-2">
-              <div class="truncate w-40 ">
-                {{ item.mer_name }}
-              </div>
-              <div class="text-xs text-gray">
-                {{ item.care_count }} 人关注
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          scroll-with-animation
+          class="flex flex-1  flex-col h-full w-full  p-3 gap-3 mt-8"
+          :refresher-enabled="true"
+          refresher-background="#f5f5f5"
+          refresher-default-style="black"
+          :refresher-triggered="state.triggered"
+          @scrolltolower="handleScrollToLower"
+          @refresherPulling="onRefresherPulling"
+          @refresherRestore="onRefresherRestore"
+          @refresherAbort="onRefresherAbort"
+          @refresherrefresh="onRefresherRefresh"
+          v-if="state.merchantList && state.merchantList.length > 0"
+
+      >
+        <div
+            v-for="(item, index) in state.merchantList" :key="index"
+            @click="handleShowMerchant(item)"
+            class="mb-3 ">
+          <div class="flex">
+            <div class="flex ">
+              <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">
+              <div class="flex flex-col gap-2">
+                <div class="truncate w-40 ">
+                  {{ item.mer_name }}
+                </div>
+                <div class="text-xs text-gray">
+                  {{ item.care_count }} 人关注
+                </div>
               </div>
+
+              <div class="text-xs">{{ (item.distance / 100).toFixed(1) }}km</div>
             </div>
 
-            <div class="text-xs">{{ (item.distance / 100).toFixed(1)}}km</div>
           </div>
-
         </div>
-      </div>
-    </scroll-view>
-    <div class="flex-1 justify-center items-center" v-else>
-      <CXBEmpty />
+      </scroll-view>
+      <div class="flex-1 justify-center items-center" v-else>
+        <CXBEmpty/>
 
+      </div>
     </div>
+
   </div>
 </template>
 <route lang="yaml">
@@ -240,3 +285,22 @@ style:
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true
 </route>
+
+<style lang="scss">
+page {
+
+  --nut-menu-item-font-size: 14px;
+  --nut-menu-bar-line-height: 24px;
+  --nut-menu-bar-box-shadow: none;
+  --nut-menu-item-active-text-color: #FE0032;
+
+  .nut-menu {
+    background: none !important;
+  }
+  .nut-menu__bar {
+    box-shadow: none !important;
+    border: 1px solid #FE0032;
+    border-radius: 4px;
+  }
+}
+</style>

src/pages/store/product/detail.vue

@@ -486,6 +486,7 @@ function handleShowCustomer() {
           <div class="pl-3" v-if="detail && detail.merchant">
             <div v-for="(item, index) in detail.merchant.recommend"
                  :key="index"
+                 @click="handleProductItemClick(item)"
                  class="flex inline-flex items-center justify-center relative "
             >
               <MerchantProductCard :item="item" exClass="w-40 border border-solid border-gray-200 mr-3"/>

src/pages/store/product/other.vue

@@ -62,7 +62,7 @@ function loadProductDetail(product: Partial<IProductDetail>) {
   if (product.platform == 6) {
     getJdProductDetail(product.id).then(res => {
       const jdProduct = res[0]
-      console.log(jdProduct)
+      // console.log(jdProduct)
       mergeProductDetail({
         images: jdProduct.detail,
         coupon: {
@@ -164,9 +164,12 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 function handleBuyNow() {
   console.log(detail.value)
   if (detail.value?.platform == 6 && detail.value?.spreadUrl) {
+    // console.log(detail.value?.spreadUrl)
+    console.log(detail.value)
     uni.navigateToMiniProgram({
       appId: 'wx91d27dbf599dff74',
-      path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
+      // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
+      path: 'pages/union/proxy/proxy?spreadUrl=' + detail.value.materialUrl,
       extraData: {
         foo: 'bar'
       },
@@ -206,7 +209,7 @@ function handleBuyNow() {
   }
 
   if (detail.value?.platform == 9) {
-    // console.log(detail.value)
+    console.log(detail.value)
   }
   if (detail.value?.platform == 2) {
     console.log(detail.value)

src/pages/vip/index.vue

@@ -1,24 +1,24 @@
 <template>
-  <CXBBasePage :show="true" title="">
+<!--  <CXBBasePage :show="true" title="">-->
 
     <div class="flex flex-col gap-3 ">
-<!--      <div-->
-<!--          class="overflow-hidden fixed top-0 w-full"-->
-<!--      >-->
-<!--        <nut-searchbar-->
-<!--            v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">-->
-<!--          &lt;!&ndash;      <template v-slot:leftout>&ndash;&gt;-->
-<!--          &lt;!&ndash;        <div @tap="navBack">&ndash;&gt;-->
-<!--          &lt;!&ndash;          <nut-icon name="left"></nut-icon>&ndash;&gt;-->
-<!--          &lt;!&ndash;        </div>&ndash;&gt;-->
-<!--          &lt;!&ndash;      </template>&ndash;&gt;-->
-<!--          <template v-slot:rightout>-->
-<!--            <div @tap="searchProduct">-->
-<!--              搜索-->
-<!--            </div>-->
-<!--          </template>-->
-<!--        </nut-searchbar>-->
-<!--      </div>-->
+      <div
+          class="overflow-hidden fixed top-0 w-full"
+      >
+        <nut-searchbar
+            v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
+          <!--      <template v-slot:leftout>-->
+          <!--        <div @tap="navBack">-->
+          <!--          <nut-icon name="left"></nut-icon>-->
+          <!--        </div>-->
+          <!--      </template>-->
+          <template v-slot:rightout>
+            <div @tap="loadList('reload')">
+              搜索
+            </div>
+          </template>
+        </nut-searchbar>
+      </div>
       <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>
       <div class="flex px-3">
         会员专区
@@ -77,11 +77,19 @@
 
           </div>
         </grid-view>
-
+        <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" >
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
       </div>
+      <CXBEmpty v-else/>
     </div>
 
-  </CXBBasePage>
+<!--  </CXBBasePage>-->
 </template>
 
 <script setup lang="ts">
@@ -90,6 +98,7 @@ import FSearch from "~/components/FSearch/FSearch.vue";
 import {computed} from "vue";
 import {getVipAreaList} from "~/apis/merchant";
 import {CDN_URL} from "~/config/app";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 
@@ -102,12 +111,44 @@ const navBarStyle = computed(() => {
   }
 })
 
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  keyword: '' ,
+  status: 'noMore',
+})
 const list = ref()
 
 onLoad(() => {
+  // getVipAreaList({
+  //   page: 1,
+  //   limit: 20
+  // }).then(res => {
+  //   // console.log(res.list)
+  //   console.log(res.list)
+  //   if (res) {
+  //     list.value = res.list
+  //   }
+  // })
+  loadList('reload')
+})
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  console.log(state.keyword)
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+  console.log(params)
   getVipAreaList({
-    page: 1,
-    limit: 20
+    // page: state.currentPage,
+    // limit: state.pageSize
+    ...params
   }).then(res => {
     // console.log(res.list)
     console.log(res.list)
@@ -115,18 +156,52 @@ onLoad(() => {
       list.value = res.list
     }
   })
-})
-
+}
 function handleItemClick(item) {
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${item.product_id}`
   })
 }
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  console.log('到底了。。。')
+
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
 </script>
 
 <route lang="yaml">
 style:
-  navigationStyle: custom
   navigationBarTitleText: 储蓄保会员
   enablePullDownRefresh: true
 </route>
+<style>
+page {
+  background: #f8f8f8;
+  --nut-searchbar-background: #fff;
+  --nut-searchbar-input-background: #f8f8f8;
+  --nut-searchbar-input-box-shadow: none;
+}
+</style>

src/pages/webview/agreement.vue

@@ -1,5 +1,5 @@
 <template>
-  <web-view :src="url" />
+  <web-view :src="url" @load="onPageLoad"/>
 </template>
 <script setup lang="ts">
 // const props = defineProps({
@@ -8,6 +8,7 @@
 //     required: true
 //   }
 // })
+const type = ref('')
 const url = ref('https://vod.bjtdba.com/agreement/')
 const PRIVACY_AGREEMENT = '1' // 隐私政策
 const SERVICE_AGREEMENT = '2' // 服务协议
@@ -15,7 +16,24 @@ const SERVICE_AGREEMENT = '2' // 服务协议
 // const PROTOCOL = `http://vod.bjtdba.com/agreement/`
 onLoad((option: any) => {
   url.value = url.value + option.type
+  type.value = option.type
+  // uni.setNavigationBarTitle({
+  //   title: '活动说明'
+  // })
+  // if (option.type == '17') {
+  //   uni.setNavigationBarTitle({
+  //     title: '活动说明'
+  //   })
+  // }
 })
+
+function onPageLoad() {
+  // if (type.value == '17') {
+  //   uni.setNavigationBarTitle({
+  //     title: '活动说明'
+  //   })
+  // }
+}
 </script>
 <route lang="yaml">
 style: