gjy před 2 roky
rodič
revize
687ca334e6

+ 27 - 0
manifest.json

@@ -118,6 +118,33 @@
                     "pid" : "2018",
                     "parameters" : {}
                 }
+            },
+            "Lyuan-KeepAlive" : {
+                "app_description" : "",
+                "app_name" : "",
+                "__plugin_info__" : {
+                    "name" : "Android保活插件,后台持续运行,永生不死 - [试用版,仅用于自定义调试基座]",
+                    "description" : "Android保活插件,后台持续运行,永生不死",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=6249",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "6249",
+                    "parameters" : {
+                        "app_description" : {
+                            "des" : "通知栏描述,不填默认后台服务,请勿关闭!",
+                            "key" : "com.keepalive.description",
+                            "value" : ""
+                        },
+                        "app_name" : {
+                            "des" : "通知栏标题, 不填默认app名称",
+                            "key" : "com.keepalive.name",
+                            "value" : ""
+                        }
+                    }
+                }
             }
         }
     },

+ 15 - 2
pages.json

@@ -358,9 +358,22 @@
 			"style": {
 				"navigationBarTitleText": "管理车辆",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white"
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+				    "pullToRefresh": {
+				        "support": true,
+				        "color": "#ff3333",
+				        "style": "default",
+				        "contentdown": {
+				            "caption": "下拉刷新"
+				        },
+
+				        "contentrefresh": {
+				            "caption": "正在刷新中"
+				        }
+				    }
+				}
 			}
-
 		}, {
 			"path": "pages/mine/manageVehicles/addVehicle",
 			"style": {

+ 35 - 27
pages/mine/manageVehicles/addVehicle.vue

@@ -14,8 +14,8 @@
 				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 				<view class="text">上传道路运输证</view>
 			</view>
-			<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(1)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
+			<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)" class="preview-card-img picture">
+				<view @click.stop="delCard(8)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -39,9 +39,9 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传挂车道路运输证</view>
 				</view>
-				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(9)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(2)">
+					<view @click.stop="delCard(9)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -68,7 +68,7 @@
 				<view class="text" v-if="sign == '挂车'">上传牵引车行驶证主页</view>
 				<view class="text" v-else>上传行驶证主页</view>
 			</view>
-			<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(1)" class="preview-card-img picture">
+			<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(3)" class="preview-card-img picture">
 				<view @click.stop="delCard(3)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
@@ -82,7 +82,7 @@
 				<view class="text" v-if="sign == '挂车'">上传牵引车行驶证副页</view>
 				<view class="text" v-else>上传行驶证副页</view>
 			</view>
-			<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(1)" class="preview-card-img picture">
+			<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(4)" class="preview-card-img picture">
 				<view @click.stop="delCard(4)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
@@ -139,7 +139,7 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传挂车行驶证主页</view>
 				</view>
-				<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(5)"
 					class="preview-card-img picture">
 					<view @click.stop="delCard(5)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
@@ -154,7 +154,7 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传挂车行驶证副页</view>
 				</view>
-				<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(1)"
+				<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(6)"
 					class="preview-card-img picture">
 					<view @click.stop="delCard(6)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
@@ -239,7 +239,7 @@
 				</u--input>
 			</view>
 			<view class="flex row noborder" v-if="sign == '挂车'">
-				<view class="left-text">牵引车外廓尺寸(毫米)</view>
+				<view style='width:390rpx;' class="left-text">牵引车外廓尺寸(毫米)</view>
 			</view>
 			<view class="flex row noborder" v-if="sign == '非挂车'">
 				<view class="left-text">外廓尺寸(毫米)</view>
@@ -307,7 +307,7 @@
 					</u--input>
 				</view>
 				<view class="flex row noborder">
-					<view class="left-text">挂车外廓尺寸(毫米)</view>
+					<view style='width:390rpx;' class="left-text">挂车外廓尺寸(毫米)</view>
 				</view>
 				<view class="flex row noborder input-ckg">
 					<view class="input-positon">
@@ -346,7 +346,10 @@
 			</view>
 			<!-- <view class="level1-title">证件信息</view> -->
 		</view>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class='submit-btn-wrap'>
+			<view class="submit-btn" @click="submit">提交</view>
+		</view>
+		
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
 		<master-keyboard ref="keyboard1" keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
@@ -603,20 +606,20 @@
 														image: result,
 														flag: 1
 													}).then(res => {
-													if (res.data.issuingAuthority) { //行驶证发证机关
-														_this.dataDetails.guaLssuingAuthority = res
-															.data.issuingAuthority
-													}
-													if (res.data.licenseRegistrationDate) { //行驶证注册日期
-														_this.dataDetails
-															.trailerLicenseRegistrationDate = res.data
-															.licenseRegistrationDate
-													}
-													if (res.data.licenseIssueDate) { //行驶证发证日期
-														_this.dataDetails.trailerLicenseIssueDate = res
-															.data.licenseIssueDate
-													}
 													if (res.data) {
+														if (res.data.issuingAuthority) { //行驶证发证机关
+															_this.dataDetails.guaLssuingAuthority = res
+																.data.issuingAuthority
+														}
+														if (res.data.licenseRegistrationDate) { //行驶证注册日期
+															_this.dataDetails
+																.trailerLicenseRegistrationDate = res.data
+																.licenseRegistrationDate
+														}
+														if (res.data.licenseIssueDate) { //行驶证发证日期
+															_this.dataDetails.trailerLicenseIssueDate = res
+																.data.licenseIssueDate
+														}
 														_this.dataDetails.guaCarNumber = res.data
 															.carNum //车牌号
 														_this.dataDetails.guaOwner = res.data
@@ -1362,15 +1365,20 @@
 		align-items: center;
 		color: #6A7282;
 	}
-
-	.submit-btn {
+	.submit-btn-wrap{
 		position: fixed;
+		bottom:0;left:0;
+		width:100%;
+		padding:40rpx 20rpx;
+		background:#fff;
+	}
+	.submit-btn {
 		bottom: 40rpx;
 		width: 90%;
 		background: #2772FB;
 		color: white;
 		text-align: center;
-		margin-left: 5%;
+		margin:0 auto;
 		padding: 30rpx 0;
 		border-radius: 50rpx;
 	}

+ 29 - 18
pages/mine/manageVehicles/editVehicle.vue

@@ -239,7 +239,7 @@
 				</u--input>
 			</view>
 			<view class="flex row noborder" v-if="sign == '挂车'">
-				<view class="left-text">牵引车外廓尺寸(毫米)</view>
+				<view style='width:390rpx;' class="left-text">牵引车外廓尺寸(毫米)</view>
 			</view>
 			<view class="flex row noborder" v-if="sign == '非挂车'">
 				<view class="left-text">外廓尺寸(毫米)</view>
@@ -309,7 +309,7 @@
 					</u--input>
 				</view>
 				<view class="flex row noborder">
-					<view class="left-text">挂车外廓尺寸(毫米)</view>
+					<view style='width:390rpx;' class="left-text">挂车外廓尺寸(毫米)</view>
 				</view>
 				<view class="flex row noborder input-ckg">
 					<view class="input-positon">
@@ -345,7 +345,9 @@
 			</view>
 			<!-- <view class="level1-title">证件信息</view> -->
 		</view>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class='submit-btn-wrap'>
+			<view class="submit-btn" @click="submit">提交</view>
+		</view>
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
 		<master-keyboard ref="keyboard1" keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
@@ -612,20 +614,20 @@
 														image: result,
 														flag: 1
 													}).then(res => {
-													if (res.data.issuingAuthority) { //行驶证发证机关
-														_this.dataDetails.guaLssuingAuthority = res
-															.data.issuingAuthority
-													}
-													if (res.data.licenseRegistrationDate) { //行驶证注册日期
-														_this.dataDetails
-															.trailerLicenseRegistrationDate = res.data
-															.licenseRegistrationDate
-													}
-													if (res.data.licenseIssueDate) { //行驶证发证日期
-														_this.dataDetails.trailerLicenseIssueDate = res
-															.data.licenseIssueDate
-													}
 													if (res.data) {
+														if (res.data.issuingAuthority) { //行驶证发证机关
+															_this.dataDetails.guaLssuingAuthority = res
+																.data.issuingAuthority
+														}
+														if (res.data.licenseRegistrationDate) { //行驶证注册日期
+															_this.dataDetails
+																.trailerLicenseRegistrationDate = res.data
+																.licenseRegistrationDate
+														}
+														if (res.data.licenseIssueDate) { //行驶证发证日期
+															_this.dataDetails.trailerLicenseIssueDate = res
+																.data.licenseIssueDate
+														}
 														_this.dataDetails.guaCarNumber = res.data
 															.carNum //车牌号
 														_this.dataDetails.guaOwner = res.data
@@ -1362,14 +1364,20 @@
 		color: #6A7282;
 	}
 
-	.submit-btn {
+	.submit-btn-wrap{
 		position: fixed;
+		bottom:0;left:0;
+		width:100%;
+		padding:40rpx 20rpx;
+		background:#fff;
+	}
+	.submit-btn {
 		bottom: 40rpx;
 		width: 90%;
 		background: #2772FB;
 		color: white;
 		text-align: center;
-		margin-left: 5%;
+		margin:0 auto;
 		padding: 30rpx 0;
 		border-radius: 50rpx;
 	}
@@ -1382,4 +1390,7 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+	/deep/.uni-input-input:disabled{
+		background:#fff;
+	}
 </style>

+ 9 - 0
pages/mine/manageVehicles/index.vue

@@ -62,6 +62,15 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
 		},
+		onPullDownRefresh () {
+		console.log('触发了下拉刷新')
+		var that=this
+			setTimeout(()=>{
+				that.init()
+						//手动关闭刷新
+			uni.stopPullDownRefresh()
+		},2000)
+		},
 		onLoad(options) {
 			console.log(this.firstAuthentication.id)
 			_this = this;

+ 2 - 2
pages/mine/set.vue

@@ -47,13 +47,13 @@
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
-			<u-line color="#EEEEEE" class="line"></u-line>
+			<!-- <u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between' @click='clearStorage'>
 				<view>
 					<text>清除缓存</text>
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
-			</view>
+			</view> -->
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logout()' class='exitlogin'>退出登录</button>