Basil преди 2 години
родител
ревизия
33ca7a3b64

+ 1 - 0
src/apis/order.api.ts

@@ -196,6 +196,7 @@ export function getIntegralOrderCreate(params: CreateOrderRequest): Promise<Inte
196 196
  */
197 197
 export function getOrderListFromStatus(params: {
198 198
     page: number
199
+    //   订单状态(0:待发货;1:待收货;2:待评价;3:已完成;4已申请退款;-1:已退款)5未支付
199 200
     status: number
200 201
     limit: number
201 202
 }): Promise<OrderListResult> {

+ 1 - 1
src/pages/home/index.vue

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

+ 97 - 85
src/pages/order/components/OrderItem.vue

@@ -1,87 +1,3 @@
1
-<template>
2
-  <div class="mb-3 bg-white rounded p-3">
3
-    <div
4
-        @click="handleHeaderClick"
5
-        class="flex items-center justify-between f-hairline-bottom pb-3">
6
-      <div class="flex items-center font-bold gap-2 text-sm">
7
-        <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
8
-        {{ orderItem.merchant.mer_name }}
9
-      </div>
10
-      <div class="text-primary text-xs">
11
-        {{ getStatusText(orderItem) }}
12
-      </div>
13
-    </div>
14
-
15
-
16
-
17
-    <div @tap.stop="handleShowOrderDetail(orderItem)">
18
-      <div v-if="orderItem.orderList">
19
-        <div v-for="(order, index) in orderItem.orderList" :key="index">
20
-          <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
21
-            <div class="flex py-2 gap-3">
22
-              <div class="flex-1 flex gap-2">
23
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
24
-
25
-                <div class="flex flex-col">
26
-                  <div class="line-clamp-2 text-[12px]">
27
-                    {{ orderProduct.cart_info.product.store_name }}
28
-                  </div>
29
-                  <div class="text-gray-500 text-[10px]">
30
-                    {{ orderProduct.cart_info.productAttr.sku }}
31
-                  </div>
32
-                </div>
33
-              </div>
34
-
35
-              <div class="flex flex-col justify-center items-center">
36
-                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
37
-                <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
38
-              </div>
39
-
40
-            </div>
41
-            <div class="flex justify-end gap-2">
42
-              <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
43
-              <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
44
-
45
-            </div>
46
-          </div>
47
-        </div>
48
-
49
-      </div>
50
-
51
-      <div v-else>
52
-        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
53
-          <div class="flex py-2 gap-3">
54
-            <div class="flex-1 flex gap-2">
55
-              <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
56
-
57
-              <div class="flex flex-col">
58
-                <div class="line-clamp-2 text-[12px]">
59
-                  {{ orderProduct.cart_info.product.store_name }}
60
-                </div>
61
-                <div class="text-gray-500 text-[10px]">
62
-                  {{ orderProduct.cart_info.productAttr.sku }}
63
-                </div>
64
-              </div>
65
-            </div>
66
-
67
-            <div class="flex flex-col justify-center items-center">
68
-              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
69
-              <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
70
-            </div>
71
-
72
-          </div>
73
-          <div class="flex justify-end gap-2">
74
-            <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
75
-            <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
76
-          </div>
77
-        </div>
78
-      </div>
79
-    </div>
80
-
81
-  </div>
82
-
83
-
84
-</template>
85 1
 <script setup lang="ts">
86 2
 import FPrice from "~/components/FPrice/FPrice.vue";
87 3
 import {OrderListModel} from "~/apis/model/order.model";
@@ -91,6 +7,9 @@ const props = defineProps({
91 7
   orderItem: {
92 8
     type: Object,
93 9
     required: true
10
+  },
11
+  status: {
12
+    type: Number,
94 13
   }
95 14
 })
96 15
 
@@ -107,6 +26,9 @@ const props = defineProps({
107 26
 //   }
108 27
 // })
109 28
 function getStatusText(orderItem: OrderListModel) {
29
+  if (props.status === 5) {
30
+    return '未支付'
31
+  }
110 32
   // switch (orderItem.status) {
111 33
   // }
112 34
   if (orderItem.status == 0) {
@@ -171,4 +93,94 @@ function handleShowOrderDetail(order) {
171 93
     url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
172 94
   })
173 95
 }
174
-</script>
96
+</script>
97
+
98
+<template>
99
+  <div class="mb-3 bg-white rounded p-3">
100
+    <div
101
+        @click="handleHeaderClick"
102
+        class="flex items-center justify-between f-hairline-bottom pb-3">
103
+      <div class="flex items-center font-bold gap-2 text-sm justify-between">
104
+        <div class="flex-1 flex items-center gap-2">
105
+          <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
106
+          {{ orderItem.merchant.mer_name }}
107
+        </div>
108
+
109
+        <div class="f-text-color-2 i-tabler-chevron-right"></div>
110
+
111
+      </div>
112
+      <div class="text-primary text-xs">
113
+        {{ getStatusText(orderItem) }}
114
+      </div>
115
+    </div>
116
+
117
+
118
+
119
+    <div @tap.stop="handleShowOrderDetail(orderItem)">
120
+      <div v-if="orderItem.orderList">
121
+        <div v-for="(order, index) in orderItem.orderList" :key="index">
122
+          <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
123
+            <div class="flex py-2 gap-3">
124
+              <div class="flex-1 flex gap-2">
125
+                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
126
+
127
+                <div class="flex flex-col">
128
+                  <div class="line-clamp-2 text-[12px]">
129
+                    {{ orderProduct.cart_info.product.store_name }}
130
+                  </div>
131
+                  <div class="text-gray-500 text-[10px]">
132
+                    {{ orderProduct.cart_info.productAttr.sku }}
133
+                  </div>
134
+                </div>
135
+              </div>
136
+
137
+              <div class="flex flex-col justify-center items-center">
138
+                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
139
+                <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
140
+              </div>
141
+
142
+            </div>
143
+            <div class="flex justify-end gap-2">
144
+              <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
145
+              <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
146
+
147
+            </div>
148
+          </div>
149
+        </div>
150
+
151
+      </div>
152
+
153
+      <div v-else>
154
+        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
155
+          <div class="flex py-2 gap-3">
156
+            <div class="flex-1 flex gap-2">
157
+              <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
158
+
159
+              <div class="flex flex-col">
160
+                <div class="line-clamp-2 text-[12px]">
161
+                  {{ orderProduct.cart_info.product.store_name }}
162
+                </div>
163
+                <div class="text-gray-500 text-[10px]">
164
+                  {{ orderProduct.cart_info.productAttr.sku }}
165
+                </div>
166
+              </div>
167
+            </div>
168
+
169
+            <div class="flex flex-col justify-center items-center">
170
+              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
171
+              <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
172
+            </div>
173
+
174
+          </div>
175
+          <div class="flex justify-end gap-2">
176
+            <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
177
+            <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
178
+          </div>
179
+        </div>
180
+      </div>
181
+    </div>
182
+
183
+  </div>
184
+
185
+
186
+</template>

+ 235 - 0
src/pages/order/components/order.json

@@ -0,0 +1,235 @@
1
+{
2
+  "status": 200,
3
+  "message": "success",
4
+  "data": {
5
+    "count": 2,
6
+    "list": [
7
+      {
8
+        "group_order_id": "4595",
9
+        "group_order_sn": "wx1694945939655574220",
10
+        "uid": "395",
11
+        "total_postage": "0.00",
12
+        "total_price": "1000.00",
13
+        "total_num": "1",
14
+        "coupon_price": "0.00",
15
+        "real_name": "测试",
16
+        "user_phone": "15100000001",
17
+        "user_address": "北京顺义区光明街道 胡图图1号",
18
+        "pay_price": "1000.00",
19
+        "pay_postage": "0.00",
20
+        "cost": "300.00",
21
+        "give_coupon_ids": "",
22
+        "paid": "0",
23
+        "pay_time": null,
24
+        "pay_type": "0",
25
+        "create_time": "2023-09-17 18:19:00",
26
+        "is_remind": "1",
27
+        "is_del": "0",
28
+        "rand": "",
29
+        "split": "0",
30
+        "serialNumber": "",
31
+        "test_order": "0",
32
+        "hf_pay_id": "",
33
+        "pay_wx": null,
34
+        "mer_id": "324",
35
+        "order_id": "4197",
36
+        "orderList": [
37
+          {
38
+            "order_id": "4197",
39
+            "orderProduct": [
40
+              {
41
+                "order_product_id": "4467",
42
+                "order_id": "4197",
43
+                "uid": "395",
44
+                "cart_id": "11311",
45
+                "product_id": "5474",
46
+                "extension_one": "0.00",
47
+                "extension_two": "0.00",
48
+                "product_sku": "513fb91079f0",
49
+                "is_refund": "0",
50
+                "product_num": "1",
51
+                "refund_num": "1",
52
+                "is_reply": "0",
53
+                "product_price": "1000.00",
54
+                "cart_info": {
55
+                  "product": {
56
+                    "product_id": "5474",
57
+                    "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-06-22\/5769f202306221123262310.jpeg",
58
+                    "store_name": "金樽花楸",
59
+                    "is_show": "1",
60
+                    "status": "1",
61
+                    "is_del": "0",
62
+                    "unit_name": "瓶",
63
+                    "price": "1000.00",
64
+                    "mer_status": "1",
65
+                    "temp_id": "202",
66
+                    "give_coupon_ids": [],
67
+                    "is_gift_bag": "0",
68
+                    "is_used": "1",
69
+                    "product_type": "0",
70
+                    "old_product_id": "0",
71
+                    "temp": {
72
+                      "shipping_template_id": "202",
73
+                      "name": "全国包邮",
74
+                      "type": "0",
75
+                      "appoint": "0",
76
+                      "undelivery": "0",
77
+                      "mer_id": "324",
78
+                      "is_default": "0",
79
+                      "sort": "0",
80
+                      "create_time": "2022-04-26 18:03:56",
81
+                      "regionAddress": null,
82
+                      "undelives": null,
83
+                      "freeAddress": null
84
+                    }
85
+                  },
86
+                  "productAttr": {
87
+                    "gong_mer_profit": null,
88
+                    "gong_pension": null,
89
+                    "gong_market_price": null,
90
+                    "cost_price": null,
91
+                    "product_id": "5474",
92
+                    "stock": "9998",
93
+                    "price": "1000.00",
94
+                    "unique": "513fb91079f0",
95
+                    "sku": "两瓶",
96
+                    "volume": "0.00",
97
+                    "weight": "0.00",
98
+                    "ot_price": "1398.00",
99
+                    "dacang_price": "0.00",
100
+                    "cost": "300.00",
101
+                    "bc_extension_one": 0,
102
+                    "bc_extension_two": 0,
103
+                    "seckill": 0
104
+                  },
105
+                  "product_type": "0"
106
+                },
107
+                "create_time": "2023-09-17 18:18:59",
108
+                "type": "9"
109
+              }
110
+            ],
111
+            "group_order_id": "4595"
112
+          }
113
+        ],
114
+        "merchant": {
115
+          "mer_id": "324",
116
+          "mer_name": "网络科技",
117
+          "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/43e9413731947f97e84f192cc8562490.png"
118
+        }
119
+      },
120
+      {
121
+        "group_order_id": "4599",
122
+        "group_order_sn": "wx1694947734003120280",
123
+        "uid": "395",
124
+        "total_postage": "0.00",
125
+        "total_price": "1000.00",
126
+        "total_num": "1",
127
+        "coupon_price": "0.00",
128
+        "real_name": "测试",
129
+        "user_phone": "15100000001",
130
+        "user_address": "北京顺义区光明街道 胡图图1号",
131
+        "pay_price": "1000.00",
132
+        "pay_postage": "0.00",
133
+        "cost": "300.00",
134
+        "give_coupon_ids": "",
135
+        "paid": "0",
136
+        "pay_time": null,
137
+        "pay_type": "0",
138
+        "create_time": "2023-09-17 18:48:54",
139
+        "is_remind": "1",
140
+        "is_del": "0",
141
+        "rand": "",
142
+        "split": "0",
143
+        "serialNumber": "",
144
+        "test_order": "0",
145
+        "hf_pay_id": "",
146
+        "pay_wx": null,
147
+        "mer_id": "324",
148
+        "order_id": "4201",
149
+        "orderList": [
150
+          {
151
+            "order_id": "4201",
152
+            "orderProduct": [
153
+              {
154
+                "order_product_id": "4471",
155
+                "order_id": "4201",
156
+                "uid": "395",
157
+                "cart_id": "11315",
158
+                "product_id": "5474",
159
+                "extension_one": "0.00",
160
+                "extension_two": "0.00",
161
+                "product_sku": "513fb91079f0",
162
+                "is_refund": "0",
163
+                "product_num": "1",
164
+                "refund_num": "1",
165
+                "is_reply": "0",
166
+                "product_price": "1000.00",
167
+                "cart_info": {
168
+                  "product": {
169
+                    "product_id": "5474",
170
+                    "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-06-22\/5769f202306221123262310.jpeg",
171
+                    "store_name": "金樽花楸",
172
+                    "is_show": "1",
173
+                    "status": "1",
174
+                    "is_del": "0",
175
+                    "unit_name": "瓶",
176
+                    "price": "1000.00",
177
+                    "mer_status": "1",
178
+                    "temp_id": "202",
179
+                    "give_coupon_ids": [],
180
+                    "is_gift_bag": "0",
181
+                    "is_used": "1",
182
+                    "product_type": "0",
183
+                    "old_product_id": "0",
184
+                    "temp": {
185
+                      "shipping_template_id": "202",
186
+                      "name": "全国包邮",
187
+                      "type": "0",
188
+                      "appoint": "0",
189
+                      "undelivery": "0",
190
+                      "mer_id": "324",
191
+                      "is_default": "0",
192
+                      "sort": "0",
193
+                      "create_time": "2022-04-26 18:03:56",
194
+                      "regionAddress": null,
195
+                      "undelives": null,
196
+                      "freeAddress": null
197
+                    }
198
+                  },
199
+                  "productAttr": {
200
+                    "gong_mer_profit": null,
201
+                    "gong_pension": null,
202
+                    "gong_market_price": null,
203
+                    "cost_price": null,
204
+                    "product_id": "5474",
205
+                    "stock": "9997",
206
+                    "price": "1000.00",
207
+                    "unique": "513fb91079f0",
208
+                    "sku": "两瓶",
209
+                    "volume": "0.00",
210
+                    "weight": "0.00",
211
+                    "ot_price": "1398.00",
212
+                    "dacang_price": "0.00",
213
+                    "cost": "300.00",
214
+                    "bc_extension_one": 0,
215
+                    "bc_extension_two": 0,
216
+                    "seckill": 0
217
+                  },
218
+                  "product_type": "0"
219
+                },
220
+                "create_time": "2023-09-17 18:48:54",
221
+                "type": "9"
222
+              }
223
+            ],
224
+            "group_order_id": "4599"
225
+          }
226
+        ],
227
+        "merchant": {
228
+          "mer_id": "324",
229
+          "mer_name": "网络科技",
230
+          "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/43e9413731947f97e84f192cc8562490.png"
231
+        }
232
+      }
233
+    ]
234
+  }
235
+}

+ 1 - 1
src/pages/order/index.vue

@@ -15,7 +15,7 @@
15 15
       <nut-tab-pane title="待付款">
16 16
         <div v-if="state.obligationOrderList.length > 0">
17 17
           <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
18
-            <OrderItem :order-item="orderItem"/>
18
+            <OrderItem :order-item="orderItem" :status="5"/>
19 19
 <!--            <OtherOrderItem :item="orderItem" v-else/>-->
20 20
           </div>
21 21
         </div>

+ 133 - 56
src/pages/revenue-sharing/index.vue

@@ -7,6 +7,7 @@ import {getAgentInfo, getRevenueSharing, getSelectUserInviteProfit} from "~/apis
7 7
 import type {RevenueSharingModel} from "~/apis/model/revenueSharingModel";
8 8
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
9 9
 import {encodeBase64} from "~/utils/http/helper";
10
+
10 11
 const userStore = useUserStore()
11 12
 const state = reactive({
12 13
   numberSun: '',
@@ -21,19 +22,26 @@ const state = reactive({
21 22
 
22 23
   currentTab: 0,
23 24
   list: [
24
-  //     {
25
-  //   order_sn: '11111',
26
-  //   status: 0,
27
-  //   content: '预估用户1502111',
28
-  //   xiadan: '2023-08-04',
29
-  //   jiesuan: '2023-08-05',
30
-  //   number: 0.10
31
-  // }
32
-  ]
25
+    //     {
26
+    //   order_sn: '11111',
27
+    //   status: 0,
28
+    //   content: '预估用户1502111',
29
+    //   xiadan: '2023-08-04',
30
+    //   jiesuan: '2023-08-05',
31
+    //   number: 0.10
32
+    // }
33
+  ],
34
+
35
+  currentPage: 1,
36
+  pageSize: 10,
37
+  totalPage: 1,
38
+
39
+  status: 'noMore',
40
+  type: 0,
33 41
 })
34 42
 onLoad((option: any) => {
35 43
   // 未结算收益
36
-  getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
44
+  getSelectUserInviteProfit({uid: userStore.uid}).then(res => {
37 45
     console.log(res)
38 46
     state.numberSun = res.numberSun
39 47
     state.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit
@@ -49,26 +57,52 @@ onLoad((option: any) => {
49 57
     state.cumulative = res.cumulative
50 58
     state.extract = res.extract
51 59
   })
52
-  loadList(0)
60
+  // loadList(0)
61
+  loadList('reload')
53 62
 })
54 63
 
55
-function loadList(type: number) {
56
-  getRevenueSharing({
57
-    page: 1,
58
-    limit: 20,
59
-    type
60
-  }).then((res: Array<RevenueSharingModel>) => {
64
+// function loadList(type: number) {
65
+//   getRevenueSharing({
66
+//     page: 1,
67
+//     limit: 20,
68
+//     type
69
+//   }).then((res: Array<RevenueSharingModel>) => {
61 70
     // if (res && res.length > 0) {
62
-    console.log(res)
71
+    // console.log(res)
72
+    // state.list = res
73
+    // }
74
+  // })
75
+//
76
+// }
77
+
78
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
79
+  getRevenueSharing({
80
+    page: state.currentPage,
81
+    limit: state.pageSize,
82
+    type: state.type
83
+  }).then(res => {
84
+    if (action === 'page' && res.length > 0) {
85
+      state.list = state.list.concat(res)
86
+    }
87
+    if (action === 'reload') {
63 88
       state.list = res
89
+    }
90
+    // if (res && res.length === 0) {
64 91
     // }
65
-  })
66 92
 
93
+    if (callback) {
94
+      callback(res)
95
+    }
96
+  })
67 97
 }
98
+
68 99
 function handleTabClick(type) {
69 100
   state.currentTab = type
70
-  loadList(type)
101
+  state.type = type
102
+  loadList('reload')
103
+  // loadList(type)
71 104
 }
105
+
72 106
 function getStatusText(status: number) {
73 107
   ////状态:0-未结算。1-已结算。-1-失效
74 108
   if (status == 0) {
@@ -87,16 +121,45 @@ function handleItemClick(item) {
87 121
     url: '/pages/revenue-sharing/detail?detail=' + encodeBase64(Object.assign({}, item))
88 122
   })
89 123
 }
124
+
125
+function handleScrollToLower() {
126
+  state.status = 'loading';
127
+  state.currentPage += 1;
128
+  setTimeout(() => {
129
+    loadList('page', (items) => {
130
+      if (items.length === 0) {
131
+        state.status = 'noMore'
132
+      }
133
+    })
134
+  }, 300)
135
+
136
+  // loadList('page', (items) => {
137
+  // })
138
+  // console.log(state.totalPage)
139
+  // if (state.currentPage > state.totalPage) {
140
+  //   state.status = 'noMore';
141
+  // } else {
142
+  //   setTimeout(() => {
143
+  //     loadList('page')
144
+  //   }, 300)
145
+  // }
146
+}
147
+
148
+onReachBottom(() => {
149
+  handleScrollToLower()
150
+
151
+})
90 152
 </script>
91 153
 
92 154
 <template>
93
-  <div class="flex flex-col px-3">
94
-    <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
155
+  <div class="flex flex-col  ">
156
+    <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full fixed top-0 left-0 z-1"></div>
95 157
 
96
-    <div class=" py-3 flex flex-col gap-3 fixed top-0 z-2 w-full">
97
-      <div class="w-full">
158
+    <div class="  flex flex-col gap-3 fixed top-0 z-2 w-full">
159
+
160
+      <div class="p-3">
98 161
         <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
99
-          <div class="flex justify-around py-8">
162
+          <div class="flex justify-around py-8 w-full">
100 163
             <div class="flex-1 flex flex-col justify-center items-center gap-2">
101 164
               <div class="text-[11px] text-gray">累计佣金(元)</div>
102 165
               <div class="font-bold ">
@@ -121,65 +184,79 @@ function handleItemClick(item) {
121 184
           </div>
122 185
 
123 186
         </div>
124
-        <div class="flex justify-around text-center text-sm py-3 bg-gray-300">
187
+        <div class="flex justify-around text-center text-sm py-3 bg-[#f8f8f8] ">
125 188
           <div
126 189
               @click="handleTabClick(0)"
127 190
               :class="state.currentTab === 0? 'text-primary' : ''"
128
-          >线上商城明细</div>
191
+          >线上商城明细
192
+          </div>
129 193
           <div
130 194
               :class="state.currentTab === 1? 'text-primary' : ''"
131 195
               @click="handleTabClick(1)"
132
-          >线下实体明细</div>
196
+          >线下实体明细
197
+          </div>
133 198
         </div>
134 199
       </div>
135
-<!--      <div class="fixed top-50">-->
136 200
 
137
-<!--      </div>-->
201
+      <!--      <div class="fixed top-50">-->
202
+
203
+      <!--      </div>-->
138 204
 
139 205
 
140 206
     </div>
141
-    <div class="px-3 py-3 flex flex-col gap-3 pt-50">
207
+    <div class="px-3 py-3 flex flex-col gap-3 pt-45 pb-safe">
142 208
       <div>
143
-        <div v-if="state.list && state.list.length > 0" class="bg-white p-3 gap-3">
144
-          <div v-for="(item, index) in state.list" :key="index"
145
-               @click="handleItemClick(item)"
146
-          >
147
-            <div class="flex flex-col">
148
-              <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
149
-                <div>订单号:{{ item.order_sn }}</div>
150
-                <div>{{ getStatusText(item.status) }}</div>
151
-              </div>
152
-              <div class="font-bold flex py-2 justify-between">
153
-                <div>
154
-                  {{ item.content }}
209
+        <div v-if="state.list && state.list.length > 0" class="  gap-3 flex flex-col">
210
+          <div class="bg-white p-3">
211
+            <div v-for="(item, index) in state.list" :key="index"
212
+                 @click="handleItemClick(item)"
213
+            >
214
+              <div class="flex flex-col">
215
+                <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
216
+                  <div>订单号:{{ item.order_sn }}</div>
217
+                  <div>{{ getStatusText(item.status) }}</div>
155 218
                 </div>
156
-                <div class="text-primary">+{{ Number.parseFloat(item.number).toFixed(2) }}</div>
157
-              </div>
158
-              <div class="flex justify-between text-gray text-xs">
159
-                <div class="flex flex-col">
160
-                  <div>消费时间</div>
161
-                  <div class="text-black text-sm">{{ item.xiadan }}</div>
219
+                <div class="font-bold flex py-2 justify-between">
220
+                  <div>
221
+                    {{ item.content }}
222
+                  </div>
223
+                  <div class="text-primary">+{{ Number.parseFloat(item.number).toFixed(2) }}</div>
162 224
                 </div>
163
-                <div class="flex flex-col">
164
-                  <div>结算时间</div>
165
-                  <div class="text-black text-sm">{{ item.jiesuan }}</div>
225
+                <div class="flex justify-between text-gray text-xs">
226
+                  <div class="flex flex-col">
227
+                    <div>消费时间</div>
228
+                    <div class="text-black text-sm">{{ item.xiadan }}</div>
229
+                  </div>
230
+                  <div class="flex flex-col">
231
+                    <div>结算时间</div>
232
+                    <div class="text-black text-sm">{{ item.jiesuan }}</div>
233
+                  </div>
166 234
                 </div>
167 235
               </div>
168
-            </div>
169 236
 
170 237
 
238
+            </div>
239
+
240
+          </div>
171 241
 
242
+          <div class=" flex justify-center items-center text-[12px] text-gray-500" >
243
+            <div v-if="state.status === 'loading'">
244
+              加载中...
245
+            </div>
246
+            <div v-if="state.status === 'noMore'">
247
+              没有更多了~
248
+            </div>
172 249
           </div>
250
+
173 251
         </div>
174 252
 
175 253
         <CXBEmpty v-else/>
176 254
       </div>
177 255
 
178 256
     </div>
179
-
180 257
   </div>
181 258
 </template>
182
-<route lang="yaml"  type="home">
259
+<route lang="yaml">
183 260
 style:
184 261
   navigationBarBackgroundColor: "#FD1642"
185 262
   navigationBarTextStyle: "white"
@@ -187,6 +264,6 @@ style:
187 264
 </route>
188 265
 <style>
189 266
 page {
190
- background: #f8f8f8;
267
+  background: #f8f8f8;
191 268
 }
192 269
 </style>

+ 1 - 1
src/pages/store/home/components/MerchantProductCard.vue

@@ -58,7 +58,7 @@ const props = defineProps({
58 58
                mode="widthFix" class="!w-8.5"></image>
59 59
         <div class="px-2 flex items-center jusitify-center text-xs">
60 60
           <div>
61
-            养老金 ¥{{item.yanglao}}
61
+            养老金 ¥{{item.yanglao || item.yanglao_price}}
62 62
           </div>
63 63
         </div>
64 64
       </div>