最新上传

5 months ago · 57e761c78f
10 changed files with 224 additions and 103 deletions
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@ -22,7 +22,7 @@ const rechargeVo = ref({});
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@ -22,7 +22,7 @@ const consumeDetail = ref({});
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@ -354,19 +354,27 @@ getGoods();
            >
              <template #default="scope">
                {{
-                  scope.row.taskCoin +
-                  scope.row.freeCoin +
-                  scope.row.rechargeCoin
+                  scope.row.taskCoin * -1 +
+                  scope.row.freeCoin * -1 +
+                  scope.row.rechargeCoin * -1
                }}
              </template>
            </el-table-column>
-            <el-table-column prop="taskCoin" label="任务金币" width="120px" />
-            <el-table-column prop="freeCoin" label="免费金币" width="120px" />
-            <el-table-column
-              prop="rechargeCoin"
-              label="充值金币"
-              width="120px"
-            />
+            <el-table-column prop="taskCoin" label="任务金币" width="120px">
+              <template #default="scope">
+                {{ scope.row.taskCoin * -1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="freeCoin" label="免费金币" width="120px">
+              <template #default="scope">
+                {{ scope.row.freeCoin * -1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="rechargeCoin" label="充值金币" width="120px"
+              ><template #default="scope">
+                {{ scope.row.rechargeCoin * -1 }}
+              </template>
+            </el-table-column>
            <el-table-column
              prop="remark"
              label="备注"
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@ -35,7 +35,7 @@ const activity = ref({});
 //搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 // 添加对象
 const addObj = ref({
@ -100,7 +100,7 @@ const search = function () {
 const reset = function () {
  getObj.value = {};
  getObj.value.pageNum = 1;
-  getObj.value.pageSize = 5;
+  getObj.value.pageSize = 10;
  getTime.value = {};
  activity.value = {};
 };
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@ -35,7 +35,7 @@ const tableData = ref([]);
 //搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 const total = ref(0);
 //分页总条目
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@ -33,7 +33,7 @@ const rechargeVo = ref({
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@ -15,7 +15,7 @@ const rechargeVo = ref({});
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
--- a/vue/gold-system/src/views/refund/allRefund.vue
+++ b/vue/gold-system/src/views/refund/allRefund.vue
@ -15,7 +15,7 @@ const detail = ref({});
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
--- a/vue/gold-system/src/views/usergold/index.vue
+++ b/vue/gold-system/src/views/usergold/index.vue
@ -27,7 +27,7 @@ const getAllObj = ref({});
 // 搜索对象
 const getObj = ref({
  pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });

 // 支付方式选项
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@ -17,7 +17,7 @@ const getYearConsumeCoin = ref({});
 const getDayConsumeCoin = ref({});

 // 中间统计图搜索参数
-const changeTimeRatio=ref("allDays");
+const changeTimeRatio = ref("allDays");
 const searchTime = ref([]);

 // 月份柱状图
@ -211,13 +211,13 @@ const get = async function () {
    ERPData.value.forEach((item, index) =>
      item == ""
        ? (ERPData.value[index] = {
-          value: 0,
-          name: "第" + (index + 1) + "学科" + 0,
-        })
+            value: 0,
+            name: "第" + (index + 1) + "学科" + 0,
+          })
        : (ERPData.value[index] = {
-          value: item[0],
-          name: "第" + (index + 1) + "学科" + item[0],
-        })
+            value: item[0],
+            name: "第" + (index + 1) + "学科" + item[0],
+          })
    );
    console.log("ERPData", ERPData.value);
    HCData.value = [
@ -237,13 +237,13 @@ const get = async function () {
    HCData.value.forEach((item, index) =>
      item == ""
        ? (HCData.value[index] = {
-          value: 0,
-          name: "第" + (index + 1) + "学科" + 0,
-        })
+            value: 0,
+            name: "第" + (index + 1) + "学科" + 0,
+          })
        : (HCData.value[index] = {
-          value: item[0],
-          name: "第" + (index + 1) + "学科" + item[0],
-        })
+            value: item[0],
+            name: "第" + (index + 1) + "学科" + item[0],
+          })
    );
    console.log("HCData", HCData.value);
    LinkData.value = [
@ -263,13 +263,13 @@ const get = async function () {
    LinkData.value.forEach((item, index) =>
      item == ""
        ? (LinkData.value[index] = {
-          value: 0,
-          name: "第" + (index + 1) + "学科" + 0,
-        })
+            value: 0,
+            name: "第" + (index + 1) + "学科" + 0,
+          })
        : (LinkData.value[index] = {
-          value: item[0],
-          name: "第" + (index + 1) + "学科" + item[0],
-        })
+            value: item[0],
+            name: "第" + (index + 1) + "学科" + item[0],
+          })
    );
    console.log("LinkData", LinkData.value);
    goldData.value = [
@ -289,13 +289,13 @@ const get = async function () {
    goldData.value.forEach((item, index) =>
      item == ""
        ? (goldData.value[index] = {
-          value: 0,
-          name: "第" + (index + 1) + "学科" + 0,
-        })
+            value: 0,
+            name: "第" + (index + 1) + "学科" + 0,
+          })
        : (goldData.value[index] = {
-          value: item[0],
-          name: "第" + (index + 1) + "学科" + item[0],
-        })
+            value: item[0],
+            name: "第" + (index + 1) + "学科" + item[0],
+          })
    );
    console.log("goldData", goldData.value);
    allData.value = [
@ -365,7 +365,7 @@ const get = async function () {
 // 获取中间柱状图数据
 const getMiddleBar = async function () {
  const result = await API.post(
-    "http://192.168.8.93:10010/statistics/getCoinTime",
+    "http://192.168.8.147:10010/statistics/getCoinTime",
    getMiddleBarObj.value
  );

@ -373,14 +373,18 @@ const getMiddleBar = async function () {
  console.log("getMiddleBarData", getMiddleBarData.value);

  // 柱状图数据处理
-  middleCategory.value = getMiddleBarData.value
-    .map((item) => item.day == null ? item.month : item.day.substring(0, 10));
-  middleRecharge.value = getMiddleBarData.value
-    .map((item) => Math.abs(item.rechargeSumCoin));
-  middleFree.value = getMiddleBarData.value
-    .map((item) => Math.abs(item.freeSumCoin));
-  middleTask.value = getMiddleBarData.value
-    .map((item) => Math.abs(item.taskSumCoin));
+  middleCategory.value = getMiddleBarData.value.map((item) =>
+    item.day == null ? item.month : item.day.substring(0, 10)
+  );
+  middleRecharge.value = getMiddleBarData.value.map((item) =>
+    Math.abs(item.rechargeSumCoin)
+  );
+  middleFree.value = getMiddleBarData.value.map((item) =>
+    Math.abs(item.freeSumCoin)
+  );
+  middleTask.value = getMiddleBarData.value.map((item) =>
+    Math.abs(item.taskSumCoin)
+  );

  middleTotalRecharge.value = 0;
  middleTotalFree.value = 0;
@ -694,28 +698,28 @@ const allTime = function () {
  search();
 };
 // 时间选择器
-const changeTime=function(){
-  console.log("changeTimeRatio",changeTimeRatio.value);
-  if(changeTimeRatio.value=="allDays"){
+const changeTime = function () {
+  console.log("changeTimeRatio", changeTimeRatio.value);
+  if (changeTimeRatio.value == "allDays") {
    allTime();
-  }else if(changeTimeRatio.value=="week"){
+  } else if (changeTimeRatio.value == "week") {
    thisWeek();
-  }else if(changeTimeRatio.value=="month"){
+  } else if (changeTimeRatio.value == "month") {
    thisMonth();
-  }else if(changeTimeRatio.value=="year"){
+  } else if (changeTimeRatio.value == "year") {
    thisYear();
-  }else if(changeTimeRatio.value=="day"){
+  } else if (changeTimeRatio.value == "day") {
    today();
  }
-}
+};

 // 根据时间搜索
 const search = function () {
  console.log(
    "searchTime",
    moment(searchTime.value[0]).format("YYYY-MM-DD") +
-    "至" +
-    moment(searchTime.value[1]).format("YYYY-MM-DD")
+      "至" +
+      moment(searchTime.value[1]).format("YYYY-MM-DD")
  );

  getMiddleBarObj.value.searchStartTime = moment(searchTime.value[0]).format(
@ -1085,26 +1089,37 @@ onMounted(async function () {
            <span v-if="getSumCoin.coinDifference > 0">
              <div class="comparedWithYesterday">
                <span>较前一天 {{ formatNum(getSumCoin.coinDifference) }}</span>
-                <span class="red-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="red-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="getSumCoin.coinDifference < 0">
              <div class="comparedWithYesterday">
                <span>较前一天 {{ formatNum(getSumCoin.coinDifference) }}</span>
-                <span class="green-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="green-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="getSumCoin.coinDifference == 0">
              <div class="comparedWithYesterday">
                <span>较前一天 {{ formatNum(getSumCoin.coinDifference) }}</span>
-                <span class="grey-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="grey-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
          </p>
-          <template #footer>充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{
-            formatNum(getSumCoin.todayFree)
-          }}
-            任务{{ formatNum(getSumCoin.todayTask) }}</template>
+          <template #footer
+            >充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{
+              formatNum(getSumCoin.todayFree)
+            }}
+            任务{{ formatNum(getSumCoin.todayTask) }}</template
+          >
        </el-card>
      </el-col>
      <el-col :span="6">
@ -1114,9 +1129,11 @@ onMounted(async function () {
            {{ formatNum(Math.abs(statistics.totalSumCoin)) }}
          </p>
          <p>
-            折合新币累计金额 {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }}
+            折合新币累计金额
+            {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }}
          </p>
-          <template #footer>昨日新增
+          <template #footer
+            >昨日新增
            {{ formatNum(Math.abs(statistics.totalYesterdaySumCoin)) }}
            ，其中充值
            {{ formatNum(Math.abs(statistics.rechargeYesterdaySumCoin)) }}
@ -1133,10 +1150,12 @@ onMounted(async function () {
            消费 {{ formatNum(Math.abs(getYearConsumeCoin.yearConsumeCoin)) }};
            退款 {{ formatNum(Math.abs(getYearConsumeCoin.yearRefundCoin)) }}
          </p>
-          <template #footer>昨日新增消耗
+          <template #footer
+            >昨日新增消耗
            {{ formatNum(Math.abs(getDayConsumeCoin.daysumCoin)) }} ; 消费
            {{ formatNum(Math.abs(getDayConsumeCoin.dayConsumeCoin)) }} ; 退款
-            {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }}</template>
+            {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }}</template
+          >
        </el-card>
      </el-col>
      <el-col :span="6">
@ -1149,46 +1168,66 @@ onMounted(async function () {
            <span v-if="statistics.weekOverWeekRate > 0">
              <div class="comparedWithYesterday">
                <span>周同比 {{ statistics.weekOverWeekRate }}%</span>
-                <span class="red-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="red-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="statistics.weekOverWeekRate < 0">
              <div class="comparedWithYesterday">
                <span>周同比 {{ statistics.weekOverWeekRate }}%</span>
-                <span class="green-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="green-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="statistics.weekOverWeekRate == 0">
              <div class="comparedWithYesterday">
                <span>周同比 {{ statistics.weekOverWeekRate }}%</span>
-                <span class="grey-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="grey-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
            <span v-if="statistics.dayOverDayRate > 0">
              <div class="comparedWithYesterday">
                <span> 日环比{{ statistics.dayOverDayRate }}%</span>
-                <span class="red-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="red-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="statistics.dayOverDayRate < 0">
              <div class="comparedWithYesterday">
                <span> 日环比{{ statistics.dayOverDayRate }}%</span>
-                <span class="green-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="green-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
            <span v-if="statistics.dayOverDayRate == 0">
              <div class="comparedWithYesterday">
                <span> 日环比{{ statistics.dayOverDayRate }}%</span>
-                <span class="grey-triangle" style="margin: 6px 0px 0px 7px"></span>
+                <span
+                  class="grey-triangle"
+                  style="margin: 6px 0px 0px 7px"
+                ></span>
              </div>
            </span>
          </p>
-          <template #footer>昨日充值人数
+          <template #footer
+            >昨日充值人数
            {{ formatNum(Math.abs(statistics.rechargeCountYesterday)) }}
            ，其中首充
            {{ formatNum(Math.abs(statistics.firstRechargeCountYesterday)) }}
-            人</template>
+            人</template
+          >
        </el-card>
      </el-col>
    </el-row>
@ -1196,23 +1235,59 @@ onMounted(async function () {
      <el-col>
        <el-card>
          <div style="margin-right: auto; text-align: right">
-            <el-radio-group v-model="changeTimeRatio" style="margin-right: 10px;" @change="changeTime()">
-              <el-radio-button label="全部" value="allDays"  style="border-color: white;"/>
-              <el-radio-button label="本日" value="day" style="border-color: white;"/>
-              <el-radio-button label="本周" value="week" style="border-color: white;"/>
-              <el-radio-button label="本月" value="month" style="border-color: white;"/>
-              <el-radio-button label="本年" value="year" style="border-color: white;"/>
+            <el-radio-group
+              v-model="changeTimeRatio"
+              style="margin-right: 10px"
+              @change="changeTime()"
+            >
+              <el-radio-button
+                label="全部"
+                value="allDays"
+                style="border-color: white"
+              />
+              <el-radio-button
+                label="本日"
+                value="day"
+                style="border-color: white"
+              />
+              <el-radio-button
+                label="本周"
+                value="week"
+                style="border-color: white"
+              />
+              <el-radio-button
+                label="本月"
+                value="month"
+                style="border-color: white"
+              />
+              <el-radio-button
+                label="本年"
+                value="year"
+                style="border-color: white"
+              />
            </el-radio-group>
            <!-- <el-button text @click="allTime()" dark=true>全部</el-button>
            <el-button text @click="today()">今日</el-button>
            <el-button text @click="thisWeek()">本周</el-button>
            <el-button text @click="thisMonth()">本月</el-button>
            <el-button text @click="thisYear()">本年</el-button> -->
-            <el-date-picker v-model="searchTime" type="daterange" range-separator="→" start-placeholder="开始时间"
-              end-placeholder="结束时间" style="width: 200px" :disabled-date="disabledDate" @change="search" />
+            <el-date-picker
+              v-model="searchTime"
+              type="daterange"
+              range-separator="→"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              style="width: 200px"
+              :disabled-date="disabledDate"
+              @change="search"
+            />
          </div>

-          <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">
              <div>
                合计：充值金币：
@ -1249,15 +1324,31 @@ onMounted(async function () {
                </div>
                <div style="width: 310px">
                  <div class="ranking-header">
-                    <span style="margin-right: 90px; width: 150px">门店金币充值排名</span>
-                    <el-select v-model="goldType" placeholder="请选择金币类型" size="small" style="width: 90px"
-                      @change="changeGoldType">
-                      <el-option v-for="item in gold" :key="item.value" :label="item.label" :value="item.value" />
+                    <span style="margin-right: 90px; width: 150px"
+                      >门店金币充值排名</span
+                    >
+                    <el-select
+                      v-model="goldType"
+                      placeholder="请选择金币类型"
+                      size="small"
+                      style="width: 90px"
+                      @change="changeGoldType"
+                    >
+                      <el-option
+                        v-for="item in gold"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
                    </el-select>
                  </div>
                  <div>
                    <el-scrollbar height="360px">
-                      <div v-for="(item, index) in areaRank" :key="item" class="ranking-item">
+                      <div
+                        v-for="(item, index) in areaRank"
+                        :key="item"
+                        class="ranking-item"
+                      >
                        <!-- <component :is="findBsComponent(index)" /> -->
                        <span style="width: 15px; text-align: center">{{
                          index + 1
@ -1308,15 +1399,31 @@ onMounted(async function () {
                </div>
                <div style="width: 310px">
                  <div class="ranking-header">
-                    <span style="margin-right: 90px; width: 150px">门店金币消费排名</span>
-                    <el-select v-model="goldType" placeholder="请选择金币类型" size="small" style="width: 90px"
-                      @change="changeGoldType">
-                      <el-option v-for="item in gold" :key="item.value" :label="item.label" :value="item.value" />
+                    <span style="margin-right: 90px; width: 150px"
+                      >门店金币消费排名</span
+                    >
+                    <el-select
+                      v-model="goldType"
+                      placeholder="请选择金币类型"
+                      size="small"
+                      style="width: 90px"
+                      @change="changeGoldType"
+                    >
+                      <el-option
+                        v-for="item in gold"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
                    </el-select>
                  </div>
                  <div>
                    <el-scrollbar height="360px">
-                      <div v-for="(item, index) in areaRank" :key="item" class="ranking-item">
+                      <div
+                        v-for="(item, index) in areaRank"
+                        :key="item"
+                        class="ranking-item"
+                      >
                        <!-- <component :is="findBsComponent(index)" /> -->
                        <span style="width: 15px; text-align: center">{{
                          index + 1
@ -1355,8 +1462,14 @@ onMounted(async function () {
          <template #header>
            <div class="card-header" style="display: flex">
              <span class="tail-head">四大学科类别占比</span>
-              <el-radio-group v-model="platform" fill="#ffffff" text-color="#409eff" size="small"
-                @change="changePlatform" style="margin-left: auto">
+              <el-radio-group
+                v-model="platform"
+                fill="#ffffff"
+                text-color="#409eff"
+                size="small"
+                @change="changePlatform"
+                style="margin-left: auto"
+              >
                <el-radio-button label="全部平台" value="全部平台" />
                <el-radio-button label="ERP" value="ERP" />
                <el-radio-button label="HC" value="HC" />