Merge remote-tracking branch 'origin/master'

.env.dev

-VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
+VITE_LOGIN_URL=https://login2.ezijing.com/auth/login/index

deploy.js

@@ -40,4 +40,4 @@ function generateUploadTarget(src, dist) {
   })
 }
 
-generateUploadTarget('../dist', '/website/prod/finance-admin')
+generateUploadTarget('./dist', '/website/prod/finance-admin')

package.json

@@ -26,6 +26,9 @@
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
     "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",
     "sass": "^1.38.0",
     "vite": "^2.5.0",

src/modules/finance/payment/components/Order.vue

 <template>
+<<<<<<< HEAD
   <div>
     <table border="1"  width="1200px" cellspacing="0" >
               <tr>
@@ -21,6 +22,27 @@
 
 <script>
 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>
 

src/modules/finance/payment/components/Student.vue

 <template>
+<<<<<<< HEAD
   <div>
           <table border="1"  width="1200px" cellspacing="0">
               <tr>
@@ -29,4 +30,18 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
+=======
+  <app-card title="学员信息"></app-card>
+</template>
+
+<script>
+// 组件
+import AppCard from '@/components/base/AppCard.vue'
+export default {
+  components: { AppCard }
+}
+</script>
+
+<style></style>
+>>>>>>> master

src/modules/finance/payment/views/List.vue

 <template>
   <app-card>
+<<<<<<< HEAD
     <app-list
       v-bind="tableOptions"
       ref="list"
@@ -14,6 +15,12 @@
         ></el-switch>
       </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 }">
         <router-link :to="{ name: 'paymentView', params: { id: row.id } }">
           <el-button type="text">查看</el-button>
@@ -51,6 +58,10 @@ export default {
         //   beforeRequest: this.beforeRequest
         // },
         filters: [
+          {
+            prop: 'date',
+            slots: 'filter-date'
+          },
           {
             type: 'select',
             prop: 'group_id',

vite.config.js

@@ -14,7 +14,7 @@ export default defineConfig({
       cert: fs.readFileSync(path.join(__dirname, './https/dev.ezijing.com.pem'))
     },
     proxy: {
-      '/api': 'https://project-api.ezijing.com'
+      '/api': 'https://finance-admin2.ezijing.com'
     }
   },
   resolve: {