Просмотр исходного кода

fix: [AE-会员端] 修改问题

bill 2 недель назад
Родитель
Сommit
52ebdb44b1

+ 2 - 2
src/ui-refactor/views/account/components/AccountOrders.vue

@@ -20,8 +20,8 @@
 
 <script>
 // 只继承旧脚本,避免加载旧页面的全局表格样式。
-import OwnOrders from '@/views/shop/order-list.vue?vue&type=script&lang=js'
-import MemberOrders from '@/views/user/member-order.vue?vue&type=script&lang=js'
+import OwnOrders from '@/views/shop/order-list.vue'
+import MemberOrders from '@/views/user/member-order.vue'
 import OrderCards from './order/AccountOrderCards.vue'
 
 export default {

+ 5 - 4
src/ui-refactor/views/account/components/order/AccountOrderCards.vue

@@ -94,18 +94,19 @@
         <strong>{{ orderSummaries[index].total }}</strong>
       </div>
     </el-card>
-
-    <!--    <div class="ng-order-pagination">-->
-    <!--      <pagination v-show="total > 0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" float="none" @pagination="getList" />-->
-    <!--    </div>-->
+    <div class="ng-order-pagination">
+      <pagination v-show="total > 0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" :hide-on-single-page="false" float="none" @pagination="getList" />
+    </div>
   </div>
 </template>
 
 <script>
 import { amountFilter, toThousandFilter } from '@/filters'
+import Pagination from '@/components/Pagination/index.vue'
 
 export default {
   name: 'AccountOrderCards',
+  components: { Pagination },
   filters: { toThousandFilter },
   props: {
     memberOrders: { type: Boolean, default: false }

+ 3 - 7
src/ui-refactor/views/guest-shop/GuestOrderDetails.vue

@@ -69,11 +69,7 @@ export default {
     },
     address() {
       return (
-        this.order.FULL_ADDRESS ||
-        [this.order.ADDRESS, this.order.LGA_NAME, this.order.CITY_NAME]
-          .filter(Boolean)
-          .join(', ') ||
-        '—'
+        this.order.FULL_ADDRESS === 'Self Pick-up' ? 'Self Pick-up' : 'Delivery'
       )
     }
   },
@@ -152,10 +148,10 @@ export default {
           </dl>
           <p v-if="!currency">Currency information is unavailable.</p>
         </ui-section-card>
-        <ui-section-card title="Delivery">
+        <ui-section-card :title="address">
           <strong>{{ order.CONSIGNEE || '—' }}</strong>
           <p class="ng-guest-order-address">
-            {{ order.MOBILE || '—' }}<br>{{ address }}<br>{{ order.COUNTRY || '—' }}
+            {{ order.MOBILE || '—' }}<br>{{ order.FULL_ADDRESS }}<br>{{ order.COUNTRY || '—' }}
           </p>
         </ui-section-card>
         <ui-section-card title="Payment">

+ 8 - 5
src/ui-refactor/views/purchase/PurchasePage.vue

@@ -46,11 +46,14 @@ export default {
         this.$message.info('Complete or cancel the current payment before leaving.')
         next(false)
       } else if (['/shop/own-order', '/shop/member-order'].includes(to.path)) {
-        // 保留旧提交及支付回调的分类判断,仅在新页面转换成功后的去向。
-        next({
-          path: '/dashboard/index',
-          query: { tab: 'orders', orderCategory: to.path === '/shop/own-order' ? 'self' : 'member' }
-        })
+        const orderSn = this.$refs.flow?.payment.orderSn
+        // 旧响应缺少订单号时,仍可从订单列表查看。
+        next(orderSn
+          ? { path: '/guest-order', query: { order: orderSn }}
+          : {
+            path: '/dashboard/index',
+            query: { tab: 'orders', orderCategory: to.path === '/shop/own-order' ? 'self' : 'member' }
+          })
       } else next()
     }
   }

+ 1 - 1
src/ui-refactor/views/purchase/README.md

@@ -25,7 +25,7 @@
 - 自动续期门槛来自 `ampDivideLine`,未取得有效门槛或不足时禁止结算和提交,支付方式继续排除 `prp`。
 - 升级保留会员查询、目标等级选择、商品选择的原顺序;保留满级/报单中心限制、等级及差额字段、原提交校验。未增加差额 BV 拦截。
 - Reporting Center ID 沿用旧 `isDec` 规则:普通会员可编辑且必填;报单中心(`Number(isDec) === 1`)默认填当前报单中心账号并禁用编辑。默认账号继续由旧 watcher 与会员切换逻辑填入。会员升级不展示该字段,也不增加人工填写校验,提交仍保留原接口返回的 `decUserName`。
-- 支付方式、支付密码提示、API、金额来源、Paystack channels、取消中间订单及成功后的订单分类沿用对应旧页。新页面将旧订单地址转为首页 Orders 对应分类;旧页面、旧路由及提交方法保留。新层锁定提交上下文,阻止重复提交、支付中切换和上一交易的迟到回调;取消失败保留支付窗口和商品,便于重试。
+- 支付方式、支付密码提示、API、金额来源、Paystack channels、取消中间订单沿用对应旧页。余额支付成功、Paystack 成功倒计时结束或点击返回按钮后,新页面将旧订单地址转为 `/guest-order?order=<本次响应的 SN>`,打开订单详情;旧响应缺少 SN 时仍回到首页 Orders 对应分类。旧页面、旧路由及提交方法保留。新层锁定提交上下文,阻止重复提交、支付中切换和上一交易的迟到回调;取消失败保留支付窗口和商品,便于重试。
 
 ## 验证证据
 

+ 31 - 5
src/ui-refactor/views/purchase/__tests__/OrderNavigation.spec.js

@@ -12,7 +12,7 @@ import usersInfo from '@/utils/usersInfo'
 import { toThousandFilter } from '@/filters'
 import { load } from './loadComponent'
 
-jest.mock('@/api/shop', () => Object.fromEntries(['fetchProductList', 'fetchReconsumeProductList', 'fetchAutoMaintenanceProductList', 'fetchShoppingCart', 'createOrder', 'createApproachOrder', 'createReconsumeOrder', 'createApproachReconsumeOrder', 'createAutoMaintenanceOrder', 'createApproachAutoMaintenanceOrder', 'deleteApproachOrder', 'fetchOrderList', 'downloadOrder'].map(key => [key, jest.fn()])))
+jest.mock('@/api/shop', () => Object.fromEntries(['fetchProductList', 'fetchReconsumeProductList', 'fetchAutoMaintenanceProductList', 'fetchShoppingCart', 'createOrder', 'createApproachOrder', 'createReconsumeOrder', 'createApproachReconsumeOrder', 'createAutoMaintenanceOrder', 'createApproachAutoMaintenanceOrder', 'deleteApproachOrder', 'fetchOrderList', 'downloadOrder', 'fetchGuestOrderDetail'].map(key => [key, jest.fn()])))
 jest.mock('@/api/user', () => Object.fromEntries(['fetchFullInfo', 'fetchUpgrade', 'fetchUpgradeInfo', 'fetchSendUpgrade', 'getUserInfo', 'fetchOrderList', 'downloadOrder'].map(key => [key, jest.fn()])))
 jest.mock('@/api/config', () => ({ getRegionList: jest.fn().mockResolvedValue({ data: [] }) }))
 jest.mock('@/utils/usersInfo', () => ({ userId: () => 'OP1', loginTimestamp: jest.fn(), userName: () => 'OP1', userEmail: () => 'operator@example.test' }))
@@ -27,6 +27,7 @@ Vue.prototype.$prompt = jest.fn().mockResolvedValue({ value: 'fixture-password'
 Vue.prototype.$confirm = jest.fn().mockResolvedValue()
 
 const PurchasePage = load(path.resolve(__dirname, '../PurchasePage.vue'))
+const OrderDetails = load(path.resolve('src/ui-refactor/views/guest-shop/GuestOrderPage.vue'))
 const drafts = load(path.resolve(__dirname, '../drafts.js'))
 const purchaseRoutes = load(path.resolve(__dirname, '../routes.js')).default.map(route => ({ ...route, path: '/' + route.path, component: PurchasePage }))
 const AccountOrders = load(path.resolve('src/ui-refactor/views/account/components/AccountOrders.vue'))
@@ -52,6 +53,7 @@ async function settle() { for (let i = 0; i < 20; i++) { await Promise.resolve()
 async function mount(location) {
   const router = new Router({ mode: 'abstract', routes: [
     ...purchaseRoutes,
+    { path: '/guest-order', component: OrderDetails },
     { path: '/dashboard/index', component: Account },
     { path: '/shop/own-order', component: { render: h => h('div', 'Legacy own orders') }},
     { path: '/shop/member-order', component: { render: h => h('div', 'Legacy member orders') }}
@@ -86,6 +88,15 @@ function expectOrders({ root, router }, category) {
   expect((category === 'self' ? shop : user).fetchOrderList).toHaveBeenCalledWith({ v: 2, page: 1, pageSize: 20 })
   expect((category === 'self' ? user : shop).fetchOrderList).not.toHaveBeenCalled()
 }
+function expectOrderDetails({ root, router }) {
+  expect(router.currentRoute.path).toBe('/guest-order')
+  expect(router.currentRoute.query).toEqual({ order: 'ORDER1' })
+  expect(root.$el.querySelector('h1').textContent).toBe('Order details')
+  expect(root.$el.querySelector('.ng-guest-order-details')).not.toBeNull()
+  expect(shop.fetchGuestOrderDetail).toHaveBeenCalledWith({ orderSn: 'ORDER1' })
+  expect(shop.fetchOrderList).not.toHaveBeenCalled()
+  expect(user.fetchOrderList).not.toHaveBeenCalled()
+}
 beforeEach(() => {
   jest.useFakeTimers()
   jest.clearAllMocks()
@@ -100,6 +111,7 @@ beforeEach(() => {
   user.fetchUpgrade.mockResolvedValue({ data: { userBalance: { cash: 10000 }, decUserName: 'RC1', allDecPackage: {}, allGoods: [product], region: [], sellType: [{ sell_type: payList }] }})
   for (const [, , cash, paystack] of cases) for (const api of [cash, paystack]) api.mockResolvedValue({ data: { SN: 'ORDER1', ORDER_AMOUNT: 200 }})
   shop.deleteApproachOrder.mockResolvedValue({})
+  shop.fetchGuestOrderDetail.mockImplementation(({ orderSn }) => Promise.resolve({ data: { order: { SN: orderSn }, goods: [] }}))
   for (const api of [shop, user]) api.fetchOrderList.mockResolvedValue({ data: { list: [], totalCount: '0' }})
 })
 afterEach(() => {
@@ -109,7 +121,7 @@ afterEach(() => {
 })
 
 describe.each(['cash', 'paystack-countdown', 'paystack-button'])('%s success navigation', payment => {
-  it.each(cases)('opens the corresponding homepage order category for %s', async(source, category) => {
+  it.each(cases)('opens the paid order details for %s', async source => {
     const context = await checkout(source)
     const { flow } = context
     expect(flow.canCheckout).toBe(true)
@@ -127,18 +139,28 @@ describe.each(['cash', 'paystack-countdown', 'paystack-button'])('%s success nav
       }
       await settle()
     }
-    expectOrders(context, category)
+    expectOrderDetails(context)
   })
 })
 
-it.each(['cash', 'pay_stack'])('preserves the alternate legacy auto-maintenance destination for %s', async payment => {
+it.each(['cash', 'pay_stack'])('opens auto-maintenance order details regardless of the legacy category for %s', async payment => {
   const context = await checkout('member-auto-maintenance')
   context.flow.memberDetails.number = 'OTHER'
   context.flow.activePayType = payment
   context.flow.submitOrder()
   await settle()
   if (payment === 'pay_stack') { context.flow.processPayment(); jest.advanceTimersByTime(5000); await settle() }
-  expectOrders(context, 'member')
+  expectOrderDetails(context)
+})
+
+it.each(cases)('keeps the order list fallback when %s returns no order number', async(source, category, api) => {
+  api.mockResolvedValueOnce({})
+  const context = await checkout(source)
+  context.flow.activePayType = 'cash'
+  context.flow.submitOrder()
+  await settle()
+  expectOrders(context, category)
+  expect(shop.fetchGuestOrderDetail).not.toHaveBeenCalled()
 })
 
 it('keeps failed and cancelled orders in checkout and blocks leaving during payment', async() => {
@@ -153,6 +175,10 @@ it('keeps failed and cancelled orders in checkout and blocks leaving during paym
   router.push({ path: '/dashboard/index', query: { tab: 'orders', orderCategory: 'self' }})
   await settle()
   expect(router.currentRoute.path).toBe('/dashboard/checkout')
+  router.push({ path: '/guest-order', query: { order: 'ORDER1' }})
+  await settle()
+  expect(router.currentRoute.path).toBe('/dashboard/checkout')
+  expect(shop.fetchGuestOrderDetail).not.toHaveBeenCalled()
   await flow.handleClose()
   await settle()
   expect(router.currentRoute.path).toBe('/dashboard/checkout')

+ 4 - 3
src/ui-refactor/views/purchase/purchaseBehavior.js

@@ -556,10 +556,11 @@ export default {
       }, 1000)
     },
     mayLeave(to) {
-      const orderList =
+      const orderDestination =
         ['/shop/own-order', '/shop/member-order'].includes(to.path) ||
-        (to.path === '/dashboard/index' && to.query?.tab === 'orders')
-      return !this.busy || to.path === '/login' || (this.completed && orderList)
+        (to.path === '/dashboard/index' && to.query?.tab === 'orders') ||
+        (to.path === '/guest-order' && to.query?.order === this.payment.orderSn)
+      return !this.busy || to.path === '/login' || (this.completed && orderDestination)
     }
   }
 }

+ 1 - 1
src/ui-refactor/views/purchase/submitPurchase.js

@@ -113,12 +113,12 @@ export default async function submitPurchase() {
           : shop.createReconsumeOrder
   const response = await api(params)
   if (!this.isCurrent()) return
+  this.payment.orderSn = response.data?.SN
   if (type === 'pay_stack') {
     const amount = this.isUpgrade ? response.data.ORDER_AMOUNT : this.cashSum
     if (!response.data.SN || !Number.isFinite(Number(amount)) || Number(amount) < 0) {
       throw new Error('Invalid payment order returned. Please contact customer service.')
     }
-    this.payment.orderSn = response.data.SN
     this.payment.amount = amount
     if (!this.isUpgrade) this.payment.metadata.cart_id = response.data.SN
     this.payment.metadata.custom_fields[0].value = response.data.SN

+ 3 - 2
src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue

@@ -143,8 +143,9 @@ export default {
       this.$message.info('Complete or cancel the current payment before leaving.')
       next(false)
     } else if (to.path === '/shop/member-order') {
-      // 旧提交方法直接跳订单页,在新页面内统一转到首页 Orders 页签。
-      next({ path: '/dashboard/index', query: { tab: 'orders', orderCategory: 'member' }})
+      next(this.payForm.orderSn
+        ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
+        : { path: '/dashboard/index', query: { tab: 'orders', orderCategory: 'member' }})
     } else next()
   },
   methods: {

+ 4 - 0
src/ui-refactor/views/welcome-pack/README.md

@@ -47,6 +47,10 @@
 - 新增 10 项使用真实 Vue Router、真实 Welcome Pack 和首页页签模板的测试。余额、Paystack 自动/手动返回、失败不跳转、初次进入及同页 query 更新均覆盖。改动前 6 项失败、4 项既有默认/失败场景通过;修复后包含注册、库存及购买的相关 139 项全部通过,定向 lint 无错误/警告。
 - 浏览器直接访问该 URL,实际首页已选中 Orders,内层沿用 My orders 默认分类。未执行真实下单或扣款;本轮未重新运行完整应用构建。
 
+### 2026-10-27 支付成功后打开订单详情
+
+余额 Save 成功、Paystack 成功倒计时结束或点击返回按钮,均携带本次下单响应的 `SN` 进入 `/guest-order?order=<SN>`。旧提交脚本在两种支付方式下均保留 `payForm.orderSn`,新页面的路由守卫负责转换成功去向;响应缺少订单号时继续回到首页 Orders 的 Member orders 分类。支付接口、金额、取消和进行中的离开保护保持原有行为。
+
 ## 复现
 
 项目根目录运行:

+ 27 - 6
src/ui-refactor/views/welcome-pack/__tests__/WelcomePackNavigation.spec.js

@@ -7,12 +7,13 @@ import path from 'path'
 import { transformSync } from '@babel/core'
 import { parseComponent, compileTemplate } from 'vue/compiler-sfc'
 import { fetchWelcomePack, createWelcomePack } from '@/api/user'
+import { fetchGuestOrderDetail } from '@/api/shop'
 import { getLanguages } from '@/api/setting'
 import { toThousandFilter } from '@/filters'
 import { load } from '../../purchase/__tests__/loadComponent'
 
 jest.mock('@/api/user', () => ({ fetchWelcomePack: jest.fn(), createWelcomePack: jest.fn() }))
-jest.mock('@/api/shop', () => ({ deleteApproachOrder: jest.fn() }))
+jest.mock('@/api/shop', () => ({ deleteApproachOrder: jest.fn(), fetchGuestOrderDetail: jest.fn() }))
 jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
 jest.mock('@/utils/usersInfo', () => ({ userName: () => 'OPERATOR', userEmail: () => 'operator@example.test', baseData: () => ({ COUNTRY_ID: 'C1' }), loginTimestamp: () => 'session' }))
 jest.mock('vue-paystack', () => ({ render: h => h('button') }))
@@ -26,6 +27,7 @@ Vue.prototype.$store = {
   dispatch: () => Promise.resolve([{ ID: 'C1', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: 'EN' }])
 }
 const Page = load(path.resolve(__dirname, '../MemberWelcomePack.vue'))
+const OrderDetails = load(path.resolve('src/ui-refactor/views/guest-shop/GuestOrderPage.vue'))
 const accountFile = path.resolve('src/ui-refactor/views/account/AccountPage.vue')
 const accountParts = parseComponent(fs.readFileSync(accountFile, 'utf8'))
 const accountModule = { exports: {}}
@@ -41,6 +43,7 @@ async function settle() { for (let i = 0; i < 20; i++) { await Promise.resolve()
 async function mount(location) {
   const router = new Router({ mode: 'abstract', routes: [
     { path: '/dashboard/member-welcome-pack', component: Page },
+    { path: '/guest-order', component: OrderDetails },
     { path: '/dashboard/index', component: Account },
     { path: '/shop/member-order', component: { render: h => h('div', 'Old orders') }}
   ] })
@@ -57,6 +60,7 @@ beforeEach(() => {
   getLanguages.mockResolvedValue([{ ID: 'EN', NAME: 'English' }])
   fetchWelcomePack.mockResolvedValue({ data: { userName: 'NEW-MEMBER', allGoods: [{ ...product }], allOpenBank: [], region: [], decLevel: [{ ID: 'L1', LEVEL_NAME: 'Starter' }], userBalance: { cash: 1000 }, isDec: '0', sellType: [{ sell_type: [{ label: 'cash', name: 'Ecoin' }, { label: 'pay_stack', name: 'Paystack' }] }] }})
   createWelcomePack.mockResolvedValue({ data: { SN: 'ORDER-1', ORDER_AMOUNT: 120, EMAIL: 'sample@example.test' }})
+  fetchGuestOrderDetail.mockImplementation(({ orderSn }) => Promise.resolve({ data: { order: { SN: orderSn }, goods: [] }}))
 })
 afterEach(() => {
   instances.splice(0).forEach(vm => { const element = vm.$el; vm.$destroy(); element.remove() })
@@ -64,7 +68,7 @@ afterEach(() => {
   jest.useRealTimers()
 })
 
-it.each(['cash', 'paystack-countdown', 'paystack-button'])('opens the homepage Orders tab after successful %s payment', async payment => {
+it.each(['cash', 'paystack-countdown', 'paystack-button'])('opens the paid order details after successful %s payment', async payment => {
   const { root, router } = await mount('/dashboard/member-welcome-pack')
   const page = root.$children[0]
   Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: payment === 'cash' ? 'cash' : 'pay_stack' })
@@ -75,13 +79,30 @@ it.each(['cash', 'paystack-countdown', 'paystack-button'])('opens the homepage O
     expect(router.currentRoute.path).toBe('/dashboard/member-welcome-pack')
     page.processPayment({ orderSn: 'ORDER-1' })
     if (payment === 'paystack-countdown') jest.advanceTimersByTime(5000)
-    else page.handleOrderList()
+    else {
+      const dialog = Array.from(document.querySelectorAll('.el-dialog')).find(element => element.querySelector('.el-dialog__title')?.textContent === 'Order successful')
+      dialog.querySelector('.el-dialog__footer button').click()
+    }
     await settle()
   }
+  expect(router.currentRoute.path).toBe('/guest-order')
+  expect(router.currentRoute.query).toEqual({ order: 'ORDER-1' })
+  expect(root.$el.querySelector('h1').textContent).toBe('Order details')
+  expect(root.$el.querySelector('.ng-guest-order-details')).not.toBeNull()
+  expect(fetchGuestOrderDetail).toHaveBeenCalledWith({ orderSn: 'ORDER-1' })
+})
+
+it('keeps the order list fallback when the paid Welcome Pack response has no order number', async() => {
+  createWelcomePack.mockResolvedValueOnce({ data: null })
+  const { root, router } = await mount('/dashboard/member-welcome-pack')
+  const page = root.$children[0]
+  Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: 'cash' })
+  page.toggleProduct(page.tableData[0])
+  page.onSubmit()
+  await settle()
   expect(router.currentRoute.path).toBe('/dashboard/index')
-  expect(router.currentRoute.query.tab).toBe('orders')
-  expect(router.currentRoute.query.orderCategory).toBe('member')
-  expect(root.$el.querySelector('#tab-orders').getAttribute('aria-selected')).toBe('true')
+  expect(router.currentRoute.query).toEqual({ tab: 'orders', orderCategory: 'member' })
+  expect(fetchGuestOrderDetail).not.toHaveBeenCalled()
 })
 
 it('stays on Welcome Pack when Save fails', async() => {

+ 90 - 90
src/views/shop/order-list.vue

@@ -2,83 +2,83 @@
   <div class="app-container">
     <el-table
       v-loading="listLoading"
-			fit
-			lazy
-			highlight-current-row
-			:data="tableData"
+      fit
+      lazy
+      highlight-current-row
+      :data="tableData"
     >
-			<el-table-column type="expand">
-				<template slot-scope="props">
-					<el-col :xs="18" :sm="18" :lg="18">
-						<el-card class="box-card" shadow="hover">
-							<el-table v-loading="listLoading" fit lazy highlight-current-row :data="props.row.hasChildren">
-								<el-table-column align="center" min-width="120px" :label="$t('shop.productCode')" prop="SKU_CODE">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row.SKU_CODE }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" min-width="200px" :label="$t('shop.productName')" prop="GOODS_TITLE">
-									<template slot-scope="{row}">
-										<span>{{ row.GOODS_TITLE }}</span>
-									</template>
-								</el-table-column >
-								<el-table-column align="center" :label="$t('shop.qty')" prop="BUY_NUMS">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row.BUY_NUMS }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" :label="$t('shop.productPrice')" min-width="150px">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;"> {{ row.REAL_PRICE | toThousandFilter }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" :label="$t('shop.totalPrice')">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" :label="$t('shop.totalBV')">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row | bvFilter | toThousandFilter }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" :label="$t('shop.taxRate')">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row.TAX_RATE / 100 }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column align="center" :label="$t('shop.totalTaxAmount')">
-									<template slot-scope="{row}">
-										<span style="white-space: nowrap;"> {{ row | taxAmountFilter | toThousandFilter }}</span>
-									</template>
-								</el-table-column>
-							</el-table>
-						</el-card>
-					</el-col>
-				</template>
-			</el-table-column>
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-col :xs="18" :sm="18" :lg="18">
+            <el-card class="box-card" shadow="hover">
+              <el-table v-loading="listLoading" fit lazy highlight-current-row :data="props.row.hasChildren">
+                <el-table-column align="center" min-width="120px" :label="$t('shop.productCode')" prop="SKU_CODE">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;">{{ row.SKU_CODE }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" min-width="200px" :label="$t('shop.productName')" prop="GOODS_TITLE">
+                  <template slot-scope="{row}">
+                    <span>{{ row.GOODS_TITLE }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.qty')" prop="BUY_NUMS">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;">{{ row.BUY_NUMS }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.productPrice')" min-width="150px">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;"> {{ row.REAL_PRICE | toThousandFilter }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.totalPrice')">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.totalBV')">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;">{{ row | bvFilter | toThousandFilter }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.taxRate')">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;">{{ row.TAX_RATE / 100 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" :label="$t('shop.totalTaxAmount')">
+                  <template slot-scope="{row}">
+                    <span style="white-space: nowrap;"> {{ row | taxAmountFilter | toThousandFilter }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </template>
+      </el-table-column>
       <el-table-column align="center" :label="$t('shop.orderCode')" prop="SN" min-width="120px" style="white-space: pre-wrap;">
-				<template slot-scope="{row}">
-					<span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.SN }}</span>
-				</template>
-			</el-table-column>
-      <el-table-column align="center" :label="$t('shop.memberCode')" prop="USER_NAME" min-width="150px"></el-table-column>
+        <template slot-scope="{row}">
+          <span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.SN }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('shop.memberCode')" prop="USER_NAME" min-width="150px" />
       <el-table-column align="center" :label="$t('shop.memberName')" prop="REAL_NAME" min-width="150px">
-				<template slot-scope="{row}">
-					<span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.REAL_NAME }}</span>
-				</template>
-			</el-table-column>
+        <template slot-scope="{row}">
+          <span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.REAL_NAME }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" :label="$t('shop.recipientName')" prop="CONSIGNEE" min-width="150px">
-				<template slot-scope="{row}">
-					<span style="white-space: pre-wrap; min-width: 120px; word-break: break-all;">{{ row.CONSIGNEE }}</span>
-				</template>
-			</el-table-column>
-      <el-table-column align="center" :label="$t('shop.phoneNumber')" prop="MOBILE" min-width="130px"></el-table-column>
+        <template slot-scope="{row}">
+          <span style="white-space: pre-wrap; min-width: 120px; word-break: break-all;">{{ row.CONSIGNEE }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('shop.phoneNumber')" prop="MOBILE" min-width="130px" />
       <el-table-column align="center" :label="$t('shop.shippingAddress')" prop="FULL_ADDRESS" min-width="140px">
-				<template slot-scope="{row}">
-					<span>{{ row.FULL_ADDRESS }}</span>
-				</template>
-			</el-table-column>
+        <template slot-scope="{row}">
+          <span>{{ row.FULL_ADDRESS }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" :label="$t('shop.country')" prop="COUNTRY" min-width="140px">
         <template slot-scope="{row}">
           <span>{{ row.COUNTRY }}</span>
@@ -89,7 +89,7 @@
           <span>{{ row.CURRENCY }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('shop.payment')" prop="PAY_TYPE" min-width="100px"></el-table-column>
+      <el-table-column align="center" :label="$t('shop.payment')" prop="PAY_TYPE" min-width="100px" />
       <el-table-column align="center" :label="$t('shop.createdTime')" prop="CREATED_AT" min-width="110px">
         <template slot-scope="{row}">
           <span>{{ tool.convertToNigeriaTime(row.CREATED_AT) }}</span>
@@ -107,7 +107,7 @@
           </el-tag>
         </template>
       </el-table-column>
-			<el-table-column align="center" :label="$t('shop.orderType')" prop="ORDER_TYPE" min-width="110px"></el-table-column>
+      <el-table-column align="center" :label="$t('shop.orderType')" prop="ORDER_TYPE" min-width="110px" />
       <el-table-column align="center" :label="$t('shop.action')" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
           <el-button type="text" size="mini" @click="handleDownload(row.SN)">{{ $t('shop.download') }}</el-button>
@@ -123,16 +123,11 @@
 import { downloadOrder, fetchOrderList } from '@/api/shop'
 import Pagination from '@/components/Pagination'
 import waves from '@/directive/waves'
-import { getScreenWidth } from "@/utils"
+import { getScreenWidth } from '@/utils'
 import tool from '@/utils/tool'
 
 export default {
   name: 'OrderList',
-  computed: {
-    tool() {
-      return tool
-    }
-  },
   components: { Pagination },
   directives: { waves },
   filters: {
@@ -142,9 +137,9 @@ export default {
     taxAmountFilter(row) {
       return tool.calculateTax(row.REAL_PRICE, row.BUY_NUMS)
     },
-		priceAmountFilter(row) {
-			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
-		},
+    priceAmountFilter(row) {
+      return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
+    },
     statusFilter(status) {
       const statusMap = {
         Unpaid: 'info',
@@ -156,18 +151,23 @@ export default {
   data() {
     return {
       tableKey: 0,
-			total: 0,
+      total: 0,
       tableData: [],
       listLoading: true,
       downloadLoading: false,
       listQuery: {
-				v: 2,
+        v: 2,
         page: 1,
-        pageSize: 20
+        pageSize: 10
       },
-			childrenNode: [],
-			screenWidth: getScreenWidth() > 600 ? '500px' : getScreenWidth() + 'px',
-			labelPosition: getScreenWidth() > 600 ? 'right' : 'top',
+      childrenNode: [],
+      screenWidth: getScreenWidth() > 600 ? '500px' : getScreenWidth() + 'px',
+      labelPosition: getScreenWidth() > 600 ? 'right' : 'top'
+    }
+  },
+  computed: {
+    tool() {
+      return tool
     }
   },
   created() {
@@ -196,7 +196,7 @@ export default {
       })
 
       this.downloadLoading = false
-    },
+    }
   }
 }
 </script>

+ 6 - 6
src/views/user/member-order.vue

@@ -128,11 +128,6 @@ import tool from '@/utils/tool'
 
 export default {
   name: 'MemberOrder',
-  computed: {
-    tool() {
-      return tool
-    }
-  },
   components: { Pagination },
   directives: { waves },
   filters: {
@@ -163,13 +158,18 @@ export default {
       listQuery: {
         v: 2,
         page: 1,
-        pageSize: 20
+        pageSize: 10
       },
       childrenNode: [],
       screenWidth: getScreenWidth() > 600 ? '500px' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 600 ? 'right' : 'top'
     }
   },
+  computed: {
+    tool() {
+      return tool
+    }
+  },
   created() {
     this.getList()
   },

+ 67 - 67
src/views/user/welcome-pack.vue

@@ -1,24 +1,24 @@
 <template>
   <div v-loading="loading">
     <div class="white-box" style="padding: 0 25px; margin-top: 25px;">
-<!--      <div class="noList">-->
-<!--        <el-select ref="select" @change="countriesChange" v-model="countries" filterable placeholder="">-->
-<!--          <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />-->
-<!--        </el-select>-->
-<!--      </div>-->
+      <!--      <div class="noList">-->
+      <!--        <el-select ref="select" @change="countriesChange" v-model="countries" filterable placeholder="">-->
+      <!--          <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />-->
+      <!--        </el-select>-->
+      <!--      </div>-->
       <el-row :gutter="20">
         <el-col :xs="24" :sm="24" :lg="14">
 
           <el-form ref="form" label-width="180px" :label-position="labelPosition" class="form-page">
-<!--            <el-form-item :label="$t('user.welcomePackWay')">-->
-<!--              <el-radio-group v-model="form.decType" @change="decTypeChange">-->
-<!--                <el-radio size="small" label="normal">{{ $t('user.normal') }}</el-radio>-->
-<!--                &lt;!&ndash;								<el-radio size="small" label="ba">{{ $t('user.BAUpgrade') }}</el-radio>&ndash;&gt;-->
-<!--              </el-radio-group>-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item :label="$t('user.welcomePackWay')">-->
+            <!--              <el-radio-group v-model="form.decType" @change="decTypeChange">-->
+            <!--                <el-radio size="small" label="normal">{{ $t('user.normal') }}</el-radio>-->
+            <!--                &lt;!&ndash;								<el-radio size="small" label="ba">{{ $t('user.BAUpgrade') }}</el-radio>&ndash;&gt;-->
+            <!--              </el-radio-group>-->
+            <!--            </el-form-item>-->
             <el-divider content-position="left">{{ $t('user.accountInformation') }}</el-divider>
             <el-form-item :label="$t('shop.country')">
-              <el-select ref="select" @change="countriesChange" v-model="form.countryId" filterable :placeholder="$t('user.selectCountry')" style="width: 100%;">
+              <el-select ref="select" v-model="form.countryId" filterable :placeholder="$t('user.selectCountry')" style="width: 100%;" @change="countriesChange">
                 <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
@@ -28,14 +28,14 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('user.newMemberCode')">
-              <el-input v-model="form.insertUserName" :readonly="userReadOnly" @blur="checkBaUser" :placeholder="$t('user.enterMemberCode')" />
+              <el-input v-model="form.insertUserName" :readonly="userReadOnly" :placeholder="$t('user.enterMemberCode')" @blur="checkBaUser" />
             </el-form-item>
             <el-form-item :label="$t('user.entryLevel')">
               <el-select v-model="form.decLv" :placeholder="$t('user.selectEntryLevel')" style="width: 100%;">
                 <el-option v-for="item in allDecLevel" :key="item.ID" :label="item.LEVEL_NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('user.stockistCode')" :required="Number(isDec) === 0" >
+            <el-form-item :label="$t('user.stockistCode')" :required="Number(isDec) === 0">
               <el-input v-model="form.decUserName" :disabled="Number(isDec) === 1" />
             </el-form-item>
 
@@ -59,9 +59,9 @@
                                 <div style="text-align: left; line-height: 25px;">
                                   <span style="font-weight: bold; cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span><br>
                                   <span>{{ row.GOODS_NO }}</span><br>
-                                  <span style="color: tomato;">{{ $t('shop.salesPrice') }}:{{row.CODE}} {{ row.SELL_PRICE | toThousandFilter }}</span><br>
+                                  <span style="color: tomato;">{{ $t('shop.salesPrice') }}:{{ row.CODE }} {{ row.SELL_PRICE | toThousandFilter }}</span><br>
                                   <span>{{ $t('shop.productBV') }}:{{ row.PRICE_PV | toThousandFilter }}</span><br>
-                                  <span>{{ $t('shop.marketPrice') }}:{{row.CODE}} {{ row.MARKET_PRICE | toThousandFilter }}</span><br>
+                                  <span>{{ $t('shop.marketPrice') }}:{{ row.CODE }} {{ row.MARKET_PRICE | toThousandFilter }}</span><br>
 
                                   <span style="display: inline-block; float: right; ">
                                     <el-input-number v-model="storeNums[$index]" size="mini" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)" />
@@ -78,9 +78,9 @@
 
                   <div class="white-box-footer">
                     <div class="flex data" style="float: right; display: inline-block; line-height: 30px; font-size: 14px; margin-top: 15px; margin-bottom: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-                      <div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}: {{currencyUnitCode}} {{ sellPriceSum | toThousandFilter }}</div>
+                      <div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}: {{ currencyUnitCode }} {{ sellPriceSum | toThousandFilter }}</div>
                       <div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}:{{ pricePvSum | toThousandFilter }}</div>
-                      <div style="display: inline-block;">{{ $t('shop.taxAmount') }}:{{currencyUnitCode}} {{ taxSum }}</div>
+                      <div style="display: inline-block;">{{ $t('shop.taxAmount') }}:{{ currencyUnitCode }} {{ taxSum }}</div>
                     </div>
                   </div>
                 </el-tab-pane>
@@ -100,22 +100,22 @@
             <el-form-item>
               <el-input v-model="conRealName" type="textarea" :rows="2" :disabled="true" />
             </el-form-item>
-<!--            <el-form-item :label="$t('atlas.placementTree')">-->
-<!--              <el-radio-group v-model="form.location" border>-->
-<!--                <el-radio :label="1">{{ $t('atlas.left') }}</el-radio>-->
-<!--                <el-radio :label="2">{{ $t('atlas.right') }}</el-radio>-->
-<!--              </el-radio-group>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item>&lt;!&ndash;自动安置区位&ndash;&gt;-->
-<!--              <el-row :gutter="5">-->
-<!--                <el-col :xs="24" :sm="12" :lg="12">-->
-<!--                  <el-button size="small" type="primary" @click="setAutoPlace('left')">{{ $t('atlas.placementAutoLeft') }}</el-button>-->
-<!--                </el-col>-->
-<!--                <el-col :xs="24" :sm="12" :lg="12">-->
-<!--                  <el-button size="small" type="primary" @click="setAutoPlace('right')">{{ $t('atlas.placementAutoRight') }}</el-button>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item :label="$t('atlas.placementTree')">-->
+            <!--              <el-radio-group v-model="form.location" border>-->
+            <!--                <el-radio :label="1">{{ $t('atlas.left') }}</el-radio>-->
+            <!--                <el-radio :label="2">{{ $t('atlas.right') }}</el-radio>-->
+            <!--              </el-radio-group>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item>&lt;!&ndash;自动安置区位&ndash;&gt;-->
+            <!--              <el-row :gutter="5">-->
+            <!--                <el-col :xs="24" :sm="12" :lg="12">-->
+            <!--                  <el-button size="small" type="primary" @click="setAutoPlace('left')">{{ $t('atlas.placementAutoLeft') }}</el-button>-->
+            <!--                </el-col>-->
+            <!--                <el-col :xs="24" :sm="12" :lg="12">-->
+            <!--                  <el-button size="small" type="primary" @click="setAutoPlace('right')">{{ $t('atlas.placementAutoRight') }}</el-button>-->
+            <!--                </el-col>-->
+            <!--              </el-row>-->
+            <!--            </el-form-item>-->
 
             <el-divider content-position="left">{{ $t('profile.personalInformation') }}</el-divider>
             <el-form-item :label="$t('shop.memberName')">
@@ -175,7 +175,7 @@
             <el-form-item :label="$t('shop.paymentMethod')" required>
               <el-radio-group v-model="form.payType" @change="chosePayType">
                 <el-radio v-for="(item, index) in payList" :key="index" border :label="item.label" style="margin: 5px;">
-                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.cash }})</span>
+                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">( {{ currencyUnitCode }} {{ userBalance.cash }})</span>
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -239,11 +239,11 @@
           <div style="text-align: left; line-height: 50px; font-size: 16px;">
             <span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br>
             <span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}:{{ product.GOODS_NO }}</span><br>
-            <span style="color: tomato;">{{ $t('shop.salesPrice') }}:{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
-            <span>{{ $t('shop.marketPrice') }}:{{currencyUnitCode}} {{ product.MARKET_PRICE }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.salesPrice') }}:{{ currencyUnitCode }} {{ product.SELL_PRICE }}</span><br>
+            <span>{{ $t('shop.marketPrice') }}:{{ currencyUnitCode }} {{ product.MARKET_PRICE }}</span><br>
             <span>{{ $t('shop.productBV') }}:{{ product.PRICE_PV }}</span><br>
             <span>{{ $t('shop.taxRate') }}:{{ product.TAX_RATE / 100 }}</span><br>
-            <span>{{ $t('shop.taxAmount') }}:{{currencyUnitCode}} {{ product.taxAmount }}</span><br>
+            <span>{{ $t('shop.taxAmount') }}:{{ currencyUnitCode }} {{ product.taxAmount }}</span><br>
             <span>{{ $t('shop.inventory') }}:{{ product.STORE_NUMS }}</span>
           </div>
         </el-col>
@@ -432,10 +432,10 @@ export default {
       allOpenBank: [],
 
       activeName: 'product',
-      isDec:null,
+      isDec: null,
 
       countries: null,
-      currencyUnitCode: ""
+      currencyUnitCode: ''
     }
   },
   computed: {
@@ -456,16 +456,16 @@ export default {
     },
     language() {
       return this.$store.getters.language
-    },
+    }
   },
   watch: {
-     isDec: {
+    isDec: {
       handler(newValue, old) {
-         if (newValue == '1') {
-            this.form.decUserName = usersInfo.userName();
-         }
-       },
-     }
+        if (newValue == '1') {
+          this.form.decUserName = usersInfo.userName()
+        }
+      }
+    }
   },
   created() {
     const regionInfo = this.$store.getters.regionInfo
@@ -475,17 +475,17 @@ export default {
   },
   methods: {
 
-    countriesChange(e){
+    countriesChange(e) {
       this.fetchWelcomePack()
     },
-    //国家列表
+    // 国家列表
     getCountries() {
       this.$store.dispatch('settings/getCountries')
     },
     // 会员报单/BA升级
     fetchWelcomePack() {
       this.loading = true
-      fetchWelcomePack({countryId: this.form.countryId}).then(response => {
+      fetchWelcomePack({ countryId: this.form.countryId }).then(response => {
         this.form.insertUserName = response.data.userName
         this.allOpenBank = response.data.allOpenBank
         this.allDecPackage = response.data.allDecPackage
@@ -494,10 +494,10 @@ export default {
         this.regionData = response.data.region
         this.allDecLevel = response.data.decLevel
         this.categoryType = 1
-        if(response.data.allGoods && response.data.allGoods.length > 0){
+        if (response.data.allGoods && response.data.allGoods.length > 0) {
           this.currencyUnitCode = response.data.allGoods[0].CODE
         }
-        //是否是报单中心
+        // 是否是报单中心
         this.isDec = response.data.isDec
         const settingObj = this.allGoods
         for (const i in this.allGoods) {
@@ -740,13 +740,14 @@ export default {
         packageId: this.form.packageId,
         goodsId: this.form.goodsId,
         goodsNum: this.form.goodsNum,
-        location: 1, //自动安置
+        location: 1, // 自动安置
         decWay: this.decWay,
         payType: this.form.payType,
         countryId: this.form.countryId,
         languageId: this.form.languageId
       }
       createWelcomePack(params).then(response => {
+        this.payForm.orderSn = response.data?.SN
         if (this.form.payType !== 'pay_stack') {
           // 余额支付
           this.$message({
@@ -757,7 +758,6 @@ export default {
           this.$router.push({ path: `/shop/member-order` })
         } else {
           this.submitButtonStat = false
-          this.payForm.orderSn = response.data.SN
           this.payForm.amount = response.data.ORDER_AMOUNT
           this.payForm.metadata.custom_fields[0].value = response.data.SN
           this.payForm.email = response.data.EMAIL
@@ -828,19 +828,19 @@ export default {
         })
       }
     },
-      // 查询安置人
-      handleChkRecommenderActualName() {
-          if (this.form.conUserName) {
-              this.loading = true
-            fetchInspectNetwork({ recommenderName: this.form.recUserName, recommenderActualName: this.form.conUserName }).then(response => {
-                  this.conRealName = response.data.REAL_NAME
-                  this.loading = false
-              }).catch(() => {
-                  this.conRealName = '-'
-                  this.loading = false
-              })
-          }
-      },
+    // 查询安置人
+    handleChkRecommenderActualName() {
+      if (this.form.conUserName) {
+        this.loading = true
+        fetchInspectNetwork({ recommenderName: this.form.recUserName, recommenderActualName: this.form.conUserName }).then(response => {
+          this.conRealName = response.data.REAL_NAME
+          this.loading = false
+        }).catch(() => {
+          this.conRealName = '-'
+          this.loading = false
+        })
+      }
+    },
     // 自动设置区位
     setAutoPlace(side) {
       if (this.recRealName !== '-') {