li.shaoyi 6 місяців тому
батько
коміт
63423866dc

+ 2 - 2
oem/sjgj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.sjgj",
   "appName": "纯金网结算中心",
-  "version": "1.0.9",
-  "versionCode": "100009",
+  "version": "1.0.10",
+  "versionCode": "100010",
   "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 2
oem/tss-vi/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tssvi",
   "appName": "Tce Vietnam",
-  "version": "1.0.54",
-  "versionCode": "100054",
+  "version": "1.0.55",
+  "versionCode": "100055",
   "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
   "tradeChannel": "ws",
   "showLoginAlert": true,

+ 2 - 2
oem/tss/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tss",
   "appName": "TCE",
-  "version": "1.0.53",
-  "versionCode": "100053",
+  "version": "1.0.55",
+  "versionCode": "100055",
   "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
   "tradeChannel": "ws",
   "showLoginAlert": true,

+ 6 - 8
src/packages/gcszt/views/account/protocol/Index.vue

@@ -14,7 +14,8 @@
             </CellGroup>
             <CellGroup inset>
                 <template v-for="(item, index) in dataList" :key="index">
-                    <Cell :title="item.templatename" :icon="iconName(item.recordstatus)" @click="signer(item)" is-link />
+                    <Cell :title="item.templatename" :icon="iconName(item.recordstatus)" @click="signer(item)"
+                        is-link />
                 </template>
                 <template v-if="thirdStepList.length != 0">
                     <template v-for="(item, index) in thirdStepList" :key="index">
@@ -29,7 +30,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, onMounted } from 'vue'
-import { CellGroup, Cell, showFailToast, showToast } from 'vant'
+import { CellGroup, Cell, showFailToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant';
 import { useNavigation } from '@mobile/router/navigation'
 import { useRequest } from '@/hooks/request'
@@ -64,8 +65,8 @@ const { run } = useRequest(queryUsereSignRecords, {
     },
     onSuccess: (res) => {
         if (res.data != null && res.data.length != 0) {
-            dataList.value = res.data.filter(e => e.templatetype === 2 )
-            thirdStepList.value = res.data.filter(e => e.templatetype === 3 )
+            dataList.value = res.data.filter(e => e.templatetype === 2)
+            thirdStepList.value = res.data.filter(e => e.templatetype === 3)
         }
     }
 })
@@ -82,10 +83,7 @@ const iconName = (type: number) => {
 const openWebview = (url: string) => {
     const ua = window.navigator.userAgent.toLowerCase()
     if (ua.indexOf('micromessenger') !== -1) {
-        showToast({
-            type: 'fail',
-            message: '请使用浏览器打开此页面'
-        })
+        showFailToast('请使用浏览器打开此页面')
     } else {
         plus.openWebview({
             url,

+ 5 - 2
src/packages/tss/views/bank/wallet/components/inoutapply/Index.vue

@@ -45,7 +45,8 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button, showToast } from 'vant'
+import { Button } from 'vant'
+import { showFailToast } from 'vant'
 import { useRequest } from '@/hooks/request'
 import { queryAccountInOutApply, getAmtInByPaidUrl } from '@/services/api/bank'
 import { getInOutApplyStatusName, getInOutExecuteTypeName } from '@/constants/order'
@@ -77,7 +78,9 @@ const goToAmtInByPaidUrl = (item: Model.AccountOutInApplyRsp) => {
             exchticket: item.exchticket
         }
     }).then((res) => {
-        plus.openURL(res.data.url)
+        plus.openURL(res.data.url, (error) => {
+            showFailToast(error.message || '打开失败')
+        })
     })
 }
 

+ 4 - 4
src/utils/h5plus/index.ts

@@ -9,7 +9,7 @@ declare global {
     }
 }
 
-interface AndroidErrorCallback {
+interface Exception {
     code: number;
     message: string;
 }
@@ -342,10 +342,10 @@ export default new (class {
      * https://www.html5plus.org/doc/zh_cn/runtime.html#plus.runtime.openURL
      * @param url 
      */
-    openURL(url: string) {
+    openURL(url: string, errorCB?: (error: Exception) => void) {
         if (this.hasPlus()) {
             this.onPlusReady((plus) => {
-                plus.runtime.openURL(url)
+                plus.runtime.openURL(url, errorCB)
             })
         } else {
             window.open(url)
@@ -549,7 +549,7 @@ export default new (class {
                     if (e.granted.length > 0) {
                         onSuccess && onSuccess()
                     }
-                }, (e: AndroidErrorCallback) => {
+                }, (e: Exception) => {
                     onError && onError(e.message)
                 })
             })