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

src/App.vue

@@ -55,7 +55,10 @@ export default {
     },
     $route() {
       this.$nextTick(() => {
-        document.querySelectorAll('.cr-overlay').forEach(e => e.parentNode.removeChild(e));
+        this.$refs.gdShare.shareCloseChange(); //切换页面隐藏分享弹窗
+        document
+          .querySelectorAll('.cr-overlay')
+          .forEach(e => !e.parentNode.className.includes('share') && e.parentNode.removeChild(e));
         store.dispatch('change_show_mini_app_guide', {
           bool: !isApp && !isWxMp && !isWechat ? true : false,
           pointer: this

src/components/avatorSwiper.vue

@@ -45,7 +45,7 @@ export default {
   data() {
     const vm = this;
     const isLoop = vm.avatorData.length < 9 ? false : true;
-    const autoplay = isLoop ? { delay: 3000 } : false;
+    const autoplay = isLoop ? { delay: 1500 } : false;
     return {
       timer: null,
       interTimer: null,
@@ -77,13 +77,14 @@ export default {
             slideLeft.addClass('ani-opt');
             slideRight.addClass('ani-opt');
             vm.isAddClass = true;
-            clearTimeout(vm.timer);
-            vm.timer = setTimeout(() => {
-              vm.oneTransLate(vm.getAvatorItem(slideRight));
-              clearTimeout(vm.timer);
-            }, 1000);
+            // clearTimeout(vm.timer);
+            // vm.timer = setTimeout(() => {
+            //   vm.oneTransLate(vm.getAvatorItem(slideRight));
+            //   clearTimeout(vm.timer);
+            // }, 1000);
           },
           transitionEnd: function() {
+            vm.oneTransLate(vm.getAvatorItem(this.slides.eq(this.activeIndex + 4)));
             for (let i = 0; i < this.slides.length; i++) {
               let slide = this.slides.eq(i);
               slide.removeClass('ani-opt');

src/components/groupShare.vue

@@ -164,13 +164,13 @@ export default {
         return `/pages/groupbuy/webview?url=${encodeURIComponent(JSON.stringify(linkPath))}`;
       }
       // // 本地测试时走的逻辑
-      if (isApp) {
-        const linkPrve = `https://mall.q-gp.com/common/launch?wxapp=gh_e1d790d67513&jumpUrl=${encodeURIComponent(
-          'pages/groupbuy/webview'
-        )}&terminal=1`;
-        const linkParams = encodeURIComponent(JSON.stringify({ url: linkPath }));
-        return `${linkPrve}&extraInfo=${linkParams}`;
-      }
+      // if (isApp) {
+      //   const linkPrve = `https://mall.q-gp.com/common/launch?wxapp=gh_e1d790d67513&jumpUrl=${encodeURIComponent(
+      //     'pages/groupbuy/webview'
+      //   )}&terminal=1`;
+      //   const linkParams = encodeURIComponent(JSON.stringify({ url: linkPath }));
+      //   return `${linkPrve}&extraInfo=${linkParams}`;
+      // }
       return linkPath;
     },
     shareOpenWechat() {
@@ -211,7 +211,6 @@ export default {
     openTenetPosterUrl() {
       // 打开小程序的海报下载页面
       const { posterUrl } = this.shareInfo;
-      console.log(posterUrl);
       this.nativeBridge.openNewUrl({
         newUrl: `/pages/groupbuy/goodshare?url=${encodeURIComponent(JSON.stringify(posterUrl))}`
       });

src/components/groupSwiper.vue

@@ -45,7 +45,7 @@ export default {
   data() {
     const vm = this;
     const isLoop = vm.avatorData.length < 7 ? false : true;
-    const autoplay = isLoop ? { delay: 1500, reverseDirection: true } : false;
+    const autoplay = isLoop ? { delay: 1000, reverseDirection: true } : false;
     return {
       timer: null,
       interTimer: null,
@@ -77,18 +77,14 @@ export default {
             vm.leftImgPath = slideLeft.data('src');
             slideLeft.addClass('ani-opt');
             slideRight.addClass('ani-opt');
-            clearTimeout(vm.timer);
-            vm.timer = setTimeout(() => {
-              vm.oneTransLate(vm.getAvatorItem(slideLeft));
-              clearTimeout(vm.timer);
-            }, 800);
           },
           transitionEnd: function() {
-            vm.isAnimate = false;
+            vm.oneTransLate(vm.getAvatorItem(this.slides.eq(this.activeIndex - 3)));
             for (let i = 0; i < this.slides.length; i++) {
               let slide = this.slides.eq(i);
               slide.removeClass('ani-opt');
             }
+            vm.isAnimate = false;
           }
         }
       }
@@ -140,11 +136,11 @@ export default {
 <style lang="less" scoped>
 @keyframes leftToRight {
   from {
-    transform: scale(0.3);
+    transform: scale(0.3) translate3d(0, 0, 0);
     opacity: 0;
   }
   to {
-    transform: scale(1);
+    transform: scale(1) translate3d(0, 0, 0);
     opacity: 1;
   }
 }