diff --git a/pages/login/login.js b/pages/login/login.js
index 9462865..e31849e 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -209,20 +209,6 @@ Page({
// 页面初始化 静默登录相关判断
onShow: function() {
var that = this;
- // wx.getStorage({
- // key: 'CustomerId',
- // success: function(res) {
- // app.globalData.CustomerId = res.data;
- // if (app.globalData.CustomerId) {
- // that.setData({
- // showCustomerChoise: false,
- // })
- // }
- // },
- // fail: function(res) {
- // that.choiceCustomer();
- // }
- // })
that.choiceCustomer();
getOpenId(function(res) {
openid = res;
diff --git a/pages/statementOfAccount/statementOfAccount.js b/pages/statementOfAccount/statementOfAccount.js
index 3f79ed6..b4c7638 100644
--- a/pages/statementOfAccount/statementOfAccount.js
+++ b/pages/statementOfAccount/statementOfAccount.js
@@ -11,8 +11,6 @@ Page({
data: {
dates: new Date().getFullYear() + '-' + (new Date().getMonth() + 1),
list:[],
- delBtnWidth: 90,
- startX: ""
},
bindDateChange: function (e) {
@@ -57,7 +55,6 @@ Page({
getBalanceList : function (that,params) {
var reslut = [];
network.requestLoading(method, params, function (res) {
- console.log(res);
var array = JSON.parse(res.result);
if (array.length <= 0) {
wx.showToast({
@@ -71,7 +68,6 @@ Page({
for (var i = 0; i < array.length; i++) {
array[i].Date = timechage.formatTimeTwo(array[i].Date.substring(6, 19), "Y/M/D");
}
- console.log(array);
let arrLast = that.data.list.concat(array);
that.setData({
list: arrLast
diff --git a/pages/statementOfAccount/statementOfAccount.wxml b/pages/statementOfAccount/statementOfAccount.wxml
index ef2a35f..cc97261 100644
--- a/pages/statementOfAccount/statementOfAccount.wxml
+++ b/pages/statementOfAccount/statementOfAccount.wxml
@@ -7,35 +7,33 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
- 日期:{{item.GatheringTime}}
- 收款:{{item.GatheringMoney}}
+
+
+
+
+
+
+ {{detailItem.BillType}}
+ {{detailItem.ID}}
+ {{detailItem.Money}}
+
+
- 删除
\ No newline at end of file
diff --git a/pages/statementOfAccount/statementOfAccount.wxss b/pages/statementOfAccount/statementOfAccount.wxss
index d415237..6e642fc 100644
--- a/pages/statementOfAccount/statementOfAccount.wxss
+++ b/pages/statementOfAccount/statementOfAccount.wxss
@@ -1,4 +1,4 @@
-page {
+page{
background: #f4f4f4;
height: 100%;
}
@@ -6,7 +6,6 @@ page {
.section {
background: #fff;
margin-top: 10px;
- width: 80%;
text-align: center;
height: 30px;
margin-left: 10%;
@@ -22,80 +21,69 @@ page {
}
.listContainer {
- width: 100%;
+ margin-top: 10px;
height: calc(100% - 50px);
display: flex;
flex-direction: column;
}
-.scroll-views {
- height: 100%;
+.header{
+ height: 60px;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
}
-/* .yonghu {
- background: #fff;
- height: 50px;
- border-bottom: 0.5px solid #ccc;
- margin-top: 10px;
- border-top: 0.5px solid #ccc;
+.headerSectionTop{
+ /* height: 50%; */
+ height: 30px;
+ width: 100%;
+ line-height: 30px;
display: flex;
flex-direction: row;
-} */
+ border-bottom: 1rpx solid #ccc;
+}
-.view1 {
- height: 100%;
- width: 50%;
- color: #464646;
- line-height: 50px;
- text-align: center;
+.headerSectionBottom{
+ /* height: 50%; */
+ height: 30px;
+ width: 100%;
+ line-height: 30px;
+ display: flex;
+ flex-direction: row;
}
-.view2 {
+.dateView{
height: 100%;
width: 50%;
- color: #464646;
- line-height: 50px;
- padding-right: 20rpx;
- text-align: center;
+ font-size: 18px;
}
-
-.item {
- position: relative;
- margin-top: 10rpx;
- border-top: 2rpx solid #eee;
- height: 50px;
- line-height: 50rpx;
- overflow: hidden;
+.titleView{
+ height: 100%;
+ width: 33.3%;
+ font-size: 16px;
+ text-align: center;
}
-.inner {
- position: absolute;
- top: 0;
+.infoView{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
}
-.inner.txt {
- background-color: #fff;
+.infoDetail{
+ height: 30px;
+ line-height: 30px;
width: 100%;
- height: 100%;
- z-index: 5;
- padding: 0 10rpx;
- transition: left 0.2s ease-in-out;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
display: flex;
flex-direction: row;
}
-.inner.del {
- background-color: red;
- font-family: Monaco;
- width: 90px;
- height: 50px;
- line-height: 50px;
- text-align: center;
- z-index: 4;
- right: 0;
- color: #fff;
+.item {
+ display: flex;
+ padding: 10rpx 20rpx;
+ flex-direction: column;
+ background-color: #fff;
}
+