diff --git a/pages/login/login.js b/pages/login/login.js
index e31849e..6e0b1a6 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -66,9 +66,7 @@ function IsBindWeixinMP(phone) {
Page({
data: {
- //用户信息
userInfo: "",
- //新增选择客户
array: [{
ID: 0,
Name: "请选择所属客户"
@@ -163,10 +161,6 @@ Page({
CustomerId: that.data.array[that.data.index].ID,
}];
var storageCustomerID = that.data.array[that.data.index].ID;
- // wx.setStorage({
- // key: 'CustomerId',
- // data: storageCustomerID,
- // })
app.globalData.CustomerId = storageCustomerID;
// 先绑定客户服务器
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 8c11ae2..9f096c4 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -1,19 +1,16 @@
-
-
+
+
{{array[index].Name}}
-
+
-
-
-
\ No newline at end of file
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 6fdf1ed..b5950ef 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -9,12 +9,20 @@ page {
margin-top: 20%;
}
-.customerPicker {
- width: 100%;
+.pickerPlaceHolder {
+ text-align: center;
height: 40px;
+ background: #EAF1F8;
line-height: 40px;
+ color: #999;
+}
+
+.pickerSelected {
text-align: center;
- background: #fafafa;
+ height: 40px;
+ line-height: 40px;
+ background: #EAF1F8;
+ color: black;
}
.view2 {
@@ -33,7 +41,7 @@ page {
.input {
text-align: center;
height: 40px;
- background: #fafafa;
+ background: #EAF1F8;
}
.denglu {
@@ -41,7 +49,7 @@ page {
margin-top: 10%;
width: 90%;
margin-right: 5%;
- background: #2e8cf5;
+ background: #f98b29;
color: #fff;
}
diff --git a/pages/statementOfAccount/statementOfAccount.wxml b/pages/statementOfAccount/statementOfAccount.wxml
index cc97261..8d92eeb 100644
--- a/pages/statementOfAccount/statementOfAccount.wxml
+++ b/pages/statementOfAccount/statementOfAccount.wxml
@@ -7,7 +7,7 @@
-
+
diff --git a/pages/statementOfAccount/statementOfAccount.wxss b/pages/statementOfAccount/statementOfAccount.wxss
index 6e642fc..fb18291 100644
--- a/pages/statementOfAccount/statementOfAccount.wxss
+++ b/pages/statementOfAccount/statementOfAccount.wxss
@@ -28,20 +28,20 @@ page{
}
.header{
- height: 60px;
+ height: 70px;
width: 100%;
display: flex;
flex-direction: column;
+ /* border-bottom: 1rpx solid #ccc; */
}
.headerSectionTop{
/* height: 50%; */
- height: 30px;
+ height: 40px;
width: 100%;
- line-height: 30px;
+ line-height: 40px;
display: flex;
flex-direction: row;
- border-bottom: 1rpx solid #ccc;
}
.headerSectionBottom{
diff --git a/utils/net.js b/utils/net.js
index 2ce4384..849cc96 100644
--- a/utils/net.js
+++ b/utils/net.js
@@ -16,8 +16,6 @@ function previousRequestLoading(method, params, successaction) {
'params': params
};
var baseUrl = app.globalData.BaseUrl;
- console.log("params == " + params);
- console.log("method == " + method);
wx.request({
url: baseUrl,
data: data,
@@ -38,7 +36,6 @@ function previousRequestLoading(method, params, successaction) {
}
},
fail: function(res) {
- console.log(res)
wx.showModal({
title: '执行出错',
content: res,
@@ -55,20 +52,13 @@ function requestLoading(method, params, successaction) {
wx.showLoading({
title: "加载中",
})
- //{"DecryptCookie":"","CustomerId":1,"Method":"/MainSystem/MainSystem/Auth/Login","Data":["栾慧",""]}
var newData = {
- // 客户和司机不添加cookie请求
- "DecryptCookie": "",//EasyAuth=72335493ecb14015be2db57fc364dc84
- // 小程序所在客户ID(仙坛,万福,和美)
+ "DecryptCookie": "",
"CustomerId": app.globalData.CustomerId,
- // 代替url原来后边拼接的方式,提取到data内
"AppendUrlString": "?appid=" + app.globalData.AppId + "&phone=" + app.globalData.Phone,
- // 请求路径
"Method": method,
- // 请求数据
"Data": params,
};
- // 中转服务器地址
var baseUrl = app.globalData.TranferBaseUrl;
wx.request({
url: baseUrl,
@@ -90,7 +80,6 @@ function requestLoading(method, params, successaction) {
}
},
fail: function(res) {
- console.log(res)
wx.showModal({
title: '执行出错',
content: res,