1 year ago · 85e61e7ab0
--- a/M.zip
+++ b/M.zip
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -12,5 +12,16 @@ module.exports = merge(prodEnv, {
 
				   IMG_UPLOADER_URL:'"https://intesys.cms.g107.com/integral.php/Api/get_signature"',
			
 
				   APP_DOWNDOAD_URL: '"https://m.intesys.cms.g107.com/app_download/"',
			
 
				   VUE_APP_WEBSCOKET:'"wss://new.gdy.g107.com/ws_v2/"',
			
 
				-  VUE_APP_WEBSCOKET_TOW:'"wss://new.gdy.g107.com/ws2/"'
			
 
				+  VUE_APP_WEBSCOKET_TOW:'"wss://new.gdy.g107.com/ws2/"',
			
 
				+
			
 
				+  // NODE_ENV: '"production"',
			
 
				+  // BASE_API: '"https://oa.g107.com"',
			
 
				+  // BASE_API_KQ: '"https://ad.g107.com"',
			
 
				+  // VUE_APP_WXURL:'"https://oa.g107.com/wx/mp/auth/wx65f4dde5ec7c31e7"',
			
 
				+  // ALIOSS_URL: '"https://integralsys.oss-cn-shenzhen.aliyuncs.com"',
			
 
				+  // WEB_LINK: '"https://oa.g107.com/m"',
			
 
				+  // IMG_UPLOADER_URL: '"https://intesys.cms.g107.com/integral.php/Api/get_signature"',
			
 
				+  // APP_DOWNDOAD_URL: '"https://oa.g107.com/m/#/android/"',
			
 
				+  // VUE_APP_WEBSCOKET:'"wss://oa.g107.com/ws_v2/"',
			
 
				+  // VUE_APP_WEBSCOKET_TOW:'"wss://oa.g107.com/ws2/"'
			
 
				 })
			
--- a/config/devtest.env.js
+++ b/config/devtest.env.js
@@ -9,5 +9,5 @@
 
				   IMG_UPLOADER_URL:'"https://intesys.cms.g107.com/integral.php/Api/get_signature"',
			
 
				   APP_DOWNDOAD_URL: '"https://new.gdy.g107.com/m/#/android/"',
			
 
				   VUE_APP_WEBSCOKET:'"wss://new.gdy.g107.com/ws_v2/"',
			
 
				-  VUE_APP_WEBSCOKET_TOW:'"wss://new.gdy.g107.com/ws2/"'
			
 
				+  VUE_APP_WEBSCOKET_TOW:'"wss://new.gdy.g107.com/ws2/"',
			
 
				  }
			
--- a/config/index.js
+++ b/config/index.js
@@ -14,7 +14,7 @@ module.exports = {
 
				 
			
 
				     // Various Dev Server settings
			
 
				     host: 'localhost', // can be overwritten by process.env.HOST
			
 
				-    port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
			
 
				+    port: 8089, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
			
 
				     autoOpenBrowser: false,
			
 
				     errorOverlay: true,
			
 
				     notifyOnErrors: true,
			
--- a/devtest/index.html
+++ b/devtest/index.html
@@ -0,0 +1,163 @@
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>功道云</title><script src=html5plus://ready></script><script src=static/js/polyfill.min.js></script><script>//某些情况下安卓没有提前注入plus对象，导致异常，有这种情况出现直接reload，直到plus存在
			
 
				+    if (window.navigator.userAgent.toLowerCase().match(/html5plus/i) == 'html5plus') {
			
 
				+      if (!window.plus) {
			
 
				+        window.location.reload()
			
 
				+      }
			
 
				+    }
			
 
				+
			
 
				+
			
 
				+    if (window.plus) {
			
 
				+
			
 
				+      function set_item(key, val){
			
 
				+        if(window.plus){
			
 
				+          return plus.storage.setItem(key, val)
			
 
				+        }else{
			
 
				+          return localStorage.setItem(key, val)
			
 
				+        }
			
 
				+      }
			
 
				+      function get_item(key){
			
 
				+        if(window.plus){
			
 
				+          return plus.storage.getItem(key)
			
 
				+        }else{
			
 
				+          return localStorage.getItem(key)
			
 
				+        }
			
 
				+      }
			
 
				+      //plus.storage.removeItem('first_init')
			
 
				+      if(!get_item('first_init') && plus.webview.currentWebview().id == plus.runtime.appid){
			
 
				+        set_item('first_init', '1');
			
 
				+        plus.io.requestFileSystem( plus.io.PRIVATE_WWW, function( fs ) {
			
 
				+          var full_url = 'file://'+fs.root.fullPath+'init.html'
			
 
				+          var init_w = plus.webview.create(full_url,full_url);
			
 
				+          init_w.show()
			
 
				+        }, function ( e ) {
			
 
				+          console.log(e)
			
 
				+        } );
			
 
				+
			
 
				+      }
			
 
				+
			
 
				+      plus.navigator.setStatusBarStyle('light');
			
 
				+      document.documentElement.style.backgroundColor = '#26A2FF';
			
 
				+      plus.navigator.setStatusBarBackground('#26A2FF');
			
 
				+
			
 
				+      function setBadgeNumber(newNum) {
			
 
				+        plus.runtime.setBadgeNumber(newNum);
			
 
				+        if (plus.os.name != 'Android') {
			
 
				+          var GeTuiSdk = plus.ios.importClass('GeTuiSdk');
			
 
				+          GeTuiSdk.setBadge(newNum);
			
 
				+        }
			
 
				+      }
			
 
				+      if (plus.navigator.isImmersedStatusbar()) {
			
 
				+        var bar_height = plus.navigator.getStatusbarHeight();
			
 
				+        document.documentElement.style.marginTop = bar_height + 'px';
			
 
				+        document.documentElement.style.height = 'calc(100vh - ' + bar_height + 'px)'
			
 
				+        document.documentElement.classList.add('app_view_html')
			
 
				+        var myEvent = new Event('resize');
			
 
				+        window.dispatchEvent(myEvent);
			
 
				+        plus.webview.currentWebview().setStyle({
			
 
				+          softinputMode: "adjustResize",
			
 
				+        })
			
 
				+      }
			
 
				+      var first = null
			
 
				+      //解决在hbuilder中ios打包后，获取焦点失效的bug
			
 
				+      //setInterval(function () {
			
 
				+		  var wv_current = plus.webview.currentWebview().nativeInstanceObject()
			
 
				+		  if (plus.os.name != 'Android') {
			
 
				+			wv_current.plusCallMethod({
			
 
				+			  'setKeyboardDisplayRequiresUserAction': false
			
 
				+			})
			
 
				+		  }
			
 
				+		  var webview = plus.webview.all();
			
 
				+		  webview = webview[webview.length - 1]
			
 
				+      //}, 1000)
			
 
				+
			
 
				+      plus.key.addEventListener('backbutton', function (e) {
			
 
				+        if (plus.storage.getItem('qr_scaning')) {
			
 
				+          return false;
			
 
				+        }
			
 
				+        webview.canBack(function (e) {
			
 
				+          if (e.canBack) {
			
 
				+            webview.back()
			
 
				+          } else {
			
 
				+            if (webview.id == plus.runtime.appid) {
			
 
				+              //首次按键，提示‘再按一次退出应用’
			
 
				+              if (!first) {
			
 
				+                first = new Date().getTime()
			
 
				+                plus.nativeUI.toast("再按一次退出应用");
			
 
				+                setTimeout(function () {
			
 
				+                  first = null
			
 
				+                }, 1000)
			
 
				+              } else {
			
 
				+                if (new Date().getTime() - first < 1500) {
			
 
				+                  plus.runtime.quit()
			
 
				+                }
			
 
				+              }
			
 
				+            } else {
			
 
				+              webview.close();
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+      })
			
 
				+      var wgtVer = null;
			
 
				+      plus.runtime.getProperty(plus.runtime.appid, function (inf) {
			
 
				+        wgtVer = inf.version
			
 
				+      });
			
 
				+    }
			
 
				+    window.onload = function () {
			
 
				+      if(window.plus){
			
 
				+        document.body.classList.add('on_app')
			
 
				+      }
			
 
				+      (function (window) {
			
 
				+        window.addEventListener('focusout', function () {
			
 
				+          //软键盘收起的事件处理
			
 
				+          window.setTimeout(function () {
			
 
				+            if (!(document.activeElement && (document.activeElement.type == 'textarea' || document.activeElement.type == 'text' || document.activeElement.type == 'password' || document.activeElement.type == 'search'||document.activeElement.type == 'tel'))) {
			
 
				+              let ua = window.navigator.userAgent.toLowerCase();
			
 
				+              if (ua.match(/MicroMessenger/i) == 'micromessenger') {
			
 
				+                window.scroll(0, 0)
			
 
				+              }
			
 
				+            }
			
 
				+          }, 300)
			
 
				+        });
			
 
				+        var winW = document.documentElement.clientWidth || window.innerWidth
			
 
				+        if (winW > 750) {
			
 
				+          winW = 750
			
 
				+        }
			
 
				+        var fontSize = Math.round(winW / 7.5)
			
 
				+        if (fontSize % 2 > 0) {
			
 
				+          fontSize += 1
			
 
				+        }
			
 
				+
			
 
				+        setInterval(function () {
			
 
				+          document.body.style.height = '100%'
			
 
				+        }, 100)
			
 
				+        document.documentElement.style.fontSize = fontSize + 'px'
			
 
				+        window.onresize = function () {
			
 
				+          if (window.plus) {
			
 
				+            setTimeout(function () {
			
 
				+              var bar_height = plus.navigator.getStatusbarHeight();
			
 
				+              document.documentElement.style.marginTop = bar_height + 'px';
			
 
				+              document.documentElement.style.backgroundColor = '#26A2FF';
			
 
				+              document.documentElement.style.height = 'calc(100vh - ' + bar_height + 'px)'
			
 
				+            }, 100)
			
 
				+          }
			
 
				+
			
 
				+          var winW = document.documentElement.clientWidth || window.innerWidth
			
 
				+          document.body.clientWidth
			
 
				+          if (winW > 750) {
			
 
				+            winW = 750
			
 
				+          }
			
 
				+          fontSize = Math.round(winW / 7.5)
			
 
				+          if (fontSize % 2 > 0) {
			
 
				+            fontSize += 1
			
 
				+          }
			
 
				+          document.documentElement.style.fontSize = fontSize + 'px'
			
 
				+        }
			
 
				+        setTimeout(function () {
			
 
				+          document.body.style.opacity = 1;
			
 
				+          document.documentElement.style.opacity = 1;
			
 
				+          if (window.plus && plus.webview.currentWebview().id == plus.runtime.appid) {
			
 
				+            localStorage.setItem('window_height', plus.screen.resolutionHeight + 1)
			
 
				+          }
			
 
				+        }, 100)
			
 
				+      }(window))
			
 
				+    }</script><link href=static/css/app.230a2dbceb66d57820714d9875d53bd0.css rel=stylesheet></head><body style="opacity: 0"><div id=app></div><script type=text/javascript src=static/js/manifest.4a037527fea76740a08f.1706754571694.js></script><script type=text/javascript src=static/js/vendor.6c6692f02cee66fefacd.1706754571694.js></script><script type=text/javascript src=static/js/app.7f53808dc2a6bcea6c1b.1706754571694.js></script></body><script type=text/javascript src="https://webapi.amap.com/maps?v=1.4.15&key=bc53b742b79c85c83ed94ef921facf93&plugin=AMap.Geocoder"></script><script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script></html>
			
--- a/devtest/static/css/app.230a2dbceb66d57820714d9875d53bd0.css
+++ b/devtest/static/css/app.230a2dbceb66d57820714d9875d53bd0.css
--- a/devtest/static/images/A.png
+++ b/devtest/static/images/A.png
--- a/devtest/static/images/B.png
+++ b/devtest/static/images/B.png
--- a/devtest/static/images/D.png
+++ b/devtest/static/images/D.png
--- a/devtest/static/images/E.png
+++ b/devtest/static/images/E.png
--- a/devtest/static/images/F.png
+++ b/devtest/static/images/F.png
--- a/devtest/static/images/Notice.png
+++ b/devtest/static/images/Notice.png
--- a/devtest/static/images/Staff.jpg
+++ b/devtest/static/images/Staff.jpg
--- a/devtest/static/images/WeChatUpIcon.png
+++ b/devtest/static/images/WeChatUpIcon.png
--- a/devtest/static/images/a1.png
+++ b/devtest/static/images/a1.png
--- a/devtest/static/images/a2.png
+++ b/devtest/static/images/a2.png
--- a/devtest/static/images/a3.png
+++ b/devtest/static/images/a3.png
--- a/devtest/static/images/a4.png
+++ b/devtest/static/images/a4.png
--- a/devtest/static/images/a5.png
+++ b/devtest/static/images/a5.png
--- a/devtest/static/images/a6.png
+++ b/devtest/static/images/a6.png
--- a/devtest/static/images/a7.png
+++ b/devtest/static/images/a7.png
--- a/devtest/static/images/a8.png
+++ b/devtest/static/images/a8.png
--- a/devtest/static/images/add.png
+++ b/devtest/static/images/add.png
--- a/devtest/static/images/add_common_menu.png
+++ b/devtest/static/images/add_common_menu.png
--- a/devtest/static/images/aite.png
+++ b/devtest/static/images/aite.png
--- a/devtest/static/images/all.png
+++ b/devtest/static/images/all.png
--- a/devtest/static/images/bg.png
+++ b/devtest/static/images/bg.png
--- a/devtest/static/images/boss.jpg
+++ b/devtest/static/images/boss.jpg
--- a/devtest/static/images/c.png
+++ b/devtest/static/images/c.png
--- a/devtest/static/images/caback2.png
+++ b/devtest/static/images/caback2.png
--- a/devtest/static/images/caback3.png
+++ b/devtest/static/images/caback3.png
--- a/devtest/static/images/caback4.png
+++ b/devtest/static/images/caback4.png
--- a/devtest/static/images/caback5.png
+++ b/devtest/static/images/caback5.png
--- a/devtest/static/images/caback6.png
+++ b/devtest/static/images/caback6.png
--- a/devtest/static/images/callback1.png
+++ b/devtest/static/images/callback1.png
--- a/devtest/static/images/daiban.png
+++ b/devtest/static/images/daiban.png
--- a/devtest/static/images/defalut_custmer_headicon.png
+++ b/devtest/static/images/defalut_custmer_headicon.png
--- a/devtest/static/images/default_company_logo.png
+++ b/devtest/static/images/default_company_logo.png
--- a/devtest/static/images/dept_add.png
+++ b/devtest/static/images/dept_add.png
--- a/devtest/static/images/dingqi.png
+++ b/devtest/static/images/dingqi.png
--- a/devtest/static/images/downloadPageLogo.png
+++ b/devtest/static/images/downloadPageLogo.png
--- a/devtest/static/images/downloadPagePhone.png
+++ b/devtest/static/images/downloadPagePhone.png
--- a/devtest/static/images/e66f.jpg
+++ b/devtest/static/images/e66f.jpg
--- a/devtest/static/images/employee_add.png
+++ b/devtest/static/images/employee_add.png
--- a/devtest/static/images/excel_icon.png
+++ b/devtest/static/images/excel_icon.png
--- a/devtest/static/images/guidang.png
+++ b/devtest/static/images/guidang.png
--- a/devtest/static/images/guild_dept_pic.png
+++ b/devtest/static/images/guild_dept_pic.png
--- a/devtest/static/images/guild_rule_pic.png
+++ b/devtest/static/images/guild_rule_pic.png
--- a/devtest/static/images/gzt.png
+++ b/devtest/static/images/gzt.png
--- a/devtest/static/images/head_default.png
+++ b/devtest/static/images/head_default.png
--- a/devtest/static/images/init.gif
+++ b/devtest/static/images/init.gif
--- a/devtest/static/images/init1.jpg
+++ b/devtest/static/images/init1.jpg
--- a/devtest/static/images/init2.jpg
+++ b/devtest/static/images/init2.jpg
--- a/devtest/static/images/init3.jpg
+++ b/devtest/static/images/init3.jpg
--- a/devtest/static/images/init4.jpg
+++ b/devtest/static/images/init4.jpg
--- a/devtest/static/images/init5.jpg
+++ b/devtest/static/images/init5.jpg
--- a/devtest/static/images/jiaru.jpg
+++ b/devtest/static/images/jiaru.jpg
--- a/devtest/static/images/jihua.png
+++ b/devtest/static/images/jihua.png
--- a/devtest/static/images/jixiaobaobiao.png
+++ b/devtest/static/images/jixiaobaobiao.png
--- a/devtest/static/images/join_company.png
+++ b/devtest/static/images/join_company.png
--- a/devtest/static/images/join_review.jpg
+++ b/devtest/static/images/join_review.jpg
--- a/devtest/static/images/jx.png
+++ b/devtest/static/images/jx.png
--- a/devtest/static/images/linshi.png
+++ b/devtest/static/images/linshi.png
--- a/devtest/static/images/logo.png
+++ b/devtest/static/images/logo.png
--- a/devtest/static/images/logo2.png
+++ b/devtest/static/images/logo2.png
--- a/devtest/static/images/manager.jpg
+++ b/devtest/static/images/manager.jpg
--- a/devtest/static/images/messageicon.png
+++ b/devtest/static/images/messageicon.png
--- a/devtest/static/images/mubiao.png
+++ b/devtest/static/images/mubiao.png
--- a/devtest/static/images/my.png
+++ b/devtest/static/images/my.png
--- a/devtest/static/images/nav_jx_4.jpg
+++ b/devtest/static/images/nav_jx_4.jpg
--- a/devtest/static/images/newNav1.png
+++ b/devtest/static/images/newNav1.png
--- a/devtest/static/images/newNav2.png
+++ b/devtest/static/images/newNav2.png
--- a/devtest/static/images/new_noData.png
+++ b/devtest/static/images/new_noData.png
--- a/devtest/static/images/noPeople.png
+++ b/devtest/static/images/noPeople.png
--- a/devtest/static/images/noTask.png
+++ b/devtest/static/images/noTask.png
--- a/devtest/static/images/noconfirm.png
+++ b/devtest/static/images/noconfirm.png
--- a/devtest/static/images/nocontent.png
+++ b/devtest/static/images/nocontent.png
--- a/devtest/static/images/nodata.png
+++ b/devtest/static/images/nodata.png
--- a/devtest/static/images/nomerits.png
+++ b/devtest/static/images/nomerits.png
--- a/devtest/static/images/nopicket.png
+++ b/devtest/static/images/nopicket.png
--- a/devtest/static/images/noworket.png
+++ b/devtest/static/images/noworket.png
--- a/devtest/static/images/okr.jpg
+++ b/devtest/static/images/okr.jpg
--- a/devtest/static/images/paiming-1.png
+++ b/devtest/static/images/paiming-1.png
--- a/devtest/static/images/paiming-2.png
+++ b/devtest/static/images/paiming-2.png
--- a/devtest/static/images/paiming-3.png
+++ b/devtest/static/images/paiming-3.png
--- a/devtest/static/images/poi-marker-default.png
+++ b/devtest/static/images/poi-marker-default.png
--- a/devtest/static/images/poi-marker-red.png
+++ b/devtest/static/images/poi-marker-red.png
--- a/devtest/static/images/point.png
+++ b/devtest/static/images/point.png
--- a/devtest/static/images/qrcode_invite.png
+++ b/devtest/static/images/qrcode_invite.png
--- a/devtest/static/images/qyc.jpg
+++ b/devtest/static/images/qyc.jpg
--- a/devtest/static/images/rank.png
+++ b/devtest/static/images/rank.png
--- a/devtest/static/images/rank_01.png
+++ b/devtest/static/images/rank_01.png
--- a/devtest/static/images/rank_02.png
+++ b/devtest/static/images/rank_02.png
--- a/devtest/static/images/rank_03.png
+++ b/devtest/static/images/rank_03.png
--- a/devtest/static/images/s-jifen.jpg
+++ b/devtest/static/images/s-jifen.jpg
--- a/devtest/static/images/s-jixiao.jpg
+++ b/devtest/static/images/s-jixiao.jpg
--- a/devtest/static/images/s-mubiao.jpg
+++ b/devtest/static/images/s-mubiao.jpg
--- a/devtest/static/images/s-xunjian.jpg
+++ b/devtest/static/images/s-xunjian.jpg
--- a/devtest/static/images/s1.png
+++ b/devtest/static/images/s1.png
--- a/devtest/static/images/s2.png
+++ b/devtest/static/images/s2.png