huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化

zhangyong/feature-20250815160302-金币优化
ZhangYong 2 months ago
parent
0e5d24326f 449a316ddf
commit
db5b0a72dc
2 changed files with 187 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/permissions/rolePermission.vue
  2. 118
      src/views/refund/gold/addCoinRefund.vue

2
src/views/permissions/rolePermission.vue
View File

@ -106,8 +106,6 @@ const searchRole = function () {
const reset = function () {
admin.value = {}
role.value.name = ''
get()
getRoleList()
}
const RoleArea = ref([])

118
src/views/refund/gold/addCoinRefund.vue
View File

@ -1,6 +1,6 @@
<script setup>
import {computed, onMounted, reactive, ref, watch} from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import API from '@/util/http.js'
import moment from 'moment'
// import _ from 'lodash'
@ -14,7 +14,7 @@ const addRe = ref({
const adminData = ref({})
const getAdminData = async function () {
try {
const result = await API({url: '/admin/userinfo', data: {}})
const result = await API({ url: '/admin/userinfo', data: {} })
adminData.value = result
addRefund.value.adminId = adminData.value.id
console.log('请求成功', result)
@ -154,18 +154,18 @@ const validateJwCode = (rule, value, callback) => {
callback();
};
const rules = reactive({
jwcode: [{required: true, validator: validateJwCode, trigger: 'blur'}],
refundType: [{required: true, message: '请选择退款类型', trigger: 'blur'}],
goodsName: [{required: false, message: '请选择退款商品', trigger: 'blur'}],
jwcode: [{ required: true, validator: validateJwCode, trigger: 'blur' }],
refundType: [{ required: true, message: '请选择退款类型', trigger: 'blur' }],
goodsName: [{ required: false, message: '请选择退款商品', trigger: 'blur' }],
// 订单号
orderCode: [{required: true, message: '请输入订单号', trigger: 'blur'}],
taskGold: [{required: true, message: '请输入任务金币', trigger: 'blur'}],
freeGold: [{required: true, message: '请输入免费金币', trigger: 'blur'}],
orderCode: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
taskGold: [{ required: true, message: '请输入任务金币', trigger: 'blur' }],
freeGold: [{ required: true, message: '请输入免费金币', trigger: 'blur' }],
permanentGold: [
{required: true, message: '请输入永久金币', trigger: 'blur'}
{ required: true, message: '请输入永久金币', trigger: 'blur' }
],
sumGold: [
{required: true, message: '请选择付款方式', trigger: 'blur'},
{ required: true, message: '请选择付款方式', trigger: 'blur' },
{
validator: (rule, value) => {
if (value === 0) {
@ -235,10 +235,10 @@ const getUser = async function (jwcode) {
// 对传过来的金币数除以 100
const processedData = {
...result.data,
historySumGold: (Number(result.data.historySumGold) || 0) ,
nowSumGold: (Number(result.data.nowSumGold) || 0) ,
nowPermanentGold: (Number(result.data.nowPermanentGold) || 0) ,
nowFreeGold: (Number(result.data.nowFreeGold) || 0) ,
historySumGold: (Number(result.data.historySumGold) || 0),
nowSumGold: (Number(result.data.nowSumGold) || 0),
nowPermanentGold: (Number(result.data.nowPermanentGold) || 0),
nowFreeGold: (Number(result.data.nowFreeGold) || 0),
nowTaskGold: (Number(result.data.nowTaskGold) || 0)
}
user.value = processedData;
@ -254,7 +254,7 @@ const getUser = async function (jwcode) {
// 退款类型，写死为商品退款
const refundType = ref([{value: '商品退款', label: '商品退款'}]);
const refundType = ref([{ value: '商品退款', label: '商品退款' }]);
// 获取退款类型
// const getRefundTypes = async function () {
@ -299,7 +299,7 @@ const getGoods = async function (jwcode) {
try {
const result = await API({
url: '/refund/selectGoods',
data: {jwcode: addRefund.value.jwcode}
data: { jwcode: addRefund.value.jwcode }
})
if (Array.isArray(result.data)) {
@ -307,9 +307,9 @@ const getGoods = async function (jwcode) {
goodsName.value = result.data.map(item => ({
orderCode: item.orderCode,
goodsName: item.goodsName,
permanentGold: Math.abs(Number((item.permanentGold) || 0)/100) ,
freeGold: Math.abs(Number((item.freeGold) || 0)/100) ,
taskGold: Math.abs(Number((item.taskGold) || 0)/100) ,
permanentGold: Math.abs(Number((item.permanentGold) || 0) / 100),
freeGold: Math.abs(Number((item.freeGold) || 0) / 100),
taskGold: Math.abs(Number((item.taskGold) || 0) / 100),
}))
// 转换订单号数组 [{label, value}]
@ -479,40 +479,28 @@ onMounted(async function () {
<template>
<div>
<div class="userAndForm">
<div class="left">
<el-form :model="addRefund" ref="Ref" :rules="rules" label-width="auto" label-position="right"
style="max-width: 750px" class="form-style">
style="max-width: 750px" class="add-form">
<el-form-item prop="jwcode" label="精网号">
<el-input v-model="addRefund.jwcode" style="width: 220px" @change="getGoods(addRefund.jwcode)"/>
<el-input v-model="addRefund.jwcode" style="width: 220px" @change="getGoods(addRefund.jwcode)" />
<el-button type="primary" @click="getUser(addRefund.jwcode)" style="margin-left: 20px">查询
</el-button>
</el-form-item>
<el-form-item prop="refundType" label="退款类型">
<el-select v-model="addRefund.refundType" placeholder="请选择" style="width: 220px">
<el-option v-for="item in refundType" :key="item.value" :label="item.label" :value="item.value"/>
<el-option v-for="item in refundType" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item prop="orderCode" label="订单号">
<el-select
v-model="addRefund.orderCode"
placeholder="请选择订单号"
style="width: 220px;"
clearable
filterable
:filter-method="handleFilter"
@change="handleOrderChange"
>
<el-option
v-for="(item, index) in orderCodes"
:key="index"
:label="item.label"
:value="item.value"
/>
<el-select v-model="addRefund.orderCode" placeholder="请选择订单号" style="width: 220px;" clearable filterable
:filter-method="handleFilter" @change="handleOrderChange">
<el-option v-for="(item, index) in orderCodes" :key="index" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item prop="goodsName" label="商品名">
<el-input v-model="addRefund.goodsName" style="width: 220px" disabled/>
<el-input v-model="addRefund.goodsName" style="width: 220px" disabled />
</el-form-item>
@ -525,23 +513,21 @@ onMounted(async function () {
<el-form-item prop="permanentGold" label="永久金币">
<el-input v-model="addRefund.permanentGold" style="width: 220px"
:disabled="addRe.typeR === '0' ? true : false" @input="handlePermanentGoldInput($event)"
type="number">
:disabled="addRe.typeR === '0' ? true : false" @input="handlePermanentGoldInput($event)" type="number">
</el-input>&nbsp;&nbsp;个
</el-form-item>
<el-form-item prop="freeGold" label="免费金币">
<el-input v-model="addRefund.freeGold" style="float: left; width: 220px"
:disabled="addRe.typeR === '0' ? true : false" @input="handleFreeGoldInput($event)" type="number"/>
:disabled="addRe.typeR === '0' ? true : false" @input="handleFreeGoldInput($event)" type="number" />
&nbsp;&nbsp;个
</el-form-item>
<div>
<el-form-item prop="taskGold" label="任务金币">
<el-input v-model="addRefund.taskGold" style="float: left; width: 220px"
:disabled="addRe.typeR === '0' ? true : false" @input="handleTaskGoldInput($event)"
type="number"/>
:disabled="addRe.typeR === '0' ? true : false" @input="handleTaskGoldInput($event)" type="number" />
&nbsp;&nbsp;个
</el-form-item>
</div>
@ -555,17 +541,19 @@ onMounted(async function () {
<el-form-item prop="remark" label="备注">
<el-input v-model="addRefund.remark" style="width: 220px" :rows="3" maxlength="100" show-word-limit
type="textarea"/>
type="textarea" />
</el-form-item>
</div>
<el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
<el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
</el-form>
</div>
<div class="right">
<!-- 客户信息栏 -->
<el-card v-if="user.jwcode" style="max-width: 800px" class="beautiful">
<el-form :model="user" label-width="auto" style="max-width: 800px" label-position="left">
<el-form :model="user" label-width="auto" style="min-width: 800px" label-position="left">
<el-text size="large" style="margin-left: 20px">客户信息</el-text>
<!-- 第一行：姓名 + 历史金币 -->
@ -633,37 +621,49 @@ onMounted(async function () {
</el-form>
</el-card>
</div>
</div>
</div>
</template>
<style scoped>
p {
margin: 0px;
}
.userAndForm {
width: 90%;
width: 100%;
height: 100%;
display: flex;
align-items: center;
}
.left {
width: 35%;
display: flex;
.add-form {
width: 100%;
margin-top: 50px;
}
}
.beautiful {
.right {
flex: 1;
float: right;
margin-left: 150px;
}
margin-left: 20px;
display: flex;
.form-style {
margin-top: 50px;
max-width: 50%;
float: left;
.beautiful {
width: 90%;
display: flex;
justify-content: center;
align-items: center;
padding: 0 10px;
}
}
}
.el-form-item {
margin-left: 50px;
}
</style>
Write Preview
Loading…
Cancel
Save