修改发票信息联调错误，修改充值记录按表计查询，我的新增发票抬头

pages/invoiceList/components/already/index.js

@@ -1,5 +1,5 @@
 import { getAlreadyInvoiceList } from "../../../../service/invoice"
-import { alertInfo } from "../../../../utils/index";
+import { alertInfo, loadingFunc } from "../../../../utils/index";
 import request from '../../../../utils/request'
 const { OK } = request;
 // pages/invoiceList/components/already/index.js
@@ -43,8 +43,11 @@ Component({
         page: page + 1,
       })
     },
+    onRefresh() {
+      loadingFunc(() => this.getList())
+    },
     scrollToLower() {
-      this.getList();
+      loadingFunc(() => this.getList())
     },
     jumpToDetail() {
       wx.navigateTo({

pages/invoiceList/components/already/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "empty": "/components/empty/index"
   }
 }

pages/invoiceList/components/already/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/invoiceList/components/already/index.wxml-->
 
 
-<scroll-view scroll-y lower-threshold="100px" bindscrolltolower="scrollToLower" style="height: 80vh;" scroll-top="{{topHeight}}px" class="scrView">
+<scroll-view wx:if="{{list.length}}" scroll-y lower-threshold="100px" bindscrolltolower="scrollToLower" style="height: 80vh;" scroll-top="{{topHeight}}px" class="scrView">
   <view class="card" wx:for="{{list}}">
     <view class="left">
       <view class="title">
@@ -28,4 +28,7 @@
     </view>
   </view>
   <view  style="height: 50rpx;"></view>
-</scroll-view>
+</scroll-view>
+<view wx:else>
+  <empty text="暂无数据" bind:refresh="onRefresh" />
+</view>

pages/invoiceList/components/info/index.wxml

@@ -29,8 +29,8 @@
         </view>
         
         <view wx:else slot="input" style="margin-top: -10rpx;"> 
-          <view wx:if="{{formData.type === 0}}"> 普通电子发票 </view>
-          <view wx:elif="{{formData.type === 1}}"> 增值税专用电子发票 </view>
+          <view wx:if="{{detail.type === 0}}"> 普通电子发票 </view>
+          <view wx:elif="{{detail.type === 1}}"> 增值税专用电子发票 </view>
           <view wx:else>-</view>
         </view>
       </van-field>
@@ -44,7 +44,7 @@
         border="{{ editType === 'detail' ? false : true }}"
       >
         <view slot="input" style="margin-top: 16rpx;" wx:if="{{editType === 'edit'}}">
-          <van-radio-group direction="horizontal"  bind:change="onChangeHeaderType">
+          <van-radio-group direction="horizontal"  bind:change="onChangeHeaderType" value="{{formData.headerType}}">
             <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">企业单位</van-radio>
             <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">个人/非企业单位</van-radio>
           </van-radio-group>
@@ -54,8 +54,8 @@
           slot="input" 
           style="margin-top: -10rpx;"
         > 
-          <view wx:if="{{formData.headerType === 0}}"> 企业单位 </view>
-          <view wx:elif="{{formData.headerType === 1}}"> 个人/非企业单位 </view>
+          <view wx:if="{{detail.headerType === 0}}"> 企业单位 </view>
+          <view wx:elif="{{detail.headerType === 1}}"> 个人/非企业单位 </view>
           <view wx:else>-</view>
         </view>
       </van-field>
@@ -83,7 +83,7 @@
       <van-field
         value="{{detail.tin}}"
         label="发票税号"
-        wx:if="{{formData.headerType === 0}}"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入发票税号' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -104,7 +104,7 @@
       <van-field
         value="{{detail.bank}}"
         label="开户行"
-        wx:if="{{formData.headerType === 0}}"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入开户行' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -125,7 +125,7 @@
       <van-field
         value="{{detail.account}}"
         label="银行账号"
-        wx:if="{{formData.headerType === 0}}"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -146,7 +146,7 @@
       <van-field
         value="{{detail.address}}"
         label="地址"
-        wx:if="{{formData.headerType === 0}}"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"
@@ -167,7 +167,7 @@
       <van-field
         value="{{detail.phone}}"
         label="电话"
-        wx:if="{{formData.headerType === 0}}"
+        wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}"
         placeholder="{{editType === 'edit' ? '请输入电话' : ''}}"
         custom-style="padding-left: 0; padding-right: 0;"
         readonly="{{editType === 'detail'}}"

pages/invoiceList/components/notyet/index.js

@@ -1,6 +1,6 @@
 // pages/invoiceList/components/notyet/index.js
 import { getInvoiceList } from '../../../../service/invoice';
-import { alertInfo } from '../../../../utils/index';
+import { alertInfo, loadingFunc } from '../../../../utils/index';
 import request from '../../../../utils/request';
 const { OK } = request;
 
@@ -40,6 +40,9 @@ Component({
       // }
       this.setData({ list: data, selectList: new Array(data?.length).map(() => false) })
     },
+    onRefresh() {
+      loadingFunc(() => this.init())
+    },
     onChange(e) {
       const { id, index } = e.currentTarget.dataset;
       // let newList = this.data.chooseList;

pages/invoiceList/components/notyet/index.json

@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "van-checkbox": "@vant/weapp/checkbox/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "empty": "/components/empty/index"
   }
 }

pages/invoiceList/components/notyet/index.wxml

@@ -1,5 +1,6 @@
+<view wx:if="{{list.length}}">
 
-<van-checkbox-group value="{{ chooseList }}" bind:change="onChange" max="{{ 2 }}">
+  <van-checkbox-group value="{{ chooseList }}" bind:change="onChange" max="{{ 2 }}" >
   <view class="cardWrapper" wx:for="{{list}}" wx:key="index">
     <view class="content">
       <view class="left">
@@ -29,5 +30,8 @@
   <view class="allMoney"> ￥ {{selectMoney}} </view>
   <van-button size="small" type="info" bind:click="next" disabled="{{!selectCount}}"> 下一步 </van-button>
 </view>
+</view>
 
-
+<view wx:else>
+  <empty bind:refresh="onRefresh" />
+</view>

pages/invoiceList/index.js

@@ -17,7 +17,7 @@ Page({
       { name: '删除', },
     ],
     selectData: {},
-    active: 1,
+    active: 0,
   },
 
   /**