提交调整

This commit is contained in:
daihh
2022-12-05 14:57:12 +08:00
parent 5582acfb94
commit 071a1d7a73
3 changed files with 19 additions and 7 deletions

View File

@@ -3,10 +3,13 @@
<view>
<u-avatar v-if="avatar && avatar!=''" shape="circle" :size="size" :src="fileBaseUrl + avatar" ></u-avatar>
<view v-else>
<view v-if="sex == null" class="peo" :style="{width:width,height:height}"></view>
<view v-if="sex == null" class="peo" :style="{width:width,height:height}">
<image src="../../static/images/default.png" alt="">
</view>
<view v-else :style="{width:width,height:height}">
<view class="peo" v-if="sex === 1 "><image src="../../static/images/man.png" alt=""></view>
<view class="peo" v-else><image src="../../static/images/woman.png" alt=""></view>
<view class="peo" v-if="sex == 1 "><image src="../../static/images/man.png" alt=""></view>
<view class="peo" v-else-if="sex==2 "><image src="../../static/images/woman.png" alt=""></view>
<view class="peo" v-else><image src="../../static/images/man.png" alt=""></view>
</view>
</view>
</view>

View File

@@ -27,7 +27,14 @@
plus.runtime.openURL(this.$config.loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// #endif
// #ifdef H5
window.open(this.$config.loginPath)
console.log('this.$config.loginPath',this.$config.loginPath);
if(this.$config.loginPath.startsWith('http')){
let returnUrl=window.location.protocol+'//'+window.location.host+"/"+this.$config.context;
location.href=this.$config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
}else{
location.href=this.$config.loginPath;
}
// #endif
}else{
apiLogin.boeLogin(token).then(rs=>{
@@ -55,9 +62,9 @@
}
}
}else{
uni.switchTab({
uni.switchTab({
url:'/pages/index/index'
})
})
}
});

View File

@@ -105,7 +105,9 @@
if(res.result.list.length!=0){
res.result.list.forEach(item => {
item.authorInfo={avatar:'',name:'',code:'',sex:null};
ids.push(item.sendAid);
if(item.sendAid){
ids.push(item.sendAid);
}
item.checked = false;
this.message.list.push(item);
});