@dongkboy 1 éve
szülő
commit
895453db1e

+ 1 - 1
config/baseUrl.js

@@ -13,7 +13,7 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "https://pre.baoxianzhanggui.com/test"; //生产
 	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
-	socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
+	socketUrl = "ws://sxzgkj.baoxianzhanggui.com/web-api/websocket";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试

+ 2 - 2
manifest.json

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

+ 0 - 1
pages/index/index.vue

@@ -353,7 +353,6 @@
 			let banner = await this.$http.get('/apps/getCarousel');
 			this.swiperList = banner.data;
 			this.bgColor = this.swiperList[0].color;
-
 		},
 		async onPullDownRefresh() {
 			let userInfoRes = await this.$http.get('/user/loginUser')

+ 173 - 64
pages/orders/orders.vue

@@ -49,11 +49,21 @@
 										</view>
 									</view>
 								</view>
+								<view class="term">
+									<text>车牌号</text>
+									<view class="dis  a-c f-wrap j-start" style="margin-top: 10px;">
+										<view class="status-data" :class="item==pageRequest.licenseNo? 'active':''"
+											v-for="(item,index) in vehiclePlateList" @tap="licenseNoclick(item)"
+											:key="index">
+											{{item}}
+										</view>
+									</view>
+								</view>
 								<view class="term">
 									<text>订单日期</text>
 									<view class="dis  a-c f-wrap j-s" style="margin-top: 10px;">
 										<view class="status-data" :class="item.value==timespecifications? 'active':''"
-											v-for="(item,index) in dateList" @tap="dateclick(index)" :key="index">
+											v-for="(item,index) in dateList" @tap="dateclick(item.value)" :key="index">
 											{{item.label}}
 										</view>
 										<view class="dis a-c">
@@ -86,47 +96,85 @@
 			</view>
 		</view>
 		<view style="padding: 110px 16px 50px 16px;">
-			<view class=" orderItemPane" v-for="(item,index) in pageResult" :key="index">
-				<view class="orderItemPane-upper dis j-s a-c ">
-					<view v-for="(statusitem, statusindex) in statusList" :key="statusindex" class="dis a-c"
-						style="font-weight: bold;" v-if="item.orderstatus == statusitem.value">
-						<image :src="statusitem.src" mode="" style="width: 22px;height: 22px;margin-right: 5px;">
-						</image>
-						<text :style="{color: statusitem.color}">{{statusitem.label}}</text>
-					</view>
-					<text class="upper-time moosize">{{item.createtime}}</text>
-				</view>
-				<view class="orderItemPane-centre ">
-					<view class="dis f-c">
-						<view class="dis a-c j-s " style="padding:4px 0;">
-							<text>{{item.licenseno}}</text>
-							<u-icon name="arrow-right" size="14px"
-								style="margin-left: 5px;color: #C7C6CA;"></u-icon></text>
+			<view v-for="(item,index) in pageResult" :key="index">
+				<view class="orderItemPane" v-for="(statusitem, statusindex) in statusList" :key="statusindex"
+					v-if="item.orderstatus == statusitem.value" :style="{background:statusitem.itemback}">
+					<view class="orderItemPane-upper dis j-s a-c ">
+						<view class="dis a-c j-start">
+							<image :src="statusitem.src" mode="" style="width: 22px;height: 22px;margin-right: 5px;">
+							</image>
+							<text class=" licenseno">{{item.licenseno}}</text>
 						</view>
-						<text>订单号:{{item.orderno}}</text>
-						<text>投保人:{{item.applyinfo.name}}</text>
-						<text>投保险种:{{item.product}}</text>
-						<text v-if="item.orderstatus=='3'">承保公司:{{item.insCompany}}</text>
+						<view class="colorBlock">
+							{{item.product}}
+						</view>
+					</view>
+					<view class="orderItemPane-centre ">
+						<view class="dis f-c">
+							<text>订单号:{{item.orderno}}</text>
+							<view class="dis a-c j-s">
+								<view class="dis a-end ">
+									<view class="dis f-c a-c">
+										<text style="font-size: 24rpx;color: #333">车主</text>
+										<text style="font-size: 24rpx;color: #333">{{item.ownerinfo.name}}</text>
+									</view>
+									<image src="../../static/image/car-insure/phone.png" mode=""
+										style="width: 16px;height: 16px;margin: 0 0 5px  10px;"
+										@click="phone(item.ownerinfo.mobile)"></image>
+								</view>
+								<view class="dis a-end ">
+									<view class="dis f-c a-c">
+										<text style="font-size: 24rpx;color: #333">投保人</text>
+										<text style="font-size: 24rpx;color: #333">{{item.applyinfo.name}}</text>
+									</view>
+									<image src="../../static/image/car-insure/phone.png" mode=""
+										style="width: 16px;height: 16px;margin: 0 0 5px  10px;"
+										@click="phone(item.applyinfo.mobile)"></image>
+								</view>
+								<view class="dis a-end ">
+									<view class="dis f-c a-c">
+										<text style="font-size: 24rpx;color: #333">被保人</text>
+										<text style="font-size: 24rpx;color: #333">{{item.insureinfo.name}}</text>
+									</view>
+									<image src="../../static/image/car-insure/phone.png" mode=""
+										style="width: 16px;height: 16px;margin: 0 0 5px  10px;"
+										@click="phone(item.insureinfo.mobile)"></image>
+								</view>
+							</view>
+							<view class="dis f-c ">
+								<view class="time dis j-s a-c">
+									<text>交强险到期时间</text>
+									<view class="dis a-c j-c">还差
+										<text class="downstyle dis j-c a-c ">3</text>
+										天到期
+									</view>
+								</view>
 
+							</view>
+						</view>
+					</view>
+					<view class="orderItemPane-below dis a-c  j-end ">
+						<u-button v-if="item.orderstatus!='3'"
+							:custom-style="{fontSize:'12px',background:'rgba(34,152,5,0.05)',color:'#229805',borderColor:'#229805'}"
+							shape="circle" size="mini" :hair-line="false" :plain="true"
+							@click="CloseEdit(item.orderno)">进行中</u-button>
+						<u-button v-if="item.orderstatus!='3'"
+							:custom-style="{fontSize:'12px',background:'rgba(255,86,0,0.05)',color:'#FF5600',borderColor:'#FF5600'}"
+							shape="circle" size="mini" :hair-line="false" :plain="true"
+							@click="quotehistory(item,'1')">核保中</u-button>
+						<u-button v-if="item.orderstatus!='3'"
+							:custom-style="{fontSize:'12px',background:'rgba(255,15,0,0.05)',color:'#FF0F00',borderColor:'#FF0F00'}"
+							shape="circle" size="mini" :hair-line="false" :plain="true"
+							@click="quotehistory(item,'2')">待缴费</u-button>
+						<u-button
+							:custom-style="{fontSize:'12px',background:'rgba(0,82,255,0.05)',color:'#0052FF',borderColor:'#0052FF'}"
+							shape="circle" size="mini" :hair-line="false" :plain="true"
+							@click="quotehistory(item,'3')">已承保</u-button>
+						<u-button v-if="item.orderstatus!='3'"
+							:custom-style="{fontSize:'12px',background:'rgba(158,0,255,0.05)',color:'#9E00FF',borderColor:'#9E00FF'}"
+							shape="circle" size="mini" :hair-line="false" :plain="true"
+							@click="quotehistory(item,'4')">核保退回</u-button>
 					</view>
-				</view>
-				<view class="orderItemPane-below dis a-c  j-s ">
-					<!-- <u-button v-if="item.orderstatus!='3'" type="primary" size="mini" :hair-line="false"
-						:custom-style="{fontSize:'12px'}" :plain="true" @click="quotehistory(item)">报价历史</u-button> -->
-					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
-						type="warning" size="mini" :hair-line="false" :plain="true"
-						@click="CloseEdit(item.orderno)">进行中</u-button>
-					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
-						type="warning" size="mini" :hair-line="false" :plain="true"
-						@click="quotehistory(item,'1')">核保中</u-button>
-					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
-						type="warning" size="mini" :hair-line="false" :plain="true"
-						@click="quotehistory(item,'2')">待缴费</u-button>
-					<u-button :custom-style="{fontSize:'12px'}" shape="circle" type="warning" size="mini"
-						:hair-line="false" :plain="true" @click="quotehistory(item,'3')">已承保</u-button>
-					<u-button v-if="item.orderstatus!='3'" :custom-style="{fontSize:'12px'}" shape="circle"
-						type="warning" size="mini" :hair-line="false" :plain="true"
-						@click="quotehistory(item,'4')">核保退回</u-button>
 				</view>
 			</view>
 			<u-loadmore v-if="pageResult.length!=0" :status="status" />
@@ -214,32 +262,42 @@
 					}, {
 						label: '进行中',
 						value: 0,
-						color: "#229805",
-						src: "/static/image/car-insure/state1.png"
+						btnColor: "#229805",
+						btnbackground: "rgba(34,152,5,0.05)",
+						itemback: "linear-gradient( 180deg, #EEFFE4 0%, #CDFFB6 100%)",
+						src: "/static/image/car-insure/state.png"
 					},
 					{
 						label: '待核保',
 						value: 1,
-						color: "#FF5600",
-						src: "/static/image/car-insure/state2.png"
+						btnColor: "#FF5600",
+						btnbackground: "rgba(255,86,0,0.05)",
+						itemback: "linear-gradient( 180deg, #FFEDE3 0%, #FFC7AB 100%)",
+						src: "/static/image/car-insure/state.png"
 					},
 					{
 						label: '待缴费',
 						value: 2,
-						color: "#FF0F00",
-						src: "/static/image/car-insure/state3.png"
+						btnColor: "#FF0F00",
+						btnbackground: "rgba(255,15,0,0.05)",
+						itemback: "linear-gradient( 180deg, #FFEEEC 0%, #FFA8A2 100%)",
+						src: "/static/image/car-insure/state.png"
 					},
 					{
 						label: '已承保',
 						value: 3,
-						color: "#0052FF",
-						src: "/static/image/car-insure/state4.png"
+						btnColor: "#0052FF",
+						btnbackground: "rgba(0,82,255,0.05)",
+						itemback: "linear-gradient( 180deg, #ECF1FF 0%, #CCDDFF 100%)",
+						src: "/static/image/car-insure/state.png"
 					},
 					{
 						label: '核保退回',
 						value: 4,
-						color: "#727272",
-						src: "/static/image/car-insure/state5.png"
+						btnColor: "#9E00FF",
+						btnbackground: "rgba(158,0,255,0.05)",
+						itemback: "linear-gradient( 180deg, #FDECFF 0%, #F5CCFF 100%)",
+						src: "/static/image/car-insure/state.png"
 					}
 				],
 				//日期筛选list
@@ -381,6 +439,11 @@
 		},
 		methods: {
 			...mapMutations(['setOrderType', 'setOrderStage']),
+			phone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone, //仅为示例
+				});
+			},
 			btn_click() {
 				uni.navigateTo({
 					url: '/pages/chat/chat'
@@ -427,9 +490,11 @@
 				this.getOrdersList(1, 20);
 				this.showDropdown = false;
 			},
+			licenseNoclick(e) {
+				this.pageRequest.licenseNo = e;
+			},
 			//状态筛选
 			statusclick(e) {
-				console.log(e);
 				if (e === this.pageRequest.orderStatus) {
 					this.pageRequest.orderStatus = ''
 				} else {
@@ -467,8 +532,10 @@
 			},
 			//日期筛选
 			dateclick(e) {
+				console.log(e);
 				/* 0:全部  1:一周内 2:一个月内 3:三个月内  4:六个月内*/
 				switch (e) {
+
 					case 0:
 						this.pageRequest.startDate = "";
 						this.pageRequest.endDate = "";
@@ -483,6 +550,7 @@
 					case 7:
 						this.pageRequest.startDate = this.transformTime(e);
 						this.pageRequest.endDate = this.transformTime();
+						this.vehiclePlateform(this.pageRequest.startDate, this.pageRequest.endDate);
 						break;
 					case '一个月内':
 						this.pageRequest.startDate = this.transformTime1(1);
@@ -499,13 +567,16 @@
 					default:
 				}
 				this.timespecifications = e;
-				this.vehiclePlateform(this.pageRequest.startDate, this.pageRequest.endDate);
+
 			},
 			async vehiclePlateform(start, end) {
 				let res = await this.$http.post('/insurance/order/queryLicenseInOrder', {
 					startDate: start,
 					endDate: end,
 				});
+				if (res.code == 200) {
+					this.vehiclePlateList = res.data;
+				}
 			},
 			startconfirm(e) {
 				this.pageRequest.startDate = e.year + '-' + e.month + '-' + e.day;
@@ -741,8 +812,6 @@
 
 	}
 
-
-
 	.search-condition {
 		padding: 0 16px;
 
@@ -822,14 +891,57 @@
 		border-radius: 10px;
 		background: #FFFFFF;
 		box-shadow: 0px 4px 10px 0px #DAE3F4;
-		border-radius: 12px;
+		border-radius: 6px;
 		cursor: pointer;
-		padding: 10px;
 	}
 
 	.orderItemPane-upper {
-		padding-bottom: 8px;
-		border-bottom: 1px solid #D4D0D0;
+		background: rgba(255, 255, 255, 0.5);
+		border-radius: 6px 6px 0px 0px;
+		padding: 13rpx 16rpx;
+
+		.licenseno {
+			font-family: Source Han Sans SC, Source Han Sans SC;
+			font-weight: bold;
+			font-size: 14px;
+			color: #181818;
+		}
+
+		.colorBlock {
+			background: #FF7F00;
+			box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);
+			border-radius: 4px;
+			border: 1px solid #FEEDDF;
+			color: #fff;
+			font-size: 26rpx;
+			font-weight: bold;
+			padding: 0 10px;
+		}
+	}
+
+	.orderItemPane-centre {
+		padding: 7px 14px;
+
+		>view>text {
+			font-weight: bold;
+			color: #232832;
+		}
+
+		.time {
+			>text {
+				color: rgba(51, 51, 51, 0.8);
+				font-size: 12px;
+			}
+
+			.downstyle {
+				background: rgba(255, 255, 255, 0.6);
+				border-radius: 2px;
+				padding: 2px 8px;
+				margin: 0 4px;
+				color: #333333;
+				font-size: 12px;
+			}
+		}
 	}
 
 	.orderItemPane .orderItemPane-centre,
@@ -838,17 +950,14 @@
 		font-weight: 400;
 	}
 
-	.orderItemPane-centre text:first-child {
-		font-weight: bold;
-		color: #232832;
-	}
-
 	.orderItemPane-below {
 		height: auto;
-		margin-top: 5px;
+		padding: 10px;
+		background: #ffff;
+		border-radius: 0 0 6px 6px;
 
 		&>button {
-			// margin-left: 10px;
+			margin-left: 10px;
 		}
 	}
 

BIN
static/image/car-insure/phone.png


BIN
static/image/car-insure/state.png


BIN
static/image/car-insure/state1.png


BIN
static/image/car-insure/state2.png


BIN
static/image/car-insure/state3.png


BIN
static/image/car-insure/state4.png


BIN
static/image/car-insure/state5.png