5 Commits

5 changed files with 43 additions and 13 deletions

View File

@@ -11,6 +11,7 @@ VITE_APP_BASE_API=/dev-api
VITE_APP_API_URL=http://192.168.1.42/ # 本地 VITE_APP_API_URL=http://192.168.1.42/ # 本地
VITE_APP_API_PHP_URL=http://192.168.1.42:8000 #php抖音美团测试环境 VITE_APP_API_PHP_URL=http://192.168.1.42:8000 #php抖音美团测试环境
VITE_APP_API_PHP_IMPORT_URL=http://192.168.1.42:8789 #本地php批量导入 VITE_APP_API_PHP_IMPORT_URL=http://192.168.1.42:8789 #本地php批量导入
# VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com #本地线上php批量导入
# WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws # WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws

View File

@@ -12,6 +12,9 @@ VITE_APP_BASE_API = https://cashier.sxczgkj.com/
VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环境 VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环境
VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com #线上php批量导入
# WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws # WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws

View File

@@ -327,6 +327,15 @@
现金充值退款金额 现金充值退款金额
</div> </div>
</div> </div>
<div class="item">
<div class="n">
<span class="i"></span>
{{ multiplyAndFormat(tableData.refund.creditRefundAmount || 0) }}
</div>
<div class="label">
挂账退款金额
</div>
</div>
</div> </div>
</div> </div>
<div class="card" style="flex: 1;"> <div class="card" style="flex: 1;">

View File

@@ -18,7 +18,7 @@
<el-form-item label="获得佣金条件" prop="inviteCount"> <el-form-item label="获得佣金条件" prop="inviteCount">
<div class="column"> <div class="column">
<el-input v-model="form.inviteCount" placeholder="请输入" :maxlength="8" style="width: 300px;" <el-input v-model="form.inviteCount" placeholder="请输入" :maxlength="8" style="width: 300px;"
@input="e => form.inviteCount = filterNumberInput(e, 1)"> @input="e => form.inviteCount = filterNumberInput(e, 0)">
<template #append></template> <template #append></template>
</el-input> </el-input>
<div class="tips">邀请达到指定人数才可赚取佣金</div> <div class="tips">邀请达到指定人数才可赚取佣金</div>
@@ -202,7 +202,7 @@ const formRef = ref(null)
const formLoading = ref(false) const formLoading = ref(false)
const levelConfigListObj = ref({ const levelConfigListObj = ref({
name: '', // 名称 name: '', // 名称
inviteCount: '', // 有效人数 inviteCount: 0, // 有效人数
costAmount: '', // 消费金额 costAmount: '', // 消费金额
commission: '', // 一级分销比例 commission: '', // 一级分销比例
levelTwoCommission: '', // 二级分销比例 levelTwoCommission: '', // 二级分销比例
@@ -210,7 +210,7 @@ const levelConfigListObj = ref({
const form = ref({ const form = ref({
id: '', id: '',
openType: 'pay', // pay购买开通 auto自动开通 manual手动开通 openType: 'pay', // pay购买开通 auto自动开通 manual手动开通
inviteCount: '', // 邀请条件人数 inviteCount: 0, // 邀请条件人数
inviteConsume: 0, // 被邀请人消费有效 0 1 inviteConsume: 0, // 被邀请人消费有效 0 1
payAmount: '', // 购买开通金额 payAmount: '', // 购买开通金额
rewardCount: '', // 每人奖励次数 rewardCount: '', // 每人奖励次数

View File

@@ -4,7 +4,7 @@
<div class="head-container"> <div class="head-container">
<el-form :model="query" inline> <el-form :model="query" inline>
<el-form-item label=""> <el-form-item label="">
<el-input v-model="query.name" placeholder="请输入昵称或手机号"></el-input> <el-input v-model="query.key" placeholder="请输入昵称或手机号"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@@ -22,7 +22,10 @@
<el-table-column label="用户" prop="headImg" width="200px"> <el-table-column label="用户" prop="headImg" width="200px">
<template v-slot="scope"> <template v-slot="scope">
<div class="user_info"> <div class="user_info">
<el-image :src="scope.row.headImg" style="width: 40px; height: 40px; flex-shrink: 0"> <el-image
:src="scope.row.headImg"
style="width: 40px; height: 40px; flex-shrink: 0"
>
<template #error> <template #error>
<div class="image-slot"> <div class="image-slot">
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
@@ -30,7 +33,14 @@
</template> </template>
</el-image> </el-image>
<span class="name">{{ scope.row.nickName }}</span> <span class="name">{{ scope.row.nickName }}</span>
<el-tag disable-transitions type="primary" style="margin-left: 10px;" v-if="scope.row.new"></el-tag> <el-tag
disable-transitions
type="primary"
style="margin-left: 10px"
v-if="scope.row.new"
>
</el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -38,7 +48,9 @@
<el-table-column label="会员" prop="isVip" width="140"> <el-table-column label="会员" prop="isVip" width="140">
<template v-slot="scope"> <template v-slot="scope">
<el-tag type="warning" v-if="scope.row.isVip">会员等级{{ scope.row.memberLevelName }}</el-tag> <el-tag type="warning" v-if="scope.row.isVip">
会员等级{{ scope.row.memberLevelName }}
</el-tag>
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
@@ -60,9 +72,14 @@
</el-table> </el-table>
</div> </div>
<div class="head-container"> <div class="head-container">
<el-pagination :total="tableData.total" :current-page="tableData.page" :page-size="tableData.size" <el-pagination
@size-change="sizeChange" @current-change="paginationChange" :total="tableData.total"
layout="total, sizes, prev, pager, next, jumper"></el-pagination> :current-page="tableData.page"
:page-size="tableData.size"
@size-change="sizeChange"
@current-change="paginationChange"
layout="total, sizes, prev, pager, next, jumper"
></el-pagination>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@@ -71,13 +88,13 @@
<script setup> <script setup>
import shopUserApi from "@/api/account/shopUser"; import shopUserApi from "@/api/account/shopUser";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { multiplyAndFormat } from '@/utils' import { multiplyAndFormat } from "@/utils";
let cacheData = {}; let cacheData = {};
const state = reactive({ const state = reactive({
show: false, show: false,
query: { query: {
name: "", key: "",
// isVip: 1, // isVip: 1,
}, },
tableData: { tableData: {