门店排名

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

@@ -284,7 +284,7 @@ const pass = function (row) {
   passObj.value.adminId = admin.value.adminId;
   passObj.value.auditId = row.auditId;
   passObj.value.status = 1;
-  passObj.value.refundId=row.refundId;
+  passObj.value.refundId = row.refundId;
   console.log("通过对象", passObj.value);
 };
 
@@ -328,7 +328,7 @@ const reject = function (row) {
   rejectObj.value.auditId = row.auditId;
   rejectObj.value.status = 2;
   rejectObj.value.reson = "";
-  rejectObj.value.refundId=row.refundId;
+  rejectObj.value.refundId = row.refundId;
   console.log("驳回对象", rejectObj.value);
   openRejectVisible();
 };

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

@@ -11,6 +11,7 @@ import * as math from 'mathjs';
 // 变量
 // 加载对象
 const loading = ref(true);
+const areaRankLoading = ref(true);
 // 总览对象
 const getSumCoin = ref({});
 const statistics = ref({});
@@ -570,25 +571,25 @@ const getAreaRank = async function () {
   if (getAreaRankObj.value.type == "充值金币") {
     areaRank.value = getMediumArea.value.map((item) => ({
       value: Math.abs(item.rechargeSumCoin),
-      name: item.area + "-" + item.store,
+      name: item.area,
     }));
   } else if (getAreaRankObj.value.type == "免费金币") {
     areaRank.value = getMediumArea.value.map((item) => ({
       value: Math.abs(item.freeSumCoin),
-      name: item.area + "-" + item.store,
+      name: item.area,
     }));
   } else if (getAreaRankObj.value.type == "任务金币") {
     areaRank.value = getMediumArea.value.map((item) => ({
       value: Math.abs(item.taskSumCoin),
-      name: item.area + "-" + item.store,
+      name: item.area,
     }));
   } else {
     areaRank.value = getMediumArea.value.map((item) => ({
       value: Math.abs(item.totalRechargeSum),
-      name: item.area + "-" + item.store,
+      name: item.area,
     }));
   }
-
+  areaRankLoading.value = false;
   console.log("areaRank", areaRank.value);
 };
 
@@ -615,6 +616,7 @@ const changeGoldType = function () {
   } else if (goldType.value == "任务金币") {
     getAreaRankObj.value.type = "任务金币";
   }
+  areaRankLoading.value = true;
   getAreaRank();
 };
 // 点击标签页初始化
@@ -629,6 +631,7 @@ const handleChange = function () {
   getAreaRankObj.value.type = "";
   goldType.value = "全部类型";
   getMiddleBar();
+  areaRankLoading.value = true;
   getAreaRank();
 };
 // 时间范围控制
@@ -754,6 +757,7 @@ const search = function () {
   console.log("getAreaRankObj", getAreaRankObj.value);
 
   getMiddleBar();
+  areaRankLoading.value = true;
   getAreaRank();
 };
 
@@ -1258,7 +1262,7 @@ onMounted(async function () {
                       <el-option v-for="item in gold" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
-                  <div>
+                  <div v-loading="areaRankLoading">
                     <el-scrollbar height="360px">
                       <div v-for="(item, index) in areaRank" :key="item" class="ranking-item">
                         <!-- <component :is="findBsComponent(index)" /> -->
@@ -1311,7 +1315,7 @@ onMounted(async function () {
                       <el-option v-for="item in gold" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
-                  <div>
+                  <div v-loading="areaRankLoading">
                     <el-scrollbar height="360px">
                       <div v-for="(item, index) in areaRank" :key="item" class="ranking-item">
                         <!-- <component :is="findBsComponent(index)" /> -->