feat: fix

components.d.ts

@@ -43,6 +43,8 @@ declare module '@vue/runtime-core' {
     NutButton: typeof import('uniapp-nutui/components/button/button.vue')['default']
     NutCalendar: typeof import('uniapp-nutui/components/calendar/calendar.vue')['default']
     NutCascader: typeof import('uniapp-nutui/components/cascader/cascader.vue')['default']
+    NutCell: typeof import('uniapp-nutui/components/cell/cell.vue')['default']
+    NutCellGroup: typeof import('uniapp-nutui/components/cellgroup/cellgroup.vue')['default']
     NutCheckbox: typeof import('uniapp-nutui/components/checkbox/checkbox.vue')['default']
     NutDatePicker: typeof import('uniapp-nutui/components/datepicker/datepicker.vue')['default']
     NutDialog: typeof import('uniapp-nutui/components/dialog/dialog.vue')['default']
@@ -57,6 +59,8 @@ 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']
+    NutRadio: typeof import('uniapp-nutui/components/radio/radio.vue')['default']
+    NutRadioGroup: typeof import('uniapp-nutui/components/radiogroup/radiogroup.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']

src/apis/common.ts

@@ -78,6 +78,9 @@ export function closeAccount(phone: string) {
 
     return defHttp.post({
         url: API.USER_LOGOUT,
+        data: {
+            phone
+        }
     })
 }
 

src/apis/model/refund.model.ts

@@ -1,3 +1,26 @@
+export interface RefundApplyRequest {
+    //订单商品id ---order_product_id
+    ids: string
+    // 申请说明
+    mark: string
+    // 数量
+    num: string
+    // 联系电话
+    phone: string
+    // 图片
+    pics: Array<string>
+    // 原因
+    refund_message: string
+    // 退款金额
+    refund_price: string
+    // 固定值
+    type: string
+    //1:退款 2:退款退货
+    refund_type: string
+    // 收货状态
+    goods: string
+
+}
 export interface RefundModel {
     refund_order_id: string
     refund_order_sn: string
@@ -31,7 +54,9 @@ export interface RefundModel {
     is_system_del: string
     after_sn: string
     refundProduct: Array<RefundProductModel>
-    private Merchant merchant: string
+    // private Merchant merchant: string
+    // merchant: MerchantModel
+    merchant: any
     take_status: string
 }
 
@@ -55,7 +80,8 @@ export interface RefundProductModel {
         refund_num: string
         is_reply: string
         product_price: string
-        private Cart_info cart_info: string
+        // private Cart_info cart_info: string
+        cart_info: any
         create_time: string
         type: string
     }
@@ -75,7 +101,8 @@ export interface ProductModel {
     refund_num: string
     is_reply: string
     product_price: string
-    private Cart_info cart_info: string
+    // private Cart_info cart_info: string
+    cart_info: any
     create_time: string
     type: string
 }

src/apis/order.api.ts

@@ -7,6 +7,7 @@ import type {
 import type {ThirdOrderResult} from "~/apis/model/third-order.model";
 import type {CommentProductRequest} from "~/apis/model/comment-product";
 import type {AfterSalesOrderResult} from "~/apis/model/after-sales-order.model";
+import type {RefundApplyRequest} from "~/apis/model/refund.model";
 
 export interface CartIdRequest {
     cart_id: Array<string>
@@ -70,6 +71,17 @@ enum API {
 }
 
 /**
+ * 申请退款
+ */
+export function refundApply(id: string, request: RefundApplyRequest) {
+    return defHttp.post({
+        url: API.REFUND_APPLY + `/${id}`,
+        data: {
+            ...request
+        }
+    })
+}
+/**
  * 退款订单详情
  * @param id
  */

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -30,7 +30,6 @@ const show = ref(props.show || false)
 const showValue = computed<PopupProps['show']>({
   get: () => props.show || show.value,
   set(val) {
-    // console.log(val + 'xxxx')
     if (val)
       emit(OPEN_EVENT)
     else
@@ -102,7 +101,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%] max-h-[80%]"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-[60%] max-h-[80%]"
 
   >
     <div class="flex flex-col justify-between h-full">

src/pages/dacang/list/index.vue

@@ -147,9 +147,9 @@ function handleShowSearchPage() {
 <!--                  :current="classifyId"-->
 <!--                  @click:item="handleTabItemClick"-->
 <!--    />-->
-    <div class=" z-10"  >
+    <div class=" fixed"  :class="headerClass">
       <div :class="headerClass">
-        <FNavBar :fixed="true" exClass="pl-2">
+        <FNavBar :fixed="true" exClass="pl-2 z-10">
           <div
               @click="handleShowSearchPage"
               class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
@@ -170,7 +170,7 @@ function handleShowSearchPage() {
           </div>
 
         </FNavBar>
-        <FTabs :tabs="state.tabs" :current="classifyId" @click:item="handleTabItemClick"/>
+        <FTabs class="fixed" :tabs="state.tabs" :current="classifyId" @click:item="handleTabItemClick"/>
       </div>
 
     </div>

src/pages/feedback/index.vue

@@ -101,12 +101,17 @@ function handleItemClick(item) {
 }
 
 function handleUploadSuccess({ data, option, fileItem }) {
-  console.log(data.data.path)
-  if (data && data.data && data.data.path) {
-    formData.images.push(data.data.path)
+  if (data && data.data) {
+    const resData = JSON.parse(data.data).data
+    const path = resData.path
+    formData.images.push(path)
   }
-
-  console.log(fileItem)
+  // console.log(data.data.path)
+  // if (data && data.data && data.data.path) {
+  //   formData.images.push(data.data.path)
+  // }
+  //
+  // console.log(fileItem)
 }
 
 function handleSubmit() {

src/pages/home/components/navs.vue

@@ -60,7 +60,7 @@ const navList = ref([{
 }, {
   image: CDN_URL + '/static/home-nav/vip_img.png',
   title: '会员专区',
-  key: 'vip',
+  key: 'member',
   // key: PLATFORM_NAME.DC,
   // categoryId: '567',
 }, {
@@ -98,7 +98,7 @@ function handleItemClick(item: any) {
       break;
     }
     // 会员专区
-    case 'vip': {
+    case 'member': {
       uni.navigateTo({
         url: '/pages/vip/index'
       })

src/pages/home/index.vue

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

src/pages/immediate-withdrawal/index.vue

@@ -28,7 +28,7 @@ onLoad(async () => {
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
 
-  yanglaojin.value = getUserYangLaoJin()
+  yanglaojin.value = await getUserYangLaoJin()
 
   // 提现配置
   widthdrawalConfig.value = await getWithdrawalConfig()
@@ -62,6 +62,7 @@ function handleInputAll() {
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+  console.log(yanglaojin.value)
   // 1 判断是否需要实名
   if (!yanglaojin.value?.is_certification == 1) {
     return uni.navigateTo({

src/pages/my-profile/index.vue

@@ -33,7 +33,7 @@ const showDatePicker = ref(false)
 const birthdayPopupValue = ref()
 const minDate = new Date(1900, 0, 1);
 const maxDate = new Date(2025, 10, 1);
-const currentDate = new Date()
+const currentDate = ref(new Date())
 
 const birthdayPopupConfirm = ({ selectedValue, selectedOptions }) => {
   console.log(selectedValue.join('-'))
@@ -88,13 +88,19 @@ function onChooseAvatar({ detail }) {
   })
 }
 
+watch(() => currentDate.value, (val) => {
+  if (val) {
+    formData.birthday = val
+  }
+})
 function handleSubmit() {
   // console.log(formData)
   updateUserInfo({
     avatar: formData.avatar,
     nickname: formData.nickname,
     sex: formData.sex,
-    birthday: formData.birthday,
+    // birthday: formData.birthday,
+    birthday: currentDate.value,
     mark: formData.mark
   }).then(res => {
     if (res) {
@@ -102,7 +108,9 @@ function handleSubmit() {
         title: '保存成功',
         icon: 'none'
       }).then(() => {
-        uni.navigateBack()
+        setTimeout(() => {
+          uni.navigateBack()
+        }, 500)
       })
     }
   }).catch(error => {
@@ -168,7 +176,7 @@ function handleSubmit() {
         class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
       <div class="">生日</div>
       <div class="flex items-center" @click="showDatePicker = true">
-        <div>请选择</div>
+        <div>{{ formData.birthday ? formData.birthday : '请选择'}}</div>
         <div
             class="f-text-color-2 i-tabler-chevron-right transform transition-300"
         />
@@ -191,7 +199,7 @@ function handleSubmit() {
         class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
       <div class="">手机号</div>
       <div class="flex items-center">
-        <div><input placeholder="请填写昵称" :value="formData.phone" class="text-right"/></div>
+        <div><input placeholder="请填写手机号" v-model="formData.phone" class="text-right"/></div>
         <div
             class="f-text-color-2 i-tabler-chevron-right transform transition-300"
         />
@@ -204,7 +212,7 @@ function handleSubmit() {
         class="bg-white rounded-md text-sm flex justify-between p-3  f-hairline-bottom">
       <div class="">签名</div>
       <div class="flex items-center">
-        <div><input placeholder="请填写您的人个性签名" :value="formData.mark" class="text-right"/></div>
+        <div><input placeholder="请填写您的人个性签名" v-model="formData.mark" class="text-right"/></div>
         <div
             class="f-text-color-2 i-tabler-chevron-right transform transition-300"
         />

src/pages/order/comment.vue

@@ -37,10 +37,15 @@ onLoad((options) => {
 const defaultFileList = ref([])
 function handleUploadSuccess({ data, option, fileItem }) {
   // console.log(data.data.path)
-  if (data && data.data && data.data.path) {
-    formData.pics.push(data.data.path)
-  }
+  // if (data && data.data && data.data.path) {
+  //   formData.pics.push(data.data.path)
+  // }
 
+  if (data && data.data) {
+    const resData = JSON.parse(data.data).data
+    const path = resData.path
+    formData.pics.push(path)
+  }
   // console.log(fileItem)
 }
 

src/pages/order/components/AllItemList.vue

@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import {getAllOrder} from "~/apis/order.api";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
+})
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // console.log(state.keyword)
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getAllOrder({
+    page: state.currentPage,
+    limit: state.pageSize
+  }).then(res => {
+    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.total / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+  // setTimeout(() => {
+  //   loadList('page', (items) => {
+  //     if (items.length === 0) {
+  //       state.status = 'noMore'
+  //     }
+  //   })
+  // }, 300)
+}
+
+// onReachBottom(() => {
+//   handleScrollToLower()
+//
+// })
+// onPullDownRefresh(() => {
+//   loadList('reload', items => {
+//     setTimeout(() => {
+//       uni.stopPullDownRefresh()
+//     }, 300)
+//   })
+// })
+onMounted(() => {
+  loadList('reload')
+  uni.$on('onTab0ReachBottom', () => {
+    console.log('alll...')
+    handleScrollToLower()
+  })
+  uni.$on('onTab0PullDownRefresh', () => {
+    loadList('reload', items => {
+      setTimeout(() => {
+        uni.stopPullDownRefresh()
+      }, 300)
+    })
+  })
+})
+
+onUnmounted(() => {
+  uni.$off('onTab0ReachBottom');
+  uni.$off('onTab0PullDownRefresh');
+})
+
+// onUnload(){
+//   uni.$off('onReachBottom');
+// },
+</script>
+<template>
+  <div class="p-3 flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
+        <OtherOrderItem :item="orderItem" v-else/>
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else class="flex flex-col  justify-center items-center w-full">
+      <CXBEmpty/>
+
+    </div>
+  </div>
+
+
+</template>

src/pages/order/components/ObligationOrderList.vue

@@ -0,0 +1,103 @@
+<script setup lang="ts">
+import {getAllOrder, getGroupOrderList} from "~/apis/order.api";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import OrderObligationItem from "~/pages/order/components/OrderObligationItem.vue";
+
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // console.log(state.keyword)
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getGroupOrderList({
+    page: state.currentPage,
+    limit: state.pageSize
+  }).then(res => {
+    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.total / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onMounted(() => {
+  loadList('reload')
+  uni.$on('onTab1ReachBottom', handleScrollToLower)
+  uni.$on('onTab1PullDownRefresh', () => {
+    loadList('reload', items => {
+      setTimeout(() => {
+        uni.stopPullDownRefresh()
+      }, 300)
+    })
+  })
+})
+
+onUnmounted(() => {
+  uni.$off('onTab1ReachBottom');
+  uni.$off('onTab1PullDownRefresh');
+})
+</script>
+<template>
+  <div class="p-3 flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+<!--        <OrderItem :order-item="orderItem" />-->
+<!--        <OtherOrderItem :item="orderItem" v-else/>-->
+        <OrderObligationItem :order-item="orderItem" />
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else class="flex flex-col  justify-center items-center w-full">
+      <CXBEmpty />
+
+    </div>
+  </div>
+
+
+</template>

src/pages/order/components/Order2List.vue

@@ -0,0 +1,111 @@
+<script setup lang="ts">
+import {getOrderListFromStatus} from "~/apis/order.api";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+
+const props = defineProps({
+  status: {
+    type: String,
+  }
+})
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // console.log(state.keyword)
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getOrderListFromStatus({
+    page: state.currentPage,
+    limit: state.pageSize,
+    status: props.status,
+  }).then(res => {
+    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onMounted(() => {
+  loadList('reload')
+
+  uni.$on('onTab2ReachBottom', handleScrollToLower)
+  uni.$on('onTab2PullDownRefresh', () => {
+    loadList('reload', items => {
+      setTimeout(() => {
+        uni.stopPullDownRefresh()
+      }, 300)
+    })
+  })
+})
+
+onUnmounted(() => {
+  uni.$off('onTab2ReachBottom');
+  uni.$off('onTab2PullDownRefresh');
+})
+onUnload(() => {
+  uni.$off('onTab2ReachBottom');
+  uni.$off('onTab2PullDownRefresh');
+})
+</script>
+<template>
+  <div class="p-3 flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <OrderItem :order-item="orderItem" />
+        <!--        <OtherOrderItem :item="orderItem" v-else/>-->
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else class="flex flex-col  justify-center items-center w-full">
+      <CXBEmpty />
+
+    </div>
+  </div>
+
+
+</template>

src/pages/order/components/Order3List.vue

@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import {getOrderListFromStatus} from "~/apis/order.api";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+
+const props = defineProps({
+  status: {
+    type: String,
+  }
+})
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // console.log(state.keyword)
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getOrderListFromStatus({
+    page: state.currentPage,
+    limit: state.pageSize,
+    status: props.status,
+  }).then(res => {
+    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+  // setTimeout(() => {
+  //   loadList('page', (items) => {
+  //     if (items.length === 0) {
+  //       state.status = 'noMore'
+  //     }
+  //   })
+  // }, 300)
+}
+
+// onReachBottom(() => {
+//   handleScrollToLower()
+//
+// })
+// onPullDownRefresh(() => {
+//   loadList('reload', items => {
+//     setTimeout(() => {
+//       uni.stopPullDownRefresh()
+//     }, 300)
+//   })
+// })
+onMounted(() => {
+  loadList('reload')
+
+  uni.$on('onTab3ReachBottom', handleScrollToLower)
+  uni.$on('onTab3PullDownRefresh', () => {
+    loadList('reload', items => {
+      setTimeout(() => {
+        uni.stopPullDownRefresh()
+      }, 300)
+    })
+  })
+})
+onUnmounted(() => {
+  uni.$off('onTab3ReachBottom');
+  uni.$off('onTab3PullDownRefresh');
+})
+onUnload(() => {
+  uni.$off('onTab3ReachBottom');
+  uni.$off('onTab3PullDownRefresh');
+})
+</script>
+<template>
+  <div class="p-3 flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <OrderItem :order-item="orderItem" />
+        <!--        <OtherOrderItem :item="orderItem" v-else/>-->
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else class="flex flex-col  justify-center items-center w-full">
+      <CXBEmpty />
+
+    </div>
+  </div>
+
+
+</template>

src/pages/order/components/Order4List.vue

@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import {getOrderListFromStatus} from "~/apis/order.api";
+import OrderItem from "~/pages/order/components/OrderItem.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+
+const props = defineProps({
+  status: {
+    type: String,
+  }
+})
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  // console.log(state.keyword)
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getOrderListFromStatus({
+    page: state.currentPage,
+    limit: state.pageSize,
+    status: props.status,
+  }).then(res => {
+    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+  // setTimeout(() => {
+  //   loadList('page', (items) => {
+  //     if (items.length === 0) {
+  //       state.status = 'noMore'
+  //     }
+  //   })
+  // }, 300)
+}
+
+// onReachBottom(() => {
+//   handleScrollToLower()
+//
+// })
+// onPullDownRefresh(() => {
+//   loadList('reload', items => {
+//     setTimeout(() => {
+//       uni.stopPullDownRefresh()
+//     }, 300)
+//   })
+// })
+onMounted(() => {
+  loadList('reload')
+
+  uni.$on('onTab4ReachBottom', handleScrollToLower)
+  uni.$on('onTab4PullDownRefresh', () => {
+    loadList('reload', items => {
+      setTimeout(() => {
+        uni.stopPullDownRefresh()
+      }, 300)
+    })
+  })
+})
+onUnmounted(() => {
+  uni.$off('onTab4ReachBottom');
+  uni.$off('onTab4PullDownRefresh');
+})
+onUnload(() => {
+  uni.$off('onTab4ReachBottom');
+  uni.$off('onTab4PullDownRefresh');
+})
+</script>
+<template>
+  <div class="p-3 flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col">
+      <div v-for="(orderItem, index) in state.list" :key="index">
+        <OrderItem :order-item="orderItem" />
+        <!--        <OtherOrderItem :item="orderItem" v-else/>-->
+      </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
+    </div>
+    <div v-else class="flex flex-col  justify-center items-center w-full">
+      <CXBEmpty />
+
+    </div>
+  </div>
+
+
+</template>

src/pages/order/components/OrderItem.vue

@@ -34,12 +34,12 @@ const props = defineProps({
 //   }
 // })
 function getStatusText(orderItem: OrderListModel) {
-  if (props.status === 5) {
-    return '未支付'
-  }
-  if (props.status === 0) {
-    return '待发货'
-  }
+  // if (props.status === 5) {
+  //   return '未支付'
+  // }
+  // if (props.status === 0) {
+  //   return '待发货'
+  // }
   // switch (orderItem.status) {
   // }
   if (orderItem.status == 0) {
@@ -169,6 +169,18 @@ function handleProductItemClick(
 }
 
 
+function handeRefund(orderItem) {
+  uni.navigateTo({
+    // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
+    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}`
+  })
+}
+
+function handleShowObligationOrderDetail(orderItem) {
+  uni.navigateTo({
+    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
+  })
+}
 </script>
 
 <template>
@@ -191,9 +203,8 @@ function handleProductItemClick(
     </div>
 
 
-
-    <div @tap.stop="handleShowOrderDetail(orderItem)">
-      <div v-if="orderItem.orderList">
+    <div>
+      <div v-if="orderItem.orderList" @tap.stop="handleShowObligationOrderDetail(orderItem)">
         <div v-for="(order, index) in orderItem.orderList" :key="index">
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
             <div class="flex py-2 gap-3">
@@ -211,26 +222,41 @@ function handleProductItemClick(
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+                <FPrice :price="orderProduct.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 
             </div>
-            <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 class="flex justify-end gap-2" v-if="orderProduct.type == 5">
+              <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+              <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
             </div>
-            <div class="flex justify-end gap-2" v-if="props.status === 0">
+            <div class="flex justify-end gap-2" v-if="orderProduct.type == 0">
               <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
-              <nut-button size="small" plain type="default" @click="handlePayment">申请售后</nut-button>
+              <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
+            </div>
+
+
+            <div class="flex justify-end gap-2" v-if="orderProduct.type == 1">
+              <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderProduct)">查看物流</nut-button>
+              <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderProduct)">申请售后</nut-button>
+
+              <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderProduct)">确认收货</nut-button>
+
+            </div>
+
+            <div class="flex justify-end gap-2" v-if="orderProduct.status == 2">
+              <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderProduct)">再次购买</nut-button>
+              <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderProduct)">去评价</nut-button>
+
             </div>
           </div>
         </div>
 
       </div>
 
-      <div v-else>
+      <div v-else  @tap.stop="handleShowOrderDetail(orderItem)">
         <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
@@ -247,29 +273,31 @@ function handleProductItemClick(
             </div>
 
             <div class="flex flex-col justify-center items-center">
-              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+<!--              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
+              <FPrice :price="orderProduct.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
               <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
             </div>
 
           </div>
-          <div class="flex justify-end gap-2" v-if="props.status === 5">
+          <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
             <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">
+          <div class="flex justify-end gap-2" v-if="orderItem.status == 0">
             <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
-            <nut-button size="small" plain type="default" @tap.stop="handlePayment">申请售后</nut-button>
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
           </div>
 
-          <div class="flex justify-end gap-2" v-if="props.status === 1">
+          <div class="flex justify-end gap-2" v-if="orderItem.status == 1">
             <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
-            <nut-button size="small" plain type="default" @tap.stop="handlePayment">申请售后</nut-button>
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</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">
+          <div class="flex justify-end gap-2" v-if="orderItem.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>
 

src/pages/order/components/OrderObligationItem.vue

@@ -1,53 +1,45 @@
-<template>
-  <div class="flex items-center justify-between f-hairline-bottom pb-3">
-    <div class="flex items-center font-bold gap-2 text-sm">
-      <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
-      {{ orderItem.merchant.mer_name }}
-    </div>
-    <div class="text-primary text-sm">
-      {{ getStatusText(orderItem) }}
-    </div>
-  </div>
-
-  <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
-    <div class="flex p-2 gap-3">
-      <div class="flex-1 flex">
-        <image :src="orderProduct.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.cart_info.product.store_name }}
-          </div>
-          <div class="text-gray-500 text-[10px]">
-            {{ orderProduct.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_num }}件</div>
-      </div>
-
-    </div>
-    <div class="flex justify-end gap-2">
-      <nut-button size="small" type="default">取消订单</nut-button>
-      <nut-button size="small" plain type="primary">立即支付</nut-button>
-    </div>
-  </div>
-
-</template>
 <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: OrderListModel) {
+  // if (props.status === 5) {
+  //   return '未支付'
+  // }
+  // if (props.status === 0) {
+  //   return '待发货'
+  // }
   // switch (orderItem.status) {
   // }
   if (orderItem.status == 0) {
@@ -73,4 +65,180 @@ function getStatusText(orderItem: OrderListModel) {
   }
 }
 
-</script>
+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}`
+  })
+}
+
+
+function handeRefund(orderItem) {
+  uni.navigateTo({
+    // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
+    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}`
+  })
+}
+
+function handleShowObligationOrderDetail(orderItem) {
+  uni.navigateTo({
+    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
+  })
+}
+</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>
+      <div v-if="orderItem.orderList" @tap.stop="handleShowObligationOrderDetail(orderItem)">
+        <div v-for="(order, index) in orderItem.orderList" :key="index">
+          <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
+            <div class="flex py-2 gap-3">
+              <div class="flex-1 flex gap-2">
+                <image :src="orderProduct.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.cart_info.product.store_name }}
+                  </div>
+                  <div class="text-gray-500 text-[10px]">
+                    {{ orderProduct.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_num }}件</div>
+              </div>
+
+            </div>
+            <div class="flex justify-end gap-2">
+              <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+              <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+  </div>
+
+
+</template>

src/pages/order/components/OtherOrderItem.vue

@@ -49,7 +49,7 @@ function handleClick() {
   //   featured: [product.goods_img]
   // })
   console.log(product)
-  if (product.source === '6') {
+  // if (product.source == '6') {
     navigateToDetail(encodeBase64({
       platform: product.source,
       id: product.goods_id,
@@ -59,7 +59,7 @@ function handleClick() {
       price: product.goods_price,
       salePrice: product.pay_money,
     }))
-  }
+  // }
 }
 
 
@@ -71,7 +71,7 @@ function handleClick() {
       <div class="text-primary">{{ item.other_status_desc }}</div>
     </div>
 
-    <div class="flex  gap-2">
+    <div class="flex  gap-2"  @tap.stop="handleClick">
       <div class="flex">
         <image :src="item.goods_img" mode="widthFix" class="w-16 h-16 rounded"></image>
 
@@ -100,7 +100,7 @@ function handleClick() {
       </div>
     </div>
     <div class="flex justify-end items-center">
-      <nut-button plain type="primary" size="small" @click="handleClick">再次购买</nut-button>
+      <nut-button plain type="primary" size="small" @tap.stop="handleClick">再次购买</nut-button>
     </div>
   </div>
 </template>

src/pages/order/components/RefundOrderItem.vue

@@ -181,16 +181,20 @@ function handleShowDetail(orderItem) {
     <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">
+      <div class="flex-1 flex items-center font-bold gap-2 text-sm justify-between ">
+        <div class="flex-1 flex items-center gap-2 w-full">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
-          {{ orderItem.merchant.mer_name }}
+          <div class="line-clamp-1 flex ">
+            {{ orderItem.merchant.mer_name }}
+          </div>
         </div>
 
-        <div class="f-text-color-2 i-tabler-chevron-right"></div>
+          <div class="f-text-color-2 i-tabler-chevron-right"></div>
 
       </div>
-      <div class="text-primary text-xs">
+      <div class=" text-xs flex w-15 justify-end"
+           :class="(orderItem.status == 3 || orderItem.status == -1) ? 'text-gray' : 'text-primary'"
+      >
         {{ getStatusText(orderItem) }}
       </div>
     </div>
@@ -220,16 +224,12 @@ function handleShowDetail(orderItem) {
                 </div>
             </div>
           </div>
-          <div class="flex justify-end gap-2" v-if="orderItem.status == 0 || orderItem.status == 1 || orderItem.status == 2">
+        </div>
+      <div class="flex justify-end">
+        <nut-button size="small" plain type="primary" @tap.stop="handleShowDetail(orderItem)">查看详情</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>
 
-          <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>
 
   </div>

src/pages/order/detail.vue

@@ -4,8 +4,8 @@ import {encodePhone} from "~/utils";
 import {CDN_URL} from "~/config/app";
 import {useAddressStore} from "~/stores/addressStore";
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {cancelOrder} from "~/apis/order.api";
-import {decodeBase64} from "~/utils/http/helper";
+import {cancelOrder, takeOrder} from "~/apis/order.api";
+import {decodeBase64, encodeBase64} from "~/utils/http/helper";
 
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 const addressStore = useAddressStore()
@@ -51,11 +51,97 @@ function handlePayment() {
   // const { orderItem } = detail.value
   // console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.order_id}&OrderList=${JSON.stringify( detail.value)}`
+    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.group_order_id}&OrderList=${JSON.stringify( detail.value)}`
     // url: `/pages/payment/index`
   })
 }
 
+function handleRemindTheDelivery() {
+  uni.showToast({
+    title: '已告知商家尽快发货',
+    icon: 'none'
+  })
+}
+
+function handeRefund() {
+  uni.navigateTo({
+    // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
+    url: `/pages/refund/option?detail=${encodeBase64(detail.value)}`
+  })
+}
+
+function handleClipboard() {
+  uni.setClipboardData({
+    data: detail.value.order_sn,
+    success(res) {
+      // wx.getClipboardData({
+      //   success (res) {
+      //     console.log(res.data) // data
+      //   }
+      // })
+    }
+  })
+}
+
+function handleShowLogistics() {
+  // console.log(orderItem)
+  // console.log('查看物流信息')
+  uni.navigateTo({
+    url: `/pages/order/logistics?id=${detail.value.order_id}`
+  })
+}
+
+function handleTakeOrder() {
+  uni.showModal({
+    title: '确认收货',
+    content: '请确认你已收到货',
+    success: function (res) {
+      if (res.confirm) {
+        takeOrder(detail.value.order_id).then(res => {
+          // console.log(res)
+          uni.showToast({
+            title: '确认收货成功'
+          })
+          uni.$emit('orderTakeFromList')
+
+        }).catch(error => {
+          uni.showToast({
+            title: error,
+            icon: "none"
+          })
+        })
+      }
+    }
+  })
+}
+
+function handleComment() {
+  uni.navigateTo({
+    url: '/pages/order/comment?detail=' + encodeBase64(detail.value)
+  })
+}
+
+const payType = computed(() => {
+  // detail.pay_type
+  if ('0' == detail.value.pay_type) {
+    return '余额'
+  }
+  if ('1' == detail.value.pay_type) {
+    return '微信'
+  }
+  if ('2' == detail.value.pay_type) {
+    return '小程序'
+  }
+  if ('3' == detail.value.pay_type) {
+    return 'h5'
+  }
+  if ('4' == detail.value.pay_type) {
+    return '支付宝'
+  }
+  if ('5' == detail.value.pay_type) {
+    return '积分兑换'
+  }
+})
 </script>
 <template>
   <CXBBasePage>
@@ -122,7 +208,11 @@ function handlePayment() {
           </div>
         </div>
 
+
         <div class=" flex flex-col gap-3 p-3">
+          <div class="flex justify-end" v-if="detail.status == 1 || detail.status == 2 || detail.status == 3">
+            <nut-button size="small" plain type="default" @tap.stop="handeRefund">申请售后</nut-button>
+          </div>
           <div class="flex justify-between">
             <div>商品总额</div>
             <div class="text-gray">¥{{ detail.total_price }}</div>
@@ -139,18 +229,29 @@ function handlePayment() {
 
             <div>实付款</div>
             <div class="text-gray">
-              <FPrice :price="detail.total_price" ex-class="font-bold"></FPrice>
+              <FPrice :price="detail.pay_price" ex-class="font-bold text-xl"></FPrice>
             </div>
           </div>
-          <div class="flex justify-between">
 
+          <div class="h-0.2 bg-gray-100 my-2"></div>
+
+<!--          <div class="flex justify-between">-->
+
+<!--            <div>订单编号</div>-->
+<!--            <div class="text-gray">{{ detail.order_sn }}</div>-->
+<!--          </div>-->
+          <div class="flex justify-between">
             <div>订单编号</div>
-            <div class="text-gray">{{ detail.order_sn }}</div>
+            <div class="flex gap-2">
+              <div class="text-gray-400">{{ detail.order_sn }}</div>
+              <div @click="handleClipboard">复制</div>
+            </div>
           </div>
           <div class="flex justify-between">
 
             <div>支付方式</div>
-            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>
+            <div class="text-gray">{{ payType }}</div>
+<!--            <div class="text-gray">{{ detail.pay_type === '0' ? '微信' : '支付宝' }}</div>-->
           </div>
           <div class="flex justify-between">
 
@@ -163,9 +264,29 @@ function handlePayment() {
     </div>
 
     <div class="fixed bottom-0 bg-white p-safe items-center  w-full">
-      <div class="flex justify-end gap-2 p-3">
-        <nut-button size="small" type="default" @click="handleCancelOrder" class="text-black"><div class="text-black">取消订单</div></nut-button>
-        <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
+      <div class="flex justify-end gap-2 p-3"
+           v-if="detail.status == 5 || detail.type == 5"
+      >
+        <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+        <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+
+      </div>
+      <div class="flex justify-end gap-2 p-3"
+           v-if="detail.status == 0 || detail.type == 0"
+      >
+        <nut-button size="small" type="default"
+                    @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+
+      </div>
+      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 1 || detail.type == 1">
+        <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics">查看物流</nut-button>
+
+        <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder">确认收货</nut-button>
+
+      </div>
+
+      <div class="flex justify-end gap-2 p-3" v-if="detail.status == 2 || detail.type == 2">
+        <nut-button size="small" plain type="primary" @tap.stop="handleComment">去评价</nut-button>
 
       </div>
     </div>
@@ -176,3 +297,4 @@ function handlePayment() {
 style:
   navigationBarTitleText: 订单详情
 </route>
+

src/pages/order/index.vue

@@ -1,59 +1,25 @@
 <template>
   <CXBBasePage>
-    <nut-tabs v-model="state.tabvalue">
-      <nut-tab-pane title="全部">
-
-        <div v-if="state.allOrderList.length > 0" class="flex flex-col gap-3">
-          <div v-for="(orderItem, index) in state.allOrderList" :key="index">
-            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
-            <OtherOrderItem :item="orderItem" v-else/>
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-
-      </nut-tab-pane>
-      <nut-tab-pane title="待付款">
-        <div v-if="state.obligationOrderList.length > 0">
-          <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
-            <OrderItem :order-item="orderItem" :status="5"/>
-<!--            <OtherOrderItem :item="orderItem" v-else/>-->
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-      </nut-tab-pane>
-      <nut-tab-pane title="待发货">
-        <div v-if="state.orderList.length > 0">
-          <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" :status="0"/>
-<!--            <OtherOrderItem :item="orderItem" v-else/>-->
-<!--            <OtherOrderItem :item="orderItem"/>-->
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-
-      </nut-tab-pane>
-      <nut-tab-pane title="待收货">
-        <div v-if="state.orderList.length > 0">
-          <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" :status="1"/>
-<!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
-<!--            <OtherOrderItem :item="orderItem" v-else/>-->
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-
-      </nut-tab-pane>
-      <nut-tab-pane title="待评价">
-        <div v-if="state.orderList.length > 0">
-          <div v-for="(orderItem, index) in state.orderList" :key="index">
-            <OrderItem :order-item="orderItem" :status="2"/>
-<!--            <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>-->
-<!--            <OtherOrderItem :item="orderItem" v-else/>-->
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-      </nut-tab-pane>
-    </nut-tabs>
+
+    <!--    <nut-navbar>-->
+    <!--      <template #content>-->
+    <div class="fixed top-0 bg-white w-full z-2">
+      <nut-tabs v-model="state.tabvalue" class="bg-white">
+        <nut-tab-pane title="全部"></nut-tab-pane>
+        <nut-tab-pane title="待付款"></nut-tab-pane>
+        <nut-tab-pane title="待发货"></nut-tab-pane>
+        <nut-tab-pane title="待收货"></nut-tab-pane>
+        <nut-tab-pane title="待评价"></nut-tab-pane>
+      </nut-tabs>
+    </div>
+
+    <div class="mt-12">
+      <AllItemList v-if="state.tabvalue == 0"/>
+      <ObligationOrderList v-if="state.tabvalue == 1"/>
+      <Order2List v-if="state.tabvalue == 2" :status="'0'"/>
+      <Order3List v-if="state.tabvalue == 3" :status="'1'"/>
+      <Order4List v-if="state.tabvalue == 4" :status="'2'"/>
+    </div>
 
   </CXBBasePage>
 </template>
@@ -70,6 +36,11 @@ import amapWx from "~/libs/amap-wx";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
+import AllItemList from "~/pages/order/components/AllItemList.vue";
+import ObligationOrderList from "~/pages/order/components/ObligationOrderList.vue";
+import Order2List from "~/pages/order/components/Order2List.vue";
+import Order3List from "~/pages/order/components/Order3List.vue";
+import Order4List from "~/pages/order/components/Order4List.vue";
 
 const state = reactive({
   tabvalue: 0,
@@ -83,102 +54,167 @@ const state = reactive({
   orderList: [],
 });
 
+const getStatusVal = () => {
+  // state.tabvalue == 2 ? '0' : state.tabvalue == 3 ? '1' : state.tabvalue == 4 ? '2' : ''
+  if (state.tabvalue == 2) {
+    return '0'
+  }
+  if (state.tabvalue == 3) {
+    return '1'
+  }
+  if (state.tabvalue == 4) {
+    return '2'
+  }
+}
 onLoad(options => {
   if (options && options.tabIndex) {
     state.tabvalue = options.tabIndex
   }
-  loadAllOrderList()
+  // loadAllOrderList()
 
   // 监听事件
-  uni.$on('orderCancelFromList', () => {
-    loadAllOrderList()
-    state.tabvalue = 0
-  })
-
-  uni.$on('orderTakeFromList', () => {
-    loadAllOrderList()
-    state.tabvalue = 3
-  })
+  // uni.$on('orderCancelFromList', () => {
+  //   loadAllOrderList()
+  //   state.tabvalue = 0
+  // })
+  //
+  // uni.$on('orderTakeFromList', () => {
+  //   loadAllOrderList()
+  //   state.tabvalue = 3
+  // })
+})
+
+uni.$on('orderCancelFromList', () => {
+  // loadAllOrderList()
+  state.tabvalue = 0
 })
-function splitArray(list, sp) {
-  if (typeof list != 'object') return [];
-  if (sp == undefined) sp = [];
-  for (var i = 0; i < list.length; i++) {
-    sp.push(list[i]);
+
+uni.$on('orderTakeFromList', () => {
+  // loadAllOrderList()
+  state.tabvalue = 3
+})
+
+onReachBottom(() => {
+  // handleScrollToLower()
+  if (state.tabvalue == 0) {
+    uni.$emit('onTab0ReachBottom')
   }
-  return sp;
-}
-function loadAllOrderList() {
-  // 获取全部订单
-  getAllOrder({
-    page: 1,
-    limit: 10
-  }).then(res => {
-    // console.log(res)
-    state.allOrderTotal = res.total
-    state.allOrderList = res.list
-    // console.log(res)
-  })
-}
-watch(() => state.tabvalue, (val) => {
-  // status: string//订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
-
-  switch (val) {
-    case '0': {
-      loadAllOrderList()
-      break;
-    }
-    case '1': {
-      getGroupOrderList({
-        page: 1,
-        limit: 10
-      }).then(res => {
-        // console.log(res)
-        // state.obligationOrderList = splitArray(res.list, state.obligationOrderList)
-        state.obligationOrderList = res.list
-      })
-      break;
-      // getOrderListFromStatus({
-      //   page: 1,
-      //   limit: 10,
-      //   status: 0
-      // }).then(res => {
-      //   state.obligationOrderList = res.list
-      // })
-    }
-    // 待发货
-    case '2': {
-      getOrderListFromStatus({
-        page: 1,
-        limit: 10,
-        status: 0
-      }).then(res => {
-        state.orderList = res.list
-      })
-      break;
-    }
-    case '3': {
-      getOrderListFromStatus({
-        page: 1,
-        limit: 10,
-        status: 1
-      }).then(res => {
-        state.orderList = res.list
-      })
-      break;
-    }
-    case '4': {
-      getOrderListFromStatus({
-        page: 1,
-        limit: 10,
-        status: 2
-      }).then(res => {
-        state.orderList = res.list
-      })
-      break;
-    }
+  if (state.tabvalue == 1) {
+    uni.$emit('onTab1ReachBottom')
+  }
+  if (state.tabvalue == 2) {
+    uni.$emit('onTab2ReachBottom')
   }
+  if (state.tabvalue == 3) {
+    uni.$emit('onTab3ReachBottom')
+  }
+  if (state.tabvalue == 4) {
+    uni.$emit('onTab4ReachBottom')
+  }
+})
+onPullDownRefresh(() => {
+  if (state.tabvalue == 0) {
+    uni.$emit('onTab0PullDownRefresh')
+  }
+  if (state.tabvalue == 1) {
+    uni.$emit('onTab1PullDownRefresh')
+  }
+  if (state.tabvalue == 2) {
+    uni.$emit('onTab2PullDownRefresh')
+  }
+  if (state.tabvalue == 3) {
+    uni.$emit('onTab3PullDownRefresh')
+  }
+  if (state.tabvalue == 4) {
+    uni.$emit('onTab4PullDownRefresh')
+  }
+  // loadList('reload', items => {
+  //   setTimeout(() => {
+  //     uni.stopPullDownRefresh()
+  //   }, 300)
+  // })
 })
+// function splitArray(list, sp) {
+//   if (typeof list != 'object') return [];
+//   if (sp == undefined) sp = [];
+//   for (var i = 0; i < list.length; i++) {
+//     sp.push(list[i]);
+//   }
+//   return sp;
+// }
+//
+// function loadAllOrderList() {
+//   // 获取全部订单
+//   getAllOrder({
+//     page: 1,
+//     limit: 10
+//   }).then(res => {
+//     // console.log(res)
+//     state.allOrderTotal = res.total
+//     state.allOrderList = res.list
+//     // console.log(res)
+//   })
+// }
+//
+// watch(() => state.tabvalue, (val) => {
+//   // status: string//订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
+//
+//   switch (val) {
+//     case '0': {
+//       loadAllOrderList()
+//       break;
+//     }
+//     case '1': {
+//       getGroupOrderList({
+//         page: 1,
+//         limit: 10
+//       }).then(res => {
+//         // console.log(res)
+//         // state.obligationOrderList = splitArray(res.list, state.obligationOrderList)
+//         state.obligationOrderList = res.list
+//       })
+//       break;
+//       // getOrderListFromStatus({
+//       //   page: 1,
+//       //   limit: 10,
+//       //   status: 0
+//       // }).then(res => {
+//       //   state.obligationOrderList = res.list
+//       // })
+//     }
+//       // 待发货
+//     case '2': {
+//       getOrderListFromStatus({
+//         page: 1,
+//         limit: 10,
+//         status: 0
+//       }).then(res => {
+//         state.orderList = res.list
+//       })
+//       break;
+//     }
+//     case '3': {
+//       getOrderListFromStatus({
+//         page: 1,
+//         limit: 10,
+//         status: 1
+//       }).then(res => {
+//         state.orderList = res.list
+//       })
+//       break;
+//     }
+//     case '4': {
+//       getOrderListFromStatus({
+//         page: 1,
+//         limit: 10,
+//         status: 2
+//       }).then(res => {
+//         state.orderList = res.list
+//       })
+//       break;
+//     }
+//   }
+// })
 
 
 </script>
@@ -188,8 +224,22 @@ style:
   enablePullDownRefresh: true
 </route>
 
-<style>
+<style lang="scss">
+//.nut-tab-pane {
+//  background: #f5f5f5 !important;
+//}
+//.nut-tabs {
+//  background: white;
+//}
+.nut-tabs__titles {
+  background: white !important;
+}
+
 .nut-tab-pane {
-  background: #f5f5f5 !important;
+  display: none !important;
+}
+
+page {
+  background: #f8f8f8;
 }
 </style>

src/pages/order/test.json

@@ -2,201 +2,21 @@
   "status": 200,
   "message": "success",
   "data": {
-    "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": "10121",
-          "product_id": "5484",
-          "extension_one": "0.00",
-          "extension_two": "0.00",
-          "product_sku": "cec1027208c0",
-          "is_refund": "1",
-          "product_num": "1",
-          "refund_num": "0",
-          "is_reply": "0",
-          "product_price": "5200.00",
-          "cart_info": {
-            "product": {
-              "product_id": "5484",
-              "image": "https:\/\/img.funengscm.com\/d4461dcc6bb88ade137410722935c8a8",
-              "store_name": "金六福珠宝 MY103 白钻\/1克拉 女士项链【贵重物品 顺丰到付签收】",
-              "is_show": "1",
-              "status": "1",
-              "is_del": "0",
-              "unit_name": "个",
-              "price": "5200.00",
-              "mer_status": "1",
-              "temp_id": "105",
-              "give_coupon_ids": [],
-              "is_gift_bag": "0",
-              "is_used": "1",
-              "product_type": "0",
-              "old_product_id": "657",
-              "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": "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": 0
-            },
-            "product_type": "0"
-          },
-          "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"
-    }
+    "wechat_user_id": "oGtg_6IyBcvYku_Q10x-N7__K2gQ",
+    "card_id": "",
+    "ali_user_id": "0",
+    "annuity_frozen": "0.00",
+    "annuity_num": "3",
+    "annuity": "0.07",
+    "create_time": "2023-08-30 11:27:09",
+    "birthday": "2023-09-21",
+    "birthday60": "未实名认证",
+    "card_number": null,
+    "annuity_yiqu": "0.00",
+    "pay_price": "14611.79",
+    "can_withdraw": 0,
+    "is_certification": 0,
+    "yinghang": "中信公证处消费养老金账户",
+    "add_up": 0
   }
 }

src/pages/order/third-order-temp.vue

@@ -0,0 +1,179 @@
+<template>
+  <CXBBasePage>
+    <nut-tabs v-model="state.tabvalue">
+      <nut-tab-pane title="京东">
+        <div v-if="state.jdOrderList && state.jdOrderList.length > 0" class="flex flex-col gap-3">
+          <div v-for="(item, index) in state.jdOrderList" :key="index">
+            <div class="bg-white rounded p-2 flex flex-col gap-2">
+              <div class="flex justify-between items-center text-[12px] f-hairline-bottom py-2">
+                <div>订单号：{{ item.order_sn }}</div>
+                <div class="text-primary">{{ item.other_status_desc }}</div>
+              </div>
+
+              <div class="flex  gap-2">
+                <div class="flex">
+                  <image :src="item.goods_img" mode="widthFix" class="w-16 h-16 rounded"></image>
+
+                </div>
+                <div class="flex items-center">
+                  <div class="flex flex-col gap-1">
+                    <div class="bg-primary text-[10px] rounded text-white px-1 w-fit">
+                      京东
+                    </div>
+                    <div class="text-[12px] line-clamp-2">
+                      {{ item.goods_name }}
+                    </div>
+                  </div>
+                  <div class="flex text-[11px] w-15 justify-end">{{ 'X' + item.goods_num }}</div>
+                </div>
+              </div>
+              <div class="flex justify-between text-[11px] items-center">
+                <div>{{ item.create_time }}</div>
+                <div class="flex justify-center items-center">
+                  预估养老金：<FPrice :price="item.yanlao"></FPrice>
+                  <div class="border border-solid border-1px border-gray-500 text-gray rounded">{{ item.status_name }}</div>
+                </div>
+              </div>
+            </div>
+
+
+          </div>
+          <!--        <div>{{ item.status_name }}</div>-->
+
+        </div>
+        <CXBEmpty v-else/>
+
+      </nut-tab-pane>
+      <nut-tab-pane title="唯品会">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="苏宁易购">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="淘宝">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="拼多多">
+        <CXBEmpty />
+      </nut-tab-pane>
+      <nut-tab-pane title="抖音">
+        <CXBEmpty />
+      </nut-tab-pane>
+    </nut-tabs>
+
+  </CXBBasePage>
+</template>
+<script setup lang="ts">
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {getThirdOrder} from "~/apis/order.api";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+enum TYPE {
+  JD = '6',
+  TB = '5',
+  PDD = '1',
+  DY = '9',
+  VIP = '2',
+  SU = '3'
+}
+const state = reactive({
+  tabvalue: '0',
+
+  allOrderTotal: 0,
+  allOrderList: [],
+
+  // 待付款订单列表
+  obligationOrderList: [],
+
+  jdOrderList: [],
+  tbOrderList: [],
+  pddOrderList: [],
+  dyOrderList: [],
+  vipOrderList: [],
+  suOrderList: []
+});
+
+onLoad(() => {
+  loadOrderList('6')
+})
+
+watch(() => state.tabvalue, (val) => {
+  console.log(val)
+  switch (val) {
+    case '0': {
+      loadOrderList(TYPE.JD)
+      break
+    }
+    case '1': {
+      loadOrderList(TYPE.VIP)
+      break
+    }
+    case '2': {
+      loadOrderList(TYPE.SU)
+      break
+    }
+    case '3': {
+      loadOrderList(TYPE.TB)
+      break
+    }
+    case '4': {
+      loadOrderList(TYPE.PDD)
+      break
+    }
+    case '5': {
+      loadOrderList(TYPE.DY)
+      break
+    }
+  }
+})
+function loadOrderList(type: TYPE) {
+
+  getThirdOrder({type, page: 1, limit: 10}).then(res => {
+    switch (type) {
+      case TYPE.JD: {
+        state.jdOrderList = res.list
+        break
+      }
+      case TYPE.VIP: {
+        state.vipOrderList = res.list
+        break
+      }
+      case TYPE.PDD: {
+        state.pddOrderList = res.list
+        break
+      }
+      case TYPE.DY: {
+        state.dyOrderList = res.list
+        break
+      }
+      case TYPE.SU: {
+        state.suOrderList = res.list
+        break
+      }
+      case TYPE.TB: {
+        state.tbOrderList = res.list
+        break
+      }
+    }
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.redirectTo({
+        url: '/pages/user/login/index'
+      })
+    }
+  })
+}
+</script>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 三方订单
+  enablePullDownRefresh: true
+</route>
+<style>
+
+.nut-tab-pane {
+  background: #f5f5f5 !important;
+}
+
+</style>

src/pages/order/third-order.vue

@@ -1,73 +1,50 @@
 <template>
-  <CXBBasePage>
-    <nut-tabs v-model="state.tabvalue">
-      <nut-tab-pane title="京东">
-        <div v-if="state.jdOrderList && state.jdOrderList.length > 0" class="flex flex-col gap-3">
-          <div v-for="(item, index) in state.jdOrderList" :key="index">
-            <div class="bg-white rounded p-2 flex flex-col gap-2">
-              <div class="flex justify-between items-center text-[12px] f-hairline-bottom py-2">
-                <div>订单号：{{ item.order_sn }}</div>
-                <div class="text-primary">{{ item.other_status_desc }}</div>
-              </div>
-
-              <div class="flex  gap-2">
-                <div class="flex">
-                  <image :src="item.goods_img" mode="widthFix" class="w-16 h-16 rounded"></image>
-
-                </div>
-                <div class="flex items-center">
-                  <div class="flex flex-col gap-1">
-                    <div class="bg-primary text-[10px] rounded text-white px-1 w-fit">
-                      京东
-                    </div>
-                    <div class="text-[12px] line-clamp-2">
-                      {{ item.goods_name }}
-                    </div>
-                  </div>
-                  <div class="flex text-[11px] w-15 justify-end">{{ 'X' + item.goods_num }}</div>
-                </div>
-              </div>
-              <div class="flex justify-between text-[11px] items-center">
-                <div>{{ item.create_time }}</div>
-                <div class="flex justify-center items-center">
-                  预估养老金：<FPrice :price="item.yanlao"></FPrice>
-                  <div class="border border-solid border-1px border-gray-500 text-gray rounded">{{ item.status_name }}</div>
-                </div>
-              </div>
-            </div>
-
-
+  <div>
+    <div class="fixed top-0 bg-white w-full z-2">
+      <nut-tabs v-model="state.tabvalue" class="bg-white">
+        <nut-tab-pane title="京东"></nut-tab-pane>
+        <nut-tab-pane title="唯品会"></nut-tab-pane>
+        <nut-tab-pane title="苏宁易购"></nut-tab-pane>
+        <nut-tab-pane title="淘宝"></nut-tab-pane>
+        <nut-tab-pane title="拼多多"></nut-tab-pane>
+        <nut-tab-pane title="抖音"></nut-tab-pane>
+      </nut-tabs>
+    </div>
+
+    <div class="p-3 mt-12">
+      <div v-if="state.list && state.list.length > 0" class="flex flex-col gap-3">
+        <div v-for="(item, index) in state.list" :key="index">
+          <OtherOrderItem :item="item" />
+        </div>
+        <!--        <div>{{ item.status_name }}</div>-->
+        <div class=" flex justify-center items-center text-[12px] text-gray-500"
+             v-if="state.list && state.list.length > 0">
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
           </div>
-          <!--        <div>{{ item.status_name }}</div>-->
-
         </div>
-        <CXBEmpty v-else/>
 
-      </nut-tab-pane>
-      <nut-tab-pane title="唯品会">
-        <CXBEmpty />
-      </nut-tab-pane>
-      <nut-tab-pane title="苏宁易购">
-        <CXBEmpty />
-      </nut-tab-pane>
-      <nut-tab-pane title="淘宝">
-        <CXBEmpty />
-      </nut-tab-pane>
-      <nut-tab-pane title="拼多多">
-        <CXBEmpty />
-      </nut-tab-pane>
-      <nut-tab-pane title="抖音">
+      </div>
+
+      <div v-else class="flex flex-col items-center pt-10">
         <CXBEmpty />
-      </nut-tab-pane>
-    </nut-tabs>
+      </div>
+    </div>
+
+
+  </div>
+
 
-  </CXBBasePage>
 </template>
 <script setup lang="ts">
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {getThirdOrder} from "~/apis/order.api";
+import {getOrderListFromStatus, getThirdOrder} from "~/apis/order.api";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 enum TYPE {
   JD = '6',
   TB = '5',
@@ -78,6 +55,13 @@ enum TYPE {
 }
 const state = reactive({
   tabvalue: '0',
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  type: TYPE.JD,
+
+  list: [],
 
   allOrderTotal: 0,
   allOrderList: [],
@@ -94,75 +78,145 @@ const state = reactive({
 });
 
 onLoad(() => {
-  loadOrderList('6')
+  // loadOrderList('6')
+  loadList('reload')
 })
 
 watch(() => state.tabvalue, (val) => {
   console.log(val)
   switch (val) {
     case '0': {
-      loadOrderList(TYPE.JD)
+      // loadOrderList(TYPE.JD)
+      state.type = TYPE.JD
       break
     }
     case '1': {
-      loadOrderList(TYPE.VIP)
+      state.type = TYPE.VIP
       break
     }
     case '2': {
-      loadOrderList(TYPE.SU)
+      state.type = TYPE.SU
       break
     }
     case '3': {
-      loadOrderList(TYPE.TB)
+      state.type = TYPE.TB
       break
     }
     case '4': {
-      loadOrderList(TYPE.PDD)
+      state.type = TYPE.PDD
       break
     }
     case '5': {
-      loadOrderList(TYPE.DY)
+      state.type = TYPE.DY
       break
     }
   }
+
+  loadList('reload')
 })
-function loadOrderList(type: TYPE) {
-
-  getThirdOrder({type, page: 1, limit: 10}).then(res => {
-    switch (type) {
-      case TYPE.JD: {
-        state.jdOrderList = res.list
-        break
-      }
-      case TYPE.VIP: {
-        state.vipOrderList = res.list
-        break
-      }
-      case TYPE.PDD: {
-        state.pddOrderList = res.list
-        break
-      }
-      case TYPE.DY: {
-        state.dyOrderList = res.list
-        break
-      }
-      case TYPE.SU: {
-        state.suOrderList = res.list
-        break
-      }
-      case TYPE.TB: {
-        state.tbOrderList = res.list
-        break
-      }
+// function loadOrderList(type: TYPE) {
+//
+//   getThirdOrder({type, page: 1, limit: 10}).then(res => {
+//     switch (type) {
+//       case TYPE.JD: {
+//         state.jdOrderList = res.list
+//         break
+//       }
+//       case TYPE.VIP: {
+//         state.vipOrderList = res.list
+//         break
+//       }
+//       case TYPE.PDD: {
+//         state.pddOrderList = res.list
+//         break
+//       }
+//       case TYPE.DY: {
+//         state.dyOrderList = res.list
+//         break
+//       }
+//       case TYPE.SU: {
+//         state.suOrderList = res.list
+//         break
+//       }
+//       case TYPE.TB: {
+//         state.tbOrderList = res.list
+//         break
+//       }
+//     }
+//   }).catch(error => {
+//     if (error === '请登录') {
+//       uni.redirectTo({
+//         url: '/pages/user/login/index'
+//       })
+//     }
+//   })
+// }
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  if (state.keyword) {
+    params.keyword = state.keyword
+  }
+
+  getThirdOrder({
+    page: state.currentPage,
+    limit: state.pageSize,
+    type: state.type,
+  }).then(res => {
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
     }
-  }).catch(error => {
-    if (error === '请登录') {
-      uni.redirectTo({
-        url: '/pages/user/login/index'
-      })
+    if (action == 'reload') {
+      state.list = res.list
+    }
+    // state.totalPage = Math.ceil(res.count / state.pageSize);
+
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  loadList('page', (items) => {
+    // uni.hideLoading()
+    // console.log(items)
+    if (!items.length > 0) {
+      console.log('没有更多了')
+      state.status = 'noMore'
+      state.currentPage -= 1;
     }
   })
+  // if (state.currentPage > state.totalPage) {
+  //   state.status = 'noMore';
+  // } else {
+  //   setTimeout(() => {
+  //     loadList('page')
+  //   }, 300)
+  // }
 }
+
+onReachBottom(() => {
+  handleScrollToLower()
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
+
 </script>
 
 <route lang="yaml">
@@ -170,10 +224,16 @@ style:
   navigationBarTitleText: 三方订单
   enablePullDownRefresh: true
 </route>
-<style>
+<style lang="scss">
+.nut-tabs__titles {
+  background: white !important;
+}
 
 .nut-tab-pane {
-  background: #f5f5f5 !important;
+  display: none !important;
 }
 
+page {
+  background: #f8f8f8;
+}
 </style>

src/pages/order_addcart/index-new.vue

@@ -0,0 +1,511 @@
+<script lang="ts" setup>
+import {getRecommendList} from "~/apis/merchant";
+import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
+import {deleteCartItem, getCartList} from "~/apis/user";
+import type {ShoppingResult} from "~/apis/model/shopping.model";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import FButton from "~/components/FButton/FButton.vue";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+import {
+  DyProductModel, IProductDetail,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import {DcProductModel} from "~/apis/model/dacang.model";
+import {encodeBase64} from "~/utils/http/helper";
+import {CDN_URL} from "~/config/app";
+import {uniq} from "lodash-es";
+import {cartChange} from "~/apis/order.api";
+const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
+const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
+const state = reactive({
+  recommendList: [],
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+  totalPage: 0,
+
+
+  totalCartCount: 0,
+  totalPrice: 0,
+  selectAll: false,
+
+  cart_id: [],
+  isManage: true,
+})
+
+const shopping = ref<ShoppingResult>()
+
+onShow(() => {
+  state.cart_id = []
+  loadCartList()
+  if (!state.isManage) {
+    state.isManage = true
+  }
+
+  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.recommendList = state.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      state.recommendList = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+// 加载购物车数据
+function loadCartList() {
+  getCartList().then(res => {
+    shopping.value = res
+
+    console.log(res)
+    shopping.value?.list.forEach((shopItem, index) => {
+      // shopItem.allCheck = true
+      shopItem.indeterminate = false
+      shopItem.allCheck = false
+      shopItem.list.forEach(goodItem => {
+        goodItem.check = false
+        // state.cart_id.push(goodItem.cart_id)
+        // if (goodItem.cart_num === 1) {}
+      })
+      console.log(shopItem)
+    })
+    // cartAllCheck("all")
+    // if (shopping.value) {
+    //   handleSelectAll()
+    // }
+  })
+}
+const hasShopping = computed(() => {
+  return shopping.value && shopping.value?.list.length > 0
+})
+
+const totalCartInfo = computed(() => {
+  let totalPrice = 0
+  let goodsNum = 0
+  if (shopping.value && shopping.value?.list.length > 0) {
+    for (let i = 0; i < shopping.value?.list.length; i++) {
+      for (let j = 0; j < shopping.value?.list[i].list.length; j++) {
+        let num = Number.parseInt(shopping.value?.list[i].list[j].cart_num);
+        let price = Number.parseFloat(shopping.value?.list[i].list[j].productAttr.price)
+        totalPrice += (num * price)
+        goodsNum += num
+      }
+    }
+  }
+
+  return {
+    totalPrice,
+    goodsNum
+  }
+})
+const totalMoney = ref(0)
+const isAllSelect = ref(false)
+
+function handleGoodsItemCheck() {
+  cartAllCheck('single')
+}
+
+function shopCheck(shopItem) {
+  if (shopItem.allCheck) {
+    console.log(shopItem)
+    shopItem.list.forEach((good, index) => {
+      good.check = true
+    })
+  } else {
+    shopItem.list.forEach((good, index) => {
+      good.check = false
+    })
+  }
+}
+function cartAllCheck(type: 'single' | 'all') {
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+
+  shopping.value?.list.forEach((goods, index) => {
+    if (type === 'single') {
+      let tempArr = goods.list.filter(goodItem => {
+        // if (goodItem.check) {
+          return goodItem.check === true
+        // }
+      })
+      if (tempArr && goods.list.length === tempArr.length) {
+        goods.allCheck = true
+        allArr.push(goods)
+      } else {
+        goods.allCheck = false
+      }
+    } else {
+      goods.list.forEach(goodItem => {
+        goodItem.check = isAllSelect.value
+      })
+      goods.allCheck = isAllSelect.value
+      if (goods.allCheck) {
+        allArr.push(goods)
+      }
+    }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+
+function reTotal() {
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+
+  shopping.value?.list.forEach((goods, index) => {
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        // state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+function handleSelectAll(checked: boolean) {
+  // console.log('000')
+  // isAllSelect.value = !isAllSelect.value
+  // isAllSelect.value = checked
+  // 这里需要修改 checkbox 的检查
+  cartAllCheck('all')
+}
+
+function handleManageCart() {
+  state.isManage = !state.isManage
+}
+
+function handleSubmit() {
+  console.log(state.isManage)
+
+  if (!state.isManage) {
+    handleDelete()
+  } else { // submit
+    state.cart_id = uniq(state.cart_id)
+
+    // console.log(state.cart_id)
+    if (state.cart_id && state.cart_id.length > 0) {
+      uni.navigateTo({
+        url: `/pages/order-confirm/index?cartId=${state.cart_id.join(',')}`
+      })
+    } else {
+      return uni.showToast({
+        title: '请选择商品',
+        icon: 'none'
+      })
+    }
+  }
+
+}
+
+function handleDelete() {
+  // const cart_id = <any>[]
+  shopping.value?.list.forEach(shopItem => {
+    shopItem.list.forEach(goodItem => {
+      if (goodItem.check) {
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+  state.cart_id = uniq(state.cart_id)
+
+  // console.log(cart_id)
+  if (state.cart_id.length === 0) {
+    return uni.showToast({
+      title: '请选择产品',
+      icon: "none"
+    })
+  } else {
+    uni.showModal({
+      title: '温馨提示',
+      content: '确认将宝贝删除?',
+      success: (res) => {
+        if (res.confirm) {
+          deleteCartItem(state.cart_id).then(res => {
+            uni.showToast({
+              title: '删除成功'
+            })
+            state.isManage = true
+            state.cart_id = []
+            state.totalPrice = ''
+            loadCartList()
+          })
+
+        } else if (res.cancel) {
+        }
+      }
+    })
+  }
+}
+
+
+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 handleNumberChange(num, goodItem) {
+  console.log(goodItem)
+  uni.showLoading()
+  console.log(num)
+  cartChange(goodItem.cart_id, num).then(res => {
+    reTotal()
+    uni.hideLoading()
+  })
+  // console.log(goodItem)
+  // console.log(num)
+  // const
+  // goodItem.productAttr.price = goodItem.productAttr.price * num
+  // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
+}
+</script>
+<template>
+  <div class="">
+    <div
+        v-if="hasShopping"
+        class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end "
+    >
+      <div class="pr-3">
+        <FButton size="small"
+                 @click="handleManageCart"
+        >
+          <div>{{ state.isManage ? '管理' : '完成'}}</div>
+        </FButton>
+      </div>
+    </div>
+    <div
+        v-if="!hasShopping"
+        class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
+      <div>
+        <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
+      </div>
+      <div>
+        暂无商品，去添加喜欢的商品
+      </div>
+    </div>
+    <div v-else class="mt-10">
+
+      <div
+          v-if="shopping && shopping.list"
+          class="flex flex-col gap-4 p-3"
+      >
+        <div
+            v-for="(shopItem, index) in shopping.list"
+            :key="index"
+            class="bg-white rounded-lg  "
+        >
+
+<!--          <nut-cell-group>-->
+<!--            <nut-cell>-->
+<!--              <nut-checkbox :indeterminate="shopItem.indeterminate" v-model="shopItem.allCheck" @change="changeBox5">-->
+<!--                {{shopItem.mer_name}}-->
+<!--              </nut-checkbox>-->
+<!--            </nut-cell>-->
+<!--            <nut-checkbox-group v-model="checkboxgroup5" ref="group2" @change="changeBox6">-->
+<!--              <nut-cell><nut-checkbox label="1" style="margin: 2px 20px 0 0">组合复选框</nut-checkbox></nut-cell>-->
+<!--              <nut-cell><nut-checkbox label="2">组合复选框</nut-checkbox></nut-cell>-->
+<!--              <nut-cell><nut-checkbox label="3">组合复选框</nut-checkbox></nut-cell>-->
+<!--              <nut-cell><nut-checkbox label="4">组合复选框</nut-checkbox></nut-cell>-->
+<!--            </nut-checkbox-group>-->
+<!--          </nut-cell-group>-->
+
+
+          <div
+              class="f-hairline-bottom flex  items-center font-bold p-3"
+          >
+            <nut-checkbox v-model="shopItem.allCheck" @change="shopCheck(shopItem)" label="全选"
+                          class="!text-primary"
+            >
+              {{ shopItem.mer_name }}
+            </nut-checkbox>
+          </div>
+          <div v-for="(goodItem, goodIndex) in shopItem.list"
+               :key="goodIndex"
+               class="flex f-hairline-bottom p-3 gap-2"
+          >
+            <div class="flex">
+              <nut-checkbox v-model="goodItem.check"
+                            @change="handleGoodsItemCheck"
+                            label="单选"
+                            class="!text-primary"
+              ></nut-checkbox>
+              <image
+                  :src="goodItem.product.image"
+                  mode="aspectFill" class="w-18 h-18 rounded"
+              ></image>
+            </div>
+
+            <div class="flex flex-col gap-1 w-full">
+              <div
+                  @click="handleProductItemClick(goodItem)"
+                  class="text-overflow line-clamp-1">{{ goodItem.product.store_name }}</div>
+              <div class="flex flex-col justify-start gap-1">
+                <div
+                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
+                  {{ goodItem.productAttr.sku }}
+                </div>
+                <div class="flex">
+                  <CXBYaojinTag :amount="goodItem.yanglao"/>
+
+                </div>
+              </div>
+              <div class="flex  justify-between ">
+                <FPrice :price="goodItem.productAttr.price"
+                        ex-class="font-bold text-dark"
+                />
+                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)"/>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="pb-12">
+      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
+        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
+        <div>
+          猜你喜欢
+        </div>
+        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
+      </div>
+
+      <div class="pb-3 px-3" v-if="state.recommendList">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in state.recommendList"
+               :key="index"
+               @click="handleProductItemClick(item)"
+          >
+            <MerchantProductCard :item="item" />
+
+          </div>
+        </grid-view>
+
+        <div class=" flex justify-center items-center text-[12px] text-gray-500"
+        >
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+
+  <div v-if="hasShopping"
+      class="fixed bottom-0 w-full">
+    <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
+      <div class="flex justify-center items-center gap-2 pl-3">
+        <nut-checkbox v-model="isAllSelect"
+                      @change="handleSelectAll"
+                      label="全选"
+                      class="!text-primary"
+        >全选
+        </nut-checkbox>
+        <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
+      </div>
+
+      <div class="flex justify-center items-center gap-2 pr-3">
+        <div class="flex text-[12px]">
+          合计：
+          <FPrice :price="state.totalPrice"></FPrice>
+<!--          {{totalCartInfo.totalPrice}}-->
+        </div>
+        <FButton
+            @click="handleSubmit"
+            size="small"
+            :exClass="['rounded-full','!text-[14px]', 'text-white', 'bg-primary', 'w-full']"
+        >
+          {{ state.isManage? '去结算' : '删除'}}
+        </FButton>
+      </div>
+    </div>
+  </div>
+</template>
+<style>
+page {
+  background-color: #f8f8f8;
+}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 购物车
+  enablePullDownRefresh: true
+</route>

src/pages/order_addcart/index.vue

@@ -21,6 +21,11 @@ const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 const state = reactive({
   recommendList: [],
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+  totalPage: 0,
+
 
   totalCartCount: 0,
   totalPrice: 0,
@@ -38,12 +43,53 @@ onShow(() => {
   if (!state.isManage) {
     state.isManage = true
   }
+
+  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({
-    page: 1,
-    limit: 10
+    ...params
   }).then(res => {
-    state.recommendList = res.list
+    if (action === 'page') {
+      state.recommendList = state.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      state.recommendList = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
   })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
 })
 
 // 加载购物车数据
@@ -118,16 +164,19 @@ function cartAllCheck(type: 'single' | 'all') {
 
   shopping.value?.list.forEach((goods, index) => {
     if (type === 'single') {
+      // 如果单选的情况下, 获取已选中的
       let tempArr = goods.list.filter(goodItem => {
+        console.log(goodItem.check)
         // if (goodItem.check) {
           return goodItem.check === true
         // }
       })
-      if (tempArr && goods.list.length === tempArr.length) {
+      console.log(tempArr)
+      if (goods.list.length === tempArr.length) {
         goods.allCheck = true
         allArr.push(goods)
       } else {
-        goods.allCheck = false
+        // goods.allCheck = false
       }
     } else {
       goods.list.forEach(goodItem => {
@@ -373,8 +422,8 @@ function handleNumberChange(num, goodItem) {
       </div>
     </div>
 
-    <div>
-      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3">
+    <div class="pb-12">
+      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
           猜你喜欢
@@ -392,6 +441,17 @@ function handleNumberChange(num, goodItem) {
 
           </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>

src/pages/payment/index.vue

@@ -82,8 +82,7 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    // 这个不写的话会显示开发环境,不能正常跳转,写上就能正常跳转了
-    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({

src/pages/payment/success.vue

@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+
+const icon = 'https://cdn.bjtdba.com/vod/image/2023-09-21/20230921160115229.png'
+</script>
+
+<template>
+<CXBBasePage>
+  <div class="flex flex-col h-screen w-screen items-center pt-20">
+
+    <image :src="icon" mode="widthFix" class="w-40"></image>
+    <div>支付成功</div>
+  </div>
+</CXBBasePage>
+</template>
+
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 支付成功
+</route>

src/pages/pension_choice_platform/index.vue

@@ -27,7 +27,7 @@ const list = [{
   icon: CDN_URL + '/static/assets/pinduoduo_d.png'
 }, {
   type: '90',
-  title: '储蓄宝',
+  title: '储蓄保',
   icon: CDN_URL + '/static/assets/cxb_logo_230316.png'
 }]
 

src/pages/pension_record/detail.vue

@@ -45,11 +45,11 @@ onLoad((options) => {
         <div class="text-gray w-1/5">交易时间</div>
         <div class="w-4/5">{{ detail.create_time}}</div>
       </div>
-      <div class="flex gap-4">
+      <div class="flex gap-4" v-if="detail.other_status_desc">
         <div class="text-gray w-1/5">交易状态</div>
         <div class="4/5">{{ detail.other_status_desc }}</div>
       </div>
-      <div class="flex gap-4">
+      <div class="flex gap-4" v-if="detail.goods_name">
         <div class="text-gray w-1/5">商品名称</div>
         <div class="line-clamp-2 w-4/5">{{ detail.goods_name }}</div>
       </div>
@@ -57,7 +57,7 @@ onLoad((options) => {
         <div class="text-gray w-1/5">流水单号</div>
         <div class="w-4/5">{{ detail.order_sn }}</div>
       </div>
-      <div class="flex gap-4">
+      <div class="flex gap-4" v-if="detail.mark">
         <div class="text-gray w-1/5">备注</div>
         <div class="w-4/5">{{ detail.remark }}</div>
       </div>

src/pages/pension_record/index.vue

@@ -76,7 +76,7 @@ const shitidian_yanglaojinImage = CDN_URL + '/static/assets/shitidian_yanglaojin
       <div class="flex flex-col bg-white rounded p-4 text-sm gap-3" v-if="yanglaoStatistics && yanglaoStatistics.third_party_num">
         <div class=" border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b pb-2">电商平台消费（单）：{{ yanglaoStatistics.third_party_num.all_num}}</div>
         <div class="flex justify-between text-xs" v-if="yanglaoStatistics">
-          <div>已结算（单）：{{ yanglaoStatistics.all_yanglao_a.all_num_a }}</div>
+          <div>已结算（单）：{{ yanglaoStatistics.third_party_num_a.all_num_a }}</div>
           <div v-if="yanglaoStatistics.third_party_num_n">未结算（单）：{{ yanglaoStatistics.third_party_num_n.all_num_n }}</div>
         </div>
       </div>

src/pages/pension_record/list.vue

@@ -6,9 +6,12 @@ import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import {encodeBase64} from "~/utils/http/helper";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 const list = ref([])
+const state = reactive({
+  type: ''
+})
 onLoad((options) => {
-  const type = options.type
-  if (type === '99') {
+  state.type = options.type
+  if (state.type == '99') {
     getUserYanglaoJinLogXx({
       page: 1,
       limit: 20,
@@ -24,7 +27,7 @@ onLoad((options) => {
     })
   }
 
-  if (type === '90') {
+  if (state.type == '90') {
     getYanglaoJinLogXs({
       page: 1,
       limit: 20,
@@ -40,7 +43,7 @@ onLoad((options) => {
     })
   }
 
-  if (type !== 90 && type !== 99) {
+  if (state.type != 90 && state.type !=99) {
     getThirdOrder({
       page: 1,
       limit: 20,
@@ -68,6 +71,7 @@ function handleItemClick(item) {
   <CXBBasePage>
     <div v-if="list && list.length > 0" class="flex flex-col gap-3 p-3">
       <div
+          v-if="state.type != 90"
           @tap="handleItemClick(item)"
           v-for="(item, index) in list" :key="index" class="bg-white rounded p-3 text-[12px]">
         <div class="flex items-center gap-3 text-[12px]">
@@ -95,6 +99,36 @@ function handleItemClick(item) {
           </div>
         </div>
       </div>
+      <div
+          v-else
+          @tap="handleItemClick(item)"
+          v-for="(item, index) in list" :key="index" class="bg-white rounded p-3 text-[12px]">
+        <div class="flex items-center gap-3 text-[12px]">
+          <image :src="item.product.product.image" mode="widthFix" class="w-15 h-15"></image>
+          <div class="flex flex-col">
+            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.product.product.store_name }}</div>
+            <CXBYaojinTag :amount="item.number" />
+          </div>
+        </div>
+        <div class="flex text-gray text-[12px] f-hairline-bottom py-3">
+          订单号：{{ item.order_sn }}
+        </div>
+        <div class="flex flex-col gap-2 pt-3">
+          <div class="flex">
+            下单时间：{{ item.create_time }}
+          </div>
+          <div class="flex justify-between items-center">
+            <div>
+              养老金来源：购买商品
+            </div>
+            <div class="flex items-center text-gray">
+              <div>详情</div>
+              <div class="f-text-color-2 i-tabler-chevron-right"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+
     </div>
 
     <CXBEmpty v-else />

src/pages/refund/README.md

@@ -1 +1,3 @@
-售后管理
+售后管理
+
+申请退款-退款类型 option.vue

src/pages/refund/components/GoodStatusPopup.vue

@@ -0,0 +1,126 @@
+<script setup lang="ts">
+import closeIcon from "~/static/icon/close.png";
+import radioOffIcon from "~/static/icon/radio-off.png";
+import radioOnIcon from "~/static/icon/radio-on.png";
+import {computed} from "vue";
+import {PopupProps} from "~/components/FPopup";
+import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
+import {CANCEL_EVENT, CONFIRM_EVENT} from "~/constants/event";
+import FPopup from "~/components/FPopup/FPopup.vue";
+
+const emit = defineEmits()
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false
+  },
+  // detail: {
+  //   type: Object,
+  //   required: true
+  // },
+})
+const show = ref(props.show || false)
+
+const showValue = computed<PopupProps['show']>({
+  get: () => props.show || show.value,
+  set(val) {
+    if (val)
+      emit(OPEN_EVENT)
+    else
+      emit(CLOSE_EVENT)
+    show.value = val
+    emit(UPDATE_SHOW_EVENT, val)
+  },
+})
+
+const onCancel = () => {
+  // show.value = false
+  showValue.value = false
+
+  emit(CANCEL_EVENT)
+}
+
+function handleClose() {
+  showValue.value = false
+
+  emit(CLOSE_EVENT)
+}
+
+const onConfirm = () => {
+  show.value = false
+  showValue.value = false
+  console.log(showValue.value)
+  emit(CONFIRM_EVENT)
+}
+
+const radioVal = ref('')
+
+function handleFinished() {
+  if (radioVal.value) {
+    emit('selected:item', radioVal.value)
+    showValue.value = false
+    emit(CONFIRM_EVENT, radioVal.value)
+
+    console.log(radioVal.value)
+  } else {
+    uni.showToast({
+      title: '请选择收货状态',
+      icon: 'none'
+    })
+  }
+}
+</script>
+
+<template>
+  <FPopup
+      v-model:show="showValue"
+      @close="onCancel"
+      position="bottom"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-80"
+
+  >
+    <div class="flex flex-col  h-full relative">
+      <div class="flex p-3 f-hairline-bottom">
+        <div class="w-full text-center font-bold">货物状态</div>
+        <div class="absolute right-3"
+             @tap="handleClose"
+        >
+          <image :src="closeIcon" class="w-4 h-4"></image>
+        </div>
+
+      </div>
+      <div class="p-3 flex-1 h-full">
+        <nut-radio-group v-model="radioVal"  text-position="left">
+          <nut-radio label="1">
+            <div class="flex flex-1">
+              未收到货
+            </div>
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="2">
+            已收到货
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+        </nut-radio-group>
+      </div>
+      <div class="px-3 ">
+<!--        <FButton-->
+<!--            @click="handleFinished"-->
+<!--            :exClass="['!bg-primary', 'rounded-full', 'text-white']"-->
+<!--            block-->
+<!--        >-->
+<!--          完成-->
+<!--        </FButton>-->
+        <nut-button
+            @click="handleFinished"
+            type="primary" block>完成
+        </nut-button>
+
+      </div>
+    </div>
+
+  </FPopup>
+</template>

src/pages/refund/components/RefundReasonPopup.vue

@@ -0,0 +1,158 @@
+<script setup lang="ts">
+import closeIcon from "~/static/icon/close.png";
+import radioOffIcon from "~/static/icon/radio-off.png";
+import radioOnIcon from "~/static/icon/radio-on.png";
+import {computed} from "vue";
+import {PopupProps} from "~/components/FPopup";
+import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
+import {CANCEL_EVENT, CONFIRM_EVENT} from "~/constants/event";
+import FPopup from "~/components/FPopup/FPopup.vue";
+
+const emit = defineEmits()
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false
+  },
+  // detail: {
+  //   type: Object,
+  //   required: true
+  // },
+})
+const show = ref(props.show || false)
+
+const showValue = computed<PopupProps['show']>({
+  get: () => props.show || show.value,
+  set(val) {
+    // console.log(val + 'xxxx')
+    if (val)
+      emit(OPEN_EVENT)
+    else
+      emit(CLOSE_EVENT)
+    show.value = val
+    emit(UPDATE_SHOW_EVENT, val)
+  },
+})
+
+const onCancel = () => {
+  // show.value = false
+  showValue.value = false
+
+  emit(CANCEL_EVENT)
+}
+
+function handleClose() {
+  showValue.value = false
+
+  emit(CLOSE_EVENT)
+}
+
+const onConfirm = () => {
+  show.value = false
+  showValue.value = false
+  console.log(showValue.value)
+  emit(CONFIRM_EVENT)
+}
+
+const radioVal = ref('')
+
+function handleFinished() {
+  if (radioVal.value) {
+    // emit('selected:item', radioVal.value)
+    showValue.value = false
+    emit(CONFIRM_EVENT, radioVal.value)
+
+    console.log(radioVal.value)
+  } else {
+    uni.showToast({
+      title: '请选择退款原因',
+      icon: 'none'
+    })
+  }
+}
+</script>
+
+<template>
+  <FPopup
+      v-model:show="showValue"
+      @close="onCancel"
+      position="bottom"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-100"
+
+  >
+    <div class="flex flex-col  h-full relative">
+      <div class="flex p-3 f-hairline-bottom">
+        <div class="w-full text-center font-bold">货物状态</div>
+        <div class="absolute right-3"
+             @tap.stop="handleClose"
+        >
+          <image :src="closeIcon" class="w-4 h-4"></image>
+        </div>
+
+      </div>
+      <div class="p-3 flex-1 h-full">
+        <nut-radio-group v-model="radioVal"  text-position="left">
+          <nut-radio label="1">
+            <div class="flex flex-1">
+              订单信息拍错了
+            </div>
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="2">
+            我不想要了
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="3">
+            地址/电话信息填写错误
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="4">
+            没用/少用优惠
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="5">
+            发货速度不满意
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="6">
+            缺货
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+          <div class="h-0.2 bg-gray-100 my-3"></div>
+          <nut-radio label="7">
+            拍多了
+            <template #icon> <image :src="radioOffIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+            <template #checkedIcon> <image :src="radioOnIcon" class="w-4 h-4" mode="widthFix"></image> </template>
+          </nut-radio>
+
+        </nut-radio-group>
+      </div>
+      <div class="px-3 ">
+        <nut-button
+            @click="handleFinished"
+            type="primary" block>完成
+        </nut-button>
+<!--        <FButton-->
+<!--            @click="handleFinished"-->
+<!--            :exClass="['!bg-primary', 'rounded-full', 'text-white']"-->
+<!--            block-->
+<!--        >-->
+<!--          完成-->
+<!--        </FButton>-->
+
+      </div>
+    </div>
+
+  </FPopup>
+</template>

src/pages/refund/detail.vue

@@ -36,8 +36,8 @@ const state = reactive({
 })
 // const detail = ref({})
 onLoad((options) => {
-  // getRefundDetail(options.id).then(res => {
-  getRefundDetail(657).then(res => {
+  getRefundDetail(options.id).then(res => {
+  // getRefundDetail(657).then(res => {
     console.log(res)
     state.detail = res
     // res.status = -1
@@ -56,7 +56,24 @@ onLoad((options) => {
   })
 })
 
+function handleClipboard() {
+  uni.setClipboardData({
+    data: state.detail.refund_order_sn,
+    success(res) {
+      // wx.getClipboardData({
+      //   success (res) {
+      //     console.log(res.data) // data
+      //   }
+      // })
+    }
+  })
+}
 
+function handleHeaderClick() {
+  uni.navigateTo({
+    url: `/pages/store/home/index?id=${state.detail.merchant.mer_id}`
+  })
+}
 </script>
 <template>
 
@@ -102,7 +119,7 @@ onLoad((options) => {
               </div>
             </div>
 
-            <div @tap.stop="handleShowOrderDetail(orderItem)">
+            <div>
               <div v-for="(orderProduct, orderProductIndex) in state.detail.refundProduct" :key="orderProductIndex">
                 <div class="flex py-2 gap-3 f-hairline-bottom pb-3">
                   <div class="flex-1 flex gap-2">
@@ -120,7 +137,7 @@ onLoad((options) => {
                         <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 class="text-gray-500 text-[11px] text-right">共{{ orderProduct.product.product_num }}件</div>
                       </div>
                     </div>
                   </div>
@@ -150,7 +167,10 @@ onLoad((options) => {
               <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 class="flex gap-2">
+                    <div class="text-gray-400">{{ state.detail.refund_order_sn }}</div>
+                   <div @click="handleClipboard">复制</div>
+                  </div>
                 </div>
                 <div class="flex justify-between">
                   <div>申请时间</div>
@@ -158,7 +178,7 @@ onLoad((options) => {
                 </div>
                 <div class="flex justify-between">
                   <div>备注说明</div>
-                  <div class="text-gray-400">{{ state.detail.take_status }}</div>
+                  <div class="text-gray-400">{{ state.detail.mark ? state.detail.mark : '暂无说明' }}</div>
                 </div>
 
               </div>
@@ -176,7 +196,7 @@ onLoad((options) => {
   </div>
 </template>
 
-<route lang="yaml" type="home">
+<route lang="yaml">
 style:
   navigationBarTitleText: 售后订单
 </route>

src/pages/refund/drawback.vue

@@ -0,0 +1,261 @@
+<script setup lang="ts">
+import FPrice from "~/components/FPrice/FPrice.vue";
+import {UPLOAD_URL} from "~/utils/http";
+import GoodStatusPopup from "~/pages/refund/components/GoodStatusPopup.vue";
+import RefundReasonPopup from "~/pages/refund/components/RefundReasonPopup.vue";
+import {getToken} from "~/utils/auth";
+import {refundApply, takeOrder} from "~/apis/order.api";
+const headers = {
+  "Content-Type": "multipart/form-data",
+  'X-Token': 'Bearer ' + getToken()
+}
+const state = reactive({
+  showGoodStatusPopup: false,
+  showReasonPopup: false,
+  // detail: {}
+  total_price: '0.00',
+  orderId: ''
+
+})
+const userStore = useUserStore()
+
+const formData = reactive({
+  ids: '',
+  // 申请说明
+  mark: '',
+  num: '',
+  // 联系电话
+  phone: '',
+  // 图片
+  pics: [],
+  // 原因
+  refund_message: '',
+  // 退款金额
+  refund_price: '',
+  type: '',
+  // 1退款， 2退款退货
+  refund_type: '',
+  // 收货状态
+  goods: ''
+})
+const defaultFileList = ref([])
+
+const radioVal = ref(false)
+function handleUploadSuccess({ data, option, fileItem }) {
+  // console.log(data.data.path)
+
+  if (data && data.data) {
+    const resData = JSON.parse(data.data).data
+    const path = resData.path
+    formData.pics.push(path)
+  }
+  // if (data && data.path) {
+  //   formData.pics.push(data.path)
+  // }
+  //
+  // console.log(fileItem)
+}
+onLoad(async (options) => {
+  await userStore.getUserInfo()
+  formData.refund_type = options.refund_type
+  formData.ids = options.ids
+  formData.refund_price = options.total_price
+  formData.num = options.total_num
+  formData.phone = userStore.userInfo.phone
+  formData.type = options.type || 1
+
+  state.orderId = options.orderId
+})
+function handleSubmit() {
+  if(!formData.goods) {
+    return uni.showToast({
+      title: '请选择收货状态',
+      icon: "none"
+    })
+  }
+  if (!formData.refund_message) {
+    return uni.showToast({
+      title: '请选择退款原因',
+      icon: "none"
+    })
+  }
+  uni.showModal({
+    content: '您确定继续退款吗？',
+    confirmColor: '#FE0032',
+    success: function (res) {
+      if (res.confirm) {
+        refundApply(state.orderId, formData).then(res => {
+          // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
+          uni.showToast({
+            title: '申请退款成功'
+          })
+          setTimeout(() => {
+            uni.navigateTo({
+              url: '/pages/refund/index'
+            })
+          }, 300)
+        })
+
+      }
+    }
+  })
+  // if (state.orderId) {
+  // }
+
+  console.log(formData)
+}
+
+function handleChooseGoodStatus () {
+  state.showGoodStatusPopup = true
+}
+
+function getGoodsStatus(radioVal) {
+  if (radioVal == 1) {
+    return formData.goods = '未收到货'
+  }
+  if (radioVal == 2) {
+    return formData.goods = '已收到货'
+  }
+}
+function onGoodStatusConfirm(val) {
+  // console.log(val)
+  // formData.goods = val
+  getGoodsStatus(val)
+}
+
+function getRefundMessage(radioVal) {
+  if (radioVal == 1) {
+    return '订单信息拍错了'
+  }
+  if (radioVal == 2) {
+    return '我不想要了'
+  }
+  if (radioVal == 3) {
+    return '地址/电话信息填写错误'
+  }
+  if (radioVal == 4) {
+    return '没用/少用优惠'
+  }
+  if (radioVal == 5) {
+    return '发货速度不满意'
+  }
+  if (radioVal == 6) {
+    return '缺货'
+  }
+  if (radioVal == 7) {
+    return '拍多了'
+  }
+}
+function onRefundReasonConfirm(val) {
+  formData.refund_message = getRefundMessage(val)
+  console.log(formData.refund_message)
+}
+
+
+</script>
+<template>
+<div>
+  <nut-cell-group>
+    <nut-cell :desc="formData.goods == '' ? '请选择' : `${formData.goods}`" is-link @click="handleChooseGoodStatus">
+      <template #title>
+        <div class="flex font-bold gap-1 items-center">
+          <div>收货状态</div>
+          <div class="text-primary">*</div>
+        </div>
+      </template>
+    </nut-cell>
+    <nut-cell :desc="formData.refund_message == '' ? '请选择' : `${formData.refund_message}`" is-link @click="state.showReasonPopup = true">
+      <template #title>
+        <div class="flex font-bold gap-1 items-center">
+          <div>退款原因</div>
+          <div class="text-primary">*</div>
+        </div>
+      </template>
+    </nut-cell>
+    <nut-cell >
+      <div class="flex flex-col">
+        <div class="flex font-bold gap-1 items-center">
+          <div>退款金额</div>
+          <div class="text-primary">*</div>
+        </div>
+        <FPrice :price="formData.refund_price" :ex-class="['font-bold text-xl']"></FPrice>
+        <div class="text-gray-500 text-[12px]">
+          不可修改，最多￥{{ formData.refund_price }},含发货邮费￥{{state.total_price}}
+        </div>
+      </div>
+
+    </nut-cell>
+  </nut-cell-group>
+
+  <div class="bg-white p-3">
+    <div class="text-sm">
+      补充描述和凭证
+    </div>
+    <div class="flex flex-col my-2 gap-2 bg-gray-100">
+        <textarea placeholder="补充描述，有助于商家更好的处理售后问题"
+                  class="p-2 text-xs rounded-lg"
+                  v-model="formData.mark"
+        />
+      <div class="flex p-2 text-gray">
+        <div class="flex flex-col justify-center items-center text-xs gap-2">
+          <nut-uploader :url="UPLOAD_URL"
+                        :headers="headers"
+                        :name="'field'"
+                        :timeout="1000*50"
+                        :data="{ filename: 'field'}"
+                        v-model:file-list="defaultFileList" maximum="3"
+                        @success="handleUploadSuccess"
+          >
+          </nut-uploader>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+  <div class="fixed bottom-0 pb-safe w-full">
+    <div class="px-3 ">
+      <nut-button
+          @click="handleSubmit"
+          type="primary" block>提交
+      </nut-button>
+
+<!--      <FButton-->
+<!--          @click="handleSubmit"-->
+<!--          :exClass="['!bg-primary', 'rounded-full', 'text-white']"-->
+<!--          block-->
+<!--      >-->
+<!--        提交-->
+<!--      </FButton>-->
+      <!--        <div class="text-center text-white bg-red rounded-full text-sm p-2">-->
+      <!--        </div>-->
+    </div>
+
+  </div>
+
+  <GoodStatusPopup v-model:show="state.showGoodStatusPopup"
+                   @confirm="onGoodStatusConfirm"
+  />
+  <RefundReasonPopup v-model:show="state.showReasonPopup"
+                     @confirm="onRefundReasonConfirm"
+  />
+</div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 售后订单
+</route>
+
+<style lang="scss">
+page {
+  background: #f8f8f8;
+}
+.nut-radio-group {
+  width: 100%;
+}
+//.nut-radio {
+//  display: flex !important;
+//  width: 100%;
+//}
+</style>

src/pages/refund/index.vue

@@ -84,20 +84,20 @@ function handleTabChange(	{title,paneKey,disabled}) {
   <div>
     <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 v-if="state.list.length > 0" class="flex flex-col">
+            <div v-for="(orderItem, index) in state.list" :key="index">
+              <RefundOrderItem :order-item="orderItem"/>
             </div>
-            <div v-if="state.status === 'noMore'">
-              没有更多了～
+            <div class=" flex justify-center items-center text-[12px] text-gray-500" >
+              <div v-if="state.status === 'loading'">
+                加载中...
+              </div>
+              <div v-if="state.status === 'noMore'">
+                没有更多了～
+              </div>
             </div>
           </div>
-        </div>
-        <CXBEmpty v-else/>
+          <CXBEmpty v-else/>
       </nut-tab-pane>
       <nut-tab-pane title="退款中">
         <div v-if="state.list.length > 0" class="flex flex-col gap-3">
@@ -138,3 +138,12 @@ function handleTabChange(	{title,paneKey,disabled}) {
 style:
   navigationBarTitleText: 退款/售后
 </route>
+
+<style>
+page {
+  background: #f8f8f8;
+}
+.nut-tab-pane {
+  background: #f8f8f8 !important;
+}
+</style>

src/pages/search/index.vue

@@ -591,8 +591,17 @@ function handleScrollToLower() {
                   </div>
 
                   <div v-if="state.currentTab === PLATFORM_NAME.DC">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+
+                    <div class="flex flex-row gap-2">
+                      <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                      <div  class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
+                        大仓
+                      </div>
+                    </div>
+
                     <FPrice :price="item.ot_price" ex-class="text-gray text-xs" need-symbol strike-through/>
+
+
                   </div>
 
                   <div v-if="state.currentTab === PLATFORM_NAME.DY">
@@ -608,7 +617,10 @@ function handleScrollToLower() {
                     <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
                     <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
                   </div>
+<!--                  <div class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">-->
+
 
+<!--                  </div>-->
 
                 </div>
               </div>

src/pages/store/home/index.vue

@@ -219,7 +219,7 @@ onPullDownRefresh(() => {
         <div
             @click="handleOpenSearchPage"
 
-            class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-gray-200"
+            class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-gray-200 h-8"
 
         >
 

src/pages/store/nearby/index.vue

@@ -215,7 +215,7 @@ function handleScrollToLower() {
     </div>
 
 
-    <div>
+    <div class="w-full">
       <div class="fixed z-3 flex flex-col justify-center h-10">
         <nut-menu>
           <nut-menu-item v-model="state.menuDefaultValue"
@@ -272,7 +272,7 @@ function handleScrollToLower() {
           </div>
         </div>
       </scroll-view>
-      <div class="flex-1 justify-center items-center" v-else>
+      <div class="flex justify-center items-center w-full h-[60%]" v-else>
         <CXBEmpty/>
 
       </div>

src/pages/store/product/detail.vue

@@ -358,7 +358,7 @@ function handleShowCustomer() {
           </swiper-item>
         </swiper>
       </div>
-      <div class="bg-black bg-op-30 fixed top-3  rounded-full right-3 h-6 w-6 flex flex-col justify-center items-center"
+      <div class="bg-black bg-op-30 fixed top-3  rounded-full right-3 h-6 w-6 flex flex-col justify-center items-center z-10"
            @click="toggleRelation"
       >
         <div class="h4 w-4"

src/pages/store/product/other.vue

@@ -163,45 +163,62 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 
 function handleBuyNow() {
   console.log(detail.value)
-  if (detail.value?.platform == 6 && detail.value?.spreadUrl) {
+  // 京东
+  if (detail.value?.platform == 6 && detail.value?.materialUrl) {
     // 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=' + detail.value.materialUrl,
-      extraData: {
-        foo: 'bar'
-      },
-      envVersion: 'release',
-      success(res) {
-        // 打开成功
-        console.log(res);
-      },
-      fail: (error) => {
-        console.log(error);
-      }
-    })
+    if (detail.value && detail.value.materialUrl) {
+      uni.navigateToMiniProgram({
+        appId: 'wx91d27dbf599dff74',
+        // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
+        path: 'pages/union/proxy/proxy?spreadUrl=' + detail.value.materialUrl,
+        extraData: {
+          foo: 'bar'
+        },
+        envVersion: 'release',
+        success(res) {
+          // 打开成功
+          console.log(res);
+        },
+        fail: (error) => {
+          console.log(error);
+        }
+      })
+    } else {
+      return uni.showToast({
+        title: '跳转失败请重试',
+        icon: 'none'
+      })
+    }
   }
   if (detail.value?.platform == 1) {
     // console.log(detail.value)
     const pddWx = detail.value.pddlink.wx
+    if (pddWx) {
+      uni.navigateToMiniProgram({
+        appId: pddWx.app_id,
+        path: pddWx.page_path,
+        // extraData: {
+        //  foo: 'bar'
+        // },
+        envVersion: 'release',
+        success(res) {
+          // 打开成功
+          console.log(res);
+        },
+        fail: (error) => {
+          console.log(error);
+        }
+      })
+
+    } else  {
+      uni.showToast({
+        title: '跳转失败请重试',
+        icon: 'none'
+      })
+    }
+    // console.log(detail.value.pddlink)
     // console.log(pddWx)
-    uni.navigateToMiniProgram({
-      appId: pddWx.app_id,
-      path: pddWx.page_path,
-      // extraData: {
-      //  foo: 'bar'
-      // },
-      envVersion: 'release',
-      success(res) {
-        // 打开成功
-        console.log(res);
-      },
-      fail: (error) => {
-        console.log(error);
-      }
-    })
   }
   if (detail.value?.platform == 3) {
     // console.log('sunig')

src/pages/user/index.vue

@@ -34,7 +34,7 @@ const myOrderList = [{
 }, {
   icon: CDN_URL + '/static/assets/after_sale_220620.png',
   text: '退款/售后',
-  url: ''
+  url: '/pages/refund/index'
 }]
 const contactUsList = [{
   type: 'customer',
@@ -216,9 +216,16 @@ function handleShowMyIntegral() {
 }
 
 function handleShowMyAllOrder(tab?: number) {
-  uni.navigateTo({
-    url: '/pages/order/index?tabIndex=' + tab
-  })
+  if (tab <= 4) {
+    uni.navigateTo({
+      url: '/pages/order/index?tabIndex=' + tab
+    })
+  }
+  if (tab == 5) {
+    uni.navigateTo({
+      url: '/pages/refund/index'
+    })
+  }
 }
 
 const userType = computed(() => {
@@ -350,7 +357,7 @@ function handleShowMyRulePage() {
             <div
                 @tap="handleShowMyInvitation"
                 class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price }}</div>
+              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0.00'}}</div>
               <div class="text-xs">我的佣金</div>
             </div>
             <div
@@ -427,6 +434,13 @@ function handleShowMyRulePage() {
               >
                 {{ orderQuantity.noPostage}}
               </div>
+              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                   v-if="
+                   item.id == 'noComment' && orderQuantity && orderQuantity.noComment != '0'"
+
+              >
+                {{ orderQuantity.noComment}}
+              </div>
               <image :src="item.icon"
                      mode="widthFix"
                      class="w-7 h-7 "