diff --git a/pages/invoiceDetail/index.wxml b/pages/invoiceDetail/index.wxml
index ef579fe..2267c9d 100644
--- a/pages/invoiceDetail/index.wxml
+++ b/pages/invoiceDetail/index.wxml
@@ -50,7 +50,7 @@
-->
-
+
尊敬的客户，您好：
已经为您开具订单{{detail.id}}的发票，发票数量共计1张，如下：
@@ -63,9 +63,12 @@
发票明细
-
+
尊敬的客户，您好：
开票申请已提交，系统正在开票中，请您稍后再查看。
+
+ 发票明细
+
\ No newline at end of file
diff --git a/pages/invoiceList/components/already/index.wxml b/pages/invoiceList/components/already/index.wxml
index 1a9a45d..4cc2aa7 100644
--- a/pages/invoiceList/components/already/index.wxml
+++ b/pages/invoiceList/components/already/index.wxml
@@ -8,7 +8,7 @@
{{item.invoice.name}}
- 发票内容： {{item.invoice.content}}
+ 发票内容： {{item.invoice.content}}（{{item.money}}元）
发票类型：{{ item.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}
@@ -18,7 +18,8 @@
- ￥{{item.money}}
+
+
发票
@@ -26,6 +27,10 @@
明细
+
+ 审核中
+ 已开票
+
diff --git a/pages/invoiceList/components/already/index.wxss b/pages/invoiceList/components/already/index.wxss
index 2c39d2b..df0c602 100644
--- a/pages/invoiceList/components/already/index.wxss
+++ b/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) */
}
\ No newline at end of file
diff --git a/pages/invoiceList/components/info/index.wxml b/pages/invoiceList/components/info/index.wxml
index 6f0df40..e4f5ee7 100644
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -47,6 +47,7 @@
-
- {{detail.name || '-'}}
-
-
- {{detail.tin || '-'}}
-
-
- {{detail.bank || '-'}}
-
-
- {{detail.account || '-'}}
-
-
- {{detail.address || '-'}}
-
-
+
@@ -272,10 +263,9 @@
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="phone"
+ value="{{detail.phone || '-'}}"
>
-
- {{detail.phone || '-'}}
-
+
@@ -303,10 +293,8 @@
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="email"
- >
-
- {{detail.email || '-'}}
-
+ value="{{detail.email || '-'}}"
+ >
false) })
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+
+ 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 })
+ }
}
}
})
\ No newline at end of file
diff --git a/pages/invoiceList/components/notyet/index.wxml b/pages/invoiceList/components/notyet/index.wxml
index d789638..5ab9525 100644
--- a/pages/invoiceList/components/notyet/index.wxml
+++ b/pages/invoiceList/components/notyet/index.wxml
@@ -25,10 +25,15 @@
- {{ selectCount }}
- 笔订单，共
- ￥ {{selectMoney}}
- 下一步
+
+ 全选
+
+
+ {{ selectCount }}
+ 笔订单，共
+ ￥ {{selectMoney}}
+ 下一步
+
diff --git a/pages/invoiceList/components/notyet/index.wxss b/pages/invoiceList/components/notyet/index.wxss
index c3e70fe..65e9424 100644
--- a/pages/invoiceList/components/notyet/index.wxss
+++ b/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);
}
diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml
index d510195..7ee0d06 100644
--- a/pages/invoicing/index.wxml
+++ b/pages/invoicing/index.wxml
@@ -71,7 +71,7 @@
disabled="{{true}}"
/>