From 661cd94155ce09c86f9603cd61c66132fdf8afc0 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 14 Apr 2025 17:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/HistoryScore/HistoryScore.vue        |  9 +++++++++
 .../IndependentRecruitment.vue                 | 18 +++++++++++++-----
 .../pages/RecommendForm/RecommendForm.vue      |  8 +++++++-
 package_sub/pages/SchoolList/SchoolList.vue    | 10 ++++++++++
 package_sub/pages/TargetCount/TargetCount.vue  |  9 +++++++++
 5 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/package_sub/pages/HistoryScore/HistoryScore.vue b/package_sub/pages/HistoryScore/HistoryScore.vue
index 975df55..c0ac06d 100644
--- a/package_sub/pages/HistoryScore/HistoryScore.vue
+++ b/package_sub/pages/HistoryScore/HistoryScore.vue
@@ -1,5 +1,7 @@
 <template>
   <view class="container safe-area-inset-bottom">
+	  <zmm-watermark :column="2" :margin="30" :watermark="watermark"></zmm-watermark>
+	  
     <view class="search-bar">
       <view class="search-bar__input">
         <u-input
@@ -76,9 +78,16 @@
 </template>
 
 <script>
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/waterlogo.png';
 export default {
+  components: {
+	zmmWatermark
+  },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
+		
       defaultTime: '',
       select: {
         keyword: "",
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 7b92310..665212d 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -1,6 +1,7 @@
 <template>
   <view class="container safe-area-inset-bottom">
     <image class="bkg" src="~@/static/me/wave.png" mode="widthFix"></image>
+	<zmm-watermark :column="2" :margin="30" :watermark="watermark"></zmm-watermark>
 
     <view class="wrap" v-if="step === 1">
       <view class="year-picker">
@@ -178,11 +179,12 @@
             'color': '#fff',
             'margin-left': '64rpx'
           }"
-            @click="stepClick('next')">下一步</u-button>
+             @click="submit">提交</u-button>
+			
       </view>
     </view>
 
-    <view class="wrap" v-if="step === 4">
+    <!-- <view class="wrap" v-if="step === 4">
       <view class="picked-data">
         <view>{{ form.year }}年</view>
         <view>{{ formArea }}</view>
@@ -234,7 +236,7 @@
           }"
             @click="submit">提交</u-button>
       </view>
-    </view>
+    </view> -->
 
     <u-picker
         v-model="isShowTime"
@@ -255,9 +257,15 @@
 </template>
 
 <script>
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/waterlogo.png';
 export default {
+  components:{
+	  zmmWatermark
+  },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
       isShowSchool: false,
       isShowSex: false,
       sexList: [
@@ -369,7 +377,7 @@ export default {
     },
     stepClick(type='next') {
       if (type === 'next') {
-        if (this.step < 4) {
+        if (this.step < 3) {
           this.step = this.step + 1
 
           if (this.step === 2) {
@@ -409,7 +417,7 @@ export default {
     },
     setTitle() {
       uni.setNavigationBarTitle({
-        title: `自主招生志愿填报 - Step ${this.step}/4`
+        title: `自主招生志愿填报 - Step ${this.step}/3`
       })
     }
   },
diff --git a/package_sub/pages/RecommendForm/RecommendForm.vue b/package_sub/pages/RecommendForm/RecommendForm.vue
index 75cd7f2..bf5b7d9 100644
--- a/package_sub/pages/RecommendForm/RecommendForm.vue
+++ b/package_sub/pages/RecommendForm/RecommendForm.vue
@@ -3,6 +3,8 @@
     :page-style="`overflow:${isShowRecommend ? 'hidden' : 'visible'};`"
   ></page-meta>
   <view class="container safe-area-inset-bottom">
+	  <zmm-watermark :column="2" :margin="30" :watermark="watermark"></zmm-watermark>
+	  
     <image class="bkg" src="~@/static/me/wave.png" mode="widthFix"></image>
 
     <view class="wrap">
@@ -319,13 +321,17 @@
 
 <script>
 import Qrcode from "@/component/Qrcode/index.vue";
-
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/waterlogo.png';
 export default {
   components: {
     Qrcode,
+	zmmWatermark
   },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
+		
       isShowQrcode: false,
       regionType: "city",
       isShowRegion: false,
diff --git a/package_sub/pages/SchoolList/SchoolList.vue b/package_sub/pages/SchoolList/SchoolList.vue
index 537cd2c..1b9b5a9 100644
--- a/package_sub/pages/SchoolList/SchoolList.vue
+++ b/package_sub/pages/SchoolList/SchoolList.vue
@@ -1,5 +1,7 @@
 <template>
   <view class="container safe-area-inset-bottom">
+	  <zmm-watermark :column="2" :margin="30" :watermark="watermark"></zmm-watermark>
+	  
     <view class="search-bar">
       <view class="search-bar__input">
         <u-input
@@ -81,9 +83,17 @@
 </template>
 
 <script>
+	
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/waterlogo.png';
 export default {
+  components: {
+	zmmWatermark
+  },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
+		
       defaultTime: '',
       select: {
         name: "",
diff --git a/package_sub/pages/TargetCount/TargetCount.vue b/package_sub/pages/TargetCount/TargetCount.vue
index 166839d..e3f25c3 100644
--- a/package_sub/pages/TargetCount/TargetCount.vue
+++ b/package_sub/pages/TargetCount/TargetCount.vue
@@ -1,5 +1,7 @@
 <template>
   <view class="container safe-area-inset-bottom">
+	  <zmm-watermark :column="2" :margin="30" :watermark="watermark"></zmm-watermark>
+	  
     <view class="search-bar">
       <view class="search-bar__input">
         <u-input
@@ -78,9 +80,16 @@
 </template>
 
 <script>
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/waterlogo.png';
 export default {
+  components: {
+	zmmWatermark
+  },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
+		
       defaultTime: '',
       select: {
         page: 1,