Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

pages.json

@@ -303,6 +303,15 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/me/aboutMe",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "关于我们",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/changeStore/changeStoreList.vue

@@ -180,7 +180,8 @@
 
 	.tabLine {
 
-		text-align: center;
+		text-align: center;
+		position: relative;
 	}
 
 	.tabActive {

pages/index/addCar.vue

@@ -22,7 +22,7 @@
 
 			<view class="mesView">
 				<view class="leftTitle">购车时间</view>
-				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate">
+				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
 					<view class="uni-input selectColor" v-if="time">{{time}}</view>
 					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
 				</picker>

pages/me/aboutMe.vue

@@ -0,0 +1,34 @@
+<template>
+	<view class="content">
+		<rich-text :nodes="couContent" ></rich-text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				couContent: '',
+			}
+		},
+		onLoad(opt) {
+			
+			if (opt.couContent) {
+				this.couContent = opt.couContent.replace(/\<p/gi, '<p style="display: inline-block"');
+			}
+		},
+		methods: {
+
+			
+		}
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+</style>

pages/me/me.vue

@@ -147,7 +147,7 @@
 			</view>
 			<view class="grayline"></view>
 			
-			<view class="rowBox" @click="gonavigateTo('')">
+			<view class="rowBox" @click="gonavigateTo('aboutMe?couContent='+numList.aboutus.contents)">
 				<view class="leftView">
 					<image src="../../static/img/icon_guanyu.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">关于我们</view>
@@ -218,6 +218,7 @@
 				})
 			},
 			gonavigateTo(url) {
+				console.log('url',url);
 				uni.navigateTo({
 					url: url
 				})

pages/module/handbook.vue

@@ -89,7 +89,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'miniAppMyBMemberCar/queryPlan',
+				let url = 'worldKeepCar/worldHome/queryPlan',
 					params = {
 						mileage: this.mileage,
 						liyangId: this.liyangId,

pages/shop/shopList.vue

@@ -109,7 +109,7 @@
 					lng:'',
 					lat:'',
 				},
-				cityName: '上海市',
+				cityName: '',
 				cityCode: '',
 				queryShopList: '',
 				shopName: '',