From 40bdf87e99369f2e5eb692c0d21349fef78d886e Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Thu, 16 Apr 2026 17:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts                |  3 +-
 src/views/order_teamaster/edit.vue | 26 ++++-------
 src/views/teamaster_user/edit.vue  | 41 ++++++++++-------
 src/views/teamaster_user/index.vue | 74 ++++++++++++++++++++++--------
 src/views/user/setting.vue         |  7 +++
 vite.config.ts                     |  3 +-
 6 files changed, 101 insertions(+), 53 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index a3e2984..5f963f5 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -5,7 +5,8 @@ const config = {
     // 开发环境使用相对路径（通过代理），生产环境使用完整URL
     baseUrl: import.meta.env.DEV
         ? '/'
-        : `${import.meta.env.VITE_APP_BASE_URL || 'https://test1.stnav.com'}/`, //请求接口域名
+        // : `${import.meta.env.VITE_APP_BASE_URL || 'https://test1.stnav.com'}/`, //请求接口域名
+        : `${import.meta.env.VITE_APP_BASE_URL || 'https://76458.com'}/`, //请求接口域名
     urlPrefix: 'brokerapi', //请求默认前缀
     timeout: 10 * 1000 //请求超时时长
 }
diff --git a/src/views/order_teamaster/edit.vue b/src/views/order_teamaster/edit.vue
index 5772897..6e00151 100644
--- a/src/views/order_teamaster/edit.vue
+++ b/src/views/order_teamaster/edit.vue
@@ -1,15 +1,9 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                
+
             </el-form>
         </popup>
     </div>
@@ -35,13 +29,13 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑茶艺师订单表' : '新增茶艺师订单表'
+    return mode.value == 'edit' ? '编辑茶艺师订单' : '新增茶艺师订单'
 })
 
 // 表单数据
 const formData = reactive({
     id: '',
-    
+
 })
 
 
@@ -59,8 +53,8 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+
+
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -74,9 +68,9 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiOrderTeamasterEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOrderTeamasterEdit(data)
         : await apiOrderTeamasterAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue
index 9fb547a..2fa784b 100644
--- a/src/views/teamaster_user/edit.vue
+++ b/src/views/teamaster_user/edit.vue
@@ -9,25 +9,32 @@
                         :preview-src-list="[formData.avatar]" preview-teleported></el-image>
                 </el-form-item>
                 <el-form-item label="本人照片" prop="image">
-                    <el-image style="width: 100px; height: 100px" :src="formData.image" fit="cover"
-                        :preview-src-list="[formData.image]" preview-teleported></el-image>
-                    <!-- <material-picker v-model="formData.image" :limit="1" /> -->
+                    <div v-if="formData.image.length > 0">
+                        <el-image style="width: 100px; height: 100px" v-for="(item, index) in formData.image"
+                            :key="index" :src="item" fit="cover" :preview-src-list="formData.image"
+                            preview-teleported></el-image>
+                    </div>
+                    <div v-else>未上传</div>
                 </el-form-item>
-                <el-form-item label="茶艺师资格证书" prop="license_img">
-                    <el-image style="width: 100px; height: 100px" :src="formData.license_img" fit="cover"
-                        :preview-src-list="[formData.license_img]" preview-teleported></el-image>
-                    <!-- <material-picker v-model="formData.license_img" :limit="1" /> -->
-                </el-form-item>
-                <el-form-item label="个人展示" prop="information">
-                    <!-- <material-picker v-model="formData.information" :limit="9" /> -->
-                    <el-image style="width: 100px; height: 100px" v-for="(item, index) in formData.information"
-                        :key="index" :src="item" fit="cover" :preview-src-list="formData.information"
-                        preview-teleported></el-image>
+                <el-form-item label="资格证书" prop="license_img">
+                    <div v-if="formData.license_img">
+                        <el-image style="width: 100px; height: 100px" :src="formData.license_img" fit="cover"
+                            :preview-src-list="[formData.license_img]" preview-teleported></el-image>
+                    </div>
+                    <div v-else>未上传</div>
                 </el-form-item>
                 <el-form-item label="健康证" prop="health_certificate">
-                    <el-image style="width: 100px; height: 100px" :src="formData.health_certificate" fit="cover"
-                        :preview-src-list="[formData.license_img]" preview-teleported></el-image>
-                    <!-- <material-picker v-model="formData.health_certificate" :limit="1" /> -->
+                    <div v-if="formData.health_certificate">
+                        <el-image style="width: 100px; height: 100px" :src="formData.health_certificate" fit="cover"
+                            :preview-src-list="[formData.license_img]" preview-teleported></el-image>
+                    </div>
+                    <div v-else>未上传</div>
+                </el-form-item>
+                <el-form-item label="身份证正面" prop="front_card">
+                    <material-picker v-model="formData.front_card" :limit="1" />
+                </el-form-item>
+                <el-form-item label="身份证反面" prop="back_card">
+                    <material-picker v-model="formData.back_card" :limit="1" />
                 </el-form-item>
                 <el-form-item label="专属圈子" prop="label_id">
                     <el-select v-model="formData.label_id" multiple placeholder="请选择" style="width: 240px" disabled>
@@ -203,6 +210,8 @@ const formData = reactive({
     health_certificate: '',
     label_id: '',
     broker_user_id: '',
+    front_card: '',
+    back_card: '',
 })
 
 // 城市列表
diff --git a/src/views/teamaster_user/index.vue b/src/views/teamaster_user/index.vue
index 5d02199..ffa9704 100644
--- a/src/views/teamaster_user/index.vue
+++ b/src/views/teamaster_user/index.vue
@@ -74,34 +74,70 @@
 
                     <el-table-column label="本人照片" prop="image" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <el-image v-if="row.image.length > 0" style="width:50px;height:50px;" :src="row.image[0]"
-                                :preview-src-list="[row.image[0]]" preview-teleported />
+                            <div v-if="row.image.length > 0">
+                                <el-image v-if="row.image.length > 0" style="width:50px;height:50px;"
+                                    :src="row.image[0]" :preview-src-list="[row.image[0]]" preview-teleported />
+                            </div>
+                            <div v-else>未上传</div>
                         </template>
                     </el-table-column>
                     <el-table-column label="姓名" prop="nickname" show-overflow-tooltip />
                     <el-table-column label="昵称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="茶艺师等级" prop="level">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.level" :value="row.level" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="茶艺服务单价" prop="price" show-overflow-tooltip />
-                    <el-table-column label="车马费/每公里" prop="mileage_price" show-overflow-tooltip />
-                    <el-table-column label="服务次数" prop="sold" show-overflow-tooltip />
-                    <el-table-column label="服务方式" prop="server_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.server_type" :value="row.server_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="账户余额" prop="user_money" show-overflow-tooltip />
-                    <el-table-column label="不可提现金额" prop="no_reflect_amount" show-overflow-tooltip />
-                    <el-table-column label="累计额度" prop="total_amount" show-overflow-tooltip />
-                    <el-table-column label="累计提现" prop="total_reflect_amount" show-overflow-tooltip />
                     <el-table-column label="状态" prop="state">
                         <template #default="{ row }">
                             <dict-value :options="dictData.state" :value="row.state" />
                         </template>
                     </el-table-column>
+                    <el-table-column label="茶艺师等级" prop="level" width="140">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.level" :value="row.level" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="服务" prop="server_type" width="260">
+                        <template #default="{ row }">
+                            <div class="flex flex-col gap-1.5 text-sm">
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">茶艺服务单价: </span>
+                                    <span>{{ row.price }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">车马费/公里: </span>
+                                    <span>{{ row.mileage_price }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">服务方式: </span>
+                                    <span><dict-value :options="dictData.server_type" :value="row.server_type" /></span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">服务次数: </span>
+                                    <span>{{ row.sold }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="账户" prop="user_money" width="260">
+                        <template #default="{ row }">
+                            <div class="flex flex-col gap-1.5 text-sm">
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">账户余额: </span>
+                                    <span>{{ row.user_money }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">不可提现金额: </span>
+                                    <span>{{ row.no_reflect_amount }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">累计额度: </span>
+                                    <span>{{ row.total_amount }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">累计提现: </span>
+                                    <span>{{ row.total_reflect_amount }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['teamaster_user/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/user/setting.vue b/src/views/user/setting.vue
index dafebc0..8d296b7 100644
--- a/src/views/user/setting.vue
+++ b/src/views/user/setting.vue
@@ -13,6 +13,12 @@
                     </div>
                 </el-form-item>
 
+                <el-form-item label="企业简称：" prop="company_abv">
+                    <div class="w-80">
+                        <el-input v-model="formData.company_abv" disabled />
+                    </div>
+                </el-form-item>
+
                 <el-form-item label="企业税号：" prop="company_sh">
                     <div class="w-80">
                         <el-input v-model="formData.company_sh" disabled />
@@ -86,6 +92,7 @@ const formData = reactive({
     avatar: '', // 头像
     account: '', // 账号
     company_name: '', // 企业名称
+    company_abv: '', // 企业简称
     company_sh: '', // 企业税号
     company_address: '', // 企业地址
     company_url: '', // 营业执照
diff --git a/vite.config.ts b/vite.config.ts
index 850679c..6709035 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -45,7 +45,8 @@ export default defineConfig({
         open: true,
         proxy: {
             '/brokerapi': {
-                target: 'https://test1.stnav.com',
+                // target: 'https://test1.stnav.com',
+                target: 'https://76458.com',
                 changeOrigin: true,
                 secure: true,
                 rewrite: (path) => path