订单日期处理

pages/orders/orders.vue

@@ -183,33 +183,30 @@
 										<view v-if="riskitem.riskCode=='0507'" class="time dis j-s a-c">
 											<template v-if="item.orderstatus!=3">
 												<text>交强险投保时间</text>
-												<text>{{riskitem.startDate}}</text>
+												<text>{{item.jqstartdate}}</text>
 											</template>
 											<template v-else>
 												<text>交强险保险期间</text>
-												<text>{{riskitem.startDate}}-{{riskitem.endDate}}</text>
+												<text>{{item.jqstartdate}}-{{item.jqenddate}}</text>
 											</template>
 
 										</view>
 										<view v-if="riskitem.riskCode=='0510'" class="time dis j-s a-c">
 											<template v-if="item.orderstatus!=3">
 												<text>商业险投保时间</text>
-												<text>{{riskitem.startDate}}</text>
+												<text>{{item.systartdate}}</text>
 											</template>
 											<template v-else>
 												<text>商业险保险期间</text>
-												<text>{{riskitem.startDate}}-{{riskitem.endDate}}</text>
+												<text>{{item.systartdate}}-{{item.syenddate}}</text>
 											</template>
 										</view>
 									</template>
-
 								</view>
-
-
 							</view>
 						</view>
 					</view>
-					<view class="orderItemPane-below dis a-c  j-end f-wrap ">
+					<view class="orderItemPane-below dis a-c  j-end f-wrap">
 						<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"
@@ -240,7 +237,7 @@
 							@click="quotehistory(item,'4')">核保退回 <u-badge type="error" bgColor="#FF0F00"
 								v-if="item.orderStatus4" :count="item.orderStatus4"
 								:offset="[-8, -8]"></u-badge></u-button>
-						<u-button
+						<u-button v-if="item.orderstatus!='3'"
 							:custom-style="{fontSize:'12px',background:'rgba(159,159,159,0.05)',color:'#666666',borderColor:'#D2D2D2'}"
 							shape="circle" size="mini" :hair-line="false" :plain="true"
 							@click="closeOrder(item.orderno)">关闭订单 </u-button>
@@ -266,6 +263,15 @@
 
 			</view>
 		</u-mask>
+		<u-modal v-model="closeOrderShow" title="提示"
+			:title-style="{fontWeight: 'bold',borderBottom:'1px solid #f2f2f2',padding:'10px'}"
+			:show-cancel-button="true"
+			:confirm-style="{background:'#E6EEFF',color:'#0052FF',height:'40px',lineHeight:'40px'}"
+			:cancel-style="{height:'40px',lineHeight:'40px'}" @confirm="closeOrderconfirm" confirm-text="确定">
+			<view class="slot-content dis  a-c j-c  p-2">
+				确认关闭订单?
+			</view>
+		</u-modal>
 		<service-widget @btnClick="btn_click"></service-widget>
 	</view>
 </template>
@@ -290,6 +296,7 @@
 		},
 		data() {
 			return {
+				closeOrderShow: false,
 				productsTypeoptions: [],
 				show: true,
 				showDropdown: false,
@@ -515,17 +522,20 @@
 					phoneNumber: phone, //仅为示例
 				});
 			},
-			//关闭订单
-			async closeOrder(orderno) {
+			async closeOrderconfirm() {
 				let res = await this.$http.get('/insurance/order/shutDown/' + orderno);
 				if (res.code == '200') {
 					uni.showToast({
-						title: res.msg,
+						title: "关闭成功",
 						icon: 'none',
 					});
 					this.getOrdersList(1, 20);
 				}
 			},
+			//关闭订单
+			closeOrder(orderno) {
+				this.closeOrderShow = true;
+			},
 			btn_click() {
 				uni.navigateTo({
 					url: '/pages/chat/chat'

pages/orders/quoteHistory.vue

@@ -68,22 +68,22 @@
 						</view>
 						<view class="orders-centre dis f-c" v-if="item.sumExportFee">
 							<view class="dataChunk special  dis j-s a-c">
-								<text style="color:#FF4D4D;">优惠金额</text>
+								<text style="color:#FF4D4D;">总优惠金额</text>
 								<text style="color:#FF4D4D;" class="font-weight">{{item.sumExportFee}}</text>
 							</view>
 							<view class="dataChunk  dis j-s a-c" v-if="item.jqExportFee">
-								<text>优惠金额</text>
+								<text>交强优惠金额</text>
 								<text class="font-weight">{{item.jqExportFee?item.jqExportFee:'无'}}</text>
 							</view>
 							<view class="dataChunk  dis j-c a-c" v-if="item.taxamount">
 								<text class="font-weight">-</text>
 							</view>
 							<view class="dataChunk  dis j-s a-c" v-if="item.syExportFee">
-								<text>优惠金额</text>
+								<text>商业优惠金额</text>
 								<text class="font-weight">{{item.syExportFee?item.syExportFee:"无"}}</text>
 							</view>
 							<view class="dataChunk  dis j-s a-c" v-if="item.noExportFee">
-								<text>优惠金额</text>
+								<text>驾意优惠金额</text>
 								<text class="font-weight">{{item.noExportFee?item.noExportFee:"无"}}</text>
 							</view>
 						</view>
@@ -92,7 +92,7 @@
 						<text class="mt-1" style="font-size: 12px;color: #333;"
 							v-if="item.jqStartDate">交强险保险期间：{{item.jqStartDate}}-{{item.jqEndDate}}</text>
 						<text class="mt-1" style="font-size: 12px;color: #333;"
-							v-if="item.jqStartDate">商业险保险期间：{{item.jqStartDate}}-{{item.jqEndDate}}</text>
+							v-if="item.syStartDate">商业险保险期间：{{item.syStartDate}}-{{item.syEndDate}}</text>
 					</view>
 					<view class="dis a-c  f-wrap time">
 						<text v-if="item.inscompany == '永诚财险'">光博分：{{ item.ilogPreUdwMess ?
@@ -190,7 +190,6 @@
 					</view>
 				</view>
 			</view>
-
 		</view>
 		<o-empty v-if="sublist.length==0" />
 		<u-modal v-model="approvalReasonShow" title="核保原因"
@@ -986,7 +985,7 @@
 				if (res.code == '200') {
 					uni.showToast({
 						title: res.msg,
-						icon: 'success',
+						icon: 'none',
 						duration: 1000
 					});
 					this.querylist();