提交 89a3ac0c authored 作者: matian's avatar matian

Merge remote-tracking branch 'origin/master'

VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index VITE_LOGIN_URL=https://login2.ezijing.com/auth/login/index
...@@ -40,4 +40,4 @@ function generateUploadTarget(src, dist) { ...@@ -40,4 +40,4 @@ function generateUploadTarget(src, dist) {
}) })
} }
generateUploadTarget('../dist', '/website/prod/finance-admin') generateUploadTarget('./dist', '/website/prod/finance-admin')
差异被折叠。
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3", "eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-vue": "^7.16.0", "eslint-plugin-vue": "^7.16.0",
"sass": "^1.38.0", "sass": "^1.38.0",
"vite": "^2.5.0", "vite": "^2.5.0",
......
<template> <template>
<<<<<<< HEAD
<div> <div>
<table border="1" width="1200px" cellspacing="0" > <table border="1" width="1200px" cellspacing="0" >
<tr> <tr>
...@@ -21,6 +22,27 @@ ...@@ -21,6 +22,27 @@
<script> <script>
export default { export default {
=======
<app-card title="订单信息">
<table>
<tr>
<th>标题</th>
<td>{{title}}</td>
</tr>
<tr>
<th></th>
<td></td>
</tr>
</table>
</app-card>
</template>
<script>
// 组件
import AppCard from '@/components/base/AppCard.vue'
export default {
components: { AppCard }
>>>>>>> master
} }
</script> </script>
......
<template> <template>
<<<<<<< HEAD
<div> <div>
<table border="1" width="1200px" cellspacing="0"> <table border="1" width="1200px" cellspacing="0">
<tr> <tr>
...@@ -29,4 +30,18 @@ export default { ...@@ -29,4 +30,18 @@ export default {
<style> <style>
</style> </style>
\ No newline at end of file =======
<app-card title="学员信息"></app-card>
</template>
<script>
// 组件
import AppCard from '@/components/base/AppCard.vue'
export default {
components: { AppCard }
}
</script>
<style></style>
>>>>>>> master
<template> <template>
<app-card> <app-card>
<<<<<<< HEAD
<app-list <app-list
v-bind="tableOptions" v-bind="tableOptions"
ref="list" ref="list"
...@@ -14,6 +15,12 @@ ...@@ -14,6 +15,12 @@
></el-switch> ></el-switch>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
=======
<app-list v-bind="tableOptions" ref="list" @selection-change="handleSelectionChange">
<template #filter-date="{ params }">
<el-date-picker v-model="params.date"></el-date-picker>
</template>
>>>>>>> master
<template v-slot:table-x="{ row }"> <template v-slot:table-x="{ row }">
<router-link :to="{ name: 'paymentView', params: { id: row.id } }"> <router-link :to="{ name: 'paymentView', params: { id: row.id } }">
<el-button type="text">查看</el-button> <el-button type="text">查看</el-button>
...@@ -51,6 +58,10 @@ export default { ...@@ -51,6 +58,10 @@ export default {
// beforeRequest: this.beforeRequest // beforeRequest: this.beforeRequest
// }, // },
filters: [ filters: [
{
prop: 'date',
slots: 'filter-date'
},
{ {
type: 'select', type: 'select',
prop: 'group_id', prop: 'group_id',
......
...@@ -14,7 +14,7 @@ export default defineConfig({ ...@@ -14,7 +14,7 @@ export default defineConfig({
cert: fs.readFileSync(path.join(__dirname, './https/dev.ezijing.com.pem')) cert: fs.readFileSync(path.join(__dirname, './https/dev.ezijing.com.pem'))
}, },
proxy: { proxy: {
'/api': 'https://project-api.ezijing.com' '/api': 'https://finance-admin2.ezijing.com'
} }
}, },
resolve: { resolve: {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论