提交4个

public/css/phone.scss

@@ -1211,7 +1211,7 @@ i, em {
     }
   }
 
-  .mobileLoginWrapper,.mobileLoginformWrap,.redEnvelopeLogin{
+  .mobileLoginWrapper,.mobileLoginformWrap,.redEnvelopeLogin,.applyLoginDialog{
     .yzcodeItem .el-form-item__content {
       width: 100%;
     }

src/components/shareCmpt.vue

@@ -194,6 +194,8 @@
                         if(this.isActivityList){
                             shareUrl = '/pages/shareline/shareline?isShareSubject=true&url='+ JSON.stringify(query);
                         }else{
+                            query.proId = that.detailInfo.projectId;
+                            query.activityId = that.$route.query.id;
                             shareUrl = '/pages/shareline/shareline?isShareSubjectProject=true&url='+ JSON.stringify(query);
                         }
                         wx.miniProgram.navigateTo({

src/main.js

@@ -220,7 +220,7 @@ router.beforeEach((to, from, next) => {
         if (i18n.locale== "zh-CN") router.replace({path:'/loginByPhone',query:to.query});
     }
     if(!publicFun.getUserInfoCookieType()){
-        if(to.matched[0].name == 'index'||to.matched[0].name=='indexView'|| to.matched[0].name == 'login'||to.matched[0].name=="mobileLogin"||to.matched[0].name=="mobileNotNeedLogin"||to.matched[0].name=="notLoginLtrIndex"||(to.matched.length==1&&to.name.indexOf("ParentRouter")!=-1)){
+        if(to.matched[0].name == 'index'||to.matched[0].name=='indexView'|| to.matched[0].name == 'login'||to.matched[0].name=="mobileLogin"||to.matched[0].name=="mobileNotNeedLogin"||to.matched[0].name=="notLoginLtrIndex"||to.matched[0].name=="noHeaderIndexParentRouter"||(to.matched.length==1&&to.name.indexOf("ParentRouter")!=-1)){
             if(to.path == '/projectlist' || to.path == '/phoneBusinessList'){
                 publicFun.setUserInfoCookie("fullPath",true);
             }else{

src/views/mobile/index/index.vue

@@ -2318,6 +2318,12 @@
         height: 100%;
         box-sizing: border-box;
         overflow-y: scroll;
+        ::-webkit-scrollbar {
+            display: none;
+            background-color: transparent !important;
+
+
+        }
     }
 
     .indexContentWrapper {

src/views/mobile/proFeedback/secondStage.vue

@@ -294,6 +294,9 @@
                 var isMini = /miniProgram/i.test(userAgent);
                 var urlData = this.isActivityList?document.location.href:document.location.href.split("#/")[0]+"#/secondStageDetail?subId="+that.currentData.id+"&proId="+that.currentData.projectId+"&activityId="+that.$route.query.id+"&stage="+this.$route.query.stage;
                 query.isList = this.isActivityList;
+                query.proId = that.currentData.projectId;
+                query.activityId = that.$route.query.id;
+
                 if(isMini){
                     if(data==2){
                         if(that.isActivityList){

src/views/mobile/topic/detail.vue

@@ -1618,7 +1618,7 @@
         padding-top: .3rem;
         display: flex;
         .rightInfo {
-            width: calc(100% - 2.55rem);
+            width: calc(100% - 2rem);
             padding-left: .25rem;
             color: #fff;
             text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.5);