Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

 <template>
   <h-view id="addCar">
+    <transition name="trans">
       <div v-show="downNum" class="modal-show">
         <div class="down">
           <div class="top">
@@ -14,7 +15,12 @@
             <list-item :item-height="44">
               <item>
                 <div slot="name">车架号</div>
-              <input slot="content" v-model="rentInfo.frame_number" readonly placeholder="自动识别车架号" >
+                <input
+                  slot="content"
+                  v-model="rentInfo.frame_number"
+                  readonly
+                  placeholder="自动识别车架号"
+                >
               </item>
               <item>
                 <div slot="name">发动机号</div>
@@ -23,21 +29,31 @@
               <item>
                 <div slot="name">厂商型号</div>
                 <input
-                slot="content" v-model="rentInfo.manufacturer" readonly class="write"
-                placeholder="请输入厂商型号" >
+                  slot="content"
+                  v-model="rentInfo.manufacturer"
+                  readonly
+                  class="write"
+                  placeholder="请输入厂商型号"
+                >
               </item>
               <item>
                 <div slot="name">车牌号</div>
-              <input slot="content" v-model="rentInfo.license_plate_number" readonly placeholder="请输入车牌号" >
+                <input
+                  slot="content"
+                  v-model="rentInfo.license_plate_number"
+                  readonly
+                  placeholder="请输入车牌号"
+                >
               </item>
             </list-item>
           </div>
         </div>
       </div>
+    </transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>合同发车</span>
+        <span>合同明细</span>
       </div>
     </h-header>
     <h-content>
@@ -69,13 +85,16 @@
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input
-            slot="content" v-model="info.product_num" readonly
-            placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="info.product_num" readonly placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
-      <div v-for="(item,index) in numInt" :key="index" class="equipment" @click="downNum=true;getRent()">
+      <div
+        v-for="(item,index) in numInt"
+        :key="index"
+        class="equipment"
+        @click="downNum=true;getRent()"
+      >
         <div class="left">
           <span>
             <img src="@/assets/contractStart/list.png" >
@@ -95,9 +114,8 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="approve" @click.native="confirm">确定</tab-button>
+      <tab-button class="approve" @click.native="isConfirm">确定</tab-button>
     </bottom-tab>
-
   </h-view>
 </template>
 <script>
@@ -108,28 +126,30 @@ export default {
       downNum: false,
       show: false,
       info: {
-        'product_plan_id': '29',
-        'product_num': '1',
-        'first_pay': '102500',
-        'division_n': '平地机',
-        'gps_fee': '500',
-        'bp_name': '黄冲',
-        'project_number': 'PJ2019050043',
-        'bp_agent_name': '上海汉得信息技术股份有限公司 ',
-        'product_plan_id_n': 'PDJ',
+        product_plan_id: '29',
+        product_num: '1',
+        first_pay: '102500',
+        division_n: '平地机',
+        gps_fee: '500',
+        bp_name: '黄冲',
+        project_number: 'PJ2019050043',
+        bp_agent_name: '上海汉得信息技术股份有限公司 ',
+        product_plan_id_n: 'PDJ',
       },
       rentInfo: {
-        'frame_number': '',
-        'engine': '',
-        'manufacturer': '',
-        'license_plate_number': '',
+        frame_number: '',
+        engine: '',
+        manufacturer: '',
+        license_plate_number: '',
       },
       products: [],
-      equip: [{
-        'product_id': '3',
-        'product_code': 'GTC389',
-        'contract_id': '231',
-      }],
+      equip: [
+        {
+          product_id: '3',
+          product_code: 'GTC389',
+          contract_id: '231',
+        },
+      ],
     }
   },
   computed: {
@@ -148,19 +168,32 @@ export default {
     })
   },
   methods: {
+    isConfirm () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定同意发车吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.confirm()
+          }
+        },
+      })
+    },
     confirm () {
       let vm = this
       let url = process.env.basePath + 'do_car_confirm'
       let param = {
-        'master': {
-          'contract_id': '123',
-          'confirm_status': 'APPROVED',
-        }}
+        master: {
+          contract_id: '123',
+          confirm_status: 'APPROVED',
+        },
+      }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.equip = res.lists
+          vm.hlsPopup.showSuccess('发车成功')
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -223,18 +256,26 @@ export default {
   input::placeholder {
     color: #888c8f;
   }
-  .hide{
+  .trans-enter-active,
+  .trans-leave-active {
+    transition: opacity 0.5s;
+  }
+  .trans-enter,
+  .trans-leave-active {
+    opacity: 0;
+  }
+  .hide {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    img{
-    width:30px;
-    height:30px;
-    margin-left:65%;
+    img {
+      width: 30px;
+      height: 30px;
+      margin-left: 65%;
     }
   }
-  .wrap{
-    padding-top:92px;
+  .wrap {
+    padding-top: 92px;
   }
   .modal-show {
     width: 100%;

src/pages/carConfirm/confirm-list.vue

@@ -129,7 +129,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'car_confirm_list_query'
       let param = {
-        order_id: window.sessionStorage.getItem('user_phone'),
+        user_phone: window.localStorage.getItem('user_phone'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

src/pages/contractStart/start-list.vue

@@ -11,12 +11,13 @@
       <input placeholder="请输入合同号/产品线/承租人名称" >
     </div>
     <h-content class="my-content">
-      <scroll
-        ref="scroll"
-        :updateData="[contructs]"
-        :pullUp="true"
+      <scroll ref="scroll" :updateData="[contructs]" :pullUp="true">
+        <div
+          v-for="(item,index) in showList"
+          :key="index"
+          class="item"
+          @click="changePage(item.project_id)"
         >
-        <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -45,12 +46,10 @@
             </div>
           </div>
         </div>
-
-    </scroll></h-content>
+      </scroll>
+    </h-content>
     <bottom-tab>
-      <tab-button class="add" @click.native="goAdd">
-        新增发车
-      </tab-button>
+      <tab-button class="add" @click.native="goAdd">新增发车</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -64,22 +63,24 @@ export default {
     return {
       tabNum: 0,
       contructs: [],
-      lists: [{
-        'project_id': '48812',
-        'project_number': '',
-        'bp_name': '李四',
-        'total_price': '51',
-        'division_n': 'PDJ',
-        'leases_status': 'Y',
+      lists: [
+        {
+          project_id: '48812',
+          project_number: '',
+          bp_name: '李四',
+          total_price: '51',
+          division_n: 'PDJ',
+          leases_status: 'Y',
         },
         {
-        'project_id': '48800',
-        'project_number': '',
-        'bp_name': '张三',
-        'total_price': '51',
-        'division_n': 'PDJ',
-        'leases_status': 'N',
-      }],
+          project_id: '48800',
+          project_number: '',
+          bp_name: '张三',
+          total_price: '51',
+          division_n: 'PDJ',
+          leases_status: 'N',
+        },
+      ],
       showList: [],
       undo: [],
       done: [],
@@ -93,7 +94,7 @@ export default {
     })
   },
   watch: {
-    'tabNum': {
+    tabNum: {
       handler () {
         if (this.tabNum === 0) {
           this.showList = this.undo
@@ -140,7 +141,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'car_apply_list_query'
       let param = {
-        order_id: window.sessionStorage.getItem('user_phone'),
+        user_phone: window.localStorage.getItem('user_phone'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -244,7 +245,7 @@ export default {
             font-size: 14px;
             color: #4b4a4b;
             letter-spacing: 0;
-              font-weight:bold;
+            font-weight: bold;
           }
           li {
             font-family: PingFangSC-Regular;
@@ -256,15 +257,14 @@ export default {
             span {
               float: right;
             }
-
           }
         }
       }
     }
   }
-  .add{
-    color:#fff;
-    background-color:#0041C4;
+  .add {
+    color: #fff;
+    background-color: #0041c4;
   }
 }
 </style>