|
@@ -47,7 +47,7 @@
|
|
|
<!-- 导航栏 -->
|
|
|
<view class="navbar" @click="goBack()">
|
|
|
<view class="title" v-if="companyInfotype==4">
|
|
|
- <u-icon name="arrow-left" size="36"></u-icon>能源管理
|
|
|
+ <u-icon name="arrow-left" size="36" v-if="carhelp.getUnionPhone()"></u-icon>能源管理
|
|
|
<span style="padding-left: 4px;" >
|
|
|
|
|
|
|
</span>
|
|
@@ -56,7 +56,7 @@
|
|
|
</span>
|
|
|
</view>
|
|
|
<view class="title" v-else>
|
|
|
- <u-icon name="arrow-left" size="36"></u-icon>能源管理
|
|
|
+ <u-icon name="arrow-left" size="36" v-if="carhelp.getUnionPhone()" ></u-icon>能源管理
|
|
|
<span style="padding-left: 4px;" v-if="companyList.length>1&¤t!=0">
|
|
|
|
|
|
|
</span>
|
|
@@ -1229,10 +1229,15 @@
|
|
|
list:[]
|
|
|
},
|
|
|
popShow1:false,
|
|
|
- userInfo:{},
|
|
|
+ userInfo:{},
|
|
|
+ unionPhone:false
|
|
|
}
|
|
|
},
|
|
|
- onLoad() {
|
|
|
+ onLoad(op) {
|
|
|
+
|
|
|
+ if(op.unionPhone){
|
|
|
+ this.unionPhone=true
|
|
|
+ }
|
|
|
var date = new Date();
|
|
|
var year = date.getFullYear();
|
|
|
var month = date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
|
|
@@ -1306,8 +1311,14 @@
|
|
|
},
|
|
|
methods: {
|
|
|
goBack(){
|
|
|
- //window.location.href = process.car.BACK_URL
|
|
|
- window.history.back()
|
|
|
+ if(this.unionPhone){
|
|
|
+ window.history.back()
|
|
|
+ }else{
|
|
|
+ window.location.href = process.car.BACK_URL
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ //
|
|
|
},
|
|
|
showAccountantWaterBtn(bl){
|
|
|
this.showAccountantWater=bl
|