优化

src/views/v1/customer/account/edit.vue

@@ -7,16 +7,9 @@
     :mask-closable="false"
     :ok-loading="loading"
     @cancel="close"
-    @before-ok="submit"
-  >
+    @before-ok="submit">
     <!-- 表单信息 start -->
-    <a-form
-      ref="formRef"
-      :model="formData"
-      :rules="rules"
-      :auto-label-width="true"
-    >
-      {{ mode }}
+    <a-form ref="formRef" :model="formData" :rules="rules" :auto-label-width="true">
       <a-form-item label="用户真实名" field="real_name" v-if="mode === 'real'">
         <a-input v-model="formData.real_name" placeholder="请输入用户真实名" />
       </a-form-item>
@@ -27,10 +20,7 @@
         <a-input v-model="formData.mobile" placeholder="请输入手机" />
       </a-form-item>
       <a-form-item label="密码" field="user_pwd" v-if="mode === 'pwd'">
-        <a-input-password
-          v-model="formData.user_pwd"
-          placeholder="请输入密码"
-        />
+        <a-input-password v-model="formData.user_pwd" placeholder="请输入密码" />
       </a-form-item>
     </a-form>
     <!-- 表单信息 end -->
@@ -38,114 +28,111 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed } from "vue";
-import tool from "@/utils/tool";
-import { Message, Modal } from "@arco-design/web-vue";
-import api from "../../api/customer/account";
+import { ref, reactive, computed } from 'vue'
+import tool from '@/utils/tool'
+import { Message, Modal } from '@arco-design/web-vue'
+import api from '../../api/customer/account'
 
-const emit = defineEmits(["success"]);
+const emit = defineEmits(['success'])
 // 引用定义
-const visible = ref(false);
-const loading = ref(false);
-const formRef = ref();
-const mode = ref("");
+const visible = ref(false)
+const loading = ref(false)
+const formRef = ref()
+const mode = ref('')
 
 let title = computed(() => {
-  return "账号信息" + (mode.value == "add" ? "-新增" : "-编辑");
-});
+  return '账号信息' + (mode.value == 'add' ? '-新增' : '-编辑')
+})
 
 // 表单初始值
 const initialFormData = {
   uid: null,
-  user_pwd: "",
-  real_name: "",
-  id_card: "",
-  mobile: "",
-};
+  user_pwd: '',
+  real_name: '',
+  id_card: '',
+  mobile: '',
+}
 
 // 表单信息
-const formData = reactive({ ...initialFormData });
+const formData = reactive({ ...initialFormData })
 
 // 验证规则
 const rules = {
-  uid: [{ required: true, message: "用户UID必需填写" }],
-  user_name: [{ required: true, message: "用户名必需填写" }],
-  user_pwd: [{ required: true, message: "用户密码必需填写" }],
-  email: [{ required: true, message: "用户邮箱必需填写" }],
+  uid: [{ required: true, message: '用户UID必需填写' }],
+  user_name: [{ required: true, message: '用户名必需填写' }],
+  user_pwd: [{ required: true, message: '用户密码必需填写' }],
+  email: [{ required: true, message: '用户邮箱必需填写' }],
   real_name: [
     {
       required: true,
       match: /^[\u4e00-\u9fa5]{2,4}$/,
-      message: "用户真实名格式不正确",
+      message: '用户真实名格式不正确',
     },
   ],
   id_card: [
     {
       required: true,
-      match:
-        /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[0-1])\d{3}[0-9Xx]$/,
-      message: "证件号码格式不正确",
+      match: /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[0-1])\d{3}[0-9Xx]$/,
+      message: '证件号码格式不正确',
     },
   ],
-  mobile: [
-    { required: true, match: /^1[3-9]\d{9}$/, message: "手机格式不正确" },
-  ],
-};
+  mobile: [{ required: true, match: /^1[3-9]\d{9}$/, message: '手机格式不正确' }],
+}
 
 // 打开弹框
-const open = async (type = "add", data) => {
-  mode.value = type;
+const open = async (type = 'add', data) => {
+  mode.value = type
   // 重置表单数据
-  Object.assign(formData, data);
-  formRef.value.clearValidate();
-  visible.value = true;
-  await initPage();
-};
+  // Object.assign(formData, data)
+  formRef.value.clearValidate()
+  visible.value = true
+  await initPage()
+}
 
 // 初始化页面数据
-const initPage = async () => {};
+const initPage = async () => {}
 
 // 设置数据
 const setFormData = async (data) => {
   for (const key in formData) {
     if (data[key] != null && data[key] != undefined) {
-      formData[key] = data[key];
+      formData[key] = data[key]
     }
   }
-};
+}
 
 // 数据保存
 const submit = async (done) => {
-  const validate = await formRef.value?.validate();
+  const validate = await formRef.value?.validate()
   if (!validate) {
-    loading.value = true;
-    let data = { ...formData };
-    let result = {};
+    loading.value = true
+    let data = { ...formData }
+    let result = {}
 
     // 修改数据
-    if (mode.value === "pwd") {
-      result = await api.updatePwdApi(data);
-    } else if (mode.value === "mobile") {
-      result = await api.updateMobileApi(data);
-    } else if (mode.value === "real") {
-      result = await api.updateRealApi(data);
+    if (mode.value === 'pwd') {
+      result = await api.updatePwdApi(data)
+    } else if (mode.value === 'mobile') {
+      result = await api.updateMobileApi(data)
+    } else if (mode.value === 'real') {
+      result = await api.updateRealApi(data)
     }
 
     if (result.code === 200) {
-      Message.success("操作成功");
-      emit("success");
-      done(true);
+      Message.success('操作成功')
+      emit('success')
+      done(true)
     }
     // 防止连续点击提交
     setTimeout(() => {
-      loading.value = false;
-    }, 500);
+      loading.value = false
+    }, 500)
   }
-  done(false);
-};
+  done(false)
+}
 
 // 关闭弹窗
-const close = () => (visible.value = false);
+const close = () => (visible.value = false)
 
-defineExpose({ open, setFormData });
+defineExpose({ open, setFormData })
 </script>

src/views/v1/customer/account/index.vue

@@ -38,6 +38,9 @@
           <a-descriptions-item label="最后登录时间">
             {{ data[0]?.login_time }}
           </a-descriptions-item>
+          <a-descriptions-item label="最后充值时间">
+            {{ data[0]?.pay_time }}
+          </a-descriptions-item>
           <a-descriptions-item label="真实姓名">
             {{ data[0]?.real_name }}
           </a-descriptions-item>

src/views/v1/customer/sdkOrder/index.vue

@@ -9,8 +9,8 @@
           </a-form-item>
         </a-col>
         <a-col :sm="6" :xs="24">
-          <a-form-item label="日期" field="pay_date">
-            <a-range-picker v-model="searchForm.pay_date" :show-time="false" mode="date" style="width: 100%" />
+          <a-form-item label="日期" field="pay_time">
+            <a-range-picker v-model="searchForm.pay_time" :show-time="false" mode="date" style="width: 100%" />
           </a-form-item>
         </a-col>
         <a-col :sm="6" :xs="24">
@@ -33,19 +33,37 @@
             <a-input v-model="searchForm.trade_id" placeholder="请输入交易订单号" allow-clear />
           </a-form-item>
         </a-col>
+        <a-col :sm="6" :xs="24">
+          <a-form-item label="支付状态" field="sync_status">
+            <a-select v-model="searchForm.sync_status" placeholder="请选择支付状态">
+              <a-option value="1">已支付</a-option>
+              <a-option value="2">异常回调</a-option>
+              <a-option value="0">未支付</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :sm="6" :xs="24">
+          <a-form-item label="发货状态" field="send_status">
+            <a-select v-model="searchForm.send_status" placeholder="请选择发货状态">
+              <a-option value="1">已发货</a-option>
+              <a-option value="0">未发货</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
       </template>
 
       <!-- Table 自定义渲染 -->
       <template #game_id="{ record }"> [{{ record.game_id }}] {{ record.game_name }} </template>
       <template #sync_status="{ record }">
-        <!-- 1成功 2失败 3处理中 -->
+        <!-- 支付回调状态 0未支付, 1已支付, 2异常回调 -->
         <a-tag :color="record.sync_status === 1 ? 'green' : record.sync_status === 2 ? 'red' : 'blue'">
-          {{ record.sync_status === 1 ? '成功' : record.sync_status === 2 ? '失败' : '异常回调' }}
+          {{ record.sync_status === 1 ? '已支付' : record.sync_status === 2 ? '异常回调' : '未支付' }}
         </a-tag>
       </template>
       <template #send_status="{ record }">
+        <!-- 发货状态 0未发货, 1已发货 -->
         <a-tag :color="record.send_status === 1 ? 'green' : 'red'">
-          {{ record.send_status === 1 ? '成功' : '失败' }}
+          {{ record.send_status === 1 ? '已发货' : '未发货' }}
         </a-tag>
       </template>
       <template #operationCell="{ record }">
@@ -81,7 +99,7 @@ const searchForm = ref({
   game_id: '',
   user_name: '',
   role_id: '',
-  pay_date: [],
+  pay_time: [],
 })
 
 // SaTable 基础配置
@@ -90,9 +108,6 @@ const options = reactive({
   showSummary: true,
   summary: [
     {
-      text: '总金额',
-      suffixText: '元',
-
       action: 'totalRow',
       dataIndex: 'money',
     },

src/views/v1/gameLog/sdkOrderSuccess/index.vue

@@ -9,13 +9,13 @@
           </a-form-item>
         </a-col>
         <a-col :sm="6" :xs="24">
-          <a-form-item label="充值日期" field="pay_date">
-            <a-range-picker class="w-full" v-model="searchForm.pay_date" :show-time="false" mode="date" />
+          <a-form-item label="充值日期" field="pay_time">
+            <a-range-picker class="w-full" v-model="searchForm.pay_time" :show-time="false" mode="date" />
           </a-form-item>
         </a-col>
         <a-col :sm="6" :xs="24">
-          <a-form-item label="注册日期" field="reg_date">
-            <a-range-picker class="w-full" v-model="searchForm.reg_date" :show-time="false" mode="date" />
+          <a-form-item label="注册日期" field="reg_time">
+            <a-range-picker class="w-full" v-model="searchForm.reg_time" :show-time="false" mode="date" />
           </a-form-item>
         </a-col>
         <a-col :sm="6" :xs="24">
@@ -99,8 +99,8 @@ const searchForm = ref({
   user_name: '',
   server_id: '',
   server_name: '',
-  reg_date: [],
-  pay_date: [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')],
+  reg_time: [],
+  pay_time: [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')],
 })
 
 // SaTable 基础配置