合并分支 'dev' 到 'master'

Publisher 自动合并请求 [fOyCnc0pn6-k2kOJJaVBf]

## test


------

## test


------

## fix
1. 修复关闭后的打赏面板回到0位置


------

## 合并分支 'test' 到 'dev'

Test



查看合并请求 !157

------



查看合并请求 !158

components/suspension/reward/rewardNew.vue

@@ -4,12 +4,12 @@
           <div style="width:100%;height: auto;border-radius: 15px 15px 0 0;overflow: hidden;">
           <div style="background: rgba(0, 0, 0, 0.9); width:100%;height: auto" @click.stop>
             <div class="top-box">
-              <div class="tab-box">
-                <div :class="{ 'z-active': list[tabIndex].nameKey === 'gift' }" @click.stop="_tabSwitch(0)"
+              <div class="tab-box" v-show="swiper">
+                <div :class="{ 'z-active': list[tabIndex].nameKey === 'gift' }" @click.stop="_tabSwitch('0')"
                   v-if="list.some(item => item.nameKey === 'gift')">
                   礼物
                 </div>
-                <div :class="{ 'z-active': list[tabIndex].nameKey === 'cash' }" @click.stop="_tabSwitch(1)"
+                <div :class="{ 'z-active': list[tabIndex].nameKey === 'cash' }" @click.stop="_tabSwitch('1')"
                  v-if="list.some(item => item.nameKey === 'cash')">
                   现金打赏
                 </div>
@@ -88,7 +88,7 @@ export default {
       this.$emit('input', false)
     },
     _tabSwitch(index) {
-      this.swiper && this.swiper.slideTo(index + '' || this.tabIndex + '');
+      this.swiper.slideTo(index + '' || this.tabIndex + '');
     },
     _initSwiper() {
      const self = this;
@@ -106,9 +106,11 @@ export default {
   watch: {
     value(newVal) {
       if (newVal){
-        this.tabIndex = 0
         this.$nextTick(() => {
           this._initSwiper();
+          this.$nextTick(() => {
+            this.swiper.slideTo(this.tabIndex)
+          })
         });
       }
     }