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

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

@@ -517,7 +517,7 @@ onMounted(async function () {
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="userName" label="姓名" width="150px" />
+            <el-table-column prop="username" label="姓名" width="150px" />
             <el-table-column prop="jwcode" label="精网号" width="150px" />
             <el-table-column prop="area" label="所属地区" width="100px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />

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

@@ -248,10 +248,26 @@ const exportExcel = () => {
   XLSX.writeFile(wb, "客户金币明细.xlsx");
 };
 
-const putExcel = ref({});
+const today = new Date();
+const startDate = new Date(
+  today.getFullYear(),
+  today.getMonth(),
+  today.getDate()
+);
+const endDate = new Date(
+  today.getFullYear(),
+  today.getMonth(),
+  today.getDate() + 1
+);
+const putExcel = ref({
+  startDate: startDate,
+  endDate: endDate,
+});
 const excelInfo = ref({});
-const areyour = async function (val) {
+const loading = ref(false);
+const areyour = async function () {
   try {
+    loading.value = true;
     const result = await API.post(
       "http://192.168.8.93:10010/detailY/searchAll",
       { ...putExcel.value }
@@ -260,10 +276,12 @@ const areyour = async function (val) {
     areyouright.value = true;
     ElMessage({
       type: "success",
-      message: "导出成功",
+      message: "查询成功",
     });
+    loading.value = false;
   } catch (error) {
     console.log("请求失败", error);
+    loading.value = false;
   }
 };
 
@@ -378,6 +396,7 @@ const get30 = function () {
   >
     <el-button type="success" @click="exportExcel()">导出</el-button>
   </el-dialog>
+
   <!-- 这是导出excel的弹窗 -->
   <el-dialog
     v-model="getPutEX"
@@ -387,6 +406,7 @@ const get30 = function () {
   >
     <template #footer>
       <el-form
+        v-loading="loading"
         ref="ruleFormRef"
         style="max-width: 600px"
         :model="putExcel"

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

@@ -102,7 +102,9 @@ const search = function () {
   get();
 };
 // 重置
-const reset = function () {};
+const reset = function () {
+  detailY.value = {};
+};
 
 // 验证跳转输入框的数字是否合法
 const checkNumber = function () {
@@ -133,6 +135,34 @@ const checkNumber = function () {
   }
 };
 
+//选地区
+const area = [
+  {
+    value: "马来西亚",
+    label: "马来西亚",
+  },
+  {
+    value: "新加坡",
+    label: "新加坡",
+  },
+  {
+    value: "香港",
+    label: "香港",
+  },
+  {
+    value: "泰国",
+    label: "泰国",
+  },
+  {
+    value: "加拿大",
+    label: "加拿大",
+  },
+  {
+    value: "越南HCM",
+    label: "越南HCM",
+  },
+];
+
 // 挂载
 onMounted(async function () {
   await get();
@@ -153,33 +183,23 @@ onMounted(async function () {
               clearable
             />
           </div>
-          <div class="head-card-element">
-            <el-text class="mx-1" size="large">更新类型：</el-text>
+          <div class="head-card-element" style="margin-left: 50px">
+            <el-text class="mx-1" size="large">所属地区：</el-text>
             <el-select
-              v-model="detailY.updateType"
-              placeholder="请选择更新类型"
-              size="large"
+              v-model="detailY.area"
+              placeholder="请选择所属地区"
               style="width: 240px"
               clearable
             >
               <el-option
-                v-for="item in updateType"
+                v-for="item in area"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </div>
-          <div class="head-card-element">
-            <el-text class="mx-1" size="large">更新时间：</el-text>
-            <el-date-picker
-              v-model="getTime"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="起始时间"
-              end-placeholder="结束时间"
-            />
-          </div>
+
           <div class="head-card-btn">
             <el-button @click="reset()">重置</el-button>
             <el-button type="primary" @click="search()">查询</el-button>