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

oem/thj/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "铁合金掌上行",
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.132:8080/cfg?key=test_132",
+  "apiUrl": "http://192.168.31.167:8080/cfg?key=test_167",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/packages/mobile/views/swap/detail/Index.vue

@@ -51,6 +51,7 @@ import { useLoginStore, useUserStore } from '@/stores'
 import AppList from '@mobile/components/base/list/index.vue'
 import { getUserId } from '@/services/methods/user'
 import { formatDecimal } from '@/filters'
+import { onActivated } from 'vue'
 
 const Price = defineAsyncComponent(() => import('@mobile/components/modules/quote/price/index.vue'))
 const Chart = defineAsyncComponent(() => import('@mobile/components/modules/hqchart/index.vue'))
@@ -74,7 +75,8 @@ const userStore = useUserStore()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => onRefresh())
 
 /// 查询用户掉期协议签署表
-const { dataList: protocolList } = useRequest(queryMdUserSwapProtocol, {
+const { dataList: protocolList, run: runMdUserSwapProtocol } = useRequest(queryMdUserSwapProtocol, {
+    manual: true,
     params: {
         userId: getUserId()
     }
@@ -163,4 +165,9 @@ const onListing = () => {
     openComponent('listing')
 }
 
+onActivated(() => {
+    /// 查询
+    runMdUserSwapProtocol()
+})
+
 </script>

src/packages/mobile/views/swap/list/Index.vue

@@ -168,9 +168,9 @@ onActivated(() => {
         if (oem === 'tjmd') { // 天津麦顿
             canProtocolSign.value = res.data.some(e => e.protocolstatus === 4)
         } else {
-            canProtocolSign.value = true
             // 铁合金
             if (res.data.length === 0) {
+                canProtocolSign.value = true
                 initMdUserSwapProtocol()
             } else {
                 canProtocolSign.value = res.data.some(e => e.protocolstatus === 4)

src/packages/thj/views/account/protocol/Index.vue

@@ -26,7 +26,7 @@ import { CellGroup, Cell, showFailToast, showToast } from 'vant'
 import { fullloading } from '@/utils/vant';
 import { useNavigation } from '@mobile/router/navigation'
 import { useRequest } from '@/hooks/request'
-import { queryTencentUsereSignRecords, requestInitTencentESS } from '@/services/api/account';
+import { queryTencentUsereSignRecords, requestInitMdUserSwapProtocol } from '@/services/api/account';
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account';
 import plus from '@/utils/h5plus'
 import { getUserId } from '@/services/methods/user'
@@ -55,13 +55,13 @@ const { run } = useRequest(queryTencentUsereSignRecords, {
             dataList.value = res.data
         }  else {
             /// 创建电子签合同
-            initTencentESS()
+            initMdUserSwapProtocol()
         }
     }
 })
 
 /// 创建电子签合同
-const { run: initTencentESS } = useRequest(requestInitTencentESS, {
+const { run: initMdUserSwapProtocol } = useRequest(requestInitMdUserSwapProtocol, {
     manual: true,
     params: {
         userId: getUserId(),