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

Merge branch 'ui-refactor-phase-2' of guanli/ngfrontend into develop

bill001 2 недель назад
Родитель
Сommit
be0d082307

+ 7 - 7
docs/refactor/signup-welcome-pack.md

@@ -3,15 +3,15 @@
 创建日期:2026-10-09  
 更新日期:2026-10-28
 
-状态:注册 UI 已迁移,已接入游客查询 / 报单与站内 Paystack V2 弹窗;真实后端、订单确认和支付待联调。
+状态:注册与会员报单已共用页面、表单、商品及支付弹窗,通过两条原路由指定模式;真实后端、订单确认和支付待联调。
 
 第 1~6 节描述当前源码,第 7 节保留最初迁移时的验证记录,第 8 节说明本次文档核对范围。早期会员报单、删除订单、成功倒计时等行为不能继续作为当前游客注册页的实现说明。
 
 ## 1. 授权与边界
 
-**初始授权**:用户要求将 `src/views/user/welcome-pack.vue` 的功能迁入新注册 UI,旧页不动、优先使用 Element UI。当前入口为 `src/ui-refactor/views/signup/SignupPage.vue`。
+**初始授权**:用户要求将 `src/views/user/welcome-pack.vue` 的功能迁入新注册 UI,旧页不动、优先使用 Element UI。2026-10-28 按用户批准方案,两条入口已统一挂载 `src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue`,共享视图仍位于 `src/ui-refactor/views/signup/SignupPage.vue`。
 
-**后续实现**:按后续需求接入游客专用接口、固定国家 / 语言选项,并调整游客支付流程;API 方法仍在 `src/api/user.js`,旧会员接口与旧页保留。本次只更新 `docs/`,不修改代码、接口或配置。
+**后续实现**:按后续需求接入游客专用接口、固定国家 / 语言选项,并调整游客支付流程;本轮仅复用页面与组件,API 方法仍在 `src/api/user.js`,旧会员接口与旧页保留。当前结构与完整验证见 [共用页面说明](../../src/ui-refactor/views/welcome-pack/README.md)。
 
 [用户提供的注册参考页](https://wangcongwang.github.io/waterng/signup.html)、截图及本地 `water1009 v1/water/signup.html` 用于分组、卡片、商品排列和视觉参考。参考中的脚本、模拟会员、商品数据、校验与支付行为不构成业务需求,也未引入生产代码。
 
@@ -19,10 +19,10 @@
 
 | 文件 | 职责 |
 |---|---|
-| [SignupPage.vue](../../src/ui-refactor/views/signup/SignupPage.vue) | 组织八个表单分组、商品事件和提交状态;Sign in 返回登录并保留查询参数 |
-| [welcomePackRegistration.js](../../src/ui-refactor/views/signup/components/welcomePackRegistration.js) | 维护游客草稿、查询、选择、计价、提交及支付状态,调用既有 API 和工具 |
+| [SignupPage.vue](../../src/ui-refactor/views/signup/SignupPage.vue) | 唯一业务视图,共用会员表单、商品选择、市场价计算及支付展示;游客保留 Sign in 和查询参数,会员报单按最新规则同样取 MARKET_PRICE |
+| [welcomePackRegistration.js](../../src/ui-refactor/views/signup/components/welcomePackRegistration.js) | 维护游客草稿、查询、提交及支付状态;商品与金额处理已移入共享视图 |
 | [SignupProducts.vue](../../src/ui-refactor/views/signup/components/SignupProducts.vue) | 通过 props 展示商品、数量、选择和汇总,发出 `toggle`、`quantity`、`details` 事件 |
-| [SignupDialogs.vue](../../src/ui-refactor/views/signup/components/SignupDialogs.vue) | 商品详情和支付弹窗;展示只读邮箱与金额,转发取消、支付回调、错误和关闭详情事件 |
+| [SignupDialogs.vue](../../src/ui-refactor/views/signup/components/SignupDialogs.vue) | 保留旧 props/events 的薄适配器,实际展示由共用 WelcomePackDialogs 负责;支付弹窗不展示邮箱 |
 | [GuestPaystack.js](../../src/ui-refactor/views/signup/components/GuestPaystack.js) | 局部继承 `vue-paystack`,加载 V2 SDK,以服务端 `accessCode` 恢复交易 |
 | [UiSectionCard.vue](../../src/components/ui/UiSectionCard.vue) | 共享分组卡片,复用 Element Card,透传属性、事件与插槽 |
 | [signup.spec.js](../../tests/unit/ui-refactor/signup.spec.js) | 游客接口、草稿标识、计价、提交校验、订单复用和支付回调的回归用例 |
@@ -30,7 +30,7 @@
 
 **已确认**:未通过 `extends` 或直接挂载旧 SFC 复用页面,因为旧页包含未限定作用域的表格、Tabs、Radio 样式,直接导入会污染新页面。独立业务快照避免加载这些样式,也遵守旧文件保持不动的约束。
 
-**维护边界**:旧会员报单与新游客注册已使用不同接口和支付流程,不能把其中一份逻辑整体覆盖到另一份。计价等兼容规则需对照维护;当前没有新增统一认证缓存或改造旧页。
+**维护边界**:游客注册与会员报单通过固定模式共用界面和计价实现,各自接口、初始化和支付协议由局部适配模块保留;没有新增认证缓存或改造旧页。
 
 ## 3. 页面与组件复用
 

+ 1 - 0
src/router/index.js

@@ -97,6 +97,7 @@ export const constantRoutes = [
       {
         path: 'dashboard/member-welcome-pack',
         component: () => import('@/ui-refactor/views/welcome-pack/MemberWelcomePack.vue'),
+        props: { mode: 'member' },
         name: 'MemberWelcomePack',
         meta: {
           title: 'Member Welcome Pack',

+ 2 - 1
src/router/modules/refactor.js

@@ -8,7 +8,8 @@ const refactorRouter = {
     {
       path: '/signup',
       name: 'PublicSignup',
-      component: () => import('@/ui-refactor/views/signup/SignupPage.vue'),
+      component: () => import('@/ui-refactor/views/welcome-pack/MemberWelcomePack.vue'),
+      props: { mode: 'guest' },
       meta: {
         publicLayout: {
           showHeader: false,

+ 14 - 1
src/ui-refactor/components/PaystackPaymentDialog.vue

@@ -25,6 +25,14 @@
     >
       {{ continueLabel }}
     </el-button>
+    <el-button
+      v-if="showCancel"
+      class="ng-paystack-payment-cancel"
+      native-type="button"
+      :loading="loading"
+      :disabled="!visible"
+      @click="$emit('cancel')"
+    >Cancel</el-button>
     <template slot="footer"><span /></template>
   </ui-dialog>
 </template>
@@ -48,7 +56,8 @@ export default {
     continueLabel: { type: String, default: 'Continue to Paystack' },
     amount: { type: [Number, String], default: 0 },
     currency: { type: String, default: '' },
-    loading: { type: Boolean, default: false }
+    loading: { type: Boolean, default: false },
+    showCancel: { type: Boolean, default: false }
   }
 }
 </script>
@@ -123,6 +132,10 @@ export default {
   line-height: 1.4;
   white-space: normal;
 }
+.ng-paystack-payment-cancel.el-button {
+  width: 100%;
+  margin: 12px 0 0;
+}
 @media (max-width: 480px) {
   .ng-paystack-payment-dialog ::v-deep .el-dialog__title {
     font-size: 22px;

+ 3 - 1
src/ui-refactor/components/README.md

@@ -33,6 +33,8 @@
 
 SDK 放在默认插槽内隐藏挂载;公共组件不查询接口、不创建或取消订单,也不转换支付金额。游客仍使用 GuestPaystack 的 accessCode,会员仍使用原 SDK、金额 ×100、metadata、reference、channels 和各自成功/取消回调。会员原有提交校验及支付密码步骤保持。
 
+`showCancel` 默认 false;会员 Welcome Pack 传 true 时显示 Cancel 按钮并发出 `cancel` 事件,确认与取消订单仍由业务模块处理。其余调用方的默认外观和事件保持。
+
 ## 支付方式展示
 
 `PaymentMethods.vue` 统一注册、Member Welcome Pack 和会员购买页的选项卡片及说明区域。`options` 接收页面已有的数组或对象,保留原顺序和 `label` / `name`;Vue 2 `v-model` 使用 `value` / `input`,只回传选中项的原始 label,不补充、过滤或自动选择支付方式。
@@ -45,4 +47,4 @@ SDK 放在默认插槽内隐藏挂载;公共组件不查询接口、不创建
 
 页面提供 `summary.amount`、`balance`、`remaining`、`insufficient`,组件只格式化展示,不计算订单金额或判断能否提交。`balances` 用于选项上的余额展示;缺失金额显示 `—`,真实零值仍显示为 0。Paystack、余额支付和其他接口返回方式均保留,加载和支付中的禁用状态由页面传入。SDK、下单、取消和余额校验不进入公共组件。
 
-`WelcomePackPayment.vue` 保留为会员 Welcome Pack 的展示适配器,继续从该页面的金额和余额生成 summary;它不再维护独立的支付卡片样式。
+`WelcomePackPayment.vue` 保留为原会员调用接口的薄适配器;2026-10-28 起,共用报单视图直接使用 `PaymentMethods`,统一生成支付摘要。

+ 1 - 1
src/ui-refactor/views/purchase/__tests__/loadComponent.js

@@ -22,7 +22,7 @@ export function load(filename, scriptOnly = false) {
     if (file.startsWith('.') || file.startsWith('@/')) {
       let resolved = file.startsWith('.') ? path.resolve(path.dirname(filename), file) : path.resolve(process.cwd(), 'src', file.slice(2))
       if (!path.extname(resolved)) resolved += '.js'
-      if (resolved.endsWith('.vue') || resolved.includes(path.join('views', 'purchase'))) return load(resolved, !!query)
+      if (resolved.endsWith('.vue') || resolved.includes(path.join('views', 'purchase')) || resolved.includes(path.join('views', 'welcome-pack'))) return load(resolved, !!query)
     }
     return require(id)
   }

+ 170 - 331
src/ui-refactor/views/signup/SignupPage.vue

@@ -1,377 +1,216 @@
 <template>
-  <div v-loading="loading" class="ng-public-signup">
-    <el-form :model="form" label-position="top" @submit.native.prevent>
-      <ui-section-card title="Network Information">
-        <el-row :gutter="24">
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Referrer ID" required>
-              <el-input
-                v-model="form.recUserName"
-                label="Referrer ID"
-                aria-required="true"
-                @change="handleChkRecUser"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Actual Referrer ID" required>
-              <el-input
-                v-model="form.conUserName"
-                label="Actual Referrer ID"
-                aria-required="true"
-                @change="handleChkRecommenderActualName"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </ui-section-card>
-      <ui-section-card title="Basic Information">
-        <el-row :gutter="24">
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Country">
-              <el-select
-                id="ng-signup-SignupPagevue-0"
-                v-model="form.countryId"
-                filterable
-                placeholder="Select country"
-                popper-class="ng-refactor-popper"
-                @change="countriesChange"
-              >
-                <el-option
-                  v-for="item in countriesList"
-                  :key="item.ID"
-                  :label="item.NAME"
-                  :value="item.ID"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Language" for="ng-signup-SignupPagevue-1">
-              <el-select
-                id="ng-signup-SignupPagevue-1"
-                v-model="form.languageId"
-                filterable
-                placeholder="Select language"
-                popper-class="ng-refactor-popper"
-              >
-                <el-option
-                  v-for="item in languageList"
-                  :key="item.ID"
-                  :label="item.NAME"
-                  :value="item.ID"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Member ID">
-              <el-input
-                v-model="form.insertUserName"
-                label="Member ID"
-                :readonly="userReadOnly"
-                placeholder="Member ID"
-                @blur="checkBaUser"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Order Level" for="ng-signup-SignupPagevue-2">
-              <el-select
-                id="ng-signup-SignupPagevue-2"
-                v-model="form.decLv"
-                placeholder="Select level"
-                popper-class="ng-refactor-popper"
-              >
-                <el-option
-                  v-for="item in allDecLevel"
-                  :key="item.ID"
-                  :label="item.LEVEL_NAME"
-                  :value="item.ID"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="Reporting Center ID">
-              <el-input v-model="form.decUserName" label="Reporting Center ID" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </ui-section-card>
-
-      <ui-section-card title="Products">
-        <signup-products
-          :items="tableData"
-          use-market-price
-          :quantities="storeNums"
-          :selected-ids="selectedIds"
-          :country-selected="!!form.countryId"
-          :subtotal="sellPriceSum"
-          :bv="pricePvSum"
-          :tax="taxSum"
-          :currency="currencyUnitCode"
-          @toggle="toggleProduct"
-          @quantity="changeProductQuantity"
-          @details="handleProduct"
-        />
-      </ui-section-card>
-
-      <ui-section-card title="Personal Information">
-        <el-row :gutter="24">
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Member Name">
-              <el-input v-model="form.realName" label="Member Name" autocomplete="name" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Phone">
-              <el-input v-model="form.mobile" label="Phone" autocomplete="tel" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Email">
-              <el-input v-model="form.email" label="Email" autocomplete="email" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Login Password">
-              <el-input
-                v-model="form.password"
-                label="Login Password"
-                maxlength="32"
-                autocomplete="new-password"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Payment Password">
-              <el-input
-                v-model="form.payPassword"
-                label="Payment Password"
-                maxlength="32"
-                autocomplete="new-password"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Recipient">
-              <el-input v-model="form.consignee" label="Recipient" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Recipient Phone">
-              <el-input v-model="form.acceptMobile" label="Recipient Phone" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </ui-section-card>
-
-      <ui-section-card class="ng-signup-delivery" title="Delivery Method">
-        <el-form-item label="Delivery Method">
-          <el-radio-group v-model="form.way" @change="wayChange">
-            <el-radio label="express" border>Door Delivery</el-radio>
-            <el-radio label="pickup" border>Pickup</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </ui-section-card>
-
-      <ui-section-card v-if="form.way !== 'pickup'" title="Address Details">
-        <el-row :gutter="24">
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Region / State" prop="areaSelected">
-              <el-cascader
-                v-model="form.areaSelected"
-                :disabled="areaDisabled"
-                :options="regionData"
-                placeholder="Select region"
-                popper-class="ng-refactor-popper"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="City">
-              <el-input
-                v-model="form.cityName"
-                label="City"
-                :disabled="addressDisabled"
-                placeholder="City"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="Detailed Address">
-              <el-input
-                v-model="form.address"
-                label="Detailed Address"
-                :disabled="addressDisabled"
-                type="textarea"
-                :rows="3"
-                placeholder="Street address, building, landmark..."
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Area / District">
-              <el-input
-                v-model="form.lgaName"
-                label="Area / District"
-                :disabled="addressDisabled"
-                placeholder="Area or district"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </ui-section-card>
-
-      <ui-section-card title="Bank Information">
-        <el-row :gutter="24">
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Bank Name" for="ng-signup-SignupPagevue-3">
-              <el-select
-                id="ng-signup-SignupPagevue-3"
-                v-model="form.openBank"
-                placeholder="Select bank"
-                popper-class="ng-refactor-popper"
-              >
-                <el-option
-                  v-for="item in allOpenBank"
-                  :key="item.BANK_CODE"
-                  :label="item.BANK_NAME"
-                  :value="item.BANK_CODE"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Account Name">
-              <el-input v-model="form.bankAddress" label="Account Name" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12">
-            <el-form-item label="Bank Account">
-              <el-input v-model="form.bankNo" label="Bank Account" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </ui-section-card>
-
+  <section
+    v-loading="loading"
+    class="ng-welcome-flow"
+    :class="isGuest ? 'ng-public-signup' : 'ng-member-welcome'"
+    :aria-label="isGuest ? 'Create account' : 'Member Welcome Pack'"
+    lang="en"
+  >
+    <el-alert v-if="!isGuest && loadError" :title="loadError" type="error" :closable="false" show-icon />
+    <el-button v-if="!isGuest && loadError" class="ng-welcome-retry" :disabled="busy" @click="initialize">Retry</el-button>
+    <el-form :model="form" label-position="top" :disabled="formDisabled" @submit.native.prevent>
+      <welcome-pack-fields
+        :form="form"
+        :guest="isGuest"
+        :countries="countriesList"
+        :country-name="countryName"
+        :languages="formLanguages"
+        :levels="allDecLevel"
+        :banks="allOpenBank"
+        :regions="regionData"
+        :stockist="!isGuest && Number(isDec) === 1"
+        :member-read-only="isGuest ? userReadOnly : true"
+        @change="updateForm"
+        @country-change="countryChanged"
+        @referrer-change="checkReferrer"
+        @actual-referrer-change="checkActualReferrer"
+        @member-blur="checkMember"
+      >
+        <ui-section-card title="Products">
+          <signup-products
+            :items="tableData || []"
+            :use-market-price="priceField === 'MARKET_PRICE'"
+            :quantities="storeNums"
+            :selected-ids="selectedIds"
+            :country-selected="!!form.countryId"
+            :subtotal="sellPriceSum"
+            :bv="pricePvSum"
+            :tax="taxSum"
+            :currency="currencyUnitCode"
+            :disabled="formDisabled"
+            @toggle="toggleProduct"
+            @quantity="changeProductQuantity"
+            @details="handleProduct"
+          />
+        </ui-section-card>
+      </welcome-pack-fields>
       <payment-methods
         v-model="form.payType"
         :options="payList"
         :currency="currencyUnitCode"
-        :balances="userBalance"
+        :balances="paymentBalances"
         :summary="paymentSummary"
-        :disabled="loading || submitButtonStat || visible || paymentComplete"
+        :disabled="isGuest ? busy : formDisabled"
       />
-
-      <div class="ng-signup-actions">
-        <el-button
-          class="ng-signup-save"
-          type="primary"
-          native-type="button"
-          :loading="submitButtonStat"
-          :disabled="paymentComplete"
-          @click="onSubmit"
-        >
-          {{ submitLabel }}
-        </el-button>
-        <p class="ng-signup-login">
-          Already have an account?
-          <router-link class="link-type" :to="loginRoute"> Sign in </router-link>
-        </p>
-      </div>
+      <el-button
+        class="ng-welcome-save ng-signup-save"
+        type="primary"
+        native-type="button"
+        :loading="submitButtonStat"
+        :disabled="isGuest ? paymentComplete : formDisabled"
+        @click="onSubmit"
+      >{{ isGuest ? submitLabel : 'Save' }}</el-button>
+      <p v-if="isGuest" class="ng-signup-login">
+        Already have an account?
+        <router-link class="link-type" :to="loginRoute"> Sign in </router-link>
+      </p>
     </el-form>
-    <signup-dialogs
+    <welcome-pack-dialogs
+      :guest="isGuest"
       :payment-visible="visible"
-      :payment-order="paymentOrder"
-      :payment-email="form.email"
+      :payment="dialogPayment"
+      :reference="isGuest ? paymentOrder.reference : reference"
+      :channels="isGuest ? [] : channels"
+      :cancel-loading="!isGuest && cancelLoading"
+      :success-visible="!isGuest && payDialog"
+      :countdown="isGuest ? 0 : countdown"
       :product-visible="visibleProduct"
       :product="product"
       :currency="currencyUnitCode"
-      @cancel-payment="handleClose"
+      @cancel="handleClose"
       @paid="processPayment"
       @payment-error="showLoadError"
+      @orders="openOrders"
       @close-product="visibleProduct = false"
     />
-  </div>
+  </section>
 </template>
 
 <script>
 import UiSectionCard from '@/components/ui/UiSectionCard.vue'
 import PaymentMethods from '@/ui-refactor/components/PaymentMethods.vue'
 import { getPaymentSummary } from '@/ui-refactor/utils/paymentSummary'
-import registration from './components/welcomePackRegistration'
-import SignupProducts from './components/SignupProducts.vue'
-import SignupDialogs from './components/SignupDialogs.vue'
+import tool from '@/utils/tool'
+import SignupProducts from '@/ui-refactor/views/signup/components/SignupProducts.vue'
+import WelcomePackFields from '@/ui-refactor/views/welcome-pack/WelcomePackFields.vue'
+import WelcomePackDialogs from '@/ui-refactor/views/welcome-pack/WelcomePackDialogs.vue'
 
 export default {
-  name: 'SignupPage',
-  components: { UiSectionCard, SignupProducts, SignupDialogs, PaymentMethods },
-  // 页面只适配商品卡片事件,提交、计价与支付逻辑继续由业务模块维护。
-  mixins: [registration],
+  name: 'WelcomePackFlow',
+  components: { UiSectionCard, SignupProducts, WelcomePackFields, PaymentMethods, WelcomePackDialogs },
+  data() {
+    return { active: true }
+  },
   computed: {
-    loginRoute() {
-      return { path: '/login', query: this.$route.query }
+    isGuest() { return this.mode === 'guest' },
+    // 注册与会员报单均使用市场价,登录状态只区分业务流程。
+    priceField() { return 'MARKET_PRICE' },
+    selectedIds() { return this.multipleSelection.map(item => item.ID) },
+    loginRoute() { return { path: '/login', query: this.$route.query } },
+    countryName() {
+      const country = (this.countriesList || []).find(item => item.ID === this.form.countryId)
+      return country ? country.NAME : ''
     },
-    selectedIds() {
-      return this.multipleSelection.map(item => item.ID)
+    formLanguages() { return this.isGuest ? this.languageList : this.memberLanguages },
+    busy() {
+      if (this.isGuest) return this.loading || this.submitButtonStat || this.visible || this.paymentComplete
+      return this.loading || this.submitButtonStat || this.visible || this.payDialog || this.cancelLoading || this.orderListOpened
     },
+    formDisabled() { return !this.isGuest && (this.busy || !this.initialized) },
+    paymentBalances() { return this.isGuest ? this.userBalance : { cash: this.userBalance.cash } },
     paymentSummary() {
-      const balance = this.userBalance[this.form.payType]
+      const balance = this.paymentBalances[this.form.payType]
       return getPaymentSummary(this.sellPriceSum, balance, this.form.payType === 'cash')
+    },
+    dialogPayment() {
+      return this.isGuest
+        ? { ...this.paymentOrder, email: this.form.email, publicKey: process.env.VUE_APP_BASE_PAY_STACK_PUBLIC_KEY || '' }
+        : this.payForm
     }
   },
+  beforeDestroy() {
+    this.active = false
+  },
   methods: {
+    updateForm(patch) {
+      if (this.formDisabled) return
+      Object.assign(this.form, patch)
+      if ('way' in patch) this.wayChange()
+    },
+    countryChanged() { if (this.isGuest) this.countriesChange() },
+    checkReferrer() { if (this.isGuest) this.handleChkRecUser() },
+    checkActualReferrer() { if (this.isGuest) this.handleChkRecommenderActualName() },
+    checkMember() { if (this.isGuest) this.checkBaUser() },
+    showLoadError(error) { this.$message.error(String(error.message || error)) },
     toggleProduct(row) {
-      const selection = this.selectedIds.includes(row.ID)
+      if (this.formDisabled) return
+      this.handleSelectionChange(this.selectedIds.includes(row.ID)
         ? this.multipleSelection.filter(item => item.ID !== row.ID)
-        : this.multipleSelection.concat(row)
-      this.handleSelectionChange(selection)
+        : this.multipleSelection.concat(row))
     },
     changeProductQuantity({ value, row, index }) {
-      // Vue 2 不能侦测数组下标赋值,使用 $set 保持数量控件与业务状态同步。
+      if (this.formDisabled) return
       this.$set(this.storeNums, index, value)
       this.handleInputNumber(value, row)
-    }
+    },
+    handleInputNumber(current, row) {
+      const selected = this.multipleSelection.find(item => item.ID === row.ID)
+      if (selected) {
+        selected.goodsNum = current
+        this.handleSureChange()
+      }
+    },
+    handleSelectionChange(selection) {
+      selection.forEach(item => {
+        item.goodsNum = this.storeNums[this.tableData.findIndex(row => row.ID === item.ID)]
+      })
+      this.multipleSelection = selection
+      this.handleSureChange()
+    },
+    handleSureChange() {
+      if (!this.multipleSelection.length) {
+        this.sellPriceSum = this.pricePvSum = this.taxSum = 0
+        return
+      }
+      let subtotal = 0
+      let bv = 0
+      let tax = 0
+      this.multipleSelection.forEach(item => {
+        subtotal += Number(item[this.priceField]) * Number(item.goodsNum)
+        bv += Number(item.PRICE_PV) * Number(item.goodsNum)
+        tax += tool.calculateTax(Number(item[this.priceField]), Number(item.TAX_RATE), Number(item.goodsNum))
+      })
+      this.sellPriceSum = tool.formatPrice(subtotal)
+      this.pricePvSum = tool.formatPrice(bv)
+      this.taxSum = tool.formatPrice(tax)
+    },
+    selectProduct() {
+      this.form.goodsId = []
+      this.form.goodsNum = []
+      this.payAmount = 0
+      this.multipleSelection.forEach(item => {
+        this.form.goodsId.push(item.ID)
+        this.form.goodsNum.push(item.goodsNum)
+        this.payAmount += Number(item[this.priceField]) * Number(item.goodsNum)
+      })
+    },
+    handleProduct(row) {
+      this.product = { ...row, taxAmount: tool.calculateTax(Number(row[this.priceField]), Number(row.TAX_RATE)) }
+      this.visibleProduct = true
+    },
+    processPayment(response) {
+      if (this.active) this.completePayment(response)
+    },
+    openOrders() { if (!this.isGuest) this.handleOrderList() }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.ng-public-layout .ng-public-signup ::v-deep .el-select,
-.ng-public-layout .ng-public-signup ::v-deep .el-cascader {
-  width: 100%;
-}
-.ng-public-layout .ng-public-signup ::v-deep .el-form-item__label {
-  float: none;
-  padding-bottom: 8px;
-  line-height: 1.5;
-}
-.ng-public-layout .ng-public-signup .ng-signup-delivery ::v-deep .el-radio-group {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 12px;
-  max-width: 100%;
-}
-.ng-public-layout .ng-public-signup .ng-signup-delivery ::v-deep .el-radio {
-  height: auto;
-  min-height: 40px;
-  margin: 0;
-  white-space: normal;
-  line-height: 1.5;
-}
-.ng-public-layout .ng-public-signup .ng-signup-delivery ::v-deep .el-radio__label {
-  white-space: normal;
-  overflow-wrap: anywhere;
-}
-.ng-public-layout .ng-public-signup ::v-deep .el-alert {
-  margin-bottom: 20px;
-}
-.ng-public-layout .ng-signup-save {
-  width: 100%;
-}
-.ng-public-layout .ng-signup-login {
+.ng-welcome-flow { min-width: 0; }
+.ng-welcome-retry { margin: 16px 0 24px; }
+.ng-welcome-save { width: 100%; }
+.ng-signup-login {
   margin: 12px 0 0;
   text-align: center;
   font-size: 13px;

+ 19 - 60
src/ui-refactor/views/signup/components/SignupDialogs.vue

@@ -1,44 +1,26 @@
 <template>
-  <div class="ng-signup-dialogs">
-    <paystack-payment-dialog
-      :visible="paymentVisible"
-      :amount="paymentOrder.amount"
-      :currency="paymentOrder.currency"
-      :before-close="cancelPayment"
-      @continue="$refs.paystack.payWithPaystack()"
-    >
-      <guest-paystack
-        v-if="paymentVisible"
-        ref="paystack"
-        :access-code="paymentOrder.accessCode"
-        :reference="paymentOrder.reference"
-        :amount="Number(paymentOrder.amount)"
-        :currency="paymentOrder.currency"
-        :email="paymentEmail"
-        :paystackkey="paystackKey"
-        :callback="paid"
-        :close="cancelPayment"
-        @error="$emit('payment-error', $event)"
-      />
-    </paystack-payment-dialog>
-    <product-details-dialog
-      :show-sales-price="false"
-      :visible="productVisible"
-      :product="product"
-      :currency="currency"
-      @update:visible="$emit('close-product')"
-    />
-  </div>
+  <welcome-pack-dialogs
+    guest
+    :payment-visible="paymentVisible"
+    :payment="payment"
+    :reference="paymentOrder.reference"
+    :product-visible="productVisible"
+    :product="product"
+    :currency="currency"
+    @cancel="$emit('cancel-payment')"
+    @paid="$emit('paid', $event)"
+    @payment-error="$emit('payment-error', $event)"
+    @close-product="$emit('close-product')"
+  />
 </template>
 
 <script>
-import ProductDetailsDialog from '@/ui-refactor/components/ProductDetailsDialog.vue'
-import GuestPaystack from './GuestPaystack'
-import PaystackPaymentDialog from '@/ui-refactor/components/PaystackPaymentDialog.vue'
+import WelcomePackDialogs from '@/ui-refactor/views/welcome-pack/WelcomePackDialogs.vue'
 
+// 保留旧组件接口,展示与 SDK 挂载统一交给公共弹窗。
 export default {
   name: 'SignupDialogs',
-  components: { GuestPaystack, ProductDetailsDialog, PaystackPaymentDialog },
+  components: { WelcomePackDialogs },
   props: {
     paymentVisible: { type: Boolean, default: false },
     paymentOrder: { type: Object, required: true },
@@ -47,33 +29,10 @@ export default {
     product: { type: Object, required: true },
     currency: { type: String, default: '' }
   },
-  data() {
-    return { paystackKey: process.env.VUE_APP_BASE_PAY_STACK_PUBLIC_KEY || '' }
-  },
-  methods: {
-    cancelPayment() {
-      this.$emit('cancel-payment')
-    },
-    paid(response) {
-      this.$emit('paid', response)
+  computed: {
+    payment() {
+      return { ...this.paymentOrder, email: this.paymentEmail, publicKey: process.env.VUE_APP_BASE_PAY_STACK_PUBLIC_KEY || '' }
     }
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.ng-public-layout .ng-signup-dialogs ::v-deep .el-dialog {
-  max-width: calc(100% - 32px);
-}
-.ng-public-layout .ng-signup-dialogs ::v-deep .el-dialog__title {
-  overflow-wrap: anywhere;
-}
-.ng-public-layout .ng-signup-dialogs ::v-deep .el-dialog__body {
-  padding: 24px;
-}
-@media (max-width: 767px) {
-  .ng-public-layout .ng-signup-dialogs ::v-deep .el-dialog__body {
-    padding: 16px;
-  }
-}
-</style>

+ 12 - 83
src/ui-refactor/views/signup/components/welcomePackRegistration.js

@@ -6,7 +6,6 @@ import {
   fetchGuestInspectNetwork
 } from '@/api/user'
 
-import tool from '@/utils/tool'
 import usersInfo from '@/utils/usersInfo'
 
 // 注册页的私有业务实现源自旧 Welcome Pack;保留接口字段与计价规则,避免引入旧页全局样式。
@@ -14,6 +13,7 @@ export default {
   data() {
     return {
       loading: false,
+      loadingTimer: null,
       draft: {},
 
       // 公开注册页使用固定选项,不依赖后台国家、语言列表请求或缓存。
@@ -124,6 +124,9 @@ export default {
       this.form.conUserName = ref.trim()
     }
   },
+  beforeDestroy() {
+    clearTimeout(this.loadingTimer)
+  },
   watch: {
     isDec: {
       handler(newValue) {
@@ -139,18 +142,16 @@ export default {
       if (country) this.form.languageId = country.DEFAULT_LANGUAGE_ID
       this.fetchWelcomePack()
     },
-    showLoadError(error) {
-      this.$message.error(String(error.message || error))
-    },
     // 游客报单初始化;临时标识只保存在本页,不写入会员登录缓存。
     fetchWelcomePack() {
+      clearTimeout(this.loadingTimer)
       this.loading = true
       this.draft = {}
       this.form.insertUserName = ''
       const countryId = this.form.countryId
       fetchGuestDec({ countryId })
         .then((response) => {
-          if (countryId !== this.form.countryId) return
+          if (!this.active || countryId !== this.form.countryId) return
           this.draft = response.data.draft || {}
           this.form.insertUserName = this.draft.insertUserName
           this.allOpenBank = response.data.allOpenBank || []
@@ -187,79 +188,16 @@ export default {
           this.form.payType =
             (Object.values(this.payList)[1] || Object.values(this.payList)[0] || {}).label || ''
 
-          setTimeout(() => {
-            this.loading = false
+          this.loadingTimer = setTimeout(() => {
+            if (this.active) this.loading = false
           }, 0.5 * 1000)
         })
         .catch((err) => {
-          if (countryId !== this.form.countryId) return
+          if (!this.active || countryId !== this.form.countryId) return
           this.showLoadError(err)
           this.loading = false
         })
     },
-    // 商品详情
-    handleProduct(row) {
-      this.product = row
-      this.product.taxAmount = tool.calculateTax(row.MARKET_PRICE, row.TAX_RATE)
-      this.visibleProduct = true
-    },
-    // 选择商品计数
-    handleInputNumber(current, row) {
-      const pageList = this.multipleSelection
-      let selectStatus = false
-      for (const i in pageList) {
-        if (pageList[i].ID === row.ID) {
-          pageList[i].goodsNum = current
-          selectStatus = true
-          break
-        }
-      }
-      if (selectStatus) {
-        this.multipleSelection = pageList
-        this.handleSureChange()
-      }
-    },
-    // 汇总继续按市场价计费;销售价仅用于展示,税额使用原含税算法。
-    handleSureChange() {
-      if (this.multipleSelection.length > 0) {
-        let accumulatorSellPrice = 0
-        let accumulatorPricePv = 0
-        let accumulatorTax = 0
-        this.multipleSelection.forEach((accumulator) => {
-          accumulatorSellPrice += accumulator.MARKET_PRICE * accumulator.goodsNum
-          accumulatorPricePv += Number(accumulator.PRICE_PV) * Number(accumulator.goodsNum)
-          accumulatorTax += tool.calculateTax(
-            Number(accumulator.MARKET_PRICE),
-            Number(accumulator.TAX_RATE),
-            Number(accumulator.goodsNum)
-          )
-        })
-
-        this.sellPriceSum = tool.formatPrice(accumulatorSellPrice)
-        this.pricePvSum = tool.formatPrice(accumulatorPricePv)
-        this.taxSum = tool.formatPrice(accumulatorTax)
-      } else {
-        this.sellPriceSum = this.pricePvSum = this.taxSum = 0.0
-      }
-    },
-    // 选择商品
-    handleSelectionChange(val) {
-      let idx = -1
-      let num
-      for (const i in this.tableData) {
-        for (const v in val) {
-          if (val[v].ID === this.tableData[i].ID) {
-            idx = i
-            num = this.storeNums[idx]
-            val[v]['goodsNum'] = num
-            break
-          }
-        }
-      }
-      this.multipleSelection = val
-      // 计算统计
-      this.handleSureChange()
-    },
     // 会员查询
     handleChkRecUser() {
       this.form.conUserName = ''
@@ -386,6 +324,7 @@ export default {
       }
       createGuestDec(params)
         .then((response) => {
+          if (!this.active) return
           const order = response.data || response
           if (!order.accessCode || !order.reference) {
             throw new Error('Payment details are missing. Please contact customer service.')
@@ -395,6 +334,7 @@ export default {
           this.visible = true
         })
         .catch((err) => {
+          if (!this.active) return
           this.$message({
             message: err.message || err,
             type: 'error'
@@ -406,7 +346,7 @@ export default {
       // 关闭只隐藏弹窗,继续支付时重新向后端获取支付信息。
       this.visible = false
     },
-    processPayment(response) {
+    completePayment(response) {
       if (!response || response.reference !== this.paymentOrder.reference) {
         this.showLoadError(new Error('Payment reference does not match the current order.'))
         return
@@ -419,17 +359,6 @@ export default {
       })
       this.$router.replace(this.loginRoute)
     },
-    // 已选择商品
-    selectProduct() {
-      this.payAmount = 0
-      this.form.goodsId = []
-      this.form.goodsNum = []
-      this.multipleSelection.map((item) => {
-        this.form.goodsId.push(item.ID)
-        this.form.goodsNum.push(item.goodsNum)
-        this.payAmount += item.goodsNum * item.MARKET_PRICE
-      })
-    },
     // BA会员查询
     checkBaUser() {
       if (this.form.decType === 'ba' && this.form.insertUserName !== '') {

+ 15 - 308
src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue

@@ -1,325 +1,32 @@
 <template>
-  <section v-loading="loading" class="ng-member-welcome" aria-label="Member Welcome Pack" lang="en">
-    <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon />
-    <el-button
-      v-if="loadError"
-      class="ng-welcome-retry"
-      :disabled="busy"
-      @click="initialize"
-    >Retry</el-button>
-    <el-form
-      :model="form"
-      label-position="top"
-      :disabled="busy || !initialized"
-      @submit.native.prevent
-    >
-      <welcome-pack-fields
-        :form="form"
-        :country-name="countryName"
-        :languages="memberLanguages"
-        :levels="allDecLevel"
-        :banks="allOpenBank"
-        :regions="regionData"
-        :stockist="Number(isDec) === 1"
-        @change="updateForm"
-      >
-        <ui-section-card title="Products">
-          <signup-products
-            :items="tableData || []"
-            :quantities="storeNums"
-            :selected-ids="selectedIds"
-            :country-selected="!!form.countryId"
-            :subtotal="sellPriceSum"
-            :bv="pricePvSum"
-            :tax="taxSum"
-            :currency="currencyUnitCode"
-            :disabled="busy || !initialized"
-            @toggle="toggleProduct"
-            @quantity="changeProductQuantity"
-            @details="handleProduct"
-          />
-        </ui-section-card>
-      </welcome-pack-fields>
-      <welcome-pack-payment
-        :options="payList"
-        :value="form.payType"
-        :currency="currencyUnitCode"
-        :amount="sellPriceSum"
-        :balance="userBalance.cash"
-        @input="form.payType = $event"
-      />
-      <el-button
-        class="ng-welcome-save"
-        type="primary"
-        :loading="submitButtonStat"
-        :disabled="busy || !initialized"
-        @click="onSubmit"
-      >
-        Save
-      </el-button>
-    </el-form>
-    <welcome-pack-dialogs
-      :payment-visible="visible"
-      :payment="payForm"
-      :reference="reference"
-      :channels="channels"
-      :cancel-loading="cancelLoading"
-      :success-visible="payDialog"
-      :countdown="countdown"
-      :product-visible="visibleProduct"
-      :product="product"
-      :currency="currencyUnitCode"
-      @cancel="handleClose"
-      @paid="processPayment"
-      @orders="handleOrderList"
-      @close-product="visibleProduct = false"
-    />
-  </section>
+  <component :is="flow" v-if="flow" :key="mode" ref="flow" />
 </template>
 
 <script>
-import Legacy from '@/views/user/welcome-pack.vue?vue&type=script&lang=js'
-import { fetchWelcomePack } from '@/api/user'
-import { deleteApproachOrder } from '@/api/shop'
-import { getLanguages } from '@/api/setting'
-import tool from '@/utils/tool'
-import usersInfo from '@/utils/usersInfo'
-import UiSectionCard from '@/components/ui/UiSectionCard.vue'
-import SignupProducts from '../signup/components/SignupProducts.vue'
-import WelcomePackFields from './WelcomePackFields.vue'
-import WelcomePackPayment from './WelcomePackPayment.vue'
-import WelcomePackDialogs from './WelcomePackDialogs.vue'
+import modes from '@/ui-refactor/views/welcome-pack/welcomePackModes'
 
 export default {
-  name: 'MemberWelcomePack',
-  components: {
-    UiSectionCard,
-    SignupProducts,
-    WelcomePackFields,
-    WelcomePackPayment,
-    WelcomePackDialogs
-  },
-  // 只继承旧脚本,初始化由新页面管理,不加载旧模板和全局样式。
-  extends: { ...Legacy, created: undefined },
-  data() {
-    return {
-      form: { countryId: '', languageId: '' },
-      initialized: false,
-      loadError: '',
-      operatorId: '',
-      sessionId: '',
-      memberLanguages: [],
-      cancelLoading: false,
-      countdownTimer: null,
-      orderListOpened: false
-    }
+  name: 'WelcomePackPage',
+  props: {
+    mode: { type: String, required: true, validator: value => ['guest', 'member'].includes(value) }
   },
   computed: {
-    busy() {
-      return (
-        this.loading ||
-        this.submitButtonStat ||
-        this.visible ||
-        this.payDialog ||
-        this.cancelLoading ||
-        this.orderListOpened
-      )
-    },
-    selectedIds() {
-      return this.multipleSelection.map(item => item.ID)
-    },
-    countryName() {
-      const country = this.countriesList.find(item => item.ID === this.form.countryId)
-      return country ? country.NAME : ''
+    flow() {
+      return modes[this.mode] || null
     }
   },
-  created() {
-    this.initialize()
-  },
-  beforeDestroy() {
-    clearInterval(this.countdownTimer)
-  },
   beforeRouteLeave(to, from, next) {
-    if (this.isCurrent() && (this.submitButtonStat || this.visible || this.cancelLoading)) {
-      this.$message.info('Complete or cancel the current payment before leaving.')
-      next(false)
-    } else if (to.path === '/shop/member-order') {
-      next(this.payForm.orderSn
-        ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
-        : { path: '/dashboard/index', query: { tab: 'orders', orderCategory: 'member' }})
-    } else next()
+    this.checkNavigation(to, from, next)
+  },
+  beforeRouteUpdate(to, from, next) {
+    this.checkNavigation(to, from, next)
   },
   methods: {
-    async initialize() {
-      this.loading = true
-      this.initialized = false
-      this.loadError = ''
-      try {
-        this.operatorId = usersInfo.userName()
-        this.sessionId = usersInfo.loginTimestamp()
-        const account = usersInfo.baseData()
-        if (!this.operatorId || !account || !account.COUNTRY_ID) {
-          throw new Error('Your account country or member ID is unavailable. Please sign in again.')
-        }
-        this.form.countryId = account.COUNTRY_ID
-        this.form.recUserName = this.form.conUserName = this.operatorId
-        const [countries, languages] = await Promise.all([
-          this.$store.dispatch('settings/getCountries'),
-          getLanguages()
-        ])
-        if (this._isDestroyed || !this.isCurrent()) return
-        this.memberLanguages = Object.values(languages)
-        const country = countries.find(item => item.ID === this.form.countryId)
-        if (!country) throw new Error('Your account country is unavailable in the country list.')
-        this.form.languageId = country.DEFAULT_LANGUAGE_ID || ''
-        await this.fetchWelcomePack()
-      } catch (error) {
-        this.loadError = String(error.message || error)
-      } finally {
-        this.loading = false
-      }
-    },
-    async fetchWelcomePack() {
-      const { data } = await fetchWelcomePack({ countryId: this.form.countryId })
-      if (this._isDestroyed || !this.isCurrent()) return
-      if (!data.userName) throw new Error('The new member ID is unavailable. Please retry.')
-      if (!data.userBalance || !data.sellType || !data.sellType[0]) {
-        throw new Error('Welcome Pack payment settings are unavailable. Please retry.')
-      }
-      this.form.insertUserName = data.userName
-      this.allOpenBank = data.allOpenBank || []
-      this.allGoods = data.allGoods || []
-      this.tableData = Object.values(this.allGoods)
-      this.userBalance = data.userBalance
-      this.regionData = data.region || []
-      this.allDecLevel = data.decLevel || []
-      this.isDec = data.isDec
-      this.categoryType = 1
-      this.currencyUnitCode = (this.tableData[0] || {}).CODE || ''
-      this.storeNums = this.tableData.map(() => 1)
-      this.tableData.forEach(item => {
-        this.$set(item, 'goodsNum', 0)
-      })
-      this.multipleSelection = []
-      this.handleSureChange()
-      this.payList = Object.values((data.sellType[0] || {}).sell_type || {})
-      this.form.payType = (this.payList[1] || this.payList[0] || {}).label || ''
-      this.initialized = true
-    },
-    isCurrent() {
-      return (
-        usersInfo.userName() === this.operatorId && usersInfo.loginTimestamp() === this.sessionId
-      )
-    },
-    updateForm(patch) {
-      if (this.busy) return
-      Object.assign(this.form, patch)
-      if ('way' in patch) this.wayChange()
-    },
-    toggleProduct(row) {
-      if (this.busy || !this.initialized) return
-      const selection = this.selectedIds.includes(row.ID)
-        ? this.multipleSelection.filter(item => item.ID !== row.ID)
-        : this.multipleSelection.concat(row)
-      this.handleSelectionChange(selection)
-    },
-    changeProductQuantity({ row, index, value }) {
-      if (this.busy) return
-      this.$set(this.storeNums, index, value)
-      this.handleInputNumber(value, row)
-    },
-    // 新会员报单使用登录后的会员价,与商品卡片和余额校验保持一致。
-    handleSureChange() {
-      let subtotal = 0
-      let bv = 0
-      let tax = 0
-      this.multipleSelection.forEach(item => {
-        subtotal += Number(item.SELL_PRICE) * Number(item.goodsNum)
-        bv += Number(item.PRICE_PV) * Number(item.goodsNum)
-        tax += tool.calculateTax(Number(item.SELL_PRICE), Number(item.TAX_RATE), Number(item.goodsNum))
-      })
-      this.sellPriceSum = tool.formatPrice(subtotal)
-      this.pricePvSum = tool.formatPrice(bv)
-      this.taxSum = tool.formatPrice(tax)
-    },
-    selectProduct() {
-      this.form.goodsId = []
-      this.form.goodsNum = []
-      this.payAmount = 0
-      this.multipleSelection.forEach(item => {
-        this.form.goodsId.push(item.ID)
-        this.form.goodsNum.push(item.goodsNum)
-        this.payAmount += Number(item.SELL_PRICE) * Number(item.goodsNum)
-      })
-    },
-    handleProduct(row) {
-      this.product = { ...row, taxAmount: tool.calculateTax(Number(row.SELL_PRICE), Number(row.TAX_RATE)) }
-      this.visibleProduct = true
-    },
-    onSubmit() {
-      if (this.busy || !this.initialized) return
-      if (!this.isCurrent()) {
-        this.$message.error('Your account has changed. Please reload this page.')
-        return
-      }
-      Legacy.methods.onSubmit.call(this)
-    },
-    async handleClose() {
-      if (this.cancelLoading || !this.visible || !this.isCurrent()) return
-      this.cancelLoading = true
-      try {
-        try {
-          await this.$confirm(this.$t('shop.confirmClose'))
-        } catch (_) {
-          return
-        }
-        if (!this.isCurrent()) return
-        // 旧响应将订单号写在 payForm,取消必须针对本次实际订单。
-        await deleteApproachOrder({ orderSn: this.payForm.orderSn })
-        this.visible = false
-        this.submitButtonStat = false
-      } catch (error) {
-        this.$message.error(String(error.message || error))
-      } finally {
-        this.cancelLoading = false
-      }
-    },
-    processPayment(event) {
-      if (!this.visible || this.cancelLoading || !this.isCurrent()) return
-      if (event && event.orderSn !== this.payForm.orderSn) return
-      this.visible = false
-      this.payStackLoading = false
-      this.handleOrderList()
-    },
-    handleCountdown() {
-      clearInterval(this.countdownTimer)
-      this.countdown = 5
-      this.countdownTimer = setInterval(() => {
-        if (--this.countdown === 0) this.handleOrderList()
-      }, 1000)
-    },
-    handleOrderList() {
-      clearInterval(this.countdownTimer)
-      if (this.orderListOpened || !this.isCurrent()) return
-      this.orderListOpened = true
-      this.$router.push(this.payForm.orderSn
-        ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
-        : { path: '/shop/member-order' })
+    checkNavigation(to, from, next) {
+      const flow = this.$refs.flow
+      if (flow && flow.checkNavigation) flow.checkNavigation(to, from, next)
+      else next()
     }
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.ng-member-welcome {
-  min-width: 0;
-}
-
-.ng-welcome-retry {
-  margin: 16px 0 24px;
-}
-
-.ng-welcome-save {
-  width: 100%;
-}
-</style>

+ 41 - 2
src/ui-refactor/views/welcome-pack/README.md

@@ -1,6 +1,45 @@
 # Member Welcome Pack
 
-## 2026-10-28 会员报单价格修正验收
+## 最新价格规则(2026-10-28 后续确认)
+
+用户调整业务规则:登录后的会员报单也取贵价。当前游客注册与会员报单统一使用 `MARKET_PRICE`,覆盖此前会员报单使用 `SELL_PRICE` 的约定。商品卡片、选购汇总(本流程没有独立购物车路由)、数量金额、含税税额、商品详情和余额校验均使用同一字段;详情不再展示不可用于本次报单的销售价。
+
+复消、会员升级、AMP 继续沿用各自原有的 `SELL_PRICE`/折扣规则,未改动其商品、购物车或支付代码。报单 POST 原请求字段不变;实际支付金额继续取后端返回的 `ORDER_AMOUNT`,传给支付弹窗及 SDK(金额 ×100),前端不覆盖后端订单金额。本轮没有进行真实报单或扣款联调。
+
+当前复验:118 项相关测试通过;8/8 故障注入捕获错误取价、金额、回调、SDK 与计时器问题;定向 lint 和完整生产构建通过。全量从本轮修改前 527 项通过变为 529 项通过,18 项既有失败和 2 个编译器版本错误不变。先复现了 10 项新规则不满足的失败,再修改运行代码。隔离样例验证市场单价 45,600、数量 2、小计与支付金额 91,200、税额 6,362.79,6 种视口无弹窗溢出,模拟支付后进入对应订单详情。
+
+## 当前结构:双入口共用页面(2026-10-28)
+
+用户已明确批准整页复用方案(`spec approval: obtained`):保留两个网址,统一会员表单外观与公共支付弹窗,通过路由固定传入游客/会员模式。
+
+- `/signup` 与 `/dashboard/member-welcome-pack` 均挂载 `MemberWelcomePack.vue`,分别传入 `mode: 'guest'`/`mode: 'member'`;原路由名称、标题、面包屑及权限不变。
+- 入口只选择模式并转发离开/同页更新守卫。`welcomePackModes.js` 沿用购买页适配方式,分别继承原游客业务和旧会员脚本,按需创建一个实例;会员原页面的初始化、会话检查、提交、取消和成功去向已迁入该模块。
+- `SignupPage.vue` 是唯一业务视图,复用 `WelcomePackFields`、商品卡片、公共支付方式和 `WelcomePackDialogs`;商品选择、数量、小计、BV、税额、余额校验金额与详情税额只有一份实现。按最新规则,游客注册和会员报单均固定使用 MARKET_PRICE。
+- 游客保留固定国家/语言、邀请默认值、推荐人查询、草稿和 accessCode;会员保留账户国家、当前会员默认推荐人、stockist 规则、服务端支付金额 ×100 及取消订单。游客成功返回登录并保留查询参数,会员成功打开本次订单详情。
+- 公共 Paystack 弹窗新增 `showCancel`(默认 false)及 `cancel` 事件;仅会员启用取消按钮,原调用方默认表现保持。每次只挂载对应 SDK,旧 `SignupDialogs` 保留原 props/events,作为公共弹窗的薄适配器。
+- 切换模式销毁旧实例,清理游客加载计时器和会员倒计时;公共支付回调及 SDK 回调在实例失效后不再跳转。旧会员页面、API、缓存、依赖和环境文件保持原样。
+
+### 当前复验与证据
+
+运行 `node src/ui-refactor/views/welcome-pack/__tests__/verifyPricing.cjs`:每轮新建证据目录,依次执行故障注入、全量回归、定向 lint 和生产构建。下方早期 `verify.cjs` 命令及验证表为历史记录,当前以本命令为准。
+
+| 检查 | 结果 |
+| --- | --- |
+| 失败用例 | 共用入口、游客初始化、双价格、模式隔离、旧回调及支付弹窗的 6 项新用例先在原实现失败;游客加载计时器清理也先复现失败 |
+| 定向回归 | 116 项通过:共享页面 10、会员业务 35、会员导航 12、游客业务 40、商品 12、游客 SDK 7;原金额、请求体、取消失败及成功去向断言保留 |
+| 故障注入 | 8/8 捕获:小计、税额、余额金额、详情税额、游客取价、迟到回调、SDK 模式及计时器清理;校验器仍拒绝测试通过、runner 崩溃和缺失目标 |
+| 全量回归 | 修改前 517 通过;修改后 527 通过,18 项原有失败名称和 2 个 Vue/编译器版本错误保持不变 |
+| lint/构建 | 修改的运行代码、路由、测试及验证脚本 lint 无错误/警告;完整生产构建成功,输出临时目录 |
+| 隔离浏览器 | 真实 SFC/样式,接口与 SDK 全部本地替代;两种表单与支付弹窗共 24 组视口检查通过,覆盖 320/375/768/1024/1440px 及 375×480。会员样例金额 38,000,游客同商品 45,600;会员取消确认、游客继续支付后返回登录均完成,无控制台错误 |
+| 范围核对 | 任务开始记录的 497 个文件哈希中,变化仅在本轮源码、路由、测试和文档范围;未修改旧报单源码、API、权限守卫、依赖或忽略的环境/lockfile。主体业务文件净减少 341 行(含新增模式模块,不含测试和文档) |
+
+当前共享视图 SHA-256:`4bd8f0347146ba1d1de3c9230b4c0fd0acbc22edd7a738845de276989eaef5e9`。上表保留共用页面重构时的验证记录,最新贵价规则的复验结果见顶部。
+
+没有进行真实注册、报单、扣款或后端联调。动态 SFC 编译仍不能给出可靠的源码覆盖率;金额使用现有枚举不变量及故障注入验证,没有新增属性测试依赖。Jest 24 未执行随机顺序测试;依赖未变,未新增供应链检查。
+
+## 2026-10-28 会员报单价格修正验收(历史)
+
+本节记录此前使用 SELL_PRICE 的方案,已被顶部最新贵价规则覆盖。
 
 - 用户要求沿用登录前后的价格区别:未登录注册继续使用 `MARKET_PRICE`;已登录的新 Member Welcome Pack 按 `SELL_PRICE` 计算商品小计、含税税额、付款摘要、商品详情税额及余额校验。截图中的单件商品应统一为 NGN 199,000,税额为 NGN 13,883.72,而非 NGN 299,900。
 - 验证数量 1–10、数字与字符串价格、零价格、多商品与移除清空,以及余额不足/刚好足够/介于销售价与市场价之间的情况。BV 算法保持原样。
@@ -32,7 +71,7 @@
 - Country 使用登录缓存 `baseData.COUNTRY_ID`,只读;新会员编号继续取会员 `GET /v1/user/dec` 的 `userName`。
 - Reporting Center ID 按旧 `isDec` 规则处理:普通会员可编辑且必填;stockist 默认填当前报单中心账号并禁用编辑。加载或提交期间沿用外层表单的禁用状态,原提交字段保留。
 - 国家/语言列表使用现有接口;产品、等级、地区、银行、余额及支付方式取登录后的 Welcome Pack 接口。
-- 提交保持旧 `POST /v1/user/dec` 字段、BV/含税算法与自动安置;新页面按 `SELL_PRICE` 计价(2026-10-28 起)。余额或 Paystack 支付成功后立即打开本次订单详情(`/guest-order?order=<SN>`)。保留银行信息,配送方式不额外加入旧请求体。
+- 提交保持旧 `POST /v1/user/dec` 字段、BV/含税算法与自动安置;新页面按最新确认的 `MARKET_PRICE` 计价。余额或 Paystack 支付成功后立即打开本次订单详情(`/guest-order?order=<SN>`)。保留银行信息,配送方式不额外加入旧请求体。
 - 支付展示按截图区分 Paystack 和 Account Balance,金额及余额来自实际状态,不移植演示数值或游客 accessCode 协议。
 - 请求中阻止重复提交和修改表单;失败恢复可操作。取消 Paystack 仍先确认并调用旧取消接口,使用本次响应中的 `payForm.orderSn`;取消失败保留支付窗口。
 - 测试覆盖身份/国家初始化、旧请求体等价、数量/金额、余额不足、缺失商品/等级/报单中心、两种支付成功/失败/取消以及入口。

+ 52 - 41
src/ui-refactor/views/welcome-pack/WelcomePackDialogs.vue

@@ -1,46 +1,54 @@
 <template>
   <div>
-    <ui-dialog
-      title="Paystack Payment"
+    <paystack-payment-dialog
       :visible="paymentVisible"
-      width="450px"
+      :amount="payment.amount"
+      :currency="payment.currency"
+      :loading="cancelLoading"
+      :show-cancel="!guest"
       :before-close="cancel"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="!cancelLoading"
+      :close-on-press-escape="guest"
+      @continue="$refs.paystack.payWithPaystack()"
+      @cancel="cancel"
     >
-      <el-form v-loading="cancelLoading" label-position="top" @submit.native.prevent>
-        <el-form-item label="Amount">
-          <el-input :value="payment.currency + ' ' + payment.amount" readonly />
-        </el-form-item>
-      </el-form>
-      <template slot="footer">
-        <paystack
-          v-if="paymentVisible"
-          :key="payment.orderSn"
-          :firstname="payment.firstname"
-          :lastname="payment.lastname"
-          :amount="payment.amount * 100"
-          :email="payment.email"
-          :metadata="payment.metadata"
-          :currency="payment.currency"
-          :paystackkey="payment.publicKey"
-          :reference="reference"
-          :channels="channels"
-          :callback="paymentCallback"
-          :close="cancel"
-        >
-          <el-button type="primary" :disabled="cancelLoading">Continue to Paystack</el-button>
-        </paystack>
-        <el-button :loading="cancelLoading" @click="cancel">Cancel</el-button>
-      </template>
-    </ui-dialog>
+      <guest-paystack
+        v-if="paymentVisible && guest"
+        ref="paystack"
+        :access-code="payment.accessCode"
+        :reference="reference"
+        :amount="Number(payment.amount)"
+        :currency="payment.currency"
+        :email="payment.email"
+        :paystackkey="payment.publicKey"
+        :callback="paymentCallback"
+        :close="cancel"
+        @error="$emit('payment-error', $event)"
+      />
+      <paystack
+        v-else-if="paymentVisible"
+        :key="payment.orderSn"
+        ref="paystack"
+        :firstname="payment.firstname"
+        :lastname="payment.lastname"
+        :amount="payment.amount * 100"
+        :email="payment.email"
+        :metadata="payment.metadata"
+        :currency="payment.currency"
+        :paystackkey="payment.publicKey"
+        :reference="reference"
+        :channels="channels"
+        :callback="paymentCallback"
+        :close="cancel"
+      />
+    </paystack-payment-dialog>
     <order-success-dialog
+      v-if="!guest"
       :visible="successVisible"
       :countdown="countdown"
       @orders="$emit('orders')"
     />
     <product-details-dialog
+      :show-sales-price="false"
       :visible="productVisible"
       :product="product"
       :currency="currency"
@@ -51,21 +59,23 @@
 
 <script>
 import paystack from 'vue-paystack'
+import GuestPaystack from '@/ui-refactor/views/signup/components/GuestPaystack'
+import PaystackPaymentDialog from '@/ui-refactor/components/PaystackPaymentDialog.vue'
 import ProductDetailsDialog from '@/ui-refactor/components/ProductDetailsDialog.vue'
-import UiDialog from '../../components/UiDialog.vue'
 import OrderSuccessDialog from '@/ui-refactor/components/OrderSuccessDialog.vue'
 
 export default {
   name: 'WelcomePackDialogs',
-  components: { UiDialog, paystack, ProductDetailsDialog, OrderSuccessDialog },
+  components: { paystack, GuestPaystack, PaystackPaymentDialog, ProductDetailsDialog, OrderSuccessDialog },
   props: {
+    guest: { type: Boolean, default: false },
     paymentVisible: { type: Boolean, default: false },
     payment: { type: Object, required: true },
-    reference: { type: String, required: true },
-    channels: { type: Array, required: true },
+    reference: { type: String, default: '' },
+    channels: { type: Array, default: () => [] },
     cancelLoading: { type: Boolean, default: false },
     successVisible: { type: Boolean, default: false },
-    countdown: { type: Number, required: true },
+    countdown: { type: Number, default: 5 },
     productVisible: { type: Boolean, default: false },
     product: { type: Object, required: true },
     currency: { type: String, default: '' }
@@ -73,13 +83,14 @@ export default {
   computed: {
     paymentCallback() {
       const orderSn = this.payment.orderSn
-      return response => this.$emit('paid', { orderSn, response })
+      const guest = this.guest
+      return response => {
+        if (!this._isDestroyed) this.$emit('paid', guest ? response : { orderSn, response })
+      }
     }
   },
   methods: {
-    cancel() {
-      this.$emit('cancel')
-    }
+    cancel() { this.$emit('cancel') }
   }
 }
 </script>

+ 45 - 13
src/ui-refactor/views/welcome-pack/WelcomePackFields.vue

@@ -2,32 +2,51 @@
   <div class="ng-welcome-fields">
     <ui-section-card title="Network Information">
       <div class="ng-welcome-grid">
-        <el-form-item label="Referrer ID" for="ng-welcome-referrer">
+        <el-form-item label="Referrer ID" for="ng-welcome-referrer" :required="guest">
           <el-input
             id="ng-welcome-referrer"
             :value="form.recUserName"
+            :aria-required="guest"
             @input="change('recUserName', $event)"
+            @change="$emit('referrer-change')"
           />
         </el-form-item>
-        <el-form-item label="Actual Referrer ID" for="ng-welcome-actual-referrer">
+        <el-form-item label="Actual Referrer ID" for="ng-welcome-actual-referrer" :required="guest">
           <el-input
             id="ng-welcome-actual-referrer"
             :value="form.conUserName"
+            :aria-required="guest"
             @input="change('conUserName', $event)"
+            @change="$emit('actual-referrer-change')"
           />
         </el-form-item>
       </div>
     </ui-section-card>
     <ui-section-card title="Basic Information">
       <div class="ng-welcome-grid">
-        <el-form-item label="Country" for="ng-welcome-country">
-          <el-input id="ng-welcome-country" :value="countryName" readonly />
-          <p class="ng-welcome-note">Set by your account, read-only.</p>
+        <el-form-item label="Country" :for="idFor('country')">
+          <el-select
+            v-if="guest"
+            :id="idFor('country')"
+            :value="form.countryId"
+            filterable
+            placeholder="Select country"
+            popper-class="ng-refactor-popper"
+            @input="change('countryId', $event)"
+            @change="$emit('country-change')"
+          >
+            <el-option v-for="item in countries" :key="item.ID" :label="item.NAME" :value="item.ID" />
+          </el-select>
+          <template v-else>
+            <el-input id="ng-welcome-country" :value="countryName" readonly />
+            <p class="ng-welcome-note">Set by your account, read-only.</p>
+          </template>
         </el-form-item>
-        <el-form-item label="Language" for="ng-welcome-language">
+        <el-form-item label="Language" :for="idFor('language')">
           <el-select
-            id="ng-welcome-language"
+            :id="idFor('language')"
             :value="form.languageId"
+            :filterable="guest"
             popper-class="ng-refactor-popper"
             @input="change('languageId', $event)"
           >
@@ -40,11 +59,17 @@
           </el-select>
         </el-form-item>
         <el-form-item label="Member ID" for="ng-welcome-member">
-          <el-input id="ng-welcome-member" :value="form.insertUserName" readonly />
+          <el-input
+            id="ng-welcome-member"
+            :value="form.insertUserName"
+            :readonly="memberReadOnly"
+            @input="change('insertUserName', $event)"
+            @blur="$emit('member-blur')"
+          />
         </el-form-item>
-        <el-form-item label="Order Level" for="ng-welcome-level">
+        <el-form-item label="Order Level" :for="idFor('level')">
           <el-select
-            id="ng-welcome-level"
+            :id="idFor('level')"
             :value="form.decLv"
             placeholder="Select level"
             popper-class="ng-refactor-popper"
@@ -62,7 +87,7 @@
           class="ng-welcome-full"
           label="Reporting Center ID"
           for="ng-welcome-center"
-          :required="!stockist"
+          :required="!guest && !stockist"
         >
           <el-input
             id="ng-welcome-center"
@@ -148,9 +173,9 @@
     </ui-section-card>
     <ui-section-card title="Bank Information">
       <div class="ng-welcome-grid">
-        <el-form-item label="Bank Name" for="ng-welcome-bank">
+        <el-form-item label="Bank Name" :for="idFor('bank')">
           <el-select
-            id="ng-welcome-bank"
+            :id="idFor('bank')"
             :value="form.openBank"
             placeholder="Select bank"
             popper-class="ng-refactor-popper"
@@ -192,6 +217,9 @@ export default {
   components: { UiSectionCard },
   props: {
     form: { type: Object, required: true },
+    guest: { type: Boolean, default: false },
+    countries: { type: Array, default: () => [] },
+    memberReadOnly: { type: Boolean, default: true },
     countryName: { type: String, default: '' },
     languages: { type: Array, required: true },
     levels: { type: Array, required: true },
@@ -218,6 +246,10 @@ export default {
     }
   },
   methods: {
+    idFor(field) {
+      const signupIds = { country: 0, language: 1, level: 2, bank: 3 }
+      return this.guest ? 'ng-signup-SignupPagevue-' + signupIds[field] : 'ng-welcome-' + field
+    },
     change(key, value) {
       this.$emit('change', { [key]: value })
     }

+ 32 - 18
src/ui-refactor/views/welcome-pack/__tests__/MemberWelcomePack.spec.js

@@ -20,7 +20,7 @@ Vue.filter('toThousandFilter', toThousandFilter)
 Vue.prototype.$t = key => key
 
 const root = path.resolve(__dirname, '..')
-const Page = load(path.join(root, 'MemberWelcomePack.vue'))
+const Page = load(path.join(root, 'welcomePackModes.js')).default.member
 const Legacy = load(path.resolve('src/views/user/welcome-pack.vue'), true)
 const product = { ID: 'P1', GOODS_NAME: 'Sample product', GOODS_NO: 'SKU1', COVER: '', SELL_PRICE: 100, MARKET_PRICE: 120, PRICE_PV: 60, TAX_RATE: 7.5, STORE_NUMS: 10, CODE: 'NGN' }
 const countries = [{ ID: 'C1', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: 'EN' }]
@@ -136,10 +136,11 @@ it.each(['cash', 'pay_stack'])('keeps the exact legacy %s request and payment re
   }
 })
 
-it.each([0, '0', 100, '100.25'])('uses member price %s for totals, BV and inclusive tax across stock quantities', async price => {
+it.each([0, '0', 100, '100.25'])('uses market price %s for welcome-pack totals, BV and inclusive tax across stock quantities', async price => {
   user.fetchWelcomePack.mockImplementation(async() => {
     const response = settings()
-    response.data.allGoods[0].SELL_PRICE = price
+    response.data.allGoods[0].MARKET_PRICE = price
+    response.data.allGoods[0].SELL_PRICE = 0
     return response
   })
   const vm = await order()
@@ -158,43 +159,56 @@ it('matches the member card price with subtotal, tax, payment summary and produc
   user.fetchWelcomePack.mockImplementation(async() => {
     const response = settings()
     response.data.allGoods[0] = { ...product, SELL_PRICE: '199000.00', MARKET_PRICE: '299900.00', PRICE_PV: '70' }
-    response.data.userBalance.cash = 250000
+    response.data.userBalance.cash = 350000
     return response
   })
   const vm = await order()
   vm.form.payType = 'cash'
   await settle()
-  expect(vm.$el.querySelector('.ng-signup-product-price strong').textContent).toBe('NGN 199,000')
+  expect(vm.$el.querySelector('.ng-signup-product-price strong').textContent).toBe('NGN 299,900')
   const totals = vm.$el.querySelector('.ng-signup-totals').textContent
-  expect(totals).toContain('NGN 199,000')
-  expect(totals).toContain('NGN 13,883.72')
+  expect(totals).toContain('NGN 299,900')
+  expect(totals).toContain('NGN 20,923.26')
   const payment = vm.$el.querySelector('.ng-payment-methods-detail').textContent
-  expect(payment).toContain('NGN 199,000')
-  expect(payment).toContain('NGN 51,000')
+  expect(payment).toContain('NGN 299,900')
+  expect(payment).toContain('NGN 50,100')
   expect(payment).not.toContain('not enough to cover this order')
   vm.$el.querySelector('.ng-signup-product-view').click()
   await settle()
-  expect(vm.product.taxAmount).toBe(13883.72)
-  expect(document.body.querySelector('.ng-product-details-dialog').textContent).toContain('NGN 13,883.72')
+  expect(vm.product.taxAmount).toBe(20923.26)
+  expect(document.body.querySelector('.ng-product-details-dialog').textContent).toContain('NGN 20,923.26')
+  expect(document.body.querySelector('.ng-product-details-dialog').textContent).not.toContain('Sales Price')
   expect(vm.tableData[0]).toMatchObject({ SELL_PRICE: '199000.00', MARKET_PRICE: '299900.00' })
   vm.onSubmit()
-  expect(vm.payAmount).toBe(199000)
+  expect(vm.payAmount).toBe(299900)
   expect(user.createWelcomePack).toHaveBeenCalledTimes(1)
 })
 
-it.each([100, 119])('accepts cash balance %s when it covers the member price but not the market price', async balance => {
+it.each([100, 119])('rejects cash balance %s that only covers the cheaper sales price', async balance => {
+  const vm = await order()
+  vm.userBalance.cash = balance
+  vm.form.payType = 'cash'
+  await settle()
+  expect(vm.$el.textContent).toContain('not enough to cover this order')
+  vm.onSubmit()
+  expect(vm.payAmount).toBe(120)
+  expect(user.createWelcomePack).not.toHaveBeenCalled()
+  expect(vm.userBalance.cash).toBe(balance)
+})
+
+it.each([120, 121])('accepts cash balance %s that covers the market-price total', async balance => {
   const vm = await order()
   vm.userBalance.cash = balance
   vm.form.payType = 'cash'
   await settle()
   expect(vm.$el.textContent).not.toContain('not enough to cover this order')
   vm.onSubmit()
-  expect(vm.payAmount).toBe(100)
+  expect(vm.payAmount).toBe(120)
   expect(user.createWelcomePack).toHaveBeenCalledTimes(1)
   expect(vm.userBalance.cash).toBe(balance)
 })
 
-it('recalculates multiple member products and clears all totals when they are removed', async() => {
+it('recalculates multiple market-price products and clears all totals when they are removed', async() => {
   user.fetchWelcomePack.mockImplementation(async() => {
     const response = settings()
     response.data.allGoods.push({ ...product, ID: 'P2', SELL_PRICE: '73.40', MARKET_PRICE: '99.90', PRICE_PV: '28.4' })
@@ -205,10 +219,10 @@ it('recalculates multiple member products and clears all totals when they are re
   vm.changeProductQuantity({ row: vm.tableData[0], index: 0, value: 3 })
   vm.changeProductQuantity({ row: vm.tableData[1], index: 1, value: 2 })
   vm.selectProduct()
-  expect(Number(vm.sellPriceSum)).toBe(446.8)
-  expect(vm.payAmount).toBe(446.8)
+  expect(Number(vm.sellPriceSum)).toBe(559.8)
+  expect(vm.payAmount).toBe(559.8)
   expect(Number(vm.pricePvSum)).toBe(236.8)
-  expect(Number(vm.taxSum)).toBe(31.17)
+  expect(Number(vm.taxSum)).toBe(39.06)
   expect(vm.form.goodsId).toEqual(['P1', 'P2'])
   expect(vm.form.goodsNum).toEqual([3, 2])
   vm.tableData.slice().forEach(row => vm.toggleProduct(row))

+ 239 - 0
src/ui-refactor/views/welcome-pack/__tests__/SharedWelcomePack.spec.js

@@ -0,0 +1,239 @@
+/* eslint-env jest */
+import Vue from 'vue'
+import Router from 'vue-router'
+import ElementUI from 'element-ui'
+import fs from 'fs'
+import path from 'path'
+import * as user from '@/api/user'
+import { deleteApproachOrder } from '@/api/shop'
+import { getLanguages } from '@/api/setting'
+import { toThousandFilter } from '@/filters'
+import { load } from '../../purchase/__tests__/loadComponent'
+
+jest.mock('@/api/user', () => Object.fromEntries(['fetchWelcomePack', 'createWelcomePack', 'fetchFullInfo', 'fetchInspectNetwork', 'fetchAutoPlace', 'fetchBrandAmbassadorInfo', 'fetchGuestDec', 'createGuestDec', 'fetchGuestFullInfo', 'fetchGuestInspectNetwork'].map(key => [key, jest.fn()])))
+jest.mock('@/api/shop', () => ({ deleteApproachOrder: 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', () => ({
+  name: 'Paystack',
+  props: ['amount', 'currency', 'email', 'metadata', 'channels', 'callback', 'close', 'reference', 'paystackkey', 'accessCode'],
+  methods: { payWithPaystack: jest.fn() },
+  render: h => h('button')
+}))
+Vue.use(Router)
+Vue.use(ElementUI)
+Vue.filter('toThousandFilter', toThousandFilter)
+Vue.prototype.$t = key => key
+Vue.prototype.$message = Object.assign(jest.fn(), { error: jest.fn(), info: jest.fn() })
+Vue.prototype.$confirm = jest.fn().mockResolvedValue()
+const countries = [{ ID: 'C1', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: 'EN' }]
+Vue.prototype.$store = { getters: { getCountriesList: countries }, dispatch: jest.fn().mockResolvedValue(countries) }
+const Page = load(path.resolve(__dirname, '../MemberWelcomePack.vue'))
+const product = { ID: 'P1', GOODS_NAME: 'Sample product', GOODS_NO: 'SKU1', SELL_PRICE: '199000.00', MARKET_PRICE: '299900.00', TAX_RATE: 7.5, PRICE_PV: 70, STORE_NUMS: 10, CODE: 'NGN' }
+const instances = []
+const errors = []
+Vue.config.errorHandler = error => errors.push(error.message)
+async function settle() { for (let i = 0; i < 20; i++) { await Promise.resolve(); await Vue.nextTick() } }
+const descendants = vm => vm.$children.reduce((all, child) => all.concat(child, descendants(child)), [])
+async function mount(location) {
+  const router = new Router({ mode: 'abstract', routes: [
+    { path: '/signup', component: Page, props: { mode: 'guest' }},
+    { path: '/dashboard/member-welcome-pack', component: Page, props: { mode: 'member' }},
+    ...['/login', '/guest-order', '/dashboard/index'].map(route => ({ path: route, component: { render: h => h('div', route) }}))
+  ] })
+  const root = new Vue({ router, render: h => h('router-view') }).$mount()
+  document.body.appendChild(root.$el)
+  instances.push(root)
+  router.push(location)
+  await settle()
+  return { root, router, entry: root.$children[0] }
+}
+async function chooseGuestCountry(root, flushLoading = true) {
+  root.$el.querySelector('#ng-signup-SignupPagevue-0').click()
+  await settle()
+  Array.from(document.body.querySelectorAll('.el-select-dropdown__item')).find(item => item.textContent.trim() === 'Nigeria').click()
+  await settle()
+  if (flushLoading) jest.runOnlyPendingTimers()
+  await settle()
+}
+beforeEach(() => {
+  jest.clearAllMocks()
+  jest.useFakeTimers()
+  errors.length = 0
+  getLanguages.mockResolvedValue([{ ID: 'EN', NAME: 'English' }])
+  const settings = () => ({ allGoods: [{ ...product }], region: [], decLevel: [{ ID: 'L1', LEVEL_NAME: 'Starter' }], userBalance: { cash: 250000 }, isDec: '0', sellType: [{ sell_type: [{ label: 'cash', name: 'Ecoin' }, { label: 'pay_stack', name: 'Paystack' }] }] })
+  user.fetchWelcomePack.mockImplementation(async() => ({ data: { ...settings(), userName: 'MEMBER-NEW' }}))
+  user.fetchGuestDec.mockImplementation(async() => ({ data: { ...settings(), draft: { draftId: 'guest-draft', accessToken: 'fixture-only-token', insertUserName: 'GUEST-NEW', currency: 'NGN' }, payList: [{ label: 'pay_stack', name: 'Paystack' }] }}))
+  user.createGuestDec.mockResolvedValue({ data: { accessCode: 'guest-access', reference: 'guest-reference', amount: 299900, currency: 'NGN' }})
+  user.createWelcomePack.mockResolvedValue({ data: { SN: 'MEMBER-ORDER', ORDER_AMOUNT: 299900, EMAIL: 'member@example.test' }})
+  user.fetchGuestFullInfo.mockResolvedValue({ data: { REAL_NAME: 'Referrer' }})
+  user.fetchGuestInspectNetwork.mockResolvedValue({ data: { REAL_NAME: 'Actual referrer' }})
+  deleteApproachOrder.mockResolvedValue({})
+})
+afterEach(async() => {
+  instances.splice(0).forEach(root => { const element = root.$el; root.$destroy(); element.remove() })
+  await settle()
+  expect(errors).toEqual([])
+  jest.clearAllTimers()
+  jest.useRealTimers()
+})
+
+it('wires both production routes to the same entry with fixed modes and unchanged access rules', () => {
+  const signup = fs.readFileSync(path.resolve('src/router/modules/refactor.js'), 'utf8')
+  const member = fs.readFileSync(path.resolve('src/router/index.js'), 'utf8')
+  const permission = fs.readFileSync(path.resolve('src/permission.js'), 'utf8')
+  const target = "import('@/ui-refactor/views/welcome-pack/MemberWelcomePack.vue')"
+  expect(signup).toContain(target)
+  expect(member).toContain(target)
+  expect(signup).toContain("props: { mode: 'guest' }")
+  expect(member).toContain("props: { mode: 'member' }")
+  expect(permission.match(/const whiteList = (.*)/)[1]).toContain("'/signup'")
+  expect(permission.match(/const whiteList = (.*)/)[1]).not.toContain('member-welcome-pack')
+})
+
+it('opens guest mode without member initialization and keeps invitation defaults and password controls', async() => {
+  const { root, entry } = await mount('/signup?mode=member&ref=INVITER')
+  expect(user.fetchWelcomePack).not.toHaveBeenCalled()
+  expect(user.fetchGuestDec).not.toHaveBeenCalled()
+  const flow = entry.$refs.flow
+  expect(flow.form.recUserName).toBe('INVITER')
+  expect(flow.form.conUserName).toBe('INVITER')
+  expect(root.$el.querySelector('#ng-welcome-password').type).toBe('password')
+  await chooseGuestCountry(root)
+  expect(user.fetchGuestDec).toHaveBeenCalledWith({ countryId: '620699181539139625' })
+  expect(flow.form.languageId).toBe('620713695651307520')
+  const input = root.$el.querySelector('#ng-welcome-referrer')
+  input.value = 'EDITED'
+  input.dispatchEvent(new Event('input', { bubbles: true }))
+  input.dispatchEvent(new Event('change', { bubbles: true }))
+  await settle()
+  expect(user.fetchGuestFullInfo).toHaveBeenCalledWith({ userName: 'EDITED' })
+  expect(flow.form.conUserName).toBe('')
+})
+
+it.each([['guest', '/signup', 299900, 20923.26], ['member', '/dashboard/member-welcome-pack', 299900, 20923.26]])('uses one view with the correct %s prices, quantities and details', async(mode, route, amount, tax) => {
+  const { root, entry } = await mount(route)
+  if (mode === 'guest') await chooseGuestCountry(root)
+  const flow = entry.$refs.flow
+  root.$el.querySelector('.ng-signup-product-add').click()
+  await settle()
+  expect(Number(flow.sellPriceSum)).toBe(amount)
+  expect(Number(flow.taxSum)).toBe(tax)
+  expect(root.$el.querySelector('.ng-signup-product-price strong').textContent).toBe('NGN ' + amount.toLocaleString('en-US'))
+  flow.changeProductQuantity({ row: flow.tableData[0], index: 0, value: 2 })
+  flow.selectProduct()
+  expect(flow.payAmount).toBe(amount * 2)
+  expect(Number(flow.paymentSummary.amount)).toBe(amount * 2)
+  expect(Number(flow.pricePvSum)).toBe(140)
+  flow.handleProduct(flow.tableData[0])
+  expect(flow.product.taxAmount).toBe(tax)
+})
+
+it('recreates the flow when changing modes and ignores a late guest payment callback', async() => {
+  const { root, router, entry } = await mount('/signup?ref=INVITER')
+  await chooseGuestCountry(root)
+  const guest = entry.$refs.flow
+  guest.form.realName = 'Guest draft'
+  guest.paymentOrder = { reference: 'old-reference' }
+  const paid = guest.processPayment.bind(guest)
+  router.push('/dashboard/member-welcome-pack')
+  await settle()
+  expect(root.$children[0]).toBe(entry)
+  expect(guest._isDestroyed).toBe(true)
+  expect(entry.$refs.flow).not.toBe(guest)
+  expect(entry.$refs.flow.form.realName).toBe('')
+  expect(entry.$refs.flow.form.recUserName).toBe('OPERATOR')
+  paid({ reference: 'old-reference' })
+  await settle()
+  expect(router.currentRoute.path).toBe('/dashboard/member-welcome-pack')
+})
+
+it('clears the guest loading timer when switching to member mode', async() => {
+  const scheduled = jest.spyOn(global, 'setTimeout')
+  const cleared = jest.spyOn(global, 'clearTimeout')
+  const { root, router } = await mount('/signup')
+  await chooseGuestCountry(root, false)
+  const index = scheduled.mock.calls.findIndex(call => call[1] === 500)
+  expect(index).toBeGreaterThanOrEqual(0)
+  const timer = scheduled.mock.results[index].value
+  router.push('/dashboard/member-welcome-pack')
+  await settle()
+  expect(cleared).toHaveBeenCalledWith(timer)
+})
+
+it('keeps member navigation blocked while payment is active and uses the shared payment dialog', async() => {
+  const { router, entry } = await mount('/dashboard/member-welcome-pack')
+  const flow = entry.$refs.flow
+  Object.assign(flow.form, { decLv: 'L1', decUserName: 'CENTER', payType: 'pay_stack' })
+  flow.toggleProduct(flow.tableData[0])
+  flow.onSubmit()
+  await settle()
+  expect(document.body.querySelector('.ng-paystack-payment-dialog')).not.toBeNull()
+  const sdk = descendants(flow).find(child => child.$options.name === 'Paystack')
+  expect(flow.payAmount).toBe(299900)
+  expect(Number(flow.paymentSummary.amount)).toBe(299900)
+  expect(document.body.querySelector('.ng-paystack-payment-dialog').textContent).toContain('NGN 299,900')
+  expect(sdk.amount).toBe(29990000)
+  expect(sdk.email).toBe('member@example.test')
+  const openPayment = jest.spyOn(sdk, 'payWithPaystack')
+  document.body.querySelector('.ng-paystack-payment-continue').click()
+  expect(openPayment).toHaveBeenCalledTimes(1)
+  router.push('/signup')
+  await settle()
+  expect(router.currentRoute.path).toBe('/dashboard/member-welcome-pack')
+  expect(flow.visible).toBe(true)
+  expect(user.fetchGuestDec).not.toHaveBeenCalled()
+  await flow.handleClose()
+  expect(deleteApproachOrder).toHaveBeenCalledWith({ orderSn: 'MEMBER-ORDER' })
+  router.push('/signup')
+  await settle()
+  expect(router.currentRoute.path).toBe('/signup')
+  expect(entry.$refs.flow.form.countryId).toBe('')
+})
+
+it('continues guest payment through accessCode and returns to login with the original query', async() => {
+  const { root, router, entry } = await mount('/signup?ref=INVITER&redirect=/dashboard/repeat-purchase')
+  await chooseGuestCountry(root)
+  const flow = entry.$refs.flow
+  Object.assign(flow.form, { decLv: 'L1', decUserName: 'CENTER', email: 'guest@example.test' })
+  flow.toggleProduct(flow.tableData[0])
+  flow.onSubmit()
+  await settle()
+  expect(user.createGuestDec).toHaveBeenCalledWith(expect.objectContaining({ draftId: 'guest-draft', accessToken: 'fixture-only-token', goodsId: ['P1'], goodsNum: [1] }))
+  expect(user.createWelcomePack).not.toHaveBeenCalled()
+  const sdk = descendants(flow).find(child => child.$options.name === 'GuestPaystack')
+  expect(sdk.amount).toBe(299900)
+  expect(sdk.email).toBe('guest@example.test')
+  expect(descendants(flow).some(child => child.$options.name === 'Paystack')).toBe(false)
+  expect(document.body.querySelector('.ng-paystack-payment-cancel')).toBeNull()
+  const resume = jest.fn()
+  sdk.scriptLoaded = Promise.resolve()
+  sdk.PaystackPopup = class { resumeTransaction(...args) { resume(...args) } }
+  document.body.querySelector('.ng-paystack-payment-continue').click()
+  await settle()
+  expect(resume).toHaveBeenCalledWith('guest-access', expect.objectContaining({ onSuccess: expect.any(Function) }))
+  resume.mock.calls[0][1].onSuccess({ reference: 'guest-reference' })
+  await settle()
+  expect(router.currentRoute.path).toBe('/login')
+  expect(router.currentRoute.query).toEqual({ ref: 'INVITER', redirect: '/dashboard/repeat-purchase' })
+})
+
+it.each(['/signup', '/dashboard/member-welcome-pack'])('round-trips shared personal fields, password visibility and pickup on %s', async route => {
+  const { root, entry } = await mount(route)
+  if (route === '/signup') await chooseGuestCountry(root)
+  const flow = entry.$refs.flow
+  const name = root.$el.querySelector('#ng-welcome-realName')
+  name.value = 'Shared form member'
+  name.dispatchEvent(new Event('input', { bubbles: true }))
+  const password = root.$el.querySelector('#ng-welcome-password')
+  expect(password.type).toBe('password')
+  password.closest('.el-input').querySelector('.el-icon-view').click()
+  await settle()
+  expect(password.type).toBe('text')
+  root.$el.querySelector('input[type="radio"][value="pickup"]').click()
+  await settle()
+  expect(flow.form.realName).toBe('Shared form member')
+  expect(flow.form.way).toBe('pickup')
+  expect(flow.areaDisabled).toBe(true)
+  expect(root.$el.textContent).not.toContain('Address Details')
+})

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

@@ -42,7 +42,7 @@ const instances = []
 async function settle() { for (let i = 0; i < 20; i++) { await Promise.resolve(); await Vue.nextTick() } }
 async function mount(location) {
   const router = new Router({ mode: 'abstract', routes: [
-    { path: '/dashboard/member-welcome-pack', component: Page },
+    { path: '/dashboard/member-welcome-pack', component: Page, props: { mode: 'member' }},
     { path: '/guest-order', component: OrderDetails },
     { path: '/dashboard/index', component: Account },
     { path: '/shop/member-order', component: { render: h => h('div', 'Old orders') }}
@@ -71,7 +71,7 @@ afterEach(() => {
 describe.each(['wrapped', 'direct'])('%s order response', shape => {
   it.each(['cash', 'pay_stack'])('opens the paid order details immediately after successful %s payment', async payment => {
     const { root, router } = await mount('/dashboard/member-welcome-pack')
-    const page = root.$children[0]
+    const page = root.$children[0].$refs.flow || root.$children[0]
     const order = { SN: 'ORDER-1', ORDER_AMOUNT: 120, EMAIL: 'sample@example.test' }
     createWelcomePack.mockResolvedValueOnce(shape === 'wrapped' ? { data: order } : order)
     const push = jest.spyOn(router, 'push')
@@ -100,7 +100,7 @@ describe.each(['wrapped', 'direct'])('%s order response', shape => {
 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]
+  const page = root.$children[0].$refs.flow || root.$children[0]
   Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: 'cash' })
   page.toggleProduct(page.tableData[0])
   page.onSubmit()
@@ -113,7 +113,7 @@ it('keeps the order list fallback when the paid Welcome Pack response has no ord
 it('stays on Welcome Pack when Save fails', async() => {
   createWelcomePack.mockRejectedValue(new Error('Order failed'))
   const { root, router } = await mount('/dashboard/member-welcome-pack')
-  const page = root.$children[0]
+  const page = root.$children[0].$refs.flow || root.$children[0]
   Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: 'cash' })
   page.toggleProduct(page.tableData[0])
   root.$el.querySelector('.ng-welcome-save').click()
@@ -132,7 +132,7 @@ it.each([
 
 it('reacts to tab query changes while the homepage is already open and preserves manual switching', async() => {
   const { root, router } = await mount('/dashboard/index')
-  const page = root.$children[0]
+  const page = root.$children[0].$refs.flow || root.$children[0]
   router.push({ path: '/dashboard/index', query: { tab: 'orders' }})
   await settle()
   expect(root.$children[0]).toBe(page)

+ 22 - 5
src/ui-refactor/views/welcome-pack/__tests__/preview.cjs

@@ -14,11 +14,22 @@ const countries = [{ ID: 'PREVIEW', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: 'EN' }
 const languages = [{ ID: 'EN', NAME: 'English' }, { ID: 'ZH', NAME: '中文' }]
 const products = ['Calmag', 'Elken Spirulina', 'C-Joie Flex'].map((name, index) => ({ ID: 'P' + index, GOODS_NAME: name, GOODS_NO: 'SKU' + index, COVER: 'preview-product.svg', CONTENT: 'Sample product for isolated UI verification.', SELL_PRICE: [38000, 52000, 45000][index], MARKET_PRICE: [45600, 62400, 54000][index], PRICE_PV: [35, 48, 42][index], TAX_RATE: 7.5, STORE_NUMS: 10, CODE: 'NGN' }))
 const data = { userName: 'NG00000002', allGoods: products, allOpenBank: [{ BANK_CODE: 'PREVIEW', BANK_NAME: 'Sample bank' }], region: [{ value: 'R1', label: 'Sample state' }], decLevel: [{ ID: 'L1', LEVEL_NAME: 'Starter' }], userBalance: { cash: 31000 }, isDec: '0', sellType: [{ sell_type: [{ label: 'pay_stack', name: 'Paystack' }, { label: 'cash', name: 'Ecoin' }] }] }
-fs.writeFileSync(local('user.js'), 'export const fetchWelcomePack = async () => ({ data: ' + JSON.stringify(data) + ' });\n' + ['createWelcomePack', 'fetchFullInfo', 'fetchInspectNetwork', 'fetchAutoPlace', 'fetchBrandAmbassadorInfo'].map(name => 'export const ' + name + ' = async () => { throw new Error("Isolated preview: no orders or member requests"); };').join('\n'))
-fs.writeFileSync(local('shop.js'), 'export const deleteApproachOrder = async () => { throw new Error("Isolated preview: no cancellations"); };')
+const guestData = { ...data, draft: { draftId: 'isolated-draft', accessToken: 'isolated-draft-token', insertUserName: 'GUEST00000002', currency: 'NGN' }, payList: [{ label: 'pay_stack', name: 'Paystack' }] }
+fs.writeFileSync(local('user.js'), `
+export const fetchWelcomePack = async () => ({ data: ${JSON.stringify(data)} });
+export const fetchGuestDec = async () => ({ data: ${JSON.stringify(guestData)} });
+const products = ${JSON.stringify(products)};
+const amount = (params, field) => params.goodsId.reduce((sum, id, index) => sum + products.find(item => item.ID === id)[field] * params.goodsNum[index], 0);
+export const createWelcomePack = async params => ({ data: { SN: 'ISOLATED-MEMBER-ORDER', ORDER_AMOUNT: amount(params, 'MARKET_PRICE'), EMAIL: params.email } });
+export const createGuestDec = async params => ({ data: { accessCode: 'isolated-access', reference: 'isolated-reference', amount: amount(params, 'MARKET_PRICE'), currency: 'NGN' } });
+${['fetchFullInfo', 'fetchInspectNetwork', 'fetchAutoPlace', 'fetchBrandAmbassadorInfo', 'fetchGuestFullInfo', 'fetchGuestInspectNetwork'].map(name => 'export const ' + name + ' = async () => ({ data: { REAL_NAME: "Isolated member" } });').join('\n')}
+`)
+fs.writeFileSync(local('shop.js'), 'export const deleteApproachOrder = async () => ({});')
 fs.writeFileSync(local('setting.js'), 'export const getLanguages = async () => ' + JSON.stringify(languages) + ';')
 fs.writeFileSync(local('identity.js'), 'export default { userName: () => "NG00000001", userEmail: () => "sample@example.test", baseData: () => ({COUNTRY_ID:"PREVIEW"}), loginTimestamp: () => "preview-session" };')
-fs.writeFileSync(local('paystack.js'), 'export default { render: h => h("button", {attrs:{disabled:true}}, "Isolated SDK preview") };')
+const sdk = 'export default { props: ["callback", "close", "reference", "amount", "currency", "email", "accessCode", "paystackkey"], methods: { payWithPaystack() { this.callback({reference:this.reference}); } }, render: h => h("button", "Isolated SDK preview") };'
+fs.writeFileSync(local('paystack.js'), sdk)
+fs.writeFileSync(local('guestPaystack.js'), sdk)
 fs.writeFileSync(local('entry.js'), `
 import Vue from ${source('node_modules/vue')};
 import Vuex from ${source('node_modules/vuex')};
@@ -34,7 +45,12 @@ Vue.use(Vuex); Vue.use(Router); Vue.use(Element, {size:'medium'});
 Vue.filter('toThousandFilter', toThousandFilter); Vue.prototype.$t = key => key;
 const store = new Vuex.Store({getters:{getCountriesList:()=>${JSON.stringify(countries)}}, actions:{'settings/getCountries':()=>${JSON.stringify(countries)}}});
 const hero = {breadcrumbs:[{text:'My Account',to:'/dashboard/index'},{text:'Member Welcome Pack'}],titleParts:[{text:'Member '},{text:'Welcome Pack.',accent:true}],subtitle:'Create a welcome-pack order for a new member using your current member ID and account country.'};
-const router = new Router({routes:[{path:'/',component:Layout,children:[{path:'*',component:Page,meta:{publicLayout:{hero}}}]}]});
+const done = { render: h => h('h1', 'Isolated result: no real order or payment') };
+const router = new Router({routes:[{path:'/',component:Layout,children:[
+  {path:'dashboard/member-welcome-pack',component:Page,props:{mode:'member'},meta:{publicLayout:{hero}}},
+  {path:'signup',component:Page,props:{mode:'guest'},meta:{publicLayout:{showHeader:false,hero:{...hero,titleParts:[{text:'Create your account.'}]}}}},
+  ...['login','guest-order','dashboard/index'].map(path=>({path,component:done}))
+]}]});
 new Vue({store,router,render:h=>h('router-view')}).$mount('#app');
 document.title = 'Member Welcome Pack · isolated preview';
 `)
@@ -51,7 +67,8 @@ config.output.publicPath = '/'
 config.devtool = false
 config.resolve.alias = {
   '@/api/user$': local('user.js'), '@/api/shop$': local('shop.js'), '@/api/setting$': local('setting.js'),
-  '@/utils/usersInfo$': local('identity.js'), 'vue-paystack$': local('paystack.js'), ...config.resolve.alias
+  '@/utils/usersInfo$': local('identity.js'), 'vue-paystack$': local('paystack.js'),
+  '@/ui-refactor/views/signup/components/GuestPaystack$': local('guestPaystack.js'), ...config.resolve.alias
 }
 config.resolve.modules.push(path.resolve('node_modules'))
 config.plugins = config.plugins.filter(plugin => !/WebUpdateNotificationPlugin/.test(plugin.constructor.name))

+ 20 - 13
src/ui-refactor/views/welcome-pack/__tests__/verifyPricing.cjs

@@ -6,10 +6,10 @@ const assert = require('assert')
 const crypto = require('crypto')
 const { spawnSync } = require('child_process')
 const output = fs.mkdtempSync(path.join(os.tmpdir(), 'ng-welcome-pricing-'))
-const target = path.resolve(__dirname, '../MemberWelcomePack.vue')
+const target = path.resolve('src/ui-refactor/views/signup/SignupPage.vue')
 const original = fs.readFileSync(target, 'utf8')
 const jest = 'node_modules/jest/bin/jest.js'
-const pricingTests = 'uses member price|matches the member card|accepts cash balance|recalculates multiple member'
+const pricingTests = 'uses market price|matches the member card|accepts cash balance|rejects cash balance|recalculates multiple market|uses one view|late guest payment|shared payment dialog|clears the guest loading timer'
 function run(args, name) {
   const result = spawnSync(process.execPath, args, {
     encoding: 'utf8', env: { ...process.env, NODE_OPTIONS: '--openssl-legacy-provider' }
@@ -25,22 +25,29 @@ function assertKilled(result, report) {
 assert.throws(() => assertKilled({ status: 0 }, { numFailedTests: 0 }))
 assert.throws(() => assertKilled({ status: 1 }, { numFailedTests: 0, numRuntimeErrorTestSuites: 1 }))
 const mutations = [
-  ['subtotal', 'subtotal += Number(item.SELL_PRICE)', 'subtotal += Number(item.MARKET_PRICE)'],
-  ['tax', 'tax += tool.calculateTax(Number(item.SELL_PRICE)', 'tax += tool.calculateTax(Number(item.MARKET_PRICE)'],
-  ['balance', 'this.payAmount += Number(item.SELL_PRICE)', 'this.payAmount += Number(item.MARKET_PRICE)'],
-  ['details', 'tool.calculateTax(Number(row.SELL_PRICE)', 'tool.calculateTax(Number(row.MARKET_PRICE)']
+  ['subtotal', 'subtotal += Number(item[this.priceField])', 'subtotal += Number(item.SELL_PRICE)'],
+  ['tax', 'tax += tool.calculateTax(Number(item[this.priceField])', 'tax += tool.calculateTax(Number(item.SELL_PRICE)'],
+  ['balance', 'this.payAmount += Number(item[this.priceField])', 'this.payAmount += Number(item.SELL_PRICE)'],
+  ['details', 'tool.calculateTax(Number(row[this.priceField])', 'tool.calculateTax(Number(row.SELL_PRICE)'],
+  ['price-rule', "priceField() { return 'MARKET_PRICE' }", "priceField() { return 'SELL_PRICE' }"],
+  ['late-callback', 'if (this.active) this.completePayment(response)', 'this.completePayment(response)'],
+  ['sdk-mode', 'v-if="paymentVisible && guest"', 'v-if="paymentVisible"', path.resolve(__dirname, '../WelcomePackDialogs.vue')],
+  ['loading-timer', 'beforeDestroy() {\n    clearTimeout(this.loadingTimer)', 'beforeDestroy() {\n    clearTimeout(undefined)', path.resolve('src/ui-refactor/views/signup/components/welcomePackRegistration.js')]
 ]
-for (const [name, from, to] of mutations) {
-  assert.strictEqual(original.split(from).length, 2, 'Mutation target must be unique: ' + name)
+for (const [name, from, to, file = target] of mutations) {
+  const source = fs.readFileSync(file, 'utf8')
+  const needle = source.includes(from) ? from : from.replace(/\n/g, '\r\n')
+  const replacement = needle === from ? to : to.replace(/\n/g, '\r\n')
+  assert.strictEqual(source.split(needle).length, 2, 'Mutation target must be unique: ' + name)
   const report = path.join(output, name + '.json')
   try {
-    fs.writeFileSync(target, original.replace(from, to))
-    const result = run([jest, '--runInBand', '--testMatch', '**/welcome-pack/__tests__/MemberWelcomePack.spec.js', '--testNamePattern', pricingTests, '--json', '--outputFile=' + report], name)
+    fs.writeFileSync(file, source.replace(needle, replacement))
+    const result = run([jest, '--runInBand', '--testMatch', '**/welcome-pack/__tests__/*WelcomePack.spec.js', '--testNamePattern', pricingTests, '--json', '--outputFile=' + report], name)
     assertKilled(result, JSON.parse(fs.readFileSync(report, 'utf8')))
     console.log('Killed: ' + name)
   } finally {
-    fs.writeFileSync(target, original)
-    assert.strictEqual(fs.readFileSync(target, 'utf8'), original)
+    fs.writeFileSync(file, source)
+    assert.strictEqual(fs.readFileSync(file, 'utf8'), source)
   }
 }
 const baseline = [
@@ -68,7 +75,7 @@ checkFailures(failures)
 const suiteErrors = tests.testResults.filter(suite => suite.status === 'failed' && !suite.assertionResults.length)
 assert.deepStrictEqual(suiteErrors.map(suite => path.relative(process.cwd(), suite.name).replace(/\\/g, '/')).sort(), ['tests/unit/components/Hamburger.spec.js', 'tests/unit/components/SvgIcon.spec.js'])
 assert(suiteErrors.every(suite => suite.message.includes('Vue packages version mismatch')))
-assert.strictEqual(run(['node_modules/eslint/bin/eslint.js', '--max-warnings=0', target, path.join(__dirname, 'MemberWelcomePack.spec.js'), __filename], 'lint').status, 0)
+assert.strictEqual(run(['node_modules/eslint/bin/eslint.js', '--max-warnings=0', target, 'src/ui-refactor/views/signup/components/welcomePackRegistration.js', 'src/ui-refactor/views/signup/components/SignupDialogs.vue', 'src/ui-refactor/components/PaystackPaymentDialog.vue', 'src/router/index.js', 'src/router/modules/refactor.js', 'src/ui-refactor/views/purchase/__tests__/loadComponent.js', 'tests/unit/ui-refactor/signup.spec.js', 'tests/unit/ui-refactor/signupProducts.spec.js', '--ext', '.js,.vue,.cjs', path.resolve(__dirname, '..')], 'lint').status, 0)
 assert.strictEqual(run(['node_modules/@vue/cli-service/bin/vue-cli-service.js', 'build', '--dest', path.join(output, 'build'), '--no-clean'], 'build').status, 0)
 assert.strictEqual(fs.readFileSync(target, 'utf8'), original)
 const result = { passed: tests.numPassedTests, existingFailures: failures.length, existingCompilerErrors: suiteErrors.length, mutationsKilled: mutations.length, lint: 'passed', build: 'passed', sourceHash: crypto.createHash('sha256').update(original).digest('hex'), output }

+ 170 - 0
src/ui-refactor/views/welcome-pack/welcomePackModes.js

@@ -0,0 +1,170 @@
+import Legacy from '@/views/user/welcome-pack.vue?vue&type=script&lang=js'
+import { fetchWelcomePack } from '@/api/user'
+import { deleteApproachOrder } from '@/api/shop'
+import { getLanguages } from '@/api/setting'
+import usersInfo from '@/utils/usersInfo'
+import guest from '@/ui-refactor/views/signup/components/welcomePackRegistration'
+import View from '@/ui-refactor/views/signup/SignupPage.vue'
+
+const member = {
+  extends: { ...Legacy, created: undefined },
+  data() {
+    return {
+      form: { countryId: '', languageId: '' },
+      initialized: false,
+      loadError: '',
+      operatorId: '',
+      sessionId: '',
+      memberLanguages: [],
+      cancelLoading: false,
+      countdownTimer: null,
+      orderListOpened: false
+    }
+  },
+  created() {
+    this.initialize()
+  },
+  beforeDestroy() {
+    clearInterval(this.countdownTimer)
+  },
+  methods: {
+    checkNavigation(to, from, next) {
+      if (this.isCurrent() && (this.submitButtonStat || this.visible || this.cancelLoading)) {
+        this.$message.info('Complete or cancel the current payment before leaving.')
+        next(false)
+      } else if (to.path === '/shop/member-order') {
+        next(this.payForm.orderSn
+          ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
+          : { path: '/dashboard/index', query: { tab: 'orders', orderCategory: 'member' }})
+      } else next()
+    },
+    async initialize() {
+      this.loading = true
+      this.initialized = false
+      this.loadError = ''
+      try {
+        this.operatorId = usersInfo.userName()
+        this.sessionId = usersInfo.loginTimestamp()
+        const account = usersInfo.baseData()
+        if (!this.operatorId || !account || !account.COUNTRY_ID) {
+          throw new Error('Your account country or member ID is unavailable. Please sign in again.')
+        }
+        this.form.countryId = account.COUNTRY_ID
+        this.form.recUserName = this.form.conUserName = this.operatorId
+        const [countries, languages] = await Promise.all([
+          this.$store.dispatch('settings/getCountries'),
+          getLanguages()
+        ])
+        if (this._isDestroyed || !this.isCurrent()) return
+        this.memberLanguages = Object.values(languages)
+        const country = countries.find(item => item.ID === this.form.countryId)
+        if (!country) throw new Error('Your account country is unavailable in the country list.')
+        this.form.languageId = country.DEFAULT_LANGUAGE_ID || ''
+        await this.fetchWelcomePack()
+      } catch (error) {
+        this.loadError = String(error.message || error)
+      } finally {
+        this.loading = false
+      }
+    },
+    async fetchWelcomePack() {
+      const { data } = await fetchWelcomePack({ countryId: this.form.countryId })
+      if (this._isDestroyed || !this.isCurrent()) return
+      if (!data.userName) throw new Error('The new member ID is unavailable. Please retry.')
+      if (!data.userBalance || !data.sellType || !data.sellType[0]) {
+        throw new Error('Welcome Pack payment settings are unavailable. Please retry.')
+      }
+      this.form.insertUserName = data.userName
+      this.allOpenBank = data.allOpenBank || []
+      this.allGoods = data.allGoods || []
+      this.tableData = Object.values(this.allGoods)
+      this.userBalance = data.userBalance
+      this.regionData = data.region || []
+      this.allDecLevel = data.decLevel || []
+      this.isDec = data.isDec
+      this.categoryType = 1
+      this.currencyUnitCode = (this.tableData[0] || {}).CODE || ''
+      this.storeNums = this.tableData.map(() => 1)
+      this.tableData.forEach(item => {
+        this.$set(item, 'goodsNum', 0)
+      })
+      this.multipleSelection = []
+      this.handleSureChange()
+      this.payList = Object.values((data.sellType[0] || {}).sell_type || {})
+      this.form.payType = (this.payList[1] || this.payList[0] || {}).label || ''
+      this.initialized = true
+    },
+    isCurrent() {
+      return (
+        this.active && usersInfo.userName() === this.operatorId && usersInfo.loginTimestamp() === this.sessionId
+      )
+    },
+    onSubmit() {
+      if (this.busy || !this.initialized) return
+      if (!this.isCurrent()) {
+        this.$message.error('Your account has changed. Please reload this page.')
+        return
+      }
+      Legacy.methods.onSubmit.call(this)
+    },
+    async handleClose() {
+      if (this.cancelLoading || !this.visible || !this.isCurrent()) return
+      this.cancelLoading = true
+      try {
+        try {
+          await this.$confirm(this.$t('shop.confirmClose'))
+        } catch (_) {
+          return
+        }
+        if (!this.isCurrent()) return
+        // 旧响应将订单号写在 payForm,取消必须针对本次实际订单。
+        await deleteApproachOrder({ orderSn: this.payForm.orderSn })
+        this.visible = false
+        this.submitButtonStat = false
+      } catch (error) {
+        this.$message.error(String(error.message || error))
+      } finally {
+        this.cancelLoading = false
+      }
+    },
+    completePayment(event) {
+      if (!this.visible || this.cancelLoading || !this.isCurrent()) return
+      if (event && event.orderSn !== this.payForm.orderSn) return
+      this.visible = false
+      this.payStackLoading = false
+      this.handleOrderList()
+    },
+    handleCountdown() {
+      clearInterval(this.countdownTimer)
+      this.countdown = 5
+      this.countdownTimer = setInterval(() => {
+        if (--this.countdown === 0) this.handleOrderList()
+      }, 1000)
+    },
+    handleOrderList() {
+      clearInterval(this.countdownTimer)
+      if (this.orderListOpened || !this.isCurrent()) return
+      this.orderListOpened = true
+      this.$router.push(this.payForm.orderSn
+        ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
+        : { path: '/shop/member-order' })
+    }
+  }
+}
+
+// 沿用购买页的局部适配方式,每个模式只继承自己的业务与状态。
+function createFlow(business, mode) {
+  return {
+    ...View,
+    name: mode === 'guest' ? 'GuestWelcomePack' : 'MemberWelcomePackFlow',
+    extends: business,
+    data() {
+      return { ...View.data.call(this), mode }
+    }
+  }
+}
+
+export default {
+  guest: createFlow(guest, 'guest'),
+  member: createFlow(member, 'member')
+}

+ 13 - 11
tests/unit/ui-refactor/signup.spec.js

@@ -3,7 +3,7 @@ import Vue from 'vue'
 import ElementUI from 'element-ui'
 import path from 'path'
 import registration from '@/ui-refactor/views/signup/components/welcomePackRegistration'
-import { load } from './loadGuestComponent'
+import { load } from '@/ui-refactor/views/purchase/__tests__/loadComponent'
 import { getLanguages } from '@/api/setting'
 import request from '@/utils/request'
 
@@ -13,19 +13,20 @@ jest.mock('@/utils/request', () => jest.fn())
 
 Vue.use(ElementUI)
 const PaymentMethods = load(path.resolve('src/ui-refactor/components/PaymentMethods.vue'))
-const SignupPage = load(path.resolve('src/ui-refactor/views/signup/SignupPage.vue'))
+const SignupPage = load(path.resolve('src/ui-refactor/views/welcome-pack/welcomePackModes.js')).default.guest
+const instances = []
 
 function instance() {
-  const vm = registration.data()
-  vm.$message = jest.fn()
-  vm.$message.error = jest.fn()
-  vm.$t = key => key
-  vm.$route = { query: {}}
-  vm.$router = { push: jest.fn(), replace: jest.fn() }
-  Object.defineProperty(vm, 'loginRoute', { get: () => SignupPage.computed.loginRoute.call(vm) })
-  Object.keys(registration.methods).forEach(key => {
-    vm[key] = registration.methods[key].bind(vm)
+  const vm = new Vue({
+    ...SignupPage,
+    beforeCreate() {
+      this.$message = Object.assign(jest.fn(), { error: jest.fn() })
+      this.$t = key => key
+      this.$route = { query: {}}
+      this.$router = { push: jest.fn(), replace: jest.fn() }
+    }
   })
+  instances.push(vm)
   return vm
 }
 
@@ -42,6 +43,7 @@ describe('Signup welcome-pack compatibility', () => {
     jest.useFakeTimers()
   })
   afterEach(() => {
+    instances.splice(0).forEach(vm => vm.$destroy())
     jest.clearAllTimers()
     jest.useRealTimers()
   })

+ 3 - 2
tests/unit/ui-refactor/signupProducts.spec.js

@@ -3,14 +3,15 @@ import Vue from 'vue'
 import ElementUI from 'element-ui'
 import path from 'path'
 import { toThousandFilter } from '@/filters'
-import { load } from './loadGuestComponent'
+import { load } from '@/ui-refactor/views/purchase/__tests__/loadComponent'
 
 jest.mock('@/utils/usersInfo', () => ({}))
 jest.mock('@/api/user', () => ({}))
+jest.mock('@/utils/request', () => jest.fn())
 Vue.use(ElementUI)
 Vue.filter('toThousandFilter', toThousandFilter)
 const Products = load(path.resolve('src/ui-refactor/views/signup/components/SignupProducts.vue'))
-const SignupPage = load(path.resolve('src/ui-refactor/views/signup/SignupPage.vue'))
+const SignupPage = load(path.resolve('src/ui-refactor/views/welcome-pack/welcomePackModes.js')).default.guest
 
 it.each([
   [undefined, 27000, 32400, 'NGN 27,000'],