소스 검색

1、app团队管理页面数据联调
2、增加撤销二维码功能
3、调整屏幕自适应

@dongkboy 1 년 전
부모
커밋
19a3fa0732

+ 1 - 1
components/modules/index/index-nav.vue

@@ -5,7 +5,7 @@
 			<swiper-item v-for="(page, pageindex) in categoryList" :key="pageindex">
 				<view class="category-list">
 					<view class="icon" v-for="category in page" :key="category.cat_id" @tap="tapEvent(category)">
-						<image mode="widthFix" :src="category.img"></image>
+						<image :src="category.img" style="width: 50px;height: 50px;"></image>
 						<view class="category-title">{{ category.title }}</view>
 					</view>
 				</view>

+ 1 - 1
components/modules/index/swiper-image.vue

@@ -7,7 +7,7 @@
 				:style="'height:'+height">
 				<swiper-item v-for="(item,index) in resdata" :key="index" @tap="tipEvent(item)"
 					:style="'height:'+height">
-					<image mode="widthFix" :src="item.image" :style="'height:'+height" lazy-load></image>
+					<image mode="scaleToFill" :src="item.image" :style="'height:'+height" lazy-load></image>
 				</swiper-item>
 			</swiper>
 		</view>

+ 62 - 34
components/modules/tools/team/mx-datepicker/mx-datepicker.vue

@@ -3,26 +3,36 @@
 		<!-- 日期选择器 -->
 		<view v-if="type!='time'" class="picker-modal">
 			<view class="picker-modal-header">
-				<view class="picker-icon picker-icon-zuozuo" :hover-stay-time="100" hover-class="picker-icon-active" @click="onSetYear('-1')"></view>
-				<view class="picker-icon picker-icon-zuo" :hover-stay-time="100" hover-class="picker-icon-active" @click="onSetMonth('-1')"></view>
+				<view class="picker-icon picker-icon-zuozuo" :hover-stay-time="100" hover-class="picker-icon-active"
+					@click="onSetYear('-1')"></view>
+				<view class="picker-icon picker-icon-zuo" :hover-stay-time="100" hover-class="picker-icon-active"
+					@click="onSetMonth('-1')"></view>
 				<text class="picker-modal-header-title">{{title}}</text>
-				<view class="picker-icon picker-icon-you" :hover-stay-time="100" hover-class="picker-icon-active" @click="onSetMonth('+1')"></view>
-				<view class="picker-icon picker-icon-youyou" :hover-stay-time="100" hover-class="picker-icon-active" @click="onSetYear('+1')"></view>
+				<view class="picker-icon picker-icon-you" :hover-stay-time="100" hover-class="picker-icon-active"
+					@click="onSetMonth('+1')"></view>
+				<view class="picker-icon picker-icon-youyou" :hover-stay-time="100" hover-class="picker-icon-active"
+					@click="onSetYear('+1')"></view>
 			</view>
-			<swiper class="picker-modal-body" :circular="true" :duration="200" :skip-hidden-item-layout="true" :current="calendarIndex" @change="onSwiperChange">
-				<swiper-item class="picker-calendar" v-for="(calendar,calendarIndex2) in calendars" :key="calendarIndex2">
+			<swiper class="picker-modal-body" :circular="true" :duration="200" :skip-hidden-item-layout="true"
+				:current="calendarIndex" @change="onSwiperChange">
+				<swiper-item class="picker-calendar" v-for="(calendar,calendarIndex2) in calendars"
+					:key="calendarIndex2">
 					<view class="picker-calendar-view" v-for="(week,index) in weeks" :key="index - 7">
 						<view class="picker-calendar-view-item">{{week}}</view>
 					</view>
-					<view class="picker-calendar-view" v-for="(date,dateIndex) in calendar" :key="dateIndex" @click="onSelectDate(date)">
+					<view class="picker-calendar-view" v-for="(date,dateIndex) in calendar" :key="dateIndex"
+						@click="onSelectDate(date)">
 						<!-- 背景样式 -->
-						<view v-show="date.bgStyle.type" :class="'picker-calendar-view-'+date.bgStyle.type" :style="{background: date.bgStyle.background}"></view>
+						<view v-show="date.bgStyle.type" :class="'picker-calendar-view-'+date.bgStyle.type"
+							:style="{background: date.bgStyle.background}"></view>
 						<!-- 正常和选中样式 -->
-						<view class="picker-calendar-view-item" :style="{opacity: date.statusStyle.opacity, color: date.statusStyle.color, background: date.statusStyle.background}">
+						<view class="picker-calendar-view-item"
+							:style="{opacity: date.statusStyle.opacity, color: date.statusStyle.color, background: date.statusStyle.background}">
 							<text>{{date.title}}</text>
 						</view>
 						<!-- 小圆点样式 -->
-						<view class="picker-calendar-view-dot" :style="{opacity: date.dotStyle.opacity, background: date.dotStyle.background}"></view>
+						<view class="picker-calendar-view-dot"
+							:style="{opacity: date.dotStyle.opacity, background: date.dotStyle.background}"></view>
 						<!-- 信息样式 -->
 						<view v-show="date.tips" class="picker-calendar-view-tips">{{date.tips}}</view>
 					</view>
@@ -34,28 +44,33 @@
 						<view class="picker-display">
 							<text>{{beginText}}日期</text>
 							<text class="picker-display-text">{{BeginTitle}}</text>
-							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100" hover-class="picker-display-link-active"
-							 :style="{color}" @click="onShowTimePicker('begin')">{{BeginTimeTitle}}</view>
+							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100"
+								hover-class="picker-display-link-active" :style="{color}"
+								@click="onShowTimePicker('begin')">{{BeginTimeTitle}}</view>
 						</view>
 						<view class="picker-display">
 							<text>{{endText}}日期</text>
 							<text class="picker-display-text">{{EndTitle}}</text>
-							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100" hover-class="picker-display-link-active"
-							 :style="{color}" @click="onShowTimePicker('end')">{{EndTimeTitle}}</view>
+							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100"
+								hover-class="picker-display-link-active" :style="{color}"
+								@click="onShowTimePicker('end')">{{EndTimeTitle}}</view>
 						</view>
 					</block>
 					<block v-else>
 						<view class="picker-display">
 							<text>当前选择</text>
 							<text class="picker-display-text">{{BeginTitle}}</text>
-							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100" hover-class="picker-display-link-active"
-							 :style="{color}" @click="onShowTimePicker('begin')">{{BeginTimeTitle}}</view>
+							<view v-if="isContainTime" class="picker-display-link" :hover-stay-time="100"
+								hover-class="picker-display-link-active" :style="{color}"
+								@click="onShowTimePicker('begin')">{{BeginTimeTitle}}</view>
 						</view>
 					</block>
 				</view>
 				<view class="picker-modal-footer-btn">
-					<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active" @click="onCancel">取消</view>
-					<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active" @click="onConfirm">确定</view>
+					<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active" @click="onCancel">取消
+					</view>
+					<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active"
+						@click="onConfirm">确定</view>
 				</view>
 			</view>
 		</view>
@@ -65,7 +80,8 @@
 				<view class="picker-modal-header">
 					<text class="picker-modal-header-title">选择日期</text>
 				</view>
-				<picker-view class="picker-modal-time" indicator-class="picker-modal-time-item" :value="timeValue" @change="onTimeChange">
+				<picker-view class="picker-modal-time" indicator-class="picker-modal-time-item" :value="timeValue"
+					@change="onTimeChange">
 					<picker-view-column>
 						<view v-for="(v,i) in 24" :key="i">{{i<10?'0'+i:i}}时</view>
 					</picker-view-column>
@@ -84,8 +100,10 @@
 						</view>
 					</view>
 					<view class="picker-modal-footer-btn">
-						<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active" @click="onCancelTime">取消</view>
-						<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active" @click="onConfirmTime">确定</view>
+						<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active"
+							@click="onCancelTime">取消</view>
+						<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active"
+							@click="onConfirmTime">确定</view>
 					</view>
 				</view>
 			</view>
@@ -137,7 +155,8 @@
 		 * @param b Date对象
 		 * @return Boolean
 		 */
-		isSameDay: (a, b) => a.getMonth() == b.getMonth() && a.getFullYear() == b.getFullYear() && a.getDate() == b.getDate(),
+		isSameDay: (a, b) => a.getMonth() == b.getMonth() && a.getFullYear() == b.getFullYear() && a.getDate() == b
+			.getDate(),
 		/**
 		 * 格式化Date对象
 		 * @param d 日期对象
@@ -157,7 +176,8 @@
 				f = f.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
 			for (var k in o)
 				if (new RegExp("(" + k + ")").test(f))
-					f = f.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+					f = f.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k])
+						.length)));
 			return f;
 		},
 		/**
@@ -292,7 +312,11 @@
 				date: {}, //当前日期对象
 				weeks: ["一", "二", "三", "四", "五", "六", "日"],
 				title: '初始化', //标题
-				calendars: [[],[],[]], //日历数组
+				calendars: [
+					[],
+					[],
+					[]
+				], //日历数组
 				calendarIndex: 1, //当前日历索引
 				checkeds: [], //选中的日期对象集合
 				showTimePicker: false, //是否显示时间选择器
@@ -413,14 +437,16 @@
 						item.bgStyle.type = 'bgbegin';
 					}
 					if (DateTools.isSameDay(this.checkeds[1], item.dateObj)) { //结束日期
-						if (this.isMultiSelect && this.showTips) item.tips = item.bgStyle.type ? this.beginText + ' / ' + this.endText : this.endText;
+						if (this.isMultiSelect && this.showTips) item.tips = item.bgStyle.type ? this.beginText + ' / ' +
+							this.endText : this.endText;
 						if (!item.bgStyle.type) { //开始日期不等于结束日期
 							item.bgStyle.type = 'bgend';
 						} else {
 							item.bgStyle.type = '';
 						}
 					}
-					if (!item.bgStyle.type && (+item.dateObj > +this.checkeds[0] && +item.dateObj < +this.checkeds[1])) { //中间的日期
+					if (!item.bgStyle.type && (+item.dateObj > +this.checkeds[0] && +item.dateObj < +this.checkeds[
+						1])) { //中间的日期
 						item.bgStyle.type = 'bg';
 						item.statusStyle.color = this.color;
 					}
@@ -437,17 +463,17 @@
 				let before = DateTools.getDateToMonth(date, date.getMonth() - 1);
 				let after = DateTools.getDateToMonth(date, date.getMonth() + 1);
 				if (this.calendarIndex == 0) {
-					if(refresh) this.calendars.splice(0, 1, DateTools.getCalendar(date, this.procCalendar));
+					if (refresh) this.calendars.splice(0, 1, DateTools.getCalendar(date, this.procCalendar));
 					this.calendars.splice(1, 1, DateTools.getCalendar(after, this.procCalendar));
 					this.calendars.splice(2, 1, DateTools.getCalendar(before, this.procCalendar));
 				} else if (this.calendarIndex == 1) {
 					this.calendars.splice(0, 1, DateTools.getCalendar(before, this.procCalendar));
-					if(refresh) this.calendars.splice(1, 1, DateTools.getCalendar(date, this.procCalendar));
+					if (refresh) this.calendars.splice(1, 1, DateTools.getCalendar(date, this.procCalendar));
 					this.calendars.splice(2, 1, DateTools.getCalendar(after, this.procCalendar));
 				} else if (this.calendarIndex == 2) {
 					this.calendars.splice(0, 1, DateTools.getCalendar(after, this.procCalendar));
 					this.calendars.splice(1, 1, DateTools.getCalendar(before, this.procCalendar));
-					if(refresh) this.calendars.splice(2, 1, DateTools.getCalendar(date, this.procCalendar));
+					if (refresh) this.calendars.splice(2, 1, DateTools.getCalendar(date, this.procCalendar));
 				}
 				this.title = DateTools.format(this.date, 'yyyy年mm月');
 			},
@@ -492,7 +518,7 @@
 				};
 				//定义默认格式
 				let defaultFormat = {
-					'date': 'yyyy/mm/dd',
+					'date': 'yyyy-mm-dd',
 					'time': 'hh:ii' + (this.showSeconds ? ':ss' : ''),
 					'datetime': ''
 				};
@@ -520,7 +546,8 @@
 								let time = [this.beginTime, this.endTime];
 								fillTime(newDate, time[index]);
 							}
-							values.push(DateTools.format(newDate, this.format ? this.format : defaultFormat[this.isContainTime ?
+							values.push(DateTools.format(newDate, this.format ? this.format : defaultFormat[this
+								.isContainTime ?
 								'datetime' : 'date']));
 							dates.push(newDate);
 						});
@@ -532,7 +559,8 @@
 							newDate.setHours(this.beginTime[0], this.beginTime[1]);
 							if (this.showSeconds) newDate.setSeconds(this.beginTime[2]);
 						}
-						result.value = DateTools.format(newDate, this.format ? this.format : defaultFormat[this.isContainTime ?
+						result.value = DateTools.format(newDate, this.format ? this.format : defaultFormat[this
+							.isContainTime ?
 							'datetime' : 'date']);
 						result.date = newDate;
 					}
@@ -567,7 +595,7 @@
 				this.isShow = newValue;
 			},
 			value(newValue, oldValue) {
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.setValue(newValue);
 				}, 0);
 			}
@@ -816,4 +844,4 @@
 	.picker-icon-youyou:before {
 		content: "\e642";
 	}
-</style>
+</style>

+ 1 - 1
main.js

@@ -83,7 +83,7 @@ plus.nativeUI.toast = (function(str) {
 	}
 });
 // #endif
-// //在main.js中配置
+//在main.js中配置
 // function sizeFun() {
 // 	// 宽屏字体大小适配
 // 	let n = 1920;

+ 2 - 2
manifest.json

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

+ 7 - 9
pages.json

@@ -761,15 +761,13 @@
 		"navigationBarTitleText": "晋掌柜",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		// "navigationStyle": "custom",
-		"backgroundColor": "#FFFFFF"
-		// "rpxCalcMaxDeviceWidth": 3840,
-		// // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
-
-		// "rpxCalcBaseDeviceWidth": 750,
-		// // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
-
-		// "rpxCalcIncludeWidth": 750
-		// // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
+		"backgroundColor": "#FFFFFF",
+		"rpxCalcMaxDeviceWidth": 0,
+		// rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
+		"rpxCalcBaseDeviceWidth": 375,
+		// rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
+		"rpxCalcIncludeWidth": 750
+		// rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
 	},
 	"tabBar": {
 		"color": "#444444",

+ 33 - 59
pages/carInsure1/payCode1.vue

@@ -22,11 +22,8 @@
 				<view>保险公司</view>
 				<view>{{companyName}}</view>
 			</view>
-			<view class="row d-flex">
-				<view>保费合计</view>
-				<view style="font-size: 34upx;color: red;font-weight: bold;">¥{{sumPermium}}</view>
-			</view>
-			<view class="row d-flex">
+
+			<view v-if="jqpremium" class="row d-flex">
 				<view>交强</view>
 				<view>{{jqpremium}}</view>
 			</view>
@@ -34,22 +31,25 @@
 				<view>车船税</view>
 				<view>{{taxamount}}</view>
 			</view>
-			<view class="row d-flex">
+			<view v-if="jypremium" class="row d-flex">
 				<view>驾意险</view>
 				<view>{{jypremium}}</view>
 			</view>
-			<view class="row d-flex">
+			<view v-if="sypremium" class="row d-flex">
 				<view>商业</view>
 				<view>{{sypremium}}</view>
 			</view>
-
 			<view class="row d-flex">
+				<view>保费合计</view>
+				<view style="font-size: 34upx;color: red;font-weight: bold;">¥{{sumPermium}}</view>
+			</view>
+			<view v-if="jqStartDate" class="row d-flex">
 				<view>交强起保日期</view>
-				<view>{{jqstartdate}}</view>
+				<view>{{jqStartDate}}</view>
 			</view>
-			<view class="row d-flex">
+			<view v-if="syStartDate" class="row d-flex">
 				<view>商业起保日期</view>
-				<view>{{systartdate}}</view>
+				<view>{{syStartDate}}</view>
 			</view>
 		</view>
 		<!-- #ifdef APP-PLUS -->
@@ -86,8 +86,8 @@
 				sypremium: "",
 				taxamount: "",
 				jypremium: "",
-				jqstartdate: "",
-				systartdate: "",
+				jqStartDate: "",
+				syStartDate: "",
 				arr: false,
 				posterUrl: "",
 			}
@@ -104,54 +104,28 @@
 				let params = {
 					companyId: data.companyId
 				};
-				let res = await this.$http.post('/insurance/order/getByCompanyId', params);
+				let res = await this.$http.get('/order/qrCode/getQrCode?areaCompanyId=' + data.companyId);
 				//获取前一个页面传过来的信息(车辆信息,人员信息,险种信息)
-				var submitTime = new Date(res.data.submittime);
-				this.endDateTime = submitTime.getFullYear() + "/" + (submitTime.getMonth() + 1) + "/" + submitTime
-					.getDate() + " 23:00";
-				this.companyName = res.data.inscompany;
-				this.sumPermium = res.data.sumpremium;
-				this.licenseNo = res.data.carinfo.licenseNo;
-				this.applyName = res.data.insuredname;
-				this.mobile = res.data.applyinfo.mobile;
-				this.jqpremium = res.data.jqpremium; // 交强
-				this.sypremium = res.data.sypremium; // 商业
-				this.taxamount = res.data.taxamount; // 车船税
-				this.jypremium = res.data.jypremium; // 驾意险
-				this.jqstartdate = res.data.jqstartdate; // 交强起保日期
-				this.systartdate = res.data.systartdate; // 商业起保日期
-				//跳转永安支付
-				switch (this.companyName) {
-					case "永安财险":
-						this.paycodeimg = QR.createQrCodeImg(this.$base.h5BaseUrl +
-							"/#/pages/carInsure1/yonganCode?companyId=" + this.companyId + '&mobile=' + this
-							.mobile, {
-								size: parseInt(300) //二维码大小
-							})
-						break;
-					case "中煤财险":
-					case "永诚财险":
-					case "众安财险":
-					case "紫金财险":
-					case "中国人寿":
-						this.paycodeimg = QR.createQrCodeImg(res.data.paymentLink, {
-							size: parseInt(300) //二维码大小  
-						})
-						break;
-					case "恒邦财险":
-					case "国任财险":
-						this.paycodeimg = res.data.paymentLink;
-						break;
-					case "安盛天平":
-						let anresult = res.data.paymentLink.replace(/[\r\n]/g, "");
-						let animgBase64 = `data:image/png;base64,${anresult}`;
-						base64ToPath(animgBase64)
-							.then(path => {
-								this.paycodeimg = path;
-							})
-						break;
+				if (res.code == '200') {
+					this.companyName = res.data.inscompany;
+					this.sumPermium = res.data.sumpremium;
+					this.licenseNo = res.data.cPlateNo;
+					this.applyName = res.data.cInsuredNme;
+					this.jqpremium = res.data.jqpremium; // 交强
+					this.sypremium = res.data.sypremium; // 商业
+					this.taxamount = res.data.taxamount; // 车船税
+					this.jypremium = res.data.jypremium; // 驾意险
+					this.jqStartDate = res.data.jqStartDate; // 交强起保日期
+					this.syStartDate = res.data.syStartDate; // 商业起保日期
+					this.paycodeimg = QR.createQrCodeImg(res.data.qrCodeUrl, {
+						size: parseInt(300) //二维码大小  
+					})
+				} else {
+					uni.showModal({
+						showCancel: false,
+						title: res.msg
+					})
 				}
-
 			} else {
 				uni.showModal({
 					showCancel: false,

+ 4 - 5
pages/carInsure1/quote1.vue

@@ -148,13 +148,12 @@
 								</view>
 								<text v-if="totalitem.result.tips && totalitem.namesimple == '众安财险'"
 									style="color: red;">{{ totalitem.result.tips}}</text>
-								<view class="dis a-c " v-if="totalitem.checked">
+								<view class="dis a-c j-s" v-if="totalitem.checked">
 									<u-form-item label="报价协议选择" :prop="totalitem.agreementId" label-width="200"
-										:border-bottom='false' style="width: 280px;padding: 0;">
+										:border-bottom='false' style="padding: 0;">
 										<u-input type="select" :select-open="totalitem.selectShow"
 											v-model="totalitem.agreementName" placeholder="请选择协议"
-											@click="totalitem.selectShow = true"
-											:custom-style="{fontSize:'14px'}"></u-input>
+											@click="totalitem.selectShow = true"></u-input>
 										<u-select mode="single-column" :list="totalitem.agreement" value-name="id"
 											label-name="agreementName" v-model="totalitem.selectShow"
 											@confirm="val=>selectConfirm(val,totalindex)"></u-select>
@@ -288,7 +287,7 @@
 											<view class="">
 												<text style="font-size: 14px;">保费:</text>
 												<text
-													style="font-size: 14px;color: #ee7000;">¥{{yongchengaccidentalDrivingVo.premium*yongchengaccidentalDrivingVo.quantity}}.00</text>
+													style="font-size: 14px;color: #ee7000;">¥{{yongchengaccidentalDrivingVo.premium*yongchengaccidentalDrivingVo.quantity}}</text>
 											</view>
 											<view class="">
 												<text style="font-size: 14px;">份数:</text>

+ 8 - 8
pages/carInsure1/quoteDetail1.vue

@@ -87,9 +87,9 @@
 								<template v-if="item.coveragePremium">
 									<view class="kindItem d-flex a-center j-sb">
 										<view class="d-flex flex-1" style="width: 300px;">{{item.kindName}}</view>
-										<text v-if="['A'].includes(item.kindCode)">投保</text>
+										<text v-if="['A'].includes(item.kindCode)">{{item.amount}}</text>
 										<text
-											v-else-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)">{{toChinesNum(item.unitAmount)}}/{{orderInfo.carinfo.seatCount-1}}
+											v-else-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)">{{toChinesNum(item.unitAmount)}}/座*{{orderInfo.carinfo.seatCount-1}}
 										</text>
 										<text
 											v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(item.kindCode)">{{item.deductibleRate}}%</text>
@@ -185,11 +185,11 @@
 				<view class="body" v-if="showextendInfo">
 					<view class="row d-flex a-center j-sb">
 						<view>评分</view>
-						<view>{{extendInfo.score}}</view>
+						<view style="color: #ff9000;">{{extendInfo.score}}</view>
 					</view>
 					<view class="row d-flex a-center j-sb">
 						<view>出险信息</view>
-						<view style="width: 200px;">{{extendInfo.accidentInfoStr}}</view>
+						<view style="width: 200px; color: #ff9000;">{{extendInfo.accidentInfoStr}}</view>
 					</view>
 					<view class="row d-flex a-center j-sb">
 						<view>商业险折扣比例</view>
@@ -585,7 +585,7 @@
 							</view>
 						</template>
 					</block>
-					<block>
+					<block v-if="jypremium">
 						<view class="row d-flex a-center j-sb">
 							<view class="d-flex a-center">驾意险</view>
 							<view>¥{{jypremium}}</view>
@@ -613,7 +613,8 @@
 					</view>
 					<view style="font-weight: bold;font-size: 34upx;color: #333; ">¥{{sumPermium}}</view>
 				</view>
-				<template v-if="orderstatus==0 && routepage!='pages/orders/subOrders'">
+				<template
+					v-if="orderstatus==0 && routepage!='pages/orders/subOrders' && routepage!='pages/orders/quoteHistory'">
 					<view class="btn d-flex a-center j-center" @tap="toUnderwriting">确认核保</view>
 				</template>
 				<!-- 	<template v-if="orderstatus ==5">
@@ -632,7 +633,6 @@
 		<previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="previewImgs"></previewImage>
 	</view>
 </template>
-
 <script>
 	import {
 		mapState,
@@ -1899,7 +1899,7 @@
 	}
 
 	.car .body .row {
-		padding: 5px 0;
+		padding: 5px;
 		border-bottom: 1px solid #F3F3F3;
 	}
 

+ 1 - 5
pages/index/index.vue

@@ -31,11 +31,7 @@
 		<swiper-image :resdata="swiperList" @changeEvent="swiperChange"></swiper-image>
 
 		<!-- 分类轮播 -->
-		<view class="px-2">
-			<view class="py-1" style="border-radius: 20upx;background-color: #ffffff;">
-				<index-nav :resdata="categoryList" :row="2"></index-nav>
-			</view>
-		</view>
+		<index-nav :resdata="categoryList" :row="2"></index-nav>
 		<!-- 推荐商品 -->
 		<view class="pick" :style="{'background':'#fff'}">
 			<view class="box">

+ 27 - 9
pages/my/my.vue

@@ -23,12 +23,17 @@
 		<!-- 头部信息End -->
 		<!-- 我的订单Start -->
 		<scroll-view scroll-x class="my-orders ">
-			<view :style="'width: calc(((690upx)/4)*'+orderTypeList.length+')'">
-				<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder">
-					<uni-grid-item style="width: calc((690upx)/4)" class="" v-for="(item ,index) in orderTypeList"
-						:index="index" :key="index">
-						<view style="width: calc((690upx)/4)"
-							class="grid-item-box d-flex a-center j-center flex-column">
+			<view>
+				<u-grid :col="4" :border="false" align="center">
+					<u-grid-item class="u-grid-iconfont" v-for="(item ,index) in orderTypeList" :index="index"
+						:key="index" @click="openOrder">
+						<view class="icon iconfont " :class="item.icon" :style="'color:'+item.iconColor"></view>
+						<view class="grid-text">{{item.text}}</view>
+					</u-grid-item>
+				</u-grid>
+				<!-- 	<uni-grid :column="orderTypeList.length" :show-border="false" :square="false" @change="openOrder">
+					<uni-grid-item class="" v-for="(item ,index) in orderTypeList" :index="index" :key="index">
+						<view class="grid-item-box d-flex a-center j-center flex-column">
 							<view class="icon iconfont" :class="item.icon" :style="'color:'+item.iconColor"></view>
 							<text class="text">{{item.text}}</text>
 							<view v-if="item.badge" class="grid-dot" v-show="item.badge>0">
@@ -37,7 +42,7 @@
 							</view>
 						</view>
 					</uni-grid-item>
-				</uni-grid>
+				</uni-grid> -->
 			</view>
 		</scroll-view>
 		<!-- 我的订单End -->
@@ -620,8 +625,8 @@
 			},
 			//跳转订单页面
 			openOrder(e) {
-				let index = e.detail.index;
-				this.setOrderStage(this.orderTypeList[index].orderStage);
+
+				this.setOrderStage(this.orderTypeList[e].orderStage);
 				this.navigate({
 					url: "/pages/orders/orders"
 				}, "switchTab", true)
@@ -822,6 +827,19 @@
 		margin-bottom: 15upx;
 	}
 
+	.u-grid-iconfont .icon {
+		width: 60upx;
+		height: 70upx;
+		font-size: 55upx;
+		color: #1396DB;
+		margin-bottom: 15upx;
+	}
+
+	.u-grid-iconfont .grid-text {
+		font-size: 24upx;
+		color: #666666;
+	}
+
 	.my-orders .grid-item-box .text {
 		font-size: 24upx;
 		color: #666666;

+ 45 - 11
pages/orders/quotation.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="background-color: #ea552d;">
+	<view style="background-color: #ea552d;height: 100vh;">
 		<view class="page dis f-c a-c" id="panelcanvas">
 			<view class="Basic-information dis f-c" style="background: bisque;border-radius: 0;">
 				<view class=" dis a-c j-c" style="padding: 4px;">
@@ -87,7 +87,7 @@
 				</view>
 				<view class="coverage dis j-s f-c" style="border: none;" v-if="dataInfo.sypremium">
 					<view class="coverage-title dis">
-						<view style="width: 200px;">
+						<view style="">
 							<text>商业险金额</text>
 						</view>
 						<view>
@@ -98,7 +98,7 @@
 						</view>
 					</view>
 					<view class="coverage-sum dis j-s" v-for="(item,index) in dataInfo.kindinfo" :key="index">
-						<view style="width: 200px;">
+						<view style="">
 							<text>{{item.kindName}}</text>
 						</view>
 						<view v-if="['D4', 'SY_FJ_YBW2'].includes(item.kindCode)">
@@ -116,13 +116,15 @@
 					</view>
 				</view>
 			</view>
+
+
 		</view>
-		<view style="width: 100%; padding-bottom: 20px; background-color: #ea552d;">
-			<!-- #ifdef APP-PLUS -->
-			<view class="tip d-flex a-center j-center" @tap="sendPayCode">发送到微信</view>
-			<!-- #endif -->
+		<view class="infoBottom d-flex a-center j-center j-sb">
+			<button type="default" class="d-flex a-center j-center" @tap="sendPayCode">发送到微信</button>
 		</view>
 	</view>
+
+	</view>
 </template>
 
 <script>
@@ -175,6 +177,10 @@
 						name: "紫金财险",
 						icon: "../../static/insuranceicon/zijin.png"
 					},
+					{
+						name: "国任财险",
+						icon: "../../static/insuranceicon/guoren.png"
+					},
 				],
 				logoimg: "",
 			}
@@ -381,12 +387,15 @@
 	}
 </script>
 <style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
 	.page {
 		background-color: rgba(234, 85, 45, 1);
-		padding: 20px 10px;
+		padding: 20px 10px 100px 10px;
 		box-sizing: border-box;
 	}
 
+
 	.Basic-information {
 		background-color: white;
 		width: 100%;
@@ -543,14 +552,39 @@
 	}
 
 	.tip {
-		width: 660upx;
-		height: 90upx;
-		background-color: #FFFFFF;
+		width: 100%;
+		background-color: #fff;
 		border-radius: 10upx;
 		font-size: 32upx;
 		font-weight: bold;
 		margin: 0 auto;
 		padding: 20px;
 		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+	}
+
+	/* 底部的样式Start */
+	.infoBottom {
+		height: 140upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: #ea552d;
+		border-top: 1upx solid #ea552d;
+		z-index: 99;
+		margin-top: 100px;
 	}
+
+	.infoBottom>button {
+		// font-size: 30upx;
+		background: #fff;
+		color: #333;
+		flex: 1;
+		margin: 0upx 30px;
+		font-weight: bold;
+	}
+
+	/* 底部的样式End */
 </style>

+ 20 - 0
pages/orders/quoteHistory.vue

@@ -44,6 +44,8 @@
 						@click="bjdpreview(item.id)">报价单</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
 						shape="circle" @click="Payment(item.id)">付款码</u-button>
+					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
+						shape="circle" @click="revokeCode(item.id)">撤销二维码</u-button>
 					<u-button size="mini" type="primary" :plain="true" :hair-line="false" shape="circle"
 						@click="detial(item.id)">查看详情</u-button>
 				</view>
@@ -119,6 +121,24 @@
 					url: "/pages/carInsure1/payCode1?companyId=" + id
 				})
 			},
+			//撤销二维码
+			async revokeCode(id) {
+				let res = await this.$http.post('/order/qrCode/destructionQrCode?areaCompanyId=' + id)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 			//报价单
 			bjdpreview(id) {
 				uni.navigateTo({

+ 21 - 1
pages/orders/subOrders.vue

@@ -46,7 +46,9 @@
 					<u-button v-if="item.orderstatus==2 && ['紫金财险'].includes(item.inscompany)" size="mini" type="error"
 						:plain="true" :hair-line="false" shape="circle" @click="cancelorder(item.id)">撤单</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
-						shape="circle" @click="Payment(item.id)">付款码</u-button>
+						shape="circle" @click="Payment(item.id)">二维码</u-button>
+					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
+						shape="circle" @click="revokeCode(item.id)">撤销二维码</u-button>
 					<u-button v-if="item.orderstatus==1  && ['中煤财险'].includes(item.inscompany)" size="mini" type="error"
 						:plain="true" :hair-line="false" shape="circle" @click="underwriting(item.id)">核保状态查询</u-button>
 					<u-button
@@ -129,6 +131,24 @@
 					url: "/pages/carInsure1/payCode1?companyId=" + id
 				})
 			},
+			//撤销二维码
+			async revokeCode(id) {
+				let res = await this.$http.post('/order/qrCode/destructionQrCode?areaCompanyId=' + id)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 			//报价单
 			bjdpreview(id) {
 				uni.navigateTo({

+ 131 - 154
pages/tools/team/team.vue

@@ -10,7 +10,8 @@
 						<view>{{queryTimeTypeArray[queryTimeTypeIndex]}}</view>
 					</picker>
 				</view>
-				<view class="d-flex a-center j-center flex-1" @click="onShowDatePicker">{{dateRange[0]}} -
+				<view class="d-flex a-center j-center flex-1" @click="onShowDatePicker">
+					{{dateRange[0].replace('/','-')}} -
 					{{dateRange[1]}}
 				</view>
 				<view class="d-flex a-center j-center" style="width: 60upx;flex-shrink: 0;">
@@ -24,22 +25,16 @@
 					<view class="d-flex a-center j-center">签单保费(元)</view>
 					<view class="d-flex a-center j-center">出单人力</view>
 				</view>
-				<block v-for="(item,index) in teamTabBars" :key="index">
+				<block v-for="(item,index) in arrdata" :key="index">
 					<view class="statisticsContent">
 						<view class="d-flex a-center j-center">{{item.name}}</view>
-						<view class="d-flex a-center j-center">{{item.personNum}}</view>
-						<view class="d-flex a-center j-center">{{item.premium.toFixed(2)}}</view>
-						<view class="d-flex a-center j-center">{{item.outSingle}}</view>
+						<view class="d-flex a-center j-center">{{item.teamnum}}</view>
+						<view class="d-flex a-center j-center">{{item.sumpremium.toFixed(2)}}</view>
+						<view class="d-flex a-center j-center">{{item.usernum}}</view>
 					</view>
 				</block>
 			</view>
-
-			<view class="teamScrollView">
-				<swiper-tab :tabBars="teamTabBars" :tabIndex="teamTabIndex" @tabtap="teamTabtap"></swiper-tab>
-			</view>
-
-			<!-- <search  @search="search"></search> -->
-
+			<swiper-tab :tabBars="arrdata" :tabIndex="teamTabIndex" @tabtap="teamTabtap"></swiper-tab>
 			<view class="team_members">
 				<view class="team_member d-flex" style="background-color: #CCCCCC;">
 					<view class="d-flex a-center j-center flex-1">
@@ -55,40 +50,12 @@
 						<view>签单保费</view>
 					</view>
 				</view>
-
-				<z-paging auto-show-back-to-top ref="paging" v-model="teamStaffList" :refresher-enabled="false"
-					:loading-more-enabled="false" :mounted-auto-call-reload="false" :style="getHeight">
-					<view class="team_member d-flex" v-for="(item,index) in teamStaffList" :key="index"
-						@tap="toTeamMember(index)">
-						<view class="d-flex a-center j-center flex-1">
-							<view>{{item.sysUser.name}}</view>
-						</view>
-						<view class="d-flex a-center j-center flex-1">
-							<view>{{item.teamUserCountPriceVO?item.teamUserCountPriceVO.underwriting:0}}</view>
-						</view>
-						<view class="d-flex a-center j-center flex-1">
-							<view>{{item.teamUserCountPriceVO?item.teamUserCountPriceVO.issue:0}}</view>
-						</view>
-						<view class="d-flex a-center j-center flex-1">
-							<template v-if="item.teamUserCountPriceVO && (item.teamUserCountPriceVO.billPrice>0)">
-								<view class="main-text-color">
-									{{item.teamUserCountPriceVO?(item.teamUserCountPriceVO.billPrice).toFixed(2):0}}
-								</view>
-							</template>
-							<template v-else>
-								<view>
-									{{item.teamUserCountPriceVO?(item.teamUserCountPriceVO.billPrice).toFixed(2):'0.00'}}
-								</view>
-							</template>
-
-						</view>
-					</view>
-				</z-paging>
-
-
-
-
-
+				<view class="dis j-s a-c team_members-data" v-for="(item,index) in teamStaffList1" :key="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>
 
 		</view>
@@ -101,15 +68,65 @@
 	import {
 		mapState
 	} from "vuex";
-	import search from "@/components/modules/orders/search.vue";
-	import swiperTab from "@/components/modules/tools/team/swiper-tab.vue";
 	import MxDatePicker from "@/components/modules/tools/team/mx-datepicker/mx-datepicker.vue";
+	import SwiperTab from "@/components/modules/tools/team/swiper-tab.vue";
+
 	export default {
 		components: {
-			search,
-			swiperTab,
+			SwiperTab,
 			MxDatePicker
 		},
+		data() {
+			return {
+				queryPeopleId: "",
+				queryTimeTypeArray: ['本月查询', '本年查询', '自定义查询'],
+				queryTimeTypeIndex: 0,
+				dateRange: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-01', new Date()
+					.getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate()
+				],
+				showDatePicker: false,
+				teamTabIndex: 0,
+				arrdata: [{
+						teamlevel: 99,
+						name: '总计',
+						teamnum: 0, //人数
+						sumpremium: 0, //签单保费
+						usernum: 0 //出单人力
+					},
+					{
+						teamlevel: 1,
+						name: '一级团队',
+						teamnum: 0, //人数
+						sumpremium: 0, //签单保费
+						usernum: 0 //出单人力
+					},
+					{
+						teamlevel: 2,
+						name: '二级团队',
+						teamnum: 0, //人数
+						sumpremium: 0, //签单保费
+						usernum: 0 //出单人力
+					},
+					{
+						teamlevel: 3,
+						name: '三级团队',
+						teamnum: 0, //人数
+						sumpremium: 0, //签单保费
+						usernum: 0 //出单人力
+					},
+					{
+						teamlevel: 9,
+						name: '临时团队',
+						teamnum: 0, //人数
+						sumpremium: 0, //签单保费
+						usernum: 0 //出单人力
+					}
+				],
+				teamStaff: {},
+				teamStaffList: [],
+				teamStaffList1: []
+			}
+		},
 		async onLoad(params) {
 			// this.queryPeopleId = params.id
 			if ((!!params.id) && (!!params.name)) {
@@ -140,74 +157,23 @@
 				return `height: ${height}px;`;
 			}
 		},
-		data() {
-			return {
-				queryPeopleId: "",
-
-				queryTimeTypeArray: ['本月查询', '本年查询', '自定义查询'],
-				queryTimeTypeIndex: 0,
 
-				dateRange: [new Date().getFullYear() + '/' + (new Date().getMonth() + 1) + '/01', new Date()
-					.getFullYear() + '/' + (new Date().getMonth() + 1) + '/' + new Date().getDate()
-				],
-				showDatePicker: false,
-				teamTabIndex: 0,
-				teamTabBars: [{
-						id: 1,
-						name: '总计',
-						personNum: '0',
-						orderNum: '0',
-						premium: 0,
-						outSingle: 0
-					},
-					{
-						id: 2,
-						name: '一级团队',
-						personNum: '0',
-						orderNum: '0',
-						premium: 0,
-						outSingle: 0
-					},
-					{
-						id: 3,
-						name: '二级团队',
-						personNum: '0',
-						orderNum: '0',
-						premium: 0,
-						outSingle: 0
-					},
-					{
-						id: 4,
-						name: '三级团队',
-						personNum: '0',
-						orderNum: '0',
-						premium: 0,
-						outSingle: 0
-					},
-					{
-						id: 5,
-						name: '临时团队',
-						personNum: '0',
-						orderNum: '0',
-						premium: 0,
-						outSingle: 0
-					}
-				],
-				teamStaff: {},
-				teamStaffList: []
-			}
-		},
 		methods: {
+			change(index) {
+				console.log(index)
+				this.current = index;
+			},
 			bindPickerChange: function(e) {
 				this.queryTimeTypeIndex = e.target.value
 				if (e.target.value == 0) {
-					this.dateRange = [new Date().getFullYear() + '/' + (new Date().getMonth() + 1) + '/01', new Date()
-						.getFullYear() + '/' + (new Date().getMonth() + 1) + '/' + new Date().getDate()
+					this.dateRange = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + '01',
+						new Date()
+						.getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate()
 					];
 					this.queryData();
 				}
 				if (e.target.value == 1) {
-					this.dateRange = [new Date().getFullYear() + '/01/01', new Date().getFullYear() + '/12/31'];
+					this.dateRange = [new Date().getFullYear() + '-01-01', new Date().getFullYear() + '-12-31'];
 					this.queryData();
 				}
 				if (e.target.value == 2) {
@@ -216,49 +182,43 @@
 			},
 
 			async queryData() {
-				console.log(this.userInfo)
+				this.arrdata.map(val => {
+					val.teamnum = 0
+					val.sumpremium = 0
+					val.usernum = 0
+				})
 				this.teamTabIndex = 0;
 				var params = {
-					"userid": this.queryPeopleId,
+					"id": "9991401004",
 					"mobile": "",
 					"name": "",
-					"enddate": this.dateRange[1],
-					"startdate": this.dateRange[0]
+					"enddate": "2023-10-03",
+					"startdate": "2023-1-01"
+				}
+				let res = await this.$http.post('/esm/user/queryTeamPolicy', params);
+				if (res.code == '200') {
+					res.data.map(ele => {
+						this.arrdata.map(val => {
+							if (ele.teamlevel == val.teamlevel) {
+								Object.assign(val, ele)
+								this.arrdata[0].teamnum += ele.teamnum;
+								this.arrdata[0].sumpremium += ele.sumpremium;
+								this.arrdata[0].usernum += ele.usernum;
+							}
+							return val;
+						})
+					})
 				}
-				let res = await this.$http.post('/esm/user/queryTeamNum', params);
-				console.log(res)
-				this.teamTabBars[0].personNum = res.data[2].teamnum;
-				this.teamTabBars[1].personNum = res.data[2].level1num;
-				this.teamTabBars[2].personNum = res.data[2].level2num;
-				this.teamTabBars[3].personNum = res.data[2].level3num;
-				this.teamTabBars[4].personNum = res.data[2].tempnum;
-
-				this.teamTabBars[0].premium = res.data[0].countPremium;
-				this.teamTabBars[1].premium = res.data[0].list1Premium;
-				this.teamTabBars[2].premium = res.data[0].list2Premium;
-				this.teamTabBars[3].premium = res.data[0].list3Premium;
-				this.teamTabBars[4].premium = 0;
-
-				this.teamTabBars[0].outSingle = res.data[0].countSingle;
-				this.teamTabBars[1].outSingle = res.data[0].outSingle1;
-				this.teamTabBars[2].outSingle = res.data[0].outSingle2;
-				this.teamTabBars[3].outSingle = res.data[0].outSingle3;
-				this.teamTabBars[4].outSingle = 0;
 
-				let res1 = await this.$http.post('/esmUserInternal/queryTeamUser', params);
-				this.teamStaff = res1.data;
-				var level1Team = this.teamStaff['level1'];
-				var level2Team = this.teamStaff['level2'];
-				var level3Team = this.teamStaff['level3'];
-				var tempTeam = this.teamStaff['temp'];
-				this.teamStaffList = level1Team.concat(level2Team).concat(level3Team).concat(tempTeam);
-				this.$refs.paging.complete(this.teamStaffList);
+				let res1 = await this.$http.post('/esm/user/queryUserPolicy', params);
+				if (res1.code == '200') {
+					this.teamStaffList = res1.data;
+					this.teamStaffList1 = res1.data;
+				}
 			},
 
 			onShowDatePicker() { //显示
-				if (this.queryTimeTypeIndex == 2) {
-					this.showDatePicker = true;
-				}
+				this.showDatePicker = true;
 			},
 			onSelected(e) { //选择
 				this.showDatePicker = false;
@@ -269,24 +229,31 @@
 			},
 			// 选择团队tap
 			teamTabtap(index) {
-				this.teamTabIndex = index;
 
-				var level1Team = this.teamStaff['level1'];
-				var level2Team = this.teamStaff['level2'];
-				var level3Team = this.teamStaff['level3'];
-				var tempTeam = this.teamStaff['temp'];
+				this.teamTabIndex = index;
 				if (index == 0) {
-					this.teamStaffList = level1Team.concat(level2Team).concat(level3Team).concat(tempTeam);
+					this.teamStaffList1 = this.teamStaffList;
 				} else if (index == 1) {
-					this.teamStaffList = level1Team;
+					let DataList = this.teamStaffList.filter(val => {
+						return val.teamlevel == 1
+					})
+					this.teamStaffList1 = DataList;
 				} else if (index == 2) {
-					this.teamStaffList = level2Team;
+					let DataList = this.teamStaffList.filter(val => {
+						return val.teamlevel == 2
+					})
+					this.teamStaffList1 = DataList;
 				} else if (index == 3) {
-					this.teamStaffList = level3Team;
+					let DataList = this.teamStaffList.filter(val => {
+						return val.teamlevel == 3
+					})
+					this.teamStaffList1 = DataList;
 				} else if (index == 4) {
-					this.teamStaffList = tempTeam;
+					let DataList = this.teamStaffList.filter(val => {
+						return val.teamlevel == 9
+					})
+					this.teamStaffList1 = DataList;
 				}
-				this.$refs.paging.complete(this.teamStaffList);
 			},
 			toTeamMember(index) {
 				this.navigate({
@@ -372,5 +339,15 @@
 		flex-wrap: nowrap;
 	}
 
+	.team_members-data {
+		padding: 0 15px;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.team_members-data>view {
+		width: 25%;
+		padding: 4px;
+	}
+
 	/* 团队成员列表End */
 </style>