|
|
@ -349,7 +349,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-show="current==1"> |
|
|
|
<view v-show="current==1 && list[current].name === '同城送'"> |
|
|
|
<view class="secondSection"> |
|
|
|
<view class="secondSection"> |
|
|
|
<image class="shopImage" :src="cityInfo.imageList?cityInfo.imageList[0]:''"></image> |
|
|
|
<image class="shopImage" :src="cityInfo.imageList?cityInfo.imageList[0]:''"></image> |
|
|
|
<view class="content" v-if="cityInfo.shop_name"> |
|
|
|
<view class="content" v-if="cityInfo.shop_name"> |
|
|
@ -569,8 +569,6 @@ |
|
|
|
}, |
|
|
|
}, |
|
|
|
list: [{ |
|
|
|
list: [{ |
|
|
|
name: '首页' |
|
|
|
name: '首页' |
|
|
|
}, { |
|
|
|
|
|
|
|
name: '同城送' |
|
|
|
|
|
|
|
}], |
|
|
|
}], |
|
|
|
current: 0, |
|
|
|
current: 0, |
|
|
|
tabList: [], |
|
|
|
tabList: [], |
|
|
@ -676,13 +674,6 @@ |
|
|
|
type: 2 |
|
|
|
type: 2 |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
// this.list = data.same_city ? [{ |
|
|
|
|
|
|
|
// name: '首页' |
|
|
|
|
|
|
|
// }, { |
|
|
|
|
|
|
|
// name: '同城送' |
|
|
|
|
|
|
|
// }] : [{ |
|
|
|
|
|
|
|
// name: '首页' |
|
|
|
|
|
|
|
// }] |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
async getWxAppStyle() { |
|
|
|
async getWxAppStyle() { |
|
|
@ -1050,14 +1041,14 @@ |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
}, |
|
|
|
changeHome(val) { |
|
|
|
changeHome(val) { |
|
|
|
this.current = val; |
|
|
|
if (this.list[val].name === '广场') { |
|
|
|
if (this.current < 2) { |
|
|
|
|
|
|
|
this.getTypeList() |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: '/pages/squareDynamic/index' |
|
|
|
url: '/pages/squareDynamic/index' |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.getTypeList() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.current = val; |
|
|
|
}, |
|
|
|
}, |
|
|
|
getCityInfo() { |
|
|
|
getCityInfo() { |
|
|
|
const that = this |
|
|
|
const that = this |
|
|
@ -1177,11 +1168,11 @@ |
|
|
|
this.getAuthorize(); |
|
|
|
this.getAuthorize(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
onShow() { |
|
|
|
onShow() { |
|
|
|
this.getWxAppStyle(); |
|
|
|
if (this.list[this.current].name === '广场') { |
|
|
|
this.isLogin = uni.getStorageSync("AccessToken") ? true : false |
|
|
|
|
|
|
|
if (this.current == 2) { |
|
|
|
|
|
|
|
this.current = 0; |
|
|
|
this.current = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.getWxAppStyle(); |
|
|
|
|
|
|
|
this.isLogin = uni.getStorageSync("AccessToken") ? true : false |
|
|
|
}, |
|
|
|
}, |
|
|
|
onPageScroll(e) { |
|
|
|
onPageScroll(e) { |
|
|
|
if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true |
|
|
|
if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true |
|
|
|