徐强 / find_landlord · 提交

转到一个项目

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

提交

内嵌 并排对比
正在显示 15 个修改的文件 包含 30 行增加 和 53 行删除
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 "xxxhdpi" : "unpackage/res/icons/192x192.png" 136 "xxxhdpi" : "unpackage/res/icons/192x192.png"
137 }, 137 },
138 "ios" : { 138 "ios" : {
139 - "appstore" : "unpackage/res/icons/ios_appIcon.png", 139 + "appstore" : "unpackage/res/icons/1024x1024.png",
140 "ipad" : { 140 "ipad" : {
141 "app" : "unpackage/res/icons/76x76.png", 141 "app" : "unpackage/res/icons/76x76.png",
142 "app@2x" : "unpackage/res/icons/152x152.png", 142 "app@2x" : "unpackage/res/icons/152x152.png",
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
165 "android" : { 165 "android" : {
166 "hdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame3.png", 166 "hdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame3.png",
167 "xhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame2.png", 167 "xhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame2.png",
168 - "xxhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/Frame1.png" 168 + "xxhdpi" : "D:/MyWork/1.20210220找地主app-梅姐、培杰/wenye_start1.png"
169 }, 169 },
170 "iosStyle" : "common" 170 "iosStyle" : "common"
171 } 171 }
@@ -199,15 +199,6 @@ @@ -199,15 +199,6 @@
199 computed:{ 199 computed:{
200 ...mapState(["userinfo","articleList"]) 200 ...mapState(["userinfo","articleList"])
201 }, 201 },
202 -/* onLoad(){  
203 - uni.setStorageSync('refreshFindWonderful',false)  
204 - this.param.page = 1  
205 - this.last_page = 0  
206 - this.current_page = 1  
207 - this.list = []  
208 - this.showWaterFalls = false  
209 - this.getData()  
210 - }, */  
211 onReady(){ 202 onReady(){
212 uni.setStorageSync('refreshFindWonderful',false) 203 uni.setStorageSync('refreshFindWonderful',false)
213 this.param.page = 1 204 this.param.page = 1
@@ -254,20 +245,12 @@ @@ -254,20 +245,12 @@
254 getData(){ 245 getData(){
255 if(this.tabIndex == 0){ 246 if(this.tabIndex == 0){
256 this.listType == 'findPlay' 247 this.listType == 'findPlay'
257 - uni.getLocation({  
258 - type: 'gcj02',  
259 - geocode: true,  
260 - success: (res) => {  
261 - this.param.city = res.address.city  
262 - // res.address.district  
263 - this.param.county = res.address.district  
264 - },  
265 - fail: (err) => {  
266 - this.param.city = '北京市'  
267 - this.param.county = '北京市'  
268 - },  
269 - complete: (com) => {  
270 - console.log('111111111111',this.param) 248 + //获取用户信息
  249 + this.$request('/user/info').then((res)=>{
  250 + if(res.data.area_id != ''){
  251 + let areaNames = Object.values(res.data.area_arr)
  252 + this.param.city = areaNames[1]
  253 + this.param.county = areaNames[2]
271 this.$request('/article/areaList',this.param).then((res)=>{ 254 this.$request('/article/areaList',this.param).then((res)=>{
272 this.last_page = res.data.last_page 255 this.last_page = res.data.last_page
273 this.current_page = res.data.current_page 256 this.current_page = res.data.current_page
@@ -275,6 +258,14 @@ @@ -275,6 +258,14 @@
275 this.$store.commit('setArticleList',this.list) 258 this.$store.commit('setArticleList',this.list)
276 this.showWaterFalls = true 259 this.showWaterFalls = true
277 }) 260 })
  261 + }else{
  262 + this.$request('/article/followUserList',this.param).then((res)=>{
  263 + this.last_page = res.data.last_page
  264 + this.current_page = res.data.current_page
  265 + this.list = this.list.concat(res.data.data)
  266 + this.$store.commit('setArticleList',this.list)
  267 + this.showWaterFalls = true
  268 + })
278 } 269 }
279 }) 270 })
280 } 271 }
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image> 12 <image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image>
13 </view> 13 </view>
14 <view class="userInfo" :class="{userActive:userInfo.group_id == '1'}"> 14 <view class="userInfo" :class="{userActive:userInfo.group_id == '1'}">
15 - <view class="userStar" v-if="userInfo.group_id == '2'"> 15 + <view class="userStar">
16 <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> 16 <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>
17 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> --> 17 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> -->
18 <view style="display: flex;align-items: center;"> 18 <view style="display: flex;align-items: center;">
@@ -70,7 +70,6 @@ @@ -70,7 +70,6 @@
70 this.$href('/pages/findWonderful/findWonderful',2) 70 this.$href('/pages/findWonderful/findWonderful',2)
71 }else{ 71 }else{
72 this.$request('/common/getConfig',{type:'8'}).then((res)=>{ 72 this.$request('/common/getConfig',{type:'8'}).then((res)=>{
73 - console.log('微信登录按钮开关',res)  
74 this.switchTab = res.data.switch 73 this.switchTab = res.data.switch
75 this.plat = plus.os.name.toLowerCase() 74 this.plat = plus.os.name.toLowerCase()
76 }) 75 })
@@ -167,7 +167,6 @@ @@ -167,7 +167,6 @@
167 let retMsg = '' 167 let retMsg = ''
168 //获取用户信息 168 //获取用户信息
169 this.$request('/user/info').then((res)=>{ 169 this.$request('/user/info').then((res)=>{
170 - console.log('用户信息',res)  
171 this.userinfo = res.data 170 this.userinfo = res.data
172 if(this.pageType == 'myAppoint'){ 171 if(this.pageType == 'myAppoint'){
173 url = '/order/lis' 172 url = '/order/lis'
@@ -141,6 +141,7 @@ @@ -141,6 +141,7 @@
141 export default{ 141 export default{
142 data(){ 142 data(){
143 return{ 143 return{
  144 + fromPage:'',
144 showChooseAddress:false, 145 showChooseAddress:false,
145 nicknameFocus:false, 146 nicknameFocus:false,
146 userInfo:{}, 147 userInfo:{},
@@ -199,7 +200,8 @@ @@ -199,7 +200,8 @@
199 // }); 200 // });
200 }) 201 })
201 }, 202 },
202 - onLoad(){ 203 + onLoad(option){
  204 + this.fromPage = option.fromPage
203 this.getData() 205 this.getData()
204 }, 206 },
205 methods:{ 207 methods:{
@@ -380,6 +382,7 @@ @@ -380,6 +382,7 @@
380 this.$request('/user/info').then((res)=>{ 382 this.$request('/user/info').then((res)=>{
381 let originInfo = res.data 383 let originInfo = res.data
382 if( 384 if(
  385 + this.fromPage != 'my' &&
383 originInfo.area_id == this.param.area_id && 386 originInfo.area_id == this.param.area_id &&
384 '/uploads' + originInfo.avatar.split('uploads')[1] == this.userInfo.avatar && 387 '/uploads' + originInfo.avatar.split('uploads')[1] == this.userInfo.avatar &&
385 originInfo.nickname == this.userInfo.nickname && 388 originInfo.nickname == this.userInfo.nickname &&
@@ -551,10 +554,6 @@ @@ -551,10 +554,6 @@
551 font-size: 28rpx; 554 font-size: 28rpx;
552 color: #c8c9cc; 555 color: #c8c9cc;
553 } 556 }
554 - }  
555 - .infoRight{  
556 - display: flex;  
557 - align-items: center;  
558 .alertTxt{ 557 .alertTxt{
559 color: #c8c9cc; 558 color: #c8c9cc;
560 font-weight: 300; 559 font-weight: 300;
@@ -562,6 +561,10 @@ @@ -562,6 +561,10 @@
562 .alertTxt.active{ 561 .alertTxt.active{
563 color: #323232; 562 color: #323232;
564 } 563 }
  564 + }
  565 + .infoRight{
  566 + display: flex;
  567 + align-items: center;
565 image{width: 32rpx;height: 32rpx;} 568 image{width: 32rpx;height: 32rpx;}
566 } 569 }
567 } 570 }
@@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
31 getData(){ 31 getData(){
32 //获取用户信息 32 //获取用户信息
33 this.$request('/user/info').then((res)=>{ 33 this.$request('/user/info').then((res)=>{
34 - console.log('用户信息',res)  
35 this.userInfo = res.data 34 this.userInfo = res.data
36 }) 35 })
37 }, 36 },
@@ -71,7 +71,6 @@ @@ -71,7 +71,6 @@
71 } 71 }
72 //获取用户信息 72 //获取用户信息
73 this.$request('/user/info').then((res)=>{ 73 this.$request('/user/info').then((res)=>{
74 - console.log('用户信息',res)  
75 this.userInfo = res.data 74 this.userInfo = res.data
76 }) 75 })
77 }, 76 },
@@ -53,7 +53,6 @@ @@ -53,7 +53,6 @@
53 onLoad() { 53 onLoad() {
54 //获取用户信息 54 //获取用户信息
55 this.$request('/user/info').then((res)=>{ 55 this.$request('/user/info').then((res)=>{
56 - console.log('用户信息',res)  
57 this.userInfo = res.data 56 this.userInfo = res.data
58 this.showCheckName = true 57 this.showCheckName = true
59 }) 58 })
@@ -27,14 +27,13 @@ @@ -27,14 +27,13 @@
27 onLoad() { 27 onLoad() {
28 //获取用户信息 28 //获取用户信息
29 this.$request('/user/info').then((res)=>{ 29 this.$request('/user/info').then((res)=>{
30 - console.log('用户信息',res)  
31 this.userInfo = res.data 30 this.userInfo = res.data
32 }) 31 })
33 }, 32 },
34 methods:{ 33 methods:{
35 confirm(){ 34 confirm(){
36 if(this.userInfo.hometown_check_status == 3){ 35 if(this.userInfo.hometown_check_status == 3){
37 - this.$href('becomeLand') 36 + this.$href('becomeLand?fromPage=checkWait')
38 }else{ 37 }else{
39 uni.switchTab({ 38 uni.switchTab({
40 url:'my' 39 url:'my'
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </view> 18 </view>
19 <view class="userInfo"> 19 <view class="userInfo">
20 <!-- 当登录人是地主时显示星星 --> 20 <!-- 当登录人是地主时显示星星 -->
21 - <view class="userStar" v-if="userInfo.group_id == '2'"> 21 + <view class="userStar">
22 <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> 22 <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>
23 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> --> 23 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> -->
24 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> --> 24 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> -->
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
253 </view> --> 253 </view> -->
254 <view class="bottomBtnWrap"> 254 <view class="bottomBtnWrap">
255 <view class="bottomBtn" @click="agree"> 255 <view class="bottomBtn" @click="agree">
256 - 成为地主 256 + 成为乡贤
257 </view> 257 </view>
258 </view> 258 </view>
259 <!-- <view class="desc"> 259 <!-- <view class="desc">
@@ -316,7 +316,6 @@ @@ -316,7 +316,6 @@
316 }, 316 },
317 onLoad(){ 317 onLoad(){
318 this.$request('/common/getConfig',{type:'8'}).then((res)=>{ 318 this.$request('/common/getConfig',{type:'8'}).then((res)=>{
319 - console.log('微信登录按钮开关',res)  
320 this.switchTab = res.data.switch 319 this.switchTab = res.data.switch
321 this.plat = plus.os.name.toLowerCase() 320 this.plat = plus.os.name.toLowerCase()
322 }) 321 })
@@ -509,7 +508,7 @@ @@ -509,7 +508,7 @@
509 return 508 return
510 } */ 509 } */
511 this.showBecomeLand = false 510 this.showBecomeLand = false
512 - this.$href('becomeLand') 511 + this.$href('becomeLand?fromPage=my')
513 }, 512 },
514 href(url){ 513 href(url){
515 this.$href(url) 514 this.$href(url)
@@ -125,7 +125,6 @@ @@ -125,7 +125,6 @@
125 }) 125 })
126 //获取用户信息 126 //获取用户信息
127 this.$request('/user/info').then((res)=>{ 127 this.$request('/user/info').then((res)=>{
128 - console.log('用户信息',res)  
129 this.userInfo = res.data 128 this.userInfo = res.data
130 }) 129 })
131 }, 130 },
@@ -146,9 +145,6 @@ @@ -146,9 +145,6 @@
146 uni.getUserInfo({ 145 uni.getUserInfo({
147 provider: 'weixin', 146 provider: 'weixin',
148 success: function (infoRes) { 147 success: function (infoRes) {
149 - console.log('用户信息',infoRes)  
150 - console.log('用户昵称为：' + infoRes.userInfo.nickName);  
151 - console.log('参数============',infoRes.userInfo)  
152 uni.request({ 148 uni.request({
153 url:apiUrl+'/api/user/bindWechat', 149 url:apiUrl+'/api/user/bindWechat',
154 method:'POST', 150 method:'POST',
@@ -233,7 +233,6 @@ @@ -233,7 +233,6 @@
233 let areaNames = [] 233 let areaNames = []
234 //获取用户信息 234 //获取用户信息
235 this.$request('/user/info').then((res)=>{ 235 this.$request('/user/info').then((res)=>{
236 - console.log('用户信息',res)  
237 let avatar = res.data.avatar 236 let avatar = res.data.avatar
238 let bg_image = res.data.bg_image 237 let bg_image = res.data.bg_image
239 if(avatar != ''){ 238 if(avatar != ''){
@@ -257,7 +256,7 @@ @@ -257,7 +256,7 @@
257 }, 256 },
258 goService(){ 257 goService(){
259 if(this.userInfo.check_status == 2 || this.userInfo.check_status == 0){ 258 if(this.userInfo.check_status == 2 || this.userInfo.check_status == 0){
260 - this.$href('/pages/my/becomeLand') 259 + this.$href('/pages/my/becomeLand?fromPage=personInfo')
261 }else{ 260 }else{
262 this.$href('/pages/my/checkWait') 261 this.$href('/pages/my/checkWait')
263 } 262 }
@@ -274,9 +273,6 @@ @@ -274,9 +273,6 @@
274 uni.getUserInfo({ 273 uni.getUserInfo({
275 provider: 'weixin', 274 provider: 'weixin',
276 success: function (infoRes) { 275 success: function (infoRes) {
277 - console.log('用户信息',infoRes)  
278 - console.log('用户昵称为：' + infoRes.userInfo.nickName);  
279 - console.log('参数============',infoRes.userInfo)  
280 uni.request({ 276 uni.request({
281 url:apiUrl+'/user/bindWechat', 277 url:apiUrl+'/user/bindWechat',
282 method:'POST', 278 method:'POST',
@@ -98,7 +98,6 @@ @@ -98,7 +98,6 @@
98 }) 98 })
99 //获取用户信息 99 //获取用户信息
100 this.$request('/user/info').then((res)=>{ 100 this.$request('/user/info').then((res)=>{
101 - console.log('用户信息',res)  
102 this.userInfo = res.data 101 this.userInfo = res.data
103 }) 102 })
104 }, 103 },
@@ -86,7 +86,6 @@ @@ -86,7 +86,6 @@
86 }) 86 })
87 //获取用户信息 87 //获取用户信息
88 this.$request('/user/info').then((res)=>{ 88 this.$request('/user/info').then((res)=>{
89 - console.log('用户信息',res)  
90 this.userInfo = res.data 89 this.userInfo = res.data
91 }) 90 })
92 }, 91 },