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

Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

Hongxilin
donghaolin 5 months ago
parent
fc3cb17437 543204d3e9
commit
3944d84e3b
8 changed files with 38 additions and 25 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. 3
      vue/gold-system/src/views/audit/rechargeAudit.vue
  2. 3
      vue/gold-system/src/views/audit/refundAudit.vue
  3. 3
      vue/gold-system/src/views/consume/allConsume.vue
  4. 6
      vue/gold-system/src/views/recharge/adminRecharge.vue
  5. 6
      vue/gold-system/src/views/recharge/allRecharge.vue
  6. 3
      vue/gold-system/src/views/refund/allRefund.vue
  7. 2
      vue/gold-system/src/views/usergold/index.vue
  8. 37
      vue/gold-system/src/views/workspace/index.vue

3
vue/gold-system/src/views/audit/rechargeAudit.vue
View File

@ -391,6 +391,7 @@ onMounted(async function () {
placeholder="请选择活动名称"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in activity"
@ -409,6 +410,7 @@ onMounted(async function () {
placeholder="请选择支付方式"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in payWay"
@ -427,6 +429,7 @@ onMounted(async function () {
placeholder="请选择所属地区"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in area"

3
vue/gold-system/src/views/audit/refundAudit.vue
View File

@ -376,6 +376,7 @@ onMounted(async function () {
placeholder="请选择退款类型"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in refundType"
@ -394,6 +395,7 @@ onMounted(async function () {
placeholder="请选择退款商品"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in product"
@ -412,6 +414,7 @@ onMounted(async function () {
placeholder="请选择所属地区"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in area"

3
vue/gold-system/src/views/consume/allConsume.vue
View File

@ -238,6 +238,7 @@ getGoods();
placeholder="请选择活动名称"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in goods"
@ -256,6 +257,7 @@ getGoods();
placeholder="请选择支付方式"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in consumePlatform"
@ -274,6 +276,7 @@ getGoods();
placeholder="请选择消费类型"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in consumeType"

6
vue/gold-system/src/views/recharge/adminRecharge.vue
View File

@ -282,7 +282,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">活动名称：</el-text>
<el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
:value="item.activityId" />
</el-select>
@ -292,7 +292,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">支付方式：</el-text>
<el-select v-model="rechargeVo.payWay" placeholder="请选择支付方式" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in payWay" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@ -303,7 +303,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区：</el-text>
<el-select v-model="rechargeVo.area" placeholder="请选择所属地区" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in area" :key="item" :label="item" :value="item" />
</el-select>
</div>

6
vue/gold-system/src/views/recharge/allRecharge.vue
View File

@ -251,7 +251,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">活动名称：</el-text>
<el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
:value="item.activityId" />
</el-select>
@ -261,7 +261,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">支付方式：</el-text>
<el-select v-model="rechargeVo.payWay" placeholder="请选择支付方式" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in payWay" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@ -272,7 +272,7 @@ onMounted(async function () {
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区：</el-text>
<el-select v-model="rechargeVo.area" placeholder="请选择所属地区" size="large"
style="width: 240px">
style="width: 240px" clearable>
<el-option v-for="item in area" :key="item" :label="item" :value="item" />
</el-select>
</div>

3
vue/gold-system/src/views/refund/allRefund.vue
View File

@ -287,6 +287,7 @@ getGoods();
placeholder="请选择退款类型"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in consumeType"
@ -305,6 +306,7 @@ getGoods();
placeholder="请选择支付方式"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in goods"
@ -323,6 +325,7 @@ getGoods();
placeholder="请选择所属地区"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in area"

2
vue/gold-system/src/views/usergold/index.vue
View File

@ -221,7 +221,7 @@ onMounted(async function () {
</div>
<div class="head-card-element">
<el-text class="mx-1" size="large">更新类型：</el-text>
<el-select v-model="detail.updateType" placeholder="请选择更新类型" size="large" style="width: 240px">
<el-select v-model="detail.updateType" placeholder="请选择更新类型" size="large" style="width: 240px" clearable>
<el-option v-for="item in updateType" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>

37
vue/gold-system/src/views/workspace/index.vue
View File

@ -4,6 +4,7 @@ import { ref, onMounted, reactive, computed } from "vue";
import { VscInfo } from 'vue-icons-plus/vsc'
import { Bs1CircleFill, Bs2CircleFill, Bs3CircleFill, Bs4Circle, Bs5Circle, Bs6Circle, Bs7Circle, Bs8Circle } from 'vue-icons-plus/bs'
import axios, { all } from 'axios';
import API from "../../api/index";
// 变量
// 加载对象
@ -96,28 +97,28 @@ const list = ref([]);
const get = async function () {
try {
// 发送POST请求
const result1 = await axios.post('http://192.168.8.147:10070/statistics/getSumCoin');
const result2 = await axios.post('http://192.168.8.174:10070/statistics/a');
const result3 = await axios.post('http://192.168.8.147:10070/statistics/getYearConsumeCoin');
const result4 = await axios.post('http://192.168.8.147:10070/statistics/getDayConsumeCoin');
const result5 = await axios.post('http://192.168.8.147:10070/statistics/getMediumAreaPay');
const result6 = await axios.post('http://192.168.8.147:10070/statistics/getMediumAreaConsume');
const result7 = await axios.post('http://192.168.8.147:10070/statistics/getMediuPayCoin');
const result8 = await axios.post('http://192.168.8.147:10070/statistics/getMediuConsumeCoin');
const result9 = await axios.post('http://192.168.8.174:10070/statistics/b');
const result1 = await API.post('http://192.168.8.93:10040/statistics/getSumCoin');
const result2 = await API.post('http://192.168.8.93:10040/statistics/a');
const result3 = await API.post('http://192.168.8.93:10040/statistics/getYearConsumeCoin');
const result4 = await API.post('http://192.168.8.93:10040/statistics/getDayConsumeCoin');
const result5 = await API.post('http://192.168.8.93:10040/statistics/getMediumAreaPay');
const result6 = await API.post('http://192.168.8.93:10040/statistics/getMediumAreaConsume');
const result7 = await API.post('http://192.168.8.93:10040/statistics/getMediuPayCoin');
const result8 = await API.post('http://192.168.8.93:10040/statistics/getMediuConsumeCoin');
const result9 = await API.post('http://192.168.8.93:10040/statistics/b');
// 将响应结果存储到响应式数据中
getSumCoin.value = result1.data.data;
statistics.value = result2.data.data;
getYearConsumeCoin.value = result3.data.data;
getDayConsumeCoin.value = result4.data.data;
getMediumAreaPay.value = result5.data.data;
getSumCoin.value = result1.data;
statistics.value = result2.data;
getYearConsumeCoin.value = result3.data;
getDayConsumeCoin.value = result4.data;
getMediumAreaPay.value = result5.data;
areaSizePay.value = getMediumAreaPay.value.length;
getMediumAreaConsume.value = result6.data.data;
getMediumAreaConsume.value = result6.data;
areaSizeConsume.value = getMediumAreaConsume.value.length;
getMediuPayCoin.value = result7.data.data;
getMediuConsumeCoin.value = result8.data.data;
platformData.value = result9.data.data;
getMediuPayCoin.value = result7.data;
getMediuConsumeCoin.value = result8.data;
platformData.value = result9.data;
console.log('getSumCoin', getSumCoin.value);

Write Preview
Loading…
Cancel
Save