From 18824a66c8737f8a0b38bbd14212dd1e97b135cb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 7 Apr 2025 13:29:01 +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

---
 package_sub/pages/BatchForm/BatchForm.vue     |   8 +
 .../IndependentDetail/IndependentDetail.vue   |   8 +-
 .../IndependentRecruitment.vue                |  29 +++-
 .../pages/RecommendForm/RecommendForm.vue     |   4 +-
 package_sub/pages/StudentInfo/StudentInfo.vue |   4 +-
 pages.json                                    |  14 ++
 pages/chat/chat.vue                           | 107 ++++++++++++
 pages/index/index.vue                         |  47 ++++--
 static/tabbar/chat-active.png                 | Bin 0 -> 1203 bytes
 static/tabbar/chat.png                        | Bin 0 -> 2406 bytes
 uni_modules/zmm-watermark/changelog.md        |  17 ++
 .../zmm-watermark/zmm-watermark.vue           | 152 ++++++++++++++++++
 uni_modules/zmm-watermark/package.json        |  81 ++++++++++
 uni_modules/zmm-watermark/readme.md           |  48 ++++++
 14 files changed, 496 insertions(+), 23 deletions(-)
 create mode 100644 pages/chat/chat.vue
 create mode 100644 static/tabbar/chat-active.png
 create mode 100644 static/tabbar/chat.png
 create mode 100644 uni_modules/zmm-watermark/changelog.md
 create mode 100644 uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue
 create mode 100644 uni_modules/zmm-watermark/package.json
 create mode 100644 uni_modules/zmm-watermark/readme.md

diff --git a/package_sub/pages/BatchForm/BatchForm.vue b/package_sub/pages/BatchForm/BatchForm.vue
index 2aa206f..e98b523 100644
--- a/package_sub/pages/BatchForm/BatchForm.vue
+++ b/package_sub/pages/BatchForm/BatchForm.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>
     <u-notice-bar class="notice-bar" v-if="aspiration && aspiration.tip" :list="[aspiration.tip]"></u-notice-bar>
 
     <view class="wrap" v-if="step === 1">
@@ -242,13 +243,20 @@
 <!--    <u-select v-model="isShowSchoolSelect" mode="mutil-column-auto" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>-->
     <u-select v-model="isShowSchoolSelect" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>
     <u-select v-model="isShowSpecSelect" :list="specList" @confirm="specListConfirm" @cancel="specListCancel"></u-select>
+  <watermark></watermark>
   </view>
 </template>
 
 <script>
+import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
+import imglogo from '@/static/logo.png';
 export default {
+  components:{
+	  zmmWatermark
+  },
   data() {
     return {
+		watermark:`<img style="width:60px" src="${imglogo}" />`,
       isShowWhite: false,
       isShowModal: false,
       step: 1,
diff --git a/package_sub/pages/IndependentDetail/IndependentDetail.vue b/package_sub/pages/IndependentDetail/IndependentDetail.vue
index 59c5299..10b07b4 100644
--- a/package_sub/pages/IndependentDetail/IndependentDetail.vue
+++ b/package_sub/pages/IndependentDetail/IndependentDetail.vue
@@ -28,10 +28,10 @@
             <view class="info-row__title">考生类别</view>
             <view class="info-row__value">{{ detail.type || ' ' }}</view>
           </view>
-          <view class="info-row">
+          <!-- <view class="info-row">
             <view class="info-row__title">民族</view>
             <view class="info-row__value">{{ detail.nationality || ' ' }}</view>
-          </view>
+          </view> -->
           <view class="info-row">
             <view class="info-row__title">户籍地址</view>
             <view class="info-row__value">{{ detail.address || ' ' }}</view>
@@ -53,10 +53,10 @@
         </view>
 
         <view class="card__body">
-          <view class="info-row">
+          <!-- <view class="info-row">
             <view class="info-row__title">其他专业是否服从</view>
             <view class="info-row__value">{{ detail.is_independent ? '是' : '否' }}</view>
-          </view>
+          </view> -->
 
           <view class="sub-form2">
             <view class="sub-form2__row sub-form2-title">
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 3cb6f2a..262eeb1 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -63,9 +63,9 @@
           <u-form-item label="考生类型" required prop="type">
             <u-input v-model="form.type" placeholder="请输入" input-align="right" />
           </u-form-item>
-          <u-form-item label="民族" prop="nationality">
+          <!-- <u-form-item label="民族" prop="nationality">
             <u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
-          </u-form-item>
+          </u-form-item> -->
           <u-form-item label="户籍地址" required prop="address">
             <u-input v-model="form.address" placeholder="请输入" input-align="right" />
           </u-form-item>
@@ -116,7 +116,7 @@
       <view class="step3-panel">
         <view class="step3-panel__title">自主招生(含课程基地实验项目)</view>
         <view class="step3-panel__content">
-          <view class="step3-panel__content--independent">
+          <!-- <view class="step3-panel__content--independent">
             <view>
               其他专业是否服从
             </view>
@@ -132,7 +132,7 @@
                 否
               </u-radio>
             </u-radio-group>
-          </view>
+          </view> -->
 
           <view class="step3-panel__content--school">
             <view>
@@ -345,7 +345,8 @@ export default {
         const { list } = await this.$u.api.schoolList({
           page: 1,
           page_size: 9999,
-          area_id: this.form.area_id
+          area_id: this.form.area_id,
+		  from:2
         })
         this.schoolList = list.data.map(school => ({
           value: school.code,
@@ -417,7 +418,23 @@ export default {
   watch: {
     step(newVal) {
       this.setTitle()
-    }
+    },
+	vuex_user: {
+		handler: function (newVal) {
+		  const keys = new Map([
+			["middle_exam_year", "year"],
+			["name", "name"],
+			["sex", "sex"],
+			["nationality", "nationality"],
+		  ]);
+		  Array.from(keys.keys()).forEach((key) => {
+			if (newVal[key]) {
+			  this.form[keys.get(key)] = newVal[key];
+			}
+		  });
+		},
+		immediate: true,
+	  },
   },
   onShow() {
     this.setTitle()
diff --git a/package_sub/pages/RecommendForm/RecommendForm.vue b/package_sub/pages/RecommendForm/RecommendForm.vue
index 5f8beb4..dba86a2 100644
--- a/package_sub/pages/RecommendForm/RecommendForm.vue
+++ b/package_sub/pages/RecommendForm/RecommendForm.vue
@@ -33,13 +33,13 @@
               @click="isShowYear = true"
             />
           </u-form-item>
-          <u-form-item label="民族" prop="nationality">
+          <!-- <u-form-item label="民族" prop="nationality">
             <u-input
               v-model="form.nationality"
               placeholder="请输入"
               input-align="right"
             />
-          </u-form-item>
+          </u-form-item> -->
           <!--          <u-form-item label="所在城市" required prop="city">-->
           <!--            <u-input type="select" v-model="form.city" placeholder="请选择" input-align="right" @click="regionType = 'city',isShowRegion = true" />-->
           <!--          </u-form-item>-->
diff --git a/package_sub/pages/StudentInfo/StudentInfo.vue b/package_sub/pages/StudentInfo/StudentInfo.vue
index 64c685f..fa571d4 100644
--- a/package_sub/pages/StudentInfo/StudentInfo.vue
+++ b/package_sub/pages/StudentInfo/StudentInfo.vue
@@ -37,9 +37,9 @@
           <u-form-item label="中考年份" required prop="middle_exam_year">
             <u-input type="select" v-model="form.middle_exam_year" placeholder="请选择" input-align="right" @click="isShowYear = true" />
           </u-form-item>
-          <u-form-item label="民族" prop="nationality">
+          <!-- <u-form-item label="民族" prop="nationality">
             <u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
-          </u-form-item>
+          </u-form-item> -->
           <u-form-item label="所在城市" required prop="city">
             <u-input type="select" v-model="form.city" placeholder="请选择" input-align="right" @click="regionType = 'city',isShowRegion = true" />
           </u-form-item>
diff --git a/pages.json b/pages.json
index 750f079..cbf4259 100644
--- a/pages.json
+++ b/pages.json
@@ -22,6 +22,14 @@
         "enablePullDownRefresh": true
       }
     },
+	{
+	  "path": "pages/chat/chat",
+	  "style": {
+	    // "navigationBarTitleText": "在线咨询",
+	    "enablePullDownRefresh": true,
+		"navigationStyle": "custom"
+	  }
+	},
     {
       "path": "pages/me/me",
       "style": {
@@ -164,6 +172,12 @@
         "selectedIconPath": "static/tabbar/list-active.png",
         "text": "模拟填报"
       },
+	  {
+	    "pagePath": "pages/chat/chat",
+	    "iconPath": "static/tabbar/chat.png",
+	    "selectedIconPath": "static/tabbar/chat-active.png",
+	    "text": "在线咨询"
+	  },
       {
         "pagePath": "pages/me/me",
         "iconPath": "static/tabbar/me.png",
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
new file mode 100644
index 0000000..e631333
--- /dev/null
+++ b/pages/chat/chat.vue
@@ -0,0 +1,107 @@
+<template>
+  <view class="customer-service">
+	  <image class="bkg" src="~@/static/index/bkg.png" mode="aspectFill"></image>
+	  
+    <!-- <view class="customer-service__title"> 系统提示 </view> -->
+    <view class="customer-service__body">
+      <view class="customer-service__body--text1"> 您需要联系我们的客服，获取授权 </view>
+      <image
+          mode="widthFix"
+          show-menu-by-longpress
+          :src="qrcode"
+      ></image>
+      <view class="customer-service__body--text2">{{ name }}：<text style="font-size: 28rpx;">{{ phone }}</text></view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      info: {}
+    };
+  },
+  methods: {
+    async getData() {
+      try {
+        const res = await this.$u.api.parameterShow({
+          number: 'customer_service'
+        })
+        this.info = res
+      } catch (err) {
+        console.error(err)
+      }
+    }
+  },
+  computed: {
+    name() {
+      return this.info.detail?.find(i => i.value === 'name')?.remark || ' '
+    },
+    phone() {
+      return this.info.detail?.find(i => i.value === 'phone')?.remark || ' '
+    },
+    qrcode() {
+      return this.info.detail?.find(i => i.value === 'qrcode')?.remark || ' '
+    }
+  },
+  created() {
+    this.getData()
+  },
+}
+</script>
+
+<style lang="scss">
+.customer-service {
+  width: 100%;
+  border-radius: 20rpx;
+  overflow: hidden;
+  .bkg {
+    position: absolute;
+    z-index: 1;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+  }
+
+  &__title {
+    font-size: 32rpx;
+    color: #ffffff;
+    text-align: center;
+    text-transform: uppercase;
+    font-weight: bold;
+    background-image: linear-gradient(263deg, #da521c 0%, #eb9b35 100%);
+    padding: 40rpx 0;
+    line-height: 1;
+  }
+  &__body {
+    color: #333;
+    // background: #fff;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+	position: relative;
+	z-index:2;
+	margin-top:150rpx;
+    &--text1 {
+      font-size: 32rpx;
+      text-align: center;
+      padding-top: 50rpx;
+    }
+    & > image {
+      width: 600rpx;
+      height: 540rpx;
+      margin-top: 34rpx;
+    }
+    &--text2 {
+      font-size: 28rpx;
+      color: #333333;
+      text-align: center;
+      padding-top: 58rpx;
+      padding-bottom: 70rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cd15192..07c3dbc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -93,12 +93,14 @@
       </view>
     </view>
 
-    <image
-      class="online-service"
-      src="~@/static/index/online-service.png"
-      mode="aspectFit"
-      @click="isShowQrcode = true"
-    ></image>
+	<button style="margin-left: auto;width: 120rpx;height: 120rpx;" class="btn-normal" open-type="contact">
+	  <image
+	    class="online-service"
+	    src="~@/static/index/online-service.png"
+	    mode="aspectFit"
+	    @click="isShowQrcode = true"
+	  ></image>
+	</button>
 
     <u-mask :show="isShowQrcode" border-radius="14" @click="isShowQrcode = false">
       <view class="qrcode-wrap">
@@ -323,9 +325,7 @@ export default {
 }
 
 .online-service {
-  position: fixed;
-  bottom: 56rpx;
-  right: 2rpx;
+
   width: 142rpx;
   height: 140rpx;
   z-index: 10;
@@ -337,4 +337,33 @@ export default {
   justify-content: center;
   height: 100%;
 }
+.btn-normal {
+  display: block;
+  margin: 0;
+  padding: 0;
+  line-height: normal;
+  background: none;
+  border-radius: 0;
+  box-shadow: none;
+  border: none;
+  font-size: unset;
+  text-align: unset;
+  overflow: visible;
+  color: inherit;
+  position: fixed;
+  bottom: 56rpx;
+  right: 2rpx;
+  z-index: 10;
+  margin-right:30rpx;
+  image {
+    
+    width: 142rpx;
+    height: 140rpx;
+    z-index: 10;
+  }
+}
+
+.btn-normal::after {
+  border: none
+}
 </style>
diff --git a/static/tabbar/chat-active.png b/static/tabbar/chat-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..109098f52687642d47f7b99c34ba7ca27a8ee738
GIT binary patch
literal 1203
zcmV;k1WfyhP)<h;3K|Lk000e1NJLTq002G!001}$1^@s6rI<@u000DfNkl<ZXo2mU
zU1%It6vuxvlVr2W=1bbCX^l0$M5<Kl;zw&6QHm6#4@E3W1z$u_1V^i&FFxv%G!H6h
zK`DWVw2B4sL9o`U&?1|(Nh9KmZ80uMwE5mivzcAF!z?VBkDb}gZn``Bhhf=!_uM(Z
zduQgJd*-f`&1RVzh~uGN-~pfm=mI1l>t(P(%K0?|%mNowEpg4wl?D$V4*?pm&uX;V
zv^q5q{|Wd|)e_&V_1$U2+kg`mc&+Gr;5k)GOy_vyHDEh{%QXfq^aOBmY9QX5E64|r
z0^-uRePetpyS4&nrv~CN)_{KwZ1Oz2R0W5(#Gnq6caQG@eszVdR=LkT59LPu&6<P8
z)Bo3`$z%8T0HZ*sPowISedPZYBfiT9UHjT3ThUnPBwGPXD8X;WxV!8MHFzjh2M?R-
z;9*l8JZxGYa7jjv29JD;wvkGA+bh}VOD*x|iSB#~xpgzf+ywf_5c=h>Jx!zc9;W5K
zXOY`(B{QESb@2=I(Uaab_Z%X+>j+B6HZqG-=$F1EH8NDR-^yDDx<%^vNn4GNWohe!
zFA#g=RpdxJlB}4c5xKJ;V<E}v^q<ZEJD;ZQvA2<%J1m<{BE5Ub=+{}D{N2%}dB;K8
z_rGhlZ`w4s)3kjL*>s9@ax^$~DVMr%xOMl-j&-qpuOlf<wsNVdg;@U^&Nlr=ks70R
z8>NZ1{-dtv5uH$siUwD@?r^OWqbaxA(|1Zok7I}A0G0Nw_O@awQp9}$soc`*TIZ#r
z!HxN(YhBh@A*0XO$}@|To^589rtM{^>t=hde$4$-&{roF4K5(`v9BEKQWuVsP3v|W
zeU{YlptH^JAerTPTe-N8Q@?%YXrqsva_lTWD(T_2^4HJirP#Q+4<yMP8GU$=rSqS-
z+gv+uKBOAeK66^i8flitPO*6I16P~$#4u7MMuU2n`EVm+ppTzs;mmtQK?{jw<14^N
z_8R|<DDB(KX=ZiiiaFKzvT5r^>FmLny^68meGB9y$F|VWwH;&bZ;bf>m$*a5q2zfS
z^M0Q&k3cpHN%IIIaeJ*4cux3LJ!B1=>fm8h9XxCbHMnvU_)&2Q@EajxHYLD=g<Lfv
z0X_~ag^YVeR<*<xu^Y%%RV%L&ojK0tp6Vw87*&tl{r@-zE>fI-xWZRs2e|t@u4;+X
z`SbWQ1sf{m2<mkC&UctK0n8=fNI(~Z!K~-+iqk<=OPD$AwUOJ9wOjdWSx#FBs(jEQ
zF}GjU65r+uoI=)LfV%;a1Y2Hr7u?{=1N|THKG3IXi68PS3T@OEiSE6C*z&mr=(e(P
z86PLTVRhhbj<xwYJ$Gm^QX_zKGTz>zI7BioX>CaUQPmRm)U6NjQYAJHp0PF&29<a>
zbijh}l&U2HH(u`5nfQyuZqf4r?al!Y`++W2l~|UFOa5^yR`8?mfJepqf^s@l$@RFH
zKR+$-o0E<&H_D(&Cn8<~j=9tw&jlBi&_-ln#Czg*#0ts!E<VNg7c1rg@IUw&Us|qa
ReER?Z002ovPDHLkV1n&+QxyOJ

literal 0
HcmV?d00001

diff --git a/static/tabbar/chat.png b/static/tabbar/chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..524d2c141bae2d0ca9d53a2590a45cca967635ae
GIT binary patch
literal 2406
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
Y0G*EC>}G_7HUIzs07*qoM6N<$f<ra40{{R3

literal 0
HcmV?d00001

diff --git a/uni_modules/zmm-watermark/changelog.md b/uni_modules/zmm-watermark/changelog.md
new file mode 100644
index 0000000..69ea43d
--- /dev/null
+++ b/uni_modules/zmm-watermark/changelog.md
@@ -0,0 +1,17 @@
+## 1.1.5（2024-06-16）
+修改兼容性，去除show字段，控制显示用v-if操作
+## 1.1.4（2024-06-15）
+column属性修复
+## 1.1.3（2024-06-02）
+新特征：
+支持nvue
+改动：
+移除maxWidth属性(单条水印最大宽度)
+新增column属性可设置水印列数
+新增fontSize属性可设置水印文字默认大小
+修改margin属性为20(水印之间上下间距)
+nvue下支持覆盖video等元素
+## 1.1.2（2022-01-12）
+调整为uni_modules目录规范
+## 1.0（2021-03-31）
+发布1.0版本
\ No newline at end of file
diff --git a/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue b/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue
new file mode 100644
index 0000000..b4cae17
--- /dev/null
+++ b/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="zmm-watermark">
+		<!-- 单个用于计算 -->
+		<view class="zmm-watermark-mold" ref="mold" id="mold">
+			<rich-text :style="moldStyle" :nodes="watermark"></rich-text>
+		</view>
+		<!-- 循环 -->
+		<view class="zmm-watermark-content" :style="{opacity:opacity}">
+			<rich-text :nodes="watermark" :style="itemStyle" v-for="(item,index) in forLength" :key="index"></rich-text>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule("dom");
+	// #endif
+	export default {
+		data() {
+			return {
+				forLength: 0, //水印数量
+				watermarkArea: 0 //水印大小(像素)
+			};
+		},
+		props: {
+			watermark: { //水印文字(支持html富文本)
+				type: String,
+				default: '水印文字'
+			},
+			color: { //水印文字默认颜色
+				type: String,
+				default: '#666'
+			},
+			fontSize: { //水印文字大小
+				type: Number,
+				default: 16
+			},
+			opacity: { //水印透明度
+				type: Number,
+				default: 0.15
+			},
+			margin: { //水印之间上下间距
+				type: Number,
+				default: 10
+			},
+			rotate: { //水印旋转角度
+				type: Number,
+				default: -21
+			},
+			column: { //水印列数
+				type: Number,
+				default: 3
+			}
+		},
+		computed: {
+			// 单个水印
+			moldStyle() {
+				return `width:${this.itemWidth}px;text-align: center;font-size:${this.fontSize}px;`
+			},
+			// 循环水印
+			itemStyle() {
+				return `color:${this.color};font-size:${this.fontSize}px;margin:${this.margin}px;width:${this.itemWidth}px;transform:rotate(${this.rotate}deg);text-align: center;`
+			},
+			// 屏幕像素
+			screenArea() {
+				let height = uni.getSystemInfoSync().windowHeight + uni.getSystemInfoSync().windowTop
+				let width = uni.getSystemInfoSync().windowWidth
+				return Math.floor(height * width * 1.2)
+			},
+			// 单个水印最大长度
+			itemWidth() {
+				let windowWidth = uni.getSystemInfoSync().windowWidth
+				return Math.floor(windowWidth / this.column - this.margin * 2)
+			}
+		},
+		watch: {
+			watermark: {
+				handler(v) {
+					if (v) {
+						this.countForLength();
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			if (this.watermark) {
+				this.countForLength();
+			}
+		},
+		methods: {
+			countForLength() { //计算水印数量
+				// #ifndef APP-NVUE
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#mold').boundingClientRect(data => {
+					let width = data.width ? data.width : this.itemWidth
+					let height = data.height ? data.height : 30
+					let itemWidth = width + this.margin * 2
+					let itemHeight = height + this.margin * 2
+					this.watermarkArea = Math.floor(itemWidth * itemHeight)
+					this.forLength = Math.floor(this.screenArea / this.watermarkArea)
+				}).exec();
+				// #endif
+				// #ifdef APP-NVUE
+				setTimeout(() => {
+					const result = dom.getComponentRect(this.$refs.mold, (option) => {
+						let size = option.size;
+						let itemWidth = size.width + this.margin * 2
+						let itemHeight = size.height + this.margin * 2
+						this.watermarkArea = Math.floor(itemWidth * itemHeight)
+						this.forLength = Math.floor(this.screenArea / this.watermarkArea)
+					});
+				}, 50);
+				// #endif
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.zmm-watermark {
+		position: fixed;
+		overflow: hidden;
+		z-index: 999;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		pointer-events: none;
+		/* #endif */
+	}
+
+	.zmm-watermark-content {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		overflow: hidden;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+	.zmm-watermark-mold {
+		position: fixed;
+		left: 0;
+		top: 0;
+		opacity: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/zmm-watermark/package.json b/uni_modules/zmm-watermark/package.json
new file mode 100644
index 0000000..afa6fcd
--- /dev/null
+++ b/uni_modules/zmm-watermark/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "zmm-watermark",
+  "displayName": "zmm-watermark-通用水印组件",
+  "version": "1.1.5",
+  "description": "支持富文本、自动计算所需水印数量不卡顿、自定义旋转角度等",
+  "keywords": [
+    "",
+    "水印",
+    "水印组件",
+    "通用水印",
+    "自定义水印",
+    "富文本水印"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.6.17"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/zmm-watermark/readme.md b/uni_modules/zmm-watermark/readme.md
new file mode 100644
index 0000000..1698be7
--- /dev/null
+++ b/uni_modules/zmm-watermark/readme.md
@@ -0,0 +1,48 @@
+#uniapp水印组件
+
+原理   
+循环标签
+
+作者   
+`zmm2113@qq.com`
+
+版本  
+> 兼容性支持：安卓、苹果、H5、微信小程序（其他平台未测试理论上支持）
+
+优势  
+> 支持富文本、自动计算所需水印数量不卡顿、自定义旋转角度等
+
+注意事项
+> 因为层级原因需要将组件需要放置到顶部
+
+一、使用示例
+```
+<template>
+	<view class="container">
+		<zmm-watermark :watermark="watermark"></zmm-watermark>
+	</view>
+</template>
+
+<script>
+	import img from '@/static/logo.png';
+	export default {
+		data() {
+			return {
+				watermark: '<h5>我是h5标签我是h5标签我是h5标签我是h5标签</h5><p style="color:#f00">我是p标签</p><br><img style="width:30px" src="' + img + '" />'
+				
+			}
+		}
+	}
+</script>
+```  
+二、配置(注意配置数据类型)
+
+配置|数据类型|默认参数|说明
+-|-|-|-
+watermark|String|"水印文字"|水印文字(支持html富文本)
+color|String|"#000000"|水印文字默认颜色
+fontSize|Number|16|水印文字大小
+opacity|Number|0.15|水印透明度
+margin|Number|20|水印之间上下间距
+rotate|Number|-21|水印旋转角度
+column|Number|3|水印列数
\ No newline at end of file