Merge remote-tracking branch 'origin/master'

pages/my/carlist.vue

@@ -138,7 +138,10 @@
 			tabBar,
       VNavigationBar
 		},
-		onLoad() {
+		onLoad(option) {
+      if(option.id){
+        this.gindex = option.id
+      }
 			this.getthree()
 			this.getlist()
 		},

pages/my/my.vue

@@ -40,7 +40,7 @@
           <image style="width: 90px;height: 22px" src="../../static/my/一键还车@2x.png" mode=""></image>
           <text class="back-car-text">添加车辆，查看更多救援信息</text>
         </view>
-        <view class="back-button">去还车</view>
+        <view class="back-button" @click="goHuanche">去还车</view>
       </view>
 
       <view class="bai-box">
@@ -329,6 +329,11 @@
         uni.navigateTo({
           url: '/pages/rescue/historylist?id=4'
         })
+      },
+      goHuanche(){
+        uni.navigateTo({
+          url: '/pages/my/carlist?id=3'
+        })
       },
 			gogogog() {
 				uni.navigateTo({