Commit 14a90176 authored by beisir's avatar beisir

Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

parents 7d1998a1 d5fd2d32
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"raven-js": "^3.27.2", "raven-js": "^3.27.2",
"sa-sdk-javascript": "^1.15.16", "sa-sdk-javascript": "^1.15.16",
"vue": "2.6.11", "vue": "2.6.11",
"vue-awesome-swiper": "3.1.3",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vuex": "^3.4.0" "vuex": "^3.4.0"
}, },
...@@ -5261,6 +5262,21 @@ ...@@ -5261,6 +5262,21 @@
"resolved": "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz", "resolved": "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
}, },
"node_modules/dom7": {
"version": "2.1.5",
"resolved": "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
"license": "MIT",
"dependencies": {
"ssr-window": "^2.0.0"
}
},
"node_modules/dom7/node_modules/ssr-window": {
"version": "2.0.0",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
"license": "MIT"
},
"node_modules/domain-browser": { "node_modules/domain-browser": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz", "resolved": "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz",
...@@ -13359,6 +13375,12 @@ ...@@ -13359,6 +13375,12 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/ssr-window": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==",
"license": "MIT"
},
"node_modules/ssri": { "node_modules/ssri": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz", "resolved": "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz",
...@@ -13967,6 +13989,20 @@ ...@@ -13967,6 +13989,20 @@
"node": ">=4.0.0" "node": ">=4.0.0"
} }
}, },
"node_modules/swiper": {
"version": "4.5.1",
"resolved": "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz",
"integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"dom7": "^2.1.3",
"ssr-window": "^1.0.1"
},
"engines": {
"node": ">= 4.7.0"
}
},
"node_modules/table": { "node_modules/table": {
"version": "5.4.6", "version": "5.4.6",
"resolved": "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz", "resolved": "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz",
...@@ -14886,6 +14922,20 @@ ...@@ -14886,6 +14922,20 @@
"resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz", "resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
}, },
"node_modules/vue-awesome-swiper": {
"version": "3.1.3",
"resolved": "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz",
"integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==",
"license": "MIT",
"dependencies": {
"object-assign": "^4.1.1",
"swiper": "^4.0.7"
},
"engines": {
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
}
},
"node_modules/vue-eslint-parser": { "node_modules/vue-eslint-parser": {
"version": "7.1.0", "version": "7.1.0",
"resolved": "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz", "resolved": "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz",
...@@ -22110,6 +22160,21 @@ ...@@ -22110,6 +22160,21 @@
"resolved": "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz", "resolved": "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
}, },
"dom7": {
"version": "2.1.5",
"resolved": "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
"requires": {
"ssr-window": "^2.0.0"
},
"dependencies": {
"ssr-window": {
"version": "2.0.0",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
}
}
},
"domain-browser": { "domain-browser": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz", "resolved": "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz",
...@@ -28819,6 +28884,11 @@ ...@@ -28819,6 +28884,11 @@
"tweetnacl": "~0.14.0" "tweetnacl": "~0.14.0"
} }
}, },
"ssr-window": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
},
"ssri": { "ssri": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz", "resolved": "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz",
...@@ -29323,6 +29393,15 @@ ...@@ -29323,6 +29393,15 @@
"util.promisify": "~1.0.0" "util.promisify": "~1.0.0"
} }
}, },
"swiper": {
"version": "4.5.1",
"resolved": "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz",
"integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==",
"requires": {
"dom7": "^2.1.3",
"ssr-window": "^1.0.1"
}
},
"table": { "table": {
"version": "5.4.6", "version": "5.4.6",
"resolved": "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz", "resolved": "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz",
...@@ -30108,6 +30187,15 @@ ...@@ -30108,6 +30187,15 @@
"resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz", "resolved": "http://npmprivate.quantgroups.com/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
}, },
"vue-awesome-swiper": {
"version": "3.1.3",
"resolved": "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz",
"integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==",
"requires": {
"object-assign": "^4.1.1",
"swiper": "^4.0.7"
}
},
"vue-eslint-parser": { "vue-eslint-parser": {
"version": "7.1.0", "version": "7.1.0",
"resolved": "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz", "resolved": "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz",
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"raven-js": "^3.27.2", "raven-js": "^3.27.2",
"sa-sdk-javascript": "^1.15.16", "sa-sdk-javascript": "^1.15.16",
"vue": "2.6.11", "vue": "2.6.11",
"vue-awesome-swiper": "3.1.3",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vuex": "^3.4.0" "vuex": "^3.4.0"
}, },
......
src/assets/images/info-bg.png

40.8 KB | W: | H:

src/assets/images/info-bg.png

52.5 KB | W: | H:

src/assets/images/info-bg.png
src/assets/images/info-bg.png
src/assets/images/info-bg.png
src/assets/images/info-bg.png
  • 2-up
  • Swipe
  • Onion skin
<template>
<div class="avator-group">
<div v-for="(item, index) in avators" :key="index" class="avator-item">
<cr-image width="44px" :src="item" />
<div v-if="index == 0" class="is-leader">
<cr-image width="48px" src="@/assets/images/leader.png" />
</div>
<div v-else class="is-new">
<cr-image width="25px" src="@/assets/images/new-user.png" />
</div>
</div>
</div>
</template>
<script>
export default {
props: {
avators: {
type: Array,
default: () => [
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_01.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_02.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_03.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_04.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_05.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_06.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_07.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_09.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_10.png'
]
},
desc: {
type: String,
default: ''
}
},
data() {
return {
isLeader: true // 标识是不是团长
};
}
};
</script>
<style lang="less" scoped>
.avator-group {
padding: 0 38 - @padding-sd;
box-sizing: border-box;
margin-bottom: @padding-md;
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: center;
.avator-item {
flex-shrink: 0;
position: relative;
width: 20%;
height: 62px;
.is-new {
position: absolute;
top: 0;
right: @padding-unit * 2;
}
.is-leader {
position: absolute;
left: 2px;
top: -11px;
}
}
}
</style>
<template>
<div class="avator-swiper">
<swiper
ref="mySwiper"
:options="swiperOptions"
class="avator-swiper_container"
@slide-change="slideChange"
@set-translate="setTranslate"
>
<swiper-slide v-for="(item, index) in avatorData" :key="index" class="avator-swiper_item">
<div class="avator-swiper_item">
<img :src="item" />
</div>
</swiper-slide>
</swiper>
</div>
</template>
<script>
import { swiper, swiperSlide } from 'vue-awesome-swiper';
import 'swiper/dist/css/swiper.css';
export default {
name: 'AvatorSwiper',
components: {
swiper,
swiperSlide
},
props: {
avatorData: {
type: Array,
default() {
return [];
}
}
},
data() {
return {
activeIndex: 0,
swiperOptions: {
loop: true,
initialSlide: 0,
slidesPerView: 9,
spaceBetween: 4,
speed: 900,
centeredSlides: true,
watchSlidesProgress: true,
allowTouchMove: false,
autoplay: {
delay: 900,
stopOnLastSlide: false,
disableOnInteraction: false
}
}
};
},
computed: {
swiper() {
return this.$refs.mySwiper.swiper;
}
},
methods: {
slideChange() {
this.activeIndex = this.swiper.realIndex;
},
setTranslate() {
const slides = this.swiper.slides;
for (let i = 0; i < slides.length; i++) {
const slide = slides.eq(i);
const progress = slides[i].progress;
slide.css('opacity', 1 - Math.abs(progress) / 9);
slide.css('transform', `scale(${1 - Math.abs(progress) / 17}`);
}
}
}
};
</script>
<style lang="less">
.avator-swiper {
width: 100%;
margin: 0 auto !important;
&_item {
transition: transform 0.2s linear;
height: 32px;
padding-top: 2px;
img {
height: 25px;
width: 25px;
border-radius: 50%;
}
&.active {
transform: scale(1.2);
}
}
}
</style>
<template>
<div class="success-info">
<p class="desc">已有<span>6999人</span>拼团成功</p>
<avator-swiper :avator-data="avatorData" />
</div>
</template>
<script>
import avatorSwiper from '@/components/avatorSwiper';
export default {
components: {
avatorSwiper
},
data() {
return {
avatorData: [
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_01.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_02.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_03.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_04.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_05.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_06.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_07.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_09.png',
'https://activitystatic.lkbang.net/mall-free-ui/img/avator_10.png'
]
};
}
};
</script>
<style lang="less" scoped>
.success-info {
.text-14();
color: @black;
text-align: center;
height: 90px;
background: #f7f8f9;
border-radius: @border-radius-md + 2;
padding: 0 @padding-unit * 10 + 5;
display: flex;
flex-direction: column;
justify-content: center;
.desc {
margin-bottom: @padding-unit * 3;
.text-14();
span {
color: @red;
}
}
}
</style>
<template>
<div>
<cr-image />
</div>
</template>
<template> <template>
<div class="goods-bottom"> <div class="goods-bottom">
<cr-button plain type="primary" shape="circle" :disabled="disabled">自己做团长</cr-button>
<cr-button shape="circle" :disabled="disabled" type="primary" block @click="buy"> <cr-button shape="circle" :disabled="disabled" type="primary" block @click="buy">
立即参团 立即参团
</cr-button> </cr-button>
<cr-button shape="circle" :disabled="disabled" type="primary" block @click="buy">
立即开团
</cr-button>
</div> </div>
</template> </template>
<script> <script>
...@@ -60,7 +58,9 @@ export default { ...@@ -60,7 +58,9 @@ export default {
border-top: 2px solid #f7f7f7; border-top: 2px solid #f7f7f7;
padding: 10px 12px; padding: 10px 12px;
box-sizing: border-box; box-sizing: border-box;
z-index: 2;
button { button {
width: 50%;
margin: 0 10px; margin: 0 10px;
} }
} }
......
// @import "../../style/var.less"; // @import "../../style/var.less";
@font-face {
font-family: "din";
src: url("../../style/DIN.ttf") format("truetype");
}
@{deep} .cr-button--default { @{deep} .cr-button--default {
color: inherit; color: inherit;
} }
...@@ -84,58 +88,15 @@ ...@@ -84,58 +88,15 @@
border-radius: 10px; border-radius: 10px;
} }
} }
&-swipe-avator{
position: absolute;
left: @padding-sm;
bottom: @padding-sm;
}
&-info { &-info {
padding: 0 @padding-sd; padding: @padding-sd @padding-sd 0;
background: @white; background: @white;
margin-bottom: @padding-sm - 4; margin-bottom: @padding-sm - 4;
&-price {
padding: @padding-x 0;
display: flex;
justify-content: space-between;
align-items: center;
min-height: 44px;
.Gi-price {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.Gi-price-left {
span {
color: @red-light;
&:nth-child(1) {
line-height: 16rpx;
.text-18();
font-weight: bold;
}
&:nth-child(2) {
margin-right: @padding-xs;
font-size: 30px;
line-height: 14px;
font-weight: bold;
}
&:nth-child(3) {
text-decoration: line-through;
.text-14();
color: @gray-4;
}
}
}
.Gi-price-right {
bottom: 0;
.text-13();
color: @gray-4;
}
}
}
&-name { &-name {
.text-16(); .text-16();
color: @black; color: @black;
...@@ -149,12 +110,34 @@ ...@@ -149,12 +110,34 @@
background-color: #FFE8E8; background-color: #FFE8E8;
background-size: cover; background-size: cover;
width: 100%; width: 100%;
height: 51px; height: 66px;
padding-left: @padding-unit * 3;
box-sizing: border-box;
&-price{ &-price{
width: 253px; width: 253px;
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
align-items: center; justify-content: center;
flex-direction: column;
.desc{
.text-12();
color:@white;
opacity: .8;
}
.price{
margin-bottom: @padding-unit - 2;
.text-14();
color:@white;
.group-price {
// font-family: "din";
margin-right: @padding-xs;
font-size: 30px;
}
.sale-price{
// font-family: "din";
.text-16();
}
}
} }
&-time{ &-time{
flex: 1; flex: 1;
...@@ -170,34 +153,12 @@ ...@@ -170,34 +153,12 @@
} }
} }
} }
&-sale { // 头像组、团购规则等
padding: 5px 10px; &-group-info{
margin-top: @padding-sm - 4;
padding:@padding-lg + @padding-unit @padding-sd @padding-sd;
background: @white; background: @white;
margin-bottom: 10px; }
&-button {
box-sizing: content-box;
margin-right: 5px;
width: 35px;
height: 15px;
border-radius: 3px;
line-height: 15px;
text-align: center;
border: 1px solid @border-color-search;
font-size: 12px;
color: @font-color-search;
}
&-content {
width: 259px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 13px;
color: #333;
}
&-active{
border-top:1px solid @grey-border;
}
}
&-param { &-param {
padding: 0 @padding-sm - 2; padding: 0 @padding-sm - 2;
background: @white; background: @white;
......
...@@ -12,10 +12,17 @@ ...@@ -12,10 +12,17 @@
<div class="custom-indicator">{{ swiperCurrent + 1 }}/{{ imgList.length }}</div> <div class="custom-indicator">{{ swiperCurrent + 1 }}/{{ imgList.length }}</div>
</template> </template>
</cr-swipe> </cr-swipe>
<swipe-customer-info v-model="showInfo" /> <div class="goods-swipe-avator">
<swipe-customer-info v-model="showInfo" />
</div>
</div> </div>
<div class="goods-group-buy-info"> <div class="goods-group-buy-info">
<div class="goods-group-buy-info-price" /> <div class="goods-group-buy-info-price">
<p class="price">
成团价¥<span class="group-price">0</span>售价¥<span class="sale-price">3000</span>
</p>
<p class="desc">拼团成功/失败,款项原路返回至账户</p>
</div>
<div class="goods-group-buy-info-time"> <div class="goods-group-buy-info-time">
<p class="goods-group-buy-info-time-desc">距成团结束</p> <p class="goods-group-buy-info-time-desc">距成团结束</p>
<count-down :end-time="endTime" /> <count-down :end-time="endTime" />
...@@ -23,16 +30,6 @@ ...@@ -23,16 +30,6 @@
</div> </div>
<!-- 商品名称/价格 --> <!-- 商品名称/价格 -->
<div class="goods-info"> <div class="goods-info">
<div class="goods-info-price">
<div class="Gi-price">
<div v-if="detailInfo.salePrice" class="Gi-price-left">
<span>¥</span>
<span>{{ detailInfo.salePrice || '' }}</span>
<span v-if="detailInfo.marketPrice">¥{{ detailInfo.marketPrice || '' }}</span>
</div>
<span class="Gi-price-right">销量:{{ detailInfo.saleCount || '' }}</span>
</div>
</div>
<div class="goods-info-name">{{ detailInfo.skuName || name.goodsName }}</div> <div class="goods-info-name">{{ detailInfo.skuName || name.goodsName }}</div>
</div> </div>
...@@ -58,6 +55,11 @@ ...@@ -58,6 +55,11 @@
<span>{{ selectedAddress.addrFullName || '添加收货地址' }}</span> <span>{{ selectedAddress.addrFullName || '添加收货地址' }}</span>
</goods-cell> </goods-cell>
</div> </div>
<div class="goods-group-info">
<avatorGroup />
<successInfo />
<rules />
</div>
<span <span
v-if="skuDetailList.length || detailImgList.length" v-if="skuDetailList.length || detailImgList.length"
id="goodDetail" id="goodDetail"
...@@ -170,7 +172,9 @@ import Img2Thumb from '@/filters/img2Thumb.filter'; ...@@ -170,7 +172,9 @@ import Img2Thumb from '@/filters/img2Thumb.filter';
import bottomNav from './components/bottomNav'; import bottomNav from './components/bottomNav';
import swipeCustomerInfo from '@/components/swipeCustomerInfo'; import swipeCustomerInfo from '@/components/swipeCustomerInfo';
import countDown from '@/components/countDown'; import countDown from '@/components/countDown';
import CountDown from '@/components/countDown.vue'; import avatorGroup from '@/components/avatorGroup';
import successInfo from '@/components/groupBuySuccessInfo';
import rules from '@/components/rules';
export default { export default {
// eslint-disable-next-line vue/name-property-casing // eslint-disable-next-line vue/name-property-casing
name: 'goodDetail', name: 'goodDetail',
...@@ -180,8 +184,9 @@ export default { ...@@ -180,8 +184,9 @@ export default {
bottomNav, bottomNav,
swipeCustomerInfo, swipeCustomerInfo,
countDown, countDown,
// tipModal avatorGroup,
CountDown successInfo,
rules
}, },
filters: { filters: {
Img2Thumb Img2Thumb
...@@ -189,9 +194,8 @@ export default { ...@@ -189,9 +194,8 @@ export default {
data() { data() {
return { return {
endTime: 1631203200000, endTime: 1631203200000,
// 以下是原有的data
flag: false,
showInfo: false, showInfo: false,
// 以下是原有的data
detailParam: { detailParam: {
skuNo: '', skuNo: '',
receiverId: '', receiverId: '',
...@@ -199,7 +203,6 @@ export default { ...@@ -199,7 +203,6 @@ export default {
}, },
specSelected: [], specSelected: [],
detailInfo: {}, detailInfo: {},
labelList: [], // 服务标签
imgList: [], imgList: [],
detailImgList: [], // 商品详情图像展示 detailImgList: [], // 商品详情图像展示
selectedGoods: { selectedGoods: {
...@@ -212,16 +215,12 @@ export default { ...@@ -212,16 +215,12 @@ export default {
specList: [], specList: [],
specChildList: [], specChildList: [],
swiperCurrent: 0, swiperCurrent: 0,
popupSwitch: true,
vccChannel: '',
sonVccChannel: '',
// showBackBtn: navBarLeftBtns, // showBackBtn: navBarLeftBtns,
currentPopupType: '', currentPopupType: '',
currentPopupName: '', currentPopupName: '',
show: false, show: false,
hasLogin: false, hasLogin: false,
name: {}, name: {}
clientHeight: 0
}; };
}, },
computed: { computed: {
...@@ -323,7 +322,6 @@ export default { ...@@ -323,7 +322,6 @@ export default {
const [addressInfo] = await goods.addrList(); const [addressInfo] = await goods.addrList();
if (addressInfo) { if (addressInfo) {
this.addressList = (addressInfo && addressInfo.addrReceiverList) || []; this.addressList = (addressInfo && addressInfo.addrReceiverList) || [];
this.flag = true;
this.show = true; this.show = true;
} else { } else {
this.addAddress(); this.addAddress();
......
...@@ -3308,6 +3308,13 @@ ...@@ -3308,6 +3308,13 @@
"resolved" "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz" "resolved" "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz"
"version" "0.1.2" "version" "0.1.2"
"dom7@^2.1.3":
"integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA=="
"resolved" "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz"
"version" "2.1.5"
dependencies:
"ssr-window" "^2.0.0"
"domain-browser@^1.1.1": "domain-browser@^1.1.1":
"integrity" "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" "integrity" "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
"resolved" "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz" "resolved" "http://npmprivate.quantgroups.com/domain-browser/-/domain-browser-1.2.0.tgz"
...@@ -8241,6 +8248,16 @@ ...@@ -8241,6 +8248,16 @@
"safer-buffer" "^2.0.2" "safer-buffer" "^2.0.2"
"tweetnacl" "~0.14.0" "tweetnacl" "~0.14.0"
"ssr-window@^1.0.1":
"integrity" "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
"resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz"
"version" "1.0.1"
"ssr-window@^2.0.0":
"integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
"resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz"
"version" "2.0.0"
"ssri@^6.0.1": "ssri@^6.0.1":
"integrity" "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==" "integrity" "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="
"resolved" "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz" "resolved" "http://npmprivate.quantgroups.com/ssri/-/ssri-6.0.1.tgz"
...@@ -8580,6 +8597,14 @@ ...@@ -8580,6 +8597,14 @@
"unquote" "~1.1.1" "unquote" "~1.1.1"
"util.promisify" "~1.0.0" "util.promisify" "~1.0.0"
"swiper@^4.0.7":
"integrity" "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA=="
"resolved" "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz"
"version" "4.5.1"
dependencies:
"dom7" "^2.1.3"
"ssr-window" "^1.0.1"
"table@^5.2.3": "table@^5.2.3":
"integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==" "integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="
"resolved" "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz" "resolved" "http://npmprivate.quantgroups.com/table/-/table-5.4.6.tgz"
...@@ -9158,6 +9183,14 @@ ...@@ -9158,6 +9183,14 @@
"resolved" "http://npmprivate.quantgroups.com/vm-browserify/-/vm-browserify-1.1.2.tgz" "resolved" "http://npmprivate.quantgroups.com/vm-browserify/-/vm-browserify-1.1.2.tgz"
"version" "1.1.2" "version" "1.1.2"
"vue-awesome-swiper@3.1.3":
"integrity" "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg=="
"resolved" "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz"
"version" "3.1.3"
dependencies:
"object-assign" "^4.1.1"
"swiper" "^4.0.7"
"vue-eslint-parser@^7.0.0": "vue-eslint-parser@^7.0.0":
"integrity" "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==" "integrity" "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q=="
"resolved" "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz" "resolved" "http://npmprivate.quantgroups.com/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment