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

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

@@ -158,7 +158,7 @@ const onDelisting = (row: Model.TjmdTradeOrderDetailRsp) => {
         case 1:  /// 未签署
             /// 传对应的机构 ID
             /// 进行下一步
-            router.push({name: 'account-protocol', query: { memberUserId: row.userid.toString() }})
+            router.push({ name: 'account-protocol', query: { memberUserId: row.userid.toString() }})
             break; 
         default: /// 其他状态
             break;

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

@@ -127,7 +127,7 @@ const rowClick = (row: Model.QuoteGoodsListRsp) => {
             setGlobalUrlParams(row)
             router.push({ name: 'swap-detail' })
         } else {
-            showToast('请前往‘我的’-’合同签署‘，进行签署相应的合同条例才能进行交易！')
+            showToast('请前往‘我的’-’合同签署‘，进行签署相应的合同！')
         }
     } else {
         showToast('未实名认证，请先去实名认证，如果已提交实名认证，请耐心等待审核通过！')

src/packages/pc/views/market/trade/swap/index.vue

@@ -123,7 +123,7 @@ const onRowClick = (row: Model.QuoteGoodsListRsp) => {
             selectedRow.value = row
             openComponent('detail')
         } else {
-            ElMessage('请前往手机App进入‘我的’-’合同签署‘功能，进行签署相应的合同条例才能进行交易！')
+            ElMessage('请前往手机App进入‘我的’-’合同签署‘功能，进行签署相应的合同！')
         }
     } else {
         ElMessage('未实名认证，请先去实名认证，如果已提交实名认证，请耐心等待审核通过！')