Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

oem/gstj/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "甘肃碳交",
   "version": "1.0.29",
   "versionCode": "100029",
-  "apiUrl": "http://8.130.69.63:8280/cfg?key=gstj",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/gstj/views/holdbank/holddeposit/components/apply/Index.vue

@@ -26,7 +26,8 @@
                     <Field v-model="Remark" label="备注" placeholder="请输入备注" />
                 </CellGroup>
                 <div class="tips_time">
-                    <span class="tips">操作时间：交易日 {{ startTime }} - {{ endTime }}</span>
+                    <span class="tips">入金时间：交易日 {{ startTime }} - {{ endTime }}</span>
+                    <span class="tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
                 </div>
             </Form>
             <template #footer>

src/packages/gstj/views/holdbank/holddeposit/components/apply/index.less

@@ -1,4 +1,6 @@
 .tips_time {
     background-color: white; 
+    border-radius: 5px; 
     margin: 10px 15px; 
+    padding: 10px 15px;
 }

src/packages/gstj/views/holdbank/holdsign/components/apply/Index.vue

@@ -21,6 +21,7 @@
                 <CellGroup inset>
                     <div class="tips_time">
                         <span class="tips">操作时间：交易日 {{ startTime }} - {{ endTime }}</span>
+                        <span class="tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
                     </div>
                 </CellGroup>
             </Form>

src/packages/gstj/views/holdbank/holdsign/components/apply/index.less

@@ -1,5 +1,7 @@
 
 .tips_time {
     background-color: white; 
-    padding: 10px; 
+    border-radius: 5px; 
+    margin: 10px 15px; 
+    padding: 10px 15px;
 }