徐强 / find_landlord · 提交

转到一个项目

作者 xuqiang
提交 9c200e7f6659fd9faa06332bb61f6bf0c53aa8b7 1 个父辈 60e6b758

提交

内嵌 并排对比
正在显示 15 个修改的文件 包含 30 行增加 和 53 行删除
... ... @@ -136,7 +136,7 @@
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/ios_appIcon.png",
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
... ... @@ -165,7 +165,7 @@
"android" : {
"hdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame3.png",
"xhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame2.png",
"xxhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame1.png"
"xxhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/wenye_start1.png"
},
"iosStyle" : "common"
}
... ...
... ... @@ -199,15 +199,6 @@
computed:{
...mapState(["userinfo","articleList"])
},
/* onLoad(){
uni.setStorageSync('refreshFindWonderful',false)
this.param.page = 1
this.last_page = 0
this.current_page = 1
this.list = []
this.showWaterFalls = false
this.getData()
}, */
onReady(){
uni.setStorageSync('refreshFindWonderful',false)
this.param.page = 1
... ... @@ -254,20 +245,12 @@
getData(){
if(this.tabIndex == 0){
this.listType == 'findPlay'
uni.getLocation({
type: 'gcj02',
geocode: true,
success: (res) => {
this.param.city = res.address.city
// res.address.district
this.param.county = res.address.district
},
fail: (err) => {
this.param.city = '北京市'
this.param.county = '北京市'
},
complete: (com) => {
console.log('111111111111',this.param)
//获取用户信息
this.$request('/user/info').then((res)=>{
if(res.data.area_id != ''){
let areaNames = Object.values(res.data.area_arr)
this.param.city = areaNames[1]
this.param.county = areaNames[2]
this.$request('/article/areaList',this.param).then((res)=>{
this.last_page = res.data.last_page
this.current_page = res.data.current_page
... ... @@ -275,6 +258,14 @@
this.$store.commit('setArticleList',this.list)
this.showWaterFalls = true
})
}else{
this.$request('/article/followUserList',this.param).then((res)=>{
this.last_page = res.data.last_page
this.current_page = res.data.current_page
this.list = this.list.concat(res.data.data)
this.$store.commit('setArticleList',this.list)
this.showWaterFalls = true
})
}
})
}
... ...
... ... @@ -12,7 +12,7 @@
<image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image>
</view>
<view class="userInfo" :class="{userActive:userInfo.group_id == '1'}">
<view class="userStar" v-if="userInfo.group_id == '2'">
<view class="userStar">
<image v-for="(item,index) in userInfo.starList" style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image>
<!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> -->
<view style="display: flex;align-items: center;">
... ...
... ... @@ -70,7 +70,6 @@
this.$href('/pages/findWonderful/findWonderful',2)
}else{
this.$request('/common/getConfig',{type:'8'}).then((res)=>{
console.log('微信登录按钮开关',res)
this.switchTab = res.data.switch
this.plat = plus.os.name.toLowerCase()
})
... ...
... ... @@ -167,7 +167,6 @@
let retMsg = ''
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userinfo = res.data
if(this.pageType == 'myAppoint'){
url = '/order/lis'
... ...
... ... @@ -141,6 +141,7 @@
export default{
data(){
return{
fromPage:'',
showChooseAddress:false,
nicknameFocus:false,
userInfo:{},
... ... @@ -199,7 +200,8 @@
// });
})
},
onLoad(){
onLoad(option){
this.fromPage = option.fromPage
this.getData()
},
methods:{
... ... @@ -380,6 +382,7 @@
this.$request('/user/info').then((res)=>{
let originInfo = res.data
if(
this.fromPage != 'my' &&
originInfo.area_id == this.param.area_id &&
'/uploads' + originInfo.avatar.split('uploads')[1] == this.userInfo.avatar &&
originInfo.nickname == this.userInfo.nickname &&
... ... @@ -551,10 +554,6 @@
font-size: 28rpx;
color: #c8c9cc;
}
}
.infoRight{
display: flex;
align-items: center;
.alertTxt{
color: #c8c9cc;
font-weight: 300;
... ... @@ -562,6 +561,10 @@
.alertTxt.active{
color: #323232;
}
}
.infoRight{
display: flex;
align-items: center;
image{width: 32rpx;height: 32rpx;}
}
}
... ...
... ... @@ -31,7 +31,6 @@
getData(){
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
... ...
... ... @@ -71,7 +71,6 @@
}
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
... ...
... ... @@ -53,7 +53,6 @@
onLoad() {
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
this.showCheckName = true
})
... ...
... ... @@ -27,14 +27,13 @@
onLoad() {
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
methods:{
confirm(){
if(this.userInfo.hometown_check_status == 3){
this.$href('becomeLand')
this.$href('becomeLand?fromPage=checkWait')
}else{
uni.switchTab({
url:'my'
... ...
... ... @@ -18,7 +18,7 @@
</view>
<view class="userInfo">
<!-- 当登录人是地主时显示星星 -->
<view class="userStar" v-if="userInfo.group_id == '2'">
<view class="userStar">
<image v-for="(item,index) in startList" :key="index" style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image>
<!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> -->
<!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> -->
... ... @@ -253,7 +253,7 @@
</view> -->
<view class="bottomBtnWrap">
<view class="bottomBtn" @click="agree">
成为地主
成为乡贤
</view>
</view>
<!-- <view class="desc">
... ... @@ -316,7 +316,6 @@
},
onLoad(){
this.$request('/common/getConfig',{type:'8'}).then((res)=>{
console.log('微信登录按钮开关',res)
this.switchTab = res.data.switch
this.plat = plus.os.name.toLowerCase()
})
... ... @@ -509,7 +508,7 @@
return
} */
this.showBecomeLand = false
this.$href('becomeLand')
this.$href('becomeLand?fromPage=my')
},
href(url){
this.$href(url)
... ...
... ... @@ -125,7 +125,6 @@
})
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
... ... @@ -146,9 +145,6 @@
uni.getUserInfo({
provider: 'weixin',
success: function (infoRes) {
console.log('用户信息',infoRes)
console.log('用户昵称为：' + infoRes.userInfo.nickName);
console.log('参数============',infoRes.userInfo)
uni.request({
url:apiUrl+'/api/user/bindWechat',
method:'POST',
... ...
... ... @@ -233,7 +233,6 @@
let areaNames = []
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
let avatar = res.data.avatar
let bg_image = res.data.bg_image
if(avatar != ''){
... ... @@ -257,7 +256,7 @@
},
goService(){
if(this.userInfo.check_status == 2 || this.userInfo.check_status == 0){
this.$href('/pages/my/becomeLand')
this.$href('/pages/my/becomeLand?fromPage=personInfo')
}else{
this.$href('/pages/my/checkWait')
}
... ... @@ -274,9 +273,6 @@
uni.getUserInfo({
provider: 'weixin',
success: function (infoRes) {
console.log('用户信息',infoRes)
console.log('用户昵称为：' + infoRes.userInfo.nickName);
console.log('参数============',infoRes.userInfo)
uni.request({
url:apiUrl+'/user/bindWechat',
method:'POST',
... ...
... ... @@ -98,7 +98,6 @@
})
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
... ...
... ... @@ -86,7 +86,6 @@
})
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('用户信息',res)
this.userInfo = res.data
})
},
... ...