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

Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化

youhua/chongzhi
zhangrenyuan 2 months ago
parent
3f19d29fd1 4aa3393636
commit
3a2cae2b41
4 changed files with 45 additions and 23 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. 4
      .env.development
  2. 16
      src/views/consume/gold/coinConsumeDetail.vue
  3. 2
      src/views/permissions/rolePermission.vue
  4. 46
      src/views/recharge/gold/coinRechargeDetail.vue

4
.env.development
View File

@ -1,4 +1,4 @@
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境
@ -6,7 +6,7 @@ VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# VITE_API_BASE='http://192.168.9.28:8081/'
# sunjiabei
# VITE_API_BASE='http://192.168.9.135:8081/'
# VITE_API_BASE='http://192.168.9.28:8081/'
# VITE_API_BASE='http://192.168.5.92:8081/'
# zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/'

16
src/views/consume/gold/coinConsumeDetail.vue
View File

@ -365,11 +365,15 @@ const getGoods = async function () {
url: '/general/goods',
data: {}
})
// 将响应结果存储到响应式数据中
console.log('请求成功product', result)
// 存储全部数据
goods.value = result.data
console.log('goods 数据', goods.value) // 修改日志输出
// 验证数据格式
if (result.data && Array.isArray(result.data)) {
goods.value = result.data
console.log('商品数据加载成功', goods.value)
} else {
console.error('返回数据格式不正确', result)
// 可以在这里设置默认值或显示错误消息
goods.value = []
}
} catch (error) {
console.log('请求失败', error)
// 在这里可以处理错误逻辑，比如显示错误提示等
@ -570,7 +574,7 @@ const getMarket = async function () {
<el-text class="mx-1" size="large">商品名称：</el-text>
<el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" style="width: 180px" clearable>
<!-- 修改 v-for 绑定逻辑 -->
<el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item" />
<el-option v-for="(item, index) in goods" :key="item.id" :label="item.goodsname " :value="item.goodsname" />
</el-select>
</div>
</el-col>

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

@ -702,7 +702,7 @@ onMounted(async function () {
:value="item.value"></el-option>
</el-input>
</el-form-item>
<el-form-item prop="market" label="地区" required>
<el-form-item prop="market" label="归属地区" required>
<el-input v-model="permissionEditRoleObj.market" placeholder="请输入归属地区" style="width: 220px" disabled />
<text>(此地区无实际意义，仅用于各分部负责人查看其地区角色)</text>
</el-form-item>

46
src/views/recharge/gold/coinRechargeDetail.vue
View File

@ -6,7 +6,7 @@ import API from '@/util/http.js'
import { reverseMarketMapping } from '@/utils/marketMap.js';
import dayjs from "dayjs";
//新增员工数数据复选框，默认no勾选
//新增员工数数据复选框，默认不勾选
const showEmployeeData = ref(false)
const trimJwCode = () => {
@ -332,13 +332,11 @@ const get = async function (val) {
return
}
}
console.log("showEmployeeData.value",showEmployeeData.value)
const result = await API({
url: '/recharge/selectBy',
data: {
...getObj.value,
rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? '0' : '1'}//新增flag参数
rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? 1 : 0 }//新增flag参数
}
})
// 复制一份 rechargeUser.value 并移除排序字段和排序方式
@ -588,17 +586,19 @@ const getTagText = (state) => {
</script>
<template>
<el-row>
<el-col>
<el-card style="margin-bottom: 20px;margin-top: 10px">
<el-row style="margin-bottom: 10px">
<el-col :span="5">
<div class="head-card-element">
<el-text size="large">精网号：</el-text>
<el-text class="mx-1" size="large">精网号：</el-text>
<el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
</div>
</el-col>
<el-col :span="5">
<div class="head-card-element">
<el-text size="large">活动名称：</el-text>
<el-text class="mx-1" size="large">活动名称：</el-text>
<el-select v-model="rechargeUser.activity" placeholder="请选择活动名称" style="width: 180px" clearable>
<el-option v-for="item in activity" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
@ -606,14 +606,14 @@ const getTagText = (state) => {
</el-col>
<el-col :span="5">
<div class="head-card-element">
<el-text size="large">所属地区：</el-text>
<el-text class="mx-1" size="large">所属地区：</el-text>
<el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable
style="width:180px" @change="handleMarketChange" />
</div>
</el-col>
<el-col :span="5">
<div class="head-card-element">
<el-text size="large">充值方式：</el-text>
<el-text class="mx-1" size="large">充值方式：</el-text>
<el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
@ -621,14 +621,14 @@ const getTagText = (state) => {
</el-col>
<el-col :span="3">
<div class="head-card-element">
<el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
<el-checkbox v-model="showEmployeeData" @click="search()">员工数据</el-checkbox>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="head-card-element">
<el-text size="large">充值时间：</el-text>
<el-text class="mx-1" size="large">充值时间：</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
:default-time="defaultTime" :disabled-date="disabledDate"/>
@ -649,11 +649,15 @@ const getTagText = (state) => {
</el-col>
</el-row>
</el-card>
</el-col>
</el-row>
<el-row>
<el-col>
<el-card>
<div>
充值新币：{{ format3(permanentGolds) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
永久金币：{{ format3(permanentGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
免费金币：{{ format3(freeGolds.toFixed(2) ) }}金币
永久金币：{{ format3(permanentGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
免费金币：{{ format3(freeGolds ) }}金币
</div>
<!-- 设置表格容器的高度和滚动样式 -->
@ -666,7 +670,7 @@ const getTagText = (state) => {
}}</span>
</template>
</el-table-column>
<el-table-column fixed="left" prop="name" label="姓名" width="150px" show-overflow-tooltip />
<el-table-column fixed="left" prop="name" label="姓名" width="150px" />
<el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
<el-table-column prop="market" label="所属地区" width="100px" />
<el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip />
@ -674,7 +678,7 @@ const getTagText = (state) => {
<el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
<el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px" />
<el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px" />
<el-table-column prop="payPlatform" label="充值方式" width="120px" />
<el-table-column prop="payPlatform" label="充值方式" width="100px" />
<el-table-column prop="payModel" label="支付方式" width="100px" />
<el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip />
<el-table-column prop="adminName" label="提交人" width="100px" />
@ -693,6 +697,8 @@ const getTagText = (state) => {
@current-change="handleCurrentChange"></el-pagination>
</div>
</el-card>
</el-col>
</el-row>
<!-- 导出弹窗 -->
<el-dialog v-model="exportListVisible" title="导出列表" width="80%">
<el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
@ -730,7 +736,19 @@ const getTagText = (state) => {
display: flex;
}
.status {
display: flex;
}
.head-card {
display: flex;
}
.head-card-element {
margin-right: 20px;
}
.head-card-btn {
margin-left: auto;
}
</style>
Write Preview
Loading…
Cancel
Save