代码提交

pages/orderList/orderList.vue

@@ -7,7 +7,7 @@
       >
         <uv-navbar
             :fixed="false"
-            title="全部订单"
+            :title="title"
             @leftClick="goBack"
         />
         <uv-tabs
@@ -18,6 +18,7 @@
         >
         </uv-tabs>
       </uv-sticky>
+
       <view class="orderList">
         <template v-if="!listEmpty">
           <order
@@ -40,23 +41,26 @@
         <ListLoadOver v-if="loadend" />
       </view>
     </layout>
+    <!-- 支付弹窗 -->
+    <PayPopup
+        ref="payPopupRef"
+        @confirm="paySuccess"
+    />
   </view>
-  <!-- 支付弹窗 -->
-  <PayPopup
-      ref="payPopupRef"
-      @confirm="paySuccess"
-  />
 </template>
 
 <script setup>
-import { ref, unref } from 'vue'
+import { computed, ref, unref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { orderList } from '@/api/order'
 import { useRouter } from "@/hooks/useRouter";
+import ListLoadOver from "@/components/ListLoadOver/index.vue"
+import ListLoadLoading from "@/components/ListLoadLoading/index.vue"
 import Empty from '@/components/Empty/index.vue'
 import emptyIcon from '@/static/icon/empty/订单.png'
 import PayPopup from '@/components/PayPopup/index.vue'
 import { usePage } from "@/hooks";
+import Header from "@/components/Header/index.vue"
 import { getProductList } from "@/api/product";
 
 const {type, refresh, dataList, loadend, loading, listEmpty} = usePage(orderList)
@@ -78,6 +82,11 @@ const navList = ref([
   // { name: "退款", value: 7, },
 ])
 
+const title  = computed(()=>{
+  const find = navList.value.find(item=>item.value === type.value);
+  return find?`${find.name}订单`:'订单'
+})
+
 
 // const handleOrderList = async (option) => {
 //   orderListData.value = []
@@ -110,7 +119,7 @@ function openPay(orderId) {
 }
 
 function paySuccess() {
-  // push({url: '/pages/payStatus/index?type=1'})
+  push({url: '/pages/payStatus/index'},{})
 }