Merge remote-tracking branch 'origin/master'

public/js/puzzle.js

@@ -75,12 +75,13 @@ var that = this,imgData="";
         ctx.lineTo(x, y + l)
         ctx.arc(x + r - 2, y + l / 2, r + 0.4, 2.76 * PI, 1.24 * PI, true)
         ctx.lineTo(x, y)
-        ctx.lineWidth = 2
-        ctx.fillStyle = 'rgba(255, 255, 255, 0.7)'
-        ctx.strokeStyle = 'rgba(255, 255, 255, 0.7)'
+        ctx.lineWidth = 2;
+        ctx.fillStyle = 'rgba(255, 255, 255,0.7)'
+        ctx.strokeStyle = 'rgba(255, 255, 255,0.7)'
         ctx.stroke()
         ctx[operation]()
-        ctx.globalCompositeOperation = 'overlay'
+        ctx.globalCompositeOperation = 'xor'
+
     }
 
     function sum (x, y) {
@@ -171,7 +172,6 @@ var that = this,imgData="";
 
         clean () {
             var issafariBrowser = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent);
-            console.log(issafariBrowser)
             if(publicFunc.isWhichBrowe().ios||issafariBrowser){
                 // location.reload()
             }else{

src/api/api.js

@@ -11,11 +11,20 @@ const i18n = new VueI18n({
     //this.$i18n.locale // 通过切换locale的值来实现语言切换
     messages: {
         'zh-CN': require('../common/lang/zh'),   // 中文语言包
-        'en': window.sessionStorage.getItem("language")=='zh-CN'?require('../common/lang/zh'):require('../common/lang/en')
+        'en': window.sessionStorage.getItem("language")=='en'?require('../common/lang/en'):require('../common/lang/zh')
     }
 })
 import { Loading,MessageBox } from 'element-ui';
 let base = "",isMobile = publicFunc.isWhichBrowe().mobile;
+var type = navigator.appName,language;
+if(!window.sessionStorage.getItem("language")){
+    if(type=="Netscape"){
+        language =navigator.language;
+    }else{
+        language = navigator.userLanguage;
+    }
+    window.sessionStorage.setItem("language",language!='zh'&&language!='zh-CN'?'en':'zh-CN');
+}
 var lang = window.sessionStorage.getItem("language") == "en" ? "en_US" : "zh_CN";
 // import slider from '../components/common/errorSlider';
 export default {

src/common/lang/en.js

@@ -428,7 +428,7 @@ module.exports = {
             look: " View",
             oneself: "Self-Recommendation",
             hasGt: "Communicated",
-            checkProgress:"查看沟通进展",
+            checkProgress:"progress",
             industry: "Industry",
             webSite: "Website",
             weChat: "WeChat Account",
@@ -895,7 +895,7 @@ module.exports = {
             viewed:'Views',
         collected:'Followers',
         Communicated:'Communicated',
-        Communicattext:"View communication process",
+        Communicattext:"progress",
         projectbasic:'Basic Information',
         market:'Market Collaboration',
         overview:'Company Overview',

src/common/validate.js

@@ -6,7 +6,7 @@ const i18n = new VueI18n({
     //this.$i18n.locale // 通过切换locale的值来实现语言切换
     messages: {
         'zh-CN': require('./lang/zh'),   // 中文语言包
-        'en': window.sessionStorage.getItem("language")=='zh-CN'?require('./lang/zh'):require('./lang/en')
+        'en': window.sessionStorage.getItem("language")=='en'?require('./lang/en'):require('./lang/zh')
     }
 })
 export default {