提交代码

src/app/admin/device/device-list/device-list.component.html

@@ -149,21 +149,30 @@
         </nz-form-item>
 
         <nz-form-item>
-            <nz-form-label [nzSpan]="6">小票顶部标题</nz-form-label>
+            <nz-form-label [nzSpan]="6">
+                小票顶部标题
+                <i nz-icon nz-tooltip nzTooltipTitle="“小票顶部标题” 最多7位字符" nzType="question-circle" nzTheme="outline"></i>
+            </nz-form-label>
             <nz-form-control [nzSpan]="14">
-                <input nz-input formControlName="receiptTop" maxlength="5" [placeholder]="'默认：嗨森逛'"/>
+                <input nz-input formControlName="receiptTop" maxlength="7" [placeholder]="'默认：嗨森逛'"/>
             </nz-form-control>
         </nz-form-item>
 
         <nz-form-item>
-            <nz-form-label [nzSpan]="6">小票来源显示</nz-form-label>
+            <nz-form-label [nzSpan]="6">
+                小票来源显示
+                <i nz-icon nz-tooltip nzTooltipTitle="“小票来源显示” 最多10位字符" nzType="question-circle" nzTheme="outline"></i>
+            </nz-form-label>
             <nz-form-control [nzSpan]="14">
                 <input nz-input formControlName="receiptSource" maxlength="10" [placeholder]="'默认：嗨森逛'"/>
             </nz-form-control>
         </nz-form-item>
 
         <nz-form-item>
-            <nz-form-label [nzSpan]="6">小票底部文案</nz-form-label>
+            <nz-form-label [nzSpan]="6">
+                小票底部文案
+                <i nz-icon nz-tooltip nzTooltipTitle="“小票底部文案” 最多15位字符" nzType="question-circle" nzTheme="outline"></i>
+            </nz-form-label>
             <nz-form-control [nzSpan]="14">
                 <input nz-input formControlName="receiptBottom" maxlength="15" [placeholder]="'默认：开心又省钱；来”嗨森逛“'"/>
             </nz-form-control>

src/app/admin/merchant-store/oli/oli.component.html

@@ -36,7 +36,7 @@
             <th rowspan="2" nzWidth="150px" nzRight="0px">操作</th>
         </tr>
         <tr>
-            <th nzWidth="60px">价格</th>
+            <th nzWidth="60px">金额</th>
             <th nzWidth="60px">折扣</th>
         </tr>
         </thead>

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=',
 };