阳光接口 洗车提交

components/modules/index/index-nav.vue

@@ -209,9 +209,10 @@
 <style lang="scss" scoped>
 	.pages {
 		background: #FFFFFF;
-		box-shadow: 0px 2px 5px 0px rgba(176, 176, 176, 0.05);
+		box-shadow: 0px 2px 5px 0px rgba(95, 107, 132, 0.05);
 		border-radius: 6px;
 		padding: 10px 10px;
+		border-bottom: 1px solid #E2E6EC;
 	}
 
 	.dots {

config/baseUrl.js

@@ -3,7 +3,7 @@ let h5BaseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://192.168.0.115:8080"; //屈晨
+	// baseUrl = "http://192.168.0.106:8080"; //屈晨
 	// baseUrl = "http://192.168.0.55:8080"; //董鑫
 	// baseUrl = "http://192.168.0.253:8080"; //田智
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "3.0.5",
-	"versionCode": 305,
+	"versionName": "3.0.6",
+	"versionCode": 306,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

pages.json

@@ -998,9 +998,43 @@
 					"bounce": "none"
 				}
 			}
-		}
+		},
 
 		//ui升级模块
+		//洗车模块
+		{
+			"path": "pages/carWash/carWash",
+			"style": {
+				"navigationBarTitleText": "洗车",
+				"app-plus": {
+					"titleNView": false,
+					"scrollIndicator": "none",
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/carWash/details",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"app-plus": {
+					"titleNView": false,
+					"scrollIndicator": "none",
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/carWash/placeOrder",
+			"style": {
+				"navigationBarTitleText": "下单",
+				"app-plus": {
+					"titleNView": false,
+					"scrollIndicator": "none",
+					"bounce": "none"
+				}
+			}
+		}
+		//洗车模块
+
 
 	],
 	"globalStyle": {

pages/carInsure/premiumCalc.vue

@@ -3652,6 +3652,61 @@
 					this.quotableCompanyList[num].msg = '接口请求超时，请重新尝试';
 				}
 			},
+			//阳光报价
+			async yangguang(num, id) {
+				let isTaxSource = this.quotableCompanyList[num].isTaxSource;
+				let params = {
+					accidentalDrivingVo: this.quotableCompanyList[num].insurancePlanInfo.drivingList[0] ? this
+						.quotableCompanyList[num].insurancePlanInfo.drivingList[0] : {},
+					orderNo: this.orderno,
+					companyId: id,
+					kinds: this.quotableCompanyList[num].insurancePlanInfo.kinds,
+					risks: this.riskList,
+					agreementId: this.quotableCompanyList[num].agreement[0].id,
+					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
+					systemType: '2'
+				};
+				try {
+					let res = await this.$http.post('/quote/quote', params);
+					this.quotableCompanyList[num].msg = res.msg;
+					if (res.code == '200') {
+						if (res.data.warnMessageList != null && res.data.warnMessageList[
+								0] != null && res.data
+							.warnMessageList[
+								0] != "") {
+							this.quotableCompanyList[num].lastYearMsg = "";
+							let dat = res.data.warnMessageList;
+							dat.map(ele => {
+								this.quotableCompanyList[num].lastYearMsg += ele +
+									'<br>';
+							})
+						}
+						const updatedItem = {
+							...this.quotableCompanyList[num],
+							quoteCode: 200
+						};
+						this.quotableCompanyList.splice(num, 1, updatedItem);
+						this.quotableCompanyList[num].result = res.data;
+						this.subOrderId = res.data.companyId;
+
+					} else {
+						const updatedItem = {
+							...this.quotableCompanyList[num],
+							quoteCode: '3'
+						};
+						this.quotableCompanyList.splice(num, 1, updatedItem);
+						this.quotableCompanyList[num].msg = res.msg;
+						return;
+					}
+				} catch (error) {
+					const updatedItem = {
+						...this.quotableCompanyList[num],
+						quoteCode: '3'
+					};
+					this.quotableCompanyList.splice(num, 1, updatedItem);
+					this.quotableCompanyList[num].msg = '接口请求超时，请重新尝试';
+				}
+			},
 			//华泰报价
 			async huatai(num, id) {
 				let isTaxSource = this.quotableCompanyList[num].isTaxSource;

pages/carInsure/quoteDetail.vue

@@ -1890,6 +1890,37 @@
 							this.underwriteShow = true;
 						}
 						break;
+					case "阳光财险":
+						let ygimage = await this.$http.post(
+							'/order/yangGuangApi/upload', {
+								companyId: this.companyId
+							});
+						if (ygimage.code == '200') {
+							let ygaudit = await this.$http.post(
+								'/order/yangGuangApi/submit', {
+									companyId: this.companyId,
+								});
+							if (ygaudit.code == '200') {
+								this.underwriteTitle = '订单自核成功';
+								this.cancelText = '暂不缴费';
+								this.confirmText = '立即缴费';
+								this.underwriteMsg = "";
+								this.underwriteShow = true;
+							} else {
+								this.underwriteTitle = '核保失败';
+								this.cancelText = '返回订单';
+								this.confirmText = '关闭';
+								this.underwriteMsg = ygaudit.msg;
+								this.underwriteShow = true;
+							}
+						} else {
+							this.underwriteTitle = '影像上传失败';
+							this.cancelText = '返回订单';
+							this.confirmText = '关闭';
+							this.underwriteMsg = ygimage.msg;
+							this.underwriteShow = true;
+						}
+						break;
 					case "国任财险":
 						let grimage = await this.$http.post(
 							'/api/guoRen/uploadImage', {

pages/carWash/carWash.js

@@ -0,0 +1,578 @@
+//美容
+const
+	meirongItem = [{
+			title: "KICKS劲氪汽车脚垫(大井峪店)", //标题
+			img: "/static/image/carWash/img/meirong1.png", //图片
+			tagWord: "汽车维修保养", //关键词
+			street: "大井峪", //街道
+			Price: "815", //单价
+			distance: "3.4km", //距离
+			tagList: [],
+			specsCategory: [{
+					description: "92号汽油30升",
+					originalPrice: "¥225.3", //原价
+					groupBuyPrice: "¥201.3", //团购价
+				},
+				{
+					description: "92号汽油40升",
+					originalPrice: "¥304.4", //原价
+					groupBuyPrice: "¥268.4", //团购价
+				}, {
+					description: "92号汽油20升",
+					originalPrice: "¥152.2", //原价
+					groupBuyPrice: "¥134.2", //团购价
+				}
+			]
+		},
+		{
+			title: "KICKS劲客汽车脚垫(普国汽配店)", //标题
+			img: "/static/image/carWash/img/meirong2.png", //图片
+			tagWord: "汽车维修保养", //关键词
+			street: "西矿街", //街道
+			Price: "701", //单价
+			distance: "4.1km", //距离
+			ranking: "万柏林区汽修保养热销榜第8名", //排名
+			rankingImg: "/static/image/carWash/img/ranking.png", //排名icon
+			tagList: [],
+
+			specsCategory: [{
+					description: "92号汽油30升",
+					originalPrice: "¥225.3", //原价
+					groupBuyPrice: "¥201.3", //团购价
+				},
+				{
+					description: "92号汽油20升",
+					originalPrice: "¥152.2", //原价
+					groupBuyPrice: "¥134.2", //团购价
+				},
+				{
+					description: "92号汽油40升",
+					originalPrice: "¥304.4", //原价
+					groupBuyPrice: "¥268.4", //团购价
+				}
+			]
+		},
+		{
+			title: "天猫养车 (南内环桥西店)", //标题
+			img: "/static/image/carWash/img/meirong3.png", //图片
+			tagWord: "汽车维修保养", //关键词
+			street: "", //街道
+			Price: "119", //单价
+			distance: "2.6km", //距离
+			tagList: [{
+					text: "消费人数500+",
+					color: "#DB8F19",
+					backColor: "#FFF3DC",
+				},
+				{
+					text: "收藏800+",
+					color: "#FB6F39",
+					backColor: "#FEECE5",
+				}
+			],
+			specsCategory: [{
+					description: "92号汽油30升",
+					originalPrice: "¥170", //原价
+					groupBuyPrice: "¥29.9", //团购价
+				},
+				{
+					description: "92号汽油40升",
+					originalPrice: "¥180", //原价
+					groupBuyPrice: "¥39.9", //团购价
+				}, {
+					description: "92号汽油20升",
+					originalPrice: "¥200", //原价
+					groupBuyPrice: "¥49.9", //团购价
+				}
+			]
+		},
+		{
+			title: "京东养车 (千峰南路店)", //标题
+			img: "/static/image/carWash/img/meirong4.png", //图片
+			tagWord: "汽车维修保养", //关键词
+			street: "", //街道
+			Price: "36", //单价
+			distance: "4.8km", //距离
+			tagList: [{
+					text: "消费人数1000+",
+					color: "#DB8F19",
+					backColor: "#FFF3DC",
+				},
+				{
+					text: "收藏700+",
+					color: "#FB6F39",
+					backColor: "#FEECE5",
+				}
+			],
+			specsCategory: [{
+					description: "92号汽油30升",
+					originalPrice: "¥170", //原价
+					groupBuyPrice: "¥29.9", //团购价
+				},
+				{
+					description: "92号汽油40升",
+					originalPrice: "¥180", //原价
+					groupBuyPrice: "¥39.9", //团购价
+				}, {
+					description: "92号汽油20升",
+					originalPrice: "¥200", //原价
+					groupBuyPrice: "¥49.9", //团购价
+				}
+			]
+		}
+	]
+//洗车
+const xicheItem = [{
+		title: "CETH 24h共享自助洗车（漪汾街店）", //标题
+		img: "/static/image/carWash/img/carWash1.png", //图片
+		description: "鑫禧汽车美容", //描述
+		distance: "3.9km", //距离
+		soldQuantity: "50", //已售
+		Price: "225.3", //原价
+		groupBuyPrice: "29.9", //折扣价
+		discount: "1.8", //折扣
+		discountimg: '/static/image/carWash/img/discount.png',
+		tagList: [{
+				text: "周末通用",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			},
+			{
+				text: "至少提前1天预约",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			}
+		],
+
+	},
+	{
+		title: "智洗24小时共享自助洗车 ｜9.88元洗车60分钟庆智洗远大驾校...", //标题
+		img: "/static/image/carWash/img/carWash2.png", //图片
+		description: "智洗24小时共享自助洗车（大王...", //描述
+		distance: "1.5km", //距离
+		soldQuantity: "900", //已售
+		Price: "225.3", //原价
+		groupBuyPrice: "9.88", //折扣价
+		discount: "3.3", //折扣
+		discountimg: '/static/image/carWash/img/discount.png',
+		tagList: [{
+				text: "周末节假日通用",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			},
+			{
+				text: "免预约",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			}
+		],
+
+	},
+	{
+		title: "喜遇24H自助洗车", //标题
+		img: "/static/image/carWash/img/carWash3.png", //图片
+		description: "智洗24小时共享自助洗车（大王...", //描述
+		distance: "1.5km", //距离
+		soldQuantity: "900", //已售
+		Price: "225.3", //原价
+		groupBuyPrice: "9.9", //折扣价
+		discount: "3.3", //折扣
+		discountimg: '/static/image/carWash/img/discount.png',
+		tagList: [{
+				text: "周末节假日通用",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			},
+			{
+				text: "免预约",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			}
+		],
+
+	},
+	{
+		title: "京东养车（千峰南路店）", //标题
+		img: "/static/image/carWash/img/carWash4.png", //图片
+		description: "鑫禧汽车美容", //描述
+		distance: "3.9km", //距离
+		soldQuantity: "50", //已售
+		Price: "225.3", //原价
+		groupBuyPrice: "29.9", //折扣价
+		discount: "1.8", //折扣
+		discountimg: '/static/image/carWash/img/discount.png',
+		tagList: [{
+				text: "周末通用",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			},
+			{
+				text: "至少提前1天预约",
+				color: "#888888",
+				backColor: "#F6F6F6",
+			}
+		],
+
+	},
+]
+//维修
+const weixiuItem = [{
+		title: "吾行养车金艳鑫养车", //标题
+		img: "/static/image/carWash/img/weixiu1.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "", //街道
+		Price: "122", //单价
+		distance: "2.4km", //距离
+		tagList: [{
+				text: "消费人数100+",
+				color: "#DB8F19",
+				backColor: "#FFF3DC",
+			},
+			{
+				text: "收藏200+",
+				color: "#FB6F39",
+				backColor: "#FEECE5",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			}
+		]
+	},
+	{
+		title: "天猫养车 (南内环桥西店)", //标题
+		img: "/static/image/carWash/img/weixiu2.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "晋祠路", //街道
+		Price: "119", //单价
+		distance: "2.6km", //距离
+		tagList: [{
+				text: "消费人数500+",
+				color: "#DB8F19",
+				backColor: "#FFF3DC",
+			},
+			{
+				text: "收藏800+",
+				color: "#FB6F39",
+				backColor: "#FEECE5",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}
+		]
+	},
+	{
+		title: "壳牌鹏致汽车保养(大同路店)", //标题
+		img: "/static/image/carWash/img/weixiu3.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "", //街道
+		Price: "203", //单价
+		distance: "5.7km", //距离
+		tagList: [],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	},
+	{
+		title: "帅旗汽修", //标题
+		img: "/static/image/carWash/img/weixiu4.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "", //街道
+		Price: "245", //单价
+		distance: "13.6km", //距离
+		tagList: [],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	}
+]
+//安全检测
+const jianceItem = [{
+		title: "山西易杰机动车辆检测有限公司", //标题
+		img: "/static/image/carWash/img/jiance1.png", //图片
+		tagWord: "年检站", //关键词
+		street: "东社街道", //街道
+		Price: "156", //单价
+		distance: "5.2km", //距离
+		tagList: [{
+				text: "消费人数1千+",
+			},
+			{
+				text: "收藏3千+",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			}
+		]
+	},
+	{
+		title: "太原市惠通三鼎机动车检测有限公司", //标题
+		img: "/static/image/carWash/img/jiance2.png", //图片
+		tagWord: "年检站", //关键词
+		street: "柴村街道", //街道
+		Price: "230", //单价
+		distance: "7.8km", //距离
+		tagList: [{
+				text: "消费人数1千+",
+			},
+			{
+				text: "收藏500+",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}
+		]
+	},
+	{
+		title: "太原市兴首邑机动车综合检测有限公司", //标题
+		img: "/static/image/carWash/img/jiance3.png", //图片
+		tagWord: "年检站", //关键词
+		street: "黄褰镇", //街道
+		Price: "520", //单价
+		distance: "30.6km", //距离
+		tagList: [{
+				text: "消费人数3千+",
+			},
+			{
+				text: "收藏2千+",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	},
+	{
+		title: "山西蔚蓝天空机动车检测有限公司", //标题
+		img: "/static/image/carWash/img/jiance4.png", //图片
+		tagWord: "年检站", //关键词
+		street: "太榆路", //街道
+		Price: "158", //单价
+		distance: "11.6km", //距离
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	}
+]
+//保养
+const baoyangItem = [{
+		title: "天猫养车（南内环桥西店）", //标题
+		img: "/static/image/carWash/img/baoyang1.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "晋祠路", //街道
+		Price: "119", //单价
+		distance: "2.6km", //距离
+		tagList: [{
+				text: "消费人数500+",
+				color: "#DB8F19",
+				backColor: "#FFF3DC",
+			},
+			{
+				text: "收藏800+",
+				color: "#FB6F39",
+				backColor: "#FEECE5",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			}
+		]
+	},
+	{
+		title: "力驰多汽车养护（太原店）", //标题
+		img: "/static/image/carWash/img/baoyang2.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "", //街道
+		Price: "170", //单价
+		distance: "1.7km", //距离
+		tagList: [{
+				text: "消费人数1千+",
+				color: "#DB8F19",
+				backColor: "#FFF3DC",
+			},
+			{
+				text: "收藏500+",
+				color: "#FB6F39",
+				backColor: "#FEECE5",
+			}
+		],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥225.3", //原价
+				groupBuyPrice: "¥201.3", //团购价
+			},
+			{
+				description: "92号汽油20升",
+				originalPrice: "¥152.2", //原价
+				groupBuyPrice: "¥134.2", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥304.4", //原价
+				groupBuyPrice: "¥268.4", //团购价
+			}
+		]
+	},
+	{
+		title: "壳牌鹏致汽车保养（大同路店）", //标题
+		img: "/static/image/carWash/img/baoyang3.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "", //街道
+		Price: "203", //单价
+		distance: "5.7km", //距离
+		tagList: [],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	},
+	{
+		title: "汇丰汽车服务中心", //标题
+		img: "/static/image/carWash/img/jiance4.png", //图片
+		tagWord: "汽车维修保养", //关键词
+		street: "大井峪", //街道
+		Price: "20", //单价
+		distance: "2.0km", //距离
+		tagList: [],
+		specsCategory: [{
+				description: "92号汽油30升",
+				originalPrice: "¥170", //原价
+				groupBuyPrice: "¥29.9", //团购价
+			},
+			{
+				description: "92号汽油40升",
+				originalPrice: "¥180", //原价
+				groupBuyPrice: "¥39.9", //团购价
+			}, {
+				description: "92号汽油20升",
+				originalPrice: "¥200", //原价
+				groupBuyPrice: "¥49.9", //团购价
+			}
+		]
+	}
+]
+module.exports = {
+	xicheItem,
+	jianceItem,
+	baoyangItem,
+	meirongItem,
+	weixiuItem
+}

pages/carWash/carWash.vue

@@ -0,0 +1,619 @@
+<template>
+	<view class="page">
+		<view class="headers dis a-c j-s">
+			<view class="dis a-c">
+				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
+				<text style="margin-left: 10px;">{{headerTitle}}</text>
+			</view>
+			<view class="search" style="">
+				<u-search :show-action="true" action-text="搜索" bg-color="#fff" maxlength="10" placeholder="请输入关键词"
+					:clearabled="false" :action-style="{position: 'absolute',right:'10px'}">
+				</u-search>
+			</view>
+		</view>
+		<view class="" style="padding: 106px 0 16px;">
+			<view class="tab dis j-s a-c">
+				<view class="item dis f-c a-c" v-for="(item,index) in tabList" :key="index" @click="tabChange(item)">
+					<image :src="item.image" mode=""></image>
+					<text>{{item.iconText}}</text>
+				</view>
+			</view>
+			<view class="dropdown">
+				<u-dropdown menu-icon="arrow-down-fill" menu-icon-size="16" title-size="26" ref="uDropdown" @open="open"
+					active-color="#FD2B54" @close="close">
+					<u-dropdown-item v-model="value1" :title="value1title+value1item" :options="options1"
+						@change="change"></u-dropdown-item>
+					<u-dropdown-item v-model="value2" title="全部分类" :options="options2"></u-dropdown-item>
+					<u-dropdown-item v-model="value3" title="智能排序" :options="options3"></u-dropdown-item>
+				</u-dropdown>
+			</view>
+			<view class="dis a-c j-start tag ">
+				<view class="dis j-c a-c " :class="tagshow?'active':''" @click="tagshow=!tagshow">
+					<text>附近5km</text>
+				</view>
+				<view v-if="headerTitle!=='洗车'" class="dis j-c a-c " style="padding: 12rpx 16rpx;"
+					:class="tagshow2?'active':''" @click="tagshow2=!tagshow2">
+					<image src="../../static/image/carWash/img/groupBuy.png" mode=""
+						style="width: 72rpx;height: 26rpx;"></image>
+				</view>
+				<view class="dis j-c a-c " :class="tagshow1?'active':''" @click="tagshow1=!tagshow1">
+					<text>上榜商户</text>
+				</view>
+			</view>
+			<!-- 洗车 -->
+			<view v-if="headerTitle=='洗车'" class="store dis a-start j-s" v-for="(item,index) in xicheItem" :key="index">
+				<image :src="item.img" mode=""></image>
+				<view class="item dis f-c j-s">
+					<view>
+						<text class="title">{{item.title}}</text>
+						<view class="dis a-c" style="color: #666;font-size: 22rpx;">
+							<text style="margin-right: 6px;">{{item.distance}}</text>
+							<text>{{item.description}}</text>
+						</view>
+						<view class="dis a-c j-s">
+							<view class="dis a-c ">
+								<view class="taglist" v-for="(tagitem,tagindex) in item.tagList" :key="tagindex">
+									{{tagitem.text}}
+								</view>
+							</view>
+							<text class="soldQuantity">已售{{item.soldQuantity}}+</text>
+						</view>
+					</view>
+					<view class="dis j-s a-c">
+						<view class="Price dis f-c ">
+							<view class="dis a-end ">
+								<view class="dis a-c">
+									<text>￥</text>
+									<text> {{item.groupBuyPrice}}</text>
+								</view>
+								<text
+									style="font-size: 18rpx;color: #999999;line-height: 1;font-weight: 500; text-decoration: line-through">￥{{item.Price}}</text>
+							</view>
+							<view class="discount dis a-c j-s">
+								<view class="dis a-c j-c" style="padding: 2px;">
+									<image :src="item.discountimg" mode=""></image>
+								</view>
+								<view class="right">
+									{{item.discount}}折热销中
+								</view>
+							</view>
+						</view>
+						<view class="btn" @click="details(item)">抢购</view>
+					</view>
+
+				</view>
+			</view>
+			<!-- 洗车 -->
+			<!-- 其他 -->
+			<view class="other dis a-start j-s" v-for="(item,index) in otherItem" :key="index" @click="details(item)">
+				<image :src="item.img" mode=""></image>
+				<view class="item dis f-c j-s">
+					<view>
+						<text class="title">{{item.title}}</text>
+						<view class="dis a-c" style="color: #666;font-size: 22rpx;">
+							<text>{{item.tagWord}}</text>
+							<text style="margin:0 6px;">{{item.street}}</text>
+							<text>￥{{item.Price}}人</text>
+						</view>
+						<view class="dis  j-s a-start  mt-1">
+							<view class="dis f-c ">
+								<view class="ranking dis a-c " v-if="item.ranking">
+									<image :src="item.rankingImg" mode=""></image>
+									<view class="dis a-c j-c">
+										<text>{{item.ranking}}</text>
+									</view>
+								</view>
+								<view class="dis a-c mb-2 " v-if="item.tagList">
+									<view class="taglist" v-for="(tagitem,tagindex) in item.tagList" :key="tagindex">
+										{{tagitem.text}}
+									</view>
+								</view>
+								<view class="dis f-c ">
+									<view class="specsCategory dis a-start "
+										v-for="(specsitem,specsindex) in item.specsCategory" :key="specsindex">
+										<view class="groupBuyIcon dis a-c j-c"><text>团</text> </view>
+										<text class="groupBuyPrice">{{specsitem.groupBuyPrice}}</text>
+										<text class="originalPrice">{{specsitem.originalPrice}}</text>
+										<text class="description">{{specsitem.description}}</text>
+									</view>
+								</view>
+							</view>
+							<text class="soldQuantity">{{item.distance}}</text>
+						</view>
+
+					</view>
+
+				</view>
+			</view>
+			<!-- 其他 -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		xicheItem,
+		jianceItem,
+		baoyangItem,
+		meirongItem,
+		weixiuItem
+	} from '@/pages/carWash/carWash.js';
+	export default {
+		data() {
+			return {
+				headerTitle: "洗车",
+				xicheItem: xicheItem,
+				jianceItem: jianceItem,
+				baoyangItem: baoyangItem,
+				meirongItem: meirongItem,
+				weixiuItem: weixiuItem,
+				otherItem: {},
+				value1: 1,
+				value1title: "附近",
+				value1item: "",
+				value2: 2,
+				value3: 1,
+				tagshow: false,
+				tagshow1: false,
+				tagshow2: false,
+				options1: [{
+						label: '500m',
+						value: 1,
+					},
+					{
+						label: '1km',
+						value: 2,
+					}, {
+						label: '3km',
+						value: 3,
+					},
+					{
+						label: '5km',
+						value: 4,
+					}
+				],
+				options2: [{
+						label: '洗车',
+						value: 1,
+					},
+					{
+						label: '检测',
+						value: 2,
+					},
+					{
+						label: '保养',
+						value: 3,
+					},
+					{
+						label: '美容',
+						value: 4,
+					},
+					{
+						label: '维修',
+						value: 5,
+					},
+
+				],
+				options3: [{
+						label: '好评优先',
+						value: 1,
+					}, {
+						label: '距离优先',
+						value: 2,
+					},
+					{
+						label: '低价优先',
+						value: 3,
+					},
+					{
+						label: '高价优先',
+						value: 4,
+					},
+				],
+				tabList: [{
+						image: "/static/image/carWash/icon/icon1.png",
+						iconText: '洗车',
+						alias: "xiche",
+					},
+					{
+						image: "/static/image/carWash/icon/icon2.png",
+						iconText: '安全检测',
+						alias: "jiance",
+					},
+					{
+						image: "/static/image/carWash/icon/icon3.png",
+						iconText: '保养',
+						alias: "baoyang",
+					},
+					{
+						image: "/static/image/carWash/icon/icon4.png",
+						iconText: '美容',
+						alias: "meirong",
+					},
+					{
+						image: "/static/image/carWash/icon/icon5.png",
+						iconText: '维修',
+						alias: "weixiu",
+					}
+				],
+
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {},
+		methods: {
+			details(item) {
+				uni.navigateTo({
+					url: `/pages/carWash/details?info=${JSON.stringify(item)}`,
+				})
+			},
+			//切换事件
+			tabChange(item) {
+				this.headerTitle = item.iconText;
+				if (item.iconText != '洗车') {
+					this.otherItem = this[item.alias + "Item"];
+				} else {
+					this.otherItem = [];
+				}
+			},
+			open(index) {
+				// 展开某个下来菜单时，先关闭原来的其他菜单的高亮
+				// 同时内部会自动给当前展开项进行高亮
+				this.$refs.uDropdown.highlight();
+			},
+			close(index) {
+				// 关闭的时候，给当前项加上高亮
+				// 当然，您也可以通过监听dropdown-item的@change事件进行处理
+				this.$refs.uDropdown.highlight(index);
+			},
+			change(index) {
+				this.value1item = "";
+				let label = this.options1.find(val => val.value == index).label
+				this.value1item = label;
+
+			},
+			//页面返回按钮
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.headers {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: auto;
+		width: 100%;
+		z-index: 999999;
+		padding: 50px 16px 14px;
+		height: auto;
+		background-image: url('/static/image/carWash/img/bg1.png');
+		background-size: 100% 100%;
+
+		text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #000;
+		}
+	}
+
+	.tab {
+		background: #FFFFFF;
+		box-shadow: 0px 6px 16px 0px rgba(176, 176, 176, 0.1);
+		border-radius: 6px;
+		padding: 20rpx 25rpx;
+		margin: 0 16px;
+
+		.item {
+			width: 25%;
+
+			image {
+				width: 64rpx;
+				height: 64rpx;
+			}
+
+			text {
+				font-size: 24rpx;
+				color: #333;
+				margin-top: 4px;
+			}
+		}
+
+	}
+
+	.dropdown {
+		margin-top: 12px;
+		position: sticky; //黏性定位
+		top: 96px;
+		background-color: #fff;
+		z-index: 1000;
+	}
+
+	.search {
+		position: relative;
+		width: 60%;
+	}
+
+	.tag {
+		position: sticky; //黏性定位
+		top: 136px;
+		z-index: 1000;
+		margin: 0 16px;
+		background: #fff;
+		padding: 5px;
+
+		>view {
+			background: #F8F8F9;
+			border-radius: 2px;
+			padding: 2px 8px;
+			margin-right: 10px;
+			color: #666;
+			font-size: 12px;
+		}
+
+		.active {
+			background: #FFF3F5;
+			color: #FD2B54;
+		}
+	}
+
+	//洗车
+	.store {
+		margin: 0 16px;
+		margin-top: 14px;
+		height: 224rpx;
+
+		>image {
+			width: 224rpx;
+			height: 224rpx;
+			margin-right: 12px;
+			border-radius: 4px;
+
+		}
+
+		.item {
+			width: 62%;
+			height: 100%;
+
+			text {
+				display: block;
+				overflow: hidden;
+				white-space: nowrap;
+				/* 不换行 */
+				text-overflow: ellipsis;
+				/* 显示省略号 */
+			}
+
+			.title {
+				font-size: 14px;
+				color: #000000;
+				font-weight: bold;
+			}
+
+			.taglist {
+				background: #F6F6F6;
+				border-radius: 2px;
+				padding: 1px 6px;
+				color: #888;
+				font-size: 20rpx;
+				margin-right: 5px;
+			}
+
+			.soldQuantity {
+				font-size: 20rpx;
+				color: #999;
+			}
+
+			.Price {
+				text:nth-child(1) {
+					font-size: 22rpx;
+					color: #FD2B54;
+				}
+
+				text:nth-child(2) {
+					font-size: 32rpx;
+					color: #FD2B54;
+					line-height: 1;
+					font-weight: bold;
+					margin-right: 2px;
+				}
+			}
+
+			.discount {
+				background: #FFD3DC;
+				border-radius: 2px 0px 0px 2px;
+				padding-left: 2px;
+
+				image {
+					width: 8px;
+					height: 8px;
+				}
+
+				.right {
+					background: linear-gradient(90deg, #FFE6EB 0%, #FFE6EB 100%);
+					border-radius: 2px 2px 2px 0px;
+					padding: 2px 7px;
+					font-size: 16rpx;
+					color: #FD2B54;
+					font-weight: bold;
+				}
+			}
+
+			.btn {
+				padding: 3px 14px;
+				background: linear-gradient(90deg, #FF8149 0%, #FF3129 49%, #FF408F 100%);
+				border-radius: 4px;
+				font-size: 13px;
+				color: #FFFFFF;
+			}
+		}
+	}
+
+	//洗车
+	//其他
+
+	.other {
+		margin: 0 16px;
+		margin-top: 14px;
+
+		>image {
+			width: 156rpx;
+			height: 156rpx;
+			margin-right: 12px;
+			border-radius: 4px;
+
+		}
+
+		.item {
+			width: 73%;
+			height: 100%;
+			border-bottom: 1px solid #EEEEEE;
+
+			text {
+				display: block;
+				overflow: hidden;
+				white-space: nowrap;
+				/* 不换行 */
+				text-overflow: ellipsis;
+				/* 显示省略号 */
+			}
+
+			.title {
+				font-size: 16px;
+				color: #000000;
+				font-weight: bold;
+			}
+
+			.ranking {
+				image {
+					width: 36rpx;
+					height: 33rpx;
+				}
+
+				>view {
+					padding: 1px 6px;
+					color: #A56237;
+					font-size: 20rpx;
+					height: 33rpx;
+					background-color: #FFF3DC;
+					border-radius: 0 4px 4px 0;
+				}
+			}
+
+			.taglist:first-child {
+				background: #FFF3DC;
+				border-radius: 2px;
+				padding: 1px 6px;
+				color: #DB8F19;
+				font-size: 20rpx;
+				margin-right: 5px;
+			}
+
+			.taglist:last-child {
+				background: #FEECE5;
+				border-radius: 2px;
+				padding: 1px 6px;
+				color: #FB6F39;
+				font-size: 20rpx;
+				margin-right: 5px;
+			}
+
+			.soldQuantity {
+				font-size: 22rpx;
+				color: #666;
+			}
+
+			.specsCategory {
+				margin-bottom: 4px;
+
+				text {
+					margin: 0 1px;
+				}
+
+				.groupBuyIcon {
+					padding: 0 8rpx;
+					background: linear-gradient(133deg, #FF684D 0%, #FE3C5B 100%);
+					border-radius: 2px;
+					color: #fff;
+					font-size: 18rpx;
+				}
+
+				//团购价
+				.groupBuyPrice {
+					font-size: 22rpx;
+					color: #FD2B54;
+					margin-left: 6px;
+					font-weight: bold;
+				}
+
+				.originalPrice {
+					font-size: 18rpx;
+					color: #999;
+					line-height: 2.5;
+					text-decoration: line-through;
+					/* 添加横线 */
+				}
+
+				//原价
+				.description {
+					font-size: 22rpx;
+					color: #333;
+					margin-left: 6px;
+				}
+			}
+		}
+	}
+
+	//其他
+	/* 媒体查询 */
+	@media (min-width: 370px) {
+		.store {
+			>image {
+				width: 35%;
+				height: 224rpx;
+				margin-right: 12px;
+				border-radius: 4px;
+			}
+		}
+
+		.other {
+			>image {
+				width: 24%;
+				height: 80px;
+				margin-right: 12px;
+				border-radius: 4px;
+			}
+		}
+
+	}
+
+	@media (min-width: 600px) {
+		.other {
+			>image {
+				width: 24%;
+				height: 120px;
+				margin-right: 12px;
+				border-radius: 4px;
+			}
+		}
+	}
+
+	@media (min-width: 900px) {
+		.other {
+			>image {
+				width: 24%;
+				height: 170px;
+				margin-right: 12px;
+				border-radius: 4px;
+			}
+		}
+	}
+</style>

pages/carWash/details.vue

@@ -0,0 +1,480 @@
+<template>
+	<view class="page">
+		<image :src="info.img" mode="" style="width: 100%;"></image>
+		<u-icon name="arrow-left" size="40" @tap="back" color="#fff"
+			style="position: absolute;top: 50px;left: 16px;"></u-icon>
+		<view class="header">
+			<view class="dis f-c" style="border-bottom: 1px solid #EEEEEE;padding-bottom: 10px;">
+				<view class="dis a-c j-s">
+					<text class="title">{{info.title}}</text>
+					<view class="track dis j-c a-c" @click="trackshow=!trackshow" :class="trackshow?'active':''">
+						<image v-if="!trackshow" src="../../static/image/carWash/icon/jia.png" mode=""></image>
+						<text style="margin-left: 7rpx;">{{trackshow?'已关注':'关注'}}</text>
+					</view>
+				</view>
+				<view class="dis a-c " style="font-size: 22rpx;color: #666;">
+					<text style="margin-right: 6px;">￥{{info.Price}}/人</text>
+					<text>{{info.tagWord}}</text>
+				</view>
+				<view class="dis a-c mt-1">
+					<view class="taglist" v-for="(tagitem,tagindex) in info.tagList" :key="tagindex">
+						{{tagitem.text}}
+					</view>
+				</view>
+			</view>
+			<view class=" dis a-start j-s mt-2">
+				<view class="dis f-c address">
+					<text>太原市万柏林区和平北路与漪汾街交叉口东北越50米</text>
+					<text>距你2.1公里，驾车13分钟</text>
+				</view>
+				<view class="icon dis a-c">
+					<view class="dis f-c" style="margin-right: 14px;">
+						<image src="../../static/image/carWash/icon/map.png" mode="" @click="mapDirections"></image>
+						<text>导航</text>
+					</view>
+					<view class="dis f-c">
+						<image src="../../static/image/carWash/icon/phone.png" mode="" @click="phone"></image>
+						<text>电话</text>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="title dis a-c j-start">
+				<text style="color: #FF3754;">优</text>
+				<text>惠团购</text>
+			</view>
+			<view class="store dis a-start j-s" v-for="(item,index) in list" :key="index">
+				<image :src="item.img" mode=""></image>
+				<view class="item dis f-c j-s">
+					<view>
+						<text class="title">{{item.title}}</text>
+
+						<view class="dis a-c j-s">
+							<view class="dis a-c ">
+								<view class="taglist" v-for="(tagitem,tagindex) in item.tagList" :key="tagindex">
+									{{tagitem.text}}
+								</view>
+							</view>
+							<text class="soldQuantity">已售{{item.soldQuantity}}+</text>
+						</view>
+					</view>
+					<view class="dis j-s a-c">
+						<view class="Price dis f-c ">
+							<view class="dis a-end ">
+								<view class="dis a-c">
+									<text>￥</text>
+									<text> {{item.groupBuyPrice}}</text>
+								</view>
+								<text
+									style="font-size: 18rpx;color: #999999;line-height: 1;font-weight: 500; text-decoration: line-through">￥{{item.Price}}</text>
+							</view>
+							<view class="discount dis a-c j-s">
+								<view class="dis a-c j-c" style="padding: 2px;">
+									<image :src="item.discountimg" mode=""></image>
+								</view>
+								<view class="right">
+									{{item.discount}}折热销中
+								</view>
+							</view>
+						</view>
+						<view class="btn" @click="btn(item)">抢购</view>
+					</view>
+
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: {},
+				trackshow: false,
+				list: [{
+						title: "92号汽油30升", //标题
+						img: "/static/image/carWash/img/3.png", //图片
+						soldQuantity: "50", //已售
+						Price: "225.3", //原价
+						groupBuyPrice: "201.3", //折扣价
+						discount: "1.8", //折扣
+						discountimg: '/static/image/carWash/img/discount.png',
+						tagList: [{
+								text: "周末通用",
+							},
+							{
+								text: "至少提前1天预约",
+							}
+						],
+					},
+					{
+						title: "92号汽油40升", //标题
+						img: "/static/image/carWash/img/1.png", //图片
+						soldQuantity: "50", //已售
+						Price: "325.3", //原价
+						groupBuyPrice: "268.4", //折扣价
+						discount: "3.3", //折扣
+						discountimg: '/static/image/carWash/img/discount.png',
+						tagList: [{
+								text: "周末节假日通用",
+							},
+							{
+								text: "免预约",
+							}
+						],
+					},
+					{
+						title: "92号汽油20升", //标题
+						img: "/static/image/carWash/img/2.png", //图片
+						soldQuantity: "50", //已售
+						Price: "225.3", //原价
+						groupBuyPrice: "134.4", //折扣价
+						discount: "1.8", //折扣
+						discountimg: '/static/image/carWash/img/discount.png',
+						tagList: [{
+								text: "周末通用",
+							},
+							{
+								text: "至少提前1天预约",
+							}
+						],
+					}
+				]
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(params) {
+			let historys = JSON.parse(params.info);
+			this.info = historys;
+			console.log(this.info);
+		},
+		methods: {
+			mapDirections() {
+				this.gomapApp(37.857133, 112.521744, "太原市万柏林区和平北路华储石油漪汾街加油站")
+			},
+			phone() {
+				uni.makePhoneCall({
+					phoneNumber: '1008611', //仅为示例
+				});
+			},
+			btn(item) {
+				uni.navigateTo({
+					url: `/pages/carWash/placeOrder?info=${JSON.stringify(item)}`
+				})
+			},
+			//页面返回按钮
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
+			},
+			gomapApp(latitude, longitude, name) {
+				let url = "";
+				if (plus.os.name == "Android") { //判断是安卓端
+					plus.nativeUI.actionSheet({ //选择菜单
+						title: "选择地图应用",
+						cancel: "取消",
+						buttons: [{
+							title: "腾讯地图"
+						}, {
+							title: "百度地图"
+						}, {
+							title: "高德地图"
+						}]
+					}, function(e) {
+						console.log(e);
+						switch (e.index) {
+
+							//下面是拼接url,不同系统以及不同地图都有不同的拼接字段
+							case 1:
+								//注意referer=xxx的xxx替换成你在腾讯地图开发平台申请的key
+								url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
+								break;
+							case 2:
+								url =
+									`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`;
+								break;
+							case 3:
+								url =
+									`amapuri://route/plan/?sid=&slat=${latitude}&slon=${longitude}&sname=太原市&did=&dlat=${37.873728}&dlon=${112.510844}&dname=${name}&dev=0&t=0`;
+								break;
+							default:
+								break;
+						}
+						if (url != "") {
+							url = encodeURI(url);
+							//plus.runtime.openURL(url,function(e){})调起手机APP应用
+							plus.runtime.openURL(url, function(e) {
+								plus.nativeUI.alert("本机未安装指定的地图应用");
+							});
+						}
+					})
+				} else {
+					// iOS上获取本机是否安装了百度高德地图，需要在manifest里配置
+					// 在manifest.json文件app-plus->distribute->apple->urlschemewhitelist节点下添加
+					//（如urlschemewhitelist:["iosamap","baidumap"]）  
+					plus.nativeUI.actionSheet({
+						title: "选择地图应用",
+						cancel: "取消",
+						buttons: [{
+							title: "腾讯地图"
+						}, {
+							title: "百度地图"
+						}, {
+							title: "高德地图"
+						}]
+					}, function(e) {
+						switch (e.index) {
+							case 1:
+								url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
+								break;
+							case 2:
+								url =
+									`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
+								break;
+							case 3:
+								url =
+									`iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
+								break;
+							default:
+								break;
+						}
+						if (url != "") {
+							url = encodeURI(url);
+							plus.runtime.openURL(url, function(e) {
+								plus.nativeUI.alert("本机未安装指定的地图应用");
+							});
+						}
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		background-color: #F3F3F4;
+		height: 100vh;
+		position: relative;
+
+		text {
+			display: block;
+			overflow: hidden;
+			white-space: nowrap;
+			/* 不换行 */
+			text-overflow: ellipsis;
+			/* 显示省略号 */
+		}
+
+		>image {
+			top: 0;
+			position: absolute;
+		}
+	}
+
+	.header {
+		padding: 28rpx 32rpx 20rpx;
+		background-color: #fff;
+		border-radius: 10px 10px 0 0;
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 361rpx;
+
+
+		.title {
+			font-size: 20px;
+			color: #000;
+			font-weight: bold;
+		}
+
+		.taglist:first-child {
+			background: #FFF3DC;
+			border-radius: 2px;
+			padding: 1px 6px;
+			color: #DB8F19;
+			font-size: 20rpx;
+			margin-right: 5px;
+		}
+
+		.taglist:last-child {
+			background: #FEECE5;
+			border-radius: 2px;
+			padding: 1px 6px;
+			color: #FB6F39;
+			font-size: 20rpx;
+			margin-right: 5px;
+		}
+
+		.track {
+			padding: 3px 14px;
+			background: linear-gradient(90deg, #FE5F4D 0%, #FD2C54 100%);
+			border-radius: 4px;
+			color: #fff;
+			font-size: 28rpx;
+			margin-left: 16px;
+			border: 1px solid #fff;
+
+			image {
+				width: 28rpx;
+				height: 28rpx;
+
+			}
+
+
+		}
+
+		.active {
+			background: #fff;
+			border: 1px solid #666;
+			color: #000;
+		}
+
+		.address {
+			text:first-child {
+				font-size: 24rpx;
+				color: #333;
+				font-weight: bold;
+			}
+
+			text:last-child {
+				font-size: 20rpx;
+				color: #666;
+
+			}
+
+
+		}
+
+		.icon {
+			text {
+				color: #888;
+				font-size: 18rpx;
+				margin-top: 2px;
+			}
+
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+
+	}
+
+	.list {
+		padding: 24rpx 32rpx;
+		background-color: #fff;
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 706rpx;
+
+		>.title {
+			font-size: 30rpx;
+			color: #000;
+			font-weight: bold;
+			margin-bottom: 28rpx;
+		}
+
+		.store {
+			margin-top: 14px;
+			height: 180rpx;
+
+			>image {
+				width: 180rpx;
+				height: 180rpx;
+				margin-right: 12px;
+				border-radius: 4px;
+
+			}
+
+			.item {
+				width: 69%;
+				height: 100%;
+
+				text {
+					display: block;
+					overflow: hidden;
+					white-space: nowrap;
+					/* 不换行 */
+					text-overflow: ellipsis;
+					/* 显示省略号 */
+				}
+
+				.title {
+					font-size: 14px;
+					color: #000000;
+					font-weight: bold;
+				}
+
+				.taglist {
+					background: #fff;
+					border: 1px solid #EEEEEE;
+					border-radius: 2px;
+					padding: 1px 6px;
+					color: #888;
+					font-size: 20rpx;
+					margin-right: 5px;
+				}
+
+				.soldQuantity {
+					font-size: 20rpx;
+					color: #999;
+				}
+
+				.Price {
+					text:nth-child(1) {
+						font-size: 22rpx;
+						color: #FD2B54;
+					}
+
+					text:nth-child(2) {
+						font-size: 28rpx;
+						color: #FD2B54;
+						line-height: 1;
+						font-weight: bold;
+						margin-right: 2px;
+					}
+				}
+
+				.discount {
+					background: #FFD3DC;
+					border-radius: 2px 0px 0px 2px;
+					padding-left: 2px;
+					width: 136rpx;
+
+					image {
+						width: 8px;
+						height: 8px;
+					}
+
+					.right {
+						background: linear-gradient(90deg, #FFE6EB 0%, #FFE6EB 100%);
+						border-radius: 2px 2px 2px 0px;
+						padding: 1px 4px;
+						font-size: 16rpx;
+						color: #FD2B54;
+						font-weight: bold;
+					}
+				}
+
+				.btn {
+					padding: 2px 14px;
+					background: linear-gradient(90deg, #FF8149 0%, #FF3129 49%, #FF408F 100%);
+					border-radius: 4px;
+					font-size: 13px;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+</style>

pages/carWash/placeOrder.vue

@@ -0,0 +1,206 @@
+<template>
+	<view class="page">
+		<view class="headers">
+			<view class="dis a-c j-start">
+				<u-icon name="arrow-left" size="40" @tap="back"></u-icon>
+				<text style="margin:auto;">优惠团购</text>
+			</view>
+		</view>
+		<view class="content">
+			<view class="item dis a-c j-s" style="padding-bottom: 10px;">
+				<text class="font-weight">购买份数</text>
+				<u-number-box v-model="quantity" @change="valChange" :min="1" input-width="40"
+					:disabled-input="true"></u-number-box>
+			</view>
+			<view class="item dis f-c">
+				<text class="font-weight">本单可享</text>
+				<view class="dis j-s a-c price">
+					<text>参考价</text>
+					<text style="font-weight: bold;">-￥{{Number(info.Price * quantity).toFixed(1)}}</text>
+				</view>
+				<view class="dis j-s a-c price">
+					<text>团购优惠</text>
+					<text
+						style="font-weight: bold;color: #FD2B54;">-¥{{(Number(info.Price) - Number(info.groupBuyPrice)).toFixed(1)}}</text>
+				</view>
+				<view class="dis j-s a-c price">
+					<text>优惠券</text>
+					<text style="color: #999;font-size: 24rpx;">暂无可用</text>
+				</view>
+			</view>
+			<view class="item dis f-c">
+				<text class="font-weight">支付方式</text>
+				<view class="dis j-s a-c price">
+					<text>光大银行储蓄卡（3039）</text>
+					<u-radio-group v-model="value">
+						<u-radio shape="circle" active-color="red"></u-radio>
+					</u-radio-group>
+				</view>
+				<view class="dis j-s a-c price">
+					<text>添加储蓄卡</text>
+				</view>
+				<view class="dis j-c a-c price">
+					<text style="font-size: 22rpx;color: #999;">更换其他支付方式</text>
+					<u-icon name="arrow-right" color="#ACACAE" size="18"></u-icon>
+				</view>
+			</view>
+		</view>
+		<view class="footer dis a-c j-s">
+			<view class="price dis f-c">
+				<view class="dis a-end ">
+					<text style="color: #FD2B54;font-size: 26rpx;font-weight: bold;">￥</text>
+					<text
+						style="color: #FD2B54;font-size: 40rpx;font-weight: bold;line-height: 1.5;">{{(Number(info.Price * quantity)-(Number(info.Price) - Number(info.groupBuyPrice))).toFixed(1)}}</text>
+					<text
+						style="color: #999;font-size: 24rpx;margin-left: 1px;text-decoration: line-through">¥{{Number(info.Price * quantity).toFixed(1)}}</text>
+				</view>
+				<view class="dis a-c" style="font-size: 22rpx;color:#FD2B54 ;">
+					<text>共{{quantity}}件</text>
+					<view class="tag"></view>
+					<text>优惠￥{{(Number(info.Price) - Number(info.groupBuyPrice)).toFixed(1)}}</text>
+				</view>
+			</view>
+			<view class="btn dis a-c j-c">
+				提交订单
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: 0,
+				quantity: 1,
+				info: {},
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(params) {
+			let historys = JSON.parse(params.info);
+			this.info = historys;
+			console.log(this.info);
+			// const currentWeekDays = this.getCurrentWeekDays();
+			// currentWeekDays.forEach(date => {
+			// 	console.log(date.toISOString().split('T')[0]); // 格式化输出为 YYYY-MM-DD
+			// });
+		},
+		methods: {
+			//页面返回按钮
+			back() {
+				uni.navigateBack({
+					delta: 1, // 返回的页面数，如果是1表示返回上一页
+					success: function() {}
+				});
+			},
+			valChange(e) {}
+			// getCurrentWeekDays() {
+			// 	const today = new Date();
+			// 	const weekDays = [];
+
+			// 	// 获取今天是星期几 (0-6) 其中 0 代表星期日，6 代表星期六
+			// 	const dayOfWeek = today.getDay();
+
+			// 	// 计算今天是本周第几天（将 Sunday 从 0 转为 7，便于计算）
+			// 	const startOfWeek = dayOfWeek === 0 ? -6 : 1 - dayOfWeek;
+
+			// 	// 获取本周的七天
+			// 	for (let i = 0; i < 7; i++) {
+			// 		const currentDate = new Date(today);
+			// 		currentDate.setDate(today.getDate() + startOfWeek + i);
+			// 		weekDays.push(currentDate);
+			// 	}
+
+			// 	return weekDays;
+			// }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/ {
+		.u-number-input {
+			background: transparent !important;
+		}
+	}
+
+	.page {
+		background: #F7F7F7;
+		height: 100vh;
+	}
+
+	.headers {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: auto;
+		width: 100%;
+		z-index: 999999;
+		padding: 50px 16px 14px;
+		height: auto;
+		background: linear-gradient(180deg, #FFF9F1 0%, #FFFFFF 100%);
+
+		text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #000;
+		}
+	}
+
+	.content {
+		padding: 16rpx 30rpx;
+		margin-top: 96px;
+
+		.item {
+			width: 100%;
+			background: #FFFFFF;
+			border-radius: 5px;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 20rpx 20rpx 0;
+			color: #333;
+			margin-bottom: 8px;
+
+			.price {
+				padding: 16rpx 0;
+				font-size: 26rpx;
+				color: #333;
+				border-bottom: 1px solid #EEEEEE;
+			}
+
+			.price:last-child {
+				border: none;
+			}
+		}
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 15px;
+		background-color: #FFFFFF;
+
+		.price {}
+
+		.btn {
+			width: 40%;
+			background: #FD2B54;
+			border-radius: 4px;
+			padding: 9px;
+			font-size: 14px;
+			color: #fff;
+			font-weight: bold;
+		}
+
+		.tag {
+			width: 0px;
+			height: 18rpx;
+			border: 1px solid #FFBECA;
+			margin: 0 6rpx;
+		}
+	}
+</style>

pages/index/checkIn.vue

@@ -0,0 +1,27 @@
+<template>
+	<view class="page">
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>

pages/index/flashSale.vue

@@ -0,0 +1,27 @@
+<template>
+	<view class="page">
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>

pages/index/index.vue

@@ -19,12 +19,17 @@
 		<!-- 占位块 -->
 		<view class="place"></view>
 		<view class="swiperelement" :style="transitionStyle">
-			<u-swiper :list="swiperlist" height="238" duration="400" interval="4000" mode="rect"
-				@change="swiperChange"></u-swiper>
+			<view class="swiper">
+				<u-swiper :list="swiperlist" height="258" duration="400" interval="4000" mode="rect" border-radius="12"
+					@change="swiperChange"></u-swiper>
+			</view>
+
 		</view>
 		<view class="pagebody">
-			<index-nav :resdata="categoryList" :row="2" @authModal="authModal" style="margin-bottom: 14px;"></index-nav>
-			<view class="mt-2 dis j-s a-c">
+			<index-nav :resdata="categoryList" :row="2" @authModal="authModal"></index-nav>
+			<u-tabs :list="itemCategorylist" :is-scroll="false" :current="current" @change="change"
+				style="background: transparent;" active-color="#000"></u-tabs>
+			<view class="mt-1 dis j-s a-c">
 				<view class="activity dis f-c ">
 					<text>签到有礼</text>
 					<text>福利多多</text>
@@ -57,19 +62,19 @@
 						</view>
 					</view>
 					<view class="dis j-s a-c mt-2">
-						<image src="../../static/image/index/pick-img/5.png" mode="" style="width: 53px;height: 53px;">
+						<image src="../../static/image/index/pick-img/5.png" mode="" style="width: 56px;height: 56px;">
 						</image>
 						<image src="../../static/image/index/pick-img/8.png" mode="" style="width: 80px;height: 56px;">
 						</image>
 					</view>
 					<view class="dis j-s a-c mt-2">
-						<image src="../../static/image/index/pick-img/6.png" mode="" style="width: 53px;height: 53px;">
+						<image src="../../static/image/index/pick-img/6.png" mode="" style="width: 56px;height: 56px;">
 						</image>
 						<image src="../../static/image/index/pick-img/9.png" mode="" style="width: 80px;height: 56px;">
 						</image>
 					</view>
 					<view class="dis j-s a-c mt-2">
-						<image src="../../static/image/index/pick-img/7.png" mode="" style="width: 53px;height: 53px;">
+						<image src="../../static/image/index/pick-img/7.png" mode="" style="width: 56px;height: 56px;">
 						</image>
 						<image src="../../static/image/index/pick-img/8.png" mode="" style="width: 80px;height: 56px;">
 						</image>
@@ -143,7 +148,22 @@
 		},
 		data() {
 			return {
-
+				itemCategorylist: [{
+						name: '推荐'
+					}, {
+						name: '美食'
+					}, {
+						name: '玩乐',
+					}, {
+						name: '出游',
+					}, {
+						name: '亲子',
+					},
+					{
+						name: '运动',
+					}
+				],
+				current: 0,
 				authShow: false,
 				locationshow: false,
 				avatar: "",
@@ -171,7 +191,6 @@
 				showTitle: false,
 				asyncClose: false,
 				isShow: false,
-				current: 0,
 				banben: {},
 				bgColor: "#4B75EB",
 				//轮播
@@ -180,15 +199,15 @@
 						img: '/static/image/index/category-img/1.png',
 						title: '车险',
 						src: '/pages/carInsure/entry',
-						width: '40px',
-						height: '30px',
+						width: '92rpx',
+						height: '69rpx',
 					},
 					{
 						cat_id: 1,
 						img: '/static/image/index/category-img/2.png',
 						title: '车损测算',
-						width: '40px',
-						height: '30px',
+						width: '92rpx',
+						height: '69rpx',
 						// src: '/pages/carInsure2/entry'
 					},
 					{
@@ -196,15 +215,15 @@
 						img: '/static/image/index/category-img/3.png',
 						title: '道路救援',
 						src: '/pages/roadRescue/index',
-						width: '40px',
-						height: '30px',
+						width: '92rpx',
+						height: '69rpx',
 					},
 					{
 						cat_id: 3,
 						img: '/static/image/index/category-img/4.png',
 						title: '司法鉴定',
-						width: '40px',
-						height: '30px',
+						width: '92rpx',
+						height: '69rpx',
 						src: '',
 
 					},
@@ -212,48 +231,48 @@
 						cat_id: 4,
 						img: '/static/image/index/category-img/5.png',
 						title: '掌柜商城',
-						width: '40px',
-						height: '30px',
+						width: '92rpx',
+						height: '69rpx',
 						src: ''
 					},
 					{
 						cat_id: 5,
 						img: '/static/image/index/category-img/6.png',
 						title: '洗车',
-						width: '32px',
-						height: '32px',
-						src: ''
+						width: '68rpx',
+						height: '68rpx',
+						src: '/pages/carWash/carWash'
 					},
 					{
 						cat_id: 6,
 						img: '/static/image/index/category-img/7.png',
 						title: '车检代办',
-						width: '32px',
-						height: '32px',
+						width: '68rpx',
+						height: '68rpx',
 						src: '/pages/caragent/index'
 					},
 					{
 						cat_id: 7,
 						img: '/static/image/index/category-img/8.png',
 						title: '审车',
-						width: '32px',
-						height: '32px',
+						width: '68rpx',
+						height: '68rpx',
 						src: ''
 					},
 					{
 						cat_id: 8,
 						img: '/static/image/index/category-img/9.png',
 						title: '代驾',
-						width: '32px',
-						height: '32px',
+						width: '68rpx',
+						height: '68rpx',
 						src: ''
 					},
 					{
 						cat_id: 9,
 						img: '/static/image/index/category-img/10.png',
 						title: '一键挪车',
-						width: '32px',
-						height: '32px',
+						width: '68rpx',
+						height: '68rpx',
 						src: '/pages/ticket/ticket'
 					}
 				],
@@ -397,6 +416,9 @@
 			uni.stopPullDownRefresh();
 		},
 		methods: {
+			change(index) {
+				this.current = index;
+			},
 			swiperChange(index) {
 				let color = this.swiperlist.find((val, ele) => ele == index);
 				this.transitionStyle.backgroundColor = color.backgroundColor;
@@ -578,6 +600,11 @@
 	@import '@/style/mixin.scss';
 
 	/deep/ {
+		.u-tab-bar {
+			background: linear-gradient(90deg, rgba(245, 128, 71, 0.8) 20%, rgba(242, 49, 78, 1) 100%) !important;
+			border-radius: 4px 4px 4px 4px;
+		}
+
 		.u-content {
 			padding-left: 40px;
 		}
@@ -673,7 +700,8 @@
 	.swiperelement {
 		height: 70px;
 		border-radius: 0px 0px 20px 0px;
-		padding: 10px 16px 0;
+		padding: 10px 12px 0;
+		position: relative;
 		transition: background-color 0.5s;
 		/* 渐变效果 */
 
@@ -682,16 +710,28 @@
 			display: table;
 			clear: both;
 		}
+
+		.swiper {
+			height: 258rpx;
+			box-shadow: 0px 2px 5px 0px rgba(95, 107, 132, 0.2);
+			position: absolute;
+			left: 12px;
+			right: 12px;
+			top: 10px;
+			border-radius: 6px;
+			border-bottom: 1px solid #E2E6EC;
+		}
 	}
 
 	.pagebody {
-		padding: 75px 16px 16px;
+		padding: 83px 12px 12px;
 		height: calc(100vh - 180px);
 		background-color: #F8F8FA;
 
 		.activity {
-			width: 30%;
+			width: 31.5%;
 			background: #FFFFFF;
+			box-shadow: 0px 1px 3px 0px rgba(95, 107, 132, 0.05);
 			padding: 8px;
 			border-radius: 6px;
 			position: relative;
@@ -715,8 +755,9 @@
 		}
 
 		.flashSale {
-			width: 48%;
+			width: 48.5%;
 			background: #FFFFFF;
+			box-shadow: 0px 2px 5px 0px rgba(95, 107, 132, 0.05);
 			border-radius: 6px;
 			position: relative;
 			padding: 8px;
@@ -742,8 +783,9 @@
 		}
 
 		.hotSaleList {
-			width: 48%;
+			width: 48.5%;
 			background: #FFFFFF;
+			box-shadow: 0px 2px 5px 0px rgba(95, 107, 132, 0.05);
 			border-radius: 6px;
 			position: relative;
 			padding: 8px;

pages/index/task.vue

@@ -0,0 +1,27 @@
+<template>
+	<view class="page">
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>

pages/my/my.vue

@@ -83,7 +83,7 @@
 									v-for="(item ,index) in toolsList" :index="index" :key="item.text">
 									<view class="grid-item-box dis a-c j-c f-c">
 										<image :src="item.image" mode=""
-											style="width: 30px;height: 30px;margin: 10px 9px 4px;"></image>
+											style="width: 34px;height: 34px;margin: 10px 9px 4px;"></image>
 										<text class="text">{{item.text}}</text>
 										<u-badge v-if="item.text=='客户管理'" size="mini" type="error" :count="InsureCount"
 											:offset="[10, 10]"></u-badge>

pages/orders/quoteHistory.vue

@@ -150,22 +150,22 @@
 								shape="circle" size="mini" :hair-line="false" :plain="true" type=""
 								@click="huataiunderwriting(item)">更新状态</u-button>
 							<u-button
-								v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险','诚泰财险'].includes(item.inscompany)"
+								v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险','诚泰财险','阳光财险'].includes(item.inscompany)"
 								:custom-style="{fontSize:'12px',background:'rgba(255,77,77,0.05)',color:'#FF4D4D',borderColor:'#FF4D4D'}"
 								shape="circle" size="mini" :hair-line="false" :plain="true" type=""
 								@click="underwriting(item.id,item.inscompany)">更新状态</u-button>
 
 
-							<u-button v-if="item.orderstatus==2 && ['紫金财险'].includes(item.inscompany)"
+							<u-button v-if="item.orderstatus==2 && ['紫金财险','阳光财险'].includes(item.inscompany)"
 								:custom-style="{fontSize:'12px',background:'rgba(159,159,159,0.05)',color:'#666666',borderColor:'#D2D2D2'}"
 								shape="circle" size="mini" :hair-line="false" :plain="true"
-								@click="cancelorder(item.id)">撤单</u-button>
+								@click="cancelorder(item.id,item)">撤单</u-button>
 							<u-button v-if="item.orderstatus==2"
 								:custom-style="{fontSize:'12px',background:'rgba(255,86,0,0.05)',color:'#FF5600',borderColor:'#FF5600'}"
 								shape="circle" size="mini" :hair-line="false" :plain="true" type=""
 								@click="Payment(item.id,item.apiType)">缴费二维码</u-button>
 							<u-button
-								v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险','诚泰财险'].includes(item.inscompany)"
+								v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险','诚泰财险','阳光财险'].includes(item.inscompany)"
 								:custom-style="{fontSize:'12px',background:'rgba(255,86,0,0.05)',color:'#FF5600',borderColor:'#FF5600'}"
 								shape="circle" size="mini" :hair-line="false" :plain="true" type=""
 								@click="queryStatus(item.id,item)">查询缴费状态</u-button>
@@ -1532,6 +1532,24 @@
 							});
 						}
 						break;
+					case "阳光财险":
+						let ygres = await this.$http.post('/order/yangGuangApi/proposalStatusQuery', {
+							companyId: id
+						});
+						if (ygres.code == '200') {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'error',
+							});
+						}
+						break;
 					case "国任财险":
 						let grres = await this.$http.post('/api/guoRen/updateOrderInfo', {
 							companyId: id
@@ -1610,23 +1628,46 @@
 
 			},
 			//撤单
-			async cancelorder(item) {
-				let res = await this.$http.post('/order/zijin/cancel', {
-					companyId: item
-				})
-				if (res.code == '200') {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-					this.querylist();
-				} else {
-					uni.showToast({
-						title: res.msg,
-						icon: 'error',
-					});
+			async cancelorder(id, item) {
+				switch (item.inscompany) {
+					case "紫金财险":
+						let zjres = await this.$http.post('/order/zijin/cancel', {
+							companyId: id
+						})
+						if (zjres.code == '200') {
+							uni.showToast({
+								title: zjres.msg,
+								icon: 'none',
+								duration: 1000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: zjres.msg,
+								icon: 'error',
+							});
+						}
+						break;
+					case "阳光财险":
+						let ygres = await this.$http.post('/order/yangGuangApi/autoWriteOff', {
+							companyId: id
+						})
+						if (ygres.code == '200') {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'none',
+								duration: 1000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'error',
+							});
+						}
+						break;
 				}
+
 			},
 			async queryStatus(id, item) {
 				switch (item.inscompany) {
@@ -1705,6 +1746,25 @@
 							});
 						}
 						break;
+					case "阳光财险":
+						let ygres = await this.$http.post('/order/yangGuangApi/proposalStatusQuery', {
+							companyId: id
+						});
+						if (ygres.code == '200') {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: ygres.msg,
+								icon: 'error',
+							});
+						}
+						break;
+
 					case "国任财险":
 						let grres = await this.$http.post('/api/guoRen/updateOrderInfo', {
 							companyId: id

pages/set/password.vue

@@ -4,64 +4,76 @@
 		<public-module></public-module>
 
 		<view class="form">
+			<view class="password dis a-c j-s">
+				<u-icon name="lock-opened-fill" color="#999" size="28"></u-icon>
+				<input placeholder="旧密码" v-model="oldPassword" password=true
+					placeholder-style="color: #C5C5C5;font-size:26upx" />
+			</view>
 			<view class="password">
-				<view class="icon iconfont icon-icon-mima"></view>
-				<input placeholder="请设置新密码(6-15位数字与字母组合)" v-model="pwd" password=true
+				<u-icon name="lock-opened-fill" color="#999" size="28"></u-icon>
+				<input placeholder="新密码(6-15位数字与字母组合)" v-model="repwd" password=true
 					placeholder-style="color: #C5C5C5;font-size:26upx" />
 			</view>
 			<view class="password">
-				<view class="icon iconfont icon-icon-mima"></view>
-				<input placeholder="再次输入新密码" v-model="repwd" password=true
+				<u-icon name="lock-opened-fill" color="#999" size="28"></u-icon>
+				<input placeholder="确认密码" v-model="password" password=true
 					placeholder-style="color: #C5C5C5;font-size:26upx" />
 			</view>
-			<button class="user-set-btn d-flex a-center j-center main-bg-color" :loading="loading"
-				:class="{'main-bf-hover-color':disabled}" :disabled="disabled" type="primary" @tap="submit">完成</button>
+			<button class="user-set-btn d-flex a-center j-center " :loading="loading" :disabled="disabled"
+				type="primary" @tap="submit">完成</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		mapState
+		mapState,
+		mapMutations
 	} from "vuex"
 	export default {
 		data() {
 			return {
-				pwd: "",
+				password: "",
 				repwd: "",
+				oldPassword: "",
 				loading: false,
 				disabled: true,
 			}
 		},
 		watch: {
-			pwd(val) {
+			password(val) {
 				this.OnBtnChange();
 			},
 			repwd(val) {
 				this.OnBtnChange();
 			},
+			oldPassword(val) {
+				this.OnBtnChange();
+			},
+
 
 		},
 		computed: {
 			...mapState(['userInfo'])
 		},
 		methods: {
+			...mapMutations(['emptyUserInfo']),
 			// 改变按钮状态
 			OnBtnChange() {
-				if (this.pwd && this.repwd) {
+				if (this.password && this.repwd && this.oldPassword) {
 					this.disabled = false;
 					return;
 				}
 				this.disabled = true;
 			},
 			async submit() {
-				if (!this.$base.passwordRegular.test(this.pwd)) {
+				if (!this.$base.passwordRegular.test(this.password)) {
 					return uni.showToast({
 						title: '密码须6-15位数字与字母组合',
 						icon: 'none'
 					});
 				}
-				if (this.pwd != this.repwd) {
+				if (this.password != this.repwd) {
 					return uni.showToast({
 						title: '两次密码输入不一致',
 						icon: "none"
@@ -69,14 +81,27 @@
 				}
 
 				let res = await this.$http.post('/user/updatePwd?id=' + this.userInfo.sysUser.id + '&password=' + this
-					.pwd);
+					.password + '&oldPassword=' + this.oldPassword);
 				if (res.code == 200) {
-					this.pwd = "";
+					this.password = "";
 					this.repwd = "";
-					return uni.showToast({
+					this.oldPassword = "";
+					uni.showToast({
 						title: "修改密码成功",
 						icon: "none"
 					});
+					this.emptyUserInfo();
+					setTimeout(() => {
+						uni.reLaunch({
+							url: "/pages/login/login"
+						})
+						return true;
+					}, 500);
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none"
+					});
 				}
 
 			}
@@ -106,7 +131,7 @@
 		align-items: center;
 		border-radius: 5upx;
 		background-color: #FFFFFF;
-		padding: 0 0 0 100upx;
+		padding: 0 0 0 20px;
 		margin: 30rpx 0rpx 50rpx;
 	}
 
@@ -115,6 +140,7 @@
 		height: 50rpx;
 		color: rgba($color: #ffffff, $alpha: 0.8);
 		font-weight: 200;
+		margin-left: 20px;
 	}
 
 	.icon {