1 mês atrás · 980d645039
--- a/online/index.html
+++ b/online/index.html
@@ -1,54 +1 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="zh-cmn-Hans">
			
 
				-  <head>
			
 
				-    <meta charset="utf-8" />
			
 
				-    <meta content="IE=edge" http-equiv="X-UA-Compatible" />
			
 
				-    <meta content="webkit" name="renderer" />
			
 
				-    <meta
			
 
				-      content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"
			
 
				-      name="viewport"
			
 
				-    />
			
 
				-    <link href="favicon.ico" rel="icon" />
			
 
				-    <title>大卫博士学位争霸赛</title>
			
 
				-    <meta content="大卫博士学位争霸赛" name="keywords" />
			
 
				-    <meta content="vue-admin-better" name="author" />
			
 
				-    <link
			
 
				-      href="static/css/loading.css?random=2024-12-17 15:54:57-zh-mead"
			
 
				-      rel="stylesheet"
			
 
				-    />
			
 
				-    <script defer="defer" src="js/app-1734422097010.js"></script>
			
 
				-    <script defer="defer" src="js/750-1734422097010.js"></script>
			
 
				-    <link href="static/css/app.04223e6d.css" rel="stylesheet" />
			
 
				-    <link href="static/css/750.4cabead5.css" rel="stylesheet" />
			
 
				-    <!--[if IE]>
			
 
				-      <link rel="icon" type="image/svg+xml" href="img/icons/favicon.svg" />
			
 
				-    <![endif]-->
			
 
				-    <link rel="icon" type="image/png" sizes="32x32" href="favicon.ico" />
			
 
				-    <link rel="icon" type="image/png" sizes="16x16" href="favicon.ico" />
			
 
				-    <link rel="manifest" href="manifest.json" />
			
 
				-    <meta name="theme-color" content="#ffffff" />
			
 
				-    <meta name="apple-mobile-web-app-capable" content="yes" />
			
 
				-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
			
 
				-    <meta name="apple-mobile-web-app-title" content="admin-plus" />
			
 
				-    <link rel="apple-touch-icon" href="favicon.ico" />
			
 
				-    <link rel="mask-icon" href="favicon.ico" color="#ffffff" />
			
 
				-    <meta name="msapplication-TileImage" content="favicon.ico" />
			
 
				-    <meta name="msapplication-TileColor" content="#ffffff" />
			
 
				-  </head>
			
 
				-  <body>
			
 
				-    <noscript></noscript>
			
 
				-    <div id="app">
			
 
				-      <div class="first-loading-wrp">
			
 
				-        <div class="loading-wrp">
			
 
				-          <span class="dot dot-spin">
			
 
				-            <i></i>
			
 
				-            <i></i>
			
 
				-            <i></i>
			
 
				-            <i></i>
			
 
				-          </span>
			
 
				-        </div>
			
 
				-        <h1>大卫博士学位争霸赛</h1>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-  </body>
			
 
				-</html>
			
 
				+<!doctype html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"/><meta content="IE=edge" http-equiv="X-UA-Compatible"/><meta content="webkit" name="renderer"/><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"/><link href="favicon.ico" rel="icon"/><title>大卫博士学位争霸赛</title><meta content="大卫博士学位争霸赛" name="keywords"/><meta content="vue-admin-better" name="author"/><link href="static/css/loading.css?random=2024-12-30 14:42:57-zh-mead" rel="stylesheet"/><script defer="defer" src="js/app-1735540977814.js"></script><script defer="defer" src="js/750-1735540977814.js"></script><link href="static/css/app.04223e6d.css" rel="stylesheet"><link href="static/css/750.4cabead5.css" rel="stylesheet"><!--[if IE]><link rel="icon" type="image/svg+xml" href="img/icons/favicon.svg"><![endif]--><link rel="icon" type="image/png" sizes="32x32" href="favicon.ico"><link rel="icon" type="image/png" sizes="16x16" href="favicon.ico"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#ffffff"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="admin-plus"><link rel="apple-touch-icon" href="favicon.ico"><link rel="mask-icon" href="favicon.ico" color="#ffffff"><meta name="msapplication-TileImage" content="favicon.ico"><meta name="msapplication-TileColor" content="#ffffff"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>大卫博士学位争霸赛</h1></div></div></body></html>
			
--- a/online/js/57-1734422097010.js
+++ b/online/js/57-1734422097010.js
--- a/online/js/750-1735540977814.js
+++ b/online/js/750-1735540977814.js
--- a/online/js/820-1735540977814.js
+++ b/online/js/820-1735540977814.js
--- a/online/js/app-1734422097010.js
+++ b/online/js/app-1734422097010.js
--- a/online/js/app-1735540977814.js
+++ b/online/js/app-1735540977814.js
--- a/online/js/vab-chunk-1ce32aae-1735540977814.js
+++ b/online/js/vab-chunk-1ce32aae-1735540977814.js
--- a/online/js/vab-chunk-27118de1-1735540977814.js
+++ b/online/js/vab-chunk-27118de1-1735540977814.js
--- a/online/js/vab-chunk-2e7a54de-1735540977814.js
+++ b/online/js/vab-chunk-2e7a54de-1735540977814.js
--- a/online/js/vab-chunk-55f36e6d-1735540977814.js
+++ b/online/js/vab-chunk-55f36e6d-1735540977814.js
--- a/online/js/vab-chunk-81b65d13-1735540977814.js
+++ b/online/js/vab-chunk-81b65d13-1735540977814.js
--- a/online/js/vab-chunk-adaa8b5b-1735540977814.js
+++ b/online/js/vab-chunk-adaa8b5b-1735540977814.js
--- a/online/js/vab-chunk-bffabe46-1735540977814.js
+++ b/online/js/vab-chunk-bffabe46-1735540977814.js
--- a/online/js/vab-chunk-c117d123-1735540977814.js
+++ b/online/js/vab-chunk-c117d123-1735540977814.js
--- a/online/js/vab-chunk-c2cf684f-1735540977814.js
+++ b/online/js/vab-chunk-c2cf684f-1735540977814.js
--- a/online/js/vab-chunk-c6f52c3a-1735540977814.js
+++ b/online/js/vab-chunk-c6f52c3a-1735540977814.js
--- a/online/js/vab-chunk-e6508ca2-1735540977814.js
+++ b/online/js/vab-chunk-e6508ca2-1735540977814.js
--- a/online/js/vab-chunk-fb9e1e3f-1735540977814.js
+++ b/online/js/vab-chunk-fb9e1e3f-1735540977814.js
--- a/online/service-worker.js
+++ b/online/service-worker.js
--- a/online/static/css/57.104bbf0f.css
+++ b/online/static/css/57.104bbf0f.css
--- a/online/static/css/750.4cabead5.css
+++ b/online/static/css/750.4cabead5.css
--- a/online/static/css/820.fa57edd2.css
+++ b/online/static/css/820.fa57edd2.css
--- a/online/static/css/app.04223e6d.css
+++ b/online/static/css/app.04223e6d.css
--- a/online/static/css/vab-chunk-55f36e6d.3d832670.css
+++ b/online/static/css/vab-chunk-55f36e6d.3d832670.css
--- a/src/views/gift/components/ChangeKucun.vue
+++ b/src/views/gift/components/ChangeKucun.vue
@@ -3,7 +3,7 @@
 
				  * @Author: 旭颖
			
 
				  * @Date: 2022-10-31 14:56:49
			
 
				  * @LastEditors: liangxvying 1615026511@qq.com
			
 
				- * @LastEditTime: 2024-12-13 19:43:04
			
 
				+ * @LastEditTime: 2024-12-30 11:59:20
			
 
				 -->
			
 
				 <template>
			
 
				   <el-dialog
			
@@ -13,7 +13,13 @@
 
				     @close="close"
			
 
				   >
			
 
				     <el-form ref="formRef" label-width="100px" :model="form" :rules="rules">
			
 
				-      <el-form-item label="库存" prop="nums">
			
 
				+      <el-form-item label="类型" prop="type">
			
 
				+        <el-radio-group v-model="form.type" class="ml-4">
			
 
				+          <el-radio :label="1">增加</el-radio>
			
 
				+          <el-radio :label="0">减少</el-radio>
			
 
				+        </el-radio-group>
			
 
				+      </el-form-item>
			
 
				+      <el-form-item :label="type == 1 ? '库存增加' : '库存减少'" prop="nums">
			
 
				         <el-input-number
			
 
				           v-model="form.nums"
			
 
				           :min="0"
			
@@ -41,11 +47,13 @@
 
				 
			
 
				       const state = reactive({
			
 
				         formRef: null,
			
 
				-
			
 
				         form: {
			
 
				-          nums: '',
			
 
				+          id: '',
			
 
				+          nums: 0,
			
 
				+          type: 1,
			
 
				         },
			
 
				         rules: {
			
 
				+          type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
			
 
				           nums: [{ required: true, trigger: 'blur', message: '请输入库存' }],
			
 
				         },
			
 
				         title: '',
			
@@ -53,14 +61,16 @@
 
				       })
			
 
				 
			
 
				       const showEdit = async (row) => {
			
 
				-        state.form = Object.assign({}, row)
			
 
				+        state.form.id = row.id
			
 
				         state.dialogFormVisible = true
			
 
				       }
			
 
				 
			
 
				       const close = () => {
			
 
				         state['formRef'].resetFields()
			
 
				         state.form = {
			
 
				-          nums: '',
			
 
				+          id: '',
			
 
				+          nums: 0,
			
 
				+          type: 1,
			
 
				         }
			
 
				         state.dialogFormVisible = false
			
 
				       }
			
@@ -68,7 +78,7 @@
 
				         state['formRef'].validate(async (valid) => {
			
 
				           if (valid) {
			
 
				             const { message } = await postApi(
			
 
				-              '/dwbs/shop-good/kucun',
			
 
				+              '/dwbs/shop-good/addkucun',
			
 
				               state.form
			
 
				             )
			
 
				             $baseMessage(message, 'success', 'vab-hey-message-success')
			
--- a/src/views/gift/list.vue
+++ b/src/views/gift/list.vue
@@ -3,7 +3,7 @@
 
				  * @Author: 旭颖
			
 
				  * @Date: 2024-08-29 14:19:28
			
 
				  * @LastEditors: liangxvying 1615026511@qq.com
			
 
				- * @LastEditTime: 2024-12-13 20:03:16
			
 
				+ * @LastEditTime: 2024-12-30 10:39:14
			
 
				 -->
			
 
				 <template>
			
 
				   <div>
			
@@ -145,6 +145,7 @@
 
				             >
			
 
				               修改库存
			
 
				             </el-button>
			
 
				+
			
 
				             <el-button
			
 
				               v-permissions="['gift_edit']"
			
 
				               type="text"
			
--- a/src/views/goods/components/BatchExport.vue
+++ b/src/views/goods/components/BatchExport.vue
@@ -0,0 +1,130 @@
 
				+<!--
			
 
				+ * @FilePath: UserManagementEdit.vue
			
 
				+ * @Author: 旭颖
			
 
				+ * @Date: 2022-10-31 14:56:49
			
 
				+ * @LastEditors: liangxvying 1615026511@qq.com
			
 
				+ * @LastEditTime: 2024-12-30 11:49:11
			
 
				+-->
			
 
				+<template>
			
 
				+  <el-dialog
			
 
				+    v-model="dialogFormVisible"
			
 
				+    title="订单批量导出"
			
 
				+    width="550px"
			
 
				+    @close="close"
			
 
				+  >
			
 
				+    <el-form ref="formRef" label-width="100px" :model="form" :rules="rules">
			
 
				+      <el-form-item label="开始日期:" prop="start_day">
			
 
				+        <el-date-picker
			
 
				+          v-model="form.start_day"
			
 
				+          type="date"
			
 
				+          format="YYYY-MM-DD"
			
 
				+          placeholder="请选择开始日期"
			
 
				+          value-format="YYYY-MM-DD"
			
 
				+          style="width: 100% !important"
			
 
				+        />
			
 
				+      </el-form-item>
			
 
				+      <el-form-item label="结束日期:" prop="end_day">
			
 
				+        <el-date-picker
			
 
				+          v-model="form.end_day"
			
 
				+          type="date"
			
 
				+          format="YYYY-MM-DD"
			
 
				+          placeholder="请选择结束日期"
			
 
				+          value-format="YYYY-MM-DD"
			
 
				+          style="width: 100%"
			
 
				+        />
			
 
				+      </el-form-item>
			
 
				+      <el-form-item label="导出前" prop="limit">
			
 
				+        <el-input-number
			
 
				+          v-model="form.limit"
			
 
				+          :min="1"
			
 
				+          :max="1000"
			
 
				+          label="请输入显示排序"
			
 
				+          style="width: 90%; margin-right: 10px"
			
 
				+        />
			
 
				+        名
			
 
				+      </el-form-item>
			
 
				+    </el-form>
			
 
				+    <template #footer>
			
 
				+      <el-button @click="close">取 消</el-button>
			
 
				+      <el-button type="primary" @click="save" v-loading="loading">
			
 
				+        立即导出
			
 
				+      </el-button>
			
 
				+    </template>
			
 
				+  </el-dialog>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+  import { getApi } from '~/src/api/api'
			
 
				+  import { fileDownLoad } from '@/utils/downloadMethods'
			
 
				+  export default defineComponent({
			
 
				+    name: 'UserManagementEdit',
			
 
				+    emits: ['fetch-data'],
			
 
				+    setup(props, { emit }) {
			
 
				+      const $baseMessage = inject('$baseMessage')
			
 
				+
			
 
				+      const state = reactive({
			
 
				+        formRef: null,
			
 
				+        form: {
			
 
				+          start_day: '',
			
 
				+          end_day: '',
			
 
				+          limit: '',
			
 
				+        },
			
 
				+        title: '',
			
 
				+        loading: false,
			
 
				+        dialogFormVisible: false,
			
 
				+        rules: {
			
 
				+          start_day: [
			
 
				+            { required: true, trigger: 'blur', message: '请选择开始日期' },
			
 
				+          ],
			
 
				+          end_day: [
			
 
				+            { required: true, trigger: 'blur', message: '请选择结束日期' },
			
 
				+          ],
			
 
				+          limit: [
			
 
				+            { required: true, trigger: 'blur', message: '请输入导出名次' },
			
 
				+          ],
			
 
				+        },
			
 
				+      })
			
 
				+
			
 
				+      const showEdit = async () => {
			
 
				+        // getApi('/dwbs/order/export-user-order-good')
			
 
				+        state.dialogFormVisible = true
			
 
				+      }
			
 
				+
			
 
				+      const close = () => {
			
 
				+        state.form = { start_day: '', end_day: '', limit: '' }
			
 
				+        state['formRef'].resetFields()
			
 
				+        state.dialogFormVisible = false
			
 
				+      }
			
 
				+      const save = () => {
			
 
				+        state['formRef'].validate(async (valid) => {
			
 
				+          const fileName = '前' + state.form.limit + '名卖货数据导出'
			
 
				+          if (valid) {
			
 
				+            state.loading = true
			
 
				+            fileDownLoad(
			
 
				+              state.form,
			
 
				+              '/dwbs/order/export-user-order-good',
			
 
				+              'get',
			
 
				+              fileName
			
 
				+            )
			
 
				+            setTimeout(() => {
			
 
				+              state.loading = false
			
 
				+              close()
			
 
				+            }, 1500)
			
 
				+          }
			
 
				+        })
			
 
				+      }
			
 
				+
			
 
				+      return {
			
 
				+        ...toRefs(state),
			
 
				+        showEdit,
			
 
				+        close,
			
 
				+        save,
			
 
				+      }
			
 
				+    },
			
 
				+  })
			
 
				+</script>
			
 
				+<style>
			
 
				+  .el-input__wrapper {
			
 
				+    width: 100%;
			
 
				+  }
			
 
				+</style>
			
--- a/src/views/goods/order.vue
+++ b/src/views/goods/order.vue
@@ -3,7 +3,7 @@
 
				  * @Author: 旭颖
			
 
				  * @Date: 2024-08-29 14:19:28
			
 
				  * @LastEditors: liangxvying 1615026511@qq.com
			
 
				- * @LastEditTime: 2024-11-07 11:52:23
			
 
				+ * @LastEditTime: 2024-12-30 11:51:33
			
 
				 -->
			
 
				 <template>
			
 
				   <div>
			
@@ -63,6 +63,13 @@
 
				       </el-form>
			
 
				     </div>
			
 
				     <div class="page-container">
			
 
				+      <vab-query-form>
			
 
				+        <vab-query-form-left-panel :span="24">
			
 
				+          <el-button :icon="Download" type="warning" @click="handleExport()">
			
 
				+            批量导出订单统计
			
 
				+          </el-button>
			
 
				+        </vab-query-form-left-panel>
			
 
				+      </vab-query-form>
			
 
				       <el-table
			
 
				         v-loading="listLoading"
			
 
				         border
			
@@ -160,6 +167,7 @@
 
				       />
			
 
				 
			
 
				       <OrderDetail ref="detailRef" @fetch-data="fetchData" />
			
 
				+      <ExportEdit ref="exportRef" />
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -181,13 +189,16 @@
 
				       OrderDetail: defineAsyncComponent(() =>
			
 
				         import('./components/OrderDetail')
			
 
				       ),
			
 
				+      ExportEdit: defineAsyncComponent(() =>
			
 
				+        import('./components/BatchExport.vue')
			
 
				+      ),
			
 
				     },
			
 
				     setup() {
			
 
				       const $baseConfirm = inject('$baseConfirm')
			
 
				       const $baseMessage = inject('$baseMessage')
			
 
				       const state = reactive({
			
 
				         detailRef: null,
			
 
				-
			
 
				+        exportRef: null,
			
 
				         list: [],
			
 
				         listLoading: true,
			
 
				         operationRef: null,
			
@@ -224,7 +235,6 @@
 
				           })
			
 
				         }
			
 
				       }
			
 
				-
			
 
				       //切换当前页数据条数
			
 
				       const handleSizeChange = (val) => {
			
 
				         state.queryForm.per_page = val
			
@@ -258,7 +268,6 @@
 
				         state.total = meta.pagination.total
			
 
				         state.listLoading = false
			
 
				       }
			
 
				-
			
 
				       //排序方法
			
 
				       const onSortChange = (column) => {
			
 
				         if (column.order == 'ascending') state.queryForm.sortedBy = 'asc'
			
@@ -266,11 +275,14 @@
 
				         state.queryForm.orderBy = column.prop
			
 
				         fetchData()
			
 
				       }
			
 
				-
			
 
				       //批量选择
			
 
				       const setSelectRows = (val) => {
			
 
				         state.selectRows = val
			
 
				       }
			
 
				+      //批量导出
			
 
				+      const handleExport = () => {
			
 
				+        state['exportRef'].showEdit()
			
 
				+      }
			
 
				       onMounted(() => {
			
 
				         fetchData()
			
 
				       })
			
@@ -292,6 +304,7 @@
 
				         onSortChange,
			
 
				         setSelectRows,
			
 
				         handleDetail,
			
 
				+        handleExport,
			
 
				       }
			
 
				     },
			
 
				   })
			
--- a/src/views/setting/canshuManagement/components/CanshuManagementEdit.vue
+++ b/src/views/setting/canshuManagement/components/CanshuManagementEdit.vue
@@ -12,6 +12,15 @@
 
				       <el-form-item label="标签" prop="tag">
			
 
				         <el-input v-model="form.tag" placeholder="tag" />
			
 
				       </el-form-item>
			
 
				+      <el-form-item label="类型" prop="tag">
			
 
				+        <el-radio-group v-model="form.type" class="ml-4">
			
 
				+          <el-radio :label="1">字符串</el-radio>
			
 
				+          <el-radio :label="2">图片</el-radio>
			
 
				+          <el-radio :label="3">数值</el-radio>
			
 
				+          <el-radio :label="4">文本</el-radio>
			
 
				+          <el-radio :label="5">布尔</el-radio>
			
 
				+        </el-radio-group>
			
 
				+      </el-form-item>
			
 
				       <el-form-item label="参数代码" prop="code">
			
 
				         <el-input
			
 
				           v-model.trim="form.code"
			
--- a/src/views/setting/systemLog/index.vue
+++ b/src/views/setting/systemLog/index.vue
@@ -2,8 +2,8 @@
 
				  * @FilePath: index.vue
			
 
				  * @Author: 旭颖
			
 
				  * @Date: 2022-12-01 09:19:15
			
 
				- * @LastEditors: Please set LastEditors
			
 
				- * @LastEditTime: 2023-01-05 11:24:57
			
 
				+ * @LastEditors: liangxvying 1615026511@qq.com
			
 
				+ * @LastEditTime: 2024-12-30 10:32:44
			
 
				 -->
			
 
				 
			
 
				 <template>
			
@@ -61,11 +61,11 @@
 
				         :data="list"
			
 
				         @sort-change="onSortChange"
			
 
				       >
			
 
				-        <el-table-column
			
 
				+        <!-- <el-table-column
			
 
				           align="center"
			
 
				           show-overflow-tooltip
			
 
				           type="selection"
			
 
				-        />
			
 
				+        /> -->
			
 
				         <el-table-column align="center" label="序号" type="index" width="70" />
			
 
				         <el-table-column
			
 
				           align="center"
			
@@ -91,7 +91,7 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="操作描述"
			
 
				-          min-width="120"
			
 
				+          min-width="140"
			
 
				           prop="description"
			
 
				           show-overflow-tooltip
			
 
				         >
			
@@ -100,14 +100,14 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="URL"
			
 
				-          min-width="120"
			
 
				+          min-width="130"
			
 
				           prop="url"
			
 
				           show-overflow-tooltip
			
 
				         />
			
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="浏览器"
			
 
				-          min-width="100"
			
 
				+          min-width="120"
			
 
				           prop="browser"
			
 
				           show-overflow-tooltip
			
 
				         />
			
@@ -115,6 +115,7 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="账号"
			
 
				+          min-width="120"
			
 
				           prop="username"
			
 
				           show-overflow-tooltip
			
 
				           :sort-orders="['asc', 'desc']"
			
@@ -134,7 +135,7 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="耗时"
			
 
				-          min-width="80"
			
 
				+          min-width="100"
			
 
				           prop="duration"
			
 
				           show-overflow-tooltip
			
 
				         />
			
@@ -142,7 +143,7 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="操作时间"
			
 
				-          min-width="120"
			
 
				+          min-width="180"
			
 
				           prop="created_at"
			
 
				           show-overflow-tooltip
			
 
				           :sort-orders="['ascending', 'descending']"
			
@@ -151,6 +152,7 @@
 
				         <el-table-column
			
 
				           align="center"
			
 
				           label="操作"
			
 
				+          fixed="right"
			
 
				           show-overflow-tooltip
			
 
				           width="100"
			
 
				         >