Browse Source

将充值金币改为永久金币

Hongxilin
hongxilin 4 months ago
parent
commit
2d55f6fe95
  1. 2
      vue/gold-system/src/views/audit/rechargeAudit.vue
  2. 2
      vue/gold-system/src/views/audit/refundAudit.vue
  3. 6
      vue/gold-system/src/views/consume/addConsume.vue
  4. 2
      vue/gold-system/src/views/consume/allConsume.vue
  5. 16
      vue/gold-system/src/views/recharge/addRecharge.vue
  6. 2
      vue/gold-system/src/views/recharge/adminRecharge.vue
  7. 2
      vue/gold-system/src/views/recharge/allRecharge.vue
  8. 6
      vue/gold-system/src/views/refund/addRefund.vue
  9. 2
      vue/gold-system/src/views/refund/allRefund.vue
  10. 6
      vue/gold-system/src/views/usergold/index.vue
  11. 2
      vue/gold-system/src/views/usergoldInfo/index.vue
  12. 24
      vue/gold-system/src/views/workspace/index.vue

2
vue/gold-system/src/views/audit/rechargeAudit.vue

@ -573,7 +573,7 @@ onMounted(async function () {
label="充值方式" label="充值方式"
width="100px" width="100px"
/> />
<el-table-column prop="paidGold" label="充值金币" width="100px" />
<el-table-column prop="paidGold" label="永久金币" width="100px" />
<el-table-column prop="freeGold" label="免费金币" width="100px" /> <el-table-column prop="freeGold" label="免费金币" width="100px" />
<el-table-column <el-table-column
prop="remark" prop="remark"

2
vue/gold-system/src/views/audit/refundAudit.vue

@ -537,7 +537,7 @@ onMounted(async function () {
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="rechargeCoin" prop="rechargeCoin"
label="充值金币"
label="永久金币"
width="100px" width="100px"
/> />
<el-table-column prop="freeCoin" label="免费金币" width="100px" /> <el-table-column prop="freeCoin" label="免费金币" width="100px" />

6
vue/gold-system/src/views/consume/addConsume.vue

@ -241,7 +241,7 @@ function calculateCoins() {
addConsume.value.freeCoin = Math.min(remainingGold, todayFree); addConsume.value.freeCoin = Math.min(remainingGold, todayFree);
remainingGold -= addConsume.value.freeCoin; remainingGold -= addConsume.value.freeCoin;
addConsume.value.rechargeCoin = remainingGold; //
addConsume.value.rechargeCoin = remainingGold; //
// allGold // allGold
addConsume.value.allGold = originalAllGold; addConsume.value.allGold = originalAllGold;
@ -302,7 +302,7 @@ function calculateCoins() {
/> />
</el-form-item> </el-form-item>
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<el-form-item prop="rechargeCoin" label="充值金币" style="float: left">
<el-form-item prop="rechargeCoin" label="永久金币" style="float: left">
<el-input <el-input
disabled disabled
v-model="addConsume.rechargeCoin" v-model="addConsume.rechargeCoin"
@ -386,7 +386,7 @@ function calculateCoins() {
<span <span
style="display: inline; white-space: nowrap; color: #b1b1b1" style="display: inline; white-space: nowrap; color: #b1b1b1"
v-if="user.buyJb" v-if="user.buyJb"
>(充值金币:{{ user.buyJb }};免费金币:{{
>(永久金币:{{ user.buyJb }};免费金币:{{
user.free6 + user.free12 user.free6 + user.free12
}};任务金币:{{ user.coreJb }})</span }};任务金币:{{ user.coreJb }})</span
> >

2
vue/gold-system/src/views/consume/allConsume.vue

@ -383,7 +383,7 @@ getGoods();
{{ scope.row.freeCoin * -1 }} {{ scope.row.freeCoin * -1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rechargeCoin" label="充值金币" width="120px"
<el-table-column prop="rechargeCoin" label="永久金币" width="120px"
><template #default="scope"> ><template #default="scope">
{{ scope.row.rechargeCoin * -1 }} {{ scope.row.rechargeCoin * -1 }}
</template> </template>

16
vue/gold-system/src/views/recharge/addRecharge.vue

@ -104,7 +104,7 @@ const Ref = ref(null);
const checkFreeGoldRadio = function (rule, value, callback) { const checkFreeGoldRadio = function (rule, value, callback) {
if (value == "0" || value == null || value == "") { if (value == "0" || value == null || value == "") {
callback(new Error("请输入充值金币"));
callback(new Error("请输入永久金币"));
} else if (value < 0 || isNaN(value)) { } else if (value < 0 || isNaN(value)) {
callback(new Error("请输入正确的格式")); callback(new Error("请输入正确的格式"));
} else { } else {
@ -580,7 +580,7 @@ const changeActivity = function (row) {
} }
} }
}; };
//
//
const changePaidGold = function (row) { const changePaidGold = function (row) {
console.log("row===", row); console.log("row===", row);
let ratio = 0; let ratio = 0;
@ -682,7 +682,7 @@ const batchAdd = async function () {
if ( if (
batchData.value[i].paidGold == "" || batchData.value[i].paidGold == "" ||
batchData.value[i].paidGold == null) { batchData.value[i].paidGold == null) {
msg += `充值金币不能为空! <br/>`;
msg += `永久金币不能为空! <br/>`;
} }
if ( if (
batchData.value[i].freeGold == "" || batchData.value[i].freeGold == "" ||
@ -877,7 +877,7 @@ onMounted(async function () {
<el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId" /> <el-option v-for="item in activity" :key="item.value" :label="item.activityName" :value="item.activityId" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="paidGold" label="充值金币">
<el-form-item prop="paidGold" label="永久金币">
<el-input v-model="addRecharge.paidGold" style="width: 100px" /> <el-input v-model="addRecharge.paidGold" style="width: 100px" />
<p style="margin-right: 20px"></p> <p style="margin-right: 20px"></p>
<p>免费金币</p> <p>免费金币</p>
@ -946,7 +946,7 @@ onMounted(async function () {
<span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{ <span style="color: #2fa1ff; margin-right: 5px" v-if="user.buyJb">{{
user.buyJb + user.free6 + user.free12 + user.coreJb user.buyJb + user.free6 + user.free12 + user.coreJb
}}</span> }}</span>
<span style="display: inline; white-space: nowrap; color: #b1b1b1" v-if="user.buyJb">(充值金币:{{ user.buyJb
<span style="display: inline; white-space: nowrap; color: #b1b1b1" v-if="user.buyJb">(永久金币:{{ user.buyJb
}};免费金币:{{ }};免费金币:{{
user.free6 + user.free12 user.free6 + user.free12
}};任务金币:{{ user.coreJb }})</span> }};任务金币:{{ user.coreJb }})</span>
@ -1041,7 +1041,7 @@ onMounted(async function () {
<span v-else>{{ scope.row.activityName }}</span> <span v-else>{{ scope.row.activityName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="paidGold" label="充值金币" width="110px">
<el-table-column property="paidGold" label="永久金币" width="110px">
<template #default="scope"> <template #default="scope">
<el-input v-if="scope.row.showInput" v-model="scope.row.paidGold" style="width: 70px" <el-input v-if="scope.row.showInput" v-model="scope.row.paidGold" style="width: 70px"
@change="changePaidGold(scope.row)" /> @change="changePaidGold(scope.row)" />
@ -1162,8 +1162,8 @@ onMounted(async function () {
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="充值金币">
<el-input v-model="batchSettingObj.paidGold" placeholder="请输入充值金币"></el-input>
<el-form-item label="永久金币">
<el-input v-model="batchSettingObj.paidGold" placeholder="请输入永久金币"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="免费金币"> <el-form-item label="免费金币">
<el-input v-model="batchSettingObj.freeGold"></el-input> <el-input v-model="batchSettingObj.freeGold"></el-input>

2
vue/gold-system/src/views/recharge/adminRecharge.vue

@ -460,7 +460,7 @@ onMounted(async function () {
width="120px" width="120px"
sortable sortable
/> />
<el-table-column prop="paidGold" label="充值金币" width="100px" />
<el-table-column prop="paidGold" label="永久金币" width="100px" />
<el-table-column prop="freeGold" label="免费金币" width="100px" /> <el-table-column prop="freeGold" label="免费金币" width="100px" />
<el-table-column <el-table-column
prop="remark" prop="remark"

2
vue/gold-system/src/views/recharge/allRecharge.vue

@ -423,7 +423,7 @@ onMounted(async function () {
label="充值方式" label="充值方式"
width="100px" width="100px"
/> />
<el-table-column prop="paidGold" label="充值金币" width="100px" />
<el-table-column prop="paidGold" label="永久金币" width="100px" />
<el-table-column prop="freeGold" label="免费金币" width="100px" /> <el-table-column prop="freeGold" label="免费金币" width="100px" />
<el-table-column <el-table-column
prop="remark" prop="remark"

6
vue/gold-system/src/views/refund/addRefund.vue

@ -120,7 +120,7 @@ const rules = reactive({
taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }], taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }], freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }],
rechargeCoin: [ rechargeCoin: [
{ required: true, message: "请输入充值金币", trigger: "blur" },
{ required: true, message: "请输入永久金币", trigger: "blur" },
], ],
allCoin: [ allCoin: [
{ required: true, message: "请选择付款方式", trigger: "blur" }, { required: true, message: "请选择付款方式", trigger: "blur" },
@ -340,7 +340,7 @@ const handleSelectionChange = (value) => {
</el-form-item> </el-form-item>
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<el-form-item prop="rechargeCoin" label="充值金币" style="float: left">
<el-form-item prop="rechargeCoin" label="永久金币" style="float: left">
<el-input <el-input
v-model="addRefund.rechargeCoin" v-model="addRefund.rechargeCoin"
style="width: 100px" style="width: 100px"
@ -428,7 +428,7 @@ const handleSelectionChange = (value) => {
<span <span
style="display: inline; white-space: nowrap; color: #b1b1b1" style="display: inline; white-space: nowrap; color: #b1b1b1"
v-if="user.buyJb" v-if="user.buyJb"
>(充值金币:{{ user.buyJb }};免费金币:{{
>(永久金币:{{ user.buyJb }};免费金币:{{
user.free6 + user.free12 user.free6 + user.free12
}};任务金币:{{ user.coreJb }})</span }};任务金币:{{ user.coreJb }})</span
> >

2
vue/gold-system/src/views/refund/allRefund.vue

@ -434,7 +434,7 @@ const checkNumber = function () {
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="rechargeCoin" prop="rechargeCoin"
label="充值金币"
label="永久金币"
width="100px" width="100px"
/> />
<el-table-column prop="freeCoin" label="免费金币" width="100px" /> <el-table-column prop="freeCoin" label="免费金币" width="100px" />

6
vue/gold-system/src/views/usergold/index.vue

@ -229,7 +229,7 @@ const json_fields = (row) => {
row.consumePlatform, // row.consumePlatform, //
row.firstexam_score, // row.firstexam_score, //
row.freeCoin, // row.freeCoin, //
row.rechageCoin, //
row.rechageCoin, //
row.taskCoin, // row.taskCoin, //
row.name, // row.name, //
moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"), // moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"), //
@ -520,7 +520,7 @@ const get30 = function () {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
现有金币免费金币{{ Math.abs(freeCoin) }}充值金币{{
现有金币免费金币{{ Math.abs(freeCoin) }}永久金币{{
Math.abs(rechargeCoin) Math.abs(rechargeCoin)
}}任务金币{{ Math.abs(taskCoin) }} }}任务金币{{ Math.abs(taskCoin) }}
</div> </div>
@ -579,7 +579,7 @@ const get30 = function () {
<span>{{ Math.abs(scope.row.freeCoin) }}</span> <span>{{ Math.abs(scope.row.freeCoin) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rechargeCoin" label="充值金币" width="150">
<el-table-column prop="rechargeCoin" label="永久金币" width="150">
<template #default="scope"> <template #default="scope">
<span>{{ Math.abs(scope.row.rechargeCoin) }}</span> <span>{{ Math.abs(scope.row.rechargeCoin) }}</span>
</template> </template>

2
vue/gold-system/src/views/usergoldInfo/index.vue

@ -243,7 +243,7 @@ onMounted(async function () {
<span>{{ Math.abs(scope.row.free6 + scope.row.free12) }}</span> <span>{{ Math.abs(scope.row.free6 + scope.row.free12) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="buyJb" label="充值金币" width="110">
<el-table-column prop="buyJb" label="永久金币" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ Math.abs(scope.row.buyJb) }}</span> <span>{{ Math.abs(scope.row.buyJb) }}</span>
</template> </template>

24
vue/gold-system/src/views/workspace/index.vue

@ -68,7 +68,7 @@ const gold = [
}, },
{ {
value: "充值金币", value: "充值金币",
label: "充值金币",
label: "永久金币",
}, },
{ {
value: "免费金币", value: "免费金币",
@ -144,7 +144,7 @@ const get = async function () {
option3Data.value = [ option3Data.value = [
{ {
value: Math.abs(statistics.value.rechargeSumCoin), value: Math.abs(statistics.value.rechargeSumCoin),
name: "充值金币" + " | " + statistics.value.rechargeSumCoin,
name: "永久金币" + " | " + statistics.value.rechargeSumCoin,
}, },
{ {
value: Math.abs(statistics.value.freeSumCoin), value: Math.abs(statistics.value.freeSumCoin),
@ -160,7 +160,7 @@ const get = async function () {
{ {
value: Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin), value: Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin),
name: name:
"充值金币" +
"永久金币" +
" | " + " | " +
Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin), Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin),
}, },
@ -184,7 +184,7 @@ const get = async function () {
option5Data.value = [ option5Data.value = [
{ {
value: Math.abs(getSumCoin.value.todayRecharge), value: Math.abs(getSumCoin.value.todayRecharge),
name: "充值金币" + " | " + getSumCoin.value.todayRecharge,
name: "永久金币" + " | " + getSumCoin.value.todayRecharge,
}, },
{ {
value: Math.abs(getSumCoin.value.todayFree), value: Math.abs(getSumCoin.value.todayFree),
@ -440,7 +440,7 @@ const getMiddleBar = async function () {
}, },
series: [ series: [
{ {
name: "充值金币",
name: "永久金币",
color: "#35e383", color: "#35e383",
type: "bar", type: "bar",
stack: "total", stack: "total",
@ -513,7 +513,7 @@ const getMiddleBar = async function () {
}, },
series: [ series: [
{ {
name: "充值金币",
name: "永久金币",
color: "#35e383", color: "#35e383",
type: "bar", type: "bar",
stack: "total", stack: "total",
@ -906,7 +906,7 @@ onMounted(async function () {
}, },
series: [ series: [
{ {
name: "充值金币",
name: "永久金币",
color: "#35e383", color: "#35e383",
type: "bar", type: "bar",
stack: "total", stack: "total",
@ -1125,7 +1125,7 @@ onMounted(async function () {
</span> </span>
</p> </p>
<template #footer> <template #footer>
<span>充值{{ formatNum(getSumCoin.todayRecharge) }}
<span>永久{{ formatNum(getSumCoin.todayRecharge) }}
免费{{ formatNum(getSumCoin.todayFree) }} 免费{{ formatNum(getSumCoin.todayFree) }}
任务{{ formatNum(getSumCoin.todayTask) }} 任务{{ formatNum(getSumCoin.todayTask) }}
</span> </span>
@ -1242,7 +1242,7 @@ onMounted(async function () {
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleChange"> <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleChange">
<el-tab-pane label="金币充值" name="recharge"> <el-tab-pane label="金币充值" name="recharge">
<div> <div>
合计充值金币
合计永久金币
<span class="mid-head-font">{{ <span class="mid-head-font">{{
formatNum(middleTotalRecharge) formatNum(middleTotalRecharge)
}}</span> }}</span>
@ -1259,7 +1259,7 @@ onMounted(async function () {
<div id="recharge" style="width: 100%; height: 400px"></div> <div id="recharge" style="width: 100%; height: 400px"></div>
<div style="width: 140px"> <div style="width: 140px">
<div class="goldCategory"> <div class="goldCategory">
<span>充值金币</span>
<span>永久金币</span>
</div> </div>
<div class="goldCategory"> <div class="goldCategory">
<span>免费金币</span> <span>免费金币</span>
@ -1295,7 +1295,7 @@ onMounted(async function () {
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="金币消费" name="consume"> <el-tab-pane label="金币消费" name="consume">
<div> <div>
合计充值金币
合计永久金币
<span class="mid-head-font">{{ <span class="mid-head-font">{{
formatNum(middleTotalRecharge) formatNum(middleTotalRecharge)
}}</span> }}</span>
@ -1312,7 +1312,7 @@ onMounted(async function () {
<div id="consume" style="width: 100%; height: 400px"></div> <div id="consume" style="width: 100%; height: 400px"></div>
<div style="width: 140px"> <div style="width: 140px">
<div class="goldCategory"> <div class="goldCategory">
<span>充值金币</span>
<span>永久金币</span>
</div> </div>
<div class="goldCategory"> <div class="goldCategory">
<span>免费金币</span> <span>免费金币</span>

Loading…
Cancel
Save