2023-4-26

api/shop.js

@@ -1,196 +0,0 @@
-import request from '@/utils/request'
-
-
-// 获取首页信息
-export function storeList(data) {
-	return request({
-		url: '/api/store_list',
-		method: 'get',
-		data
-	});
-}
-
-// 订单数据统计
-export function statistics(data) {
-	return request({
-		url: '/api/admin/order/statistics',
-		method: 'get',
-		data
-	});
-}
-
-
-// 订单列表
-export function shopOrderList(data) {
-	return request({
-		url: '/api/admin/order/list',
-		method: 'get',
-		data
-	});
-}
-
-
-// 订单详情
-export function shopOrderDetai(data,orderid) {
-	return request({
-		url: '/api/admin/order/detai/'+orderid,
-		method: 'get',
-		data
-	});
-}
-
-
-// 订单发货（普通商品）
-export function deliveryGain(data,orderid) {
-	return request({
-		url: '/api/admin/order/delivery/gain/'+orderid,
-		method: 'get',
-		data
-	});
-}
-
-
-
-// 订单发货
-export function delivery(data) {
-	return request({
-		url: '/api/admin/order/delivery/keep',
-		method: 'get',
-		data
-	});
-}
-
-// 订单退款（普通商品）
-export function refund(data) {
-	return request({
-		url: '/api/admin/order/refund',
-		method: 'get',
-		data
-	});
-}
-
-
-// 订单核销（普通商品）
-export function order_verific(data) {
-	return request({
-		url: '/api/order/order_verific',
-		method: 'get',
-		data
-	});
-}
-
-
-// 门店资金
-export function funds(data) {
-	return request({
-		url: '/api/admin/funds',
-		method: 'get',
-		data
-	});
-}
-
-// 车辆报修
-export function question(data) {
-	return request({
-		url: '/api/admin/car/question',
-		method: 'post',
-		data
-	});
-}
-// 车辆报修详情
-export function questionInfo(data) {
-	return request({
-		url: '/api/admin/question/info',
-		method: 'get',
-		data
-	});
-}
-// 车辆发货
-export function set_car_number(data) {
-	return request({
-		url: '/api/admin/car/set_car_number',
-		method: 'post',
-		data
-	});
-}
-// 订单查询
-export function orderDetail(data,id) {
-	return request({
-		url: '/api/admin/order/detail/'+id,
-		method: 'get',
-		data
-	});
-}
-
-// 车辆批次
-export function batch(data) {
-	return request({
-		url: '/api/car/batch',
-		method: 'get',
-		data
-	});
-}
-// 车辆类型
-export function carType(data) {
-	return request({
-		url: '/api/car/type',
-		method: 'get',
-		data
-	});
-}
-
-// 获取自己所属的门店信息
-export function adminStore(data) {
-	return request({
-		url: '/api/admin/store',
-		method: 'get',
-		data
-	});
-}
-
-
-// 维修人员列表
-export function adminKf(data) {
-	return request({
-		url: '/api/admin/kf',
-		method: 'get',
-		data
-	});
-}
-// 安排维修人员
-export function schedule_task(data) {
-	return request({
-		url: '/api/admin/schedule_task',
-		method: 'post',
-		data
-	});
-}
-
-// 员工我的任务
-export function task(data) {
-	return request({
-		url: '/api/admin/task',
-		method: 'post',
-		data
-	});
-}
-// 处理任务
-export function tasksave(data) {
-	return request({
-		url: '/api/admin/tasksave',
-		method: 'post',
-		data
-	});
-}
-
-// 处理任务
-export function detail(data,id) {
-	return request({
-		url: '/api/admin/order/detail/'+id,
-		method: 'get',
-		data
-	});
-}
-
-
-

pages.json

@@ -8,13 +8,11 @@
 					"titleNView": false
 				},
 				// #endif
-				"navigationBarTitleText": "绿津"
-			}
-		},
-		{
-			"path": "pages/index/notice",
-			"style": {
-				"navigationBarTitleText": "消息中心"
+				// #ifdef MP
+				"navigationBarBackgroundColor": "#ff629f",
+				"navigationBarTextStyle":"white",
+				// #endif
+				"navigationBarTitleText": "母婴界严选"
 			}
 		},
 		{
@@ -23,552 +21,241 @@
 				"navigationBarTitleText": "邀好友赚佣金"
 			}
 		},
-		// #ifndef APP
 		{
-			"path": "pages/index/follow",
+			"path": "pages/user/user",
 			"style": {
-				"navigationBarTitleText": "关注公众号"
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "个人中心"
 			}
-		},
-		// #endif
-		{
-			"path": "pages/index/noticeDetail",
-			"style": {
-				"navigationBarTitleText": "消息",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+		}
+	],
+	"subPackages": [{
+		"root": "pages/user_home",
+		"name": "user",
+		"pages": [
+			{
+				"path": "realName/realNameAuthentication",
+				"style": {
+					"navigationBarTitleText": "实名认证"
 				}
-			}
-		},
-		{
-			"path": "pages/index/shopTab",
-			"style": {
-				// "enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "门店查询",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "realName/cropper",
+				"style": {
+					"navigationBarTitleText": "图片裁切"
 				}
-			}
-		},
-		{
-			"path": "pages/user/myCart/authorization",
-			"style": {
-				"navigationBarTitleText": "授权"
-			}
-		},
-		{
-			"path": "pages/user/myCart/Prepayment",
-			"style": {
-				"navigationBarTitleText": "提前还款"
-			}
-		},
-		{
-			"path": "pages/index/route",
-			"style": {
-				"navigationBarTitleText": "历史行程"
-			}
-		},
-		{
-			"path": "pages/index/routeDetail",
-			"style": {
-				"navigationBarTitleText": "行程详情"
-			}
-		},
-		// #ifdef H5
-		{
-			"path": "pages/public/domApp",
-			"style": {
-				"navigationBarTitleText": "app下载",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "myteam",
+				"style": {
+					"navigationBarTitleText": "我的团队"
 				}
-			}
-		},
-		// #endif
-		// #ifndef MP
-		{
-			"path": "pages/public/workwork",
-			"style": {
-				"navigationBarTitleText": "关于我们"
-			}
-		},
-		// #endif
-		{
-			"path": "pages/public/register",
-			"style": {
-				"navigationBarTitleText": "注册",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "award/award",
+				"style": {
+					"navigationBarTitleText": "佣金",
+					"navigationBarBackgroundColor": "#f6ab0b",
+					"navigationBarTextStyle": "white"
 				}
-			}
-		},
-		{
-			"path": "pages/public/phoneLogin",
-			"style": {
-				"navigationBarTitleText": "手机登录",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "award/awardList",
+				"style": {
+					"navigationBarTitleText": "佣金明细"
 				}
-			}
-		},
-		{
-			"path": "pages/public/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "award/withdrawal",
+				"style": {
+					"navigationBarTitleText": "提现"
 				}
-			}
-		},
-		// #ifdef MP || H5
-		{
-			"path": "pages/public/wxLogin",
-			"style": {
-				"navigationBarTitleText": "微信登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
+			},
+			{
+				"path": "money/pay",
+				"style": {
+					"navigationBarTitleText": "支付",
+					"navigationBarBackgroundColor": "#0BBB62",
+					"navigationBarTextStyle": "white"
 				}
-			}
-		},
-		// #endif
-		{
-			"path": "pages/public/forget",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"app-plus": {
-					"titleNView": false
+			},
+			{
+				"path": "money/paySuccess",
+				"style": {
+					"navigationBarTitleText": "支付成功"
+				}
+			},
+			{
+				"path": "money/wallet",
+				"style": {
+					"navigationBarTitleText": "我的钱包",
+					"navigationBarBackgroundColor": "#0BBB62",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "money/walletList",
+				"style": {
+					"navigationBarTitleText": "余额明细"
+				}
+			},
+			{
+				"path": "award/account",
+				"style": {
+					"navigationBarTitleText": "提现账号"
+				}
+			},
+			{
+				"path": "money/recharge",
+				"style": {
+					"navigationBarTitleText": "充值",
+					"navigationBarBackgroundColor": "#0BBB62",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "shareQrCode",
+				"style": {
+					"navigationBarTitleText": "邀请好友"
 				}
 			}
-		},
-		{
-			"path": "pages/public/userAgreement",
-			"style": {
-				"navigationBarTitleText": "用户协议"
-			}
-		},
-		{
-			"path": "pages/public/privacyAgreement",
-			"style": {
-				"navigationBarTitleText": "隐私协议"
+			
+		]
+	}, {
+		"root": "pages/set",
+		"name": "set",
+		"pages": [{
+				"path": "set",
+				"style": {
+					"navigationBarTitleText": "设置"
+				}
+			},
+			{
+				"path": "address",
+				"style": {
+					"navigationBarTitleText": "收货地址"
+				}
+			},
+			{
+				"path": "addressManage",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			},
+			{
+				"path": "phone",
+				"style": {
+					"navigationBarTitleText": "手机认证"
+				}
+			},
+			{
+				"path": "password",
+				"style": {
+					"navigationBarTitleText": "修改密码"
+				}
+			},
+			{
+				"path": "userinfo",
+				"style": {
+					"navigationBarTitleText": "修改资料"
+				}
 			}
-		},
-		// {
-		// 	"path": "pages/product/reply",
-		// 	"style": {
-		// 		"navigationBarTitleText": "商品评价",
-		// 		"app-plus": {
-		// 			"titleNView": {
-		// 				"type": "transparent"
-		// 			}
-		// 		}
-		// 	}
-		// },
-		{
-			"path": "pages/product/product",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
+		]
+	}, {
+		"root": "pages/public",
+		"name": "public",
+		"pages": [
+			// #ifdef H5
+			{
+				"path": "domApp",
+				"style": {
+					"navigationBarTitleText": "app下载",
+					"app-plus": {
+						"titleNView": false
 					}
 				}
-			}
-		},
-		{
-			"path": "pages/product/showImg",
-			"style": {
-				"navigationBarTitleText": "图片预览",
-				"app-plus": {
-					"animationType": "fade-in",
-					"titleNView": {
-						"type": "transparent"
-					},
-					"animationDuration": 300
+			},
+			// #endif
+			// #ifndef MP
+			{
+				"path": "workwork",
+				"style": {
+					"navigationBarTitleText": "关于我们"
 				}
-			}
-		},
-		// {
-		// 	"path": "pages/product/seckill",
-		// 	"style": {
-		// 		"navigationBarTitleText": "限时秒杀"
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/product/list",
-		// 	"style": {
-		// 		"enablePullDownRefresh": true,
-		// 		"navigationBarTitleText": "商品列表"
-		// 	}
-		// },
-		{
-			"path": "pages/product/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP || APP-PLUS
-				"app-plus": {
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": false,
-							"placeholderColor": "#606266",
-							"align": "left"
-						},
-						"buttons": [{
-							"text": "搜索",
-							"fontSize": "14",
-							"color": "#303133",
-							"background": "rgba(0,0,0,0)",
-							"width": "40px"
-						}]
+			},
+			// #endif
+			{
+				"path": "register",
+				"style": {
+					"navigationBarTitleText": "注册",
+					"app-plus": {
+						"titleNView": false
 					}
-				},
-				// #endif
-				"navigationBarTitleText": "搜索"
-			}
-		},
-		// {
-		// 	"path": "pages/product/classify",
-		// 	"style": {
-		// 		"navigationStyle": "custom",
-		// 		"app-plus": {
-		// 			"titleNView": {
-		// 				"type": "transparent"
-		// 			}
-		// 		}
-		// 	}
-		// },
-		{
-			"path": "pages/set/set",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/set/address",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/set/addressManage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "手机认证"
-			}
-		},
-		{
-			"path": "pages/set/password",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		},
-		{
-			"path": "pages/set/userinfo",
-			"style": {
-				"navigationBarTitleText": "修改资料"
-			}
-		},
-		{
-			"path": "pages/cart/cart",
-			"style": {
-				// #ifndef MP-WEIXIN
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "购物车"
-			}
-		},
-
-		{
-			"path": "pages/user/user",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "个人中心"
-			}
-		},
-		{
-			"path": "pages/user/repair/userRepair",
-			"style": {
-				"navigationBarTitleText": "维修历史"
-			}
-		},
-		{
-			"path": "pages/user/repair/repairDetail",
-			"style": {
-				"navigationBarTitleText": "申请内容"
-			}
-		},
-		{
-			"path": "pages/user/myCart/authorizationList",
-			"style": {
-				"navigationBarTitleText": "授权列表"
-			}
-		},
-		{
-			"path": "pages/user/reportForRepair/Report",
-			"style": {
-				"navigationBarTitleText": "故障报修"
-			}
-		},
-		{
-			"path": "pages/user/realName/realNameAuthentication",
-			"style": {
-				"navigationBarTitleText": "实名认证"
-			}
-		},
-		{
-			"path": "pages/user/realName/cropper",
-			"style": {
-				"navigationBarTitleText": "图片裁切"
-			}
-		},
-		{
-			"path": "pages/user/myCart/myCart",
-			"style": {
-				"navigationBarTitleText": "我的车辆"
-			}
-		},
-		{
-			"path": "pages/user/myteam",
-			"style": {
-				"navigationBarTitleText": "我的团队"
-			}
-		},
-		{
-			"path": "pages/user/award/award",
-			"style": {
-				"navigationBarTitleText": "佣金",
-				"navigationBarBackgroundColor": "#f6ab0b",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/user/award/awardList",
-			"style": {
-				"navigationBarTitleText": "佣金明细"
-			}
-		},
-		{
-			"path": "pages/user/award/withdrawal",
-			"style": {
-				"navigationBarTitleText": "提现"
-			}
-		},
-
-		// {
-		// 	"path": "pages/user/favorites",
-		// 	"style": {
-		// 		"navigationBarTitleText": "收藏夹"
-		// 	}
-		// }, {
-		// 	"path": "pages/user/coupon",
-		// 	"style": {
-		// 		"navigationBarTitleText": "我的卡卷"
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/user/scoreAccumulate",
-		// 	"style": {
-		// 		"navigationBarTitleText": "积分明细"
-		// 	}
-		// },
-		{
-			"path": "pages/order/order",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"app-plus": {
-					"bounce": "none"
 				}
-			}
-		},
-		{
-			"path": "pages/order/orderAfter",
-			"style": {
-				"navigationBarTitleText": "售后管理"
-			}
-		},
-		{
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"app-plus": {
-					"bounce": "none"
+			},
+			{
+				"path": "phoneLogin",
+				"style": {
+					"navigationBarTitleText": "手机登录",
+					"app-plus": {
+						"titleNView": false
+					}
 				}
-			}
-		},
-		// {
-		// 	"path": "pages/order/evaluate",
-		// 	"style": {
-		// 		"navigationBarTitleText": "评论"
-		// 	}
-		// },
-		{
-			"path": "pages/order/orderRefund",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-		},
-		{
-			"path": "pages/order/createOrder",
-			"style": {
-				"navigationBarTitleText": "创建订单"
-			}
-		},
-		{
-			"path": "pages/user/money/pay",
-			"style": {
-				"navigationBarTitleText": "支付",
-				"navigationBarBackgroundColor": "#0BBB62",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/user/money/paySuccess",
-			"style": {
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-		{
-			"path": "pages/user/money/wallet",
-			"style": {
-				"navigationBarTitleText": "我的钱包",
-				"navigationBarBackgroundColor": "#0BBB62",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/user/money/walletList",
-			"style": {
-				"navigationBarTitleText": "余额明细"
-			}
-		},
-		{
-			"path": "pages/user/award/account",
-			"style": {
-				"navigationBarTitleText": "提现账号"
-			}
-		},
-		{
-			"path": "pages/user/money/recharge",
-			"style": {
-				"navigationBarTitleText": "充值",
-				"navigationBarBackgroundColor": "#0BBB62",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/shop/cartAciton",
-			"style": {
-				"navigationBarTitleText": "车辆激活"
-			}
-		},
-		{
-			"path": "pages/shop/repair/clientRepair",
-			"style": {
-				"navigationBarTitleText": "客户报修"
-			}
-		},
-		{
-			"path": "pages/shop/repair/taskClientRepair",
-			"style": {
-				"navigationBarTitleText": "维修任务"
-			}
-		},
-		{
-			"path": "pages/shop/repair/clientReparirDetail",
-			"style": {
-				"navigationBarTitleText": "报修详情"
-			}
-		},
-		{
-			"path": "pages/shop/repair/repairHistory",
-			"style": {
-				"navigationBarTitleText": "维修历史"
-			}
-		},
-		{
-			"path": "pages/shop/shopOrder",
-			"style": {
-				"navigationBarTitleText": "店铺订单"
-			}
-		},
-		{
-			"path": "pages/shop/shopOrderDetail",
-			"style": {
-				"navigationBarTitleText": "店铺订单详情"
-			}
-		},
-		{
-			"path": "pages/shop/shopOrderAfter",
-			"style": {
-				"navigationBarTitleText": "售后订单"
-			}
-		},
-		{
-			"path": "pages/shop/shopIndex",
-			"style": {
-				"navigationBarTitleText": "店铺详情",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
+			},
+			{
+				"path": "login",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"app-plus": {
+						"titleNView": false
 					}
 				}
-			}
-		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
+			},
+			// #ifdef MP || H5
+			{
+				"path": "wxLogin",
+				"style": {
+					"navigationBarTitleText": "微信登录",
+					"app-plus": {
+						"titleNView": {
+							"type": "transparent"
 						}
 					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/public/redirect",
-			"style": {
-				"navigationBarTitleText": "微信登录跳转页面",
-				"app-plus": {
-					"titleNView": false
+				}
+			},
+			// #endif
+			{
+				"path": "forget",
+				"style": {
+					"navigationBarTitleText": "忘记密码",
+					"app-plus": {
+						"titleNView": false
+					}
+				}
+			},
+			{
+				"path": "redirect",
+				"style": {
+					"navigationBarTitleText": "微信登录跳转页面",
+					"app-plus": {
+						"titleNView": false
+					}
+				}
+			},
+			{
+				"path": "userAgreement",
+				"style": {
+					"navigationBarTitleText": "用户协议"
+				}
+			},
+			{
+				"path": "privacyAgreement",
+				"style": {
+					"navigationBarTitleText": "隐私协议"
 				}
 			}
-		},
-		{
-			"path": "pages/user/shareQrCode",
-			"style": {
-				"navigationBarTitleText": "邀请好友"
-			}
-		}
-	],
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -577,7 +264,7 @@
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#5DBC7C",
+		"selectedColor": "#F65486",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
@@ -586,17 +273,11 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/category/category",
-			// 	"iconPath": "static/tabBar/tab-cate.png",
-			// 	"selectedIconPath": "static/tabBar/tab-cate-current.png",
-			// 	"text": "分类"
-			// },
 			{
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/tab-cart.png",
 				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
+				"text": "商城"
 			},
 			{
 				"pagePath": "pages/user/user",
@@ -606,14 +287,12 @@
 			}
 		]
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
 }

pages/cart/cart.vue

@@ -1,510 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 空白页 -->
-		<view v-if="!hasLogin || empty === true" class="empty">
-			<image src="/static/error/emptyCart.png" class="emptyImg" mode="aspectFit"></image>
-			<view v-if="hasLogin" class="empty-tips">
-				空空如也
-				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛>
-				</navigator>
-			</view>
-			<view v-else class="empty-tips">
-				空空如也
-				<view class="navigator" @click="navToLogin">去登陆></view>
-			</view>
-		</view>
-		<view v-else>
-			<!-- 列表 -->
-			<view class="cart-list">
-				<block v-for="(item, index) in cartList" :key="item.id">
-					<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
-						<view class="flex padding-r-20" @click="item.checked=!item.checked">
-							<image v-if='item.checked' class="checkedGoods" src="../../static/icon/addressIconXz.png"
-								mode="scaleToFill">
-							</image>
-							<view v-else class="icon-checked-box">
-
-							</view>
-						</view>
-						<image class="image-wrapper" :src="item.productInfo.image" :class="[item.loaded]"
-							mode="aspectFill" lazy-load @load="onImageLoad('cartList', index)"
-							@error="onImageError('cartList', index)"></image>
-						<view class="item-right">
-							<view class="clamp title">{{ item.productInfo.store_name }}</view>
-							<view class="attr">{{ item.productInfo.attrInfo.suk }}</view>
-							<view class="flex">
-								<text class="price">¥{{ item.productInfo.price }}</text>
-								<uni-number-box class="step" :min="1" :max="item.productInfo.stock"
-									:value="item.cart_num > item.productInfo.stock ? item.productInfo.stock : item.cart_num"
-									:isMax="item.cart_num >= item.productInfo.stock ? true : false"
-									:isMin="item.cart_num === 1" :index="index" @eventChange="numberChange">
-								</uni-number-box>
-							</view>
-							<view class="server" v-if="item.day>0">
-								(服务费：{{item.day_deducted}} 服务天数：{{item.day}})
-							</view>
-						</view>
-						<image class="del-btn" src="../../static/icon/goodsExit.png" @click="deleteCartItem(index)"
-							mode="scaleToFill"></image>
-					</view>
-				</block>
-			</view>
-			<!-- 底部菜单栏 -->
-			<view class="action-section">
-				<view class="flex leftBox">
-					<view class="checkbox" @click="check('all')">
-						<image class="icon-checked-box icon-checked" v-if='allChecked'
-							src="../../static/icon/addressIconXz.png" mode="scaleToFill"></image>
-						<view v-else class="icon-checked-box"></view>
-					</view>
-					<view class="margin-l-20">
-						全选
-					</view>
-				</view>
-				<view class="total-box">
-					<view class="font-size-base">
-						<text>合计：</text>
-						<text class="price">¥{{ total }}</text>
-
-					</view>
-					<view class="coupon">
-						共{{checkedNum}}件商品
-					</view>
-				</view>
-				<button type="primary" class="no-border confirm-btn" @click="createOrder">立即购买</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getCartList,
-		getCartNum,
-		cartDel
-	} from '@/api/user.js';
-	import {
-		mapState
-	} from 'vuex';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	export default {
-		data() {
-			return {
-				total: 0, //总价格
-				allChecked: false, //全选状态  true|false
-				empty: false, //空白页现实  true|false
-				cartList: []
-			};
-		},
-		onShow() {
-			uni.setTabBarStyle({
-				backgroundColor: '#FFFFFF'
-			})
-			// 只有登录时才加载数据
-			if (this.hasLogin) {
-				this.loadData();
-			}
-		},
-		watch: {
-			//显示空白页
-			cartList(e) {
-				let empty = e.length === 0 ? true : false;
-				if (this.empty !== empty) {
-					this.empty = empty;
-				}
-			}
-		},
-		computed: {
-			...mapState('user', ['hasLogin']),
-			...mapState('shop', ['shopDetail']),
-			checkedNum() {
-				let num = 0;
-				for (var i = 0; i < this.cartList.length; i++) {
-					if (this.cartList[i].checked) {
-						num++
-					}
-				}
-				return num
-			},
-		},
-		methods: {
-			//请求数据
-			async loadData() {
-				let obj = this;
-				getCartList({
-					store_id:obj.shopDetail.id
-				})
-					.then(function(e) {
-						// 获取当前购物车物品增加数量
-						let nub = obj.cartList.length;
-						// 获取之前对象数组
-						let aArray = obj.cartList.reverse();
-						// 获取返回数据对象数组
-						let bArray = e.data.valid.reverse();
-						obj.cartList = bArray
-							.map((item, ind) => {
-								// 设置返回数据默认为勾选状态
-								item.checked = true;
-								// 获取相同数组之前对象的数据
-								let carlist = aArray[ind];
-								// 判断之前是否已经加载完毕
-								if (carlist && carlist.loaded == 'loaded') {
-									item.loaded = 'loaded';
-								}
-								return item;
-							})
-							.reverse();
-						obj.calcTotal(); //计算总价
-					})
-					.catch(function(e) {
-						console.log(e);
-					});
-			},
-			//监听image加载完成
-			onImageLoad(key, index) {
-				// 修改载入完成后图片class样式
-				this.$set(this[key][index], 'loaded', 'loaded');
-			},
-			//监听image加载失败
-			onImageError(key, index) {
-				this[key][index].image = '/static/error/errorImage.jpg';
-			},
-			// 跳转到登录页
-			navToLogin() {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			},
-			//选中状态处理
-			check(type, index) {
-				if (type === 'item') {
-					this.cartList[index].checked = !this.cartList[index].checked;
-				} else {
-					const checked = !this.allChecked;
-					const list = this.cartList;
-					list.forEach(item => {
-						item.checked = checked;
-					});
-					this.allChecked = checked;
-				}
-				this.calcTotal(type);
-			},
-			//数量
-			numberChange(data) {
-				let arr = this.cartList[data.index];
-				arr.cart_num = data.number;
-				getCartNum({
-						id: arr.id,
-						number: data.number
-					})
-					.then(e => {
-						console.log(e);
-					})
-					.catch(function(e) {
-						console.log(e);
-					});
-				this.calcTotal();
-			},
-			//删除
-			deleteCartItem(index) {
-				let list = this.cartList;
-				let row = list[index];
-				let id = row.id;
-				uni.showModal({
-					title: '提示',
-					content: '是否删除'+row.productInfo.store_name,
-					success: res => {
-						if(res.confirm){
-							cartDel({
-								ids: id
-							});
-							this.cartList.splice(index, 1);
-							uni.hideLoading();
-							this.calcTotal();
-						}
-					}
-				});
-				
-			},
-			//清空
-			// clearCart() {
-			// 	uni.showModal({
-			// 		content: '清空购物车？',
-			// 		success: e => {
-			// 			if (e.confirm) {
-			// 				let st = this.cartList.map(e => {
-			// 					return e.id;
-			// 				});
-			// 				cartDel({
-			// 					ids: st.join(',')
-			// 				}).then(e => {
-			// 					console.log(e);
-			// 				});
-			// 				this.cartList = [];
-			// 			}
-			// 		}
-			// 	});
-			// },
-			//计算总价
-			calcTotal() {
-				let list = this.cartList;
-				if (list.length === 0) {
-					this.empty = true;
-					return;
-				}
-				let total = 0;
-				let checked = true;
-				list.forEach(item => {
-					if (item.checked === true) {
-						total += item.productInfo.price * item.cart_num;
-					} else if (checked === true) {
-						checked = false;
-					}
-				});
-				this.allChecked = checked;
-				this.total = Number(total.toFixed(2));
-			},
-			//创建订单
-			createOrder() {
-				let list = this.cartList;
-				let goodsData = [];
-				list.forEach(item => {
-					if (item.checked) {
-						goodsData.push(item.id);
-					}
-				});
-
-				uni.navigateTo({
-					url: '/pages/order/createOrder?id=' + goodsData.join(',')
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container {
-		padding-bottom: 134rpx;
-		background-color: $page-color-base;
-		/* #ifdef MP-WEIXIN || H5 */
-		padding-top: 30rpx;
-		/* #endif */
-		/* #ifdef APP */
-		padding-top: var(--status-bar-height);
-		/* #endif */
-		/* 空白页 */
-		.empty {
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
-			height: 100vh;
-			padding-bottom: 100rpx;
-			display: flex;
-			justify-content: center;
-			flex-direction: column;
-			align-items: center;
-			background: #fff;
-
-			.emptyImg {
-				width: 300rpx;
-				height: 250rpx;
-				margin-bottom: 30rpx;
-			}
-
-			.empty-tips {
-				display: flex;
-				font-size: $font-sm + 2rpx;
-				color: $font-color-disabled;
-
-				.navigator {
-					color: $uni-color-primary;
-					margin-left: 16rpx;
-				}
-			}
-		}
-	}
-
-	/* 购物车列表项 */
-	.cart-list {
-		padding: 0 30rpx;
-	}
-
-	.cart-item {
-		display: flex;
-		position: relative;
-		padding: 20rpx;
-		background-color: #FFFFFF;
-		margin-bottom: 20rpx;
-		border-radius: 20rpx;
-
-		.icon-checked-box {
-			width: 37rpx;
-			height: 37rpx;
-			z-index: 5;
-			border: 1px solid $font-color-light;
-			border-radius: 99rpx;
-		}
-
-		.checkedGoods {
-			width: 37rpx;
-			height: 37rpx;
-		}
-
-		.image-wrapper {
-			width: 170rpx;
-			height: 170rpx;
-			flex-shrink: 0;
-			position: relative;
-			border-radius: 20rpx;
-		}
-
-		.checkbox {
-			position: absolute;
-			left: -16rpx;
-			top: -16rpx;
-			z-index: 8;
-			font-size: 44rpx;
-			line-height: 1;
-			padding: 4rpx;
-			color: $font-color-disabled;
-			background: #fff;
-			border-radius: 50px;
-		}
-
-		.item-right {
-			overflow: hidden;
-			position: relative;
-			padding-left: 30rpx;
-			flex-grow: 1;
-
-			.title,
-			.price {
-				font-size: $font-base;
-				color: $font-color-dark;
-			}
-
-			.attr {
-				font-size: 24rpx;
-				color: $font-color-light;
-				height: 40rpx;
-				line-height: 40rpx;
-			}
-
-			.server {
-				font-size: 24rpx;
-				color: $font-color-light;
-				margin-top: 10rpx;
-			}
-
-			.price {
-				font-size: 30rpx;
-				color: $color-green;
-			}
-		}
-
-		.del-btn {
-			flex-shrink: 0;
-			height: 40rpx;
-			width: 40rpx;
-		}
-	}
-
-	/* 底部栏 */
-	.action-section {
-		/* #ifdef H5 */
-		margin-bottom: 100rpx;
-		/* #endif */
-		position: fixed;
-		left: 0rpx;
-		bottom: 0rpx;
-		z-index: 95;
-		display: flex;
-		align-items: center;
-		width: 750rpx;
-		height: 100rpx;
-		padding: 0 30rpx;
-		background: rgba(255, 255, 255, 0.9);
-
-		.leftBox {
-			padding-right: 30rpx;
-			border-right: 1px solid $font-color-disabled;
-		}
-
-		.checkbox {
-			line-height: 1;
-			font-size: 30rpx;
-
-			.icon-checked-box {
-				width: 37rpx;
-				height: 37rpx;
-				z-index: 5;
-				border: 1px solid $font-color-light;
-				border-radius: 99rpx;
-			}
-
-			.icon-checked {
-				border: none;
-				color: $base-color;
-			}
-		}
-
-		.clear-btn {
-			position: absolute;
-			left: 26rpx;
-			top: 0;
-			z-index: 4;
-			width: 0;
-			height: 52rpx;
-			line-height: 52rpx;
-			padding-left: 38rpx;
-			font-size: $font-base;
-			color: #fff;
-			background: $font-color-disabled;
-			border-radius: 0 50px 50px 0;
-			opacity: 0;
-			transition: 0.2s;
-
-			&.show {
-				opacity: 1;
-				width: 120rpx;
-			}
-		}
-
-		.total-box {
-			flex-grow: 1;
-			padding-left: 30rpx;
-			font-size: 30rpx;
-
-			.price {
-				color: $color-green;
-			}
-
-			.coupon {
-				font-size: 24rpx;
-				color: $font-color-light;
-			}
-		}
-
-		.confirm-btn {
-			padding: 0 70rpx;
-			margin: 0;
-			border-radius: 100px;
-			height: 70rpx;
-			line-height: 70rpx;
-			font-size: 24rpx;
-			background: $color-yellow;
-			color: #714D01;
-		}
-	}
-
-	/* 复选框选中状态 */
-	.action-section .checkbox.checked,
-	.cart-item .checkbox.checked {
-		color: $base-color;
-	}
-</style>

pages/category/category.vue

@@ -1,216 +0,0 @@
-<template>
-	<view class="content">
-		<scroll-view scroll-y class="left-aside">
-			<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{ active: item.id === currentId }" @click="tabtap(item)">{{ item.cate_name }}</view>
-		</scroll-view>
-		<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
-			<view v-for="item in flist" :key="item.id" class="s-list" :id="'main-' + item.id">
-				<text class="s-item">{{ item.cate_name }}</text>
-				<view class="t-list ">
-					<view @click="navToList(item.id, titem.id)" class="t-item" v-for="titem in item.children" :key="titem.id">
-						<image :src="titem.pic"></image>
-						<text>{{ titem.cate_name }}</text>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-import { getCategoryList } from '@/api/product.js';
-export default {
-	data() {
-		return {
-			sizeCalcState: false,
-			tabScrollTop: 0,
-			currentId: 9,
-			flist: [],
-		};
-	},
-	onLoad() {
-		this.loadData();
-	},
-	// 监听导航栏输入框点击事件
-	onNavigationBarSearchInputClicked(e) {
-		uni.navigateTo({
-			url: '/pages/product/search'
-		});
-	},
-	methods: {
-		// 载入数据
-		async loadData() {
-			let obj = this;
-			getCategoryList({})
-				.then(({ data }) => {
-					obj.flist = data.map(function(s) {
-						return s;
-					});
-				})
-				.catch(err => {
-					console.log(err);
-				});
-		},
-		//一级分类点击
-		tabtap(item) {
-			console.log(item);
-			// 判断有没有初始化页面高度对象数据
-			if (!this.sizeCalcState) {
-				this.calcSize();
-			}
-			// 获取当前点击的id
-			this.currentId = item.id;
-			console.log(item.top);
-			this.tabScrollTop = item.top;
-			console.log(this.tabScrollTop);
-		},
-		//右侧栏滚动
-		asideScroll(e) {
-			// 判断有没有初始化页面高度对象数据
-			if (!this.sizeCalcState) {
-				this.calcSize();
-			}
-			let scrollTop = e.detail.scrollTop;
-			let box = 0; //列表包裹框高度初始化
-			let bottom = 10; //距离页面底部多少像素左侧列表切换到最后一个一级分类
-			// 查询当前页面对象
-			let view = uni.createSelectorQuery().select('.content');
-			view.fields(
-				{
-					id: true,
-					dataset: true,
-					rect: true,
-					size: true,
-					scrollOffset: true
-				},
-				function(e) {
-					// 保存包裹框高度
-					box = e.height;
-				}
-			).exec();
-			// 获取所有距离顶部大于滚轮距离页面高度的所有分类
-			let tabs = this.flist.filter(item =>( item.top-10) <= scrollTop).reverse();
-			if (tabs.length > 0) {
-				// 判断是否已经到达滚轮底部
-				if (box + scrollTop + bottom >= e.detail.scrollHeight) {
-					this.currentId = this.flist[this.flist.length - 1].id;
-				} else {
-					this.currentId = tabs[0].id;
-				}
-			}
-		},
-		//计算右侧栏每个tab的高度等信息
-		calcSize() {
-			let h = 0;
-			this.flist.forEach(item => {
-				let view = uni.createSelectorQuery().select('#main-' + item.id);
-				view.fields(
-					{
-						size: true
-					},
-					data => {
-						item.top = h;
-						h += data.height;
-						item.bottom = h;
-					}
-				).exec();
-			});
-			this.sizeCalcState = true;
-		},
-		navToList(sid, tid) {
-			// 点击导航跳转到详细页面
-			uni.navigateTo({
-				url: '/pages/product/list?fid='+this.currentId+'&sid='+sid+'&tid='+tid
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-	background-color: #f8f8f8;
-}
-
-.content {
-	display: flex;
-}
-.left-aside {
-	flex-shrink: 0;
-	width: 200rpx;
-	height: 100%;
-	background-color: #fff;
-}
-.f-item {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 100rpx;
-	font-size: 28rpx;
-	color: $font-color-base;
-	position: relative;
-	&.active {
-		color: $base-color;
-		background: #f8f8f8;
-		&:before {
-			content: '';
-			position: absolute;
-			left: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			height: 36rpx;
-			width: 8rpx;
-			background-color: $base-color;
-			border-radius: 0 4px 4px 0;
-			opacity: 0.8;
-		}
-	}
-}
-
-.right-aside {
-	flex: 1;
-	overflow: hidden;
-	padding-left: 20rpx;
-	padding-right: 20rpx;
-}
-.s-item {
-	display: flex;
-	align-items: center;
-	height: 70rpx;
-	padding-top: 8rpx;
-	font-size: 28rpx;
-	color: $font-color-dark;
-}
-.t-list {
-	display: flex;
-	flex-wrap: wrap;
-	border-radius: 15rpx;
-	width: 100%;
-	background: #fff;
-	padding-top: 12rpx;
-	&:after {
-		content: '';
-		flex: 99;
-		height: 0;
-	}
-}
-.t-item {
-	flex-shrink: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	width: 171rpx;
-	font-size: 26rpx;
-	color: #666;
-	padding-bottom: 20rpx;
-
-	image {
-		width: 140rpx;
-		height: 140rpx;
-	}
-}
-</style>

pages/index/indexComponents/noUser.vue

@@ -1,309 +0,0 @@
-<template>
-	<view class="container">
-		<view class="content">
-			<view class="title">
-				<text>HI，车主</text>
-			</view>
-			<view class="tip">
-				<text>
-					您还没未拥有车辆。
-				</text>
-			</view>
-			<view class="itemTitleBox flex">
-				<view class="itemTitle">
-					附近商家
-				</view>
-				<view class="tager flex" @click="navTo('/pages/index/shopTab')">
-					<text>切换</text>
-					<image class="itemIcon" src="../../../static/icon/next1.png" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="shopContent flex">
-				<view class="shoplogo">
-					<image class="logo" :src="shopDetail.image" mode="scaleToFill"></image>
-				</view>
-				<view class="shopDetail">
-					<view class="shopName clamp">
-						{{shopDetail.name}}
-					</view>
-					<view class="shopDetailText">
-						{{shopDetail.detailed_address}}
-					</view>
-				</view>
-			</view>
-			<view class="itemTitleBox flex">
-				<view class="itemTitle">
-					国标系列
-				</view>
-				<view class="tager flex" @click="navTo('/pages/shop/shopIndex?id='+shopDetail.id+'&type=1')">
-					<text>全部</text>
-					<image class="itemIcon" src="../../../static/icon/next1.png" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="flex cartList">
-				<view class="itemBox" v-for="(item,index) in cartList" @click="navTo('/pages/product/product?id='+item.id)" :key='index'>
-					<view class="imgBox">
-						<image class="imageItem" :src="item.image" mode="scaleToFill"></image>
-					</view>
-					<view class="itemDetaile">
-						<view class="cartName">
-							<view class="clamp2 ">
-								{{item.store_name}}
-							</view>
-						</view>
-						<view class="maney clamp">
-							<text class="greenText font-size-base">￥{{item.price}}</text>
-							<text class="lign font-size-sm">{{item.sales|getNum}}+付款</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="itemTitleBox flex">
-				<view class="itemTitle">
-					电摩系列
-				</view>
-				<view class="tager flex" @click="navTo('/pages/shop/shopIndex?id='+shopDetail.id+'&type=2')">
-					<text>全部</text>
-					<image class="itemIcon" src="../../../static/icon/next1.png" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="flex cartList">
-				<view class="itemBox" v-for="(item,index) in carTwoList" :key='index' @click="navTo('/pages/product/product?id='+item.id)">
-					<view class="imgBox">
-						<image class="imageItem" :src="item.image" mode="scaleToFill"></image>
-					</view>
-					<view class="itemDetaile">
-						<view class="cartName">
-							<view class="clamp2 ">
-								{{item.store_name}}
-							</view>
-						</view>
-						<view class="maney clamp">
-							<text class="greenText font-size-base">￥{{item.price}}</text>
-							<text class="lign font-size-sm">{{item.sales|getNum}}+付款</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="itemTitleBox flex">
-				<view class="itemTitle">
-					电轻摩系列
-				</view>
-				<view class="tager flex" @click="navTo('/pages/shop/shopIndex?id='+shopDetail.id)+'&type=3'">
-					<text>全部</text>
-					<image class="itemIcon" src="../../../static/icon/next1.png" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="flex cartList">
-				<view class="itemBox" v-for="(item,index) in carTreeList" :key='index' @click="navTo('/pages/product/product?id='+item.id)">
-					<view class="imgBox">
-						<image class="imageItem" :src="item.image" mode="scaleToFill"></image>
-					</view>
-					<view class="itemDetaile">
-						<view class="cartName">
-							<view class="clamp2 ">
-								{{item.store_name}}
-							</view>
-						</view>
-						<view class="maney clamp">
-							<text class="greenText font-size-base">￥{{item.price}}</text>
-							<text class="lign font-size-sm">{{item.sales|getNum}}+付款</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-	} from 'vuex';
-	import {
-		getProducts,
-	} from '@/api/product.js';
-	export default {
-		data() {
-			return {
-				cartList: [], //国标系列电动车
-				carTwoList: [], //电摩系列电动车
-				carTreeList: [], //电摩系列电动车
-			};
-		},
-		computed: {
-			...mapState('shop', ['shopDetail'])
-		},
-		filters: {
-			getNum(num) {
-				if (num) {
-					// 转为字符串
-					num += '';
-					let nu = num.slice(0, 1);
-					for (let i = 0; i < num.length - 1; i++) {
-						nu += 0
-					}
-					return nu
-				} else {
-					return 0
-				}
-			}
-		},
-		methods: {
-			init() {
-				// 查询国标
-				this.getProducts(2, 'salesOrder').then((data) => {
-					this.cartList = data;
-				})
-				// 查询电车
-				this.getProducts(5, 'salesOrder').then((data) => {
-					this.carTwoList = data;
-				})
-				// 查询电轻摩
-				this.getProducts(6, 'salesOrder').then((data) => {
-					this.carTreeList = data;
-				})
-			},
-			// 获取门店车辆信息
-			getProducts(sid, type) {
-				let data = {
-					sid: sid,
-					page: 1,
-					limit: 10,
-					store_id: this.shopDetail.id,
-					is_car: 1
-				}
-				// 保存查询分类
-				data[type] = 1
-				return new Promise((ok, erro) => {
-					getProducts(data).then(({
-						data
-					}) => {
-						ok(data)
-					}).catch((e) => {
-						erro(e)
-					})
-				})
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			}
-		},
-
-	};
-</script>
-
-<style lang="scss">
-	$paddingJg:40rpx;
-	.container{
-		/* #ifdef APP */
-		padding-top: calc(105rpx + var(--status-bar-height));
-		/* #endif */
-		/* #ifdef H5 || MP */
-		padding-top: 105rpx;
-		/* #endif */
-	}
-	.content {
-		.greenText {
-			color: $color-green;
-		}
-		.title {
-			font-size: 48rpx;
-			padding: 0 $paddingJg;
-			padding-top: 60rpx;
-		}
-
-		.tip {
-			font-size: 22rpx;
-			color: $font-color-light;
-			margin: 20rpx 0;
-			padding: 0 $paddingJg;
-		}
-
-		.shopContent {
-			color: $font-color-white;
-			background-color: $base-color;
-			border-radius: 20rpx;
-			height: 160rpx;
-			padding: 20rpx;
-			margin: 0 $paddingJg;
-			margin-bottom: 20rpx;
-
-			.shoplogo {
-				flex-shrink: 0;
-				background-color: $font-color-white;
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 20rpx;
-
-				.logo {
-					height: 100%;
-					width: 100%;
-				}
-			}
-
-			.shopDetail {
-				padding-left: 30rpx;
-				flex-grow: 1;
-
-				.shopName {
-					margin-bottom: 25rpx;
-					font-size: 36rpx;
-				}
-
-				.shopDetailText {
-					font-size: 22rpx;
-				}
-			}
-		}
-
-		.cartList {
-			flex-wrap: wrap;
-			margin: 0 $paddingJg;
-			overflow: hidden;
-
-			.itemBox {
-				width: 310rpx;
-				min-height: 460rpx;
-				background-color: $font-color-white;
-				border-radius: 20rpx;
-				box-shadow: 0px 0px 10px 0px rgba(226, 226, 226, 0.35);
-				margin-bottom: 30rpx;
-				overflow: hidden;
-
-				.imgBox {
-					line-height: 0;
-
-					.imageItem {
-						width: 310rpx;
-						height: 310rpx;
-					}
-				}
-
-				.itemDetaile {
-					padding: 10rpx 20rpx;
-
-					.cartName {
-						line-height: 1.5;
-						font-size: 28rpx;
-						color: $font-color-base;
-						font-weight: 400;
-						min-height: 90rpx;
-					}
-
-					.maney {
-						line-height: 1;
-
-						.lign {
-							margin-left: 20rpx;
-							color: $font-color-light;
-
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

pages/index/indexComponents/onUser.vue

@@ -1,1223 +0,0 @@
-<template>
-	<view class="pageBox">
-		<view class="userOff" v-if="actionCartItem">
-			<view class="navBox">
-				<view class="flex topIconBox">
-					<image @click="navTo('/pages/index/shopTab?type=1')" class="topIcon"
-						src="../../../static/controller/witchShop.png" mode="widthFix"></image>
-					<view v-if="actionCartItem" class="clamp padding-l-10 padding-r-10">
-						{{actionCartItem.car_name||''}}
-					</view>
-					<image @click="navTo('/pages/index/notice')" class="topIcon"
-						src="../../../static/controller/witchMessage.png" mode="widthFix">
-					</image>
-					<view class="topIconNum flex" v-if="notify>0">
-						<text>
-							{{notify}}
-						</text>
-					</view>
-				</view>
-			</view>
-			<view class="actionBox">
-				<image class="cartImg" :src="actionCartItem.image" mode="aspectFit"></image>
-				<view class="timeBox" v-if="actionCartItem.day>0">
-					<view style="border-radius: 20rpx;"
-						class="rowContentBox flexCenter lineBorder padding-l-20 padding-r-20 padding-t-10 padding-b-10">
-						<view class="tipMen"></view>
-						<view class="dayBox" v-if="actionCartItem.car_operate">
-							<view>
-								{{actionCartItem.day}}
-							</view>
-							<view class="oldDay margin-t-10">
-								剩余天数
-							</view>
-						</view>
-						<view class="dayBox" v-else>
-							<view class="oldDay margin-t-10 font-color-red">
-								已欠费
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="leftNotify" v-if="fx">
-					<navigator url="/pages/index/share">
-						<image class="img" src="../../../static/image/redPage.png" mode="aspectFill"></image>
-					</navigator>
-				</view>
-			</view>
-			<view class="content">
-				<view class="contentButtom flexCenter">
-					<view class="buttomBox flex">
-						<view class="leftBox">
-							<view class="buttom buttomLg ">
-								<view @click="authSet" class="rowContentBox flexCenter lineBorder">
-									<view class="tipMen"></view>
-									<view class="centerTextBox">
-										<view>
-											<image class="tipIcon" src="../../../static/controller/shouquan.png"
-												mode="aspectFit"></image>
-										</view>
-										<view class="margin-t-10">
-											授权
-										</view>
-									</view>
-								</view>
-								<view class="rightPaddingBg">
-								</view>
-								<view class="buttomPaddingBg">
-								</view>
-							</view>
-							<view class="leftCenterButtom buttom" @click="navTo('/pages/user/money/recharge')">
-								<view class="rowContentBox flexCenter lineBorder">
-									<view class="tipMen"></view>
-									<view>
-										<view>
-											充
-										</view>
-										<view>
-											值
-										</view>
-									</view>
-								</view>
-								<view class="topBageBg"></view>
-								<view class="bottomBageBg"></view>
-							</view>
-							<view class="buttomLg buttom">
-								<view @click="navTo('/pages/user/reportForRepair/Report?id='+actionCartItem.car_number)"
-									class="rowContentBox flexCenter lineBorder">
-									<view class="tipMen"></view>
-									<view class="centerTextBox">
-										<view>
-											<image class="tipIcon" src="../../../static/controller/baoxiu.png"
-												mode="aspectFit"></image>
-										</view>
-										<view class="margin-t-10">
-											报修
-										</view>
-									</view>
-								</view>
-								<view class="topPaddingBg"></view>
-								<view class="rightPaddingBg"></view>
-							</view>
-						</view>
-						<view class="centerBgBox">
-							<view class="centerBg lineBorder borderRadiusAll">
-								<view class="borTopHide"></view>
-								<view class="borBottomHide"></view>
-							</view>
-							<view class="bgGray borderRadiusAll"></view>
-							<view class="contentOrg borderRadiusAll">
-								<view class="contentOrgBg borderRadiusAll centerBox lineBorder2 flexCenter">
-									<view class="centerBoxJb borderRadiusAll lineBorder2">
-										<view class="boxBgJb borderRadiusAll flexCenter">
-											<view class="flex-center">
-												<view class="iconButtomBox borderRadiusAll flexCenter"
-													:class="{greedBg:actionCartItem.status==1||actionCartItem.status==3||actionCartItem.status==4}"
-													@click="tabCarStatus('tab',actionCartItem)">
-													<view class="mr borderRadiusAll "></view>
-													<view class="iconButtomJb">
-														<view>
-															<image class="img"
-																src="../../../static/controller/qidong.png"
-																mode="aspectFit"></image>
-														</view>
-														<view class="margin-t-10"
-															v-if="actionCartItem.status==1||actionCartItem.status==3||actionCartItem.status==4">
-															启动
-														</view>
-														<view class="margin-t-10" v-else>
-															关闭
-														</view>
-													</view>
-												</view>
-											</view>
-										</view>
-									</view>
-									<view class="line left"></view>
-									<view class="line right"></view>
-									<view @click="alertCartList" class="topButtomTipBox posbuttom flexCenter">
-										<view class="centerTextBox">
-											<view>
-												<image class="tipIcon" src="../../../static/controller/huanche.png"
-													mode="aspectFit"></image>
-											</view>
-											<view class="margin-t-10">
-												换车
-											</view>
-										</view>
-									</view>
-									<view class="rightButtomTipBox posbuttom flexCenter"
-										@click="tabCarStatus('seek',actionCartItem)">
-										<view class="centerTextBox">
-											<view>
-												<image class="tipIcon" src="../../../static/controller/xunche.png"
-													mode="aspectFit"></image>
-											</view>
-											<view class="margin-t-10">
-												寻车
-											</view>
-										</view>
-									</view>
-									<view
-										@click="openMap(actionCartItem.cartInfo.latitude,actionCartItem.cartInfo.longitude)"
-										class="bottomButtomTipBox posbuttom flexCenter">
-										<view class="centerTextBox">
-											<view>
-												<image class="tipIcon" src="../../../static/controller/dingwei.png"
-													mode="aspectFit"></image>
-											</view>
-											<view class="margin-t-10">
-												定位
-											</view>
-										</view>
-									</view>
-									<view class="leftButtomTipBox posbuttom flexCenter"
-										@click="tabCarStatus('unlock',actionCartItem)">
-										<view class="centerTextBox">
-											<view>
-												<image class="tipIcon" src="../../../static/controller/kaisuo.png"
-													mode="aspectFit"></image>
-											</view>
-											<view class="margin-t-10">
-												开座垫
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="rightBox">
-							<view class="rightButtom buttom flex">
-
-								<view class="centerTextBox">
-									<view>
-										{{actionCartItem.bfb||0}}%
-									</view>
-									<view>
-										<image class="tipIcon" src="../../../static/controller/dianchi.png"
-											mode="aspectFit"></image>
-									</view>
-								</view>
-								<view class="rightElectric flexCenter">
-									<view class="electric" :class="{greedBg:actionCartItem.bfb>91}"></view>
-									<view class="electric" :class="{greedBg:actionCartItem.bfb>83}"></view>
-									<view class="electric" :class="{greedBg:actionCartItem.bfb>75}"></view>
-									<view class="electric" :class="{greedBg:actionCartItem.bfb>66}"></view>
-									<view class="electric" :class="{yellowBg:actionCartItem.bfb>58}"></view>
-									<view class="electric" :class="{yellowBg:actionCartItem.bfb>50}"></view>
-									<view class="electric" :class="{yellowBg:actionCartItem.bfb>41}"></view>
-									<view class="electric" :class="{yellowBg:actionCartItem.bfb>33}"></view>
-									<view class="electric" :class="{redGb:actionCartItem.bfb>24}"></view>
-									<view class="electric" :class="{redGb:actionCartItem.bfb>16}"></view>
-									<view class="electric" :class="{redGb:actionCartItem.bfb>8}"></view>
-									<view class="electric" :class="{redGb:actionCartItem.bfb>0}"></view>
-								</view>
-							</view>
-							<view class=" buttomLg buttom"  @click="navTo('/pages/index/route?id='+actionCartItem.car_number)">
-								<view class="topBageBg"></view>
-								<view class="rowContentBox flexCenter lineBorder">
-									<view class="tipMen"></view>
-									<view class="centerTextBox margin-l-40 padding-l-30">
-										<view>
-											<image class="tipIcon" src="../../../static/controller/xincheng.png"
-												mode="aspectFit"></image>
-										</view>
-										<view class="margin-t-10">
-											行程
-										</view>
-									</view>
-								</view>
-								<view class="topPaddingBg"></view>
-								<view class="leftPaddingBg"></view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-popup ref="popup" type="bottom" v-if="actionCartItem">
-			<view class="cartListAlertButtom">
-				<view class="cartTitle flex">
-					<view>
-						请选择更换的车辆
-					</view>
-					<image @click="popupClose" class="exit" src="../../../static/icon/goodsExit.png" mode="scaleToFill">
-					</image>
-				</view>
-				<view class="actionCartBox">
-					<view class="itemCart flex" :class="{action:item.id==actionCartItem.id}"
-						v-for="(item,index) in myCartList" @click="changeCart(index)" :key='index'>
-						<image class="cartImg" :src="item.image" mode="scaleToFill"></image>
-						<view class="content">
-							<view class="title clamp2" :class="{action:item.id==actionCartItem.id}">
-								{{item.car_name||''}}
-							</view>
-							<view class="address margin-t-20" :class="{action:item.id==actionCartItem.id}">
-								{{item.address||"暂无定位信息"}}
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<view style="height: 1px;"></view>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		mycar,
-		getCarInfo,
-		getcar_status,
-		car_switch,
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	// #ifdef MP
-	import {
-		openGetAddress,
-	} from '@/utils/rocessor.js';
-	// #endif
-	// #ifdef H5
-	import weixinObj from "@/plugin/jweixin-module/index.js";
-	import {
-		weixindata
-	} from "@/utils/wxAuthorized.js"
-	// #endif
-	export default {
-		props: {
-			notify: {
-				type: Number,
-				default: 0
-			},
-		},
-		data() {
-			return {
-				chickedMyCart: 0, //默认选中的车辆
-				// 我的车辆
-				myCartList: [],
-				ladingCart: false, //判断是否已经加载过我的车辆
-				// #ifdef H5
-				iconPath: '../../static/image/location.png', //定位图标地址
-				// #endif
-				// #ifndef H5
-				iconPath: '../../../static/image/location.png', //定位图标地址
-				// #endif
-				timeOut: '', //用于存放调用定时获取对象数据
-				reachangeAlert:false,//判断是否已经提示过充值
-			};
-		},
-		watch: {
-			reachange(newValue, oldValue) {
-				if (newValue && (this.actionCartItem.auth_num != -1)) {
-					uni.showModal({
-						title: '错误',
-						content: '您的余额已不足三天支付是否马上充值',
-						cancelText: '关闭',
-						confirmText: '马上充值',
-						success: res => {
-							if (res.confirm) {
-								this.navTo('/pages/user/money/recharge');
-							}
-						},
-					});
-				}
-
-			}
-		},
-		computed: {
-			...mapState('user', ['address', 'userInfo']),
-			...mapState(['fx']),
-			actionCartItem() {
-				if (this.myCartList[this.chickedMyCart]) {
-					return this.myCartList[this.chickedMyCart]
-				} else {
-					return false
-				}
-			},
-			reachange() {
-				// 余额
-				const a1 = +this.userInfo.now_money;
-				if (!this.actionCartItem) {
-					return false
-				}
-				// 三天内应该付的金额
-				const a2 = this.actionCartItem.day_deducted * 3;
-				if (a1 < a2 && !this.reachangeAlert&&this.actionCartItem.day>0) {
-					// 处理已加载提示用户充值信息
-					this.reachangeAlert = true;
-					return (new Date()).getTime()
-				} else {
-					return false
-				}
-			}
-		},
-		created() {
-			this.getUserInfo();
-		},
-		beforeDestroy() {
-
-		},
-		methods: {
-			...mapMutations('user', ['setAddress', 'setUserInfo']),
-			// 加载初始数据
-			getUserInfo() {
-				getUserInfo({})
-					.then(({
-						data
-					}) => {
-						this.setUserInfo(data)
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			// 设置tabbar背景颜色
-			setTabbar() {
-				uni.setTabBarStyle({
-					backgroundColor: '#25273E'
-				})
-			},
-			// 父元素启动监听
-			onStartGetCartInfo() {
-				console.log('监听');
-				if (this.timeOut) {
-					this.outGetCartInfo();
-				}
-				this.onGetCartInfo()
-			},
-			// 关闭定时获取车辆信息
-			outGetCartInfo() {
-				clearInterval(this.timeOut)
-			},
-			onGetCartInfo() {
-				this.getCarInfo(this.myCartList[this.chickedMyCart]);
-				this.timeOut = setInterval((e) => {
-					this.getCarInfo(this.myCartList[this.chickedMyCart]);
-				}, 60000)
-			},
-			// tab改变事件
-			changetab(tab) {
-				this.myCartList[this.chickedMyCart].status = tab
-			},
-			// 关闭车辆选择弹窗
-			popupClose() {
-				this.$refs.popup.close();
-			},
-			// 显示车辆选择列表
-			alertCartList() {
-				// 打开选择弹窗
-				this.$refs.popup.open();
-			},
-			// 打开地图导航
-			openMap(lat, long) {
-				uni.openLocation({
-					latitude: +lat,
-					longitude: +long,
-					complete(e) {
-						console.log(e, '地图打开');
-					}
-				})
-			},
-			// 切换更新车辆信息
-			changeCart(index) {
-				this.$refs.popup.close();
-				this.chickedMyCart = index;
-				// 判断是否已经加载过车辆信息未加载则更新信息
-				// if(!this.myCartList[this.chickedMyCart].cartInfoLoading){
-				const cart = this.myCartList[this.chickedMyCart];
-				this.getCarInfo(cart);
-				this.$emit("changeCart", cart)
-				// }
-			},
-			// 载入我的车辆列表
-			loadCard() {
-				let that = this;
-				mycar({}).then((e) => {
-					// 判断数据是由有过更新
-					if (that.myCartList.length != e.data.data.length) {
-						that.myCartList = e.data.data.map((e) => {
-							// 保存百分比
-							e.bfb = 0;
-							// 保存车辆消息
-							e.cartInfo = {}
-							// 判断是否已经加载数据
-							e.cartInfoLoading = false
-							return e
-						});
-						// 初始化选中的车辆
-						that.chickedMyCart = 0;
-						that.getCarInfo(that.myCartList[that.chickedMyCart])
-					}
-				}).catch((e) => {
-					console.log();
-				})
-			},
-			// 加载车辆信息
-			getCarInfo(item) {
-				getcar_status({
-					car_number: item.car_number
-				}).then((e) => {
-					// console.log(e, '车辆');
-					if (e.data.id) {
-						// 保存车辆信息
-						item.cartInfo = e.data;
-						// 保存电量百分比
-						item.bfb = +e.data.residue
-						item.cartInfo.latitude = +item.cartInfo.latitude;
-						item.cartInfo.longitude = +item.cartInfo.longitude;
-						if (!item.cartInfoLoading) {
-							this.onStartGetCartInfo()
-						}
-						// item.day = e.data.day;
-						item.cartInfoLoading = true;
-					}
-				}).catch((e) => {
-					console.log(e);
-				})
-			},
-			// 调用切换
-			tabCarStatus(type = 'tab', item) {
-				uni.showLoading({
-					title: '请求发送中',
-					mask: true
-				});
-				let that = this;
-				let data = {
-					car_number: item.car_number,
-				};
-				// 是否开关锁
-				if (type == 'tab') {
-					data.status = (item.status == 1) ? 2 : 1;
-				}
-				// 是否解锁
-				if (type == 'unlock') {
-					data.status = 7;
-				}
-				// 是否寻车
-				if (type == 'seek') {
-					data.status = 5;
-				}
-				// #ifdef H5
-				let bool = uni.getStorageSync('weichatBrowser') || '';
-				uni.showLoading({
-					title: '获取地址中',
-					mask: true
-				});
-				// 判断是否公众号
-				if (bool) {
-					weixindata().then(() => {
-						weixinObj.getLocation({
-							type: 'gcj02',
-							success: (e) => {
-								uni.hideLoading()
-								data.latitude = e.latitude;
-								data.longitude = e.longitude;
-								that.car_switch(data, type, item)
-							},
-							fail() {
-								uni.hideLoading()
-							}
-						});
-					})
-				} else {
-					uni.getLocation({
-						type: 'gcj02',
-						success(e) {
-							uni.hideLoading()
-							data.latitude = e.latitude;
-							data.longitude = e.longitude;
-							that.car_switch(data, type, item)
-						},
-						fail(e) {
-							uni.hideLoading()
-							console.log(e, 'cw');
-						}
-					})
-				}
-
-				// #endif
-
-				// #ifdef MP
-				// 判断是否已经有位置数据
-
-				if (!that.address.latitude || !that.address.longitude) {
-					// 判断是否已经获取授权
-					openGetAddress().then((e) => {
-						uni.showLoading({
-							title: '获取地址中',
-							mask: true
-						});
-						// 获取当前选中开锁的对象
-						wx.startLocationUpdateBackground({
-							type: 'gcj02',
-							success: (e) => {
-								uni.hideLoading()
-								// 调用鉴定位置变化事件
-								wx.onLocationChange((res) => {
-									console.log(res, '位置数据');
-									// 保存当前经纬度
-									that.setAddress({
-										latitude: res.latitude,
-										longitude: res.longitude
-									})
-									// 判断是否已经加载过最近商家信息
-									if (!that.loadShopData) {
-										data.latitude = res.latitude;
-										data.longitude = res.longitude;
-										that.car_switch(data, type, item)
-										that.loadShopData = true;
-									}
-								})
-							},
-							fail: () => {
-								uni.hideLoading()
-							}
-						})
-
-					})
-				} else {
-					data.latitude = that.address.latitude;
-					data.longitude = that.address.longitude;
-					that.car_switch(data, type, item)
-				}
-				// #endif
-				// #ifdef APP
-				uni.getLocation({
-					type:'gcj02',
-					success(res){
-						data.latitude =res.latitude;
-						data.longitude = res.longitude;
-						that.car_switch(data, type, item);
-					},fail(e) {
-						uni.showModal({
-							title: '授权失败',
-							content: '未授权定位权限无法开启仪表盘功能',
-							showCancel: false,
-						});
-						console.log(e);
-					}
-				})
-				// #endif
-			},
-			// 保存地址
-			car_switch(data, type, item) {
-				uni.showLoading({
-					title: '请求发送中',
-					mask: true
-				});
-				car_switch(data).then((e) => {
-					if (type == 'tab') {
-						item.status = (item.status == 1) ? 2 : 1;
-					}
-					uni.hideLoading()
-					uni.showToast({
-						title: e.msg
-					});
-				}).catch((e) => {
-					uni.hideLoading()
-					uni.showModal({
-						title: '错误',
-						content: e.msg,
-						showCancel: false,
-					});
-				})
-			},
-			// 判断是否有权限授权车辆
-			authSet(){
-				if(this.actionCartItem.auth_num!=-1){
-					this.navTo('/pages/user/myCart/authorization?id='+this.actionCartItem.car_number)
-				}else{
-					uni.showModal({
-						title: '提示',
-						content: '该车辆是他人授权给您的车辆您无权二次授权',
-						showCancel: false,
-					});
-				}
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			}
-		},
-
-	};
-</script>
-
-<style lang="scss">
-	$paddingJg:40rpx;
-	// 按钮黑色背景
-	$bgBlack:#161727;
-	// 底色
-	$contentBg:#373c5a;
-	// 按钮包裹框背景颜色
-	$maxBoxBg:#1f2136;
-
-	.pageBox {
-		height: 0;
-		min-height: 100%;
-	}
-
-	.flexCenter {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.navBox {
-		/* #ifdef APP */
-		padding-top: var(--status-bar-height);
-		padding-bottom: 30rpx;
-		/* #endif */
-		/* #ifdef H5 || MP */
-		padding-top: 30rpx;
-		padding-bottom: 30rpx;
-		/* #endif */
-		background-color: $contentBg;
-		flex-shrink: 0;
-	}
-
-	.topIconBox {
-		padding: 0 $paddingJg;
-		position: relative;
-		color: #FFFFFF;
-		font-size: $font-base + 2rpx;
-
-		.topIconNum {
-			position: absolute;
-			top: -10rpx;
-			right: 20rpx;
-			font-size: $font-sm;
-			min-width: 30rpx;
-			min-height: 30rpx;
-			border-radius: 100rpx;
-			background-color: $color-red;
-			padding: 5rpx;
-			justify-content: center;
-		}
-
-		.topIcon {
-			transform: rotateZ(-90deg);
-			width: 45rpx;
-			height: 45rpx;
-			flex-shrink: 0;
-		}
-	}
-
-	.userOff {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-
-		.actionBox {
-			background-color: #0f1025;
-			flex-shrink: 1;
-			flex-grow: 1;
-			text-align: center;
-			height: 400rpx;
-			position: relative;
-
-			.cartImg {
-				height: 100%;
-				width: 100%;
-			}
-
-			.leftNotify {
-				position: absolute;
-				top: 20rpx;
-				left: 30rpx;
-
-				.img {
-					width: 120rpx;
-					height: 120rpx;
-				}
-			}
-
-			.timeBox {
-				position: absolute;
-				color: #FFFFFF;
-				right: 30rpx;
-				top: 30rpx;
-				font-size: $font-base;
-				font-weight: bold;
-
-				.dayBox {
-					z-index: 1;
-					line-height: 1;
-				}
-
-				.oldDay {
-					font-size: $font-sm - 2rpx;
-					color: $font-color-disabled;
-				}
-
-				.tipMen {
-					transform-origin: top left;
-					margin-left: 0;
-				}
-			}
-		}
-
-		.content {
-			flex-shrink: 0;
-			flex-grow: 1;
-		}
-
-		.lineBorder {
-			border: 1px solid #aaaec7;
-		}
-
-		.lineBorder2 {
-			border: 1px solid #b7cbf2;
-		}
-
-		.rowContentBox {
-			overflow: hidden;
-			background-color: $contentBg;
-
-			.tipMen {
-				position: absolute;
-				top: 0;
-				left: 0;
-				transform-origin: top left;
-				margin-left: -40rpx;
-				transform: rotateZ(-45deg);
-				height: 100%;
-				width: 100%;
-				background-image: linear-gradient(to bottom, rgba(69, 75, 113, 1) 0%, transparent 100%);
-			}
-		}
-
-		.rowContentBox,
-		.centerBox {
-			height: 100%;
-			width: 100%;
-			position: relative;
-		}
-
-		.contentButtom {
-
-			width: 750rpx;
-			height: 100%;
-			background-color: $maxBoxBg;
-			font-size: $font-base;
-			line-height: 1;
-
-			.centerTextBox {
-				text-align: center;
-				margin-left: -70rpx;
-			}
-
-			.tipIcon {
-				width: 46rpx;
-				height: 46rpx;
-			}
-
-			.buttomBox {
-				width: 750rpx;
-				padding: 40rpx;
-				color: #B2B9D3;
-
-				.buttom {
-					padding: 10rpx;
-					background-color: $bgBlack;
-					position: relative;
-
-					.rightPaddingBg,
-					.topPaddingBg,
-					.leftPaddingBg,
-					.buttomPaddingBg {
-						position: absolute;
-						background-color: $bgBlack;
-						z-index: 11;
-					}
-
-					.topPaddingBg,
-					.buttomPaddingBg {
-						height: 12rpx;
-						width: 180rpx;
-						left: 0;
-					}
-
-					.rightPaddingBg,
-					.leftPaddingBg {
-						height: 180rpx;
-						width: 10rpx;
-						top: 0rpx;
-					}
-
-					.topPaddingBg {
-						top: -1px;
-					}
-
-					.buttomPaddingBg {
-						button: 0rpx;
-					}
-
-					.rightPaddingBg {
-						right: 0rpx;
-					}
-
-					.leftPaddingBg {
-						left: 0;
-					}
-
-					.topBageBg,
-					.bottomBageBg {
-						height: 30rpx;
-						width: 180rpx;
-						background-color: $maxBoxBg;
-						position: absolute;
-						z-index: 10;
-					}
-
-					.topBageBg {
-						top: -30rpx;
-					}
-
-					.bottomBageBg {
-						bottom: -30rpx;
-					}
-				}
-
-				.centerBox {
-					// background-image: linear-gradient(to bottom, #49548d 0%, transparent 100%);
-					background-color: rgba($color: #49548d, $alpha: 0.5);
-					box-shadow: 0px 0px 30rpx rgba($color: #5a6fdb, $alpha: 0.5) inset;
-				}
-
-
-				.buttomLg {
-					width: 180rpx;
-					height: 180rpx;
-				}
-
-
-				.leftBox {
-					.leftCenterButtom {
-						margin: 30rpx 0;
-						width: 80rpx;
-						height: 120rpx;
-						background-size: 80rpx 120rpx;
-						z-index: 99;
-
-						.tipMen {
-							margin-left: 0rpx;
-						}
-					}
-				}
-
-				.centerBgBox {
-					flex-shrink: 1;
-					position: relative;
-
-					.borderRadiusAll {
-						border-radius: 1000rpx;
-					}
-
-					.bgGray {
-						position: absolute;
-						top: 0;
-						left: 0;
-						background-color: $maxBoxBg;
-						width: 530rpx;
-						height: 530rpx;
-						z-index: 20;
-						left: -265rpx;
-						top: -265rpx;
-					}
-
-					.contentOrg {
-						position: absolute;
-						background-color: $bgBlack;
-						width: 480rpx;
-						height: 480rpx;
-						left: -240rpx;
-						top: -240rpx;
-						z-index: 99;
-						padding: 20rpx;
-
-						.contentOrgBg {
-							width: 100%;
-							height: 100%;
-							position: relative;
-							background-color: $contentBg;
-							background-image: linear-gradient(to bottom, rgba($color: #454b71, $alpha: 1) 0%, transparent 25%, transparent 75%, rgba($color: #454b71, $alpha: 1) 100%);
-
-							.posbuttom {
-								position: absolute;
-
-								.centerTextBox {
-									margin: 0;
-								}
-							}
-
-							.topButtomTipBox {
-								top: 0;
-								padding-bottom: 20rpx;
-							}
-
-							.bottomButtomTipBox {
-								bottom: 0;
-								padding-top: 20rpx;
-							}
-
-							.bottomButtomTipBox,
-							.topButtomTipBox {
-								width: 200rpx;
-								height: 140rpx;
-								margin: 0 auto;
-							}
-
-							.rightButtomTipBox,
-							.leftButtomTipBox {
-								width: 140rpx;
-								height: 200rpx;
-							}
-
-							.rightButtomTipBox {
-								padding-left: 20rpx;
-								right: 0;
-							}
-
-							.leftButtomTipBox {
-								padding-right: 20rpx;
-								left: 0;
-							}
-
-							.line {
-								position: absolute;
-								width: calc(440rpx + 2px);
-								height: 20rpx;
-								border-top: 1px solid #b7cbf2;
-								border-bottom: 1px solid #b7cbf2;
-								border-left: 1px solid $bgBlack;
-								border-right: 1px solid $bgBlack;
-								background-color: $bgBlack;
-								box-shadow: 0px 0px 30rpx rgba($color: #5a6fdb, $alpha: 0.5);
-
-								&.left {
-									transform: rotateZ(45deg);
-								}
-
-								&.right {
-									transform: rotateZ(-45deg);
-
-								}
-							}
-
-							.centerBoxJb {
-								width: 200rpx;
-								height: 200rpx;
-								background-color: $bgBlack;
-								box-shadow: 0px 0px 30rpx rgba($color: #5a6fdb, $alpha: 0.5);
-								position: relative;
-
-								.boxBgJb {
-									background-color: $bgBlack;
-									width: 100%;
-									height: 100%;
-									position: absolute;
-									z-index: 1;
-
-									.iconButtomBox {
-										font-size: $font-base;
-										color: #FFFFFF;
-										font-weight: bold;
-										width: 160rpx;
-										height: 160rpx;
-										background-color: #DEDEDE;
-										text-align: center;
-										background-color: #F6C531;
-										position: relative;
-
-										&.greedBg {
-											background-color: $color-green;
-										}
-
-										.mr {
-											position: absolute;
-											height: 100%;
-											width: 100%;
-											background-image: linear-gradient(to bottom, rgba($color: #FFFFFF, $alpha: 0.2) 0%, rgba($color: #FFFFFF, $alpha: 0) 50%, rgba($color: #FFFFFF, $alpha: 0) 100%);
-											box-shadow: 0px 0px 20rpx rgba($color: #FFFFFF, $alpha: 0.5) inset;
-										}
-
-										.iconButtomJb {
-											.img {
-												width: 75rpx;
-												height: 75rpx;
-
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-
-					.centerBg {
-						position: absolute;
-						left: -280rpx;
-						top: -280rpx;
-						background-color: $bgBlack;
-						width: 560rpx;
-						height: 560rpx;
-						z-index: 10;
-
-						.borTopHide {
-							top: -10rpx;
-							left: 120rpx;
-						}
-
-						.borBottomHide,
-						.borTopHide {
-							position: absolute;
-							height: 100rpx;
-							width: 316rpx;
-							background-color: $maxBoxBg;
-						}
-
-
-						.borBottomHide {
-							left: 120rpx;
-							bottom: -10rpx;
-						}
-					}
-				}
-
-				.rightBox {
-					flex-shrink: 0;
-
-					.rightElectric {
-						flex-direction: column;
-						padding-right: 6rpx;
-
-						.electric {
-							width: 40rpx;
-							height: 10rpx;
-							// border-radius: 10rpx;
-							background-color: $maxBoxBg;
-							margin-bottom: 16rpx;
-
-							// &:last-child{
-							// 	border-bottom-left-radius: 10rpx;
-							// 	border-bottom-right-radius: 10rpx;
-							// }
-							// &:first-child{
-							// 	border-top-left-radius: 10rpx;
-							// 	border-top-right-radius: 10rpx;
-							// }
-							&.greedBg {
-								background-color: $color-green;
-							}
-
-							&.yellowBg {
-								background-color: #F6C531;
-							}
-
-							&.redGb {
-								background-color: #DE2C2C;
-							}
-						}
-					}
-
-					.rightButtom {
-						position: relative;
-						z-index: 11;
-						margin-bottom: 30rpx;
-						width: 180rpx;
-						height: 330rpx;
-						padding-left: 30rpx;
-						padding-top: 16rpx;
-						align-items: flex-start;
-
-						.centerTextBox {
-							text-align: right;
-							margin-left: 16rpx;
-
-						}
-					}
-				}
-
-			}
-		}
-	}
-
-	.cartListAlertButtom {
-		position: relative;
-		padding-top: 20rpx;
-		border-top-left-radius: 30rpx;
-		border-top-right-radius: 30rpx;
-		background-color: #FFFFFF;
-		z-index: 999;
-		/* #ifdef H5 */
-		padding-bottom: var(--window-bottom);
-
-		/* #endif */
-		.actionCartBox {
-			padding-bottom: 40rpx;
-
-			.itemCart {
-				background-color: #F3F6F8;
-				margin: 0 30rpx 30rpx;
-				padding: 0 30rpx;
-				border-radius: 20rpx;
-				height: 200rpx;
-				text-align: left;
-
-				&.action {
-					background-color: $color-green;
-				}
-
-				.cartImg {
-					width: 120rpx;
-					height: 120rpx;
-				}
-
-				.content {
-					flex-grow: 1;
-					padding-left: 20rpx;
-				}
-
-				.title {
-					font-size: $font-base;
-					font-weight: bold;
-					color: $font-color-base;
-
-					&.action {
-						color: #FFFFFF;
-					}
-				}
-
-				.address {
-					line-height: 1;
-					font-size: $font-sm - 2rpx;
-					color: $font-color-disabled;
-
-					&.action {
-						color: #FFFFFF;
-					}
-				}
-			}
-		}
-
-		.cartTitle {
-			margin: 0 30rpx;
-			margin-bottom: 30rpx;
-			font-size: $font-lg;
-			font-weight: bold;
-
-			.exit {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-
-	}
-</style>

pages/index/notice.vue

@@ -1,334 +0,0 @@
-<template>
-	<view class="content">
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">
-				<text>{{ item.text }}</text>
-				<text class="margin-l-10" v-if="item.count>0">({{item.count}})</text>
-			</view>
-		</view>
-
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<!-- #ifdef H5 -->
-					<empty src="../../static/error/emptyNotice.png"
-						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- #endif -->
-
-					<!-- #ifndef H5 -->
-					<empty src="../static/error/emptyNotice.png"
-						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- #endif -->
-					<!-- 订单列表 -->
-					<view class="itemBox" v-for="(item,index) in tabItem.orderList">
-						<view class="time">
-							{{item.add_time}}
-						</view>
-						<view @click="
-						tabItem.state==1
-						?
-						navTo('/pages/index/noticeDetail?id='+item.id+'&type=1',item)
-						:
-						navTo('/pages/index/noticeDetail?id='+item.id+'&type=2',item)
-						" class="itemDetail" :class="{wargin:tabItem.state==2,base:tabItem.state==1}">
-							<view class="typeName" :class="{gray:item.is_read==1}">
-								{{item.title}}
-							</view>
-							<view class="detail" :class="{gray:item.is_read==1}">
-								{{item.synopsis}}
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		articleList,
-		notify,
-		notify_read
-	} from '@/api/index.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 1,
-						text: '通知',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						count: 0, //总消息条数
-					},
-					{
-						state: 2,
-						text: '警报',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						count: 0, //总消息条数
-					}
-				]
-			};
-		},
-
-		onLoad(options) {
-			this.initNum();
-			this.loadData();
-		},
-		methods: {
-			// 初始化查询数量
-			initNum() {
-				notify().then((e) => {
-					this.navList[1].count = e.data.not_read_count;
-				})
-			},
-			navTo(url, item) {
-				let data = {
-					url: url,
-				}
-
-				// 判断是否为报警信息
-				if (item.type==2) {
-					// 判断是否已读
-					notify_read({
-						id: item.id
-					})
-					data.success = function(res) {
-						// 通过eventChannel向被打开页面传送数据
-						res.eventChannel.emit('addPushData', item)
-					}
-				}
-				 if (item.is_read != 1) {
-				 	this.navList[item.type-1].count--
-				 }
-				 console.log(this.navList[item.type-1]);
-				// 设置为已读
-				item.is_read = 1
-				uni.navigateTo(data)
-			},
-			// 转换金额为数字
-			moneyNum(value) {
-				return +value;
-			},
-			// 确认收货
-			//获取订单列表
-			loadData(source) {
-				const that = this;
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				console.log(navItem, '数据');
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				// 判断是否为消息通知
-				if (state == 1) {
-					articleList({
-							page: navItem.page,
-							limit: navItem.limit
-						}, 1)
-						.then(({
-							data
-						}) => {
-							data.data = data.data.map((e) => {
-								e.is_read = +e.is_read;
-								e.type=1
-								return e
-							})
-							that.callback(data, navItem)
-						})
-						.catch(e => {
-							console.log(e);
-						});
-				}
-				// 判断是否为警报
-				if (state == 2) {
-					notify({
-							page: navItem.page,
-							limit: navItem.limit
-						})
-						.then(({
-							data
-						}) => {
-
-							data.data = data.data.map((e) => {
-								const detail = {
-									title: e.content,
-									synopsis: e.address,
-									longitude: e.longitude,
-									latitude: e.latitude,
-									address: e.address,
-									is_read: +e.is_read,
-									id: e.id,
-									add_time: e.add_time,
-									type:2
-								}
-								return detail
-							})
-
-
-
-							that.callback(data, navItem)
-						})
-						.catch(e => {
-							console.log(e);
-						});
-				}
-
-			},
-			// 回调数据处理
-			callback(data, navItem) {
-				navItem.count = data.not_read_count;
-				let arr = data.data
-				navItem.orderList = navItem.orderList.concat(arr);
-				// console.log(navItem.orderList);
-				navItem.page++;
-				if (navItem.limit == arr.length) {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					navItem.loadingType = 'more';
-					return;
-				} else {
-					//判断是否还有数据， 有改为 more， 没有改为noMore
-					navItem.loadingType = 'noMore';
-				}
-				uni.hideLoading();
-				this.$set(navItem, 'loaded', true);
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-
-	.tab-content {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		height: 100%;
-	}
-
-	.itemBox {
-		padding: 50rpx 30rpx 0;
-
-		.time {
-			margin: 0 auto;
-			width: 360rpx;
-			background-color: $font-color-disabled;
-			height: 48rpx;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 48rpx;
-			margin-bottom: 30rpx;
-			border-radius: 10rpx;
-			font-size: 24rpx;
-		}
-
-		.itemDetail {
-			padding: 50rpx;
-			background-color: #FFFFFF;
-			border-radius: 20rpx;
-
-			&.base {
-				color: $font-color-base;
-			}
-
-			&.wargin {
-				color: $color-red;
-			}
-
-
-			.typeName {
-				font-size: 28rpx;
-
-				&.gray {
-					color: $color-gray !important;
-				}
-			}
-
-			.detail {
-				font-size: 24rpx;
-
-				&.gray {
-					color: $color-gray !important;
-				}
-			}
-		}
-	}
-
-	.navbar {
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-		position: relative;
-		z-index: 10;
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
-</style>

pages/index/noticeDetail.vue

@@ -1,310 +0,0 @@
-<template>
-	<view class="content">
-		<view class="itemDetail">
-			<view class="typeName clamp2" :class="{wargin:type==2,base:type==1}">
-				{{actionCart.title}}
-			</view>
-			<view class="detail">
-				{{actionCart.add_time}}
-			</view>
-			<view class="contentDetail detail-desc">
-				<rich-text class="detail-centent" :nodes="actionCart.content"></rich-text>
-			</view>
-		</view>
-		<view class="mapBox" v-if="type==2">
-			<map :enable-zoom='false' :enable-scroll='false' @click="openMap(actionCart.latitude,actionCart.longitude)"
-				class="map" :latitude="actionCart.latitude" :longitude="actionCart.longitude" :markers="[{
-				latitude:actionCart.latitude,
-				longitude:actionCart.longitude,
-				iconPath: '../../static/image/location.png',
-				heighe:35,
-				width:35
-			}]"></map>
-			<view class="mapBottom flex">
-				<view>
-					<image src="../../static/icon/gpsW.png" mode="widthFix"></image>
-				</view>
-				<view class="clamp">
-					{{actionCart.title}}
-				</view>
-			</view>
-			<!-- <view class="mapTip flex">
-				<view class="leftMapTip flex" :class="{success:actionCart.xh,error:!actionCart.xh}">
-					<image class="topTip" src="../../static/icon/mpXh.png" mode="widthFix"></image>
-				</view>
-				<view class="leftMapTip flex" :class="{success:actionCart.gps,error:!actionCart.gps}">
-					<image class="topTip" src="../../static/icon/mpGps.png" mode="widthFix"></image>
-				</view>
-			</view> -->
-		</view>
-
-		<!-- <view class="base-buttom" v-if="type==1">
-
-		</view> -->
-	</view>
-</template>
-
-<script>
-	import {
-		share
-	} from '@/api/wx';
-	import {
-		mapState,
-	} from 'vuex';
-	import {
-		details,
-	} from '@/api/index.js';
-	export default {
-		data() {
-			return {
-				id: '', //保存信息id
-				type: 0, //2为警报1为非警报
-				actionCart: {},
-
-			};
-		},
-
-		onLoad(options) {
-			const that = this;
-			that.id = options.id;
-			that.type = options.type;
-			if(+options.type==2){
-				// #ifdef APP-NVUE
-				const eventChannel = that.$scope.eventChannel; // 兼容APP-NVUE
-				// #endif
-				// #ifndef APP-NVUE
-				const eventChannel = that.getOpenerEventChannel();
-				// #endif
-				// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
-				eventChannel.on('addPushData', function(data) {
-					that.actionCart = data;
-					that.actionCart.content = that.actionCart.content.replace(/\<img/gi, '<img class="rich-img"');
-				})
-			}
-			if(+options.type==1){
-				that.loadData();
-			}
-			if(+options.type==3){
-				that.loadData();
-			}
-			that.share()
-		},
-		// #ifdef MP
-		onShareAppMessage(options) {
-			// 设置菜单中的转发按钮触发转发事件时的转发内容
-			let pages = getCurrentPages(); //获取加载的页面
-			let currentPage = pages[pages.length - 1]; //获取当前页面的对象
-			let url = currentPage.route; //当前页面url
-			let item = currentPage.options; //如果要获取url中所带的参数可以查看options
-			let shareObj = {
-				title: this.shareData.title, // 默认是小程序的名称(可以写slogan等)
-				path: url, // 默认是当前页面，必须是以‘/’开头的完整路径
-				imageUrl: this.shareData.img,
-				desc:this.shareData.synopsis,
-				success: function(res) {
-					// 转发成功之后的回调
-					if (res.errMsg == 'shareAppMessage:ok') {}
-				},
-				fail: function() {
-					// 转发失败之后的回调
-					if (res.errMsg == 'shareAppMessage:fail cancel') {
-						// 用户取消转发
-					} else if (res.errMsg == 'shareAppMessage:fail') {
-						// 转发失败，其中 detail message 为详细失败信息
-					}
-				}
-			};
-			// 判断是否可以邀请
-			if (this.userInfo) {
-				shareObj.path += '&spread=' + this.userInfo.uid;
-			}
-			return shareObj;
-		},
-		// #endif
-		methods: {
-			share() {
-				console.log('加载分享');
-				const that = this;
-				// 请求获取默认数据
-				share({}).then(({
-					data
-				}) => {
-					console.log('分享回调', data);
-					that.shareData = data.data
-				});
-			},
-			// 打开地图导航
-			openMap(lat, long) {
-				uni.openLocation({
-					latitude: lat,
-					longitude: long,
-				})
-			},
-			navTo(url) {
-
-				uni.navigateTo({
-					url: url
-				})
-
-			},
-			// 转换金额为数字
-			moneyNum(value) {
-				return +value;
-			},
-			// 确认收货
-			//获取订单列表
-			loadData() {
-				const that = this;
-				details({},this.id)
-					.then(({
-						data
-					}) => {
-						this.actionCart = data;
-						that.actionCart.content = that.actionCart.content.replace(/\<img/gi, '<img class="rich-img"');
-						uni.setNavigationBarTitle({
-							title:data.title
-						})
-					})
-					.catch(e => {
-						
-					});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	/deep/ .iconenter {
-		font-size: $font-base + 2rpx;
-		color: #888;
-	}
-	
-	/deep/ .con_image {
-		width: 130rpx;
-		height: 130rpx;
-		display: inline-block;
-		padding: 15rpx;
-	
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	
-	/* 商品详情中限制图片大小 */
-	/deep/ .rich-img {
-		width: 100% !important;
-		height: auto;
-	}
-	.detail-desc {
-		background: #fff;
-		/deep/ img {
-			max-width: 100% !important;
-			display: inline !important;
-		}
-		/deep/ div {
-			max-width: 100% !important;
-		}
-	}
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	// .content {
-	// 	padding-top: 30rpx;
-	// }
-
-	.base-buttom {
-		position: relative;
-		bottom: auto;
-		right: auto;
-		left: auto;
-	}
-
-	.itemDetail {
-		margin-bottom: 30rpx;
-		padding: 50rpx;
-		padding-top: 44px;
-		background-color: #FFFFFF;
-		.base {
-			color: $font-color-base;
-		}
-
-		.wargin {
-			color: $color-red;
-		}
-
-		.typeName {
-			font-size: 36rpx;
-		}
-
-		.detail {
-			margin-top: 10rpx;
-			font-size: 24rpx;
-			color: $font-color-light;
-		}
-
-		.contentDetail {
-			margin-top: 40rpx;
-			font-size: 28rpx;
-			color: $font-color-light;
-		}
-	}
-
-	.mapBox {
-		position: relative;
-
-		.mapBottom {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			padding: 15rpx;
-			font-size: 24rpx;
-			;
-			color: #ffffff;
-			justify-content: flex-start;
-			background-color: rgba($color: #000000, $alpha: 0.75);
-
-			image {
-				width: 30rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.map {
-			width: 750rpx;
-			height: 300rpx;
-			font-size: 35rpx;
-		}
-
-		.mapTip {
-			position: absolute;
-			top: 0;
-			left: 0;
-			padding: 20rpx;
-
-			.leftMapTip {
-				margin-right: 20rpx;
-				width: 44rpx;
-				height: 44rpx;
-				border-radius: 10rpx;
-				justify-content: center;
-
-				.topTip {
-					width: 24rpx;
-				}
-
-				&.success {
-					background-color: $color-green;
-				}
-
-				&.error {
-					background-color: $color-red;
-				}
-			}
-		}
-	}
-</style>

pages/index/route.vue

@@ -1,277 +0,0 @@
-<template>
-	<view class="content">
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content padding-t-30" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<!-- #ifdef H5 -->
-					<empty src="../../static/error/emptyList.png"
-						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- #endif -->
-					<!-- #ifndef H5 -->
-					<empty src="../static/error/emptyList.png"
-						v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- #endif -->
-					<!-- 订单列表 -->
-					<view v-for="(item,index) in tabItem.orderList" @click="navTo('./routeDetail?id='+item.id)">
-						<!-- <view class="timeDay">
-							{{items.time}}
-						</view> -->
-						<view class="routeItemBox">
-							<view class="cartName flex">
-								<view class="flex">
-									<image class="cartImg" :src="item.car.image" mode="scaleToFill">
-									</image>
-									<text class="carName">
-										{{item.car.car_name}}
-									</text>
-								</view>
-								<image class="iconRight" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-							<view class="routeItem flex">
-								<view class="leftTime">
-									<view>
-										{{item.add_time}}
-									</view>
-								</view>
-								<view class="rightRoute flex">
-									<view class="leftImg">
-										<image src="../../static/image/routeContent.png" mode="widthFix"></image>
-									</view>
-									<view class="rightConent">
-										<view class="statusTitle">
-											起点
-										</view>
-										<view class="routeName clamp2">
-											{{item.start_address}}
-										</view>
-										<view class="contentJg">
-
-										</view>
-										<view class="statusTitle">
-											终点
-										</view>
-										<view class="routeName clamp2 end">
-											{{item.last_address}}
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- <view class="detailRoute flex">
-								<view class="flex">
-									<image src="../../static/icon/cartRoute.png" mode="widthFix"></image>
-									<text class="margin-l-10">{{item.route}}</text>
-								</view>
-								<view class="flex">
-									<image src="../../static/icon/cartTime.png" mode="widthFix"></image>
-									<text class="margin-l-10">{{item.timeAll}}</text>
-								</view>
-								<view class="flex">
-									<image src="../../static/icon/cartSpeed.png" mode="widthFix"></image>
-									<text class="margin-l-10">{{item.speed}}</text>
-								</view>
-							</view> -->
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		car_record
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				id: '', //保存车辆car_number
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}]
-			};
-		},
-
-		onLoad(options) {
-			this.id = options.id || ''
-			this.loadData();
-		},
-		methods: {
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			// 转换金额为数字
-			// 确认收货
-			//获取订单列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				console.log(navItem, '数据');
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				car_record({
-						car_number: this.id,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == arr.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.list-scroll-content,
-	.swiper-box {
-		height: 100%;
-	}
-
-	.timeDay {
-		font-size: 32rpx;
-		font-weight: 400;
-		padding: 30rpx;
-	}
-
-	.routeItemBox {
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		margin: 0 30rpx;
-		margin-bottom: 30rpx;
-		line-height: 1.5;
-		padding-bottom: 30rpx;
-		padding-top: 10rpx;
-
-		.cartName {
-			font-size: 32rpx;
-			font-weight: 400;
-			padding: 20rpx 30rpx;
-			border-bottom: 1px solid $page-color-light;
-
-			.carName {
-				padding-left: 20rpx;
-			}
-
-			.cartImg {
-				width: 60rpx;
-				height: 60rpx;
-			}
-
-			.iconRight {
-				width: 26rpx;
-			}
-		}
-
-		.detailRoute {
-			color: $font-color-base;
-			font-weight: 100;
-			margin: 0 30rpx;
-			background-color: #F3F6F8;
-			padding: 10rpx 30rpx;
-			border-radius: 20rpx;
-
-			image {
-				width: 36rpx;
-				font-size: 24rpx;
-			}
-		}
-
-		.routeItem {
-			align-items: flex-start;
-			padding-top: 20rpx;
-
-			.leftTime {
-				width: 70rpx;
-				margin: 50rpx;
-				flex-shrink: 0;
-				font-size: 24rpx;
-				font-weight: 100;
-			}
-
-			.rightRoute {
-				flex-grow: 1;
-				// height: 262rpx;
-				align-items: flex-start;
-
-				.leftImg {
-					image {
-						width: 36rpx;
-					}
-				}
-
-				.rightConent {
-					padding-left: 20rpx;
-					flex-grow: 1;
-
-					.statusTitle {
-						color: $font-color-light;
-						font-size: 22rpx;
-					}
-
-					.routeName {
-						color: $font-color-base;
-						font-size: 28rpx;
-						min-height: 2.5rem;
-						margin-bottom: 15rpx;
-
-						&.end {
-							min-height: 1.5rem;
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

pages/index/routeDetail.vue

@@ -1,85 +0,0 @@
-<template>
-	<map class="map" id="map" ref="map1" :polyline='carRouteList' :markers="markers"></map>
-</template>
-
-<script>
-	import {
-		record_info
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				// 路线图
-				carRouteList: [],
-				id: 0,
-				map: '',
-				markers:[],
-			};
-		},
-		onLoad: function(option) {
-			this.id = option.id
-		},
-		onReady() {
-			this.info()
-		},
-		methods: {
-			// 获取路径详细
-			info() {
-				record_info({
-					id: this.id
-				}).then((e) => {
-					let data = [{
-						points: [],
-						color: '#0BBB62',
-						width: 5,
-						arrowLine: true
-					}]
-					console.log(data[0]);
-					e.data.location.forEach((e) => {
-						const address = e.split(',');
-						data[0].points.push({
-							longitude: +address[0],
-							latitude: +address[1]
-						})
-					})
-					this.carRouteList = data;
-					const item0 = data[0].points[0];
-					const item1 = data[0].points[data[0].points.length-1];
-					this.markers = [
-						{
-							id:1,
-							longitude:item0.longitude,
-							latitude: item0.latitude,
-							iconPath:'../../static/image/stImg.png',
-							width:30,
-							height:30
-						},{
-							id:2,
-							longitude:item1.longitude,
-							latitude: item1.latitude,
-							iconPath:'../../static/image/endImg.png',
-							width:30,
-							height:30
-						}
-					]
-					this.map = uni.createMapContext("map", this);
-					this.map.includePoints({
-						padding: [100, 20, 300, 20],
-						points: data[0].points
-					})
-				})
-			}
-		}
-	};
-</script>
-
-<style>
-	page {
-		height: 100%;
-	}
-
-	.map {
-		height: 100%;
-		width: 750rpx;
-	}
-</style>

pages/index/shopTab.vue

@@ -1,324 +0,0 @@
-<template>
-	<view class="container">
-		<view class="topNav flex">
-			<image @click="backIndex" class="back" src="../../static/icon/back.png" mode="widthFix"></image>
-			<view class="inputbox flex">
-				<image class="search" src="../../static/icon/search.png" mode="widthFix"></image>
-				<input class="input" confirm-type='搜索' @confirm='searchData' placeholder="请输入城市或者门店" type="text"
-					v-model="search" />
-			</view>
-		</view>
-		<!-- <pickerAddress class="" @change="onCityClick">
-			<view class="address flex">
-				<view class="flex">
-					<text class="text">{{province}}</text>
-					<image class="tipButtom" src="../../static/icon/dom.png" mode="widthFix"></image>
-				</view>
-				<view class="flex">
-					<text class="text">{{city}}</text>
-					<image class="tipButtom" src="../../static/icon/dom.png" mode="widthFix"></image>
-				</view>
-				<view class="flex">
-					<text class="text">{{district}}</text>
-					<image class="tipButtom" src="../../static/icon/dom.png" mode="widthFix"></image>
-				</view>
-			</view>
-		</pickerAddress> -->
-		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="storeList">
-			<!-- 空白页 -->
-			<!-- <empty v-if="loaded === true && orderList.length === 0"></empty> -->
-			<!-- 订单列表 -->
-			<view class="itemList">
-				<view class="item flex" v-for="(item,index) in orderList" :key='index' @click="onChecked(item)">
-					<view class="imgBox">
-						<image class="logo" :src="item.image" mode="aspectFit"></image>
-					</view>
-					<view class="padding-l-20 flex-grow-true">
-						<view class="title clamp flex">
-							<view class="name">
-								{{item.name}}
-							</view>
-							<view class="km">
-								{{item.range<1?item.distance+'m':item.range+'km'}}
-							</view>
-						</view>
-						<view class="list margin-t-20">
-							营业时间：{{item.day_time}}
-						</view>
-						<view class="list">
-							联系电话：{{item.phone}}
-						</view>
-						<view class="flex addressBox ">
-							<image class="iconA margin-r-10" src="../../static/icon/shopAddress.png" mode="heightFix">
-							</image>
-							<text class="clamp">
-								{{item.address}}
-							</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		storeList,
-	} from '@/api/shop.js';
-	import {
-		mapMutations,
-		mapState
-	} from 'vuex';
-	export default {
-		computed: {
-			...mapState('user', ['address'])
-		},
-		data() {
-			return {
-				search: '', //查询内容
-				loadingType: 'more',
-				orderList: [],
-				page: 1, //当前页数
-				limit: 10, //每次信息条数
-				province: '请选择', //省
-				city: '请选择', //市
-				district: '请选择', //区
-				loaded: false,
-				type: 0 //默认为切换商店，1为不切换
-
-			};
-		},
-		onLoad: function(option) {
-			console.log(option.type);
-			if (option.type) {
-				this.type = option.type;
-			}
-			this.storeList();
-		},
-		methods: {
-			...mapMutations('shop', ['setShopInfo']),
-			toJSON() {
-				return this;
-			},
-			backIndex() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
-			// 查询方法
-			searchData() {
-				// 初始化数据重新搜索
-				this.loaded = false;
-				this.page = 1;
-				this.orderList = [];
-				this.loadingType = 'more';
-				this.storeList()
-			},
-			// 存储当前的门店
-			onChecked(item) {
-				if (this.type == 0) {
-					this.setShopInfo(item);
-					uni.showToast({
-						title: '切换成功',
-						mask: true,
-						duration: 1500
-					});
-					setTimeout((e) => {
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					}, 1500)
-				}
-				console.log();
-				if (+this.type == 1) {
-					this.setShopInfo(item);
-					uni.navigateTo({
-						url: '/pages/shop/shopIndex?id=' + item.id
-					})
-				}
-			},
-			storeList(source) {
-				//这里是将订单挂载到tab列表下
-				let navItem = this;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				let city = `${this.province},${this.city},${this.district}`;
-				if (this.province == '请选择') {
-					city = '';
-				}
-				storeList({
-						city,
-						page: navItem.page,
-						limit: navItem.limit,
-						key: this.search,
-						latitude: this.address.latitude,
-						longitude: this.address.longitude,
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.list.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == arr.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-						console.log(this, '结果');
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			// 内容改变事件
-			onCityClick(item) {
-				const arr = item.data;
-				this.province = arr[0];
-				this.city = arr[1];
-				this.district = arr[2];
-				// 开始查询
-				console.log(this.province, this.city, this.district);
-				console.log(arr);
-				this.searchData()
-			}
-		},
-
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.container {
-		height: 100%;
-	}
-	/* #ifdef APP */
-	.container {
-		padding-top: var(--status-bar-height);
-	}
-	/* #endif */
-
-	.list-scroll-content {
-		height: calc(100% - 44px);
-		position: relative;
-		overflow: hidden;
-		z-index: 100;
-	}
-
-	.itemList {
-		padding: 30rpx $page-row-spacing;
-
-		.item {
-			background-color: #FFFFFF;
-			margin-bottom: 30rpx;
-			padding: 30rpx;
-			border-radius: 20rpx;
-			.list,.km{
-				color: $font-color-light;
-				font-size: $font-sm;
-			}
-			.logo {
-				height: 200rpx;
-				width: 200rpx;
-				border-radius: 20rpx;
-			}
-
-			.title {
-				font-size: 36rpx;
-				color: $font-color-dark;
-			}
-
-			.iconR {
-				height: 24rpx;
-			}
-
-			.iconA {
-				width: 24rpx;
-				height: 24rpx;
-			}
-
-			.addressBox {
-				font-size: 24rpx;
-				color: $font-color-light;
-				justify-content: flex-start;
-			}
-		}
-	}
-
-	.address {
-		background-color: #FFFFFF;
-		justify-content: space-around;
-		height: 40px;
-
-		.text {
-			font-size: 22rpx;
-			color: $font-color-dark;
-			margin-right: 5px;
-		}
-
-		.tipButtom {
-			width: 11px;
-		}
-	}
-
-	.topNav {
-		height: 44px;
-		background-color: #FFFFFF;
-		padding: 0 15px;
-		/* #ifdef MP */
-		height:calc(44px +  var(--status-bar-height)) ;
-		padding-top: calc(var(--status-bar-height) - 15px);
-		/* #endif */
-		.back {
-			width: 13px;
-		}
-
-		.inputbox {
-			background-color: $page-color-base;
-			height: 15px;
-			flex-grow: 1;
-			margin-left: 15px;
-			border-radius: 50px;
-			height: 30px;
-			padding-left: 20px;
-			/* #ifdef MP */
-			margin-right: 200rpx;
-			/* #endif */
-			font-size: $font-base;
-
-			.search {
-				width: 18px;
-			}
-
-			.input {
-				height: 100%;
-				width: 100%;
-				text-align: left;
-				padding-left: 10px;
-
-			}
-		}
-	}
-</style>

pages/shop/repair/clientRepair.vue

@@ -1,301 +0,0 @@
-<template>
-	<view class="container ">
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="itemBox" v-for="(item,index) in tabItem.orderList">
-						<view class="flex item">
-							<view class="title">
-								报修车辆：
-							</view>
-							<view class="content">
-								{{item.car.car_name}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修单号：
-							</view>
-							<view class="content">
-								{{item.order_id}}
-							</view>
-						</view>
-						<view class="flex item" @click="openAddress(item)">
-							<view class="title">
-								维修地点：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopAddress.png" mode="widthFix"></image>
-								<text class="margin-l-10">{{item.address}}</text>
-							</view>
-						</view>
-						<view class="flex item" @click="openPhone(item.phone)">
-							<view class="title">
-								联系电话：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-								<text class="margin-l-10">
-									{{item.phone}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								申报时间：
-							</view>
-							<view class="content">
-								{{item.add_time}}
-							</view>
-						</view>
-						<view  @click="navDetail(item)" class="flex padding-t-20" v-if="navList[tabCurrentIndex].state==0">
-							<!-- <view class="boxButtom flex btn1" @click="">
-								联系不上
-							</view> -->
-								<view class="boxButtom flex btn2">
-									安排人员前往
-								</view>
-						</view>
-						<view  @click="navDetail(item)" class="flex padding-t-20" v-if="navList[tabCurrentIndex].state==1">
-							<view class="boxButtom flex btn1">
-								已安排{{item.processor_user.staff_name}}前往维修
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-<script>
-	import {
-		question
-	} from '@/api/shop.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '安排维修',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}, {
-					state: 1,
-					text: '正在维修',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}, ]
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		methods: {
-			// 跳转详细页面
-			navDetail(item){
-				uni.navigateTo({
-					url:'./clientReparirDetail?id='+item.order_id
-				})
-			},
-			// 打开地址
-			openAddress(res) {
-				console.log(res, '返回的位置数据');
-				uni.chooseLocation({
-					latitude: res.latitude,
-					longitude: res.longitude,
-					success(re) {
-						console.log(re, '当前位置');
-					},
-					fail(e) {
-						console.log(e, 'cw');
-					}
-				})
-			},
-			// 拨打电话
-			openPhone(item) {
-				uni.makePhoneCall({
-					phoneNumber:item //仅为示例
-				});
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tabChange');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			// 加载数据
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				console.log('开始请求');
-				question({
-						status: state,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page,.container {
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-
-	.list-scroll-content {
-		height: 100%;
-		padding-top: 30rpx;
-	}
-
-	.navbar {
-
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
-
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 40rpx 0;
-
-		.boxButtom {
-			justify-content: center;
-			margin: 0 30rpx;
-			color: $color-green;
-			font-size: 24rpx;
-			height: 70rpx;
-			border-radius: 100rpx;
-			line-height: 1;
-			padding: 0 50rpx;
-			flex-grow: 1;
-
-			&.btn3 {
-				border: 1px solid $uni-color-warning;
-				color: $uni-color-warning;
-			}
-
-			&.btn1 {
-				border: 1px solid $font-color-light;
-				color: $font-color-light;
-			}
-
-			&.btn2 {
-				color: #FFFFFF;
-				background-color: $color-green;
-				padding: 0 120rpx;
-			}
-		}
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-
-				.icon {
-					width: 32rpx;
-				}
-			}
-
-		}
-	}
-</style>

pages/shop/repair/clientReparirDetail.vue

@@ -1,543 +0,0 @@
-<template>
-	<view class="container padding-t-30">
-		<view class="itemBox">
-			<view v-if='item.car' class="flex item">
-				<view class="title">
-					报修车辆：
-				</view>
-				<view class="content">
-					{{item.car.car_name}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					维修单号：
-				</view>
-				<view class="content">
-					{{id}}
-				</view>
-			</view>
-			<view class="flex item" @click="openAddress(item)">
-				<view class="title">
-					维修地点：
-				</view>
-				<view class="content flex">
-					<image class="icon" src="../../../static/icon/shopAddress.png" mode="widthFix"></image>
-					<text class="margin-l-10">{{item.address}}</text>
-				</view>
-			</view>
-			<view class="flex item" @click="openPhone(item.phone)">
-				<view class="title">
-					联系电话：
-				</view>
-				<view class="content flex">
-					<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-					<text class="margin-l-10">
-						{{item.phone}}
-					</text>
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					申报时间：
-				</view>
-				<view class="content">
-					{{item.add_time}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					故障概述：
-				</view>
-				<view class="content">
-					{{item.content}}
-				</view>
-			</view>
-			<view class="flex item" v-if="item.status>1">
-				<view class="title">
-					维修师傅：
-				</view>
-				<view class="content">
-					{{item.processor_user.staff_name}}
-				</view>
-			</view>
-			<view class="flex item" @click="openPhone(item.processor_user.phone)" v-if="item.status>1">
-				<view class="title">
-					师傅电话：
-				</view>
-				<view class="content flex">
-					<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-					<text class="margin-l-10">
-						{{item.processor_user.phone}}
-					</text>
-				</view>
-			</view>
-			<view class="flex item" v-if="item.status>1">
-				<view class="title">
-					处理结果：
-				</view>
-				<view class="content">
-					{{item.processor_result}}
-				</view>
-			</view>
-			<view class="flex item" v-if="item.status>1">
-				<view class="title">
-					处理时间：
-				</view>
-				<view class="content">
-					{{item.processor_time}}
-				</view>
-			</view>
-			<view class="item ">
-				<view class="title">
-					已传图片：
-				</view>
-				<view class="content margin-t-20">
-					<image @click="showImage(ls)" v-for="(ls,ind) in item.images" class="img margin-r-20" :src="ls"
-						mode="scaleToFill">
-					</image>
-				</view>
-			</view>
-		</view>
-		<view class="order-item" v-if="item.status==3">
-			<view class="masterWorker flex">
-				<image class="imgUser" src="../../../static/error/missing-face.png" mode="scaleToFill"></image>
-				<view class="padding-l-30">
-					<view class="masterName">
-						{{item.processor_user.staff_name}}
-					</view>
-					<view class="masterTime margin-t-20">
-						完成时间： {{item.processor_time}}
-					</view>
-				</view>
-			</view>
-			<view class="flex_item zhil">
-				<view>响应速度：</view>
-				<view>
-					<uni-rate :readonly='true' text="1" size="20" margin="10" :value="item.response_score" >
-					</uni-rate>
-				</view>
-			</view>
-			<view class="flex_item zhil">
-				<view>技术评分：</view>
-				<view>
-					<uni-rate :readonly='true' text="1" size="20" margin="10" :value="item.skill_score" >
-					</uni-rate>
-				</view>
-			</view>
-			<view class="flex_item zhil">
-				<view>服务态度：</view>
-				<view>
-					<uni-rate :readonly='true' text="1" size="20" margin="10" :value="item.attitude_score" >
-					</uni-rate>
-				</view>
-			</view>
-		</view>
-		<view class="buttom flex" v-if="loadStatus==0">
-			<view v-if="item.type==0" class="btn  success" @click="showPopup">
-				安排人员前往
-			</view>
-			<view v-if="item.type==1&&item.processor_user" class="btn action" @click="showPopup">
-				已安排{{item.processor_user.staff_name}}前往维修
-			</view>
-		</view>
-		<view class="buttom flex" v-if="loadStatus==1&&item.status==1">
-			<view class="btn  success" @click="onSetRw">
-				处理任务
-			</view>
-		</view>
-		<view class="buttom flex" v-if="loadStatus==1&&item.status==2">
-			<view class="btn  action">
-				已处理完成
-			</view>
-		</view>
-		<uni-popup ref="popup" type="bottom">
-			<view class="alertBox">
-				<view class="popupTitle">
-					<text>安排维修人员</text>
-					<image @click="outPopup" class="exitIcon" src="../../../static/icon/goodsExit.png" mode="widthFix">
-					</image>
-				</view>
-				<scroll-view scroll-y="true" class="list">
-					<view class="flex" v-for="(item,index) in mastList">
-						<view class="avatarBox flex">
-							<image class="avatar" :src="item.avatar" mode="scaleToFill"></image>
-							<view class="padding-l-20 nameBox">
-								<view class="name">
-									{{item.staff_name}}
-								</view>
-								<view class="ordNum">
-									进行中任务：100
-								</view>
-							</view>
-						</view>
-						<view class="alertButtom bgGree" @click="setKfOrder(item)">
-							安排
-						</view>
-						<!-- <view class="alertButtom bgYellow"  v-if="item.type==0">
-							更换
-						</view> -->
-						<!-- <view class="alertButtom bgGray"  v-if="item.type==3">
-							取消
-						</view> -->
-					</view>
-				</scroll-view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="popupImg" type="center">
-			<image @click="hideShowImg" class="actionImgShow" :src="actionImg" mode="aspectFit"></image>
-		</uni-popup>
-
-		<uni-popup ref="popupDialog" type="dialog">
-			<uni-popup-dialog mode="input" title='处理结果' confirmText='提交' placeholder="请输入处理结果" :duration="2000"
-				@confirm="confirmSet">
-
-			</uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-<script>
-	import {
-		questionInfo,
-		adminKf,
-		schedule_task,
-		tasksave
-	} from '@/api/shop.js';
-	export default {
-		data() {
-			return {
-				id: '', //保存orderid
-				item: {},
-				rateValue: [{
-					text: '响应速度',
-					value: 0,
-				}, {
-					text: '技术评分',
-					value: 0,
-				}, {
-					text: '服务态度',
-					value: 0,
-				}],
-				// 师父人数
-				mastList: [],
-				actionImg: '', //选中的图片
-				loadStatus: 0, //默认可以查看安排维修按钮
-			};
-		},
-		onLoad(opt) {
-			if (opt.type) {
-				this.loadStatus = opt.type;
-			}
-			this.id = opt.id;
-			this.loadData();
-			// 获取员工列表
-			this.adminKf();
-		},
-		methods: {
-			// 开始处理任务
-			onSetRw() {
-				this.$refs.popupDialog.open();
-			},
-			// 提交处理结果
-			confirmSet(data) {
-				if (!(data.trim())) {
-					uni.showModal({
-						title: '错误',
-						content: '请输入处理结果',
-						showCancel: false,
-					});
-					return
-				}
-				tasksave({
-					id: this.item.id,
-					processor_result: data,
-				}).then((e) => {
-					uni.showToast({
-						title: e.msg
-					})
-					this.loadData();
-					console.log(e);
-				}).catch((e) => {
-					console.log(e);
-				})
-			},
-			// 拨打电话
-			openPhone(item) {
-				uni.makePhoneCall({
-					phoneNumber: item //仅为示例
-				});
-			},
-			// 显示图片弹窗
-			showImage(item) {
-				this.actionImg = item;
-				this.$refs.popupImg.open();
-			},
-			// 隐藏图片显示弹窗
-			hideShowImg() {
-				this.$refs.popupImg.close();
-			},
-			// 安排维修人员
-			setKfOrder(item) {
-				const that = this;
-				uni.showLoading({
-					title: '安排中',
-					mask: true
-				});
-				schedule_task({
-					id: this.item.id,
-					uid: item.uid
-				}).then((e) => {
-					uni.hideLoading()
-					uni.showToast({
-						title: e.msg
-					});
-					// 关闭弹窗
-					that.outPopup();
-					// 刷新页面
-					that.loadData();
-					console.log(e);
-				}).catch((e) => {
-					uni.hideLoading()
-					uni.hideToast();
-					uni.showModal({
-						title: '错误',
-						content: e.msg,
-						showCancel: false,
-					});
-					console.log(e);
-				})
-			},
-			// 员工列表
-			adminKf() {
-				adminKf().then((e) => {
-					this.mastList = e.data;
-					console.log(e);
-				}).catch(() => {
-					console.log(e);
-				})
-			},
-			// 关闭弹窗
-			outPopup() {
-				this.$refs.popup.close()
-			},
-			loadData() {
-				questionInfo({
-					order_id: this.id
-				}).then((e) => {
-					this.item = e.data;
-					this.item.images = this.item.images.split(',')
-					this.item.type = e.data.status;
-					console.log(e);
-				}).catch((e) => {
-					console.log(e);
-				})
-			},
-			// 显示底部弹窗
-			showPopup() {
-				console.log('点击');
-				if (this.item.type == 0) {
-					this.$refs.popup.open()
-				}
-				if (this.item.type == 1) {
-					uni.showModal({
-						title: '提示',
-						content: '已安排了工作人员无法重新安排',
-						showCancel: false,
-					});
-				}
-			}
-		}
-	};
-</script>
-<style lang="scss">
-	.order-item {
-		display: flex;
-		flex-direction: column;
-		padding: 30rpx 0;
-		border-radius: 20rpx;
-		background: #fff;
-		margin: 0 $page-row-spacing;
-
-		.masterWorker {
-			padding: 0 30rpx;
-			border-bottom: 1px solid $page-color-light;
-			padding-bottom: 30rpx;
-			justify-content: flex-start;
-
-			.masterTime {
-				font-size: 22rpx;
-				color: $font-color-light;
-			}
-
-			.masterName {
-				color: $font-color-base;
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-
-			.imgUser {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 100rpx;
-			}
-		}
-
-		.flex_item {
-			margin: 0 30rpx;
-			color: $font-color-base;
-			font-size: $font-base;
-
-			&.zhil {
-				font-size: 28rpx !important;
-				padding: 15rpx 0;
-			}
-		}
-	}
-
-	.actionImgShow {
-		height: 100vh;
-		width: 750rpx;
-	}
-
-	.alertBox {
-		border-top-left-radius: 20rpx;
-		border-top-right-radius: 20rpx;
-		background-color: #FFF;
-		height: 1000rpx;
-
-		.popupTitle {
-			font-size: $font-lg;
-			position: relative;
-			font-weight: bold;
-			line-height: 1;
-			height: 130rpx;
-			line-height: 130rpx;
-			text-align: center;
-
-			.exitIcon {
-				width: 50rpx;
-				position: absolute;
-				top: 40rpx;
-				right: 50rpx;
-			}
-		}
-
-		.list {
-			height: 870rpx;
-			padding: 0 50rpx;
-
-			.avatar {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 100rpx;
-			}
-
-			.alertButtom {
-				width: 160rpx;
-				height: 60rpx;
-				color: #FFFFFF;
-				border-radius: 100rpx;
-				font-size: 24rpx;
-				line-height: 60rpx;
-				text-align: center;
-
-				&.bgGree {
-					background-color: $color-green;
-				}
-
-				&.bgYellow {
-					background-color: $uni-color-warning;
-				}
-
-				&.bgGray {
-					background-color: $font-color-disabled;
-				}
-			}
-
-			.nameBox {
-				.name {
-					font-size: $font-base;
-					color: $font-base;
-				}
-
-				.ordNum {
-					font-size: 22rpx;
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding-top: 30rpx;
-		padding-bottom: 10rpx;
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-
-				.img {
-					width: 120rpx;
-					height: 120rpx;
-					border-radius: 20rpx;
-				}
-
-				.icon {
-					width: 32rpx;
-				}
-			}
-
-		}
-	}
-
-	.buttom {
-		justify-content: space-around;
-		padding-top: 50rpx;
-
-		.btn {
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			border-radius: 99rpx;
-			color: #FFFFFF;
-			flex-grow: 1;
-			margin: 0 30rpx;
-
-			&.success {
-				background-color: $color-green;
-			}
-
-			&.action {
-				background-color: $font-color-disabled;
-			}
-
-			// &.warning {
-			// 	background-color: $uni-color-warning;
-			// }
-		}
-
-		.borderGray {
-			border: 1px solid $font-color-disabled;
-			color: $font-color-disabled;
-		}
-
-		.borderGreed {
-			border: 1px solid $color-green;
-			color: $color-green;
-		}
-	}
-</style>

pages/shop/repair/repairHistory.vue

@@ -1,328 +0,0 @@
-<template>
-	<view class="container ">
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="itemBox" v-for="(item,index) in tabItem.orderList">
-						<view class="flex item">
-							<view class="title">
-								订单状态：
-							</view>
-							<view class="content">
-								<text v-if='item.status==3' class="font-color-greed">
-								已完成
-								</text>
-								<text  v-if='item.status==-1' class="font-color-gray">
-								已取消
-								</text>
-								<text v-if='item.status==2'  class="font-color-yellow">
-								待评价
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								报修车辆：
-							</view>
-							<view class="content">
-								{{item.car.car_name}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修单号：
-							</view>
-							<view class="content">
-								{{item.order_id}}
-							</view>
-						</view>
-						<view class="flex item" @click="openAddress(item)">
-							<view class="title">
-								维修地点：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopAddress.png" mode="widthFix"></image>
-								<text class="margin-l-10">{{item.address}}</text>
-							</view>
-						</view>
-						<view class="flex item" @click="openPhone(item.phone)">
-							<view class="title">
-								联系电话：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-								<text class="margin-l-10">
-									{{item.phone}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修师傅：
-							</view>
-							<view class="content">
-								{{item.processor_user.staff_name}}
-							</view>
-						</view>
-						<view class="flex item" @click="openPhone(item.processor_user.phone)">
-							<view class="title">
-								师傅电话：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-								<text class="margin-l-10">
-									{{item.processor_user.phone}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								申报时间：
-							</view>
-							<view class="content">
-								{{item.add_time}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								结束时间：
-							</view>
-							<view class="content">
-								{{item.processor_time}}
-							</view>
-						</view>
-						<view class="flex padding-t-20" v-if="navList[tabCurrentIndex].state==0">
-							<view @click="navDetail(item)" class="boxButtom flex btn1">
-								查看详情
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-<script>
-	import {
-		question
-	} from '@/api/shop.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '维修历史',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}]
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		methods: {
-			// 跳转详细页面
-			navDetail(item) {
-				uni.navigateTo({
-					url: './clientReparirDetail?id=' + item.order_id + '&type=2'
-				})
-			},
-			// 打开地址
-			openAddress(res) {
-				console.log(res, '返回的位置数据');
-				uni.chooseLocation({
-					latitude: res.latitude,
-					longitude: res.longitude,
-					success(re) {
-						console.log(re, '当前位置');
-					},
-					fail(e) {
-						console.log(e, 'cw');
-					}
-				})
-			},
-			// 拨打电话
-			openPhone(item) {
-				uni.makePhoneCall({
-					phoneNumber: item //仅为示例
-				});
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tabChange');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			// 加载数据
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				console.log('开始请求');
-				question({
-						history: 1,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							e.status = +e.status;
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page,
-	.container {
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		height: 100%;
-		padding-top: 30rpx;
-	}
-
-	.navbar {
-
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
-
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 40rpx 0;
-
-		.boxButtom {
-			justify-content: center;
-			margin: 0 30rpx;
-			color: $color-green;
-			font-size: 24rpx;
-			height: 70rpx;
-			border-radius: 100rpx;
-			line-height: 1;
-			padding: 0 50rpx;
-			flex-grow: 1;
-
-			&.btn3 {
-				border: 1px solid $uni-color-warning;
-				color: $uni-color-warning;
-			}
-
-			&.btn1 {
-				border: 1px solid $font-color-light;
-				color: $font-color-light;
-			}
-
-			&.btn2 {
-				color: #FFFFFF;
-				background-color: $color-green;
-				padding: 0 120rpx;
-			}
-		}
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-
-				.icon {
-					width: 32rpx;
-				}
-			}
-
-		}
-	}
-</style>

pages/shop/repair/taskClientRepair.vue

@@ -1,284 +0,0 @@
-<template>
-	<view class="container ">
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="itemBox" v-for="(item,index) in tabItem.orderList">
-						<view class="flex item">
-							<view class="title">
-								报修车辆：
-							</view>
-							<view class="content">
-								{{item.car.car_name}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修单号：
-							</view>
-							<view class="content">
-								{{item.order_id}}
-							</view>
-						</view>
-						<view class="flex item" @click="openAddress(item)">
-							<view class="title">
-								维修地点：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopAddress.png" mode="widthFix"></image>
-								<text class="margin-l-10">{{item.address}}</text>
-							</view>
-						</view>
-						<view class="flex item" @click="openPhone(item.phone)">
-							<view class="title">
-								联系电话：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-								<text class="margin-l-10">
-									{{item.phone}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								申报时间：
-							</view>
-							<view class="content">
-								{{item.add_time}}
-							</view>
-						</view>
-						<view  class="flex padding-t-20"
-							v-if="navList[tabCurrentIndex].state==0">
-							<view @click="navDetail(item)" class="boxButtom flex btn1">
-								查看详情
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-<script>
-	import {
-		task
-	} from '@/api/shop.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '安排维修',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}]
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		methods: {
-			// 跳转详细页面
-			navDetail(item) {
-				uni.navigateTo({
-					url: './clientReparirDetail?id=' + item.order_id+'&type=1'
-				})
-			},
-			// 打开地址
-			openAddress(res) {
-				console.log(res, '返回的位置数据');
-				uni.chooseLocation({
-					latitude: res.latitude,
-					longitude: res.longitude,
-					success(re) {
-						console.log(re, '当前位置');
-					},
-					fail(e) {
-						console.log(e, 'cw');
-					}
-				})
-			},
-			// 拨打电话
-			openPhone(item) {
-				uni.makePhoneCall({
-					phoneNumber: item //仅为示例
-				});
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tabChange');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			// 加载数据
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				console.log('开始请求');
-				task({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page,
-	.container {
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		height: 100%;
-		padding-top: 30rpx;
-	}
-
-	.navbar {
-
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
-
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 40rpx 0;
-
-		.boxButtom {
-			justify-content: center;
-			margin: 0 30rpx;
-			color: $color-green;
-			font-size: $font-sm;
-			height: 70rpx;
-			border-radius: 100rpx;
-			line-height: 1;
-			padding: 0 50rpx;
-			flex-grow: 1;
-
-			&.btn3 {
-				border: 1px solid $uni-color-warning;
-				color: $uni-color-warning;
-			}
-
-			&.btn1 {
-				border: 1px solid $font-color-light;
-				color: $font-color-light;
-			}
-
-			&.btn2 {
-				color: #FFFFFF;
-				background-color: $color-green;
-				padding: 0 120rpx;
-			}
-		}
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-
-				.icon {
-					width: 32rpx;
-				}
-			}
-
-		}
-	}
-</style>

pages/user/myCart/Prepayment.vue

@@ -1,366 +0,0 @@
-<template>
-	<view class="app">
-		<view class="bg">
-		</view>
-		<view class="moneyBox">
-			<view class="price-box">
-				<text>提前还款金额</text>
-			</view>
-			<view class="moneyNumBox flex">
-				<text class="fh">￥</text>
-				<input class="moneyValue" type="text" v-model="money" />
-			</view>
-			<view class="day">
-				服务天数剩余{{day}}天
-			</view>
-		</view>
-		<view class="moneyBox margin-t-30 padding-t-30">
-			<view class="yt-list">
-				<view class="yt-list-cell" @click="payType='yue'">
-					<view class="cell-tit flex">
-						<image class="orderIcon" src="../../../static/icon/ye.png" mode="widthFix"></image>
-						<text class="margin-l-10">余额({{now_money}})</text>
-					</view>
-					<image class="checked" v-if="payType=='yue'" src="../../../static/icon/addressIconXz.png"
-						mode="widthFix">
-					</image>
-					<view v-else class="noChecked"></view>
-				</view>
-			</view>
-		</view>
-		<view class="base-buttom" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</view>
-	</view>
-</template>
-
-<script>
-	import {
-		balance
-	} from '@/api/wallet.js';
-	import {
-		getCarInfo,
-		prepayment
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				payType: 'yue',
-				money: 0, //订单金额
-				allMoney: 0, //总的还款金额
-				now_money: 0.0, //余额
-				car_number: '', //保存订单id
-				payLoding: false, //判断是否支付中
-				minMoney: 0, //最低还款金额
-			};
-		},
-		onLoad(options) {
-			this.car_number = options.id;
-			// 载入余额
-			balance({}).then(({
-				data
-			}) => {
-				// 获取余额
-				this.now_money = data.now_money;
-			});
-			getCarInfo({
-				car_number: this.car_number
-			}).then((e) => {
-				this.money = e.data.surplus;
-				this.allMoney = e.data.surplus;
-				this.minMoney = +e.data.day_deducted
-				this.day = e.data.day
-			})
-		},
-		methods: {
-			// 支付成功跳转
-			paySuccessTo() {
-				uni.hideLoading();
-				uni.redirectTo({
-					url: '/pages/user/money/paySuccess?type=1'
-				});
-			},
-			//确认支付
-			confirm: async function() {
-				let obj = this;
-				// 判断是否余额不足
-				if (obj.payType == 'yue' && +obj.now_money < obj.money) {
-					uni.showModal({
-						title: '提示',
-						content: '账户余额不足！',
-						showCancel: false,
-					});
-					return;
-				}
-				// 判断是否为未支付订单中跳转进入
-				if (this.money < this.minMoney) {
-					uni.showModal({
-						title: '提示',
-						content: '还款金额不可低于' + this.minMoney + '元',
-						showCancel: false,
-					});
-					return
-				}
-				if (this.money % this.minMoney != 0 && this.money < this.allMoney) {
-					uni.showModal({
-						title: '提示',
-						content: '还款金额必须为' + this.minMoney + '的倍数',
-						showCancel: false,
-					});
-					return
-				}
-
-				// 支付中
-				uni.showLoading({
-					title: '支付中',
-					mask: true
-				})
-				obj.payLoding = true;
-				prepayment({
-					'car_number': this.car_number,
-					money: this.money
-				}).then((e) => {
-					uni.hideLoading()
-					uni.showToast({
-						title: e.msg
-					});
-					obj.payLoding = false;
-					uni.showModal({
-						title: '提示',
-						content: e.msg,
-						showCancel: false,
-						cancelText: '取消',
-						confirmText: '返回',
-						success: res => {
-							if(res.confirm){
-								uni.navigateBack()
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}).catch((e) => {
-					obj.payLoding = false;
-					uni.hideLoading()
-					console.log(e);
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.app {
-		width: 100%;
-		padding-top: 30rpx;
-	}
-
-	.moneyBox {
-		position: relative;
-		margin: 0 $page-row-spacing;
-		border-radius: 20rpx;
-		overflow: hidden;
-		background-color: #FFFFFF;
-		padding: 50rpx 30rpx 30rpx;
-
-		.moneyNumBox {
-			color: $font-color-base;
-			border-bottom: 1px solid $page-color-light;
-
-			.fh {
-				font-size: $font-base + 2rpx;
-
-			}
-
-			.moneyValue {
-				font-size: $font-lg + 16rpx;
-			}
-		}
-
-		.day {
-			padding-top: 30RPX;
-			font-size: $font-sm - 2rpx;
-			color: $font-color-light;
-		}
-	}
-
-	.bg {
-		background-color: $color-green;
-		width: 950rpx;
-		position: absolute;
-		left: -100rpx;
-		border-bottom-left-radius: 1000rpx;
-		border-bottom-right-radius: 1000rpx;
-		top: 0rpx;
-		height: 300rpx;
-	}
-
-	.price-box {
-		background-color: #fff;
-		padding-bottom: 60rpx;
-		font-size: $font-base;
-		color: $font-color-base;
-		font-weight: bold;
-
-		.price {
-			font-size: 50upx;
-			color: #303133;
-			margin-top: 12upx;
-
-			&:before {
-				content: '￥';
-				font-size: 40upx;
-			}
-		}
-	}
-
-	.pay-type-list {
-		margin-top: 20upx;
-		background-color: #fff;
-		padding-left: 60upx;
-
-		.type-item {
-			height: 120upx;
-			padding: 20upx 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding-right: 60upx;
-			font-size: 30upx;
-			position: relative;
-		}
-
-		.icon {
-			width: 100upx;
-			font-size: 52upx;
-		}
-
-		.iconyue {
-			color: #fe8e2e;
-		}
-
-		.iconweixin {
-			color: #36cb59;
-		}
-
-		.iconzhifubao {
-			color: #01aaef;
-		}
-
-		.tit {
-			font-size: $font-lg;
-			color: $font-color-dark;
-			margin-bottom: 4upx;
-		}
-
-		.con {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			font-size: $font-sm;
-			color: $font-color-light;
-		}
-	}
-
-	.clickbg {
-		background-color: $color-gray !important;
-	}
-
-	.yt-list {
-		background: #fff;
-		border-radius: 20rpx;
-		width: 100%;
-	}
-
-	.yt-list-cell {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		line-height: 70rpx;
-		position: relative;
-
-		.checked,
-		.noChecked {
-			width: 36rpx;
-			height: 36rpx;
-		}
-
-		.noChecked {
-			border: 1px solid $font-color-light;
-			border-radius: 100rpx;
-		}
-
-		&.cell-hover {
-			background: #fafafa;
-		}
-
-		&.b-b:after {
-			left: 30rpx;
-		}
-
-		.cell-icon {
-			height: 32rpx;
-			width: 32rpx;
-			font-size: 22rpx;
-			color: #fff;
-			text-align: center;
-			line-height: 32rpx;
-			background: #f85e52;
-			border-radius: 4rpx;
-			margin-right: 12rpx;
-
-			&.hb {
-				background: #ffaa0e;
-			}
-
-			&.lpk {
-				background: #3ab54a;
-			}
-		}
-
-		.cell-more {
-			align-self: center;
-			font-size: 24rpx;
-			color: $font-color-light;
-			margin-left: 8rpx;
-			margin-right: -10rpx;
-		}
-
-		.cell-tit {
-			font-size: 26rpx;
-			color: $font-color-light;
-			margin-right: 10rpx;
-
-			.orderIcon {
-				width: 48rpx;
-			}
-		}
-
-		.cell-tip {
-			font-size: 26rpx;
-			color: $font-color-dark;
-
-			&.disabled {
-				color: $font-color-light;
-			}
-
-			&.active {
-				color: $base-color;
-			}
-
-			&.red {
-				color: $base-color;
-			}
-		}
-
-		&.desc-cell {
-			.cell-tit {
-				max-width: 90rpx;
-			}
-		}
-
-		.desc {
-			text-align: right;
-			font-size: $font-base;
-			color: $font-color-light;
-		}
-	}
-</style>

pages/user/myCart/authorization.vue

@@ -1,193 +0,0 @@
-<template>
-	<view class="container">
-		<view class="listBox">
-			<view class="list">
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">授权手机号</text>
-					</view>
-					<view class="right flex">
-						<input class="input" placeholder="请输入用户手机" type="text" v-model="phone"
-							placeholder-class="placeholder" />
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">授权时长</text>
-					</view>
-					<view class="right flex">
-						<picker class="input" mode="selector" range-key='text' :range="timeList" @change="changeTime">
-							<view>{{time}}</view>
-						</picker>
-						<image class="img" src="../../../static/icon/dom.png" mode="widthFix"></image>
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">对其备注</text>
-					</view>
-					<view class="right flex">
-						<input class="input" v-model="mask" type="text" placeholder="请输入备注信息"
-							placeholder-class="placeholder" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="base-buttom" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">授权</view>
-	</view>
-</template>
-
-<script>
-	import {
-		add_auth_car
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				phone: '',
-				id: '',
-				time: '授权时长',
-				mask: '',
-				timeList: [{
-						type: 0,
-						text: '长期'
-					},
-					{
-						type: 1,
-						text: '1天'
-					},
-					{
-						type: 3,
-						text: '3天'
-					},
-					{
-						type: 7,
-						text: '7天'
-					},
-					{
-						type: 30,
-						text: '30天'
-					}
-				],
-				indexTime: 0, //选中的时间对象
-				loding: false
-			};
-		},
-		onLoad: function(option) {
-			this.id = option.id
-		},
-		methods: {
-			changeTime(e) {
-				this.time = this.timeList[e.detail.value].text
-				this.indexTime = e.detail.value;
-			},
-			confirm(e) {
-				let obj = this;
-				if(!obj.phone){
-					uni.showToast({
-						title:'请输入授权用户手机号',
-						icon:'none'
-					})
-					return
-				}
-				if(obj.time=='授权时长'){
-					uni.showToast({
-						title:'请选择授权时长',
-						icon:'none'
-					})
-					return
-				}
-				obj.loding = true;
-				add_auth_car({
-						to_phone: obj.phone,
-						car_number: obj.id,
-						day: obj.indexTime,
-						nickname: obj.mask
-					})
-					.then(({
-						data
-					}) => {
-						uni.showToast({
-							title:'授权成功',
-							icon:'success'
-						})
-						setTimeout(function() {
-							obj.loding = false;
-							uni.navigateBack();
-						}, 1000);
-					})
-					.catch(err => {
-						obj.loding = false;
-						console.log(err);
-					});
-			}
-		},
-
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.bg-gray {
-		background-color: $color-gray;
-	}
-	.base-buttom{
-		position: relative;
-		bottom: auto;
-		left: auto;
-		right: auto;
-	}
-	.content {
-		padding-top: 30rpx;
-	}
-
-	.listBox {
-		margin: $page-row-spacing;
-		margin-top: 30rpx;
-		border-radius: 20rpx;
-		overflow: hidden;
-		background-color: #FFFFFF;
-	}
-
-	.list {
-		.input {
-			text-align: right;
-			font-size: $font-base;
-			color: $color-gray;
-			min-height: 28rpx;
-			flex-grow: 1;
-		}
-
-		.listItem {
-			padding: 35rpx 40rpx;
-			border-bottom: 1px solid $page-color-light;
-		}
-
-		.listIconImg {
-			width: 36rpx;
-		}
-
-		.right {
-			color: $font-color-light;
-			font-size: $font-base;
-			flex-grow: 1;
-
-			.img {
-				width: 26rpx;
-				margin-left: 10rpx;
-			}
-		}
-
-		.titleBox {
-			.title {
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-</style>

pages/user/myCart/authorizationList.vue

@@ -1,188 +0,0 @@
-<template>
-	<view class="content">
-		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-			<!-- 空白页 -->
-			<empty v-if="navList[0].loaded === true && navList[0].orderList.length === 0"></empty>
-			<!-- 订单列表 -->
-			<view class="listItem flex" v-for="(item, index) in navList[0].orderList">
-				<view>
-					<image class="avatar" :src="item.to_user.avatar" mode="scaleToFill"></image>
-				</view>
-				<view class="conetnt">
-					<view class="name">
-						{{item.nickname}}
-					</view>
-					<view class="user">
-						手机号：{{item.to_user.phone}}
-					</view>
-				</view>
-				<view class="rightButtom" @click="outAuth(item)">
-					解除
-				</view>
-			</view>
-			<uni-load-more :status=" navList[0].loadingType"></uni-load-more>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		del_auth_car,
-		get_auth
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '授权用户',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}],
-				id: '',
-			};
-		},
-
-		onLoad(options) {
-			this.id = options.id || '';
-			this.loadData();
-		},
-		methods: {
-			// 是否取消授权
-			outAuth(item) {
-				uni.showModal({
-					title: '提示',
-					content: `是否取消${item.nickname}授权？`,
-					success: res => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: '取消授权中',
-								mask:true
-							});
-							del_auth_car({
-								id:item.id
-							}).then((e) => {
-								uni.hideLoading()
-								
-							}).catch((e) => {
-								console.log(e);
-								uni.hideLoading()
-							})
-							console.log('取消授权');
-						}
-						
-					},
-				});
-			},
-			//获取列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				get_auth({
-						car_number: this.id,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == arr.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			//订单状态文字和颜色
-		}
-	}
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		padding-top: 30rpx;
-		height: 100%;
-	}
-
-	.listItem {
-		padding: $page-row-spacing;
-		margin: $page-row-spacing;
-		margin-top: 0;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-
-		.avatar {
-			border-radius: 100rpx;
-			width: 120rpx;
-			height: 120rpx;
-
-		}
-
-		.rightButtom {
-			padding: 20rpx 0;
-			text-align: center;
-			color: $color-red;
-			border-radius: 100rpx;
-			border: 1px solid $color-red;
-			width: 200rpx;
-
-		}
-
-		.conetnt {
-			padding-left: 20rpx;
-			flex-grow: 1;
-
-			.name {
-				font-size: 32rpx;
-				color: $font-color-dark;
-			}
-
-			.user {
-				font-size: 24rpx;
-				color: $font-color-disabled;
-				margin-top: 30rpx;
-			}
-
-
-		}
-	}
-</style>

pages/user/myCart/cartConfing.vue

@@ -1,269 +0,0 @@
-<template>
-	<view>
-		<view class="iconList flex">
-			<navigator :url="'/pages/user/myCart/authorization?id='+item.car_number" v-if="item.auth_num!=-1">
-				<view class="iconItem">
-					<view class="iconImgItem">
-						<image src="../../../static/icon/iconAuthorization.png" mode="widthFix"></image>
-					</view>
-					<view class="iconName">
-						授权
-					</view>
-				</view>
-			</navigator>
-			<navigator :url="'/pages/user/reportForRepair/Report?id='+item.car_number">
-				<view class="iconItem">
-					<view class="iconImgItem">
-						<image src="../../../static/icon/iconBaoxiu.png" mode="widthFix"></image>
-					</view>
-					<view class="iconName">
-						报修
-					</view>
-				</view>
-			</navigator>
-			<!-- <view class="iconItem">
-			<view class="iconImgItem">
-				<image src="../../../static/icon/iconSet.png" mode="widthFix"></image>
-			</view>
-		</view> -->
-			<view class="iconItem" @click="tabCarStatus('seek',item)">
-				<view class="iconImgItem">
-					<image src="../../../static/icon/iconAlarm.png" mode="widthFix"></image>
-				</view>
-				<view class="iconName">
-					寻车
-				</view>
-			</view>
-			<view class="iconItem" @click="tabCarStatus('tab',item)">
-				<view class="iconImgItem">
-					<image v-if="item.status==1||item.status==3||item.status==4" src="../../../static/icon/lockGreen.png" mode="widthFix">
-					</image>
-					<image v-else src="../../../static/icon/lockRed.png" mode="widthFix"></image>
-				</view>
-				<view class="iconName">
-					<view class="greed" v-if="item.status==1||item.status==3||item.status==4">
-						启动
-					</view>
-					<view class="red" v-else>
-						关闭
-					</view>
-				</view>
-			</view>
-			<view class="iconItem" @click="tabCarStatus('unlock',item)">
-				<view class="iconImgItem">
-					<image src="../../../static/icon/lockGray.png" mode="widthFix"></image>
-				</view>
-				<view class="iconName">
-					解锁
-				</view>
-			</view>
-		</view>
-		<uni-popup ref="message" type="message">
-			<uni-popup-message type="error" message="错误消息" :duration="0">
-			</uni-popup-message>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		car_switch
-	} from '@/api/user.js';
-	// #ifdef MP
-	import {
-		openGetAddress,
-	} from '@/utils/rocessor.js';
-	// #endif
-	// #ifdef H5
-	import weixinObj from "@/plugin/jweixin-module/index.js";
-	import {
-		weixindata
-	} from "@/utils/wxAuthorized.js"
-	// #endif
-
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		props: {
-			item: {
-				type: Object,
-				default () {
-					return {
-
-					}
-				}
-			},
-		},
-		data() {
-			return {
-				loadShopData: false, //判断是否已经开启监听
-			}
-		},
-		computed: {
-			auth_num() {
-				return this.item ? +this.item.auth_num : 0
-			},
-			...mapState('user', ['address']),
-		},
-		methods: {
-			...mapMutations('user', ['setAddress']),
-			// 数据加载中
-			// 保存地址
-			car_switch(data, type, item) {
-				car_switch(data).then(() => {
-					if (type == 'tab') {
-						const status = (item.status == 1) ? 2 : 1;
-						this.$emit("tab", status)
-					}
-					uni.hideLoading()
-					uni.showToast({
-						title: '发送成功'
-					});
-				}).catch((e) => {
-					uni.hideLoading()
-					// this.$refs.message.open();
-					uni.showModal({
-						title: '错误',
-						content: e.msg,
-						showCancel: false,
-					});
-				})
-			},
-			// 调用切换
-			tabCarStatus(type = 'tab', item) {
-				let that = this;
-				let data = {
-					car_number: item.car_number,
-				};
-				// 是否开关锁
-				if (type == 'tab') {
-					data.status = (item.status == 1) ? 2 : 1;
-				}
-				// 是否解锁
-				if (type == 'unlock') {
-					data.status = 6;
-				}
-				// 是否寻车
-				if (type == 'seek') {
-					data.status = 5;
-				}
-				// #ifdef H5
-				let bool = uni.getStorageSync('weichatBrowser') || '';
-				// 判断是否公众号
-				if (bool) {
-					weixindata().then(() => {
-						weixinObj.getLocation({
-							type: 'gcj02',
-							success: (e) => {
-								data.latitude = e.latitude;
-								data.longitude = e.longitude;
-								that.car_switch(data, type, item)
-							}
-						});
-					})
-				} else {
-					uni.getLocation({
-						type: 'gcj02',
-						success(e) {
-							data.latitude = e.latitude;
-							data.longitude = e.longitude;
-							that.car_switch(data, type, item)
-						},
-						fail(e) {
-							console.log(e, 'cw');
-						}
-					})
-				}
-
-				// #endif
-
-				// #ifdef MP
-				// 判断是否已经有位置数据
-
-				if (!that.address.latitude || !that.address.longitude) {
-					// 判断是否已经获取授权
-					openGetAddress().then((e) => {
-						// 获取当前选中开锁的对象
-						uni.showLoading({
-							title: '请求发送中',
-							mask: true
-						});
-						console.log("授权");
-						wx.startLocationUpdateBackground({
-							type: 'gcj02',
-							success: (e) => {
-								console.log(e);
-								// 调用鉴定位置变化事件
-								wx.onLocationChange((res) => {
-									console.log(res, '位置数据');
-									// 保存当前经纬度
-									that.setAddress({
-										latitude: res.latitude,
-										longitude: res.longitude
-									})
-									// 判断是否已经加载过最近商家信息
-									if (!that.loadShopData) {
-										data.latitude = res.latitude;
-										data.longitude = res.longitude;
-										that.car_switch(data, type, item)
-										that.loadShopData = true;
-									}
-								})
-							},
-							fail: () => {
-								uni.hideLoading()
-							}
-						})
-
-					})
-				} else {
-					uni.showLoading({
-						title: '请求发送中',
-						mask: true
-					});
-					data.latitude = that.address.latitude;
-					data.longitude = that.address.longitude;
-					that.car_switch(data, type, item)
-				}
-				// #endif
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.iconList {
-		padding: 30rpx;
-		padding-bottom: 0;
-
-		.iconItem {
-			.iconImgItem {
-				width: 62rpx;
-				margin: 0 auto;
-
-				image {
-					width: 100%;
-					height: 62rpx;
-				}
-			}
-
-			.iconName {
-				color: $font-color-base;
-				font-size: 22rpx;
-				text-align: center;
-				padding: 15rpx 0;
-				font-weight: 100;
-
-				.greed {
-					color: $color-green;
-				}
-
-				.red {
-					color: $color-red;
-				}
-			}
-		}
-	}
-</style>

pages/user/myCart/myCart.vue

@@ -1,299 +0,0 @@
-<template>
-	<view class="content">
-		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-			<!-- 空白页 -->
-			<!-- #ifdef H5 -->
-			<empty src="../../../static/error/emptyMyCart.png" v-if="navList[0].loaded === true && navList[0].orderList.length === 0"></empty>
-			<!-- #endif -->
-			<!-- #ifndef H5 -->
-			<empty src="../static/error/emptyMyCart.png" v-if="navList[0].loaded === true && navList[0].orderList.length === 0"></empty>
-			<!-- #endif -->
-			<!-- 订单列表 -->
-			<view class="listItem" v-for="(item, index) in navList[0].orderList" :key='index'>
-				<view v-if="item.day>0" class="topRightTip" @click="navTo('./Prepayment?id='+item.car_number)">
-					<image src="../../../static/image/moneyPay.png" mode="widthFix"></image>
-				</view>
-				<view class="flex">
-					<view class="imgbox">
-						<image :src="item.image" mode="widthFix"></image>
-					</view>
-					<view class="contentDetail flex">
-						<view class="goodsName">
-							<view class="topName">
-								{{item.car_name}}
-							</view>
-							<view class="goodsType">
-								{{item.car_sku}}
-							</view>
-							<view class="goodsTime margin-t-10">
-								激活时间：{{item.bind_time}}
-							</view>
-						</view>
-						<view class="goodsRight">
-							<view class="status">
-								已授权
-							</view>
-							<navigator :url="'./authorizationList?id='+item.car_number">
-								<view class="numR">
-									{{item.auth_num}}
-								</view>
-							</navigator>
-						</view>
-					</view>
-				</view>
-				<view class="address">
-					当前位置：{{item.address}}
-				</view>
-				<map @click="openMap(item.latitude,item.longitude)"  class="map" :enable-zoom='false' :enable-scroll='false' :latitude="item.latitude" :longitude="item.longitude" :markers="[{
-						latitude: item.latitude,
-						longitude:item.longitude,
-						iconPath: '../../../static/image/location.png',
-						width:35,
-						height:35
-					}]"></map>
-				<view class="detail flex">
-					<view class="item">
-						<view class="type">
-							剩余电量
-						</view>
-						<view class="num">
-							{{item.residue}}%
-						</view>
-					</view>
-					<view class="item">
-						<view class="type">
-							剩余天数
-						</view>
-						<view class="num">
-							{{item.day}}
-						</view>
-					</view>
-					<!-- <view class="item">
-						<view class="type">
-							总里程数
-						</view>
-						<view class="num">
-							200
-						</view>
-					</view> -->
-				</view>
-				<cartConfing @tab="changetab($event,item)" :item='item'></cartConfing>
-			</view>
-
-			<uni-load-more :status=" navList[0].loadingType"></uni-load-more>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import cartConfing from './cartConfing.vue';
-	import {
-		carList,
-	} from '@/api/user.js';
-	export default {
-		components: {
-			cartConfing
-		},
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '待付款',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}]
-			};
-		},
-
-		onLoad(options) {
-			this.loadData();
-		},
-		methods: {
-			// tab改变事件
-			changetab(tab,item){
-				item.status = tab
-			},
-			// 打开地图导航
-			openMap(lat, long) {
-				uni.openLocation({
-					latitude: +lat,
-					longitude: +long,
-					complete(e){
-						console.log(e,'地图打开');
-					}
-				})
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			//获取列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return; 
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				carList({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						navItem.page++;
-						if (navItem.limit == arr.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		padding-top: 30rpx;
-		height: 100%;
-	}
-
-	.listItem {
-		margin: 0rpx 20rpx 30rpx;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		background-color: #FFFFFF;
-		position: relative;
-		overflow: hidden;
-
-		.topRightTip {
-			position: absolute;
-			top: 0;
-			right: 0;
-
-			image {
-				width: 80rpx;
-			}
-		}
-
-		.imgbox {
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 20rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.contentDetail {
-			padding-left: 30rpx;
-			flex-grow: 1;
-
-			.goodsName {
-				.topName {
-					color: $font-color-dark;
-					font-size: 32rpx;
-					font-weight: bold;
-					margin-bottom: 30rpx;
-				}
-
-				.goodsType,
-				.goodsTime {
-					color: $font-color-light;
-					font-size: 24rpx;
-				}
-			}
-		}
-
-		.map {
-			width: 630rpx;
-			height: 200rpx;
-			font-size: 35rpx;
-		}
-
-		.goodsRight {
-			flex-shrink: 0;
-			.status {
-				color: $font-color-light;
-				font-size: 24rpx;
-			}
-
-			.numR {
-				height: 60rpx;
-				width: 60rpx;
-				border-radius: 10rpx;
-				border: 1px solid $color-green;
-				line-height: 60rpx;
-				font-size: 32rpx;
-				color: $color-green;
-				text-align: center;
-				margin: 0 auto;
-				margin-top: 20rpx;
-			}
-		}
-
-		.address {
-			color: $font-color-light;
-			font-size: 24rpx;
-			line-height: 1;
-			padding: 30rpx 0;
-		}
-
-		.detail {
-			margin-top: 30rpx;
-			padding: 0 20rpx;
-			justify-content: space-around;
-			.item {
-				color: $font-color-light;
-				text-align: center;
-				line-height: 1.5;
-
-				.type {
-					font-size: 24rpx;
-				}
-
-				.num {
-					font-size: 32rpx;
-
-				}
-			}
-		}
-	}
-</style>

pages/user/repair/repairDetail.vue

@@ -1,154 +0,0 @@
-<template>
-	<view class="container padding-t-30">
-		<view class="itemBox">
-			<view class="flex item">
-				<view class="title">
-					保修车辆：
-				</view>
-				<view class="content">
-					{{item.shop}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					维修单号：
-				</view>
-				<view class="content">
-					{{item.shop}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					维修地点：
-				</view>
-				<view class="content">
-					{{item.mast}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					完成时间：
-				</view>
-				<view class="content">
-					{{item.addTime}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					申报时间：
-				</view>
-				<view class="content">
-					{{item.delTime}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					联系电话：
-				</view>
-				<view class="content">
-					{{item.delTime}}
-				</view>
-			</view>
-			<view class="flex item">
-				<view class="title">
-					故障概述：
-				</view>
-				<view class="content">
-					{{item.delTime}}
-				</view>
-			</view>
-			<view class="item ">
-				<view class="title">
-					已传图片：
-				</view>
-				<view class="content margin-t-20">
-					<image class="img margin-r-20" src="../../../static/error/errorImage.jpg" mode="scaleToFill"></image>
-					<image class="img margin-r-20" src="../../../static/error/errorImage.jpg" mode="scaleToFill"></image>
-				</view>
-			</view>
-		</view>
-		
-		
-		
-		<view class="buttom flex">
-			<view class="borderGray btn">
-				上一个申请
-			</view>
-			<view class="borderGreed btn">
-				下一个申请
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	export default {
-		data() {
-			return {
-				item: {
-					shop: '绿津路桥加盟商一',
-					mast: '戴师傅',
-					address: '国际塑料城',
-					addTime: '2022-08-08 18:00',
-					delTime: '2022-08-08 19:00',
-
-				}
-			};
-		},
-		methods: {
-			loadData(source) {
-
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding-top: 40rpx;
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-				.img{
-					width: 120rpx;
-					height: 120rpx;
-					border-radius: 20rpx;
-				}
-			}
-
-		}
-	}
-	
-	.buttom{
-		justify-content: space-around;
-		padding-top: 50rpx;
-		.btn{
-			width: 300rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			border-radius: 99rpx;
-		}
-		.borderGray{
-			border:1px solid $font-color-disabled;
-			color: $font-color-disabled;
-		}
-		.borderGreed{
-			border: 1px solid $color-green;
-			color: $color-green;
-		}
-	}
-</style>

pages/user/repair/userRepair.vue

@@ -1,327 +0,0 @@
-<template>
-	<view class="container ">
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="itemBox" v-for="(item,index) in tabItem.orderList">
-						<view class="flex item">
-							<view class="title">
-								订单状态：
-							</view>
-							<view class="content">
-								<text v-if='item.status==3' class="font-color-greed">
-								已完成
-								</text>
-								<text  v-if='item.status==-1' class="font-color-gray">
-								已取消
-								</text>
-								<text v-if='item.status==2'  class="font-color-yellow">
-								待评价
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								报修车辆：
-							</view>
-							<view class="content">
-								{{item.car.car_name}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修单号：
-							</view>
-							<view class="content">
-								{{item.order_id}}
-							</view>
-						</view>
-						<view class="flex item" @click="openAddress(item)">
-							<view class="title">
-								维修地点：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopAddress.png" mode="widthFix"></image>
-								<text class="margin-l-10">{{item.address}}</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								维修师傅：
-							</view>
-							<view class="content flex">
-								<text class="margin-l-10">
-									{{item.processor_user.staff_name}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item" @click="openPhone(item.processor_user.phone)">
-							<view class="title">
-								师傅电话：
-							</view>
-							<view class="content flex">
-								<image class="icon" src="../../../static/icon/shopPhone.png" mode="widthFix"></image>
-								<text class="margin-l-10">
-									{{item.processor_user.phone}}
-								</text>
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								申报时间：
-							</view>
-							<view class="content">
-								{{item.add_time}}
-							</view>
-						</view>
-						<view class="flex item">
-							<view class="title">
-								结束时间：
-							</view>
-							<view class="content">
-								{{item.processor_time}}
-							</view>
-						</view>
-						<view class="flex padding-t-20" v-if="navList[tabCurrentIndex].state==0">
-							<view @click="navDetail(item)" class="boxButtom flex btn1">
-								查看详情
-							</view>
-							<view v-if='item.status==2' @click="navPj(item)" class="boxButtom flex btn2">
-								去评价
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-<script>
-	import {
-		question
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-					state: 0,
-					text: '维修历史',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}]
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		methods: {
-			// 跳转详细页面
-			navDetail(item) {
-				uni.navigateTo({
-					url: '/pages/shop/repair/clientReparirDetail?id=' + item.order_id + '&type=2'
-				})
-			},
-			navPj(item){
-				uni.navigateTo({
-					url: '/pages/user/reportForRepair/Report?id=' + item.car_number
-				})
-			},
-			// 打开地址
-			openAddress(res) {
-				console.log(res, '返回的位置数据');
-				uni.chooseLocation({
-					latitude: res.latitude,
-					longitude: res.longitude,
-					success(re) {
-						console.log(re, '当前位置');
-					},
-					fail(e) {
-						console.log(e, 'cw');
-					}
-				})
-			},
-			// 拨打电话
-			openPhone(item) {
-				uni.makePhoneCall({
-					phoneNumber: item //仅为示例
-				});
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-				this.loadData('tabChange');
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			// 加载数据
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				console.log('开始请求');
-				question({
-						history: 1,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.data.map(e => {
-							e.status = +e.status;
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						// console.log(navItem.orderList);
-						navItem.page++;
-						if (navItem.limit == data.length) {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据， 有改为 more， 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page,
-	.container {
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: 100%;
-	}
-
-	.list-scroll-content {
-		height: 100%;
-		padding-top: 30rpx;
-	}
-
-	.navbar {
-
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
-
-	.itemBox {
-		margin: 0 $page-row-spacing;
-		margin-bottom: $page-row-spacing;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 40rpx 0;
-
-		.boxButtom {
-			justify-content: center;
-			margin: 0 30rpx;
-			color: $color-green;
-			font-size: 24rpx;
-			height: 70rpx;
-			border-radius: 100rpx;
-			line-height: 1;
-			padding: 0 50rpx;
-			flex-grow: 1;
-
-			&.btn3 {
-				border: 1px solid $uni-color-warning;
-				color: $uni-color-warning;
-			}
-
-			&.btn1 {
-				border: 1px solid $font-color-light;
-				color: $font-color-light;
-			}
-
-			&.btn2 {
-				color: #FFFFFF;
-				background-color: $color-green;
-				padding: 0 120rpx;
-			}
-		}
-
-		.item {
-			justify-content: flex-start;
-			padding: 30rpx;
-			padding-top: 0;
-			font-size: $font-base;
-
-			.title {
-				flex-shrink: 0;
-				color: $font-color-base;
-			}
-
-			.content {
-				color: $font-color-light;
-
-				.icon {
-					width: 32rpx;
-				}
-			}
-
-		}
-	}
-</style>

pages/user/reportForRepair/Report.vue

@@ -1,151 +0,0 @@
-<template>
-	<view class="content">
-		<view class="navStatus">
-			<view class="flex margin-l-20 margin-r-20">
-				<view class="itemNum" :class="{action:type>0}">
-					1
-				</view>
-				<view class="content flex" :class="{action:type>1}">
-				</view>
-				<view class="itemNum" :class="{action:type>1}">
-					2
-				</view>
-				<view class="content flex" :class="{action:type>2}">
-				</view>
-				<view class="itemNum" :class="{action:type>2}">
-					3
-				</view>
-			</view>
-			<view class="titleBox flex">
-				<view class="title">
-					报修申请
-				</view>
-				<view class="title">
-					等待维修
-				</view>
-				<view class="title">
-					维修完成
-				</view>
-			</view>
-		</view>
-		<status1 :cartInfo='cartInfo' v-if="type==1" @request='changeType(2)'></status1>
-		<status2 :reportDeatil='reportDeatil' :cartInfo='cartInfo' v-if="type==2" @request='changeType(3)'></status2>
-		<status3 :reportDeatil='reportDeatil' v-if="type==3"></status3>
-	</view>
-</template>
-
-<script>
-	import status1 from "./status1.vue"
-	import status2 from "./status2.vue"
-	import status3 from "./status3.vue"
-	import {
-		getCarInfo,
-		question_info
-	} from "../../../api/user.js"
-	export default {
-		components: {
-			status1,
-			status2,
-			status3
-		},
-		data() {
-			return {
-				cartInfo: {},//车辆信息
-				type: 1, //显示当前进度
-				id: '', //车辆id
-				loading: false, //是否提交中
-				reportDeatil:{}//报修信息
-			};
-		},
-		onLoad(options) {
-			this.id = options.id;
-			this.getCarInfo();
-			// 初始化加载报修信息
-			this.question_info();
-		},
-		methods: {
-			// 报修信息
-			getCarInfo() {
-				getCarInfo({
-					car_number: this.id,
-				}).then((e) => {
-					this.cartInfo = e.data;
-					// console.log(e);
-				}).catch((e) => {
-					console.log(e);
-				})
-			},
-			changeType(type) {
-				this.type = type
-				if(type==2){
-					this.question_info()
-				}
-			},
-			// 获取报修详情
-			question_info() {
-				question_info({
-					car_number: this.id
-				}).then((e) => {
-					if (e.data) {
-						this.reportDeatil = e.data;
-						if(e.data.status==2){
-							this.type=3
-						}else if(e.data.status==0||e.data.status==1){
-							this.type=2
-						}
-						
-					}
-					// console.log(e);
-				}).catch((e) => {
-					uni.hideToast();
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.navStatus {
-		padding: 60rpx 80rpx;
-
-		.item {
-			.itemGree {}
-		}
-
-		.itemNum {
-			width: 60rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			font-size: 28rpx;
-			text-align: center;
-			color: #FFFFFF;
-			background-color: $font-color-light;
-			border-radius: 99rpx;
-
-			&.action {
-				background-color: $color-green;
-			}
-		}
-
-		.title {
-			margin-top: 30rpx;
-			font-size: 24rpx;
-			color: $font-color-light;
-		}
-
-		.content {
-			flex-grow: 1;
-			border-bottom: 8rpx dotted $font-color-light;
-			margin: 0 10rpx;
-
-			&.action {
-				margin: 0;
-				border-bottom: 8rpx solid $color-green;
-			}
-		}
-	}
-</style>

pages/user/reportForRepair/status1.vue

@@ -1,283 +0,0 @@
-<template>
-	<view class="content">
-		<view class="listBox">
-			<view class="list">
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">当前车辆</text>
-					</view>
-					<view class="right flex">
-						{{cartInfo.car_name}}
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">维修地点</text>
-					</view>
-					<view class="right flex" @click="getAddress">
-						<view class="input">
-							{{address}}
-						</view>
-						<image class="img" src="../../../static/icon/location.png" mode="widthFix"></image>
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">联系电话</text>
-					</view>
-					<view class="right flex">
-						<input class="input" v-model="phone" type="text" placeholder="请填写联系电话"
-							placeholder-class="placeholder" />
-					</view>
-				</view>
-				<view class="listItem">
-					<view class="flex titleBox">
-						<text class="title">故障简述</text>
-					</view>
-					<view class="right flex">
-						<textarea class="textarea_text" placeholder="简单的描述下故障。" v-model="content" maxlength='300'
-							name="" id="" cols="30" rows="10"></textarea>
-						<view class="maxShow">
-							{{content.length}}/300
-						</view>
-					</view>
-				</view>
-				<view class="listItem">
-					<view class="flex titleBox">
-						<text class="title">图片上传</text>
-					</view>
-					<view class="right flex imgList">
-						<view class="position-relative margin-r-20" v-if="imgList.length>0"
-							v-for="(item,index) in imgList">
-							<image class="upImg" :src="item" mode="scaleToFill"></image>
-							<image class="topExit" src="../../../static/icon/goodsExit.png" mode="scaleToFill"
-								@click="delImg(index)"></image>
-						</view>
-						<view class="position-relative margin-r-20">
-							<image class="upImg" src="../../../static/image/upImg.png" mode="scaleToFill"
-								@click="upImg()"></image>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="base-buttom" @click="confirm">
-			申请报修
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		create_question
-	} from '@/api/user.js';
-	import {
-		upload
-	} from '@/api/order.js';
-	export default {
-		props: {
-			cartInfo: {
-				type: Object,
-				default: function() {
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				content: '', //提交内容
-				cartName: '车辆编号asdsfqdqwew',
-				phone: '', //手机号
-				address: '', //定位
-				lat: '', //经度
-				lon: '', //纬度
-				imgList: [],
-			};
-		},
-		created() {
-			// console.log('调用方法1');
-		},
-		methods: {
-			// 提交审核
-			confirm() {
-				if (!this.phone || this.phone.length != 11) {
-					uni.showModal({
-						title: '提示',
-						content: '请填写正确的手机号',
-						showCancel: false,
-					});
-
-					return
-				}
-				if (!this.content || !(this.content.trim())) {
-					uni.showModal({
-						title: '提示',
-						content: '请填写故障描述',
-						showCancel: false,
-					});
-				}
-				if (this.imgList.length < 1) {
-					uni.showModal({
-						title: '提示',
-						content: '请上传故障图片',
-						showCancel: false,
-					});
-				}
-				uni.showLoading({
-					title: '提交中',
-					mask: true
-				});
-
-				create_question({
-					car_number: this.cartInfo.car_number,
-					phone: this.phone,
-					content: this.content,
-					images: this.imgList.join(','),
-					longitude: this.lon,
-					'latitude': this.lat,
-					address: this.address
-				}).then((e) => {
-					uni.showModal({
-						title: '提示',
-						content: e.msg,
-						showCancel: false,
-					});
-					this.$emit("request");
-					uni.hideLoading()
-				}).catch((e) => {
-					uni.hideLoading()
-				})
-			},
-
-			// 上传修理图片
-			upImg(type = 'add', index) {
-				// console.log(type,index,'上传');
-				let that = this;
-				upload({
-					filename: ''
-				}).then(data => {
-					// console.log(type == 'add');
-					if (type == 'add') {
-						that.imgList = that.imgList.concat([data[0].url]);
-					}
-					if (type == "edit") {
-						that.imgList[index] = data[0].url;
-					}
-				})
-			},
-			// 获取用户地址信息
-			getAddress() {
-				let that = this;
-				uni.getLocation({
-					type:'gcj02',
-					success(res) {
-						// console.log(res, '返回的位置数据');
-						uni.chooseLocation({
-							latitude: res.latitude,
-							longitude: res.longitude,
-							success(re) {
-								that.lat = re.latitude;
-								that.lon = re.longitude;
-								that.address = re.address;
-								// console.log(re, '当前位置');
-							},
-							fail(e) {
-								console.log(e, 'cw');
-							}
-						})
-					}
-				})
-			},
-			// 删除上传图片
-			delImg(index) {
-				this.imgList.splice(index, 1)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.listBox {
-		margin: $page-row-spacing;
-		margin-top: 30rpx;
-		border-radius: 20rpx;
-		overflow: hidden;
-		background-color: #FFFFFF;
-	}
-
-	.list {
-		.input {
-			text-align: right;
-			font-size: $font-base;
-			color: $color-gray;
-			width: 100%;
-		}
-
-		.listItem {
-			padding: 35rpx 40rpx;
-			border-bottom: 1px solid $page-color-light;
-
-			.imgList {
-				margin-top: 30rpx;
-				justify-content: flex-start;
-
-				.topExit {
-					width: 30rpx;
-					height: 30rpx;
-					position: absolute;
-					top: -10rpx;
-					right: -10rpx;
-				}
-			}
-		}
-
-		.listIconImg {
-			width: 36rpx;
-		}
-
-		.right {
-			color: $font-color-light;
-			font-size: $font-base;
-			flex-grow: 1;
-			justify-content: flex-end;
-			position: relative;
-
-			.img {
-				width: 26rpx;
-			}
-
-			.upImg {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 20rpx;
-			}
-
-			.textarea_text {
-				background-color: $page-color-base;
-				width: 100%;
-				margin-top: 30rpx;
-				border-radius: 20rpx;
-				padding: 30rpx;
-			}
-
-			.maxShow {
-				position: absolute;
-				bottom: 10rpx;
-				right: 20rpx;
-				font-size: 24rpx;
-			}
-
-		}
-
-		.titleBox {
-			.title {
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-</style>

pages/user/reportForRepair/status2.vue

@@ -1,328 +0,0 @@
-<template>
-	<view class="content">
-		<view class="shopContent flex">
-			<view class="shoplogo">
-				<image class="logo" :src="reportDeatil.store.image" mode="scaleToFill"></image>
-			</view>
-			<view class="shopDetail">
-				<view class="shopName clamp">
-					{{reportDeatil.store.name}}
-				</view>
-				<view class="shopDetailText clamp2" v-if="reportDeatil.processor_uid==0">
-					{{reportDeatil.store.detailed_address}}
-				</view>
-				<view class="shopDetailText" v-if="reportDeatil.processor_uid!=0">
-					<view>
-						已安排：{{reportDeatil.processor_user.staff_name}}
-					</view>
-					<!-- <view>
-						预计{{detail.time}}小时到达维修地点
-					</view> -->
-				</view>
-			</view>
-			<view class="buttomShop" @click="payShopPhonw">
-				联系商家
-			</view>
-		</view>
-		<view class="listBox">
-			<view class="list">
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">当前车辆</text>
-					</view>
-					<view class="right flex">
-						{{cartInfo.car_name}}
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">维修单号</text>
-					</view>
-					<view class="right flex">
-						{{reportDeatil.order_id}}
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">维修地点</text>
-					</view>
-					<view class="right flex">
-						{{reportDeatil.address}}
-					</view>
-				</view>
-				<!-- <view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">联系电话</text>
-					</view>
-					<view class="right flex" @click="edit">
-						<text class="margin-r-10">
-							{{reportDeatil.phone}}
-						</text>
-						<image class="img" src="../../../static/icon/addressIcon1.png" mode="widthFix"></image>
-					</view>
-				</view> -->
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">申报时间</text>
-					</view>
-					<view class="right flex">
-						{{reportDeatil.add_time}}
-					</view>
-				</view>
-				<view class="flex listItem">
-					<view class="flex titleBox">
-						<text class="title">故障简述</text>
-					</view>
-					<view class="right flex">
-						{{reportDeatil.content}}
-					</view>
-				</view>
-
-				<view class="listItem" v-if="imglist.length>0">
-					<view class="flex titleBox">
-						<text class="title">已传图片</text>
-					</view>
-					<view class="right flex imgList">
-						<view v-if="" class="position-relative margin-r-20" v-for="(item,index) in imglist">
-							<image class="upImg" :src="item" mode="scaleToFill"></image>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="base-buttom" @click="outBxiu">
-			撤销报修
-		</view>
-
-
-		<uni-popup ref="popup" type="dialog">
-			<uni-popup-dialog mode="input" title="请输入修改手机号" @confirm="editPhone">
-			</uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		cancel_question
-	} from '@/api/user.js';
-	export default {
-		props: {
-			cartInfo: {
-				type: Object,
-				default: function() {
-					return {}
-				}
-			},
-			reportDeatil: {
-				type: Object,
-				default: function() {
-					return {}
-				}
-			}
-		},
-		computed: {
-			imglist() {
-				return this.reportDeatil.images.split(',')
-			}
-		},
-		data() {
-			return {};
-		},
-		created() {
-			// console.log('调用方法2');
-		},
-		methods: {
-			// 撤销报修
-			outBxiu() {
-				uni.showModal({
-					title: '提示',
-					content: '是否撤销报修？',
-					success: res => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: '提交中...',
-								mask: true
-							});
-							cancel_question({
-								id: this.reportDeatil.id
-							}).then((e) => {
-								uni.hideLoading()
-								uni.showModal({
-									title: '提示',
-									content: '撤销成功',
-									showCancel: false,
-									success: res => {
-										uni.navigateBack()
-									},
-								});
-							}).catch((e) => {
-								uni.hideLoading()
-							})
-						}
-					},
-				});
-			},
-			// 打开修改弹窗
-			edit() {
-				this.$refs.popup.open();
-			},
-			editPhone(e) {
-				console.log(e, '修改手机号');
-			},
-			payShopPhonw() {
-				uni.makePhoneCall({
-					phoneNumber: this.reportDeatil.store.phone //仅为示例
-				});
-			}
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content{
-		padding-bottom: 30rpx;
-	}
-	.base-buttom{
-		margin-top: 30rpx;
-	}
-	.base-buttom {
-		color: $color-red;
-		border: 1px solid $color-red;
-		background-color: $page-color-base;
-	}
-
-	.shopContent {
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		height: 160rpx;
-		padding: 20rpx;
-		margin: 0 $page-row-spacing;
-		margin-bottom: 20rpx;
-
-		.buttomShop {
-			border-radius: 99rpx;
-			border: 1px solid $color-green;
-			color: $color-green;
-			font-size: 24rpx;
-			padding: 20rpx 50rpx;
-			line-height: 1;
-			flex-shrink: 0;
-		}
-
-		.shoplogo {
-			flex-shrink: 0;
-			background-color: $font-color-white;
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 20rpx;
-
-			.logo {
-				height: 100%;
-				width: 100%;
-				border-radius: 20rpx;
-			}
-		}
-
-		.shopDetail {
-			padding-left: 30rpx;
-			flex-grow: 1;
-
-			.shopName {
-				line-height: 1;
-				margin-bottom: 15rpx;
-				font-size: 28rpx;
-				color: $font-base;
-			}
-
-			.shopDetailText {
-				font-size: 22rpx;
-				color: $font-color-light;
-			}
-		}
-	}
-
-	.listBox {
-		margin: $page-row-spacing;
-		margin-top: 30rpx;
-		border-radius: 20rpx;
-		overflow: hidden;
-		background-color: #FFFFFF;
-	}
-
-	.list {
-		.input {
-			text-align: right;
-			font-size: $font-base;
-			color: $color-gray;
-			width: 100%;
-		}
-
-		.listItem {
-			padding: 35rpx 40rpx;
-			border-bottom: 1px solid $page-color-light;
-
-			.imgList {
-				margin-top: 30rpx;
-				justify-content: flex-start;
-
-				.topExit {
-					width: 30rpx;
-					height: 30rpx;
-					position: absolute;
-					top: -10rpx;
-					right: -10rpx;
-				}
-			}
-		}
-
-		.listIconImg {
-			width: 36rpx;
-		}
-
-		.right {
-			color: $font-color-light;
-			font-size: $font-base;
-			justify-content: flex-end;
-			position: relative;
-			padding-left: 10rpx;
-
-			.img {
-				width: 26rpx;
-			}
-
-			.upImg {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 20rpx;
-				background-color: $font-color-disabled;
-			}
-
-			.textarea_text {
-				background-color: $page-color-base;
-				width: 100%;
-				margin-top: 30rpx;
-				border-radius: 20rpx;
-				padding: 30rpx;
-			}
-
-			.maxShow {
-				position: absolute;
-				bottom: 10rpx;
-				right: 20rpx;
-				font-size: 24rpx;
-			}
-
-		}
-
-		.titleBox {
-			flex-shrink: 0;
-
-			.title {
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-</style>

pages/user/reportForRepair/status3.vue

@@ -1,192 +0,0 @@
-<template>
-	<view class="content">
-		<view class="order-item">
-			<view class="masterWorker flex" v-if="reportDeatil.processor_user">
-				<image class="imgUser" src="../../../static/error/missing-face.png" mode="scaleToFill"></image>
-				<view class="padding-l-30">
-					<view class="masterName">
-						{{reportDeatil.processor_user.staff_name}}
-					</view>
-					<view class="masterTime margin-t-20">
-						完成时间：{{reportDeatil.processor_time}}
-					</view>
-				</view>
-			</view>
-			<view class="flex_item zhil" v-for="(item,index) in rateValue">
-				<view>{{item.text}}：</view>
-				<view>
-					<uni-rate text="1" size="20" margin="10" :value="item.value" @change="rateChange($event,index)">
-					</uni-rate>
-				</view>
-			</view>
-		</view>
-		<view @click.stop="submit" class="base-buttom">
-			提交并结束报修
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		question_score,
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				rateValue: [{
-					text: '响应速度',
-					value: 0,
-				}, {
-					text: '技术评分',
-					value: 0,
-				}, {
-					text: '服务态度',
-					value: 0,
-				}],
-			};
-		},
-		props: {
-			reportDeatil: {
-				type: Object,
-				default: function() {
-					return {
-
-					}
-				}
-			},
-		},
-		methods: {
-			// 评分
-			rateChange(val, index) {
-				console.log(val, index);
-				this.rateValue[index].value = val.value
-			},
-			//提交评论
-			submit(e) {
-				let obj = this;
-				if (this.rateValue[0].value == 0 || this.rateValue[1].value == 0 || this.rateValue[2].value == 0) {
-					uni.showModal({
-						title: '错误',
-						content: '最低评分为一颗星，请重新选择',
-						showCancel: false,
-					});
-					return
-				}
-				uni.showLoading({
-					title: '提交中',
-					mask: true
-				});
-				question_score({
-						id: this.reportDeatil.id,
-						response_score: this.rateValue[0].value, //响应频分
-						skill_score: this.rateValue[1].value, //技术评分
-						attitude_score: this.rateValue[2].value, //服务评分
-					})
-					.then(e => {
-						uni.hideLoading();
-						uni.showModal({
-							title: '提示',
-							content: e.msg,
-							showCancel: false,
-							success: res => {
-								uni.navigateBack()
-							},
-						});
-					})
-					.catch(e => {
-						uni.showToast({
-							title: e.msg,
-							icon: 'error'
-						});
-						uni.hideLoading()
-					});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.content {
-		padding: 0 $page-row-spacing;
-	}
-
-	.order-item {
-		display: flex;
-		flex-direction: column;
-		padding: 30rpx 0;
-		border-radius: 20rpx;
-		background: #fff;
-		margin-top: 20rpx;
-
-		.masterWorker {
-			padding: 0 30rpx;
-			border-bottom: 1px solid $page-color-light;
-			padding-bottom: 30rpx;
-			justify-content: flex-start;
-
-			.masterTime {
-				font-size: 22rpx;
-				color: $font-color-light;
-			}
-
-			.masterName {
-				color: $font-color-base;
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-
-			.imgUser {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 100rpx;
-			}
-		}
-
-		.flex_item {
-			margin: 0 30rpx;
-			color: $font-color-base;
-			font-size: $font-base;
-		}
-	}
-
-	.zhil {
-		font-size: 28rpx !important;
-		padding: 15rpx 15rpx;
-	}
-
-	.submit-box {
-		bottom: 0;
-		left: 0;
-		width: 750rpx;
-	}
-
-	.submit-btn {
-		margin-top: 10px;
-		display: inline-block;
-		width: 670rpx;
-		height: 96rpx;
-		line-height: 96rpx;
-		text-align: center;
-		background-color: #1BCC26 !important;
-		opacity: 1;
-		border-radius: 32rpx;
-		border-width: 8rpx;
-		border-color: rgba(255, 255, 255, 1);
-		box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 56rpx;
-		font-size: 39rpx;
-		font-weight: bold;
-		color: rgba(255, 255, 255, 1);
-	}
-
-	.address-box {
-		padding: 15rpx 40rpx;
-		margin-bottom: 10px;
-	}
-</style>

pages/user/shopPage.vue

@@ -1,507 +0,0 @@
-<template>
-	<view class="container">
-		<view class="vheigh"></view>
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="user-info-box ">
-					<view class="detail flex" @click="navTo('/pages/set/userinfo')">
-						<view class="portrait-box">
-							<image class="portrait" :src="shopAction.image || '/static/error/shopErroe.png'"></image>
-						</view>
-						<view class="info-box">
-							<view class="username">{{ shopAction.name?shopAction.name:'载入中'}}</view>
-							<view class="authentication success">已认证</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="cover-container">
-				<view class="tj-sction" v-if="type==1">
-					<view class="tj-item" @click="navTo('./money/wallet')">
-						<text>支付金额</text>
-						<text class="num">{{ orderNum.todayPrice || '0' }}</text>
-						<text>昨日：{{orderNum.proPrice}}</text>
-					</view>
-					<!-- <view class="tj-item" @click="navTo('/pages/user/award/award')">
-						<text>会员数</text>
-						<text class="num">{{ orderNum.proPrice || '0' }}</text>
-						<text>昨日：{{orderNum.proPrice}}</text>
-					</view> -->
-					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
-						<text>支付订单数</text>
-						<text class="num">{{ orderNum.todayCount || '0' }}</text>
-						<text>昨日：{{orderNum.proCount}}</text>
-					</view>
-				</view>
-				<!-- 订单 -->
-				<view class="item-box">
-					<view class="box-title flex">
-						<view class="title"><text>店铺订单</text></view>
-						<!-- <view class="link" @click="navTo('/pages/shop/shopOrder?state=0')" hover-class="common-hover">
-							<text>全部</text>
-							<text class="iconfont iconenter"></text>
-						</view> -->
-					</view>
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/shop/shopOrder?state=0')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class=" icon position-relative">
-								<view class="numOrderItem font-color-gray">
-									{{orderNum.unpaid_count}}
-								</view>
-							</view>
-							<text>待付款</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/shop/shopOrder?state=1')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class=" icon position-relative">
-								<view class="numOrderItem font-color-red">
-									{{orderNum.unshipped_count}}
-								</view>
-							</view>
-							<text>待发货</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/shop/shopOrder?state=2')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon position-relative">
-								<view class="numOrderItem font-color-gray">
-									{{orderNum.received_count}}
-								</view>
-							</view>
-							<text>已发货</text>
-						</view>
-						<!-- <view class="order-item" @click="navTo('/pages/shop/shopOrderAfter?state=3')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon position-relative">
-								<view class="numOrderItem font-color-yellow">
-									{{orderNum.refund_count}}
-								</view>
-							</view>
-							<text>待售后</text>
-						</view> -->
-					</view>
-				</view>
-				<view class="listBox">
-					<view class="list">
-						<view class="flex listItem" @click="navTo('/pages/shop/repair/clientRepair')" v-if="type==1">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myWx.png" mode="widthFix"></image>
-								<text class="title">客户报修</text>
-							</view>
-							<view class="right flex" v-if="question>0">
-								<text class="numbox">{{question}}</text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<view class="flex listItem" @click="navTo('/pages/shop/repair/repairHistory')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myWx.png" mode="widthFix"></image>
-								<text class="title">维修历史</text>
-							</view>
-							<!-- <view class="right flex" v-if="question>0">
-								<text class="numbox">{{question}}</text>
-							</view> -->
-						</view>
-						<!-- <view class="flex listItem" @click="navTo('/pages/set/set')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/shopMoney.png" mode="widthFix">
-								</image>
-								<text class="title">店铺钱包</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-							</view>
-						</view> -->
-						<view class="flex listItem" @click="navTo('/pages/shop/repair/taskClientRepair')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myWx.png" mode="widthFix"></image>
-								<text class="title">维修任务</text>
-							</view>
-							<view class="right flex" v-if="tesk>0">
-								<text class="numbox">{{tesk}}</text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<!-- <view class="flex listItem" @click="navTo('/pages/set/set')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myServer.png" mode="widthFix"></image>
-								<text class="title">联系平台</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-							</view>
-						</view> -->
-						<view class="flex listItem" @click="navTo('/pages/set/set')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mySet.png" mode="widthFix"></image>
-								<text class="title">设置</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="tapBottom" @click="changeTab">
-					前往用户界面
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		statistics,
-		funds,
-		question,
-		adminStore,
-		task
-	} from '@/api/shop.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	export default {
-		data() {
-			return {
-				type: 0, //0为数据未加载,1为门店2为店员
-				orderNum: {
-					unpaid_count: 0, //待支付
-					unshipped_count: 0, //待发货
-					received_count: 0, //待收获
-					refund_count: 0, //待售后
-					todayPrice: 0, //今日成交额
-					todayCount: 0, //今日订单数
-					proPrice: 0, //昨日成交额
-					proCount: 0, //昨日订单数
-				},
-				question: 0, //维修数量
-				tesk: 0, //维修任务数量
-			};
-		},
-		computed: {
-			...mapState('user', ['hasLogin']),
-			...mapState('shop', ['shopAction'])
-		},
-		created() {
-			this.type = this.shopAction.type
-		},
-		methods: {
-			...mapMutations('shop', ['setShopAction']),
-			// 重新加载数据
-			getInit() {
-				const that = this;
-				// 订单数
-				statistics().then((e) => {
-					that.orderNum = e.data
-				})
-				// 门店资金
-				funds().then((e) => {
-					that.name = e.data.name;
-					that.logo = e.data.image;
-					// 保存商店数据
-					if (e.data.address) {
-						e.data.type = 1;
-						that.setShopAction(e.data);
-					} else {
-						e.data.type = 2;
-						adminStore().then((ar) => {
-							that.setShopAction(ar.data);
-						}).catch((e) => {
-							console.log(e);
-						})
-					}
-					that.type = e.data.type;
-				})
-				// 查询店长客户报修数量
-				question().then((e) => {
-					that.question = e.data.count
-				})
-				// 查询维修任务数量
-				task().then((e) => {
-					that.tesk = e.data.count;
-				}).catch((e) => {
-					console.log(e);
-				})
-
-			},
-			// 界面切换
-			changeTab() {
-				this.$emit('tab', false)
-			},
-			navTo(url) {
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
-					uni.navigateTo({
-						url
-					});
-				}
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.tapBottom {
-		margin: 0 50rpx;
-		text-align: center;
-		color: #FFFFFF;
-		border: 1px solid $color-green;
-		background-color:$color-green ;
-		line-height: 1;
-		padding: 25rpx;
-		border-radius: 100rpx;
-		margin-top: 50rpx;
-	}
-
-	.listBox {
-		margin-top: 20rpx;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-
-	.list {
-		.listItem {
-			padding: 35rpx 40rpx;
-			border-bottom: 1px solid $page-color-light;
-		}
-
-		.listIconImg {
-			width: 36rpx;
-			height: 36rpx;
-		}
-
-		.right {
-			.img {
-				width: 26rpx;
-			}
-
-			.numbox {
-				background-color: $color-red;
-				color: #FFFFFF;
-				font-size: 22rpx;
-				border-radius: 100rpx;
-				min-width: 36rpx;
-				height: 36rpx;
-				line-height: 36rpx;
-				text-align: center;
-				padding: 0 5rpx;
-			}
-		}
-
-		.titleBox {
-			.title {
-				padding-left: 20rpx;
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	%flex-center {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	%section {
-		display: flex;
-		justify-content: space-around;
-		align-content: center;
-		border-radius: 10rpx;
-	}
-
-	.container {
-		height: 100%;
-		background-color: $page-color-base;
-	}
-
-	.content-box {
-		height: 100%;
-	}
-
-	.vheigh {
-		height: var(--status-bar-height);
-	}
-
-	.user-section {
-		padding: 15rpx 30rpx 0;
-		position: relative;
-	}
-
-	.user-info-box {
-		height: 180rpx;
-		color: white;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		z-index: 1;
-
-		.detail {
-			height: 130rpx;
-
-			.portrait-box {
-				height: 100%;
-
-				.portrait {
-					width: 130rpx;
-					height: 100%;
-					border: 5rpx solid #fff;
-					border-radius: 50%;
-				}
-			}
-
-			.info-box {
-				margin-left: 20rpx;
-				line-height: 1.5;
-
-				.username {
-					font-size: 40rpx;
-					color: $font-color-dark;
-					font-weight: bold;
-					height: 100%;
-				}
-
-				.authentication {
-					border: 2rpx solid #FF4241;
-					border-radius: 20px;
-					padding: 0 25rpx;
-					font-size: 24rpx;
-					color: #FF4241;
-					float: left;
-
-					&.success {
-						border: 2rpx solid $color-green;
-						color: $color-green;
-					}
-				}
-			}
-		}
-	}
-
-	.cover-container {
-		padding: 0 30rpx;
-		position: relative;
-		padding-bottom: 20rpx;
-	}
-
-	.tj-sction {
-		@extend %section;
-
-		.tj-item {
-			@extend %flex-center;
-			flex-direction: column;
-			height: 100rpx;
-			font-size: $font-sm;
-			color: $font-color-light;
-		}
-
-		.num {
-			font-size: $font-base;
-			color: $font-color-dark;
-			margin-bottom: 8rpx;
-			font-weight: bold;
-		}
-	}
-
-	.item-box {
-		border-radius: 20rpx;
-		background-color: white;
-		margin-top: 20rpx;
-
-		.box-title {
-			line-height: 1;
-			padding: 30rpx;
-
-			.title {
-				font-size: $font-lg;
-				font-weight: bold;
-			}
-
-			.link {
-				font-size: $font-base - 2rpx;
-				color: $font-color-light;
-			}
-		}
-
-		.order-section {
-			@extend %section;
-			padding: 28rpx 0;
-			padding-top: 0;
-
-			.order-item {
-				@extend %flex-center;
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 10rpx;
-				font-size: $font-sm;
-				color: $font-color-dark;
-
-				.numOrderItem {
-					font-size: 36rpx;
-					font-weight: bold;
-					text-align: center;
-				}
-			}
-
-			.iconfont {
-				font-size: 48rpx;
-				margin-bottom: 18rpx;
-				color: #fa436a;
-			}
-
-			.icon-shouhoutuikuan {
-				font-size: 44rpx;
-			}
-
-			.icon {
-				height: 50rpx;
-				width: 48rpx;
-				margin-bottom: 18rpx;
-				background-size: 100%;
-				background-repeat: no-repeat;
-				background-position: center;
-
-				.icon-img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.history-section {
-		// padding: 30rpx 0 0;
-		margin-top: 20rpx;
-		background: #fff;
-		border-radius: 10rpx;
-
-		.h-list {
-			white-space: nowrap;
-			padding: 30rpx 30rpx 0;
-
-			.h-list-image {
-				display: inline-block;
-				width: 160rpx;
-				height: 160rpx;
-				margin-right: 20rpx;
-				border-radius: 10rpx;
-			}
-		}
-	}
-</style>

pages/user/user.vue

@@ -1,106 +1,451 @@
 <template>
-	<view class="content">
-		<user-page ref='userPage' v-show="isUserPage" @tab='changeTab'>
-		</user-page>
-		<shop-page ref='shopPage' v-show="!isUserPage" @tab='changeTab'>
-		</shop-page>
+	<view class="container">
+		<scroll-view class="content-box" scroll-y="true">
+			<view class="user-section">
+				<view class="user-info-box ">
+					<view class="detail flex">
+						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
+							<image class="portrait" :src="user.avatar || '/static/error/missing-face.png'"></image>
+						</view>
+						<view class="info-box">
+							<view class="username flex-start">
+								<text class="clamp padding-r-20">
+									{{ user.nickname || '游客' }}
+								</text>
+
+								<view class="tipLevel flex-shrink-false">
+								</view>
+							</view>
+							<view class="flex-start flex">
+								<view class="authentication"
+									@click="navTo('/pages/user/realName/realNameAuthentication')" v-if="!user.mobile">
+								</view>
+								<view class="authentication" v-else>{{user.mobile}}</view>
+							</view>
+						</view>
+						<view class="righ-tbox flex">
+							<image class="right-tip" src="../../static/icon/tiptop.png" mode="scaleToFill"></image>
+							<block v-if="!user.work_type_title">
+								普通用户
+							</block>
+							<block v-else>
+								{{user.work_type_title}}
+							</block>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="nav-model flex" @click="navcard">
+				<view class="right-card">
+					<view class="title">
+						我的名片
+					</view>
+					<view class="tip" v-if="user.info_audit_status==-2">
+						认证成功即可获得母婴师名片
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==1">
+						认证成功点击查看您的母婴师名片
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id<=0">
+						名片资料审核中请等待审核完毕
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id>0">
+						修改名片资料中请等待审核完毕
+					</view>
+				</view>
+				<image class="next" src="../../static/icon/next2.png" mode="scaleToFill"></image>
+			</view>
+			<view class="nav-model-rz flex" v-if="user.work_type_id>0&&user.type_audit_status!=1" @click="user.type_audit_status==0||navTo('/pages/user/model/shoprz')">
+				<view class="tiptext" v-if="user.type_audit_status==-2">
+					您未完成平台认证，请立即认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==-1">
+					您平台认证失败，请重新认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==-3">
+					您平台认证已失效，请重新认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==0">
+					您已提交认证信息请等待认证结束
+				</view>
+				<view class="rztext" v-if="user.type_audit_status==-2">
+					立即认证
+				</view>
+				<view class="rztext" v-else-if='user.type_audit_status==-3||user.type_audit_status==-1'>
+					重新认证
+				</view>
+			</view>
+			<view class="cover-container">
+				<view class="listBox">
+					<view class="list">
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/mymoney.png" mode="widthFix"></image>
+								<text class="title">我的钱包</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view> -->
+						<view class="flex listItem" @click="navTo('/pages/user/model/mymodellist')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/userreal.png" mode="widthFix"></image>
+								<text class="title">实名认证</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<!-- #ifdef MP -->
+						<button hover-class="none" class="flex listItem" open-type='contact'>
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/userkf.png" mode="widthFix"></image>
+								<text class="title">客服中心</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</button>
+						<!-- #endif -->
+						<view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/usershare.png" mode="widthFix"></image>
+								<text class="title">邀请好友</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="flex listItem" @click="navTo('/pages/set/set')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/userset.png" mode="widthFix"></image>
+								<text class="title">设置</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
 	</view>
 </template>
 <script>
-	import userPage from "./userPage.vue"
-	import shopPage from "./shopPage.vue"
 	import {
 		mapState,
 		mapMutations
 	} from 'vuex';
 	import {
-		orderData,
-		getUserInfo
+		share
+	} from '@/api/wx';
+	import {
+		getUser
 	} from '@/api/user.js';
+	import {
+		articleList,
+		notify
+	} from '@/api/index.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
 	export default {
-		components: {
-			userPage,
-			shopPage
-		},
 		data() {
 			return {
-				isUserPage: true //默认用户页面
+				user: {
+					avatar: '', //头像
+					nickname: '', //昵称
+				},
+				shareData: {}
 			};
 		},
 		computed: {
-			...mapState('user', [ 'hasLogin']),
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+			...mapState(['baseURL', 'urlFile']),
+			...mapState(['fx']),
+			// 总消息条数
+			notic() {
+				return this.user.question_sum + this.user.notice_sum;
+			},
+		},
+		// 创建时获取分享信息
+		onLoad() {
+			// share().then((res) => {
+			// 	this.shareData = res.data.data
+			// }).catch((res) => {
+			// 	console.log(res, '分享加载失败');
+			// })
 		},
 		onShow() {
-			uni.setTabBarStyle({
-				backgroundColor: '#FFFFFF'
-			})
-			// 判断是否已经登录
-			this.loadBaseData();
-			// 判断是否用户页面
-			if (this.isUserPage&&this.hasLogin) {
-				this.$nextTick(() => {
-					this.$refs.userPage.getUser();
-				})
-			} else if(this.hasLogin){
-				this.$nextTick(() => {
-					this.$refs.shopPage.getInit();
-				})
-			}
+			this.getUser();
 		},
 		methods: {
-			toJSON(){
-				return this;
-			},
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			changeTab(bool) {
-				if (bool) {
-					this.$refs.shopPage.getInit();
-				}
-				if (!bool) {
-					this.$refs.userPage.getUser();
+			...mapMutations('user', ['setUserInfo']),
+			// 跳转卡片页面
+			navcard() {
+				// 判断是否已经认证
+				if (this.user.work_type_id <=0) {
+					this.navTo('/pages/user/model/modelrz')
+				} else {
+					if (this.user.show_template_id) {
+						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id+'&look=1')
+					}else{
+						this.navTo('/pages/user/model/model')
+					}
 				}
-				// 判断 是否切换为商家
-				this.isUserPage = !bool;
 			},
-			// 加载初始数据
-			loadBaseData() {
-				getUserInfo({})
-					.then(({
-						data
-					}) => {
-						this.setUserInfo(data);
-						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-						orderData({})
-							.then(({
-								data
-							}) => {
-								this.setOrderInfo(data);
-							})
-							.catch(e => {
-								this.setOrderInfo({
-									complete_count: 0, //完成
-									received_count: 0, //待收货
-									unshipped_count: 0, //待发货
-									order_count: 0, //订单总数
-									unpaid_count: 0 //待付款
-								});
-							});
-					})
-					.catch(e => {
-						console.log(e);
+
+			//#ifdef APP
+			shareDomApp() {
+				uni.share({
+					provider: 'weixin',
+					type: 0,
+					title: '母婴界严选',
+					summary: '',
+					imageUrl: this.shareData.img,
+					href: this.baseURL + this.urlFile + '/pages/public/register?spread=' + this.userInfo.uid
+				})
+			},
+			//#endif
+			// 获取用户数据
+			getUser() {
+				console.log('data')
+				const that = this;
+				getUser({}).then((e) => {
+					this.user = e.data;
+					this.setUserInfo(e.data)
+				}).catch((e) => {
+					console.log(e, 'sj');
+				})
+				// 系统消息
+				// articleList({}, 1).then((e) => {
+				// 	that.user.question_sum = e.data.count
+				// 	console.log(that, 1);
+				// }).catch((e) => {
+				// 	console.log(e);
+				// })
+				// 报警消息
+				// notify().then((e) => {
+				// 	that.user.notice_sum = e.data.count
+				// }).catch((e) => {
+				// 	console.log(e);
+				// })
+			},
+			changeTab() {
+				this.$emit('tab', true)
+			},
+			navTo(url) {
+				console.log(this.hasLogin,'this.hasLogin');
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url,
+						fail(e) {
+							console.log(e);
+						}
 					});
+				}
 			},
-			/**
-			 * 统一跳转接口,拦截未登录路由
-			 * navigator标签现在默认没有转场动画，所以用view
-			 */
 		}
 	};
 </script>
 <style lang="scss">
-	.content {
-		/* #ifdef H5 */
-		padding-bottom: 150rpx;
-		/* #endif */
+	page {
+		height: 100%;
+	}
+
+	.listBox {
+		margin-top: 20rpx;
+		overflow: hidden;
+	}
+
+	.list {
+		.listItem {
+			padding: 35rpx 40rpx;
+			margin-bottom: 15rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			border: none;
+			line-height: 1;
+			&::after{
+				border: none;
+			}
+		}
+		
+		.listIconImg {
+			width: 36rpx;
+			height: 36rpx;
+		}
+
+		.right {
+			.img {
+				width: 26rpx;
+			}
+		}
+
+		.titleBox {
+			.title {
+				padding-left: 20rpx;
+				color: $font-color-base;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.container {
+		height: 100%;
+		background-color: $page-color-base;
+	}
+
+	.content-box {
+		height: 100%;
+	}
+
+	.user-section {
+		padding: 15rpx 30rpx 0;
+		position: relative;
+		background: url('https://api.myjie.cn/resource/appimage/userbg.png');
+		background-size: 100% 100%;
+		padding-top: 100rpx;
+		height: 350rpx;
+	}
+
+	.user-info-box {
+		height: 180rpx;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		z-index: 1;
+
+		.detail {
+			height: 130rpx;
+			flex-grow: 1;
+			overflow: hidden;
+
+			.portrait-box {
+				height: 100%;
+
+				.portrait {
+					width: 130rpx;
+					height: 100%;
+					border: 5rpx solid #fff;
+					border-radius: 50%;
+				}
+			}
+
+			.info-box {
+				margin-left: 20rpx;
+				line-height: 1.5;
+				flex-grow: 1;
+				overflow: hidden;
+
+				.tipLevel {
+					height: 36rpx;
+					margin-right: 20rpx;
+				}
+
+				.username {
+					font-size: 34rpx;
+					color: #FFF;
+					font-weight: bold;
+					height: 100%;
+				}
+
+				.authentication {
+					font-size: 24rpx;
+					color: #FFF;
+					float: left;
+				}
+			}
+
+			.righ-tbox {
+				padding: 10rpx 20rpx;
+				border-radius: 12rpx;
+				font-size: 25rpx;
+				line-height: 1;
+				color: $base-color;
+				background-color: #FFF;
+
+				.right-tip {
+					width: 25rpx;
+					height: 33rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+	.nav-model-rz{
+		background-color:#FFD7E3 ;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: 30rpx;
+		padding-bottom: 15rpx;
+		padding-top: 50rpx;
+		line-height: 1;
+		width: 690rpx;
+		margin-top: -38rpx;
+		.tiptext{
+			color:#F65486 ;
+			font-size: 26rpx;
+			font-weight: bold;
+		}
+		.rztext{
+			color: #FFF;
+			background-color: #F65486;
+			border-radius: 100rpx;
+			padding: 15rpx 20rpx;
+			font-size: 22rpx;
+		}
+	}
+
+	.nav-model {
+		background: url('https://api.myjie.cn/resource/appimage/uservip.png');
+		background-size: 100% 100%;
+		color: #FFF;
+		border-radius: 20rpx;
+		width: 690rpx;
+		height: 157rpx;
+		margin: 0 auto;
+		margin-top: -80rpx;
+		font-weight: bold;
+		z-index: 1;
+		position: relative;
+
+		.next {
+			width: 26rpx;
+			height: 28rpx;
+			margin-right: 40rpx;
+		}
+
+		.right-card {
+			padding-left: 170rpx;
+		}
+
+		.title {
+			font-size: 35rpx;
+		}
+
+		.tip {
+			font-size: 26rpx;
+		}
+
+	}
+
+	.cover-container {
+		padding: 0 30rpx;
+		position: relative;
+		padding-bottom: 20rpx;
 	}
 </style>

pages/user/userPage.vue

@@ -1,557 +0,0 @@
-<template>
-	<view class="container">
-		<view class="vheigh"></view>
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="user-info-box ">
-					<view class="detail flex">
-						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
-							<image class="portrait" :src="user.avatar || '/static/error/missing-face.png'"></image>
-						</view>
-						<view class="info-box">
-							<view class="username flex-start">
-								<text class="clamp padding-r-20">
-									{{ user.nickname || '游客' }}
-								</text>
-								<image v-if="user.level>0" class="tipLevel flex-shrink-false"
-									:src="`../../static/image/level${user.level-1}.png`" mode="heightFix"></image>
-							</view>
-							<view class="flex-start flex">
-								<view class="authentication"
-									@click="navTo('/pages/user/realName/realNameAuthentication')"
-									v-if="userInfo.is_real==0||!userInfo.is_real">未实名认证</view>
-								<view class="authentication success" v-else>已认证</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="cover-container">
-				<view class="tj-sction">
-					<view class="tj-item" @click="navTo('./money/wallet')">
-						<text class="num">{{ user.now_money || '0.00' }}</text>
-						<text>余额</text>
-					</view>
-					<view v-if="fx" class="tj-item" @click="navTo('/pages/user/award/award')">
-						<text class="num">{{ user.brokerage_price || '0.00' }}</text>
-						<text>佣金</text>
-					</view>
-					<!-- <view class="tj-item" @click="navTo('/pages/index/route')">
-						<text class="num">{{ user.record_sum || '0' }}</text>
-						<text>行程</text>
-					</view> -->
-					<view class="tj-item" @click="navTo('/pages/index/notice')">
-						<text class="num">{{ notic|| '0' }}</text>
-						<text>消息</text>
-					</view>
-				</view>
-				<!-- 订单 -->
-				<view class="item-box">
-					<view class="box-title flex">
-						<view class="title"><text>我的订单</text></view>
-						<!-- <view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover">
-							<text>全部订单</text>
-							<text class="iconfont iconenter"></text>
-						</view> -->
-					</view>
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="../../static/icon/userIconAll.png" mode="aspectFit">
-								</image>
-								<!-- <view class="corner" v-if="orderInfo.unshipped_count > 0">
-									<text>{{ orderInfo.unshipped_count }}</text>
-								</view> -->
-							</view>
-							<text>已完成</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="../../static/icon/userIconPay.png" mode="aspectFit">
-								</image>
-								<view class="corner" v-if="user.unpaid_count > 0">
-									<text>{{ user.unpaid_count }}</text>
-								</view>
-							</view>
-							<text>待付款</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
-							:hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="../../static/icon/userIconGet.png" mode="aspectFit">
-								</image>
-								<view class="corner" v-if="user.received_count > 0">
-									<text>{{ user.received_count }}</text>
-								</view>
-							</view>
-							<text>待收货</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/orderAfter?state=0')"
-							hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="../../static/icon/userIconout.png" mode="aspectFit">
-								</image>
-								<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
-									<text>{{ orderInfo.complete_count }}</text>
-								</view> -->
-							</view>
-							<text>售后</text>
-						</view>
-					</view>
-				</view>
-				<view class="listBox">
-					<view class="list">
-						<view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myCart.png" mode="widthFix"></image>
-								<text class="title">我的车辆</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<view class="flex listItem" @click="navTo('/pages/user/repair/userRepair')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myWx.png" mode="widthFix"></image>
-								<text class="title">维修历史</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<view class="flex listItem" v-if="fx" @click="navTo('/pages/user/myteam')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myitem.png" mode="widthFix"></image>
-								<text class="title">我的团队</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<view class="flex listItem" @click="navTo('/pages/set/address')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myAddress.png" mode="widthFix">
-								</image>
-								<text class="title">我的地址</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-						<!-- #ifndef APP -->
-						<view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myitem.png" mode="widthFix"></image>
-								<text class="title">邀请好友</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-							</view>
-						</view>
-						<!-- #endif -->
-						<!-- #ifdef APP -->
-						<view class="flex listItem" @click="shareDomApp">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myitem.png" mode="widthFix"></image>
-								<text class="title">邀请好友</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-							</view>
-						</view>
-						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<view class="flex listItem" @click="navTo('/pages/public/workwork')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myServer.png" mode="widthFix"></image>
-								<text class="title">关于我们</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-							</view>
-						</view>
-						<!-- #endif -->
-						<view class="flex listItem" @click="navTo('/pages/set/set')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mySet.png" mode="widthFix"></image>
-								<text class="title">设置</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="tapBottom" v-if='user.adminid' @click="changeTab">
-					前往商家界面
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		share
-	} from '@/api/wx';
-	import {
-		getUser
-	} from '@/api/user.js';
-	import {
-		articleList,
-		notify
-	} from '@/api/index.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	export default {
-		data() {
-			return {
-				user: {
-					avatar: '', //头像
-					nickname: '', //昵称
-					now_money: 0, //余额
-					brokerage_price: 0, //佣金
-					record_sum: 0, //行程
-					notice_sum: 0, //报警信息
-					question_sum: 0, //系统消息
-					// 订单数据类型
-					orderStatusNum: {
-						unpaid_count: 0, //待付款
-						received_count: 0, //待收货
-					},
-				},
-				shareData: {}
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-			...mapState(['baseURL', 'urlFile']),
-			...mapState(['fx']),
-			// 总消息条数
-			notic() {
-				return this.user.question_sum + this.user.notice_sum;
-			},
-		},
-		// 创建时获取分享信息
-		created() {
-			share().then((res) => {
-				this.shareData = res.data.data
-			}).catch((res) => {
-				console.log(res, '分享加载失败');
-			})
-		},
-		methods: {
-			//#ifdef APP
-			shareDomApp() {
-				uni.share({
-					provider: 'weixin',
-					type: 0,
-					title: '绿津智能电动车',
-					summary: '新一代智能电动车，手机开关锁、智能防盗、卫星定位，时刻掌握爱车位置。品牌大厂生产，质量好，款式多，售后优，所有车辆支持0元购新车！',
-					imageUrl: this.shareData.img,
-					href: this.baseURL + this.urlFile + '/pages/public/register?spread=' + this.userInfo.uid
-				})
-			},
-			//#endif
-			// 获取用户数据
-			getUser() {
-				const that = this;
-				getUser({}).then((e) => {
-					this.user = e.data;
-				}).catch((e) => {
-					console.log(e);
-				})
-				// 系统消息
-				articleList({}, 1).then((e) => {
-					that.user.question_sum = e.data.count
-					console.log(that, 1);
-				}).catch((e) => {
-					console.log(e);
-				})
-				// 报警消息
-				notify().then((e) => {
-					that.user.notice_sum = e.data.count
-				}).catch((e) => {
-					console.log(e);
-				})
-			},
-			changeTab() {
-				this.$emit('tab', true)
-			},
-			navTo(url) {
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
-					uni.navigateTo({
-						url,
-						fail(e) {
-							console.log(e);
-						}
-					});
-				}
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.tapBottom {
-		margin: 0 50rpx;
-		text-align: center;
-		color: #FFFFFF;
-		border: 1px solid $color-red;
-		background-color: $color-red;
-		line-height: 1;
-		padding: 25rpx;
-		border-radius: 100rpx;
-		margin-top: 50rpx;
-	}
-
-	.listBox {
-		margin-top: 20rpx;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-
-	.list {
-		.listItem {
-			padding: 35rpx 40rpx;
-			border-bottom: 1px solid $page-color-light;
-		}
-
-		.listIconImg {
-			width: 36rpx;
-			height: 36rpx;
-		}
-
-		.right {
-			.img {
-				width: 26rpx;
-			}
-		}
-
-		.titleBox {
-			.title {
-				padding-left: 20rpx;
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	%flex-center {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	%section {
-		display: flex;
-		justify-content: space-around;
-		align-content: center;
-		border-radius: 10rpx;
-	}
-
-	.container {
-		height: 100%;
-		background-color: $page-color-base;
-	}
-
-	.content-box {
-		height: 100%;
-	}
-
-	.vheigh {
-		height: var(--status-bar-height);
-	}
-
-	.user-section {
-		padding: 15rpx 30rpx 0;
-		position: relative;
-	}
-
-	.user-info-box {
-		height: 180rpx;
-		color: white;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		z-index: 1;
-
-		.detail {
-			height: 130rpx;
-			flex-grow: 1;
-			overflow: hidden;
-
-			.portrait-box {
-				height: 100%;
-
-				.portrait {
-					width: 130rpx;
-					height: 100%;
-					border: 5rpx solid #fff;
-					border-radius: 50%;
-				}
-			}
-
-			.info-box {
-				margin-left: 20rpx;
-				line-height: 1.5;
-				flex-grow: 1;
-				overflow: hidden;
-
-				.tipLevel {
-					height: 36rpx;
-					margin-right: 20rpx;
-				}
-
-				.username {
-					font-size: 40rpx;
-					color: $font-color-dark;
-					font-weight: bold;
-					height: 100%;
-				}
-
-				.authentication {
-					border: 2rpx solid #FF4241;
-					border-radius: 20px;
-					padding: 0 25rpx;
-					font-size: 24rpx;
-					color: #FF4241;
-					float: left;
-
-					&.success {
-						border: 2rpx solid $color-green;
-						color: $color-green;
-					}
-				}
-			}
-		}
-	}
-
-	.cover-container {
-		padding: 0 30rpx;
-		position: relative;
-		padding-bottom: 20rpx;
-	}
-
-	.tj-sction {
-		@extend %section;
-
-		.tj-item {
-			@extend %flex-center;
-			flex-direction: column;
-			height: 100rpx;
-			font-size: $font-sm;
-			color: $font-color-light;
-		}
-
-		.num {
-			font-size: $font-base;
-			color: $font-color-dark;
-			margin-bottom: 8rpx;
-			font-weight: bold;
-		}
-	}
-
-	.item-box {
-		border-radius: 20rpx;
-		background-color: white;
-		margin-top: 20rpx;
-
-		.box-title {
-			line-height: 1;
-			padding: 30rpx;
-
-			.title {
-				font-size: $font-lg;
-				font-weight: bold;
-			}
-
-			.link {
-				font-size: $font-base - 2rpx;
-				color: $font-color-light;
-			}
-		}
-
-		.order-section {
-			@extend %section;
-			padding: 28rpx 0;
-			padding-top: 0;
-
-			.order-item {
-				@extend %flex-center;
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 10rpx;
-				font-size: $font-sm;
-				color: $font-color-dark;
-			}
-
-			.iconfont {
-				font-size: 48rpx;
-				margin-bottom: 18rpx;
-				color: #fa436a;
-			}
-
-			.icon-shouhoutuikuan {
-				font-size: 44rpx;
-			}
-
-			.icon {
-				height: 50rpx;
-				width: 48rpx;
-				margin-bottom: 18rpx;
-				background-size: 100%;
-				background-repeat: no-repeat;
-				background-position: center;
-
-				.icon-img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.history-section {
-		// padding: 30rpx 0 0;
-		margin-top: 20rpx;
-		background: #fff;
-		border-radius: 10rpx;
-
-		.h-list {
-			white-space: nowrap;
-			padding: 30rpx 30rpx 0;
-
-			.h-list-image {
-				display: inline-block;
-				width: 160rpx;
-				height: 160rpx;
-				margin-right: 20rpx;
-				border-radius: 10rpx;
-			}
-		}
-	}
-</style>

uni.scss

@@ -4,7 +4,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #F4F4F4;
 // 主题颜色
-$base-color: #0BBB62;//项目颜色
+$base-color: #6DD6B8;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色