Merge branch 'dev' of https://gitea.lihaink.cn/mkm/OfficeApp

subpkg/property/chosseCompany.vue

@@ -51,7 +51,7 @@
 					<view class="" style="display: flex;align-items: center;">
 						<u--image :src="dataList.cars_info.pic" width="100rpx" height="100rpx"></u--image>
 						<view class="" style="margin-left: 10rpx;">
-							车牌号：1111111
+							车牌号：{{dataList.cars_info.license}}
 						</view>
 					</view>
 

subpkg/property/contractList.vue

@@ -19,8 +19,6 @@
 				</view>
 			</view>
 		</view>
-
-
 	</view>
 
 </template>

subpkg/property/index.vue

@@ -7,7 +7,7 @@
 			<!-- 小组公司 -->
 			<view class="noCar" v-if='company_type==18'>
 				<!-- 申请 -->
-				<view class="" v-if="step==-2">
+				<view class="" v-if="step==6||step==9999">
 
 					<u-empty text="你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统~" icon="../../static/img/empty/data.png">
 					</u-empty>
@@ -65,9 +65,9 @@
 				</view>
 
 				<!-- 等待 -->
-				<view class="" v-if='[-3,-1,0,1,2].includes(step)'>
+				<view class="" v-if='[5,-1,0,1,2].includes(step)'>
 
-					<view class="loading" v-if='step==-3'>
+					<view class="loading" v-if='step==5'>
 						<span>你已提交解除申请,等待签约</span>
 						<span class="dots">...</span>
 					</view>
@@ -356,7 +356,7 @@
 				villageCompanyApi().then(res => {
 					this.showLoading = false
 					this.datas = res.data
-					this.step = res.data.status
+					this.step = res.data?.status || 9999
 					switch (this.step) {
 						case 3:
 							uni.redirectTo({

subpkg/property/vehicle_a.vue

@@ -52,7 +52,7 @@
 								</view>
 							</view>
 						</view>
-						<u-button v-if="datas.type==1&&company_type==16" type="primary" class='poline_btn'
+						<u-button v-if="datas.type==1&&company_type==18" type="primary" class='poline_btn'
 							color="#FF7C32" @tap="cancelContractFn" text="解除合同"></u-button>
 					</view>
 				</view>
@@ -181,7 +181,9 @@
 				}).then(res => {
 					Toast("解除成功")
 					setTimeout(() => {
-						uni.navigateBack()
+						uni.redirectTo({
+							url: '/subpkg/property/index'
+						})
 					}, 2000)
 				})
 			},