diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java index 53624a2..3dcaf72 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java @@ -70,7 +70,7 @@ public class WaUserController { private CrmebConfig crmebConfig; private String buildPublicFileUrl(String relativeUrl) { - String domain = StringUtils.defaultString(crmebConfig.getDomain(), "https://lehoo6.com").trim(); + String domain = StringUtils.defaultString(crmebConfig.getDomain(), "https://h5y2c.com").trim(); if (!StringUtils.startsWithAny(domain, "http://", "https://")) { domain = "https://" + domain; } diff --git a/backend/crmeb-front/src/main/resources/application-byhlc112.yml b/backend/crmeb-front/src/main/resources/application-byhlc112.yml index abb5706..ca1f566 100644 --- a/backend/crmeb-front/src/main/resources/application-byhlc112.yml +++ b/backend/crmeb-front/src/main/resources/application-byhlc112.yml @@ -1,6 +1,6 @@ crmeb: - imagePath: /www/wwwroot/lehoo6.com/ # 服务器图片路径配置 斜杠结尾 - domain: lehoo6.com # 当前项目域名，合同/PDF 等公开地址拼接使用 + imagePath: /www/wwwroot/h5y2c.com/ # 服务器图片路径配置 斜杠结尾 + domain: h5y2c.com # 当前项目域名，合同/PDF 等公开地址拼接使用 asyncConfig: true #是否同步config表数据到redis server: diff --git a/deploy/docker/integral-resell/h5.Dockerfile b/deploy/docker/integral-resell/h5.Dockerfile index fc846ec..e67541c 100644 --- a/deploy/docker/integral-resell/h5.Dockerfile +++ b/deploy/docker/integral-resell/h5.Dockerfile @@ -62,32 +62,22 @@ set -eu CONFIG_FILE=/usr/share/nginx/html/static/configs.js -[ -f "$CONFIG_FILE" ] || exit 0 - -escape_sed() { - printf '%s' "$1" | sed 's/[\/&]/\\&/g' +js_escape() { + printf '%s' "$1" | awk '{ gsub(/\\/, "\\\\"); gsub("\047", "\\\047"); printf "%s", $0 }' } -replace_js_string() { - key="$1" - value="$2" - [ -n "$value" ] || return 0 - sed -i -E "s#(${key}:[[:space:]]*)'[^']*'#\1'$(escape_sed "$value")'#" "$CONFIG_FILE" -} +mkdir -p "$(dirname "$CONFIG_FILE")" -replace_js_number() { - key="$1" - value="$2" - [ -n "$value" ] || return 0 - sed -i -E "s#(${key}:[[:space:]]*)[0-9]+#\1${value}#" "$CONFIG_FILE" +cat > "$CONFIG_FILE" < 这套目录结构与 `deploy/docker/step1-integral` 保持一致，按 `czleilei240` 已验证方案复制而来。 > 当前默认域名假设为： -> - 寄卖商城 H5：`lehoo6.com` -> - 寄卖商城后台/API：`admin.lehoo6.com` +> - 寄卖商城 H5：`h5y2c.com` +> - 寄卖商城后台/API：`admin.h5y2c.com` --- @@ -24,11 +24,11 @@ vim .env vim houtai.env # 2. 首次部署：在服务器上确保宿主机目录存在 -mkdir -p /www/wwwroot/lehoo6.com -mkdir -p /www/wwwroot/admin.lehoo6.com/public/upload +mkdir -p /www/wwwroot/h5y2c.com +mkdir -p /www/wwwroot/admin.h5y2c.com/public/upload # 3. 将 H5 静态文件同步到宿主机目录（首次 / 每次前端更新后） -rsync -av integral-resell/h5/ /www/wwwroot/lehoo6.com/ +rsync -av integral-resell/h5/ /www/wwwroot/h5y2c.com/ # 4. 构建并启动，edge-nginx 会在宿主机监听 80/443 docker compose --env-file .env up -d --build @@ -44,15 +44,15 @@ docker compose --env-file .env logs -f integral-houtai | 宿主机路径 | 容器路径 | 用途 | |---|---|---| -| `/www/wwwroot/lehoo6.com` | `/usr/share/nginx/html` | H5 静态文件，手动改 JS 即时生效 | -| `/www/wwwroot/admin.lehoo6.com` | `/app` | webman 后台完整应用目录 | +| `/www/wwwroot/h5y2c.com` | `/usr/share/nginx/html` | H5 静态文件，手动改 JS 即时生效 | +| `/www/wwwroot/admin.h5y2c.com` | `/app` | webman 后台完整应用目录 | | `./houtai.env` | `/app/.env` | 运行时配置，只读挂入 | | `integral-runtime`（named vol）| `/app/runtime` | webman PID、session 等运行时数据 | | 域名 | 用途 | Docker 容器端口 | 宿主机端口 | Docker 入口 | |---|---|---|---|---| -| `lehoo6.com` | 寄卖商城 H5 | integral-h5:80 | **80/443**，直连测试 **18080** | `edge-nginx` | -| `admin.lehoo6.com` | 寄卖商城 API / 后台 | integral-houtai:**8785** | **80/443**，直连测试 **18085** | `edge-nginx` | +| `h5y2c.com` | 寄卖商城 H5 | integral-h5:80 | **80/443**，直连测试 **18080** | `edge-nginx` | +| `admin.h5y2c.com` | 寄卖商城 API / 后台 | integral-houtai:**8785** | **80/443**，直连测试 **18085** | `edge-nginx` | --- @@ -60,8 +60,8 @@ docker compose --env-file .env logs -f integral-houtai | 地址 | 预期 | |------|------| -| `https://lehoo6.com/` | 寄卖商城 H5 首页 | -| `https://admin.lehoo6.com/api/...` | 寄卖商城 API | +| `https://h5y2c.com/` | 寄卖商城 H5 首页 | +| `https://admin.h5y2c.com/api/...` | 寄卖商城 API | | `http://39.97.236.112:18080/` | H5 直连测试 | | `ss -lntp \| grep -E ':(80\|443)'` | 看到 Docker Nginx 监听宿主机 80/443 | @@ -85,8 +85,8 @@ docker compose --env-file .env down -v | 位置 | 值 | |---|---| -| `.env` INTEGRAL_API_PUBLIC_URL | `https://admin.lehoo6.com` | -| `.env` INTEGRAL_H5_PUBLIC_URL | `https://lehoo6.com/` | +| `.env` INTEGRAL_API_PUBLIC_URL | `https://admin.h5y2c.com` | +| `.env` INTEGRAL_H5_PUBLIC_URL | `https://h5y2c.com/` | | `.env` INTEGRAL_APP_STR | `ZFyTNQTWEkCBbyhlc1120529` | | `houtai.env` APP_SECRET | 同上 | | `.env` INTEGRAL_SN_ID | `17533260260529` | @@ -96,4 +96,4 @@ docker compose --env-file .env down -v ## 待确认项 - 短信当前使用阿里云签名 `宝应宏煜春商贸`、模板 `SMS_334545236`，如更换短信账号需同步更新 `houtai.env` -- 如果寄卖后台域名不是 `admin.lehoo6.com`，请统一替换 `.env.example`、README 和入口 Nginx 配置 +- 如果寄卖后台域名不是 `admin.h5y2c.com`，请统一替换 `.env.example`、README 和入口 Nginx 配置 diff --git a/deploy/docker/step1-integral-byhlc112/docker-compose.yml b/deploy/docker/step1-integral-byhlc112/docker-compose.yml index bf2cf57..dc2ef6e 100644 --- a/deploy/docker/step1-integral-byhlc112/docker-compose.yml +++ b/deploy/docker/step1-integral-byhlc112/docker-compose.yml @@ -96,7 +96,7 @@ services: - "443:443" volumes: - ./nginx-edge.conf:/etc/nginx/conf.d/default.conf:ro - - ../ssl-cert/lehoo6.com_cert/nginx:/etc/nginx/ssl/lehoo6.com_cert:ro + - ../ssl-cert/h5y2c.com_cert/nginx:/etc/nginx/ssl/h5y2c.com_cert:ro depends_on: - integral-h5 - integral-houtai diff --git a/deploy/docker/step1-integral-byhlc112/nginx-edge.conf b/deploy/docker/step1-integral-byhlc112/nginx-edge.conf index d08d3fe..686c10a 100644 --- a/deploy/docker/step1-integral-byhlc112/nginx-edge.conf +++ b/deploy/docker/step1-integral-byhlc112/nginx-edge.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name lehoo6.com admin.lehoo6.com jf.lehoo6.com jfadmin.lehoo6.com; + server_name h5y2c.com admin.h5y2c.com jf.h5y2c.com jfadmin.h5y2c.com; return 301 https://$host$request_uri; } @@ -8,10 +8,10 @@ server { server { listen 443 ssl; http2 on; - server_name jf.lehoo6.com; + server_name jf.h5y2c.com; - ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem; - ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key; + ssl_certificate /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.pem; + ssl_certificate_key /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_session_cache shared:SSL:10m; @@ -32,10 +32,10 @@ server { server { listen 443 ssl; http2 on; - server_name jfadmin.lehoo6.com; + server_name jfadmin.h5y2c.com; - ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem; - ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key; + ssl_certificate /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.pem; + ssl_certificate_key /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_session_cache shared:SSL:10m; @@ -56,10 +56,10 @@ server { server { listen 443 ssl; http2 on; - server_name lehoo6.com; + server_name h5y2c.com; - ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem; - ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key; + ssl_certificate /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.pem; + ssl_certificate_key /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_session_cache shared:SSL:10m; @@ -80,10 +80,10 @@ server { server { listen 443 ssl; http2 on; - server_name admin.lehoo6.com; + server_name admin.h5y2c.com; - ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem; - ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key; + ssl_certificate /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.pem; + ssl_certificate_key /etc/nginx/ssl/h5y2c.com_cert/h5y2c.com.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_session_cache shared:SSL:10m; diff --git a/deploy/docker/step2-single-shop-byhlc112/.env.example b/deploy/docker/step2-single-shop-byhlc112/.env.example index 887c9e4..2f9a92e 100644 --- a/deploy/docker/step2-single-shop-byhlc112/.env.example +++ b/deploy/docker/step2-single-shop-byhlc112/.env.example @@ -28,13 +28,13 @@ SINGLE_FRONT_LOG_DIR=/www/wwwroot/javaapi/logs/front SINGLE_ADMIN_LOG_DIR=/www/wwwroot/javaapi/logs/admin # ---------- 图片/PDF 目录（与步骤一 H5 Nginx 共享宿主机路径） ---------- -CRMEB_IMAGE_DIR=/www/wwwroot/lehoo6.com +CRMEB_IMAGE_DIR=/www/wwwroot/h5y2c.com # ---------- 前端静态目录（bind-mount，rsync 更新后立即生效） ---------- -# 积分商城 H5（uni-app SPA），对应域名 jf.lehoo6.com -SINGLE_H5_DIR=/www/wwwroot/jf.lehoo6.com -# 积分商城管理后台（Vue SPA），对应域名 jfadmin.lehoo6.com -SINGLE_ADMIN_WEB_DIR=/www/wwwroot/jfadmin.lehoo6.com +# 积分商城 H5（uni-app SPA），对应域名 jf.h5y2c.com +SINGLE_H5_DIR=/www/wwwroot/jf.h5y2c.com +# 积分商城管理后台（Vue SPA），对应域名 jfadmin.h5y2c.com +SINGLE_ADMIN_WEB_DIR=/www/wwwroot/jfadmin.h5y2c.com # ---------- 宿主机暴露端口（供宝塔 Nginx 反代） ---------- SINGLE_ADMIN_PORT=18081 diff --git a/deploy/docker/step2-single-shop-byhlc112/README.md b/deploy/docker/step2-single-shop-byhlc112/README.md index 80d5602..33b6ac0 100644 --- a/deploy/docker/step2-single-shop-byhlc112/README.md +++ b/deploy/docker/step2-single-shop-byhlc112/README.md @@ -8,8 +8,8 @@ > 这套方案参考 `deploy/docker/step2-single-shop`，按 `czleilei240` 已验证结构复制。 > 当前默认域名假设为： -> - 积分商城 H5：`jf.lehoo6.com` -> - 积分商城管理后台：`jfadmin.lehoo6.com` +> - 积分商城 H5：`jf.h5y2c.com` +> - 积分商城管理后台：`jfadmin.h5y2c.com` --- @@ -28,21 +28,21 @@ scp single-shop-22/backend/crmeb-admin/target/miao-admin-2.2.jar root@39.97.236 ### 2. 前端静态文件 ```bash -mkdir -p /www/wwwroot/jf.lehoo6.com +mkdir -p /www/wwwroot/jf.h5y2c.com rsync -a --delete single-shop-22/single_uniapp22miao/unpackage/dist/build/web/ \ - root@39.97.236.112:/www/wwwroot/jf.lehoo6.com/ -chmod -R 755 /www/wwwroot/jf.lehoo6.com/ + root@39.97.236.112:/www/wwwroot/jf.h5y2c.com/ +chmod -R 755 /www/wwwroot/jf.h5y2c.com/ -mkdir -p /www/wwwroot/jfadmin.lehoo6.com +mkdir -p /www/wwwroot/jfadmin.h5y2c.com rsync -a --delete single-shop-22/backend-adminend/dist/ \ - root@39.97.236.112:/www/wwwroot/jfadmin.lehoo6.com/ -chmod -R 755 /www/wwwroot/jfadmin.lehoo6.com/ + root@39.97.236.112:/www/wwwroot/jfadmin.h5y2c.com/ +chmod -R 755 /www/wwwroot/jfadmin.h5y2c.com/ ``` ### 3. 图片/PDF 目录 ```bash -mkdir -p /www/wwwroot/lehoo6.com +mkdir -p /www/wwwroot/h5y2c.com ``` --- @@ -69,12 +69,12 @@ docker compose --env-file .env logs -f single-admin-api | 域名 | 用途 | 宿主机端口 | |---|---|---| -| `jf.lehoo6.com` | 积分商城 H5（uni-app） | **18082** | -| `jfadmin.lehoo6.com` | 积分商城管理后台（Vue） | **18081** | +| `jf.h5y2c.com` | 积分商城 H5（uni-app） | **18082** | +| `jfadmin.h5y2c.com` | 积分商城管理后台（Vue） | **18081** | > Spring Boot API 端口（30032 / 30033）仅容器内监听，不对外暴露。 > 宝塔 Nginx 通过域名反代到 `127.0.0.1:18081 / 18082`，再由容器内 Nginx 转发到 API。 -> 图片/PDF 实际落盘路径为宿主机 `/www/wwwroot/lehoo6.com/crmebimage/public/...`。 +> 图片/PDF 实际落盘路径为宿主机 `/www/wwwroot/h5y2c.com/crmebimage/public/...`。 --- @@ -82,8 +82,8 @@ docker compose --env-file .env logs -f single-admin-api | 地址 | 预期 | |------|------| -| `https://jf.lehoo6.com/` | 积分商城 H5 | -| `https://jfadmin.lehoo6.com/` | 积分商城管理后台 | +| `https://jf.h5y2c.com/` | 积分商城 H5 | +| `https://jfadmin.h5y2c.com/` | 积分商城管理后台 | | `http://39.97.236.112:18082/` | H5 直连测试 | | `http://39.97.236.112:18081/` | 管理后台直连测试 | @@ -97,9 +97,9 @@ docker compose --env-file .env logs -f single-admin-api | `/www/wwwroot/javaapi/miao-admin-2.2.jar` | `/app/app.jar` | 管理端 API JAR | | `/www/wwwroot/javaapi/logs/front/` | `/app/log` | 用户端 API 日志 | | `/www/wwwroot/javaapi/logs/admin/` | `/app/log` | 管理端 API 日志 | -| `/www/wwwroot/lehoo6.com/` | `/usr/local/crmeb/` | 图片/PDF 写入目录 | -| `/www/wwwroot/jf.lehoo6.com/` | `/usr/share/nginx/html` | H5 静态文件 | -| `/www/wwwroot/jfadmin.lehoo6.com/` | `/usr/share/nginx/html` | 管理后台静态文件 | +| `/www/wwwroot/h5y2c.com/` | `/usr/local/crmeb/` | 图片/PDF 写入目录 | +| `/www/wwwroot/jf.h5y2c.com/` | `/usr/share/nginx/html` | H5 静态文件 | +| `/www/wwwroot/jfadmin.h5y2c.com/` | `/usr/share/nginx/html` | 管理后台静态文件 | | `../single-shop/application-docker.yml` | `/config/application-docker.yml` | Spring Boot 配置 | --- @@ -110,7 +110,7 @@ docker compose --env-file .env logs -f single-admin-api |---|---| | RDS Host | `rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com` | | DB / User | `byhlc112` / `yangtangyoupin` | -| imagePath 宿主机目录 | `/www/wwwroot/lehoo6.com/` | +| imagePath 宿主机目录 | `/www/wwwroot/h5y2c.com/` | | SYNC_SOURCE_ID | `shop_16` | | SYNC_TARGET_MER_ID | `16` | | Spring profile | `docker`（通过 `application-docker.yml` 注入） | @@ -119,5 +119,5 @@ docker compose --env-file .env logs -f single-admin-api ## 待确认项 -- 如果积分管理后台域名不是 `jfadmin.lehoo6.com`，需要同步替换 `.env.example`、README 和宝塔 Nginx 配置 +- 如果积分管理后台域名不是 `jfadmin.h5y2c.com`，需要同步替换 `.env.example`、README 和宝塔 Nginx 配置 - Redis 仍按 Docker 内置实例方案生成；若你想接外部 Redis，可以再帮你补一版外部 Redis 配置 diff --git a/deploy/ssl/h5y2c.com_cert.zip b/deploy/ssl/h5y2c.com_cert.zip new file mode 100644 index 0000000..c5096fc Binary files /dev/null and b/deploy/ssl/h5y2c.com_cert.zip differ diff --git a/deploy/ssl/lehoo6.com_cert.zip b/deploy/ssl/lehoo6.com_cert.zip new file mode 100644 index 0000000..ebc511a Binary files /dev/null and b/deploy/ssl/lehoo6.com_cert.zip differ diff --git a/docs/com-byhlc112.md b/docs/com-byhlc112.md index 7b59111..9b47f35 100644 --- a/docs/com-byhlc112.md +++ b/docs/com-byhlc112.md @@ -20,13 +20,13 @@ - 1. profile: byhlc112 - 2. profile file: application-byhlc112.yml, mysql连接信息修改，redis主机ip修改。 - 3. **PDF合同模板文件路径**：pdf/sign_contract_byhlc112.pdf -- 4. 用户PDF合同url地址前缀/落库域名：https://lehoo6.com/ -- 5. imagePath: /www/wwwroot/lehoo6.com/ +- 4. 用户PDF合同url地址前缀/落库域名：https://h5y2c.com/ +- 5. imagePath: /www/wwwroot/h5y2c.com/ ### uniapp前端配置变更 -- 1. 积分商城domain：https://jf.lehoo6.com -- 2. 抢购页面跳转地址：https://lehoo6.com +- 1. 积分商城domain：https://jf.h5y2c.com +- 2. 抢购页面跳转地址：https://h5y2c.com - 3. **PDF合同预览文件路径**： /static/sign_contract_byhlc112.pdf @@ -39,8 +39,8 @@ ### 积分商城后台backend-adminend配置变更 -- 1. backend-adminend/.env.development文件中VUE_APP_BASE_API改为https://jf.lehoo6.com -- 2. backend-adminend/.env.production文件中VUE_APP_BASE_API改为https://jf.lehoo6.com +- 1. backend-adminend/.env.development文件中VUE_APP_BASE_API改为https://jf.h5y2c.com +- 2. backend-adminend/.env.production文件中VUE_APP_BASE_API改为https://jf.h5y2c.com --- @@ -56,4 +56,4 @@ nohup java -Xms128m -Xmx256m -jar miao-front-2.2.jar > front.log & tail -f front 、、、启动积分商城后台api服务 cd /www/wwwroot/javaapi nohup java -Xms128m -Xmx256m -jar miao-admin-2.2.jar > admin.log & tail -f admin.log -、、、 \ No newline at end of file +、、、 diff --git a/outputs/screenshot_process_table/build_process_excel.py b/outputs/screenshot_process_table/build_process_excel.py new file mode 100644 index 0000000..ccffba1 --- /dev/null +++ b/outputs/screenshot_process_table/build_process_excel.py @@ -0,0 +1,68 @@ +from openpyxl import Workbook, load_workbook +from openpyxl.styles import Alignment, Border, Font, PatternFill, Side +from openpyxl.utils import get_column_letter + + +OUTPUT = "outputs/screenshot_process_table/小程序上线流程表.xlsx" + +headers = ["阶段", "任务", "产出物", "负责人", "建议时长"] +rows = [ + ["需求与原型", "需求澄清、功能清单、原型评审", "PRD、原型图", "产品", "2~3天"], + ["UI设计", "界面设计、切图标注", "设计稿、切图", "UI", "3~4天"], + ["开发", "前端+后端联调、自测", "代码包", "前端/后端", "6~8天"], + ["测试与修复", "功能测试、兼容性、回归", "测试报告", "测试", "3~4天"], + ["小程序提审", "提交代码、填写审核信息", "审核中", "产品/运营", "1~7天（官方不等）"], + ["发布上线", "审核通过后全量/灰度发布", "线上版本", "产品/运营", "1天"], +] + +wb = Workbook() +ws = wb.active +ws.title = "流程表" + +ws.append(headers) +for row in rows: + ws.append(row) + +header_fill = PatternFill("solid", fgColor="F3F6FA") +grid = Side(style="thin", color="D9DEE7") +border = Border(bottom=grid) + +for cell in ws[1]: + cell.font = Font(name="Arial", bold=True, size=12, color="111827") + cell.fill = header_fill + cell.alignment = Alignment(horizontal="left", vertical="center") + cell.border = border + +for row in ws.iter_rows(min_row=2, max_row=ws.max_row): + for cell in row: + cell.font = Font(name="Arial", size=11, color="111827") + cell.alignment = Alignment(horizontal="left", vertical="center", wrap_text=True) + cell.border = border + +widths = { + "A": 16, + "B": 34, + "C": 22, + "D": 16, + "E": 22, +} + +for col, width in widths.items(): + ws.column_dimensions[col].width = width + +for row_idx in range(1, ws.max_row + 1): + ws.row_dimensions[row_idx].height = 28 + +ws.freeze_panes = "A2" +ws.auto_filter.ref = f"A1:{get_column_letter(ws.max_column)}{ws.max_row}" + +wb.save(OUTPUT) + +check = load_workbook(OUTPUT) +sheet = check["流程表"] +assert sheet.max_row == 7 +assert sheet.max_column == 5 +assert sheet["A2"].value == "需求与原型" +assert sheet["E6"].value == "1~7天（官方不等）" + +print(OUTPUT) diff --git a/single_uniapp22miao/config/app.js b/single_uniapp22miao/config/app.js index c2a690b..d09ed12 100644 --- a/single_uniapp22miao/config/app.js +++ b/single_uniapp22miao/config/app.js @@ -7,7 +7,7 @@ // let domain = 'https://jf.wenjinhui.com' // let domain = 'https://jjy-jf.fwxgpt.com' // byhlc112 项目 -let domain = 'https://jf.lehoo6.com' +let domain = 'https://jf.h5y2c.com' // let domain = 'https://jf.jinyawen.com' // let domain = 'https://jf.hapengran.com' // let domain = 'https://jjy-jf.uj345.com' @@ -19,7 +19,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'https://jf.lehoo6.com', + HTTP_H5_URL: 'https://jf.h5y2c.com', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/single_uniapp22miao/pages/integral/points.vue b/single_uniapp22miao/pages/integral/points.vue index 987c4d7..5ce9d2a 100644 --- a/single_uniapp22miao/pages/integral/points.vue +++ b/single_uniapp22miao/pages/integral/points.vue @@ -343,12 +343,12 @@ export default { // window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index' //window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index' // window.location.href = 'https://xiashengjun.com/?#/pages/personal/index' - window.location.href = 'https://lehoo6.com/?#/pages/personal/index' + window.location.href = 'https://h5y2c.com/?#/pages/personal/index' // window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index' // #endif // #ifndef H5 uni.navigateTo({ - url: '/pages/web-view/index?url=' + encodeURIComponent('https://lehoo6.com/?#/pages/personal/index') + url: '/pages/web-view/index?url=' + encodeURIComponent('https://h5y2c.com/?#/pages/personal/index') }) // #endif }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign.vue b/single_uniapp22miao/pages/sub-pages/webview/sign.vue index 51af743..4c03543 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign.vue @@ -364,7 +364,7 @@ export default { // window.location.href = 'https://shop.wenjinhui.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://anyue.szxingming.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') - window.location.href = 'https://lehoo6.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') + window.location.href = 'https://h5y2c.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://shop.uj345.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') }, 1000) // 返回签名信息给上一页面