Merge branch 'dev/v1.0.56_wmh' of jianyu/web into feature/v1.0.56

apps/mobile/src/views/common/vipsubscribeRights.vue

@@ -13,56 +13,60 @@
         alt=""
       />
       <div class="scrollbox">
-        <van-swipe
-          type="card"
-          :height="tabheight"
-          :width="tabwidth"
-          :loop="false"
-          @change="cardscroll"
-          ref="card_"
-        >
-          <van-swipe-item
-            :default="index"
-            v-for="(item, index) in cardlist"
-            :key="index"
+        <div class="s-content">
+          <van-swipe
+            type="card"
+            :height="tabheight"
+            :width="tabwidth"
+            :loop="false"
+            @change="cardscroll"
+            ref="card_"
           >
-            <div
-              :class="{
-                'card-item': true,
-                'blue-item': item.color === 'blue',
-                'yellow-item': item.color === 'yellow',
-                'yellowb-item': item.color === 'yellowb'
-              }"
-              @click="itemclick(index)"
+            <van-swipe-item
+              :default="index"
+              v-for="(item, index) in cardlist"
+              :key="index"
             >
-              <div class="card-head">
-                <div class="left-text">{{ item.title }}</div>
+              <div
+                :class="{
+                  'card-item': true,
+                  'blue-item': item.color === 'blue',
+                  'yellow-item': item.color === 'yellow',
+                  'yellowb-item': item.color === 'yellowb'
+                }"
+                @click="itemclick(index)"
+              >
+                <div class="card-head">
+                  <div class="left-text">{{ item.title }}</div>
+                  <div
+                    :class="{
+                      'right-btn': true,
+                      'btn-blue': item.color === 'blue',
+                      'btn-yellow': item.color === 'yellow',
+                      'btn-yellowb': item.color === 'yellowb'
+                    }"
+                    @click.stop="cardClick(item)"
+                  >
+                    {{
+                      item.title === '超级订阅' ? viperbtnText : memberbtnText
+                    }}
+                  </div>
+                </div>
                 <div
                   :class="{
-                    'right-btn': true,
-                    'btn-blue': item.color === 'blue',
-                    'btn-yellow': item.color === 'yellow',
-                    'btn-yellowb': item.color === 'yellowb'
+                    'tag-text': true,
+                    'tag-blue': item.color === 'blue',
+                    'tag-yellow': item.color === 'yellow',
+                    'tag-yellowb': item.color === 'yellowb'
                   }"
-                  @click.stop="cardClick(item)"
                 >
-                  {{ item.title === '超级订阅' ? viperbtnText : memberbtnText }}
+                  {{ item.tag }}
                 </div>
+                <div class="card-desc" v-html="item.desc"></div>
               </div>
-              <div
-                :class="{
-                  'tag-text': true,
-                  'tag-blue': item.color === 'blue',
-                  'tag-yellow': item.color === 'yellow',
-                  'tag-yellowb': item.color === 'yellowb'
-                }"
-              >
-                {{ item.tag }}
-              </div>
-              <div class="card-desc" v-html="item.desc"></div>
-            </div>
-          </van-swipe-item>
-        </van-swipe>
+            </van-swipe-item>
+          </van-swipe>
+        </div>
       </div>
     </div>
     <div class="content_box">
@@ -323,9 +327,23 @@ export default {
     },
     itemclick(index) {
       this.setswipeTo(index)
+      if (index == 1) {
+        let dom = document.querySelector('.van-swipe__track')
+        this.$nextTick(() => {
+          setTimeout(() => {
+            dom.style.transform = `translateX(-${px2px('305px')})`
+          }, 150)
+        })
+      }
     },
     cardscroll(val) {
       this.tab = val
+      if (this.tab == 1) {
+        let dom = document.querySelector('.van-swipe__track')
+        this.$nextTick(() => {
+          dom.style.transform = `translateX(-${px2px('305px')})`
+        })
+      }
     },
     setswipeTo(val) {
       this.$refs.card_.swipeTo(val)
@@ -1294,8 +1312,14 @@ export default {
       padding-left: 12px;
       width: 100%;
       height: 148px;
+      .s-content {
+        // margin-left: 12px;
+      }
 
       ::v-deep {
+        .van-swipe {
+          overflow: visible;
+        }
         .card-item {
           width: 315px;
           height: 142px;
@@ -1385,7 +1409,7 @@ export default {
             #f4feff 55.8%,
             #e4fcff 100%
           );
-          box-shadow: 2px 4px 6px 0px #017e9533;
+          box-shadow: 2px 4px 14px 0px #017e9533;
         }
 
         .yellow-item {
@@ -1395,7 +1419,7 @@ export default {
             #fffaf2 51.55%,
             #ffecd0 100%
           );
-          box-shadow: 2px 4px 6px 0px #84500033;
+          box-shadow: 2px 4px 14px 0px #84500033;
         }
 
         .yellowb-item {
@@ -1405,7 +1429,7 @@ export default {
             #fff5ee 57.07%,
             #ffdec6 100%
           );
-          box-shadow: 2px 4px 6px 0px #84500033;
+          box-shadow: 2px 4px 14px 0px #84500033;
         }
 
         .van-swipe__indicators {

apps/mobile/src/views/order/components/vipsubscribe/BuyTip.vue

@@ -83,7 +83,7 @@ export default {
   .popupBox {
     width: 303px;
     background-image: url('@/assets/image/vip-subscribe/popup-bg.png');
-    background-size: cover;
+    background-size: contain;
     background-repeat: no-repeat;
     border-radius: 12px;
     .header {