From 8c9fe474d3d43265c33653f17bb411336269dfab Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 26 七月 2024 15:34:22 +0800
Subject: [PATCH] fix bug 接口对接和样式调整
---
sub_pages/customer/trade/list.vue | 4
pages/home/home.vue | 498 ++++++++++++++++----------------
sub_pages/customer/self/follow.vue | 2
sub_pages/customer/self/collect.vue | 8
pages/home/components/home-top-flow.vue | 278 ++++++++++--------
pages/home/components/home-zones.vue | 6
pages/login/supplier-reg.vue | 2
sub_pages/customer/shopping/confirm.vue | 2
pages/order/order.vue | 14
sub_pages/customer/customer-info/customer-info.vue | 15
pages/user/supplier-user.vue | 14
11 files changed, 438 insertions(+), 405 deletions(-)
diff --git a/pages/home/components/home-top-flow.vue b/pages/home/components/home-top-flow.vue
index 1b5e2ba..ff32ab2 100644
--- a/pages/home/components/home-top-flow.vue
+++ b/pages/home/components/home-top-flow.vue
@@ -1,149 +1,173 @@
<template>
- <view class="home-top-flow">
- <view class="item flex" v-for="(item,index) of list" :key="index">
- <view class="img">
- <image class="img img100"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ff/fff3027bd0a146478fd1f0aae816a028%E5%BE%AE%E4%BF%A1%E6%88%AA%E5%9B%BE_20240710224139.png">
- </image>
- <view class="level">
- A级
- </view>
- </view>
+ <view class="home-top-flow">
+ <view class="item flex" v-for="(item,index) of list" :key="index">
+ <view class="img">
+ <image class="img img100"
+ :src="item.cover">
+ </image>
+ <view class="level">
+ {{ ite.levelStr}}
+ </view>
+ </view>
- <view class="m-l-12 info-container flex1">
- <view class="title">
- 橙色芭比
- <view class="price">
- ￥6.60/扎
- </view>
- </view>
- <view class="tags">
- <view class="tag red">限时抢购</view>
- <view class="tag green">品质严选</view>
- </view>
- <view class="shop-name">
- 小石头花卉
- </view>
- <view class="other-info flex">
- <view class="m-r-15">
- 已售:7
- </view>
- <view class="m-r-15">
- 剩余:13
- </view>
- <view class="m-r-15">
- 1支/扎
- </view>
- </view>
- </view>
- </view>
- </view>
+ <view class="m-l-12 info-container flex1">
+ <view class="title">
+ {{ item.name || '-' }}
+ <view class="price">
+ ￥{{ item.price || 0 }}/扎
+ </view>
+ </view>
+ <view class="tags">
+ <view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']" :key="tag">{{
+ tag
+ }}
+ </view>
+ <!-- <view class="tag red">限时抢购</view>-->
+ <!-- <view class="tag green">品质严选</view>-->
+ </view>
+ <view class="shop-name">
+ {{ item.supplierName || '佚名' }}
+ </view>
+ <view class="other-info flex">
+ <view class="m-r-15">
+ 已售:{{ item.sales || 0 }}
+ </view>
+ <view class="m-r-15">
+ 剩余:{{ item.stock || 0 }}
+ </view>
+ <view class="m-r-15">
+ {{ item.unit || 0 }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
</template>
<script>
- export default {
- data() {
- return {
- list: [{}, {}, {}, {}]
- };
- }
- }
+export default {
+ data() {
+ return {
+ // list: [{}, {}, {}, {}]
+ };
+ },
+ mounted() {
+ this.listApi = '/api/customer/flower/list'
+ this.page.size = 4
+ this.page.current = 1
+ this.getList('post')
+ },
+ methods: {
+ getList_after() {
+ if (this.list) {
+ for (var item of this.list) {
+ item.tagArr = []
+ if (item.tags) {
+ item.tagArr = item.tags.split(",") || []
+ }
+ }
+ }
+ }
+ },
+
+}
</script>
<style lang="scss">
- .home-top-flow {
- .item {
- margin-top: 20rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- padding: 10rpx;
+.home-top-flow {
+ .item {
+ margin-top: 20rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 10rpx;
- .info-container {
-
- .other-info {
- margin-top: 6rpx;
- font-size: 24rpx;
- color: #666666;
- line-height: 34rpx;
- text-align: left;
- }
+ .info-container {
- .shop-name {
- margin-top: 14rpx;
- font-size: 24rpx;
- color: #666666;
- line-height: 34rpx;
- }
+ .other-info {
+ margin-top: 6rpx;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ text-align: left;
+ }
- .tags {
- margin-top: 12rpx;
- display: flex;
+ .shop-name {
+ margin-top: 14rpx;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
- .tag {
- min-width: 80rpx;
- padding-left: 20rpx;
- padding-right: 20rpx;
- line-height: 36rpx;
- background: #FEE6E6;
- border-radius: 21rpx;
- font-size: 24rpx;
- color: #CD1212;
- margin-right: 12rpx;
- }
+ .tags {
+ margin-top: 12rpx;
+ display: flex;
- .tag.green {
- color: rgba(110, 159, 102, 1);
- background: rgba(202, 229, 214, 1);
- border-radius: 21rpx;
- // opacity: 0.57;
- }
- }
+ .tag {
+ min-width: 80rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ line-height: 36rpx;
+ background: #FEE6E6;
+ border-radius: 21rpx;
+ font-size: 24rpx;
+ color: #CD1212;
+ margin-right: 12rpx;
+ text-align: center;
+ }
- .title {
- font-weight: 600;
- font-size: 32rpx;
- color: #000000;
- line-height: 44rpx;
- margin-top: 8rpx;
- position: relative;
+ .tag.green {
+ color: rgba(110, 159, 102, 1);
+ background: rgba(202, 229, 214, 1);
+ border-radius: 21rpx;
+ // opacity: 0.57;
+ }
+ }
- .price {
- position: absolute;
- font-weight: 400;
- font-size: 28rpx;
- color: #CF0000;
- line-height: 40rpx;
- top: 0;
- right: 0;
- }
- }
+ .title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #000000;
+ line-height: 44rpx;
+ margin-top: 8rpx;
+ position: relative;
- }
+ .price {
+ position: absolute;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #CF0000;
+ line-height: 40rpx;
+ top: 0;
+ right: 0;
+ }
+ }
- .img {
- width: 206rpx;
- height: 206rpx;
- border-radius: 8rpx;
- position: relative;
+ }
- .level {
- position: absolute;
- width: 66rpx;
- height: 44rpx;
- background: #20613D;
- left: 0;
- top: 0;
- border-top-left-radius: 8rpx;
- border-bottom-right-radius: 8rpx;
- color: #FFFFFF;
- line-height: 44rpx;
- font-size: 24rpx;
- text-align: center;
- }
+ .img {
+ width: 206rpx;
+ height: 206rpx;
+ border-radius: 8rpx;
+ position: relative;
- }
+ .level {
+ position: absolute;
+ width: 66rpx;
+ height: 44rpx;
+ background: #20613D;
+ left: 0;
+ top: 0;
+ border-top-left-radius: 8rpx;
+ border-bottom-right-radius: 8rpx;
+ color: #FFFFFF;
+ line-height: 44rpx;
+ font-size: 24rpx;
+ text-align: center;
+ }
+
+ }
- }
- }
+ }
+}
</style>
\ No newline at end of file
diff --git a/pages/home/components/home-zones.vue b/pages/home/components/home-zones.vue
index f7bb51b..7b2c3f6 100644
--- a/pages/home/components/home-zones.vue
+++ b/pages/home/components/home-zones.vue
@@ -1,12 +1,12 @@
<template>
<view class="home-zones">
- <view class="c" v-for="(item,index) of list">
+ <view class="c" v-for="(item,index) of list" @click.stop="toDetail(item.id)">
<image class="p1 img100 m-t-12" :lazy-load="true" mode="aspectFill"
:src="item.bgUrl">
</image>
<view class="c-txt-1">
<view class="title">{{ item.name }}</view>
- <view class="flex" @click.stop="toDetail(item.id)">
+ <view class="flex">
<view class="desc">查看详情</view>
<view class="right m-l-5">
<uni-icons class="icon" type="right" color="#C3B8A0" size="12"></uni-icons>
@@ -75,7 +75,7 @@
methods: {
toDetail(id) {
uni.navigateTo({
- url: `//sub_pages/customer/trade/list?zoneId=${id}`
+ url: `/sub_pages/customer/trade/list?zoneId=${id}`
})
},
},
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7d94fbe..9fc91ee 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,282 +1,280 @@
<template>
- <view class="main-container user-home">
- <view class="bg-top-green"></view>
- <!-- 顶部，可能 -->
- <view class="school" :style="{'padding-top':(StatusBar)+'px'
+ <view class="main-container user-home">
+ <view class="bg-top-green"></view>
+ <!-- 顶部，可能 -->
+ <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>
- </view>
- </picker>
- </view>
- <view class="search-container m-t-12 flex">
- <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>
- </template>
- </u-input>
- </view>
- </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>
+ <view class="search-container m-t-12 flex">
+ <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>
+ </template>
+ </u-input>
+ </view>
+ </view>
- <!-- banner -->
- <uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="currentBanner"
- :mode="'dot'" :dots-styles="dotsStyles[0]" field="content">
- <swiper class="swiper-box" @change="changeBanner" :interval="10000" :circular="true" :current="0"
- 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>
- </view>
- </swiper-item>
- </swiper>
- <swiper class="swiper-box" @change="changeBanner" :current="0" v-if="!banners||banners.length==0">
- <swiper-item v-for="(item, index) in 1" :key="index">
- <view class="swiper-item" :class="'swiper-item' + index">
- <image class="home-banner-image" mode="scaleToFill"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png">
- </image>
- </view>
- </swiper-item>
- </swiper>
- </uni-swiper-dot>
- <!-- 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" />
- <span v-if="!currentNotice||!currentNotice.id"> </span>
- </view>
- <!-- 当前分类 -->
- <home-category></home-category>
- <!-- 特别的几个公告图片 -->
- <home-banner-imgs></home-banner-imgs>
- <!-- 均价情况 -->
- <home-price></home-price>
- <!-- 几个专区 -->
- <home-zones></home-zones>
- <!-- 置顶的花列表 -->
- <home-top-flow></home-top-flow>
+ <!-- banner -->
+ <uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="currentBanner"
+ :mode="'dot'" :dots-styles="dotsStyles[0]" field="content">
+ <swiper class="swiper-box" @change="changeBanner" :interval="10000" :circular="true" :current="0"
+ 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>
+ </view>
+ </swiper-item>
+ </swiper>
+ <swiper class="swiper-box" @change="changeBanner" :current="0" v-if="!banners||banners.length==0">
+ <swiper-item v-for="(item, index) in 1" :key="index">
+ <view class="swiper-item" :class="'swiper-item' + index">
+ <image class="home-banner-image" mode="scaleToFill"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png">
+ </image>
+ </view>
+ </swiper-item>
+ </swiper>
+ </uni-swiper-dot>
+ <!-- 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"/>
+ <span v-if="!currentNotice||!currentNotice.id"> </span>
+ </view>
+ <!-- 当前分类 -->
+ <home-category></home-category>
+ <!-- 特别的几个公告图片 -->
+ <home-banner-imgs></home-banner-imgs>
+ <!-- 均价情况 -->
+ <home-price></home-price>
+ <!-- 几个专区 -->
+ <home-zones></home-zones>
+ <!-- 置顶的花列表 -->
+ <home-top-flow></home-top-flow>
- <view style="min-height:200rpx">
- </view>
- <common-footer flg="0"></common-footer>
+ <view style="min-height:200rpx">
+ </view>
+ <common-footer flg="0"></common-footer>
- </view>
+ </view>
</template>
<script>
- import homePrice from './components/home-price.vue'
- import homeBannerImgs from './components/home-banner-imgs.vue'
- import homeZones from './components/home-zones.vue'
- import homeTopFlow from './components/home-top-flow.vue'
- import homeCategory from './components/home-category.vue'
+import homePrice from './components/home-price.vue'
+import homeBannerImgs from './components/home-banner-imgs.vue'
+import homeZones from './components/home-zones.vue'
+import homeTopFlow from './components/home-top-flow.vue'
+import homeCategory from './components/home-category.vue'
- export default {
- components: {
- homeCategory,
- homePrice,
- homeBannerImgs,
- homeZones,
- homeTopFlow
- },
+export default {
+ components: {
+ homeCategory,
+ homePrice,
+ homeBannerImgs,
+ homeZones,
+ homeTopFlow
+ },
- data() {
- return {
- search_flow: '',
- CustomBar: uni.getStorageSync('CustomBar'),
- StatusBar: uni.getStorageSync('StatusBar'),
- // StatusBar:0,
- color: '#fff',
- schools: [],
- areaIndex: -1,
- scrollable: false,
+ data() {
+ return {
+ search_flow: '',
+ CustomBar: uni.getStorageSync('CustomBar'),
+ StatusBar: uni.getStorageSync('StatusBar'),
+ // StatusBar:0,
+ color: '#fff',
+ schools: [],
+ areaIndex: -1,
+ scrollable: false,
- info: [{
- colorClass: 'uni-bg-red',
- url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
- content: '内容 A'
- },
- {
- colorClass: 'uni-bg-green',
- url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
- content: '内容 B'
- },
- {
- colorClass: 'uni-bg-blue',
- url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
- content: '内容 C'
- }
- ],
- dotStyle: [{
- backgroundColor: 'rgba(0, 0, 0, .3)',
- border: '1px rgba(0, 0, 0, .3) solid',
- color: '#fff',
- selectedBackgroundColor: 'rgba(0, 0, 0, .9)',
- selectedBorder: '1px rgba(0, 0, 0, .9) solid'
- },
- {
- backgroundColor: 'rgba(255, 90, 95,0.3)',
- border: '1px rgba(255, 90, 95,0.3) solid',
- color: '#fff',
- selectedBackgroundColor: 'rgba(255, 90, 95,0.9)',
- selectedBorder: '1px rgba(255, 90, 95,0.9) solid'
- },
- {
- backgroundColor: 'rgba(83, 200, 249,0.3)',
- border: '1px rgba(83, 200, 249,0.3) solid',
- color: '#fff',
- selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
- selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
- }
- ],
- currentBanner: 0,
- banners: [],
- tripList: [],
- tuangouList: [],
- hide_footer: false,
- noticeList: [],
- currentNoticeIndex: 0,
- currentNotice: {
+ info: [{
+ colorClass: 'uni-bg-red',
+ url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ content: '内容 A'
+ },
+ {
+ colorClass: 'uni-bg-green',
+ url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ content: '内容 B'
+ },
+ {
+ colorClass: 'uni-bg-blue',
+ url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+ content: '内容 C'
+ }
+ ],
+ dotStyle: [{
+ backgroundColor: 'rgba(0, 0, 0, .3)',
+ border: '1px rgba(0, 0, 0, .3) solid',
+ color: '#fff',
+ selectedBackgroundColor: 'rgba(0, 0, 0, .9)',
+ selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+ },
+ {
+ backgroundColor: 'rgba(255, 90, 95,0.3)',
+ border: '1px rgba(255, 90, 95,0.3) solid',
+ color: '#fff',
+ selectedBackgroundColor: 'rgba(255, 90, 95,0.9)',
+ selectedBorder: '1px rgba(255, 90, 95,0.9) solid'
+ },
+ {
+ backgroundColor: 'rgba(83, 200, 249,0.3)',
+ border: '1px rgba(83, 200, 249,0.3) solid',
+ color: '#fff',
+ selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
+ selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
+ }
+ ],
+ currentBanner: 0,
+ banners: [],
+ tripList: [],
+ tuangouList: [],
+ hide_footer: false,
+ noticeList: [],
+ currentNoticeIndex: 0,
+ currentNotice: {}
+ };
+ },
+ // onShareAppMessage() {
+ // let that = this;
+ // var url =
+ // `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${this.currentInfo&&this.currentInfo.nickName||''}`; //你的转发页面路径拼接参数
+ // return {
+ // title: "校购GO小狗狗",
+ // path: url,
+ // }
+ // },
+ // onShareTimeline() {
+ // let that = this;
+ // var url = "/pages/home/home" //你的分享页面路径
+ // return {
+ // title: '校购GO小狗狗',
+ // path: url,
+ // query: `shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${this.currentInfo&&this.currentInfo.nickName||''}`, //你的参数拼接，注意：不需要加?
+ // // imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg' //你分享的封面
+ // };
+ // },
- }
- };
- },
- // onShareAppMessage() {
- // let that = this;
- // var url =
- // `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${this.currentInfo&&this.currentInfo.nickName||''}`; //你的转发页面路径拼接参数
- // return {
- // title: "校购GO小狗狗",
- // path: url,
- // }
- // },
- // onShareTimeline() {
- // let that = this;
- // var url = "/pages/home/home" //你的分享页面路径
- // return {
- // title: '校购GO小狗狗',
- // path: url,
- // query: `shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${this.currentInfo&&this.currentInfo.nickName||''}`, //你的参数拼接，注意：不需要加?
- // // imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg' //你分享的封面
- // };
- // },
+ onLoad() {
+ // console.log('home created')
+ //这里进行一次初始化即可
+ // this.$http.request('get', '/api/school/area/list', {
- onLoad() {
- // console.log('home created')
- //这里进行一次初始化即可
- // this.$http.request('get', '/api/school/area/list', {
+ // }).then(res => {
+ // if (res.code == 0) {
+ // this.schools = res.data || []
+ // }
+ // })
- // }).then(res => {
- // if (res.code == 0) {
- // this.schools = res.data || []
- // }
- // })
-
- // uni.navigateTo({
- // url: '/sub_pages/customer/trade/detail'
- // })
+ // uni.navigateTo({
+ // url: '/sub_pages/customer/trade/detail'
+ // })
- //获取banner图
- this.$http.request('get', '/api/pub/banner/list', {
+ //获取banner图
+ this.$http.request('get', '/api/pub/banner/list', {}).then(res => {
+ if (res.code == 0) {
+ this.banners = res.data.records || []
+ }
+ })
- }).then(res => {
- if (res.code == 0) {
- this.banners = res.data.records || []
- }
- })
+ var areaIndex = uni.getStorageSync('areaIndex')
+ if (!areaIndex && areaIndex !== 0) {
- var areaIndex = uni.getStorageSync('areaIndex')
- if (!areaIndex && areaIndex !== 0) {
-
- } else {
- this.areaIndex = areaIndex
- }
+ } else {
+ this.areaIndex = areaIndex
+ }
+ //公告
+ this.$http.request('get', '/api/announcement/page', {
+ params: {
+ size: 5,
+ status: 'A'
+ }
+ }).then(res => {
+ if (res.code === 0) {
+ this.noticeList = (res.data && res.data.records || [])
+ console.log('this.noticeList', this.noticeList)
+ if (this.noticeList.length > 0) {
+ this.currentNotice = this.noticeList[0]
+ if (this.currentNotice.title && this.currentNotice.title.length >= 30) {
+ this.scrollable = true
+ } else {
+ this.scrollable = false
+ }
+ let that = this
+ if (this.noticeList.length >= 1) {
+ setInterval(() => {
+ console.log('interval,1')
+ that.currentNoticeIndex += 1
+ that.currentNoticeIndex %= that.noticeList.length
+ that.currentNotice = that.noticeList[that.currentNoticeIndex]
+ that.scrollable = false
+ that.$nextTick(() => {
+ if (that.currentNotice.title && that.currentNotice.title
+ .length >= 30) {
+ that.scrollable = true
+ } else {
+ that.scrollable = false
+ }
+ })
- //公告
- this.$http.request('get', '/api/announcement/page', {
- params: {
- size: 5,
- status: 'A'
- }
- }).then(res => {
- if (res.code == 0) {
- this.noticeList = (res.data && res.data.records || [])
- console.log('this.noticeList', this.noticeList)
- if (this.noticeList.length > 0) {
- this.currentNotice = this.noticeList[0]
- if (this.currentNotice.title && this.currentNotice.title.length >= 30) {
- this.scrollable = true
- } else {
- this.scrollable = false
- }
- let that = this
- if (this.noticeList.length >= 1) {
- setInterval(() => {
- console.log('interval,1')
- that.currentNoticeIndex += 1
- that.currentNoticeIndex %= that.noticeList.length
- that.currentNotice = that.noticeList[that.currentNoticeIndex]
- that.scrollable = false
- that.$nextTick(() => {
- if (that.currentNotice.title && that.currentNotice.title
- .length >= 30) {
- that.scrollable = true
- } else {
- that.scrollable = false
- }
- })
+ }, 8000)
+ }
- }, 8000)
- }
-
- }
- }
- })
+ }
+ }
+ })
- },
- methods: {
- buttonSearchFlow() {
- console.log('buttonSearchFlow')
- },
- pop(status) {
- this.hide_footer = !!status
- },
- changeBanner(e) {
- this.currentBanner = e.detail.current
- },
+ },
+ methods: {
+ buttonSearchFlow() {
+ console.log('buttonSearchFlow')
+ uni.navigateTo({
+ url: '/sub_pages/trade/list?name=' + this.search_flow
+ })
+ },
+ pop(status) {
+ this.hide_footer = !!status
+ },
+ changeBanner(e) {
+ this.currentBanner = e.detail.current
+ },
- getNoticeMore() {
- uni.navigateTo({
- url: '/pages/notice/list?id=' + this.currentNotice.id
- })
- },
- PickerChangeSchool(e) {
- if (e.detail.value == '-1') {
- this.$message.showToast('未选择位置')
- return
- }
- console.log(' this.schools', this.schools, parseInt(e.detail.value), e);
+ getNoticeMore() {
+ uni.navigateTo({
+ url: '/pages/notice/list?id=' + this.currentNotice.id
+ })
+ },
+ PickerChangeSchool(e) {
+ if (e.detail.value == '-1') {
+ this.$message.showToast('未选择位置')
+ return
+ }
+ console.log(' this.schools', this.schools, parseInt(e.detail.value), e);
- this.areaIndex = parseInt(e.detail.value)
- uni.setStorageSync('areaId', this.schools[parseInt(e.detail.value)].id);
- uni.setStorageSync('areaIndex', parseInt(e.detail.value));
+ this.areaIndex = parseInt(e.detail.value)
+ uni.setStorageSync('areaId', this.schools[parseInt(e.detail.value)].id);
+ uni.setStorageSync('areaIndex', parseInt(e.detail.value));
- },
+ },
- }
- }
+ }
+}
</script>
<style lang="scss" scoped>
- @import "./home.scss";
+@import "./home.scss";
</style>
\ No newline at end of file
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 48fcb9d..e686b8c 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -5,7 +5,7 @@
<view style="padding: 20rpx;text-align: center;background-color: #fff;">仅限花满芫合伙人入驻</view>
<!-- #endif -->e
- <view v-if="source==='step'" class="" style="background-color: #fff;margin-top: 20rpx;padding: 20rpx;">
+ <view v-if="source==='step'" class="" style="background-color:#ffffff;padding: 20rpx;padding-top: 60rpx;">
<u-steps current="1">
<u-steps-item title="信息填写" class="u-steps-item">
</u-steps-item>
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 2c4d1a8..33e9d8c 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -19,7 +19,7 @@
},
onLoad(options) {
this.query.status = options.status || ''
- this.listApi = `/api/customer/list`
+ this.listApi = `/api/customer/order/list`
this.getList()
},
onReachBottom() {
@@ -51,12 +51,17 @@
<view>消费订单：￥<span>{{ '0' }}</span> 总消费：￥<span>{{ '0' }}</span></view>
</view>
</view>
- <view class="status-list m-t-12 flex">
- <view v-for="each of status" :key="each.value" class="status-each" :class="[query.status===each.value?'cur':'']">
+ <view class="status-list m-t-12 flex flex-wrap-normal">
+ <view v-for="each of status" :key="each.value"
+ @click.stop="(e)=>{
+ query.status = each.value || '';
+ refreshList();
+ }"
+ class="status-each" :class="[query.status===each.value?'cur':'']">
{{ each.name }}
</view>
</view>
- <no-data v-if="!list||list.length==0" style="width: 100%;" class="m-t-12"></no-data>
+ <no-data v-if="!list||list.length===0" style="width: 100%;" class="m-t-12"></no-data>
<view v-for="(item,index) in list" :key="index" class="m-t-12">
<view @click.stop="toDetail(item)" class="order-item list-item">
<view class="title flex">
@@ -151,6 +156,7 @@
padding-left: 20rpx;
padding-right: 20rpx;
width: fit-content;
+ min-width: 120rpx;
text-align: center;
}
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index a0ab487..da328c0 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -100,12 +100,12 @@
<view>我的服务</view>
</view>
<view class="flex service-icons-container">
- <view class="service-icons" @click="goto('/sub_pages/customer/follow/follow',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
</image>
<view>关注店铺</view>
</view>
- <view class="service-icons" @click="goto('/sub_pages/customer/collect/collect',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/collect',true)">
<image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
</image>
<view>我的收藏</view>
@@ -115,20 +115,20 @@
</image>
<view>地址管理</view>
</view>
- <view class="service-icons">
+ <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')" >
<image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">
</image>
<view>售后规则</view>
</view>
</view>
- <view class="flex service-icons-container">
- <view class="service-icons">
+ <view class="flex service-icons-container" >
+ <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')" >
<image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">
</image>
<view>新手帮助</view>
</view>
- <view class="service-icons">
- <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
+ <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')" >
+ <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
</image>
<view>运费详查</view>
</view>
diff --git a/sub_pages/customer/customer-info/customer-info.vue b/sub_pages/customer/customer-info/customer-info.vue
index e89a270..eb9fbee 100644
--- a/sub_pages/customer/customer-info/customer-info.vue
+++ b/sub_pages/customer/customer-info/customer-info.vue
@@ -1,10 +1,10 @@
<template>
<view class="container-page" style="padding: 0rpx;">
- <view v-if="source==='step'" class="m-t-20">
+ <view v-if="source==='step'" class="" style="padding-top:40rpx">
<u-steps current="0">
<u-steps-item title="信息填写" class="u-steps-item" style="font-size: 28rpx;">
</u-steps-item>
- <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item>
+ <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item>
</u-steps>
</view>
<view class="p20">
@@ -16,7 +16,6 @@
</view>
</view>
-
<view class="form-item before-line">
@@ -44,13 +43,13 @@
<view class="form-item before-line">
<view class="label ">店铺简介</view>
<view class="m-l-a m-r-0 flex1">
- <view class="m-t-12 m-b-12">
+ <view class="m-t-12 m-b-12">
<u-textarea v-model="dto.description" placeholder="请输入店铺简介">
</u-textarea>
</view>
-<!-- <input v-model="dto.description" placeholder="请输入地址"-->
-<!-- style="margin-top: 16px;text-align: right;"></input>-->
+ <!-- <input v-model="dto.description" placeholder="请输入地址"-->
+ <!-- style="margin-top: 16px;text-align: right;"></input>-->
</view>
</view>
@@ -78,7 +77,7 @@
<view class="button-green-1 m-t-20 button-fixed-bottom before-line " @click="submit">
- {{source==='step'?'下一步':'更新'}}
+ {{ source === 'step' ? '下一步' : '更新' }}
</view>
@@ -266,7 +265,7 @@
0] || {}
that.$message.hideLoading()
that.dto.cover = (pic || {}).url || ''
- console.log('pic',that.dto)
+ console.log('pic', that.dto)
that.$forceUpdate()
}).catch(res => {
diff --git a/sub_pages/customer/self/collect.vue b/sub_pages/customer/self/collect.vue
index f3350c1..eec6161 100644
--- a/sub_pages/customer/self/collect.vue
+++ b/sub_pages/customer/self/collect.vue
@@ -1,6 +1,6 @@
<template>
- <view class="page-collect">
- <view class="search-container m-t-12 flex">
+ <view class="page-collect p20">
+ <view class="search-container bg-white flex">
<view class="flex1 input">
<u-input placeholder="请输入花名" v-model="query.name">
<template slot="suffix">
@@ -9,7 +9,7 @@
</u-input>
</view>
</view>
- <view class="component-filter-container">
+ <view class="component-filter-container p10 bg-white">
<view class="flex1" @click.stop="order_show=true">
{{ this.query.columnStr || '排序' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
@@ -20,6 +20,8 @@
></image>
</view>
</view>
+ <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
+
<u-picker :show="level_show" @confirm="select_level" keyName="label" :columns="level_columns"
@cancel="level_show=false"></u-picker>
diff --git a/sub_pages/customer/self/follow.vue b/sub_pages/customer/self/follow.vue
index 3624dbf..5963c4b 100644
--- a/sub_pages/customer/self/follow.vue
+++ b/sub_pages/customer/self/follow.vue
@@ -1,5 +1,7 @@
<template>
<view class="follow-page">
+ <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
+
<view class="follow-item m-b-40" v-for="(item,index) of list" :key="index">
<image class="avatar img100" :src="item.avatar" mode="aspectFill"></image>
<view class="info">
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 1fa2c45..14e7dbf 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -245,7 +245,7 @@
</view>
<view class="bottom-price flex">
<view class="m-t-12 m-l-0 m-r-a">
- 合计:￥ {{ (dto.totalAmount || 0) + (current_transport.fee || 0) || 0 }} 元
+ 合计:<span class="t-red">￥ {{ (dto.totalAmount || 0) + (current_transport.fee || 0) || 0 }} </span>元
</view>
<view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
提交订单
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index fa24afc..75d94c6 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -30,7 +30,7 @@
</view>
</view>
<view class="" style="min-height: calc(100vh - 260rpx);">
- <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
+ <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
<view v-else>
<!-- 查询条件 -->
<view class="component-filter-container">
@@ -157,6 +157,7 @@
data() {
return {
query: {
+ name:'',
category: '',
zoneId: '',
levelStr: '',
@@ -181,6 +182,7 @@
console.log('options', options)
this.query.category = options.categoryId || ''
this.query.zoneId = options.zoneId || ''
+ this.query.name = options.name || ''
this.listApi = '/api/customer/flower/list'
this.getList('post')
this.$http.request('get', '/api/code/value', {
--
Gitblit v1.9.3