fe / yohobuy-node · Commits

Go to a project

Authored by 李奇
Commit 25ab43cbaa19f5c3d303bb49fbbce83ac3524f15 1 parent f1886b82

layout静态资源引入方式修改

Inline Side-by-side
Showing 2 changed files with 14 additions and 6 deletions
@@ -12,10 +12,17 @@ @@ -12,10 +12,17 @@
12 <meta content="email=no" name="format-detection" /> 12 <meta content="email=no" name="format-detection" />
13 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> 13 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
14 <meta name="renderer" content="webkit" /> 14 <meta name="renderer" content="webkit" />
  15 + {{#dnsPrefetch.hosts}}
  16 + <link rel="dns-prefetch" href="{{this}}">
  17 + {{/dnsPrefetch.hosts}}
  18 +
15 {{#if devEnv}} 19 {{#if devEnv}}
16 <link rel="stylesheet" href="//{{devHost}}:5002/css/index.css"> 20 <link rel="stylesheet" href="//{{devHost}}:5002/css/index.css">
  21 + <link rel="stylesheet" href="//{{devHost}}:5002/css/cart.index.css">
  22 +
17 {{^}} 23 {{^}}
18 - <link rel="stylesheet" href="//cdn.yoho.cn/yohobuy-node/{{version}}/index.css"> 24 + <link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/index.css">
  25 + <link rel="stylesheet" href="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/cart.index.css">
19 {{/if}} 26 {{/if}}
20 </head> 27 </head>
21 <body class="client"> 28 <body class="client">
@@ -65,9 +72,9 @@ @@ -65,9 +72,9 @@
65 <script src="//{{devHost}}:5002/libs.js"></script> 72 <script src="//{{devHost}}:5002/libs.js"></script>
66 <script src="//{{devHost}}:5002/{{module}}.{{page}}.js"></script> 73 <script src="//{{devHost}}:5002/{{module}}.{{page}}.js"></script>
67 {{^}} 74 {{^}}
68 - <input name="assetsPrefix" type="text" type="hidden" value="//cdn.yoho.cn/yohobuy-node/assets">  
69 - <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script>  
70 - <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script> 75 + <input name="assetsPrefix" type="text" type="hidden" value="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/assets">
  76 + <script src="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/libs.js"></script>
  77 + <script src="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
71 {{> analysis}} 78 {{> analysis}}
72 {{/if}} 79 {{/if}}
73 </body> 80 </body>
@@ -322,7 +322,7 @@ var _loadPage = function() { @@ -322,7 +322,7 @@ var _loadPage = function() {
322 322
323 /** 323 /**
324 * 人工接入队列中 324 * 人工接入队列中
325 - * @param message 内部消息对象 325 + * @param message 内部消息对象
326 */ 326 */
327 function inQueue(message) { 327 function inQueue(message) {
328 systemTip(message.content); 328 systemTip(message.content);
@@ -507,6 +507,8 @@ var _loadPage = function() { @@ -507,6 +507,8 @@ var _loadPage = function() {
507 isHidden = broswer.tabIsHidden(), 507 isHidden = broswer.tabIsHidden(),
508 allTypes = socketConf.recType; 508 allTypes = socketConf.recType;
509 509
  510 + console.log(rec.chatMessage);
  511 +
510 // 删除上个定时器 512 // 删除上个定时器
511 if (titleInterval) { 513 if (titleInterval) {
512 clearInterval(titleInterval); 514 clearInterval(titleInterval);
@@ -1166,7 +1168,6 @@ if (util.isSupport()) { @@ -1166,7 +1168,6 @@ if (util.isSupport()) {
1166 _loadPage(); 1168 _loadPage();
1167 } else { 1169 } else {
1168 $('.un-support').show(); 1170 $('.un-support').show();
1169 - return false;  
1170 } 1171 }
1171 1172
1172 // 点击刷新提示 1173 // 点击刷新提示