feat: fix

components.d.ts

@@ -59,6 +59,8 @@ declare module '@vue/runtime-core' {
     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']
+    NutStep: typeof import('uniapp-nutui/components/step/step.vue')['default']
+    NutSteps: typeof import('uniapp-nutui/components/steps/steps.vue')['default']
     NutSwitch: typeof import('uniapp-nutui/components/switch/switch.vue')['default']
     NutTable: typeof import('uniapp-nutui/components/table/table.vue')['default']
     NutTabPane: typeof import('uniapp-nutui/components/tabpane/tabpane.vue')['default']

src/apis/model/refund.model.ts

@@ -0,0 +1,101 @@
+export interface RefundModel {
+    refund_order_id: string
+    refund_order_sn: string
+    order_id: string
+    uid: string
+    mer_id: string
+    extension_one: string
+    extension_two: string
+    delivery_type: string
+    delivery_id: string
+    delivery_mark: string
+    delivery_pics: string
+    delivery_phone: string
+    mer_delivery_user: string
+    mer_delivery_address: string
+    phone: string
+    mark: string
+    mer_mark: string
+    pics: Array<string>
+    refund_type: string
+    refund_message: string
+    refund_price: string
+    refund_postage: string
+    refund_num: string
+    fail_message: string
+    status: string
+    status_time: string
+    create_time: string
+    reconciliation_id: string
+    is_del: string
+    is_system_del: string
+    after_sn: string
+    refundProduct: Array<RefundProductModel>
+    private Merchant merchant: string
+    take_status: string
+}
+
+export interface RefundProductModel {
+    refund_product_id: string
+    refund_order_id: string
+    order_product_id: string
+    refund_num: string
+    create_time: string
+    product: {
+        order_product_id: string
+        order_id: string
+        uid: string
+        cart_id: string
+        product_id: string
+        extension_one: string
+        extension_two: string
+        product_sku: string
+        is_refund: string
+        product_num: string
+        refund_num: string
+        is_reply: string
+        product_price: string
+        private Cart_info cart_info: string
+        create_time: string
+        type: string
+    }
+}
+
+export interface ProductModel {
+    order_product_id: string
+    order_id: string
+    uid: string
+    cart_id: string
+    product_id: string
+    extension_one: string
+    extension_two: string
+    product_sku: string
+    is_refund: string
+    product_num: string
+    refund_num: string
+    is_reply: string
+    product_price: string
+    private Cart_info cart_info: string
+    create_time: string
+    type: string
+}
+
+export interface CartInfoModel {
+    product: ProductModel
+    productAttr: ProductAttrModel
+}
+
+export interface ProductAttrModel {
+    product_id: string
+    stock: string
+    price: string
+    unique: string
+    sku: string
+    volume: string
+    weight: string
+    ot_price: string
+    dacang_price: string
+    cost: string
+    bc_extension_one: string
+    bc_extension_two: string
+}

src/apis/order.api.ts

@@ -70,11 +70,24 @@ enum API {
 }
 
 /**
+ * 退款订单详情
+ * @param id
+ */
+export function getRefundDetail(id: string) {
+    return defHttp.get({
+        url: API.REFUND_DETAIL + `/${id}`,
+    })
+}
+
+/**
  * 售后-订单列表
  */
-export function refundList(): Promise<AfterSalesOrderResult> {
+export function refundList(params: { page: number, type: number, limit: number }): Promise<AfterSalesOrderResult> {
     return defHttp.get({
-        url: API.REFUND_LIST
+        url: API.REFUND_LIST,
+        data: {
+            ...params
+        }
     })
 }
 

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

@@ -2,6 +2,7 @@
 import {CDN_URL} from "~/config/app";
 import {getSpreadImage, getSpreadNumber, getUserInviteList} from "~/apis/user";
 import {encodePhone} from "../../utils";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 const userStore = useUserStore()
 
 const invite_friends_bg = CDN_URL + '/static/assets/invite_friends_bg_220826.png'
@@ -118,136 +119,139 @@ function shareImage() {
 }
 </script>
 <template>
-  <div class="relative top-0 left-0 min-h-screen h-full w-full bg-[#FFCB75] z-0 ">
-    <image :src="invite_friends_bg" mode="widthFix" class="w-full h-full absolute"></image>
-    <image
-        @click="handleShowAgreement(17)"
-        :src="huodongshuomingImg" mode="widthFix" class="w-10 absolute top-0 right-3"></image>
-    <div
-        @click="showDialog = true"
-        class="text-sm text-black absolute top-3 left-3 px-2">
-      邀请码
-    </div>
+  <CXBBasePage>
+    <div class="relative top-0 left-0 min-h-screen h-full w-full bg-[#FFCB75] z-0 ">
+      <image :src="invite_friends_bg" mode="widthFix" class="w-full h-full absolute"></image>
+      <image
+          @click="handleShowAgreement(17)"
+          :src="huodongshuomingImg" mode="widthFix" class="w-10 absolute top-0 right-3"></image>
+      <div
+          @click="showDialog = true"
+          class="text-sm text-black absolute top-3 left-3 px-2">
+        邀请码
+      </div>
 
-    <nut-dialog title="邀请码"  v-model:visible="showDialog" @cancel="onCancel" @ok="onOk" >
-      <template>
-        <input v-model="inviteCode" class="border border-solid border-1px rounded h-10" placeholder="请输入推荐人邀请码"/>
-      </template>
-    </nut-dialog>
+      <nut-dialog title="邀请码"  v-model:visible="showDialog" @cancel="onCancel" @ok="onOk" >
+        <template>
+          <input v-model="inviteCode" class="border border-solid border-1px rounded h-10" placeholder="请输入推荐人邀请码"/>
+        </template>
+      </nut-dialog>
 
-    <div class="relative top-120 text-white flex flex-col items-center justify-center pb-30">
-      <div class=" w-full h-10 relative flex justify-center items-center">
-        <div class="relative w-60 text-center z-1 h-10 absolute top-2">
-          立即邀请
+      <div class="relative top-120 text-white flex flex-col items-center justify-center pb-30">
+        <div class=" w-full h-10 relative flex justify-center items-center">
+          <div class="relative w-60 text-center z-1 h-10 absolute top-2">
+            立即邀请
+          </div>
+          <image :src="buttonImg" mode="widthFix" class="w-60 h-10 absolute top-0"></image>
         </div>
-        <image :src="buttonImg" mode="widthFix" class="w-60 h-10 absolute top-0"></image>
-      </div>
-      <div class="text-primary text-[12px] relative py-3">我的邀请码：{{ userStore && userStore.userInfo && userStore.userInfo.user_number }}</div>
-      <div class="relative w-full flex items-center">
-        <div class="w-full px-3 flex justify-center items-center  text-gray-600 text-[12px]">
-          <div class="integral_bg">
-            <div class="pt-20 flex flex-col gap-3 px-5 h-48 ">
-              <div class="bg-[#ffedc6] flex justify-around items-center flex-1 ">
-                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center gap-2">
-                  <div>首次邀请好友</div>
-                  <div class="flex gap-1  ">
-                    <text>奖励<text class="text-primary text-xl font-bold">99</text>积分</text>
+        <div class="text-primary text-[12px] relative py-3">我的邀请码：{{ userStore && userStore.userInfo && userStore.userInfo.user_number }}</div>
+        <div class="relative w-full flex items-center">
+          <div class="w-full px-3 flex justify-center items-center  text-gray-600 text-[12px]">
+            <div class="integral_bg">
+              <div class="pt-20 flex flex-col gap-3 px-5 h-48 ">
+                <div class="bg-[#ffedc6] flex justify-around items-center flex-1 ">
+                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center gap-2">
+                    <div>首次邀请好友</div>
+                    <div class="flex gap-1  ">
+                      <text>奖励<text class="text-primary text-xl font-bold">99</text>积分</text>
+                    </div>
                   </div>
-                </div>
-                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                  <div>好友首次获得养老金</div>
-                  <div class="flex gap-1  ">
-                    <text>奖励<text class="text-primary text-xl font-bold">350</text>积分</text>
+                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                    <div>好友首次获得养老金</div>
+                    <div class="flex gap-1  ">
+                      <text>奖励<text class="text-primary text-xl font-bold">350</text>积分</text>
+                    </div>
                   </div>
                 </div>
-              </div>
 
-              <div class="bg-[#ffedc6] flex justify-around items-center flex-1">
-                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                  <div>好友签到3天</div>
-                  <div class="flex gap-1  ">
-                    <text>奖励<text class="text-primary text-xl font-bold">50</text>积分</text>
+                <div class="bg-[#ffedc6] flex justify-around items-center flex-1">
+                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                    <div>好友签到3天</div>
+                    <div class="flex gap-1  ">
+                      <text>奖励<text class="text-primary text-xl font-bold">50</text>积分</text>
+                    </div>
                   </div>
-                </div>
-                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                  <div>好友签到14天</div>
-                  <div class="flex gap-1  ">
-                    <text>奖励<text class="text-primary text-xl font-bold">100</text>积分</text>
+                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                    <div>好友签到14天</div>
+                    <div class="flex gap-1  ">
+                      <text>奖励<text class="text-primary text-xl font-bold">100</text>积分</text>
+                    </div>
                   </div>
-                </div>
-                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                  <div>好友签到30天</div>
-                  <div class="flex gap-1  ">
-                    <text>奖励<text class="text-primary text-xl font-bold">300</text>积分</text>
+                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                    <div>好友签到30天</div>
+                    <div class="flex gap-1  ">
+                      <text>奖励<text class="text-primary text-xl font-bold">300</text>积分</text>
+                    </div>
                   </div>
                 </div>
+
               </div>
 
             </div>
 
-          </div>
-
 
-<!--          <image :src="integral_bg" mode="widthFix" class="w-full h-full relative"></image>-->
+            <!--          <image :src="integral_bg" mode="widthFix" class="w-full h-full relative"></image>-->
 
+          </div>
         </div>
-      </div>
-      <div class="relative w-full">
-        <div class="px-4">
-          <div class="bg-[#F8F8F8] rounded-lg h-60 text-gray-500">
-            <div class="bg-[#FDF5E8] rounded-t-lg flex items-center justify-center py-2">
-              <image :src="goodFriendImg" mode="widthFix" class="w-50"></image>
-            </div>
-            <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList && invitePartnerModel.userInviteVoList.list.length > 0">
-              <swiper autoplay vertical :circular="true" :display-multiple-items="4" class="w-auto h-46">
-                <swiper-item  v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index" class="w-auto text-[12px] h-auto">
-                  <div class="p-3 h-30 flex justify-between  f-hairline-bottom">
-                    <div class="flex gap-2">
-                      <image :src="item.avatar" mode="widthFix" class="w-8 h-8"></image>
-                      <div class="flex flex-col">
-                        <div class="font-bold">{{ item.nickname }}</div>
-                        <div>{{ encodePhone( item.phone ) }}</div>
+        <div class="relative w-full">
+          <div class="px-4">
+            <div class="bg-[#F8F8F8] rounded-lg h-60 text-gray-500">
+              <div class="bg-[#FDF5E8] rounded-t-lg flex items-center justify-center py-2">
+                <image :src="goodFriendImg" mode="widthFix" class="w-50"></image>
+              </div>
+              <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList && invitePartnerModel.userInviteVoList.list.length > 0">
+                <swiper autoplay vertical :circular="true" :display-multiple-items="4" class="w-auto h-46">
+                  <swiper-item  v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index" class="w-auto text-[12px] h-auto">
+                    <div class="p-3 h-30 flex justify-between  f-hairline-bottom">
+                      <div class="flex gap-2">
+                        <image :src="item.avatar" mode="widthFix" class="w-8 h-8"></image>
+                        <div class="flex flex-col">
+                          <div class="font-bold">{{ item.nickname }}</div>
+                          <div>{{ encodePhone( item.phone ) }}</div>
+                        </div>
                       </div>
-                    </div>
 
-                    <div class="text-gray">{{ item.promoterTime }}</div>
+                      <div class="text-gray">{{ item.promoterTime }}</div>
 
 
-                  </div>
-                </swiper-item>
-              </swiper>
-            </div>
+                    </div>
+                  </swiper-item>
+                </swiper>
+              </div>
 
-            <div v-else class="flex justify-center items-center text-[12px] text-gray h-48">
-              竟然没有好友
+              <div v-else class="flex justify-center items-center text-[12px] text-gray h-48">
+                竟然没有好友
+              </div>
             </div>
+
           </div>
 
         </div>
-
-      </div>
-      <div class="relative w-full text-[12px] py-5 text-black flex justify-center items-center">
-        <div class="flex gap-4">
-          <div
-              @click="shareImage"
-              class="flex flex-col justify-center items-center gap-3">
-            <image :src="wexinLogo" mode="widthFix" class="w-10 h-10"></image>
-            <div>微信</div>
-          </div>
-          <div
-              @click="handleShowCode"
-              class="flex flex-col justify-center items-center gap-3">
-            <image :src="smLogo" mode="widthFix" class="w-10 h-10"></image>
-            <div>面对面扫码</div>
+        <div class="relative w-full text-[12px] py-5 text-black flex justify-center items-center">
+          <div class="flex gap-4">
+            <div
+                @click="shareImage"
+                class="flex flex-col justify-center items-center gap-3">
+              <image :src="wexinLogo" mode="widthFix" class="w-10 h-10"></image>
+              <div>微信</div>
+            </div>
+            <div
+                @click="handleShowCode"
+                class="flex flex-col justify-center items-center gap-3">
+              <image :src="smLogo" mode="widthFix" class="w-10 h-10"></image>
+              <div>面对面扫码</div>
+            </div>
           </div>
         </div>
       </div>
+
     </div>
 
-  </div>
+  </CXBBasePage>
 </template>
 
 <style>

src/pages/order/components/RefundOrderItem.vue

@@ -168,10 +168,16 @@ function handleProductItemClick(
 }
 
 
+function handleShowDetail(orderItem) {
+  console.log(orderItem)
+  uni.navigateTo({
+    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+  })
+}
 </script>
 
 <template>
-  <div class="mb-3 bg-white rounded p-3">
+  <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">
@@ -196,8 +202,7 @@ function handleProductItemClick(
           <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="flex flex-col flex-1">
                 <div class="line-clamp-2 text-[12px]">
                   {{ orderProduct.product.cart_info.product.store_name }}
                 </div>
@@ -205,36 +210,24 @@ function handleProductItemClick(
                   {{ 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]">共{{ orderProduct.product.product_num }}件</div>
+                  </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="orderItem.status == 0 || orderItem.status == 1 || orderItem.status == 2">
 
-          <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>
+<!--            <nut-button size="small" type="default" @click="handleCancelOrder">撤销售后</nut-button>-->
+            <nut-button size="small" plain type="primary" @tap.stop="handleShowDetail(orderItem)">查看详情</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 class="flex justify-end gap-2" v-else>
+            <nut-button size="small" plain type="primary" @tap.stop="handleShowDetail(orderItem)">查看详情</nut-button>
           </div>
         </div>
     </div>

src/pages/order/test.json

@@ -2,157 +2,201 @@
   "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",
+    "refund_order_id": "657",
+    "refund_order_sn": "rwx169381561906885278",
+    "order_id": "3923",
+    "uid": "10574",
+    "mer_id": "321",
+    "extension_one": "0.00",
+    "extension_two": "0.00",
+    "delivery_type": null,
+    "delivery_id": null,
+    "delivery_mark": null,
+    "delivery_pics": null,
+    "delivery_phone": null,
+    "mer_delivery_user": null,
+    "mer_delivery_address": null,
+    "phone": null,
+    "mark": "",
+    "mer_mark": null,
+    "pics": [],
+    "refund_type": "1",
+    "refund_message": "订单信息拍错了",
+    "refund_price": "5200.00",
+    "refund_postage": "0.00",
+    "refund_num": "1",
+    "fail_message": null,
+    "status": "0",
+    "status_time": "2023-09-04 16:20:19",
+    "create_time": "2023-09-04 16:20:19",
+    "reconciliation_id": "0",
+    "is_del": "0",
+    "is_system_del": "0",
+    "after_sn": null,
+    "take_status": "未收到货",
+    "dhm_msg": "",
+    "refundProduct": [
+      {
+        "refund_product_id": "670",
+        "refund_order_id": "657",
+        "order_product_id": "4084",
+        "refund_num": "1",
+        "create_time": "2023-08-14 08:25:47",
+        "product": {
+          "order_product_id": "4084",
+          "order_id": "3808",
+          "uid": "389",
+          "cart_id": "9848",
+          "product_id": "5624",
+          "extension_one": "0.00",
+          "extension_two": "0.00",
+          "product_sku": "759a13446d30",
+          "is_refund": "1",
+          "product_num": "1",
+          "refund_num": "0",
+          "is_reply": "0",
+          "product_price": "9.90",
+          "cart_info": {
+            "product": {
+              "product_id": "5624",
+              "image": "https:\/\/img.funengscm.com\/a8dbc8f89850e7a802c3335b4c04863f",
+              "store_name": "拍一发二小白洗鞋神器清洗剂白鞋清洁去污去黄增白擦",
+              "is_show": "1",
+              "status": "1",
+              "is_del": "0",
+              "unit_name": "个",
+              "price": "9.90",
+              "mer_status": "1",
+              "temp_id": "105",
+              "give_coupon_ids": [],
+              "is_gift_bag": "0",
+              "is_used": "1",
+              "product_type": "0",
+              "old_product_id": "716",
+              "temp": {
+                "shipping_template_id": "105",
+                "name": "包邮",
+                "type": "0",
+                "appoint": "0",
+                "undelivery": "0",
+                "mer_id": "0",
+                "is_default": "0",
+                "sort": "0",
+                "create_time": "2020-07-13 17:30:51",
+                "regionAddress": null,
+                "undelives": null,
+                "freeAddress": null
+              }
+            },
+            "productAttr": {
+              "gong_mer_profit": "1.44",
+              "gong_pension": "0.72",
+              "gong_market_price": "9.90",
+              "cost_price": "7.01",
+              "product_id": "5624",
+              "stock": "100",
+              "price": "9.90",
+              "unique": "759a13446d30",
+              "sku": "拍一发二",
+              "volume": "0.00",
+              "weight": "0.00",
+              "ot_price": "36.00",
+              "dacang_price": "0.00",
+              "cost": "7.01",
+              "bc_extension_one": 0,
+              "bc_extension_two": 0,
+              "seckill": 0
+            },
+            "product_type": "0"
+          },
+          "create_time": "2023-08-04 13:24:55",
+          "type": "1"
+        }
+      },
+      {
+        "refund_product_id": "675",
+        "refund_order_id": "657",
+        "order_product_id": "4189",
+        "refund_num": "1",
+        "create_time": "2023-09-04 16:20:19",
+        "product": {
+          "order_product_id": "4189",
+          "order_id": "3923",
           "uid": "10574",
-          "cart_id": "11091",
-          "product_id": "6105",
+          "cart_id": "10121",
+          "product_id": "5484",
           "extension_one": "0.00",
           "extension_two": "0.00",
-          "product_sku": "7b5cd1815c80",
-          "is_refund": "0",
+          "product_sku": "cec1027208c0",
+          "is_refund": "1",
           "product_num": "1",
-          "refund_num": "1",
+          "refund_num": "0",
           "is_reply": "0",
-          "product_price": "10.00",
+          "product_price": "5200.00",
           "cart_info": {
             "product": {
-              "product_id": "6105",
-              "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-12\/74d95202309120948354624.jpg",
-              "store_name": "蛋白肽测试",
+              "product_id": "5484",
+              "image": "https:\/\/img.funengscm.com\/d4461dcc6bb88ade137410722935c8a8",
+              "store_name": "金六福珠宝 MY103 白钻\/1克拉 女士项链【贵重物品 顺丰到付签收】",
               "is_show": "1",
               "status": "1",
               "is_del": "0",
-              "unit_name": "的",
-              "price": "300.00",
+              "unit_name": "个",
+              "price": "5200.00",
               "mer_status": "1",
-              "temp_id": "259",
+              "temp_id": "105",
               "give_coupon_ids": [],
               "is_gift_bag": "0",
               "is_used": "1",
               "product_type": "0",
-              "old_product_id": "0",
+              "old_product_id": "657",
               "temp": {
-                "shipping_template_id": "259",
-                "name": "测试001",
-                "type": "1",
+                "shipping_template_id": "105",
+                "name": "包邮",
+                "type": "0",
                 "appoint": "0",
                 "undelivery": "0",
-                "mer_id": "465",
+                "mer_id": "0",
                 "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"
-                },
+                "create_time": "2020-07-13 17:30:51",
+                "regionAddress": null,
                 "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",
+              "gong_mer_profit": "1874.00",
+              "gong_pension": "937.00",
+              "gong_market_price": "5200.00",
+              "cost_price": "1452.00",
+              "product_id": "5484",
+              "stock": "100",
+              "price": "5200.00",
+              "unique": "cec1027208c0",
+              "sku": "金六福珠宝 MY103 白钻\/1克拉 女士项链",
+              "volume": "0.00",
+              "weight": "0.00",
+              "ot_price": "10999.00",
+              "dacang_price": "0.00",
+              "cost": "1452.00",
               "bc_extension_one": 0,
               "bc_extension_two": 0,
-              "seckill": 1
+              "seckill": 0
             },
             "product_type": "0"
           },
-          "create_time": "2023-09-15 17:44:28",
+          "create_time": "2023-09-04 11:57:00",
           "type": "5"
         }
-      ]
+      }
+    ],
+    "merchant": {
+      "mer_id": "321",
+      "mer_name": "大仓创客",
+      "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/d616961db8aefbe92f72972a1d7db88a.png",
+      "business_id": "0",
+      "merchant_type": "3"
     }
   }
 }

src/pages/refund/detail.vue

@@ -0,0 +1,197 @@
+<script setup lang="ts">
+import {CDN_URL} from "~/config/app";
+import {getRefundDetail} 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({
+  currentStep: 1,
+  currentStepTitle: '退款申请',
+  detail: null
+})
+// const detail = ref({})
+onLoad((options) => {
+  // getRefundDetail(options.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.status == 3) {
+      state.currentStep = 3
+    }
+    if (res.status == -1) {
+      state.currentStep = 2
+    }
+  })
+})
+
+
+</script>
+<template>
+
+  <div class="" v-if="state.detail">
+    <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="p-3">
+          <div class="bg-white rounded-lg h-18 flex justify-center items-center ">
+            <div class="w-full">
+              <nut-steps :current="state.currentStep" progress-dot>
+                <nut-step title="退款申请"></nut-step>
+                <nut-step title="商家处理"></nut-step>
+                <nut-step :title="state.detail.status == -1 ? '退款失败' : '退款成功'"></nut-step>
+              </nut-steps>
+            </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>
+
+                <div class="f-text-color-2 i-tabler-chevron-right"></div>
+
+              </div>
+            </div>
+
+            <div @tap.stop="handleShowOrderDetail(orderItem)">
+              <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 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>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <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>
+              </div>
+
+              <div class="py-3 flex flex-col gap-3">
+                <div class="flex justify-between">
+                  <div>订单编号</div>
+                  <div class="text-gray-400">{{ state.detail.refund_order_sn }}</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.take_status }}</div>
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<route lang="yaml" type="home">
+style:
+  navigationBarTitleText: 售后订单
+</route>
+
+<style lang="scss">
+.top-bg {
+  width: 750 rpx;
+  height: 212 rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/shouhoudingdanbeijing.png');
+  background-size: 100% 100%;
+}
+
+page {
+  --nut-steps-base-icon-font-size: 12px;
+  --nut-steps-base-title-font-size: 12px;
+  background: #f8f8f8;
+}
+</style>

src/pages/refund/index.vue

@@ -5,35 +5,136 @@ import RefundOrderItem from "~/pages/order/components/RefundOrderItem.vue";
 
 const state = reactive({
   tabvalue: 0,
-  list: []
+  list: [],
+  type: 0,
+
+
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  status: 'noMore',
 })
 
 onLoad(() => {
-  refundList().then(res => {
-    console.log(res)
-    state.list = res.list
+  loadList('reload')
+})
+
+
+function loadList(action: 'page' | 'reload',  callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize,
+    type: state.type
+  }
+
+  refundList(params).then(res => {
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.status = 'more'
+
+    if (callback) {
+      callback(res.list)
+    }
   })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  setTimeout(() => {
+    loadList('page', (items) => {
+      if (items.length === 0) {
+        state.status = 'noMore'
+      }
+    })
+  }, 300)
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
 })
+// watch(() => state.t)
+function handleTabChange(	{title,paneKey,disabled}) {
+
+  console.log(paneKey)
+  if (paneKey == 0) {
+    state.type = 0
+    state.currentPage = 1
+    loadList('reload')
+  }
+  if (paneKey == 1) {
+    state.type = 1
+    state.currentPage = 1
+    loadList('reload')
+  }
+  if (paneKey == 2) {
+    state.type = 2
+    state.currentPage = 1
+    loadList('reload')
+  }
+}
 </script>
 <template>
   <div>
-    <nut-tabs v-model="state.tabvalue">
+    <nut-tabs v-model="state.tabvalue" @change="handleTabChange">
       <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 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>
         <CXBEmpty v-else/>
       </nut-tab-pane>
       <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 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>
+        <CXBEmpty v-else/>
       </nut-tab-pane>
       <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 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>
+        <CXBEmpty v-else/>
       </nut-tab-pane>
     </nut-tabs>
   </div>
 </template>
-<route lang="yaml"   type="home">
+<route lang="yaml">
 style:
   navigationBarTitleText: 退款/售后
 </route>

src/pages/vip/index.vue

@@ -136,7 +136,7 @@ onLoad(() => {
 })
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-  console.log(state.keyword)
+  // console.log(state.keyword)
   const params = {
     page: state.currentPage,
     limit: state.pageSize