11 Incheckningar 5d3704f790 ... bc48b41084

Upphovsman SHA1 Meddelande Datum
  tanxue bc48b41084 样式修改 14 timmar sedan
  tanxue a46d0ef181 兑换码样式修改 14 timmar sedan
  tanxue 6d7782c5fa Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 14 timmar sedan
  tanxue 3d7c9be8d0 Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 15 timmar sedan
  tanxue 381bc86e86 Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 15 timmar sedan
  tanxue 40405eeeb4 Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 15 timmar sedan
  tanxue 430f33f7f1 Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 15 timmar sedan
  tanxue 44162bb967 Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 15 timmar sedan
  tanxue 9f6af5b4aa Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学 16 timmar sedan
  tanxue 90f083f223 Merge branch '2025鹅状元数学' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025鹅状元数学 18 timmar sedan
  tanxue 43d2a112c5 兑换码样式修改 18 timmar sedan

+ 23 - 0
common/styles/global/components.scss

@@ -325,7 +325,30 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	}
 	.tip-content{min-height: 240rpx;text-align: justify;}
 }
+// 一个确认按钮的弹窗
+.small-one-button-dialog{
+	.tip-content-box{
+		width: 625rpx;height: 365rpx;padding: 36rpx 48rpx;
+		@include ezy-no-repeat-cover;box-sizing: border-box;text-align:center;
+		background-image: url("@/static/images/common/tip-small-bj.png");
+	}
+	.tip-content{
+		color: #222;font-size: 38rpx;padding-bottom: 36rpx;
+		display: flex;justify-content: center;align-items: center;
+		border-bottom: 1px dashed #70cbf4;line-height: 1.6;
+		min-height: 150rpx;
+	}
+	.tip-btn-box{
+		width: 100%;display: flex;justify-content: space-between;justify-content: center;margin: 36rpx 0 0;
+		.tip-btn{
+			width: 394rpx;height: 88rpx;line-height: 88rpx;
+			color: #fff;@include ezy-no-repeat-cover;text-align: center;
+			background-image: url("@/static/images/common/tip-one-confirm-btn.png");
+		}
+	}
+}
 
+// 大鹅提示弹窗
 .tip-e-dialog{
 	width: 625rpx;height: 519rpx;padding: 42rpx 48rpx;@include ezy-no-repeat-cover;
 	background-image: url("@/static/images/common/tip-big-bj.png");position: relative;

+ 36 - 2
common/styles/global/pages.scss

@@ -229,8 +229,7 @@
 		width: 100%;height: 100rpx;border: 1rpx solid #dfdfdf;border-radius: 16rpx;
 		display: flex;align-items: center;
 		.phone-input {font-size: 38rpx;padding: 0 30rpx;box-sizing: border-box;color: #555;flex: 1;overflow: hidden;}
-		.uni-input-placeholder {font-size: 34rpx;color: #acacae;
-		}
+		.uni-input-placeholder {font-size: 34rpx;color: #acacae;}
 		.close-btn{width: 42rpx;height: 42rpx;margin-right: 30rpx;@include ezy-no-repeat-cover;
 		background-image: url("@/static/images/login/login-close-icon.png");flex-shrink: 0;}
 	}
@@ -1077,3 +1076,38 @@
 }
 
 
+// 兑换码
+.ezy-dhm-page{
+	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	.dhm-body{
+		width: 95%;margin: 20rpx auto 0;box-sizing: border-box;padding: 36rpx;
+		.dhm-head-box{
+			width: 100%;padding: 12rpx 0 56rpx;box-sizing: border-box;
+			display: flex;align-items: center;color: #333;line-height: 1.6;
+			.head-img-box{width: 126rpx;height: 126rpx;margin: 0 24rpx 0 12rpx;@include ezy-no-repeat-cover;border-radius: 50%;}
+			.head-content-box{font-size: 32rpx;}
+			
+		}
+		.duihuan-input-box{
+			width: 100%;height: 100rpx;border: 1rpx solid #dfdfdf;border-radius: 16rpx;
+			display: flex;align-items: center;
+			.uni-input-placeholder {font-size: 34rpx;color: #acacae;}
+			.duihuan-prefix-icon {
+			  width: 56rpx;height: 56rpx;margin:0 32rpx 0 16rpx;@include ezy-no-repeat-cover;
+			  background-image: url("@/static/images/my/two-code.png");position: relative;
+			  font-weight: normal;display: flex;align-items: center;justify-content: space-between;flex-shrink: 0;
+			}
+			.duihuan-prefix-icon::after{
+				content: '';width: 1rpx;height: 56rpx;display: inline-block;background-color: #dfdfdf;
+				position: absolute;bottom: 0;right: -16rpx;
+				}
+		}
+		
+		.duihuan-confirm-btn{
+			width: 100%;height: 92rpx;line-height: 92rpx;text-align: center;font-size:32rpx;
+			margin-top: 42rpx;@include ezy-no-repeat-contain;font-weight: bold;
+			background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;
+		}
+	}
+}
+

+ 11 - 4
pages/chanpinMy/components/duihuanma/duihuanError.vue

@@ -1,12 +1,19 @@
 <template>
-	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" mask-background-color="rgba(255, 255, 255, 0.6);">
-		<view>{{ tex }}</view>
-		<view @click="handleConfirm">确认</view>
+	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" mask-background-color="rgba(0,0,0, 0.76);">
+		<view class="small-one-button-dialog">
+			<view class="tip-content-box">
+				<view class="tip-content">{{ tex }}</view>
+				<view class="tip-btn-box">
+					<ezyActiveVue class="ezy-btn-active tip-btn" @aclick="handleConfirm">确认</ezyActiveVue>
+				</view>
+			</view>
+		</view>
 	</uni-popup>
 </template>
 
 <script setup>
 import {ref} from "vue"
+import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 
 const dlRef = ref(null);
 const tex = ref('兑换无效,请重新输入');
@@ -15,7 +22,7 @@ const emits =defineEmits(['confirm'])
 
 function handleConfirm() {
 	emits('confirm')
-  handleClose()
+	handleClose()
 }
 
 function handleShow(msg) {

+ 10 - 4
pages/chanpinMy/components/duihuanma/duihuanSuccess.vue

@@ -1,13 +1,19 @@
 <template>
-	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" mask-background-color="rgba(255, 255, 255, 0.6);">
-		<view>兑换成功</view>
-		<view @click="handleConfirm">确认</view>
+	<uni-popup ref="dlRef" :animation="true" :is-mask-click="false" mask-background-color="rgba(0,0,0, 0.76);">
+		<view class="small-one-button-dialog">
+			<view class="tip-content-box">
+				<view class="tip-content">兑换成功</view>
+				<view class="tip-btn-box">
+					<ezyActiveVue class="ezy-btn-active tip-btn" @aclick="handleConfirm">确认</ezyActiveVue>
+				</view>
+			</view>
+		</view>
 	</uni-popup>
 </template>
 
 <script setup>
 import {ref} from "vue"
-
+import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
 const dlRef = ref(null);
 
 const emits =defineEmits(['confirm'])

+ 19 - 13
pages/chanpinMy/duihuanma.vue

@@ -1,20 +1,25 @@
 <template>
-	<view class="icon-title-navBar-box1">
-		<view @click="handleBack" class="nav-bar-icon"></view>
-		<text class="nav-bar-title">使用兑换码</text>
-	</view>
-	<view>
-		<view class="tip-content-box">
-			<icon class="head-img-box" :style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
-			<view>{{ myInfoData.nickName }}</view>
-			<view>{{ myInfoData.userName }}</view>
-			<input class="duihuan-input" type="text" focus v-model="duihuamaValue" placeholder="请输入兑换码" />
-			<view class="tip-btn-box">
-				<view class="confirm-btn" @click="confirmBtn">兑换码</view>
+	<view class="ezy-dhm-page">
+		<view class="icon-title-navBar-box">
+			<view @click="handleBack" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">使用兑换码</text>
+		</view>
+		<view class="ezy-page-body dhm-body">
+			<view class="dhm-head-box">
+				<icon class="head-img-box" :style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
+				<view class="head-content-box">
+					<view>{{ myInfoData.nickName }}</view>
+					<view>{{ myInfoData.userName }}</view>
+				</view>
 			</view>
+			<view class="duihuan-input-box">
+				<icon class="duihuan-prefix-icon">+86</icon>
+				<input class="duihuan-input" type="text" focus v-model="duihuamaValue" placeholder="请输入兑换码" />
+			</view>
+			<ezyActiveVue class="ezy-btn-active duihuan-confirm-btn" @aclick="confirmBtn">确定兑换
+			</ezyActiveVue>
 		</view>
 	</view>
-
 	<!-- 失败 -->
 	<duihuanError ref="dhErrRef"></duihuanError>
 	<!-- 成功 -->
@@ -25,6 +30,7 @@
 	import {
 		ref,reactive
 	} from 'vue';
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue"
 	import duihuanError from "./components/duihuanma/duihuanError";
 	import duihuanSuccess from "./components/duihuanma/duihuanSuccess";
 	import {