Bladeren bron

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

ccjgmwz 3 jaren geleden
bovenliggende
commit
b00cac9570
1 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 4 2
      pages/user/user.vue

+ 4 - 2
pages/user/user.vue

@@ -11,7 +11,7 @@
 				<view class="personal">
 				<view class="personal">
 					<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
 					<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
 					<view style='font-size:13px;color:#8F97AB;' class="information">{{starUserphone}}</view>
 					<view style='font-size:13px;color:#8F97AB;' class="information">{{starUserphone}}</view>
-					<view @click='show=true' class="company"><image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png" mode=""></image> {{compName}}></view>
+					<view v-if='hasLogin' @click='show=true' class="company"><image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png" mode=""></image> {{compName}}></view>
 					<u-picker @confirm='compconfirm' mode="selector" v-model="show"   :range="companyList" range-key="compName"></u-picker>
 					<u-picker @confirm='compconfirm' mode="selector" v-model="show"   :range="companyList" range-key="compName"></u-picker>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -308,7 +308,9 @@
 					}
 					}
 				})
 				})
 				if(!uni.getStorageSync('compName')){
 				if(!uni.getStorageSync('compName')){
-					this.$api.doRequest('get', '/commonUser/getComp').then(res => {
+					this.$api.doRequest('get', '/openServiceInfo/selectCommonCompany', {
+				phone: this.userInfo.phone
+			}).then(res => {
 						if (res.data.data) {
 						if (res.data.data) {
 							this.companyList=res.data.data
 							this.companyList=res.data.data
 							if(this.companyList.length>0){
 							if(this.companyList.length>0){