浏览代码

Merge branch 'dev3.1' of http://192.168.3.207:10080/qmx/jy into dev3.1

zhangyuhan 4 年之前
父节点
当前提交
8f367b5359

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_memberdetail.html

@@ -402,11 +402,11 @@
             retunn
         }
         if (window.location.host.indexOf("test") > -1) {
-            imgSrc += "https://web2-qmxtest.jianyu360.cn"
+            imgSrc = "https://web2-qmxtest.jianyu360.cn" + imgSrc
         } else if (window.location.host.indexOf("com") > -1) {
-            imgSrc += "https://www.qmx.top"
+            imgSrc = "https://www.qmx.top" + imgSrc
         }
-        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;top: 0px;"><img style="margin-top: 3rem;padding: .3rem;" src="' + imgSrc + '"></div>')
+        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;"><img src="' + imgSrc + '"></div>')
     }
 </script>
 {{include "/common/baiducc.html"}}

+ 3 - 2
src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_list.html

@@ -111,8 +111,9 @@
             // 取消关注重新赋值list
             var isCancel = sessionStorage.getItem('isCancel')
             if(isCancel){
-                this.list = []
-                this.getProjectList()
+                // this.list = []
+                // this.getProjectList()
+                location.reload()
                 sessionStorage.removeItem('isCancel')
             }
         },

+ 3 - 3
src/web/templates/weixin/member/memberdetail.html

@@ -393,11 +393,11 @@
             retunn
         }
         if (window.location.host.indexOf("test") > -1) {
-            imgSrc += "https://web2-qmxtest.jianyu360.cn"
+            imgSrc = "https://web2-qmxtest.jianyu360.cn" + imgSrc
         } else if (window.location.host.indexOf("com") > -1) {
-            imgSrc += "https://www.qmx.top"
+            imgSrc = "https://www.qmx.top" + imgSrc
         }
-        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;top: 0px;"><img style="margin-top: 3rem;padding: .3rem;" src="' + imgSrc + '"></div>')
+        $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;"><img src="' + imgSrc + '"></div>')
     }
 
 </script>