Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

oem/gcszt/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "贵茶数字通",
   "version": "1.0.6",
   "versionCode": "100006",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.134:8080/cfg?key=test_134",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/gcszt/views/account/certification/Index.vue

@@ -57,7 +57,7 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted, ref, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
-import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule, Image, Cell } from 'vant'
+import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule } from 'vant'
 import { fullloading, dialog } from '@/utils/vant';
 import { getIdCardAge } from '@/filters';
 import { useRequest } from '@/hooks/request'

src/packages/gcszt/views/mine/Index.vue

@@ -262,7 +262,7 @@ onActivated(() => {
         }
     }).then((res) => {
         /// 判断是否能签约
-        hasSignContract.value = !res.data.map(e => e.recordstatus != 3)
+        hasSignContract.value = !res.data.some(e => e.recordstatus != 3)
     })
 })
 </script>

src/packages/pc/views/account/sign/index.vue

@@ -99,10 +99,12 @@ const { dataList: records} = useRequest(queryUsereSignRecords, {
 
 /// 判断是否能签约
 const canBankSign = computed(() => {
-    if (oem === 'tjmd') {
+    if ( oem.toLowerCase() === 'tjmd' ) {
         return protocolList.value.some(e => { return e.protocolstatus === 4 })
-    } else if (oem === 'zrwyt') {
+    } else if ( oem.toLowerCase() === 'zrwyt' ) {
         return records.value.some(e => { return e.recordstatus === 3 })
+    } else if ( oem.toLowerCase() === 'gcszt' ) {
+        return !records.value.some(e => { return e.recordstatus != 3 })
     }
     return true
 })