From bf7847e556c62e609662376feeddc803f0900953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98daijinzheng=40xingtongworld=2Ecom=E2=80=99?=
 <‘ceshi@qq.com’>
Date: Fri, 7 Jul 2023 20:04:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js              |  16 ++---
 i18n/lang/en.json   |   8 +--
 pages/base/home.vue | 169 ++++++++++++++++++++++++++++++++++++--------
 3 files changed, 150 insertions(+), 43 deletions(-)

diff --git a/app.js b/app.js
index 48ddb73..4a4cc40 100644
--- a/app.js
+++ b/app.js
@@ -3,21 +3,21 @@ let config = {};
 if (process.env.NODE_ENV == 'production'||true) { //生产环境
     config = {
         // ajax地址
-        baseUrl: 'https://ser.ybgcoins.com',
+        baseUrl: 'https://mgsc.nvrcoin.com',
         // 图片地址 （暂时无用）
-        imgUrl: 'https://ser.ybgcoins.com/storage',
+        imgUrl: 'https://mgsc.nvrcoin.com/storage',
         // socket地址
-        socketUrl: 'wss://ser.ybgcoins.com/ws1',
-        socketUrl1: 'wss://ser.ybgcoins.com/ws2',
+        socketUrl: 'wss://mgsc.nvrcoin.com/ws1',
+        socketUrl1: 'wss://mgsc.nvrcoin.com/ws2',
         // pc端地址
-        pcUrl:'https://www.ybgcoins.com',
+        pcUrl:'https://www.nvrcoin.com',
         // app名称
-        appName: 'YBGCoins',
+        appName: 'NVRCoins',
         // 版本
         version: '1.0.0',
         // 移动端地址
-        mobile: 'https://h5.ybgcoins.com/',
-        down:"https://h5.ybgcoins.com/download/BTwallets.html"
+        mobile: 'https://mobile.nvrcoin.com/',
+        down:"https://mobile.nvrcoin.com/download/BTwallets.html"
     };
 } else { //开发环境
     config = {
diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index b4fa31d..d796a90 100644
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -141,9 +141,9 @@
 		"c7": "Optional",
 		"c8": "Added successfully",
 		"c9": "Cancelled successfully",
-		"d0": "首页",
+		"d0": "Home",
 		"d1": "Transaction",
-		"d2": "钱包",
+		"d2": "Wallets",
 		"d3": "Please enter search keywords",
 		"d4": "All",
 		"d5": "Motherboard",
@@ -271,9 +271,9 @@
 		"d5": "Please select"
 	},
 	"exchange": {
-		"a0": "币币交易",
+		"a0": "Spot Trading",
 		"a1": "Subscription",
-		"a2": "永续合约",
+		"a2": "Derivatives",
 		"a3": "Transaction",
 		"a4": "Open Orders",
 		"a5": "History",
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 95b24dd..02e8d3b 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -92,17 +92,36 @@
 
 			<!-- num count -->
 			<div class="num-count">
-				<div class="num-top d-flex">
+				<div class="num-top">
 					<div class="num-left">
+						<scroll-view @refresherrefresh="onRefresh" :refresher-enabled="refresherEnabled && scrollTop < 50"
+							:refresher-triggered="refreshing" refresher-background="transparent" :refresher-threshold="50">
+							<!-- 轮播 -->
+							<swiper class="my-swipe2 m-x-md p-b-xs" indicator-dots indicator-color="white">
+								<swiper-item class="my_swipe_item2" v-for="(item, idx) in homeList" :key="idx">
+									<div class="num">
+										<img src="../../assets/img/bg/USDT(2) Copy@2x.png"
+											style="width: 24px;height: 24px;margin-right: 6px;vertical-align: bottom;"
+											alt="">
+										<!-- BTC/USDT -->
+										{{ item.pair }}
+									</div>
+									<div class="num num2">{{ item.pair }}</div>
+									<div class="title title2">≈0.032935 USD</div>
+									<div class="title title3">{{ item.increaseStr }}</div>
+									<!-- <div class="num-center" style="border-left: 1px solid gray;"></div> -->
+								</swiper-item>
+							</swiper>
+						</scroll-view>
 						<!-- <div class="num">{{$t("common.user")}}</div> -->
-						<div class="num">
+						<!-- <div class="num">
 							<img src="../../assets/img/bg/USDT(2) Copy@2x.png"
 								style="width: 24px;height: 24px;margin-right: 6px;vertical-align: bottom;" alt="">
-							BTC/USDT
+							{{ item.pair }}
 						</div>
-						<div class="num num2">0.032935</div>
+						<div class="num num2">{{ item.pair }}</div>
 						<div class="title title2">≈0.032935 USD</div>
-						<div class="title title3">+0.12%</div>
+						<div class="title title3">{{ item.increaseStr }}</div> -->
 
 						<!-- <div class="title">{{$t("common.user")}}</div>
 						<div class="num">5 {{$t("common.million")}}+</div> -->
@@ -112,9 +131,8 @@
 						<div class="title">{{$t("common.trading")}}</div>
 						<div class="title">{{$t("common.transactions")}}</div>
 					</div> -->
-					<div class="num-center" style="border-left: 1px solid white;"></div>
-					<div class="num-right">
-						<!-- <div class="num">{{$t("common.user")}}</div> -->
+					<!-- <div class="num-center" style="border-left: 1px solid gray;"></div> -->
+					<!-- <div class="num-right">
 						<div class="num">
 							<img src="../../assets/img/bg/USDT(2) Copy@2x.png"
 								style="width: 24px;height: 24px;margin-right: 6px;vertical-align: bottom;" alt="">
@@ -123,10 +141,7 @@
 						<div class="num num2">0.032935</div>
 						<div class="title title2">≈0.032935 USD</div>
 						<div class="title title3">+0.12%</div>
-						<!-- <div class="title">{{$t("common.using")}}</div>
-						<div class="num">8,464,594</div>		
-						<div class="title">{{$t("common.crypto")}}</div> -->
-					</div>
+					</div> -->
 				</div>
 				<!-- <div class="num-bottom d-flex">
 					<div class="num-left">
@@ -142,7 +157,21 @@
 				</div> -->
 			</div>
 
-			<div class="scqs-list" style="margin-top: 6rem;margin-left: 1rem;">
+			<div style="margin-top: 5rem;">
+				<scroll-view @refresherrefresh="onRefresh" :refresher-enabled="refresherEnabled && scrollTop < 50"
+					:refresher-triggered="refreshing" refresher-background="transparent" :refresher-threshold="50">
+					<!-- 轮播 -->
+					<swiper class="my-swipe m-x-md p-b-xs" indicator-dots indicator-color="white">
+						<swiper-item class="my_swipe_item" v-for="(item, idx) in home" :key="idx">
+							<img width="90%" height="100%" class="rounded-sm" fit="cover" :src="item.imgurl" />
+						</swiper-item>
+					</swiper>
+				</scroll-view>
+			</div>
+
+
+
+			<div class="scqs-list" style="margin-top: 3rem;margin-left: 1rem;">
 				<div class="dzdzc-bottom-list-top">
 					<div class="dzdzc-bottom-list-title" style="font-size: 24px;">
 						{{ $t("shou.a8") }}
@@ -154,25 +183,28 @@
 				</div>
 
 				<div class="scqs-list-li" style="margin-top: 1rem;">
-					<div class="scqs-list-li-top" style="display: flex;justify-content: space-between;color: gray;">
+					<div class="scqs-list-li-top"
+						style="display: flex;justify-content: space-between;color: gray;margin-bottom: 1rem;">
 						<div style="width: 40%;">{{ $t("shou.a9") }}</div>
-						<div style="width: 25%;">{{ $t("shou.a10") }}</div>
-						<div style="width: 25%;">{{ $t("shou.a11") }}</div>
+						<div style="width: 32%;text-align: right;">{{ $t("shou.a10") }}</div>
+						<div style="width: 25%;text-align: center;">{{ $t("shou.a11") }}</div>
 					</div>
 					<div class="scqs-list-li-content" v-for="item in indexList" :key="item.id"
-						style="display: flex;justify-content: space-between;">
+						style="display: flex;justify-content: space-between;margin-bottom: 1.5rem;">
 						<div style="width: 40%;">
-							<img style="width: 20px;height: 20px;" src="item.coin_icon" alt="">
+							<img style="width: 25px;height: 25px;vertical-align: middle;margin-right: 0.4rem;"
+								:src="item.coin_icon" alt="">
 							{{ item.coin_name }}
 						</div>
-						<div style="width: 25%;">{{ item.high }}</div>
-						<div style="width: 25%;">{{ item.increase }}</div>
+						<div style="width: 25%;text-align: right;">{{ item.high }}</div>
+						<div style="width: 25%;text-align: center;">{{ item.increase }}</div>
 					</div>
 				</div>
 
 			</div>
 
-			<div class="scqs-list-bottom" style="display: flex;justify-content: space-around;margin-left: 1rem;flex-wrap: wrap;">
+			<div class="scqs-list-bottom"
+				style="display: flex;justify-content: space-around;margin-left: 1rem;flex-wrap: wrap;">
 				<div class="scqs-list-bottom-box">
 					<div class="scqs-list-bottom-box-t">
 						{{ $t("shou.a13") }}
@@ -268,7 +300,7 @@
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists2">
 					<div class="dzdzc-bottom-lists-text">
 						<div class="dzdzc-bottom-lists-text-title">
 							{{ $t("shou.a32") }}
@@ -283,7 +315,7 @@
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists3">
 					<div class="dzdzc-bottom-lists-text">
 						<div class="dzdzc-bottom-lists-text-title">
 							{{ $t("shou.a34") }}
@@ -298,7 +330,7 @@
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists4">
 					<div class="dzdzc-bottom-lists-text">
 						<div class="dzdzc-bottom-lists-text-title">
 							{{ $t("shou.a36") }}
@@ -325,15 +357,15 @@
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists5">
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists6">
 
 				</div>
 
-				<div class="dzdzc-bottom-lists">
+				<div class="dzdzc-bottom-lists dzdzc-bottom-lists7">
 
 				</div>
 			</div>
@@ -966,6 +998,7 @@
 	</view>
 </template>
 
+
 <script>
 import College from "@/api/college"
 import Home from "@/api/home"
@@ -1008,6 +1041,7 @@ export default {
 			infoActive: 1, // 详情选中
 			marketList: [],
 			marketListHe: [],
+			homeList: [],
 			home: {},
 			notice: [],
 			wap: "",
@@ -1145,7 +1179,7 @@ export default {
 				this.home = res.data.bannerList
 				this.notice = res.data.noticeList
 				this.indexList = res.data.brokenLine
-				console.log(this.indexList);
+				this.homeList = res.data.homeList
 				this.marketList = res.data.marketList
 				// this.infoActive = 1;
 				this.dunshift()
@@ -1362,6 +1396,9 @@ export default {
 
 		}
 	},
+	// created() {
+	// 	this.indexList();
+	// },
 	mounted() {
 		this.getCollegeList()
 		this.onRefresh()
@@ -1464,7 +1501,7 @@ export default {
 			0;
 
 		.num-top {
-			justify-content: space-around;
+			// justify-content: space-around;
 		}
 
 		.num-bottom {
@@ -1512,10 +1549,12 @@ export default {
 	.scqs-list-bottom-box {
 		width: 40%;
 		margin-top: 1rem;
+
 		.scqs-list-bottom-box-t {
 			font-size: 28px;
 			color: #fff;
 		}
+
 		.scqs-list-bottom-box-b {
 			font-size: 16px;
 			color: gray;
@@ -1615,7 +1654,7 @@ export default {
 			background-repeat: no-repeat;
 
 			.dzdzc-bottom-lists-text {
-				width: 70%;
+				width: 66%;
 				padding-top: 0.9rem;
 				margin-left: 1rem;
 
@@ -1626,7 +1665,7 @@ export default {
 				}
 
 				.dzdzc-bottom-lists-text-t {
-					font-size: 15px;
+					font-size: 12px;
 					color: gray;
 					margin-top: 0.5rem;
 
@@ -1636,6 +1675,60 @@ export default {
 
 		}
 
+		.dzdzc-bottom-lists2 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/2.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
+		.dzdzc-bottom-lists3 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/3.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
+		.dzdzc-bottom-lists4 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/4.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
+		.dzdzc-bottom-lists5 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/图片\ 7@1x.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
+		.dzdzc-bottom-lists6 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/图片\ 9@1x.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
+		.dzdzc-bottom-lists7 {
+			width: 100%;
+			height: 170px;
+			margin-top: 1rem;
+			background-image: url('../../assets/img/bg/图片\ 10@1x.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
+
 	}
 
 	.ljzqsy-box {
@@ -1967,9 +2060,23 @@ export default {
 	}
 }
 
+.my-swipe2 {
+	.my_swipe_item2 {
+		display: inline !important;
+		width: 50% !important;
+		// height: 90% !important;
+	}
+}
+
 .my-swipe {
 	height: 150px;
 
+	.my_swipe_item {
+		display: inline !important;
+		width: 60% !important;
+		// height: 90% !important;
+	}
+
 	.van-image {
 		padding: 0 18px;
 		box-sizing: border-box;