diff --git a/app.json b/app.json
index 4d47d77..063a9d2 100644
--- a/app.json
+++ b/app.json
@@ -5,7 +5,8 @@
"pages/mine/mine",
"pages/orderList/orderList",
"pages/orderList/orderDetail/orderDetail",
- "pages/myCars/myCars"
+ "pages/myCars/myCars",
+ "pages/myCars/carsDetail/carsDetail"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index 4f87bc4..2da02b3 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -19,7 +19,7 @@ Page({
break;
// 车辆申请
case "2":
- transferURL = '/pages/orderList/orderList';
+ transferURL = '/pages/myCars/myCars';
break;
// 销售出库
case "3":
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index e3cc7ea..e49a58e 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -7,7 +7,7 @@ page {
.view_me_main {
display: flex;
flex-direction: row;
- background: #2E8CF5;
+ background: #2689f8;
padding-top: 40rpx;
padding-left: 5%;
padding-bottom: 40rpx;
diff --git a/pages/myCars/carsDetail/carsDetail.js b/pages/myCars/carsDetail/carsDetail.js
new file mode 100644
index 0000000..d009d56
--- /dev/null
+++ b/pages/myCars/carsDetail/carsDetail.js
@@ -0,0 +1,14 @@
+// pages/myCars/carsDetail/carsDetail.js
+Page({
+
+ data: {
+ customerName :""
+ },
+
+ onLoad: function (options) {
+ var that = this;
+ let ID = Number(options.ID);
+ },
+
+
+})
\ No newline at end of file
diff --git a/pages/myCars/carsDetail/carsDetail.json b/pages/myCars/carsDetail/carsDetail.json
new file mode 100644
index 0000000..8c79e5e
--- /dev/null
+++ b/pages/myCars/carsDetail/carsDetail.json
@@ -0,0 +1,5 @@
+{
+ "navigationBarBackgroundColor": "white",
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "车辆详情"
+}
\ No newline at end of file
diff --git a/pages/myCars/carsDetail/carsDetail.wxml b/pages/myCars/carsDetail/carsDetail.wxml
new file mode 100644
index 0000000..cea4aac
--- /dev/null
+++ b/pages/myCars/carsDetail/carsDetail.wxml
@@ -0,0 +1,65 @@
+
+
+ 车牌号
+
+
+
+
+
+
+
+ 车主
+
+ {{customerName}}
+
+
+
+
+
+ 车主电话
+
+ {{customerName}}
+
+
+
+
+
+ 车主身份证号
+
+ {{customerName}}
+
+
+
+
+
+ 车主地址
+
+ {{customerName}}
+
+
+
+
+
+ 司机姓名
+
+ {{customerName}}
+
+
+
+
+
+ 司机电话
+
+ {{customerName}}
+
+
+
+
+
+ 司机身份证号
+
+ {{customerName}}
+
+
+
+
diff --git a/pages/myCars/carsDetail/carsDetail.wxss b/pages/myCars/carsDetail/carsDetail.wxss
new file mode 100644
index 0000000..a57f708
--- /dev/null
+++ b/pages/myCars/carsDetail/carsDetail.wxss
@@ -0,0 +1,32 @@
+/* pages/myCars/carsDetail/carsDetail.wxss */
+
+.baseitem {
+ background: #fff;
+ height: 80rpx;
+ line-height: 80rpx;
+ /* border-bottom: 0.1px solid #dbdbdb; */
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ font-size: 16px;
+}
+
+.baseitem_key {
+ color: #666;
+ width: 40%;
+}
+
+.baseitem_value {
+ color: rgb(48, 48, 48);
+ margin-left: 20rpx;
+ width: 60%;
+ text-align: right;
+}
+
+.lineView{
+ height: 1rpx;
+ background-color:#dbdbdb;
+ margin-left: 20rpx;
+}
\ No newline at end of file
diff --git a/pages/myCars/myCars.js b/pages/myCars/myCars.js
index e8e90aa..9040e27 100644
--- a/pages/myCars/myCars.js
+++ b/pages/myCars/myCars.js
@@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
-
+ carsList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7, 8, 9,1]
},
/**
@@ -15,52 +15,11 @@ Page({
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
+ transToCarsDetail:function(event){
+ var itemID = event.currentTarget.dataset.detailitemid;
+ wx.navigateTo({
+ url: 'carsDetail/carsDetail?id=' + itemID,
+ })
},
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
})
\ No newline at end of file
diff --git a/pages/myCars/myCars.json b/pages/myCars/myCars.json
index 9e26dfe..087d5c2 100644
--- a/pages/myCars/myCars.json
+++ b/pages/myCars/myCars.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+ "navigationBarTitleText": "车辆申请"
+}
\ No newline at end of file
diff --git a/pages/myCars/myCars.wxml b/pages/myCars/myCars.wxml
index d78c7c9..b0c4e4d 100644
--- a/pages/myCars/myCars.wxml
+++ b/pages/myCars/myCars.wxml
@@ -1,2 +1,28 @@
-pages/myCars/myCars.wxml
+
+
+
+
+
+
+
+
+
+
+
+ 司机:梁方刚{{item.orderID}}
+
+
+ 电话:13448957984{{item.workFlowState}}
+
+
+
+
+ 车主:1000{{item.Customer_Name}}
+
+
+ 车牌号:123556{{item.time}}
+
+
+
+
\ No newline at end of file
diff --git a/pages/myCars/myCars.wxss b/pages/myCars/myCars.wxss
index cff501b..c41894c 100644
--- a/pages/myCars/myCars.wxss
+++ b/pages/myCars/myCars.wxss
@@ -1 +1,70 @@
-/* pages/myCars/myCars.wxss */
\ No newline at end of file
+/* pages/myCars/myCars.wxss */
+page {
+ background:#EAF1F8;
+ height: calc(100%-10px);
+}
+
+.scroll-views {
+ height: 100%;
+ width: 100%;
+ padding-top: 10rpx;
+ display: flex;
+ flex-direction: column;
+}
+
+.listItem{
+ height: 100rpx;
+ display: flex;
+ flex-direction: column;
+ background-color: #fff;
+ padding: 20rpx 20rpx;
+ border-bottom: 1rpx solid #ddd;
+ background: white;
+
+}
+
+.orderID{
+ height: 50%;
+ width: 100%;
+
+}
+
+.topView{
+ height: 50%;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+}
+
+.bottomView{
+ margin-top: 10rpx;
+ height: 50%;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+}
+
+.goodsNum{
+ height: 100%;
+ width: 50%;
+}
+
+.goodsMoney{
+ height: 100%;
+ width: 50%;
+ text-align: right;
+}
+
+.goodsIDText{
+ font-size: 16px;
+}
+
+.goodsNumText{
+ font-size: 14px;
+ color: #666;
+}
+
+.goodsMoneyText{
+ font-size: 14px;
+ color: #666;
+}
\ No newline at end of file
diff --git a/pages/orderList/orderList.wxss b/pages/orderList/orderList.wxss
index c66ab0b..a995591 100644
--- a/pages/orderList/orderList.wxss
+++ b/pages/orderList/orderList.wxss
@@ -53,6 +53,7 @@ page {
}
.listItem{
+
display: flex;
flex-direction: column;
background-color: #fff;
@@ -62,11 +63,6 @@ page {
}
-.orderID{
- height: 50%;
- width: 100%;
-
-}
.topView{
height: 50%;
width: 100%;