项目优化

.env.dev

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

.env.test

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

src/modules/payment/components/SecondChannel.vue

@@ -3,35 +3,35 @@
   <table border="1" cellspacing="0" class="tableDetail">
     <tr class="part">
       <th>不含税销售金额</th>
-      <td>{{ dealList.sales_amount_excluding_tax }}</td>
+      <td>{{ dealList.secondary_sales_amount_excluding_tax }}</td>
       <th>渠道代理费提基数</th>
-      <td>{{ dealList.channel_agent_fee_base }}</td>
+      <td>{{ dealList.secondary_channel_agent_fee_base }}</td>
       <th>服务费规则</th>
-      <td>{{ dealList.service_fee_rules }}</td>
+      <td>{{ dealList.secondary_service_fee_rules }}</td>
     </tr>
     <tr class="title">
       <th>服务费比例</th>
       <td>{{ serviceChargeRatio() }}</td>
       <th>代理服务费</th>
-      <td>{{ dealList.agency_service_fee }}</td>
+      <td>{{ dealList.secondary_agency_service_fee }}</td>
       <th>代理服务费（不含税金额）</th>
-      <td>{{ dealList.agency_service_fee_excluding_tax }}</td>
+      <td>{{ dealList.secondary_agency_service_fee_excluding_tax }}</td>
     </tr>
     <tr class="title">
       <th>户名</th>
-      <td>{{ dealList.channel_account_name }}</td>
+      <td>{{ dealList.secondary_channel_account_name }}</td>
       <th>账号</th>
-      <td>{{ dealList.channel_account }}</td>
+      <td>{{ dealList.secondary_channel_account }}</td>
       <th>开户行</th>
-      <td>{{ dealList.channel_bank_of_deposit }}</td>
+      <td>{{ dealList.secondary_channel_bank_of_deposit }}</td>
     </tr>
     <tr class="title">
       <th>渠道税率</th>
-      <td colspan="5">{{ dealList.channel_tax_rate }}</td>
+      <td colspan="5">{{ dealList.secondary_channel_tax_rate }}</td>
     </tr>
     <tr class="title">
-      <th>分成方式</th>
-      <td colspan="5">{{ dealList.secondary_division_type }}</td>
+      <th>二级渠道</th>
+      <td colspan="5">{{ dealList.secondary_channel_id_name }}</td>
     </tr>
   </table>
 </template>

src/modules/payment/views/Detail.vue

@@ -34,7 +34,7 @@
     <app-card title="发票信息">
       <Ticket :dealList="dealList" />
     </app-card>
-    <app-card title="渠道信息">
+    <app-card title="一级渠道信息">
       <Channel :dealList="dealList" />
     </app-card>
     <app-card title="二级渠道信息" v-show="this.dealList.secondary_channel_id !== ''">

src/modules/payment/views/List.vue

@@ -294,6 +294,34 @@ export default {
           { label: '尾款手续费', prop: 'final_service_charge', align: 'center', minWidth: 100 },
           { label: '尾款到账金额', prop: 'final_amount_received', align: 'center', minWidth: 100 },
           { label: '尾款待缴金额', prop: 'final_amount_need_to_pay', align: 'center', minWidth: 100 },
+          { label: '二级渠道', prop: 'secondary_channel_id_name', align: 'center', minWidth: 100 },
+          { label: '二级渠道分成方式', prop: 'secondary_division_type', align: 'center', minWidth: 200 },
+          { label: '二级渠道规则', prop: 'secondary_service_fee_rules', align: 'center', minWidth: 100 },
+          { label: '二级渠道比例', prop: 'secondary_service_charge_ratio', align: 'center', minWidth: 100 },
+          {
+            label: '二级渠道不含税销售金额',
+            prop: 'secondary_sales_amount_excluding_tax',
+            align: 'center',
+            minWidth: 300
+          },
+          {
+            label: '二级渠道渠道代理费提基数',
+            prop: 'secondary_channel_agent_fee_base',
+            align: 'center',
+            minWidth: 300
+          },
+          { label: '二级渠道代理服务费', prop: 'secondary_agency_service_fee', align: 'center', minWidth: 200 },
+          {
+            label: '二级渠道代理服务费（不含税金额）',
+            prop: 'secondary_agency_service_fee_excluding_tax',
+            align: 'center',
+            minWidth: 300
+          },
+          { label: '二级渠道渠道税率', prop: 'secondary_channel_tax_rate', align: 'center', minWidth: 200 },
+          { label: '二级渠道户名', prop: 'secondary_channel_account_name', align: 'center', minWidth: 100 },
+          { label: '二级渠道账号', prop: 'secondary_channel_account', align: 'center', minWidth: 100 },
+          { label: '二级渠道开户行', prop: 'secondary_channel_bank_of_deposit', align: 'center', minWidth: 200 },
+
           { label: '跟进人', prop: 'sales_rep_user_id_name', align: 'center', minWidth: 100 },
           { label: '渠道', prop: 'channel_id_name', align: 'center', minWidth: 300 },
           { label: '交易流水号', prop: 'txn_id_list', align: 'center', minWidth: 300 },

vite.config.js

@@ -13,8 +13,17 @@ export default defineConfig({
       key: fs.readFileSync(path.join(__dirname, './https/dev.ezijing.com.key')),
       cert: fs.readFileSync(path.join(__dirname, './https/dev.ezijing.com.pem'))
     },
+    // proxy: {
+    //   '/api/finance': 'https://finance-backend-api.ezijing.com'
+    // },
     proxy: {
-      '/api': 'https://finance-admin2.ezijing.com'
+      '/api/finance': {
+        target: 'https://finance-backend-api.ezijing.com',
+        changeOrigin: true,
+        rewrite: path => path.replace(/^\/api\/finance/, '')
+      },
+
+      '/api': 'https://app.ezijing.com'
     }
   },
   resolve: {