Merge branch 'dev' of https://gitea.lihaink.cn/mkm/OfficeApp
This commit is contained in:
commit
34f6838e2a
@ -51,7 +51,7 @@
|
|||||||
<view class="" style="display: flex;align-items: center;">
|
<view class="" style="display: flex;align-items: center;">
|
||||||
<u--image :src="dataList.cars_info.pic" width="100rpx" height="100rpx"></u--image>
|
<u--image :src="dataList.cars_info.pic" width="100rpx" height="100rpx"></u--image>
|
||||||
<view class="" style="margin-left: 10rpx;">
|
<view class="" style="margin-left: 10rpx;">
|
||||||
车牌号:1111111
|
车牌号:{{dataList.cars_info.license}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<!-- 小组公司 -->
|
<!-- 小组公司 -->
|
||||||
<view class="noCar" v-if='company_type==18'>
|
<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 text="你还没有所属车辆哦,请向镇公司申请用车或使用自有车辆并绑定系统~" icon="../../static/img/empty/data.png">
|
||||||
</u-empty>
|
</u-empty>
|
||||||
@ -65,9 +65,9 @@
|
|||||||
</view>
|
</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>你已提交解除申请,等待签约</span>
|
||||||
<span class="dots">...</span>
|
<span class="dots">...</span>
|
||||||
</view>
|
</view>
|
||||||
@ -356,7 +356,7 @@
|
|||||||
villageCompanyApi().then(res => {
|
villageCompanyApi().then(res => {
|
||||||
this.showLoading = false
|
this.showLoading = false
|
||||||
this.datas = res.data
|
this.datas = res.data
|
||||||
this.step = res.data.status
|
this.step = res.data?.status || 9999
|
||||||
switch (this.step) {
|
switch (this.step) {
|
||||||
case 3:
|
case 3:
|
||||||
uni.redirectTo({
|
uni.redirectTo({
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</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>
|
color="#FF7C32" @tap="cancelContractFn" text="解除合同"></u-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -181,7 +181,9 @@
|
|||||||
}).then(res => {
|
}).then(res => {
|
||||||
Toast("解除成功")
|
Toast("解除成功")
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
uni.navigateBack()
|
uni.redirectTo({
|
||||||
|
url: '/subpkg/property/index'
|
||||||
|
})
|
||||||
}, 2000)
|
}, 2000)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user