2023.11.10

manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "1.0.185",
-	"versionCode": 185,
+	"versionName": "1.0.188",
+	"versionCode": 188,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -199,6 +199,9 @@
 		},
 		"sdkConfigs": {
 			"maps": {}
+		},
+		"uniStatistics": {
+			"enable": false
 		}
 	}
 }

pages/carInsure1/quote1.vue

@@ -306,7 +306,7 @@
 											<text style="font-size: 14px;">分类</text>
 											<view class=" dis a-c j-s " @click="anshengPopupshow=true">
 												<text
-													style="font-size: 14px;">{{anshengaccidentalDrivingVo.planChineseName}}</text>
+													style="font-size: 14px;">{{anshengaccidentalDrivingVo.planCode}}{{anshengaccidentalDrivingVo.planChineseName}}</text>
 												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 											</view>
 										</view>
@@ -317,7 +317,7 @@
 													active-color="rgb(255, 170, 0)"></u-checkbox>
 												<view class=" dis a-c j-s " @click="anshengPopupshow1=true">
 													<text
-														style="font-size: 14px;">{{anshengaccidentalDrivingVo.productName}}</text>
+														style="font-size: 14px;">{{anshengaccidentalDrivingVo.productCode}}{{anshengaccidentalDrivingVo.productName}}</text>
 													<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
 												</view>
 											</view>
@@ -445,22 +445,22 @@
 			</view>
 		</u-popup>
 		<!-- 安盛驾意险弹框 -->
-		<u-popup v-model="anshengPopupshow" mode="center" width="70%" border-radius="10">
+		<u-popup v-model="anshengPopupshow" mode="center" width="90%" border-radius="10">
 			<view class="popContent dis f-c a-c">
 				<u-radio-group size="30" active-color="rgb(255, 170, 0)">
 					<u-radio style="margin: 4px 0;flex: auto;" @change="ASprogrammeradioChange"
 						v-for="(item, index) in anshengprogrammeData" :key="index" :name="item.planCode">
-						{{item.planChineseName}}
+						{{item.planCode}}{{item.planChineseName}}
 					</u-radio>
 				</u-radio-group>
 			</view>
 		</u-popup>
-		<u-popup v-model="anshengPopupshow1" mode="center" width="70%" border-radius="10">
+		<u-popup v-model="anshengPopupshow1" mode="center" width="90%" border-radius="10">
 			<view class="popContent dis f-c a-c">
 				<u-radio-group size="30" active-color="rgb(255, 170, 0)">
 					<u-radio style="margin: 4px 0;flex: auto;" @change="ASInsuranceradioChange"
 						v-for="(item, index) in anshengInsuranceData" :key="index" :name="item.productCode">
-						{{item.productName}}
+						{{item.productCode}}{{item.productName}}
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -1457,7 +1457,16 @@
 				let info = this.anshengprogrammeData.find((val => val.planCode == id))
 				this.anshengPopupshow = false;
 				this.anshengInsuranceData = info.departmentProductList;
-				Object.assign(this.anshengaccidentalDrivingVo, info.departmentProductList[0]);
+				let dataInfo = {
+					personFlag: info.personFlag,
+					planChineseName: info.planChineseName,
+					planCode: info.planCode,
+					planSeries: info.planSeries,
+					productCode: info.departmentProductList[0].productCode,
+					productName: info.departmentProductList[0].productName,
+					quantity: info.departmentProductList[0].quantity
+				}
+				Object.assign(this.anshengaccidentalDrivingVo, dataInfo);
 			},
 			//安盛二级选择
 			ASInsuranceradioChange(id) {
@@ -1926,62 +1935,7 @@
 				this.totalCompanyList[num].msg = res.msg;
 				switch (namesimple) {
 					case '安盛天平':
-						if (res.data == null && res.msg.indexOf("交强险重复投保") > -1 && res.msg.indexOf(";终保日期") > -1) {
-							let time = res.msg.substr(res.msg.indexOf(";终保日期 ") + 6, 16) + ":00";
-							this.jqstartDate = time;
-							this.jqendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0507") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (res.data == null && res.msg.indexOf("上年保险止期(") > -1 && res.msg.indexOf("重复投保情况") > -
-							1) {
-							let time = res.msg.substr(res.msg.indexOf("上年保险止期(") + 7, 17) + ":00";
-							time = time.substring(0, 4) + "-" + time.substring(5, 7) + "-" + time.substring(8, 10) +
-								" " + time.substring(12, 14) + ":" + time.substring(15, 17) + ":00"
-							this.systartDate = time;
-							this.syendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0510") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (!!res.data) {
+						if (!!res.data) {
 							if (res.data.warnMessageList != null && res.data.warnMessageList[0] != null && res.data
 								.warnMessageList[
 									0] != "") {
@@ -2000,63 +1954,7 @@
 						}
 						break;
 					case '中国人寿':
-						if (res.data == null && res.msg.indexOf("交强险") > -1 && res.msg.indexOf(";终保日期") > -1) {
-							let time = res.msg.substr(res.msg.indexOf(";终保日期") + 6, 16) + ":00";
-							this.jqstartDate = time;
-							this.jqendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0507") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (res.data == null && res.msg.indexOf("商业险-平台返回") > -1 && res.msg.indexOf("保险期间：") > -
-							1) {
-							let time = res.msg.substr(res.msg.indexOf("保险期间：") + 18, 12) + "00";
-							time = time.substring(0, 4) + "-" + time.substring(4, 6) + "-" + time.substring(6, 8) +
-								" " + time.substring(8, 10) + ":" + time.substring(10, 12) + ":" + time.substring(12,
-									14);
-							this.systartDate = time;
-							this.syendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0510") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (!!res.data) {
+						if (!!res.data) {
 							if (res.data.warnMessageList != null && res.data.warnMessageList[0] != null && res.data
 								.warnMessageList[
 									0] != "") {
@@ -2076,61 +1974,7 @@
 						break;
 
 					case '恒邦财险':
-						if ((res.data == null && res.msg.indexOf("交强险平台返回") > -1 && res.msg.indexOf(";终保日期") > -1) || (
-								res.data == null && res.msg.indexOf("重复投保") > -1 && res.msg.indexOf(";终保日期") > -1)) {
-							let time = res.msg.substr(res.msg.indexOf(";终保日期") + 6, 16) + ":00";
-							this.jqstartDate = time;
-							this.jqendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0507") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (res.data == null && res.msg.indexOf("平台校验，重复投保") > -1 && res.msg.indexOf("终保日期：") >
-							-1) {
-							let time = res.msg.substr(res.msg.indexOf("终保日期：") + 5, 10) + " 00:00:00";
-							this.systartDate = time;
-							this.syendDate = this.oneYearPast(time);
-							if (this.riskList.length > 0) {
-								for (let i = 0; i < this.riskList.length; i++) {
-									if (this.riskList[i].riskCode == "0510") {
-										this.riskList[i].startDate = time;
-										this.riskList[i].endDate = this.oneYearPast(time);
-									}
-								}
-							}
-							let param = {
-								userId: this.userInfo.sysUser.id,
-								quoteno: this.quoteno,
-								orderNo: this.orderno,
-								carInfo: this.carInfo,
-								insuredPersonInfo: this.insuredPersonInfo,
-								ownerInfo: this.ownerInfo,
-								policyHolderInfo: this.policyHolderInfo,
-								kindList: this.kindList,
-								riskList: this.riskList,
-								vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
-							};
-							await this.$http.post('/insurance/order/generateOrder', param);
-							return this.quoteInsurance(num, id, apiType);
-						} else if (!!res.data) {
+						if (!!res.data) {
 							if (res.data.warnMessageList != null && res.data.warnMessageList[0] != null && res.data
 								.warnMessageList[
 									0] != "") {
@@ -2170,7 +2014,6 @@
 					default:
 						break;
 				}
-
 			},
 			//安盛天平
 			ansheng(num, id) {

pages/carInsure1/underwriting1.vue

@@ -131,7 +131,8 @@
 				</view>
 				<view class="uni-uploader" v-if="showCarImageInfo">
 					<view class="uni-uploader-body dis ">
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files f-c dis a-c">
+							<text>行驶证主页</text>
 							<block v-for="(image,index) in imgList1" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -146,7 +147,8 @@
 								</view>
 							</view>
 						</view>
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files f-c dis a-c">
+							<text>行驶证副本</text>
 							<block v-for="(image,index) in imgList2" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -174,7 +176,8 @@
 				</view>
 				<view class="uni-uploader" v-if="showOwnerImageInfo">
 					<view class="uni-uploader-body dis ">
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>正面</text>
 							<block v-for="(image,index) in imgList3" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -189,7 +192,8 @@
 									@tap="chooseImage('C02','ownerImageListId','imgList3')"></view>
 							</view>
 						</view>
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>反面</text>
 							<block v-for="(image,index) in imgList4" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -220,7 +224,8 @@
 
 				<view class="uni-uploader" v-if="showPolicyImageInfo">
 					<view class="uni-uploader-body dis ">
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>正面</text>
 							<block v-for="(image,index) in imgList5" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -235,7 +240,8 @@
 									@tap="chooseImage('C03','policyImageListId','imgList5')"></view>
 							</view>
 						</view>
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>反面</text>
 							<block v-for="(image,index) in imgList6" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -265,7 +271,8 @@
 
 				<view class="uni-uploader" v-if="showInsuredImageInfo">
 					<view class="uni-uploader-body dis ">
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>正面</text>
 							<block v-for="(image,index) in imgList7" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -280,7 +287,8 @@
 									@tap="chooseImage('C04','insuredImageListId','imgList7')"></view>
 							</view>
 						</view>
-						<view class="uni-uploader__files">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>反面</text>
 							<block v-for="(image,index) in imgList8" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
@@ -299,10 +307,56 @@
 				</view>
 			</view>
 			<!-- 被保人影像信息End -->
+			<!-- 新车影像信息Start -->
+			<view class="imageInfo">
+				<view class="title d-flex a-center j-sb">
+					<text style="font-weight: bold;">新车照片</text>
+					<view class="showStatus" @tap="controlShow('showNewCarImageInfo')">
+						{{showNewCarImageInfo?'收起':'展开'}}
+					</view>
+				</view>
+				<view class="uni-uploader" v-if="showNewCarImageInfo">
+					<view class="uni-uploader-body dis ">
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>新车合格证</text>
+							<block v-for="(image,index) in imgNewCarQualified" :key="index">
+								<view class="uni-uploader__file">
+									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
+										@tap="previewImage($event,'imgNewCarQualified')"></image>
+									<view class="delImgIcon iconfont icon-cuo d-flex a-center j-center"
+										@tap="delCheckImage(image,'imgNewCarinvoiceId','imgNewCarQualified')"></view>
+								</view>
+							</block>
+							<view v-if="imgNewCarQualified.length==0" class="uni-uploader__input-box"
+								style="box-sizing: border-box;">
+								<view class="uni-uploader__input"
+									@tap="chooseImage('XC00','imgNewCarinvoiceId','imgNewCarQualified')"></view>
+							</view>
+						</view>
+						<view class="uni-uploader__files dis f-c a-c">
+							<text>购车发票</text>
+							<block v-for="(image,index) in imgNewCarInvoice" :key="index">
+								<view class="uni-uploader__file">
+									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
+										@tap="previewImage($event,'imgNewCarInvoice')"></image>
+									<view class="delImgIcon iconfont icon-cuo d-flex a-center j-center"
+										@tap="delCheckImage(image,'imgNewCarinvoiceId','imgNewCarInvoice')"></view>
+								</view>
+							</block>
+							<view v-if="imgNewCarInvoice.length==0" class="uni-uploader__input-box"
+								style="box-sizing: border-box;">
+								<view class="uni-uploader__input"
+									@tap="chooseImage('GC00','imgNewCarinvoiceId','imgNewCarInvoice')"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 新车影像信息End -->
 			<!-- 验车照Start -->
-			<!-- <view class="imageInfo">
+			<view class="imageInfo">
 				<view class="title d-flex a-center j-sb">
-					<text style="font-weight: bold;">验车照</text>
+					<text style="font-weight: bold;">其他关系证明</text>
 					<view class="showStatus" @tap="controlShow('showCarCheckImageInfo')">
 						{{showCarCheckImageInfo?'收起':'展开'}}
 					</view>
@@ -310,22 +364,23 @@
 				<view class="uni-uploader" v-if="showCarCheckImageInfo">
 					<view class="uni-uploader-body">
 						<view class="uni-uploader__files">
-							<block v-for="(image,index) in carCheckImageList" :key="index">
+							<block v-for="(image,index) in imgRelationship" :key="index">
 								<view class="uni-uploader__file">
 									<image class="uni-uploader__img" :src="image.url" :data-src="image.url"
-										@tap="previewImage($event,'carCheck')"></image>
+										@tap="previewImage($event,'imgRelationship')"></image>
 									<view class="delImgIcon iconfont icon-cuo d-flex a-center j-center "
-										@tap="delCheckImage('carCheck',index)"></view>
+										@tap="delCheckImage('imgRelationship',index)"></view>
 								</view>
 							</block>
 							<view class="uni-uploader__input-box" style="box-sizing: border-box;">
-								<view class="uni-uploader__input" @tap="chooseImage('C05','carCheck')"></view>
+								<view class="uni-uploader__input"
+									@tap="chooseImage('GX00','imgRelationshipid','imgRelationship')"></view>
 							</view>
 						</view>
 					</view>
 				</view>
 
-			</view> -->
+			</view>
 			<!-- 验车照End -->
 			<!-- 特约 -->
 			<block v-if="zijinengageListData.length>0">
@@ -500,6 +555,9 @@
 				showInsuredImageInfo: false, //显示被保人影像
 				insuredImageListId: [],
 				showCarCheckImageInfo: false, //显示验车照影像
+				imgRelationshipid: [],
+				showNewCarImageInfo: false, //显示新车影像
+				imgNewCarinvoiceId: [],
 				existenceimg: 0,
 				token: "",
 				imgList1: [],
@@ -510,6 +568,9 @@
 				imgList6: [],
 				imgList7: [],
 				imgList8: [],
+				imgRelationship: [], //其他证明
+				imgNewCarQualified: [], //合格证
+				imgNewCarInvoice: [], //发票
 				zijinengageListData: [],
 				zijinengageList: [],
 			}
@@ -750,7 +811,7 @@
 					});
 				}
 				const mergedArray = [...this.carImageListId, ...this.ownerImageListId, ...this
-					.policyImageListId, ...this.insuredImageListId
+					.policyImageListId, ...this.insuredImageListId, ...this.imgRelationshipid
 				];
 
 				if (mergedArray.length > 0) {

pages/index/index.vue

@@ -308,7 +308,6 @@
 			}
 		},
 		onShow() {
-			console.log(1)
 			const arr = uni.getStorageSync('historyInfo');
 			if (arr) {
 				uni.removeStorageSync('historyInfo');

pages/my/my.vue

@@ -22,12 +22,11 @@
 		</view>
 		<!-- 头部信息End -->
 		<!-- 我的订单Start -->
-		<scroll-view scroll-x class="my-orders">
+		<scroll-view scroll-x class="my-orders ">
 			<view :style="'width: calc(((690upx)/4)*'+orderTypeList.length+')'">
-				<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder"
-					style="width: 100%;height:100%">
-					<uni-grid-item style="width: calc((690upx)/4)" class="d-flex a-center j-center"
-						v-for="(item ,index) in orderTypeList" :index="index" :key="index">
+				<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder">
+					<uni-grid-item style="width: calc((690upx)/4)" class="" v-for="(item ,index) in orderTypeList"
+						:index="index" :key="index">
 						<view style="width: calc((690upx)/4)"
 							class="grid-item-box d-flex a-center j-center flex-column">
 							<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor"></view>
@@ -793,12 +792,18 @@
 	/* 个人信息End */
 
 	/* 我的订单Start */
+	.my-orders {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
 	.my-orders,
 	.wallet-body {
 		position: relative;
-		width: 690upx;
+		width: 95%;
 		height: 180upx;
-		margin: -80upx 30upx 0upx;
+		margin: -80rpx auto 0;
 		background: #FFFFFF;
 		border-radius: 20upx;
 		box-shadow: 0upx 0upx 10upx #efeff4;

pages/orders/orders.vue

@@ -73,6 +73,7 @@
 					<view class="dis f-wrap item  ">
 						<text>投保人：{{item.insuredname}}</text>
 						<text>投保险种：{{item.product}}</text>
+						<text v-if="item.orderstatus=='3'">承保公司：{{item.insCompany}}</text>
 						<text>订单号：{{item.orderno}}</text>
 					</view>
 				</view>

pages/set/password.vue

@@ -2,110 +2,130 @@
 	<view class="body">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		
+
 		<view class="form">
 			<view class="password">
 				<view class="icon iconfont icon-icon-mima"></view>
-				<input placeholder="请设置新密码(6-15位数字与字母组合)" v-model="pwd" password=true placeholder-style="color: #C5C5C5;font-size:26upx"/>
+				<input placeholder="请设置新密码(6-15位数字与字母组合)" v-model="pwd" 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 placeholder-style="color: #C5C5C5;font-size:26upx"/>
+				<input placeholder="再次输入新密码" v-model="repwd" 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 main-bg-color" :loading="loading"
+				:class="{'main-bf-hover-color':disabled}" :disabled="disabled" type="primary" @tap="submit">完成</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {mapState} from "vuex"
+	import {
+		mapState
+	} from "vuex"
 	export default {
 		data() {
 			return {
-				pwd:"",
-				repwd:"",
-				loading:false,
-				disabled:true,
+				pwd: "",
+				repwd: "",
+				loading: false,
+				disabled: true,
 			}
 		},
-		watch:{
-			pwd(val){
+		watch: {
+			pwd(val) {
 				this.OnBtnChange();
 			},
-			repwd(val){
+			repwd(val) {
 				this.OnBtnChange();
 			},
-			
+
 		},
-		computed:{
+		computed: {
 			...mapState(['userInfo'])
 		},
 		methods: {
 			// 改变按钮状态
-			OnBtnChange(){
-				if(this.pwd && this.repwd){
-					this.disabled=false; return;
+			OnBtnChange() {
+				if (this.pwd && this.repwd) {
+					this.disabled = false;
+					return;
 				}
-				this.disabled=true;
+				this.disabled = true;
 			},
-			async submit(){
+			async submit() {
 				if (!this.$base.passwordRegular.test(this.pwd)) {
-					return uni.showToast({title: '密码须6-15位数字与字母组合',icon: 'none'});
+					return uni.showToast({
+						title: '密码须6-15位数字与字母组合',
+						icon: 'none'
+					});
 				}
-				if(this.pwd != this.repwd){
-					return uni.showToast({ title: '两次密码输入不一致', icon:"none" });
+				if (this.pwd != this.repwd) {
+					return uni.showToast({
+						title: '两次密码输入不一致',
+						icon: "none"
+					});
 				}
-				
-				let res = await this.$http.post('/user/updatePwd?id='+this.userInfo.sysUser.id+'&password='+this.pwd);
-				if (res.code == 200){
+
+				let res = await this.$http.post('/user/updatePwd?id=' + this.userInfo.sysUser.id + '&password=' + this
+					.pwd);
+				if (res.code == 200) {
 					this.pwd = "";
 					this.repwd = "";
-					return uni.showToast({ title: "修改密码成功", icon:"none" });
+					return uni.showToast({
+						title: "修改密码成功",
+						icon: "none"
+					});
 				}
-				
+
 			}
 		}
 	}
 </script>
 
 <style>
-.body{
-	position: absolute;
-	width: 100%;
-	height:100vh;
-	background-color: #F5F5F5;
-}
-.form{
-	width: 90%;
-	padding: 20upx 5%;
-	font-size: 30upx;
-}
-.form .password{
-	position: relative;
-	width: calc(100% - 100upx);
-	height: 90upx;
-	display: flex;
-	align-items: center;
-	border-radius: 5upx;
-	background-color: #FFFFFF;
-	padding: 0 0 0 100upx;
-	margin: 30upx 0upx 50upx;
-}
-.form .password input{
-	width: 100%;
-	height: 50upx;
-	color: rgba($color: #ffffff, $alpha: 0.8);
-	font-weight: 200;
-}
-.icon{
-	color: #999;
-	height: 70upx;
-	font-size: 40upx;
-	z-index: 10;
-	position: absolute;
-	top: 10upx;
-	left: 10upx;
-	padding: 0 15upx;
-	border-right: 2px solid #F5F5F5;
-}
-</style>
+	.body {
+		position: absolute;
+		width: 100%;
+		height: 100vh;
+		background-color: #F5F5F5;
+	}
+
+	.form {
+		width: 100%;
+		padding: 20upx 5%;
+		font-size: 30upx;
+	}
+
+	.form .password {
+		position: relative;
+		width: 100%;
+		height: 90upx;
+		display: flex;
+		align-items: center;
+		border-radius: 5upx;
+		background-color: #FFFFFF;
+		padding: 0 0 0 100upx;
+		margin: 30rpx 0rpx 50rpx;
+	}
+
+	.form .password input {
+		width: 100%;
+		height: 50rpx;
+		color: rgba($color: #ffffff, $alpha: 0.8);
+		font-weight: 200;
+	}
+
+	.icon {
+		color: #999;
+		height: 70upx;
+		font-size: 40upx;
+		z-index: 10;
+		position: absolute;
+		top: 10upx;
+		left: 10upx;
+		padding: 0 15upx;
+		border-right: 2px solid #F5F5F5;
+	}
+</style>

pages/wallet/withdraw.vue

@@ -4,7 +4,7 @@
 		<public-module></public-module>
 		<view class="withdraw-head d-flex a-center">
 			<view class="withdraw-head-to">到账渠道</view>
-			<view class="withdraw-head-way" style="color:#576B95">{{userInfo.esmUserInternal.bankname}} ({{userInfo.esmUserInternal.accountno.substring(userInfo.esmUserInternal.accountno.length - 4)}})</view>
+			<!-- <view class="withdraw-head-way" style="color:#576B95">{{userInfo.esmUserInternal.bankname}} ({{userInfo.esmUserInternal.accountno.substring(userInfo.esmUserInternal.accountno.length - 4)}})</view> -->
 		</view>
 		<view style="color: #ACACAC;background-color: #F7F7F7;padding: 5upx 60upx;">注：仅支持整数，72小时内到账</view>
 		<view class="withdraw-body">
@@ -25,22 +25,24 @@
 					<text class="info-money-all" @click="getAll">全部提现</text>
 				</view>
 			</view>
-			<view :class="'tx' + (is_post ? '-active' : '')"><button  @click="handleShowModel">提现</button></view>
+			<view :class="'tx' + (is_post ? '-active' : '')"><button @click="handleShowModel">提现</button></view>
 		</view>
 
-			<view :class="['keyboard', keyboradShow ? '' : 'active', isIphoneX ? 'isIphone' : '']">
+		<view :class="['keyboard', keyboradShow ? '' : 'active', isIphoneX ? 'isIphone' : '']">
 			<block v-for="(item, index) in 9" :key="index">
 				<view class="keyboard-item" @tap="keyboradKey(index + 1)">{{ index + 1 }}</view>
 			</block>
 			<view class="keyboard-item hide"></view>
 			<view class="keyboard-item" @tap="keyboradKey(0)"><text>0</text></view>
-			<view class="keyboard-item delte" @tap="keyboradDel()"><image class="img" src="/static/common/del.png" mode="aspectFill" :lazy-load="true"></image></view>
+			<view class="keyboard-item delte" @tap="keyboradDel()">
+				<image class="img" src="/static/common/del.png" mode="aspectFill" :lazy-load="true"></image>
+			</view>
 		</view>
-		
-		<wyb-popup ref="withdrawPopup" type="center" height="480" width="680" radius="6" :maskClickClose="false" >
-		    <view class="popup-content">
-		        <view class="withdrawHeader d-flex a-center j-center">提现确认</view>
-		        <view class="withdrawBody">
+
+		<wyb-popup ref="withdrawPopup" type="center" height="480" width="680" radius="6" :maskClickClose="false">
+			<view class="popup-content">
+				<view class="withdrawHeader d-flex a-center j-center">提现确认</view>
+				<view class="withdrawBody">
 					<view>
 						<text>提现金额：</text>
 						<text class="text-red">{{ money }}元</text>
@@ -58,313 +60,354 @@
 						<text class="text-red">{{ fee }}%</text>
 					</view>
 				</view>
-		        <view class="withdrawFooter d-flex a-center j-end"><view class="d-flex a-center j-center" @tap="closeWithdrawPopup">我再想想</view><view class="d-flex a-center j-center" @tap="getMoney">确认提现</view></view>
-		    </view>
+				<view class="withdrawFooter d-flex a-center j-end">
+					<view class="d-flex a-center j-center" @tap="closeWithdrawPopup">我再想想</view>
+					<view class="d-flex a-center j-center" @tap="getMoney">确认提现</view>
+				</view>
+			</view>
 		</wyb-popup>
-		
-	
+
+
 	</view>
 </template>
 
 <script>
-import {mapState} from "vuex"
-import wybPopup from '@/components/common/wyb-popup/wyb-popup.vue'
-export default {
-	components: {
-		wybPopup
-	},
-	computed:{
-		...mapState(['userInfo'])
-	},
-	data() {
-		return {
-			lowest: 0,		//最低提现金额
-			fee: 0,			//提现费率
-			pool: 0,		//可提现余额
-			
-			extract: '',	//选择的提现金额
-			service_fee: 0.0,//提现服务费
-			showModal: false,
-			is_out: false,
-			is_lowest: false,
-			is_post: false,
-			money: '',		//提现金额
-			real_money: '',	//实际到账
-			keyboradShow: false,
-			isIphoneX: false,
-			isRefuse: false
-		};
-	},
-	watch: {
-		extract(oldVal, newVal) {}
-	},
-	async onLoad() {
-		await this.getPayAccount();//获取可提现余额
-		this.loadData();
-	},
-	methods: {
-		// 可提现余额查询
-		async getPayAccount() {
-			let res = await this.$http.get('/insPayApply/payAccount?userid=' + this.userInfo.sysUser.id);
-			this.pool = res.data.accountBalance;
+	import {
+		mapState
+	} from "vuex"
+	import wybPopup from '@/components/common/wyb-popup/wyb-popup.vue'
+	export default {
+		components: {
+			wybPopup
 		},
-		
-		showWithdrawPopup(){
-			this.$refs.withdrawPopup.show() // 显示
+		computed: {
+			...mapState(['userInfo'])
 		},
-		closeWithdrawPopup(){
-			this.$refs.withdrawPopup.hide() // 显示
-		},
-		loadData() {
-			this.lowest = 10;
-			this.fee = "0";
-			// this.pool = "136.5";
-			this.$nextTick(() => {
-				this.keyboradShow = true;
-			});
+		data() {
+			return {
+				lowest: 0, //最低提现金额
+				fee: 0, //提现费率
+				pool: 0, //可提现余额
+
+				extract: '', //选择的提现金额
+				service_fee: 0.0, //提现服务费
+				showModal: false,
+				is_out: false,
+				is_lowest: false,
+				is_post: false,
+				money: '', //提现金额
+				real_money: '', //实际到账
+				keyboradShow: false,
+				isIphoneX: false,
+				isRefuse: false
+			};
 		},
-		stopKeyborad() {
-			uni.hideKeyboard();
+		watch: {
+			extract(oldVal, newVal) {}
 		},
-		keyboradKey(key) {
-			this.extract = this.extract * 10 + key;
-			this.checkMoney();
+		async onLoad() {
+			await this.getPayAccount(); //获取可提现余额
+			this.loadData();
 		},
-		keyboradDel() {
-			if (this.extract && this.extract > 0) {
-				let val = parseInt(this.extract / 10);
-				if (val == 0) val = '';
-				this.extract = val;
+		methods: {
+			// 可提现余额查询
+			async getPayAccount() {
+				let res = await this.$http.get('/insPayApply/payAccount?userid=' + this.userInfo.sysUser.id);
+				this.pool = res.data.accountBalance;
+			},
+
+			showWithdrawPopup() {
+				this.$refs.withdrawPopup.show() // 显示
+			},
+			closeWithdrawPopup() {
+				this.$refs.withdrawPopup.hide() // 显示
+			},
+			loadData() {
+				this.lowest = 10;
+				this.fee = "0";
+				// this.pool = "136.5";
+				this.$nextTick(() => {
+					this.keyboradShow = true;
+				});
+			},
+			stopKeyborad() {
+				uni.hideKeyboard();
+			},
+			keyboradKey(key) {
+				this.extract = this.extract * 10 + key;
 				this.checkMoney();
+			},
+			keyboradDel() {
+				if (this.extract && this.extract > 0) {
+					let val = parseInt(this.extract / 10);
+					if (val == 0) val = '';
+					this.extract = val;
+					this.checkMoney();
+				}
+			},
+			getAll() {
+				this.extract = parseInt(this.pool);
+				this.checkMoney();
+			},
+			checkMoney() {
+				if (!this.extract || this.extract < this.lowest) {
+					this.is_lowest = true;
+					this.is_post = false;
+				} else if (this.extract > this.pool) {
+					this.is_out = true;
+					this.is_lowest = false;
+					this.is_post = false;
+				} else {
+					this.is_out = false;
+					this.is_lowest = false;
+					this.is_post = true;
+				}
+				if (parseFloat(this.extract).toString() == 'NaN') {
+					this.is_post = false;
+					uni.showToast({
+						title: '输入金额不合法',
+						icon: "none"
+					});
+				}
+			},
+			handleShowModel() {
+				if (this.isRefuse) return;
+				this.checkMoney();
+				if (!this.is_post) return;
+				this.money = this.extract;
+				this.service_fee = Number((this.extract * (this.fee / 100)).toString().match(/^\d+(?:\.\d{0,2})?/));
+				this.real_money = Number((this.extract - this.service_fee).toString().match(/^\d+(?:\.\d{0,2})?/));
+				this.showWithdrawPopup();
+			},
+			async getMoney() {
+				this.closeWithdrawPopup();
+				if (this.isRefuse) return;
+				this.isRefuse = true;
+				let res = await this.$http.post('/insPayApply/applyPay?amount=' + this.real_money + '&userid=' + this
+					.userInfo.sysUser.id);
+				uni.showToast({
+					title: '提现申请已提交，等待管理员处理',
+					icon: "none",
+					duration: 2000
+				});
+				setTimeout(() => {
+					uni.navigateBack();
+				}, 2000);
 			}
 		},
-		getAll() {
-			this.extract = parseInt(this.pool);
-			this.checkMoney();
-		},
-		checkMoney() {
-			if (!this.extract || this.extract < this.lowest) {
-				this.is_lowest = true;
-				this.is_post = false;
-			} else if (this.extract > this.pool) {
-				this.is_out = true;
-				this.is_lowest = false;
-				this.is_post = false;
-			} else {
-				this.is_out = false;
-				this.is_lowest = false;
-				this.is_post = true;
-			}
-			if (parseFloat(this.extract).toString() == 'NaN') {
-				this.is_post = false;
-				uni.showToast({ title: '输入金额不合法', icon:"none" });
-			}
-		},
-		handleShowModel() {
-			if (this.isRefuse) return;
-			this.checkMoney();
-			if (!this.is_post) return;
-			this.money = this.extract;
-			this.service_fee = Number((this.extract * (this.fee / 100)).toString().match(/^\d+(?:\.\d{0,2})?/));
-			this.real_money = Number((this.extract - this.service_fee).toString().match(/^\d+(?:\.\d{0,2})?/));
-			this.showWithdrawPopup();
-		},
-		async getMoney() {
-			this.closeWithdrawPopup();
-			if (this.isRefuse) return;
-			this.isRefuse = true;
-			let res = await this.$http.post('/insPayApply/applyPay?amount='+ this.real_money +'&userid=' + this.userInfo.sysUser.id);
-			uni.showToast({ title: '提现申请已提交，等待管理员处理', icon:"none",duration:2000 });
-			setTimeout(() => {
-				uni.navigateBack();
-			}, 2000);
+		async onPullDownRefresh() {
+			this.extract = '';
+			await this.getPayAccount();
+			this.loadData();
+			this.is_out = false;
+			this.is_lowest = false;
+			this.is_post = false;
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 500);
 		}
-	},
-	async onPullDownRefresh() {
-		this.extract = '';
-		await this.getPayAccount();
-		this.loadData();
-		this.is_out = false;
-		this.is_lowest = false;
-		this.is_post = false;
-		setTimeout(function() {
-			uni.stopPullDownRefresh();
-		}, 500);
-	}
-};
+	};
 </script>
 
 <style scoped>
-page {
-	background-color: #ededed;
-}
-
-.withdraw{
-	padding: 20px;
-	background-color: #ededed;
-	position:absolute;
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-}
-.withdraw-head{
-	background-color: #f7f7f7;
-	display: flex;
-	align-content: center;
-	padding: 10px 30px;
-	font-size: 14px;
-}
-.withdraw-head-way{
-	display: flex;
-	flex-direction: column;
-	align-content: center;
-	margin-left: 20px;
-}
-.withdraw-head-way-1{
-	color: #576b95;
-	margin-bottom: 10px;
-}
-.withdraw-head-way-1 .way-icon{
-	width: 16px;
-	height: 16px;
-	margin-right: 5px;
-	top: 2px;
-}
-.withdraw-head-way-2{
-	color: #acacac;
-	font-size: 12px;
-}
-
-.withdraw-body{
-	background-color: #fff;
-	padding: 20px 30px;
-	font-size: 28upx;
-}
-.withdraw-body .input-money{
-	display: flex;
-	align-content: center;
-	font-weight: 600;
-	border-bottom: 0.5px solid #eaeef1;
-}
-.withdraw-body .input-money .rmb{
-	font-size: 2em;
-	top: 10px;
-	position: relative;
-}
-.withdraw-body .input-money .t-input{
-	height: 1.9em;
-	font-size: 2.5em;
-	border: none;
-	position: relative;
-	left: 3.5%;
-	outline: none;
-}
-.withdraw-body .info-money{
-	margin-top: 10px;
-	font-size: 12px;
-	margin-bottom: 20px;
-}
-.withdraw-body .info-money-num{
-	color: #b2b2b2;
-}
-.withdraw-body .info-money-all{
-	color: #576b95;
-}
-.withdraw-body .tx button{
-	color: #b2b2b2;
-	font-size: 30upx;
-}
-.withdraw-body .tx-active button{
-	font-size: 30upx;
-	color: #fff;
-	background: #1E85FE;
-}
-.withdraw .keyboard{
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	background: #ebebeb;
-	display: flex;
-	justify-content: center;
-	z-index: 2;
-	flex-wrap: wrap;
-	transition: all 0.2s ease-in 0.2s;
-}
-.withdraw .active {
-	bottom: -400rpx;
-}
-.withdraw .keyboard-item {
-	box-sizing: border-box;
-	width: 250rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	background: #fff;
-	font-size: 40rpx;
-	color: #333;
-	height: 99rpx;
-	border: 1rpx solid #ebebeb;
-	border-top: none;
-	border-left: none;
-}
-
-.withdraw .hide {
-	opacity: 0;
-}
-.withdraw .delte {
-	background: none;
-	box-shadow: none;
-}
-.withdraw .delte image {
-	width: 60rpx;
-	height: 60rpx;
-}
-.withdraw .isIphone {
-	padding-bottom: 68rpx !important;
-}
-.withdraw .fee em {
-	font-size: 0.5rem;
-	font-style: normal;
-}
-
-.popup-content .withdrawHeader{
-	height: 100upx;
-	background-color: #fff;
-	color: #666666;
-	font-size: 32upx;
-	border-radius: 10upx;
-}
-.popup-content .withdrawBody{
-	height: 220upx;
-	padding: 25upx;
-	background-color: #F8F8F8;
-}
-.popup-content .withdrawBody view>text:nth-of-type(1){
-	font-size: 26upx;
-}
-.popup-content .withdrawBody view.margin-top-sm {
-	margin-top: 10upx;
-}
-.popup-content .withdrawBody .text-red{
-	color: #E54D42;
-}
-.popup-content .withdrawFooter{
-	height: 120upx;
-}
-.popup-content .withdrawFooter view{
-	width: 120upx;
-	height: 70upx;
-	margin: 0upx 30upx;
-	border-radius: 10upx;
-	padding: 0upx 15upx;
-}
-.popup-content .withdrawFooter view:nth-of-type(1){
-	background-color: #f0f0f0;
-}
-.popup-content .withdrawFooter view:nth-of-type(2){
-	background-color: #1E85FE;
-	color: #FFFFFF;
-}
-</style>
+	page {
+		background-color: #ededed;
+	}
+
+	.withdraw {
+		padding: 20px;
+		background-color: #ededed;
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+	}
+
+	.withdraw-head {
+		background-color: #f7f7f7;
+		display: flex;
+		align-content: center;
+		padding: 10px 30px;
+		font-size: 14px;
+	}
+
+	.withdraw-head-way {
+		display: flex;
+		flex-direction: column;
+		align-content: center;
+		margin-left: 20px;
+	}
+
+	.withdraw-head-way-1 {
+		color: #576b95;
+		margin-bottom: 10px;
+	}
+
+	.withdraw-head-way-1 .way-icon {
+		width: 16px;
+		height: 16px;
+		margin-right: 5px;
+		top: 2px;
+	}
+
+	.withdraw-head-way-2 {
+		color: #acacac;
+		font-size: 12px;
+	}
+
+	.withdraw-body {
+		background-color: #fff;
+		padding: 20px 30px;
+		font-size: 28upx;
+	}
+
+	.withdraw-body .input-money {
+		display: flex;
+		align-content: center;
+		font-weight: 600;
+		border-bottom: 0.5px solid #eaeef1;
+	}
+
+	.withdraw-body .input-money .rmb {
+		font-size: 2em;
+		top: 10px;
+		position: relative;
+	}
+
+	.withdraw-body .input-money .t-input {
+		height: 1.9em;
+		font-size: 2.5em;
+		border: none;
+		position: relative;
+		left: 3.5%;
+		outline: none;
+	}
+
+	.withdraw-body .info-money {
+		margin-top: 10px;
+		font-size: 12px;
+		margin-bottom: 20px;
+	}
+
+	.withdraw-body .info-money-num {
+		color: #b2b2b2;
+	}
+
+	.withdraw-body .info-money-all {
+		color: #576b95;
+	}
+
+	.withdraw-body .tx button {
+		color: #b2b2b2;
+		font-size: 30upx;
+	}
+
+	.withdraw-body .tx-active button {
+		font-size: 30upx;
+		color: #fff;
+		background: #1E85FE;
+	}
+
+	.withdraw .keyboard {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		background: #ebebeb;
+		display: flex;
+		justify-content: center;
+		z-index: 2;
+		flex-wrap: wrap;
+		transition: all 0.2s ease-in 0.2s;
+	}
+
+	.withdraw .active {
+		bottom: -400rpx;
+	}
+
+	.withdraw .keyboard-item {
+		box-sizing: border-box;
+		width: 250rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: #fff;
+		font-size: 40rpx;
+		color: #333;
+		height: 99rpx;
+		border: 1rpx solid #ebebeb;
+		border-top: none;
+		border-left: none;
+	}
+
+	.withdraw .hide {
+		opacity: 0;
+	}
+
+	.withdraw .delte {
+		background: none;
+		box-shadow: none;
+	}
+
+	.withdraw .delte image {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.withdraw .isIphone {
+		padding-bottom: 68rpx !important;
+	}
+
+	.withdraw .fee em {
+		font-size: 0.5rem;
+		font-style: normal;
+	}
+
+	.popup-content .withdrawHeader {
+		height: 100upx;
+		background-color: #fff;
+		color: #666666;
+		font-size: 32upx;
+		border-radius: 10upx;
+	}
+
+	.popup-content .withdrawBody {
+		height: 220upx;
+		padding: 25upx;
+		background-color: #F8F8F8;
+	}
+
+	.popup-content .withdrawBody view>text:nth-of-type(1) {
+		font-size: 26upx;
+	}
+
+	.popup-content .withdrawBody view.margin-top-sm {
+		margin-top: 10upx;
+	}
+
+	.popup-content .withdrawBody .text-red {
+		color: #E54D42;
+	}
+
+	.popup-content .withdrawFooter {
+		height: 120upx;
+	}
+
+	.popup-content .withdrawFooter view {
+		width: 120upx;
+		height: 70upx;
+		margin: 0upx 30upx;
+		border-radius: 10upx;
+		padding: 0upx 15upx;
+	}
+
+	.popup-content .withdrawFooter view:nth-of-type(1) {
+		background-color: #f0f0f0;
+	}
+
+	.popup-content .withdrawFooter view:nth-of-type(2) {
+		background-color: #1E85FE;
+		color: #FFFFFF;
+	}
+</style>