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

src/views/wallet/mch-manage/index.vue

@@ -57,6 +57,16 @@
 						</div>
 					</template>
 				</el-table-column>
+				<el-table-column prop="walletTypeUniqueCode" width="200" label="支付默认钱包">
+					<template #default="{ row }">
+						<div class="flex items-center justify-center">
+							<div class="color-primary">{{ row.walletTypeName }}</div>
+							<div class="flex items-center just ml5">
+								<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+							</div>
+						</div>
+					</template>
+				</el-table-column>
 				<el-table-column prop="deptName" label="部门" />
 				<el-table-column prop="phone" label="联系电话" show-overflow-tooltip :min-width="120" />
 				<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip :min-width="160">
@@ -69,14 +79,8 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
-				<el-table-column label="操作" width="150">
+				<el-table-column label="操作" width="200">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(scope.row.id)">
-							编辑
-						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([scope.row.id])">
-							删除
-						</el-button>
 						<el-button
 							icon="setting"
 							text
@@ -86,6 +90,12 @@
 						>
 							配置
 						</el-button>
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([scope.row.id])">
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -108,7 +118,7 @@ import { useDict } from "/@/hooks/dict"
 import FormDialog from "./form.vue"
 import Setting from "./setting.vue"
 
-const { merchant_type } = useDict("merchant_type")
+const { merchant_type, wallet_type } = useDict("merchant_type", "wallet_type")
 // 定义变量内容
 const formDialogRef = ref()
 const settingDialogRef = ref()