Skip to content

G
group-buy-ui
Commit 3c6c5160 authored by Xuguangxing's avatar Xuguangxing
Browse files
Options

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

parents 9ad5ef53 dbed4e39
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 44 deletions
package-lock.json
View file @ 3c6c5160
...@@ -4704,16 +4704,16 @@ ...@@ -4704,16 +4704,16 @@
}, },
"dom7": { "dom7": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz", "resolved": "https://registry.nlark.com/dom7/download/dom7-2.1.5.tgz?cache=0&sync_timestamp=1629879453685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom7%2Fdownload%2Fdom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", "integrity": "sha1-p5QRAXgAsx2EAAcM2uu/ySwfY3c=",
"requires": { "requires": {
"ssr-window": "^2.0.0" "ssr-window": "^2.0.0"
}, },
"dependencies": { "dependencies": {
"ssr-window": { "ssr-window": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz", "resolved": "https://registry.nlark.com/ssr-window/download/ssr-window-2.0.0.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==" "integrity": "sha1-mMMBrvmVIzF/jWlhjwAQeRCW78Q="
} }
} }
}, },
...@@ -11463,8 +11463,8 @@ ...@@ -11463,8 +11463,8 @@
}, },
"ssr-window": { "ssr-window": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz", "resolved": "https://registry.nlark.com/ssr-window/download/ssr-window-1.0.1.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==" "integrity": "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
}, },
"ssri": { "ssri": {
"version": "6.0.1", "version": "6.0.1",
...@@ -11971,12 +11971,11 @@ ...@@ -11971,12 +11971,11 @@
} }
}, },
"swiper": { "swiper": {
"version": "4.5.1", "version": "4.0.7",
"resolved": "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz", "resolved": "https://registry.npmmirror.com/swiper/download/swiper-4.0.7.tgz?cache=0&sync_timestamp=1632899438741&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fswiper%2Fdownload%2Fswiper-4.0.7.tgz",
"integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==", "integrity": "sha1-iRdcKiPYZiLtqDRHQMJKNwGmsnA=",
"requires": { "requires": {
"dom7": "^2.1.3", "dom7": "^2.0.1"
"ssr-window": "^1.0.1"
} }
}, },
"table": { "table": {
...@@ -12789,11 +12788,22 @@ ...@@ -12789,11 +12788,22 @@
}, },
"vue-awesome-swiper": { "vue-awesome-swiper": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz", "resolved": "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-3.1.3.tgz",
"integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==", "integrity": "sha1-BVALUB/7P+yb9+uZhbz0roNg7Z4=",
"requires": { "requires": {
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"swiper": "^4.0.7" "swiper": "^4.0.7"
},
"dependencies": {
"swiper": {
"version": "4.5.1",
"resolved": "https://registry.npmmirror.com/swiper/download/swiper-4.5.1.tgz?cache=0&sync_timestamp=1632899438741&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fswiper%2Fdownload%2Fswiper-4.5.1.tgz",
"integrity": "sha1-7UOZjngM60eGEAecjSP9Ql7KY28=",
"requires": {
"dom7": "^2.1.3",
"ssr-window": "^1.0.1"
}
}
} }
}, },
"vue-eslint-parser": { "vue-eslint-parser": {
......
src/components/avatorSwiper.vue
View file @ 3c6c5160
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<script> <script>
import { swiper, swiperSlide } from 'vue-awesome-swiper'; import { swiper, swiperSlide } from 'vue-awesome-swiper';
import 'swiper/dist/css/swiper.css'; import 'swiper/dist/css/swiper.css';
import Img2Thumb from '@/filters/img2Thumb.filter'; import Img2Thumb from '@/filters/img2Thumb.filter';
export default { export default {
name: 'AvatorSwiper', name: 'AvatorSwiper',
...@@ -45,7 +46,7 @@ export default { ...@@ -45,7 +46,7 @@ export default {
data() { data() {
const vm = this; const vm = this;
const isLoop = vm.avatorData.length < 9 ? false : true; const isLoop = vm.avatorData.length < 9 ? false : true;
const autoplay = isLoop ? { delay: 5000 } : false; const autoplay = isLoop ? { delay: 3000 } : false;
return { return {
timer: null, timer: null,
isLoop, isLoop,
...@@ -57,9 +58,10 @@ export default { ...@@ -57,9 +58,10 @@ export default {
initialSlide: 0, initialSlide: 0,
slidesPerView: 9, slidesPerView: 9,
spaceBetween: 4, spaceBetween: 4,
speed: 600, cssMode: true,
speed: 800,
centeredSlides: true, centeredSlides: true,
watchSlidesProgress: false, centeredSlidesBounds: true,
allowTouchMove: false, allowTouchMove: false,
autoplay, autoplay,
on: { on: {
...@@ -124,8 +126,8 @@ export default { ...@@ -124,8 +126,8 @@ export default {
// }, // },
getAvatorItem(ele) { getAvatorItem(ele) {
return { return {
src: ele.data('src'), src: ele.data('src') || '',
name: ele.data('name') name: ele.data('name') || ''
}; };
} }
} }
...@@ -154,14 +156,15 @@ export default { ...@@ -154,14 +156,15 @@ export default {
} }
.ani-left { .ani-left {
transform-origin: center; transform-origin: center;
animation: bigToSamll 0.6s linear; animation: bigToSamll 0.8s linear;
} }
.ani-right { .ani-right {
transform-origin: center; transform-origin: center;
animation: samllToBig 0.6s linear; animation: samllToBig 0.8s linear;
} }
.ani-opt { .ani-opt {
opacity: 0; opacity: 0;
transition: 0.1s linear;
} }
.avator_left, .avator_left,
.avator_right { .avator_right {
...@@ -171,18 +174,19 @@ export default { ...@@ -171,18 +174,19 @@ export default {
top: 0; top: 0;
} }
.avator_right { .avator_right {
right: 0; right: 0px;
} }
.avator_left { .avator_left {
left: 0; left: 0px;
} }
.avator-swiper { .avator-swiper {
position: relative; position: relative;
width: 100%; width: 262px;
margin: 0 auto;
&_item { &_item {
height: 32px; height: 32px;
width: 25px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -213,10 +217,19 @@ export default { ...@@ -213,10 +217,19 @@ export default {
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
} }
.avator-swiper_container { // .avator-swiper_container {
.swiper-slide-active { // .swiper-slide-active {
transform: scale(1.2); // transform: scale(1.2);
transition: transform 0.6s linear; // transition: transform 0.6s linear;
} // }
} // }
// .avator-swiper_container {
// .swiper-slide-active {
// transform: scale(1);
// transition: transform 0.6s linear;
// }
// .swiper-slide:not(.swiper-slide-active) {
// transform: scale(0.8);
// }
// }
</style> </style>
src/components/groupBuySuccessInfo.vue
View file @ 3c6c5160
...@@ -39,12 +39,13 @@ export default { ...@@ -39,12 +39,13 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.success-info { .success-info {
.text-14(); .text-14();
width: 327px;
color: @black; color: @black;
text-align: center; text-align: center;
height: 90px; height: 90px;
background: #f7f8f9; background: #f7f8f9;
border-radius: @border-radius-md + 2; border-radius: @border-radius-md + 2;
padding: 0 @padding-unit * 10 + 5; // padding: 0 @padding-unit * 10;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
......
src/components/groupSwiper.vue
View file @ 3c6c5160
...@@ -58,6 +58,7 @@ export default { ...@@ -58,6 +58,7 @@ export default {
initialSlide: 0, initialSlide: 0,
slidesPerView: 7, slidesPerView: 7,
// spaceBetween: 8, // spaceBetween: 8,
// cssMode: true,
speed: 600, speed: 600,
centeredSlides: true, centeredSlides: true,
centeredSlidesBounds: true, centeredSlidesBounds: true,
......
src/mixins/goodsCheck.mixin.js
View file @ 3c6c5160
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
message: '参与拼团活动需要您先进行登录哦~', message: '参与拼团活动需要您先进行登录哦~',
title: '', title: '',
closeOnClickOverlay: true, closeOnClickOverlay: true,
showCancelButton: false, showCancelButton: true,
confirmButtonText: '登录', confirmButtonText: '登录',
onConfirm: () => { onConfirm: () => {
if (isWxMp) { if (isWxMp) {
......
src/views/orderList/components/List.less
View file @ 3c6c5160
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
margin-bottom: @padding-sm; margin-bottom: @padding-sm;
} }
&__head { &__head {
padding: @padding-sm @padding-xs; height: 44px;
padding: 0 @padding-xs;
border-bottom: 1px solid @grey-border; border-bottom: 1px solid @grey-border;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -17,13 +18,35 @@ ...@@ -17,13 +18,35 @@
} }
&-image { &-image {
position: relative; position: relative;
display: inline-block; width: 25px;
width: 20px; height: 30px;
height: 25px; display: flex;
justify-content: center;
align-items: center;
text-align: center; text-align: center;
margin-right: 4px; margin-right: 4px;
background: url(~@/assets/images/leaderBorder.png) no-repeat center;
background-size: 100%;
}
&-crown,
&-leader {
position: absolute;
}
&-crown {
width: 10px;
height: 10px;
background: url(~@/assets/images/leaderIcon.png) no-repeat center;
background-size: 100%;
top: -2px;
right: -1px;
}
&-leader {
width: 100%;
height: 8px;
background: url(~@/assets/images/leader-name.png) no-repeat center;
bottom: 0px;
background-size: auto 100%;
} }
&-red { &-red {
color: @red; color: @red;
} }
...@@ -37,8 +60,8 @@ ...@@ -37,8 +60,8 @@
padding-right: @padding-unit; padding-right: @padding-unit;
} }
&-avator { &-avator {
margin-left: @padding-unit - 2; // margin-left: @padding-unit - 2;
margin-top: @padding-unit - 2; // margin-top: @padding-unit - 2;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
} }
......
src/views/orderList/components/List.vue
View file @ 3c6c5160
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
<div v-for="(item, index) in list" :key="index" class="Ol__item" @click="toDetail(item)"> <div v-for="(item, index) in list" :key="index" class="Ol__item" @click="toDetail(item)">
<div class="Ol__head"> <div class="Ol__head">
<div class="Ol__head-left"> <div class="Ol__head-left">
<span class="Ol__head-image"> <div class="Ol__head-image">
<cr-image class="Ol__head-avator" width="85%" :src="item.profilePhoto" /> <span class="Ol__head-crown" :src="item.profilePhoto" />
<cr-image class="Ol__head-group" src="@/assets/images/group.png" /> <cr-image class="Ol__head-avator" width="80%" :src="item.profilePhoto" />
</span> <span class="Ol__head-leader" :src="item.profilePhoto" />
<!-- <cr-image class="Ol__head-group" src="@/assets/images/group.png" /> -->
</div>
<span class="Ol__head-name">{{ item.nickname }}</span> <span class="Ol__head-name">{{ item.nickname }}</span>
</div> </div>
<div class="Ol__head-right"> <div class="Ol__head-right">
......
src/views/orderList/index.less
View file @ 3c6c5160
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
z-index: 3; z-index: 3;
& > div { & > div {
z-index: 3; z-index: 3;
.cr-tabs__item--active {
font-weight: bold;
& > .cr-tabs__text {
font-weight: bold;
}
}
} }
} }
} }
\ No newline at end of file
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