diff --git a/app.json b/app.json index 063a9d2..2bab428 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,8 @@ "pages/orderList/orderList", "pages/orderList/orderDetail/orderDetail", "pages/myCars/myCars", - "pages/myCars/carsDetail/carsDetail" + "pages/myCars/carsDetail/carsDetail", + "pages/myCars/creatNewCar/creatNewCar" ], "window": { "backgroundTextStyle": "light", diff --git a/imgs/blueBtn.png b/imgs/blueBtn.png new file mode 100644 index 0000000..7c2da0b Binary files /dev/null and b/imgs/blueBtn.png differ diff --git a/imgs/whiteBtn.png b/imgs/whiteBtn.png new file mode 100644 index 0000000..d1c821c Binary files /dev/null and b/imgs/whiteBtn.png differ diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js index 2da02b3..f32ceaa 100644 --- a/pages/homePage/homePage.js +++ b/pages/homePage/homePage.js @@ -23,7 +23,7 @@ Page({ break; // 销售出库 case "3": - transferURL = '/pages/outStoreOrderList/outStoreOrderList'; + transferURL = '/pages/orderList/orderList'; break; } diff --git a/pages/myCars/carsDetail/carsDetail.js b/pages/myCars/carsDetail/carsDetail.js index d009d56..ab48e93 100644 --- a/pages/myCars/carsDetail/carsDetail.js +++ b/pages/myCars/carsDetail/carsDetail.js @@ -2,7 +2,9 @@ Page({ data: { - customerName :"" + carNumber :"1234345", + custometPhone:"18510330317", + customerName: "以及萨帝" }, onLoad: function (options) { @@ -10,5 +12,35 @@ Page({ let ID = Number(options.ID); }, + // 保存按钮点击 + saveCarsChange:function(){ + + }, + + // 新增按钮点击 + creatNewCar:function(){ + wx.navigateTo({ + url: '../creatNewCar/creatNewCar', + }) + }, + + getPhone:function(event){ + var phone =event.detail.value; + if (phone == "") { + wx.showToast({ + title: '请输入手机号码', + }) + return false; + } else if (!(/^1[34578]\d{9}$/.test(phone))) { + wx.showToast({ + title: '号码不正确', + }) + return false; + } else { + this.setData({ + custometPhone: phone, + }) + } + } }) \ No newline at end of file diff --git a/pages/myCars/carsDetail/carsDetail.wxml b/pages/myCars/carsDetail/carsDetail.wxml index cea4aac..0670c19 100644 --- a/pages/myCars/carsDetail/carsDetail.wxml +++ b/pages/myCars/carsDetail/carsDetail.wxml @@ -1,65 +1,87 @@ - - 车牌号 - - + + + 车牌号 + + + - - + - - 车主 - - {{customerName}} + + 车主 + + + - - + - - 车主电话 - - {{customerName}} + + 车主电话 + + + - - + - - 车主身份证号 - - {{customerName}} + + 车主身份证号 + + + - - + - - 车主地址 - - {{customerName}} + + 车主地址 + + + - - + - - 司机姓名 - - {{customerName}} + + 司机姓名 + + + - - + - - 司机电话 - - {{customerName}} + + 司机电话 + + + - - + - - 司机身份证号 - - {{customerName}} + + 司机身份证号 + + + + + + + + + + + + + 保存 + + + + + + + + 新增 + + - + \ No newline at end of file diff --git a/pages/myCars/carsDetail/carsDetail.wxss b/pages/myCars/carsDetail/carsDetail.wxss index a57f708..0f952ad 100644 --- a/pages/myCars/carsDetail/carsDetail.wxss +++ b/pages/myCars/carsDetail/carsDetail.wxss @@ -1,16 +1,25 @@ /* pages/myCars/carsDetail/carsDetail.wxss */ -.baseitem { +page { + background: #eaf1f8; +} + +.container { + height: 100%; background: #fff; - height: 80rpx; - line-height: 80rpx; - /* border-bottom: 0.1px solid #dbdbdb; */ + margin-top: 10rpx; +} + +.baseitem { + height: 100rpx; + line-height: 100rpx; display: flex; flex-direction: row; align-items: center; padding-left: 20rpx; padding-right: 20rpx; font-size: 16px; + /* border-bottom: 0.1px solid #dbdbdb; */ } .baseitem_key { @@ -25,8 +34,51 @@ text-align: right; } -.lineView{ +.lineView { height: 1rpx; - background-color:#dbdbdb; + background-color: #dbdbdb; margin-left: 20rpx; +} + + +.imageView { + height: 100%; + width: 50%; + /* margin-left: 15px; + margin-right: 15px; */ + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 20px; +} + +.whiteText{ + color: black; + font-size: 20px; +} + +.bottomGroupView{ + margin-top: 20%; + width: 100%; + height: 80px; + display: flex; + flex-direction: row; } \ No newline at end of file diff --git a/pages/myCars/creatNewCar/creatNewCar.js b/pages/myCars/creatNewCar/creatNewCar.js new file mode 100644 index 0000000..44ada3b --- /dev/null +++ b/pages/myCars/creatNewCar/creatNewCar.js @@ -0,0 +1,66 @@ +// pages/myCars/creatNewCar/creatNewCar.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/myCars/creatNewCar/creatNewCar.json b/pages/myCars/creatNewCar/creatNewCar.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/pages/myCars/creatNewCar/creatNewCar.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pages/myCars/creatNewCar/creatNewCar.wxml b/pages/myCars/creatNewCar/creatNewCar.wxml new file mode 100644 index 0000000..b32cf08 --- /dev/null +++ b/pages/myCars/creatNewCar/creatNewCar.wxml @@ -0,0 +1,78 @@ + + + + + 车牌号 + + + + + + + + 车主 + + + + + + + + 车主电话 + + + + + + + + 车主身份证号 + + + + + + + + 车主地址 + + + + + + + + 司机姓名 + + + + + + + + 司机电话 + + + + + + + + 司机身份证号 + + + + + + + + + + + + + 确认 + + + + diff --git a/pages/myCars/creatNewCar/creatNewCar.wxss b/pages/myCars/creatNewCar/creatNewCar.wxss new file mode 100644 index 0000000..8407ca5 --- /dev/null +++ b/pages/myCars/creatNewCar/creatNewCar.wxss @@ -0,0 +1,69 @@ +/* pages/myCars/creatNewCar/creatNewCar.wxss */ + +page { + background: #eaf1f8; +} + +.container { + height: 100%; + background: #fff; + margin-top: 10rpx; +} + +.baseitem { + height: 100rpx; + line-height: 100rpx; + display: flex; + flex-direction: row; + align-items: center; + padding-left: 20rpx; + padding-right: 20rpx; + font-size: 16px; + /* border-bottom: 0.1px solid #dbdbdb; */ +} + +.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; +} + +.imageView { + height: 80px; + width: 100%; + margin-top: 20%; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 20px; +} diff --git a/pages/myCars/myCars.wxss b/pages/myCars/myCars.wxss index c41894c..fa077ec 100644 --- a/pages/myCars/myCars.wxss +++ b/pages/myCars/myCars.wxss @@ -13,7 +13,7 @@ page { } .listItem{ - height: 100rpx; + /* height: 100rpx; */ display: flex; flex-direction: column; background-color: #fff; diff --git a/pages/orderList/orderDetail/orderDetail.wxml b/pages/orderList/orderDetail/orderDetail.wxml index fee491c..ced9977 100644 --- a/pages/orderList/orderDetail/orderDetail.wxml +++ b/pages/orderList/orderDetail/orderDetail.wxml @@ -8,60 +8,89 @@ - - 订货时间 - - {{customerName}}基本信息 + + + 订货时间 + + {{customerName}}基本信息 + - - - 提货时间 - - {{customerName}} + + + + 提货时间 + + {{customerName}} + - - - 会计单位 - - {{customerName}} + + + + 会计单位 + + {{customerName}} + - - - 购货客户 - - {{customerName}} + + + + 购货客户 + + {{customerName}} + - - - 销售部门 - - {{customerName}} + + + + 销售部门 + + {{customerName}} + - - - 送货地址 - - {{customerName}} + + + + 送货地址 + + {{customerName}} + - - - 运输车辆 - - {{customerName}} + + + + 运输车辆 + + {{customerName}} + - - - 司机 - - {{customerName}} + + + + 司机 + + {{customerName}} + - - - 联系方式 - - {{customerName}} + + + + 联系方式 + + {{customerName}} + + + + + + + + 保存 + + + + @@ -76,17 +105,17 @@ 主数量:111{{mainNumber}} - + 辅数量:222{{secondNumber}} - - - -