From c9ece393fc028ffecca0915d1b9af62d51b5aef6 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期二, 13 八月 2024 17:21:19 +0800 Subject: [PATCH] 1 --- sub_pages/customer/shop/shop.vue | 657 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 526 insertions(+), 131 deletions(-) diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue index a8621bc..2e44cdb 100644 --- a/sub_pages/customer/shop/shop.vue +++ b/sub_pages/customer/shop/shop.vue @@ -1,33 +1,36 @@ <template> - <view class="brand-detail"> + <view class="brand-detail" style="background: #20613D;"> <view class="brand-top-info"> - <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> - <view class="info-brand m-t-12" v-if="shopid"> + + <view class="info-brand m-t-12" v-if="id"> <view class="flex"> - <image class="store-logo"></image> + <image class="store-logo" :src="dto.cover"></image> <view> - <view class="store-name">花仙子</view> - <view class="store-address">云南省-昆明市-官渡区</view> + <view class="store-name">{{dto.name}}</view> + <view class="store-address"> + {{ ((dto.province||'')+ (dto.city&&'-'||'') + (dto.city||'')+ (dto.region&&'-'||'')+(dto.region||'')) ||dto.address || '暂无详细地址'}} + </view> </view> - <view class="store-sc m-l-a m-r-0"> - <image src="../../../static/icon-gz-1.png" class="icon" v-if="dto.gz" @click="updateGz(false)"></image> - <image src="../../../static/icon-gz-0.png" class="icon" v-if="!dto.gz" @click="updateGz(true)"></image> - 关注 + <view class="store-sc m-l-a m-r-0" @click="updateGz(!dto.followed)"> + <view class="icon-view"> + <image src="../../../static/icon-gz-1.png" class="icon" v-if="dto.followed"></image> + <image src="../../../static/icon-gz-0.png" class="icon" v-if="!dto.followed"></image> + </view> + <view>{{dto.followed?'取消':'关注'}}</view> </view> + <!-- <view class="store-sc m-l-a m-r-0" @click="updateGz(!dto.followed)"> + <image src="../../../static/icon-gz-1.png" class="icon" v-if="dto.followed" + ></image> + <image src="../../../static/icon-gz-0.png" class="icon" v-if="!dto.followed" + ></image> + 关注 + </view> --> </view> </view> <view class="tj-info m-t-12"> <view class="form-item"> - <view class="value">0</view> + <view class="value">{{page.total || 0}}</view> <view class="label">发布</view> </view> <view class="form-item"> @@ -43,105 +46,198 @@ <view class="label">关注</view> </view> </view> - <top-tabs :tabs="tabs" :flg="flg" @change="changeTab"> + <view class="p10" style="padding-left: 20rpx;padding-right: 20rpx;"> + <top-tabs :tabs="tabs" :flg="flg" @change="changeTab"> - </top-tabs> + </top-tabs> + </view> </view> <view class="brand-info"> - <view v-if="flg==='0'" class="brand-info-0"> - <view class="component-filter-container" style="padding-top: 12rpx;"> - <view class="flex1"> - 排序<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> - </view> - <view class="flex1"> - 等级<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> - </view> - <view class="flex1"> - 参数<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> + <view v-show="flg==='0'||flg==='1'" class="brand-info-0"> + <view class="search-container flex" + style="padding-left: 20rpx;padding-right: 20rpx;padding-top: 20rpx"> + <view class="flex1 input"> + <u-input placeholder="请输入花名" v-model="query.name" clearable @confirm="buttonSearchFlow" @clear="()=>{ + $nextTick(()=>{buttonSearchFlow()}) + }"> + <template slot="suffix"> + <uni-icons color="#20613D" type="search" size="24" + @click="buttonSearchFlow"></uni-icons> + </template> + </u-input> </view> </view> - <view class="top-title"> + <view class="component-filter-container" style="padding-top: 12rpx;" v-show="flg==='0'"> + <view class="flex1" @click.stop="$refs.popup_column.open()"> + 排序{{ query.columnStr&&('-'+query.columnStr) || '' }} + <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> + </view> + <view class="flex1" @click.stop="$refs.popup_level.open()"> + {{ query.levelStr || '级别' }} + <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image> + </view> + </view> + <view class="top-title m-t-12" v-show="flg==='0'"> 报价已包含打包费、材料费、交易佣金 </view> - <view class="component-shop-item flex" v-for="(item,index) of list" :key="index" - @click="toDetail(item)"> - <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> + <no-data v-if="(!list||list.length==0)&&true" style="width: 100%;margin-top: 120rpx;"></no-data> + <view class="flex m-t-12 flex-wrap-normal"> + <view class="type-list" v-if="flg==='1'"> + <view v-for="(item,index) of catgoryTree" @click="changeType(item)" + :class="[query.categoryRoot===item.id?'current':'']" :key="index" class="p10 flex type-item"> + {{item.name || '-'}} </view> + </view> + <view class="flex1"> + + + <view class="component-shop-item flex" v-for="(item,index) of list" :key="index" :class="flg==='1'?'flg-category':''"> + <view class="img" @click.stop="toDetail(item)"> + <image class="img img100" :src="item.cover" lazy-load> + </image> + <view class="level"> + {{item.levelStr||''}} + </view> + </view> - <view class="m-l-12 info-container flex1"> - <view class="title"> - 橙色芭比 - <view class="price"> - ¥6.60/扎 + <view class="m-l-12 info-container flex1"> + <view class="title" @click.stop="toDetail(item)"> + {{item.name}} + <view class="price"> + ¥{{item.price}}/扎 + </view> </view> - </view> - <view class="shop-name"> - 牛油果泡泡·白色 - </view> - <view class="other-info flex"> - <view class="m-r-15"> - 已售:7 + <view class="shop-name" @click.stop="toDetail(item)"> + {{item.categoryStr}} </view> - <view class="m-r-15"> - 剩余:13 + <view class="other-info flex" @click.stop="toDetail(item)"> + <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}} + </view> </view> - <view class="m-r-15"> - 1支/扎 - </view> - </view> - <view class="bottom-buttons flex"> - - <view class="icons flex"> - <uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32" - @click.stop="mulnum(item)"></uni-icons> - <view class="curnums" v-if="item.shopnum&&item.shopnum>=1">{{item.shopnum}}</view> - <uni-icons v-if="!item.shopnum||item.shopnum<=99" type="plus-filled" size="32" - @click.stop="addnum(item)"></uni-icons> + <view class="bottom-buttons flex"> + <view class="m-l-0 m-r-a"> + <view class="m-r-15 desc-gray other-info"> + 颜色:{{item.color||'-'}} + </view> + </view> + <view class="icons flex"> + <uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32" + @click.stop="addnum(item,-1)"></uni-icons> + <view class="curnums" @click.stop="updateItemNum(item)" + v-if="item.shopnum&&item.shopnum>=1"> + {{ item.shopnum }} + </view> + <uni-icons v-if="!item.shopnum||item.shopnum<=99" type="plus-filled" size="32" + @click.stop="addnum(item,1)"></uni-icons> + </view> </view> </view> </view> </view> - + </view> </view> - <view v-if="flg==='1'" class="brand-info-1"> - <trade :hidefooter="true"></trade> + <!-- <view v-show="flg==='1'" class="brand-info-1"> + <trade :hidefooter="true" :supplierId="id" :catgoryTree="catgoryTree" v-if="catgoryTree" ref="trade"> + </trade> </view> + --> <view v-if="flg==='2'" class="brand-info-3"> <view class="title"> 基础信息 </view> - <view class="form-input"> - <view class="label">经营模式</view> + <view class="form-input flex"> + <view class="label ">经营模式</view> <view class="value">供应商</view> </view> - <view class="form-input"> - <view class="label">身份认证</view> - <view class="value">个人身份认证</view> + <view class="form-input flex"> + <view class="label ">商家详细</view> + <view class="value">{{dto.address || '暂无'}}</view> </view> + <view class="form-input flex"> + <view class="label ">商家介绍</view> + <view class="value">{{dto.description || '-'}}</view> + </view> + <view class="form-input flex"> + <view class="label">身份认证</view> + <view class="value">{{dto.idcardTypeStr||'未认证'}}</view> + </view> + <!-- <view class="form-input flex"> + <view class="label"> </view> + <view class="value">{{'已实名'}}</view> + </view> --> </view> </view> + <uni-popup ref="popup_column" type="bottom"> + <view class="component-popup_input_all"> + <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同排序</view> + <view v-for="(item,i) in order_columns" :key="i" class="m-t-20"> + <view class="m-t-12 flex value-items"> + <view class="value-item" @click="()=>{ + if(each.value!==query.value){ + query.column = each.value + query.columnStr = each.label + refreshList('post') + $refs.popup_column.close() + } + }" :class="[query.column==each.value?'cur':'']" v-for="(each, j) in item" :key="j"> + {{ each.label || '-' }} + </view> + </view> + </view> + <view class="button-space"></view> + <view> + <view class="button-green" @click="$refs.popup_column.close()">关闭 + </view> + </view> + </view> + </uni-popup> - + <uni-popup ref="popup_level" type="bottom"> + <view class="component-popup_input_all"> + <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同级别</view> + <view v-for="(item,i) in level_columns" :key="i" class="m-t-20"> + <view class="m-t-12 flex value-items"> + <view class="value-item" @click="()=>{ + if(each.value!==query.value){ + query.level = each.value + query.levelStr = each.label + refreshList('post') + $refs.popup_level.close() + } + }" :class="[query.level==each.value?'cur':'']" v-for="(each, j) in item" :key="j"> + {{ each.label || '-' }} + </view> + </view> + </view> + <view class="button-space"></view> + <view> + <view class="button-green" @click="$refs.popup_level.close()">关闭 + </view> + </view> + </view> + </uni-popup> </view> </template> <script> - import trade from '@/sub_pages/customer/trade/trade.vue' + import trade from './shop-trade.vue' + import http from "../../../plugins/http"; + export default { components: { trade, }, data() { return { - shopid: 'test', - search_flow: '', + // search_flow: '', flg: '0', tabs: [{ name: '全部商品' @@ -157,59 +253,285 @@ }, ], dto: {}, - list: [{}, {}] + list: [], + id: '', + catgoryTree: undefined, + query: { + columnStr: '', + column: '', + levelStr: '', + level: '', + name: '', + categoryRoot:'', + }, + level_show: false, + level_columns: [ + [] + ], + + order_show: false, + order_columns: [ + [] + ] } }, + onShow() { + //避免商品数目不一样 + this.refreshList('post') + }, + onLoad(options) { + this.id = options.id || '' + this.page.size = 300 + if (this.id) { + this.getDetail() + } + this.listApi = `/api/customer/flower/list` + this.query.supplierId = this.id + this.getList('post') + this.$http.request('get', '/api/code/value', { + params: { + type: 'FLOWER_LEVEL' + } + }).then(res => { + var data = res.data + this.level_columns = [data || []] + this.level_columns[0].unshift({ + label: '全部', + value: '' + }) + }) + this.$http.request('get', '/api/code/value', { + params: { + type: 'FLOWER_ORDER_BY' + } + }).then(res => { + var data = res.data + this.order_columns = [data || []] + this.order_columns[0].unshift({ + label: '默认', + value: '' + }) + }) + }, + // #ifdef PUB_CUSTOMER + onShareAppMessage() { + let that = this; + var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO && + that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || '' + var url = + `/sub_pages/customer/shop/shop?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: this.dto.id && this.dto.name ? (this.dto.name + " 的店铺") : "花满芫", + path: url, + } + }, + onShareTimeline() { + let that = this; + var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO && + that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || '' + var url = + `/sub_pages/customer/shop/shop?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: this.dto.id && this.dto.name ? (this.dto.name + " 的店铺") : "花满芫", + path: url, + } + }, + // #endif + onReachBottom() { + // if (this.flg === '0') { + // this.getMore('post') + // } + }, methods: { - //update 关注 - async updateGz(type){ - this.$message.showLoading() - // var res; - // if(type){ - // res = await this.$http.request('post',`/api/follow/add`,{ - // data:{ - // supplierId:this.dto.supplierId || this.dto.id - // } - // }) - // }else{ - // res = await this.$http.request('get',`/api/follow/add`,{ - // data:{ - // supplierId:this.dto.supplierId || this.dto.id - // } - // }) - // } - this.$message.hideLoading() - if(code===0){ - this.dto.gz = !this.dto.gz - await this.$store.dispatch('sign_add', 'follow') - } + + async getDetail() { + { + this.$message.showLoading() + const { + code, + data + } = await this.$http.request('get', `/api/pub/supplier/detail/${this.id}`, { + params: {} + }) + if (code === 0) { + this.dto = { + ...data, + } + } + + this.$message.hideLoading() + } + //获取商家下的商品列表 + + // { + // this.$message.showLoading() + // const { + // code, + // data + // } = await this.$http.request('post', `/api/customer/flower/list`, { + // data: { + // supplierId: this.id, + // size: 20 + // } + // }) + // if (code === 0) { + // this.list = data.records || [] + // } + + // this.$message.hideLoading() + // } + + }, + //update 关注 + async updateGz(type) { + if (!this.currentInfo.id) { + this.$message.showToast('请先登录') + return + } + this.$message.showLoading() + const { + code + } = await this.$http.request(type ? 'post' : 'get', `/api/follow/${type ? 'add' : 'delete'}`, { + data: { + supplierId: this.dto.supplierId || this.dto.id + }, + params: { + supplierId: this.dto.supplierId || this.dto.id + } + }) + if (code === 0) { + this.dto.followed = !this.dto.followed + await this.$store.dispatch('sign_add', 'follow') + this.$forceUpdate() + } + this.$message.hideLoading() - }, - changeTab(flg) { - this.flg = flg + }, + async changeTab(flg) { + console.log('changeTab', flg) + if ('0' === ('' + flg)) { + //刷新list数据 + this.query.categoryRoot = '' + this.refreshList('post') + } + if ('1' === ('' + flg)) { + this.list = [] + if (!this.catgoryTree) { + this.$message.showLoading() + const { + code, + data + } = await this.$http.request('get', `/api/customer/flower/category/tree`, { + data: { + supplierId: this.dto.supplierId || this.dto.id + }, + params: { + supplierId: this.dto.supplierId || this.dto.id + } + }) + if (code === 0) { + // data 分类树 + this.catgoryTree = data || [] + // let tmp = this + // this.$nextTick(() => { + // tmp.$refs.trade.refInit(tmp.catgoryTree) + // }) + } + this.$message.hideLoading() + } + //如果存在第一个分类,根据一级分类查询 + if(this.catgoryTree.length>0){ + this.query.categoryRoot =this.catgoryTree[0].id + //然后刷新 + this.refreshList('post') + + } + + } + this.flg = '' + flg //如果没有加载数据,需要加载一下 + + }, + changeType(item) { + if(item.id!==this.query.categoryRoot){ + this.query.categoryRoot = item.id || '' + this.refreshList('post') + //拼接二级分类,然后查询商品列表 + } + }, buttonSearchFlow() { - + // this.query.name = this.search_flow || '' + this.refreshList('post') }, - mulnum(item) { - if (item.shopnum > 0) { - item.shopnum -= 1 - } - this.shoptotal -= 1 - this.$forceUpdate() + async updateItemNum(item) { + const res = await this.$message.confirm('', { + editable: true, + title: '请输入想要购买的数量' + }) + if (res.content && res.confirm) { + // 发送请求 + var t = parseInt(res.content) + if (isNaN(t) || t < 0) { + this.$message.showToast('数目需要大于等于0') - }, - addnum(item) { - if (item.shopnum) { - item.shopnum += 1 + } else { + if (!item.stock || t > item.stock) { + this.$message.showToast('库存不足无法修改') + return + } + this.addnum(item, (t - item.shopnum)) + + } } else { - item.shopnum = 1 + } - this.shoptotal += 1 - this.$forceUpdate() + }, + async addnum(item, addnum) { + if (!this.currentInfo.id) { + await this.$message.confirm('请前往登录') + uni.navigateTo({ + url: '/pages/user/supplier-user' + }) + return + } + if (!item.shopnum) { + item.shopnum = 0 + } + if (!item.stock) { + item.stock = 0 + } + if (addnum > 0 & item.shopnum + addnum > item.stock) { + this.$message.showToast('库存不足,无法修改') + return + } + if (item.shopnum + addnum >= 0) { + + } else { + return + } + this.$message.showLoading() + const { + code + } = await this.$http.request('post', '/api/customer/flower/cart/change-num', { + data: { + id: item.id, + num: addnum + } + }) + this.$message.hideLoading() + if (code === 0) { + item.shopnum += addnum + this.$forceUpdate() + } + }, + + toDetail(item) { + uni.navigateTo({ + url: `/sub_pages/customer/trade/detail?id=${item.id}` + }) }, } } @@ -217,24 +539,90 @@ <style lang="scss" scoped> .brand-detail { + + // min-height: 99vh; .brand-info { background: #FFFFFF; - border-radius: 40rpx 40rpx 0rpx 0rpx; + // border-radius: 40rpx 40rpx 0rpx 0rpx; + border-top-left-radius: 40rpx; + border-top-right-radius: 40rpx; + overflow: hidden; + overflow-y: scroll; padding: 40rpx 32rpx; + height: calc(100vh - 450rpx); + padding-top: 0rpx; + + .type-list { + max-width: 140rpx; + min-width: 140rpx; + background: #EEF7F5; + border-radius: 8rpx; + min-height: calc(100vh - 600rpx); + // max-height: calc(100vh - 600rpx); + overflow-y: scroll; + margin-right: 10rpx; + + .type-item { + text-align: center; + font-weight: 400; + font-size: 24rpx; + color: #000000; + display: block; + line-height: 60rpx; + // padding-left: 30rpx; + // padding-right: 30rpx; + } + + .type-item.current { + font-weight: 600; + color: #04BA97; + } + } + .flg-category.component-shop-item{ + .img{ + width: 140rpx; + height: 140rpx; + margin-top: 10rpx; + } + .info-container{ + .title { + margin-top: 0rpx; + } + .shop-name{ + + } + .other-info { + margin-bottom: 60rpx; + } + .bottom-buttons{ + bottom: -50rpx; + } + } + + } .brand-info-0 { .top-title { - height: 54rpx; + height: 60rpx; background: #E4ECE8; border-radius: 4rpx; font-weight: 400; font-size: 24rpx; color: #779787; - line-height: 80rpx; + margin-top: 10rpx; + line-height: 60rpx; + padding-left: 20rpx; } } + .brand-info-1 { + // padding: 40rpx 30rpx; + + } + .brand-info-3 { + padding: 40rpx 30rpx; + .title { font-weight: 600; font-size: 32rpx; @@ -243,23 +631,24 @@ margin-bottom: 20rpx; } - .form-item { + .form-input { display: flex; border-bottom: 2rpx solid #EEEEEE; + line-height: 80rpx; .label { - font-weight: 400; + font-weight: 600; font-size: 28rpx; color: #000000; - line-height: 40rpx; } .value { font-weight: 400; font-size: 28rpx; color: #666666; - line-height: 40rpx; margin-left: auto; + margin-right: 0; + text-align: right; .check { @@ -273,26 +662,32 @@ .brand-top-info { background-image: url('https://hmy-flower.oss-cn-shanghai.aliyuncs.com/37/37dc02b58bd44af79e45031af2bb6c0b%E4%BD%8D%E5%9B%BE@2x.png'); - - .tj-info{ + background-size: 100% 100%; + + .tj-info { display: flex; - .form-item{ + + .form-item { flex: 1; text-align: center; - .label{ + + .label { font-weight: 400; font-size: 32rpx; color: #FFFFFF; line-height: 44rpx; } - .value{ + + .value { font-weight: 600; font-size: 48rpx; color: #FFFFFF; line-height: 66rpx; + } } } + .search-container { display: flex; margin: 12rpx 0rpx 20rpx 0rpx; -- Gitblit v1.9.3