feat(balanceSummary): 财务管理-余额汇总删除国家及重复字段

src/pages/financial/balanceSummary.vue

@@ -7,20 +7,7 @@
     </view>
     <view class="kuang" v-for="(item, index) in tableData" :key="index">
       <table class="tftable" border="1">
-        <tr>
+        
-          <td align="right">{{ '国家' }}</td>
-          <td align="left">
-            <view class="theflex">
-              <view style="margin-right: 8rpx">
-                <img
-                  style="width: 46rpx; height: 32rpx"
-                  :src="item.pkCountryIcon"
-                  alt=""
-              /></view>
-              <view>{{ item.pkCountryName }}</view>
-            </view>
-          </td>
-        </tr>
         <tr v-if="showData.account1">
           <td align="right">{{ '消费账户余额' + `(${isLocalSymbol()})` }}</td>
           <td align="left">{{ item.account1 }}</td>
@@ -89,7 +76,7 @@
             {{ item.account12 }}
           </td>
         </tr>
-        <tr v-if="showData.settleAccount1">
+        <!-- <tr v-if="showData.settleAccount1">
           <td align="right">{{ '消费账户余额' + `(${isLocals()})` }}</td>
           <td align="left">
             {{ item.settleAccount1 }}
@@ -138,7 +125,7 @@
         <tr v-if="showData.settleAccount12">
           <td align="right">{{ '乐学代金券余额' + `(${isLocals()})` }}</td>
           <td align="left">{{ item.settleAccount12 }}</td>
-        </tr>
+        </tr> -->
       </table>
     </view>
 
@@ -218,6 +205,10 @@ export default {
       },
     };
   },
+  onReachBottom() {
+    this.queryParams.pageNum++;
+    this.getSearch();
+  },
   onLoad(options) {
     if (uni.getStorageSync("userAll")) {
       this.userCountry = JSON.parse(uni.getStorageSync("userAll")).country;
@@ -232,7 +223,7 @@ export default {
     isLocalSymbol,
     isLocals,
 // 设置默认日期，最大值为今天，最小值为去年今天
-chooseTimed() {
+    chooseTimed() {
       let date = new Date();
       let year = date.getFullYear();
       let month = date.getMonth() + 1;
@@ -257,20 +248,14 @@ chooseTimed() {
         this.showData = obj;
       });
     },
-    onReachBottom() {
+    
-      this.queryParams.pageNum++;
-      this.getSearch();
-    },
     getSearch() {
       api
         .getBalanceSummaryList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
           this.total = res.total;
-          this.tableData = res.rows;
+          this.tableData = this.tableData.concat(res.rows);
-          this.tableData.forEach((item) => {
+          
-            item.pkCountryName = this.userCountry.shortName;
-            item.pkCountryIcon = this.userCountry.nationalFlag2;
-          });
         });
     },
     getList1() {

src/pages/financial/walletDetails.vue

@@ -23,19 +23,7 @@
           :key="index">
       <table class="tftable"
              border="1">
-        <tr>
+        
-          <td align="right">{{ '国家' }}</td>
-          <td align="left">
-            <view class="theflex">
-              <view style="margin-right: 8rpx">
-                <img style="width: 46rpx; height: 32rpx"
-                     :src="item.pkCountryIcon"
-                     alt="" />
-              </view>
-              <view>{{ item.pkCountryName }}</view>
-            </view>
-          </td>
-        </tr>
         <tr>
           <td align="right">{{ '会员编号' }}</td>
           <td align="left">{{ item.memberCode }}</td>
@@ -45,11 +33,11 @@
           <td align="left">{{ item.memberName }}</td>
         </tr>
         <tr>
-          <td align="right">{{ '体系名称' }}</td>
+          <td align="right">隶属体系</td>
           <td align="left">{{ item.vertexName }}</td>
         </tr>
         <tr>
-          <td align="right">{{ '团队名称' }}</td>
+          <td align="right">隶属团队</td>
           <td align="left">{{ item.teamName }}</td>
         </tr>
         <tr>

src/pages/financial/walletDetailsPro.vue

@@ -23,19 +23,7 @@
           :key="index">
       <table class="tftable"
              border="1">
-        <tr>
+        
-          <td align="right">{{ '国家' }}</td>
-          <td align="left">
-            <view class="theflex">
-              <view style="margin-right: 8rpx">
-                <img style="width: 46rpx; height: 32rpx"
-                     :src="item.pkCountryIcon"
-                     alt="" />
-              </view>
-              <view>{{ item.pkCountryName }}</view>
-            </view>
-          </td>
-        </tr>
         <tr>
           <td align="right">{{ '会员编号' }}</td>
           <td align="left">{{ item.memberCode }}</td>
@@ -44,6 +32,14 @@
           <td align="right">{{ '会员姓名' }}</td>
           <td align="left">{{ item.memberName }}</td>
         </tr>
+        <tr>
+          <td align="right">隶属体系</td>
+          <td align="left">{{ item.vertexName }}</td>
+        </tr>
+        <tr>
+          <td align="right">隶属团队</td>
+          <td align="left">{{ item.teamName }}</td>
+        </tr>
         <tr>
           <td align="right">{{ '钱包类型' }}</td>
           <td align="left">{{ item.pkAccountVal }}</td>
@@ -56,18 +52,10 @@
           <td align="right">{{ '交易金额' }}({{ isLocalSymbol() }})</td>
           <td align="left">{{ item.tradeAmount }}</td>
         </tr>
-        <tr>
-          <td align="right">{{ '交易金额' }}({{ isLocals() }})</td>
-          <td align="left">{{ item.settleTradeAmount }}</td>
-        </tr>
         <tr>
           <td align="right">{{ '交易余额' }}({{ isLocalSymbol() }})</td>
           <td align="left">{{ item.tradeBalance }}</td>
         </tr>
-        <tr>
-          <td align="right">{{ '交易余额' }}({{ isLocals() }})</td>
-          <td align="left">{{ item.settleTradeBalance }}</td>
-        </tr>
         <tr>
           <td align="right">{{ '交易备注' }}</td>
           <td align="left">{{ item.remarks }}</td>

vue.config.js

@@ -10,12 +10,19 @@ module.exports = {
     open: true,
     port: 8099,
     proxy: {
+      // '/prod-api': {
+      //   target: 'http://localhost:8080',
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     '^/prod-api': ''
+      //   }
+      // },
       '/prod-api': {
-        target: 'http://localhost:8080',
+        target: 'http://t-mana.beida413.com',
         changeOrigin: true,
-        pathRewrite: {
+        // pathRewrite: {
-          '^/prod-api': ''
+        //   '^/prod-api': ''
-        }
+        // }
       }
     }
   },