From 7a89892d6ac9c181febed610b62f1aeb8145099b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 06:58:48 +0800
Subject: [PATCH] update
---
pages/home/home.vue | 127 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7d94fbe..900bce8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,20 +4,27 @@
<!-- 顶部，可能 -->
<view class="school" :style="{'padding-top':(StatusBar)+'px'
,height:CustomBar+'rpx','line-height':CustomBar+'rpx' }">
- <picker @change="PickerChangeSchool" :value="areaIndex" :range="schools" range-key="name">
- <view class="picker flex">
- <uni-icons type="location" class="m-r-5" size="18"></uni-icons>
- <view>
- {{ areaIndex>=0&&schools[areaIndex].name ? schools[areaIndex].name : '选择位置' }}
- </view>
+ <!-- <picker @change="PickerChangeSchool" :value="areaIndex" :range="schools" range-key="name">
+ <view class="picker flex">
+ <uni-icons type="location" class="m-r-5" size="18"></uni-icons>
+ <view>
+ {{ areaIndex >= 0 && schools[areaIndex].name ? schools[areaIndex].name : '选择位置' }}
+ </view>
+ </view>
+ </picker> -->
+ <view class="picker flex" @click.stop="goToAddress">
+ <uni-icons type="location" class="m-r-5" size="18"></uni-icons>
+ <view>
+ {{ address&&address.id?address.address: '选择地址' }}
</view>
- </picker>
+ </view>
</view>
- <view class="search-container m-t-12 flex">
+ <view class="search-container m-t-12 flex" @click="goto('/pages/home/components/home-search',false)">
<view class="flex1 input">
- <u-input placeholder="请输入花名" v-model="search_flow">
- <template slot="suffix">
- <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
+ <u-input placeholder="请输入花名" disabled v-model="search_flow">
+ <template slot="suffix">
+ <!-- @click="buttonSearchFlow" -->
+ <uni-icons color="#20613D" type="search" size="24" ></uni-icons>
</template>
</u-input>
</view>
@@ -30,8 +37,8 @@
v-if="banners&&banners.length>0" :autoplay="true">
<swiper-item v-for="(item, index) in banners" :key="index">
<view class="swiper-item" :class="'swiper-item' + index">
- <image @click="previewImg(item.imageSmall||item.image)" class="home-banner-image"
- mode="aspectFit" :src="item.imageSmall||item.image">
+ <image @click="previewImg(item.url||item.image)" class="home-banner-image" mode="scaleToFill"
+ :src="item.url||item.image">
</image>
</view>
</swiper-item>
@@ -49,7 +56,7 @@
<!-- tip -->
<view class="m-t-12" @click="getNoticeMore">
<uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more show-icon
- :scrollable="scrollable" :text="currentNotice.title" :key="currentNotice.id" />
+ :scrollable="scrollable" :text="currentNotice.title||'暂无公告'" :key="currentNotice.id" />
<span v-if="!currentNotice||!currentNotice.id"> </span>
</view>
<!-- 当前分类 -->
@@ -57,7 +64,7 @@
<!-- 特别的几个公告图片 -->
<home-banner-imgs></home-banner-imgs>
<!-- 均价情况 -->
- <home-price></home-price>
+ <!-- <home-price></home-price> -->
<!-- 几个专区 -->
<home-zones></home-zones>
<!-- 置顶的花列表 -->
@@ -71,6 +78,9 @@
</template>
<script>
+ import {
+ mapState
+ } from 'vuex'
import homePrice from './components/home-price.vue'
import homeBannerImgs from './components/home-banner-imgs.vue'
import homeZones from './components/home-zones.vue'
@@ -78,6 +88,16 @@
import homeCategory from './components/home-category.vue'
export default {
+ computed: {
+ ...mapState({
+ address: state => {
+ return state.defaultaddress || {}
+ },
+ currentInfo: state => {
+ return state.currentInfo || {}
+ },
+ }),
+ },
components: {
homeCategory,
homePrice,
@@ -142,9 +162,7 @@
hide_footer: false,
noticeList: [],
currentNoticeIndex: 0,
- currentNotice: {
-
- }
+ currentNotice: {}
};
},
// onShareAppMessage() {
@@ -167,7 +185,13 @@
// };
// },
- onLoad() {
+ onLoad(options) {
+ // if(options.partnerUserId){
+ // //需要前往注册了
+ // uni.navigateTo({
+ // url: '/pages/login/supplier-login'
+ // })
+ // }
// console.log('home created')
//这里进行一次初始化即可
// this.$http.request('get', '/api/school/area/list', {
@@ -177,17 +201,37 @@
// this.schools = res.data || []
// }
// })
-
+
// uni.navigateTo({
// url: '/sub_pages/customer/trade/detail'
// })
//获取banner图
- this.$http.request('get', '/api/pub/banner/list', {
-
- }).then(res => {
+ this.$http.request('get', '/api/pub/banner/list', {}).then(res => {
if (res.code == 0) {
- this.banners = res.data.records || []
+ this.banners = res.data || []
+ if (this.banners.length == 0) {
+ this.banners.push({
+ url: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png'
+ })
+ } else {
+ for (var item of this.banners) {
+ // http://106.14.123.210/files/group1/e8/e1c17f7229514e5da211d8d47b09906b.jpeg
+ try {
+ if (item.url) {
+ var t = JSON.parse(item.url)
+ if (Array.isArray(t)) {
+ item.url = t[0] || ''
+ } else {
+ item.url = t.url || ''
+ }
+ }
+
+ } catch (e) {
+ // console.log('error',e)
+ }
+ }
+ }
}
})
@@ -197,18 +241,31 @@
} else {
this.areaIndex = areaIndex
}
+ //如果已经登录，加载一下默认地址
+ let that = this
+ setTimeout(() => {
+ if (that.currentInfo.id && !that.address.id) {
+ that.$http.request('get', '/api/address/default/detail').then(res => {
+ if (res.data) {
+ that.$store.commit('setDefaultAddress', {
+ ...res.data
+ })
+ }
+ })
+ }
-
+ }, 2000)
//公告
- this.$http.request('get', '/api/announcement/page', {
+ this.$http.request('get', '/api/pub/announcement/list', {
params: {
size: 5,
- status: 'A'
+ // status: 'A'
}
}).then(res => {
- if (res.code == 0) {
- this.noticeList = (res.data && res.data.records || [])
+ if (res.code === 0) {
+ // (res.data && res.data.records || [])
+ this.noticeList = res.data || []
console.log('this.noticeList', this.noticeList)
if (this.noticeList.length > 0) {
this.currentNotice = this.noticeList[0]
@@ -244,8 +301,20 @@
},
methods: {
+ goToAddress() {
+ if (!this.currentInfo.id) {
+ this.$message.showToast('请先前往登录')
+ return
+ }
+ uni.navigateTo({
+ url: '/pages/user/address/address?source=select'
+ })
+ },
buttonSearchFlow() {
console.log('buttonSearchFlow')
+ uni.navigateTo({
+ url: '/sub_pages/customer/trade/list?name=' + this.search_flow
+ })
},
pop(status) {
this.hide_footer = !!status
--
Gitblit v1.9.3