@dongkboy il y a 1 an
Parent
commit
90105772e7

+ 1 - 1
components/modules/tools/team/swiper-tab.vue

@@ -4,7 +4,7 @@
 			<block v-for="(tab,index) in tabBars" :key="index">
 				<view class="scroll-view-item scroll-item" :class="{'active':tabIndex==index}" @tap="tabtap(index)">
 					<view class="d-flex a-center j-center">{{tab.name}}</view>
-					<view class="d-flex a-center j-center">({{tab.personNum}}人,{{tab.orderNum}}单)</view>
+					<view class="d-flex a-center j-center">({{tab.teamnum}}人)</view>
 				</view>
 			</block>
 		</scroll-view>

+ 8 - 8
config/baseUrl.js

@@ -3,20 +3,20 @@ let h5BaseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://39.98.239.48/web-api"; //测试
-	// h5BaseUrl = "http://39.98.239.48/h5";
+	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
+	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "http://192.168.0.253:8082";
 	// baseUrl = "http://192.168.0.115:8080"; //凯森
-	baseUrl = "http://sxzgkj.baoxianzhanggui.com/web-api"; //正式
-	h5BaseUrl = "http://sxzgkj.baoxianzhanggui.com/h5";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //正式
+	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	// baseUrl = "http://39.98.239.48/web-api"; //测试
-	// h5BaseUrl = "http://39.98.239.48/h5";
+	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
+	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "http://192.168.0.115:8080"; //凯森
-	baseUrl = "http://sxzgkj.baoxianzhanggui.com/web-api"; //正式
-	h5BaseUrl = "http://sxzgkj.baoxianzhanggui.com/h5";
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //正式
+	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 }
 const courtConfig = {

+ 9 - 0
config/login.js

@@ -187,6 +187,15 @@ async function getLoginUserInfo(token, userId) {
 		title: 'token',
 		data: Author
 	})
+	let Institutionalsources = await $http.get('/recruiting/queryType', {}, {
+		header: {
+			Authorization: Author,
+		}
+	});
+	store.commit('setUserModules', {
+		title: 'sources',
+		data: Institutionalsources.data
+	})
 	// if (userInfoRes.data.name == '游客') {
 	// 	uni.reLaunch({
 	// 		url: "/pages/user/certify"

+ 2 - 2
manifest.json

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

+ 4 - 0
pages/carInsure1/carInfo1.vue

@@ -53,6 +53,10 @@
 					<input class="uni-input-input textColor" placeholder="请输入功率" v-model="carInfo.powerScale"
 						placeholder-style="font-size:28upx" />
 				</uni-forms-item>
+				<uni-forms-item label="整备质量: ">
+					<input class="uni-input-input textColor" placeholder="请输入功率" v-model="carInfo.completeKerbMass"
+						placeholder-style="font-size:28upx" />
+				</uni-forms-item>
 				<uni-forms-item label="新车购置价: " required name="purchasePrice">
 					<input class="uni-input-input textColor" placeholder="请输入新车购置价" v-model="carInfo.purchasePrice"
 						placeholder-style="font-size:28upx"

+ 3 - 3
pages/carInsure1/insureItems1.vue

@@ -135,7 +135,7 @@
 						@click="systartShow = true"></u-input>
 					<u-picker v-model="systartShow" mode="time" :params="params" @confirm="systartconfirm"></u-picker>
 				</u-form-item>
-				<u-form-item label="商业险保日期" class="modelformcss">
+				<u-form-item label="商业险保日期" class="modelformcss">
 					<u-input type="select" :select-open="syendShow" v-model="syendDate" placeholder="请选择开始时间"
 						@click="syendShow = true"></u-input>
 					<u-picker v-model="syendShow" mode="time" :params="params" @confirm="syendconfirm"></u-picker>
@@ -160,7 +160,7 @@
 					</view>
 				</template>
 			</block>
-			<view v-if="insureCodeList.length>0">
+			<!-- 	<view v-if="insureCodeList.length>0">
 				<view class="car-ins-cell d-flex j-sb common-ins-cell" style="border:none;">
 					<view class="cell-title d-flex a-center j-center">增值服务</view>
 					<view class="cell-desc d-flex a-center j-center">赠送</view>
@@ -168,7 +168,7 @@
 				<view
 					style="margin:0 30upx 30upx; padding: 15upx;color: #A6A6A6;font-size: 24upx;background-color: #F8FAFC;">
 					注:包含道路救援/安全检测/代为驾驶/代为送检,投保以上商业主0险免费赠送,各家保司各个地区旅游差异,具体以保单信息为准</view>
-			</view>
+			</view> -->
 		</view>
 
 		<view>

+ 88 - 5
pages/carInsure1/payCode1.vue

@@ -4,11 +4,13 @@
 		<public-module></public-module>
 		<view class="panel" id="panelcanvas">
 			<view class="header">请扫描下方二维码进行付款</view>
-			<view class="d-flex a-center j-center" style="margin-bottom: 20upx;color: #f00;" v-show="paycodeimg">
-				<!-- <text>该二维码将于 {{endDateTime}} 失效</text> -->
-			</view>
-			<view class="d-flex a-center j-center qrcode">
+			<!-- <view class="d-flex a-center j-center" style="margin-bottom: 20upx;color: #f00;" v-show="paycodeimg">
+				<text>该二维码将于 {{endDateTime}} 失效</text>
+			</view> -->
+			<view class="d-flex a-center j-center qrcode" style="position: relative;">
 				<image :src="paycodeimg" mode="widthFix"></image>
+				<image :src="logoimg" mode="" style="width: 30px;height: 30px;position: absolute;margin: 0 auto;">
+				</image>
 			</view>
 			<view class="row d-flex">
 				<view>投保人</view>
@@ -47,10 +49,18 @@
 				<view>交强起保日期</view>
 				<view>{{jqStartDate}}</view>
 			</view>
+			<view v-if="jqStartDate" class="row d-flex">
+				<view>交强终保日期</view>
+				<view>{{jqEndDate}}</view>
+			</view>
 			<view v-if="syStartDate" class="row d-flex">
 				<view>商业起保日期</view>
 				<view>{{syStartDate}}</view>
 			</view>
+			<view v-if="syStartDate" class="row d-flex">
+				<view>商业终保日期</view>
+				<view>{{sysEndDate}}</view>
+			</view>
 		</view>
 		<!-- #ifdef APP-PLUS -->
 		<view class="tip d-flex a-center j-center" @tap="sendPayCode">发送到微信</view>
@@ -59,7 +69,6 @@
 		<canvas id="mycanvas" ref="mycanvas" canvas-id="mycanvas" style="width: 1080px;height: 1680px;"></canvas>
 	</view>
 </template>
-
 <script>
 	import {
 		mapState,
@@ -87,9 +96,65 @@
 				taxamount: "",
 				jypremium: "",
 				jqStartDate: "",
+				jqEndDate: "",
 				syStartDate: "",
+				sysEndDate: "",
 				arr: false,
 				posterUrl: "",
+				insCompanyList: [{
+						name: "中煤财险",
+						icon: "../../static/insuranceicon/zhongmei.png"
+					}, //华农
+					{
+						name: "恒邦财险",
+						icon: "../../static/insuranceicon/hengbang.png"
+					},
+					{
+						name: "安盛天平",
+						icon: "../../static/insuranceicon/ansheng.png"
+					},
+					{
+						name: "中国人寿",
+						icon: "../../static/insuranceicon/renshou.png"
+					},
+					{
+						name: "众安财险",
+						icon: "../../static/insuranceicon/zhongan.png"
+					},
+					{
+						name: "永诚财险",
+						icon: "../../static/insuranceicon/yongcheng.png"
+					},
+					{
+						name: "永安财险",
+						icon: "../../static/insuranceicon/yongan.png"
+					},
+					{
+						name: "紫金财险",
+						icon: "../../static/insuranceicon/zijin.png"
+					},
+					{
+						name: "国任财险",
+						icon: "../../static/insuranceicon/guoren.png"
+					},
+					{
+						name: "华泰财险",
+						icon: "../../static/insuranceicon/huatai.png"
+					},
+					{
+						name: "大家财险",
+						icon: "../../static/insuranceicon/dajia.png"
+					},
+					{
+						name: "太平财险",
+						icon: "../../static/insuranceicon/taiping.png"
+					},
+					{
+						name: "华农财险",
+						icon: "../../static/insuranceicon/huanong.png"
+					},
+				],
+				logoimg: "",
 			}
 		},
 		computed: {
@@ -116,7 +181,9 @@
 					this.taxamount = res.data.taxamount; // 车船税
 					this.jypremium = res.data.jypremium; // 驾意险
 					this.jqStartDate = res.data.jqStartDate; // 交强起保日期
+					this.jqEndDate = res.data.jqEndDate; // 交强起保日期
 					this.syStartDate = res.data.syStartDate; // 商业起保日期
+					this.sysEndDate = res.data.sysEndDate; // 商业起保日期
 					if (this.companyName == '太平财险') {
 						let result = res.data.qrCodeUrl.replace(/[\r\n]/g, "");
 						let imgBase64 = `data:image/png;base64,${result}`;
@@ -129,6 +196,22 @@
 							size: parseInt(300) //二维码大小  
 						})
 					}
+					this.insCompanyList.map(ele => {
+						if (ele.name == res.data.inscompany) {
+							uni.getImageInfo({
+								src: ele.icon,
+								success: image => {
+									pathToBase64(image.path)
+										.then(base64 => {
+											this.logoimg = base64;
+										})
+										.catch(error => {});
+								},
+								fail: err => {}
+							});
+						}
+						return ele;
+					})
 
 				} else {
 					uni.showModal({

+ 168 - 115
pages/carInsure1/quote1.vue

@@ -95,15 +95,16 @@
 				<view class="header dis a-c j-s">
 					<view class="title  d-flex">精选保险公司<view class="icon iconfont icon-Group-"></view>
 					</view>
-					<view class="">
+					<!-- 	<view class="">
 						<u-checkbox v-model="Selectchecked" @change="SelectAll($event)"
 							active-color="rgb(250, 53, 52)">全选</u-checkbox>
-					</view>
+					</view> -->
 				</view>
 				<block v-for="(totalitem,totalindex) in totalCompanyList" :key="totalindex">
 					<template>
 						<view class="quoteCompanyItem">
 							<view class="top dis  f-c">
+
 								<ls-loading v-show="totalitem.quoteCode==1" text="掌柜正在为您报价,请稍等......"
 									:animation="animation" fontSize="22" />
 								<view class="companyIcon dis j-s  a-c">
@@ -136,7 +137,6 @@
 								</view>
 								<view v-show="totalitem.quoteCode==200" class="dis Premium  f-wrap"
 									style="font-size: 12px;color: #6495ed;border-top: 1px solid #f2f2f2;">
-
 									<text
 										v-if="totalitem.result.jqPremium">交强险:{{totalitem.result.startDateJq}}~{{totalitem.result.endDateJq}}
 
@@ -188,6 +188,11 @@
 											:hair-line="false" @click="guoRencontributing(totalitem.agreementId)"
 											style="margin-left: 10px;">特约选择</u-button>
 									</view>
+									<u-form-item label="自主定价系数" v-if="totalitem.namesimple == '紫金财险'"
+										placeholder="请输入数字" label-width="200" :border-bottom='false'
+										style="padding: 0;">
+										<u-input type="number" v-model="totalitem.coefficient"></u-input>
+									</u-form-item>
 									<text
 										style="color: #ff9000;font-weight: bold;">{{totalitem.underwritingDescription}}</text>
 								</view>
@@ -219,6 +224,38 @@
 											</view>
 
 
+										</view>
+									</view>
+								</template>
+								<template
+									v-if="totalitem.namesimple == '中煤财险' && totalitem.checked && totalitem.agreementId && zhongmeiaccidentalDrivingVo.rideRiskCode">
+									<view class="accident-style dis f-c ">
+										<text style="font-weight: bold;font-size: 12px;">意外险信息</text>
+										<view class=" accident-ins dis a-c j-s">
+											<u-checkbox shape="circle" size="30" v-model="totalitem.jychecked"
+												@change="checkboxChangeInfo($event,totalindex)"
+												active-color="rgb(255, 170, 0)"></u-checkbox>
+											<view class=" dis a-c j-s " @click="zhongmeiPopupshow=true">
+												<text
+													style="font-size: 14px;">{{zhongmeiaccidentalDrivingVo.rideRiskName}}</text>
+												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
+											</view>
+										</view>
+										<view class=" dis j-s a-c">
+											<view class="">
+												<text style="font-size: 14px;">保费:</text>
+												<text
+													style="font-size: 14px;color: #ee7000;">¥{{zhongmeiaccidentalDrivingVo.unitPremium*zhongmeiaccidentalDrivingVo.quantity}}</text>
+											</view>
+											<view class="">
+												<text style="font-size: 14px;">份数:</text>
+												<u-number-box v-model="zhongmeiaccidentalDrivingVo.quantity" :min="1"
+													:max="Number(zhongmeiaccidentalDrivingVo.maxQuantity)"
+													:disabled-input="true" :input-width="70" :input-height="44"
+													size="26"></u-number-box>
+											</view>
+
+
 										</view>
 									</view>
 								</template>
@@ -332,6 +369,27 @@
 										</view>
 									</view>
 								</template>
+								<template
+									v-if="totalitem.namesimple == '华农财险' && totalitem.checked && totalitem.agreementId && huanongaccidentalDrivingVo.planCode">
+									<view class="accident-style dis f-c ">
+										<text style="font-weight: bold;font-size: 12px;">意外险信息</text>
+										<view class=" accident-ins dis a-c j-s">
+											<u-checkbox shape="circle" size="30" v-model="totalitem.jychecked"
+												@change="checkboxChangeInfo($event,totalindex)"
+												active-color="rgb(255, 170, 0)"></u-checkbox>
+											<view class=" dis a-c j-s " @click="huanongPopupshow=true">
+												<text
+													style="font-size: 14px;">{{huanongaccidentalDrivingVo.planName}}</text>
+												<u-icon name="arrow-right" style="color: #999;" size="24"></u-icon>
+											</view>
+										</view>
+										<view class=" dis j-s a-c">
+											<text style="font-size: 14px;">份数:</text>
+											<u-number-box v-model="huanongaccidentalDrivingVo.allQuantity" :min="1"
+												:input-width="70" :input-height="44" size="26"></u-number-box>
+										</view>
+									</view>
+								</template>
 								<template
 									v-if="totalitem.namesimple == '永诚财险' && totalitem.checked && totalitem.agreementId && yongchengaccidentalDrivingVo.rideRiskCode">
 									<view class="accident-style dis f-c ">
@@ -514,6 +572,17 @@
 				</u-radio-group>
 			</view>
 		</u-popup>
+		<!-- 中煤驾意险弹框 -->
+		<u-popup v-model="zhongmeiPopupshow" mode="center" width="70%" 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;" @change="ZMradioChange"
+						v-for="(item, index) in zhongmeiInsuranceData" :key="index" :name="item.rideRiskCode">
+						{{item.rideRiskName}}
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</u-popup>
 		<!-- 恒邦驾意险弹框 -->
 		<u-popup v-model="hengbangPopupshow" mode="center" width="80%" border-radius="10">
 			<view class="popContent dis f-c a-c">
@@ -536,6 +605,17 @@
 				</u-radio-group>
 			</view>
 		</u-popup>
+		<!-- 华农驾意险弹框 -->
+		<u-popup v-model="huanongPopupshow" mode="center" width="50%" 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="HNradioChange"
+						v-for="(item, index) in huanongInsuranceData" :key="index" :name="item.planCode">
+						{{item.planName}}
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</u-popup>
 		<u-popup v-model="yongchengPopupshow" mode="center" width="50%" border-radius="10">
 			<view class="popContent dis f-c a-c">
 				<u-radio-group size="30" active-color="rgb(255, 170, 0)">
@@ -670,6 +750,11 @@
 		},
 		data() {
 			return {
+				shadowStyle: {
+					backgroundImage: "none",
+					paddingTop: "0",
+					marginTop: "20rpx"
+				},
 				Selectchecked: false,
 				params: {
 					year: true, //年
@@ -680,9 +765,15 @@
 					second: true, //秒
 				},
 				Generateshow: false,
+				zhongmeiPopupshow: false,
+				zhongmeiInsuranceData: [], //中煤意外险list
+				zhongmeiaccidentalDrivingVo: [], //中煤意外险
 				zijinPopupshow: false,
 				zijinInsuranceData: [], //紫金意外险list
 				zijinaccidentalDrivingVo: [], //紫金意外险
+				huanongPopupshow: false,
+				huanongInsuranceData: [], //华农意外险list
+				huanongaccidentalDrivingVo: [], //华农意外险
 				taipingPopupshow: false,
 				taipingInsuranceData: [], //太平意外险list
 				taipingaccidentalDrivingVo: [], //太平意外险
@@ -1359,7 +1450,6 @@
 				const eventChannel = this.getOpenerEventChannel()
 				// 监听acceptData事件,获取上一页面通过eventChannel传送到当前页面的数据
 				eventChannel.on('acceptData', async (data) => {
-					console.log(data)
 					this.carInfo = data.carInfo; //车辆信息
 					this.ownerInfo = data.ownerInfo; //车主信息
 					this.policyHolderInfo = data.policyHolderInfo; //投保人信息
@@ -1448,13 +1538,13 @@
 			uni.setStorageSync('historyInfo', res);
 		},
 		methods: {
-			SelectAll(e) {
-				this.totalCompanyList.map((ele, index) => {
-					e.value ? ele.checked = true : ele.checked = false;
-					this.checkboxChange(e, ele.id, ele.cnName, index)
+			// SelectAll(e) {
+			// 	this.totalCompanyList.map((ele, index) => {
+			// 		e.value ? ele.checked = true : ele.checked = false;
+			// 		this.checkboxChange(e, ele.id, ele.cnName, index)
 
-				})
-			},
+			// 	})
+			// },
 			jqstartconfirm(e) {
 				this.jqstartDate = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second;
 				this.jqendDate = this.oneYearPast(this.jqstartDate)
@@ -1699,6 +1789,7 @@
 									policyNum: Number(grcallback1.data[0].policyNum), //最大份数
 								}
 							}
+
 							break;
 						case '大家财险':
 							let djcallback = await this.$http.post('/api/dajia/accidentalDrivingList', {
@@ -1719,20 +1810,49 @@
 								};
 							}
 							break;
+						case '中煤财险':
+							let zmcallback = await this.$http.post('/order/zhongMeiApi/queryRideAccident', {
+								agreementId: this.totalCompanyList[index].agreement[0].id,
+								seatNum: Number(this.carInfo.seatCount)
+							});
+							if (zmcallback.code == '200') {
+								let data = zmcallback.data;
+								data.map(ele => {
+									ele.quantity = 1;
+									return ele;
+								})
+								this.zhongmeiInsuranceData = data;
+								this.zhongmeiaccidentalDrivingVo = {
+									rideRiskCode: data[0].rideRiskCode,
+									rideRiskName: data[0].rideRiskName,
+									quantity: data[0].quantity,
+									maxQuantity: data[0].maxQuantity,
+									unitPremium: data[0].unitPremium,
+								};
+							}
+							break;
 						case '中国人寿':
 						case '恒邦财险':
 						case '众安财险':
 						case '太平财险':
+						case '华农财险':
 							let Insurancecallback = await this.$http.post(
 								'/insurance/crawler/getDrivingInsurance', {
 									agreementId: this.totalCompanyList[index].agreement[0].id
 								});
 							if (Insurancecallback.code == 200) {
 								let data = Insurancecallback.data;
-								data.map(ele => {
-									ele.quantity = 1;
-									return ele;
-								})
+								if (ins == '华农财险') {
+									data.map(ele => {
+										ele.allQuantity = 1;
+										return ele;
+									})
+								} else {
+									data.map(ele => {
+										ele.quantity = 1;
+										return ele;
+									})
+								}
 								this[name + "InsuranceData"] = data;
 								this[name + 'accidentalDrivingVo'] = data[0];
 							}
@@ -1740,13 +1860,26 @@
 						default:
 							break;
 					}
+
 				} else {}
+
 			},
 			//驾意险勾选框
 			checkboxChangeInfo(event, index) {
 				this.totalCompanyList[index].jychecked = event.value;
 			},
-
+			//中煤
+			ZMradioChange(id) {
+				let info = this.zhongmeiInsuranceData.find(val => val.rideRiskCode == id)
+				this.zhongmeiaccidentalDrivingVo = {
+					rideRiskCode: info.rideRiskCode,
+					rideRiskName: info.rideRiskName,
+					quantity: info.quantity,
+					maxQuantity: info.maxQuantity,
+					unitPremium: info.unitPremium,
+				}
+				this.zhongmeiPopupshow = false;
+			},
 			//人寿意外险
 			RSradioChange(id) {
 				this.renshouaccidentalDrivingVo = this.renshouInsuranceData.find(val => val.id == id)
@@ -1763,6 +1896,11 @@
 				this.zhonganaccidentalDrivingVo = this.zhonganInsuranceData.find(val => val.combination == id)
 				this.zhonganPopupshow = false;
 			},
+			//华农驾意险
+			HNradioChange(id) {
+				this.huanongaccidentalDrivingVo = this.huanongInsuranceData.find(val => val.planCode == id);
+				this.huanongPopupshow = false;
+			},
 			//大家意外险
 			DJradioChange(id) {
 				let info = this.dajiaInsuranceData.find(val => val.id == id)
@@ -1853,7 +1991,6 @@
 				Object.assign(this.guorenaccidentalDrivingVo, dataInfo);
 				this.guorenPopupshow1 = false;
 			},
-
 			//紫金意外险
 			ZJcheckboxGroupChange(detail) {
 				this.zijinaccidentalDrivingVo = [];
@@ -1875,6 +2012,7 @@
 					ele["lastYearMsg"] = "";
 					ele["agreementName"] = "";
 					ele["apiType"] = "";
+					ele["coefficient"] = "";
 					ele["selectShow"] = false;
 					ele['underwritingDescription'] = "";
 				})
@@ -2021,7 +2159,7 @@
 			//中煤报价
 			async zhongmei(num, id) {
 				let params = {
-					accidentalDrivingVo: this.zmDrivingForm,
+					accidentalDrivingVo: this.zhongmeiaccidentalDrivingVo,
 					orderNo: this.orderno,
 					companyId: id,
 					agreementId: this.totalCompanyList[num].agreementId,
@@ -2141,6 +2279,7 @@
 					orderNo: this.orderno,
 					companyId: id,
 					agreementId: this.totalCompanyList[num].agreementId,
+					coefficient: this.totalCompanyList[num].coefficient,
 				};
 				let res = await this.$http.post('/order/zijin/quote', params);
 				this.totalCompanyList[num].msg = res.msg;
@@ -2197,7 +2336,7 @@
 						let dat = res.data.warnMessageList;
 						dat.map(ele => {
 							this.totalCompanyList[num].lastYearMsg +=
-								ele;
+								ele + '<br>';
 						})
 					}
 					this.totalCompanyList[num].quoteCode = 200;
@@ -2278,7 +2417,7 @@
 						let dat = res.data.warnMessageList;
 						dat.map(ele => {
 							this.totalCompanyList[num]
-								.lastYearMsg += ele;
+								.lastYearMsg += ele + '<br>';
 						})
 					}
 					this.totalCompanyList[num].quoteCode = 200;
@@ -2363,7 +2502,7 @@
 						let dat = res.data.warnMessageList;
 						dat.map(ele => {
 							this.totalCompanyList[num]
-								.lastYearMsg += ele;
+								.lastYearMsg += ele + '<br>';
 						})
 					}
 					this.totalCompanyList[num].quoteCode = 200;
@@ -2452,7 +2591,7 @@
 						let dat = res.data.warnMessageList;
 						dat.map(ele => {
 							this.totalCompanyList[num]
-								.lastYearMsg += ele;
+								.lastYearMsg += ele + '<br>';
 						})
 					}
 					this.totalCompanyList[num].quoteCode = 200;
@@ -2466,7 +2605,6 @@
 
 			//爬虫统一报价接口
 			async quoteInsurance(num, id, apiType, jychecked) {
-				console.log(apiType)
 				let api = apiType === 2 ?
 					"/insurance/crawler/quote" :
 					"anshengquote";
@@ -2488,37 +2626,10 @@
 				this.totalCompanyList[num].msg = res.msg;
 				switch (namesimple) {
 					case '安盛天平':
-						if (!!res.data) {
-							if (res.data.warnMessageList !=
-								null && res.data
-								.warnMessageList[0] != null &&
-								res.data
-								.warnMessageList[
-									0] != "") {
-								this.totalCompanyList[num]
-									.lastYearMsg = "";
-								let dat = res.data
-									.warnMessageList;
-								dat.map(ele => {
-									this.totalCompanyList[
-											num]
-										.lastYearMsg +=
-										ele;
-								})
-							}
-							this.totalCompanyList[num]
-								.quoteCode = 200;
-							this.totalCompanyList[num].result =
-								res.data;
-						} else {
-							this.totalCompanyList[num]
-								.quoteCode = "3";
-							this.totalCompanyList[num].msg =
-								res.msg;
-							return;
-						}
-						break;
+					case '恒邦财险':
 					case '中国人寿':
+					case '太平财险':
+					case '华农财险':
 						if (!!res.data) {
 							if (res.data.warnMessageList !=
 								null && res.data
@@ -2534,61 +2645,8 @@
 									this.totalCompanyList[
 											num]
 										.lastYearMsg +=
-										ele;
-								})
-							}
-							this.totalCompanyList[num]
-								.quoteCode = 200;
-							this.totalCompanyList[num].result =
-								res.data;
-						} else {
-							this.totalCompanyList[num]
-								.quoteCode = "3";
-							this.totalCompanyList[num].msg =
-								res.msg;
-							return;
-						}
-						break;
+										ele + '<br>';
 
-					case '恒邦财险':
-						if (!!res.data) {
-							if (res.data.warnMessageList !=
-								null && res.data
-								.warnMessageList[0] != null &&
-								res.data
-								.warnMessageList[
-									0] != "") {
-								this.totalCompanyList[num]
-									.lastYearMsg = "";
-								let dat = res.data
-									.warnMessageList;
-								dat.map(ele => {
-									this.totalCompanyList[
-											num]
-										.lastYearMsg +=
-										ele;
-								})
-							}
-							this.totalCompanyList[num]
-								.quoteCode = 200;
-							this.totalCompanyList[num].result =
-								res.data;
-						} else {
-							this.totalCompanyList[num]
-								.quoteCode = "3";
-							this.totalCompanyList[num].msg =
-								res.msg;
-							return;
-						}
-						break;
-					case '太平财险':
-						if (!!res.data) {
-							if (res.data.warnMessageList != null && res.data.warnMessageList[0] != null && res.data
-								.warnMessageList[0] != "") {
-								this.totalCompanyList[num].lastYearMsg = "";
-								let dat = res.data.warnMessageList;
-								dat.map(ele => {
-									this.totalCompanyList[num].lastYearMsg += ele;
 								})
 							}
 							this.totalCompanyList[num]
@@ -2619,7 +2677,7 @@
 									this.totalCompanyList[
 											num]
 										.lastYearMsg +=
-										ele;
+										ele + '<br>';
 								})
 							}
 							this.totalCompanyList[num]
@@ -2649,9 +2707,6 @@
 				this.quoteInsurance(num, id, this
 					.totalCompanyList[num].apiType, this
 					.totalCompanyList[num].jychecked);
-				console.log(num, id, this
-					.totalCompanyList[num].apiType, this
-					.totalCompanyList[num].jychecked)
 			},
 			//安盛天平
 			ansheng(num, id) {
@@ -2761,9 +2816,10 @@
 			},
 			//上年信息
 			YearMsg(msg, title) {
+				let content = msg.replace(/<br>/g, "\r\n")
 				uni.showModal({
 					title: title + "上年信息",
-					content: msg,
+					content: content,
 					showCancel: false,
 					confirmText: "关闭"
 				})
@@ -2916,7 +2972,6 @@
 	}
 
 	.accident-style {
-		padding: 20px;
 
 		>view {
 			margin-bottom: 15px;
@@ -3073,9 +3128,6 @@
 		font-size: 32upx;
 		font-weight: bold;
 		width: 180upx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
 	}
 
 	.quoteCompanyItem .top .totalMoney {
@@ -3198,5 +3250,6 @@
 		}
 	}
 
+
 	/* 查看详情按钮End */
 </style>

+ 78 - 15
pages/carInsure1/quoteDetail1.vue

@@ -22,7 +22,7 @@
 			</view>
 		</view>
 		<view>
-			<view class="welfare">
+			<!-- <view class="welfare">
 				<view class="header d-flex a-center j-sb">
 					<view class="title">投保享福利</view>
 					<view class="icon iconfont icon-youjiantou d-flex a-center" style="font-size: 24upx;"></view>
@@ -37,7 +37,7 @@
 						<view class="content">八项检查:血常规,尿常规,心电图等</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="quotePlan">
 				<view class="header d-flex a-center j-sb">
@@ -52,7 +52,8 @@
 						<block v-for="(item,index) in riskList" :key="index">
 							<template v-if="item.riskCode=='0507'">
 								<view class="row d-flex a-center j-sb">
-									<view class="d-flex a-center">交强险 <view class="date">起保日期:{{orderInfo.jqstartdate}}
+									<view class="d-flex a-center">交强险 <view class="date">
+											{{orderInfo.jqstartdate}}~{{orderInfo.jqenddate}}
 										</view>
 									</view>
 									<view>¥{{jqpremium}}</view>
@@ -70,7 +71,8 @@
 						<block v-for="(item,index) in riskList" :key="index">
 							<template v-if="item.riskCode == '0510'">
 								<view class="row d-flex a-center j-sb">
-									<view class="d-flex a-center">商业险 <view class="date">起保日期:{{orderInfo.systartdate}}
+									<view class="d-flex a-center">商业险 <view class="date">
+											{{orderInfo.systartdate}}~{{orderInfo.syenddate}}
 										</view>
 									</view>
 									<view>¥{{sypremium}}</view>
@@ -123,15 +125,9 @@
 					<view class="title">{{name}}官方无忧理赔</view>
 				</view>
 				<view class="body d-flex" style="flex-wrap: wrap;">
-					<view
-						style="width: 50%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; padding-right: 20upx;box-sizing: border-box;">
-						智慧理赔服务</view>
-					<view
-						style="width: 50%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 20upx;box-sizing: border-box;">
-						异地出险全国通赔</view>
-					<view
-						style="width: 50%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding-right: 20upx;box-sizing: border-box;">
-						掌柜车险管控质量</view>
+					<view style="text-align: left;text-indent: 0.2rem;font-size: 12px;">
+						{{companyUnderwriting}}
+					</view>
 				</view>
 			</view>
 			<!-- <template v-if="!!token">
@@ -1042,6 +1038,7 @@
 				extendInfo: {},
 				routepage: "",
 				roadrescueList: [],
+				companyUnderwriting: "",
 			}
 		},
 		// 监听导航栏的按钮
@@ -1166,6 +1163,7 @@
 						case "众安财险":
 						case "中国人寿":
 						case "太平财险":
+						case "华农财险":
 							this.pythonprint(); //电子保单
 							break;
 						case "永诚财险":
@@ -1180,8 +1178,14 @@
 						case "国任财险":
 							this.guoRengetPolicyPrint(); //电子保单
 							break;
+						case "大家财险":
+							this.daJiagetPolicyPrint(); //电子保单
+							break;
 					}
 				}
+				let commpanykad = await this.$http.get('/insurance/order/getAgreementInsCompany');
+				let data = commpanykad.data.find(val => val.namesimple === this.name);
+				this.companyUnderwriting = data.remark;
 			} else {
 				uni.showModal({
 					showCancel: false,
@@ -1390,6 +1394,23 @@
 						});
 					}
 				}
+				if (this.orderInfo.crossInsurance.length > 0) {
+					this.orderInfo.crossInsurance.map(async ele => {
+						let res = await this.$http.post('/api/yongCheng/getPolicyPrint', {
+							companyId: this.companyId,
+							policyNumber: ele.policyNumber,
+							riskCode: "0513",
+							type: '2', //2:保单
+						});
+						if (res.code == '200') {
+							this.policyList.push({
+								fileTitle: "驾意险保单",
+								filename: ele.policyNumber,
+								fileurl: res.data.jyUrl,
+							})
+						}
+					})
+				}
 			},
 			//爬虫电子保单统一调用
 			async pythonprint() {
@@ -1427,8 +1448,6 @@
 						}
 					}
 				}
-
-
 			},
 			async ziJingetPolicyPrint() {
 				this.policyList = [];
@@ -1492,6 +1511,50 @@
 				}
 
 			},
+			async daJiagetPolicyPrint() {
+				this.policyList = [];
+				this.policyList1 = [];
+				if (this.orderInfo.jqpolicyno) {
+					let res = await this.$http.post('/api/dajia/obtainWarranty', {
+						companyId: this.companyId,
+						riskCode: "0507",
+						type: '2', //2:保单
+					});
+					if (res.code == '200') {
+						this.policyList.push({
+							fileTitle: "交强电子保单",
+							filename: this.orderInfo.jqpolicyno,
+							fileurl: res.data,
+						})
+					}
+					let res1 = await this.$http.post('/api/dajia/obtainWarranty', {
+						companyId: this.companyId,
+						riskCode: "0507",
+						type: '1', //1:标志
+					});
+					if (res1.code == '200') {
+						this.policyList1.push({
+							fileTitle: "交强电子标志",
+							filename: this.orderInfo.jqpolicyno,
+							fileurl: res1.data,
+						})
+					}
+					if (this.orderInfo.sypolicyno) {
+						let res = await this.$http.post('/api/dajia/obtainWarranty', {
+							companyId: this.companyId,
+							riskCode: "0510",
+							type: '2', //2:标志
+						});
+						if (res.code == '200') {
+							this.policyList.push({
+								fileTitle: "商业电子保单",
+								filename: this.orderInfo.sypolicyno,
+								fileurl: res.data,
+							})
+						}
+					}
+				}
+			},
 			async huaTaigetPolicyPrint() {
 				this.policyList = [];
 				this.policyList1 = [];

+ 1 - 0
pages/carInsure1/underwriting1.vue

@@ -1346,6 +1346,7 @@
 								case "众安财险":
 								case "中国人寿":
 								case "太平财险":
+								case "华农财险":
 									let pythonimage = await this.$http.post(
 										'/insurance/crawler/submitImage', {
 											subOrderNo: this.companyId

+ 2 - 2
pages/my/my.vue

@@ -59,7 +59,7 @@
 		<!-- 广告End -->
 
 		<!-- 我的钱包Start -->
-		<view class="my-wallet" v-if="userInfo.sysUser.roleId!=19">
+		<view class="my-wallet" v-if="sources==1">
 			<view class="header d-flex a-center j-sb">
 				<view>我的钱包</view>
 				<span @tap="toWallet" style="font-size: 24upx;color: #333;">更多</span>
@@ -399,7 +399,7 @@
 			}
 		},
 		computed: {
-			...mapState(['userInfo', "userCheckInfo"]),
+			...mapState(['userInfo', "userCheckInfo", "sources"]),
 
 			toolsListLength() {
 				return Math.ceil(this.toolsList.length / 8);

+ 1 - 0
pages/orders/orders.vue

@@ -85,6 +85,7 @@
 						<text>投保险种:{{item.product}}</text>
 						<text v-if="item.orderstatus=='3'">承保公司:{{item.insCompany}}</text>
 						<text>订单号:{{item.orderno}}</text>
+						<text>业务员:{{item.username}}({{item.userid}})</text>
 					</view>
 				</view>
 				<view class="orderItemPane-below dis a-c  j-end search">

+ 0 - 1
pages/orders/quotation.vue

@@ -8,7 +8,6 @@
 					<text style="font-weight: bold;margin-left: 6px;">{{dataInfo.inscompany}}报价单</text>
 				</view>
 			</view>
-
 			<view class="Basic-information dis f-c" style="border-top-right-radius: 0;border-top-left-radius: 0;">
 				<view class="basic-logo dis a-c">
 					<image :src="caricon" mode=""></image>

+ 14 - 1
pages/orders/quoteHistory.vue

@@ -14,6 +14,7 @@
 		</view>
 		<view class="pdd" style="padding-top: 120px;">
 			<view class="sub-orders " v-for="(item,index) in sublist" :key="index">
+				<view v-if="item.orderstatus==2" class="triangle"></view>
 				<view class="orders-upper dis f-c">
 					<view class="dis a-end j-s">
 						<text class="strong">{{item.inscompany}}</text>
@@ -41,7 +42,7 @@
 				</view>
 				<view class="orders-below dis j-end">
 					<u-button
-						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险'].includes(item.inscompany)"
+						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险'].includes(item.inscompany)"
 						size="mini" type="error" :plain="true" :hair-line="false" shape="circle"
 						@click="queryStatus(item.id,item.inscompany)">查询缴费状态</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
@@ -310,6 +311,17 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.triangle {
+		width: 0;
+		height: 0;
+		border-right: 60px solid transparent;
+		border-top: 30px solid #f12711;
+		position: absolute;
+		top: 0;
+		left: 0;
+		border-top-left-radius: 6px;
+	}
+
 	.car-header {
 		width: 100%;
 		height: auto;
@@ -354,6 +366,7 @@
 		box-shadow: 0 0 4px 1px #dfdfdf;
 		padding-bottom: 0;
 		margin-bottom: 10px;
+		position: relative;
 
 		.orders-upper {
 			view {

+ 1 - 1
pages/orders/subOrders.vue

@@ -44,7 +44,7 @@
 				</view>
 				<view class="orders-below dis j-end">
 					<u-button
-						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险'].includes(item.inscompany)"
+						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','太平财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险','中煤财险','华农财险'].includes(item.inscompany)"
 						size="mini" type="error" shape="circle"
 						@click="queryStatus(item.id,item.inscompany)">查询缴费状态</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" shape="circle"

+ 5 - 15
pages/tools/addStaff/addStaff.vue

@@ -19,21 +19,18 @@
 		<view class="line"></view>
 
 		<!-- 增员菜单Start -->
-		<template v-if="userInfo.sysUser.roleId==19">
-			<block v-for="(item,index) in menusList1" :key="index">
+		<template v-if="sources==1">
+			<block v-for="(item,index) in menusList" :key="index">
 				<my-list-item :item="item" :index="index"></my-list-item>
 			</block>
 		</template>
-		<template v-else>
-			<block v-for="(item,index) in menusList" :key="index">
+		<template v-else-if="sources==2">
+			<block v-for="(item,index) in menusList1" :key="index">
 				<my-list-item :item="item" :index="index"></my-list-item>
 			</block>
 		</template>
-		<!-- 增员菜单End -->
-
 	</view>
 </template>
-
 <script>
 	import {
 		mapState,
@@ -60,13 +57,6 @@
 						url: "/pages/tools/addStaff/codeDownload",
 						auth: true
 					},
-					{
-						icon: "",
-						name: "出单员扫码注册",
-						clicktype: "navigateTo",
-						url: "/pages/tools/addStaff/orderissuer",
-						auth: true
-					},
 					{
 						icon: "",
 						name: "邀请函",
@@ -93,7 +83,7 @@
 			}
 		},
 		computed: {
-			...mapState(['userInfo']),
+			...mapState(['userInfo', 'sources']),
 		},
 		methods: {
 			getStaffList(staffType) {

+ 557 - 318
pages/tools/policy.vue

@@ -1,359 +1,598 @@
 <template>
-	<view>
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<!-- 顶部搜索框区域Start -->
-		<view class="search">
-			<search  @search="search"></search>
-		</view>
-		<!-- 顶部搜索框区域End -->
-		
+	<view class="parent">
 		<!-- 查询区域Start -->
-		<view class="queryView d-flex">
-			<view class="d-flex a-center j-center">
-				<picker @change="bindPickerTypeChange" :value="typeIndex" :range="typeArray">
-				    <view class="d-flex a-center">{{typeArray[typeIndex]}} <view class="icon iconfont icon-xiala"></view></view>
-				</picker>
-			</view>
-			<view class="d-flex a-center j-center">
-				<picker @change="bindPickerYearChange" :value="yearIndex" :range="yearArray">
-				    <view class="d-flex a-center">{{yearArray[yearIndex]}}年 <view class="icon iconfont icon-xiala"></view></view>
-				</picker>
+		<view class="white flexd "
+			style="box-shadow:rgb(255, 204, 149) 0px 0px 6px 1px;z-index: 99; background:  linear-gradient(to left, #f2994a, #f2c94c);">
+			<view class="search">
+				<u-search v-model="pageRequest.licenseNo" @custom="custom" @search="search" :shape="shape"
+					:clearabled="clearabled" :show-action="showAction" :input-align="inputAlign" @clear="clear"
+					placeholder="车牌号搜索"></u-search>
 			</view>
-			<view class="d-flex a-center j-center">
-				<picker @change="bindPickerMonthChange" :value="monthIndex" :range="monthArray">
-				    <view class="d-flex a-center">{{monthArray[monthIndex]}}月 <view class="icon iconfont icon-xiala"></view></view>
-				</picker>
-			</view>
-		</view>
-		<!-- 查询区域End -->
-		
-		<z-paging auto-show-back-to-top ref="paging" @query="getOrdersList" :list.sync="list" :default-page-size="10"  :mounted-auto-call-reload="true" :style="getHeight">
-			<view class="container-list">
-				<block v-for="(orderItem,orderIndex) in list " :key="orderIndex" >
-					<view class="container-list-item p-3 pt-2 box-sizing">
-						<view class="container-list-item-header d-flex">
-							<view class="date">{{orderItem.createtime}}</view>
+			<u-dropdown active-color="#fff" inactive-color="#fff" ref="uDropdown">
+				<u-dropdown-item title="筛选条件">
+					<view class="slot-content1">
+						<view class="dis f-c">
+							<text class="title" style="margin:0 10px;">订单状态</text>
+							<view class="dis  a-c f-wrap" style="margin: 10px;">
+								<view class="status-data" :class="item.value==pageRequest.orderStatus? 'active':''"
+									v-for="(item,index) in statusList" @tap="statusclick(index)" :key="index">
+									{{item.label}}
+								</view>
+							</view>
 						</view>
-						<view class="container-list-item-body d-flex">
-							<view class="left flex-column d-flex a-center j-center" :data-orderno="orderItem.orderno" @tap="openQuoteDetail">
-								<p class="plate-number">{{orderItem.carinfo.licenseNo}}</p>
-								<p class="plate-number">{{orderItem.inscompany}}</p>
-								<p class="car-owner">{{orderItem.ownerinfo.name}}</p>
+						<view class="dis f-c">
+							<text class="title" style="margin:0 10px;">保险公司</text>
+							<view class="dis  a-c f-wrap" style="margin: 10px;">
+								<view class="status-data" :class="item.id==pageRequest.companyId? 'active':''"
+									v-for="(item,index) in esmInsCompanyList" @tap="companystatusclick(item.id)"
+									:key="index">
+									{{item.namesimple}}
+								</view>
 							</view>
-							<view class="right d-flex flex-1 flex-column">
-								<block v-for ="(riskItem,riskIndex) in orderItem.riskinfo" :key="riskIndex" >
-									<template v-if="riskItem.riskCode == '0507'">
-										<view class="ritem d-flex flex-column">
-											<view class="top d-flex j-sb">
-												<p class="insurance">交强险</p>
-												<p class="amount">{{riskItem.premium}}元</p>
-											</view>
-											<view class="time">{{riskItem.startDate}} - {{riskItem.endDate}}  </view>
-										</view>
-									</template>
-									
-									
-								</block>
-								<block v-for ="(riskItem,riskIndex) in orderItem.riskinfo" :key="riskIndex" >
-									<template v-if="riskItem.riskCode == '0510'">
-										<view class="ritem d-flex flex-column">
-											<view class="top d-flex j-sb">
-												<p class="insurance">商业险</p>
-												<p class="amount">{{riskItem.premium}}元</p>
-											</view>
-											<view class="time">{{riskItem.startDate}} - {{riskItem.endDate}}  </view>
-										</view>
-									</template>
-								</block>
+						</view>
+						<view class="dis f-c">
+							<text class="title" style="margin:0 10px;">订单日期</text>
+							<view class="dis  a-c f-wrap" style="margin: 10px;">
+								<view class="status-data" :class="item.value==timespecifications? 'active':''"
+									v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
+									{{item.label}}
+								</view>
+								<view class="dis a-c ">
+									<view class="status-data" :class="startShow? 'active' :''" @tap="startShowmethod()">
+										<text v-if="pageRequest.startDate!=''">{{pageRequest.startDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+									<view class="status-data" :class="endShow? 'active' :''" @tap="endShowmethod()">
+										<text v-if="pageRequest.endDate!=''">{{pageRequest.endDate}}</text>
+										<text v-else>{{transformTime()}}</text>
+									</view>
+								</view>
 							</view>
 						</view>
-						<view class="container-list-item-footer">
-							<block v-for ="(riskItem,riskIndex) in orderItem.riskinfo" :key="riskIndex" >
-								<template v-if="riskItem.riskCode == '0507'">
-									<view class="numStyle">交强险保单号:{{orderItem.jqpolicyno}}</view>
-								</template>
-							</block>
-							<block v-for ="(riskItem,riskIndex) in orderItem.riskinfo" :key="riskIndex" >
-								<template v-if="riskItem.riskCode == '0510'">
-									<view class="numStyle">商业险保单号:{{orderItem.sypolicyno}}</view>
-								</template>
-							</block>
+						<view class="dis j-s a-c" style="margin:10px;">
+							<u-button type="success" size="medium" :hair-line="false" style="width: 45%;"
+								@click="closeDropdown">取消</u-button>
+							<u-button type="warning" size="medium" style="width: 45%;"
+								@click="querysearch">确定</u-button>
 						</view>
 					</view>
-				</block>
+				</u-dropdown-item>
+			</u-dropdown>
+		</view>
+		<view class="search" style="padding-top: 100px;">
+			<view class=" orderItemPane" v-for="(item,index) in pageResult" :key="index" @click="querydetail(item)">
+				<view class="orderItemPane-upper dis j-s a-c search">
+					<view class="dis j-s">
+						<view class="icon iconfont icon-tree-round-car"
+							style="color: rgba(255, 154, 23, 0.57);margin-right: 5px;">
+						</view>
+						<text class="title">{{item.licenseno}}</text>
+					</view>
+					<text class="upper-time moosize">{{item.createtime}}</text>
+
+				</view>
+				<view class="orderItemPane-centre " style="padding: 0 10px;">
+					<view class="status dis j-end">
+						<view v-for="(statusitem,statusindex) in statusList" :key="statusindex">
+							<text v-if="item.orderstatus==statusitem.value"
+								:style="{color:statusitem.color}">{{statusitem.label}}
+								<u-icon name="arrow-right" size="14px"
+									style="margin-left: 5px;color: #999;"></u-icon></text>
+						</view>
+					</view>
+					<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>
+				<view class="orderItemPane-below dis a-c  j-end search">
+					<u-button type="primary" size="mini" :hair-line="false" :plain="true"
+						@click="quotehistory(item)">报价历史</u-button>
+					<u-button v-if="item.orderstatus!='3'" type="success" size="mini" :hair-line="false" :plain="true"
+						@click="CloseEdit(item.orderno)">编辑</u-button>
+				</view>
 			</view>
-		</z-paging>
+		</view>
+		<o-empty v-if="pageResult.length==0" />
+		<!-- 回到顶部 -->
+		<u-picker v-model="startShow" mode="time" :params="params" @confirm="startconfirm"></u-picker>
+		<u-picker v-model="endShow" mode="time" :params="params" @confirm="endconfirm"></u-picker>
+
 	</view>
 </template>
 
 <script>
-	import {mapState} from "vuex"
-	import search from "@/components/modules/orders/search.vue";
-	import ZPagingMixin from '@/uni_modules/z-paging/components/z-paging/js/z-paging-mixin';
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	// import carOrders from "@/components/modules/orders/carOrders.vue";
+	import {
+		watch
+	} from "vue";
 	export default {
-		components:{
-			search,
-			ZPagingMixin
-		},
-		computed: {
-			...mapState(['userInfo']),
-			getHeight() {
-				let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(184);
-				let bgColor = '#FFFFFF';
-				if(this.list.length>0){
-					bgColor = '#F5F5F5';
+		components: {},
+		watch: {
+			stageIndex(newVal, oldVal) {
+				if (newVal !== oldVal) {
+					this.pageRequest.orderStatus = newVal;
 				}
-				return `height: ${height}px; background-color:${bgColor}`;
 			}
 		},
 		data() {
 			return {
-				list:[],
-				
-				/* 查询区域Start */
-				typeArray:['车险'],	//订单的类型
-				// typeArray:['车险','意外险','寿险'],	//订单的类型
-				stageArray:[
-					{"label":'待继续',"value":'0'},
-					{"label":'核保中',"value":'1'},
-					{"label":'已核保',"value":'2'},
-					{"label":'已核保待缴费',"value":'5'},
-					{"label":'已缴费',"value":'6'},
-					{"label":'已承保',"value":'7'},
-					{"label":'待修改',"value":'3'},
-					{"label":'核保不通过',"value":'4'},
-					{"label":'已关闭',"value":'99'}
-				],	//订单的阶段
-				yearArray:[],	//订单的查询年份
-				monthArray:[],	//订单的查询月份
-				typeIndex:0,	//订单的类型选择
-				yearIndex:0,	//订单的年份选择
-				monthIndex:0, 	//订单的月份选择
-				/* 查询区域End */
+				dwdw: this.$u.color['success'],
+				/* 时间筛选相关 */
+				startShow: false,
+				endShow: false,
+				params: {
+					year: true, //年
+					month: true, //月
+					day: true, //日
+				},
+				/* 时间筛选相关 */
+				pageRequest: { //查询的默认条件
+					companyId: "",
+					orderNo: "",
+					frameNo: "",
+					insuredName: "",
+					licenseNo: "",
+					orderStatus: "3",
+					userId: "",
+					deptId: "",
+					endDate: "",
+					startDate: "",
+					pageNum: 1,
+					pageSize: 20,
+				},
+				timespecifications: null,
+				pageResult: [], //列表数据
+				/* 搜索框配置 */
+				shape: 'round',
+				clearabled: true,
+				showAction: true,
+				inputAlign: 'left',
+				/* 搜索框配置 */
+				//状态筛选list
+				statusList: [{
+						label: '报价中',
+						value: 0,
+						color: "#1E9600"
+					},
+					{
+						label: '待核保',
+						value: 1,
+						color: "#f5af19"
+					},
+					{
+						label: '已核保待缴费',
+						value: 2,
+						color: "#f12711"
+					},
+					{
+						label: '已承保',
+						value: 3,
+						color: "#86A8E7"
+					},
+					{
+						label: '核保退回',
+						value: 4,
+						color: "#bdc3c7"
+					}
+				],
+				//日期筛选list
+				dateList: [{
+						label: '全部',
+						value: 0,
+					},
+					{
+						label: '一周内',
+						value: 1,
+					},
+					{
+						label: '一个月内',
+						value: 2,
+					},
+					{
+						label: '三个月内',
+						value: 3,
+					},
+					{
+						label: '六个月内',
+						value: 4,
+					},
+
+				],
+				typeArray: [{
+						label: '车险',
+						value: 0,
+					},
+					{
+						label: '意外险',
+						value: 1,
+					},
+					{
+						label: '寿险',
+						value: 2,
+					}
+				], //订单的类型
+				toTopFlag: false, //显示回到顶部按钮
+				queryLicenseNo: "",
+				queryFrameNo: "",
+				insureMore: false,
+				insureMoreIndex: null,
+				esmInsCompanyList: [],
+
 			}
 		},
-		onLoad() {
-			// 搜索年选项Start
-			this.yearArray=[(new Date().getFullYear()-2),(new Date().getFullYear()-1),new Date().getFullYear(),]
-			this.yearIndex=this.yearArray.length-1;
-			// 搜索年选项End
-			
-			// 搜索月选项Start
-			var month = new Date().getMonth()+1;
-			for(var i=1;i<=month;i++){
-				if(i<10){
-					this.monthArray.push('0'+i);
-				}else{
-					this.monthArray.push(i);
-				}
+		computed: {
+			...mapState(['userInfo', 'typeIndex', 'stageIndex'])
+		},
+
+		// 页面触底加载
+		onReachBottom() {
+			this.currentPage = this.currentPage + 1;
+			if (this.totalPages >= this.currentPage) {} else {
+				return false;
+			}
+		},
+		// 页面滚动触发
+		onPageScroll(e) { //根据距离顶部距离是否显示回到顶部按钮
+			if (e.scrollTop > 600) { //当距离大于600时显示回到顶部按钮
+				this.toTopFlag = true
+			} else { //当距离小于600时显示回到顶部按钮
+				this.toTopFlag = false
+			}
+		},
+		onShow() {
+			const arr = uni.getStorageSync('historyInfo');
+			if (arr) {
+				uni.removeStorageSync('historyInfo');
 			}
-			this.monthIndex=this.monthArray.length-1;
-			// 搜索月选项End
+			this.getOrdersList()
+			this.esmInsCompany()
+		},
+		async onLoad(e) {
+			this.pageRequest.userId = this.userInfo.sysUser.id;
+			this.pageRequest.deptId = this.userInfo.sysUser.deptId;
+			this.getOrdersList()
+
 		},
 		methods: {
-			// 订单类型发生变化
-			bindPickerTypeChange(e){
-				this.typeIndex = e.target.value;
+			...mapMutations(['setOrderType', 'setOrderStage']),
+			async getOrdersList() {
+				let res = await this.$http.post('/insurance/order/queryPageOrder', this.pageRequest);
+				if (res.code == '200') {
+					this.pageResult = res.data.content;
+				}
+			},
+			async esmInsCompany() {
+				let commpanykad = await this.$http.get('/insurance/order/getAgreementInsCompany');
+				if (commpanykad.code == '200') {
+					this.esmInsCompanyList = commpanykad.data;
+				}
+			},
+			//展开
+			selectMore(val) {
+				this.insureMore = true;
+				this.insureMoreIndex = val;
+			},
+			packup(val) {
+				this.insureMore = false;
+				this.insureMoreIndex = val;
+			},
+			//取消事件
+			closeDropdown() {
+				this.$refs.uDropdown.close();
+			},
+			//查询事件
+			querysearch() {
+				this.getOrdersList();
+				this.$refs.uDropdown.close();
+			},
+			//状态筛选
+			statusclick(e) {
+				this.pageRequest.orderStatus = e;
+			},
+			//保险公司筛选
+			companystatusclick(e) {
+				this.pageRequest.companyId = e;
+			},
+			startShowmethod() {
+				this.startShow = true;
+				this.timespecifications = null;
+			},
+			endShowmethod() {
+				this.endShow = true;
+				this.timespecifications = null;
+			},
+			//日期筛选
+			dateclick(e) {
+				/* 0:全部  1:一周内 2:一个月内 3:三个月内  4:六个月内*/
+				switch (e) {
+					case 0:
+						this.pageRequest.startDate = "";
+						this.pageRequest.endDate = "";
+						break;
+					case 1:
+						this.pageRequest.startDate = this.transformTime(7);
+						this.pageRequest.endDate = this.transformTime();
+						break;
+					case 2:
+						this.pageRequest.startDate = this.transformTime1(1);
+						this.pageRequest.endDate = this.transformTime();
+						break;
+					case 3:
+						this.pageRequest.startDate = this.transformTime1(3);
+						this.pageRequest.endDate = this.transformTime();
+						break;
+					case 4:
+						this.pageRequest.startDate = this.transformTime1(6);
+						this.pageRequest.endDate = this.transformTime();
+						break;
+					default:
+				}
+				this.timespecifications = e;
+			},
+			startconfirm(e) {
+				this.pageRequest.startDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			endconfirm(e) {
+				this.pageRequest.endDate = e.year + '-' + e.month + '-' + e.day;
+			},
+			//验证车架号
+			isFrameno(str) {
+				let mPattern = /^([0-9A-Z]){17}$/;
+				return mPattern.test(str);
 			},
-			
 			isCarBrand(str) {
-				let mPattern = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼A-Z]{1}[A-Z]{1}[A-Z0-9]{4,5}([A-Z0-9挂学警港澳使领]{1}|应急)$/ || /^沪[0-9A-Z]{5}$/ || /^陆丰[0-9A-Z]{4}临$/;
-			      return mPattern.test(str.trim())
+				let mPattern = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼A-Z]{1}[A-Z]{1}[A-Z0-9]{4,5}([A-Z0-9挂学警港澳使领]{1}|应急)$/ ||
+					/^沪[0-9A-Z]{5}$/ || /^陆丰[0-9A-Z]{4}临$/;
+				return mPattern.test(str.trim())
+				// return /^陆丰[0-9A-Z]{4}临$/.test(str.trim())
 			},
-			
-			search(a){
-				if(this.isCarBrand(a.trim())){
-					this.list=[]; //获取到的订单列表
-					var infodata= {
-						"columnFilters":{
-							"orderstatus":{
-								"name":"orderstatus",
-								"value":"7"
-							},
-							"licenseNo":{
-								"name":"licenseNo",
-								"value":a.trim()
-							},
-							"userid":{
-								"name":"userid",
-								"value":this.userInfo.sysUser.id
-							},
-							"quotestatus":{
-								"name":"quotestatus",
-								"value":'1'
-							}
-						},
-						"pageNum":1,
-						"pageSize":10
-					};
-					this.getOrdersList(1,10,infodata);//重新查询订单
-				}else{
-					return uni.showToast({icon:"none",title:"请输入正确的车牌号或车架号",duration:1500})
+			//查看子订单
+			async querydetail(val) {
+				let params = {
+					orderno: val.orderno,
+					insuredname: val.insuredname,
+					licenseno: val.licenseno,
+					modelcname: val.carinfo.modelcname,
 				}
+				uni.navigateTo({
+					url: `/pages/orders/subOrders?orderno=${JSON.stringify(params)}`
+				})
 			},
-			
-			//搜索年发生变化
-			bindPickerYearChange(e) {
-				this.yearIndex = e.target.value;
-				this.monthArray=[];
-				if(this.yearIndex == (this.yearArray.length-1)){
-					var month = new Date().getMonth()+1;
-					for(var i=1;i<=month;i++){
-						if(i<10){
-							this.monthArray.push('0'+i);
-						}else{
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex=this.monthArray.length-1;
-				}else{
-					for(var i=1;i<=12;i++){
-						if(i<10){
-							this.monthArray.push('0'+i);
-						}else{
-							this.monthArray.push(i);
-						}
-					}
-					this.monthIndex=0;
+			//报价历史
+			quotehistory(val) {
+				let params = {
+					orderno: val.orderno,
+					insuredname: val.insuredname,
+					licenseno: val.licenseno,
+					modelcname: val.carinfo.modelcname,
 				}
-				this.list=[]; //获取到的订单列表
-				this.getOrdersList(1,10);//重新查询订单
+				uni.navigateTo({
+					url: `/pages/orders/quoteHistory?orderno=${JSON.stringify(params)}`
+				})
+			},
+			//编辑
+			CloseEdit(val) {
+				uni.navigateTo({
+					url: "/pages/carInsure1/quote1?orderno=" + val
+				})
+				// this.navigate({
+				// 	url: '/pages/carInsure1/quote1',
+				// 	success: (res) => {
+				// 		res.eventChannel.emit("acceptData", {
+				// 			carInfo: val.carinfo, //车辆信息
+				// 			ownerInfo: val.ownerinfo, //车主信息
+				// 			policyHolderInfo: val.applyinfo, //
+				// 			insuredPersonInfo: val.insureinfo,
+				// 			riskList: val.risk,
+				// 			kindList: val.king,
+				// 			orderno: val.orderno, //车辆
+				// 			quoteno: val.quoteno, //车主
+				// 			vehicleAndVesselTaxForm: val.vehicleAndVesselTax, //车船税
+
+				// 		})
+				// 	}
+				// }, "navigateTo", true);
+			},
+			//回车搜索事件
+			search(val) {
+				this.getOrdersList();
 			},
-			//搜索月发生变化
-			bindPickerMonthChange(e) {
-				this.monthIndex = e.target.value
-				this.list=[]; //获取到的订单列表
-				this.getOrdersList(1,10);//重新查询订单
+			//搜索按钮事件
+			custom(val) {
+				this.getOrdersList();
 			},
+			//搜索框清除事件
+			clear(val) {
 
-			//获取订单数据Start
-			async getOrdersList(pageNo, pageSize,info={}) {
-				
-				var queryStartDate = this.yearArray[this.yearIndex]+'-'+this.monthArray[this.monthIndex]+'-'+'01';
-				var formatQueryDate = new Date(queryStartDate);
-				formatQueryDate.setMonth(formatQueryDate.getMonth()+1)
-				formatQueryDate.setTime(formatQueryDate.getTime()-24*60*60*1000);
-				var queryEndDate = formatQueryDate.getFullYear()+'-'+(formatQueryDate.getMonth()+1)+'-'+formatQueryDate.getDate();
-				
-				var data = {};
-				if(info=={}){
-					data = info;
-				}else{
-					data = {
-						"columnFilters": {
-							"orderstatus":{
-								"name":"orderstatus",
-								"value":"7"
-							},
-							"startdate":{
-								"name":"startdate",
-								"value":queryStartDate
-							},
-							"licenseNo":{
-								"name":"licenseNo",
-								"value":this.queryLicenseNo
-							},
-							"enddate":{
-								"name":"enddate",
-								"value":queryEndDate
-							},
-							"userid":{
-								"name":"userid",
-								"value":this.userInfo.sysUser.id
-							},
-							"quotestatus":{
-								"name":"quotestatus",
-								"value":'1'
-							}
-						},
-						"pageNum": pageNo,
-						"pageSize": pageSize
-					};
+			},
+			//关闭订单后查询
+			closeOrders() {
+				this.totalSize = 0;
+				this.ordersList = []; //获取到的订单列表
+				this.currentPage = 1; //当前的页数
+				this.totalPages = 1; //总共的页数
+			},
+			//当前时间
+			transformTime(day) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = day ? date.getDate() - day : date.getDate();
+				var strMonth = date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
 				}
-				let res = await this.$http.post('/insOrder/findPage',data);
-				let content = [];
-				if(res.data.content.length>0){
-					content = res.data.content;
+				if (strDay < 10) {
+					strDay = "0" + strDay;
 				}
-				this.$refs.paging.complete(content);
-		
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
 			},
-			//获取订单数据End
-			
-			//跳转订单详情页面Start(公用)
-			openQuoteDetail(e){
-				this.navigate({
-					url:"/pages/carInsure/quoteDetail?orderno="+e.currentTarget.dataset.orderno
-				},'navigateTo',true)
+			transformTime1(month) {
+				var date = new Date();
+				date.setFullYear(date.getFullYear());
+				date.setTime(date.getTime());
+				var strYear = date.getFullYear();
+				var strDay = date.getDate();
+				var strMonth = month ? (date.getMonth() + 1) - month : date.getMonth() + 1;
+				if (strMonth < 10) {
+					strMonth = "0" + strMonth;
+				}
+				if (strDay < 10) {
+					strDay = "0" + strDay;
+				}
+				var datastr = strYear + "-" + strMonth + "-" + strDay;
+				return datastr;
 			},
-			//跳转订单详情页面End(公用)
-		},
-
+		}
 	}
 </script>
-
-<style lang="scss" scoped>
-@import '@/style/mixin.scss';
-.container-list-item{
-	background: #fff;
-	margin-bottom: 15upx;
-}
-.container-list-item-header .date{
-	background:rgba($themeColor, 0.8) ;
-	color: #FFFFFF;
-	width: 290upx;
-	border-radius: 4upx;
-	font-size: 24upx;
-	text-align: center;
-}
-.container-list-item-body .left{
-	width: 230upx;
-	flex-shrink: 0;
-	color: rgba($themeColor, 0.8);
-	font-size: 26upx;
-}
-.container-list-item-body .right .ritem{
-	box-sizing: border-box;
-	padding-top: 10upx;
-	padding-bottom: 10upx;
-	border-bottom: 1px solid rgba(0,0,0,.05);
-}
-.container-list-item-body .right .ritem .top{
-	font-size: 28upx;
-	color: #464646;
-	margin-bottom: 10upx;
-}
-.container-list-item-body .right .ritem .time{
-	font-size: 22upx;
-	color: rgba(0,0,0,.5);
-}
-.container-list-item-footer .numStyle{
-	line-height: 60upx;
-}
-	
-/* 查询区域Start */
-.queryView {
-	justify-content: space-around;
-	height: 82upx;
-	line-height: 80upx;
-}
-.queryView>view{
-	border-top: 1px solid rgba($themeColor, 0.6);
-	border-bottom: 1px solid rgba($themeColor, 0.6);
-	border-left: 1px solid rgba($themeColor, 0.6);
-	box-sizing: border-box;
-	color: rgba($themeColor, 0.6);
-}
-.queryView>view:nth-child(1){
-	flex: 3;
-}
-.queryView>view:nth-child(2){
-	flex: 3;
-}
-.queryView>view:nth-child(3){
-	border-right: 1px solid rgba($themeColor, 0.6);
-	flex: 3;
-}
-/* 查询区域End */
+<style>
+	page {
+		background-color: #f2f2f2;
+	}
 </style>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	/deep/ uni-tabbar .uni-tabbar-bottom {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	/deep/ .u-action[data-v-1a326067] {
+		color: #FFFFFF;
+	}
+
+	/deep/ .u-dropdown__menu__item__arrow[data-v-01c0c507] uni-text {
+		color: #FFFFFF !important;
+	}
+
+
+
+	.parent {}
+
+
+	.search {
+		padding: 10px;
+
+	}
+
+	.slot-content1 {
+		background-color: #FFFFFF;
+		padding: 24rpx;
+	}
+
+	.title {
+		font-weight: bold;
+		color: #333;
+	}
+
+	.status-data {
+		padding: 4px 10px;
+		box-sizing: border-box;
+		margin: 0 7px 7px 0;
+		font-size: 15px;
+		border: 1px solid #eee;
+		border-radius: 5px;
+		cursor: pointer;
+
+	}
+
+	.active {
+		background: rgba(234, 142, 45, 0.08);
+		color: #ff9556;
+		border: 1px solid rgba(234, 85, 45, 0.01);
+		font-weight: 700;
+	}
+
+	.white {
+		background-color: white;
+	}
+
+	.orderItemPane {
+		background-color: white;
+		width: 100%;
+		height: auto;
+		margin: 10px 0;
+		border-radius: 10px;
+		box-shadow: 0 0 6px 1px #e3e3e3;
+		// padding: 10px 10px 0 10px;
+		cursor: pointer;
+	}
+
+	.orderItemPane .orderItemPane-centre,
+	.orderItemPane .orderItemPane-upper .upper-time,
+	.inscommny-sum>text {
+		color: #999;
+	}
+
+	.orderItemPane-centre .status,
+	.inscommny-sum>text text {
+		color: #ff9000;
+		font-weight: bold;
+	}
+
+	.orderItemPane-centre .item {
+		border-bottom: 1px solid #f2f2f2;
+
+	}
+
+	.orderItemPane-centre .item>text,
+	.inscommny-sum>text {
+		margin: 0 10px 4px 10px;
+		font-size: 14px;
+	}
+
+	.orderItemPane-below {
+		height: auto;
+		border-bottom: 1px solid #f2f2f2;
+
+		&>button {
+			margin-left: 10px;
+		}
+	}
+
+
+	.orderItemPane-extend .extend-button>text {
+		color: #ff9000;
+		font-size: 12px;
+	}
+
+	.orderItemPane-extend {
+		border-bottom-right-radius: 10px;
+		border-bottom-left-radius: 10px;
+	}
+
+	.classes::before {
+		content: "·";
+		color: #ff9000;
+		margin-right: 10px;
+	}
+
+	.flexd {
+		position: fixed;
+		left: 0;
+		right: 0;
+	}
+
+	.moosize {
+		font-size: 12px;
+	}
+
+	.color {
+		color: #ff9000;
+	}
+
+	/* 查询区域End */
+</style>

+ 15 - 5
pages/tools/team/team.vue

@@ -58,28 +58,28 @@
 					<view class="dis j-c a-c">{{item.sumpremium}}</view>
 				</view>
 				<view v-if="teamTabIndex==1" class="dis j-s a-c team_members-data"
-					v-for="(item,index) in userPolicyList2" :key="index">
+					v-for="(item,index) in userPolicyList2" :key="index" @click="toTeamMember('userPolicyList2',index)">
 					<view class="dis j-c a-c">{{item.username}}</view>
 					<view class="dis j-c a-c">{{item.ordernum}}</view>
 					<view class="dis j-c a-c">{{item.policynum}}</view>
 					<view class="dis j-c a-c">{{item.sumpremium}}</view>
 				</view>
 				<view v-if="teamTabIndex==2" class="dis j-s a-c team_members-data"
-					v-for="(item,index) in userPolicyList3" :key="index">
+					v-for="(item,index) in userPolicyList3" :key="index" @click="toTeamMember('userPolicyList3',index)">
 					<view class="dis j-c a-c">{{item.username}}</view>
 					<view class="dis j-c a-c">{{item.ordernum}}</view>
 					<view class="dis j-c a-c">{{item.policynum}}</view>
 					<view class="dis j-c a-c">{{item.sumpremium}}</view>
 				</view>
 				<view v-if="teamTabIndex==3" class="dis j-s a-c team_members-data"
-					v-for="(item,index) in userPolicyList4" :key="index">
+					v-for="(item,index) in userPolicyList4" :key="index" @click="toTeamMember('userPolicyList4',index)">
 					<view class="dis j-c a-c">{{item.username}}</view>
 					<view class="dis j-c a-c">{{item.ordernum}}</view>
 					<view class="dis j-c a-c">{{item.policynum}}</view>
 					<view class="dis j-c a-c">{{item.sumpremium}}</view>
 				</view>
 				<view v-if="teamTabIndex==4" class="dis j-s a-c team_members-data"
-					v-for="(item,index) in userPolicyList5" :key="index">
+					v-for="(item,index) in userPolicyList5" :key="index" @click="toTeamMember('userPolicyList5',index)">
 					<view class="dis j-c a-c">{{item.username}}</view>
 					<view class="dis j-c a-c">{{item.ordernum}}</view>
 					<view class="dis j-c a-c">{{item.policynum}}</view>
@@ -122,7 +122,7 @@
 				userPolicyList4: [],
 				userPolicyList5: [],
 				arrdata: [{
-						teamlevel: 99,
+						teamlevel: 0,
 						name: '汇总',
 						teamnum: 0, //人数
 						sumpremium: 0, //签单保费
@@ -222,6 +222,15 @@
 					this.userPolicyList3 = res.data.userPolicyList1;
 					this.userPolicyList4 = res.data.userPolicyList2;
 					this.userPolicyList5 = res.data.userPolicyList9;
+					this.SummaryList.map(ele => {
+						this.arrdata.map(val => {
+							if (ele.teamlevel == val.name) {
+								val.teamnum = ele.teamnum;
+							}
+						})
+
+					})
+					console.log(this.arrdata)
 				}
 			},
 
@@ -237,6 +246,7 @@
 			},
 			// 选择团队tap
 			teamTabtap(index) {
+				console.log(index)
 				this.teamTabIndex = index;
 			},
 			toTeamMember(index) {

+ 133 - 108
pages/wallet/bindBank.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 		<!-- 步骤条End -->
-		
+
 		<!-- 持卡人信息Start -->
 		<view class="bindBankCard">
 			<view class="bindBank-infor">
@@ -18,7 +18,7 @@
 				<view class="inputData d-flex">
 					<view class="d-flex a-center">提现人</view>
 					<view class="d-flex a-center flex-1">
-						<input  style="font-size: 28upx;" type="text" disabled v-model="userInfo.sysUser.name"  />
+						<input style="font-size: 28upx;" type="text" disabled v-model="userInfo.sysUser.name" />
 					</view>
 				</view>
 				<!-- <view class="inputData d-flex">
@@ -30,170 +30,195 @@
 				<view class="inputData d-flex">
 					<view class="d-flex a-center">选择银行</view>
 					<view class="d-flex a-center flex-1">
-						<input  style="font-size: 28upx;" type="text" disabled v-model="bankname" placeholder="系统自动识别" />
+						<input style="font-size: 28upx;" type="text" disabled v-model="bankname" placeholder="系统自动识别" />
 					</view>
 				</view>
 				<view class="inputData d-flex">
 					<view class="d-flex a-center">银行卡卡号</view>
 					<view class="d-flex a-center flex-1">
-						<input type="text" v-model="accountno" @blur="validateBankCard" placeholder="请输入银行卡卡号"  style="font-size: 28upx;"/>
+						<input type="text" v-model="accountno" @blur="validateBankCard" placeholder="请输入银行卡卡号"
+							style="font-size: 28upx;" />
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 持卡人信息End -->
-		
-		<button class="user-set-btn d-flex a-center j-center main-bg-color" :class="{'main-bf-hover-color':disabled}" 
-		type="primary" @tap="submit" :disabled="disabled" style="margin: 40upx  30upx;">绑定银行卡</button>
-		
+
+		<button class="user-set-btn d-flex a-center j-center main-bg-color" :class="{'main-bf-hover-color':disabled}"
+			type="primary" @tap="submit" :disabled="disabled" style="margin: 40upx  30upx;">绑定银行卡</button>
+
 	</view>
 </template>
 
 <script>
-	import {mapState,mapMutations} from "vuex"
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
 	import bankBin from "@/common/bankcardinfo.js"
 	export default {
 		data() {
 			return {
-				bankname:"",//银行名称
-				accountno:"",//银行卡账号
-				disabled:true,
-				validateBankCardStatus:false,//银行卡验证状态
+				bankname: "", //银行名称
+				accountno: "", //银行卡账号
+				disabled: true,
+				validateBankCardStatus: false, //银行卡验证状态
 			}
 		},
-		computed:{
+		computed: {
 			...mapState(['userInfo'])
 		},
-		watch:{
-			bankname(val){
+		watch: {
+			bankname(val) {
 				this.OnBtnChange();
 			},
-			accountno(val){
+			accountno(val) {
 				this.OnBtnChange();
 			},
 		},
 		methods: {
 			...mapMutations(['setUserModules']),
 			// 改变按钮状态
-			OnBtnChange(){
-				if(this.accountno && this.bankname){
-					this.disabled=false; return;
+			OnBtnChange() {
+				if (this.accountno && this.bankname) {
+					this.disabled = false;
+					return;
 				}
-				this.disabled=true;
+				this.disabled = true;
 			},
 			// 验证银行卡
-			async validateBankCard(){
+			async validateBankCard() {
 				var that = this;
 				that.bankname = "";
-				
+
 				await bankBin.getBankBin(this.accountno)
-					.then((data)=> {
+					.then((data) => {
 						console.log(data)
 						that.bankname = data.bankName;
 						that.validateBankCardStatus = true;
 						return true;
 					})
-					.catch((err)=> {
+					.catch((err) => {
 						console.log(err)
 						that.validateBankCardStatus = false;
-						return uni.showToast({ title: err.split(":")[1] , icon:"none" });
+						return uni.showToast({
+							title: err.split(":")[1],
+							icon: "none"
+						});
 					})
 			},
-			async submit(){
+			async submit() {
 				var params = {
-					"accountno":this.accountno,
-					"bankname":this.bankname,
-					"id":this.userInfo.sysUser.id
+					"accountno": this.accountno,
+					"bankname": this.bankname,
+					"id": this.userInfo.sysUser.id
 				}
-				let res = await this.$http.post('/esmUserInternal/saveUser',params);
+				let res = await this.$http.post('/esmUserInternal/saveUser', params);
 				let info = {
-					sysUser:{},
-					esmUserInternal:{},
-					esmUserAgent:{}
+					sysUser: {},
+					esmUserInternal: {},
+					esmUserAgent: {}
 				};
-				Object.assign(info.sysUser,this.userInfo.sysUser);
-				Object.assign(info.esmUserInternal,this.userInfo.esmUserInternal);
-				Object.assign(info.esmUserAgent,this.userInfo.esmUserAgent);
+				Object.assign(info.sysUser, this.userInfo.sysUser);
+				Object.assign(info.esmUserInternal, this.userInfo.esmUserInternal);
+				Object.assign(info.esmUserAgent, this.userInfo.esmUserAgent);
 				info.esmUserInternal.accountno = this.accountno;
 				info.esmUserInternal.bankname = this.bankname;
-				this.setUserModules({title:'userInfo',data:info})
-				uni.showToast({ title: '更改银行卡成功',duration:2000,icon:"none"});
+				this.setUserModules({
+					title: 'userInfo',
+					data: info
+				})
+				uni.showToast({
+					title: '更改银行卡成功',
+					duration: 2000,
+					icon: "none"
+				});
 				setTimeout(() => {
 					return uni.navigateBack();
 				}, 2000);
 			}
-			
-			
+
+
 		}
 	}
 </script>
 
 
 <style lang="scss" scoped>
-@import '@/style/mixin.scss';
-page{
-	background-color: #F5F5F5;
-}
-.bindBank-step {
-	padding: 72upx 0 78upx;
-	background: rgba($themeColor, 0.8);
-	text-align: center;
-}
-.bindBank-step>view{
-	position:relative;
-	width: 50%;
-}
-.bindBank-step-icon{
-	width: 76upx;
-	height: 76upx;
-	line-height: 76upx;
-	position: relative;
-	z-index: 3;
-	display: inline-block;
-	overflow: hidden;
-}
-.bindBank-step-des{
-	font-size: 24upx;
-	color: #fff;
-}
-.bindBank-step-iconCard{
-	background: url('/static/image/bindBank/icon-card.png') no-repeat 0 0;
-	background-size: 100%;
-}
-.bindBank-step-iconEnd{
-	background: url('/static/image/bindBank/icon-Password.png') no-repeat 0 0;
-	background-size: 100%;
-}
-
-/* 银行卡信息Start */
-.bindBankCard{
-	background-color: #f0eff5;
-	margin-top: -40upx;
-	border-radius: 40upx 40upx 0upx 0upx ;
-	overflow: hidden;
-	font-size: 28upx;
-}
-.bindBankCard .row{
-	padding: 0upx 30upx ;
-	box-sizing: border-box;
-}
-.bindBankCard .inputData{
-	padding: 10upx 15upx;
-	color: #333;
-	background-color: #fff;
-	height: 80upx;
-}
-.bindBank-infor>.header{
-	height: 90upx;
-	line-height: 90upx;
-}
-.bindBankCard .inputData>view:nth-of-type(1){
-	padding: 20upx 0;
-	text-indent: 10upx;
-	width:210upx;
-	flex-shrink: 1;
-	font-size: 30upx;
-}
-/* 银行卡信息End */
-
-</style>
+	@import '@/style/mixin.scss';
+
+	page {
+		background-color: #F5F5F5;
+	}
+
+	.bindBank-step {
+		padding: 72upx 0 78upx;
+		background: rgba($themeColor, 0.8);
+		text-align: center;
+	}
+
+	.bindBank-step>view {
+		position: relative;
+		width: 50%;
+	}
+
+	.bindBank-step-icon {
+		width: 76upx;
+		height: 76upx;
+		line-height: 76upx;
+		position: relative;
+		z-index: 3;
+		display: inline-block;
+		overflow: hidden;
+	}
+
+	.bindBank-step-des {
+		font-size: 24upx;
+		color: #fff;
+	}
+
+	.bindBank-step-iconCard {
+		background: url('/static/image/bindBank/icon-card.png') no-repeat 0 0;
+		background-size: 100%;
+	}
+
+	.bindBank-step-iconEnd {
+		background: url('/static/image/bindBank/icon-Password.png') no-repeat 0 0;
+		background-size: 100%;
+	}
+
+	/* 银行卡信息Start */
+	.bindBankCard {
+		background-color: #f0eff5;
+		margin-top: -40upx;
+		border-radius: 40upx 40upx 0upx 0upx;
+		overflow: hidden;
+		font-size: 28upx;
+	}
+
+	.bindBankCard .row {
+		padding: 0upx 30upx;
+		box-sizing: border-box;
+	}
+
+	.bindBankCard .inputData {
+		padding: 10upx 15upx;
+		color: #333;
+		background-color: #fff;
+		height: 80upx;
+	}
+
+	.bindBank-infor>.header {
+		height: 90upx;
+		line-height: 90upx;
+	}
+
+	.bindBankCard .inputData>view:nth-of-type(1) {
+		padding: 20upx 0;
+		width: 210upx;
+		flex-shrink: 1;
+		font-size: 30upx;
+	}
+
+	/* 银行卡信息End */
+</style>