完善功能

src/api/parten_account_log.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 城市合伙人流水表列表
+export function apiPartenAccountLogLists(params: any) {
+    return request.get({ url: '/parten_account_log/lists', params })
+}
+
+// 添加城市合伙人流水表
+export function apiPartenAccountLogAdd(params: any) {
+    return request.post({ url: '/parten_account_log/add', params })
+}
+
+// 编辑城市合伙人流水表
+export function apiPartenAccountLogEdit(params: any) {
+    return request.post({ url: '/parten_account_log/edit', params })
+}
+
+// 删除城市合伙人流水表
+export function apiPartenAccountLogDelete(params: any) {
+    return request.post({ url: '/parten_account_log/delete', params })
+}
+
+// 城市合伙人流水表详情
+export function apiPartenAccountLogDetail(params: any) {
+    return request.get({ url: '/parten_account_log/detail', params })
+}

src/api/wxcode.ts

@@ -1,26 +0,0 @@
-import request from '@/utils/request'
-
-// 渠道列表
-export function apiWxcodeLists(params: any) {
-    return request.get({ url: '/wxcode/lists', params })
-}
-
-// 添加渠道
-export function apiWxcodeAdd(params: any) {
-    return request.post({ url: '/wxcode/add', params })
-}
-
-// 编辑渠道
-export function apiWxcodeEdit(params: any) {
-    return request.post({ url: '/wxcode/edit', params })
-}
-
-// 删除渠道
-export function apiWxcodeDelete(params: any) {
-    return request.post({ url: '/wxcode/delete', params })
-}
-
-// 渠道详情
-export function apiWxcodeDetail(params: any) {
-    return request.get({ url: '/wxcode/detail', params })
-}

src/views/broker/edit.vue

@@ -15,6 +15,18 @@
                 <el-form-item label="密码" prop="password">
                     <el-input v-model="formData.password" clearable placeholder="请输入密码" />
                 </el-form-item>
+                <el-form-item label="企业名称" prop="company_name">
+                    <el-input v-model="formData.company_name" clearable placeholder="请输入企业名称" />
+                </el-form-item>
+                <el-form-item label="营业执照" prop="company_url">
+                    <material-picker v-model="formData.company_url" :limit="1" />
+                </el-form-item>
+                <el-form-item label="税号" prop="company_sh">
+                    <el-input v-model="formData.company_sh" clearable placeholder="请输入税号" />
+                </el-form-item>
+                <el-form-item label="营业地址" prop="company_address">
+                    <el-input v-model="formData.company_address" clearable placeholder="请输入营业地址" />
+                </el-form-item>
                 <el-form-item label="状态" prop="disable">
                     <el-select v-model="formData.disable" clearable placeholder="请选择">
                         <el-option label="启用" :value="0"></el-option>
@@ -59,6 +71,10 @@ const formData = reactive({
     name: '',
     avatar: '',
     account: '',
+    company_name: '',
+    company_url: '',
+    company_sh: '',
+    company_address: '',
     password: '',
     disable: 0,
     city_id: '',
@@ -82,6 +98,26 @@ const formRules = reactive<any>({
         message: '请输入账号',
         trigger: ['blur']
     }],
+    company_name: [{
+        required: true,
+        message: '请输入公司名称',
+        trigger: ['blur']
+    }],
+    company_url: [{
+        required: true,
+        message: '请选择营业执照',
+        trigger: ['blur']
+    }],
+    company_sh: [{
+        required: true,
+        message: '请输入税号',
+        trigger: ['blur']
+    }],
+    company_address: [{
+        required: true,
+        message: '请输入公司地址',
+        trigger: ['blur']
+    }],
     password: [{
         required: true,
         message: '请输入密码',

src/views/broker/index.vue

@@ -32,7 +32,7 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="账号" prop="account" show-overflow-tooltip />
-                    <el-table-column label="二维码" prop="image" show-overflow-tooltip>
+                    <el-table-column label="推广码" prop="image" show-overflow-tooltip>
                         <template #default="{ row }">
                             <el-image v-if="row.url" style="width:50px;height:50px;" :src="row.url"
                                 :preview-src-list="[row.url]" preview-teleported />

src/views/parten_account_log/index.vue

@@ -0,0 +1,90 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="流水号" prop="sn">
+                    <el-input class="w-[280px]" v-model="queryParams.sn" clearable placeholder="请输入流水号" />
+                </el-form-item>
+                <el-form-item class="w-[280px]" label="流水类型" prop="change_type">
+                    <el-select v-model="queryParams.change_type" clearable placeholder="请选择流水类型">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option label="提现" value="1"></el-option>
+                        <el-option label="分账收益" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="动作" prop="action" class="w-[280px]">
+                    <el-select v-model="queryParams.action" clearable placeholder="请选择">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option label="增加" value="1"></el-option>
+                        <el-option label="减少" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="流水号" prop="sn" show-overflow-tooltip />
+                    <el-table-column label="流水类型" prop="change_type">
+                        <template #default="{ row }">
+                            {{ row.change_type == 1 ? '提现' : '分账收益' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="动作" prop="action">
+                        <template #default="{ row }">
+                            {{ row.action == 1 ? '增加' : '减少' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动数量" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="变动前数量" prop="before_amount" show-overflow-tooltip />
+                    <el-table-column label="变动后数量" prop="after_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="partenAccountLogLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiPartenAccountLogLists, apiPartenAccountLogDelete } from '@/api/parten_account_log'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+
+
+// 查询条件
+const queryParams = reactive({
+    sn: '',
+    change_type: '',
+    action: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiPartenAccountLogLists,
+    params: queryParams
+})
+
+getLists()
+</script>

src/views/tea_store/edit.vue

@@ -21,15 +21,6 @@
                 <el-form-item label="星级" prop="star">
                     <el-input v-model="formData.star" clearable placeholder="请输入星级(最大值为5)" />
                 </el-form-item>
-                <el-form-item label="门店类型" prop="operation_type">
-                    <el-radio-group v-model="formData.operation_type" placeholder="请选择门店类型">
-                        <el-radio v-for="(item, index) in dictData.operation_type" :key="index"
-                            :label="parseInt(item.value)">
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-
                 <el-form-item label="店铺状态" prop="status">
                     <el-select v-model="formData.status" clearable placeholder="请选择">
                         <el-option label="上架" :value="1"></el-option>
@@ -58,12 +49,6 @@
                 <el-form-item label="详细地址" prop="address">
                     <el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
                 </el-form-item>
-                <el-form-item label="所属城市" prop="city_area_id">
-                    <el-select v-model="formData.city_area_id" clearable placeholder="请选择">
-                        <el-option :label="item.name" :value="item.id" v-for="item in cityList"
-                            :key="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
 
                 <el-form-item label="经度" prop="longitude">
                     <el-input v-model="formData.longitude" clearable placeholder="请输入经度" />
@@ -176,7 +161,6 @@ const formData = reactive({
     image: '',
     image_arr: '',
     star: '',
-    operation_type: '',
     day_time: '',
     start_time: '',
     end_time: '',
@@ -222,12 +206,6 @@ const formRules = reactive<any>({
             message: '请上传轮播图',
         }
     ],
-    operation_type: [
-        {
-            required: true,
-            message: '请选择门店类型',
-        }
-    ],
     start_time: [
         {
             required: true,
@@ -258,12 +236,6 @@ const formRules = reactive<any>({
             message: '请输入详细地址',
         }
     ],
-    city_area_id: [
-        {
-            required: true,
-            message: '请输入所属城市',
-        }
-    ],
     longitude: [
         {
             required: true,

src/views/tea_store/index.vue

@@ -47,11 +47,6 @@
                             <el-image style="width:50px;height:50px;" :src="row.image" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="门店类型" prop="operation_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.operation_type" :value="row.operation_type" />
-                        </template>
-                    </el-table-column>
                     <el-table-column label="店铺状态" prop="status">
                         <template #default="{ row }">
                             <span>{{ row.status == 1 ? '上架' : '下架' }}</span>
@@ -65,30 +60,6 @@
                     <el-table-column label="门店余额" prop="balance" show-overflow-tooltip />
                     <el-table-column label="操作" width="200" fixed="right">
                         <template #default="{ row }">
-                            <div v-if="row.operation_type == 1">
-                                <el-button v-perms="['tea_room/lists']" type="primary" link>
-                                    <router-link :to="{
-                                        path: getRoutePath('tea_room/lists'),
-                                        query: {
-                                            id: row.id
-                                        }
-                                    }">
-                                        包间
-                                    </router-link>
-                                </el-button>
-                                <!-- 
-                                <el-button type="primary" link>
-                                    <router-link :to="{
-                                        path: getRoutePath('tea_room/lists'),
-                                        query: {
-                                            id: row.id
-                                        }
-                                    }">
-                                        包间
-                                    </router-link>
-                                </el-button> -->
-                            </div>
-
                             <div class="flex items-center">
                                 <el-button v-perms="['tea_store/license']" type="primary" link @click="handleSee(row)">
                                     资质

src/views/tea_store/teamaster_leaf/edit.vue

@@ -9,6 +9,14 @@
                 <el-form-item label="茶叶价格" prop="price">
                     <el-input v-model="formData.price" clearable placeholder="请输入茶叶价格" />
                 </el-form-item>
+                <el-form-item label="茶叶类型" prop="type">
+                    <el-select v-model="formData.type" clearable placeholder="请选择茶叶类型">
+                        <el-option label="自由选购" :value="0"></el-option>
+                        <el-option label="清风套餐" :value="1"></el-option>
+                        <el-option label="明月套餐" :value="2"></el-option>
+                        <el-option label="鹤鸣套餐" :value="3"></el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -42,12 +50,33 @@ const formData = reactive({
     id: '',
     name: '',
     price: '',
+    type: '',
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
-
+    name: [
+        {
+            required: true,
+            message: '请输入茶叶名称',
+            trigger: ['blur']
+        }
+    ],
+    price: [
+        {
+            required: true,
+            message: '请输入茶叶价格',
+            trigger: ['blur']
+        }
+    ],
+    type: [
+        {
+            required: true,
+            message: '请选择茶叶类型',
+            trigger: ['blur']
+        }
+    ],
 })
 
 

src/views/tea_store/teamaster_leaf/index.vue

@@ -27,7 +27,14 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="茶叶名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="茶叶价格" prop="price" show-overflow-tooltip />
-                    <!-- <el-table-column label="创建时间" prop="dtime" show-overflow-tooltip /> -->
+                    <el-table-column label="茶叶类型" prop="type" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span v-if="row.type == 0">自由选购</span>
+                            <span v-if="row.type == 1">清风套餐</span>
+                            <span v-if="row.type == 2">明月套餐</span>
+                            <span v-if="row.type == 3">鹤鸣套餐</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['tea-store/teamaster_leaf/edit']" type="primary" link

src/views/teamaster_real/edit.vue

@@ -33,34 +33,31 @@
                 <el-form-item label="体重" prop="weight">
                     <el-input v-model="formData.weight" clearable placeholder="请输入体重" disabled />
                 </el-form-item>
+                <el-form-item label="茶艺师资格证书" prop="license_img">
+                    <el-image style="width: 100px; height: 100px" :src="formData.license_img" :zoom-rate="1.2"
+                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.license_img]" show-progress
+                        :initial-index="4" fit="cover" />
+                    <!-- <material-picker v-model="formData.license_img" /> -->
+                </el-form-item>
                 <el-form-item label="个人头像照片" prop="avatar">
                     <el-image style="width: 100px; height: 100px" :src="formData.avatar" :zoom-rate="1.2" :max-scale="7"
                         :min-scale="0.2" :preview-src-list="[formData.avatar]" show-progress :initial-index="4"
                         fit="cover" />
                 </el-form-item>
-                <el-form-item label="健康证" prop="certificate"
+                <el-form-item label="健康证" prop="health_certificate" v-if="formData.health_certificate">
-                    v-if="formData.certificate.length > 0 && formData.certificate[0]">
+                    <el-image style="width: 100px; height: 100px" :src="formData.health_certificate" :zoom-rate="1.2"
-                    <el-image style="width: 100px; height: 100px" :src="formData.certificate[0]" :zoom-rate="1.2"
+                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.health_certificate]" show-progress
-                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.certificate[0]]" show-progress
                         :initial-index="4" fit="cover" />
                 </el-form-item>
-                <el-form-item label="茶艺师资格证" prop="certificate"
+                <el-form-item label="个人展示" prop="avatar">
-                    v-if="formData.certificate.length > 0 && formData.certificate[1]">
+                    <el-image v-for="(item, index) in formData.information" :key="index"
-                    <el-image style="width: 100px; height: 100px" :src="formData.certificate[1]" :zoom-rate="1.2"
+                        style="width: 100px; height: 100px" :src="item" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.certificate[1]]" show-progress
+                        :preview-src-list="formData.information" show-progress :initial-index="4" fit="cover" />
-                        :initial-index="4" fit="cover" />
                 </el-form-item>
-                <!-- <el-form-item label="营业执照" prop="license_img">
-                    <el-image style="width: 100px; height: 100px" :src="formData.license_img" :zoom-rate="1.2"
-                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.license_img]" show-progress
-                        :initial-index="4" fit="cover" />
-                    <material-picker v-model="formData.license_img" />
-                </el-form-item> -->
-                <el-form-item label="兴趣爱好" prop="hobby_introduce">
-                    <editor class="flex-1" v-model="formData.hobby_introduce" :height="500" />
 
-                    <!-- <el-input v-model="formData.hobby_introduce" clearable placeholder="请输入兴趣爱好" /> -->
+                <!-- <el-form-item label="兴趣爱好" prop="hobby_introduce">
-                </el-form-item>
+                    <editor class="flex-1" v-model="formData.hobby_introduce" :height="500" />
+                </el-form-item> -->
                 <el-form-item label="审核状态" prop="status">
                     <el-select v-model="formData.status" clearable placeholder="请选择">
                         <el-option label="未审核" :value="0"></el-option>
@@ -93,7 +90,7 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '审核茶艺师' : '新增茶艺师审核'
+    return mode.value == 'edit' ? '编辑茶艺师审核' : '新增茶艺师审核'
 })
 
 // 表单数据
@@ -110,8 +107,8 @@ const formData = reactive({
     height: '',
     weight: '',
     avatar: '',
-    information: '',
+    health_certificate: '',
-    certificate: [],
+    information: [],
     license_img: '',
     hobby_introduce: '',
     status: '',
@@ -190,14 +187,6 @@ const handleSubmit = async () => {
     let data = { ...formData, gender: formData.gender.join(",") }
     data.avatar = removeImageUrlPrefix(data.avatar)
 
-    if (data.certificate && data.certificate[0]) {
-        data.certificate = removeImageUrlPrefix(data.certificate[0])
-    }
-
-    if (data.certificate && data.certificate[1]) {
-        data.certificate = removeImageUrlPrefix(data.certificate[1])
-    }
-
     if (data.license_img) {
         data.license_img = removeImageUrlPrefix(data.license_img)
     }
@@ -220,6 +209,8 @@ const handleClose = () => {
     emit('close')
 }
 
+
+
 defineExpose({
     open,
     setFormData,

src/views/teamaster_user/edit.vue

@@ -12,9 +12,6 @@
                 <el-form-item label="用户昵称" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入用户昵称" />
                 </el-form-item>
-                <el-form-item label="账户余额" prop="user_money">
-                    <el-input v-model="formData.user_money" disabled clearable />
-                </el-form-item>
                 <el-form-item label="本人照片" prop="image">
                     <material-picker v-model="formData.image" :limit="1" />
                 </el-form-item>
@@ -75,12 +72,6 @@
                 <!-- <el-form-item label="服务区域" prop="address_id">
                     <el-input v-model="formData.address_id" clearable placeholder="请输入服务区域" />
                 </el-form-item> -->
-                <el-form-item label="所属城市" prop="city_id">
-                    <el-select v-model="formData.city_id" clearable placeholder="请选择">
-                        <el-option :label="item.name" :value="item.id" v-for="item in cityList"
-                            :key="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item label="地址" prop="longitude">
                     <el-input v-model="formData.address" clearable placeholder="请输入地址" />
                 </el-form-item>
@@ -155,13 +146,11 @@ const formData = reactive({
     sold: '',
     server_type: '',
     address_id: 0,
-    city_id: '',
     address: '',
     longitude: '',
     latitude: '',
     disable: '',
-    state: '',
+    state: ''
-    user_money: ''
 })
 
 // 城市列表

src/views/user/setting.vue

@@ -2,17 +2,36 @@
 <template>
     <div class="user-setting">
         <el-card class="!border-none" shadow="never">
-            <el-form
+            <el-form ref="formRef" class="ls-form" :model="formData" :rules="rules" label-width="100px">
-                ref="formRef"
-                class="ls-form"
-                :model="formData"
-                :rules="rules"
-                label-width="100px"
-            >
                 <el-form-item label="头像：" prop="avatar">
                     <material-picker v-model="formData.avatar" :limit="1" />
                 </el-form-item>
 
+                <el-form-item label="企业名称：" prop="company_name">
+                    <div class="w-80">
+                        <el-input v-model="formData.company_name" disabled />
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="企业税号：" prop="company_sh">
+                    <div class="w-80">
+                        <el-input v-model="formData.company_sh" disabled />
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="企业地址：" prop="company_address">
+                    <div class="w-80">
+                        <el-input v-model="formData.company_address" disabled />
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="营业执照：" prop="company_url">
+                    <div class="w-80">
+                        <el-image style="width:200px;height:100px;" fit="cover" :src="formData.company_url"
+                            :preview-src-list="[formData.company_url]" preview-teleported />
+                    </div>
+                </el-form-item>
+
                 <el-form-item label="账号：" prop="account">
                     <div class="w-80">
                         <el-input v-model="formData.account" disabled />
@@ -27,34 +46,22 @@
 
                 <el-form-item label="当前密码：" prop="password_old">
                     <div class="w-80">
-                        <el-input
+                        <el-input v-model.trim="formData.password_old" placeholder="修改密码时必填, 不修改密码时留空" type="password"
-                            v-model.trim="formData.password_old"
+                            show-password />
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
                     </div>
                 </el-form-item>
 
                 <el-form-item label="新的密码：" prop="password">
                     <div class="w-80">
-                        <el-input
+                        <el-input v-model.trim="formData.password" placeholder="修改密码时必填, 不修改密码时留空" type="password"
-                            v-model.trim="formData.password"
+                            show-password />
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
                     </div>
                 </el-form-item>
 
                 <el-form-item label="确定密码：" prop="password_confirm">
                     <div class="w-80">
-                        <el-input
+                        <el-input v-model.trim="formData.password_confirm" placeholder="修改密码时必填, 不修改密码时留空"
-                            v-model.trim="formData.password_confirm"
+                            type="password" show-password />
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
                     </div>
                 </el-form-item>
             </el-form>
@@ -78,6 +85,10 @@ const userStore = useUserStore()
 const formData = reactive({
     avatar: '', // 头像
     account: '', // 账号
+    company_name: '', // 企业名称
+    company_sh: '', // 企业税号
+    company_address: '', // 企业地址
+    company_url: '', // 营业执照
     name: '', // 名称
     password_old: '', // 当前密码
     password: '', // 新的密码

src/views/withdraw/parten_bank/index.vue

@@ -27,10 +27,10 @@
                 </template>
                 新增
             </el-button>
-            <!-- <el-button v-perms="['parten_bank/delete']" :disabled="!selectData.length"
+            <el-button v-perms="['parten_bank/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
                 删除
-            </el-button> -->
+            </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -38,7 +38,7 @@
                     <el-table-column label="银行卡号" prop="bank_card" show-overflow-tooltip />
                     <el-table-column label="开户行名称" prop="bank_open_name" show-overflow-tooltip />
                     <el-table-column label="绑定手机号码" prop="mobile" show-overflow-tooltip />
-                    <!-- <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['parten_bank/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
@@ -48,7 +48,7 @@
                                 删除
                             </el-button>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">

src/views/withdraw/parten_reflect/edit.vue

@@ -44,7 +44,7 @@ getBankLists()
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '提现申请' : '提现申请'
+    return mode.value = '提现申请'
 })
 
 // 表单数据

src/views/withdraw/parten_reflect/index.vue

@@ -4,11 +4,21 @@
             <el-form-item label="账户余额" prop="order_sn">
                 ￥{{ accountInfo.money }}
             </el-form-item>
+            <el-form-item label="总收益" prop="order_sn">
+                ￥{{ accountInfo.total_reflect_amount }}
+            </el-form-item>
 
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="订单编号" prop="order_sn">
                     <el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单编号" />
                 </el-form-item>
+                <el-form-item class="w-[280px]" label="审核状态" prop="server_type">
+                    <el-select v-model="queryParams.status" clearable placeholder="请选择">
+                        <el-option label="待审核" value="0"></el-option>
+                        <el-option label="审核通过" value="1"></el-option>
+                        <el-option label="审核失败" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -23,10 +33,10 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['parten_reflect/delete']" :disabled="!selectData.length"
+            <!-- <el-button v-perms="['parten_reflect/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
                 删除
-            </el-button>
+            </el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -68,7 +78,8 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData"
+            @success="getLists(); getAccountInfo();"" @close=" showEdit = false" />
     </div>
 </template>
 

src/views/workbench/index.vue

@@ -14,21 +14,6 @@
                         <div class="w-20">当前版本</div>
                         <span> {{ workbenchData.version.version }}</span>
                     </div>
-                    <div class="flex leading-9">
-                        <div class="w-20">获取渠道</div>
-                        <div>
-                            <a :href="workbenchData.version.channel.website" target="_blank">
-                                <el-button type="success" size="small">官网</el-button>
-                            </a>
-                            <a
-                                class="ml-3"
-                                :href="workbenchData.version.channel.gitee"
-                                target="_blank"
-                            >
-                                <el-button type="danger" size="small">Gitee</el-button>
-                            </a>
-                        </div>
-                    </div>
                 </div>
             </el-card>
             <el-card class="!border-none mb-4 flex-1" shadow="never">
@@ -42,14 +27,28 @@
                 </template>
 
                 <div class="flex flex-wrap">
-                    <div class="w-1/2 md:w-1/4">
+                    <div class="w-1/2 md:w-1/3">
-                        <div class="leading-10">销售额</div>
+                        <div class="leading-10">今日收益</div>
                         <div class="text-6xl">{{ workbenchData.today.today_sales }}</div>
                         <div class="text-tx-secondary text-xs">
                             总：{{ workbenchData.today.total_sales }}
                         </div>
                     </div>
-                    <div class="w-1/2 md:w-1/4">
+                    <div class="w-1/2 md:w-1/3">
+                        <div class="leading-10">经纪人收益</div>
+                        <div class="text-6xl">{{ workbenchData.today.today_broker_sales }}</div>
+                        <div class="text-tx-secondary text-xs">
+                            总：{{ workbenchData.today.total_broker_sales }}
+                        </div>
+                    </div>
+                    <div class="w-1/2 md:w-1/3">
+                        <div class="leading-10">茶艺师收益</div>
+                        <div class="text-6xl">{{ workbenchData.today.today_teamaster_sales }}</div>
+                        <div class="text-tx-secondary text-xs">
+                            总：{{ workbenchData.today.total_teamaster_sales }}
+                        </div>
+                    </div>
+                    <!-- <div class="w-1/2 md:w-1/4">
                         <div class="leading-10">成交订单</div>
                         <div class="text-6xl">{{ workbenchData.today.order_num }}</div>
                         <div class="text-tx-secondary text-xs">
@@ -57,19 +56,12 @@
                         </div>
                     </div>
                     <div class="w-1/2 md:w-1/4">
-                        <div class="leading-10">新增用户</div>
+                        <div class="leading-10">我的收益</div>
                         <div class="text-6xl">{{ workbenchData.today.today_new_user }}</div>
                         <div class="text-tx-secondary text-xs">
                             总：{{ workbenchData.today.total_new_user }}
                         </div>
-                    </div>
+                    </div> -->
-                    <div class="w-1/2 md:w-1/4">
-                        <div class="leading-10">新增访问量</div>
-                        <div class="text-6xl">{{ workbenchData.today.today_visitor }}</div>
-                        <div class="text-tx-secondary text-xs">
-                            总：{{ workbenchData.today.total_visitor }}
-                        </div>
-                    </div>
                 </div>
             </el-card>
         </div>
@@ -79,11 +71,8 @@
                     <span>常用功能</span>
                 </template>
                 <div class="flex flex-wrap">
-                    <div
+                    <div v-for="item in workbenchData.menu" class="md:w-[12.5%] w-1/4 flex flex-col items-center"
-                        v-for="item in workbenchData.menu"
+                        :key="item">
-                        class="md:w-[12.5%] w-1/4 flex flex-col items-center"
-                        :key="item"
-                    >
                         <router-link :to="item.url" class="mb-3 flex flex-col items-center">
                             <image-contain width="40px" height="40px" :src="item?.image" />
                             <div class="mt-2">{{ item.name }}</div>
@@ -95,28 +84,20 @@
         <div class="lg:flex gap-4">
             <el-card class="!border-none mb-4 lg:mb-0 w-full lg:w-2/3" shadow="never">
                 <template #header>
-                    <span>访问量趋势图</span>
+                    <span>订单趋势图</span>
                 </template>
                 <div>
-                    <v-charts
+                    <v-charts ref="visitorChart" style="height: 350px" :option="workbenchData.visitorOption"
-                        ref="visitorChart"
+                        :autoresize="true" />
-                        style="height: 350px"
-                        :option="workbenchData.visitorOption"
-                        :autoresize="true"
-                    />
                 </div>
             </el-card>
             <el-card class="!border-none w-full lg:w-1/3" shadow="never">
                 <template #header>
-                    <span>销售额趋势图</span>
+                    <span>经纪人收益图</span>
                 </template>
                 <div>
-                    <v-charts
+                    <v-charts ref="saleChart" style="height: 350px" :option="workbenchData.saleOption"
-                        ref="saleChart"
+                        :autoresize="true" />
-                        style="height: 350px"
-                        :option="workbenchData.saleOption"
-                        :autoresize="true"
-                    />
                 </div>
             </el-card>
         </div>
@@ -168,14 +149,14 @@ const workbenchData: any = reactive({
             type: 'value'
         },
         legend: {
-            data: ['访问量']
+            data: ['']
         },
         tooltip: {
             trigger: 'axis'
         },
         series: [
             {
-                name: '访问量',
+                name: '',
                 data: [],
                 type: 'line',
                 smooth: true,

src/views/wxcode/edit.vue

@@ -1,113 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <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-item label="图片地址" prop="url">
-                    <el-input v-model="formData.url" clearable placeholder="请输入图片地址" />
-                </el-form-item> -->
-                <el-form-item label="场景值" prop="type">
-                    <el-input v-model="formData.type" clearable placeholder="请输入场景数值：1电梯、2充电宝"
-                        :disabled="Number(formData.id) > 0 ? true : false" />
-                </el-form-item>
-                <el-form-item label="场景名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入场景名称：电梯、充电宝" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-select v-model="formData.status" clearable placeholder="请选择">
-                        <el-option label="启用" :value="1"></el-option>
-                        <el-option label="禁用" :value="0"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="wxcodeEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiWxcodeAdd, apiWxcodeEdit, apiWxcodeDetail } from '@/api/wxcode'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑渠道' : '新增渠道'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    url: '',
-    type: '',
-    name: '',
-    status: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiWxcodeDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiWxcodeEdit(data)
-        : await apiWxcodeAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>

src/views/wxcode/index.vue

@@ -1,110 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['wxcode/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['wxcode/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="图片" prop="url" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-image style="width:50px;height:50px;" :src="row.url" :preview-src-list="[row.url]"
-                                preview-teleported />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="场景值" prop="type" show-overflow-tooltip />
-                    <el-table-column label="场景名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="dtime" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-tag :type="row.status == 1 ? 'success' : 'danger'">
-                                {{ row.status == 1 ? '启用' : '禁用' }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['wxcode/edit']" type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['wxcode/delete']" type="danger" link @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="wxcodeLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiWxcodeLists, apiWxcodeDelete } from '@/api/wxcode'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiWxcodeLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiWxcodeDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>