完善功能

src/api/carousel.ts

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 轮播图列表
+export function apiCarouselLists(params: any) {
+    return request.get({ url: '/carousel/lists', params })
+}
+
+// 添加轮播图
+export function apiCarouselAdd(params: any) {
+    return request.post({ url: '/carousel/add', params })
+}
+
+// 编辑轮播图
+export function apiCarouselEdit(params: any) {
+    return request.post({ url: '/carousel/edit', params })
+}
+
+// 删除轮播图
+export function apiCarouselDelete(params: any) {
+    return request.post({ url: '/carousel/delete', params })
+}
+
+// 轮播图详情
+export function apiCarouselDetail(params: any) {
+    return request.get({ url: '/carousel/detail', params })
+}
+
+// 茶艺师入口图
+export function apiCarouselTeamaster(params: any) {
+    return request.post({ url: '/carousel/homeImage', params })
+}
+
+// 编辑茶艺师入口图
+export function apiCarouselTeamasterEdit(params: any) {
+    return request.post({ url: '/carousel/homeImageEdit', params })
+}

src/api/consumer.ts

@@ -29,3 +29,8 @@ export function storeMoneyList(params: any) {
 export function sourceList() {
     return request.post({ url: '/wxcode/getLists' })
 }
+
+// 门店列表
+export function storeList() {
+    return request.post({ url: '/user.user/storeList' })
+}

src/views/consumer/lists/index.vue

@@ -6,6 +6,15 @@
                     <el-input v-model="queryParams.keyword" placeholder="账号/昵称/手机号码" clearable
                         @keyup.enter="resetPage" />
                 </el-form-item>
+                <el-form-item class="w-[280px]" label="门店搜索">
+                    <el-select v-model="queryParams.store_id" filterable>
+                        <el-option :label="item.name" :value="item.id" v-for="item in storeListData"
+                            :key="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="城市搜索">
+                    <el-input v-model="queryParams.city" placeholder="请输入城市名称" clearable @keyup.enter="resetPage" />
+                </el-form-item>
                 <el-form-item label="注册时间">
                     <daterange-picker v-model:startTime="queryParams.create_time_start"
                         v-model:endTime="queryParams.create_time_end" />
@@ -14,9 +23,6 @@
                     <el-select v-model="queryParams.source">
                         <el-option :label="item.name" :value="item.id" v-for="item in sourceListData"
                             :key="item.id"></el-option>
-                        <!-- <el-option label="微信小程序" :value="0" />
-                        <el-option label="电梯扫码" :value="1" />
-                        <el-option label="充电宝扫码" :value="2" /> -->
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -37,6 +43,16 @@
                 <el-table-column label="昵称" prop="nickname" min-width="100" />
                 <el-table-column label="手机号码" prop="mobile" min-width="100" />
                 <el-table-column label="渠道标识" prop="source_name" min-width="100" />
+                <el-table-column label="城市" prop="store_name" min-width="100">
+                    <template #default="{ row }">
+                        <span>{{ row.city || '—' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="门店" prop="store_name" min-width="100">
+                    <template #default="{ row }">
+                        <span>{{ row.store_name || '—' }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="注册时间" prop="create_time" min-width="120" />
                 <el-table-column label="操作" width="180" fixed="right">
                     <template #default="{ row }">
@@ -71,7 +87,7 @@
     </div>
 </template>
 <script lang="ts" setup name="consumerLists">
-import { getUserList, sourceList } from '@/api/consumer'
+import { getUserList, sourceList, storeList } from '@/api/consumer'
 import { ClientMap } from '@/enums/appEnums'
 import { usePaging } from '@/hooks/usePaging'
 import { getRoutePath } from '@/router'
@@ -80,7 +96,9 @@ const queryParams = reactive({
     keyword: '',
     source: '',
     create_time_start: '',
-    create_time_end: ''
+    create_time_end: '',
+    store_id: '',
+    city: '',
 })
 
 const { pager, getLists, resetPage, resetParams } = usePaging({
@@ -97,4 +115,11 @@ const getSourceLabel = async () => {
 }
 
 getSourceLabel()
+
+const storeListData = ref([])
+const getStoreLabel = async () => {
+    const storeOptions = await storeList()
+    storeListData.value = storeOptions
+}
+getStoreLabel()
 </script>

src/views/finance/component/refund-log.vue

@@ -1,39 +1,35 @@
 <template>
     <div class="code-preview">
         <el-dialog v-model="show" width="760px" title="退款日志">
-            <el-table size="large" v-loading="loading" :data="logLists" height="500">
+            <el-table size="large" :data="logLists" height="500">
-                <el-table-column label="流水单号" prop="sn" min-width="190" />
+                <el-table-column label="流水单号" prop="order_sn" min-width="190" />
                 <el-table-column label="退款金额" min-width="110">
                     <template #default="{ row }"> ¥{{ row.refund_amount }} </template>
                 </el-table-column>
                 <el-table-column label="退款状态" prop="" min-width="100">
                     <template #default="{ row }">
                         <el-tag type="warning" v-if="row.refund_status == 0">
-                            {{ row.refund_status_text }}
+                            待退款
                         </el-tag>
                         <el-tag v-if="row.refund_status == 1">
-                            {{ row.refund_status_text }}
+                            退款成功
                         </el-tag>
                         <el-tag type="danger" v-if="row.refund_status == 2">
-                            {{ row.refund_status_text }}
+                            退款失败
                         </el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column label="记录时间" prop="create_time" min-width="180" />
-                <el-table-column label="操作人" prop="handler" min-width="120" />
+                <!-- <el-table-column label="操作人" prop="handler" min-width="120" /> -->
             </el-table>
         </el-dialog>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { refundLog } from '@/api/finance'
-
-const loading = ref(false)
-const logLists = ref([])
 const props = defineProps<{
     modelValue: boolean
-    refundId: number
+    refundRow: Record<string, any> | null
 }>()
 
 const emit = defineEmits<{
@@ -49,23 +45,8 @@ const show = computed<boolean>({
     }
 })
 
-const getRefundLog = async () => {
+const logLists = computed(() => {
-    loading.value = true
+    if (!props.refundRow) return []
-    logLists.value = []
+    return [props.refundRow]
-    try {
-        const res = await refundLog({
-            record_id: props.refundId
-        })
-        logLists.value = res
-    } catch (error) {
-        console.log(error)
-    }
-    loading.value = false
-}
-
-watch(show, (value) => {
-    if (value) {
-        getRefundLog()
-    }
 })
 </script>

src/views/finance/refund_record.vue

@@ -7,7 +7,7 @@
                     <div class="text-6xl">{{ refundData.total }}</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">{{ refundData.ing }}</div>
                 </div>
                 <div class="w-1/2 md:w-1/4">
@@ -97,7 +97,7 @@
                         <el-table-column label="退款状态" prop="" min-width="100">
                             <template #default="{ row }">
                                 <el-tag type="warning" v-if="row.refund_status == 0">
-                                    退款中
+                                    待退款
                                 </el-tag>
                                 <el-tag v-if="row.refund_status == 1">
                                     退款成功
@@ -111,7 +111,7 @@
                         <el-table-column label="操作" width="180" fixed="right">
                             <template #default="{ row }">
                                 <el-button v-perms="['finance.refund/log']" type="primary" link
-                                    @click="handleShowRefundLog(row.id)">
+                                    @click="handleShowRefundLog(row)">
                                     退款日志
                                 </el-button>
                                 <el-button v-if="row.refund_status == 2" v-perms="['recharge.recharge/refundAgain']"
@@ -128,7 +128,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <refund-log v-model="showRefundLog" :refund-id="selectRefundId" />
+        <refund-log v-model="showRefundLog" :refund-row="selectRefundRow" />
     </div>
 </template>
 <script lang="ts" setup name="refundRecord">
@@ -154,7 +154,7 @@ const refundData = reactive({
     error: 0
 })
 const showRefundLog = ref(false)
-const selectRefundId = ref(0)
+const selectRefundRow = ref<Record<string, any> | null>(null)
 const activeTab = ref(0)
 const tabLists = ref([
     {
@@ -163,7 +163,7 @@ const tabLists = ref([
         numKey: 'total'
     },
     {
-        name: '退款中',
+        name: '待退款',
         type: 0,
         numKey: 'ing'
     },
@@ -193,9 +193,9 @@ const handleRefund = async (id: number) => {
     getRefundStat()
 }
 
-const handleShowRefundLog = async (id: number) => {
+const handleShowRefundLog = async (row: Record<string, any>) => {
     showRefundLog.value = true
-    selectRefundId.value = id
+    selectRefundRow.value = row
 }
 const handleTabChange = (index: any) => {
     queryParams.refund_status = tabLists.value[index].type as string

src/views/gallery/carousel/edit.vue

@@ -0,0 +1,131 @@
+<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="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入标题" />
+                </el-form-item>
+                <el-form-item label="图片地址" prop="address">
+                    <material-picker v-model="formData.address" :limit="1" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="formData.status" clearable placeholder="请选择状态">
+                        <el-option label="启用" :value="1" />
+                        <el-option label="禁用" :value="0" />
+                    </el-select>
+                    <!-- <el-input v-model="formData.status" clearable placeholder="请输入状态" /> -->
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="carouselEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCarouselAdd, apiCarouselEdit, apiCarouselDetail } from '@/api/carousel'
+import { removeImageUrlPrefix } 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: '',
+    title: '',
+    address: '',
+    status: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [
+        {
+            required: true,
+            message: '请输入标题',
+            trigger: ['blur']
+        }
+    ],
+    address: [
+        {
+            required: true,
+            message: '请选择图片地址',
+            trigger: ['change']
+        }
+    ],
+    status: [
+        {
+            required: true,
+            message: '请选择状态',
+            trigger: ['change']
+        }
+    ]
+})
+
+
+// 获取详情
+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 apiCarouselDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    data.address = removeImageUrlPrefix(formData.address)
+    mode.value == 'edit'
+        ? await apiCarouselEdit(data)
+        : await apiCarouselAdd(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/gallery/carousel/index.vue

@@ -0,0 +1,108 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['carousel/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['carousel/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="title" show-overflow-tooltip />
+                    <el-table-column label="图片" prop="address" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <el-image style="width:100px;height:50px;" :src="row.address"
+                                :preview-src-list="[row.address]" preview-teleported fit="cover" />
+                        </template>
+                    </el-table-column>
+                    <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="['carousel/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['carousel/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="carouselLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiCarouselLists, apiCarouselDelete } from '@/api/carousel'
+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: apiCarouselLists,
+    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 apiCarouselDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>

src/views/gallery/teamaster_gallery.vue

@@ -0,0 +1,94 @@
+<template>
+    <div class="teamaster-gallery">
+        <el-card class="!border-none" v-loading="loading" shadow="never">
+            <el-form ref="formRef" class="ls-form" :model="formData" :rules="formRules" label-width="100px">
+                <el-form-item label="当前图片">
+                    <div class="w-[220px]">
+                        <el-image v-if="formData.url" style="width:220px;height:110px;" :src="formData.url"
+                            :preview-src-list="[formData.url]" preview-teleported fit="cover" />
+                        <div v-else class="text-tx-secondary">暂无图片</div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="上传图片" prop="url">
+                    <material-picker v-model="formData.url" :limit="1" />
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <footer-btns>
+            <el-button type="primary" :loading="submitLoading" @click="handleSubmit">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+
+<script lang="ts" setup name="teamasterGallery">
+import type { FormInstance } from 'element-plus'
+import { apiCarouselTeamaster, apiCarouselTeamasterEdit } from '@/api/carousel'
+import { removeImageUrlPrefix } from '@/utils/util'
+
+const formRef = shallowRef<FormInstance>()
+const loading = ref(false)
+const submitLoading = ref(false)
+
+const formData = reactive<Record<string, any>>({
+    url: ''
+})
+
+const formRules = reactive({
+    url: [
+        {
+            required: true,
+            message: '请上传图片',
+            trigger: ['change']
+        }
+    ]
+})
+
+const setFormData = (data: any) => {
+    formData.url = ''
+
+    if (!data) {
+        return
+    }
+
+    const currentData = Array.isArray(data) ? data.find((item) => item) : data
+
+    if (!currentData) {
+        return
+    }
+
+    if (typeof currentData === 'string') {
+        formData.url = currentData
+        return
+    }
+
+    Object.assign(formData, currentData)
+    formData.url = currentData.url ?? currentData.address ?? currentData.image ?? currentData.img ?? ''
+}
+
+const getTeamasterImage = async () => {
+    loading.value = true
+    try {
+        const data = await apiCarouselTeamaster({})
+        setFormData(data)
+    }
+    finally {
+        loading.value = false
+    }
+}
+
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    submitLoading.value = true
+
+    const url = removeImageUrlPrefix(formData.url)
+    try {
+        await apiCarouselTeamasterEdit({ url })
+        getTeamasterImage()
+    }
+    finally {
+        submitLoading.value = false
+    }
+}
+
+getTeamasterImage()
+</script>

src/views/tea_store/license.vue

@@ -11,6 +11,9 @@
                 <el-form-item label="法定代表" prop="legal_person">
                     <el-input v-model="formData.legal_person" clearable disabled />
                 </el-form-item>
+                <el-form-item label="身份证号" prop="person_card">
+                    <el-input v-model="formData.person_card" clearable disabled />
+                </el-form-item>
                 <el-form-item label="有效期" prop="effective">
                     <el-input :value="formData.effective == 1 ? '永久有效' : formData.end_time" clearable disabled />
                 </el-form-item>
@@ -78,6 +81,7 @@ const formData = reactive({
     card: '',
     name: '',
     legal_person: '',
+    person_card: '',
     effective: 1,
     end_time: '',
     license_img: ''

src/views/workbench/index.vue

@@ -48,13 +48,13 @@
                             总：{{ workbenchData.today.total_new_user }}
                         </div>
                     </div>
-                    <div class="w-1/2 md:w-1/4">
+                    <!-- <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> -->
                 </div>
             </el-card>
         </div>