From f02470ab94a18b6ca73821eb90170635ba8e6d4d Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 16 Jan 2025 17:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |  8 +++++--
 pages/index/index.vue          |  2 +-
 pages_order/home/notice.vue    | 21 ++++++++++++++++-
 pages_order/mine/promotion.vue | 52 ++++++++++++++++++++++++++++++++++--------
 4 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/pages.json b/pages.json
index 34367e9..3ab0e96 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -107,7 +108,10 @@
 				"path": "mine/recharge"
 			},
 			{
-				"path": "mine/promotion"
+				"path": "mine/promotion",
+				"style": {
+					"navigationBarTextStyle": "white"
+				}
 			},
 			{
 				"path": "home/notice"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 466f9f7..420d372 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,7 +12,7 @@
 			mode="widthFix"></image> -->
 			
 			<image :src="configList.index_img"
-			style="width: 240rpx;"
+			style="width: 240rpx;height: 100rpx;"
 			mode="widthFix"></image>
 		</view>
 
diff --git a/pages_order/home/notice.vue b/pages_order/home/notice.vue
index 1d5ca00..b77d487 100644
--- a/pages_order/home/notice.vue
+++ b/pages_order/home/notice.vue
@@ -3,6 +3,15 @@
 	<view class="page">
 		<navbar :title="title" leftClick @leftClick="$utils.navigateBack" />
 		<view style="padding: 20rpx;">
+			
+			<view class="videos">
+				<view class="video"
+				v-for="(item, index) in videos"
+				:key="index">
+					<video :src="item"></video>
+				</view>
+			</view>
+			
 			<uv-parse :content="notice"></uv-parse>
 		</view>
 	</view>
@@ -12,7 +21,8 @@
 	export default {
 		data() {
 			return {
-				notice : {},
+				notice : '',
+				videos : [],
 				id : 0,
 				title : '公告',
 				titles : ['公司介绍', '产品介绍', '关于我们', '其他'],
@@ -45,6 +55,7 @@
 				}, res => {
 					if(res.code == 200){
 						this.notice = res.result.details
+						this.videos = res.result.voSub ? res.result.voSub.split(',') : []
 					}
 				})
 			},
@@ -54,5 +65,13 @@
 
 <style scoped lang="scss">
 	.page {
+		.videos{
+			.video{
+				width: 100%;
+				video{
+					width: 100%;
+				}
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
index 7220c19..67ddb6f 100644
--- a/pages_order/mine/promotion.vue
+++ b/pages_order/mine/promotion.vue
@@ -3,23 +3,17 @@
 		
 		
 		<navbar title="推荐有礼" 
-		bgColor="#A3D250"
+		:bgColor="bgColor"
 		color="#fff"
 		leftClick @leftClick="$utils.navigateBack" />
 		
-		<view class=""
-		style="position: relative;"
+		<view class="tui_image"
 		v-if="!show">
 			<image :src="configList.tui_image" mode="widthFix"
 			style="width: 100%;"></image>
 			
 			<view class="uni-color-btn"
-			style="position: absolute;bottom: 150rpx;
-			height: 40rpx;
-			background-color: #f40;
-			box-shadow: 0 0 10rpx 10rpx #ff440066;
-			width: 80%;"
-			@click="show = true">
+			@click="clickTab">
 				推荐二维码海报生成
 			</view>
 		</view>
@@ -28,7 +22,9 @@
 		<view
 		v-if="show">
 		
-			<image style="width: 100%;" :src="imagePath" mode="widthFix"></image>			
+			<image
+			class="image" 
+			:src="imagePath" mode="aspectFill"></image>			
 		
 			
 			<!-- <view class="uni-color-btn"
@@ -67,6 +63,8 @@
 				canvas: {},
 				imagePath: '',
 				show : false,
+				bgColor : '#fe6c17',
+				load : false,
 			}
 		},
 		onShow() {
@@ -76,6 +74,7 @@
 		methods: {
 			getQrCode() {
 				// this.show = true
+				this.load = true
 				this.$api('getInviteCode', res => {
 					if (res.code == 200) {
 						this.url = res.result.url
@@ -84,6 +83,15 @@
 					}
 				})
 			},
+			clickTab(){
+				this.bgColor = '#de0917'
+				this.show = true
+				if(this.load){
+					uni.showLoading({
+						title: "拼命绘画中..."
+					})
+				}
+			},
 			draw() {
 
 				// uni.showLoading({
@@ -177,6 +185,7 @@
 									var tempFilePath = res.tempFilePath;
 									this.imagePath = tempFilePath
 									uni.hideLoading()
+									this.load = false
 								}
 							});
 						}, 600);
@@ -240,6 +249,29 @@
 	.promotion {
 		width: 100%;
 		height: 100vh;
+		background-color: #de0917;
+		.tui_image{
+			position: relative;
+			.uni-color-btn{
+				position: absolute;
+				bottom: 150rpx;
+				height: 40rpx;
+				background-color: #fff;
+				box-shadow: 0 0 10rpx 10rpx #ffffff66;
+				color: #de0917;
+				font-weight: 900;
+				width: 80%;
+				font-family: STFangsong;
+				font-size: 34rpx;
+			}
+		}
+		
+		.image{
+			width: 100%;
+			height: calc(100vh - 200rpx);
+		}
+		
+		
 		// background-color: $uni-color;
 		.promotion-card {
 			width: 90%;