diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index f32ceaa..31c16d9 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -19,7 +19,9 @@ Page({
break;
// 车辆申请
case "2":
- transferURL = '/pages/myCars/myCars';
+ // transferURL = '/pages/myCars/myCars';
+ // 没有列表,直接进入车辆详情
+ transferURL = '/pages/myCars/carsDetail/carsDetail';
break;
// 销售出库
case "3":
diff --git a/pages/myCars/carsDetail/carsDetail.js b/pages/myCars/carsDetail/carsDetail.js
index 5c2eeff..4659eec 100644
--- a/pages/myCars/carsDetail/carsDetail.js
+++ b/pages/myCars/carsDetail/carsDetail.js
@@ -3,62 +3,94 @@
const app = getApp()
var network = require("../../../utils/net.js")
var update = "/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/CarRpc/Update";
-
+var carsInfo = "/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/CarRpc/GetInfo";
Page({
data: {
- carDetail:{},
- },
-
- onLoad: function (options) {
- var that = this;
- var item = JSON.parse(options.item);
- this.setData({
- carDetail:item,
- });
+ carDetail: {},
},
- // 保存按钮点击
- saveCarsChange:function(){
+ onLoad: function(options) {
+ // var that = this;
+ // var item = JSON.parse(options.item);
+ // this.setData({
+ // carDetail:item,
+ // });
var that = this;
- var method = update;
- var params = [{
- "CarNumber": CarNumber,
- "CarOwner": CarOwner,
- "Phone": app.globalData.Phone,
- "CarDetail_ID": ID
- }];
- network.transfer_request(method, params, function (res) {
- wx.navigateBack({
- delta: 1
+ var method = carsInfo;
+ var params = [app.globalData.Phone];
+ network.transfer_request(method, params, function(res) {
+ that.setData({
+ carDetail: res.result,
})
})
},
- // 新增按钮点击
- creatNewCar:function(){
- wx.navigateTo({
- url: '../creatNewCar/creatNewCar',
- })
+ // 车辆对应的信息
+ getCarInfo: function(event) {
+ var value = event.detail.value;
+ var item = event.currentTarget.dataset.item;
+ this.data.carDetail[item] = value;
+ this.setData({
+ carDetail: this.data.carDetail
+ });
},
- getPhone:function(event){
- var phone =event.detail.value;
- if (phone == "") {
+
+ // 保存按钮点击
+ saveCarsChange: function() {
+ var carInfo = this.data.carDetail;
+ if (!carInfo.CarNumber) {
+ wx.showToast({
+ title: '请输入车牌号',
+ })
+ return false;
+ }
+ if (!carInfo.CarOwner) {
+ wx.showToast({
+ title: '请输入车主姓名',
+ })
+ return false;
+ }
+ if (!carInfo.CarOwnerPhone) {
wx.showToast({
- title: '请输入手机号码',
+ title: '请输入车主手机号码',
})
return false;
- } else if (!(/^1[34578]\d{9}$/.test(phone))) {
+ }
+ if (!(/^1[34578]\d{9}$/.test(carInfo.CarOwnerPhone))) {
wx.showToast({
- title: '号码不正确',
+ title: '车主号码不正确',
})
return false;
- } else {
- this.setData({
- custometPhone: phone,
+ }
+ if ((carInfo.CarOwnerIDCard.length < 18) || (carInfo.CarOwnerIDCard.length > 18)) {
+ wx.showToast({
+ title: '车主身份证号不正确',
})
+ return false;
}
- }
+
+ var method = update;
+ var params = [this.data.carDetail];
+ network.transfer_request(method, params, function(res) {
+ wx.showToast({
+ title: '信息变更操作成功',
+ success:function(res){
+ wx.navigateBack({
+ delta: 1
+ })
+ }
+ })
+ })
+ },
+
+ // // 新增按钮点击
+ // creatNewCar:function(){
+ // wx.navigateTo({
+ // url: '../creatNewCar/creatNewCar',
+ // })
+ // },
+
})
\ No newline at end of file
diff --git a/pages/myCars/carsDetail/carsDetail.wxml b/pages/myCars/carsDetail/carsDetail.wxml
index cd35edf..ef23273 100644
--- a/pages/myCars/carsDetail/carsDetail.wxml
+++ b/pages/myCars/carsDetail/carsDetail.wxml
@@ -3,7 +3,7 @@
车牌号
-
+
@@ -11,7 +11,7 @@
车主
-
+
@@ -19,69 +19,63 @@
车主电话
-
+
-
+
-
+
司机姓名
-
-
-
+ {{carDetail.Name}}
司机电话
-
-
-
+ {{carDetail.Phone}}
-
+
-
+
-
+
- 保存
+ 保存
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/myCars/carsDetail/carsDetail.wxss b/pages/myCars/carsDetail/carsDetail.wxss
index fc75eaa..0fe7d23 100644
--- a/pages/myCars/carsDetail/carsDetail.wxss
+++ b/pages/myCars/carsDetail/carsDetail.wxss
@@ -41,8 +41,9 @@ page {
.imageView {
- height: 100%;
- width: 50%;
+ margin-top: 20%;
+ width: 100%;
+ height: 80px;
/* margin-left: 15px;
margin-right: 15px; */
position: relative;
diff --git a/pages/myCars/myCars.json b/pages/myCars/myCars.json
index 087d5c2..766d2c2 100644
--- a/pages/myCars/myCars.json
+++ b/pages/myCars/myCars.json
@@ -1,3 +1,3 @@
{
- "navigationBarTitleText": "车辆申请"
+ "navigationBarTitleText": "车辆列表"
}
\ No newline at end of file
diff --git a/pages/myCars/myCars.wxml b/pages/myCars/myCars.wxml
index c8794c3..b49a134 100644
--- a/pages/myCars/myCars.wxml
+++ b/pages/myCars/myCars.wxml
@@ -11,7 +11,7 @@
- 司机:{{item.DriverName}}
+ 车主:{{item.CarOwner}}
电话:{{item.Phone}}
@@ -19,7 +19,7 @@
- 车主:{{item.CarOwner}}
+ 司机:{{item.CarOwner}}
车牌号:{{item.CarNumber}}