12.20修改

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

@@ -297,14 +297,15 @@ const checkNumber = function () {
 // 通过按钮
 const pass = function (row) {
   // 通过初始化
+  passObj.value = row;
   passObj.value.adminId = admin.value.adminId;
   passObj.value.auditId = row.auditId;
   passObj.value.status = 1;
-  passObj.value.rechargeId=row.rechargeId;
-  passObj.value.detailId=row.detailId;
-  passObj.value.jwcode=row.jwcode;
-  passObj.value.paidGold=row.paidGold;
-  passObj.value.freeGold=row.freeGold;
+  passObj.value.rechargeId = row.rechargeId;
+  passObj.value.detailId = row.detailId;
+  passObj.value.jwcode = row.jwcode;
+  passObj.value.paidGold = row.paidGold;
+  passObj.value.freeGold = row.freeGold;
   console.log("通过对象", passObj.value);
 };
 
@@ -348,8 +349,8 @@ const reject = function (row) {
   rejectObj.value.auditId = row.auditId;
   rejectObj.value.status = 2;
   rejectObj.value.reson = "";
-  rejectObj.value.rechargeId=row.rechargeId;
-  rejectObj.value.detailId=row.detailId;
+  rejectObj.value.rechargeId = row.rechargeId;
+  rejectObj.value.detailId = row.detailId;
   console.log("驳回对象", rejectObj.value);
   openRejectVisible();
 };

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

@@ -286,23 +286,14 @@ onMounted(async function () {
             <el-table-column prop="updateType" label="更新类型" width="150">
               <!-- 模板内容 -->
               <template #default="scope">
-                <span v-if="scope.row.auditStatus == 1">
-                  <div class="status">
-                    <span class="green-dot"></span>
-                    <span>已通过</span>
-                  </div>
+                <span v-if="scope.row.updateType == 1">
+                  <span>消费</span>
                 </span>
-                <span v-if="scope.row.auditStatus == 0">
-                  <div class="status">
-                    <span class="grey-dot"></span>
-                    <span>待审核</span>
-                  </div>
+                <span v-if="scope.row.updateType == 0">
+                  <span>充值</span>
                 </span>
-                <span v-if="scope.row.auditStatus == 2">
-                  <div class="status">
-                    <span class="red-dot"></span>
-                    <span>已驳回</span>
-                  </div>
+                <span v-if="scope.row.updateType == 2">
+                  <span>退款</span>
                 </span>
               </template>
             </el-table-column>

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

@@ -365,8 +365,12 @@ const get = async function () {
 // 获取中间柱状图数据
 const getMiddleBar = async function () {
   const result = await API.post(
-    "http://192.168.8.93:10010/statistics/getCoinTime",
-    getMiddleBarObj.value
+    "http://192.168.8.93:10010/statistics/getCoinTime?" +
+      "searchEndTime=" +
+      getMiddleBarObj.value.searchEndTime +
+      "&searchStartTime=" +
+      getMiddleBarObj.value.searchStartTime,
+    {}
   );
 
   getMiddleBarData.value = result.data;