From 265e243aa5c36f6697d2ddcce83a22f0b05ade6f Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Mon, 3 Dec 2018 18:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homePage/homePage.js              |   4 +-
 pages/myCars/carsDetail/carsDetail.js   | 106 +++++++++++++++---------
 pages/myCars/carsDetail/carsDetail.wxml |  46 +++++-----
 pages/myCars/carsDetail/carsDetail.wxss |   5 +-
 pages/myCars/myCars.json                |   2 +-
 pages/myCars/myCars.wxml                |   4 +-
 6 files changed, 98 insertions(+), 69 deletions(-)

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 @@
   <view class='baseitem'>
     <view class='baseitem_key'>车牌号</view>
     <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail.CarNumber}}"></input>
+      <input class='inputItem' bindinput='getCarInfo' placeholder='请输入车牌号' value="{{carDetail.CarNumber}}" data-item='CarNumber'></input>
     </view>
   </view>
   <view class='lineView'></view>
@@ -11,7 +11,7 @@
   <view class='baseitem'>
     <view class='baseitem_key'>车主</view>
     <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail.CarOwner}}"></input>
+      <input class='inputItem' bindinput='getCarInfo' placeholder='请输入车主姓名'  value="{{carDetail.CarOwner}}" data-item='CarOwner'></input>
     </view>
   </view>
   <view class='lineView'></view>
@@ -19,69 +19,63 @@
   <view class='baseitem'>
     <view class='baseitem_key'>车主电话</view>
     <view class='baseitem_value'>
-      <input class='inputItem' type="number" maxlength="11" value="{{carDetail.Phone}}" bindblur="getPhone"></input>
+      <input class='inputItem' bindinput='getCarInfo' placeholder='请输入车主电话'  type="number" maxlength="11" value="{{carDetail.CarOwnerPhone}}" data-item='CarOwnerPhone'></input>
     </view>
   </view>
   <view class='lineView'></view>
-<!-- 
+
   <view class='baseitem'>
     <view class='baseitem_key'>车主身份证号</view>
     <view class='baseitem_value'>
-      <input class='inputItem' type='idcard' value="{{carDetail}}"></input>
+      <input class='inputItem' bindinput='getCarInfo' placeholder='请输入车主身份证号'  type='idcard' value="{{carDetail.CarOwnerIDCard}}" data-item='CarOwnerIDCard'></input>
     </view>
   </view>
-  <view class='lineView'></view> -->
+  <view class='lineView'></view> 
 
-  <!-- <view class='baseitem'>
+  <view class='baseitem'>
     <view class='baseitem_key'>车主地址</view>
     <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail}}"></input>
+      <input class='inputItem' bindinput='getCarInfo' placeholder='请输入车主地址'  value="{{carDetail.CarOwnerAddress}}" data-item='CarOwnerAddress'></input>
     </view>
   </view>
-  <view class='lineView'></view> -->
+  <view class='lineView'></view>
 
   <view class='baseitem'>
     <view class='baseitem_key'>司机姓名</view>
-    <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail.DriverName}}"></input>
-    </view>
+    <view class='baseitem_value'>{{carDetail.Name}}</view>
   </view>
   <view class='lineView'></view>
 
   <view class='baseitem'>
     <view class='baseitem_key'>司机电话</view>
-    <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail.Phone}}"></input>
-    </view>
+    <view class='baseitem_value'>{{carDetail.Phone}}</view>
   </view>
   <view class='lineView'></view>
 
-  <!-- <view class='baseitem'>
+  <view class='baseitem'>
     <view class='baseitem_key'>司机身份证号</view>
-    <view class='baseitem_value'>
-      <input class='inputItem' value="{{carDetail}}"></input>
-    </view>
+    <view class='baseitem_value'>{{carDetail.IdCard}}</view>
   </view>
-  <view class='lineView'></view> -->
+  <view class='lineView'></view>
 
 </view>
 
-<view class='bottomGroupView'>
+<!-- <view class='bottomGroupView'> -->
 
 <view class='imageView' catchtap='saveCarsChange'>
-  <image class='currentImage' src="/imgs/whiteBtn.png">
+  <image class='currentImage' src="/imgs/blueBtn.png">
     <view class='btnTextView'>
-      <text class='whiteText'>保存</text>
+      <text class='btnText'>保存</text>
     </view>
   </image>
 </view>
 
-<view class='imageView' catchtap='creatNewCar'>
+<!-- <view class='imageView' catchtap='creatNewCar'>
   <image class='currentImage' src="/imgs/blueBtn.png">
     <view class='btnTextView'>
       <text class='btnText'>新增</text>
     </view>
   </image>
-</view>
+</view> -->
 
-</view>
\ No newline at end of file
+<!-- </view> -->
\ 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 @@
   <view class='listItem' bindlongpress="handleLongPress" catchtap='transToCarsDetail' data-detailitem='{{item}}' data-cardetailid='{{item.CarDetail_ID}}'>
     <view class='topView'>
       <view class='goodsNum'>
-        <text class='goodsIDText'>司机：{{item.DriverName}}</text>
+        <text class='goodsIDText'>车主：{{item.CarOwner}}</text>
       </view>
       <view class='goodsMoney'>
         <text class='goodsIDText'>电话：{{item.Phone}}</text>
@@ -19,7 +19,7 @@
     </view>
     <view class='bottomView'>
       <view class='goodsNum'>
-        <text class='goodsNumText'>车主：{{item.CarOwner}}</text>
+        <text class='goodsNumText'>司机：{{item.CarOwner}}</text>
       </view>
       <view class='goodsMoney'>
         <text class='goodsMoneyText'>车牌号：{{item.CarNumber}}</text>