diff --git a/locales/en.json b/locales/en.json index d93dd89..d67e854 100644 --- a/locales/en.json +++ b/locales/en.json @@ -96,7 +96,24 @@ }, "answer":{ "title": "Answer", - "text1": "Answer time" + "text1": "Answer time", + "text2": "Step one", + "text3": "ACTIVATING EXTREME INTELLIGENCE CLOUD BRAIN", + "text4": "START-UP PROCESS TAKES 5 TO 15 SECONDS", + "text5": "Loading", + "text6": "Step two", + "text7": "CONFIGURING THE NETWORK ENVIRONMENT", + "text8": "THE PROCESS OF CONFIGURING THE OVEERSEAS HTTP PROXY TAKES 10 TO 20 SECONDS", + "text9": "Step three", + "text10": "OPENING FINGERPRINT BROWSER", + "text11": "CONFIGURING A NEW BROWSER TAKES 10 TO 20 SECONDS", + "text12": "Step four", + "text13": "BROWSER IMPORT TARGET QUESTIONNAIRE", + "text14": "THE IMPORT PROCESS TAKES 10 TO 20 SECONDS", + "text15": "Step five", + "text16": "MATCHING VIRTUAL CHARACTER", + "text17": "THE MATCHING PROCESS TAKES 10 TO 20 SECONDS", + "text18": "COMPLETED THE CURRENT QUESTIONNAIRE" }, "mine":{ "text1": "Login/Register", @@ -353,10 +370,10 @@ "text24": "Core advantage" }, "nav":{ - "home": "Home", - "questionnaire": "Questionnaire", - "promotion": "Promotion", - "mt": "MT", - "mine": "Mine" - } + "home": "Home", + "questionnaire": "Questionnaire", + "promotion": "Promotion", + "mt": "MT", + "mine": "Mine" + } } \ No newline at end of file diff --git a/locales/zh.json b/locales/zh.json index 8893b35..65f5274 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -96,7 +96,24 @@ }, "answer":{ "title": "答题", - "text1": "答题时间" + "text1": "答题时间", + "text2": "Step one", + "text3": "正在启动极智云脑", + "text4": "启动过程需5~15秒的时间", + "text5": "Loading", + "text6": "Step two", + "text7": "正在配置网络环境", + "text8": "配置海外HTTP代理过程需10~20秒的时间", + "text9": "Step three", + "text10": "正在打开指纹浏览器", + "text11": "配置新的浏览器过程需10~20秒的时间", + "text12": "Step four", + "text13": "浏览器导入目标问卷", + "text14": "导入过程需10~20秒的时间", + "text15": "Step five", + "text16": "正在匹配虚拟人设", + "text17": "匹配过程需10~20秒的时间", + "text18": "已完成当前问卷" }, "mine":{ "text1": "登录/注册", diff --git a/manifest.json b/manifest.json index 74a92a5..4e7a45b 100644 --- a/manifest.json +++ b/manifest.json @@ -12,6 +12,8 @@ "versionName" : "1.0.7", "versionCode" : 107, "app-plus" : { + "softinputMode": "adjustResize", + "statusBarAppearance": "dark", "modules" : { "Payment" : {}, "OAuth" : {}, @@ -66,7 +68,20 @@ } }, "splashscreen" : { - "androidStyle" : "default" + "androidStyle" : "default", + "android" : { + "hdpi" : "static/images/index2-1.png", + "xhdpi" : "static/images/index2-1.png", + "xxhdpi" : "static/images/index2-1.png" + } + }, + "icons" : { + "android" : { + "hdpi" : "static/images/logo2.png", + "xhdpi" : "static/images/logo2.png", + "xxhdpi" : "static/images/logo2.png", + "xxxhdpi" : "static/images/logo2.png" + } } }, "compilerVersion" : 3, diff --git a/pages.json b/pages.json index 855a311..8f771bb 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,12 @@ { "pages": [ + { + "path" : "pages/index/guide", + "style" : + { + "navigationBarTitleText" : "" + } + }, { "path" : "pages/index/index", "style" : @@ -597,6 +604,12 @@ } ] }, + "globalStyle": { + "navigationStyle":"custom", + "tabBar": { + "show": "false" + } + }, "condition": { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) "list": [{ diff --git a/pages/index/guide.vue b/pages/index/guide.vue new file mode 100644 index 0000000..8068e05 --- /dev/null +++ b/pages/index/guide.vue @@ -0,0 +1,83 @@ + + + + \ No newline at end of file diff --git a/pages/questionnaire/answer.vue b/pages/questionnaire/answer.vue index 0343df7..7c82be0 100644 --- a/pages/questionnaire/answer.vue +++ b/pages/questionnaire/answer.vue @@ -32,18 +32,18 @@ - Step one:{{step}}/5 + {{$t('answer.text2')}}:{{step}}/5 - ACTIVATING EXTREME INTELLIGENCE CLOUD BRAIN + {{$t('answer.text3')}} - START-UP PROCESS TAKES 5 TO 15 SECONDS + {{$t('answer.text4')}} Loading...{{b}}% + margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}% @@ -52,18 +52,18 @@ - Step two:{{step}}/5 + {{$t('answer.text6')}}:{{step}}/5 - CONFIGURING THE NETWORK ENVIRONMENT + {{$t('answer.text7')}} - THE PROCESS OF CONFIGURING THE OVEERSEAS HTTP PROXY TAKES 10 TO 20 SECONDS + {{$t('answer.text8')}} Loading...{{b}}% + margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}% @@ -72,18 +72,18 @@ - Step three:{{step}}/5 + {{$t('answer.text9')}}:{{step}}/5 - OPENING FINGERPRINT BROWSER + {{$t('answer.text10')}} - CONFIGURING A NEW BROWSER TAKES 10 TO 20 SECONDS + {{$t('answer.text11')}} Loading...{{b}}% + margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}% @@ -92,18 +92,18 @@ - Step four:{{step}}/5 + {{$t('answer.text12')}}:{{step}}/5 - BROWSER IMPORT TARGET QUESTIONNAIRE + {{$t('answer.text13')}} - THE IMPORT PROCESS TAKES 10 TO 20 SECONDS + {{$t('answer.text14')}} Loading...{{b}}% + margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}% @@ -112,18 +112,18 @@ - Step five:{{step}}/5 + {{$t('answer.text15')}}:{{step}}/5 - MATCHING VIRTUAL CHARACTER + {{$t('answer.text16')}} - THE MATCHING PROCESS TAKES 10 TO 20 SECONDS + {{$t('answer.text17')}} Loading...{{b}}% + margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}% @@ -157,11 +157,11 @@ - COMPLETED THE CURRENT QUESTIONNAIRE + {{$t('answer.text18')}} - + diff --git a/pages/wallet/fundrecords.vue b/pages/wallet/fundrecords.vue index 1c4e89b..4b7e410 100644 --- a/pages/wallet/fundrecords.vue +++ b/pages/wallet/fundrecords.vue @@ -70,7 +70,7 @@ - {{$t('nodata')}} + {{$t('nodata')}} diff --git a/pages/wallet/index.vue b/pages/wallet/index.vue index e389ed5..a2db7b2 100644 --- a/pages/wallet/index.vue +++ b/pages/wallet/index.vue @@ -101,7 +101,8 @@ let data = { page: 1, limit: 10, - currency: 'money' + currency: 'money', + lang: this.$i18n.locale }; this.$http.post('/api/balanceLog/list', data).then(res => { if(res.code == 0){ diff --git a/static/images/g1.png b/static/images/g1.png new file mode 100644 index 0000000..d95f732 Binary files /dev/null and b/static/images/g1.png differ diff --git a/static/images/g2.png b/static/images/g2.png new file mode 100644 index 0000000..1215c36 Binary files /dev/null and b/static/images/g2.png differ diff --git a/static/images/index2-1.png b/static/images/index2-1.png new file mode 100644 index 0000000..28f620c Binary files /dev/null and b/static/images/index2-1.png differ diff --git a/static/images/index2-2.png b/static/images/index2-2.png new file mode 100644 index 0000000..ee5bff0 Binary files /dev/null and b/static/images/index2-2.png differ diff --git a/static/images/index2-3.png b/static/images/index2-3.png new file mode 100644 index 0000000..f1df3e1 Binary files /dev/null and b/static/images/index2-3.png differ diff --git a/style.zip b/style.zip deleted file mode 100644 index 50a32f0..0000000 Binary files a/style.zip and /dev/null differ