zhangyuhan 4 жил өмнө
parent
commit
f1348c1588

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/local/layout.css

@@ -349,6 +349,7 @@ ul, li, ol {
 .badge-number {
     font-size: 11px;
     line-height: 15px;
+    min-width: 15px;
     color: #fff;
     background: #FB483D;
     padding: 0 4px;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 34 - 0
src/jfw/modules/app/src/web/templates/big-member/page_contrast.html


+ 1 - 1
src/jfw/modules/app/src/web/templates/me/mine.html

@@ -247,7 +247,7 @@
     <script>
         function getOfflineMessageCount () {
             try {
-                var nowPlatform = 'h5';
+                var nowPlatform = 'app';
                 (function (w, d, e, x) {
                     w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
                     x = d.createElement('script');

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/notice.html

@@ -115,7 +115,7 @@
     }
     function getOfflineMessageCount () {
         try {
-            var nowPlatform = 'h5';
+            var nowPlatform = 'app';
             (function (w, d, e, x) {
                 w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
                 x = d.createElement('script');

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
src/web/templates/big-member/pc/page_index.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 34 - 1
src/web/templates/big-member/wx/page_index.html


+ 115 - 21
src/web/templates/weixin/my.html

@@ -14,9 +14,32 @@
     <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/css/merge-wx.css?v={{Msg "seo" "version"}}">
 	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>   
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
+.icon-customer {
+    display: inline-block;
+    width: .48rem;
+    height: .48rem;
+    margin-right: .32rem;
+    background-color: transparent;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAATTSURBVHgB7Zg/b9tGFMDfHeUm9VJ1KtqkCLul7lDZUiNZSlFy6xZ562Z57CT5E8gZO1kdO0X+BLbmIpGA2q4cKxaTqVsUwEUzCkXhFJbJ13cUKdM0aZLSFe2gHyCIPN7de+/+vPfuAObMmTPnv4SBJDKaloa//s6kFOURAmiAoFLvafsjwpCeDXoamGi1jOe/7oEkZjZAKM7PzqsMWG2icDQD+nVMZj42ut0BzIACM5DNr1b5CPcYY9+S8rcTNBWGZjjw8sd377I/fj/twpRMNQP2qL8bbVPjCsihab6/sGl0OkNISGIDhPKpd6M2rfOM/xvSWmcMdwCVzgIf0eoYL49CoaBeQEpFCyvI8BtabmpA1wYZoSc1IrEBuXyp71deKM45+/HidqoRR4GV1VKNmVAP2DPGi6ODZUhAIgNW8iWxbGp+obQZ15JuxgzNCkfe9s8Gs6DROz7YjNlNfAMyD1bLCuO7vuKppn3SZ0ZLK++N2qTFlRllJtN7vf1OnD44xERhbNv7jsKni5GfUnmBYXSG5vmCjoCDK30r+CRuH7EMWPmqWKFxUb1lFjP1WX24QBjBGd/wFatjmdHEMoBxtu4raspQ3qXXpeWCsBMhM5BIA8RmA5EaeBARFCRjcnPLV6QtF4v3otrdaIDw+QoqdW8ZjtOAfweRM3ngJjScAQwl1AuJhgq5Of/adxAbWJe1jGaRFToDiqXshnQoIIFKGyRxg/KurFCvFGgAjYjm9c2UrOkUIRkgX/NMs5rLPdRgRrIPvi67yovl6cqilMPrmbQwWYEGcGSewIIt20sQL57/soci13GwuKXBjCCYgbJOuodNC61LWcxSg9oHLyFkkxyF8hzDJ3HqwBWJr29KMwaeFzWoSexI/H9lboDLUvtlfenZS/zi6avtsDqfP3vVjqqTFHkzgLBl/zGs3f+5r/k/Lz3tV8iNaW4dkEQKJEHKdRCYJp65wndJ4c2zP8G+fVhMp6oMrRpOKmMTJBFsAFK64MRo8sv3fJoG3jyY5LfJ/fZhfGBPUzb2ZPEDGAcgtAAnXcOA0ufgXMrXN2Pw5eULBnq/4Dig8IHnteKmtplcQSO7Hl3Kw4mL/U1fHsCFpd+UK9nKM0u367qyOO9c9sfWs9nVsiuLSsqTeqZiBPUZmgtl8yWRKmhwgzInRwef+cvvt/sqHQvLNHOUDrsBkQxFbJ1xaAz05WsjuZIvvg456LuEnpVD9wAlUBtBZ1ZXeXGgCWrnjG7D+cWCoqweIWstrG3oxdbb09PhR5/eaVHHH5LXSFPnaefa5CcS+L3MA42Q9ckd9Q2t8+/cMuem4wc6c28Y+/tvw9pKuxt1EalxCpUqwvXNjohvKH+6dpoT613hlP06m9id4TiDJNWAbKG0TtKbEdWG3EL9+PjQcG746t6rmiTKC+TdTtuHEuV1zOpDmo2G/0I4qfICaYGMYkDZqwhYAb6eQ93ZqGnyUlu+rx1SfiPp3pJmgJ2Cu/OJuHNyfNj0V8nmiyKGqFeaic3K4HHv6CC21/IizwA7Uo4toNGtkrIURZnf55c9z5R6WC1r8VbzZIbLMXl7gK4J+a3zfkRAsgkLgtMgLRsVN2wiIPmvCQPohAXBaZAeBwS5wkPNMq+fYSlqGsJ9wpw5c+a4/AP3DxdK/hdlwgAAAABJRU5ErkJggg==);
+}
+.badge-number {
+    font-size: 11px;
+    line-height: 15px;
+    min-width: 15px;
+    color: #fff;
+    background: #FB483D;
+    padding: 0 4px;
+    display: inline-block;
+    text-align: center;
+    white-space: nowrap;
+    border-radius: 40px;
+}
 .message > img{
 	width: .48rem;
     height: .48rem;
@@ -41,7 +64,7 @@
                  <a href="#" class="set_email" style="display:none">
                     <span>邮箱设置</span>
                     <i class="iconfont icon-arrow"></i>
-                </a> 
+                </a>
                 <a class="user_email" style="display:none">
                     <span></span>
                     <i class="iconfont icon-arrow"></i>
@@ -124,7 +147,17 @@
                 </div>
                 <img class="arrow_right" src="/images/wx/persional/my_arrow_right.png" alt="">
             </a>
-            <a class="menu_list feedback">
+            <a class="menu_list" href="/jyapp/free/customer">
+                <div class="menu_list_left">
+                    <span class="j-icon base-icon icon-customer"></span>
+                    <span class="label">人工客服</span>
+                </div>
+                <div class="menu_list_right">
+                    <span class="badge-number" style="display: none;"></span>
+                    <img class="arrow_right" src="/images/wx/persional/my_arrow_right.png" alt="">
+                </div>
+            </a>
+            <a class="menu_list feedback" style="display: none;">
                 <div class="menu_list_left">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANfSURBVHgB7ZjNThNRFMfPmQ5DiZtiTfyKSX2DBlQa2AxvoEtXDAQTTDStT0B9Aoe4EIPR8gTAE9AFJrjQ1CegC6JYP5iNSEvnHu+UDum003Lnoy0k80uazsy9p/P/d86de+4FiIiIiBgmCB5ZXHqmIsayDCANIYEIBhKUTWJb71dfFzzFinbUcrmEXKUNfqhCfynWR/FRQdcNkc4SCDJSo23ov3gLtflHCSFkYGEppxGFlzICqAtLzzWRjrJIJwlpznEBoQQMX/DgMoSAaUKCZPoALeNKQsm6Z+G8WCED0JY6dcZzdFUvQ4jwMTbLU+ew5ZLQExceA62ELb7xm52DNiES58vARUI0hbqiPcmlZZleEUDKS1zj3X+C82tregkCENjAiEwblnjPMyIP4gPXejWPQwACpxAJ5mq/6GkgfS+jTk7NbPfqwwBfgl8IV3o183vvTdyf1nr1wR7BZzPvjZu3IJlMgqKMNtrevVlxxFllRvzY25M4joPR/uZZfJol69s061CpVODg+7dmC22aY8p8qVjsKC9cx8BEZnqZ54Zqn1s/9Of3L7iavNYw0k5TiFDt0gtb+M/KD35strTgQ+mo9pUf5NtjXJ/A5NT0Hm9KubUpigLVajXPJLZe2t0tQwikVTXBBWZlWc47hTswPn/62DHguxiYITifMhEVghixhSNgjis5NwW5gQ69QgYIqMxvkgJ3PBsREc6LRwPb2nwbMNG8K4OsMWJzQYyICpckXKnHZT327+QwFAN2YDqTSfkx4lW4/bbppsO3ARtRI/xT5IEGF6d5ES6qw8JXKdH8Z/PcSKGHEetcayjA7sLNMVn/4vJ+FyVQLSRoxEFYwm0CF3MWIkbCFm4TigGbMyOqqseOTJXAPF1V8S0TdkXZDFO4TagGbJqDcbP56SuXfkUWGRg2kYFhI2TAqmVgwKTTqv99Iat8bj2X/54sw4CR4rWs4wKB6/aL+zyAsM4DzkSTBLnJBzMaIYU+EbnenjDB7+94AoRs3a2vqwF2rOjSaM1ZDvBqkp8PJpXaij9eEJYZkuuk6JpCpVLRYMhm21NpGJyKN2e7LZJi3QIP9veN63dub0kkjTd23hDiMEBOl5T0lo0pj0s7Owfd+gnvCGb4IgYGyG5IOx4REREXnP/2G7L/stZoqgAAAABJRU5ErkJggg==" alt="">
                     <span>意见反馈</span>
@@ -136,25 +169,86 @@
     <script src="/js/jquery-3.2.1.min.js"></script>
     <script src="/js/merge-wx.js?v={{Msg "seo" "version"}}"></script>
     <script>
+    function getOfflineMessageCount () {
+        try {
+            var nowPlatform = 'wxh5';
+            (function (w, d, e, x) {
+                w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
+                x = d.createElement('script');
+                x.async = true;
+                x.id = 'zhichiScript';
+                x.className="zhiCustomBtn";
+
+                x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76';
+                window.xxx = x
+                d.body.appendChild(x);
+            })(window, document, 'zc');
+            $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
+                console.log(r, 'r')
+                var ajaxUserInfo = {
+                    headImage: '',
+                    nickName: '默认昵称',
+                    userId: '',
+                }
+
+                if (r) {
+                    Object.keys(ajaxUserInfo).forEach(function (v) {
+                        if (r[v] && r[v] !== '') {
+                            ajaxUserInfo[v] = r[v]
+                        }
+                    })
+                }
+
+                zc('config', {
+                    custom:true,
+                    top_bar_flag: 0,
+                    auto_expand: false,
+                    show_face: 1,
+                    async: 0,
+                    photo_flag: false,
+                    partnerid: ajaxUserInfo.userId,
+                    face: ajaxUserInfo.headImage
+                })
+                console.log('获取未读消息')
+                zc('receive_message',function(res){
+                    console.log(res, 'res receive_message')
+                })
+                zc('zhichiReceive',function(res){
+                    console.log(res, 'res zhichiReceive')
+                })
+                zc("offline_message_count",function(res){
+                    console.log(res, 'offline_message_count')
+                    if (res && res.size && res.size > 0) {
+                        $(".badge-number").text(res.size).show()
+                    } else {
+                        $(".badge-number").hide()
+                    }
+                })
+            })
+        } catch (e) {
+            console.log('error: ',e)
+        }
+    }
+    getOfflineMessageCount()
 		//苹果刷新js
-		$(function () {    
-			var isPageHide = false;   
-			window.addEventListener('pageshow', function () {      
+		$(function () {
+			var isPageHide = false;
+			window.addEventListener('pageshow', function () {
 			    if (isPageHide) {
 	                location.reload();
-			    }    
-			});    
+			    }
+			});
 			window.addEventListener('pagehide', function () {
 			    isPageHide = true;
-			});  
+			});
 		});
-		
-        $(function () { 
+
+        $(function () {
 		  	//分享
 		  	initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-			
+
 			var nowTimestamp= (new Date()).valueOf();
-      
+
       //关注项目
 			$(".myProject").on("click",function(){
 				window.location.href="/follow/list";
@@ -163,7 +257,7 @@
 			$(".myEnt").on("click",function(){
 				window.location.href="/jylab/followent/entList";
 			})
-      
+
 			$(".vip").on("click",function(){
 				$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
 					if (data.isvip){
@@ -211,19 +305,19 @@
 			if(img_head!=""){
 				$("#head_img").attr("src",img_head);
 			}
-      
+
       showUserMerge();
       $(".userMerge span:eq(1)").on("click",function(){
         sessionStorage.removeItem("userMergeFlag")
         window.location.href='/page_entniche/page/user/account_merge.html'
       })
-      
+
         })
-		
+
 		function getParam(pname) {
 		    var params = location.search.substr(1);
 		    var ArrParam = params.split('&');
-		    if (ArrParam.length == 1) { 
+		    if (ArrParam.length == 1) {
 		        return params.split('=')[1];
 		    }
 		    else {
@@ -235,7 +329,7 @@
 		        }
 		    }
 		}
-			
+
 		// 控制手机号中间四位显示星号
 		function user_phone_encryption(user_phone){
 			let userName =user_phone;
@@ -244,7 +338,7 @@
                 $('.user_name').text(userName)
             }
 		}
-		
+
     //用户合并是否显示
     function showUserMerge(){
         // 自动合并账号期间,不显示手机号合并
@@ -282,4 +376,4 @@
 	{{include "/common/baiducc.html"}}
 </body>
 
-</html>
+</html>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно