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,30 +4,30 @@
 -->
 <template>
 <view class="appCotent">
-<div class="scan">
-    <div class="contentMoveCar">
-        <div class="car_item__one">
-            <div class="item__content">
-                京A123G63
+    <div class="scan">
+        <div class="contentMoveCar">
+            <div class="car_item__one">
+                <div class="item__content">
+                    京A123G63
+                </div>
+            </div>
+            <div class="car_item__three">
+                感谢您使用挪车二维码，请完成车牌号与手机的绑定以便享受挪车服务
             </div>
         </div>
-        <div class="car_item__three">
-          感谢您使用挪车二维码，请完成车牌号与手机的绑定以便享受挪车服务
+        <div class="moveCarMsg">
+            <div class="scan__tips">
+                <div>请填写以下信息</div>
+                <div @click="goLoveCar">从爱车选择<span>
+                        <image src="@/static/move-car/scan_right.png" /></span></div>
+            </div>
+            <active-form :formDate.sync="formData"></active-form>
         </div>
-    </div>
-    <div class="moveCarMsg">
-        <div class="scan__tips">
-            <div>请填写以下信息</div>
-            <div>从爱车选择<span>
-                    <image src="@/static/move-car/scan_right.png" /></span></div>
+        <div class="view__btn view__no__bind" @click="confirmBinding">
+            确认绑定
         </div>
-        <active-form :formDate.sync="formData"></active-form>
+        <div class="use__text">使用说明</div>
     </div>
-    <div class="view__btn view__no__bind" @click="confirmBinding">
-        确认绑定
-    </div>
-    <div class="use__text">使用说明</div>
-</div>
 </view>
 </template>
 
@@ -103,39 +103,44 @@ export default {
                     },
                 },
             ],
-			moveCode: '',
-			moveCodeInfo: {},
+          moveCode: '',
+          moveCodeInfo: {},
         }
     },
     methods: {
-		confirmBinding(){
-			for(let i in this.formData){
-				let name = this.formData[i].rules.name
-				this.moveCodeInfo[name] = this.formData[i].rules.value
-			}
-			console.log(this.moveCodeInfo)
-			let opts = { url: '/app/moveCode/binding/', method: 'put' };
-			this.http.httpTokenRequest(opts, this.moveCodeInfo).then(res => {
-				if (res.data.code == 200) {
-					//展示绑定成功
-					uni.showToast({
-						title: "绑定成功",
-						icon: "success",
-					});
-					this.goBack()
-				}else{
-					//绑定失败，展示失败信息
-					uni.showToast({
-						title: res.data.msg,
-						icon: "error",
-					});
-				}
-			})
-		},
+      goLoveCar() {
+        uni.navigateTo({
+          url: '/pagesB/pages/move-car/loveCar'
+        });
+      },
+      confirmBinding(){
+        for(let i in this.formData){
+          let name = this.formData[i].rules.name
+          this.moveCodeInfo[name] = this.formData[i].rules.value
+        }
+        console.log(this.moveCodeInfo)
+        let opts = { url: '/app/moveCode/binding/', method: 'put' };
+        this.http.httpTokenRequest(opts, this.moveCodeInfo).then(res => {
+          if (res.data.code == 200) {
+            //展示绑定成功
+            uni.showToast({
+              title: "绑定成功",
+              icon: "success",
+            });
+            this.goBack()
+          }else{
+            //绑定失败，展示失败信息
+            uni.showToast({
+              title: res.data.msg,
+              icon: "error",
+            });
+          }
+        })
+      },
+    },
+    onLoad(option) {
+      this.moveCode = option.moveCode
     },
-	onLoad(option) {
-		this.moveCode = option.moveCode
-	},
 }
 </script>
 

static/public.css

@@ -18,4 +18,4 @@
 .self__input__km{
     display: flex;
     align-items: center;
-}
+}
\ No newline at end of file