Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -3,7 +3,7 @@
       <div v-if="validStatus === 1">
       <div v-if="validStatus === 1">
           <div class="account">
           <div class="account">
               <p class="account-tip">支付宝账号</p>
               <p class="account-tip">支付宝账号</p>
-              <p class="account-name">{{alipayAccount}}</p>
+              <p class="account-name">{{alipayAccount?alipayAccount:nickName}}</p>
           </div>
           </div>
           <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如
           <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如
 需要帮助可致电<a class="phone" href="tel:400-8890-9646"> 400-8890-9646 </a>联系电话客服</span></p>
 需要帮助可致电<a class="phone" href="tel:400-8890-9646"> 400-8890-9646 </a>联系电话客服</span></p>
@@ -26,7 +26,7 @@ export default {
       this.fetchUserAliPayAccount()
       this.fetchUserAliPayAccount()
   },
   },
   computed: {
   computed: {
-      ...mapState(['alipayAccount','certName', 'validStatus'])
+      ...mapState(['alipayAccount','certName', 'validStatus','nickName'])
   },
   },
   methods: {
   methods: {
       ...mapActions(['fetchUserAliPayAccount']),
       ...mapActions(['fetchUserAliPayAccount']),

@@ -25,12 +25,8 @@
         <!-- 商品信息 -->
         <!-- 商品信息 -->
         <order-item-info class="item-wrapper" />
         <order-item-info class="item-wrapper" />
         <!-- 鉴定视频 -->
         <!-- 鉴定视频 -->
-        <div
-          class="video-img"
-          v-if="orderDetail.appraiseVideoUrl"
-          @click="() => onVideoHandler()"
-        ></div>
-        <div ref="videoWrapper" class="video-wrapper">
+        <div class="video-img" v-if="orderDetail.appraiseVideoUrl" @click="() => onVideoHandler()"></div>
+        <div class="video-wrapper">
           <VideoPlayer
           <VideoPlayer
             ref="videoPlayer"
             ref="videoPlayer"
             class="video-player"
             class="video-player"
@@ -215,12 +211,13 @@ export default {
   }
   }
 
 
   .video-img {
   .video-img {
+    display: block;
     margin-top: 40px;
     margin-top: 40px;
-    margin-left: -15px;
-    width: calc(100% + 20px);
+    width: 100%;
     height: 378px;
     height: 378px;
-    background: url("~statics/image/order/video-big@3x.png");
+    background: url("~statics/image/order/video-big@3x.png") no-repeat;
     background-size: cover;
     background-size: cover;
+    background-position: center;
   }
   }
 
 
   .video-wrapper {
   .video-wrapper {
@@ -229,7 +226,7 @@ export default {
 
 
   .video-player {
   .video-player {
     display: block;
     display: block;
-    height: 30px;
+    height: 40px;
     opacity: 0;
     opacity: 0;
   }
   }
 
 

@@ -122,7 +122,7 @@ export default {
     }
     }
   },
   },
   mounted() {
   mounted() {
-    this.showPlayer();
+    // this.showPlayer();
   },
   },
   beforeDestroy() {
   beforeDestroy() {
     if (this.player) {
     if (this.player) {
@@ -131,8 +131,10 @@ export default {
   },
   },
   methods: {
   methods: {
     parentHandleclick() {
     parentHandleclick() {
-      this.showVideo = true;
+      this.showPlayer();
+
       this.player.play();
       this.player.play();
+
       const timeId = setTimeout(() => {
       const timeId = setTimeout(() => {
         this.player.requestFullscreen();
         this.player.requestFullscreen();
         clearTimeout(timeId);
         clearTimeout(timeId);
@@ -143,6 +145,7 @@ export default {
         return;
         return;
       }
       }
 
 
+      this.showVideo = true;
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.initPlayer();
         this.initPlayer();
       });
       });
@@ -187,14 +190,6 @@ export default {
           this.voiceBtn.removeClass(noVioceClass);
           this.voiceBtn.removeClass(noVioceClass);
         }
         }
       });
       });
-
-      // setTimeout(() => {
-      //   this.$yoho.getNetStatus({}, res => {
-      //     if (res && +res.wifi === 1) {
-      //       this.player.autoplay("muted");
-      //     }
-      //   });
-      // }, 1000);
     },
     },
     getTime() {
     getTime() {
       return new Date().getTime();
       return new Date().getTime();

@@ -29,7 +29,7 @@
                 @on-video="params => onVideoHandle(params)"
                 @on-video="params => onVideoHandle(params)"
               />
               />
             </div>
             </div>
-            <div ref="videoWrapper" class="video-wrapper">
+            <div class="video-wrapper">
               <VideoPlayer
               <VideoPlayer
                 :ref="order.orderCode"
                 :ref="order.orderCode"
                 class="video-player"
                 class="video-player"
@@ -115,15 +115,6 @@ export default {
         $video.parentHandleclick();
         $video.parentHandleclick();
       }
       }
     }
     }
-  },
-
-  mounted() {
-    if (this.$yoho.isAndroid) {
-      this.$refs.videoWrapper.forEach($vnode => {
-        $vnode.style.position = "absolute";
-        $vnode.style.top = "-1000px";
-      });
-    }
   }
   }
 };
 };
 </script>
 </script>

@@ -5,6 +5,7 @@ export default function() {
     state: {
     state: {
       alipayAccount: '',
       alipayAccount: '',
       certName: '',
       certName: '',
+      nickName: '',
       validStatus: 0
       validStatus: 0
     },
     },
     mutations: {
     mutations: {
@@ -12,10 +13,12 @@ export default function() {
         let {
         let {
           alipayAccount,
           alipayAccount,
           certName,
           certName,
+          nickName,
           validStatus
           validStatus
         } = data;
         } = data;
 
 
         state.alipayAccount = maskAccount(alipayAccount);
         state.alipayAccount = maskAccount(alipayAccount);
+        state.nickName = nickName || '';
         state.certName = certName;
         state.certName = certName;
         state.validStatus = validStatus;
         state.validStatus = validStatus;
       }
       }