Merge remote-tracking branch 'origin/master'

public/css/phone.scss

@@ -1987,7 +1987,7 @@ i, em {
   }
 
   //举报
-  .reportElDialog,.applyElDialog,.successApplyDialog,.commentElDialog,.shareDialog{
+  .reportElDialog,.applyElDialog,.successApplyDialog,.commentElDialog,.shareDialog,.commentElTopicDialog{
     .el-dialog__header{
       border-bottom: 1px solid #E8EAF3;
       margin: 0 .2rem;
@@ -2135,7 +2135,7 @@ i, em {
     width: .23rem;
     height: .26rem;
   }
-  .commentElDialog,.shareDialog{
+  .commentElDialog,.shareDialog,.commentElTopicDialog{
     .el-dialog__header{
       margin: 0 .2rem;
       height: 1.1rem;
@@ -2174,6 +2174,11 @@ i, em {
       }
     }
   }
+  .commentElTopicDialog .el-dialog{
+    position: fixed;
+    top: 0;
+    bottom: unset;
+  }
   .textareaDetail{
     .el-textarea .el-input__count{
       line-height: 20px !important;

src/components/mobile/applyLogin.vue

@@ -232,7 +232,11 @@
                     if(res.code==0){
                         that.commonResResult(res.result);
                     }else{
-                        that.$toast(res.msg);
+                        this.$toast({
+                            message: res.msg,
+                            duration: 2000,
+                            className: 'noticeError'
+                        });
                         that.timeOutReturn();
                     }
                 }).catch((err)=>{
@@ -289,7 +293,11 @@
                         });
                     }
                 }).catch((err)=>{
-                    that.$toast(err)
+                    this.$toast({
+                        message: err,
+                        duration: 2000,
+                        className: 'noticeError'
+                    });
                 })
             },
 

src/components/mobile/faceCmpt1.vue

@@ -439,7 +439,7 @@
             handleShowEle(event) {
                 var u = navigator.userAgent;
                 if(u.indexOf('Android') > -1 || u.indexOf('Adr') > -1){
-                    document.getElementById("hbl-fa").setAttribute("class","absoluteDiv");
+                    this.$emit("showDialogAndroid",true);
                 }
                 if (event.srcElement.setSelectionRange) {
                     setTimeout(function () {
@@ -533,10 +533,8 @@
                 if (navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
                     globalMsg.$emit("scrollToTop");
                 }
-                var u = navigator.userAgent;
-                if(u.indexOf('Android') > -1 || u.indexOf('Adr') > -1){
-                    document.getElementById("hbl-fa").classList.remove("absoluteDiv");
-                }
+                this.$emit("showDialogAndroid",false);
+
             },
 
             //让input获取焦点

src/components/mobile/topicCommentCmpt.vue

 <template>
     <div>
-        <el-dialog :class="[className,'commentElDialog',!isReply?'noBorderTitleDialog':'']"
+        <el-dialog :class="[className,androidDialog?'commentElTopicDialog':'commentElDialog',!isReply?'noBorderTitleDialog':'']"
                    :visible.sync="visible"
                    :before-close="handleClose"
                    width="100%"
@@ -9,7 +9,7 @@
                    :close-on-click-modal="true"
                    :modal-append-to-body="false"
         >
-            <comment @publishComment="publishComment" :faceVisible="visible" :isEmpty="isEmpty" :isHasReward="isHasReward" :topicTitle="topicTitle" :commentType="1" :replyCreatedBy="replyCreatedBy?replyCreatedBy:''"></comment>
+            <comment @publishComment="publishComment" @showDialogAndroid="showDialogAndroid" :faceVisible="visible" :isEmpty="isEmpty" :isHasReward="isHasReward" :topicTitle="topicTitle" :commentType="1" :replyCreatedBy="replyCreatedBy?replyCreatedBy:''"></comment>
         </el-dialog>
     </div>
 </template>
@@ -35,6 +35,7 @@
                 firstNum:null,
                 lastNum:null,
                 isEmpty:false,
+                androidDialog:false
             }
         },
         components:{
@@ -80,6 +81,10 @@
                 }
             },
 
+            showDialogAndroid(data){
+                this.androidDialog = data;
+            },
+
             //发布
             publishComment(data){
                 let params;

src/main.js

@@ -147,11 +147,6 @@ if(vvv!=process.env.VUE_APP_UPDATED){
     location.reload();
 }
 router.beforeEach((to, from, next) => {
-    // 强制给index.html 加上时间戳
-    // if (document.URL.indexOf('t=') < 0) {
-    //     let timestamp = (new Date()).valueOf()
-    //     window.location.href = '/index.html?t=' + timestamp + '#' + to.fullPath
-    // }
     store.dispatch("routerToPathAction", to.fullPath);
     if (to.name == "mobileLoginCmpt"||to.name=="emailLoginCmpt") {
         cancelRequest.cancelRequest()
@@ -257,6 +252,20 @@ router.beforeEach((to, from, next) => {
     }
     next();
     document.body.scrollTop=document.documentElement.scrollTop=0;
+    // // 强制给index.html 加上时间戳
+    // if (document.URL.indexOf('t=') < 0) {
+    //     let timestamp = (new Date()).valueOf(),hrefVal;
+    //     if(to.path=="/"){
+    //         hrefVal = document.location.href.split("#/")[0] + '#' + to.fullPath+'t=' + timestamp;
+    //     }else{
+    //         hrefVal = document.location.href.split("#/")[0]+'index.html?t=' + timestamp + '#' + to.fullPath;
+    //     }
+    //     window.location.href =hrefVal;
+    // }
+    if(to.path!=from.path){
+        cancelRequest.cancelRequest()
+
+    }
 });
 
 // router.onError((error) => {

src/views/mobile/topic/detail.vue

@@ -1804,12 +1804,17 @@
                         /deep/ .pswp__img {
                             height: unset !important;
                             position: static;
+                            width: 100% !important;
+                        }
+                        /deep/ .pswp__img--placeholder{
+                            width: 0 !important;
                         }
                         /deep/ .pswp__zoom-wrap {
                             margin: auto;
                             height: 100vh;
                             transform: unset !important;
                             display: flex;
+                            flex-wrap: wrap;
                             align-items: center;
                         }
                     }
@@ -1832,6 +1837,10 @@
                         /deep/ .pswp__img {
                             height: unset !important;
                             position: static;
+                            width: 100% !important;
+                        }
+                        /deep/ .pswp__img--placeholder{
+                            width: 0 !important;
                         }
                         /deep/ .pswp__zoom-wrap {
                             margin: auto;

src/views/mobile/topic/discussdetail.vue

@@ -1112,6 +1112,9 @@
                     height: unset !important;
                     position: static;
                 }
+                /deep/ .pswp__img--placeholder{
+                    width: 0 !important;
+                }
                 /deep/ .pswp__zoom-wrap {
                     margin: auto;
                     height: 100vh;