2
0

2 Incheckningar e5db01fb9f ... 63add44deb

Upphovsman SHA1 Meddelande Datum
  huangziyang 63add44deb Merge branch 'fix-home-0.0.1' 1 vecka sedan
  tangyuanwang ac81e2a765 [捉药师] 订单列表显示内容问题修改 1 vecka sedan
2 ändrade filer med 19 tillägg och 9 borttagningar
  1. 8 8
      pages/order/index.vue
  2. 11 1
      utils/common.js

+ 8 - 8
pages/order/index.vue

@@ -8,7 +8,7 @@ const orderList = ref([]);
 
 onMounted(async () => {
   const res = await request("api/question_bank/question_reception/orders/list");
-  orderList.value = res.data;
+  orderList.value = res.data.data;
 });
 </script>
 
@@ -23,10 +23,10 @@ onMounted(async () => {
     <view class="Container">
       <view class="card" v-for="item in orderList" :key="item.id">
         <view class="left">
-          <view class="name">{{ item.name }}</view>
+          <view class="name">{{ item.order_name }}</view>
           <view
-            >有效期: {{ utils.timestampToString(item.start_time_validity) }}至{{
-              utils.timestampToString(item.end_time_validity)
+            >有效期: {{ utils.timestampToString_day(item.start_time_validity) }}至{{
+              utils.timestampToString_day(item.end_time_validity)
             }}</view
           >
           <view>订单号: {{ item.order_sn }}</view>
@@ -35,10 +35,10 @@ onMounted(async () => {
           >
         </view>
         <view class="right">
-          <view class="price"
-            >¥{{ item.order_preferential_price?.toFixed?.(1) }}</view
-          >
-          <view class="line">{{ item.order_original_price?.toFixed?.(1) }}</view>
+          <view class="price" v-if="item.order_preferential_price > 0">¥{{ item.order_preferential_price }}</view>
+		  <view class="price" v-if="item.order_preferential_price < 0.01">赠送</view>
+          <view class="line" v-if="item.order_preferential_price > 0">{{ item.order_original_price }}</view>
+		  <view class="line" v-if="item.order_preferential_price < 0.01"></view>
         </view>
       </view>
     </view>

+ 11 - 1
utils/common.js

@@ -22,5 +22,15 @@ function timestampToString(timestamp) {
   const seconds = String(date.getSeconds()).padStart(2, "0");
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
+function timestampToString_day(timestamp) {
+  const date = new Date(timestamp * 1000);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
 
-export default { debounce, timestampToString };
+export default { debounce, timestampToString,timestampToString_day };