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

# Conflicts:
#	pages/binding/index.vue
#	pagesB/pages/move-car/addCar.vue
#	pagesB/pages/move-car/editCar.vue
#	pagesB/pages/move-car/oneMoveCar.vue
#	pagesB/pages/move-car/scan.vue
#	pagesD/pages/personal/userInfo.vue
#	unpackage/dist/build/mp-weixin/common/active-form/active-form.wxml
#	unpackage/dist/build/mp-weixin/static/my/my15.png
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/active-form.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-carnumber/codecook-carnumber.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-keyboard/codecook-keyboard.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-gap/u-gap.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-modal/u-modal.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-search/u-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-switch/u-switch.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/wxcomponents/custom-tarbar/custom-tarbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getCarCode.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getPrice.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/userInfo.js.map
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/main.wxss
#	unpackage/dist/dev/mp-weixin/common/runtime.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.js
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getCarCode.js
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getCarCode.wxml
#	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/pagesA/pages/index/getPrice.wxss
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/index.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/oneMoveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/oneMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.wxss
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/payOk.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/payOk.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/help.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/orderDetail.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/pull.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.wxss
#	unpackage/dist/dev/mp-weixin/static/public.css

App.vue

@@ -21,10 +21,11 @@ export default {
 }
 
 .appCotent {
-    height: 100%;
     box-sizing: border-box;
+    background: #f9f9f9;
    	max-width: 750rpx;
     margin: 0 auto;
+    min-height: 100vh;
 }
 
 uni-page-body {

common/active-form/active-form.vue

@@ -63,7 +63,7 @@
                 placeholder-class="plaClass"
                 :placeholder="item.placeholder"
                 v-model="item.rules.label"
-                @click="formDate2[index].show = true"
+                @click="clickFn(index)"
               />
               <view class="select-icon"> </view>
             </view>
@@ -321,6 +321,11 @@ export default {
     },
   },
   methods: {
+  clickFn(index) {
+    this.formDate2[index].show = true
+    this.$emit('clickFn', index)
+  },
+
     async getphonenumber({ detail }) {
       if (detail.errMsg === "getPhoneNumber:ok") {
         console.log("detail :>> ", detail);

pages.json

@@ -36,7 +36,12 @@
 				{
 					"path": "pages/index/index",
 					"style": {
-						"navigationBarTitleText": "首页"
+						"navigationBarTitleText": "首页",
+						"app-plus": {
+							"titleNView":{
+								"autoBackButton":true
+							}
+						}
 					}
 				},
 				{
@@ -59,7 +64,12 @@
 				{
 					"path": "pages/move-car/index",
 					"style": {
-						"navigationBarTitleText": "我要挪车"
+						"navigationBarTitleText": "我要挪车",
+						"app-plus": {
+							"titleNView":{
+								"autoBackButton":false
+							}
+						}
 					}
 				},
 				{
@@ -136,7 +146,12 @@
 				{
 					"path": "pages/shop/index",
 					"style": {
-						"navigationBarTitleText": "精选商城"
+						"navigationBarTitleText": "精选商城",
+						"app-plus": {
+							"titleNView":{
+								"autoBackButton":false
+							}
+						}
 					}
 				},
 				{
@@ -171,8 +186,10 @@
 				{
 					"path": "pages/personal/index",
 					"style": {
+						"navigationBarTitleText": "个人中心",
 						"app-plus": {
-							"titleNView": false
+							"titleNView":{
+							}
 						}
 					}
 				},

pages/binding/binding.vue

@@ -17,8 +17,8 @@
         </view>
     </div>
     <div class="login__read">
-        <u-checkbox-group v-model="checked" placement="row">
-            <u-checkbox activeColor="ok"></u-checkbox>
+        <u-checkbox-group  placement="row">
+            <u-checkbox v-model="checked" ></u-checkbox>
         </u-checkbox-group>
         已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
     </div>
@@ -33,7 +33,7 @@
 export default {
     data() {
         return {
-            checked: [],
+            checked: false,
             formData: [{
                     id: "kjjns", //id必须唯一 可以是数字
                     placeholder: "请输入京东账号",

pages/binding/index.vue

+<!--
+ * @Author: euzhi
+ * @Description: 登录
+-->
 <template>
   <view class="appCotent">
 
@@ -25,8 +29,8 @@
 
 
       <div class="login__read">
-				<u-checkbox-group  v-model="nc_protocol" placement="row">
-					<u-checkbox activeColor="green"></u-checkbox>
+        <u-checkbox-group placement="row">
+          <u-checkbox activeColor="green" v-model="checked"></u-checkbox>
         </u-checkbox-group>
         已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
       </div>
@@ -38,13 +42,14 @@
 export default {
     data() {
         return {
+          checked: true,
           code: "",
           isCanUse: false, //默认为true
           isCanUse2: false, //默认为true
           openid: '',
           nc_protocol : false,
           scene : "",
-		}
+        };
     },
   methods: {
     //登录
@@ -184,6 +189,7 @@ export default {
     }
     // #endif
   }
+
 }
 </script>
 

pagesA/pages/index/getCarCode.vue

@@ -4,11 +4,11 @@
 -->
 <template>
 <view class="appCotent">
-<div class="getCarCode">
+    <div class="getCarCode">
         <div class="get__content">
             <div class="address" v-if="addressShow">
                 <div class="address__left">
-                <div class="right__title">
+                    <div class="right__title" @click="geMap">
                         北京市朝阳区李家董镇太阳宫社区大唐公寓 2号楼3单元303
                     </div>
                     <div class="right__phone">
@@ -61,7 +61,7 @@
                                 <text class="num__two">¥{{vo.price2}}</text>
                             </div>
                         </div>
-                    <div class="list__add">
+                        <div class="list__add" @click="add">
                             <image src="@/static/index/get-car-code2.png" />
                         </div>
                     </div>
@@ -73,7 +73,7 @@
         <div class="price__bottom">
             <div class="price">
                 <div class="price__num">
-                共<span>1</span>件
+                    共<span>{{nums}}</span>件
                 </div>
                 <div class="price__all">
                     合计<span class="num__two">￥00.00</span>
@@ -83,7 +83,7 @@
                 立即支付
             </div>
         </div>
-</div>
+    </div>
 </view>
 </template>
 
@@ -91,6 +91,7 @@
 export default {
     data() {
         return {
+            nums:0,
             show: false,
             addressShow: false,
             content: "地址不能为空",
@@ -119,9 +120,21 @@ export default {
         }
     },
     methods: {
+        getMap() {
+            uni.getLocation({
+                type: 'wgs84',
+                success: function (res) {
+                    console.log('当前位置的经度：' + res.longitude);
+                    console.log('当前位置的纬度：' + res.latitude);
+                }
+            });
+        },
         pay() {
             this.show = true
         },
+        add(){
+            this.nums++
+        },
         addAddress() {
             this.addressShow = !this.addressShow
         }

pagesA/pages/index/getPrice.vue

@@ -31,7 +31,9 @@
                     <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
+                    <div class="self__input__km">
+                        <u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input><span>KM</span>
+                    </div>
                 </u-form-item>
                 <u-form-item label="车牌号" ref="item1"> </u-form-item>
                 <car-number v-model="carNumber"></car-number>
@@ -110,9 +112,16 @@ export default {
 .getPrice {
     width: 100%;
     height: 100%;
-    .uni-input-input,
+
+     /deep/.uni-input-input,
     .uni-input-placeholder {
         text-indent: 300rpx;
+        text-align: right;
+    }
+
+    .self__input__km {
+        display: flex;
+        align-items: center;
     }
 
     .content__code {

pagesA/pages/index/index.vue

@@ -202,7 +202,7 @@ export default {
 
         .code__get {
             position: absolute;
-            right: -45rpx;
+            right: -60rpx;
             width: 90rpx;
             height: 90rpx;
             font-size: 28rpx;

pagesB/pages/move-car/addCar.vue

@@ -10,7 +10,7 @@
             填写车辆信息
         </div>
         <div>
-            <u--form labelPosition="left" :model="model1" ref="form1" labelWidth="100">
+            <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
                 <u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1">
                     <u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input>
                 </u-form-item>
@@ -18,17 +18,18 @@
                     <u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input>
                 </u-form-item>
                 <u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item1">
+                  <div class="self__input__km">
                     <u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input>KM
+                  </div>
                 </u-form-item>
-                <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1">
+                <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
                 <car-number v-model="model1.carInfo.carNo"></car-number>
-				</u-form-item>
             </u--form>
         </div>
     </div>
     <div class="add__user">
-        <u-checkbox-group v-model="checked" placement="row">
-            <u-checkbox activeColor="ok"></u-checkbox>
+        <u-checkbox-group placement="row">
+            <u-checkbox v-model="checked"></u-checkbox>
         </u-checkbox-group>
         勾选同意<span>《用户服务协议》</span>
     </div>
@@ -47,6 +48,7 @@ export default {
     },
     data() {
         return {
+            checked:false,
             model1: {
                 carInfo: {
                     brand: '',
@@ -126,13 +128,15 @@ export default {
 <style lang="scss" scoped>
 .addCar {
     padding: 40rpx 0rpx;
-    .uni-input-input,
-    .uni-input-placeholder {
-        text-indent: 300rpx;
+  /deep/.u-input__content__field-wrapper__field{
+        text-align: right !important;
+        padding-right: 30rpx;
     }
+
     .u-checkbox-group {
         display: inline-block !important;
     }
+
     /deep/.u-checkbox-group--row {
         display: inline-block !important;
     }
@@ -169,6 +173,7 @@ export default {
         padding-left: 40rpx;
         margin-top: 30rpx;
         margin-bottom: 60rpx;
+
         span {
             color: rgba(58, 134, 247, 1);
             padding: 0 5rpx;

pagesB/pages/move-car/editCar.vue

@@ -10,7 +10,7 @@
             填写车辆信息
         </div>
         <div>
-            <u--form labelPosition="left" :model="model1" ref="form1" labelWidth="100">
+            <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
                 <u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1">
                     <u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input>
                 </u-form-item>
@@ -18,11 +18,12 @@
                     <u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input>
                 </u-form-item>
                 <u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item3">
+                  <div class="self__input__km">
                     <u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input>KM
+                  </div>
                 </u-form-item>
-                <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1">
+                <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
                 <car-number v-model="model1.carInfo.carNo"></car-number>
-				</u-form-item>
             </u--form>
         </div>
     </div>
@@ -140,9 +141,10 @@ export default {
 <style lang="scss" scoped>
 .editCar {
     padding: 40rpx 0rpx;
-    .uni-input-input,
-    .uni-input-placeholder {
-        text-indent: 300rpx;
+   /deep/ .u-input__content__field-wrapper__field{
+        text-align: right !important;
+        padding-right: 30rpx;
+        justify-content: space-evenly;
     }
     .u-checkbox-group {
         display: inline-block !important;

pagesB/pages/move-car/oneMoveCar.vue

@@ -33,8 +33,8 @@
             拨打车主电话通知
         </div>
         <div class="move-car__wx">
-            <u-checkbox-group v-model="checked" placement="row">
-                <u-checkbox activeColor="ok"></u-checkbox>
+            <u-checkbox-group  placement="row">
+                <u-checkbox  v-model="checked"></u-checkbox>
             </u-checkbox-group> 微信通知(上限3次)
         </div>
         <div class="move-car__more">
@@ -82,7 +82,7 @@ export default {
                           fontSize:'18',
               },
             ],
-            checked: [],
+            checked:false,
             moveCode: '',
             appBusCar: {},
             appBo: {
@@ -140,7 +140,7 @@ export default {
         },
         goMyCar() {
             uni.navigateTo({
-                url: '/pages/move-car/myMoveCar'
+                url: '/pagesB/pages/move-car/myMoveCar'
             })
         },
         getCarNumber(){
@@ -164,6 +164,7 @@ export default {
           })
         },
       },
+    },
     onLoad() {
       if(e.query) {
         //获取二维码携带的参数

pagesB/pages/move-car/scan.vue

@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="car_item__three">
-            我的车辆如果阻碍了您的爱车的通行，请点击下方按钮通知我，给您造成的不便敬请谅解！！！
+          感谢您使用挪车二维码，请完成车牌号与手机的绑定以便享受挪车服务
         </div>
     </div>
     <div class="moveCarMsg">
@@ -41,8 +41,7 @@ export default {
                     sex: "",
                 },
             },
-            formData: [
-				{
+            formData: [{
                     id: "kjjns", //id必须唯一 可以是数字
                     placeholder: "请输入",
                     label: "车牌号", // 提示输入名
@@ -142,6 +141,11 @@ export default {
 
 <style lang="scss" scoped>
 .scan {
+    /deep/ .form-container .line .input {
+        text-align: right !important;
+        padding-right: 30rpx;
+    }
+
     .use__text {
         text-align: center;
         font-size: 28rpx;
@@ -174,6 +178,7 @@ export default {
     .u-checkbox-group {
         display: inline-block !important;
     }
+
     /deep/.u-checkbox-group--row {
         display: inline-block !important;
     }

pagesC/pages/shop/index.vue

@@ -64,7 +64,6 @@ export default {
     },
     methods: {
         goSearch() {
-			console.log('---');
             uni.navigateTo({
                 url: '/pagesC/pages/shop/search'
             })

pagesC/pages/shop/payOk.vue

@@ -4,17 +4,17 @@
 -->
 <template>
 <view class="appCotent">
-<div class="payOk">
+    <div class="payOk">
         <div class="ok__icon">
             <image src="@/static/shop/pay-ok1.png" />
         </div>
         <div class="ok__msg">支付成功</div>
         <div class="ok__tips">挪车码预计今天发货，请耐心等待</div>
         <div class="ok__btn">
-        <div>查看订单</div>
-        <div>返回首页</div>
+            <div @click="viewId">查看订单</div>
+            <div @click="goGhome">返回首页</div>
+        </div>
     </div>
-</div>
 </view>
 </template>
 
@@ -25,6 +25,18 @@ export default {
 
         }
     },
+    methods: {
+        viewId() {
+            uni.navigateTo({
+                url: '/pagesD/pages/personal/myOrder'
+            })
+        },
+        goGhome() {
+            uni.navigateTo({
+                url: '/pagesC/pages/shop/index'
+            })
+        }
+    },
 }
 </script>
 
@@ -35,6 +47,7 @@ export default {
 
     .ok__icon {
         text-align: center;
+
         image {
             width: 144rpx;
             height: 144rpx;
@@ -64,6 +77,7 @@ export default {
         align-items: center;
         justify-content: space-between;
         margin-top: 80rpx;
+
         >div {
             width: 320rpx;
             height: 76rpx;

pagesD/pages/personal/help.vue

@@ -18,7 +18,7 @@
 
 <style lang="scss" scoped>
 .hlep{
-    padding:40rpx 0;
+    padding:0rpx 0;
     height: 1092rpx;
     image{
         height: 100%;

pagesD/pages/personal/index.vue

@@ -8,7 +8,7 @@
         <custom-tarbar :selected="4"></custom-tarbar>
         <view class="personal">
             <div class="ps__bg">
-                <div class="ps__title">个人中心</div>
+                <div class="ps__title"></div>
                 <div class="ps__info">
                     <div class="info__cover">
                         <image :src="avatar" />
@@ -27,7 +27,7 @@
                     <div class="shop__tab">
                         <div class="tab__top">
                             <span>商品订单</span>
-                            <div class="tab__all" @click="goOrder">
+                            <div class="tab__all" @click="goOrder(0)">
                                 <span>全部订单</span>
                                 <span>
                                     <image src="@/static/my/my5.png">
@@ -35,7 +35,7 @@
                             </div>
                         </div>
                         <div class="tab__bottom">
-                            <div class="tab__item" v-for="(vo,inx) in items" :key="inx">
+                            <div class="tab__item" v-for="(vo,inx) in items" :key="inx" @click="goOrder(vo.page)">
                                 <image :src="vo.icon" />
                                 <div>{{vo.title}}</div>
                             </div>
@@ -54,7 +54,7 @@
                     </div>
                 </div>
             </div>
-            <div class="ps__btn">退出登录</div>
+            <div class="ps__btn" @click="loginOut">退出登录</div>
         </view>
         <u-gap bgColor="transparent" height="70"></u-gap>
     </view>
@@ -92,17 +92,21 @@ export default {
             ],
             items: [{
                     title: '待付款',
-                    icon: require('@/static/my/my2.png')
+                    icon: require('@/static/my/my2.png'),
+                    page:0
                 },
                 {
                     title: '待收货',
-                    icon: require('@/static/my/my3.png')
+                    icon: require('@/static/my/my3.png'),
+                    page:2
                 }, {
                     title: '已完成',
-                    icon: require('@/static/my/my14.png')
+                    icon: require('@/static/my/my14.png'),
+                    page:3
                 }, {
                     title: '退款/售后',
-                    icon: require('@/static/my/my9.png')
+                    icon: require('@/static/my/my9.png'),
+                    page:4
                 }
             ],
 			//用户信息
@@ -112,9 +116,14 @@ export default {
         }
     },
     methods: {
-        goOrder() {
+        loginOut(){
              uni.navigateTo({
-                url: '/pagesD/pages/personal/myOrder'
+                url: '/pages/binding/index'
+            });
+        },
+        goOrder(page=0) {
+            uni.navigateTo({
+                url: '/pagesD/pages/personal/myOrder?page=' + page
             });
         },
         goUrl(vo) {
@@ -155,7 +164,7 @@ export default {
             font-weight: bold;
             color: #FFFFFF;
             text-align: center;
-            padding-top: 80rpx;
+            padding-top: 40rpx;
         }
 
         .ps__info {

pagesD/pages/personal/myOrder.vue

@@ -4,7 +4,7 @@
 -->
 <template>
 <view class="appCotent">
-<div class="myOrder">
+    <div class="myOrder">
         <u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{
             color: '#303133',
             fontWeight: 'bold',
@@ -142,7 +142,7 @@
                 </div>
             </div>
         </div>
-</div>
+    </div>
 </view>
 </template>
 
@@ -167,6 +167,11 @@ export default {
             }],
         }
     },
+    onLoad: function (e) {
+        this.$nextTick(() => {
+            this.current = Number(e.page) || 0
+        })
+    },
     methods: {
         pull() {
             uni.navigateTo({
@@ -179,7 +184,6 @@ export default {
             });
         },
         changeVal(v) {
-            console.log(v);
             this.current = v.index
         }
     },

pagesD/pages/personal/orderDetail.vue

@@ -67,7 +67,7 @@
                     <div class="bottom__price">￥48.00</div>
                 </div>
             </div>
-            <div class="order__btn">
+            <div class="order__btn" @click="pull">
                 <span>申请退款</span>
             </div>
         </div>
@@ -84,6 +84,11 @@ export default {
                 url: '/pagesD/pages/personal/carTime'
             })
         }
+        ,pull() {
+            uni.navigateTo({
+                url: '/pagesD/pages/personal/pull'
+            })
+        }
     },
 }
 </script>

pagesD/pages/personal/pull.vue

@@ -87,7 +87,7 @@ export default {
             }
         }
 
-        .view__item:nth-last-child(1) {
+        .view__item:nth-of-type(2) {
             border-bottom: none !important;
         }
     }

pagesD/pages/personal/userInfo.vue

@@ -4,19 +4,38 @@
 -->
 <template>
 <view class="appCotent">
-<div class="userInfo">
+    <div class="userInfo">
         <div class="info__cover" @click="select">
             <span class="cover__name">头像</span>
             <div class="cover">
                 <image :src="image" />
+              <!-- 此处应该有默认头像 -->
+<!--                <image v-else src="@/static/my/my2.png" />-->
                 <span>
                     <image src="@/static/my/my6.png" /></span>
             </div>
         </div>
+        <u-popup :show="show" @close="close" closeOnClickOverlay>
+            <view class="user__title">
+                填写昵称
+            </view>
+            <div class="user__input"><input v-model="user__nikename" placeholder="输入昵称(最多输入20个字符)" type="text">
+                <div class="user__name__border"></div>
+                <div class="user__save" @click="save">保存</div>
+            </div>
+        </u-popup>
+        <u-popup :show="show__six" @close="close__sex" closeOnClickOverlay>
+            <div class="user__input user__sex" @click="select__sex('男')">
+                男
+                <div class="user__name__border user__name__border__sex" @click="select__sex('女')"></div>
+                女
+            </div>
+        </u-popup>
+        <u-datetime-picker :show="show__date" v-model="dateValue" ref='datetimePicker' mode="date" @confirm='confirm' @close='close__date' @cancel='close__date' :formatter="formatter" closeOnClickOverlay></u-datetime-picker>
         <view class="info__content">
-        <active-form :formDate.sync="formData"></active-form>
+            <active-form @clickFn='clickFn' :formDate.sync="formData"></active-form>
         </view>
-</div>
+    </div>
 </view>
 </template>
 
@@ -24,6 +43,15 @@
 export default {
     data() {
         return {
+            dateValue: Number(new Date()),
+            user__nikename: '',
+            show__six: false,
+            show: false,
+            show__date: false,
+            image: '',
+            userInfo: {
+              nickName: '默认昵称',
+            },
             formData: [{
                     id: "kjjns", //id必须唯一 可以是数字
                     placeholder: "请填写",
@@ -44,43 +72,113 @@ export default {
                     rules: {
                         name: "nickName", //字段名 即提交给后端的字段
                         value: "",
-                        verify: false, //是否开启校验
-                        errMess: "昵称未填写", //校验不通过的错误提示
+                        label: ""
                     },
                 },
                 {
                     id: "kjjns", //id必须唯一 可以是数字
                     placeholder: "请选择",
                     label: "性别", // 提示输入名
-                    type: "text", //类型
+                    type: "select", //类型
                     rules: {
                         name: "sex", //字段名 即提交给后端的字段
                         value: "",
                         verify: false, //是否开启校验
-                        errMess: "性别未填写", //校验不通过的错误提示
+                        label: ''
                     },
                 },
                 {
                     id: "kjjns", //id必须唯一 可以是数字
                     placeholder: "请选择",
                     label: "生日", // 提示输入名
-                    type: "text", //类型
+                    type: "select", //类型
                     rules: {
                         name: "birthday", //字段名 即提交给后端的字段
                         value: "",
                         verify: false, //是否开启校验
-                        errMess: "生日未填写", //校验不通过的错误提示
+                        label: ''
                     },
                 },
 
             ],
-			userInfo: {
-				nickName: '默认昵称',
-			},
-			image: '',
         }
     },
+    onReady() {
+      // 微信小程序需要用此写法
+      this.$refs.datetimePicker.setFormatter(this.formatter)
+    },
     methods: {
+      formatter(type, value) {
+        if (type === 'year') {
+          return `${value}年`
+        }
+        if (type === 'month') {
+          return `${value}月`
+        }
+        if (type === 'day') {
+          return `${value}日`
+        }
+        return value
+      },
+      transformTime(timestamp) {
+        if (timestamp) {
+          var time = new Date(timestamp);
+          console.log(time);
+          var y = time.getFullYear(); //getFullYear方法以四位数字返回年份
+          var M = time.getMonth() + 1; // getMonth方法从 Date 对象返回月份 (0 ~ 11)，返回结果需要手动加一
+          var d = time.getDate(); // getDate方法从 Date 对象返回一个月中的某一天 (1 ~ 31)
+          return y + '-' + M + '-' + d
+        } else {
+          return '';
+        }
+      },
+      confirm(e) {
+        this.formData.forEach(element => {
+          if (element.label === '生日') {
+            element.rules.label = this.transformTime(e.value)
+          }
+        });
+        this.show__date = false
+      },
+      select__sex(val) {
+        this.formData.forEach(element => {
+          if (element.label === '性别') {
+            element.rules.label = val
+          }
+        });
+        this.show__six = false
+      },
+      save() {
+        this.formData.forEach(element => {
+          if (element.label === '昵称') {
+            element.rules.label = this.user__nikename
+          }
+        });
+        this.show = false
+      },
+      clickFn(e) {
+        console.log(e)
+        switch (e) {
+          case 1:
+            this.show = true
+            break;
+          case 2:
+            this.show__six = true
+            break;
+          case 3:
+            this.show__date = true
+            break;
+        }
+      },
+      close() {
+        this.show = false;
+      },
+      close__sex() {
+        this.show__six = false;
+      },
+      close__date() {
+        this.show__date = false;
+      },
       select() {
         let that = this
         uni.chooseImage({
@@ -112,6 +210,7 @@ export default {
             });
           }
         });
+
       },
       getUserInfo(){
         let opts = { url: '/app/user/info', method: 'get' };
@@ -140,11 +239,64 @@ export default {
     created() {
       this.getUserInfo()
     },
+
 }
 </script>
 
 <style lang="scss" scoped>
 .userInfo {
+    .user__save {
+        font-size: 32rpx;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #3A86F7;
+        line-height: 42rpx;
+        text-align: center;
+        padding: 30rpx 0;
+    }
+
+    .user__title {
+        font-size: 36rpx;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333;
+        line-height: 42rpx;
+        text-align: center;
+        padding: 30rpx 0;
+    }
+
+    /deep/ .u-popup__content {
+        border-radius: 20rpx 20rpx 0px 0px;
+    }
+
+    .user__input {
+        padding: 0 30rpx;
+        padding-bottom: 40rpx;
+        text-align: center;
+
+        .user__name__border {
+            width: 100%;
+            height: 2rpx;
+            background: url('@/static/my/border.png') no-repeat;
+            background-size: contain;
+            margin-top: 30rpx;
+        }
+
+        .user__name__border__sex {
+            margin-bottom: 30rpx;
+        }
+    }
+
+    .user__sex {
+        font-size: 36rpx;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #333333;
+        line-height: 42rpx;
+        padding: 30rpx 0;
+        padding-bottom: 60rpx;
+    }
+
     padding: 40rpx;
 
     .info__cover {

static/public.css

@@ -15,3 +15,7 @@
     bottom: 16rpx;
     left: 2rpx;
 }
+.self__input__km{
+    display: flex;
+    align-items: center;
+}
\ No newline at end of file

unpackage/dist/build/mp-weixin/pages/personal/index.json

 {
+  "navigationBarTitleText": "个人中心",
   "usingComponents": {
     "u-gap": "/common/uview-ui/components/u-gap/u-gap",
     "custom-tarbar": "/common/wxcomponents/custom-tarbar/custom-tarbar"

unpackage/dist/build/mp-weixin/pages/personal/userInfo.json

 {
   "navigationBarTitleText": "编辑资料",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-popup": "/common/uview-ui/components/u-popup/u-popup",
+    "u-datetime-picker": "/common/uview-ui/components/u-datetime-picker/u-datetime-picker"
+  }
 }
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.json

+{
+  "usingComponents": {
+    "u-picker": "/common/uview-ui/components/u-picker/u-picker"
+  },
+  "component": true
+}
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml

+<u-picker vue-id="4066cfa8-1" show="{{show}}" closeOnClickOverlay="{{closeOnClickOverlay}}" columns="{{columns}}" title="{{title}}" itemHeight="{{itemHeight}}" showToolbar="{{showToolbar}}" visibleItemCount="{{visibleItemCount}}" defaultIndex="{{innerDefaultIndex}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" data-ref="picker" data-event-opts="{{[['^close',[['close']]],['^cancel',[['cancel']]],['^confirm',[['confirm']]],['^change',[['change']]]]}}" bind:close="__e" bind:cancel="__e" bind:confirm="__e" bind:change="__e" class="data-v-a73d27cc vue-ref" bind:__l="__l"></u-picker>
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss

+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-a73d27cc, scroll-view.data-v-a73d27cc, swiper-item.data-v-a73d27cc {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.json

+{
+  "usingComponents": {
+    "u-popup": "/common/uview-ui/components/u-popup/u-popup",
+    "u-toolbar": "/common/uview-ui/components/u-toolbar/u-toolbar",
+    "u-loading-icon": "/common/uview-ui/components/u-loading-icon/u-loading-icon"
+  },
+  "component": true
+}
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.wxml

+<u-popup vue-id="0c78d7fe-1" show="{{show}}" data-event-opts="{{[['^close',[['closeHandler']]]]}}" bind:close="__e" class="data-v-0fb62bf0" bind:__l="__l" vue-slots="{{['default']}}"><view class="u-picker data-v-0fb62bf0"><block wx:if="{{showToolbar}}"><u-toolbar vue-id="{{('0c78d7fe-2')+','+('0c78d7fe-1')}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" title="{{title}}" data-event-opts="{{[['^cancel',[['cancel']]],['^confirm',[['confirm']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-0fb62bf0" bind:__l="__l"></u-toolbar></block><picker-view class="u-picker__view data-v-0fb62bf0" style="{{'height:'+(''+$root.g0)+';'}}" indicatorStyle="{{'height: '+$root.g1}}" value="{{innerIndex}}" immediateChange="{{immediateChange}}" data-event-opts="{{[['change',[['changeHandler',['$event']]]]]}}" bindchange="__e"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><picker-view-column class="u-picker__view__column data-v-0fb62bf0"><block wx:for="{{item.l0}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><block wx:if="{{item.g2}}"><text class="u-picker__view__column__item u-line-1 data-v-0fb62bf0" style="{{'height:'+(item.g3)+';'+('line-height:'+(item.g4)+';')+('font-weight:'+(index1===innerIndex[index]?'bold':'normal')+';')}}">{{item1.m0}}</text></block></block></picker-view-column></block></picker-view><block wx:if="{{loading}}"><view class="u-picker--loading data-v-0fb62bf0"><u-loading-icon vue-id="{{('0c78d7fe-3')+','+('0c78d7fe-1')}}" mode="circle" class="data-v-0fb62bf0" bind:__l="__l"></u-loading-icon></view></block></view></u-popup>
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.wxss

+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-0fb62bf0, scroll-view.data-v-0fb62bf0, swiper-item.data-v-0fb62bf0 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-picker.data-v-0fb62bf0 {
+  position: relative;
+}
+.u-picker__view__column.data-v-0fb62bf0 {
+  display: flex;
+  flex-direction: row;
+  flex: 1;
+  justify-content: center;
+}
+.u-picker__view__column__item.data-v-0fb62bf0 {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  font-size: 16px;
+  text-align: center;
+  display: block;
+  color: #303133;
+}
+.u-picker__view__column__item--disabled.data-v-0fb62bf0 {
+  cursor: not-allowed;
+  opacity: 0.35;
+}
+.u-picker--loading.data-v-0fb62bf0 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.87);
+  z-index: 1000;
+}
+

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.json

+{
+  "usingComponents": {},
+  "component": true
+}
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.wxml

+<block wx:if="{{show}}"><view data-event-opts="{{[['touchmove',[['noop',['$event']]]]]}}" class="u-toolbar data-v-7b8fcf10" catchtouchmove="__e"><view class="u-toolbar__cancel__wrapper data-v-7b8fcf10" hover-class="u-hover-class"><text data-event-opts="{{[['tap',[['cancel',['$event']]]]]}}" class="u-toolbar__wrapper__cancel data-v-7b8fcf10" style="{{'color:'+(cancelColor)+';'}}" bindtap="__e">{{cancelText}}</text></view><block wx:if="{{title}}"><text class="u-toolbar__title u-line-1 data-v-7b8fcf10">{{title}}</text></block><view class="u-toolbar__confirm__wrapper data-v-7b8fcf10" hover-class="u-hover-class"><text data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="u-toolbar__wrapper__confirm data-v-7b8fcf10" style="{{'color:'+(confirmColor)+';'}}" bindtap="__e">{{confirmText}}</text></view></view></block>
\ No newline at end of file

unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.wxss

+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-7b8fcf10, scroll-view.data-v-7b8fcf10, swiper-item.data-v-7b8fcf10 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-toolbar.data-v-7b8fcf10 {
+  height: 42px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.u-toolbar__wrapper__cancel.data-v-7b8fcf10 {
+  color: #909193;
+  font-size: 15px;
+  padding: 0 15px;
+}
+.u-toolbar__title.data-v-7b8fcf10 {
+  color: #303133;
+  padding: 0 60rpx;
+  font-size: 16px;
+  flex: 1;
+  text-align: center;
+}
+.u-toolbar__wrapper__confirm.data-v-7b8fcf10 {
+  color: #3c9cff;
+  font-size: 15px;
+  padding: 0 15px;
+}
+