Browse Source

修改文件

ZaiZai 10 months ago
parent
commit
0c871a6a87
4 changed files with 73 additions and 145 deletions
  1. 15 30
      src/views/resource/attach.vue
  2. 25 47
      src/views/resource/oss.vue
  3. 29 54
      src/views/resource/sms.vue
  4. 4 14
      src/views/user/index.vue

+ 15 - 30
src/views/resource/attach.vue

@@ -23,9 +23,8 @@
             </el-button>
         </template>
         <hc-table
-            :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            :is-index="false" is-check :check-style="{ width: 29 }"
-            @selection-change="tableCheckChange"
+            :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :is-index="false" :check-style="{ width: 29 }" @selection-change="tableCheckChange"
         >
             <template #attachSize="{ row }">{{ getRowFilterSize(row) }}</template>
             <template #action="{ row }">
@@ -89,18 +88,13 @@ const tableData = ref([])
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //获取过滤后的大小
@@ -138,15 +132,11 @@ const uploadClose = () => {
 
 //删除
 const delRowClick = async ({ item }, resolve)=> {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 //批量删除
@@ -160,16 +150,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 </script>

+ 25 - 47
src/views/resource/oss.vue

@@ -21,9 +21,8 @@
             <el-button hc-btn type="danger" @click="delClick">删除</el-button>
         </template>
         <hc-table
-            :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            :is-index="false" is-check :check-style="{ width: 29 }"
-            @selection-change="tableCheckChange"
+            :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :is-index="false" :check-style="{ width: 29 }" @selection-change="tableCheckChange"
         >
             <template #category="{ row }">{{ getCategoryName(row) }}</template>
             <template #status="{ row }">{{ row.statusName ?? '否' }}</template>
@@ -185,18 +184,13 @@ const tableData = ref([])
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //表格被选择
@@ -274,15 +268,12 @@ const dialogSubmit = async () => {
     if (!formRes) return false
     submitLoading.value = true
     //发起请求
-    const { error, code, msg } = await mainApi.submit(formModel.value)
+    const { isRes } = await mainApi.submit(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗
@@ -317,28 +308,20 @@ const debugClose = () => {
 
 //启用
 const enableRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.enable(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('启用成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '启用失败')
-    }
+    const { isRes } = await mainApi.enable(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('启用成功')
+    getTableData().then()
 }
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 //批量删除
@@ -352,16 +335,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 </script>

+ 29 - 54
src/views/resource/sms.vue

@@ -21,9 +21,8 @@
             <el-button hc-btn type="danger" @click="delClick">删除</el-button>
         </template>
         <hc-table
-            :column="tableColumn" :datas="tableData" :loading="tableLoading"
-            :is-index="false" is-check :check-style="{ width: 29 }"
-            @selection-change="tableCheckChange"
+            :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
+            :is-index="false" :check-style="{ width: 29 }" @selection-change="tableCheckChange"
         >
             <template #category="{ row }">{{ getCategoryName(row) }}</template>
             <template #status="{ row }">{{ row.statusName ?? '否' }}</template>
@@ -207,18 +206,13 @@ const tableData = ref([])
 const getTableData = async () => {
     tableData.value = []
     tableLoading.value = true
-    const { error, code, data } = await mainApi.page({
+    const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
     })
     tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data['records'])
-        searchForm.value.total = data['total']
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    tableData.value = getArrValue(data?.records)
+    searchForm.value.total = data?.total ?? 0
 }
 
 //表格被选择
@@ -315,15 +309,12 @@ const dialogSubmit = async () => {
     if (!formRes) return false
     submitLoading.value = true
     //发起请求
-    const { error, code, msg } = await mainApi.submit(formModel.value)
+    const { isRes } = await mainApi.submit(formModel.value)
     submitLoading.value = false
-    if (!error && code === 200) {
-        dialogClose()
-        window?.$message?.success('操作成功')
-        getTableData().then()
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    if (!isRes) return
+    dialogClose()
+    window?.$message?.success('操作成功')
+    getTableData().then()
 }
 
 //关闭弹窗
@@ -370,13 +361,10 @@ const debugSubmit = async () => {
     if (!formRes) return false
     debugLoading.value = true
     //发起请求
-    const { error, code, msg } = await mainApi.send(debugForm.value)
-    if (!error && code === 200) {
-        debugClose()
-        window?.$message?.success(msg)
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-    }
+    const { isRes, msg } = await mainApi.send(debugForm.value)
+    if (!isRes) return
+    debugClose()
+    window?.$message?.success(msg)
 }
 
 const debugClose = () => {
@@ -388,28 +376,20 @@ const debugClose = () => {
 
 //启用
 const enableRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.enable(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('启用成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '启用失败')
-    }
+    const { isRes } = await mainApi.enable(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('启用成功')
+    getTableData().then()
 }
 
 //删除
 const delRowClick = async ({ item }, resolve) => {
-    const { code, msg } = await mainApi.del(item.id)
-    if (code === 200) {
-        resolve()
-        window.$message.success('删除成功')
-        getTableData().then()
-    } else {
-        resolve()
-        window.$message.error(msg ?? '删除失败')
-    }
+    const { isRes } = await mainApi.del(item.id)
+    resolve() //关闭弹窗
+    if (!isRes) return
+    window.$message.success('删除成功')
+    getTableData().then()
 }
 
 //批量删除
@@ -423,16 +403,11 @@ const delClick = () => {
     HcDelMsg(async (resolve) => {
         //发起请求
         const ids = arrToId(rows)
-        const { code, msg } = await mainApi.del(ids)
-        //关闭弹窗的回调
-        resolve()
-        //处理结果
-        if (code === 200) {
-            window.$message.success('删除成功')
-            getTableData().then()
-        } else {
-            window.$message.error(msg ?? '删除失败')
-        }
+        const { isRes } = await mainApi.del(ids)
+        resolve() //关闭弹窗
+        if (!isRes) return
+        window.$message.success('删除成功')
+        getTableData().then()
     })
 }
 </script>

+ 4 - 14
src/views/user/index.vue

@@ -168,15 +168,10 @@ const updateUserInfo = async () => {
     const formRes = await formValidate(formUserRef.value)
     if (!formRes) return false
     const { id, avatar, name, realName, phone, email } = formUserModel.value
-    const { error, code, msg } = await mainApi.updateInfo({
+    const { error, code } = await mainApi.updateInfo({
         id, avatar, name, realName, phone, email,
     })
-    if (!error && code === 200) {
-        return true
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-        return false
-    }
+    return !error && code === 200
 }
 
 //修改密码
@@ -184,14 +179,9 @@ const updatePasswordInfo = async () => {
     const formRes = await formValidate(formPasswordRef.value)
     if (!formRes) return false
     const { oldPassword, newPassword, newPassword1 } = formPasswordModel.value
-    const { error, code, msg } = await mainApi.updatePassword({
+    const { error, code } = await mainApi.updatePassword({
         oldPassword, newPassword, newPassword1, plaintextPassword: newPassword,
     })
-    if (!error && code === 200) {
-        return true
-    } else {
-        window?.$message?.error(msg ?? '操作失败')
-        return false
-    }
+    return !error && code === 200
 }
 </script>