Parcourir la source

调试页面

master
corala il y a 2 ans
Parent
révision
f5293268f1
6 fichiers modifiés avec 95 ajouts et 73 suppressions
  1. +1
    -1
      src/common/http.api.js
  2. +0
    -6
      src/pages.json
  3. +4
    -5
      src/pages/my/contact_check_page.vue
  4. +78
    -54
      src/pages/my/electContract.vue
  5. +2
    -1
      src/pages/my/goonContract.vue
  6. +10
    -6
      src/pages/tabs/index.vue

+ 1
- 1
src/common/http.api.js Voir le fichier

@@ -79,7 +79,7 @@ let updateLevelurl= '/appCustomer/updateLevel.do' //客源关注功能
let findRepairPersonTaskurl= '/appCleanRepair/findRepairPersonTask.do' //查询当前登录维修人的维修任务
let confirmRepairTaskurl= '/appCleanRepair/confirmRepairTask.do' //维修人员确认当前已完成的维修
let repairEquipmentDictionaryurl= '/appCleanRepair/repairEquipmentDictionary.do' //维修设备字典
let dealurl= '/appContract/deal.do' //成交合同申请
let dealurl= '/appHouseContract/deal.do' //成交合同申请
let examineurl= '/appHouseContract/examine.do' //合同主管审核店长审批
let processurl= '/appContractProcess/process.do' //合同申请进度
let contracturl= '/appContractModel/contract.do' //改价申请详情


+ 0
- 6
src/pages.json Voir le fichier

@@ -17,12 +17,6 @@
},
"pages": [
{
// "path": "pages/tabs/index",
// "style": {
// "navigationBarTitleText": "8090公寓",
// "navigationBarTextStyle": "black"
// }
// },{
"path": "pages/tabs/login",
"style": {
"navigationBarTitleText": "登录",


+ 4
- 5
src/pages/my/contact_check_page.vue Voir le fichier

@@ -3,20 +3,19 @@
</template>
<script>
export default {
// 定金合同详情页
data() {
return {
src: ''
};
},
onLoad(options) {
this.src = options.src;
},
onShow() {
uni.setStorageSync('backFlag',1)
uni.setStorageSync('backFlag_contractId',options.contractId)
},
created() {
this.src = uni.getStorageSync('src');
},
methods: {
},
};


+ 78
- 54
src/pages/my/electContract.vue Voir le fichier

@@ -137,10 +137,13 @@
<!-- <view class="red-item">拆单金额(3010.0)与第一笔合计不等(6001.0),押金、服务费(6009.0)默认第一笔不在计算在内!</view> -->
</view>
</view>
<view class="step" v-if="step==1" @click="nextStep">下一步</view>
<view class="step2" v-if="step==2">
<view class="next-btn btn" v-if="step==2" @click="step=1">上一步</view>
<view class="submit-btn btn" @click="submit">提交并预览</view>
<view class="btn-box">
<view class="step" v-if="step==1" @click="nextStep">下一步</view>
<view class="step2" v-if="step==2">
<view class="next-btn btn" v-if="step==2" @click="step=1">上一步</view>
<view class="submit-btn btn" v-if="backFlag==1" @click="submit1">提交</view>
<view class="submit-btn btn" v-else @click="submit">提交并预览</view>
</view>
</view>
</view>
<view v-if="!canEdit" class="errText">{{errText}}</view>
@@ -347,7 +350,9 @@
// 人员列表
dealPeopleList: [],
contractId: '',//
electContractInfo: {}
electContractInfo: {},
btnText: '提交并预览',
backFlag: 0
};
},
onLoad(options) {
@@ -356,7 +361,6 @@
}else{
this.electContractInfo = uni.getStorageSync('electContractInfo');
uni.removeStorageSync('electContractInfo');
console.log(this.electContractInfo)
this.roomId = this.electContractInfo.roomId;
this.form.rent_date_start = this.electContractInfo.rent_date_start
this.form.rent_date_end = this.electContractInfo.rent_date_end
@@ -368,6 +372,11 @@
this.getDeptList()
},
onShow() {
// 从定金合同详情页返回来的
this.backFlag = uni.getStorageSync('backFlag')||0
this.contractId = uni.getStorageSync('backFlag_contractId')||0
uni.removeStorageSync('backFlag');
uni.removeStorageSync('backFlag_contractId');
},
methods: {
// 部门列表
@@ -492,15 +501,15 @@
})
return ;
}
console.log('time')
console.log(this.getTimer(this.form.rent_date_start))
console.log(this.getTimer(this.form.rent_date_end))
if(this.getTimer(this.form.rent_date_end)<this.getTimer(this.form.rent_date_start)){
if(this.getTimer(this.form.rent_date_end) < this.getTimer(this.form.rent_date_start)){
this.$refs.uToast.show({
title: '租约的结束时间不能小于开始时间'
})
return ;
}
this.$refs.uToast.show({
title: '提交预览中...'
})
let body = {
"contractId": this.contractId,
"oldContractId": this.electContractInfo.proxy_contract_id,//续期合同id
@@ -518,21 +527,26 @@
}
this.$u.api.twoContractInfo({body:body}).then((res)=>{
if(res.ErrNo=='0000'){
// this.$refs.uToast.show({
// title: '拆单金额(3010.0)与第一笔合计不等(6001.0),押金、服务费(6009.0)默认第一笔不在计算在内!',
// })
this.$refs.uToast.show({
title: res.ErrMsg,
icon: 'none',
type:'success'
})
uni.setStorageSync('src',res.result)
uni.navigateTo({
url: '/pages/my/contact_check_page?src='+res.result
url: '/pages/my/contact_check_page?contractId='+this.contractId
})
}else{
}
})
},
submit1(){
this.$u.api.deal({body:{contractId: this.contractId}}).then((res)=>{
if(res.ErrNo =='0000'){
this.$refs.uToast.show({
title: res.ErrMsg
})
setTimeout(()=>{
uni.navigateBack({
delta: 1
});
},1000)
}
})
},
confirmXingzuo(e){
this.form.star = e[0].value
@@ -652,49 +666,59 @@
margin: 24rpx 30rpx 0;
}
}
.step{
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
background: #FF6D25;
border-radius: 12rpx;
margin-left: 30rpx;
font-size: 32rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
.btn-box{
background-color: #fff;
position: fixed;
z-index: 9999;
bottom: 50rpx;
}
.step2{
position: fixed;
z-index: 9999;
bottom: 50rpx;
width: 690rpx;
margin-left: 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
.btn{
width: 330rpx;
height: 88rpx;
bottom: 0;
height: 88rpx;
left: 0;
right: 0;
.step{
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
background: #FF6D25;
border-radius: 12rpx;
margin-left: 30rpx;
font-size: 32rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
}
.next-btn{
color: #FF6D25;
background: #FFFFFF;
border: 2rpx solid #FF6D25;
}
.submit-btn{
background: #FF6D25;
color: #FFFFFF;
position: fixed;
z-index: 9999;
bottom: 50rpx;
}
.step2{
position: fixed;
z-index: 9999;
bottom: 50rpx;
width: 690rpx;
margin-left: 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
.btn{
width: 330rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
border-radius: 12rpx;
font-size: 32rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
}
.next-btn{
color: #FF6D25;
background: #FFFFFF;
border: 2rpx solid #FF6D25;
}
.submit-btn{
background: #FF6D25;
color: #FFFFFF;
}
}
}



+ 2
- 1
src/pages/my/goonContract.vue Voir le fichier

@@ -57,7 +57,8 @@
onLoad(options) {
},
onShow() {
uni.removeStorageSync('backFlag');
uni.removeStorageSync('backFlag_contractId');
},
created() {
this.getList()


+ 10
- 6
src/pages/tabs/index.vue Voir le fichier

@@ -109,12 +109,16 @@
created(){
},
onShow() {
let token = uni.getStorageSync('token');
if(token){
this.$u.vuex("vuex_token",token);
uni.switchTab({
url: '/pages/tabs/index'
})
if(!this.vuex_token){
let token = uni.getStorageSync('token');
if(token){
this.$u.vuex("vuex_token",token);
}else{
uni.navigateTo({
url: '/pages/tabs/login'
})
return ;
}
}
this.current = 0
this.current1 = 0


Chargement…
Annuler
Enregistrer