diff --git a/src/app/admin/device/device-list/device-list.component.html b/src/app/admin/device/device-list/device-list.component.html
index 3076443..1331620 100644
--- a/src/app/admin/device/device-list/device-list.component.html
+++ b/src/app/admin/device/device-list/device-list.component.html
@@ -149,21 +149,30 @@
- 小票顶部标题
+
+ 小票顶部标题
+
+
-
+
- 小票来源显示
+
+ 小票来源显示
+
+
- 小票底部文案
+
+ 小票底部文案
+
+
diff --git a/src/app/admin/merchant-store/oli/oli.component.html b/src/app/admin/merchant-store/oli/oli.component.html
index e8bd3d9..fdcff7c 100644
--- a/src/app/admin/merchant-store/oli/oli.component.html
+++ b/src/app/admin/merchant-store/oli/oli.component.html
@@ -36,7 +36,7 @@
操作 |
- 价格 |
+ 金额 |
折扣 |
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index cc5edd5..ca22a39 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
export const environment = {
production: false,
- baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'http://localhost:9302/filesystem/',
- // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
- // imageUrl: 'https://hsg.dctpay.com/filesystem/',
+/* baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'http://localhost:9302/filesystem/',*/
+ baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
};