修改了发票详细样式，新增发票审核状态，发票新增全选

pages/invoiceDetail/index.wxml

@@ -50,7 +50,7 @@
 </view> -->
 
 <navigator title="发票详细" canBack="{{true}}" bind:back="back" />
-<view wx:if="{{detail.status === 1}}">
+<view wx:if="{{detail.status === 2}}">
   <view class="wrapper">
     <view style="margin-top: 40rpx;"> 尊敬的客户，您好： </view>
     <view style="margin-top: 20rpx;"> 已经为您开具订单{{detail.id}}的发票，发票数量共计1张，如下： </view>
@@ -63,9 +63,12 @@
     <van-button type="info" style="flex: 1;margin-left: 40rpx;" block bind:click="jumpToDetail"> 发票明细 </van-button>
   </view>
 </view>
-<view wx:if="{{detail.status === 0}}">
+<view wx:if="{{detail.status === 1}}">
   <view class="wrapper">
     <view style="margin-top: 40rpx;"> 尊敬的客户，您好： </view>
     <view style="margin-top: 20rpx;"> 开票申请已提交，系统正在开票中，请您稍后再查看。 </view>
   </view>
+  <view class="operate">
+    <van-button type="info" style="flex: 1;" block bind:click="jumpToDetail"> 发票明细 </van-button>
+  </view>
 </view>

pages/invoiceList/components/already/index.wxml

@@ -8,7 +8,7 @@
         {{item.invoice.name}}
       </view>
       <view class="invoiceContent">
-        发票内容： {{item.invoice.content}}
+        发票内容： {{item.invoice.content}}（{{item.money}}元）
       </view>
       <view class="invoiceType">
         发票类型：{{ item.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}
@@ -18,7 +18,8 @@
       </view>
     </view>
     <view class="right">
-      <view class="money"> ￥{{item.money}} </view>
+
+      <view class="money"> </view>
       <view class="operate">
         <view style="margin-top: 20rpx; margin-bottom: 20rpx;">
           <van-button type="info" class="invoiceBtn" bind:click="submit" size="small" bind:click="jumpToDetail" data-id="{{item.id}}">发票</van-button>
@@ -26,6 +27,10 @@
         <van-button type="info" class="detailBtn" bind:click="submit" size="small" bind:click="jumpToDetailContent" data-id="{{item.id}}">明细</van-button>
       </view>
     </view>
+    <view class="{{item.status === 1 ? 'approving' : 'already'}}">
+        <view wx:if="{{item.status === 1}}"> 审核中 </view>
+        <view wx:else> 已开票 </view>
+      </view>
   </view>
   <view  style="height: 50rpx;"></view>
 </scroll-view>

pages/invoiceList/components/already/index.wxss

@@ -8,15 +8,17 @@
   background-color: #fff;
   border-radius: 26rpx;
   padding: 20rpx;
-  box-sizing: border-box
+  box-sizing: border-box;
-  ;
+  position: relative;
 }
 
 .left {
   flex: 1;
 }
 .right {
-
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
 }
 .detailBtn {
   margin-top: 20rpx;
@@ -36,4 +38,26 @@
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
+}
+.approving {
+  position: absolute;
+  top: 0;
+  right: 0;
+  font-size: 30rpx;
+  background-color: rgb(239,227,227);
+  padding: 14rpx 24rpx;
+  border-radius: 18rpx;
+  color: rgb(224, 106, 106) 
+}
+
+.already {
+  position: absolute;
+  top: 0;
+  right: 0;
+  font-size: 30rpx;
+  background-color: #0958d9;
+  padding: 14rpx 24rpx;
+  border-radius: 18rpx;
+  color: #fff;
+  /* color: var(--deep-green)  */
 }

pages/invoiceList/components/info/index.wxml

@@ -47,6 +47,7 @@
           </view>
         </van-field>
         <van-field
+          value="{{detail.name || '-'}}"
           label="发票抬头"
           custom-style="padding-left: 0; padding-right: 0;"
           readonly="{{true}}"
@@ -55,12 +56,10 @@
           title-width="132rpx"
           border="{{ false }}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view> {{detail.name || '-'}} </view>
-          </view>
         </van-field>
         <van-field
           label="发票税号"
+          value="{{detail.tin || '-'}}"
           wx:if="{{detail.headerType === 0}}"
           custom-style="padding-left: 0; padding-right: 0;"
           readonly="{{editType === 'detail'}}"
@@ -69,11 +68,9 @@
           title-width="132rpx"
           border="{{ editType === 'detail' ? false : true }}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view> {{detail.tin || '-'}} </view>
-          </view>
         </van-field>
         <van-field
+          value="{{detail.bank}}"
           label="开户行"
           wx:if="{{detail.headerType === 0}}"
           custom-style="padding-left: 0; padding-right: 0;"
@@ -83,12 +80,10 @@
           title-width="132rpx"
           border="{{ editType === 'detail' ? false : true }}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view> {{detail.bank || '-'}} </view>
-          </view>
         </van-field>
         <van-field
           label="银行账号"
+          value="{{detail.account || '-'}}"
           wx:if="{{(detail.headerType === 0)}}"
           placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
           custom-style="padding-left: 0; padding-right: 0;"
@@ -100,15 +95,12 @@
           bind:change="onChangeText"
           data-name="account"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view> {{detail.account || '-'}} </view>
-          </view>
         </van-field>
         <van-field
           label="地址"
           wx:if="{{(detail.headerType === 0)}}"
           placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
-          custom-style="padding-left: 0; padding-right: 0;"
+          custom-style="padding-left: 0; padding-right: 0; height: auto;"
           readonly="{{editType === 'detail'}}"
           autosize="{{true}}"
           type="textarea"
@@ -116,10 +108,8 @@
           border="{{ editType === 'detail' ? false : true }}"
           bind:change="onChangeText"
           data-name="address"
+          value="{{detail.address || '-'}}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view> {{detail.address || '-'}} </view>
-          </view>
         </van-field>
         
         <van-field
@@ -133,10 +123,11 @@
           border="{{ editType === 'detail' ? false : true }}"
           bind:change="onChangeText"
           data-name="remark"
+          value="{{detail.remark || '-'}}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
+          <!-- <view slot="input" style="margin-top: -10rpx;"> 
             <view> {{detail.remark || '-'}} </view>
-          </view>
+          </view> -->
         </van-field>
       </view>
       <view wx:else>
@@ -272,10 +263,9 @@
           border="{{ editType === 'detail' ? false : true }}"
           bind:change="onChangeText"
           data-name="phone"
+          value="{{detail.phone || '-'}}"
         >
-          <view slot="input" style="margin-top: -10rpx;"> 
+        
-            <view> {{detail.phone || '-'}} </view>
-          </view>
         </van-field>
       </view>
       <view wx:else>
@@ -303,10 +293,8 @@
         border="{{ editType === 'detail' ? false : true }}"
         bind:change="onChangeText"
         data-name="email"
-      >
+        value="{{detail.email || '-'}}"
-        <view slot="input" style="margin-top: -10rpx;"> 
+      > 
-          <view> {{detail.email || '-'}} </view>
-        </view>
       </van-field>
       <van-field
         value="{{formData.email}}"

pages/invoiceList/components/notyet/index.js

@@ -34,11 +34,12 @@ Component({
   methods: {
     async init() {
       const { code, message, data } = await getInvoiceList();
-      // if (code !== OK) {
+      if (code !== OK) {
-      //   alertInfo(message)
+        alertInfo(message)
-      //   return;
+        return;
-      // }
+      }
-      this.setData({ list: data, selectList: new Array(data?.length).map(() => false) })
+      
+      this.setData({ list: data, selectList: new Array(data?.length).map(() => false), allChecked: false, })
     },
     onRefresh() {
       loadingFunc(() => this.init())
@@ -64,9 +65,11 @@ Component({
           selectMoney += list[i]?.money;
         }
       }
+      console.log('newSelectList', newSelectList)
       this.setData({
         // chooseList: newList,
         selectList: newSelectList,
+        allChecked: selectCount === list.length,
         selectCount,
         selectMoney: Number(selectMoney.toFixed(2))
       })
@@ -92,6 +95,17 @@ Component({
       wx.navigateTo({
         url: `/pages/invoicing/index?money=${selectMoney}&count=${selectCount}&tenement=${tenementID}&ids=${ids}&tenementName=${tenementName}`,
       })
+    },
+    onAllChecked(e) {
+      // console.log('e', e.detail)
+      const { list } = this.data;
+      if (e.detail) {
+        const newSelectList = Array.from({ length: list.length }, () => true)
+
+        this.setData({ selectList: newSelectList, selectCount: list.length, selectMoney: list.map(item => item.money).reduce((prev, next) => prev + next).toFixed(2), allChecked: true  })
+      } else {
+        this.setData({ allChecked: false, selectMoney: 0, selectList: [], selectCount: 0 })
+      }
     }
   }
 })

pages/invoiceList/components/notyet/index.wxml

@@ -25,10 +25,15 @@
 </van-checkbox-group>
 
 <view class="allSelect">
-  <view class="allNumber"> {{ selectCount }} </view>
+  <van-checkbox value="{{ allChecked }}" bind:change="onAllChecked">
-  笔订单，共
+    全选
-  <view class="allMoney"> ￥ {{selectMoney}} </view>
+  </van-checkbox>
-  <van-button size="small" type="info" bind:click="next" disabled="{{!selectCount}}"> 下一步 </van-button>
+  <view style="flex: 1; display: flex; align-items: center; justify-content: flex-end;">
+    <view class="allNumber"> {{ selectCount }} </view>
+    笔订单，共
+    <view class="allMoney"> ￥ {{selectMoney}} </view>
+    <van-button size="small" type="info" bind:click="next" disabled="{{!selectCount}}"> 下一步 </van-button>
+  </view>
 </view>
 </view>
 

pages/invoiceList/components/notyet/index.wxss

@@ -47,6 +47,7 @@
   box-sizing: border-box;
   display: flex;
   align-items: center;
+  justify-content: space-between;
 }
 
 .allNumber {
@@ -56,8 +57,8 @@
 }
 
 .allMoney {
-  flex: 1;
   margin-left: 20rpx;
+  margin-right: 20rpx;
   color: var(--money-color);
 }
 

pages/invoicing/index.wxml

@@ -71,7 +71,7 @@
         disabled="{{true}}"
       />
       <van-field
-        value="{{ detail.address }}"
+        value="{{ detail.phone }}"
         wx:if="{{detail.headerType === 0}}"
         label="电话"
         readonly

utils/index.js

@@ -46,6 +46,7 @@ export function getConfigByEnv() {
     // 开发版
     case 'develop':
       api = "http://localhost:8000"
+      // api = "https://zgd.hbhcbn.com/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
       break;
     // 体验版