5/18

config/baseUrl.js

@@ -7,8 +7,8 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://192.168.5.249:8001"; //田智
 	// baseUrl = "http://192.168.5.47:8001"; //屈晨
 	// baseUrl = "http://192.168.5.163:8001"; //刘斌
-	baseUrl = "http://192.168.5.17:8001"; //徐强
-	// baseUrl = "https://tennat.baoxianzhanggui.com/api"; //测试
+	// baseUrl = "http://192.168.5.150:8001"; //徐强
+	baseUrl = "https://tennat.baoxianzhanggui.com/api"; //测试
 	h5BaseUrl = "https://tennat.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";

manifest.json

@@ -2,8 +2,8 @@
 	"name": "晋掌柜",
 	"appid": "__UNI__05D695B",
 	"description": "晋掌柜app",
-	"versionName": "1.0.7",
-	"versionCode": 107,
+	"versionName": "1.0.8",
+	"versionCode": 108,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

node_modules/uview-ui/libs/config/props/datetimePicker.js

@@ -15,8 +15,8 @@ export default {
         value: '',
         title: '',
         mode: 'datetime',
-        maxDate: new Date(new Date().getFullYear() + 10, 0, 1).getTime(),
-        minDate: new Date(new Date().getFullYear() - 10, 0, 1).getTime(),
+        maxDate: new Date(new Date().getFullYear() + 60, 0, 1).getTime(),
+        minDate: new Date(new Date().getFullYear() - 70, 0, 1).getTime(),
         minHour: 0,
         maxHour: 23,
         minMinute: 0,

pages/index/index.vue

@@ -393,20 +393,25 @@
 						Object.assign(this.ownersInfo, res.data.ownersInfo);
 						Object.assign(this.policyHolderInfo, res.data.policyHolderInfo);
 						Object.assign(this.insuredPersonInfo, res.data.insuredPersonInfo);
+						uni.navigateTo({
+							url: '/pages/quote/quoteInfo',
+							success: (res) => {
+								res.eventChannel
+									.emit(
+										"acceptData", {
+											carInfo: this.carInfo,
+											ownersInfo: this.ownersInfo,
+											policyHolderInfo: this.policyHolderInfo,
+											insuredPersonInfo: this.insuredPersonInfo,
+										})
+							}
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/quote/quoteInfo'
+						})
 					}
-					uni.navigateTo({
-						url: '/pages/quote/quoteInfo',
-						success: (res) => {
-							res.eventChannel
-								.emit(
-									"acceptData", {
-										carInfo: this.carInfo,
-										ownersInfo: this.ownersInfo,
-										policyHolderInfo: this.policyHolderInfo,
-										insuredPersonInfo: this.insuredPersonInfo,
-									})
-						}
-					})
+
 				} else {
 					uni.showToast({
 						title: "请输入车牌号",

pages/orders/orders1.vue

@@ -116,13 +116,13 @@
 						</view>
 					</view>
 					<view class="cardAll-btn dis a-c j-end ">
-						<view v-for="(cardAllitem,cardAllindex) in cardAllbtns(5)" :key="cardAllindex"
+						<view v-for="(cardAllitem,cardAllindex) in cardAllbtns(item.orderStatus)" :key="cardAllindex"
 							@click="cardAllbtnChange(cardAllitem.value,item.mainDetails[cardAllitem.value])">
 							<text>{{cardAllitem.label}}</text>
 							<u-badge numberType="overflow" :max="99" :value="1" :absolute="true" bgColor="#FF4545"
 								:offset="[-5,-16]" style="font-size: 18rpx;"></u-badge>
 						</view>
-						<view @click="cardAllbtnChange(cardAllitem.orderStatus)">查看全部</view>
+						<view @click="cardAllbtnChange(item.orderStatus)">查看全部</view>
 					</view>
 				</view>
 				<u-loadmore v-if="subPageResult.length!=0" :status="substatus" />

pages/quote/imageGalleryPage.vue

@@ -176,7 +176,6 @@
 										}],
 										imageCode: keys.imageType,
 									})
-
 									this.imageCollection.imgList1.push(keys);
 									break;
 								case 'D01':

pages/quote/premiumCalc1.vue

@@ -39,22 +39,20 @@
 						<u--input v-model="jqstartDate" disabled disabledColor="#ffffff" clearable
 							suffixIconStyle="color:#333;font-size:40rpx" placeholder="请选择起保日期"
 							placeholderStyle="text-align:right;" border="none" style="pointer-events: none">
-							<template slot="suffix">
-								<image src="/static/icon/quote/dateIcon.png" mode="">
-								</image>
-							</template>
 						</u--input>
+						<image src="/static/icon/quote/dateIcon.png"
+							style="width: 30rpx;height: 30rpx;margin-left: 10rpx;" mode="">
+						</image>
 					</u-form-item>
 					<u-form-item label="商业起保日期" borderBottom @click="systartShow = true"
 						v-if="['034001','034002','0330034002','0330034001'].includes(productId)">
 						<u--input v-model="systartDate" disabled disabledColor="#ffffff" clearable
 							suffixIconStyle="color:#333;font-size:40rpx" placeholder="请选择起保日期"
 							placeholderStyle="text-align:right;" border="none" style="pointer-events: none">
-							<template slot="suffix">
-								<image src="/static/icon/quote/dateIcon.png" mode="">
-								</image>
-							</template>
 						</u--input>
+						<image src="/static/icon/quote/dateIcon.png"
+							style="width: 30rpx;height: 30rpx;margin-left: 10rpx;" mode="">
+						</image>
 					</u-form-item>
 					<u-form-item label="报价车型" borderBottom @click="brandModelPopup=true">
 						<u--text :lines="1" bold :text="carInfo.brandName"></u--text>

pages/quote/quoteInfo.vue

@@ -395,6 +395,7 @@
 					const eventChannel = this.getOpenerEventChannel()
 					// 监听acceptData事件，获取上一页面通过eventChannel传送到当前页面的数据
 					await eventChannel.on('acceptData', (data) => {
+						console.log(data);
 						this.carInfo = data.carInfo;
 						this.ownerInfo = data.ownerInfo;
 						this.policyHolderInfo = data.policyHolderInfo;

pages/quote/quoteRecordDetail.vue

@@ -428,7 +428,7 @@
 		<uni-Popup :show="feeEntryInfoShow" @close="feeEntryInfoShow=false" :closeable="false" headerTitle="费用信息"
 			overflow="auto" :headerStyle="{fontSize:'36rpx'}" maxHeight="980rpx" mode="center" width="90%">
 			<template #content>
-				<view class="feeEntryClass">
+				<view class="feeEntryClass" v-if="insFeeOrders">
 					<view class="dis a-start j-s  data-view">
 						<text class="title">交强险</text>
 						<view class="dis f-c discount">

unpackage/dist/build/web/index.html

@@ -6,4 +6,4 @@
 				// window.location.href = '/demo/picture/website/pcguide.html';
 			}</script><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=./static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/mp-h5/jweixin-1.4.0.js></script><script src=./static/js/chunk-vendors.543fb57f.js></script><script src=./static/js/index.ccfaeabf.js></script></body></html>
+			})</script><link rel=stylesheet href=./static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/mp-h5/jweixin-1.4.0.js></script><script src=./static/js/chunk-vendors.543fb57f.js></script><script src=./static/js/index.5738a405.js></script></body></html>