dct 1 rok temu
rodzic
commit
08fba2bbd3
11 zmienionych plików z 837 dodań i 342 usunięć
  1. 104 104
      CHANGELOG.md
  2. 1 1
      package.json
  3. 174 174
      public/update.html
  4. 2 2
      src/api/login.js
  5. 1 1
      src/api/managerUser.js
  6. 4 4
      src/globalData.js
  7. 42 36
      src/permission.js
  8. 497 14
      src/router/index.js
  9. 5 5
      src/store/index.js
  10. 1 1
      src/utils/request.js
  11. 6 0
      vite.config.js

+ 104 - 104
CHANGELOG.md

@@ -1,192 +1,192 @@
-## [1.0.8](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.7...1.0.8) (2021-09-29)
+## [1.0.8](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.7...1.0.8) (2021-09-29)
 
 
 ### Bug Fixes
 
-* 修复总代流水记录操作人显示 ([121f269](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/121f2692d6532e643c1c90d2a0076f3a907d07c9))
-* 总代 订单/商户页面新增查询字段 ([9c18355](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9c18355494a048d50ef253d7badbc0c960805afe))
-* 总代流水记录新增操作人字段 ([b681738](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b6817381643418c46c78c1ec213881cd81e09cf7))
+* 修复总代流水记录操作人显示 ([121f269](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/121f2692d6532e643c1c90d2a0076f3a907d07c9))
+* 总代 订单/商户页面新增查询字段 ([9c18355](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9c18355494a048d50ef253d7badbc0c960805afe))
+* 总代流水记录新增操作人字段 ([b681738](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b6817381643418c46c78c1ec213881cd81e09cf7))
 
 
 ### Features
 
-* 产品分销/价格码,新增两个状态 ([275c763](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/275c763dd913ff3462bb926922a5e94c5b53cf27))
-* 价格码选择组件列表获取接口,参数修改为包含自营商户 ([ba63f1e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ba63f1edf3f0b5c8e1e82ba04bb0c33bba7cff00))
-* 取现 替换成 冲账&&总代流水记录新增操作人 ([68d013a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/68d013a1862115c351aaf708af37f491ef55e0a7))
-* **商户:** 修改价格码上下架按钮显示逻辑 ([b7c6ec6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b7c6ec6a051fe25b20605c68b6ef5a3aaa273b4f))
-* 商户订单新增查询字段 ([1d70b9d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1d70b9dd2c4c7be95bcef5d7263fba6edbcd6b07))
+* 产品分销/价格码,新增两个状态 ([275c763](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/275c763dd913ff3462bb926922a5e94c5b53cf27))
+* 价格码选择组件列表获取接口,参数修改为包含自营商户 ([ba63f1e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ba63f1edf3f0b5c8e1e82ba04bb0c33bba7cff00))
+* 取现 替换成 冲账&&总代流水记录新增操作人 ([68d013a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/68d013a1862115c351aaf708af37f491ef55e0a7))
+* **商户:** 修改价格码上下架按钮显示逻辑 ([b7c6ec6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b7c6ec6a051fe25b20605c68b6ef5a3aaa273b4f))
+* 商户订单新增查询字段 ([1d70b9d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1d70b9dd2c4c7be95bcef5d7263fba6edbcd6b07))
 
 
 
-## [1.0.7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.6...1.0.7) (2021-09-27)
+## [1.0.7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.6...1.0.7) (2021-09-27)
 
 
 ### Bug Fixes
 
-* 修复密码修改弹框显示bug ([a7883fc](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a7883fc51f74ec3106f625d8e41d6acacead225c))
-* 字段 总代平台 景区核销统计 查询条件修改 ([7ddd243](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7ddd243878dbb9e7a869c950bd40fd365b3a5266))
-* **总代:** 修复订单查询日期格式问题 ([4d8829d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4d8829d8c4b97cda7b2f6bf333b0a2d54ec8a1f7))
+* 修复密码修改弹框显示bug ([a7883fc](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a7883fc51f74ec3106f625d8e41d6acacead225c))
+* 字段 总代平台 景区核销统计 查询条件修改 ([7ddd243](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7ddd243878dbb9e7a869c950bd40fd365b3a5266))
+* **总代:** 修复订单查询日期格式问题 ([4d8829d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4d8829d8c4b97cda7b2f6bf333b0a2d54ec8a1f7))
 
 
 ### Features
 
-* 修改商户选择组件列表获取接口 ([3c0cfc6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/3c0cfc614e6d632bde14d1cf2f01c1633346ad83))
-* 商户、景点代理,订单列表新增查看景点订单 ([1795bb0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1795bb048ce22c33ac95365a84086dcac43d27c9))
-* 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改 ([9878c4d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9878c4d9060308e8ac250aa7f6233b479cc7551d))
-* 总代新增角色和权限管理 ([cebc1f1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/cebc1f117bdaf1f54e93b9c95867348aa8ec1598))
-* 景点总代 流水记录新增订单详情 ([1c06e13](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1c06e13b88534bbd4b5a85bdb073012152521bd0))
-* 流水记录新增原始流水详情 列表展示优化 ([6613b94](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6613b9452f346e05d274c2bc7646a424959d74dd))
-* 订单查询时间默认值设置为当前一周时间 ([0a91f13](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/0a91f13abaf0660b9e16d4eb76b5cd497ad04398))
+* 修改商户选择组件列表获取接口 ([3c0cfc6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/3c0cfc614e6d632bde14d1cf2f01c1633346ad83))
+* 商户、景点代理,订单列表新增查看景点订单 ([1795bb0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1795bb048ce22c33ac95365a84086dcac43d27c9))
+* 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改 ([9878c4d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9878c4d9060308e8ac250aa7f6233b479cc7551d))
+* 总代新增角色和权限管理 ([cebc1f1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/cebc1f117bdaf1f54e93b9c95867348aa8ec1598))
+* 景点总代 流水记录新增订单详情 ([1c06e13](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1c06e13b88534bbd4b5a85bdb073012152521bd0))
+* 流水记录新增原始流水详情 列表展示优化 ([6613b94](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6613b9452f346e05d274c2bc7646a424959d74dd))
+* 订单查询时间默认值设置为当前一周时间 ([0a91f13](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/0a91f13abaf0660b9e16d4eb76b5cd497ad04398))
 
 
 ### Reverts
 
-* Revert "feat: 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改" ([61a00c0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/61a00c0d332f83f5fc496428d63a269ad2bfa608))
+* Revert "feat: 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改" ([61a00c0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/61a00c0d332f83f5fc496428d63a269ad2bfa608))
 
 
 
-## [1.0.6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.5...1.0.6) (2021-09-20)
+## [1.0.6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.5...1.0.6) (2021-09-20)
 
 
 ### Features
 
-* **商户:** 文案修改 ([98fcdbb](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/98fcdbb56c2b924a26c79a119524226b317fc722))
-* **总代:** 商户列表新增冻结金额显示 ([51f06d2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/51f06d270a994f48e9152addc6b4ee3afcd17237))
-* **总代:** 订单查询条件新增订单号、票号;文案修改 ([8864522](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/8864522ebba8a7e895a825a9b29338c33410733f))
+* **商户:** 文案修改 ([98fcdbb](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/98fcdbb56c2b924a26c79a119524226b317fc722))
+* **总代:** 商户列表新增冻结金额显示 ([51f06d2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/51f06d270a994f48e9152addc6b4ee3afcd17237))
+* **总代:** 订单查询条件新增订单号、票号;文案修改 ([8864522](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/8864522ebba8a7e895a825a9b29338c33410733f))
 
 
 
-## [1.0.5](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.4...1.0.5) (2021-09-18)
+## [1.0.5](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.4...1.0.5) (2021-09-18)
 
 
 ### Bug Fixes
 
-* bug fix ([6cc5c48](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6cc5c48103bf8a4b6dc6252d94263aa350195af5))
-* 商户平台 价格码新增批量删除 ([fd40dea](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/fd40dea370e934c6be30b89340b6e465ab66c418))
-* 导航栏新增用户名显示 ([c17eaa7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c17eaa737f3f7fb3dd782cfd4f2c27c866bf3e94))
-* 总代-修改挂账额度 bug fix ([1f269cf](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1f269cf928f4faf698f9f09637eb4958ddd0cccd))
-* 景点代理产品页面 新增展示 补充检索条件 追加全选功能 ([d5913a9](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d5913a9e8cd4df6841fdc3206d31af42680df10e))
+* bug fix ([6cc5c48](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6cc5c48103bf8a4b6dc6252d94263aa350195af5))
+* 商户平台 价格码新增批量删除 ([fd40dea](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/fd40dea370e934c6be30b89340b6e465ab66c418))
+* 导航栏新增用户名显示 ([c17eaa7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c17eaa737f3f7fb3dd782cfd4f2c27c866bf3e94))
+* 总代-修改挂账额度 bug fix ([1f269cf](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1f269cf928f4faf698f9f09637eb4958ddd0cccd))
+* 景点代理产品页面 新增展示 补充检索条件 追加全选功能 ([d5913a9](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d5913a9e8cd4df6841fdc3206d31af42680df10e))
 
 
 ### Features
 
-* 产品新增商品添加搜索功能 ([c4c8568](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c4c85688451871fc7106b2286ccb24c5555c3951))
-* 商户&景区代理 可修改当前用户密码 ([d269fa1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d269fa12076d893c6ae8d355df710f2a6871f787))
-* 商户产品,创建时新增价格码显示 ([91d574f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/91d574f8942569c19ba7649e480601f3d591800a))
-* 新增 商户和景区代理的流水记录 ([a610252](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a6102521f2962185607f673c8a8bb1898329559b))
-* 新增产品创建时新增价格码显示 ([7804017](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/780401722fb7e575d21c6efe6ee4b0e9ddf94b13))
+* 产品新增商品添加搜索功能 ([c4c8568](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c4c85688451871fc7106b2286ccb24c5555c3951))
+* 商户&景区代理 可修改当前用户密码 ([d269fa1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d269fa12076d893c6ae8d355df710f2a6871f787))
+* 商户产品,创建时新增价格码显示 ([91d574f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/91d574f8942569c19ba7649e480601f3d591800a))
+* 新增 商户和景区代理的流水记录 ([a610252](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a6102521f2962185607f673c8a8bb1898329559b))
+* 新增产品创建时新增价格码显示 ([7804017](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/780401722fb7e575d21c6efe6ee4b0e9ddf94b13))
 
 
 
-## [1.0.4](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.3...1.0.4) (2021-09-17)
+## [1.0.4](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.3...1.0.4) (2021-09-17)
 
 
 ### Bug Fixes
 
-* bug fix ([e0990fa](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e0990fab5b7151c1e4a8ea1e78f81960e22d0f81))
-* 产品 自动填入子商品金额,第一个填全部,后面填0 ([b07064f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b07064fa8e15a3c51ca7b5a37136a4ea87e7ba26))
-* 新增展示字段 绑定商户表单优化 ([fa036d8](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/fa036d858f38a16de93776702b62eaa8f93f426c))
+* bug fix ([e0990fa](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e0990fab5b7151c1e4a8ea1e78f81960e22d0f81))
+* 产品 自动填入子商品金额,第一个填全部,后面填0 ([b07064f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b07064fa8e15a3c51ca7b5a37136a4ea87e7ba26))
+* 新增展示字段 绑定商户表单优化 ([fa036d8](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/fa036d858f38a16de93776702b62eaa8f93f426c))
 
 
 ### Features
 
-* 修改商户订单列表筛选状态 ([2041706](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/20417066086401717c6d25bd6224c8ea62fb903d))
-* 分销商创建参数修改 ([b5a5aae](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b5a5aaec0b94382c9981214817c66957b4ff0ec4))
-* 总代-订单列表新增状态筛选 ([b296612](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b296612629de5a22a0fcc45a4ceb38cbf62a0105))
-* 新增总代信息显示页面 ([682b13c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/682b13c6c5da78940c7f9293767e80f0400377d9))
-* 订单列表新增金额显示 ([58b135a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/58b135a62c8c2d6221a5cad3cb0a6a07aa5fffd3))
-* 预订人没有填,自动填入第一个游客信息 ([7784df7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7784df728774f57dce14390f3a68b9a53cf0d963))
+* 修改商户订单列表筛选状态 ([2041706](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/20417066086401717c6d25bd6224c8ea62fb903d))
+* 分销商创建参数修改 ([b5a5aae](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b5a5aaec0b94382c9981214817c66957b4ff0ec4))
+* 总代-订单列表新增状态筛选 ([b296612](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b296612629de5a22a0fcc45a4ceb38cbf62a0105))
+* 新增总代信息显示页面 ([682b13c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/682b13c6c5da78940c7f9293767e80f0400377d9))
+* 订单列表新增金额显示 ([58b135a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/58b135a62c8c2d6221a5cad3cb0a6a07aa5fffd3))
+* 预订人没有填,自动填入第一个游客信息 ([7784df7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7784df728774f57dce14390f3a68b9a53cf0d963))
 
 
 
-## [1.0.3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.2...1.0.3) (2021-09-15)
+## [1.0.3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.2...1.0.3) (2021-09-15)
 
 
 ### Bug Fixes
 
-* 订单页问题修改 ([904181e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/904181efb07d85260f263f238a27c56afdbbf0cb))
+* 订单页问题修改 ([904181e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/904181efb07d85260f263f238a27c56afdbbf0cb))
 
 
 ### Features
 
-* 产品/套票 加入总代筛选 ([89550cc](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/89550cca4f2925697889beb9cfb1aaa4cafd0415))
-* 名称统一 ([62f285f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/62f285f120a91f75f324847a75e87897666de851))
-* 新增订单 门票 统计报表 报表下载 ([4c8f252](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4c8f252cde0046763756a26d0321b7313fe8fb94))
-* 统计报表 分销商售票&核销统计 ([cd97b41](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/cd97b41709604756bdacc50585c44478b8ddf5e0))
-* 统计报表 总代售票&核销统计 ([e2a2f8f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e2a2f8f1b020471a5cfe869f5e0f132702de41ae))
-* 统计报表 景区售票&核销统计 ([68f794f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/68f794fed0d428dd550ca658ff04441b57b01945))
+* 产品/套票 加入总代筛选 ([89550cc](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/89550cca4f2925697889beb9cfb1aaa4cafd0415))
+* 名称统一 ([62f285f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/62f285f120a91f75f324847a75e87897666de851))
+* 新增订单 门票 统计报表 报表下载 ([4c8f252](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4c8f252cde0046763756a26d0321b7313fe8fb94))
+* 统计报表 分销商售票&核销统计 ([cd97b41](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/cd97b41709604756bdacc50585c44478b8ddf5e0))
+* 统计报表 总代售票&核销统计 ([e2a2f8f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e2a2f8f1b020471a5cfe869f5e0f132702de41ae))
+* 统计报表 景区售票&核销统计 ([68f794f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/68f794fed0d428dd550ca658ff04441b57b01945))
 
 
 
-## [1.0.2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.1...1.0.2) (2021-09-13)
+## [1.0.2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.1...1.0.2) (2021-09-13)
 
 
 ### Bug Fixes
 
-* 修复页面跳转问题 ([7ed849c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7ed849cc7903f9855029d567ce6323ac1f2fa428))
-* 去除价格百分比显示 ([c08f226](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c08f226f26bf766a4e79d0c55aed16d972431773))
-* 商户编辑bug fix ([d433a5f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d433a5fbe7c64fcb4c1f9bdc373847ce709cc2c7))
-* **景点代理:** 商品管理新增、编辑添加商户绑定;样式修复 ([9da511e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9da511e3e15cc88cd92578054207ba1c70f43a63))
+* 修复页面跳转问题 ([7ed849c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7ed849cc7903f9855029d567ce6323ac1f2fa428))
+* 去除价格百分比显示 ([c08f226](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c08f226f26bf766a4e79d0c55aed16d972431773))
+* 商户编辑bug fix ([d433a5f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d433a5fbe7c64fcb4c1f9bdc373847ce709cc2c7))
+* **景点代理:** 商品管理新增、编辑添加商户绑定;样式修复 ([9da511e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9da511e3e15cc88cd92578054207ba1c70f43a63))
 
 
 ### Features
 
-* 新增挂账额度 取现 充值 ([922b927](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/922b927a104336df0da3241dcd5857694a4e82fe))
+* 新增挂账额度 取现 充值 ([922b927](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/922b927a104336df0da3241dcd5857694a4e82fe))
 
 
 
-## [1.0.1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8...1.0.1) (2021-09-13)
+## [1.0.1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8...1.0.1) (2021-09-13)
 
 
 ### Bug Fixes
 
-* bug fix ([484cc22](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/484cc22a942104704c0237229ff203e35aa41b05))
-* bug fix ([f22806b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f22806baf7e811d2a4ee22395939ab800d2a4d1d))
-* bug fix ([6757aed](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6757aedbb9a550da54fb84279158f949d99863a0))
-* bug fix,菜单只有一个时,不显示子菜单 ([dec76a9](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/dec76a9f5632994b7a8754c43b01dff87beaf4d5))
-* fix package.json ([ea7bb5c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8))
-* logo 修改 ([283c425](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/283c425b2e5ad723449c4d8eef4168b5c57fa6f2))
-* ota接口更新 ([a553371](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a553371f31d02ee5d2c4c32184a1c019d99eebe3))
-* 修复日历汉化bug ([1d561a1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1d561a12b688e5b25788d37a85b5d03dc6c26489))
-* 修改分销商列表获取接口 ([223dc08](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/223dc08901f0ac742704a86713ed18ae6e19b50f))
-* 修改商品显示 ([6eadb45](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6eadb45b3acb21b19203e667f2d3dfc3439105b6))
-* 修改拼写错误 ([d65d90f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d65d90fc3e52069bf226f5fb5d043b705da72d34))
-* 修改菜单顺序 ([e21c949](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e21c949492cc17972582b73c8853971d53bc6d93))
-* 创建价格码:产品价格校验补充 ([f039cad](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f039cadede79bf833161db616c4a74a73a5a8b35))
-* 创建价格码:新增商品下的产品价格设置 ([5ce0442](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/5ce04426f34b099d44da92921b52c3ca1123db8f))
-* 名称修改 ([b6ede3b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b6ede3b09edf4fbb28f8c41d867136f3bb335f82))
-* 商品管理/价格码管理 分页问题修复 ([86d3bc3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/86d3bc316f3c77a58569ccba06634c52c5964420))
-* 完成分销商管理 ([4e9d60d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4e9d60de3a19d3b36e302bc57128bbbbd37cfb21))
-* 新增环境变量,区分管理端和商户界面 ([681a192](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/681a1921fed790e5cf423c74c3e325566961cb94))
-* 样式修改 ([9921e1b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9921e1bfc9a066379b3eb376b748204c9201c4f3))
-* 用户管理新增编辑 路由权限配置 ([f00fc24](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f00fc2413e198fbf379c8f3b43523548709fb6ef))
-* 统一写法 ([d9fc593](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d9fc5932ae416e0f0cbd69de7e45843596af6e4e))
-* 统计报表查询条件,景点文本输入为下拉组件 ([e212d51](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e212d519f2f7037c8b378ba5679b0a5e0f083497))
-* 菜单bug 修改 ([1727ed3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1727ed393608460ee09fdec4e253824ad020fc40))
-* 订单商品获取bug修复 ([a0452d2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a0452d24ec702b52d43335d668cae3e0f67dcb35))
-* 订单管理 下单逻辑修改 ([e8f3b1b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e8f3b1b798a1340134b3ee6ab3ac128a7166404a))
-* 路由守卫优化 接口调用区分 ([2495c96](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/2495c962b425d889771c237b58d7b7fbdd9c15e3))
-* 路由守卫修改 ([172ca8a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/172ca8aabfa27749feaa5d99df13bb45381e086e))
+* bug fix ([484cc22](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/484cc22a942104704c0237229ff203e35aa41b05))
+* bug fix ([f22806b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f22806baf7e811d2a4ee22395939ab800d2a4d1d))
+* bug fix ([6757aed](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6757aedbb9a550da54fb84279158f949d99863a0))
+* bug fix,菜单只有一个时,不显示子菜单 ([dec76a9](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/dec76a9f5632994b7a8754c43b01dff87beaf4d5))
+* fix package.json ([ea7bb5c](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8))
+* logo 修改 ([283c425](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/283c425b2e5ad723449c4d8eef4168b5c57fa6f2))
+* ota接口更新 ([a553371](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a553371f31d02ee5d2c4c32184a1c019d99eebe3))
+* 修复日历汉化bug ([1d561a1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1d561a12b688e5b25788d37a85b5d03dc6c26489))
+* 修改分销商列表获取接口 ([223dc08](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/223dc08901f0ac742704a86713ed18ae6e19b50f))
+* 修改商品显示 ([6eadb45](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6eadb45b3acb21b19203e667f2d3dfc3439105b6))
+* 修改拼写错误 ([d65d90f](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d65d90fc3e52069bf226f5fb5d043b705da72d34))
+* 修改菜单顺序 ([e21c949](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e21c949492cc17972582b73c8853971d53bc6d93))
+* 创建价格码:产品价格校验补充 ([f039cad](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f039cadede79bf833161db616c4a74a73a5a8b35))
+* 创建价格码:新增商品下的产品价格设置 ([5ce0442](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/5ce04426f34b099d44da92921b52c3ca1123db8f))
+* 名称修改 ([b6ede3b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b6ede3b09edf4fbb28f8c41d867136f3bb335f82))
+* 商品管理/价格码管理 分页问题修复 ([86d3bc3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/86d3bc316f3c77a58569ccba06634c52c5964420))
+* 完成分销商管理 ([4e9d60d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4e9d60de3a19d3b36e302bc57128bbbbd37cfb21))
+* 新增环境变量,区分管理端和商户界面 ([681a192](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/681a1921fed790e5cf423c74c3e325566961cb94))
+* 样式修改 ([9921e1b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9921e1bfc9a066379b3eb376b748204c9201c4f3))
+* 用户管理新增编辑 路由权限配置 ([f00fc24](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f00fc2413e198fbf379c8f3b43523548709fb6ef))
+* 统一写法 ([d9fc593](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d9fc5932ae416e0f0cbd69de7e45843596af6e4e))
+* 统计报表查询条件,景点文本输入为下拉组件 ([e212d51](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e212d519f2f7037c8b378ba5679b0a5e0f083497))
+* 菜单bug 修改 ([1727ed3](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1727ed393608460ee09fdec4e253824ad020fc40))
+* 订单商品获取bug修复 ([a0452d2](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a0452d24ec702b52d43335d668cae3e0f67dcb35))
+* 订单管理 下单逻辑修改 ([e8f3b1b](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e8f3b1b798a1340134b3ee6ab3ac128a7166404a))
+* 路由守卫优化 接口调用区分 ([2495c96](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/2495c962b425d889771c237b58d7b7fbdd9c15e3))
+* 路由守卫修改 ([172ca8a](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/172ca8aabfa27749feaa5d99df13bb45381e086e))
 
 
 ### Features
 
-* 修改项目名为景点名,新增景点下拉框组件 ([43fe400](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/43fe400b9e9fa7914f5db2d9aba957e7464f4ab7))
-* 分销商新增激活、删除功能 ([f8063f5](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f8063f5c0fd4c2ff3de9722b38419c06fb7fcdb6))
-* 分销商管理 ([48a60a6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/48a60a66cbc4e521ead3dc73facbd4f424add21e))
-* 加入景区商品检票销售统计 ([5dd2ad0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/5dd2ad039dad79114881a07d9978881492635a37))
-* 商户下单页面优化 ([8bb4687](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/8bb468794bc11cec6750be274f1069f1b72a6656))
-* 商户新增分销商管理 ([bf86394](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/bf863941d1cb273c0f0d8f9a7f219f10b80bbab5))
-* 新增 代理商户 代理用户 代理商品 页面 ([ad1e4bd](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ad1e4bd03f695d2d6e21a23588e19fb2eb841c28))
-* 新增产品选择组件,优化景点选择组,新增change事件、showAll属性 ([e734c9d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e734c9d8ace1414189167bb03d37abd4e6f3884f))
-* 新增景点代理界面 ([83d020e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/83d020e7b5f3f98e6dd62d4b008442e0c7998eb5))
-* 新增景点代理页面逻辑 ([d2dc0c7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d2dc0c729e5623d405c917a75e7211d5046a3239))
-* 新增景点信息列表 ([ecbdbad](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ecbdbadcb2eb9d5f3cfb1c64acf10c816b7439ef))
-* 新增票种管理页面 ([d01b3e1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d01b3e105ffbfa28f1ccaf7f352813e8d7cf9097))
-* 新增角色管理页面 ([1527929](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1527929305aae05714c674bc47cbeca61ee299a3))
-* 检查统计页面查询条件,补全查询参数 ([c96bd5d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c96bd5d06cf989878ac3d6bbc8d2236681539069))
-* 票种新增景点筛选 ([e729573](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e729573e6e9ee8c831284f780bfbf969847fac9e))
-* 订单&价格码&商品管理 加入查询表单 ([4961385](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/49613856597c83a029dc481a83a3f1205d4767fd))
+* 修改项目名为景点名,新增景点下拉框组件 ([43fe400](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/43fe400b9e9fa7914f5db2d9aba957e7464f4ab7))
+* 分销商新增激活、删除功能 ([f8063f5](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f8063f5c0fd4c2ff3de9722b38419c06fb7fcdb6))
+* 分销商管理 ([48a60a6](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/48a60a66cbc4e521ead3dc73facbd4f424add21e))
+* 加入景区商品检票销售统计 ([5dd2ad0](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/5dd2ad039dad79114881a07d9978881492635a37))
+* 商户下单页面优化 ([8bb4687](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/8bb468794bc11cec6750be274f1069f1b72a6656))
+* 商户新增分销商管理 ([bf86394](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/bf863941d1cb273c0f0d8f9a7f219f10b80bbab5))
+* 新增 代理商户 代理用户 代理商品 页面 ([ad1e4bd](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ad1e4bd03f695d2d6e21a23588e19fb2eb841c28))
+* 新增产品选择组件,优化景点选择组,新增change事件、showAll属性 ([e734c9d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e734c9d8ace1414189167bb03d37abd4e6f3884f))
+* 新增景点代理界面 ([83d020e](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/83d020e7b5f3f98e6dd62d4b008442e0c7998eb5))
+* 新增景点代理页面逻辑 ([d2dc0c7](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d2dc0c729e5623d405c917a75e7211d5046a3239))
+* 新增景点信息列表 ([ecbdbad](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ecbdbadcb2eb9d5f3cfb1c64acf10c816b7439ef))
+* 新增票种管理页面 ([d01b3e1](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d01b3e105ffbfa28f1ccaf7f352813e8d7cf9097))
+* 新增角色管理页面 ([1527929](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1527929305aae05714c674bc47cbeca61ee299a3))
+* 检查统计页面查询条件,补全查询参数 ([c96bd5d](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c96bd5d06cf989878ac3d6bbc8d2236681539069))
+* 票种新增景点筛选 ([e729573](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e729573e6e9ee8c831284f780bfbf969847fac9e))
+* 订单&价格码&商品管理 加入查询表单 ([4961385](https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/49613856597c83a029dc481a83a3f1205d4767fd))
 
 
 

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "clearticker_merchant",
+  "name": "clearticket_merchant",
   "version": "1.0.8",
   "scripts": {
     "dev": "vite --open",

+ 174 - 174
public/update.html

@@ -14,7 +14,7 @@
         line-height: .6563em;
         margin: .6563em 0;
     }
-    
+
     h2 {
         color: #6699cc;
         font-size: 1.75em;
@@ -22,44 +22,44 @@
         border-bottom: 1px solid #eee;
         margin-top:30px;
     }
-    
+
     h3 {
         color: #6699cc;
         font-size: 1.5em;
     line-height: 1.43;
     }
-    
+
     h4 {
         color: #6699cc;
         font-size: 1.2857em;
         line-height: 1.1667em;
         margin: 1.1667em 0;
     }
-    
+
     h5 {
         color: #6699cc;
         font-size: 1.15em;
         line-height: 1.3em;
         margin: 1.3em 0;
     }
-    
+
     h6 {
         color: #6699cc;
         font-size: 1em;
         line-height: 1.5em;
         margin: 1.5em 0;
     }
-    
+
     h1,h2,h3,h4,h5,h6 {
         line-height: 1.5em;
     }
-    
+
     body,p,td,div {
         color: #515151;
         font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
         word-wrap: break-word;
     }
-    
+
     a {
         -webkit-transition: color .2s ease-in-out;
         -moz-transition: color .2s ease-in-out;
@@ -69,15 +69,15 @@
         color: #f99157;
         text-decoration: none;
     }
-    
-    a[href^="mailto"] { 
+
+    a[href^="mailto"] {
         color: #66cccc;
     }
-    
+
     a:hover {
         color: #f99157;
     }
-    
+
     ul{
         padding-left: 30px; margin:0.8em 0
     }
@@ -85,46 +85,46 @@
     li {
         font-size: 110%;margin-bottom: 5px;
     }
-    
+
     li li {
         font-size: 100%;
     }
-    
+
     li p {
         font-size: 100%;
         margin: .5em 0;
     }
-    
+
     .footnote {
         color: #a09f93;
         font-size: .8em;
         vertical-align: super;
     }
-    
+
     hr {
         height: 10px;
         border: none;
         background-color: #d3d0c8;
         color: #515151;
     }
-    
+
     #wrapper img {
         max-width: 100%;
         height: auto;
     }
-    
+
     strong, b {
         color: #ffcc66;
     }
-    
+
     em, i {
         color: #cc99cc;
     }
-    
+
     dd {
         margin-bottom: 1em;
     }
-    
+
     li {
         list-style: none;
         position: relative;
@@ -139,31 +139,31 @@
         font-size: 160%;
         content: '\2022';
     }
-    
+
     ol {
         counter-reset: index;
     }
-    
+
     ol li {
         counter-increment: index;
     }
-    
+
     ol li::before {
         content: counter(index) ".";
     }
-    
+
     li > p:first-child {
         margin: 0;
     }
-    
+
     ul ul,ul ol {
         margin-bottom: .4em;
     }
-    
+
     caption,col,colgroup,table,tbody,td,tfoot,th,thead,tr {
         border-spacing: 0;
     }
-    
+
     table {
         border: 1px solid rgba(0,0,0,0.25);
         border-collapse: collapse;
@@ -173,68 +173,68 @@
         padding: 0;
         table-layout: fixed;
     }
-    
+
     caption {
         display: table-caption;
         font-weight: 700;
     }
-    
+
     col {
         display: table-column;
     }
-    
+
     colgroup {
         display: table-column-group;
     }
-    
+
     tbody {
         display: table-row-group;
     }
-    
+
     tfoot {
         display: table-footer-group;
     }
-    
+
     thead {
         display: table-header-group;
     }
-    
+
     td,th {
         display: table-cell;
     }
-    
+
     tr {
         display: table-row;
     }
-    
+
     table th,table td {
         font-size: 1.1em;
         line-height: 23px;
         padding: 0 1em;
     }
-    
+
     table thead {
         background: rgba(0,0,0,0.15);
         border: 1px solid rgba(0,0,0,0.15);
         border-bottom: 1px solid rgba(0,0,0,0.2);
     }
-    
+
     table tbody {
         background: rgba(0,0,0,0.05);
     }
-    
+
     table tfoot {
         background: rgba(0,0,0,0.15);
         border: 1px solid rgba(0,0,0,0.15);
         border-top: 1px solid rgba(0,0,0,0.2);
     }
-    
+
     figure {
         display: inline-block;
         position: relative;
         margin: 1em 0 2em;
     }
-    
+
     figcaption {
         font-style: italic;
         text-align: center;
@@ -251,15 +251,15 @@
         -ms-transition: all .2s ease-in-out;
         transition: all .2s ease-in-out;
     }
-    
+
     figure:hover>figcaption {
         background: rgba(0,0,0,1)
     }
-    
+
     code {
         color: #99cc99;
     }
-    
+
     .poetry pre {
         display: block;
         font-family: Georgia, Garamond, serif !important;
@@ -268,17 +268,17 @@
         line-height: 1.6em;
         margin-left: 1em;
     }
-    
+
     .poetry pre code {
         font-family: Georgia, Garamond, serif !important;
     }
-    
+
     blockquote p {
         font-size: 110%;
         font-style: italic;
         line-height: 1.6em;
     }
-    
+
     sup,sub,a.footnote {
         font-size: 1.4ex;
         height: 0;
@@ -286,39 +286,39 @@
         position: relative;
         vertical-align: super;
     }
-    
+
     sub {
         vertical-align: sub;
         top: -1px;
     }
-    
+
     p,h5 {
         font-size: 1.1429em;
         line-height: 1.3125em;
         margin: 1.3125em 0;
     }
-    
+
     dt,th {
         font-weight: 700;
     }
-    
+
     table tr:nth-child(odd),table th:nth-child(odd),table td:nth-child(odd) {
         background: rgba(255,255,255,0.06);
     }
-    
+
     table tr:nth-child(even),table td:nth-child(even) {
         background: rgba(200,200,200,0.25);
     }
-    
+
     @media print {
         body {
             overflow: auto;
         }
-    
+
         img,pre,blockquote,table,figure,p {
             page-break-inside: avoid;
         }
-    
+
         #wrapper {
             background-color: #f2f0ec;
             color: #515151;
@@ -328,29 +328,29 @@
             text-indent: 0;
         }
     }
-    
+
     @media screen {
         .inverted #wrapper,.inverted {
             background: #2d2d2d;
         }
-    
+
         .inverted hr {
             color: #d3d0c8;
             background-color: 515151
         }
-    
+
         .inverted p,.inverted td, .inverted div {
             color: #d3d0c8 !important;
         }
-    
+
         .inverted table tr:nth-child(odd),.inverted table th:nth-child(odd),.inverted table td:nth-child(odd) {
             background: none;
         }
-    
+
         #wrapper {
             padding: 20px;
         }
-    
+
         ::selection {
             background: #d3d0c8;
             color: #515151;
@@ -359,37 +359,37 @@
             color: #d3d0c8;
             background: #515151;
         }
-    
+
         h1::selection {
             background-color: rgba(45, 156, 208, .3);
         }
-    
+
         h2::selection {
             background-color: rgba(90, 182, 224, .3);
         }
-    
+
         h3::selection,h4::selection,h5::selection,h6::selection,li::selection,ol::selection {
             background-color: rgba(133, 201, 232, .3);
         }
-    
+
         code::selection {
             background-color: rgba(0,0,0,.7);
             color: #eee;
         }
-    
+
         code span::selection {
             background-color: rgba(0,0,0,.7) !important;
             color: #eee !important;
         }
-    
+
         a::selection {
             background-color: rgba(255, 230, 102,.2);
         }
-    
+
         .inverted a::selection {
             background-color: rgba(255, 230, 102,.6);
         }
-    
+
         td::selection,th::selection,caption::selection {
             background-color: rgba(180, 237, 95, .5);
         }
@@ -397,157 +397,157 @@
     </style>
   </head>
   <body>
-  <h2 id="108-2021-09-29"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.7...1.0.8">1.0.8</a> (2021-09-29)</h2>
+  <h2 id="108-2021-09-29"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.7...1.0.8">1.0.8</a> (2021-09-29)</h2>
 <h3 id="bug-fixes">Bug Fixes</h3>
 <ul>
-<li>修复总代流水记录操作人显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/121f2692d6532e643c1c90d2a0076f3a907d07c9">121f269</a>)</li>
-<li>总代 订单/商户页面新增查询字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9c18355494a048d50ef253d7badbc0c960805afe">9c18355</a>)</li>
-<li>总代流水记录新增操作人字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b6817381643418c46c78c1ec213881cd81e09cf7">b681738</a>)</li>
+<li>修复总代流水记录操作人显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/121f2692d6532e643c1c90d2a0076f3a907d07c9">121f269</a>)</li>
+<li>总代 订单/商户页面新增查询字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9c18355494a048d50ef253d7badbc0c960805afe">9c18355</a>)</li>
+<li>总代流水记录新增操作人字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b6817381643418c46c78c1ec213881cd81e09cf7">b681738</a>)</li>
 </ul>
 <h3 id="features">Features</h3>
 <ul>
-<li>产品分销/价格码,新增两个状态 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/275c763dd913ff3462bb926922a5e94c5b53cf27">275c763</a>)</li>
-<li>价格码选择组件列表获取接口,参数修改为包含自营商户 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ba63f1edf3f0b5c8e1e82ba04bb0c33bba7cff00">ba63f1e</a>)</li>
-<li>取现 替换成 冲账&amp;&amp;总代流水记录新增操作人 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/68d013a1862115c351aaf708af37f491ef55e0a7">68d013a</a>)</li>
-<li><strong>商户:</strong> 修改价格码上下架按钮显示逻辑 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b7c6ec6a051fe25b20605c68b6ef5a3aaa273b4f">b7c6ec6</a>)</li>
-<li>商户订单新增查询字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1d70b9dd2c4c7be95bcef5d7263fba6edbcd6b07">1d70b9d</a>)</li>
+<li>产品分销/价格码,新增两个状态 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/275c763dd913ff3462bb926922a5e94c5b53cf27">275c763</a>)</li>
+<li>价格码选择组件列表获取接口,参数修改为包含自营商户 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ba63f1edf3f0b5c8e1e82ba04bb0c33bba7cff00">ba63f1e</a>)</li>
+<li>取现 替换成 冲账&amp;&amp;总代流水记录新增操作人 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/68d013a1862115c351aaf708af37f491ef55e0a7">68d013a</a>)</li>
+<li><strong>商户:</strong> 修改价格码上下架按钮显示逻辑 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b7c6ec6a051fe25b20605c68b6ef5a3aaa273b4f">b7c6ec6</a>)</li>
+<li>商户订单新增查询字段 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1d70b9dd2c4c7be95bcef5d7263fba6edbcd6b07">1d70b9d</a>)</li>
 </ul>
-<h2 id="107-2021-09-27"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.6...1.0.7">1.0.7</a> (2021-09-27)</h2>
+<h2 id="107-2021-09-27"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.6...1.0.7">1.0.7</a> (2021-09-27)</h2>
 <h3 id="bug-fixes-1">Bug Fixes</h3>
 <ul>
-<li>修复密码修改弹框显示bug (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a7883fc51f74ec3106f625d8e41d6acacead225c">a7883fc</a>)</li>
-<li>字段 总代平台 景区核销统计 查询条件修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7ddd243878dbb9e7a869c950bd40fd365b3a5266">7ddd243</a>)</li>
-<li><strong>总代:</strong> 修复订单查询日期格式问题 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4d8829d8c4b97cda7b2f6bf333b0a2d54ec8a1f7">4d8829d</a>)</li>
+<li>修复密码修改弹框显示bug (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a7883fc51f74ec3106f625d8e41d6acacead225c">a7883fc</a>)</li>
+<li>字段 总代平台 景区核销统计 查询条件修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7ddd243878dbb9e7a869c950bd40fd365b3a5266">7ddd243</a>)</li>
+<li><strong>总代:</strong> 修复订单查询日期格式问题 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4d8829d8c4b97cda7b2f6bf333b0a2d54ec8a1f7">4d8829d</a>)</li>
 </ul>
 <h3 id="features-1">Features</h3>
 <ul>
-<li>修改商户选择组件列表获取接口 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/3c0cfc614e6d632bde14d1cf2f01c1633346ad83">3c0cfc6</a>)</li>
-<li>商户、景点代理,订单列表新增查看景点订单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1795bb048ce22c33ac95365a84086dcac43d27c9">1795bb0</a>)</li>
-<li>商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9878c4d9060308e8ac250aa7f6233b479cc7551d">9878c4d</a>)</li>
-<li>总代新增角色和权限管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/cebc1f117bdaf1f54e93b9c95867348aa8ec1598">cebc1f1</a>)</li>
-<li>景点总代 流水记录新增订单详情 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1c06e13b88534bbd4b5a85bdb073012152521bd0">1c06e13</a>)</li>
-<li>流水记录新增原始流水详情 列表展示优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6613b9452f346e05d274c2bc7646a424959d74dd">6613b94</a>)</li>
-<li>订单查询时间默认值设置为当前一周时间 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/0a91f13abaf0660b9e16d4eb76b5cd497ad04398">0a91f13</a>)</li>
+<li>修改商户选择组件列表获取接口 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/3c0cfc614e6d632bde14d1cf2f01c1633346ad83">3c0cfc6</a>)</li>
+<li>商户、景点代理,订单列表新增查看景点订单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1795bb048ce22c33ac95365a84086dcac43d27c9">1795bb0</a>)</li>
+<li>商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9878c4d9060308e8ac250aa7f6233b479cc7551d">9878c4d</a>)</li>
+<li>总代新增角色和权限管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/cebc1f117bdaf1f54e93b9c95867348aa8ec1598">cebc1f1</a>)</li>
+<li>景点总代 流水记录新增订单详情 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1c06e13b88534bbd4b5a85bdb073012152521bd0">1c06e13</a>)</li>
+<li>流水记录新增原始流水详情 列表展示优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6613b9452f346e05d274c2bc7646a424959d74dd">6613b94</a>)</li>
+<li>订单查询时间默认值设置为当前一周时间 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/0a91f13abaf0660b9e16d4eb76b5cd497ad04398">0a91f13</a>)</li>
 </ul>
 <h3 id="reverts">Reverts</h3>
 <ul>
-<li>Revert &quot;feat: 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改&quot; (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/61a00c0d332f83f5fc496428d63a269ad2bfa608">61a00c0</a>)</li>
+<li>Revert &quot;feat: 商户平台分销商列表添加取现、充值、修改挂账额度 删除、编辑、激活参数修改&quot; (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/61a00c0d332f83f5fc496428d63a269ad2bfa608">61a00c0</a>)</li>
 </ul>
-<h2 id="106-2021-09-20"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.5...1.0.6">1.0.6</a> (2021-09-20)</h2>
+<h2 id="106-2021-09-20"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.5...1.0.6">1.0.6</a> (2021-09-20)</h2>
 <h3 id="features-2">Features</h3>
 <ul>
-<li><strong>商户:</strong> 文案修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/98fcdbb56c2b924a26c79a119524226b317fc722">98fcdbb</a>)</li>
-<li><strong>总代:</strong> 商户列表新增冻结金额显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/51f06d270a994f48e9152addc6b4ee3afcd17237">51f06d2</a>)</li>
-<li><strong>总代:</strong> 订单查询条件新增订单号、票号;文案修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/8864522ebba8a7e895a825a9b29338c33410733f">8864522</a>)</li>
+<li><strong>商户:</strong> 文案修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/98fcdbb56c2b924a26c79a119524226b317fc722">98fcdbb</a>)</li>
+<li><strong>总代:</strong> 商户列表新增冻结金额显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/51f06d270a994f48e9152addc6b4ee3afcd17237">51f06d2</a>)</li>
+<li><strong>总代:</strong> 订单查询条件新增订单号、票号;文案修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/8864522ebba8a7e895a825a9b29338c33410733f">8864522</a>)</li>
 </ul>
-<h2 id="105-2021-09-18"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.4...1.0.5">1.0.5</a> (2021-09-18)</h2>
+<h2 id="105-2021-09-18"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.4...1.0.5">1.0.5</a> (2021-09-18)</h2>
 <h3 id="bug-fixes-2">Bug Fixes</h3>
 <ul>
-<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6cc5c48103bf8a4b6dc6252d94263aa350195af5">6cc5c48</a>)</li>
-<li>商户平台 价格码新增批量删除 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/fd40dea370e934c6be30b89340b6e465ab66c418">fd40dea</a>)</li>
-<li>导航栏新增用户名显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c17eaa737f3f7fb3dd782cfd4f2c27c866bf3e94">c17eaa7</a>)</li>
-<li>总代-修改挂账额度 bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1f269cf928f4faf698f9f09637eb4958ddd0cccd">1f269cf</a>)</li>
-<li>景点代理产品页面 新增展示 补充检索条件 追加全选功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d5913a9e8cd4df6841fdc3206d31af42680df10e">d5913a9</a>)</li>
+<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6cc5c48103bf8a4b6dc6252d94263aa350195af5">6cc5c48</a>)</li>
+<li>商户平台 价格码新增批量删除 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/fd40dea370e934c6be30b89340b6e465ab66c418">fd40dea</a>)</li>
+<li>导航栏新增用户名显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c17eaa737f3f7fb3dd782cfd4f2c27c866bf3e94">c17eaa7</a>)</li>
+<li>总代-修改挂账额度 bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1f269cf928f4faf698f9f09637eb4958ddd0cccd">1f269cf</a>)</li>
+<li>景点代理产品页面 新增展示 补充检索条件 追加全选功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d5913a9e8cd4df6841fdc3206d31af42680df10e">d5913a9</a>)</li>
 </ul>
 <h3 id="features-3">Features</h3>
 <ul>
-<li>产品新增商品添加搜索功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c4c85688451871fc7106b2286ccb24c5555c3951">c4c8568</a>)</li>
-<li>商户&amp;景区代理 可修改当前用户密码 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d269fa12076d893c6ae8d355df710f2a6871f787">d269fa1</a>)</li>
-<li>商户产品,创建时新增价格码显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/91d574f8942569c19ba7649e480601f3d591800a">91d574f</a>)</li>
-<li>新增 商户和景区代理的流水记录 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a6102521f2962185607f673c8a8bb1898329559b">a610252</a>)</li>
-<li>新增产品创建时新增价格码显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/780401722fb7e575d21c6efe6ee4b0e9ddf94b13">7804017</a>)</li>
+<li>产品新增商品添加搜索功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c4c85688451871fc7106b2286ccb24c5555c3951">c4c8568</a>)</li>
+<li>商户&amp;景区代理 可修改当前用户密码 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d269fa12076d893c6ae8d355df710f2a6871f787">d269fa1</a>)</li>
+<li>商户产品,创建时新增价格码显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/91d574f8942569c19ba7649e480601f3d591800a">91d574f</a>)</li>
+<li>新增 商户和景区代理的流水记录 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a6102521f2962185607f673c8a8bb1898329559b">a610252</a>)</li>
+<li>新增产品创建时新增价格码显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/780401722fb7e575d21c6efe6ee4b0e9ddf94b13">7804017</a>)</li>
 </ul>
-<h2 id="104-2021-09-17"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.3...1.0.4">1.0.4</a> (2021-09-17)</h2>
+<h2 id="104-2021-09-17"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.3...1.0.4">1.0.4</a> (2021-09-17)</h2>
 <h3 id="bug-fixes-3">Bug Fixes</h3>
 <ul>
-<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e0990fab5b7151c1e4a8ea1e78f81960e22d0f81">e0990fa</a>)</li>
-<li>产品 自动填入子商品金额,第一个填全部,后面填0 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b07064fa8e15a3c51ca7b5a37136a4ea87e7ba26">b07064f</a>)</li>
-<li>新增展示字段 绑定商户表单优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/fa036d858f38a16de93776702b62eaa8f93f426c">fa036d8</a>)</li>
+<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e0990fab5b7151c1e4a8ea1e78f81960e22d0f81">e0990fa</a>)</li>
+<li>产品 自动填入子商品金额,第一个填全部,后面填0 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b07064fa8e15a3c51ca7b5a37136a4ea87e7ba26">b07064f</a>)</li>
+<li>新增展示字段 绑定商户表单优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/fa036d858f38a16de93776702b62eaa8f93f426c">fa036d8</a>)</li>
 </ul>
 <h3 id="features-4">Features</h3>
 <ul>
-<li>修改商户订单列表筛选状态 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/20417066086401717c6d25bd6224c8ea62fb903d">2041706</a>)</li>
-<li>分销商创建参数修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b5a5aaec0b94382c9981214817c66957b4ff0ec4">b5a5aae</a>)</li>
-<li>总代-订单列表新增状态筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b296612629de5a22a0fcc45a4ceb38cbf62a0105">b296612</a>)</li>
-<li>新增总代信息显示页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/682b13c6c5da78940c7f9293767e80f0400377d9">682b13c</a>)</li>
-<li>订单列表新增金额显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/58b135a62c8c2d6221a5cad3cb0a6a07aa5fffd3">58b135a</a>)</li>
-<li>预订人没有填,自动填入第一个游客信息 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7784df728774f57dce14390f3a68b9a53cf0d963">7784df7</a>)</li>
+<li>修改商户订单列表筛选状态 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/20417066086401717c6d25bd6224c8ea62fb903d">2041706</a>)</li>
+<li>分销商创建参数修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b5a5aaec0b94382c9981214817c66957b4ff0ec4">b5a5aae</a>)</li>
+<li>总代-订单列表新增状态筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b296612629de5a22a0fcc45a4ceb38cbf62a0105">b296612</a>)</li>
+<li>新增总代信息显示页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/682b13c6c5da78940c7f9293767e80f0400377d9">682b13c</a>)</li>
+<li>订单列表新增金额显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/58b135a62c8c2d6221a5cad3cb0a6a07aa5fffd3">58b135a</a>)</li>
+<li>预订人没有填,自动填入第一个游客信息 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7784df728774f57dce14390f3a68b9a53cf0d963">7784df7</a>)</li>
 </ul>
-<h2 id="103-2021-09-15"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.2...1.0.3">1.0.3</a> (2021-09-15)</h2>
+<h2 id="103-2021-09-15"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.2...1.0.3">1.0.3</a> (2021-09-15)</h2>
 <h3 id="bug-fixes-4">Bug Fixes</h3>
 <ul>
-<li>订单页问题修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/904181efb07d85260f263f238a27c56afdbbf0cb">904181e</a>)</li>
+<li>订单页问题修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/904181efb07d85260f263f238a27c56afdbbf0cb">904181e</a>)</li>
 </ul>
 <h3 id="features-5">Features</h3>
 <ul>
-<li>产品/套票 加入总代筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/89550cca4f2925697889beb9cfb1aaa4cafd0415">89550cc</a>)</li>
-<li>名称统一 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/62f285f120a91f75f324847a75e87897666de851">62f285f</a>)</li>
-<li>新增订单 门票 统计报表 报表下载 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4c8f252cde0046763756a26d0321b7313fe8fb94">4c8f252</a>)</li>
-<li>统计报表 分销商售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/cd97b41709604756bdacc50585c44478b8ddf5e0">cd97b41</a>)</li>
-<li>统计报表 总代售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e2a2f8f1b020471a5cfe869f5e0f132702de41ae">e2a2f8f</a>)</li>
-<li>统计报表 景区售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/68f794fed0d428dd550ca658ff04441b57b01945">68f794f</a>)</li>
+<li>产品/套票 加入总代筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/89550cca4f2925697889beb9cfb1aaa4cafd0415">89550cc</a>)</li>
+<li>名称统一 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/62f285f120a91f75f324847a75e87897666de851">62f285f</a>)</li>
+<li>新增订单 门票 统计报表 报表下载 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4c8f252cde0046763756a26d0321b7313fe8fb94">4c8f252</a>)</li>
+<li>统计报表 分销商售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/cd97b41709604756bdacc50585c44478b8ddf5e0">cd97b41</a>)</li>
+<li>统计报表 总代售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e2a2f8f1b020471a5cfe869f5e0f132702de41ae">e2a2f8f</a>)</li>
+<li>统计报表 景区售票&amp;核销统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/68f794fed0d428dd550ca658ff04441b57b01945">68f794f</a>)</li>
 </ul>
-<h2 id="102-2021-09-13"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/1.0.1...1.0.2">1.0.2</a> (2021-09-13)</h2>
+<h2 id="102-2021-09-13"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/1.0.1...1.0.2">1.0.2</a> (2021-09-13)</h2>
 <h3 id="bug-fixes-5">Bug Fixes</h3>
 <ul>
-<li>修复页面跳转问题 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/7ed849cc7903f9855029d567ce6323ac1f2fa428">7ed849c</a>)</li>
-<li>去除价格百分比显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c08f226f26bf766a4e79d0c55aed16d972431773">c08f226</a>)</li>
-<li>商户编辑bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d433a5fbe7c64fcb4c1f9bdc373847ce709cc2c7">d433a5f</a>)</li>
-<li><strong>景点代理:</strong> 商品管理新增、编辑添加商户绑定;样式修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9da511e3e15cc88cd92578054207ba1c70f43a63">9da511e</a>)</li>
+<li>修复页面跳转问题 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/7ed849cc7903f9855029d567ce6323ac1f2fa428">7ed849c</a>)</li>
+<li>去除价格百分比显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c08f226f26bf766a4e79d0c55aed16d972431773">c08f226</a>)</li>
+<li>商户编辑bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d433a5fbe7c64fcb4c1f9bdc373847ce709cc2c7">d433a5f</a>)</li>
+<li><strong>景点代理:</strong> 商品管理新增、编辑添加商户绑定;样式修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9da511e3e15cc88cd92578054207ba1c70f43a63">9da511e</a>)</li>
 </ul>
 <h3 id="features-6">Features</h3>
 <ul>
-<li>新增挂账额度 取现 充值 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/922b927a104336df0da3241dcd5857694a4e82fe">922b927</a>)</li>
+<li>新增挂账额度 取现 充值 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/922b927a104336df0da3241dcd5857694a4e82fe">922b927</a>)</li>
 </ul>
-<h2 id="101-2021-09-13"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/compare/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8...1.0.1">1.0.1</a> (2021-09-13)</h2>
+<h2 id="101-2021-09-13"><a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/compare/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8...1.0.1">1.0.1</a> (2021-09-13)</h2>
 <h3 id="bug-fixes-6">Bug Fixes</h3>
 <ul>
-<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/484cc22a942104704c0237229ff203e35aa41b05">484cc22</a>)</li>
-<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f22806baf7e811d2a4ee22395939ab800d2a4d1d">f22806b</a>)</li>
-<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6757aedbb9a550da54fb84279158f949d99863a0">6757aed</a>)</li>
-<li>bug fix,菜单只有一个时,不显示子菜单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/dec76a9f5632994b7a8754c43b01dff87beaf4d5">dec76a9</a>)</li>
-<li>fix package.json (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8">ea7bb5c</a>)</li>
-<li>logo 修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/283c425b2e5ad723449c4d8eef4168b5c57fa6f2">283c425</a>)</li>
-<li>ota接口更新 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a553371f31d02ee5d2c4c32184a1c019d99eebe3">a553371</a>)</li>
-<li>修复日历汉化bug (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1d561a12b688e5b25788d37a85b5d03dc6c26489">1d561a1</a>)</li>
-<li>修改分销商列表获取接口 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/223dc08901f0ac742704a86713ed18ae6e19b50f">223dc08</a>)</li>
-<li>修改商品显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/6eadb45b3acb21b19203e667f2d3dfc3439105b6">6eadb45</a>)</li>
-<li>修改拼写错误 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d65d90fc3e52069bf226f5fb5d043b705da72d34">d65d90f</a>)</li>
-<li>修改菜单顺序 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e21c949492cc17972582b73c8853971d53bc6d93">e21c949</a>)</li>
-<li>创建价格码:产品价格校验补充 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f039cadede79bf833161db616c4a74a73a5a8b35">f039cad</a>)</li>
-<li>创建价格码:新增商品下的产品价格设置 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/5ce04426f34b099d44da92921b52c3ca1123db8f">5ce0442</a>)</li>
-<li>名称修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/b6ede3b09edf4fbb28f8c41d867136f3bb335f82">b6ede3b</a>)</li>
-<li>商品管理/价格码管理 分页问题修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/86d3bc316f3c77a58569ccba06634c52c5964420">86d3bc3</a>)</li>
-<li>完成分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/4e9d60de3a19d3b36e302bc57128bbbbd37cfb21">4e9d60d</a>)</li>
-<li>新增环境变量,区分管理端和商户界面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/681a1921fed790e5cf423c74c3e325566961cb94">681a192</a>)</li>
-<li>样式修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/9921e1bfc9a066379b3eb376b748204c9201c4f3">9921e1b</a>)</li>
-<li>用户管理新增编辑 路由权限配置 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f00fc2413e198fbf379c8f3b43523548709fb6ef">f00fc24</a>)</li>
-<li>统一写法 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d9fc5932ae416e0f0cbd69de7e45843596af6e4e">d9fc593</a>)</li>
-<li>统计报表查询条件,景点文本输入为下拉组件 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e212d519f2f7037c8b378ba5679b0a5e0f083497">e212d51</a>)</li>
-<li>菜单bug 修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1727ed393608460ee09fdec4e253824ad020fc40">1727ed3</a>)</li>
-<li>订单商品获取bug修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/a0452d24ec702b52d43335d668cae3e0f67dcb35">a0452d2</a>)</li>
-<li>订单管理 下单逻辑修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e8f3b1b798a1340134b3ee6ab3ac128a7166404a">e8f3b1b</a>)</li>
-<li>路由守卫优化 接口调用区分 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/2495c962b425d889771c237b58d7b7fbdd9c15e3">2495c96</a>)</li>
-<li>路由守卫修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/172ca8aabfa27749feaa5d99df13bb45381e086e">172ca8a</a>)</li>
+<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/484cc22a942104704c0237229ff203e35aa41b05">484cc22</a>)</li>
+<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f22806baf7e811d2a4ee22395939ab800d2a4d1d">f22806b</a>)</li>
+<li>bug fix (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6757aedbb9a550da54fb84279158f949d99863a0">6757aed</a>)</li>
+<li>bug fix,菜单只有一个时,不显示子菜单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/dec76a9f5632994b7a8754c43b01dff87beaf4d5">dec76a9</a>)</li>
+<li>fix package.json (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ea7bb5c3a3fd74dce51d58bb64f0350b8371a3e8">ea7bb5c</a>)</li>
+<li>logo 修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/283c425b2e5ad723449c4d8eef4168b5c57fa6f2">283c425</a>)</li>
+<li>ota接口更新 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a553371f31d02ee5d2c4c32184a1c019d99eebe3">a553371</a>)</li>
+<li>修复日历汉化bug (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1d561a12b688e5b25788d37a85b5d03dc6c26489">1d561a1</a>)</li>
+<li>修改分销商列表获取接口 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/223dc08901f0ac742704a86713ed18ae6e19b50f">223dc08</a>)</li>
+<li>修改商品显示 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/6eadb45b3acb21b19203e667f2d3dfc3439105b6">6eadb45</a>)</li>
+<li>修改拼写错误 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d65d90fc3e52069bf226f5fb5d043b705da72d34">d65d90f</a>)</li>
+<li>修改菜单顺序 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e21c949492cc17972582b73c8853971d53bc6d93">e21c949</a>)</li>
+<li>创建价格码:产品价格校验补充 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f039cadede79bf833161db616c4a74a73a5a8b35">f039cad</a>)</li>
+<li>创建价格码:新增商品下的产品价格设置 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/5ce04426f34b099d44da92921b52c3ca1123db8f">5ce0442</a>)</li>
+<li>名称修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/b6ede3b09edf4fbb28f8c41d867136f3bb335f82">b6ede3b</a>)</li>
+<li>商品管理/价格码管理 分页问题修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/86d3bc316f3c77a58569ccba06634c52c5964420">86d3bc3</a>)</li>
+<li>完成分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/4e9d60de3a19d3b36e302bc57128bbbbd37cfb21">4e9d60d</a>)</li>
+<li>新增环境变量,区分管理端和商户界面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/681a1921fed790e5cf423c74c3e325566961cb94">681a192</a>)</li>
+<li>样式修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/9921e1bfc9a066379b3eb376b748204c9201c4f3">9921e1b</a>)</li>
+<li>用户管理新增编辑 路由权限配置 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f00fc2413e198fbf379c8f3b43523548709fb6ef">f00fc24</a>)</li>
+<li>统一写法 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d9fc5932ae416e0f0cbd69de7e45843596af6e4e">d9fc593</a>)</li>
+<li>统计报表查询条件,景点文本输入为下拉组件 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e212d519f2f7037c8b378ba5679b0a5e0f083497">e212d51</a>)</li>
+<li>菜单bug 修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1727ed393608460ee09fdec4e253824ad020fc40">1727ed3</a>)</li>
+<li>订单商品获取bug修复 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/a0452d24ec702b52d43335d668cae3e0f67dcb35">a0452d2</a>)</li>
+<li>订单管理 下单逻辑修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e8f3b1b798a1340134b3ee6ab3ac128a7166404a">e8f3b1b</a>)</li>
+<li>路由守卫优化 接口调用区分 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/2495c962b425d889771c237b58d7b7fbdd9c15e3">2495c96</a>)</li>
+<li>路由守卫修改 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/172ca8aabfa27749feaa5d99df13bb45381e086e">172ca8a</a>)</li>
 </ul>
 <h3 id="features-7">Features</h3>
 <ul>
-<li>修改项目名为景点名,新增景点下拉框组件 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/43fe400b9e9fa7914f5db2d9aba957e7464f4ab7">43fe400</a>)</li>
-<li>分销商新增激活、删除功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/f8063f5c0fd4c2ff3de9722b38419c06fb7fcdb6">f8063f5</a>)</li>
-<li>分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/48a60a66cbc4e521ead3dc73facbd4f424add21e">48a60a6</a>)</li>
-<li>加入景区商品检票销售统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/5dd2ad039dad79114881a07d9978881492635a37">5dd2ad0</a>)</li>
-<li>商户下单页面优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/8bb468794bc11cec6750be274f1069f1b72a6656">8bb4687</a>)</li>
-<li>商户新增分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/bf863941d1cb273c0f0d8f9a7f219f10b80bbab5">bf86394</a>)</li>
-<li>新增 代理商户 代理用户 代理商品 页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ad1e4bd03f695d2d6e21a23588e19fb2eb841c28">ad1e4bd</a>)</li>
-<li>新增产品选择组件,优化景点选择组,新增change事件、showAll属性 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e734c9d8ace1414189167bb03d37abd4e6f3884f">e734c9d</a>)</li>
-<li>新增景点代理界面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/83d020e7b5f3f98e6dd62d4b008442e0c7998eb5">83d020e</a>)</li>
-<li>新增景点代理页面逻辑 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d2dc0c729e5623d405c917a75e7211d5046a3239">d2dc0c7</a>)</li>
-<li>新增景点信息列表 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/ecbdbadcb2eb9d5f3cfb1c64acf10c816b7439ef">ecbdbad</a>)</li>
-<li>新增票种管理页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/d01b3e105ffbfa28f1ccaf7f352813e8d7cf9097">d01b3e1</a>)</li>
-<li>新增角色管理页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/1527929305aae05714c674bc47cbeca61ee299a3">1527929</a>)</li>
-<li>检查统计页面查询条件,补全查询参数 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/c96bd5d06cf989878ac3d6bbc8d2236681539069">c96bd5d</a>)</li>
-<li>票种新增景点筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/e729573e6e9ee8c831284f780bfbf969847fac9e">e729573</a>)</li>
-<li>订单&amp;价格码&amp;商品管理 加入查询表单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticker_merchant/commit/49613856597c83a029dc481a83a3f1205d4767fd">4961385</a>)</li>
+<li>修改项目名为景点名,新增景点下拉框组件 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/43fe400b9e9fa7914f5db2d9aba957e7464f4ab7">43fe400</a>)</li>
+<li>分销商新增激活、删除功能 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/f8063f5c0fd4c2ff3de9722b38419c06fb7fcdb6">f8063f5</a>)</li>
+<li>分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/48a60a66cbc4e521ead3dc73facbd4f424add21e">48a60a6</a>)</li>
+<li>加入景区商品检票销售统计 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/5dd2ad039dad79114881a07d9978881492635a37">5dd2ad0</a>)</li>
+<li>商户下单页面优化 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/8bb468794bc11cec6750be274f1069f1b72a6656">8bb4687</a>)</li>
+<li>商户新增分销商管理 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/bf863941d1cb273c0f0d8f9a7f219f10b80bbab5">bf86394</a>)</li>
+<li>新增 代理商户 代理用户 代理商品 页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ad1e4bd03f695d2d6e21a23588e19fb2eb841c28">ad1e4bd</a>)</li>
+<li>新增产品选择组件,优化景点选择组,新增change事件、showAll属性 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e734c9d8ace1414189167bb03d37abd4e6f3884f">e734c9d</a>)</li>
+<li>新增景点代理界面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/83d020e7b5f3f98e6dd62d4b008442e0c7998eb5">83d020e</a>)</li>
+<li>新增景点代理页面逻辑 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d2dc0c729e5623d405c917a75e7211d5046a3239">d2dc0c7</a>)</li>
+<li>新增景点信息列表 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/ecbdbadcb2eb9d5f3cfb1c64acf10c816b7439ef">ecbdbad</a>)</li>
+<li>新增票种管理页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/d01b3e105ffbfa28f1ccaf7f352813e8d7cf9097">d01b3e1</a>)</li>
+<li>新增角色管理页面 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/1527929305aae05714c674bc47cbeca61ee299a3">1527929</a>)</li>
+<li>检查统计页面查询条件,补全查询参数 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/c96bd5d06cf989878ac3d6bbc8d2236681539069">c96bd5d</a>)</li>
+<li>票种新增景点筛选 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/e729573e6e9ee8c831284f780bfbf969847fac9e">e729573</a>)</li>
+<li>订单&amp;价格码&amp;商品管理 加入查询表单 (<a href="https://gitlab.cleartv.cn:21435/frontend/clearticket/clearticket_merchant/commit/49613856597c83a029dc481a83a3f1205d4767fd">4961385</a>)</li>
 </ul>
 
   </body>

+ 2 - 2
src/api/login.js

@@ -9,11 +9,11 @@ const appMap = {
 const str = appMap[import.meta.env.VITE_APP_TYPE]
 
 export function login (params) {
-  return http.post(`/${str}/login`, params)
+  return http.post(`/auth/login`, { data: params })
 }
 
 export function logout (params) {
-  return http.post(`/${str}/logout`)
+  return http.post(`/auth/logout`)
 }
 
 export function getPermissions () {

+ 1 - 1
src/api/managerUser.js

@@ -21,7 +21,7 @@ export function addUser (params) {
   return http.post(`/${str}/user`, params)
 }
 export function getCurrentUserInfo () {
-  return http.get(`/${str}/user/info`)
+  return http.get(`/auth/getCurrent`)
 }
 export function getUserInfoByID (id) {
   return http.get(`/${str}/user/${id}`)

+ 4 - 4
src/globalData.js

@@ -4,14 +4,14 @@ const appType = import.meta.env.VITE_APP_TYPE
 
 const actionMap = {
   merchant() {
-    store.dispatch('managerUsers/getRoles')
+    // store.dispatch('managerUsers/getRoles')
     store.dispatch('GetInfo')
-    store.dispatch('getUserPermission')
+    // store.dispatch('getUserPermission')
   },
   agent() {
     store.dispatch('GetInfo')
-    store.dispatch('managerUsers/getScenicRoles')
-    store.dispatch('getUserPermission')
+    // store.dispatch('managerUsers/getScenicRoles')
+    // store.dispatch('getUserPermission')
   },
   admin() {
     store.dispatch('GetInfo')

+ 42 - 36
src/permission.js

@@ -7,10 +7,15 @@ import { message } from 'ant-design-vue'
 const appType = import.meta.env.VITE_APP_TYPE
 console.log(appType)
 
+// adminRouter.forEach(r => { router.addRoute(r) }) // 添加静态路由
+// normalRouter.forEach(r => { router.addRoute(r) })
+// agentRouter.forEach(r => { router.addRoute(r) })
+store.commit('SET_ROUTES', normalRouter)
 router.beforeEach(async (to, from, next) => {
-  const isLogin = await checklogin()
+  // const isLogin = await checklogin()
 
-  console.log(isLogin)
+  // console.log(isLogin)
+  const isLogin = false
 
   if (to.path === '/login' || to.path === '/' || to.path === '/init') {
     if (isLogin) {
@@ -25,46 +30,47 @@ router.beforeEach(async (to, from, next) => {
       next()
     }
   } else {
-    if (isLogin) {
-      if (store.state.addRoutes) {
-        next()
-      } else {
-        const routerMap = {
-          admin: adminRouter,
-          merchant: normalRouter,
-          agent: agentRouter
-        }
+    next()
+    // if (isLogin) {
+    //   if (store.state.addRoutes) {
+    //     next()
+    //   } else {
+    //     const routerMap = {
+    //       admin: adminRouter,
+    //       merchant: normalRouter,
+    //       agent: agentRouter
+    //     }
 
-        const asyncRouter = routerMap[appType]
+    //     const asyncRouter = routerMap[appType]
 
-        await store.dispatch('getUserPermission').then(permissions => {
-          if (permissions) {
-            asyncRouter.forEach(r => {
-              r.children = r.children.filter(item => {
-                return permissions.indexOf(item.meta.permission) > -1 || !item.meta.permission
-              })
-            })
-          }
+    //     await store.dispatch('getUserPermission').then(permissions => {
+    //       if (permissions) {
+    //         asyncRouter.forEach(r => {
+    //           r.children = r.children.filter(item => {
+    //             return permissions.indexOf(item.meta.permission) > -1 || !item.meta.permission
+    //           })
+    //         })
+    //       }
 
-          store.commit('SET_ROUTES', asyncRouter) // 筛选权限列表
-        })
+    //       store.commit('SET_ROUTES', asyncRouter) // 筛选权限列表
+    //     })
 
-        asyncRouter.forEach(r => {
-          router.addRoute(r) // 添加动态路由
-        })
+    //     asyncRouter.forEach(r => {
+    //       router.addRoute(r) // 添加动态路由
+    //     })
 
-        let availableRouters = []
-        asyncRouter.forEach(v => {
-          v.children.length && (availableRouters = [...availableRouters, ...v.children]) // 将所有可进入的路由 降级为一维数组
-        })
-        if (availableRouters.length === 0) return message.error('对不起,您暂时没有权限访问该系统,请联系管理员修改权限')
+    //     let availableRouters = []
+    //     asyncRouter.forEach(v => {
+    //       v.children.length && (availableRouters = [...availableRouters, ...v.children]) // 将所有可进入的路由 降级为一维数组
+    //     })
+    //     if (availableRouters.length === 0) return message.error('对不起,您暂时没有权限访问该系统,请联系管理员修改权限')
 
-        const path = router.getRoutes().find(i => i.path.indexOf(to.path) > -1) ? to.path : availableRouters[0].path // 取所有可进入路由的第一个
+    //     const path = router.getRoutes().find(i => i.path.indexOf(to.path) > -1) ? to.path : availableRouters[0].path // 取所有可进入路由的第一个
 
-        next({ path, replace: true })
-      }
-    } else {
-      next({ path: '/login', replace: true })
-    }
+    //     next({ path, replace: true })
+    //   }
+    // } else {
+    //   next({ path: '/login', replace: true })
+    // }
   }
 })

+ 497 - 14
src/router/index.js

@@ -1,39 +1,522 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router';
 
-export { default as normalRouter } from './merchantRouter'
-export { default as adminRouter } from './adminRouter'
-export { default as agentRouter } from './agentRouter'
+import Main from '../components/Main.vue';
+import {
+  EveryUser,
+  Commodity,
+  Coupon,
+  Order,
+  Analysis,
+  TableReport,
+  Permissions,
+  DataScreen,
+  ShoppingMall,
+  Ticket,
+  Landscape,
+  Expenses,
+  Message,
+  TicketOne,
+  ChartHistogramOne,
+  IncomeOne,
+} from '@icon-park/vue-next';
+import { shallowRef } from 'vue';
+
+export { default as normalRouter } from './merchantRouter';
+export { default as adminRouter } from './adminRouter';
+export { default as agentRouter } from './agentRouter';
 
 // 路由信息
 const routes = [
   {
     path: '/',
-    redirect: '/login'
+    redirect: '/login',
   },
   {
     path: '/login',
     name: 'login',
-    component: () => import('../pages/login.vue')
+    component: () => import('../pages/login.vue'),
   },
   {
     path: '/init',
     name: 'init',
-    component: () => import('../pages/init.vue')
+    component: () => import('../pages/init.vue'),
   },
   {
     path: '/test',
     name: 'test',
-    component: () => import('../Test.vue')
+    component: () => import('../Test.vue'),
+  },
+  {
+    path: '/audit',
+    name: 'audit',
+    component: Main,
+    meta: { title: '商户审核', keepAlive: false, permission: '', icon: shallowRef(EveryUser) },
+    children: [
+      {
+        path: '/audit/index',
+        name: 'auditIndex',
+        component: () => import('@/pages/admin/audit/index.vue'),
+        meta: { title: '商户审核列表', keepAlive: false, permission: '' },
+      },
+    ],
+  },
+  {
+    path: '/otaPublic',
+    name: 'otaPublic',
+    component: Main,
+    meta: { title: '分销商管理', keepAlive: false, permission: '', icon: shallowRef(ShoppingMall) },
+    children: [
+      {
+        path: '/otaPublic/index',
+        name: 'otaPublicIndex',
+        component: () => import('@/pages/admin/otaPublic/index.vue'),
+        meta: { title: '分销商列表', keepAlive: false, permission: '' },
+      },
+    ],
+  },
+  {
+    path: '/scenicOrder',
+    name: 'scenicOrder',
+    component: Main,
+    meta: { title: '订单管理', keepAlive: false, permission: '', icon: shallowRef(Order) },
+    children: [
+      {
+        path: '/scenicOrder/index',
+        name: 'scenicOrderIndex',
+        component: () => import('@/pages/agent/scenicOrder/index.vue'),
+        meta: { title: '订单列表', keepAlive: false, permission: 'scenicAgent_orders:order_query' },
+      },
+      {
+        path: '/scenicOrder/cancel',
+        name: 'scenicOrderCancel',
+        component: () => import('@/pages/agent/scenicOrder/cancel.vue'),
+        meta: { title: '退单列表', keepAlive: false, permission: 'scenic_agent_orders:cancel_order_query' },
+      },
+    ],
+  },
+  {
+    path: '/scenicTicket',
+    name: 'scenicTicket',
+    component: Main,
+    meta: { title: '代理门票资源', keepAlive: false, permission: '', icon: shallowRef(Ticket) },
+    children: [
+      {
+        path: '/scenicTicket/index',
+        name: 'scenicTicketIndex',
+        component: () => import('@/pages/agent/scenicTicket/index.vue'),
+        meta: { title: '代理门票资源', keepAlive: false, permission: 'scenicAgent_tickets:ticket' },
+      },
+    ],
+  },
+  {
+    path: '/scenicGoods',
+    name: 'scenicGoods',
+    component: Main,
+    meta: { title: '代理产品/套票', keepAlive: false, permission: '', icon: shallowRef(Commodity) },
+    children: [
+      {
+        path: '/scenicGoods/index',
+        name: 'scenicGoodsIndex',
+        component: () => import('@/pages/agent/scenicGoods/index.vue'),
+        meta: { title: '代理产品/套票', keepAlive: false, permission: 'scenicAgent_product:product' },
+      },
+    ],
+  },
+  {
+    path: '/merchant',
+    name: 'merchant',
+    component: Main,
+    meta: { title: '代理商户管理', keepAlive: false, permission: '', icon: shallowRef(EveryUser) },
+    children: [
+      {
+        path: '/merchant/index',
+        name: 'merchantIndex',
+        component: () => import('@/pages/agent/merchant/index.vue'),
+        meta: { title: '代理商户列表', keepAlive: false, permission: 'scenicAgent_merchant:query' },
+      },
+      {
+        path: '/merchant/scenicTransactionRecord',
+        name: 'scenicTransactionRecordIndex',
+        component: () => import('@/pages/agent/scenicTransactionRecord/index.vue'),
+        meta: { title: '代理流水记录', keepAlive: false, permission: 'scenicAgent_merchant:transaction_record' },
+      },
+      {
+        path: '/merchant/paymentApply',
+        name: 'paymentApplyIndex',
+        component: () => import('@/pages/agent/paymentApply/index.vue'),
+        meta: { title: '商户收款审核', keepAlive: false, permission: 'scenic_agent_payment_apply:payment_apply' },
+      },
+    ],
+  },
+  {
+    path: '/scenicStatistic',
+    name: 'scenicStatistic',
+    component: Main,
+    meta: { title: '统计报表', keepAlive: false, permission: '', icon: shallowRef(Analysis) },
+    children: [
+      {
+        path: '/scenicStatistic/scenic_ticket_statistic',
+        name: 'scenic_ticket_statistic',
+        component: () => import('@/pages/agent/scenicStatistic/scenicTicketStatistic.vue'),
+        meta: { title: '景区售票统计', keepAlive: false, permission: 'scenicAgent_stats:sale_stats' },
+      },
+      {
+        path: '/scenicStatistic/scenic_check_statistic',
+        name: 'scenic_check_statistic',
+        component: () => import('@/pages/agent/scenicStatistic/scenicCheckStatistic.vue'),
+        meta: { title: '景区核销统计', keepAlive: false, permission: 'scenicAgent_stats:check_stats' },
+      },
+      {
+        path: '/scenicStatistic/merchant_ticket_statistic',
+        name: 'merchant_ticket_statistic',
+        component: () => import('@/pages/agent/scenicStatistic/merchantTicketStatistic.vue'),
+        meta: { title: '商户售票统计', keepAlive: false, permission: 'scenicAgent_stats:sale_stats' },
+      },
+      {
+        path: '/scenicStatistic/merchant_check_statistic',
+        name: 'merchant_check_statistic',
+        component: () => import('@/pages/agent/scenicStatistic/merchantCheckStatistic.vue'),
+        meta: { title: '商户核销统计', keepAlive: false, permission: 'scenicAgent_stats:check_stats' },
+      },
+      {
+        path: '/scenicStatistic/guestCharts',
+        name: 'guestChartsIndex',
+        component: () => import('@/pages/agent/scenicStatistic/guestCharts/index.vue'),
+        meta: { title: '客户画像', keepAlive: false, permission: 'scenicAgent_setting:roles' },
+      },
+    ],
+  },
+  {
+    path: '/scenicReport',
+    name: 'scenicReport',
+    component: Main,
+    meta: { title: '报表下载', keepAlive: false, permission: '', icon: shallowRef(TableReport) },
+    children: [
+      {
+        path: '/scenicReport/index',
+        name: 'scenicReportIndex',
+        component: () => import('@/pages/agent/scenicReport/index.vue'),
+        meta: { title: '报表下载', keepAlive: false, permission: 'scenicAgent_stats:report' },
+      },
+    ],
+  },
+  {
+    path: '/scenicUsers',
+    name: 'scenicUsers',
+    component: Main,
+    meta: { title: '代理用户列表', keepAlive: false, permission: '', icon: shallowRef(EveryUser) },
+    children: [
+      {
+        path: '/scenicUsers/index',
+        name: 'scenicUsersIndex',
+        component: () => import('@/pages/agent/scenicUsers/index.vue'),
+        meta: { title: '代理用户列表', keepAlive: false, permission: 'scenicAgent_setting:users' },
+      },
+    ],
+  },
+  {
+    path: '/messageUsers',
+    name: 'messageUsers',
+    component: Main,
+    meta: { title: '消息用户管理', keepAlive: false, permission: '', icon: shallowRef(Message) },
+    children: [
+      {
+        path: '/messageUsers/index',
+        name: 'messageUsersIndex',
+        component: () => import('@/pages/messageUsers/index.vue'),
+        meta: { title: '消息用户列表', keepAlive: false, permission: 'scenic_agent_message_type_user:users' },
+      },
+    ],
+  },
+  {
+    path: '/scenicRole',
+    name: 'scenicRole',
+    component: Main,
+    meta: { title: '代理角色管理', keepAlive: false, permission: '', icon: shallowRef(Permissions) },
+    children: [
+      {
+        path: '/scenicRole/index',
+        name: 'scenicRoleIndex',
+        component: () => import('@/pages/agent/scenicRole/index.vue'),
+        meta: { title: '代理角色管理', keepAlive: false, permission: 'scenicAgent_setting:roles' },
+      },
+    ],
+  },
+  {
+    path: '/moneyAcount',
+    name: 'moneyAcount',
+    component: Main,
+    meta: { title: '收款账户设置', keepAlive: false, permission: '', icon: shallowRef(IncomeOne) },
+    children: [
+      {
+        path: '/moneyAcount/index',
+        name: 'moneyAcountIndex',
+        component: () => import('@/pages/agent/moneyAcount/index.vue'),
+        meta: { title: '收款账户设置', keepAlive: false, permission: 'scenicAgent_seting:install_account' },
+      },
+    ],
+  },
+  {
+    path: '/order',
+    name: 'order',
+    component: Main,
+    meta: { title: '订单管理', keepAlive: false, permission: '', icon: shallowRef(Order) },
+    children: [
+      {
+        path: '/order/index',
+        name: 'orderIndex',
+        component: () => import('@/pages/merchant/order/index.vue'),
+        meta: { title: '商品下单', keepAlive: false, permission: 'merchant_orders:order_query' },
+      },
+      {
+        path: '/order/list',
+        name: 'orderList',
+        component: () => import('@/pages/merchant/order/list.vue'),
+        meta: { title: '订单列表', keepAlive: false, permission: 'merchant_orders:order_query' },
+      },
+      {
+        path: '/order/cancel',
+        name: 'orderCancel',
+        component: () => import('@/pages/merchant/order/cancel.vue'),
+        meta: { title: '退单列表', keepAlive: false, permission: 'merchant_orders:order_query' },
+      },
+    ],
   },
   {
-    path: '/:pathMatch(.*)*', name: 'not-found', component: () => import('@/pages/exception/404.vue')
-  }
-]
+    path: '/ticket',
+    name: 'ticket',
+    component: Main,
+    meta: { title: '门票资源', keepAlive: false, permission: '', icon: shallowRef(Ticket) },
+    children: [
+      {
+        path: '/ticket/index',
+        name: 'ticketIndex',
+        component: () => import('@/pages/merchant/ticket/index.vue'),
+        meta: { title: '门票资源', keepAlive: false, permission: 'merchant_product:ticket' },
+      },
+    ],
+  },
+  {
+    path: '/goods',
+    name: 'goods',
+    component: Main,
+    meta: { title: '产品/套票', keepAlive: false, permission: '', icon: shallowRef(Commodity) },
+    children: [
+      {
+        path: '/goods/index',
+        name: 'goodsIndex',
+        component: () => import('@/pages/merchant/goods/index.vue'),
+        meta: { title: '产品/套票', keepAlive: false, permission: 'merchant_product:product' },
+      },
+    ],
+  },
+  {
+    path: '/pricecode',
+    name: 'pricecode',
+    component: Main,
+    meta: { title: '产品分销/价格码', keepAlive: false, permission: '', icon: shallowRef(Coupon) },
+    children: [
+      {
+        path: '/pricecode/index',
+        name: 'pricecodeIndex',
+        component: () => import('@/pages/merchant/pricecode/index.vue'),
+        meta: { title: '产品分销/价格码', keepAlive: false, permission: 'merchant_product:pricecode' },
+      },
+    ],
+  },
+  {
+    path: '/statistic',
+    name: 'statistic',
+    component: Main,
+    meta: { title: '统计报表', keepAlive: false, permission: '', icon: shallowRef(Analysis) },
+    children: [
+      {
+        path: '/statistic/scenic_sale_statistic',
+        name: 'scenic_sale_statistic',
+        component: () => import('@/pages/merchant/statistic/scenicSaleStatistic.vue'),
+        meta: { title: '景区售票统计', keepAlive: false, permission: 'merchant_stats:sales_stats' },
+      },
+      {
+        path: '/statistic/scenic_check_statistic',
+        name: 'scenic_check_statistic',
+        component: () => import('@/pages/merchant/statistic/scenicCheckStatistic.vue'),
+        meta: { title: '景区核销统计', keepAlive: false, permission: 'merchant_stats:check_stats' },
+      },
+      {
+        path: '/statistic/product_sale_statistic',
+        name: 'product_sale_statistic',
+        component: () => import('@/pages/merchant/statistic/productSaleStatistic.vue'),
+        meta: { title: '分销商售票统计', keepAlive: false, permission: 'merchant_stats:sales_stats' },
+      },
+      {
+        path: '/statistic/product_check_statistic',
+        name: 'product_check_statistic',
+        component: () => import('@/pages/merchant/statistic/productCheckStatistic.vue'),
+        meta: { title: '分销商核销统计', keepAlive: false, permission: 'merchant_stats:check_stats' },
+      },
+      {
+        path: '/statistic/scenic_agent_sale_statistic',
+        name: 'scenic_agent_sale_statistic',
+        component: () => import('@/pages/merchant/statistic/scenicAgentSaleStatistic.vue'),
+        meta: { title: '总代售票统计', keepAlive: false, permission: 'merchant_stats:sales_stats' },
+      },
+      {
+        path: '/statistic/scenic_agent_check_statistic',
+        name: 'scenic_agent_check_statistic',
+        component: () => import('@/pages/merchant/statistic/scenicAgentCheckStatistic.vue'),
+        meta: { title: '总代核销统计', keepAlive: false, permission: 'merchant_stats:check_stats' },
+      },
+    ],
+  },
+  {
+    path: '/report',
+    name: 'report',
+    component: Main,
+    meta: { title: '报表下载', keepAlive: false, permission: '', icon: shallowRef(TableReport) },
+    children: [
+      {
+        path: '/report/index',
+        name: 'reportIndex',
+        component: () => import('@/pages/merchant/report/index.vue'),
+        meta: { title: '报表下载', keepAlive: false, permission: 'merchant_stats:report' },
+      },
+    ],
+  },
+  {
+    path: '/messageUsers',
+    name: 'messageUsers',
+    component: Main,
+    meta: { title: '消息用户管理', keepAlive: false, permission: '', icon: shallowRef(Message) },
+    children: [
+      {
+        path: '/messageUsers/index',
+        name: 'messageUsersIndex',
+        component: () => import('@/pages/messageUsers/index.vue'),
+        meta: { title: '消息用户列表', keepAlive: false, permission: 'message_type_user:users' },
+      },
+    ],
+  },
+  {
+    path: '/users',
+    name: 'users',
+    component: Main,
+    meta: { title: '用户管理', keepAlive: false, permission: '', icon: shallowRef(EveryUser) },
+    children: [
+      {
+        path: '/users/index',
+        name: 'usersIndex',
+        component: () => import('@/pages/merchant/users/index.vue'),
+        meta: { title: '用户列表', keepAlive: false, permission: 'merchant_setting:users' },
+      },
+    ],
+  },
+  {
+    path: '/role',
+    name: 'role',
+    component: Main,
+    meta: { title: '角色管理', keepAlive: false, permission: '', icon: shallowRef(Permissions) },
+    children: [
+      {
+        path: '/role/index',
+        name: 'roleIndex',
+        component: () => import('@/pages/merchant/role/index.vue'),
+        meta: { title: '角色管理', keepAlive: false, permission: 'merchant_setting:roles' },
+      },
+    ],
+  },
+  {
+    path: '/otaPublic',
+    name: 'otaPublic',
+    component: Main,
+    meta: { title: '分销商管理', keepAlive: false, permission: '', icon: shallowRef(ShoppingMall) },
+    children: [
+      {
+        path: '/otaPublic/index',
+        name: 'otaPublicIndex',
+        component: () => import('@/pages/merchant/otaPublic/index.vue'),
+        meta: { title: '分销商列表', keepAlive: false, permission: '' },
+      },
+    ],
+  },
+  {
+    path: '/project',
+    name: 'project',
+    component: Main,
+    meta: { title: '景区管理', keepAlive: false, permission: '', icon: shallowRef(Landscape) },
+    children: [
+      {
+        path: '/project/index',
+        name: 'projectIndex',
+        component: () => import('@/pages/merchant/project/index.vue'),
+        meta: { title: '景区信息', keepAlive: false, permission: '' },
+      },
+    ],
+  },
+  {
+    path: '/scenicAgent',
+    name: 'scenicAgent',
+    component: Main,
+    meta: { title: '总代信息', keepAlive: false, permission: '', icon: shallowRef(DataScreen) },
+    children: [
+      {
+        path: '/scenicAgent/index',
+        name: 'scenicAgentIndex',
+        component: () => import('@/pages/merchant/scenicAgent/index.vue'),
+        meta: { title: '总代信息', keepAlive: false, permission: 'merchant_setting:scenicAgent' },
+      },
+      {
+        path: '/scenicAgent/transactionRecord',
+        name: 'transactionRecordIndex',
+        component: () => import('@/pages/merchant/transactionRecord/index.vue'),
+        meta: { title: '流水记录', keepAlive: false, permission: '' },
+      },
+    ],
+  },
+  {
+    path: '/paymentApply',
+    name: 'paymentApply',
+    component: Main,
+    meta: { title: '打款申请', keepAlive: false, permission: '', icon: shallowRef(Expenses) },
+    children: [
+      {
+        path: '/paymentApply/index',
+        name: 'paymentApplyIndex',
+        component: () => import('@/pages/merchant/paymentApply/index.vue'),
+        meta: { title: '商户打款申请', keepAlive: false, permission: 'merchant_payment_apply:payment_apply' },
+      },
+    ],
+  },
+  {
+    path: '/agencyPreOrder',
+    name: 'agencyPreOrder',
+    component: Main,
+    meta: { title: '旅行社预约', keepAlive: false, permission: '', icon: shallowRef(TicketOne) },
+    children: [
+      {
+        path: '/agencyPreOrder/groupPreOrder',
+        name: 'groupPreOrder',
+        component: () => import('@/pages/merchant/agencyPreOrder/groupPreOrder.vue'),
+        meta: { title: '团体预约', keepAlive: false, permission: 'message_agency:create' },
+      },
+      {
+        path: '/agencyPreOrder/preOrderList',
+        name: 'preOrderList',
+        component: () => import('@/pages/merchant/agencyPreOrder/preOrderList.vue'),
+        meta: { title: '预约订单', keepAlive: false, permission: 'message_agency:page' },
+      },
+    ],
+  },
+  {
+    path: '/:pathMatch(.*)*',
+    name: 'not-found',
+    component: () => import('@/pages/exception/404.vue'),
+  },
+];
 
 // 导出路由
 const router = createRouter({
   history: createWebHashHistory(),
-  routes
-})
+  routes,
+});
 
-export default router
+export default router;

+ 5 - 5
src/store/index.js

@@ -58,11 +58,11 @@ const store = createStore({
       })
     },
     getUserPermission ({ commit }) {
-      return getPermissions().then(res => {
-        commit('SET_USER_INFO2', res?.extraInfo)
-        return res?.extraInfo?.permissions
-        // return ['merchant_setting:users', 'merchant_setting:roles', 'merchant_setting:permissions', 'merchant_product:product', 'merchant_product:pricecode', 'merchant_orders:order_query', 'merchant_orders:order_create', 'merchant_orders:order_cancel', 'merchant_stats:sales_stats', 'merchant_stats:check_stats', 'merchant_stats:report']
-      })
+      // return getPermissions().then(res => {
+      //   commit('SET_USER_INFO2', res?.extraInfo)
+      //   return res?.extraInfo?.permissions
+      //   // return ['merchant_setting:users', 'merchant_setting:roles', 'merchant_setting:permissions', 'merchant_product:product', 'merchant_product:pricecode', 'merchant_orders:order_query', 'merchant_orders:order_create', 'merchant_orders:order_cancel', 'merchant_stats:sales_stats', 'merchant_stats:check_stats', 'merchant_stats:report']
+      // })
     }
   },
   modules: {

+ 1 - 1
src/utils/request.js

@@ -6,7 +6,7 @@ const appType = import.meta.env.VITE_APP_TYPE
 // 创建axios实例
 console.log(window.config.baseURL)
 const service = axios.create({
-  baseURL: !import.meta.env.PROD ? '/api/' : (window.config && window.config.baseURL)
+  baseURL: !import.meta.env.PROD ? '/tenant' : (window.config && window.config.baseURL)
   // timeout: 5000 // 请求超时时间
 })
 

+ 6 - 0
vite.config.js

@@ -25,6 +25,12 @@ export default defineConfig(({ command, mode }) => {
           target: 'https://potadev.cleartv.cn/',
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, '')
+        },
+        '/tenant': {
+        // target: 'https://pdev.cleartv.cn/cticketmember/',
+          target: 'https://oriented-quail-refined.ngrok-free.app/',
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, '')
         }
       }
     }