merge: 合入 iteration/august（分销码注册地址按环境配置）

# Conflicts:
#	.gitea/workflows/deploy.yaml

.gitea/workflows/deploy.yaml

@@ -1,9 +1,9 @@
-name: 构建并部署前端到生产环境
+name: 构建并部署前端到测试环境
 
 on:
   push:
     branches:
-      - develop
+      - iteration/8-11
       - dev
       - test
 
@@ -27,7 +27,7 @@ jobs:
       - name: 设置镜像标签
         id: tag
         run: |
-          if [ "${{ github.ref }}" = "refs/heads/develop" ]; then
+          if [ "${{ github.ref }}" = "refs/heads/iteration/8-11" ]; then
             echo "tag=latest" >> $GITHUB_OUTPUT
           elif [ "${{ github.ref }}" = "refs/heads/dev" ]; then
             echo "tag=dev" >> $GITHUB_OUTPUT
@@ -51,8 +51,8 @@ jobs:
           docker push ${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
           docker push ${{ env.IMAGE_NAME }}:${{ github.sha }}
 
-      - name: 部署到本地（仅 develop 分支）
+      - name: 部署到测试环境（仅 iteration/8-11 分支）
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/iteration/8-11'
         run: |
           mkdir -p ${{ env.DEPLOY_DIR }}
 

Dockerfile

@@ -50,7 +50,7 @@ RUN rm -rf /etc/nginx/conf.d/default.conf
 COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
 
 # 从构建阶段复制构建产物（UniApp H5 输出目录）
-COPY --from=builder /build/dist/build/h5 /usr/share/nginx/html/h5
+COPY --from=builder /build/dist/build/h5/ /usr/share/nginx/html/
 
 # 暴露端口
 EXPOSE 80

docker/nginx.conf

@@ -27,16 +27,8 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    location /h5/ {
+    location / {
-        try_files $uri $uri/ /h5/index.html;
+        try_files $uri $uri/ /index.html;
-    }
-
-    location = /h5 {
-        return 301 /h5/;
-    }
-
-    location = / {
-        return 301 /h5/;
     }
 
     location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {

env/.env

@@ -7,6 +7,9 @@ VITE_APP_ENV=development
 # 接口地址
 VITE_API_BASE_URL=https://cmp-api.boss160.cn
 
+# 管理后台地址（代理分销码注册页所在站点）
+VITE_ADMIN_BASE_URL=https://cmp-admin.boss160.cn
+
 # 端口号
 VITE_APP_PORT=9527
 

env/.env.development

@@ -4,6 +4,9 @@ VITE_APP_ENV=development
 # 接口地址
 VITE_API_BASE_URL=https://cmp-api.boss160.cn
 
+# 管理后台地址（代理分销码注册页所在站点）
+VITE_ADMIN_BASE_URL=https://cmp-admin.boss160.cn
+
 # 是否使用代理 (H5开发环境使用代理解决跨域)
 VITE_APP_PROXY=true
 

env/.env.production

@@ -4,6 +4,9 @@ VITE_APP_ENV=production
 # 接口地址
 VITE_API_BASE_URL=https://cmp-api.xm-iot.cn
 
+# 管理后台地址（代理分销码注册页所在站点）
+VITE_ADMIN_BASE_URL=https://cmp-admin.xm-iot.cn
+
 # 是否使用代理 (生产环境不使用代理)
 VITE_APP_PROXY=false
 

env/.env.test

@@ -4,6 +4,9 @@ VITE_APP_ENV=staging
 # 接口地址
 VITE_API_BASE_URL=https://cmp-api.boss160.cn
 
+# 管理后台地址（代理分销码注册页所在站点）
+VITE_ADMIN_BASE_URL=https://cmp-admin.boss160.cn
+
 # 是否使用代理 (测试环境不使用代理)
 VITE_APP_PROXY=false
 

openspec/changes/add-agent-distribution-code/design.md

@@ -0,0 +1,21 @@
+## Context
+
+The Uni-app frontend already obtains the authenticated user through `GET /api/auth/me`. That user includes `user_type` and `shop_id`; `GET /api/admin/shops/{shop_id}` returns the shop's `distribution_code`. The home page currently has an agent-only “提现管理” shortcut, and `src/static/icons/分销码.png` is present as an untracked user-supplied asset.
+
+## Goals / Non-Goals
+
+- Goals: expose a role-restricted shortcut after withdrawal management and show the current shop's distribution code as a scannable QR code.
+- Non-Goals: change backend contracts, generate or rotate distribution codes, or expose another shop's code.
+
+## Decisions
+
+- Use the current authenticated user's `shop_id` from `/api/auth/me`; do not hardcode a shop ID or accept one from the page URL.
+- Fetch the shop record through a typed shop-detail API method and encode the returned `distribution_code` value itself in the QR code.
+- Generate/render the QR code locally with a Uni-app-compatible solution. Do not send distribution codes to a remote QR-generation service.
+- Add a dedicated page, use the supplied icon for the home shortcut, and re-check the current user type on the page so direct navigation does not bypass the agent-only UI.
+- Show a clear unavailable/error state when the account has no `shop_id`, the shop response has no distribution code, or the request fails.
+
+## Risks / Trade-offs
+
+- QR rendering APIs differ across Uni-app targets. Select a local renderer compatible with the project's supported H5 and mini-program builds and verify it in the target runtime.
+- The supplied icon is currently untracked; implementation must preserve and use it without replacing or deleting it.

openspec/changes/add-agent-distribution-code/proposal.md

@@ -0,0 +1,16 @@
+# Change: Add agent distribution code viewing
+
+## Why
+
+Agent accounts need a quick way to share their shop's distribution code. The authenticated user response already provides `shop_id`, and the shop detail endpoint returns `distribution_code`, but the agent home page does not expose or display it.
+
+## What Changes
+
+- Add a “查看我的分销码” shortcut immediately after “提现管理” on the agent home page, visible only when `user_type` is `3`.
+- Add a distribution-code page that uses the current authenticated user's `shop_id` to fetch `/api/admin/shops/{shop_id}` and renders the returned `distribution_code` as a QR code.
+- Reuse the existing `src/static/icons/分销码.png` shortcut icon.
+
+## Impact
+
+- Affected specs: `agent-distribution-code` (new capability)
+- Affected code: `src/pages/agent-system/home/index.vue`, `src/pages/agent-system/distribution-code/index.vue`, `src/pages.json`, and the shop API module; a Uni-app-compatible local QR renderer may require a dependency.

openspec/changes/add-agent-distribution-code/specs/agent-distribution-code/spec.md

@@ -0,0 +1,23 @@
+## ADDED Requirements
+
+### Requirement: Agent users can view their shop distribution code
+
+The authenticated home page SHALL show a “查看我的分销码” shortcut immediately after “提现管理” only when the current user's `user_type` is `3`. The shortcut SHALL use `src/static/icons/分销码.png`. Opening it SHALL use the current user's `shop_id` to retrieve that shop's `distribution_code` from `/api/admin/shops/{shop_id}` and display a QR code encoding that exact value. The code SHALL be generated locally and SHALL NOT be sent to a third-party QR service.
+
+#### Scenario: Agent sees and opens the shortcut
+- **GIVEN** `/api/auth/me` returns a user with `user_type` `3` and a valid `shop_id`
+- **WHEN** the home page displays its quick actions
+- **THEN** “查看我的分销码” appears immediately after “提现管理” with the supplied distribution-code icon
+- **AND** opening it displays the current shop's distribution code as a QR code
+
+#### Scenario: Non-agent does not see the shortcut
+- **GIVEN** `/api/auth/me` returns a user whose `user_type` is not `3`
+- **WHEN** the home page displays its quick actions
+- **THEN** the distribution-code shortcut is not shown
+- **AND** direct navigation to the distribution-code page does not reveal a code
+
+#### Scenario: Shop or distribution code is unavailable
+- **GIVEN** an agent opens the distribution-code page
+- **WHEN** the current account has no `shop_id`, the shop request fails, or the shop has no `distribution_code`
+- **THEN** no QR code is rendered
+- **AND** the page explains that the distribution code is currently unavailable

openspec/changes/add-agent-distribution-code/tasks.md

@@ -0,0 +1,12 @@
+## 1. Proposal Review
+- [x] 1.1 Review and approve this proposal before implementation
+
+## 2. Implementation
+- [x] 2.1 Add a typed shop-detail API method for `/api/admin/shops/{shop_id}` and its `distribution_code` field
+- [x] 2.2 Add a distribution-code page that checks the current user type, fetches the current shop, and renders the code locally as a QR
+- [x] 2.3 Register the page and add the agent-only home shortcut immediately after withdrawal management using the supplied icon
+- [x] 2.4 Handle missing shop/code and request failure states
+
+## 3. Verification
+- [x] 3.1 Run targeted ESLint and type-check; record unrelated existing type-check failures
+- [x] 3.2 Verify role gating, `shop_id` lookup, and QR content mapping, and build H5 and WeChat mini-program targets

openspec/changes/update-agent-distribution-registration-link/proposal.md

@@ -0,0 +1,15 @@
+# Change: Encode agent registration URL in distribution QR code
+
+## Why
+
+The current distribution QR code encodes only the raw distribution code, so scanning it does not open agent registration with the code prefilled. Scanners should open the registration route with the current shop's distribution code in its query string.
+
+## What Changes
+
+- Change the locally generated QR content to an absolute URL composed from `VITE_API_BASE_URL`, `/agent-registration`, and the URL-encoded `distribution_code` query parameter.
+- Keep the existing agent-only access checks, shop lookup, and local QR rendering behavior.
+
+## Impact
+
+- Affected specs: `agent-distribution-code`
+- Affected code: `src/pages/agent-system/distribution-code/index.vue`

openspec/changes/update-agent-distribution-registration-link/specs/agent-distribution-code/spec.md

@@ -0,0 +1,23 @@
+## MODIFIED Requirements
+
+### Requirement: Agent users can view their shop distribution code
+
+The authenticated home page SHALL show a "View my distribution code" shortcut immediately after withdrawal management only when the current user's `user_type` is `3`. The shortcut SHALL use `src/static/icons/分销码.png`. Opening it SHALL use the current user's `shop_id` to retrieve that shop's `distribution_code` from `/api/admin/shops/{shop_id}` and display a QR code encoding the absolute registration URL formed from `VITE_API_BASE_URL`, `/agent-registration`, and the URL-encoded `distribution_code` query parameter. The code SHALL be generated locally and SHALL NOT be sent to a third-party QR service.
+
+#### Scenario: Agent sees and opens the shortcut
+- **GIVEN** `/api/auth/me` returns a user with `user_type` `3` and a valid `shop_id`
+- **WHEN** the home page displays its quick actions
+- **THEN** "View my distribution code" appears immediately after withdrawal management with the supplied distribution-code icon
+- **AND** opening it displays a QR code whose decoded value is `${VITE_API_BASE_URL}/agent-registration?distribution_code=${encodeURIComponent(distribution_code)}`
+
+#### Scenario: Non-agent does not see the shortcut
+- **GIVEN** `/api/auth/me` returns a user whose `user_type` is not `3`
+- **WHEN** the home page displays its quick actions
+- **THEN** the distribution-code shortcut is not shown
+- **AND** direct navigation to the distribution-code page does not reveal a code
+
+#### Scenario: Shop or distribution code is unavailable
+- **GIVEN** an agent opens the distribution-code page
+- **WHEN** the current account has no `shop_id`, the shop request fails, or the shop has no `distribution_code`
+- **THEN** no QR code is rendered
+- **AND** the page explains that the distribution code is currently unavailable

openspec/changes/update-agent-distribution-registration-link/tasks.md

@@ -0,0 +1,10 @@
+## 1. Proposal Review
+- [x] 1.1 Review and approve this proposal before implementation
+
+## 2. Implementation
+- [x] 2.1 Build the registration URL from the configured API base URL and URL-encoded distribution code
+- [x] 2.2 Generate the QR code from the registration URL while preserving existing access and error handling
+
+## 3. Verification
+- [x] 3.1 Verify URL composition, including trailing slash handling and query encoding
+- [x] 3.2 Run target-page ESLint, H5 build, and project type-check; record existing unrelated type-check errors

package.json

@@ -91,6 +91,7 @@
     "destr": "^2.0.5",
     "pinia": "2.2.4",
     "pinia-plugin-persistedstate": "4.1.3",
+    "qrcode-generator": "^2.0.4",
     "uview-plus": "^3.7.13",
     "vue": "3.4.21",
     "vue-i18n": "9.1.9",

pnpm-lock.yaml

@@ -74,6 +74,9 @@ importers:
       pinia-plugin-persistedstate:
         specifier: 4.1.3
         version: 4.1.3(pinia@2.2.4(typescript@5.8.3)(vue@3.4.21(typescript@5.8.3)))
+      qrcode-generator:
+        specifier: ^2.0.4
+        version: 2.0.4
       uview-plus:
         specifier: ^3.7.13
         version: 3.7.13
@@ -7304,6 +7307,9 @@ packages:
     resolution: {integrity: sha512-kXuQdQTB6oN3KhI6V4acnBSZx8D2I4xzZvn9+wFLLFCoBNQY/sFnCW6c43OL7pOQ2HvGV4lnWIXNmgfp7cTWhQ==}
     engines: {node: '>=20'}
 
+  qrcode-generator@2.0.4:
+    resolution: {integrity: sha512-mZSiP6RnbHl4xL2Ap5HfkjLnmxfKcPWpWe/c+5XxCuetEenqmNFf1FH/ftXPCtFG5/TDobjsjz6sSNL0Sr8Z9g==}
+
   qrcode-reader@1.0.4:
     resolution: {integrity: sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ==}
 
@@ -18535,6 +18541,8 @@ snapshots:
     dependencies:
       hookified: 1.15.0
 
+  qrcode-generator@2.0.4: {}
+
   qrcode-reader@1.0.4: {}
 
   qrcode-terminal@0.12.0: {}

src/api/shop.ts

@@ -1,16 +1,27 @@
-import { get } from '@/utils/request'
+import { get } from '@/utils/request';
 
 export interface ShopCascadeParams {
-  parent_id?: number
+  parent_id?: number;
-  shop_name?: string
+  shop_name?: string;
 }
 
 export interface ShopCascadeItem {
-  id: number
+  id: number;
-  shop_name: string
+  shop_name: string;
-  has_children: boolean
+  has_children: boolean;
+}
+
+export interface ShopDetail {
+  id: number;
+  shop_name: string;
+  shop_code: string;
+  distribution_code?: string | null;
 }
 
 export function getShopCascade(params?: ShopCascadeParams) {
-  return get<ShopCascadeItem[]>('/api/admin/shops/cascade', { params })
+  return get<ShopCascadeItem[]>('/api/admin/shops/cascade', { params });
+}
+
+export function getShopDetail(shopId: number) {
+  return get<ShopDetail>(`/api/admin/shops/${shopId}`);
 }

src/pages.json

@@ -55,6 +55,14 @@
         "navigationBarTextStyle": "black"
       }
     },
+    {
+      "path": "pages/agent-system/distribution-code/index",
+      "style": {
+        "navigationBarTitleText": "我的分销码",
+        "navigationBarBackgroundColor": "#ffffff",
+        "navigationBarTextStyle": "black"
+      }
+    },
     {
       "path": "pages/agent-system/asset-wallet/index",
       "style": {

src/pages/agent-system/distribution-code/index.vue

@@ -0,0 +1,141 @@
+<template>
+  <view class="bg-page min-h-screen px-4 pt-6 pb-safe">
+    <view class="rounded-16px bg-white px-5 py-6">
+      <text class="mb-6 block text-center text-18px text-[#212121] font-700">
+        我的分销码
+      </text>
+
+      <view v-if="loading && !distributionCode" class="min-h-64 center">
+        <text class="text-14px text-[#999]">
+          正在加载分销码...
+        </text>
+      </view>
+
+      <view v-else-if="errorMessage" class="min-h-64 center flex-col">
+        <text class="text-center text-14px text-[#7a8590]">
+          {{ errorMessage }}
+        </text>
+        <button class="bg-brand mt-4 rounded-8px px-6 py-2 text-14px text-white" @click="loadDistributionCode">
+          重试
+        </button>
+      </view>
+
+      <view v-else-if="distributionCode" class="flex flex-col items-center">
+        <view class="rounded-12px bg-white p-2 shadow-sm">
+          <canvas
+            id="distribution-code-qr"
+            canvas-id="distribution-code-qr"
+            class="qr-canvas"
+            style="width: 240px; height: 240px;"
+          />
+        </view>
+        <text class="mt-4 text-13px text-[#7a8590]">
+          扫描二维码进入代理注册
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import qrcodeGenerator from 'qrcode-generator';
+import { nextTick, onMounted, ref } from 'vue';
+import { getUserInfo } from '@/api/auth';
+import { getShopDetail } from '@/api/shop';
+
+const QR_CANVAS_ID = 'distribution-code-qr';
+const QR_CANVAS_SIZE = 240;
+const QR_QUIET_ZONE = 4;
+
+const loading = ref(true);
+const distributionCode = ref('');
+const errorMessage = ref('');
+
+function getRegistrationUrl(code: string) {
+  const adminBaseUrl = (import.meta.env.VITE_ADMIN_BASE_URL || '').replace(/\/+$/, '');
+  return `${adminBaseUrl}/agent-registration#/agent-registration?distribution_code=${encodeURIComponent(code)}`;
+}
+
+function drawQrCode(value: string) {
+  const qrCode = qrcodeGenerator(0, 'M');
+  qrCode.addData(value);
+  qrCode.make();
+
+  const moduleCount = qrCode.getModuleCount();
+  const moduleSize = QR_CANVAS_SIZE / (moduleCount + QR_QUIET_ZONE * 2);
+  const context = uni.createCanvasContext(QR_CANVAS_ID);
+
+  context.setFillStyle('#ffffff');
+  context.fillRect(0, 0, QR_CANVAS_SIZE, QR_CANVAS_SIZE);
+  context.setFillStyle('#1F2937');
+
+  for (let row = 0; row < moduleCount; row += 1) {
+    for (let column = 0; column < moduleCount; column += 1) {
+      if (qrCode.isDark(row, column)) {
+        context.fillRect(
+          (column + QR_QUIET_ZONE) * moduleSize,
+          (row + QR_QUIET_ZONE) * moduleSize,
+          moduleSize + 0.25,
+          moduleSize + 0.25,
+        );
+      }
+    }
+  }
+
+  context.draw(false);
+}
+
+async function loadDistributionCode() {
+  loading.value = true;
+  distributionCode.value = '';
+  errorMessage.value = '';
+
+  try {
+    const user = await getUserInfo();
+    if (user.user_type !== 3) {
+      errorMessage.value = '当前账号无权查看分销码';
+      return;
+    }
+
+    if (!user.shop_id) {
+      errorMessage.value = '未获取到当前店铺信息，暂无法查看分销码';
+      return;
+    }
+
+    const shop = await getShopDetail(user.shop_id);
+    const code = shop.distribution_code?.trim();
+    if (!code) {
+      errorMessage.value = '当前店铺暂无可用的分销码';
+      return;
+    }
+
+    distributionCode.value = code;
+    await nextTick();
+    drawQrCode(getRegistrationUrl(code));
+  }
+  catch (error) {
+    console.error('加载分销码失败:', error);
+    distributionCode.value = '';
+    errorMessage.value = '分销码加载失败，请稍后重试';
+  }
+  finally {
+    loading.value = false;
+  }
+}
+
+onMounted(() => {
+  void loadDistributionCode();
+});
+</script>
+
+<style scoped>
+.center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.qr-canvas {
+  display: block;
+}
+</style>

src/pages/agent-system/home/index.vue

@@ -142,6 +142,14 @@
               </text>
             </view>
 
+            <!-- 代理端: 查看我的分销码 -->
+            <view v-if="userInfo?.user_type === 3" class="aspect-square flex flex-col items-center justify-center px-1 py-3" @click="navigateTo('/pages/agent-system/distribution-code/index')">
+              <image src="@/static/icons/分销码.png" class="mb-1.5 h-8 w-8 rounded-8px" mode="aspectFit" />
+              <text class="text-12px text-[#212121] font-500">
+                查看我的分销码
+              </text>
+            </view>
+
             <!-- 修改密码 -->
             <view class="aspect-square flex flex-col items-center justify-center px-1 py-3" @click="navigateTo('/pages/agent-system/change-password/index')">
               <image src="@/static/icons/修改密码.png" class="mb-1.5 h-8 w-8 rounded-8px" mode="aspectFit" />

types/components.d.ts

@@ -11,6 +11,8 @@ declare module 'vue' {
     AgentFundSummaryCard: typeof import('./../src/components/AgentFundSummaryCard.vue')['default']
     AgreePrivacy: typeof import('./../src/components/agree-privacy/index.vue')['default']
     LangSelect: typeof import('./../src/components/lang-select/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
     ShopCascadePicker: typeof import('./../src/components/ShopCascadePicker.vue')['default']
     SimplePicker: typeof import('./../src/components/SimplePicker.vue')['default']
     Skeleton: typeof import('./../src/components/Skeleton.vue')['default']

types/env.d.ts

@@ -5,6 +5,8 @@ interface ImportMetaEnv {
   VITE_APP_ENV: string;
   /** 接口地址 */
   VITE_API_BASE_URL: string;
+  /** 管理后台地址（代理分销码注册页所在站点） */
+  VITE_ADMIN_BASE_URL: string;
   /** 端口号 */
   VITE_APP_PORT: string;
   /** h5是否需要配置代理 */

vite.config.ts

@@ -17,9 +17,8 @@ export default defineConfig(({ command, mode }): UserConfig => {
   console.log('环境变量 env -> ', env);
 
   const isBuild = process.env.NODE_ENV === 'production';
-  // const base = ['development', 'test'].includes(mode) ? '/h5/' : '/';
   return {
-    base: '/h5/',
+    base: '/',
     // 自定义env目录
     envDir: './env',
     resolve: {