Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/hard/hard-thrid-zy.ts

@@ -3,7 +3,7 @@ import request from "/@/utils/request"
 // 交易数据同步
 export function syncNativeCardTradeInfo(query?: any) {
 	return request({
-		url: "/wallet/hard-third-zy/sync-native-card-trade",
+		url: "/hard/hard-third-zy/sync-native-card-trade",
 		method: "get",
 		params: query,
 	})

src/views/wallet/wallet-setting/components/third-zy/index.vue

@@ -30,9 +30,8 @@
 				</el-table-column>
 				<el-table-column prop="orgRes" label="原始res" show-overflow-tooltip>
 					<template #default="{ row }">
-						<el-button text :type="row.orgRes ? 'primary' : 'danger'" @click="row.orgRes && handleClickJsonView(row.orgRes)">
-							查看
-						</el-button>
+						<el-button v-if="row.orgRes" text type="primary" @click="row.orgRes && handleClickJsonView(row.orgRes)"> 查看 </el-button>
+						<div class="color-danger" v-else>null</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="encipherRes" label="加密res" show-overflow-tooltip>
@@ -68,6 +67,7 @@
 						>
 							详情
 						</el-button>
+						<div v-else class="color-danger">null</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="version" label="同步版本" show-overflow-tooltip />