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

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

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

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

@@ -66,8 +66,8 @@
 7. 提交使用 `POST /v1/user/guest-dec`。在原业务字段之外,将 `draftId` 与 `accessToken` 放在请求体最外层,不嵌套为 `draft`。两项缺失时阻止提交;草稿只保存在页面内存,不写入会员缓存。
 7. 提交使用 `POST /v1/user/guest-dec`。在原业务字段之外,将 `draftId` 与 `accessToken` 放在请求体最外层,不嵌套为 `draft`。两项缺失时阻止提交;草稿只保存在页面内存,不写入会员缓存。
 8. 提交响应按 `response.data || response` 读取订单,包含 `orderSn`、`amount`、`currency`、`reference`、`accessCode` 等支付信息;缺少 `accessCode` 或 `reference` 时显示错误。`authorizationUrl` 即使返回,当前也不用于整页跳转。
 8. 提交响应按 `response.data || response` 读取订单,包含 `orderSn`、`amount`、`currency`、`reference`、`accessCode` 等支付信息;缺少 `accessCode` 或 `reference` 时显示错误。`authorizationUrl` 即使返回,当前也不用于整页跳转。
 9. 当前支付由 `GuestPaystack` 加载 `https://js.paystack.co/v2/inline.js`,调用 `resumeTransaction(accessCode)`。金额用于展示,不由前端重新创建交易或按旧流程乘 100 初始化扣款;交易金额与币种由服务端交易决定。
 9. 当前支付由 `GuestPaystack` 加载 `https://js.paystack.co/v2/inline.js`,调用 `resumeTransaction(accessCode)`。金额用于展示,不由前端重新创建交易或按旧流程乘 100 初始化扣款;交易金额与币种由服务端交易决定。
-10. 关闭弹窗仅隐藏,不删除订单。每次有效点击 Continue Payment 都重新校验当前表单并调用 `POST /v1/user/guest-dec`,成功后使用本次返回的支付信息打开弹窗;请求中阻止重复点击,失败或缺少交易标识时不打开旧支付信息。是否复用已有后台订单由接口决定。SDK 内仍防止重复打开,支付回调的 `reference` 必须与最新订单一致;随后立即使用 `replace` 跳转 `/login`,保留原查询参数,不再停留注册页,也没有成功倒计时。取消支付、请求失败或回调不匹配时不跳转。
-11. `paymentComplete` 后按钮显示 Payment submitted 并禁用;这只表示前端收到了匹配回调,不代表服务端已确认注册或付款成功。
+10. 关闭弹窗仅隐藏,不删除订单。每次有效点击 Continue Payment 都重新校验当前表单并调用 `POST /v1/user/guest-dec`,成功后使用本次返回的支付信息打开弹窗;请求中阻止重复点击,失败或缺少交易标识时不打开旧支付信息。是否复用已有后台订单由接口决定。SDK 内仍防止重复打开,支付回调的 `reference` 必须与最新订单一致;随后显示 Payment Successful 弹窗,点击 Got it 后使用 `replace` 跳转 `/login`,保留原查询参数,没有自动跳转或倒计时。取消支付、请求失败或回调不匹配时不显示成功弹窗、不跳转。
+11. 按 2026-10-28 用户要求,成功弹窗中的 Member ID 使用本次 `POST /v1/user/guest-dec` 请求的 `insertUserName` 快照,不依赖成功响应或支付回调返回会员编号,也不读取之后被修改的表单。提供 Copy 按钮并复用既有剪贴板反馈,缺失编号显示 `—` 且禁用复制。弹窗不允许遮罩、Escape 或关闭按钮跳过确认;重复成功回调不重开弹窗、不重复导航。`paymentComplete` 后提交按钮显示 Registration Complete! 并禁用。成功触发点仍是匹配的前端支付回调,本次不新增服务端确认查询。
 
 
 邀请链接形如 `/#/login?ref=会员ID`,登录页 Register 已透传查询参数。注册页创建时读取单个字符串 `ref`,去掉首尾空格后同时作为 `form.recUserName` 和 `form.conUserName` 的默认值;没有有效 `ref` 时留空,不猜测推荐人。初始化不触发推荐人查询或其他接口,也不反复覆盖手动修改;两项始终可编辑。手动更改推荐人仍会清空实际推荐人,需要重新填写并确认关系。Save 和 Continue Payment 都传递用户当前填写的两项。
 邀请链接形如 `/#/login?ref=会员ID`,登录页 Register 已透传查询参数。注册页创建时读取单个字符串 `ref`,去掉首尾空格后同时作为 `form.recUserName` 和 `form.conUserName` 的默认值;没有有效 `ref` 时留空,不猜测推荐人。初始化不触发推荐人查询或其他接口,也不反复覆盖手动修改;两项始终可编辑。手动更改推荐人仍会清空实际推荐人,需要重新填写并确认关系。Save 和 Continue Payment 都传递用户当前填写的两项。
 
 

+ 9 - 2
src/ui-refactor/views/signup/SignupPage.vue

@@ -8,7 +8,7 @@
   >
   >
     <el-alert v-if="!isGuest && loadError" :title="loadError" type="error" :closable="false" show-icon />
     <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-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>
+    <el-form :model="form" label-position="top" autocomplete="off" :disabled="formDisabled" @submit.native.prevent>
       <welcome-pack-fields
       <welcome-pack-fields
         :form="form"
         :form="form"
         :guest="isGuest"
         :guest="isGuest"
@@ -83,6 +83,12 @@
       @orders="openOrders"
       @orders="openOrders"
       @close-product="visibleProduct = false"
       @close-product="visibleProduct = false"
     />
     />
+    <registration-success-dialog
+      v-if="isGuest"
+      :visible="registrationSuccessVisible"
+      :member-id="submittedMemberId"
+      @confirm="confirmRegistration"
+    />
   </section>
   </section>
 </template>
 </template>
 
 
@@ -92,12 +98,13 @@ import PaymentMethods from '@/ui-refactor/components/PaymentMethods.vue'
 import { getPaymentSummary } from '@/ui-refactor/utils/paymentSummary'
 import { getPaymentSummary } from '@/ui-refactor/utils/paymentSummary'
 import tool from '@/utils/tool'
 import tool from '@/utils/tool'
 import SignupProducts from '@/ui-refactor/views/signup/components/SignupProducts.vue'
 import SignupProducts from '@/ui-refactor/views/signup/components/SignupProducts.vue'
+import RegistrationSuccessDialog from '@/ui-refactor/views/signup/components/RegistrationSuccessDialog.vue'
 import WelcomePackFields from '@/ui-refactor/views/welcome-pack/WelcomePackFields.vue'
 import WelcomePackFields from '@/ui-refactor/views/welcome-pack/WelcomePackFields.vue'
 import WelcomePackDialogs from '@/ui-refactor/views/welcome-pack/WelcomePackDialogs.vue'
 import WelcomePackDialogs from '@/ui-refactor/views/welcome-pack/WelcomePackDialogs.vue'
 
 
 export default {
 export default {
   name: 'WelcomePackFlow',
   name: 'WelcomePackFlow',
-  components: { UiSectionCard, SignupProducts, WelcomePackFields, PaymentMethods, WelcomePackDialogs },
+  components: { UiSectionCard, SignupProducts, WelcomePackFields, PaymentMethods, WelcomePackDialogs, RegistrationSuccessDialog },
   data() {
   data() {
     return { active: true }
     return { active: true }
   },
   },

+ 168 - 0
src/ui-refactor/views/signup/components/RegistrationSuccessDialog.vue

@@ -0,0 +1,168 @@
+<template>
+  <ui-dialog
+    class="ng-signup-success"
+    title="Payment Successful"
+    width="420px"
+    top="0"
+    :visible="visible"
+    :show-close="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <div class="ng-signup-success-heading">
+      <i class="el-icon-check ng-signup-success-icon" aria-hidden="true" />
+      <div>
+        <h2>Payment Successful</h2>
+        <p>Your member account has been created. Please keep your Member ID safe.</p>
+      </div>
+    </div>
+    <div class="ng-signup-success-member">
+      <div class="ng-signup-success-credential">
+        <span>Member ID · Login credential</span>
+        <strong class="ng-signup-success-member-id">{{ memberId || '—' }}</strong>
+      </div>
+      <el-button
+        class="ng-signup-success-copy"
+        native-type="button"
+        icon="el-icon-document-copy"
+        aria-label="Copy Member ID"
+        :disabled="!memberId"
+        @click="copyMemberId"
+      >Copy</el-button>
+    </div>
+    <el-alert
+      class="ng-signup-success-warning"
+      type="warning"
+      :closable="false"
+      show-icon
+      title="Your Member ID is your login credential —— you will need it every time you sign in. It cannot be recovered if lost. Screenshot orwrite it down now."
+    />
+    <el-button
+      class="ng-signup-success-confirm"
+      type="primary"
+      native-type="button"
+      @click="$emit('confirm')"
+    >Got it</el-button>
+    <template slot="footer"><span /></template>
+  </ui-dialog>
+</template>
+
+<script>
+import UiDialog from '@/ui-refactor/components/UiDialog.vue'
+import handleClipboard from '@/utils/clipboard'
+
+export default {
+  name: 'RegistrationSuccessDialog',
+  components: { UiDialog },
+  props: {
+    visible: { type: Boolean, default: false },
+    memberId: { type: String, default: '' }
+  },
+  methods: {
+    copyMemberId(event) { handleClipboard(this.memberId, event) }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.ng-signup-success {
+  display: flex;
+  padding: 16px;
+}
+.ng-signup-success ::v-deep .el-dialog {
+  flex-shrink: 0;
+  max-width: 100%;
+  margin: auto !important;
+}
+.ng-signup-success ::v-deep .el-dialog__header,
+.ng-signup-success ::v-deep .el-dialog__footer {
+  display: none;
+}
+.ng-signup-success ::v-deep .el-dialog__body {
+  padding: 24px;
+  word-break: normal;
+}
+.ng-signup-success-heading {
+  display: flex;
+  align-items: flex-start;
+  gap: 12px;
+  margin-bottom: 20px;
+}
+.ng-signup-success-icon {
+  display: flex;
+  flex: 0 0 40px;
+  align-items: center;
+  justify-content: center;
+  height: 40px;
+  border-radius: 50%;
+  color: #23734d;
+  background: #eaf6ef;
+  font-size: 20px;
+}
+.ng-signup-success-heading h2 {
+  margin: 0 0 6px;
+  color: #202259;
+  font-size: 22px;
+  line-height: 1.3;
+}
+.ng-signup-success-heading p {
+  margin: 0;
+  color: #606266;
+  font-size: 13px;
+  line-height: 1.6;
+}
+.ng-signup-success-member {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 16px;
+  border: 1px solid #dfe4ed;
+  border-radius: 8px;
+  background: #f7f8fa;
+}
+.ng-signup-success-credential {
+  min-width: 0;
+}
+.ng-signup-success-credential span {
+  color: #606266;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.ng-signup-success-member-id {
+  display: block;
+  margin-top: 6px;
+  color: #202259;
+  font-size: 22px;
+  line-height: 1.3;
+  overflow-wrap: anywhere;
+}
+.ng-signup-success-copy {
+  flex-shrink: 0;
+}
+.ng-signup-success-warning {
+  margin: 16px 0 20px;
+  align-items: flex-start;
+  color: #806528;
+  background: #fff8e5;
+}
+.ng-signup-success-warning ::v-deep .el-alert__title {
+  line-height: 1.6;
+}
+.ng-signup-success-warning ::v-deep .el-alert__icon {
+  margin-top: 4px;
+}
+.ng-signup-success-confirm {
+  width: 100%;
+  min-height: 50px;
+  font-size: 16px;
+}
+@media (max-width: 480px) {
+  .ng-signup-success ::v-deep .el-dialog__body {
+    padding: 20px 16px;
+  }
+  .ng-signup-success-heading h2 {
+    font-size: 20px;
+  }
+}
+</style>

+ 11 - 5
src/ui-refactor/views/signup/components/welcomePackRegistration.js

@@ -43,6 +43,8 @@ export default {
       submitButtonStat: false,
       submitButtonStat: false,
       visible: false,
       visible: false,
       paymentComplete: false,
       paymentComplete: false,
+      registrationSuccessVisible: false,
+      submittedMemberId: '',
       paymentOrder: {
       paymentOrder: {
         orderSn: '', amount: 0, currency: '', reference: '', accessCode: ''
         orderSn: '', amount: 0, currency: '', reference: '', accessCode: ''
       },
       },
@@ -112,7 +114,7 @@ export default {
   },
   },
   computed: {
   computed: {
     submitLabel() {
     submitLabel() {
-      if (this.paymentComplete) return 'Payment submitted'
+      if (this.paymentComplete) return 'Registration Complete!'
       return this.paymentOrder.accessCode ? 'Continue Payment' : 'Save'
       return this.paymentOrder.accessCode ? 'Continue Payment' : 'Save'
     }
     }
   },
   },
@@ -330,6 +332,8 @@ export default {
             throw new Error('Payment details are missing. Please contact customer service.')
             throw new Error('Payment details are missing. Please contact customer service.')
           }
           }
           this.paymentOrder = order
           this.paymentOrder = order
+          // 保存与本次支付订单对应的请求值,避免后续表单编辑改变成功弹窗中的编号。
+          this.submittedMemberId = params.insertUserName || ''
           this.submitButtonStat = false
           this.submitButtonStat = false
           this.visible = true
           this.visible = true
         })
         })
@@ -347,16 +351,18 @@ export default {
       this.visible = false
       this.visible = false
     },
     },
     completePayment(response) {
     completePayment(response) {
+      if (this.paymentComplete) return
       if (!response || response.reference !== this.paymentOrder.reference) {
       if (!response || response.reference !== this.paymentOrder.reference) {
         this.showLoadError(new Error('Payment reference does not match the current order.'))
         this.showLoadError(new Error('Payment reference does not match the current order.'))
         return
         return
       }
       }
       this.visible = false
       this.visible = false
       this.paymentComplete = true
       this.paymentComplete = true
-      this.$message({
-        message: 'Payment submitted. Please wait for order confirmation.',
-        type: 'success'
-      })
+      this.registrationSuccessVisible = true
+    },
+    confirmRegistration() {
+      if (!this.registrationSuccessVisible) return
+      this.registrationSuccessVisible = false
       this.$router.replace(this.loginRoute)
       this.$router.replace(this.loginRoute)
     },
     },
     // BA会员查询
     // BA会员查询

+ 5 - 1
src/ui-refactor/views/welcome-pack/README.md

@@ -8,6 +8,10 @@
 
 
 当前复验:118 项相关测试通过;8/8 故障注入捕获错误取价、金额、回调、SDK 与计时器问题;定向 lint 和完整生产构建通过。全量从本轮修改前 527 项通过变为 529 项通过,18 项既有失败和 2 个编译器版本错误不变。先复现了 10 项新规则不满足的失败,再修改运行代码。隔离样例验证市场单价 45,600、数量 2、小计与支付金额 91,200、税额 6,362.79,6 种视口无弹窗溢出,模拟支付后进入对应订单详情。
 当前复验:118 项相关测试通过;8/8 故障注入捕获错误取价、金额、回调、SDK 与计时器问题;定向 lint 和完整生产构建通过。全量从本轮修改前 527 项通过变为 529 项通过,18 项既有失败和 2 个编译器版本错误不变。先复现了 10 项新规则不满足的失败,再修改运行代码。隔离样例验证市场单价 45,600、数量 2、小计与支付金额 91,200、税额 6,362.79,6 种视口无弹窗溢出,模拟支付后进入对应订单详情。
 
 
+## 浏览器自动填充(2026-10-28)
+
+注册/会员报单用于录入新会员资料,表单使用 `autocomplete="off"` 关闭历史补全;姓名、电话、邮箱、收件人、地址、银行资料及选择框的非密码输入统一使用固定 `ng-registration` 标记,避免 Chrome 自动建议当前浏览者保存的个人地址。该标记属于针对 Chrome 的兼容措施,并非标准 autocomplete 字段类型;Chromium 将其归类为 unrecognized,默认抑制地址建议。两个密码字段保持 `new-password`;地区 Cascader 保持只读选择。样式、手动输入、复制粘贴、选项和提交字段不变,不修改全局控件或普通登录页。浏览器或扩展主动发起的手动填充仍由浏览器控制。
+
 ## 当前结构:双入口共用页面(2026-10-28)
 ## 当前结构:双入口共用页面(2026-10-28)
 
 
 用户已明确批准整页复用方案(`spec approval: obtained`):保留两个网址,统一会员表单外观与公共支付弹窗,通过路由固定传入游客/会员模式。
 用户已明确批准整页复用方案(`spec approval: obtained`):保留两个网址,统一会员表单外观与公共支付弹窗,通过路由固定传入游客/会员模式。
@@ -15,7 +19,7 @@
 - `/signup` 与 `/dashboard/member-welcome-pack` 均挂载 `MemberWelcomePack.vue`,分别传入 `mode: 'guest'`/`mode: 'member'`;原路由名称、标题、面包屑及权限不变。
 - `/signup` 与 `/dashboard/member-welcome-pack` 均挂载 `MemberWelcomePack.vue`,分别传入 `mode: 'guest'`/`mode: 'member'`;原路由名称、标题、面包屑及权限不变。
 - 入口只选择模式并转发离开/同页更新守卫。`welcomePackModes.js` 沿用购买页适配方式,分别继承原游客业务和旧会员脚本,按需创建一个实例;会员原页面的初始化、会话检查、提交、取消和成功去向已迁入该模块。
 - 入口只选择模式并转发离开/同页更新守卫。`welcomePackModes.js` 沿用购买页适配方式,分别继承原游客业务和旧会员脚本,按需创建一个实例;会员原页面的初始化、会话检查、提交、取消和成功去向已迁入该模块。
 - `SignupPage.vue` 是唯一业务视图,复用 `WelcomePackFields`、商品卡片、公共支付方式和 `WelcomePackDialogs`;商品选择、数量、小计、BV、税额、余额校验金额与详情税额只有一份实现。按最新规则,游客注册和会员报单均固定使用 MARKET_PRICE。
 - `SignupPage.vue` 是唯一业务视图,复用 `WelcomePackFields`、商品卡片、公共支付方式和 `WelcomePackDialogs`;商品选择、数量、小计、BV、税额、余额校验金额与详情税额只有一份实现。按最新规则,游客注册和会员报单均固定使用 MARKET_PRICE。
-- 游客保留固定国家/语言、邀请默认值、推荐人查询、草稿和 accessCode;会员保留账户国家、当前会员默认推荐人、stockist 规则、服务端支付金额 ×100 及取消订单。游客成功返回登录并保留查询参数,会员成功打开本次订单详情。
+- 游客保留固定国家/语言、邀请默认值、推荐人查询、草稿和 accessCode;会员保留账户国家、当前会员默认推荐人、stockist 规则、服务端支付金额 ×100 及取消订单。游客在匹配支付回调后显示 Payment Successful 弹窗,以本次提交的 `insertUserName` 展示并复制 Member ID,点击 Got it 后返回登录并保留查询参数;会员成功仍打开本次订单详情。弹窗由游客私有 `RegistrationSuccessDialog` 展示,复用 UiDialog 和既有剪贴板工具,不依赖成功响应返回会员编号。
 - 公共 Paystack 弹窗新增 `showCancel`(默认 false)及 `cancel` 事件;仅会员启用取消按钮,原调用方默认表现保持。每次只挂载对应 SDK,旧 `SignupDialogs` 保留原 props/events,作为公共弹窗的薄适配器。
 - 公共 Paystack 弹窗新增 `showCancel`(默认 false)及 `cancel` 事件;仅会员启用取消按钮,原调用方默认表现保持。每次只挂载对应 SDK,旧 `SignupDialogs` 保留原 props/events,作为公共弹窗的薄适配器。
 - 切换模式销毁旧实例,清理游客加载计时器和会员倒计时;公共支付回调及 SDK 回调在实例失效后不再跳转。旧会员页面、API、缓存、依赖和环境文件保持原样。
 - 切换模式销毁旧实例,清理游客加载计时器和会员倒计时;公共支付回调及 SDK 回调在实例失效后不再跳转。旧会员页面、API、缓存、依赖和环境文件保持原样。
 
 

+ 20 - 6
src/ui-refactor/views/welcome-pack/WelcomePackFields.vue

@@ -5,6 +5,7 @@
         <el-form-item label="Referrer ID" for="ng-welcome-referrer" :required="guest">
         <el-form-item label="Referrer ID" for="ng-welcome-referrer" :required="guest">
           <el-input
           <el-input
             id="ng-welcome-referrer"
             id="ng-welcome-referrer"
+            autocomplete="ng-registration"
             :value="form.recUserName"
             :value="form.recUserName"
             :aria-required="guest"
             :aria-required="guest"
             @input="change('recUserName', $event)"
             @input="change('recUserName', $event)"
@@ -14,6 +15,7 @@
         <el-form-item label="Actual Referrer ID" for="ng-welcome-actual-referrer" :required="guest">
         <el-form-item label="Actual Referrer ID" for="ng-welcome-actual-referrer" :required="guest">
           <el-input
           <el-input
             id="ng-welcome-actual-referrer"
             id="ng-welcome-actual-referrer"
+            autocomplete="ng-registration"
             :value="form.conUserName"
             :value="form.conUserName"
             :aria-required="guest"
             :aria-required="guest"
             @input="change('conUserName', $event)"
             @input="change('conUserName', $event)"
@@ -25,11 +27,12 @@
     <ui-section-card title="Basic Information">
     <ui-section-card title="Basic Information">
       <div class="ng-welcome-grid">
       <div class="ng-welcome-grid">
         <el-form-item label="Country" :for="idFor('country')">
         <el-form-item label="Country" :for="idFor('country')">
+          <!-- 保持只读下拉,避免浏览器对 Country 搜索框触发地址自动填充。 -->
           <el-select
           <el-select
             v-if="guest"
             v-if="guest"
             :id="idFor('country')"
             :id="idFor('country')"
+            autocomplete="ng-registration"
             :value="form.countryId"
             :value="form.countryId"
-            filterable
             placeholder="Select country"
             placeholder="Select country"
             popper-class="ng-refactor-popper"
             popper-class="ng-refactor-popper"
             @input="change('countryId', $event)"
             @input="change('countryId', $event)"
@@ -38,13 +41,14 @@
             <el-option v-for="item in countries" :key="item.ID" :label="item.NAME" :value="item.ID" />
             <el-option v-for="item in countries" :key="item.ID" :label="item.NAME" :value="item.ID" />
           </el-select>
           </el-select>
           <template v-else>
           <template v-else>
-            <el-input id="ng-welcome-country" :value="countryName" readonly />
+            <el-input id="ng-welcome-country" :value="countryName" autocomplete="ng-registration" readonly />
             <p class="ng-welcome-note">Set by your account, read-only.</p>
             <p class="ng-welcome-note">Set by your account, read-only.</p>
           </template>
           </template>
         </el-form-item>
         </el-form-item>
         <el-form-item label="Language" :for="idFor('language')">
         <el-form-item label="Language" :for="idFor('language')">
           <el-select
           <el-select
             :id="idFor('language')"
             :id="idFor('language')"
+            autocomplete="ng-registration"
             :value="form.languageId"
             :value="form.languageId"
             :filterable="guest"
             :filterable="guest"
             popper-class="ng-refactor-popper"
             popper-class="ng-refactor-popper"
@@ -61,6 +65,7 @@
         <el-form-item label="Member ID" for="ng-welcome-member">
         <el-form-item label="Member ID" for="ng-welcome-member">
           <el-input
           <el-input
             id="ng-welcome-member"
             id="ng-welcome-member"
+            autocomplete="ng-registration"
             :value="form.insertUserName"
             :value="form.insertUserName"
             :readonly="memberReadOnly"
             :readonly="memberReadOnly"
             @input="change('insertUserName', $event)"
             @input="change('insertUserName', $event)"
@@ -70,6 +75,7 @@
         <el-form-item label="Order Level" :for="idFor('level')">
         <el-form-item label="Order Level" :for="idFor('level')">
           <el-select
           <el-select
             :id="idFor('level')"
             :id="idFor('level')"
+            autocomplete="ng-registration"
             :value="form.decLv"
             :value="form.decLv"
             placeholder="Select level"
             placeholder="Select level"
             popper-class="ng-refactor-popper"
             popper-class="ng-refactor-popper"
@@ -91,6 +97,7 @@
         >
         >
           <el-input
           <el-input
             id="ng-welcome-center"
             id="ng-welcome-center"
+            autocomplete="ng-registration"
             :value="form.decUserName"
             :value="form.decUserName"
             :disabled="stockist"
             :disabled="stockist"
             @input="change('decUserName', $event)"
             @input="change('decUserName', $event)"
@@ -113,7 +120,7 @@
             :type="field.password ? 'password' : 'text'"
             :type="field.password ? 'password' : 'text'"
             :show-password="!!field.password"
             :show-password="!!field.password"
             :maxlength="field.password ? 32 : undefined"
             :maxlength="field.password ? 32 : undefined"
-            :autocomplete="field.autocomplete || 'off'"
+            :autocomplete="field.autocomplete || 'ng-registration'"
             @input="change(field.key, $event)"
             @input="change(field.key, $event)"
           />
           />
         </el-form-item>
         </el-form-item>
@@ -146,6 +153,7 @@
         <el-form-item label="City" for="ng-welcome-city">
         <el-form-item label="City" for="ng-welcome-city">
           <el-input
           <el-input
             id="ng-welcome-city"
             id="ng-welcome-city"
+            autocomplete="ng-registration"
             :value="form.cityName"
             :value="form.cityName"
             placeholder="City"
             placeholder="City"
             @input="change('cityName', $event)"
             @input="change('cityName', $event)"
@@ -154,6 +162,7 @@
         <el-form-item class="ng-welcome-full" label="Detailed Address" for="ng-welcome-address">
         <el-form-item class="ng-welcome-full" label="Detailed Address" for="ng-welcome-address">
           <el-input
           <el-input
             id="ng-welcome-address"
             id="ng-welcome-address"
+            autocomplete="ng-registration"
             :value="form.address"
             :value="form.address"
             type="textarea"
             type="textarea"
             :rows="3"
             :rows="3"
@@ -164,6 +173,7 @@
         <el-form-item label="Area / District" for="ng-welcome-district">
         <el-form-item label="Area / District" for="ng-welcome-district">
           <el-input
           <el-input
             id="ng-welcome-district"
             id="ng-welcome-district"
+            autocomplete="ng-registration"
             :value="form.lgaName"
             :value="form.lgaName"
             placeholder="Area or district"
             placeholder="Area or district"
             @input="change('lgaName', $event)"
             @input="change('lgaName', $event)"
@@ -176,6 +186,7 @@
         <el-form-item label="Bank Name" :for="idFor('bank')">
         <el-form-item label="Bank Name" :for="idFor('bank')">
           <el-select
           <el-select
             :id="idFor('bank')"
             :id="idFor('bank')"
+            autocomplete="ng-registration"
             :value="form.openBank"
             :value="form.openBank"
             placeholder="Select bank"
             placeholder="Select bank"
             popper-class="ng-refactor-popper"
             popper-class="ng-refactor-popper"
@@ -192,6 +203,7 @@
         <el-form-item label="Account Name" for="ng-welcome-bank-name">
         <el-form-item label="Account Name" for="ng-welcome-bank-name">
           <el-input
           <el-input
             id="ng-welcome-bank-name"
             id="ng-welcome-bank-name"
+            autocomplete="ng-registration"
             :value="form.bankAddress"
             :value="form.bankAddress"
             @input="change('bankAddress', $event)"
             @input="change('bankAddress', $event)"
           />
           />
@@ -199,6 +211,7 @@
         <el-form-item label="Bank Account" for="ng-welcome-bank-number">
         <el-form-item label="Bank Account" for="ng-welcome-bank-number">
           <el-input
           <el-input
             id="ng-welcome-bank-number"
             id="ng-welcome-bank-number"
+            autocomplete="ng-registration"
             :value="form.bankNo"
             :value="form.bankNo"
             maxlength="50"
             maxlength="50"
             @input="change('bankNo', $event)"
             @input="change('bankNo', $event)"
@@ -230,9 +243,10 @@ export default {
   data() {
   data() {
     return {
     return {
       personalFields: [
       personalFields: [
-        { key: 'realName', label: 'Member Name', autocomplete: 'name' },
-        { key: 'mobile', label: 'Phone', autocomplete: 'tel' },
-        { key: 'email', label: 'Email', autocomplete: 'email' },
+        // Chrome 对地址填充可能忽略 off;非密码字段以固定业务标记抑制地址建议。
+        { key: 'realName', label: 'Member Name' },
+        { key: 'mobile', label: 'Phone' },
+        { key: 'email', label: 'Email' },
         { key: 'password', label: 'Login Password', password: true, autocomplete: 'new-password' },
         { key: 'password', label: 'Login Password', password: true, autocomplete: 'new-password' },
         {
         {
           key: 'payPassword',
           key: 'payPassword',

+ 63 - 1
src/ui-refactor/views/welcome-pack/__tests__/SharedWelcomePack.spec.js

@@ -8,11 +8,13 @@ import * as user from '@/api/user'
 import { deleteApproachOrder } from '@/api/shop'
 import { deleteApproachOrder } from '@/api/shop'
 import { getLanguages } from '@/api/setting'
 import { getLanguages } from '@/api/setting'
 import { toThousandFilter } from '@/filters'
 import { toThousandFilter } from '@/filters'
+import handleClipboard from '@/utils/clipboard'
 import { load } from '../../purchase/__tests__/loadComponent'
 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/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/shop', () => ({ deleteApproachOrder: jest.fn() }))
 jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
 jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
+jest.mock('@/utils/clipboard', () => jest.fn())
 jest.mock('@/utils/usersInfo', () => ({ userName: () => 'OPERATOR', userEmail: () => 'operator@example.test', baseData: () => ({ COUNTRY_ID: 'C1' }), loginTimestamp: () => 'session' }))
 jest.mock('@/utils/usersInfo', () => ({ userName: () => 'OPERATOR', userEmail: () => 'operator@example.test', baseData: () => ({ COUNTRY_ID: 'C1' }), loginTimestamp: () => 'session' }))
 jest.mock('vue-paystack', () => ({
 jest.mock('vue-paystack', () => ({
   name: 'Paystack',
   name: 'Paystack',
@@ -129,6 +131,50 @@ it.each([['guest', '/signup', 299900, 20923.26], ['member', '/dashboard/member-w
   expect(flow.product.taxAmount).toBe(tax)
   expect(flow.product.taxAmount).toBe(tax)
 })
 })
 
 
+it('keeps the country selector read-only while open and still selects the country', async() => {
+  const { root, entry } = await mount('/signup')
+  const input = root.$el.querySelector('#ng-signup-SignupPagevue-0')
+  input.click()
+  await settle()
+  expect(input.readOnly).toBe(true)
+  expect(input.getAttribute('autocomplete')).toBe('ng-registration')
+  Array.from(document.body.querySelectorAll('.el-select-dropdown__item')).find(item => item.textContent.trim() === 'Nigeria').click()
+  await settle()
+  expect(entry.$refs.flow.form.countryId).toBe('620699181539139625')
+  expect(user.fetchGuestDec).toHaveBeenCalledWith({ countryId: '620699181539139625' })
+})
+
+it.each(['/signup', '/dashboard/member-welcome-pack'])('suppresses saved-person autofill throughout %s while retaining new-password semantics and editing', async route => {
+  const { root, entry } = await mount(route)
+  if (route === '/signup') await chooseGuestCountry(root)
+  expect(root.$el.querySelector('form').getAttribute('autocomplete')).toBe('off')
+  const fields = root.$el.querySelector('.ng-welcome-fields')
+  for (const input of fields.querySelectorAll('input:not([type="radio"]), textarea')) {
+    if (input.closest('.el-cascader')) {
+      expect(input.readOnly).toBe(true)
+    } else {
+      expect(input.getAttribute('autocomplete')).toBe(input.type === 'password' ? 'new-password' : 'ng-registration')
+    }
+  }
+  const flow = entry.$refs.flow
+  for (const [id, key, value] of [
+    ['realName', 'realName', 'New member'], ['email', 'email', 'new-member@example.test'],
+    ['address', 'address', 'Sample street'], ['city', 'cityName', 'Sample city'],
+    ['district', 'lgaName', 'Sample district'], ['consignee', 'consignee', 'Sample recipient']
+  ]) {
+    const input = fields.querySelector('#ng-welcome-' + id)
+    input.value = value
+    input.dispatchEvent(new Event('input', { bubbles: true }))
+    await settle()
+    expect(flow.form[key]).toBe(value)
+  }
+  const password = fields.querySelector('#ng-welcome-password')
+  password.closest('.el-input').querySelector('.el-icon-view').click()
+  await settle()
+  expect(password.type).toBe('text')
+  expect(password.getAttribute('autocomplete')).toBe('new-password')
+})
+
 it('recreates the flow when changing modes and ignores a late guest payment callback', async() => {
 it('recreates the flow when changing modes and ignores a late guest payment callback', async() => {
   const { root, router, entry } = await mount('/signup?ref=INVITER')
   const { root, router, entry } = await mount('/signup?ref=INVITER')
   await chooseGuestCountry(root)
   await chooseGuestCountry(root)
@@ -191,7 +237,7 @@ it('keeps member navigation blocked while payment is active and uses the shared
   expect(entry.$refs.flow.form.countryId).toBe('')
   expect(entry.$refs.flow.form.countryId).toBe('')
 })
 })
 
 
-it('continues guest payment through accessCode and returns to login with the original query', async() => {
+it('shows the submitted Member ID after guest payment, copies it and returns to login on confirmation', async() => {
   const { root, router, entry } = await mount('/signup?ref=INVITER&redirect=/dashboard/repeat-purchase')
   const { root, router, entry } = await mount('/signup?ref=INVITER&redirect=/dashboard/repeat-purchase')
   await chooseGuestCountry(root)
   await chooseGuestCountry(root)
   const flow = entry.$refs.flow
   const flow = entry.$refs.flow
@@ -214,6 +260,22 @@ it('continues guest payment through accessCode and returns to login with the ori
   expect(resume).toHaveBeenCalledWith('guest-access', expect.objectContaining({ onSuccess: expect.any(Function) }))
   expect(resume).toHaveBeenCalledWith('guest-access', expect.objectContaining({ onSuccess: expect.any(Function) }))
   resume.mock.calls[0][1].onSuccess({ reference: 'guest-reference' })
   resume.mock.calls[0][1].onSuccess({ reference: 'guest-reference' })
   await settle()
   await settle()
+  expect(router.currentRoute.path).toBe('/signup')
+  const success = document.body.querySelector('.ng-signup-success')
+  expect(success).not.toBeNull()
+  expect(success.textContent).toContain('Payment Successful')
+  expect(success.querySelector('.ng-signup-success-member-id').textContent).toBe('GUEST-NEW')
+  expect(success.textContent).not.toContain('OPERATOR')
+  expect(success.textContent).not.toContain('INVITER')
+  success.querySelector('.ng-signup-success-copy').click()
+  expect(handleClipboard).toHaveBeenCalledWith('GUEST-NEW', expect.any(MouseEvent))
+  const dialog = descendants(flow).find(child => child.$options.name === 'RegistrationSuccessDialog')
+  const elementDialog = descendants(dialog).find(child => child.$options.name === 'ElDialog')
+  expect(elementDialog.closeOnClickModal).toBe(false)
+  expect(elementDialog.closeOnPressEscape).toBe(false)
+  expect(elementDialog.showClose).toBe(false)
+  success.querySelector('.ng-signup-success-confirm').click()
+  await settle()
   expect(router.currentRoute.path).toBe('/login')
   expect(router.currentRoute.path).toBe('/login')
   expect(router.currentRoute.query).toEqual({ ref: 'INVITER', redirect: '/dashboard/repeat-purchase' })
   expect(router.currentRoute.query).toEqual({ ref: 'INVITER', redirect: '/dashboard/repeat-purchase' })
 })
 })

+ 32 - 6
tests/unit/ui-refactor/signup.spec.js

@@ -503,7 +503,26 @@ describe('Signup welcome-pack compatibility', () => {
     expect(vm.$message).toHaveBeenCalledWith({ message: 'profile.selectLevel', type: 'error' })
     expect(vm.$message).toHaveBeenCalledWith({ message: 'profile.selectLevel', type: 'error' })
   })
   })
 
 
-  it.each([{}, { ref: 'test-inviter', redirect: '/dashboard/repeat-purchase' }])('returns to login immediately after the matching payment callback with query %j and prevents another submission', query => {
+  it('keeps the member ID from the submitted request when the response has no member ID and the form changes', async() => {
+    const vm = instance()
+    vm.draft = { draftId: 'test-draft', accessToken: 'test-only-guest-token' }
+    Object.assign(vm.form, {
+      decLv: 'level', recUserName: 'test-referrer', conUserName: 'test-actual-referrer',
+      payType: 'pay_stack', insertUserName: 'NG-SUBMITTED'
+    })
+    vm.multipleSelection = [{ ID: 'goods', goodsNum: 1, MARKET_PRICE: 120 }]
+    request.mockResolvedValue({ data: { accessCode: 'test-access-code', reference: 'test-reference' }})
+    vm.onSubmit()
+    expect(request.mock.calls[0][0].data.insertUserName).toBe('NG-SUBMITTED')
+    vm.form.insertUserName = 'NG-EDITED'
+    await settle()
+    vm.processPayment({ reference: 'test-reference', memberID: 'IGNORED-CALLBACK-ID' })
+    expect(vm.submittedMemberId).toBe('NG-SUBMITTED')
+    expect(vm.registrationSuccessVisible).toBe(true)
+    expect(vm.$router.replace).not.toHaveBeenCalled()
+  })
+
+  it.each([{}, { ref: 'test-inviter', redirect: '/dashboard/repeat-purchase' }])('waits for success confirmation before returning to login with query %j and prevents another submission', query => {
     const vm = instance()
     const vm = instance()
     vm.$route.query = query
     vm.$route.query = query
     vm.paymentOrder = { accessCode: 'test-access-code', reference: 'test-reference' }
     vm.paymentOrder = { accessCode: 'test-access-code', reference: 'test-reference' }
@@ -511,16 +530,22 @@ describe('Signup welcome-pack compatibility', () => {
     vm.processPayment({ reference: 'test-reference' })
     vm.processPayment({ reference: 'test-reference' })
     expect(vm.visible).toBe(false)
     expect(vm.visible).toBe(false)
     expect(vm.paymentComplete).toBe(true)
     expect(vm.paymentComplete).toBe(true)
-    expect(vm.$message).toHaveBeenCalledWith({
-      message: 'Payment submitted. Please wait for order confirmation.', type: 'success'
-    })
-    expect(vm.$router.replace).toHaveBeenCalledTimes(1)
-    expect(vm.$router.replace).toHaveBeenCalledWith({ path: '/login', query })
+    expect(vm.registrationSuccessVisible).toBe(true)
+    expect(vm.$router.replace).not.toHaveBeenCalled()
     vm.onSubmit()
     vm.onSubmit()
     jest.advanceTimersByTime(6000)
     jest.advanceTimersByTime(6000)
     expect(request).not.toHaveBeenCalled()
     expect(request).not.toHaveBeenCalled()
     expect(window.location.assign).not.toHaveBeenCalled()
     expect(window.location.assign).not.toHaveBeenCalled()
     expect(vm.$router.push).not.toHaveBeenCalled()
     expect(vm.$router.push).not.toHaveBeenCalled()
+    expect(vm.$router.replace).not.toHaveBeenCalled()
+    vm.confirmRegistration()
+    expect(vm.registrationSuccessVisible).toBe(false)
+    expect(vm.$router.replace).toHaveBeenCalledTimes(1)
+    expect(vm.$router.replace).toHaveBeenCalledWith({ path: '/login', query })
+    vm.processPayment({ reference: 'test-reference' })
+    vm.confirmRegistration()
+    expect(vm.registrationSuccessVisible).toBe(false)
+    expect(vm.$router.replace).toHaveBeenCalledTimes(1)
   })
   })
 
 
   it.each([undefined, { reference: 'different-reference' }])('rejects a callback for a different payment: %s', response => {
   it.each([undefined, { reference: 'different-reference' }])('rejects a callback for a different payment: %s', response => {
@@ -528,6 +553,7 @@ describe('Signup welcome-pack compatibility', () => {
     vm.paymentOrder = { reference: 'test-reference' }
     vm.paymentOrder = { reference: 'test-reference' }
     vm.processPayment(response)
     vm.processPayment(response)
     expect(vm.paymentComplete).toBe(false)
     expect(vm.paymentComplete).toBe(false)
+    expect(vm.registrationSuccessVisible).toBe(false)
     expect(vm.$message.error).toHaveBeenCalledWith('Payment reference does not match the current order.')
     expect(vm.$message.error).toHaveBeenCalledWith('Payment reference does not match the current order.')
     expect(vm.$router.push).not.toHaveBeenCalled()
     expect(vm.$router.push).not.toHaveBeenCalled()
     expect(vm.$router.replace).not.toHaveBeenCalled()
     expect(vm.$router.replace).not.toHaveBeenCalled()