01.25(司机端迁移

api/mine/wallet.js

@@ -0,0 +1,11 @@
+
+import request from '@/utils/request'
+
+//  我的账户  /api/front/user/center/my/account
+export function getMyWalletAPI() {
+	return request({
+		url: '/api/front/user/center/my/account',
+		method: 'get',
+	})
+}
+

api/myOrder/index.js

@@ -0,0 +1,137 @@
+import request from '@/utils/request'
+
+// 查询工单列表
+export function getReservationList(params) {
+	return request({
+		url: '/api/front/car/user/center/reservation/order/list',
+		method: 'get',
+		params
+	})
+}
+// 积分商品订单列表 /api/front/integral/product/order/list
+export function getIntegralOrderList(params) {
+	return request({
+		url: '/api/front/integral/product/order/list',
+		method: 'get',
+		params
+	})
+}
+//积分商品订单详情 /api/front/integral/product/order/info/{id}
+export function getIntegralOrderDetail(id) {
+	return request({
+		url: `/api/front/integral/product/order/info/${id}`,
+		method: 'get',
+	})
+}
+//积分商品订单取消 /api/front/card/product/order/cancel/{orderNo}
+export function getIntegralOrderCancel(orderNo) {
+	return request({
+		url: `/api/front/integral/product/order/cancel/${orderNo}`,
+		method: 'post',
+	})
+}
+//卡券订单列表 /api/front/card/product/order/list
+export function getCardOrderList(params) {
+	return request({
+		url: '/api/front/card/product/order/list',
+		method: 'get',
+		params
+	})
+}
+//卡券订单详情 
+export function getCardOrderDetail(id) {
+	return request({
+		url: `/api/front/card/product/order/detail/${id}`,
+		method: 'get',
+	})
+}
+//卡券订单取消 /api/front/card/product/order/cancel/{orderNo}
+export function getCardOrderCancel(orderNo) {
+	return request({
+		url: `/api/front/card/product/order/cancel/${orderNo}`,
+		method: 'post',
+	})
+}
+// 卡券订单申请退款/api/front/card/product/order/refund
+export function getCardOrderRefund(data) {
+	return request({
+		url: `/api/front/card/product/order/refund`,
+		method: 'post',
+		data
+	})
+}
+//卡券订单退款详情/api/front/card/product/order/refund/detail/{orderNo}
+export function getCardOrderRefundDetail(orderNo) {
+	return request({
+		url: `/api/front/card/product/order/refund/detail/${orderNo}`,
+		method: 'get',
+	})
+}
+//通过卡券订单编号获取卡券可使用门店列表 /api/front/card/product/order/merchant/list/{id}
+export function getCardMerchantList(orderNo) {
+	return request({
+		url: `/api/front/card/product/order/merchant/list/${orderNo}`,
+		method: 'get',
+	})
+}
+//删除工单 /api/front/car/user/center/delete/reservation/order/{id}
+export function deleteCenterOrder(id) {
+	return request({
+		url: `/api/front/car/user/center/delete/reservation/order/${id}`,
+		method: 'post',
+	})
+}
+//取消工单 /api/front/car/user/center/cancel/reservation/order/{id}
+export function getCancelOrderCancel(id) {
+	return request({
+		url: `/api/front/car/user/center/cancel/reservation/order/${id}`,
+		method: 'post',
+	})
+}
+//工单详情  /api/front/car/user/center/info
+export function getCancelOrderDetail(params) {
+	return request({
+		url: `/api/front/car/user/center/info`,
+		method: 'get',
+		params
+	})
+}
+//工单评价  /api/front/integral/product/order/reply/save
+export function getCarOrderSave(data) {
+	return request({
+		url: `/api/front/car/user/center/reply`,
+		method: 'post',
+		data
+	})
+}
+//工单评价详情 /api/front/merchant/reservation/reply/detail/{id}
+export function getCarOrderDetail(id) {
+	return request({
+		url: `/api/front/merchant/reservation/reply/detail/${id}`,
+		method: 'get',
+	})
+}
+//我的工单评价列表
+export function getCarOrderReplyList(params) {
+	return request({
+		url: `/api/front/car/user/center/reply/list`,
+		method: 'get',
+		params
+	})
+}
+//卡券订单评价 /api/front/card/product/order/reply
+export function getRrontOrderReply(data) {
+	return request({
+		url: `/api/front/card/product/order/reply`,
+		method: 'post',
+		data
+	})
+}
+// 卡券订单评价列表  /api/front/card/product/order/reply/list
+export function getFrontOrderReplyList(params) {
+	return request({
+		url: `/api/front/card/product/order/reply/list`,
+		method: 'get',
+		params
+	})
+}

api/system/user.js

@@ -1,9 +1,39 @@
-import request from '@/utils/request'
-
-// 查询用户个人信息
-export function getUserInfo() {
-  return request({
-    url: '/api/front/user/info',
-    method: 'get'
-  })
+import request from '@/utils/request'
+
+// 查询用户个人信息
+export function getUserInfo() {
+  return request({
+    url: '/api/front/user/info',
+    method: 'get'
+  })
 }
+
+// 查询用户个人信息
+export function getUserUserInfo() {
+  return request({
+    url: '/api/front/user/user/info',
+    method: 'get'
+  })
+}
+//个人中心/api/front/user/center/info
+ export function userCenterInfo(id) {
+ 	return request({
+ 		url: `/api/front/user/center/info`,
+ 		method: 'get'
+ 	})
+ }
+ // 个人中心首页 /api/front/user/center/user/personal/center
+ export function userCenterPersonalInfo(id) {
+ 	return request({
+ 		url: `/api/front/user/center/user/personal/center`,
+ 		method: 'get'
+ 	})
+ } 
+ //编辑个人资料 /api/front/user/user/edit
+ export function getUserEdit(data) {
+ 	return request({
+ 		url: `/api/front/user/user/edit`,
+ 		method: 'post',
+		data
+ 	})
+ } 

api/user/index.js

@@ -78,4 +78,76 @@ export function cardUserRecord(data) {
 		method: 'post',
 		data
 	})
-}
+}
+ //我的活动 /api/front/card/product/order/help/list
+ export function getCardHelpList(params) {
+ 	return request({
+ 		url: '/api/front/card/product/order/help/list',
+ 		method: 'get',
+ 		params
+ 	})
+ }
+ //用户详情 /api/front/community/user/home/page/{id}
+ export function userInfo(id) {
+ 	return request({
+ 		url: `/api/front/community/user/home/page/${id}`,
+ 		method: 'get'
+ 	})
+ }
+ 
+ //我的收藏 卡券商品收藏 列表/api/front/card/product/collect/product/list
+ export function getCardCollectList(params) {
+ 	return request({
+ 		url: '/api/front/card/product/collect/product/list',
+ 		method: 'get',
+ 		params
+ 	})
+ }
+ // 我的收藏 积分商品收藏列表 /  /api/front/integral/product/reply/product/list
+ export function getCardReplyList(params) {
+ 	return request({
+ 		url: '/api/front/integral/product/reply/product/list',
+ 		method: 'get',
+ 		params
+ 	})
+ }
+ // 核销券(卡券)列表
+ export function getFrontCardList(params) {
+ 	return request({
+ 		url: '/api/front/card/user/page/list',
+ 		method: 'get',
+ 		params
+ 	})
+ }
+ //卡券门店列表  
+  export function getFrontCardUserList(data) {
+  	return request({
+  		url: '/api/front/card/user/merchant/list',
+  		method: 'post',
+  		data
+  	})
+  }
+  // 优惠券列表 /api/front/coupon/user/list
+  export function getFrontCouponUserList(params) {
+  	return request({
+  		url: '/api/front/coupon/user/list',
+  		method: 'get',
+  		params
+  	})
+  }
+  //修改卡券  /api/front/card/user/edit
+  export function cardUserEdit(data) {
+  	return request({
+  		url: '/api/front/card/user/edit',
+  		method: 'post',
+  		data
+  	})
+  }
+  //卡券详情 /api/front/card/user/info/{id}
+  export function cardUserInfo(id) {
+  	return request({
+  		url: `/api/front/card/user/info/${id}`,
+  		method: 'get'
+  	})
+  }
+  

data/menu.js

@@ -1,47 +1,47 @@
 export const mineMenu = [{
 	id: 1,
 	name: '我的消息',
-	url: '/pages/message/message'
+	url: '/pages/driver/message/message'
 }, {
 	id: 2,
 	name: '我的订单',
-	url: '/pages/mine/my_order/my_order'
+	url: '/pages/driver/mine/my_order/my_order'
 }, {
 	id: 3,
 	name: '我的活动',
-	url: '/pages/mine/my_activity/my_activity'
+	url: '/pages/driver/mine/my_activity/my_activity'
 }, {
 	id: 4,
 	name: '天天打卡',
-	url: '/pages/welfare/task/task'
+	url: '/pages/driver/welfare/task/task'
 }, {
 	id: 5,
 	name: '我的钱包',
-	url: '/pages/mine/wallet/wallet'
+	url: '/pages/driver/mine/wallet/wallet'
 }, {
 	id: 6,
 	name: '我的收藏',
-	url: '/pages/mine/my_favorite/my_favorite'
+	url: '/pages/driver/mine/my_favorite/my_favorite'
 }, {
 	id: 7,
 	name: '邀请有礼',
-	url: '/pages/welfare/invite/invite'
+	url: '/pages/driver/welfare/invite/invite'
 }, {
 	id: 8,
 	name: '绑定微信',
-	url: '/pages/mine/binding_wx/binding_wx'
+	url: '/pages/driver/mine/binding_wx/binding_wx'
 }, {
 	id: 9,
 	name: '我的认证',
-	url: '/pages/mine/my_authentication/my_authentication'
+	url: '/pages/driver/mine/my_authentication/my_authentication'
 }, {
 	id: 10,
 	name: '车辆信息',
-	url: '/pages/mine/car_info/car_info'
+	url: '/pages/driver/mine/car_info/car_info'
 }, {
 	id: 11,
 	name: '我的卡包',
-	url: '/pages/mine/my_card_bag/my_card_bag'
+	url: '/pages/driver/mine/my_card_bag/my_card_bag'
 }, {
 	id: 12,
 	name: '商务合作',
@@ -49,9 +49,9 @@ export const mineMenu = [{
 }, {
 	id: 13,
 	name: '常见问题',
-	url: '/pages/mine/common_problem/common_problem'
+	url: '/pages/driver/mine/common_problem/common_problem'
 }, {
 	id: 14,
 	name: '关于我们',
-	url: '/pages/mine/about_us/about_us'
+	url: '/pages/driver/mine/about_us/about_us'
 }, ]

data/tabsData2.js

@@ -0,0 +1,146 @@
+export const tabsList1 = [{
+	name: '租车',
+	value: 1
+}, {
+	name: '买车',
+	value: 2
+}, {
+	name: '动态',
+	value: 3
+}, {
+	name: '问答',
+	value: 4
+}, {
+	name: '咨询',
+	value: 5
+}, {
+	name: '积分',
+	value: 6
+}, {
+	name: '卡券',
+	value: 7
+}]
+
+export const tabsList2 = [{
+	name: '全部',
+	value: -1
+}, {
+	name: '助力中',
+	value: 0
+}, {
+	name: '助理成功',
+	value: 1
+}, {
+	name: '助力失败',
+	value: 2
+}]
+export const tabsList3 = [{
+	name: '全部',
+	value: 1
+}, {
+	name: '未提车',
+	value: 2
+}, {
+	name: '已完成',
+	value: 3
+}, {
+	name: '已退款',
+	value: 4
+}]
+export const tabsList4 = [{
+	name: '全部',
+	value: 1
+}, {
+	name: '未提车',
+	value: 2
+}, {
+	name: '租赁期',
+	value: 3
+}, {
+	name: '已完成',
+	value: 4
+}, {
+	name: '评价',
+	value: 5
+}, {
+	name: '已退款',
+	value: 6
+}]
+export const tabsList5 = [{
+	name: '工单订单',
+	value: 1
+}, {
+	name: '积分订单',
+	value: 2
+}, {
+	name: '卡券订单',
+	value: 3
+}]
+export const tabsList6 = [{
+	name: '全部',
+	value: -1
+}, {
+	name: '代付款',
+	value: 0
+}, {
+	name: '待使用',
+	value: 1
+}, {
+	name: '已完成',
+	value: 2
+}]
+
+export const tabsList7 = [{
+	name: '全部',
+	value: 1,
+	type: 'all'
+}, {
+	name: '待受理',
+	value: 2,
+	type: 'ucheck'
+}, {
+	name: '已确认',
+	value: 3,
+	type: 'notArrive'
+}, {
+	name: '已完成',
+	value: 4,
+	type: 'finish'
+}, {
+	name: '已驳回',
+	value: 5,
+	type: 'reject'
+}]
+
+export const indexTabList = [{
+	name: '广场',
+	value: 1,
+	type: 'true'
+}, {
+	name: '关注',
+	value: 3,
+	type: 'true'
+}, {
+	name: '转租',
+	value: 2,
+	type: 'true'
+}, {
+	name: '此地',
+	value: 4,
+	type: 'true'
+}, {
+	name: '咨询',
+	value: 5,
+	type: 'true'
+
+}]
+export const tabsList8 = [{
+	name: '全部卡券',
+	value: 1
+}, {
+	name: '限时优惠',
+	value: 2
+}, {
+	name: '助力抢券',
+	value: 3
+}]

pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [{
+			"path": "pages/driver/index/index",
+			"style": {
+				"navigationBarTitleText": "发现",
+				"navigationStyle": "custom"
+			}
+		},{
 			"path": "pages/repair/tabbar/repair",
 			"style": {
 				"navigationBarTitleText" : "首页",
@@ -479,12 +485,6 @@
 			"style": {
 				"navigationBarTitleText": "浏览文本"
 			}
-		},{
-			"path": "pages/driver/index/index",
-			"style": {
-				"navigationBarTitleText": "发现",
-				"navigationStyle": "custom"
-			}
 		},
 		{
 			"path": "pages/driver/mine/index",
@@ -518,6 +518,426 @@
 				"enablePullDownRefresh" : false,
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/my_order",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_activity/my_activity",
+			"style": {
+				"navigationBarTitleText": "我的活动",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/welfare/task/task",
+			"style": {
+				"navigationBarTitleText": "天天打卡",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/wallet/wallet",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_favorite/my_favorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},{
+			"path": "pages/driver/welfare/invite/invite",
+			"style": {
+				"navigationBarTitleText": "邀请有礼",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/binding_wx/binding_wx",
+			"style": {
+				"navigationBarTitleText": "绑定微信",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_authentication/my_authentication",
+			"style": {
+				"navigationBarTitleText": "我的认证",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/car_info/car_info",
+			"style": {
+				"navigationBarTitleText": "车辆信息",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/driver/mine/car_info/carUnbind",
+			"style": {
+				"navigationBarTitleText": "解绑车辆",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_binding",
+			"style": {
+				"navigationBarTitleText": "绑定车辆",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_card_bag/my_card_bag",
+			"style": {
+				"navigationBarTitleText": "我的卡包",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/common_problem/common_problem",
+			"style": {
+				"navigationBarTitleText": "常见问题",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/about_us/about_us",
+			"style": {
+				"navigationBarTitleText": "关于我们",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_user/my_user",
+			"style": {
+				"navigationBarTitleText": "个人资料",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/set/set",
+			"style": {
+				"navigationBarTitleText": "设置",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_ttention/my_ttention",
+			"style": {
+				"navigationBarTitleText": "我的关注",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_integral/my_integral",
+			"style": {
+				"navigationBarTitleText": "我的积分",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/personal_center/personal_center",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/serveOrder/serve_order",
+			"style": {
+				"navigationBarTitleText": "服务订单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/rentCars/rent_order",
+			"style": {
+				"navigationBarTitleText": "租车订单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/buyCars/buy_cars_order",
+			"style": {
+				"navigationBarTitleText": "买车订单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_evaluate/my_evaluate",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_evaluate/my_card_evaluate",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/refund/refund",
+			"style": {
+				"navigationBarTitleText": "申请退款",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_evaluate/my_review",
+			"style": {
+				"navigationBarTitleText": "评价详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_evaluate/evaluate_issue",
+			"style": {
+				"navigationBarTitleText": "发布评价",
+				"enablePullDownRefresh": false
+			}
+		} ,{
+			"path": "pages/driver/serve/coupons/payresult",
+			"style": {
+				"navigationBarTitleText": "支付结果",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/serveOrder/serve_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单卡券详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/serveOrder/integral_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单积分详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/serveOrder/work_particulars",
+			"style": {
+				"navigationBarTitleText": "服务订单工单详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_evaluate/my_review",
+			"style": {
+				"navigationBarTitleText": "评价详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/driver/serve/coupons/coupons",
+			"style": {
+				"navigationBarTitleText": "卡券",
+				"enablePullDownRefresh" : false
+			}
+		}, {
+			"path": "pages/driver/serve/coupons/cou_order",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/coupons/cou_detail_reply",
+			"style": {
+				"navigationBarTitleText": "用户评价",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/coupons/cou_card",
+			"style": {
+				"navigationBarTitleText": "选择优惠券",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path" : "pages/driver/mine/my_activity/detail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "卡券详情",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_card_bag/card_detail_page",
+			"style": {
+				"navigationBarTitleText": "核销券",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/driver/serve/coupons/cou_detail",
+			"style": {
+				// "navigationBarTitleText": "卡券详情"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
+		},  {
+			"path": "pages/driver/serve/coupons/cou_store",
+			"style": {
+				"navigationBarTitleText": "门店列表",
+				"enablePullDownRefresh" : false
+			}
+		}, {
+			"path": "pages/driver/serve/activity_list",
+			"style": {
+				"navigationBarTitleText": "助力活动",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/hot_list",
+			"style": {
+				"navigationBarTitleText": "热销推荐",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path" : "pages/driver/welfare/rightsInterests/rightsInterests",
+			"style" : 
+			{
+				"navigationBarTitleText" : "积分权益",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/repair",
+			"style": {
+				"navigationBarTitleText": "维修",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_create/select_store",
+			"style": {
+				"navigationBarTitleText": "常规保养",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path" : "pages/driver/welfare/rightsInterests/rightsInterests_particulars",
+			"style" : 
+			{
+				"navigationBarTitleText" : "积分权益商品详情",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom"
+			}
+		},	{
+			"path" : "pages/driver/welfare/rightsInterests/confirm_order",
+			"style" : 
+			{
+				"navigationBarTitleText" : "确认订单",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path" : "pages/driver/welfare/payment_state/payment_state",
+			"style" : 
+			{
+				"navigationBarTitleText" : "支付结果",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_create/select_city",
+			"style": {
+				"navigationBarTitleText": "搜索城市",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_create/select_time",
+			"style": {
+				"navigationBarTitleText": "预约时间",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_create/result",
+			"style": {
+				"navigationBarTitleText": "维修预约",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/re_create/reservation",
+			"style": {
+				"navigationBarTitleText": "维修预约",
+				"enablePullDownRefresh" : false
+			}
+		},{
+			"path": "pages/driver/serve/repair/realname",
+			"style": {
+				"navigationBarTitleText": "完善资料",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path": "pages/driver/mine/my_order/refund/refund_x",
+			"style": {
+				"navigationBarTitleText": "退款详情",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/driver/welfare/task/integral",
+			"style": {
+				"navigationBarTitleText": "积分明细",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F2F5F9"
+			}
+		}, {
+			"path": "pages/driver/mine/wallet/topUp",
+			"style": {
+				"navigationBarTitleText": "钱包充值"
+			}
+		}, {
+			"path": "pages/driver/mine/wallet/withdrawDeposit",
+			"style": {
+				"navigationBarTitleText": "提现"
+			}
+		},
+		{
+			"path": "pages/driver/welfare/invite/invite_register",
+			"style": {
+				"navigationBarTitleText": "邀请注册",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path" : "pages/driver/index/post",
+			"style" :  {
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
+			}
+			},
+		{
+			"path": "pages/driver/welfare/invite/invite_commission",
+			"style": {
+				"navigationBarTitleText": "邀请购买",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/driver/welfare/invite/invite_poster",
+			"style": {
+				"navigationBarTitleText": "邀请海报",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"tabBar": {

pages/driver/index/index.vue

@@ -28,7 +28,7 @@
 					<!-- #endif -->
 					<text>搜索</text>
 				</view>
-				<u-icon name="plus" size="22" @click="$tab.navigateTo(`./post?type=${actTabType}`)" />
+				<u-icon name="plus" size="22" @click="$tab.navigateTo(`/pages/driver/index/post?type=${actTabType}`)" />
 			</view>
 			<!-- tab蓝 -->
 			<view class="tab-box">

pages/driver/message/message.vue

@@ -61,7 +61,7 @@
 				</u-swipe-action>
 			</u-list>
 		</view>
-		<tabbar-carshop current="/pages/carShop/message/message"></tabbar-carshop>
+		<!-- <tabbar-carshop current="/pages/carShop/message/message"></tabbar-carshop> -->
 		
 		<u-popup :show="showClear" mode="center" @close="showClear=false" :safeAreaInsetBottom='false'>
 			<view class="allView">
@@ -78,7 +78,7 @@
 
 <script>
 	import config from "@/config"
-	import tabbarCarshop from '@/components/tabbar-carshop/tabbar-carshop.vue'
+	// import tabbarCarshop from '@/components/tabbar-carshop/tabbar-carshop.vue'
 	import { getUnReadAPI } from '@/api/serve/message'
 
 	import {
@@ -88,9 +88,9 @@
 		SendMmsg
 	} from '@/api/message/index.js';
 	export default {
-		components: {
-			tabbarCarshop
-		},
+		// components: {
+		// 	tabbarCarshop
+		// },
 		data() {
 			return {
 				config,
@@ -239,9 +239,7 @@
 			},
 			
 			goBack(){
-				uni.navigateBack({
-					url:`/pages/serve/index`
-				})
+				uni.navigateBack()
 			},
 			// 打开清除弹层
 			openClear(){

pages/driver/mine/car_info/car_info.vue

@@ -96,13 +96,13 @@
 				console.log('去绑定');
 				this.isShow = false
 				uni.navigateTo({
-					url: '/pages/serve/repair/re_binding'
+					url: '/pages/driver/serve/repair/re_binding'
 				})
 			},
 			toUnbindPages() {
 				console.log('去解绑');
 				uni.navigateTo({
-					url: '/pages/mine/car_info/carUnbind'
+					url: '/pages/driver/mine/car_info/carUnbind'
 				})
 			}
 		}

pages/driver/mine/index.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="user-right rel">
-				<view class="setting abs" @click="navTtentionFn('/pages/mine/set/set')">
+				<view class="setting abs" @click="navTtentionFn('/pages/driver/mine/set/set')">
 					<!-- #ifdef MP-WEIXIN -->
 					<image :src="`${config.aliyunOssUrl}/static/images/app/mine/setting.png`" mode=""></image>
 					<!-- #endif -->
@@ -47,7 +47,7 @@
 		</view>
 		<view class="data-show flex align-center justify-between bg-white">
 			<view class="data-item flex-column align-center justify-between"
-				@click="navTtentionFn('/pages/mine/my_ttention/my_ttention?type=1')">
+				@click="navTtentionFn('/pages/driver/mine/my_ttention/my_ttention?type=1')">
 				<view class="c111 f-32">
 					{{userInfo.concernedNum}}
 				</view>
@@ -56,7 +56,7 @@
 				</view>
 			</view>
 			<view class="data-item flex-column align-center justify-between"
-				@click="navTtentionFn('/pages/mine/my_ttention/my_ttention?type=2')">
+				@click="navTtentionFn('/pages/driver/mine/my_ttention/my_ttention?type=2')">
 				<view class="c111 f-32">
 					{{userInfo.fansNum}}
 				</view>
@@ -65,7 +65,7 @@
 				</view>
 			</view>
 			<view class="data-item flex-column align-center justify-between"
-				@click="navTtentionFn('/pages/mine/my_integral/my_integral')">
+				@click="navTtentionFn('/pages/driver/mine/my_integral/my_integral')">
 				<view class="c111 f-32">
 					{{userInfo.integral}}
 				</view>
@@ -74,7 +74,7 @@
 				</view>
 			</view>
 			<view class="data-item flex-column align-center justify-between"
-				@click="navTtentionFn(`/pages/mine/personal_center/personal_center?uid=${userInfo.id}`)">
+				@click="navTtentionFn(`/pages/driver/mine/personal_center/personal_center?uid=${userInfo.id}`)">
 				<view class="c111 f-32">
 					{{userInfo.noteNum}}
 				</view>
@@ -117,7 +117,7 @@
 
 <script>
 	import { mineMenu } from '@/data/menu';
-	import { getUserInfo, userCenterInfo, userCenterPersonalInfo } from "@/api/system/user.js"
+	import { getUserUserInfo, userCenterInfo, userCenterPersonalInfo } from "@/api/system/user.js"
 	import { userInfo, } from "@/api/user/index.js"
 	import config from '@/config';
 	export default {
@@ -150,7 +150,6 @@
 			// })
 			// })
 			userCenterPersonalInfo().then(res => {
-				console.log(res, '7777777777777');
 				this.userInfo = res.data
 				this.avatar = res.data.avatar
 				uni.setStorageSync('userInfo', this.userInfo)
@@ -160,7 +159,7 @@
 			//个人信息
 			navUserInfoFn() {
 				uni.navigateTo({
-					url: "/pages/mine/my_user/my_user"
+					url: "/pages/driver/mine/my_user/my_user"
 				})
 			},
 			checkedSign() {

pages/driver/mine/my_activity/my_activity.vue

@@ -32,7 +32,7 @@
 					<view class="data-list-leg f-jcsb">
 						<view class="f-a-i">
 							<image v-for="(img,index) in 3" :style="{marginLeft: index>1?'-8rpx':''}"
-								src="../../../static/logo.png" mode=""></image>
+								src="@/static/logo.png" mode=""></image>
 							<image style="margin-left: -8rpx;background: rgba(0, 0, 0, 0.3);"
 								src="@/static/images/app/mine/more.png" mode=""></image>
 							<view class="data-list-leg-num">10人</view>
@@ -52,7 +52,7 @@
 <script>
 	import {
 		tabsList2
-	} from "@/data/tabsData.js"
+	} from "@/data/tabsData2.js"
 	import {
 		getCardHelpList
 	} from "@/api/user/index.js"
@@ -83,7 +83,6 @@
 						item.labels = JSON.parse(item.labels)
 						console.log(item.labels);
 					})
-
 					this.$refs.paging.complete(res.data.list);
 				})
 			}

pages/driver/mine/my_authentication/my_authentication.vue

@@ -30,7 +30,7 @@
 <script>
 	import config from '@/config';
 	import { realNameDetaiNowlAPI} from '@/api/serve/repair'
-	import popup from '@/pages/serve/repair/popup'
+	import popup from '@/pages/driver/serve/repair/popup'
 	export default {
 		components: { popup },
 		data() {

pages/driver/mine/my_card_bag/my_card_bag.vue

@@ -125,7 +125,7 @@
 			//优惠券去使用 
 			navCouponsFn() {
 				uni.navigateTo({
-					url: '/pages/serve/coupons/coupons'
+					url: '/pages/driver/serve/coupons/coupons'
 				})
 			},
 			//确认选择门店
@@ -175,7 +175,7 @@
 			//核销详情
 			navDetailFn(item) {
 				uni.navigateTo({
-					url: `/pages/mine/my_card_bag/card_detail_page?id=${item.id}`
+					url: `/pages/driver/mine/my_card_bag/card_detail_page?id=${item.id}`
 				})
 			},
 			// 一级tab

pages/driver/mine/my_evaluate/evaluate_issue.vue

@@ -112,14 +112,14 @@
 				this.pushData.merName = this.orderObj.merName
 				if (this.typeOne == 1) {
 					getCarOrderSave(this.pushData).then(res => {
-						uni.navigateTo({
-							url: `/pages/mine/my_evaluate/my_review?isShowView=${this.isShowView}&evaluateData=${encodeURIComponent(JSON.stringify(this.pushData))}&orderId=${this.orderObj.id}&typeOne=${this.pushData}`
+						uni.redirectTo({
+							url: `/pages/driver/mine/my_evaluate/my_review?isShowView=${this.isShowView}&evaluateData=${encodeURIComponent(JSON.stringify(this.pushData))}&orderId=${this.orderObj.id}&typeOne=${this.pushData}`
 						});
 					})
 				} else {
 					getRrontOrderReply(this.pushData).then(res => {
-						uni.navigateTo({
-							url: `/pages/mine/my_evaluate/my_review?isShowView=${this.isShowView}&evaluateData=${encodeURIComponent(JSON.stringify(this.pushData))}&orderId=${this.orderObj.id}&typeOne=${this.pushData}`
+						uni.redirectTo({
+							url: `/pages/driver/mine/my_evaluate/my_review?isShowView=${this.isShowView}&evaluateData=${encodeURIComponent(JSON.stringify(this.pushData))}&orderId=${this.orderObj.id}&typeOne=${this.pushData}`
 						});
 					})
 				}

pages/driver/mine/my_favorite/my_favorite.vue

@@ -30,7 +30,7 @@
 						<u-icon v-else name="checkmark-circle-fill" color="#13AFA8" size="16"></u-icon>
 					</view>
 					<view :class="['f-a-i','car-rental',actFlaf?'act-flaf':'']">
-						<image src="@/static/images/app/serve/serve_zuche.png" mode=""></image>
+						<image src="@/static/favicon.ico" mode=""></image>
 						<view class="car-rental-cont">
 							<view class="car-rental-cont-name">汽车标题</view>
 							<view class="car-rental-cont-auto-age">车龄 1年 | 租期 1年</view>
@@ -47,7 +47,7 @@
 						<u-icon v-else name="checkmark-circle-fill" color="#13AFA8" size="16"></u-icon>
 					</view>
 					<view :class="['f-a-i','car-rental',actFlaf?'act-flaf':'']">
-						<image src="@/static/images/app/serve/serve_zuche.png" mode=""></image>
+						<image src="@/static/favicon.ico" mode=""></image>
 						<view class="car-rental-cont">
 							<view class="car-rental-cont-name">汽车标题</view>
 							<view class="f-a-i">
@@ -80,7 +80,7 @@
 								text="关于uView的取名来由，首字母u来自于uni-app首字母,uni-app是基Vuejs，Vue和View(延伸为UI、视图之意)同音，同时view组件uni-app中最础最重要的故取名uView，表达源于uni-app和Vue之意，同时在此也对它示感谢。"></u--text>
 						</view>
 						<view>
-							<image style="width: 100%;height: 386rpx;" src="@/static/images/app/serve/serve_zuche.png"
+							<image style="width: 100%;height: 386rpx;" src="@/static/favicon.ico"
 								mode=""></image>
 						</view>
 						<view class="f-jce dynamic-condition-operate">
@@ -205,7 +205,7 @@
 						<u-icon v-else name="checkmark-circle-fill" color="#13AFA8" size="16"></u-icon>
 					</view>
 					<view :class="['f-a-i','car-rental',actFlaf?'act-flaf':'']">
-						<image src="@/static/images/app/serve/serve_zuche.png" mode=""></image>
+						<image src="@/static/favicon.ico" mode=""></image>
 						<view class="car-rental-cont">
 							<view class="">
 								<u--text :lines="2" size="14"
@@ -317,7 +317,7 @@
 	} from "@/api/welfare/welfare.js"
 	import {
 		tabsList1
-	} from "@/data/tabsData.js"
+	} from "@/data/tabsData2.js"
 	import config from '@/config';
 	export default {
 		components: {

pages/driver/mine/my_order/buyCars/buy_cars_order.vue

@@ -56,7 +56,7 @@
 <script>
 	import {
 		tabsList3
-	} from "@/data/tabsData.js"
+	} from "@/data/tabsData2.js"
 	import config from '@/config';
 	export default {
 		data() {

pages/driver/mine/my_order/my_order.vue

@@ -13,7 +13,7 @@
 			</view>
 		</u-navbar>
 		<view class="user-order-type f-a-i f-jcsb"
-			@click="navOrderListFn('/pages/mine/my_order/serveOrder/serve_order')">
+			@click="navOrderListFn('/pages/driver/mine/my_order/serveOrder/serve_order')">
 			<view>服务订单(1)</view>
 			<u-icon name="arrow-right" color="#999" size="18"></u-icon>
 		</view>
@@ -40,14 +40,14 @@
 				<view>{{cardData.arriveTime}}</view>
 			</view>
 		</view>
-		<view class="user-order-type f-a-i f-jcsb" @click="navOrderListFn('/pages/mine/my_order/rentCars/rent_order')">
+		<view class="user-order-type f-a-i f-jcsb" @click="navOrderListFn('/pages/driver/mine/my_order/rentCars/rent_order')">
 			<view>租车订单(1)</view>
 			<u-icon name="arrow-right" color="#999" size="18"></u-icon>
 		</view>
 		<view class="car-rental-order">
 			<view class="user-data f-a-i">
 				<view class="user-data-image">
-					<image src="../../../static/images/tabbar/mine.png" mode=""></image>
+					<image src="@/static/images/tabbar/mine.png" mode=""></image>
 				</view>
 				<view class="user-data-name">浙江元江之星</view>
 			</view>
@@ -62,7 +62,7 @@
 			</view>
 		</view>
 		<view class="user-order-type f-a-i f-jcsb"
-			@click="navOrderListFn('/pages/mine/my_order/buyCars/buy_cars_order')">
+			@click="navOrderListFn('/pages/driver/mine/my_order/buyCars/buy_cars_order')">
 			<view>买车订单(1)</view>
 			<u-icon name="arrow-right" color="#999" size="18"></u-icon>
 		</view>

pages/driver/mine/my_order/rentCars/rent_order.vue

@@ -69,7 +69,7 @@
 <script>
 	import {
 		tabsList4
-	} from "@/data/tabsData.js"
+	} from "@/data/tabsData2.js"
 	import config from '@/config';
 	export default {
 		data() {

pages/driver/mine/my_order/serveOrder/serve_order.vue

@@ -146,7 +146,7 @@
 									<u-button text="重新下单" plain color="#333333" shape="circle"
 										:customStyle="{height:'56rpx'}"></u-button>
 								</view>
-								<view v-if="item.status==1" class="butt-list">
+								<view v-if="item.status==1" class="butt-list" @click.stop="navRefundFn(item)">
 									<u-button text="申请退款" plain color="#333333" shape="circle"
 										:customStyle="{height:'56rpx'}"></u-button>
 								</view>
@@ -314,7 +314,7 @@
 		tabsList4,
 		tabsList6,
 		tabsList7
-	} from "@/data/tabsData.js"
+	} from "@/data/tabsData2.js"
 	import {
 		getReservationList,
 		getIntegralOrderList,
@@ -364,11 +364,11 @@
 						this.topUpTypeShow = false
 						console.log(res, '支付返回数据');
 						uni.navigateTo({
-							url: `/pages/serve/coupons/payresult?resultType=res`
+							url: `/pages/driver/serve/coupons/payresult?resultType=res`
 						})
 					}).catch(err => {
 						uni.navigateTo({
-							url: `/pages/serve/coupons/payresult?resultType=err`
+							url: `/pages/driver/serve/coupons/payresult?resultType=err`
 						})
 					})
 				} else {
@@ -419,7 +419,7 @@
 			//去卡包  pages/mine/my_card_bag/my_card_bag
 			navCardBagFn() {
 				uni.navigateTo({
-					url: '/pages/mine/my_card_bag/my_card_bag'
+					url: '/pages/driver/mine/my_card_bag/my_card_bag'
 				})
 			},
 			//去评价
@@ -427,11 +427,11 @@
 				console.log(this.typeOne, '去评价');
 				if (item.isReply == 0) {
 					uni.navigateTo({
-						url: `/pages/mine/my_evaluate/evaluate_issue?typeOne=${this.typeOne}&orderSn=${item.orderSn}&id=${item.id}`
+						url: `/pages/driver/mine/my_evaluate/evaluate_issue?typeOne=${this.typeOne}&orderSn=${item.orderSn}&id=${item.id}`
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/mine/my_evaluate/my_review?typeOne=${this.typeOne}`
+						url: `/pages/driver/mine/my_evaluate/my_review?typeOne=${this.typeOne}`
 					})
 				}
 			},
@@ -439,18 +439,18 @@
 			navRefundFn(item) {
 				console.log(item);
 				uni.navigateTo({
-					url: `/pages/mine/my_order/refund/refund?type=1&orderNo=${item.orderNo}&payPrice=${item.payPrice}`
+					url: `/pages/driver/mine/my_order/refund/refund?type=1&orderNo=${item.orderNo}&payPrice=${item.payPrice}`
 				})
 			},
 			//我的评价
 			navMyevaluateFn() {
 				if (this.typeOne == 1) {
 					uni.navigateTo({
-						url: `/pages/mine/my_evaluate/my_evaluate`
+						url: `/pages/driver/mine/my_evaluate/my_evaluate`
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/mine/my_evaluate/my_card_evaluate`
+						url: `/pages/driver/mine/my_evaluate/my_card_evaluate`
 					})
 				}
 			},
@@ -458,15 +458,15 @@
 			navAnewPlaceFn() {
 				if (this.typeOne == 3) {
 					uni.redirectTo({
-						url: '/pages/serve/coupons/coupons'
+						url: '/pages/driver/serve/coupons/coupons'
 					})
 				} else if (this.typeOne == 2) {
 					uni.redirectTo({
-						url: '/pages/welfare/rightsInterests/rightsInterests'
+						url: '/pages/driver/welfare/rightsInterests/rightsInterests'
 					})
 				} else {
 					uni.redirectTo({
-						url: '/pages/serve/repair/repair'
+						url: '/pages/driver/serve/repair/repair'
 					})
 				}
 			},
@@ -475,15 +475,15 @@
 				console.log(this.typeOne);
 				if (this.typeOne == 3) {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/serve_particulars?id=${item.id}`
+						url: `/pages/driver/mine/my_order/serveOrder/serve_particulars?id=${item.id}`
 					})
 				} else if (this.typeOne == 2) {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/integral_particulars?id=${item.id}`
+						url: `/pages/driver/mine/my_order/serveOrder/integral_particulars?id=${item.id}`
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/mine/my_order/serveOrder/work_particulars?id=${item.orderSn}`
+						url: `/pages/driver/mine/my_order/serveOrder/work_particulars?id=${item.orderSn}`
 					})
 				}
 			},

pages/driver/mine/my_order/serveOrder/serve_particulars.vue

@@ -214,11 +214,11 @@
 					paycardAPI(this.payData).then(res=>{
 						this.topUpTypeShow = false
 						uni.navigateTo({
-							url:`/pages/serve/coupons/payresult?resultType=res`
+							url:`/pages/driver/serve/coupons/payresult?resultType=res`
 						})
 					}).catch(err=>{
 						uni.navigateTo({
-							url:`/pages/serve/coupons/payresult?resultType=err`
+							url:`/pages/driver/serve/coupons/payresult?resultType=err`
 						})
 					})
 				}else{
@@ -241,25 +241,25 @@
 			//去卡包
 			navCardBagFn(url) {
 				uni.redirectTo({
-					url: '/pages/mine/my_card_bag/my_card_bag'
+					url: '/pages/driver/mine/my_card_bag/my_card_bag'
 				})
 			},
 			//申请退款
 			navRefundFn() {
 				uni.navigateTo({
-					url: `/pages/mine/my_order/refund/refund?type=1&orderNo=${this.orderData.orderNo}&payPrice=${this.orderData.payPrice}`
+					url: `/pages/driver/mine/my_order/refund/refund?type=1&orderNo=${this.orderData.orderNo}&payPrice=${this.orderData.payPrice}`
 				})
 			},
 			//查看退款进度
 			navRefundDataFn() {
 				uni.navigateTo({
-					url: `/pages/mine/my_order/refund/refund_x?type=1&orderNo=${this.orderData.orderNo}`
+					url: `/pages/driver/mine/my_order/refund/refund_x?type=1&orderNo=${this.orderData.orderNo}`
 				})
 			},
 			//重新下单  pages/serve/coupons/coupons
 			navAnewPlaceFn(){
 				uni.redirectTo({
-					url: '/pages/serve/coupons/coupons'
+					url: '/pages/driver/serve/coupons/coupons'
 				})
 			},
 			//返回

pages/driver/mine/my_user/my_user.vue

@@ -48,7 +48,7 @@
 			<view class="container-title">
 				绑定微信
 			</view>
-			<view class="flex align-center container-cont">
+			<view class="flex align-center container-cont" @click="navAuthenticationFn('wx')">
 				{{userInfo.isWechat?'已绑定':'未绑定'}}
 				<u-icon name="arrow-right" />
 			</view>
@@ -131,10 +131,16 @@
 		computed: {},
 		methods: {
 			//去认证
-			navAuthenticationFn() {
-				uni.navigateTo({
-					url: '/pages/mine/my_authentication/my_authentication'
-				})
+			navAuthenticationFn(type) {
+				if(type=='wx'){
+					uni.navigateTo({
+						url: '/pages/driver/mine/binding_wx/binding_wx'
+					})
+				}else{
+					uni.navigateTo({
+						url: '/pages/driver/mine/my_authentication/my_authentication'
+					})
+				}
 			},
 			// 保存昵称
 			changeNickname() {

pages/driver/mine/personal_center/personal_center.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 			<view>
-				<u-navbar title="''" safeAreaInsetTop placeholder bgColor="#f5f5f5">
+				<u-navbar :title="''" safeAreaInsetTop placeholder bgColor="#f5f5f5">
 					<view class="u-nav-slot" slot="left" @click="$tab.navigateBack">
 						<u-icon name="arrow-left" size="19"></u-icon>
 					</view>
@@ -249,7 +249,7 @@
 			//个人信息
 			navUserInfoFn() {
 				uni.navigateTo({
-					url: "/pages/mine/my_user/my_user"
+					url: "/pages/driver/mine/my_user/my_user"
 				})
 			},
 			// 点赞

pages/driver/mine/wallet/wallet.vue

@@ -112,14 +112,13 @@
 			topUpFn(type) {
 				if (type == 2) {
 					uni.navigateTo({
-						url: '/pages/mine/wallet/topUp'
+						url: '/pages/driver/mine/wallet/topUp'
 					})
 				} else {
 					uni.navigateTo({
-						url: '/pages/mine/wallet/withdrawDeposit'
+						url: '/pages/driver/mine/wallet/withdrawDeposit'
 					})
 				}
-
 			},
 			navBackFn() {
 				uni.navigateBack()
@@ -135,11 +134,11 @@
 				width: 750rpx;
 				height: 524rpx;
 				// #ifndef MP
-				background-image: url('../../../static/images/app/mine/wallet-bg.png');
+				background-image: url('@/static/images/app/mine/wallet-bg.png');
 				background-size: cover;
 				// #endif
 				// #ifdef MP
-				background-image: url('../../../static/images/app/mine/wallet-bg.png');
+				background-image: url('@/static/images/app/mine/wallet-bg.png');
 				background-size: cover;
 
 				// #endif

pages/driver/serve/activity_list.vue

@@ -35,7 +35,7 @@
 			toMyactivityPages(item){
 				console.log(item,'列表--活动详情');
 				uni.navigateTo({
-					url:`/pages/serve/hot_list?type=help&id=${item && item.id}&name=${item && item.name}`
+					url:`/pages/driver/serve/hot_list?type=help&id=${item && item.id}&name=${item && item.name}`
 				})
 				// uni.navigateTo({
 				// 	url:`/pages/mine/my_activity/detail`

pages/driver/serve/coupons/cou_detail.vue

@@ -181,7 +181,7 @@
 	import { getCardProductInfoAPI , collectAPI , unCollectAPI , replyListAPI } from '@/api/serve/coupons'
 	import config from '@/config';
 	import { mapGetters } from 'vuex'
-import { merchantInfo } from '../../../api/system/config';
+import { merchantInfo } from '@/api/system/config';
 	export default {
 		data(){
 			return {
@@ -193,7 +193,7 @@ import { merchantInfo } from '../../../api/system/config';
 				starValue: 4, // 评价星
 				id:null, // 卡券id
 				cardInfo:{},
-				storeBackImage:'../../../static/images/app/serve/repair_refund.png',
+				storeBackImage:'@/static/images/app/serve/repair_refund.png',
 				nowTime:'', 
 				merchantObj:{},
 				replyData:{
@@ -289,7 +289,7 @@ import { merchantInfo } from '../../../api/system/config';
 			// 用户评价
 			toReply(){
 				uni.navigateTo({
-					url:`/pages/serve/coupons/cou_detail_reply?id=${this.cardInfo.id}`
+					url:`/pages/driver/serve/coupons/cou_detail_reply?id=${this.cardInfo.id}`
 				})
 			},
 			
@@ -306,7 +306,7 @@ import { merchantInfo } from '../../../api/system/config';
 						this.$store.dispatch('Cardmoney',null)
 						// 确认订单
 						uni.navigateTo({
-							url:`/pages/serve/coupons/cou_order`
+							url:`/pages/driver/serve/coupons/cou_order`
 						})
 					}else if (num===2){
 						// console.log('已经结束');
@@ -317,7 +317,7 @@ import { merchantInfo } from '../../../api/system/config';
 						this.$store.dispatch('Cardmoney',null)
 						// 确认订单
 						uni.navigateTo({
-							url:`/pages/serve/coupons/cou_order`
+							url:`/pages/driver/serve/coupons/cou_order`
 						})
 					}
 				}else{
@@ -328,12 +328,12 @@ import { merchantInfo } from '../../../api/system/config';
 			toStorePages(){
 				console.log(this.cardInfo.merchantList,'123');
 				uni.navigateTo({
-					url:`/pages/serve/coupons/cou_store`
+					url:`/pages/driver/serve/coupons/cou_store`
 				})
 			},
 			goBack(){
 				uni.navigateBack({
-					url:`/pages/serve/coupons/coupons`
+					url:`/pages/driver/serve/coupons/coupons`
 				})
 			},
 			// 收藏

pages/driver/serve/coupons/cou_detail_reply.vue

@@ -2,7 +2,7 @@
 	<view>
 		<z-paging ref="paging" v-model="dataList" @query="queryList()">
 			<view>
-				<view v-for="(item,index) in dataList" :key="index">
+				<view v-for="(item,index) in dataList" :key="item">
 					<view class="evaluate-list">
 						<view class="evaluate-list-header flex">
 							<image :src="item.avatar" mode=""></image>

pages/driver/serve/coupons/cou_order.vue

@@ -191,7 +191,7 @@
 			// 使用优惠券
 			useCouponsBtn(){
 				uni.navigateTo({
-					url:`/pages/serve/coupons/cou_card`
+					url:`/pages/driver/serve/coupons/cou_card`
 				})
 			},
 			// 打开
@@ -229,11 +229,11 @@
 						this.topUpTypeShow = false
 						// console.log(res,'支付返回数据');
 						uni.navigateTo({
-							url:`/pages/serve/coupons/payresult?resultType=res`
+							url:`/pages/driver/serve/coupons/payresult?resultType=res`
 						})
 					}).catch(err=>{
 						uni.navigateTo({
-							url:`/pages/serve/coupons/payresult?resultType=err`
+							url:`/pages/driver/serve/coupons/payresult?resultType=err`
 						})
 					})
 				}else{

pages/driver/serve/coupons/coupons.vue

@@ -112,11 +112,11 @@
 				this.$store.dispatch('CardId', item.id)
 				if(this.cardType==3){
 					uni.navigateTo({
-						url: `/pages/mine/my_activity/detail?id=${item.id}`
+						url: `/pages/driver/mine/my_activity/detail?id=${item.id}`
 					})
 				}else{
 					uni.navigateTo({
-						url:`/pages/serve/coupons/cou_detail?id=${item.id}`
+						url:`/pages/driver/serve/coupons/cou_detail?id=${item.id}`
 					})
 				}
 			},

pages/driver/serve/coupons/payresult.vue

@@ -42,17 +42,17 @@
 		methods: {
 			toServeOrderPage(){
 				uni.navigateTo({
-					url:`/pages/mine/my_order/serveOrder/serve_order`,
+					url:`/pages/driver/mine/my_order/serveOrder/serve_order`,
 				})
 			},
 			toMyCardBagPage() {
 				uni.redirectTo({
-					url: '/pages/mine/my_card_bag/my_card_bag'
+					url: '/pages/driver/mine/my_card_bag/my_card_bag'
 				})
 			},
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/index/index'
+					url: '/pages/driver/index/index'
 				});
 			}
 		},

pages/driver/serve/index.vue

@@ -204,13 +204,13 @@
 			// 去热销列表
 			toHotPages(type, item){
 				uni.navigateTo({
-					url:`/pages/serve/hot_list?type=${type}&id=${item && item.id}&name=${item && item.name}`
+					url:`/pages/driver/serve/hot_list?type=${type}&id=${item && item.id}&name=${item && item.name}`
 				})
 			},
 			// 活动列表
 			toMyActivityListPage(){
 				uni.navigateTo({
-					url:`/pages/serve/activity_list`
+					url:`/pages/driver/serve/activity_list`
 				})
 			},
 			// 去活动详情
@@ -227,7 +227,7 @@
 			toDetailPages(item){
 				this.$store.dispatch('CardId', item.id)
 				uni.navigateTo({
-					url:`/pages/serve/coupons/cou_detail?id=${item.id}`
+					url:`/pages/driver/serve/coupons/cou_detail?id=${item.id}`
 				})
 			},
 			
@@ -237,13 +237,13 @@
 			// 卡券
 			toCouponsPages(num){
 				uni.navigateTo({
-					url:`/pages/serve/coupons/coupons?num=${num}`
+					url:`/pages/driver/serve/coupons/coupons?num=${num}`
 				})
 			},
 			// 维修
 			toRepairPages(){
 				uni.navigateTo({
-					url:`/pages/serve/repair/repair`
+					url:`/pages/driver/serve/repair/repair`
 				})
 			},
 			// 消息 (两个)
@@ -252,7 +252,7 @@
 				// 	url:`/pages/serve/message/message`
 				// })
 				uni.navigateTo({
-					url:`/pages/message/message`
+					url:`/pages/driver/message/message`
 				})
 			}
 		}

pages/driver/serve/repair/re_create/reservation.vue

@@ -97,7 +97,7 @@
       <view class="btnview_sure" @click="groupSubmit" shape="circle">确 认</view>
     </view>
     <!-- 预约信息 -->
-    <u-popup :show="popupShow" :round="16" mode="bottom" @close="popupShow = false" closeable="true">
+    <u-popup :show="popupShow" :round="16" mode="bottom" @close="popupShow = false" :closeable="true">
       <view class="popuptxt">预约信息</view>
       <view class="popview">
         <view class="groupview">
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-	import popup from '@/pages/serve/repair/popup'
+	import popup from '@/pages/driver/serve/repair/popup'
 	import { getStoreList, getCarouselAPI , reservationCreateAPI, getMyCarAPI , realNameDetaiNowlAPI} from '@/api/serve/repair'
   import { mapGetters } from "vuex";
   import config from '@/config'
@@ -222,7 +222,7 @@
       // 去选择时间
       openTime() {
         uni.navigateTo({
-          url: `/pages/serve/repair/re_create/select_time`,
+          url: `/pages/driver/serve/repair/re_create/select_time`,
         });
       },
       // 确认提交
@@ -243,7 +243,7 @@
           reservationCreateAPI(this.createData)
             .then((res) => {
               uni.navigateTo({
-                url: "/pages/serve/repair/re_create/result",
+                url: "/pages/driver/serve/repair/re_create/result",
               });
             })
             .catch((err) => {
@@ -266,11 +266,11 @@
 	  	console.log('弹弹确认');
 	  	if(this.whoBtn==1){
 	  		uni.navigateTo({
-	  		  url: "/pages/serve/repair/realname",
+	  		  url: "/pages/driver/serve/repair/realname",
 	  		});
 	  	}if(this.whoBtn==2){
 	  		uni.navigateTo({
-	  		  url: "/pages/serve/repair/re_binding",
+	  		  url: "/pages/driver/serve/repair/re_binding",
 	  		});
 	  	}if(this.whoBtn==3){
 	  		console.log('等待平台完善');

pages/driver/serve/repair/re_create/result.vue

@@ -41,7 +41,7 @@
         this.$store.dispatch('WorkingDay', '')
         this.$store.dispatch('WorkingTime', '')
         uni.navigateTo({
-          url: `/pages/mine/my_order/my_order`
+          url: `/pages/driver/mine/my_order/my_order`
         });
       },
       toHomePage() {
@@ -49,7 +49,7 @@
         this.$store.dispatch('WorkingDay', '')
         this.$store.dispatch('WorkingTime', '')
         uni.switchTab({
-          url: '/pages/index/index'
+          url: '/pages/driver/index/index'
         });
       }
     }

pages/driver/serve/repair/re_create/select_city.vue

@@ -52,7 +52,7 @@
 <script>
 	import { getHotCityAPI } from '@/api/serve/repair'
 	import { mapGetters } from 'vuex'
-	const area = require('../../../../data/address_a.js')
+	const area = require('@/data/address_a.js')
 	export default {
 		data() {
 			return {

pages/driver/serve/repair/re_create/select_store.vue

@@ -10,7 +10,7 @@
             <u-icon name="map-fill" color="#3D3D3D" size="14"></u-icon>
             <text class="lefttxt">选择门店</text>
         </view>
-        <view class="posright" @click="link('/pages/serve/repair/re_create/select_city')">
+        <view class="posright" @click="link('/pages/driver/serve/repair/re_create/select_city')">
           <text class="righttxt">{{ selectCity?selectCity:citySave }}</text>
           <u-icon name="arrow-right" color="#999999" size="10"></u-icon>
         </view>
@@ -18,7 +18,7 @@
       <z-paging ref="paging" :fixed="false" use-page-scroll auto-full-height v-model="dataList" @query="queryList">
         <view class="posfoot">
           <view class="footview" hover-class="hover-footview" v-for="(item,index) in dataList" :key="item.id"
-            @click="link(`/pages/serve/repair/re_create/reservation?id=${item.id}`,`${item.id}`)">
+            @click="link(`/pages/driver/serve/repair/re_create/reservation?id=${item.id}`,`${item.id}`)">
             <view class="footleft">
               <image class="footleft_img" :src="item.backImage"></image>
               <!-- coverImage 封面图   backImage 背景图   avatar 头像 -->
@@ -67,7 +67,7 @@
   import { brannerList } from '@/api/system/config';
   import { mapGetters } from 'vuex'
   import config from '@/config'
-  const QQMapWX = require('../../../../js_sdk/qqmap-wx-jssdk/qqmap-wx-jssdk.js')
+  const QQMapWX = require('@/js_sdk/qqmap-wx-jssdk/qqmap-wx-jssdk.js')
   var qqmapsdk = new QQMapWX({ key: 'SH4BZ-BN36N-UYSFP-SJMPC-LZMGK-EWF3P' })
   export default {
     data() {

pages/driver/serve/repair/repair.vue

@@ -216,7 +216,7 @@
 							// });
 						}else {
 							this.$store.dispatch('HomeNum', num)
-							uni.navigateTo({ url: `/pages/serve/repair/re_create/select_store` })
+							uni.navigateTo({ url: `/pages/driver/serve/repair/re_create/select_store` })
 						}
 					})
 				}

pages/driver/welfare/index.vue

@@ -144,7 +144,7 @@
 			//积分权益
 			navRightsInterestsFn() {
 				uni.navigateTo({
-					url: '/pages/welfare/rightsInterests/rightsInterests'
+					url: '/pages/driver/welfare/rightsInterests/rightsInterests'
 				})
 			},
 			//积分商品列表
@@ -160,7 +160,7 @@
 			//积分商品详情
 			navParticularsFn(item) {
 				uni.navigateTo({
-					url: `/pages/welfare/rightsInterests/rightsInterests_particulars?id=${item.id}`
+					url: `/pages/driver/welfare/rightsInterests/rightsInterests_particulars?id=${item.id}`
 				})
 			}
 		}

pages/driver/welfare/invite/invite.vue

@@ -138,19 +138,19 @@
 			//海报邀请
 			navInPosterFn(){
 				uni.navigateTo({
-					url:'/pages/welfare/invite/invite_poster'
+					url:'/pages/driver/welfare/invite/invite_poster'
 				})
 			},
 			//邀请注册
 			navRegisterFn(){
 				uni.navigateTo({
-					url:'/pages/welfare/invite/invite_register'
+					url:'/pages/driver/welfare/invite/invite_register'
 				})
 			},
 			//邀请购买 
 			navCommissionFn(){
 				uni.navigateTo({
-					url:'/pages/welfare/invite/invite_commission'
+					url:'/pages/driver/welfare/invite/invite_commission'
 				})
 			},
 			//

pages/driver/welfare/invite/invite_commission.vue

@@ -59,7 +59,8 @@
 			queryList(pageNo, pageSize) {
 				this.$refs.paging.complete([{}, {}])
 			},
-
+			//提现
+			toHomePage(){}
 		},
 	}
 </script>
@@ -149,13 +150,6 @@
 		}
 
 		.page-header-withdraw-deposit {
-			width: 130rpx;
-			height: 56rpx;
-			border-radius: 28rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-			background: rgba(137, 215, 211, 1);
 		}
 
 		.page-header-title {

pages/driver/welfare/payment_state/payment_state.vue

@@ -42,12 +42,12 @@
 		methods: {
 			toMyCardBagPage() {
 				uni.redirectTo({
-					url: '/pages/mine/my_order/serveOrder/serve_order'
+					url: '/pages/driver/mine/my_order/serveOrder/serve_order'
 				})
 			},
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/index/index'
+					url: '/pages/driver/index/index'
 				});
 			}
 		},

pages/driver/welfare/rightsInterests/confirm_order.vue

@@ -205,11 +205,11 @@
 					frontPayintegral(obj).then(res => {
 						this.paymentShow = false
 						uni.navigateTo({
-							url: `/pages/welfare/payment_state/payment_state?resultType=res`
+							url: `/pages/driver/welfare/payment_state/payment_state?resultType=res`
 						})
 					}).catch(err => {
 						uni.navigateTo({
-							url: `/pages/welfare/payment_state/payment_state?resultType=err`
+							url: `/pages/driver/welfare/payment_state/payment_state?resultType=err`
 						})
 					})
 				} else {

pages/driver/welfare/rightsInterests/rightsInterests.vue

@@ -60,7 +60,7 @@
 			//详情 
 			navParticularsFn(item) {
 				uni.navigateTo({
-					url: `/pages/welfare/rightsInterests/rightsInterests_particulars?id=${item.id}`
+					url: `/pages/driver/welfare/rightsInterests/rightsInterests_particulars?id=${item.id}`
 				})
 			}
 		},

pages/driver/welfare/rightsInterests/rightsInterests_particulars.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<u-navbar title="''" :safeAreaInsetTop="true" bgColor="rgba(0,0,0,0)">
+		<u-navbar :title="' '" :safeAreaInsetTop="true" bgColor="rgba(0,0,0,0)">
 			<view class="u-nav-slot flex align-center justify-around" slot="left">
 				<u-icon name="arrow-left" size="19" @click="navBackFn('back')"></u-icon>
 				<u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
@@ -180,7 +180,7 @@
 				let id = this.commodityDeta.id
 				let commodityNum = this.commodityNum
 				uni.navigateTo({
-					url: `/pages/welfare/rightsInterests/confirm_order?id=${id}&commodityNum=${commodityNum}`
+					url: `/pages/driver/welfare/rightsInterests/confirm_order?id=${id}&commodityNum=${commodityNum}`
 				})
 			},
 			//弹出层
@@ -191,7 +191,7 @@
 			navBackFn(type) {
 				if (type == 'tabbar') {
 					uni.switchTab({
-						url: '/pages/index/index'
+						url: '/pages/driver/index/index'
 					})
 				} else {
 					uni.navigateBack()

pages/driver/welfare/task/task.vue

@@ -95,7 +95,7 @@
 				let form = {category: this.current}
 				console.log(form);
 				taskList(form).then(res => {
-					console.log(res);
+					// console.log(res);
 					this.taskList = res.data
 				})
 			},
@@ -116,7 +116,7 @@
 						})
 					} else {
 						uni.switchTab({
-							url: '/pages/index/index'
+							url: '/pages/driver/index/index'
 						})
 					}
 				}
@@ -128,7 +128,7 @@
 			//积分明细
 			navIntegFn() {
 				uni.navigateTo({
-					url: '/pages/welfare/task/integral'
+					url: '/pages/driver/welfare/task/integral'
 				})
 			}
 		}

pages/login/driver-login.vue

@@ -52,7 +52,7 @@
 				resendCodeTime: 60, 
 				timer: null,
 				form: {
-					phone: '18875843298',
+					phone: '18739735805',
 					captcha: '999999'
 				},
 				rules: {
@@ -116,13 +116,14 @@
 			},
 			// 登录
 			loginSumbit() {
-				uni.$u.toast('司机模块开发中')
-				return
+				// uni.$u.toast('司机模块开发中')
+				// return
 				if (this.agree) {
 					this.$refs.uForm.validate().then(res => {
 						userLogin(this.form).then(res => {
 							console.log(res.data.token);
 							setToken(res.data.token)
+							uni.setStorageSync('userType', 'driver')
 							uni.switchTab({
 								url: '/pages/driver/index/index'
 							});

pages/login/server-login.vue

@@ -66,7 +66,7 @@
 				timer: null,
 				identityName: '车商',
 				identityList: [[ 
-					{keyName: 'platform', text: '平台'}, 
+					// {keyName: 'platform', text: '平台'}, 
 					{keyName: 'repair', text: '维修店'}, 
 					{keyName: 'carDealers', text: '车商'}
 				]], 

permission.js

@@ -1,50 +1,58 @@
-import { getToken } from '@/utils/auth'
-
-// 登录页面
-const loginPage1 = "/pages/login/driver-login"
-const loginPage2 = "/pages/login/server-login"
-
-  
-// 页面白名单
-const whiteList = [
-  '/pages/login/driver-login',
-  '/pages/login/server-login',
-	'/pages/repair/tabbar/repair'
-]
-
-// 检查地址白名单
-function checkWhite(url) {
-  const path = url.split('?')[0]
-  return whiteList.indexOf(path) !== -1
-}
-
-// 页面跳转验证拦截器
-let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
-list.forEach(item => {
-  uni.addInterceptor(item, {
-    invoke(to) {
-      if (getToken()) {
-        if (to.url === loginPage1 || to.url === loginPage2) {
-					console.log('用户身份', uni.getStorageSync('userType'));
-					let userType = uni.getStorageSync('userType')
-					if(userType == 'repair') {
-						uni.switchTab({
-							url: '/pages/repair/tabbar/repair'
-						})
-					}
-        }
-        return true
-      } else {
-        if (checkWhite(to.url)) {
-          return true
-        }
-        console.log("触发页面验证拦截", to.url)
-        uni.reLaunch({ url: loginPage1 })
-        return false
-      }
-    },
-    fail(err) {
-      console.log(err)
-    }
-  })
-})
+import { getToken } from '@/utils/auth'
+
+// 登录页面
+const loginPage1 = "/pages/login/driver-login"
+const loginPage2 = "/pages/login/server-login"
+
+  
+// 页面白名单
+const whiteList = [
+  '/pages/login/driver-login',
+  '/pages/login/server-login',
+	'/pages/repair/tabbar/repair'
+]
+
+// 检查地址白名单
+function checkWhite(url) {
+  const path = url.split('?')[0]
+  return whiteList.indexOf(path) !== -1
+}
+
+// 页面跳转验证拦截器
+let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
+list.forEach(item => {
+  uni.addInterceptor(item, {
+    invoke(to) {
+      if (getToken()) {
+        if (to.url === loginPage1 || to.url === loginPage2) {
+				console.log('用户身份', uni.getStorageSync('userType'));
+				let userType = uni.getStorageSync('userType')
+				if(userType == 'repair') {
+					uni.switchTab({
+						url: '/pages/repair/tabbar/repair'
+					})
+				}else if(userType == 'carDealers'){
+					uni.switchTab({
+						url: '/pages/carShop/message/message'
+					})
+				}else if(userType == 'driver'){
+					uni.switchTab({
+						url: '/pages/driver/index/index'
+					})
+				}
+        }
+        return true
+      } else {
+        if (checkWhite(to.url)) {
+          return true
+        }
+        console.log("触发页面验证拦截", to.url)
+        uni.reLaunch({ url: loginPage1 })
+        return false
+      }
+    },
+    fail(err) {
+      console.log(err)
+    }
+  })
+})

static/scss/currency.css

@@ -34,9 +34,18 @@ image {
 .f-38 {
 	font-size: 38rpx;
 }
+.f-40 {
+	font-size: 40rpx
+}
 .f-48 {
 	font-size: 48rpx
 }
+.f-50 {
+	font-size: 50rpx;
+}
+.f-52 {
+	font-size: 52rpx;
+}
 .f-56 {
 	font-size: 56rpx;
 }
@@ -56,6 +65,9 @@ image {
 .black {
 	color: #000;
 }
+.c000{
+	color: #000;
+}
 .white {
 	color: #fff
 }
@@ -86,9 +98,6 @@ image {
 .c444 {
 	color: #444444;
 }
-.c555 {
-	color: #555555;
-}
 .c999 {
 	color: #999999;
 }
@@ -118,6 +127,20 @@ image {
 .text-right {
 	text-align: right;
 }
+/* 文字 */ 
+.line-one {
+	white-space: nowrap; /* 不换行 */
+	overflow: hidden; /* 隐藏超出部分 */
+	text-overflow: ellipsis; /* 使用省略号表示被裁切的内容 */
+}
+.line-two {
+	display: -webkit-box; /* 必须 */
+	overflow: hidden; /* 必须 */
+	text-overflow: ellipsis; /* 必须 */
+	/* white-space: nowrap; */ /* 必须 */
+	-webkit-line-clamp: 2; /* 指定行数 */
+	-webkit-box-orient: vertical; /* 必须 */
+}
 /* 边框 */
 .border-bottom {
 	border-bottom: 1rpx solid #000;
@@ -194,6 +217,9 @@ image {
 .mt-5 {
 	margin-top: 50rpx;
 }
+.mt-6 {
+	margin-top: 60rpx;
+}
 .mt-8 {
 	margin-top: 80rpx;
 }
@@ -206,6 +232,9 @@ image {
 .ml-3 {
 	margin-left: 30rpx;
 }
+.ml-4 {
+	margin-left: 40rpx;
+}
 .mr-2 {
 	margin-right: 20rpx;
 }