Merge branch 'master' of http://svn.ouj.com:3000/eos_sicbo/chat

_src/pages/common.js

@@ -8,11 +8,7 @@ function animate (time) {
 requestAnimationFrame(animate)
 
 if ('serviceWorker' in navigator) {
-  let scriptUrl = '/dist/sw.js'
-  // 本地特殊处理
-  if (location.hostname === '127.0.0.1') {
-    scriptUrl = '/sw.js'
-  }
+  let scriptUrl = '/sw.js'
 
   navigator.serviceWorker.register(scriptUrl).then(function (reg) {
     if (reg.installing) {

build_cache.js

@@ -16,12 +16,14 @@ if (process.env.URL === 'new') {
 // 获取文件
 let baseDir = path.join(__dirname, '/')
 list.forEach((value, index) => {
+
   // 对.html和.json特殊处理
   if (value.endsWith('.html') || value.endsWith('.json')) {
-    value = value.replace('/dist/', '/')
-    list[index] = value.replace(baseDir, '/')
+    value = value.replace(baseDir, '/')
+    list[index] = value.replace('/dist/', '/')
   } else {
-    list[index] = global.URL_CDN + value.replace(baseDir, '')
+    value = value.replace(baseDir, '')
+    list[index] = global.URL_CDN + value
   }
 })
 

dist/css/chunk-65c55dcc.4a300cbe.css

@@ -0,0 +1 @@
+input[type=file][data-v-47cd2aa2]{position:absolute;left:0;top:0;width:100%;height:100%;-webkit-appearance:none;opacity:0;z-index:1}.edit-list[data-v-47cd2aa2]{background-color:#fff}.edit-list .item[data-v-47cd2aa2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 .42667rem;height:2.26133rem;line-height:2.26133rem;position:relative}.edit-list .item.avatar-item[data-v-47cd2aa2]{height:3.54133rem;line-height:3.54133rem}.edit-list .item[data-v-47cd2aa2]:after{content:"";position:absolute;height:1px;background-color:#d8d8d8;right:0;bottom:0;left:.42667rem}.edit-list .item[data-v-47cd2aa2]:last-child:after{display:none}.edit-list .title[data-v-47cd2aa2]{font-size:.59733rem;color:#000}.edit-list .cont[data-v-47cd2aa2]{color:#999;font-size:.59733rem}.edit-list .cont i[data-v-47cd2aa2]{display:inline-block;vertical-align:middle;margin-left:.21333rem}.edit-list .cont .user-avatar[data-v-47cd2aa2]{position:relative;width:2.56rem;height:2.56rem;line-height:2.56rem;z-index:2;vertical-align:middle;display:inline-block}

dist/css/chunk-6f498702.a8887c6a.css

@@ -1 +0,0 @@
-input[type=file][data-v-ea97d162]{position:absolute;left:0;top:0;width:100%;height:100%;-webkit-appearance:none;opacity:0;z-index:1}.edit-list[data-v-ea97d162]{background-color:#fff}.edit-list .item[data-v-ea97d162]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 .42667rem;height:2.26133rem;line-height:2.26133rem;position:relative}.edit-list .item.avatar-item[data-v-ea97d162]{height:3.54133rem;line-height:3.54133rem}.edit-list .item[data-v-ea97d162]:after{content:"";position:absolute;height:1px;background-color:#d8d8d8;right:0;bottom:0;left:.42667rem}.edit-list .item[data-v-ea97d162]:last-child:after{display:none}.edit-list .title[data-v-ea97d162]{font-size:.59733rem;color:#000}.edit-list .cont[data-v-ea97d162]{color:#999;font-size:.59733rem}.edit-list .cont i[data-v-ea97d162]{display:inline-block;vertical-align:middle;margin-left:.21333rem}.edit-list .cont .user-avatar[data-v-ea97d162]{position:relative;width:2.56rem;height:2.56rem;line-height:2.56rem;z-index:2;vertical-align:middle;display:inline-block}

dist/js/chunk-01808817.c4ed8b7d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-01808817"],{"18d9":function(n,t,c){"use strict";c.r(t);var e=function(){var n=this,t=n.$createElement;n._self._c;return n._m(0)},a=[function(){var n=this,t=n.$createElement,c=n._self._c||t;return c("div",{staticClass:"no-chat"},[c("i",{staticClass:"mee-icon"})])}],s=(c("cadf"),c("551c"),c("097d"),{name:"noChat"}),i=s,r=(c("cda9"),c("2877")),u=Object(r["a"])(i,e,a,!1,null,"73961370",null);t["default"]=u.exports},"7b80":function(n,t,c){},cda9:function(n,t,c){"use strict";var e=c("7b80"),a=c.n(e);a.a}}]);

dist/js/chunk-0b1259b6.cb907381.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0b1259b6"],{"045a":function(t,i,s){},1749:function(t,i,s){"use strict";s.r(i);var a=function(){var t=this,i=t.$createElement,s=t._self._c||i;return s("div",{staticClass:"c-view"},[s("div",{staticClass:"box"},[s("div",{staticClass:"box-hd"},[s("div",{staticClass:"title-wrap"},[t._v(t._s(t.$t("group.recommendGroup"))+"\n        ")])]),s("div",{staticClass:"box-bd pub-scroll-box"},[s("ul",{staticClass:"list-group"},t._l(t.showHotList,function(i,a){return s("li",{key:a,staticClass:"group-item"},[s("div",{staticClass:"avatar-wrap",on:{click:function(s){t.joinGroup(i.group_id,i.is_join)}}},[i.cover_photo?s("img",{staticClass:"user-avatar",attrs:{src:i.cover_photo+"?imageview/0/w/180",alt:""}}):s("div",{staticClass:"user-avatar",class:"avatar_bg"+t.bgColorNum(i.group_id),attrs:{"data-name":i.group_title&&i.group_title.slice(0,2).toUpperCase()}}),1==i.is_auth?s("i",{staticClass:"icon-auth"}):t._e()]),s("div",{staticClass:"info"},[s("h3",{on:{click:function(s){t.joinGroup(i.group_id,i.is_join)}}},[t._v(t._s(i.group_title))]),s("p",[s("i",{staticClass:"icon-group"}),t._v("\n              "+t._s(i.member_num)+"\n            ")]),s("el-button",{attrs:{type:"primary"},on:{click:function(s){t.joinGroup(i.group_id,i.is_join)}}},[t._v(t._s(1==i.is_join?t.$t("group.enter"):"+ "+t.$t("group.join")))])],1)])}))])])])},o=[],n=(s("7f7f"),s("1951"),s("450d"),s("eedf")),r=s.n(n),c=s("2b0e"),e=s("bced");c["default"].component(r.a.name,r.a);var u={name:"hotGroup",mixins:[e["a"]]},l=u,p=(s("3518"),s("2877")),_=Object(p["a"])(l,a,o,!1,null,"c10c10d4",null);i["default"]=_.exports},3518:function(t,i,s){"use strict";var a=s("045a"),o=s.n(a);o.a}}]);

dist/js/chunk-1a0d9872.eb44b8ad.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1a0d9872"],{1749:function(t,a,i){"use strict";i.r(a);var s=function(){var t=this,a=t.$createElement,i=t._self._c||a;return i("div",{staticClass:"c-view"},[i("div",{staticClass:"box"},[i("div",{staticClass:"box-hd"},[i("div",{staticClass:"title-wrap"},[t._v(t._s(t.$t("group.recommendGroup"))+"\n        ")])]),i("div",{staticClass:"box-bd pub-scroll-box"},[i("ul",{staticClass:"list-group"},t._l(t.showHotList,function(a,s){return i("li",{key:s,staticClass:"group-item"},[i("div",{staticClass:"avatar-wrap",on:{click:function(i){return t.joinGroup(a.group_id,a.is_join)}}},[a.cover_photo?i("img",{staticClass:"user-avatar",attrs:{src:a.cover_photo+"?imageview/0/w/180",alt:""}}):i("div",{staticClass:"user-avatar",class:"avatar_bg"+t.bgColorNum(a.group_id),attrs:{"data-name":a.group_title&&a.group_title.slice(0,2).toUpperCase()}}),1==a.is_auth?i("i",{staticClass:"icon-auth"}):t._e()]),i("div",{staticClass:"info"},[i("h3",{on:{click:function(i){return t.joinGroup(a.group_id,a.is_join)}}},[t._v(t._s(a.group_title))]),i("p",[i("i",{staticClass:"icon-group"}),t._v("\n              "+t._s(a.member_num)+"\n            ")]),i("el-button",{attrs:{type:"primary"},on:{click:function(i){return t.joinGroup(a.group_id,a.is_join)}}},[t._v(t._s(1==a.is_join?t.$t("group.enter"):"+ "+t.$t("group.join")))])],1)])}),0)])])])},o=[],r=(i("dc12"),i("5cf1"),i("ad09"),i("94c8")),n=i.n(r),c=i("8973"),e=i("bced");c["default"].component(n.a.name,n.a);var u={name:"hotGroup",mixins:[e["a"]]},l=u,p=(i("aa2b"),i("fc05")),_=Object(p["a"])(l,s,o,!1,null,"55788a80",null);a["default"]=_.exports},"9bfa":function(t,a,i){},aa2b:function(t,a,i){"use strict";var s=i("9bfa"),o=i.n(s);o.a}}]);

dist/js/chunk-3028e170.58535a0f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3028e170"],{"18d9":function(n,t,e){"use strict";e.r(t);var c=function(){var n=this,t=n.$createElement;n._self._c;return n._m(0)},a=[function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"no-chat"},[e("i",{staticClass:"mee-icon"})])}],s={name:"noChat"},i=s,r=(e("6c75"),e("fc05")),u=Object(r["a"])(i,c,a,!1,null,"75000044",null);t["default"]=u.exports},"6c75":function(n,t,e){"use strict";var c=e("c2ed"),a=e.n(c);a.a},c2ed:function(n,t,e){}}]);

mini.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=//static.meechat.me/cdn/new.mee.chat/dist/favicon.ico><title>MeeChat</title><meta name=msapplication-TileColor content=#2d2f34><meta name=theme-color content=#2d2f34><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-4031c6b3.7da7025b.css rel=prefetch><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-4031c6b3.f58fdfd9.js rel=prefetch><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-common.54d70dac.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-vendors.3c668f4e.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/mini.979353cc.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-common.8e809abc.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-vendors.8a48f48a.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/mini.c0c6a5bf.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-vendors.3c668f4e.css rel=stylesheet><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-common.54d70dac.css rel=stylesheet><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/mini.979353cc.css rel=stylesheet></head><body class=mini-wrap><div id=app></div><script>window.EOS_PROTOCOL = 'https'
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=//static.meechat.me/cdn/new.mee.chat/dist/favicon.ico><title>MeeChat</title><meta name=msapplication-TileColor content=#2d2f34><meta name=theme-color content=#2d2f34><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-c83e9e48.4cd58218.css rel=prefetch><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-c83e9e48.ab43cd42.js rel=prefetch><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-common.db3c2412.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-vendors.5c93e029.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/mini.6c9dec95.css rel=preload as=style><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-common.1ed37b81.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-vendors.5c8ed0d6.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/js/mini.8482d5a6.js rel=preload as=script><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-vendors.5c93e029.css rel=stylesheet><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/chunk-common.db3c2412.css rel=stylesheet><link href=//static.meechat.me/cdn/new.mee.chat/dist/css/mini.6c9dec95.css rel=stylesheet></head><body class=mini-wrap><div id=app></div><script>window.EOS_PROTOCOL = 'https'
       window.EOS_HOST = 'proxy.eosnode.tools'
-      window.EOS_PORT = '443'</script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-vendors.8a48f48a.js></script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-common.8e809abc.js></script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/mini.c0c6a5bf.js></script></body></html>
+      window.EOS_PORT = '443'</script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-vendors.5c8ed0d6.js></script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/chunk-common.1ed37b81.js></script><script src=//static.meechat.me/cdn/new.mee.chat/dist/js/mini.8482d5a6.js></script></body></html>

public/sw.js

@@ -1,4 +1,4 @@
-const CACHE_NAME = 'MeeChat_v1.2.5';
+const CACHE_NAME = 'MeeChat_v1.3';
 let urlsToCache = [];
 // let networkFirstList = ['', 'h5.html', 'mini.html'];
 let networkFirstList = [];
@@ -43,14 +43,15 @@ self.addEventListener('fetch', function (event) {
     url = url.substr(0, pos)
   }
 
-  if (urlsToCache.indexOf(url) !== -1) {
+  let isNetworkFirst = url.endsWith('.html') || url.endsWith('.json');
+  if (urlsToCache.indexOf(url) !== -1 && !isNetworkFirst) {
     return _cacheFirst(event)
   } else {
     return _networkFirst(event)
   }
 })
 
-function _cacheFirst(event, response) {
+function _cacheFirst(event) {
   event.respondWith(
     caches.match(event.request).then(function (response) {
       // Cache hit - return response