修改首页顶部布局和首页内容数据

i18n/lang/en.json

@@ -160,7 +160,10 @@
 		"e5": "Contract conversion",
 		"e6": "Miner Level",
 		"e7": "Miner",
-		"wallet": "Wallet"
+		"wallet": "Wallet",
+		"e8": "Deposit",
+		"e9": "Withdraw",
+		"e10": "Contact Us"
 	},
 	"accountSettings": {
 		"a0": "Account Settings",
@@ -281,7 +284,7 @@
 	"exchange": {
 		"a0": "Spot Trading",
 		"a1": "Subscription",
-		"a2": "Derivatives",
+		"a2": "Futures",
 		"a3": "Transaction",
 		"a4": "Open Orders",
 		"a5": "History",
@@ -561,7 +564,7 @@
 		"a1": "Enter your email",
 		"a2": "Password",
 		"a3": "Enter your password",
-		"a4": "Log In ",
+		"a4": "Login",
 		"a5": "Forgot Password",
 		"a6": "No account",
 		"a7": "Register Now",

i18n/lang/zh-TW.json

@@ -160,7 +160,10 @@
 		"e5": "合約折合",
 		"e6": "礦工等級",
 		"e7": "礦工",
-		"wallet": "錢包"
+		"wallet": "錢包",
+		"e8": "充值",
+		"e9": "提現",
+		"e10": "聯繫我們"
 	},
 	"accountSettings": {
 		"a0": "賬號設置",

layout/vLang.vue

@@ -1,6 +1,8 @@
 <template>
    <v-picker class="d-inline-block" :value="lang" :list="langList" @change="selectLang" range-key="label">
-     {{label}}
+     <!-- {{label}} -->
+	 <image v-if="theme=='dark'" src="@/assets/img/icon/language2.png" mode="widthFix" style="width: 40rpx;padding-top: 35rpx;"></image>
+	 <image v-else src="@/assets/img/icon/language1.png" mode="widthFix" style="width: 40rpx;padding-top: 35rpx;"></image>
    </v-picker>
 </template>
 <script>
@@ -18,6 +20,7 @@ export default {
     ...mapState({
       langList: "langList",
       lang: "lang",
+	  theme: "theme",
     }),
     label() {
       return this.langList.find((item) => item.value == this.lang).label;

pages/base/home.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="d-flex flex-col">
 		<!-- 头部 -->
-		<v-header class="nav_bar p-y-xs" :left-text="$t('base.a1')" :left-arrow="false" :left-click="personalCenter">
-
+		<v-header class="nav_bar p-y-xs" :left-text="$t('base.a1')" :left-arrow="false">
+			 <!-- :left-click="personalCenter" -->
 			<template #left>
 				<!-- <van-icon name="user-circle-o" class="fn-25 color-theme-1" /> -->
-				<view class="nav-left d-flex align-center justify-center">
+				<view class="nav-left d-flex align-center">
 					<!-- <div class="nav-menu">
 						<img src="../../assets/img/icon/menu-unfold.svg" alt="" />
 					</div> -->
-					<view class="d-flex align-center">
+					<view class="d-flex align-center" @click.stop="personalCenter">
 						<!-- <van-icon class="fn-20" name="manager" color="white" @click="show=true" /> -->
 						<van-icon name="user-circle-o" class="fn-25 color-theme-1" @click="show = true" />
 					</view>
@@ -21,15 +21,22 @@
                         >{{ app.appName }}
                         <span class="fn-16 m-l-xs">{{ $t("first.a2") }}</span>
                     </text> -->
+					<view class="d-flex align-center" style="margin-left: 30rpx;">
+						<img width="25px" height="25px" @click.stop="changtTheme" :src="theme == 'light' ? 'static/img/moon.png' : 'static/img/sun.png'" />
+					</view>
 				</view>
 			</template>
 			<!-- <template #title>
 
             </template> -->
 			<template #right>
-				<!-- <v-link to="/pages/login/index" class="d-flex align-center">
-					<van-icon class="fn-20" name="manager" color="white" />
-				</v-link> -->
+				<v-link to="/pages/login/index" class="d-flex align-center login_cor" v-if="!isLogin">
+					<!-- <van-icon class="fn-20" name="manager" color="white" /> -->
+					{{ $t("login.a4") }}
+				</v-link>
+				<view @click="sign_up" class="sign_up_box" v-if="!isLogin">
+					{{ $t("reg.b9") }}
+				</view>
 				<!-- <view class="nav_lang per-bot p-y-md p-x-sm d-flex align-center">
 					<img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" />
 					<span class="color-light d-flex" style="color: #fff; font-size: 16px;">
@@ -41,12 +48,10 @@
 				</view> -->
 				<view class="per-bot p-y-md p-x-sm d-flex align-center">
 					<!-- <img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" /> -->
+					
 					<span class="color-light">
-						<v-lang @change="
-							marketList = [];
-						indexData();
-						"></v-lang>
-						<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
+						<v-lang @change="marketList = [];indexData();"></v-lang>
+						<!-- <i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> -->
 					</span>
 				</view>
 
@@ -890,6 +895,20 @@
 					</view>
 				</view>
 			</view>
+			<view class="d-flex" style="padding: 60rpx 80rpx;justify-content: space-between;">
+				<view @click="recharge">
+					<view class="text-center"><img src="@/assets/img/home/top-up.png" style="width: 92rpx;height: 92rpx;" /></view>
+					<view class="text-center">{{ $t("base.e8") }}</view>
+				</view>
+				<view @click="assetsdraw">
+					<view class="text-center"><img src="@/assets/img/home/withdraw.png" style="width: 92rpx;height: 92rpx;" /></view>
+					<view class="text-center">{{ $t("base.e9") }}</view>
+				</view>
+				<view @click="toservice">
+					<view class="text-center"><img src="@/assets/img/home/Contact.png" style="width: 92rpx;height: 92rpx;" /></view>
+					<view class="text-center">{{ $t("base.e10") }}</view>
+				</view>
+			</view>
 			<view class="title_Top">
 				<view style="width: 50%;">
 					<view class="title_view">200+</view>
@@ -929,7 +948,7 @@
 								</view>
 							</view>
 							<view>
-								<view style="text-align: right;">{{ item.count }}</view>
+								<view style="text-align: right;">{{ item.price }}</view>
 								<view style="text-align: right;" :class="item.increase >= 0 ? 'buys' : 'red'">{{ item.increaseStr }}</view>
 							</view>
 						</view>
@@ -948,7 +967,7 @@
 								</view>
 							</view>
 							<view>
-								<view style="text-align: right;">{{ item.count }}</view>
+								<view style="text-align: right;">{{ item.price }}</view>
 								<view style="text-align: right;" :class="item.increase >= 0 ? 'buys' : 'red'">{{ item.increaseStr }}</view>
 							</view>
 						</view>
@@ -967,7 +986,7 @@
 								</view>
 							</view>
 							<view>
-								<view style="text-align: right;">{{ item.count }}</view>
+								<view style="text-align: right;">{{ item.price }}</view>
 								<view style="text-align: right;" :class="item.increase >= 0 ? 'buys' : 'red'">{{ item.increaseStr }}</view>
 							</view>
 						</view>
@@ -1883,6 +1902,15 @@ export default {
 			this.$router.push({ path: '/pages/login/index' })
 
 		},
+		recharge(){
+			this.$router.push({ path: '/pages/assets/recharge' })
+		},
+		assetsdraw(){
+			this.$router.push({ path: '/pages/assets/draw' })
+		},
+		toservice(){
+			this.$router.push({ path: '/pages/service/service?id=33&type=0' })
+		},
 		// goto down app
 		gotodown(){
 			// this.$router.push({ path: '/download/XUScoin.mobileconfig' })
@@ -1935,7 +1963,7 @@ export default {
 		width: 210px;
 		height: 40px;
 		align-items: center;
-		justify-content: space-between;
+		// justify-content: space-between;
 
 		.nav-menu {
 			width: 24px;
@@ -3348,4 +3376,19 @@ export default {
 		padding: 20px 0px;
 	}
 }
+.text-center{
+	text-align: center;
+}
+.login_cor{
+	color: var(--col2);
+}
+.sign_up_box{
+	height: 60rpx;
+	line-height: 60rpx;
+	margin-left: 30rpx;
+	background-color: var(--col2);
+	color: var(--text-col);
+	padding: 0rpx 20rpx;
+	border-radius: 40rpx;
+}
 </style>

pages/base/index.vue

@@ -82,7 +82,8 @@ export default {
                     activeIcon: "static/img/base_link_1.png",
                 },
                 {
-                    label: this.$t("first.b8")+this.$t("exchange.a2"),
+                    label: this.$t("exchange.a2"),
+					// this.$t("first.b8")+
                     tel: "contract",
                     icon: "static/img/base_caidan_0.png",
                     activeIcon: "static/img/base_caidan_1.png",

pages/login/index.vue

@@ -8,7 +8,7 @@
                <v-lang
                   
                 ></v-lang>
-                <i class="iconfont m-l-xs fn-sm" >&#xe6e9;</i>
+                <!-- <i class="iconfont m-l-xs fn-sm" >&#xe6e9;</i> -->
               </span>
             </view>
         </template>

pages/reg/index.vue

@@ -9,7 +9,7 @@
                 <v-lang
                   @change="changeLang"
                 ></v-lang>
-                <i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
+                <!-- <i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> -->
               </span>
             </view>
         </template>