Merge remote-tracking branch 'origin/master' into dev_cd

# Conflicts:
#	pagesB/pages/move-car/scan.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getPrice.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/scan.js.map
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.js
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.wxml
#	unpackage/dist/dev/mp-weixin/static/public.css

pagesA/pages/index/getPrice.vue

@@ -38,7 +38,7 @@
                 <u-form-item label="车牌号" ref="item1"> </u-form-item>
                 <car-number v-model="carNumber"></car-number>
             </u--form>
-            <div class="select__car">
+            <div class="select__car" @click="goLoveCar">
                 从爱车选择 <image src="@/static/index/zhankai.png" alt="">
             </div>
         </div>
@@ -98,6 +98,11 @@ export default {
         },
     },
     methods: {
+        goLoveCar(){
+            uni.navigateTo({
+                url: '/pagesB/pages/move-car/loveCar'
+            });   
+        },
         getCarCode() {
             //跳转到获取挪车码页面
             uni.navigateTo({

pagesB/pages/move-car/scan.vue

@@ -4,7 +4,7 @@
 -->
 <template>
 <view class="appCotent">
-<div class="scan">
+    <div class="scan">
         <div class="contentMoveCar">
             <div class="car_item__one">
                 <div class="item__content">
@@ -18,7 +18,7 @@
         <div class="moveCarMsg">
             <div class="scan__tips">
                 <div>请填写以下信息</div>
-            <div>从爱车选择<span>
+                <div @click="goLoveCar">从爱车选择<span>
                         <image src="@/static/move-car/scan_right.png" /></span></div>
             </div>
             <active-form :formDate.sync="formData"></active-form>
@@ -27,7 +27,7 @@
             确认绑定
         </div>
         <div class="use__text">使用说明</div>
-</div>
+    </div>
 </view>
 </template>
 
@@ -108,6 +108,11 @@ export default {
         }
     },
     methods: {
+      goLoveCar() {
+        uni.navigateTo({
+          url: '/pagesB/pages/move-car/loveCar'
+        });
+      },
       confirmBinding(){
         for(let i in this.formData){
           let name = this.formData[i].rules.name