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

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

@@ -123,11 +123,11 @@ const columns: Model.TableColumn[] = [
 const rowClick = (row: Model.QuoteGoodsListRsp) => {
     /// 这里要去判断是否已经实名认证
     if (userStore.hasAuth) {
-        if (protocolList.value.length != 0) {
+        if (userStore.userInfo.usertype != 2 && protocolList.value.length === 0) {
+            showToast('请前往‘我的’-’合同签署‘，进行签署相应的合同！')
+        } else {
             setGlobalUrlParams(row)
             router.push({ name: 'swap-detail' })
-        } else {
-            showToast('请前往‘我的’-’合同签署‘，进行签署相应的合同！')
         }
     } else {
         showToast('未实名认证，请先去实名认证，如果已提交实名认证，请耐心等待审核通过！')

src/packages/pc/components/modules/quote/tik/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-quote-tik">
         <div class="app-quote-tik__header">
-            <h4>分时成交</h4>
+            <h4>{{ quoteDay?.marketid != 99201 ? '分时成交' : '参考价格' }}</h4>
             <!-- <span>更多</span> -->
         </div>
         <div class="app-quote-tik__body" v-if="quoteDay">

src/packages/pc/views/footer/goods/order/index.vue

@@ -1,7 +1,7 @@
 <!-- 商品订单- 委托 -->
 <template>
     <app-table ref="tableRef" :data="tableList" selection-type="multiple" v-model:columns="tableColumns" :loading="loading"
-        @selection-change="onTableSelect" @row-dblclick="onCancelSumit">
+        @selection-change="onTableSelect" @row-dblclick="onDBClickCancel">
         <template #headerRight>
             <div class="buttonbar">
                 <el-button type="primary" size="small" :disabled="selectedRows.length === 0"
@@ -81,7 +81,7 @@ const tableColumns = ref<Model.TableColumn[]>([
 ])
 
 /// 双击单据撤销
-const onCancelSumit = (row: Model.TradeOrderDetailRsp) => {
+const onDBClickCancel = (row: Model.TradeOrderDetailRsp) => {
     selectedRows.value = [row]
     tableRef.value?.elTable.toggleRowSelection(row, true) // 双击选中该行
     openComponent('cancel')

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

@@ -118,12 +118,12 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 const onRowClick = (row: Model.QuoteGoodsListRsp) => {
     /// 这里要去判断是否已经实名认证
     if (userStore.hasAuth) {
-        if (protocolList.value.length != 0) {
+        if (userStore.userInfo.usertype != 2 && protocolList.value.length === 0) {
+            ElMessage('请前往手机App进入‘我的’-’合同签署‘功能，进行签署相应的合同！')
+        } else {
             futuresStore.selectedGoodsId = row.refgoodsid
             selectedRow.value = row
             openComponent('detail')
-        } else {
-            ElMessage('请前往手机App进入‘我的’-’合同签署‘功能，进行签署相应的合同！')
         }
     } else {
         ElMessage('未实名认证，请先去实名认证，如果已提交实名认证，请耐心等待审核通过！')