|
|
@@ -4,34 +4,41 @@
|
|
|
<view class="py-[14rpx] flex items-center justify-between px-[20rpx]">
|
|
|
<view class="flex-1 search-input mr-[20rpx]">
|
|
|
<text @click.stop="searchTypeFn('all')" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
|
|
|
- <input class="input" maxlength="50" type="text" v-model="goods_name"
|
|
|
- placeholder="请搜索您想要的商品"
|
|
|
- placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search"
|
|
|
- @confirm="searchTypeFn('all')">
|
|
|
- <text v-if="goods_name" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="goods_name=''"></text>
|
|
|
+ <input class="input" maxlength="50" type="text" v-model="goods_name" placeholder="请搜索您想要的商品"
|
|
|
+ placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search"
|
|
|
+ @confirm="searchTypeFn('all')">
|
|
|
+ <text v-if="goods_name" class="nc-iconfont nc-icon-cuohaoV6xx1 clear"
|
|
|
+ @click="goods_name = ''"></text>
|
|
|
</view>
|
|
|
- <view :class="['iconfont text-[32rpx] text-[#333] -mb-[2rpx]', listType ? 'icona-yingyongzhongxinV6xx-32' : 'icona-yingyongliebiaoV6xx-32']"
|
|
|
+ <view
|
|
|
+ :class="['iconfont text-[32rpx] text-[#333] -mb-[2rpx]', listType ? 'icona-yingyongzhongxinV6xx-32' : 'icona-yingyongliebiaoV6xx-32']"
|
|
|
@click="listIconBtn"></view>
|
|
|
</view>
|
|
|
<view class="flex justify-between tems-center h-[88rpx] px-[30rpx]">
|
|
|
<view class=" flex items-center justify-between text-[26rpx] flex-1">
|
|
|
- <text class="text-[#333]" :class="{ 'text-[var(--primary-color)] font-500': searchType == 'all' }" @click="searchTypeFn('all')">综合排序</text>
|
|
|
- <view class="flex items-center text-[#333]" :class="{ 'text-[var(--primary-color)] font-500': searchType == 'sale_num' }"
|
|
|
- @click="searchTypeFn('sale_num')">
|
|
|
+ <text class="text-[#333]" :class="{ 'text-[var(--primary-color)] font-500': searchType == 'all' }"
|
|
|
+ @click="searchTypeFn('all')">综合排序</text>
|
|
|
+ <view class="flex items-center text-[#333]"
|
|
|
+ :class="{ 'text-[var(--primary-color)] font-500': searchType == 'sale_num' }"
|
|
|
+ @click="searchTypeFn('sale_num')">
|
|
|
<text class="mr-[4rpx]">销量</text>
|
|
|
<text v-if="sale_num == 'asc'" class="text-[16rpx] nc-iconfont nc-icon-a-xiangshangV6xx1"
|
|
|
- :class="{'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
|
|
|
+ :class="{ 'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
|
|
|
<text v-else class="text-[16rpx] nc-iconfont nc-icon-a-xiangxiaV6xx1"
|
|
|
- :class="{'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
|
|
|
+ :class="{ 'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
|
|
|
</view>
|
|
|
- <view class="flex items-center text-[#333]" :class="{'text-[var(--primary-color)] font-500': searchType == 'price' }"
|
|
|
- @click="searchTypeFn('price')">
|
|
|
+ <view class="flex items-center text-[#333]"
|
|
|
+ :class="{ 'text-[var(--primary-color)] font-500': searchType == 'price' }"
|
|
|
+ @click="searchTypeFn('price')">
|
|
|
<text class="mr-[4rpx]">价格</text>
|
|
|
- <text v-if="price == 'asc'" class="text-[16rpx] nc-iconfont nc-icon-a-xiangshangV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'price' }"></text>
|
|
|
- <text v-else class="text-[16rpx] nc-iconfont nc-icon-a-xiangxiaV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'price' }"></text>
|
|
|
+ <text v-if="price == 'asc'" class="text-[16rpx] nc-iconfont nc-icon-a-xiangshangV6xx1"
|
|
|
+ :class="{ 'text-[var(--primary-color)]': searchType == 'price' }"></text>
|
|
|
+ <text v-else class="text-[16rpx] nc-iconfont nc-icon-a-xiangxiaV6xx1"
|
|
|
+ :class="{ 'text-[var(--primary-color)]': searchType == 'price' }"></text>
|
|
|
</view>
|
|
|
- <view class="flex items-center" :class="{'text-[var(--primary-color)] font-500': searchType == 'label', 'text-[#333]': searchType != 'label' }"
|
|
|
- @click="searchTypeFn('label')">
|
|
|
+ <view class="flex items-center"
|
|
|
+ :class="{ 'text-[var(--primary-color)] font-500': searchType == 'label', 'text-[#333]': searchType != 'label' }"
|
|
|
+ @click="searchTypeFn('label')">
|
|
|
<text class="mr-[8rpx]">筛选</text>
|
|
|
<text class="iconfont font-500 icona-shaixuanV6xx-34 -mb-[4rpx] !text-[26rpx]"></text>
|
|
|
</view>
|
|
|
@@ -40,76 +47,60 @@
|
|
|
</view>
|
|
|
<u-popup :show="labelPopup" mode="top" @close="labelPopup = false">
|
|
|
<view @touchmove.prevent.stop class="h-[50vh] overflow-auto mt-[30rpx]">
|
|
|
- <view v-for="(item, index) in categoryList" :key="index">
|
|
|
- <view class="text-[28rpx] px-[20rpx] mt-[10rpx]">{{item.category_name}}</view>
|
|
|
- <view class="flex flex-wrap pl-[20rpx] pt-[20rpx]">
|
|
|
- <text @click="loadCategory(item.category_id)"
|
|
|
- :key="item.category_id"
|
|
|
- :class="{ 'label-select': currGoodsCategory == item.category_id }"
|
|
|
- class="truncate text-[#333] border-[2rpx] border-solid border-transparent w-[162rpx] h-[56rpx] flex items-center justify-center mr-[20rpx] mb-[30rpx] box-border bg-[var(--temp-bg)] rounded-[50rpx] text-[24rpx]">
|
|
|
- 全部
|
|
|
- </text>
|
|
|
- <text @click="loadCategory(subItem.category_id)" v-for="(subItem,index) in item.child_list"
|
|
|
- :key="subItem.category_id"
|
|
|
- :class="{ 'label-select': currGoodsCategory == subItem.category_id }"
|
|
|
- class="truncate text-[#333] border-[2rpx] border-solid border-transparent w-[162rpx] h-[56rpx] flex items-center justify-center mr-[20rpx] mb-[30rpx] box-border bg-[var(--temp-bg)] rounded-[50rpx] text-[24rpx]">
|
|
|
- {{ subItem.category_name }}
|
|
|
- </text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+ <view v-for="(item, index) in categoryList" :key="index">
|
|
|
+ <view class="text-[28rpx] px-[20rpx] mt-[10rpx]">{{ item.category_name }}</view>
|
|
|
+ <view class="flex flex-wrap pl-[20rpx] pt-[20rpx]">
|
|
|
+ <text @click="loadCategory(item.category_id)" :key="item.category_id"
|
|
|
+ :class="{ 'label-select': currGoodsCategory == item.category_id }"
|
|
|
+ class="truncate text-[#333] border-[2rpx] border-solid border-transparent w-[162rpx] h-[56rpx] flex items-center justify-center mr-[20rpx] mb-[30rpx] box-border bg-[var(--temp-bg)] rounded-[50rpx] text-[24rpx]">
|
|
|
+ 全部
|
|
|
+ </text>
|
|
|
+ <text @click="loadCategory(subItem.category_id)" v-for="(subItem, index) in item.child_list"
|
|
|
+ :key="subItem.category_id"
|
|
|
+ :class="{ 'label-select': currGoodsCategory == subItem.category_id }"
|
|
|
+ class="truncate text-[#333] border-[2rpx] border-solid border-transparent w-[162rpx] h-[56rpx] flex items-center justify-center mr-[20rpx] mb-[30rpx] box-border bg-[var(--temp-bg)] rounded-[50rpx] text-[24rpx]">
|
|
|
+ {{ subItem.category_name }}
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
|
|
|
- <mescroll-body ref="mescrollRef" top="176rpx" bottom="60px" @init="mescrollInit" :down="{ use: false }" @up="getAllAppListFn">
|
|
|
+ <mescroll-body ref="mescrollRef" top="176rpx" bottom="60px" @init="mescrollInit" :down="{ use: false }"
|
|
|
+ @up="getAllAppListFn">
|
|
|
<view v-if="goodsList.length" :class="['sidebar-margin', !listType ? 'biserial-goods-list' : '']">
|
|
|
<template v-if="listType">
|
|
|
<view v-for="(item, index) in goodsList" :key="index"
|
|
|
- class="bg-white flex px-[20rpx] py-[24rpx] rounded-[var(--rounded-small)] overflow-hidden top-mar"
|
|
|
- :class="{ 'mb-[20rpx]': (index+1) == goodsList.length}" @click="toDetail(item.goods_id)">
|
|
|
-
|
|
|
-<!-- <easy-image class="w-[190rpx] h-[190rpx]" image-class="rounded-[var(--rounded-mid)]"-->
|
|
|
-<!-- :image-src="item.goods_cover_thumb_small" />-->
|
|
|
-
|
|
|
- <image v-if="item.goods_cover_thumb_mid" class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]"
|
|
|
- :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'"
|
|
|
- @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"/>
|
|
|
- <image v-else class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"/>
|
|
|
+ class="bg-white flex px-[20rpx] py-[24rpx] rounded-[var(--rounded-small)] overflow-hidden top-mar"
|
|
|
+ :class="{ 'mb-[20rpx]': (index + 1) == goodsList.length }" @click="toDetail(item.id)">
|
|
|
+ <image v-if="item.productImage" class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]"
|
|
|
+ :src="img(item.productImage)" :mode="'aspectFill'"
|
|
|
+ @error="item.productImage = 'https://v6.site.niucloud.com/static/resource/images/diy/shop_default.jpg'" />
|
|
|
+ <image v-else class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]"
|
|
|
+ :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'" />
|
|
|
|
|
|
<view class="flex-1 flex flex-col ml-[20rpx] py-[6rpx]">
|
|
|
- <view class="text-[28rpx] text-[#333] leading-[40rpx] multi-hidden mb-[10rpx]">
|
|
|
- <view class="brand-tag" v-if="item.goods_brand" :style="diyGoods.baseTagStyle(item.goods_brand)">{{ item.goods_brand.brand_name }}</view>
|
|
|
- {{ item.goods_name }}
|
|
|
+ <view class="text-[28rpx] text-[#333] leading-[40rpx] multi-hidden mb-[10rpx]"></view>
|
|
|
+ <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden mb-[8rrpx]">
|
|
|
+ {{ item.itemName }}
|
|
|
</view>
|
|
|
- <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden mb-[8rrpx]">
|
|
|
- {{ item.sub_title }}
|
|
|
- </view>
|
|
|
- <view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
|
|
|
- <template v-for="(tagItem, tagIndex) in item.goods_label_name">
|
|
|
- <image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"/>
|
|
|
- <view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
|
|
|
- {{ tagItem.label_name }}
|
|
|
- </view>
|
|
|
- </template>
|
|
|
+ <view class="flex flex-wrap">
|
|
|
+ <view class="base-tag" :style="diyGoods.baseTagStyle()">
|
|
|
+ {{ item.productNo }}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="mt-auto flex justify-between items-baseline">
|
|
|
<view class="flex items-baseline mt-[20rpx]">
|
|
|
<view class="text-[var(--price-text-color)] price-font flex items-baseline">
|
|
|
<text class="text-[24rpx] font-500 mr-[4rpx]">￥</text>
|
|
|
- <text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
- <text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
+ <text class="text-[40rpx] font-500">{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
+ <text class="text-[24rpx] font-500">.{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
</view>
|
|
|
- <image v-if="diyGoods.priceType(item) == 'member_price'"
|
|
|
- class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')"
|
|
|
- mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'newcomer_price'"
|
|
|
- class="max-w-[60rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/newcomer.png')"
|
|
|
- mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'discount_price'"
|
|
|
- class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')"
|
|
|
- mode="heightFix" />
|
|
|
</view>
|
|
|
<text class="text-[22rpx] mt-[20rpx] text-[var(--text-color-light9)]">
|
|
|
- 已售{{ item.sale_num }}{{ item.unit }}
|
|
|
+ 起订{{ item.minOrderQuantity || 1 }}{{ item.unitName || '件' }}
|
|
|
</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -118,46 +109,38 @@
|
|
|
<template v-else>
|
|
|
<view>
|
|
|
<template v-for="(item, index) in goodsList">
|
|
|
- <view v-if="(index%2) == 0" class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]"
|
|
|
- @click="toDetail(item.goods_id)">
|
|
|
-
|
|
|
-<!-- <easy-image class="w-[100%] h-[344rpx]" image-class="rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"-->
|
|
|
-<!-- :image-src="item.goods_cover_thumb_small" />-->
|
|
|
- <image v-if="item.goods_cover_thumb_mid"
|
|
|
- class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
- :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'"
|
|
|
- @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"/>
|
|
|
+ <view v-if="(index % 2) == 0"
|
|
|
+ class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]"
|
|
|
+ @click="toDetail(item.id)">
|
|
|
+ <image v-if="item.productImage"
|
|
|
+ class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
+ :src="img(item.productImage)" :mode="'aspectFill'"
|
|
|
+ @error="item.productImage = 'static/resource/images/diy/shop_default.jpg'" />
|
|
|
<image v-else
|
|
|
- class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
- :src="img('static/resource/images/diy/shop_default.jpg')"
|
|
|
- :mode="'aspectFill'"/>
|
|
|
+ class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
+ :src="img('https://v6.site.niucloud.com/static/resource/images/diy/shop_default.jpg')"
|
|
|
+ :mode="'aspectFill'" />
|
|
|
|
|
|
<view class="px-[20rpx] flex-1 pt-[16rpx] pb-[24rpx] flex flex-col justify-between">
|
|
|
- <view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden">
|
|
|
- <view class="brand-tag" v-if="item.goods_brand" :style="diyGoods.baseTagStyle(item.goods_brand)">{{ item.goods_brand.brand_name }}</view>
|
|
|
- {{ item.goods_name }}
|
|
|
+ <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden my-[5rpx]">
|
|
|
+ {{ item.itemName }}
|
|
|
</view>
|
|
|
- <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden my-[5rpx]">
|
|
|
- {{ item.sub_title }}
|
|
|
- </view>
|
|
|
- <view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
|
|
|
- <template v-for="(tagItem, tagIndex) in item.goods_label_name">
|
|
|
- <image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"/>
|
|
|
- <view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">{{ tagItem.label_name }}</view>
|
|
|
- </template>
|
|
|
+ <view class="flex flex-wrap">
|
|
|
+ <view class="base-tag" :style="diyGoods.baseTagStyle()">{{ item.productNo }}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="flex justify-between flex-wrap items-end">
|
|
|
<view class="flex items-baseline mt-[20rpx]">
|
|
|
<view class="text-[var(--price-text-color)] price-font flex items-baseline">
|
|
|
<text class="text-[24rpx] font-500">￥</text>
|
|
|
- <text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
- <text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
+ <text class="text-[40rpx] font-500">{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
+ <text class="text-[24rpx] font-500">.{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
</view>
|
|
|
- <image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'newcomer_price'" class="max-w-[60rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'discount_price'" class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')" mode="heightFix" />
|
|
|
</view>
|
|
|
- <text class="text-[22rpx] text-[var(--text-color-light9)] mt-[20rpx]">已售{{ item.sale_num }}{{ item.unit }}</text>
|
|
|
+ <text class="text-[22rpx] text-[var(--text-color-light9)] mt-[20rpx]"> 起订{{
|
|
|
+ item.minOrderQuantity || 1 }}{{ item.unitName || '件' }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -165,46 +148,38 @@
|
|
|
</view>
|
|
|
<view>
|
|
|
<template v-for="(item, index) in goodsList">
|
|
|
- <view v-if="(index%2) == 1" class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]" @click="toDetail(item.goods_id)">
|
|
|
-<!-- <easy-image class="w-[100%] h-[344rpx]" image-class="rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"-->
|
|
|
-<!-- :image-src="item.goods_cover_thumb_small" />-->
|
|
|
- <image v-if="item.goods_cover_thumb_mid"
|
|
|
- class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
- :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'"
|
|
|
- @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'" />
|
|
|
- <image v-else class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
- :src="img('static/resource/images/diy/shop_default.jpg')"
|
|
|
- :mode="'aspectFill'" />
|
|
|
+ <view v-if="(index % 2) == 1"
|
|
|
+ class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]"
|
|
|
+ @click="toDetail(item.id)">
|
|
|
+ <image v-if="item.productImage"
|
|
|
+ class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
+ :src="img(item.productImage)" :mode="'aspectFill'"
|
|
|
+ @error="item.productImage = 'static/resource/images/diy/shop_default.jpg'" />
|
|
|
+ <image v-else
|
|
|
+ class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]"
|
|
|
+ :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'" />
|
|
|
<view class="px-[20rpx] flex-1 pt-[16rpx] pb-[24rpx] flex flex-col justify-between">
|
|
|
- <view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden">
|
|
|
- <view class="brand-tag" v-if="item.goods_brand" :style="diyGoods.baseTagStyle(item.goods_brand)">
|
|
|
- {{ item.goods_brand.brand_name }}
|
|
|
- </view>
|
|
|
- {{ item.goods_name }}
|
|
|
+ <view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden"></view>
|
|
|
+ <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden my-[5rpx]">
|
|
|
+ {{ item.itemName }}
|
|
|
</view>
|
|
|
- <view class="text-[24rpx] text-[#999] leading-[30rpx] using-hidden my-[5rpx]">
|
|
|
- {{ item.sub_title }}
|
|
|
- </view>
|
|
|
- <view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
|
|
|
- <template v-for="(tagItem, tagIndex) in item.goods_label_name">
|
|
|
- <image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')" />
|
|
|
- <view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
|
|
|
- {{ tagItem.label_name }}
|
|
|
- </view>
|
|
|
- </template>
|
|
|
+ <view class="flex flex-wrap">
|
|
|
+ <view class="base-tag" :style="diyGoods.baseTagStyle()">
|
|
|
+ {{ item.productNo }}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="flex justify-between flex-wrap items-baseline">
|
|
|
<view class="flex items-baseline mt-[20rpx]">
|
|
|
<view class="text-[var(--price-text-color)] price-font flex items-baseline">
|
|
|
<text class="text-[24rpx] font-500">￥</text>
|
|
|
- <text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
- <text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
+ <text class="text-[40rpx] font-500">{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
|
|
|
+ <text class="text-[24rpx] font-500">.{{
|
|
|
+ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
|
|
|
</view>
|
|
|
- <image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'newcomer_price'" class="max-w-[60rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
|
|
|
- <image v-else-if="diyGoods.priceType(item) == 'discount_price'" class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')" mode="heightFix" />
|
|
|
</view>
|
|
|
- <text class="mt-[20rpx] text-[22rpx] text-[var(--text-color-light9)]">已售{{ item.sale_num }}{{ item.unit }}</text>
|
|
|
+ <text class="mt-[20rpx] text-[22rpx] text-[var(--text-color-light9)]">起订{{
|
|
|
+ item.minOrderQuantity || 1 }}{{ item.unitName || '件' }}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -212,7 +187,8 @@
|
|
|
</view>
|
|
|
</template>
|
|
|
</view>
|
|
|
- <mescroll-empty v-if="!goodsList.length && loading" :option="{tip : '暂无商品', btnText:'去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })"></mescroll-empty>
|
|
|
+ <mescroll-empty v-if="!goodsList.length && loading" :option="{ tip: '暂无商品', btnText: '去逛逛' }"
|
|
|
+ @emptyclick="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })"></mescroll-empty>
|
|
|
</mescroll-body>
|
|
|
|
|
|
<tabbar />
|
|
|
@@ -223,7 +199,7 @@
|
|
|
import { reactive, ref, onMounted } from 'vue'
|
|
|
import { t } from '@/locale'
|
|
|
import { redirect, img, handleOnloadParams } from '@/utils/common';
|
|
|
-import { getGoodsCategoryTree, getGoodsPages } from '@/addon/shop/api/goods';
|
|
|
+import { getGoodsCategoryTree, getGoodsComponents } from '@/addon/shop/api/goods';
|
|
|
import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
|
|
|
import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
|
|
|
import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
|
|
|
@@ -246,7 +222,7 @@ const sale_num = ref("");
|
|
|
const searchType = ref('all');
|
|
|
//列表类型
|
|
|
const listType = ref(true)
|
|
|
-onLoad(async(option: any) => {
|
|
|
+onLoad(async (option: any) => {
|
|
|
// #ifdef MP-WEIXIN
|
|
|
// 处理小程序场景值参数
|
|
|
option = handleOnloadParams(option);
|
|
|
@@ -279,8 +255,9 @@ const getAllAppListFn = (mescroll: mescrollStructure) => {
|
|
|
order: searchType.value === 'all' ? '' : searchType.value,
|
|
|
sort: searchType.value == 'price' ? price.value : sale_num.value
|
|
|
};
|
|
|
- getGoodsPages(data).then((res: any) => {
|
|
|
- let newArr = (res.data.data as Array<Object>);
|
|
|
+ getGoodsComponents(data).then((res: any) => {
|
|
|
+ let newArr = (res.rows as Array<Object>);
|
|
|
+ console.log(newArr, 'newArrnewArrnewArrnewArr')
|
|
|
//设置列表数据
|
|
|
if (Number(mescroll.num) === 1) {
|
|
|
goodsList.value = []; //如果是第一页需手动制空列表
|
|
|
@@ -294,7 +271,7 @@ const getAllAppListFn = (mescroll: mescrollStructure) => {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-onPageScroll((e)=> {
|
|
|
+onPageScroll((e) => {
|
|
|
// uni.$emit('scroll')
|
|
|
})
|
|
|
|
|
|
@@ -345,7 +322,7 @@ const listIconBtn = () => {
|
|
|
listType.value = !listType.value
|
|
|
}
|
|
|
const toDetail = (id: string | number) => {
|
|
|
- redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: id }, mode: 'navigateTo' })
|
|
|
+ redirect({ url: '/addon/shop/pages/goods/detail', param: { goodsId: id }, mode: 'navigateTo' })
|
|
|
}
|
|
|
onMounted(() => {
|
|
|
setTimeout(() => {
|
weixin_52219567