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

.hbuilderx/launch.json

+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

.vscode/settings.json

+{
+    "commentTranslate.multiLineMerge": false
+}
\ No newline at end of file

App.vue

 <script>
-	export default {
-		onLaunch: function() {
-			uni.hideTabBar()
-		}
-	}
+export default {
+    onLaunch: function () {
+        uni.hideTabBar()
+
+    }
+
+}
 </script>
 
-<style lang='scss'>
-	@import 'common/css/iconfont.css';
-	@import "common/uview-ui/index.scss";
-	@import "./static/public.css";
-	/*每个页面公共css */
-	.content {
-		width: 100%;
-		height: 100vh;
-		box-sizing: border-box;
-	}
-	uni-page-body {
-		width: 100%;
-		height: 100%;
-		background: #f9f9f9;
-	}
-	uni-page-wrapper{
-		width: 100%;
-		height: 100%;
-		background: #f9f9f9;
-	}
+<style lang="scss">
+@import 'common/css/iconfont.css';
+@import "common/uview-ui/index.scss";
+@import "./static/public.css";
+
+/*每个页面公共css */
+.content {
+    width: 100%;
+    height: 100vh;
+    box-sizing: border-box;
+}
+
+.appCotent {
+    height: 100%;
+    box-sizing: border-box;
+   	max-width: 750rpx;
+    margin: 0 auto;
+}
+
+uni-page-body {
+    width: 100%;
+    height: 100%;
+    background: #f9f9f9;
+}
+
+uni-page-wrapper {
+    width: 100%;
+    height: 100%;
+    background: #f9f9f9;
+}
 </style>

common/wxcomponents/custom-tarbar/custom-tarbar.vue

@@ -17,7 +17,7 @@ color: tabBar.color,
                     <view class="tarbar-list-li-icon">
                         <image :src="selected == index ? item.selectedIconPath : item.iconPath" mode=""></image>
                     </view>
-                    <view class="tarbar-list-li-name">{{ item.text }}</view>
+                    <view :class="selected!==index?'tarbar-list-li-name':'tarbar-list-li-name__active'">{{ item.text }}</view>
                 </block>
                 <block v-else>
                     <view class="tarbar-list-li-icon">
@@ -27,9 +27,6 @@ color: tabBar.color,
             </view>
         </view>
     </view>
-    <block v-if="isShowMask">
-        <release-popup @close-mask="closeMask"></release-popup>
-    </block>
 </view>
 </template>
 
@@ -80,20 +77,21 @@ export default {
                 ]
             },
             oldSelected: 0, // 记录之前访问的索引; 值为2的时候显示遮罩
-            isShowMask: false
         };
     },
     onLoad() {},
     methods: {
         setSelected(index) {
-            console.log(index);
             if (index != 2) {
-                uni.switchTab({
-                    url: this.tabBar.list[index].pagePath
+                uni.navigateTo({
+                    url: this.tabBar.list[index].pagePath,
                 });
             } else {
                 //扫码
                 // 允许从相机和相册扫码
+                uni.navigateTo({
+                    url: '/pages/move-car/scan',
+                });
                 uni.scanCode({
                     success: function (res) {
                         console.log('条码类型：' + res.scanType);
@@ -103,9 +101,7 @@ export default {
             }
             this.$forceUpdate();
         },
-        closeMask() {
-            this.isShowMask = false;
-        }
+
     }
 };
 </script>
@@ -130,15 +126,24 @@ export default {
 .tarbar-list-ul {
     width: 100%;
     height: 100%;
-    padding: 20upx 50upx;
+    padding: 20upx 0upx;
     display: flex;
     justify-content: space-between;
     box-sizing: border-box;
 }
 
 .tarbar-list-li {
-    width: 100upx;
+    width: 25%;
     height: 80upx;
+    text-align: center;
+}
+
+.tarbar-list-li:nth-of-type(2) {
+    padding-right: 40rpx;
+}
+
+.tarbar-list-li:nth-of-type(4) {
+    padding-left: 40rpx;
 }
 
 .tarbar-list-li-icon {
@@ -164,6 +169,18 @@ export default {
     margin-top: 10rpx;
 }
 
+.tarbar-list-li-name__active {
+    width: 100%;
+    text-align: center;
+    line-height: 30upx;
+    font-size: 20upx;
+    height: 30upx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(225, 37, 27, 1);
+    margin-top: 10rpx;
+}
+
 .tarbar-list-li-center {
     width: 100upx;
     position: absolute;

pages.json

@@ -231,45 +231,48 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "首页",
 		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#ffffff"
-	},
-	"tabBar": {
-		"color": "#595656",
-		"selectedColor": "#E84351",
-		"borderStyle": "black",
-		"backgroundColor": "#FFFFFF",
-		"list": [
-			{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tarbar/index22.png",
-				"selectedIconPath": "static/tarbar/index5.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/move-car/index",
-				"iconPath": "static/tarbar/index17.png",
-				"selectedIconPath": "static/tarbar/index24.png",
-				"text": "我要挪车"
-			},
-			/*
-			{
-				"pagePath": "pages/collection/collection",
-				"iconPath": "static/tarbar/详情页-查看更多.png",
-				"selectedIconPath": "static/tarbar/release.png"
-			},
-			*/
-			{
-				"pagePath": "pages/shop/index",
-				"iconPath": "static/tarbar/index22.png",
-				"selectedIconPath": "static/tarbar/index17.png",
-				"text": "精选商城"
-			},
-			{
-				"pagePath": "pages/personal/index",
-				"iconPath": "static/tarbar/index11.png",
-				"selectedIconPath": "static/tarbar/index23.png",
-				"text": "我的"
-			}
-		]
+		"backgroundColor": "#ffffff",
+		"rpxCalcMaxDeviceWidth": 750, // rpx 计算所支持的最大设备宽度，单位 px，默认值为 960
+		"rpxCalcBaseDeviceWidth": 375, // rpx 计算使用的基准设备宽度，设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算，单位 px，默认值为 375
+		"rpxCalcIncludeWidth": 750 // rpx 计算特殊处理的值，始终按实际的设备宽度计算，单位 rpx，默认值为 750
 	}
+	// "tabBar": {
+	// 	"color": "#595656",
+	// 	"selectedColor": "#E84351",
+	// 	"borderStyle": "black",
+	// 	"backgroundColor": "#FFFFFF",
+	// 	"list": [
+	// 		{
+	// 			"pagePath": "pages/index/index",
+	// 			"iconPath": "static/tarbar/index22.png",
+	// 			"selectedIconPath": "static/tarbar/index5.png",
+	// 			"text": "首页"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/move-car/index",
+	// 			"iconPath": "static/tarbar/index17.png",
+	// 			"selectedIconPath": "static/tarbar/index24.png",
+	// 			"text": "我要挪车"
+	// 		},
+	// 		/*
+	// 		{
+	// 			"pagePath": "pages/collection/collection",
+	// 			"iconPath": "static/tarbar/详情页-查看更多.png",
+	// 			"selectedIconPath": "static/tarbar/release.png"
+	// 		},
+	// 		*/
+	// 		{
+	// 			"pagePath": "pages/shop/index",
+	// 			"iconPath": "static/tarbar/index22.png",
+	// 			"selectedIconPath": "static/tarbar/index17.png",
+	// 			"text": "精选商城"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/personal/index",
+	// 			"iconPath": "static/tarbar/index11.png",
+	// 			"selectedIconPath": "static/tarbar/index23.png",
+	// 			"text": "我的"
+	// 		}
+	// 	]
+	// }
 }
\ No newline at end of file

pages/binding/binding.vue

@@ -3,6 +3,7 @@
  * @Description: 绑定账号
 -->
 <template>
+<view class="appCotent">
 <div class="bindingLogin">
     <div class="login__logo">
         <image src="@/static/binding/logo.png">
@@ -25,6 +26,7 @@
         <view class="subform" @click="sub">确认绑定</view>
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -74,7 +76,7 @@ export default {
             //     duration: 2000,
             // });
             //跳转到首页
-            uni.switchTab({
+            uni.navigateTo({
                 url: '/pages/index/index'
             });
         },

pages/binding/index.vue

@@ -3,20 +3,22 @@
  * @Description: 登录
 -->
 <template>
-<div class="binding">
-    <div class="login__logo">
-        <image src="@/static/binding/logo.png">
+<view class="appCotent">
+    <div class="binding">
+        <div class="login__logo">
+            <image src="@/static/binding/logo.png">
+        </div>
+        <div class="login__btn" @click="login">
+            微信一键登录
+        </div>
+        <div class="login__read">
+            <u-checkbox-group v-model="checked" placement="row">
+                <u-checkbox activeColor="ok"></u-checkbox>
+            </u-checkbox-group>
+            已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
+        </div>
     </div>
-    <div class="login__btn" @click="login">
-        微信一键登录
-    </div>
-    <div class="login__read">
-        <u-checkbox-group v-model="checked" placement="row">
-            <u-checkbox activeColor="ok"></u-checkbox>
-        </u-checkbox-group>
-        已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
-    </div>
-</div>
+</view>
 </template>
 
 <script>
@@ -27,13 +29,14 @@ export default {
         };
     },
     methods: {
-          login() {
+        login() {
             //跳转到绑定页面
             uni.navigateTo({
                 url: '/pages/binding/binding'
             });
         }
     },
+
 }
 </script>
 
@@ -54,6 +57,10 @@ export default {
         display: inline-block !important;
     }
 
+    /deep/.u-checkbox-group--row {
+        display: inline-block !important;
+    }
+
     .login__btn {
         width: 600rpx;
         height: 90rpx;

pages/form2Moban.vue

@@ -3,6 +3,7 @@
  * @Description: 领取优惠卷
 -->
 <template>
+<view class="appCotent">
 <div class="getPrice">
     <u-gap bgColor="transparent" height="20"></u-gap>
 
@@ -20,6 +21,7 @@
         </u--form>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/formMoban.vue

@@ -3,6 +3,7 @@
  * @Description: 领取优惠卷
 -->
 <template>
+<view class="appCotent">
 <div class="getPrice">
     <u-gap bgColor="transparent" height="30"></u-gap>
     <div class="content__code">
@@ -61,6 +62,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/index/getCarCode.vue

@@ -3,6 +3,7 @@
  * @Description: 获取挪车码
 -->
 <template>
+<view class="appCotent">
 <div class="getCarCode">
     <div class="get__content">
         <div class="address" v-if="addressShow">
@@ -75,7 +76,7 @@
                 共<span>1</span>件
             </div>
             <div class="price__all">
-                合计<span>￥00.00</span>
+                合计<span class="num__two">￥00.00</span>
             </div>
         </div>
         <div class="price__next" @click="pay">
@@ -83,6 +84,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/index/getPrice.vue

@@ -3,64 +3,66 @@
  * @Description: 领取优惠卷
 -->
 <template>
-<div class="getPrice">
-    <u-gap bgColor="transparent" height="30"></u-gap>
-    <div class="content__code">
-        <div class="code__img"></div>
-        <div class="code__money">
-            <div class="money__title">
-                <text>二维码挪车贴-经典样式</text>
-            </div>
-            <div class="code__tips">
-                <text>静电贴材质 7.1cm*8.9cm</text>
-            </div>
-            <div class="money__num">
-                <text class="num__one">￥0.00</text>
+<view class="appCotent">
+    <div class="getPrice">
+        <u-gap bgColor="transparent" height="30"></u-gap>
+        <div class="content__code">
+            <div class="code__img"></div>
+            <div class="code__money">
+                <div class="money__title">
+                    <text>二维码挪车贴-经典样式</text>
+                </div>
+                <div class="code__tips">
+                    <text>静电贴材质 7.1cm*8.9cm</text>
+                </div>
+                <div class="money__num">
+                    <text class="num__one">￥0.00</text>
+                </div>
             </div>
         </div>
-    </div>
-    <u-gap bgColor="transparent" height="30"></u-gap>
-    <div class="car_info">
-        <div class="car_info__title">填写车辆信息</div>
-        <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
-            <u-form-item label="品牌" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="车型" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="行驶里程" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>KM
-            </u-form-item>
-            <u-form-item label="车牌号" ref="item1"> </u-form-item>
-            <car-number v-model="carNumber"></car-number>
-        </u--form>
-        <div class="select__car">
-            从爱车选择 <image src="@/static/index/zhankai.png" alt="">
+        <u-gap bgColor="transparent" height="30"></u-gap>
+        <div class="car_info">
+            <div class="car_info__title">填写车辆信息</div>
+            <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
+                <u-form-item label="品牌" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>
+                </u-form-item>
+                <u-form-item label="车型" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>
+                </u-form-item>
+                <u-form-item label="行驶里程" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>KM
+                </u-form-item>
+                <u-form-item label="车牌号" ref="item1"> </u-form-item>
+                <car-number v-model="carNumber"></car-number>
+            </u--form>
+            <div class="select__car">
+                从爱车选择 <image src="@/static/index/zhankai.png" alt="">
+            </div>
         </div>
-    </div>
-    <div class="price__bottom">
-        <div class="price">
-            <div class="price__num">
-                共<span>1</span>件
+        <div class="price__bottom">
+            <div class="price">
+                <div class="price__num">
+                    共<span>1</span>件
+                </div>
+                <div class="price__all">
+                    合计<span>￥00.00</span>
+                </div>
             </div>
-            <div class="price__all">
-                合计<span>￥00.00</span>
+            <div class="price__next" @click="getCarCode">
+                下一步
             </div>
         </div>
-        <div class="price__next" @click="getCarCode">
-            下一步
-        </div>
-    </div>
-    <div class="price__bottom">
-        <div class="price">
-            ￥0.00
-        </div>
-        <div class="price__next" @click="getCarCode">
-            下一步
+        <div class="price__bottom">
+            <div class="price">
+                ￥0.00
+            </div>
+            <div class="price__next" @click="getCarCode">
+                下一步
+            </div>
         </div>
     </div>
-</div>
+</view>
 </template>
 
 <script>
@@ -108,6 +110,10 @@ export default {
 .getPrice {
     width: 100%;
     height: 100%;
+    .uni-input-input,
+    .uni-input-placeholder {
+        text-indent: 300rpx;
+    }
 
     .content__code {
         padding: 28rpx;

pages/index/index.vue

 <template>
-<view class="index-content">
-    <custom-tarbar :selected="0"></custom-tarbar>
-    <u-swiper :radius="0" :height="210" :list="list5" @change="(e) => (current = e.current)" :autoplay="false">
-        <view slot="indicator" class="indicator">
-            <view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
+<view class="appCotent">
+    <view class="index-content">
+        <custom-tarbar :selected="0"></custom-tarbar>
+        <u-swiper :radius="0" :height="210" :list="list5" @change="(e) => (current = e.current)" :autoplay="false">
+            <view slot="indicator" class="indicator">
+                <view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
+                </view>
             </view>
-        </view>
-    </u-swiper>
-    <u-gap bgColor="transparent" height="15"></u-gap>
-    <div class="content__code">
-        <div class="code__img"></div>
-        <div class="code__money">
-            <div class="money__title">
-                <text>二维码挪车贴</text>
+        </u-swiper>
+        <u-gap bgColor="transparent" height="15"></u-gap>
+        <div class="content__code">
+            <div class="code__img"></div>
+            <div class="code__money">
+                <div class="money__title">
+                    <text>二维码挪车贴</text>
+                </div>
+                <div class="code__tips">
+                    <text>绑定京东账号，仅需支付邮费</text>
+                </div>
+                <div class="money__num">
+                    <text class="num__one">￥0.00</text>
+                    <text class="num__two">￥19.99</text>
+                </div>
             </div>
-            <div class="code__tips">
-                <text>绑定京东账号，仅需支付邮费</text>
-            </div>
-            <div class="money__num">
-                <text class="num__one">￥0.00</text>
-                <text class="num__two">￥19.99</text>
+            <div class="code__get" @click="getPrice">
+                <div>
+                    立即
+                </div>
+                <div>
+                    领取
+                </div>
             </div>
         </div>
-        <div class="code__get" @click="getPrice">
-            <div>
-                立即
-            </div>
-            <div>
-                领取
-            </div>
+        <u-gap bgColor="transparent" height="15"></u-gap>
+        <div class="index__item3">
+            <image src="@/static/index/index23.png"></image>
+        </div>
+        <u-gap bgColor="transparent" height="15"></u-gap>
+        <div class="index__item3-1">
+            <image src="@/static/index/index14.png"></image>
         </div>
-    </div>
-    <u-gap bgColor="transparent" height="15"></u-gap>
-    <div class="index__item3">
-        <image src="@/static/index/index23.png"></image>
-    </div>
-    <u-gap bgColor="transparent" height="15"></u-gap>
-    <div class="index__item3-1">
-        <image src="@/static/index/index14.png"></image>
-    </div>
-    <u-gap bgColor="transparent" height="15"></u-gap>
-    <div class="index__item4">
-        <image src="@/static/index/index20.png"></image>
-    </div>
-    <u-gap bgColor="transparent" height="15"></u-gap>
-    <div class="index__item5">
-        <image src="@/static/index/index8.png"></image>
-    </div>
-    <u-gap bgColor="transparent" height="60"></u-gap>
+        <u-gap bgColor="transparent" height="15"></u-gap>
+        <div class="index__item4">
+            <image src="@/static/index/index20.png"></image>
+        </div>
+        <u-gap bgColor="transparent" height="15"></u-gap>
+        <div class="index__item5">
+            <image src="@/static/index/index8.png"></image>
+        </div>
+        <u-gap bgColor="transparent" height="60"></u-gap>
+    </view>
 </view>
 </template>
 
@@ -90,41 +92,41 @@ export default {
     height: 100%;
 
     .index__item3 {
-        width: 750rpx;
+        width: 100%;
         height: 356rpx;
 
         image {
-            width: 750rpx;
+            width: 100%;
             height: 356rpx;
         }
     }
 
     .index__item3-1 {
-        width: 750rpx;
+        width: 100%;
         height: 711rpx;
 
         image {
-            width: 750rpx;
+            width: 100%;
             height: 711rpx;
         }
     }
 
     .index__item4 {
-        width: 750rpx;
+        width: 100%;
         height: 646rpx;
 
         image {
-            width: 750rpx;
+            width: 100%;
             height: 646rpx;
         }
     }
 
     .index__item5 {
-        width: 750rpx;
+        width: 100%;
         height: 1289rpx;
 
         image {
-            width: 750rpx;
+            width: 100%;
             height: 1289rpx;
         }
     }
@@ -140,7 +142,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        margin: 0 auto;
+        margin-left: 30rpx;
         position: relative;
 
         .code__img {
@@ -184,6 +186,16 @@ export default {
                     font-weight: 500;
                     color: #999999;
                     line-height: 42rpx;
+                    position: relative;
+                }
+                .num__two::before{
+                    content:'';
+                    width: 100%;
+                    height: 1rpx;
+                    background:#999 ;
+                    position: absolute;
+                    bottom: 16rpx;
+                    left: 8rpx;
                 }
             }
         }

pages/main.vue

+<!--
+ * @Author: euzhi
+ * @Description: tab
+-->
+<template>
+<div class="tab__item">
+        <custom-tarbar :selected="0"></custom-tarbar>
+</div>
+</template>
+
+<script>
+import customTarbar from "@/common/wxcomponents/custom-tarbar/custom-tarbar.vue";
+export default {
+    components: {
+        customTarbar
+    },
+    data() {
+        return {
+
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

pages/move-car/addCar.vue

@@ -3,6 +3,7 @@
  * @Description: 新增车辆
 -->
 <template>
+<view class="appCotent">
 <div class="addCar">
     <div class="add__content">
         <div class="add__title">
@@ -34,6 +35,7 @@
         完成
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -93,7 +95,10 @@ export default {
 <style lang="scss" scoped>
 .addCar {
     padding: 40rpx 0rpx;
-
+    .uni-input-input,
+    .uni-input-placeholder {
+        text-indent: 300rpx;
+    }
     .u-checkbox-group {
         display: inline-block !important;
     }

pages/move-car/callDetail.vue

@@ -3,6 +3,7 @@
  * @Description: 呼叫记录详情
 -->
 <template>
+<view class="appCotent">
 <div class="callDetail">
     <div class="view__content">
         <div class="view__item" v-for="(vo,inx) in items" :key="inx">
@@ -18,6 +19,7 @@
         返回
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/editCar.vue

@@ -3,6 +3,7 @@
  * @Description: 新增车辆
 -->
 <template>
+<view class="appCotent">
 <div class="editCar">
     <div class="add__content">
         <div class="add__title">
@@ -32,6 +33,7 @@
         删除
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -91,10 +93,16 @@ export default {
 <style lang="scss" scoped>
 .editCar {
     padding: 40rpx 0rpx;
-
+    .uni-input-input,
+    .uni-input-placeholder {
+        text-indent: 300rpx;
+    }
     .u-checkbox-group {
         display: inline-block !important;
     }
+    .u-checkbox-group--row{
+        display: inline-block !important;
+    }
 
     .add__content {
         background: #FFFFFF;

pages/move-car/index.vue

 <template>
-<view class="moveCar">
-    <custom-tarbar :selected="1"></custom-tarbar>
-    <div class="move_car__content">
-        <div class="menu__top" @click="goUrl({
+<view class="appCotent">
+    <view class="moveCar">
+        <custom-tarbar :selected="1"></custom-tarbar>
+        <div class="move_car__content">
+            <div class="menu__top" @click="goUrl({
 
 url: '/pages/move-car/loveCar',
 
 })">
-            <div>
-                <image src="@/static/move-car/move-car1.png" />
-            </div>
-            <div>
-                爱车管理
-            </div>
-        </div>
-
-        <div class="menu__list">
-            <div class="list__items" v-for="(vo,inx) in items" :key="inx" @click="goUrl(vo)">
                 <div>
-                    <image :src="vo.icon" />
+                    <image src="@/static/move-car/move-car1.png" />
                 </div>
                 <div>
-                    {{vo.title}}
+                    爱车管理
+                </div>
+            </div>
+
+            <div class="menu__list">
+                <div class="list__items" v-for="(vo,inx) in items" :key="inx" @click="goUrl(vo)">
+                    <div>
+                        <image :src="vo.icon" />
+                    </div>
+                    <div>
+                        {{vo.title}}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    </view>
 </view>
 </template>
 
@@ -39,7 +41,7 @@ export default {
         return {
             items: [{
                     icon: require("@/static/move-car/move-car6.png"),
-                    url: "/pages/move-car/scan",
+                    url: "/pages/move-car/oneMoveCar",
                     title: "扫一扫联系车主"
                 },
                 {
@@ -48,7 +50,7 @@ export default {
                     title: "我的呼叫记录"
                 }, {
                     icon: require("@/static/move-car/move-car2.png"),
-                    url: "/pages/move-car/oneMoveCar",
+                    url: "/pages/move-car/myMoveCar",
                     title: "我的挪车牌"
                 }, {
                     icon: require("@/static/move-car/move-car4.png"),
@@ -77,7 +79,8 @@ export default {
                 })
             }
         }
-    }
+    },
+
 };
 </script>
 

pages/move-car/loveCar.vue

@@ -3,6 +3,7 @@
  * @Description: 爱车管理
 -->
 <template>
+<view class="appCotent">
 <div class="loveCar">
     <div class="love-car__title">
         我的爱车
@@ -27,6 +28,7 @@
         <image src="../../static/move-car/love-car5.png"> 添加车辆
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/moveCarDetail.vue

@@ -3,6 +3,7 @@
  * @Description: 挪车码详情
 -->
 <template>
+<view class="appCotent">
 <div class="moveCarDetail">
     <div class="view__content">
         <div class="view__item" v-for="(vo,inx) in items" :key="inx">
@@ -21,6 +22,7 @@
         返回
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/myCall.vue

@@ -3,6 +3,7 @@
  * @Description: 我的呼叫记录
 -->
 <template>
+<view class="appCotent">
 <div class="myRecord">
     <div class="record__item" v-for="(vo,inx) in items" :key="inx">
         <div class="item__top">
@@ -31,6 +32,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/myMoveCar.vue

@@ -3,6 +3,7 @@
  * @Description: 我的挪车码
 -->
 <template>
+<view class="appCotent">
 <div class="myMoveCar">
     <div class="my__search">
         <u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
@@ -32,6 +33,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/myRecord.vue

@@ -3,6 +3,7 @@
  * @Description: 我的挪车记录
 -->
 <template>
+<view class="appCotent">
 <div class="myRecord">
     <div class="record__item" v-for="(vo,inx) in items" :key="inx">
         <div class="item__top">
@@ -31,6 +32,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/oneMoveCar.vue

 <template>
+<view class="appCotent">
 <div class="oneMoveCar">
     <div class="contentMoveCar">
         <div class="car_item__one">
@@ -56,6 +57,7 @@
     </div>
     	<u-action-sheet :actions="list" @close='close'  closeOnClickOverlay  round='6' :show="show"></u-action-sheet>
 </div>
+</view>
 </template>
 
 <script>
@@ -108,6 +110,9 @@ export default {
     .u-checkbox-group {
         display: inline-block !important;
     }
+    .u-checkbox-group--row{
+        display: inline-block !important;
+    }
 
     .contentMoveCar {
 

pages/move-car/recordDetail.vue

@@ -3,6 +3,7 @@
  * @Description: 挪车记录详情
 -->
 <template>
+<view class="appCotent">
 <div class="callDetail">
     <div class="view__content">
         <div class="view__item" v-for="(vo,inx) in items" :key="inx">
@@ -18,6 +19,7 @@
         返回
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/move-car/scan.vue

@@ -3,6 +3,7 @@
  * @Description: 扫码绑定
 -->
 <template>
+<view class="appCotent">
 <div class="scan">
     <div class="contentMoveCar">
         <div class="car_item__one">
@@ -27,6 +28,7 @@
     </div>
     <div class="use__text">使用说明</div>
 </div>
+</view>
 </template>
 
 <script>
@@ -142,6 +144,9 @@ export default {
     .u-checkbox-group {
         display: inline-block !important;
     }
+    .u-checkbox-group--row{
+        display: inline-block !important;
+    }
 
     .contentMoveCar {
 

pages/personal/addAddress.vue

@@ -3,34 +3,42 @@
  * @Description: 新增地址
 -->
 <template>
-<div class="addAddress">
-    <u-gap bgColor="transparent" height="20"></u-gap>
+<view class="appCotent">
+    <div class="addAddress">
+        <u-gap bgColor="transparent" height="20"></u-gap>
 
-    <div class="car_info">
-        <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
-            <u-form-item label="收货人:" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="请填写收货人姓名" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="手机号码:" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="请填写收货人手机号码" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="收货地址:" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="楼号门牌:" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" placeholder="例如  2栋3单元101室" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="设置默认地址:" prop="userInfo.name" ref="item1">
-                <u-switch class="del__address" v-model="model1.value" activeColor="#5ac725" @change="change"></u-switch>
-            </u-form-item>
+        <div class="car_info">
+            <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
+                <u-form-item label="收货人:" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input v-model="model1.userInfo.name" placeholder="请填写收货人姓名" border="none"></u--input>
+                </u-form-item>
+                <u-form-item label="手机号码:" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input v-model="model1.userInfo.name" placeholder="请填写收货人手机号码" border="none"></u--input>
+                </u-form-item>
+                <u-form-item label="收货地址:" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input>
+                    <span class="app__gps">
+                        <image src="../../static/my/gps.png">
+                    </span>
+                    <span class="app__right">
+                        <image src="../../static/my/my6.png">
+                    </span>
+                </u-form-item>
+                <u-form-item label="楼号门牌:" prop="userInfo.name" borderBottom ref="item1">
+                    <u--input v-model="model1.userInfo.name" placeholder="例如  2栋3单元101室" border="none"></u--input>
+                </u-form-item>
+                <u-form-item label="设置默认地址:" prop="userInfo.name" ref="item1">
+                    <u-switch class="del__address" v-model="model1.value" activeColor="#5ac725" @change="change"></u-switch>
+                </u-form-item>
 
-        </u--form>
+            </u--form>
+        </div>
+        <div class="add__tips">为保证您的商品准确送达，请填写正确的地址！</div>
+        <div class="love__btn" @click="add">
+            <image src="../../static/move-car/love-car5.png"> 新增地址
+        </div>
     </div>
-    <div class="add__tips">为保证您的商品准确送达，请填写正确的地址！</div>
-    <div class="love__btn" @click="add">
-        <image src="../../static/move-car/love-car5.png"> 新增地址
-    </div>
-</div>
+</view>
 </template>
 
 <script>
@@ -63,6 +71,23 @@ export default {
 
 <style lang="scss" scoped>
 .addAddress {
+    .app__gps {
+        image {
+            width: 34rpx;
+            height: 36rpx;
+        }
+    }
+
+    .app__right {
+        padding-left: 20rpx;
+        padding-bottom: 10rpx;
+
+        image {
+            width: 11rpx;
+            height: 18rpx;
+        }
+    }
+
     .love__btn {
         height: 76rpx;
         background: url('@/static/move-car/love-car4.png') no-repeat;
@@ -76,6 +101,7 @@ export default {
         width: 670rpx;
         margin: 0 auto;
         margin-top: 40rpx;
+
         image {
             width: 30rpx;
             height: 30rpx;

pages/personal/ask.vue

@@ -3,6 +3,7 @@
  * @Description: 问题反馈
 -->
 <template>
+<view class="appCotent">
 <div class="pull">
     <div class="view__content">
         <div class="view__title">
@@ -24,6 +25,7 @@
         提交
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/personal/asking.vue

@@ -3,6 +3,7 @@
  * @Description: 常见问题
 -->
 <template>
+<view class="appCotent">
 <div class="asking">
     <div class="title__ask">
         【如何获取客户？获取客户的渠道有哪些？】
@@ -20,6 +21,7 @@
         通过参加行业群的集体活动，接洽客户。
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/personal/carTime.vue

@@ -3,6 +3,7 @@
  * @Description: 查看物流
 -->
 <template>
+<view class="appCotent">
 <div class="carTime">
     <div class="time__content">
         <div class="time__top">
@@ -16,7 +17,7 @@
                 <div>
                     物流单号:3543859111977240
                 </div>
-                <div class="time__btn btn__one" @click="viewCar">
+                <div class="time__btn btn__one">
                     <span>复制</span>
                 </div>
             </div>
@@ -80,6 +81,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -184,6 +186,7 @@ export default {
                     display: inline-block;
                     right: 0rpx;
                     bottom: 60rpx;
+                    border-radius: 4rpx;
                 }
             }
         }

pages/personal/editAddress.vue

@@ -3,6 +3,7 @@
  * @Description: 编辑地址
 -->
 <template>
+<view class="appCotent">
 <div class="editAddress">
     <u-gap bgColor="transparent" height="20"></u-gap>
 
@@ -15,7 +16,13 @@
                 <u--input v-model="model1.userInfo.name" placeholder="请填写收货人手机号码" border="none"></u--input>
             </u-form-item>
             <u-form-item label="收货地址:" prop="userInfo.name" borderBottom ref="item1">
-                <u--input v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input>
+                <u--input v-model="model1.userInfo.name"  placeholder="点击选择收货地址" border="none"></u--input>
+                <span class="app__gps">
+                    <image src="../../static/my/gps.png" >
+                </span>
+                <span class="app__right">
+                    <image src="../../static/my/my6.png" >
+                </span>
             </u-form-item>
             <u-form-item label="楼号门牌:" prop="userInfo.name" borderBottom ref="item1">
                 <u--input v-model="model1.userInfo.name" placeholder="例如  2栋3单元101室" border="none"></u--input>
@@ -34,6 +41,7 @@
         删除该地址
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -83,6 +91,20 @@ export default {
 
 <style lang="scss" scoped>
 .editAddress {
+    .app__gps{
+        image{
+            width: 34rpx;
+            height: 36rpx;
+        }
+    }
+    .app__right{
+        padding-left: 20rpx;
+        padding-bottom: 10rpx;
+        image{
+            width: 11rpx;
+            height: 18rpx;
+        }
+    }
     .love__btn {
         height: 76rpx;
         background: url('@/static/move-car/love-car4.png') no-repeat;

pages/personal/help.vue

@@ -3,9 +3,11 @@
  * @Description: 帮助使用
 -->
 <template>
+<view class="appCotent">
     <div class="hlep">
         <image src="../../static/my/help.png" />
     </div>
+</view>
 </template>
 
 <script>
@@ -20,7 +22,7 @@
     height: 1092rpx;
     image{
         height: 100%;
-        width: 750rpx;
+        width: 100%;
     }
 }
 </style>
\ No newline at end of file

pages/personal/index.vue

@@ -3,59 +3,61 @@
  * @Description: 个人中心
 -->
 <template>
-<view class="content">
-    <custom-tarbar :selected="4"></custom-tarbar>
-    <view class="personal">
-        <div class="ps__bg">
-            <div class="ps__title">个人中心</div>
-            <div class="ps__info">
-                <div class="info__cover">
-                    <image src="../../static/my/my2.png" />
-                </div>
-                <div>
-                    <div class="info__name">这里是昵称</div>
-                    <div class="view__info" @click="editInfo">
-                        查看个人主页或编辑资料
-                        <span>
-                            <image src="../../static/my/my7.png">
-                        </span>
+<view class="appCotent">
+    <view class="content">
+        <custom-tarbar :selected="4"></custom-tarbar>
+        <view class="personal">
+            <div class="ps__bg">
+                <div class="ps__title">个人中心</div>
+                <div class="ps__info">
+                    <div class="info__cover">
+                        <image src="../../static/my/my2.png" />
                     </div>
-                </div>
-            </div>
-            <div class="ps__shop">
-                <div class="shop__tab">
-                    <div class="tab__top">
-                        <span>商品订单</span>
-                        <div class="tab__all" @click="goOrder">
-                            <span>全部订单</span>
+                    <div>
+                        <div class="info__name">这里是昵称</div>
+                        <div class="view__info" @click="editInfo">
+                            查看个人主页或编辑资料
                             <span>
-                                <image src="../../static/my/my5.png">
+                                <image src="../../static/my/my7.png">
                             </span>
                         </div>
                     </div>
-                    <div class="tab__bottom">
-                        <div class="tab__item" v-for="(vo,inx) in items" :key="inx">
-                            <image :src="vo.icon" />
-                            <div>{{vo.title}}</div>
+                </div>
+                <div class="ps__shop">
+                    <div class="shop__tab">
+                        <div class="tab__top">
+                            <span>商品订单</span>
+                            <div class="tab__all" @click="goOrder">
+                                <span>全部订单</span>
+                                <span>
+                                    <image src="../../static/my/my5.png">
+                                </span>
+                            </div>
+                        </div>
+                        <div class="tab__bottom">
+                            <div class="tab__item" v-for="(vo,inx) in items" :key="inx">
+                                <image :src="vo.icon" />
+                                <div>{{vo.title}}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="ps__list">
-            <div class="list__item" v-for="(vo,inx) in menu" :key="inx" @click="goUrl(vo)">
-                <div class="list__left">
-                    <image :src="vo.icon" alt="" srcset="">
-                        {{vo.title}}
-                </div>
-                <div class="list__right">
-                    <image src="../../static/my/my5.png" alt="" srcset="">
+            <div class="ps__list">
+                <div class="list__item" v-for="(vo,inx) in menu" :key="inx" @click="goUrl(vo)">
+                    <div class="list__left">
+                        <image :src="vo.icon" alt="" srcset="">
+                            {{vo.title}}
+                    </div>
+                    <div class="list__right">
+                        <image src="../../static/my/my5.png" alt="" srcset="">
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="ps__btn">退出登录</div>
+            <div class="ps__btn">退出登录</div>
+        </view>
+        <u-gap bgColor="transparent" height="70"></u-gap>
     </view>
-    <u-gap bgColor="transparent" height="70"></u-gap>
 </view>
 </template>
 
@@ -85,7 +87,7 @@ export default {
                 {
                     icon: require("../../static/my/my11.png"),
                     title: "问题反馈",
-                    url:  "/pages/personal/ask"
+                    url: "/pages/personal/ask"
                 }
             ],
             items: [{
@@ -116,12 +118,13 @@ export default {
                 url: vo.url
             });
         },
-		editInfo() {
-			uni.navigateTo({
-				url: '/pages/personal/userInfo'
-			});
-		}
+        editInfo() {
+            uni.navigateTo({
+                url: '/pages/personal/userInfo'
+            });
+        }
     },
+
 };
 </script>
 
@@ -129,7 +132,7 @@ export default {
 .personal {
     .ps__bg {
         background: url('../../static/my/my15.png') no-repeat;
-        background-size: contain;
+        background-size: cover;
 
         .ps__title {
             font-size: 40rpx;
@@ -259,7 +262,7 @@ export default {
 
         .list__item {
             position: relative;
-            padding: 34rpx 40rpx;
+            padding: 26rpx 40rpx;
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -336,7 +339,7 @@ export default {
 
     .ps__btn {
         margin-top: 20rpx;
-        width: 750rpx;
+        width: 100%;
         height: 100rpx;
         background: #FFFFFF;
         box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);

pages/personal/myAddress.vue

@@ -3,6 +3,7 @@
  * @Description: 我的地址
 -->
 <template>
+<view class="appCotent">
 <div class="myAddress">
     <div class="address__content">
         <div class="ress__item" v-for="(vo,inx) in 4" :key="inx">
@@ -23,6 +24,7 @@
         <image src="../../static/move-car/love-car5.png"> 新增地址
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -127,7 +129,7 @@ export default {
                 }
 
                 >span:nth-of-type(2) {
-
+                    padding-left: 40rpx;
                     image {
                         width: 28rpx;
                         height: 30rpx;

pages/personal/myOrder.vue

@@ -3,6 +3,7 @@
  * @Description: 我的订单
 -->
 <template>
+<view class="appCotent">
 <div class="myOrder">
     <u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{
             color: '#303133',
@@ -142,6 +143,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>
@@ -286,7 +288,7 @@ export default {
                     font-family: PingFang SC;
                     font-weight: 500;
                     color: #666666;
-                    margin: 20rpx
+                    margin: 20rpx 0;
                 }
 
                 .order__num {

pages/personal/orderDetail.vue

@@ -3,6 +3,7 @@
  * @Description: 订单详情
 -->
 <template>
+<view class="appCotent">
 <div class="orderDetail">
     <div class="order__car">
         <div>
@@ -72,6 +73,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/personal/pull.vue

@@ -3,6 +3,7 @@
  * @Description: 申请退款
 -->
 <template>
+<view class="appCotent">
 <div class="pull">
     <div class="view__content">
         <div class="view__item" v-for="(vo,inx) in items" :key="inx">
@@ -22,6 +23,7 @@
     </div>
 
 </div>
+</view>
 </template>
 
 <script>

pages/personal/userInfo.vue

@@ -3,6 +3,7 @@
  * @Description: 描述
 -->
 <template>
+<view class="appCotent">
 <div class="userInfo">
     <div class="info__cover" @click="select">
         <span class="cover__name">头像</span>
@@ -16,6 +17,7 @@
         <active-form :formDate.sync="formData"></active-form>
     </view>
 </div>
+</view>
 </template>
 
 <script>

pages/release/release.vue

 <template>
+<view class="appCotent">
 	<view class="content">
 		<view class="release">
 			release
 		</view>
 	</view>
+</view>
 </template>
 
 <script>

pages/shop/detail.vue

 <template>
+<view class="appCotent">
 <div class="shop__detail">
     <div class="top__swiper">
         <u-swiper radius='0' :list="list6" @change="e => currentNum = e.current" :autoplay="false" height='358' indicatorStyle="right: 20px">
@@ -24,6 +25,7 @@
     <div class="shop__btn view__no__bind" @click="pay">立即购买</div>
     <u-gap bgColor="transparent" height="80"></u-gap>
 </div>
+</view>
 </template>
 
 <script>

pages/shop/index.vue

 <template>
+<view class="appCotent">
 <view>
     <custom-tarbar :selected="3"></custom-tarbar>
     <view class="shop">
@@ -33,7 +34,7 @@
                         临时停车牌
                     </div>
                     <div class="one__item__price">
-                        ￥25.5<span>￥39.9</span>
+                        ￥25.5<span class="num__two">￥39.9</span>
                     </div>
                 </div>
             </div>
@@ -41,6 +42,7 @@
     </view>
     <u-gap bgColor="transparent" height="60"></u-gap>
 
+</view>
 </view>
 </template>
 
@@ -91,14 +93,14 @@ export default {
             flex-wrap: wrap;
 
             .one__item {
-                width: 320rpx;
+                width: 48%;
                 background: #FFFFFF;
                 box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2);
                 border-radius: 20rpx;
                 margin-bottom: 30rpx;
 
                 .one__item__img {
-                    width: 320rpx;
+                    width: 100%;
                     height: 320rpx;
                     background: #FFD4D4;
                     border-radius: 20rpx;
@@ -117,6 +119,7 @@ export default {
                     color: #333333;
                     margin: 20rpx 0;
                     text-indent: 20rpx;
+                    margin-bottom: 10rpx;
                 }
 
                 .one__item__price {
@@ -124,7 +127,6 @@ export default {
                     font-family: PingFang SC;
                     font-weight: 500;
                     color: #E1251B;
-                    line-height: 42rpx;
                     text-indent: 20rpx;
                     padding-bottom: 20rpx;
 

pages/shop/pay.vue

@@ -3,6 +3,7 @@
  * @Description: 支付
 -->
 <template>
+<view class="appCotent">
 <div class="pay">
     <div class="address">
         <div class="address__left">
@@ -62,6 +63,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/shop/payOk.vue

@@ -3,6 +3,7 @@
  * @Description: 描述
 -->
 <template>
+<view class="appCotent">
 <div class="payOk">
     <div class="ok__icon">
         <image src="../../static/shop/pay-ok1.png" />
@@ -14,6 +15,7 @@
         <div>返回首页</div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/shop/search.vue

@@ -3,6 +3,7 @@
  * @Description: 搜索商品
 -->
 <template>
+<view class="appCotent">
 <div class="myMoveCar">
     <div class="my__search">
         <u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
@@ -27,6 +28,7 @@
         </div>
     </div>
 </div>
+</view>
 </template>
 
 <script>

pages/titleMoban.vue

@@ -3,9 +3,11 @@
  * @Description: 描述
 -->
 <template>
+<view class="appCotent">
 <div>
     <div class="view__title">超低价养车好物</div>
 </div>
+</view>
 </template>
 
 <script>

pages/view2Moban.vue

@@ -3,6 +3,7 @@
  * @Description: 扫码绑定
 -->
 <template>
+<view class="appCotent">
 <div class="scan">
     <div class="contentMoveCar">
         <div class="car_item__one">
@@ -19,6 +20,7 @@
     </div>
     	<u-action-sheet :actions="list" @close='close'  closeOnClickOverlay  round='6' :show="show"></u-action-sheet>
 </div>
+</view>
 </template>
 
 <script>
@@ -71,6 +73,9 @@ export default {
     .u-checkbox-group {
         display: inline-block !important;
     }
+    .u-checkbox-group--row{
+        display: inline-block !important;
+    }
 
     .contentMoveCar {
 

pages/viewMoban.vue

@@ -3,6 +3,7 @@
  * @Description: 新增车辆
 -->
 <template>
+<view class="appCotent">
 <div class="addCar">
     <div class="view__content">
         1
@@ -11,6 +12,7 @@
         完成
     </div>
 </div>
+</view>
 </template>
 
 <script>

static/public.css

@@ -2,4 +2,16 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
+}
+.num__two{
+    position: relative;
+}
+.num__two::before{
+    content:'';
+    width: 100%;
+    height: 1rpx;
+    background:#999 ;
+    position: absolute;
+    bottom: 16rpx;
+    left: 2rpx;
 }
\ No newline at end of file

unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js.map

+{"version":3,"sources":["webpack:////Users/chengxinzhi/Desktop/move-car/jd-vx-app/common/uview-ui/components/u--textarea/u--textarea.vue?0660","webpack:////Users/chengxinzhi/Desktop/move-car/jd-vx-app/common/uview-ui/components/u--textarea/u--textarea.vue?eccc","webpack:////Users/chengxinzhi/Desktop/move-car/jd-vx-app/common/uview-ui/components/u--textarea/u--textarea.vue?8c31","webpack:////Users/chengxinzhi/Desktop/move-car/jd-vx-app/common/uview-ui/components/u--textarea/u--textarea.vue?c828","uni-app:///common/uview-ui/components/u--textarea/u--textarea.vue"],"names":[],"mappings":";;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAwH;AACxH;AAC+D;AACL;;;AAG1D;AACsN;AACtN,gBAAgB,iNAAU;AAC1B,EAAE,gFAAM;AACR,EAAE,qFAAM;AACR,EAAE,8FAAe;AACjB;AACA;AACA;AACA;AACA;AACA,EAAE,yFAAU;AACZ;AACA;;AAEA;AACe,gF;;;;;;;;;;;;ACtBf;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;;;;;;;;;;;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;ACjCA;AAAA;AAAA;AAAA;AAAu2B,CAAgB,wyBAAG,EAAC,C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACsC33B,4F;AACA;AACA,qBADA;AAEA,wDAFA;AAGA;AACA,0BADA,EAHA,E","file":"common/uview-ui/components/u--textarea/u--textarea.js","sourcesContent":["import { render, staticRenderFns, recyclableRender, components } from \"./u--textarea.vue?vue&type=template&id=77652d68&\"\nvar renderjs\nimport script from \"./u--textarea.vue?vue&type=script&lang=js&\"\nexport * from \"./u--textarea.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"common/uview-ui/components/u--textarea/u--textarea.vue\"\nexport default component.exports","export * from \"-!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--16-0!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--textarea.vue?vue&type=template&id=77652d68&\"","var components\nvar render = function() {\n  var _vm = this\n  var _h = _vm.$createElement\n  var _c = _vm._self._c || _h\n  if (!_vm._isMounted) {\n    _vm.e0 = function(e) {\n      return _vm.$emit(\"focus\")\n    }\n\n    _vm.e1 = function(e) {\n      return _vm.$emit(\"blur\")\n    }\n\n    _vm.e2 = function(e) {\n      return _vm.$emit(\"linechange\", e)\n    }\n\n    _vm.e3 = function(e) {\n      return _vm.$emit(\"confirm\")\n    }\n\n    _vm.e4 = function(e) {\n      return _vm.$emit(\"input\", e)\n    }\n\n    _vm.e5 = function(e) {\n      return _vm.$emit(\"keyboardheightchange\")\n    }\n  }\n}\nvar recyclableRender = false\nvar staticRenderFns = []\nrender._withStripped = true\n\nexport { render, staticRenderFns, recyclableRender, components }","import mod from \"-!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--textarea.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--textarea.vue?vue&type=script&lang=js&\"","<template>\r\n\t<uvTextarea\r\n\t\t:value=\"value\"\r\n\t\t:placeholder=\"placeholder\"\r\n\t\t:height=\"height\"\r\n\t\t:confirmType=\"confirmType\"\r\n\t\t:disabled=\"disabled\"\r\n\t\t:count=\"count\"\r\n\t\t:focus=\"focus\"\r\n\t\t:autoHeight=\"autoHeight\"\r\n\t\t:fixed=\"fixed\"\r\n\t\t:cursorSpacing=\"cursorSpacing\"\r\n\t\t:cursor=\"cursor\"\r\n\t\t:showConfirmBar=\"showConfirmBar\"\r\n\t\t:selectionStart=\"selectionStart\"\r\n\t\t:selectionEnd=\"selectionEnd\"\r\n\t\t:adjustPosition=\"adjustPosition\"\r\n\t\t:disableDefaultPadding=\"disableDefaultPadding\"\r\n\t\t:holdKeyboard=\"holdKeyboard\"\r\n\t\t:maxlength=\"maxlength\"\r\n\t\t:border=\"border\"\r\n\t\t:customStyle=\"customStyle\"\n\t\t:formatter=\"formatter\"\n\t\t@focus=\"e => $emit('focus')\"\r\n\t\t@blur=\"e => $emit('blur')\"\r\n\t\t@linechange=\"e => $emit('linechange', e)\"\r\n\t\t@confirm=\"e => $emit('confirm')\"\r\n\t\t@input=\"e => $emit('input', e)\"\r\n\t\t@keyboardheightchange=\"e => $emit('keyboardheightchange')\"\r\n\t></uvTextarea>\r\n</template>\r\n\r\n<script>\r\n\t/**\r\n\t * 此组件存在的理由是，在nvue下，u--textarea被uni-app官方占用了，u-textarea在nvue中相当于textarea组件\r\n\t * 所以在nvue下，取名为u--textarea，内部其实还是u-textarea.vue，只不过做一层中转\r\n\t */\r\n\timport uvTextarea from '../u-textarea/u-textarea.vue';\r\n\timport props from '../u-textarea/props.js'\r\n\texport default {\r\n\t\tname: 'u--textarea',\r\n\t\tmixins: [uni.$u.mpMixin, props, uni.$u.mixin],\r\n\t\tcomponents: {\r\n\t\t\tuvTextarea\r\n\t\t},\r\n\t}\r\n</script>\r\n"],"sourceRoot":""}
\ No newline at end of file