修改bug

components/popUpWindow/popUpWindow.vue

@@ -8,7 +8,8 @@
 					<image src="../../static/popUpWindow/bg.png" mode="widthFix"></image>
 				</div>
 				<view class="popup-desc">
-					{{ tip[type[$i18n.locale]] }}
+					<!-- {{ tip.details }} -->
+					<u-parse :content="tip.details"></u-parse>
 				</view>
 				<view class="popup-btn">
 					<view @click="close" class="">ok</view>
@@ -45,13 +46,21 @@
 		methods: {
 			//关闭
 			close() {
-				uni.setStorageSync('clickPopUp', {}); //用户是否点击过关闭弹框
+				uni.setStorageSync('clickPopUp', 'true'); //用户是否点击过关闭弹框
 				this.$emit('close')
 			},
 
 			//获取首页提示
 			getIndexTip() {
-				this.request('getIndexTip').then(res => {
+				// this.request('getIndexTip').then(res => {
+				// 	if (res.code == 200) {
+				// 		this.tip = res.result
+				// 	}
+				// })
+				
+				this.request('getPromptNotice', {}, {
+					us : this.$i18n.locale
+				}).then(res => {
 					if (res.code == 200) {
 						this.tip = res.result
 					}
@@ -69,7 +78,7 @@
 		position: fixed;
 		height: 100vh;
 		width: 750rpx;
-		background: rgba(0, 0, 0, .1);
+		background: rgba(0, 0, 0, 0.3);
 		left: 0;
 		top: 0;
 		z-index: 1000;
@@ -77,7 +86,7 @@
 
 		.popup-content {
 			position: relative;
-			width: 96%;
+			width: 90%;
 			margin: 0rpx auto;
 			background: white;
 			border-radius: 15rpx;

config.js

@@ -16,7 +16,8 @@ const config = {
 	},
 	prod : {
 		// baseUrl : 'https://uav-api.xzaiyp.top/uav-api',
-		baseUrl : 'https://api.olxbookbub.top/uav-oxl-api',//国外服务器
+		// baseUrl : 'https://api.olxbookbub.top/uav-oxl-api',//国外服务器
+		baseUrl : 'https://api.oxlbook.top/uav-oxl-api',//国外服务器第二版
 	},
 }
 

pages/home/home.vue

@@ -34,6 +34,10 @@
 		<view class="home-title content">
 			<view>{{ $t('page.home.aboutUs') }}</view>
 		</view>
+		
+		<u-notice-bar 
+		@click="showPopUp = true"
+		:text="noticeText"></u-notice-bar>
 
 		<view class="about-us"
 		:style="{'background-image' : `url(${aboutImage})`}">
@@ -57,7 +61,7 @@
 		<sTabbar select="0" />
 
 		<!-- 弹窗 -->
-		<popUpWindow :show="showPopUp" @close="closePopUp"></popUpWindow>
+		<popUpWindow :show="showPopUp" @close="showPopUp = false"></popUpWindow>
 
 		<!-- 选择语言弹框 -->
 		<changeLanguage :show.sync="showLanguage" @close="closeLanguage"></changeLanguage>
@@ -87,13 +91,29 @@
 				shopList : [],		//商品列表
 				scrollList : [],		//提现滚动列表
 				aboutImage : '',
+				noticeText : '',//公告标题
 			}
 		},
 		onShow() {
 			this.getShopList()
 			this.getIndexScroll()
+			this.getIndexTip()
+			// if(!uni.getStorageSync('clickPopUp')){
+			// 	this.showPopUp = true
+			// }
 		},
 		methods: {
+
+			//获取首页公告
+			getIndexTip() {
+				this.request('getPromptNotice', {}, {
+					us : this.$i18n.locale
+				}).then(res => {
+					if (res.code == 200) {
+						this.noticeText = res.result.title
+					}
+				})
+			},
 			//关闭语言选项
 			closeLanguage() {
 				this.$play()

utils/shop.js

@@ -81,4 +81,8 @@ export default {
 	getRandomImage : { url : '/index/getRandomImage' , method : 'GET' },
 	//获取平台充值地址
 	getPayUrl : { url : '/index/getPayUrl' , method : 'GET' },
+	
+	
+	//首页公告弹窗内容
+	getPromptNotice : { url : '/index/getPromptNotice' , method : 'GET' },
 }