[报单模块添加及筛选条件,及权证管理模块没有报单兼容插件]
This commit is contained in:
@@ -100,7 +100,7 @@
|
||||
<swiper class="banner-swiper" indicator-color="#e93340" indicator-active-color="#f8f8f8"
|
||||
indicator-dots autoplay>
|
||||
<swiper-item v-for="(item, index) in banners" :key="index">
|
||||
<image class="cover" :src="item.cover" mode="aspectFill"></image>
|
||||
<image class="cover" :src="item.cover" mode="aspectFill" @click="swiperClick(item.url)" />
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
</view>
|
||||
@@ -126,8 +126,12 @@
|
||||
<view class="goods-push" v-if="JSON.stringify(position) != '{}'">
|
||||
<view class="itme item-mian" @click="onGoods(position.one)">
|
||||
<image class="cover" :src="position.one.cover" mode="aspectFill"></image>
|
||||
<view class="title">{{position.one.name}}</view>
|
||||
<view class="title">
|
||||
<span class='is_allow_values' v-if='position.one.specal_tags.is_allow_values'>{{position.one.specal_tags.is_allow_values}}</span>
|
||||
{{position.one.name}}
|
||||
</view>
|
||||
<view class="price"><text>¥</text>{{position.one.original_price}}</view>
|
||||
<span class='is_self' v-if='position.one.specal_tags.is_self'>{{position.one.specal_tags.is_self}}</span>
|
||||
</view>
|
||||
<view class="itme">
|
||||
<view class="itme-list" v-for="(item, index) in position.two" :key="index" @click="onGoods(item)">
|
||||
@@ -196,6 +200,9 @@
|
||||
import goodsList from '@/components/goods-list/goods-list'
|
||||
import industryList from '@/components/industry-list/industry-list'
|
||||
import userAuth from '@/public/userAuth'
|
||||
import {
|
||||
config
|
||||
} from '@/apis/index.js'
|
||||
export default {
|
||||
comments: {
|
||||
goodsList,
|
||||
@@ -236,7 +243,8 @@
|
||||
busList: [],
|
||||
busPage: 1,
|
||||
// 分页
|
||||
pageStatus: ''
|
||||
pageStatus: '',
|
||||
imgUrl: config.apiUrls
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@@ -269,6 +277,14 @@
|
||||
break
|
||||
}
|
||||
},
|
||||
// 点击轮播图
|
||||
swiperClick(url) {
|
||||
if (url === 'goBaoDanList') {
|
||||
uni.navigateTo({
|
||||
url: 'pages/goods/lists?type=baodan'
|
||||
})
|
||||
}
|
||||
},
|
||||
// 领取,更多优惠券
|
||||
onCoupons(type, id, index) {
|
||||
let token = this.$store.getters.getToken
|
||||
@@ -341,6 +357,10 @@
|
||||
mall().then(res => {
|
||||
this.classify = res.categories.slice(0, 9)
|
||||
this.banners = res.banners
|
||||
this.banners = [...this.banners, {
|
||||
cover: config.apiUrls + 'images/baodan-banner.png',
|
||||
url: 'goBaoDanList'
|
||||
}]
|
||||
this.coupons = res.coupons
|
||||
this.position = res.positions
|
||||
}).catch(err => {
|
||||
@@ -470,6 +490,8 @@
|
||||
margin: $margin/2;
|
||||
width: calc(20% - #{$margin});
|
||||
text-align: center;
|
||||
position: relative;
|
||||
|
||||
|
||||
.cover {
|
||||
width: 98rpx;
|
||||
@@ -482,6 +504,15 @@
|
||||
line-height: 40rpx;
|
||||
font-size: $title-size-sm;
|
||||
color: $text-gray;
|
||||
.is_allow_values {
|
||||
color: #fff;
|
||||
background-image: linear-gradient(to left,$main-color,$mian-color-light);
|
||||
padding: 2rpx 14rpx;
|
||||
font-size: 20rpx;
|
||||
text-align: center;
|
||||
border-radius: 30rpx;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -506,12 +537,34 @@
|
||||
text-align: center;
|
||||
border-right: solid 1rpx $border-color;
|
||||
@extend .vertical;
|
||||
|
||||
position: relative;
|
||||
|
||||
.is_self {
|
||||
position: absolute;
|
||||
top: 14rpx;
|
||||
right: 20rpx;
|
||||
background-image: linear-gradient(to bottom, #ee4c47, #9e312f);
|
||||
// background-color: #ee4c47;
|
||||
box-shadow: 0 4rpx 10rpx 2rpx rgba($color: #000, $alpha: .3);
|
||||
color: #fff;
|
||||
font-size: 26;
|
||||
padding: 2rpx 20rpx 10rpx 20rpx;
|
||||
border-radius: 0 0 50rpx 50rpx;
|
||||
}
|
||||
.title {
|
||||
font-weight: bold;
|
||||
font-size: $title-size;
|
||||
@extend .nowrap;
|
||||
line-height: 50rpx;
|
||||
.is_allow_values {
|
||||
color: #fff;
|
||||
background-image: linear-gradient(to left,$main-color,$mian-color-light);
|
||||
padding: 2rpx 14rpx;
|
||||
font-size: 20rpx;
|
||||
text-align: center;
|
||||
border-radius: 30rpx;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.price {
|
||||
@@ -527,9 +580,9 @@
|
||||
}
|
||||
|
||||
.cover {
|
||||
margin-bottom: 30rpx;
|
||||
width: 220rpx;
|
||||
height: 280rpx;
|
||||
margin-bottom: 20rpx;
|
||||
width: 320rpx;
|
||||
height: 300rpx;
|
||||
vertical-align: top;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
||||
<template>
|
||||
<view class="Goods-LISTS">
|
||||
<!-- <image :src="`${config.apiUrls}images/baodan-banner.png`" mode="widthFix" /> -->
|
||||
<view class="tabs">
|
||||
<view class="tabs-item" :class="{'show': tabIndex == 0}" @click="onTabs" data-index="0">最新</view>
|
||||
<view class="tabs-item" :class="{'show': tabIndex == 1}" @click="onTabs" data-index="1">
|
||||
@@ -19,6 +20,9 @@
|
||||
list
|
||||
} from '@/apis/interfaces/goods'
|
||||
import goodsList from '@/components/goods-list/goods-list'
|
||||
import {
|
||||
config
|
||||
} from '@/apis/index.js'
|
||||
export default {
|
||||
name: 'Goods-LISTS',
|
||||
data() {
|
||||
@@ -28,6 +32,7 @@
|
||||
goods: [],
|
||||
page: 1,
|
||||
has_more: true,
|
||||
isBaoDan: false, // 是否是报单,默认有id不是报单,无id是报单
|
||||
};
|
||||
},
|
||||
onReachBottom() {
|
||||
@@ -44,6 +49,14 @@
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
onShow() {
|
||||
if (this.$Route.query.type === 'baodan') {
|
||||
this.isBaoDan = true
|
||||
uni.setNavigationBarTitle({
|
||||
title: '报单商品'
|
||||
})
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onTabs(e) {
|
||||
let index = e.target.dataset.index
|
||||
@@ -58,7 +71,7 @@
|
||||
|
||||
onGoods(e) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/goods/details?id='+e.goods_id
|
||||
url: '/pages/goods/details?id=' + e.goods_id
|
||||
})
|
||||
// this.$Router.push({
|
||||
// name: 'goodsDetails',
|
||||
@@ -72,8 +85,11 @@
|
||||
order_by: this.tabIndex == 1 ? this.marketType : '',
|
||||
page: this.page
|
||||
}
|
||||
if (this.$Route.query.type) {
|
||||
if (this.$Route.query.type === 'id') {
|
||||
data.category_id = this.$Route.query.id
|
||||
} else if (this.$Route.query.type === 'baodan') {
|
||||
// 报单加个条件筛选
|
||||
data.is_allow_values = 1
|
||||
} else {
|
||||
data.category_cid = this.$Route.query.id
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<view class="item" :class="{'show': status == '3'}" @click="onTabs('3')">已驳回</view>
|
||||
</view>
|
||||
<!-- 优选商品 -->
|
||||
<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证">
|
||||
<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证" notag='has'>
|
||||
<template v-slot:statistics="goods">
|
||||
<view>库存{{goods.value.stock}}</view>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user