1

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",
+		"home": "Home",
-			"questionnaire": "Questionnaire",
+		"questionnaire": "Questionnaire",
-			"promotion": "Promotion",
+		"promotion": "Promotion",
-			"mt": "MT",
+		"mt": "MT",
-			"mine": "Mine"
+		"mine": "Mine"
-		}
+	}
 }

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": "登录/注册",

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,

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": [{

pages/index/guide.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="page">
+		<view v-if="i==1">
+			<view>
+				<image src='/static/images/g1.png' style="width: 60%; margin: auto;" mode="widthFix"></image>
+			</view>
+			<view style="font-size: 56rpx; color: #333; font-weight: 700; text-align: center; margin-top: 40rpx;">
+				Make some <span style="color: #1D61E7; margin-left: 20rpx;">money</span></view>
+			<view style="width: 80%; margin: 20rpx auto; text-align: center; font-size: 32rpx; color: #333;">
+				Paid surveys are a handy sideline for anyone looking to make some extra money，You earn a commission for each survey you complete. 
+			</view>
+		</view>
+		<view v-if="i==2">
+			<view>
+				<image src='/static/images/g2.png' style="width: 60%; margin: auto;" mode="widthFix"></image>
+			</view>
+			<view style="font-size: 56rpx; color: #333; font-weight: 700; text-align: center; margin-top: 40rpx;">
+				Make money by <br><span style="color: #1D61E7;">completing surveys</span></view>
+			<view style="width: 80%; margin: 20rpx auto; text-align: center; font-size: 32rpx; color: #333;">
+				If you are looking for an easy way to make money with surveys, you can join the "MMT" community.
+			</view>
+		</view>
+		<view style="bottom: 0rpx; position: absolute; width:100vw; height: 120rpx; ">
+			<button style="width: 86%; background-color: #1D61E7; color: #fff; margin: auto;" @click="button">{{text}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getUserInfo } from '@/config/utils';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		
+		data() {
+			return{
+				i: 1,
+				text: "Next"
+			}
+		},
+		computed: {
+			
+		},
+		//第一次加载
+		onLoad(e) {
+			
+		},
+		//页面显示
+		onShow() {},
+		//方法
+		methods: {
+			button(){
+				if(this.i == 1){
+					this.i = 2;
+					this.text = "Enter"
+				}else{
+					uni.switchTab({
+						url:'/pages/index/index'
+					})
+				}
+			}
+		},
+		//页面隐藏
+		onHide() {},
+		//页面卸载
+		onUnload() {},
+		//页面下来刷新
+		onPullDownRefresh() {},
+		//页面上拉触底
+		onReachBottom() {},
+		//用户点击分享
+		onShareAppMessage(e) {
+			return this.wxShare();
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+	body{background-color: #fff;}
+	.page{min-height: 96vh; padding-top: 100rpx;}
+</style>

pages/questionnaire/answer.vue

@@ -32,18 +32,18 @@
 			<view class="v2" v-if="step==1">
 				<view style="width: 50%; margin: 20rpx auto; background-color: #f8f8f8; text-align: center; 
 				padding: 30rpx 50rpx; font-size: 32rpx; color: #333;">
-					Step one：<span style="color: #1D61E7">{{step}}</span>/5
+					{{$t('answer.text2')}}：<span style="color: #1D61E7">{{step}}</span>/5
 				</view>
 				<view><image src="/static/images/step1.png" style="width: 60%; margin: auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					ACTIVATING EXTREME INTELLIGENCE CLOUD BRAIN
+					{{$t('answer.text3')}}
 				</view>
 				<view style="font-size: 28rpx; font-weight: 400; text-align: center; color: #999; margin-top: 10rpx;">
-					START-UP PROCESS TAKES 5 TO 15 SECONDS
+					{{$t('answer.text4')}}
 				</view>
 				<view>
 					<view style="color:#1D61FF; font-size: 28rpx; text-align: center; font-weight: 500; 
-					margin-top: 60rpx;">Loading...{{b}}%</view>
+					margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}%</view>
 					<view style="width: 80%; margin: auto;">
 						<slider :value="b" :disabled="true" style="height: 24rpx;" min="0" max="100" step="0.01" />
 					</view>
@@ -52,18 +52,18 @@
 			<view class="v2" v-if="step==2">
 				<view style="width: 50%; margin: 20rpx auto; background-color: #f8f8f8; text-align: center; 
 				padding: 30rpx 50rpx; font-size: 32rpx; color: #333;">
-					Step two：<span style="color: #1D61E7">{{step}}</span>/5
+					{{$t('answer.text6')}}：<span style="color: #1D61E7">{{step}}</span>/5
 				</view>
 				<view><image src="/static/images/step2.png" style="width: 60%; margin: auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					CONFIGURING THE NETWORK ENVIRONMENT
+					{{$t('answer.text7')}}
 				</view>
 				<view style="font-size: 28rpx; font-weight: 400; text-align: center; color: #999; margin-top: 10rpx;">
-					THE PROCESS OF CONFIGURING THE OVEERSEAS HTTP PROXY TAKES 10 TO 20 SECONDS
+					{{$t('answer.text8')}}
 				</view>
 				<view>
 					<view style="color:#1D61FF; font-size: 28rpx; text-align: center; font-weight: 500; 
-					margin-top: 60rpx;">Loading...{{b}}%</view>
+					margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}%</view>
 					<view style="width: 80%; margin: auto;">
 						<slider :value="b" :disabled="true" style="height: 24rpx;" min="0" max="100" step="0.01" />
 					</view>
@@ -72,18 +72,18 @@
 			<view class="v2" v-if="step==3">
 				<view style="width: 50%; margin: 20rpx auto; background-color: #f8f8f8; text-align: center; 
 				padding: 30rpx 50rpx; font-size: 32rpx; color: #333;">
-					Step three：<span style="color: #1D61E7">{{step}}</span>/5
+					{{$t('answer.text9')}}：<span style="color: #1D61E7">{{step}}</span>/5
 				</view>
 				<view><image src="/static/images/step3.png" style="width: 60%; margin: auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					OPENING FINGERPRINT BROWSER
+					{{$t('answer.text10')}}
 				</view>
 				<view style="font-size: 28rpx; font-weight: 400; text-align: center; color: #999; margin-top: 10rpx;">
-					CONFIGURING A NEW BROWSER TAKES 10 TO 20 SECONDS
+					{{$t('answer.text11')}}
 				</view>
 				<view>
 					<view style="color:#1D61FF; font-size: 28rpx; text-align: center; font-weight: 500; 
-					margin-top: 60rpx;">Loading...{{b}}%</view>
+					margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}%</view>
 					<view style="width: 80%; margin: auto;">
 						<slider :value="b" :disabled="true" style="height: 24rpx;" min="0" max="100" step="0.01" />
 					</view>
@@ -92,18 +92,18 @@
 			<view class="v2" v-if="step==4">
 				<view style="width: 50%; margin: 20rpx auto; background-color: #f8f8f8; text-align: center; 
 				padding: 30rpx 50rpx; font-size: 32rpx; color: #333;">
-					Step four：<span style="color: #1D61E7">{{step}}</span>/5
+					{{$t('answer.text12')}}：<span style="color: #1D61E7">{{step}}</span>/5
 				</view>
 				<view><image src="/static/images/step4.png" style="width: 60%; margin: auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					BROWSER IMPORT TARGET QUESTIONNAIRE
+					{{$t('answer.text13')}}
 				</view>
 				<view style="font-size: 28rpx; font-weight: 400; text-align: center; color: #999; margin-top: 10rpx;">
-					THE IMPORT PROCESS TAKES 10 TO 20 SECONDS
+					{{$t('answer.text14')}}
 				</view>
 				<view>
 					<view style="color:#1D61FF; font-size: 28rpx; text-align: center; font-weight: 500; 
-					margin-top: 60rpx;">Loading...{{b}}%</view>
+					margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}%</view>
 					<view style="width: 80%; margin: auto;">
 						<slider :value="b" :disabled="true" style="height: 24rpx;" min="0" max="100" step="0.01" />
 					</view>
@@ -112,18 +112,18 @@
 			<view class="v2" v-if="step==5">
 				<view style="width: 50%; margin: 20rpx auto; background-color: #f8f8f8; text-align: center; 
 				padding: 30rpx 50rpx; font-size: 32rpx; color: #333;">
-					Step five：<span style="color: #1D61E7">{{step}}</span>/5
+					{{$t('answer.text15')}}：<span style="color: #1D61E7">{{step}}</span>/5
 				</view>
 				<view><image src="/static/images/step5.png" style="width: 60%; margin: auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					MATCHING VIRTUAL CHARACTER
+					{{$t('answer.text16')}}
 				</view>
 				<view style="font-size: 28rpx; font-weight: 400; text-align: center; color: #999; margin-top: 10rpx;">
-					THE MATCHING PROCESS TAKES 10 TO 20 SECONDS
+					{{$t('answer.text17')}}
 				</view>
 				<view>
 					<view style="color:#1D61FF; font-size: 28rpx; text-align: center; font-weight: 500; 
-					margin-top: 60rpx;">Loading...{{b}}%</view>
+					margin-top: 60rpx;">{{$t('answer.text5')}}...{{b}}%</view>
 					<view style="width: 80%; margin: auto;">
 						<slider :value="b" :disabled="true" style="height: 24rpx;" min="0" max="100" step="0.01" />
 					</view>
@@ -157,11 +157,11 @@
 			<view class="v2" v-if="step==7">
 				<view><image src="/static/images/step7.png" style="width: 40%; margin: 60rpx auto;" mode="widthFix"></image></view>
 				<view style="font-size: 36rpx; font-weight: 600; text-align: center; color: #3d3d3d;">
-					COMPLETED THE CURRENT QUESTIONNAIRE
+					{{$t('answer.text18')}}
 				</view>
-				<view>
+				<!-- <view>
 					<button style="width: 40%; margin: 40rpx auto; background-color: #1D61E7; color: #fff; border-radius: 30rpx;">BACK</button>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="h5_press_save">

pages/wallet/fundrecords.vue

@@ -70,7 +70,7 @@
 					</view>
 					<view style="text-align: center; padding-bottom: 160rpx;" v-if="list.length <= 0">
 						<image style="width: 360rpx; height: 360rpx; margin: 160rpx auto 0rpx auto;" src="/static/images/w5.png" fit="cover"></image>
-						<view style="color: #999; font-size: 28px; font-weight: 400;">{{$t('nodata')}}</view>
+						<view style="color: #999; font-size: 36rpx; font-weight: 400;">{{$t('nodata')}}</view>
 					</view>
 				</view>
 			</view>		

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){