@dongkboy 11 luni în urmă
părinte
comite
24dacad482

+ 1 - 1
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.103:8080"; //屈晨
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产

+ 2 - 2
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.2.6",
-	"versionCode": 226,
+	"versionName": "2.3.0",
+	"versionCode": 230,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

+ 61 - 0
pages/carInsure2/quote.vue

@@ -405,6 +405,37 @@
 										</view>
 									</view>
 								</template>
+								<template
+									v-if="totalitem.namesimple == '泰康财险' && totalitem.checked && totalitem.agreementId">
+									<view class="accident-style dis f-c ">
+										<view class="dis j-s a-c">
+											<text style="font-weight: bold;font-size: 14px;">意外险</text>
+											<u-switch v-model="totalitem.jychecked" active-color="#0052FF"
+												inactive-color="#eee" size='30'
+												@change="accidentChange($event,totalitem.id,totalitem.cnName,totalindex)"></u-switch>
+										</view>
+										<view class=""
+											v-if="taikangaccidentalDrivingVo.projectCode && totalitem.jychecked">
+											<view class=" accident-ins dis a-c j-s" @click="taikangPopupshow=true">
+												<text>{{taikangaccidentalDrivingVo.projectName}}</text>
+												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
+											</view>
+											<view class=" dis j-s a-c">
+												<view class="">
+													<text>保费:</text>
+													<text
+														style="color: #ee7000;">¥{{taikangaccidentalDrivingVo.sumPremium*taikangaccidentalDrivingVo.quantity}}.00</text>
+												</view>
+												<view class="">
+													<text>份数:</text>
+													<u-number-box v-model="taikangaccidentalDrivingVo.quantity" :min="1"
+														:max="10" :disabled-input="true" :input-width="70"
+														:input-height="44" :long-press="false" size="26"></u-number-box>
+												</view>
+											</view>
+										</view>
+									</view>
+								</template>
 								<template
 									v-if="totalitem.namesimple == '永诚财险' && totalitem.checked && totalitem.agreementId">
 									<view class="accident-style dis f-c ">
@@ -710,6 +741,20 @@
 					<u-radio style="margin: 4px 0;flex: auto;align-items: flex-start;" label-size="30"
 						@change="HNradioChange" shape="square" v-for="(item, index) in huanongInsuranceData"
 						:key="index" :name="item.projectCode">
+						{{item.projectName}}s
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</u-modal>
+		<!-- 泰康驾意险弹框 -->
+		<u-modal v-model="taikangPopupshow" title="驾意险"
+			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
+			:scroll-height="{height: '300px'}" :show-confirm-button="false" mask-close-able>
+			<view class="slot-content">
+				<u-radio-group size="30" wrap>
+					<u-radio style="margin: 4px 0;flex: auto;align-items: flex-start;" label-size="30"
+						@change="TkradioChange" shape="square" v-for="(item, index) in taikangInsuranceData"
+						:key="index" :name="item.projectCode">
 						{{item.projectName}}
 					</u-radio>
 				</u-radio-group>
@@ -981,6 +1026,11 @@
 				huanongPopupshow: false,
 				huanongInsuranceData: [], //华农意外险list
 				huanongaccidentalDrivingVo: [], //华农意外险
+
+				taikangPopupshow: false,
+				taikangInsuranceData: [], //泰康意外险list
+				taikangaccidentalDrivingVo: [], //泰康意外险
+
 				taipingPopupshow: false,
 				taipingInsuranceData: [], //太平意外险list
 				taipingaccidentalDrivingVo: [], //太平意外险
@@ -2280,6 +2330,7 @@
 						case '众安财险':
 						case '太平财险':
 						case '华农财险':
+						case '泰康财险':
 							let Insurancecallback = await this.$http.post(
 								'/api/drivingInsurance/getDrivingInsuranceRule', {
 									agreementId: this.totalCompanyList[index].agreement[0].id,
@@ -2394,6 +2445,10 @@
 				this.taipingaccidentalDrivingVo = this.taipingInsuranceData.find(val => val.projectCode == id)
 				this.taipingPopupshow = false;
 			},
+			TkradioChange(id) {
+				this.taikangaccidentalDrivingVo = this.taikangInsuranceData.find(val => val.projectCode == id)
+				this.taikangPopupshow = false;
+			},
 			//永诚意外险
 			YCradioChange(id) {
 				this.yongchengaccidentalDrivingVo = this.yongchengInsuranceData.find(val => val.projectCode == id)
@@ -3227,6 +3282,7 @@
 					case '中国人寿':
 					case '太平财险':
 					case '华农财险':
+					case '泰康财险':
 						if (!!res.data) {
 							if (res.data.warnMessageList !=
 								null && res.data
@@ -3337,6 +3393,11 @@
 					.totalCompanyList[num].apiType, this
 					.totalCompanyList[num].jychecked);
 			},
+			taikang(num, id) {
+				this.quoteInsurance(num, id, this
+					.totalCompanyList[num].apiType, this
+					.totalCompanyList[num].jychecked);
+			},
 			Lastyear() {
 				this.$refs.lastYearMsgCI.show() // 显示
 			},

+ 6 - 0
pages/carInsure2/quoteDetail.vue

@@ -965,6 +965,10 @@
 						name: "渤海财险",
 						icon: "../../static/insuranceicon/bohai.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				companyId: "", //订单号
 				orderInfo: {},
@@ -1497,6 +1501,7 @@
 						case "中国人寿":
 						case "太平财险":
 						case "华农财险":
+						case "泰康财险":
 							this.pythonprint(); //电子保单
 							break;
 						case "永诚财险":
@@ -2405,6 +2410,7 @@
 					case "中国人寿":
 					case "太平财险":
 					case "华农财险":
+					case "泰康财险":
 						let pythonimage = await this.$http.post(
 							'/insurance/crawler/submitImage', {
 								subOrderNo: this.companyId

+ 1 - 1
pages/index/index.vue

@@ -310,7 +310,7 @@
 			if (this.userInfo.sysUser.headSculpture) {
 				this.avatar = this.$base.baseUrl + this.userInfo.sysUser.headSculpture;
 			} else {
-				this.avatar = "/static/common/avatar.png"
+				this.avatar = "/static/image/my/avatar1.png"
 			}
 			const arr = uni.getStorageSync('historyInfo');
 			if (arr) {

+ 4 - 0
pages/orders1/paymentCode.vue

@@ -181,6 +181,10 @@
 						name: "华农财险",
 						icon: "../../static/insuranceicon/huanong.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				logoimg: "",
 			}

+ 4 - 0
pages/orders1/paymentCode1.vue

@@ -151,6 +151,10 @@
 						name: "华农财险",
 						icon: "../../static/insuranceicon/huanong.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				logoimg: "",
 			}

+ 8 - 4
pages/orders1/quotation.vue

@@ -21,7 +21,7 @@
 					<text class="title">车辆信息</text>
 					<view class="dis j-s a-c">
 						<text>车牌号:</text>
-						<text>{{dataInfo.orderno}}</text>
+						<text>{{dataInfo.licenseno}}</text>
 					</view>
 					<view class="dis j-s a-c">
 						<text>品牌型号:</text>
@@ -52,7 +52,7 @@
 					</view>
 					<view class="dis j-s a-c">
 						<text>投保人身份证号:</text>
-						<text>{{ownerinfo.identifyNumber}}</text>
+						<text>{{applyinfo.identifyNumber}}</text>
 					</view>
 					<view class="dis j-s a-c">
 						<text>被保人姓名:</text>
@@ -60,7 +60,7 @@
 					</view>
 					<view class="dis j-s a-c">
 						<text>被保人身份证号:</text>
-						<text>{{ownerinfo.identifyNumber}}</text>
+						<text>{{insureinfo.identifyNumber}}</text>
 					</view>
 				</view>
 				<view class="information">
@@ -88,7 +88,7 @@
 					</view>
 					<view class="dis j-s a-c">
 						<text>车船税:</text>
-						<text>{{ownerinfo.identifyNumber}}</text>
+						<text>¥{{dataInfo.taxamount}}</text>
 					</view>
 					<view class="dis  f-c j-s " v-if="dataInfo.sypremium">
 						<view class="dis j-s a-c">
@@ -268,6 +268,10 @@
 						name: "渤海财险",
 						icon: "../../static/insuranceicon/bohai.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				logoimg: "",
 			}

+ 4 - 0
pages/orders1/quotation1.vue

@@ -192,6 +192,10 @@
 						name: "华农财险",
 						icon: "../../static/insuranceicon/huanong.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				logoimg: "",
 			}

+ 2 - 2
pages/orders1/quoteHistory.vue

@@ -37,7 +37,7 @@
 				<view class="orders-below dis f-c">
 					<view class="dis a-c j-end">
 						<u-button
-							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险'].includes(item.inscompany)"
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="queryStatus(item.id,item)">查询缴费状态</u-button>
 						<u-button v-if="item.orderstatus==2" size="mini" type="error" :custom-style="{fontSize:'14px'}"
@@ -54,7 +54,7 @@
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="huataiunderwriting(item)">更新订单</u-button>
 						<u-button
-							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险'].includes(item.inscompany)"
 							size="mini" type="error" :plain="true" :custom-style="{fontSize:'14px'}"
 							@click="underwriting(item.id,item.inscompany)">更新订单</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px',background:'#FF5600'}"

+ 2 - 4
pages/orders1/subOrders.vue

@@ -38,7 +38,7 @@
 				<view class="orders-below dis f-c">
 					<view class="dis a-c j-end">
 						<u-button
-							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险','渤海财险','泰康财险'].includes(item.inscompany)"
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="queryStatus(item.id,item)">查询缴费状态</u-button>
 						<u-button v-if="item.orderstatus==2" size="mini" type="error" :custom-style="{fontSize:'14px'}"
@@ -55,7 +55,7 @@
 							size="mini" :custom-style="{fontSize:'14px'}" type="error" :plain="true"
 							@click="huataiunderwriting(item)">更新订单</u-button>
 						<u-button
-							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险'].includes(item.inscompany)"
+							v-if="item.orderstatus==1  && ['中煤财险','永诚财险','国任财险','大家财险','渤海财险','恒邦财险','安盛天平','中国人寿','众安财险','太平财险','华农财险','泰康财险'].includes(item.inscompany)"
 							size="mini" type="error" :plain="true" :custom-style="{fontSize:'14px'}"
 							@click="underwriting(item.id,item.inscompany)">更新订单</u-button>
 						<u-button size="mini" type="primary" :custom-style="{fontSize:'14px',background:'#FF5600'}"
@@ -202,7 +202,6 @@
 			},
 			//付款码
 			Payment(id, type) {
-				console.log(type);
 				let pro = this.quotationType.themeCode;
 				if (pro == "QD") {
 					uni.navigateTo({
@@ -217,7 +216,6 @@
 			//报价单
 			bjdpreview(id) {
 				let pro = this.quotationType.themeCode;
-				console.log(pro);
 				if (pro == "QD") {
 					uni.navigateTo({
 						url: "/pages/orders1/quotation?companyId=" + id

+ 3 - 3
pages/tools/addStaff/addStaff.vue

@@ -35,10 +35,10 @@
 					<image :src="DownloadImg" mode="widthFix" lazy-load style="width: 110px;"></image>
 					<text class="mt-1" style="color: rgba(51, 51, 51, 0.8);">微信扫描二维码</text>
 					<text style="color: rgba(51, 51, 51, 0.8);">即可下载App</text>
-					<view class="invitation dis j-c a-c">
+					<!-- 	<view class="invitation dis j-c a-c">
 						<image src="../../../static/image/addStaff/f4.png" mode=""></image>
-						<text>邀请函</text>
-					</view>
+						<text @click="invitation">邀请函</text>
+					</view> -->
 				</view>
 			</view>
 			<view class="promotion " v-if="sources==2">

+ 1 - 1
pages/tools/messageReminder/messageReminder.vue

@@ -12,7 +12,7 @@
 				<view class="" style="width: 80%;">
 					<view class="dis j-s a-c">
 						<text>{{item.titleType}}</text>
-						<text>{{item.time}}</text>
+						<text>{{item.result.createTime}}</text>
 					</view>
 					<view class="ellipsis">{{item.result.content}}</view>
 				</view>

+ 275 - 29
pages/wallet/bankCard.vue

@@ -15,8 +15,6 @@
 							<text>储蓄卡</text>
 						</view>
 					</view>
-					<image class="tool" src="/static/image/bindBank/tool.png" mode="" @click="del(item.id)">
-					</image>
 				</view>
 				<view class="bank dis j-s a-c">
 					<view>{{item.bankNumber.slice(0,4)}}</view>
@@ -26,8 +24,8 @@
 					<view>{{item.bankNumber.slice(-3)}}</view>
 				</view>
 			</view>
-			<view v-if="current==1" class="bankClass dis a-start f-c j-s" v-for="(item,index) in cardPackList2"
-				:key="index" :style="{background:item.stylelist.background}">
+			<view v-if="current==1 && item.delFlag==0" class="bankClass dis a-start f-c j-s"
+				v-for="(item,index) in cardPackList2" :key="index" :style="{background:item.stylelist.background}">
 				<image class="Backgroundimage" src="/static/image/bindBank/img1.png" mode="" style=""></image>
 				<view class="dis j-s">
 					<view class="dis">
@@ -39,8 +37,13 @@
 							<text>储蓄卡</text>
 						</view>
 					</view>
-					<image class="tool" src="/static/image/bindBank/tool.png" mode="" @click="del(item.id)">
-					</image>
+					<view class="dis ">
+						<image class="tool" src="/static/image/bindBank/xiugai.png" style="margin-right: 12px;" mode=""
+							@click="update(item.id)">
+						</image>
+						<image class="tool" src="/static/image/bindBank/del.png" mode="" @click="del(item.id)">
+						</image>
+					</view>
 				</view>
 				<view class="bank dis j-s a-c">
 					<view>{{item.bankNumber.slice(0,4)}}</view>
@@ -50,28 +53,35 @@
 					<view>{{item.bankNumber.slice(-3)}}</view>
 				</view>
 			</view>
-			<view v-if="current==2" class="bankClass dis a-start f-c j-s" v-for="(item,index) in cardPackList3"
-				:key="index" :style="{background:item.stylelist.background}">
-				<image class="Backgroundimage" src="/static/image/bindBank/img1.png" mode="" style=""></image>
-				<view class="dis j-s">
-					<view class="dis">
-						<view class="logo">
-							<image :src="item.stylelist.logo" mode=""></image>
-						</view>
-						<view class="banktitle dis f-c j-s">
-							<text>{{item.bankAccount}}</text>
-							<text>储蓄卡</text>
-						</view>
+			<view class="" v-if="current==2" v-for="(item,index) in cardPackList3" :key="index">
+				<view class="rejectionReason dis a-start j-start">
+					<view style="width: 5%;margin-top: 2px;">
+						<image src="/static/image/bindBank/bohui.png" mode="" style="width: 14px;height: 14px;">
+						</image>
 					</view>
-					<image class="tool" src="/static/image/bindBank/tool.png" mode="" @click="del(item.id)">
-					</image>
+					<view style="width: 95%;">
+						驳回原因:{{item.remark?item.remark:'无'}}</view>
 				</view>
-				<view class="bank dis j-s a-c">
-					<view>{{item.bankNumber.slice(0,4)}}</view>
-					<view>{{item.bankNumber.slice(4,8)}}</view>
-					<view>{{item.bankNumber.slice(8,12)}}</view>
-					<view>{{item.bankNumber.slice(12,16)}}</view>
-					<view>{{item.bankNumber.slice(-3)}}</view>
+				<view class="bankClass dis a-start f-c j-s" :style="{background:item.stylelist.background}">
+					<image class="Backgroundimage" src="/static/image/bindBank/img1.png" mode="" style=""></image>
+					<view class="dis j-s">
+						<view class="dis">
+							<view class="logo">
+								<image :src="item.stylelist.logo" mode=""></image>
+							</view>
+							<view class="banktitle dis f-c j-s">
+								<text>{{item.bankAccount}}</text>
+								<text>储蓄卡</text>
+							</view>
+						</view>
+					</view>
+					<view class="bank dis j-s a-c">
+						<view>{{item.bankNumber.slice(0,4)}}</view>
+						<view>{{item.bankNumber.slice(4,8)}}</view>
+						<view>{{item.bankNumber.slice(8,12)}}</view>
+						<view>{{item.bankNumber.slice(12,16)}}</view>
+						<view>{{item.bankNumber.slice(-3)}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -82,9 +92,37 @@
 		</view>
 		<u-modal v-model="deleteshow" :show-cancel-button='true' @confirm="delbankCard">
 			<view class="slot-content dis a-c j-c" style="padding: 10px;">
-				<span style="font-weight: bold;">点击确认删除银行卡</span>
+				<span style="font-weight: bold;">点击确定解绑银行卡</span>
 			</view>
 		</u-modal>
+		<u-popup mode="bottom" v-model="promptShow" width="100%" height="50%" border-radius="14" :closeable="true">
+			<view style="padding: 16px;">
+				<view class="binding dis f-c a-c ">
+					<view class="title dis f-c a-c ">
+						<text>修改银行卡信息</text>
+						<text>请填写本人的银行卡信息</text>
+					</view>
+					<view class="formInfo">
+						<u-field v-model="form.bankNumber" @blur="validateBankCard" :field-style="{textAlign:'right'}"
+							label="银行卡" placeholder="请输入银行卡卡号">
+						</u-field>
+						<u-field v-model="form.realUserName" :field-style="{textAlign:'right'}" label="本人姓名"
+							placeholder="输入真实姓名">
+						</u-field>
+						<u-field @click="showAction" v-model="form.bankAccount" :field-style="{textAlign:'right'}"
+							label="选择银行" placeholder="点击选择银行">
+						</u-field>
+						<u-field v-model="form.bankAddress" :field-style="{textAlign:'right'}" label="开户行"
+							placeholder="输入开户行">
+						</u-field>
+					</view>
+					<u-button class="mt-5" type="primary"
+						style="background-color:#0052FF ;font-weight: bold;width: 100%;" @tap="updateSubmit">
+						点击修改</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-select v-model="show" :list="bnklist" @confirm="confirm"></u-select>
 	</view>
 </template>
 
@@ -92,6 +130,107 @@
 	export default {
 		data() {
 			return {
+				show: false,
+				bnklist: [{
+						value: '1',
+						label: '中国工商银行'
+					},
+					{
+						value: '2',
+						label: '中国农业银行'
+					},
+					{
+						value: '3',
+						label: '中国银行'
+					},
+					{
+						value: '4',
+						label: '中国建设银行'
+					},
+					{
+						value: '5',
+						label: '交通银行'
+					},
+					{
+						value: '6',
+						label: '中国邮政储蓄银行'
+					},
+					{
+						value: '7',
+						label: '招商银行'
+					},
+					{
+						value: '8',
+						label: '中信银行'
+					},
+					{
+						value: '9',
+						label: '中国光大银行'
+					},
+					{
+						value: '10',
+						label: '华夏银行'
+					},
+					{
+						value: '11',
+						label: '中国民生银行'
+					},
+					{
+						value: '12',
+						label: '广发银行'
+					},
+					{
+						value: '13',
+						label: '平安银行'
+					},
+					{
+						value: '14',
+						label: '上海浦东发展银行'
+					},
+					{
+						value: '15',
+						label: '兴业银行'
+					},
+					{
+						value: '16',
+						label: '浙商银行'
+					},
+					{
+						value: '17',
+						label: '渤海银行'
+					},
+					{
+						value: '18',
+						label: '恒丰银行'
+					},
+					{
+						value: '19',
+						label: '北京银行'
+					},
+					{
+						value: '20',
+						label: '上海银行'
+					},
+					{
+						value: '21',
+						label: '晋商银行'
+					},
+					{
+						value: '22',
+						label: '山西银行'
+					},
+					{
+						value: '23',
+						label: '农村商业银行'
+					},
+				],
+				form: {
+					bankNumber: "",
+					realUserName: "",
+					bankAccount: "",
+					bankAddress: "",
+				},
+				promptShow: false,
 				id: "",
 				deleteshow: false,
 				list: [{
@@ -102,6 +241,7 @@
 					name: '驳回',
 				}],
 				current: 1,
+				validateBankCardStatus: false, //银行卡验证状态
 				bankNumber: "",
 				cardPackList1: [],
 				cardPackList2: [],
@@ -166,6 +306,16 @@
 						logo: "/static/image/bankLogo/jinshang.png",
 						background: "linear-gradient(90deg, rgba(224, 150, 165, 0.7) 0%, #e096a5 100%)"
 					},
+					{
+						bankName: "山西银行",
+						logo: "/static/image/bankLogo/shanxi.png",
+						background: "linear-gradient(90deg, rgba(192, 19, 73, 0.7) 0%, #c01349 100%)"
+					},
+					{
+						bankName: "农村商业银行",
+						logo: "/static/image/bankLogo/nongcun.png",
+						background: "linear-gradient(90deg, rgba(0, 155, 77, 0.7) 0%, #009b4d 100%)"
+					},
 				],
 			}
 		},
@@ -174,6 +324,57 @@
 		},
 		onLoad() {},
 		methods: {
+			async updateSubmit() {
+				let res = await this.$http.put('/userBank/update', this.form);
+				if (res.code == '200') {
+					this.promptShow = false;
+					uni.showToast({
+						title: res.msg,
+						icon: "none"
+					});
+
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: "none"
+					});
+				}
+			},
+			confirm(e) {
+				this.form.bankAccount = e[0].label;
+			},
+			showAction() {
+				this.show = true;
+			},
+			// 验证银行卡
+			async validateBankCard() {
+				var that = this;
+				that.form.bankAccount = "";
+				await bankBin.getBankBin(this.accountno)
+					.then((data) => {
+						that.form.bankAccount = data.bankName;
+						that.validateBankCardStatus = true;
+						return true;
+					})
+					.catch((err) => {
+						that.validateBankCardStatus = false;
+						return uni.showToast({
+							title: err.split(":")[1],
+							icon: "none"
+						});
+					})
+			},
+			async update(id) {
+				let res = await this.$http.get('/userBank/getByBankId?id=' + id);
+				if (res.code == '200') {
+					this.form.id = res.data.id;
+					this.form.bankNumber = res.data.bankNumber;
+					this.form.realUserName = res.data.realUserName;
+					this.form.bankAccount = res.data.bankAccount;
+					this.form.bankAddress = res.data.bankAddress;
+					this.promptShow = true;
+				}
+			},
 			change(index) {
 				this.current = index;
 			},
@@ -223,8 +424,12 @@
 				this.id = id;
 				this.deleteshow = true;
 			},
+
 			async delbankCard() {
-				let res = await this.$http.delete('/userBank/' + this.id);
+				let res = await this.$http.post('/userBank/unbind', {
+					id: this.id,
+					delFlag: '1',
+				});
 				if (res.code == '200') {
 					this.getcardPack();
 					uni.showToast({
@@ -239,6 +444,47 @@
 </script>
 
 <style lang="scss" scoped>
+	.binding {
+		padding: 16px;
+
+		.title {
+			font-size: 14px;
+			color: #333333;
+
+			text:first-child {
+				font-size: 20px;
+				font-weight: bold;
+			}
+		}
+
+		.formInfo {
+			margin-top: 18px;
+			width: 100%;
+			background: #FFFFFF;
+			box-shadow: 0px 4px 10px 0px #DAE3F4;
+			border-radius: 6px;
+
+
+		}
+
+
+	}
+
+	.rejectionReason {
+		width: 100%;
+		height: auto;
+		padding: 5px;
+		background: rgba(255, 15, 0, 0.1);
+		border-radius: 8px 8px 8px 8px;
+		margin-bottom: 5px;
+
+
+		>view {
+			color: #DC0D00;
+			font-size: 12px;
+		}
+	}
+
 	page {
 		background-color: #fff;
 	}
@@ -302,7 +548,7 @@
 		}
 
 		.tool {
-			width: 28px;
+			width: 20px;
 			height: 20px;
 		}
 

+ 4 - 0
pages/wallet/billInfo1.vue

@@ -906,6 +906,10 @@
 						name: "渤海财险",
 						icon: "../../static/insuranceicon/bohai.png"
 					},
+					{
+						name: "泰康财险",
+						icon: "../../static/insuranceicon/taikang.png"
+					},
 				],
 				companyId: "", //订单号
 				orderInfo: {},

+ 17 - 1
pages/wallet/bindBank.vue

@@ -10,6 +10,8 @@
 				<u-field v-model="accountno" @blur="validateBankCard" :field-style="{textAlign:'right'}" label="银行卡"
 					placeholder="请输入银行卡卡号">
 				</u-field>
+				<u-field v-model="realUserName" :field-style="{textAlign:'right'}" label="本人姓名" placeholder="输入真实姓名">
+				</u-field>
 				<u-field @click="showAction" v-model="bankname" :field-style="{textAlign:'right'}" label="选择银行"
 					placeholder="点击选择银行">
 				</u-field>
@@ -47,7 +49,8 @@
 				promptShow: false,
 				bankname: "", //银行名称
 				accountno: "", //银行卡账号
-				bankAddress: "",
+				bankAddress: "", //开户行
+				realUserName: "", //真实姓名
 				disabled: true,
 				show: false,
 				list: [{
@@ -130,6 +133,18 @@
 						value: '20',
 						label: '上海银行'
 					},
+					{
+						value: '21',
+						label: '晋商银行'
+					},
+					{
+						value: '22',
+						label: '山西银行'
+					},
+					{
+						value: '23',
+						label: '农村商业银行'
+					},
 				],
 				validateBankCardStatus: false, //银行卡验证状态
 			}
@@ -191,6 +206,7 @@
 				}
 				var params = {
 					"bankNumber": this.accountno,
+					"realUserName": this.realUserName,
 					"bankAccount": this.bankname,
 					"bankAddress": this.bankAddress,
 					"isDefault": 0,

+ 1 - 0
pages/wallet/wallet.vue

@@ -114,6 +114,7 @@
 			async toWithdraw() {
 				let res = await this.$http.post('/userBank/getUserBankList', {
 					auditStatus: '1',
+					delFlag: '0'
 				});
 				if (res.data.length) {
 					this.navigate({

+ 33 - 20
pages/wallet/withdraw.vue

@@ -20,7 +20,7 @@
 			<text style="font-size: 15px;color: #333;">提现金额</text>
 			<view class="input-money">
 				<text class="rmb">¥</text>
-				<input v-model.number="extract" type="text" @input="arrinput" class="t-input" />
+				<input v-model.number="extract" disabled type="text" @input="arrinput" class="t-input" />
 			</view>
 			<view class="info-money">
 				<view v-if="is_out">
@@ -40,7 +40,7 @@
 						<view class="keyboard-item" @tap="keyboradKey(index + 1)">{{ index + 1 }}</view>
 					</block>
 					<view class="keyboard-item" style="width: 66%;" @tap="keyboradKey(0)"><text>0</text></view>
-					<view class="keyboard-item ">.</view>
+					<view class="keyboard-item " @tap="keyboradKey('.')">.</view>
 				</view>
 				<view class="dis f-c j-s" style="margin-left: 8px;width: 20%;">
 					<view class="keyboard-item " @tap="keyboradDel()" style="width: 100%;">
@@ -118,17 +118,17 @@
 					},
 					{
 						bankName: "中国工商银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/gongshang.png",
 						background: "linear-gradient(90deg, rgba(177, 0, 13, 0.7) 0%, #b1000d 100%)"
 					},
 					{
 						bankName: "中国农业银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/nongye.png",
 						background: "linear-gradient(90deg, rgba(86,152, 130, 0.7) 0%, #569882 100%)"
 					},
 					{
 						bankName: "中国银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/zhongguo.png",
 						background: "linear-gradient(90deg, rgba(157, 32, 40, 0.7) 0%, #9d2028 100%)"
 					},
 					{
@@ -138,35 +138,49 @@
 					},
 					{
 						bankName: "招商银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/zhaoshang.png",
 						background: "linear-gradient(90deg, rgba(197, 0, 25, 0.7) 0%, #c50019 100%)"
 					},
 					{
 						bankName: "中国民生银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/minsheng.png",
 						background: "linear-gradient(90deg, rgba(84,149, 92, 0.7) 0%, #54955c 100%)"
 					},
 					{
 						bankName: "中国光大银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/guangda.png",
 						background: "linear-gradient(90deg, rgba(93, 30, 131, 0.7) 0%, #5d1e83 100%)"
 					},
 					{
 						bankName: "中信银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/zhongxin.png",
 						background: "linear-gradient(90deg, rgba(184, 0,22, 0.7) 0%, #b80016 100%)"
 					},
 					{
 						bankName: "华夏银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/huaxia.png",
 						background: "linear-gradient(90deg, rgba(216, 12, 24, 0.7) 0%, #d80c18 100%)"
 					},
 					{
 						bankName: "中国交通银行",
-						logo: "/static/image/bankLogo/youzheng.png",
+						logo: "/static/image/bankLogo/jiaotong.png",
 						background: "linear-gradient(90deg, rgba(33, 58, 120, 0.7) 0%, #213a78 100%)"
 					},
-
+					{
+						bankName: "晋商银行",
+						logo: "/static/image/bankLogo/jinshang.png",
+						background: "linear-gradient(90deg, rgba(224, 150, 165, 0.7) 0%, #e096a5 100%)"
+					},
+					{
+						bankName: "山西银行",
+						logo: "/static/image/bankLogo/shanxi.png",
+						background: "linear-gradient(90deg, rgba(192, 19, 73, 0.7) 0%, #c01349 100%)"
+					},
+					{
+						bankName: "农村商业银行",
+						logo: "/static/image/bankLogo/nongcun.png",
+						background: "linear-gradient(90deg, rgba(0, 155, 77, 0.7) 0%, #009b4d 100%)"
+					},
 				],
 				lowest: 0, //最低提现金额
 				amount: 500, //可提现余额
@@ -214,6 +228,7 @@
 			async getbankCard() {
 				let res = await this.$http.post('/userBank/getUserBankList', {
 					auditStatus: "1",
+					delFlag: '0'
 				});
 				this.bankList.map(val => {
 					res.data.map(ele => {
@@ -243,16 +258,14 @@
 			},
 			//输入事件
 			keyboradKey(key) {
-				this.extract = this.extract * 10 + key;
+				// this.extract = this.extract * 10 + key;
+				this.extract += key;
 				this.checkMoney();
 			},
 			//键盘递减事件
 			keyboradDel() {
-				if (this.extract && this.extract > 0) {
-					let val = parseInt(this.extract / 10);
-					this.extract = val;
-					this.checkMoney();
-				}
+				if (this.extract.length) this.extract = this.extract.substr(0, this.extract.length - 1);
+				this.checkMoney();
 			},
 			//全部提现
 			getAll() {
@@ -279,10 +292,10 @@
 			},
 			//金额计算
 			checkMoney() {
-				if (!this.extract || this.extract < this.lowest) {
+				if (!this.extract || parseFloat(this.extract) < parseFloat(this.lowest)) {
 					this.is_lowest = true;
 					this.is_post = false;
-				} else if (this.extract > this.amount) {
+				} else if (parseFloat(this.extract) > parseFloat(this.amount)) {
 					this.is_out = true;
 					this.is_lowest = false;
 					this.is_post = false;

BIN
static/image/bankLogo/nonhcun.png


BIN
static/image/bankLogo/shanxi.png


BIN
static/image/bindBank/bohui.png


BIN
static/image/bindBank/del.png


BIN
static/image/bindBank/tool.png


BIN
static/image/bindBank/xiugai.png


BIN
static/insuranceicon/taikang.png