From 9043377f2c208aaee841350a84b2ffaf9d35b384 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 17 May 2022 18:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/AddReport.vue        |  21 +--
 src/saas/AppCountryAlbum/ReportConfig.vue     | 126 ++++++++++++++++++
 src/saas/AppCountryAlbum/Watermark.vue        |  45 ++++++-
 src/saas/AppCountryAlbum/components/Home.vue  |   1 -
 .../components/{ => report}/Daily.vue         |   2 +-
 .../components/{ => report}/InspectLog.vue    |   2 +-
 .../{ => report}/MeetingMminutes.vue          |   0
 .../components/{ => report}/WorkReport.vue    |  90 ++++++++++---
 src/saas/AppCountryAlbum/images/rili.png      | Bin 30394 -> 30327 bytes
 9 files changed, 258 insertions(+), 29 deletions(-)
 create mode 100644 src/saas/AppCountryAlbum/ReportConfig.vue
 rename src/saas/AppCountryAlbum/components/{ => report}/Daily.vue (98%)
 rename src/saas/AppCountryAlbum/components/{ => report}/InspectLog.vue (98%)
 rename src/saas/AppCountryAlbum/components/{ => report}/MeetingMminutes.vue (100%)
 rename src/saas/AppCountryAlbum/components/{ => report}/WorkReport.vue (60%)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 5c407877..b6304c58 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="report">
     <components class="report-item" :is="component"></components>
-    <div class="report-list">
+    <div class="report-list" data-html2canvas-ignore>
       <image @click="component = 'WorkReport'" :class="[component === 'WorkReport' ? 'active' : '']" src="./images/report1.png" />
       <image @click="component = 'Daily'" :class="[component === 'Daily' ? 'active' : '']" src="./images/report4.png" />
       <image @click="component = 'InspectLog'" :class="[component === 'InspectLog' ? 'active' : '']" src="./images/report2.png" />
@@ -11,10 +11,10 @@
 </template>
 
 <script>
-  import Daily from './components/Daily'
-  import WorkReport from './components/WorkReport'
-  import InspectLog from './components/InspectLog'
-  import MeetingMminutes from './components/MeetingMminutes'
+  import Daily from './components/report/Daily'
+  import WorkReport from './components/report/WorkReport'
+  import InspectLog from './components/report/InspectLog'
+  import MeetingMminutes from './components/report/MeetingMminutes'
 
   export default {
     name: 'Report',
@@ -46,23 +46,26 @@
 
 <style lang="scss" scoped>
   .report {
-    height: 100vh;
-    overflow: hidden;
+    // height: 100vh;
+    // overflow: hidden;
+    padding-bottom: 240px;
 
     * {
       box-sizing: border-box;
     }
 
     .report-item {
-      height: calc(100% - 240px);
       padding-bottom: 20px;
-      overflow-y: auto;
     }
 
     .report-list {
+      position: fixed;
       display: flex;
       justify-content: center;
       align-items: center;
+      left: 0;
+      bottom: 0;
+      width: 100%;
       height: 240px;
       padding: 0 24px;
       background: #FFFFFF;
diff --git a/src/saas/AppCountryAlbum/ReportConfig.vue b/src/saas/AppCountryAlbum/ReportConfig.vue
new file mode 100644
index 00000000..42a71fde
--- /dev/null
+++ b/src/saas/AppCountryAlbum/ReportConfig.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="AttendanceFiexdTime">
+    <div class="form-group">
+      <div class="form-item" v-for="(item, index) in list" :key="index">
+        <span>{{ item.label }}</span>
+        <div class="form-item__right" v-if="item.type === 'text'">
+          <input :placeholder="'请输入' + item.label" v-model="item.value">
+          <span></span>
+        </div>
+        <div class="form-item__right" v-if="item.type === 'date'" @click="currIndex = index, isShowDate = true">
+          <span :style="{color: item.value ? '#333' : '#999'}">{{ item.value || '请选择' + item.label }}</span>
+          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
+        </div>
+      </div>
+    </div>
+    <div class="form-btn" hover-class="text-hover" @click="save">保存</div>
+    <u-picker mode="time" v-model="isShowDate" :params="params" @confirm="onChange"></u-picker>
+  </div>
+</template>
+<script>
+  export default {
+    data () {
+      return {
+        list: [],
+        isShowDate: false,
+        params: {
+          year: true,
+          month: true,
+          day: true
+        },
+        currIndex: 0
+      }
+    },
+
+    onLoad (query) {
+      this.list = JSON.parse(query.params)
+    },
+
+    methods: {
+      onChange (e) {
+        this.$set(this.list[this.currIndex], 'value', `${e.year}-${e.month}-${e.day}`)
+      },
+
+      save () {
+        uni.$emit('change', this.list)
+        uni.navigateBack({
+          delta: 1
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AttendanceFiexdTime {
+    padding-bottom: 130px;
+
+    * {
+      line-height: 1;
+      box-sizing: border-box;
+    }
+
+    .form-btn {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      color: #fff;
+      font-size: 32px;
+      background: #1365DD;
+
+      &:active {
+        opacity: 0.8;
+      }
+    }
+    .form-group {
+      margin-bottom: 16px;
+      padding: 0 32px;
+      background: #fff;
+
+      .form-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 120px;
+        font-size: 32px;
+        color: #333333;
+        border-bottom: 1px solid #DDDDDD;
+
+        &:last-child {
+          border: none;
+        }
+
+        & > span {
+          margin-right: 20px;
+        }
+
+        .form-item__right {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          text-align: right;
+          height: 100%;
+          flex: 1;
+
+          span {
+            font-size: 30px;
+            color: #333;
+          }
+
+          input {
+            width: 100%;
+            height: 100%;
+            text-align: right;
+            font-size: 30px;
+            color: #333;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 8c915175..a9661021 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -12,7 +12,7 @@
     <div class="watermark" v-if="currIndex > -1">
       <component :is="'Watermark' + (currIndex + 1)"></component>
     </div>
-    <div class="photo-bottom" v-if="!isHide">
+    <div class="photo-bottom" data-html2canvas-ignore>
       <div class="photo-bottom__top">
         <image src="./images/clear.png" @click="isHide = true, currIndex = -1" />
         <h2>水印</h2>
@@ -31,6 +31,20 @@
       </div>
     </div>
     <image class="newImg" @click="waterSrc = ''" :src="waterSrc" v-if="waterSrc" />
+    <div class="photo-tabbar"  data-html2canvas-ignore>
+      <div class="item" @click="back">
+        <image src="./images/fanhui.png" />
+        <div>返回</div>
+      </div>
+      <div class="item" @click="isHide = false, currIndex = 0">
+        <image src="./images/shuiyin.png" />
+        <div>水印</div>
+      </div>
+      <div class="item" @click="save">
+        <image src="./images/shangchuan.png" />
+        <div>上传</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -81,7 +95,6 @@
     methods: {
       save () {
         this.isHide = true
-        console.log(this.$refs.waterMarker.offsetHeight)
         this.$nextTick(() => {
           setTimeout(() => {
             html2canvas(this.$refs.waterMarker, {
@@ -136,6 +149,34 @@
       font-size: 28px;
     }
 
+    .photo-tabbar {
+      display: flex;
+      position: fixed;
+      align-items: center;
+      bottom: 0;
+      left: 0;
+      z-index: 10;
+      width: 100%;
+      height: 216px;
+      background: #1E1E21;
+
+      .item {
+        flex: 1;
+        text-align: center;
+
+        image {
+          width: 56px;
+          height: 56px;
+          margin-bottom: 12px;
+        }
+
+        div {
+          font-size: 28px;
+          color: #fff;
+        }
+      }
+    }
+
     .photo-bottom {
       position: fixed;
       bottom: 0;
diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue
index 62a6af06..e02ccbeb 100644
--- a/src/saas/AppCountryAlbum/components/Home.vue
+++ b/src/saas/AppCountryAlbum/components/Home.vue
@@ -99,7 +99,6 @@
           count: 1,
           sizeType: ['compressed'],
           success: res => {
-            console.log(res.tempFiles[0])
             let formData = new FormData()
             formData.append('file', res.tempFiles[0])
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {
diff --git a/src/saas/AppCountryAlbum/components/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
similarity index 98%
rename from src/saas/AppCountryAlbum/components/Daily.vue
rename to src/saas/AppCountryAlbum/components/report/Daily.vue
index 9c9dd5a5..da4dd7b4 100644
--- a/src/saas/AppCountryAlbum/components/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="add">
-        <div class="add-btn" @click="choose">
+        <div class="add-btn">
           <span>添加图片</span>
         </div>
         <div class="add-btn">
diff --git a/src/saas/AppCountryAlbum/components/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
similarity index 98%
rename from src/saas/AppCountryAlbum/components/InspectLog.vue
rename to src/saas/AppCountryAlbum/components/report/InspectLog.vue
index e44160fb..47e6cf44 100644
--- a/src/saas/AppCountryAlbum/components/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -66,7 +66,7 @@
     .top {
       width: 100%;
       height: 16px;
-      background: url(./../images/xc-icon.png) repeat;
+      background: url(./../../images/xc-icon.png) repeat;
       background-size: 16px 16px;
     }
 
diff --git a/src/saas/AppCountryAlbum/components/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
similarity index 100%
rename from src/saas/AppCountryAlbum/components/MeetingMminutes.vue
rename to src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
diff --git a/src/saas/AppCountryAlbum/components/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
similarity index 60%
rename from src/saas/AppCountryAlbum/components/WorkReport.vue
rename to src/saas/AppCountryAlbum/components/report/WorkReport.vue
index e66c4676..67c63a2c 100644
--- a/src/saas/AppCountryAlbum/components/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -1,28 +1,26 @@
 <template>
-  <div class="WorkReport">
-    <div class="top">
-      <span>请输入汇报单位</span>
-      <span>2022-03-09</span>
+  <div class="WorkReport" ref="report">
+    <div class="top" @click="linkTo('./ReportConfig')">
+      <span>{{ form.unit || '请输入汇报单位' }}</span>
+      <span>{{ form.date || '请选择日期' }}</span>
     </div>
-    <div class="body">
+    <div class="body" @click="linkTo('./ReportConfig')">
       <h2>工作汇报</h2>
-      <div class="subtitle">千言街巡查情况汇报</div>
+      <div class="subtitle">{{ form.title || '请输入标题' }}</div>
       <div class="partition">
         <div><i></i></div>
       </div>
     </div>
     <div class="bottom">
-      <div class="bottom-item__wrapper">
+      <div class="bottom-item__wrapper" @click="linkTo('./ReportConfig')">
         <div class="bottom-item">
-          <label>汇报人：</label>
-          <span>鄢然</span>
+          <label>汇报人：{{ form.name || '请输入汇报人姓名' }}</label>
         </div>
         <div class="bottom-item">
-          <label>备注：</label>
-          <span>鄢然</span>
+          <span>备注：{{ '请输入备注' }}</span>
         </div>
       </div>
-      <div class="add">
+      <div class="add" data-html2canvas-ignore ref="add">
         <div class="add-btn">
           <span>添加图片</span>
         </div>
@@ -31,10 +29,12 @@
         </div>
       </div>
     </div>
+    <image v-if="waterSrc" :src="waterSrc" />
   </div>
 </template>
 
 <script>
+  import html2canvas from 'html2canvas'
   export default {
     name: 'WorkReport',
 
@@ -42,16 +42,71 @@
 
     data () {
       return {
-
+        waterSrc: '',
+        form: {
+          unit: '',
+          title: '',
+          date: '',
+          name: ''
+        }
       }
     },
 
-    onLoad () {
-
+    mounted () {
+      uni.$on('change', e => {
+        console.log(e)
+        e.forEach(v => {
+          this.form[v.key] = v.value
+        })
+      })
     },
 
     methods: {
+      save () {
+        const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
+        html2canvas(this.$refs.report, {
+          allowTaint: true,
+          useCORS: true,
+          height
+        }).then((canvas) => {
+          let dataURL = canvas.toDataURL('image/png')
+          this.waterSrc = dataURL
+        }).catch(e => {
+          console.log(e)
+        })
+      },
 
+      linkTo (path) {
+        const data = [
+          {
+            type: 'text',
+            key: 'unit',
+            value: '',
+            label: '汇报单位'
+          },
+          {
+            type: 'text',
+            key: 'title',
+            value: '',
+            label: '标题'
+          },
+          {
+            type: 'text',
+            key: 'name',
+            value: '',
+            label: '汇报人'
+          },
+          {
+            type: 'date',
+            key: 'date',
+            value: '',
+            label: '汇报日期'
+          }
+        ]
+        uni.navigateTo({
+          url: `${path}?params=${JSON.stringify(data)}`
+        })
+      }
     }
   }
 </script>
@@ -146,6 +201,11 @@
           color: #333333;
           font-size: 32px;
 
+          span {
+            flex: 1;
+            text-align: justify;
+          }
+
           &:last-child {
             margin-bottom: 0;
           }
diff --git a/src/saas/AppCountryAlbum/images/rili.png b/src/saas/AppCountryAlbum/images/rili.png
index 7fac11374e99e69b8cc49758b913d8e244e7fb70..2f353d33bca9a0da2ed2823a4caa2c5d3e0c2422 100644
GIT binary patch
delta 6218
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
DAjQ<;

delta 6285
zcmcgwc|4SD+aA-%2#ppyV<IAJk$o9NmMkGjghVDDS+l!Mh3rcxdqT**Z&@N_5*k}$
zELq0BZ)q^T+w;ADe((4Fp6B;`@BBO0eV)g49@lvs=XL#BrmA0|DvdxxrC2MX(34!i
zQ%{BIF|HB@RyFif#?xmID%Ta(e}-I7%=zdXs}jh=2dB=|RC%d@y8f9%ArKbUt(HB*
z$HQaDqZ9m6!E}mWJw~^sR7&gRgOV~EUr)P7uanZ!2<c9gBO?!=$K<P&UdO@ak+F%m
z`ht40aoPuc&qMb`{NP;0SDK6SCpS;D0U~uBxfeuAwp^cA^+Z!lYd3;=b?BBuW*o<=
z4{TPOKV#Ma^01Av5<@az&yZ!>RKwT&xo1dUOmMzStz>+)kzyt#?>*G=y=C-ZOF4mq
za%5FobR_sXdKkEh!97_f4;S0!9!|?|O4_f!|K#av37o$0^@vbDq$0din~b~!;5$R>
z{qDZk<5k8I;-z;sqLyZUBn2c@h;7R|E$BD5Ow;gAINkS5Ni%-f_evfq?9oOk*o-c3
zUjI7zZnUY|+lkMdTofIY{$eolQS<re%=x5z=^Wc_+@*j^%l`XB7n`BPSc=SUsl&nq
zzhd(JHNWZd(SrT_zJ$KJv2^FefG(zfc1ITFgIMQ`W&Q;V=yom&5wMAvigtezu<&H&
z&ES&t-Qto3g*PFolqAbJ$|Jmj?x99)430}vt(3Rs4klGLS1@}pWH1*HX&`3PuUUAj
zP<D2;6<S2TB8MHcdMN1$#KXr{*ZPwb(=taH)P3FIC~=FQGuVN<ued#d1;XV+&o~+q
zb1R4Sy;ij+2hG2iUz2(vNQ98<S5pF#q})5s6>#9@%A;3&^gU8miS#Xtu9?i?+S|H(
zGrxPylH`S5jt;TzZ)gm-GU~TVaNbXOP1=j))FB_tO=$%Dij;1xHosQH@v-O0e#X(Q
z#Q=5wK{g#L{~2kJ)oZ}BgO@I3<!~gkF#S$SJ!jbx<x9g%Ig~c-C{|6``zNfCdadR@
zZgJSqqU%vznfZPHTDRY>KYlmN&1Bq8%-M-gYfKbh3h5cqA((q>K(H7n!9-zYOmLbs
zFvG$}A8>18yy@V{Bxz#*`mVI<X1$Q7`@oT7!~SByWTE+X?Ex@vGuiQahrY=jkL&Y2
zsfa2{_3-928Q=Ru)^|PPK#tPp%6?Q~W{lvp+%M1%xp%bwarE1*UuU<4&2W-+gGJS)
zL&MYDh<R?B%3e!&fxf>$>V8tjU{{r>EOa~|T5{=<`PVq6q-|l9T<Otf{?K!X(ba(I
zC0D*Z<@S58C2avu$1O2Z;d1(@m*FKRoJ$XO`2miJ;L~Cue;A(2$6)(gdNe14ydb03
z(S%yMQwx>k)<sakqTrl%t+C%bn_muRZ~OS<`zo9qT<ba-wrD`MVRU+`S17;2H!?Iv
zHl?-FbP(+^kBicx533MLY;r8a2%)}$7$VEe2ty;L9vEewS)B!NDQy<gB6&w<?~WEs
zmXpu=bUuw-?{u~3=jOU+hf8U1X66>bH;5jYAC9fPh%%oZ2-u7Dst4BEg|5Wxc>F5M
z_~N8&m|9A}6&s31*|1W<I$+~cF(;chKXsCf$v61?lu$;>Jkbedb>dJe7-K1|qfS{t
zInCB>fY7#gbGqb+qU}<ikCogT5c6mYPXYMP1>9_%pXp2vs}hfZK;aRm=F0{@{Y+Ya
z#S&1nkuSEoL_Bvw5Rp~#WnVv{=lL)k6^QPF_UZ^I=4VRQk+MX1Tk{^e*@Zx$MzHjk
zzBZe)rgVbJcH7VfjL|%6Bm_#Ln_s<Gu`>>AFdIIF`1<+%4sYQ+gN9&lqN9y;b|Yx?
zpGq<C!x+&mchKdJ6k^Ja_M7Nb{{Zs@KJ3j#Ps#B%vBOaYAuYIU^amT2ymR2Lz8uw2
z!NE_gPQvUjd}|45;Q>+cqfr~WVBDlLs2IE1EGrd8bRc?4J`e(x;6<ap0o^w~JwpXT
zu%A64R4_Y@Ky-3a^fPJ|2o*GR4cvHl1OzK7!A(u~3<8CnodC1EVWWa#?37M1!>C~J
zi%loMZkB+;@ZEmrh2c;*qoyAXh`<g8&rbR+V9E$%M8)i#Mg_KXgMUeE-6}=FQGLZB
zR*X)o<Fqw1E`TqfyiI;y%erF6o4WF}Z83>d${$S&aNOygG8BTkiHOS+vwTq)xc|{?
zQR(nfr2l7{L)5fqTO_f;I)Ci6a%nYt8>SG&%ZPq^9($LFwD2U1$Dn+?ZQNKjo?|N`
zW-<?_O0^xVFn7~}PgB8gEUaV5=z>oUzU~ee7I4kL4nQQxIY7D${Okot7Mzd2H2Z$7
z-Q%9Pn)=>b(@X~xD}$((*p&@fMWK(cJLUqWLcB=Rk%2aFcmFUzCWeCD-LmGoBb;R-
zSJd+yOt5P4wpKCS&gr&O^l7Z*%g%_Yu(_fO44e!+3>lP9D)S@+m)?aO+pzw5m)t_#
z1R!#jjS8m6Yw!c9FX64Edz)xOYH;+C65(pmYp`e6I3fFN%)I$L^7r1Qw#EH%?mJsU
z!_Caal=h4ll%1MZl>#<1Ig_VE_g}hmnOkP^Zv2TPS}>ld!6;H+X=n2M?LVRuXz<Q=
zbksD5a!dR%Y*iN{#<zl+8Pck*u@%Hh0PrRK0D;28(cX|FA9B8P>4wR?bV_DEHoJ&#
zVd*10yG@K*4W4Rj1#Zf{m6lZS11U6N+rJc187^<du5q>R^->g)vbUzgIwrRE&^n&X
zZa_{?{9aBzpPTSWQj9HI4T3d-$Ja3=$d*)IPM|TYpT8y4{Y*WIOY2Kv`&cFLMrKp*
zN<909qDYoewm5zvd<#De7Tx(O_G(S$)wzVBcbgW~#@|abXmo#Jb;@=mI4xhM@1-|I
z*&=krUqGN+A_m@cTEOY6%Z6^3qylENqUhQ~f}>A&8sO+ijjDP<yj$!&@y9)X>R%`h
z5@_NmQbj*(WnV!B0N_$^EPZZZa%sbRz8iB1`p4=P0kw5fv+WTQ2_Rv!mE+TXVCHZ7
z-b_WUH&hFXMrgEL7WeS2?0IWY-0hu1FhOdP3;Yi=m&+_h3i<=skxA&e*fA=r8HW2j
zfq{2hDizshO$K*Oy-}Ff`I6nv2KN}vaV?q>qwsvMp8`OJcuHq{C3}Xf4cIpCS}Ipu
z9!%!*7K|Xdpn}A~diM$3KmrFaZNENWd0P_ExnxTZ-4c6C#CKJ9X7PiEOca}4u+_Kt
z0hKCLm=qjU9k(4DTqPDg@F4DvT%?{3s6Zsz`7sH-bJ}vc37+F#DbM9eRP(7wvqmv@
z(i{pXadPS^XcZ+o%Wz*x8u+8C4Uy5TY;GzTY+CoVZIsdUAr%9&qLI`}aHu**2?u}u
z$++U5i<^dC%h;{ELIP>4V#VG{g|>2OS+D7D3Umm-7;9;$#{BOoR!B<J#6Lx3hd!+j
ze?Mvb<93Q^R4mv`*uVpGoz-_&=#<S%#A3Dq=Ub=VN*4OBg!#G=Skup-t*Bs&bQjx2
zP8!hXm@7nD1|kA)Ux#4Tuw*Evl1Y+Gc4lK!g<z@AILognujY3~K6G?sAho$z>IU~0
zkM3QMP=R1&ne$45vhxJJ@Kh`ALn4tGHeMzSpeIl-GGtdO2nHG|N9IODpmcl&(}3u`
z@3LHId;q&>Q?ED_F8r*;u`(t&mxy1uriwY!<X6ZG&4TVw$E~L49I#nj-n2J<F$@=e
zf%b23ywNJq*w>_h{~ELhH`RhMYJ%$wHy}^hhXVYv+q1w7;TH`oQCzt<=@w+T#?`Ex
zs2Amf<BJsyM<lyFG~M>qZQ23GQuqLiCPrHK^;L%4CfhE-=MbpdC4*^E;+0(d58IRm
zF?OLBf$DEN&~fekKSL*9iBk2&;7<?})pO}Vc}_V7a#?m%{grW8TR!GG&o?4V<c>-U
zkAV%HU{JKE-6_;cuJzX`qmxvySuHRMkJs!%_~&|*K`^>3>FgXJ{bM5UqTopyn#|@J
z4j=iN)-jIZR$RkGM%rpdC3E?H^<hy-P|t4~)&0@O_M&ODktPm?S{)YxTR3S4hE>_a
zTc0hutTBaMc?q^6pExf~)eVDw>Nwsk@6bPc(~?fhlfH^C-b^i@yHSYXkh-QHSEXik
z8n)<gf$4+*1CUEucMX(fv||FTP8h7#8M#?R=rg!**zv~HC*8X>_g!SJC4>dBg42~Z
z3rMVSylzp>fLK%KF<lYIbTJ2~FsVbZ)3C><FDj-a_T=R>MO~)nuG#(w9)CBGWzl<A
z-0{xibBuU%|1MKDSRr($D#q~S-PiGeE9hUpj){wvT6u?2RtkG^6*T;C9)k(dl-0x>
z6yE4iE>-U+cO!gLurwWxVx$I-XHgR?S}=ZUuhvlkti&@~kio2?x4b2?9~!MD)J#~g
z0tRbWE`CdkSIjR7_qdok<+=$<6&=a|EQd>fk`x0kmtJOkhXb1&0An;|#j>BskCDTO
z?}T(!if5b<3WGp-4Aw;N(WegxYx^IX2X}oAIsX2lff1b`wccWZmx~vEiJEL|dK+d=
zebV}gFYoeL6Vk_*m^nd=u97B>_1!n4)p<1BhR3P1-EovOt_WPkRs#DPwHqDb)}-&h
zn1=N47@rWdv<77J8U<~8#5|^SDFt^uX2I0^^22Srv%gf=R@1ITP%M5Mo%S9jG%=4z
zC$`~&JcCy2cFJ6BqnyWVi3Be`M~i(unOY%Q&Walun~dzc9>%<&`pYqJLE-UYr4<{E
zr8~1a=i2Nmr5J=o3i^!+b<}aiUwVp$PY?60W-hz}6s9ngk0otE{S-OfL3jvVJ0mpw
z0%J{Q%8~C>!dNWk!zj`Ms+AH{&oe7}EqRmH-7Jj;3_jY>5?a$4d%0i~6iO}1_O0Dp
zopKCm1MJ#uBl>N;=N@jw44pe(_q-*3W#ffg;bY%Ig_!O6!|W4wH}pQ_SX7=jIOpt+
z1mwizV2m=2Ed$`HisMyEF*C+fGkW*r^R=@1+-27A(N6tKA4_ui78ub#xBuk~MYlj_
z7`{d?Pn)bkpQ7N$epZ{@C%WSyQ~hSMJjhw@s+h<P@a$bWE8xa)+3h}t?{f2LL5qh>
zLN_PzIJZ(S%{-aHeYgCZ$$*BP^TYcXhIwAlE8cehkq24|Q{Km*_{(9xl<>i~j6OJ4
ztFHC*tQSpUC<m;DYdtHb{E3mi9zkPuZTYOA63U*-12?w0HE?Yv*DcaSNK$^Kv|*<{
zV#qF5;lcQfKil{iIY2ne)+2d<X)dAT`wa+H13HOlkhG=k;9Lt-<zC_YwNoQL(r$A@
zS5|c3afqF#prgehqK@77Nud;1jmOS}4Vwsud$M1R$TtT^9u05=)%q9Gpb{{3h<Dj5
zgYQ<D4(7PZ<mBh;Bhndk#3uoF0{T4VmE27`7kt0zNhd~H$AfdoeaylFZ(vI(3^y8#
zOTA+j3g8frmr7pjgn0Xmsj5YDYYi_xeb6k{j3N5{cAe+mo?3ce`I0?NkDgcLoF`!u
zGm=I+VCgIq&<96^Q`o6puduF=SH@L}CgZC36W7T?lRq#zH|}YlRVZ?ju1xHGF+_07
ztZ=pTn|J2CwAMaW_3@)#$~Ru5BW|``0t!!61>Tk_raxGe)VfW~QbPrKeSPNUfavu2
zZer;7*`g*2)^BJpBJv2q=A=z0SQTLyuAN&%uBM?)R)TJcz9kxtAoVMXK^IO~E6-t4
z^1R}}*UnAoFfkOm4<Wo%R3s*H?G0tRGv4c5z~y3guKjs%(IfBmwzE9*s~1;X906|o
z(&pHlw#JgJ&$67JYI#$z`shU$wY&#u^t`3^(28osdK$xBY;TW<1j`ED7c!5yC^!<^
z=wc=HT3L_p2c)-B-N)Ag^+0sFz%5Yb&B3vp#qKgV!iPh!4{yB#ZK4(&zD2u@!5N;J
z3flGVIvb498N3gezsU!{DP9-~i&GE13P=6qL8I!#jcB28Q!qyOSz9nX7}nML{aJ8+
z0%I`q;lNB_*qPRwd~lQ%7(-Y)9?Zl7h7C&62G@fj?#2s%CMF6-rISebKac_c9@>8d
z8Sr<C_75Th{!Y>U!I}a8ES-ND8StMvX#WNo0QSH?NatT>6Zl`d^Zy?i@HchipF#%w
zP2Ko6bpB;Ffqz`l{u(miKd80;6EfhxZQxHjr?CTYVj}JF4Fn#48AXslYCd<a8qj{j
z20hmLm}NFZw#MEETQkrEAkdssn!A!3k7QUK6_7rWEUi}JNRzA}Z}4pk9)F?Fep}6V
zeY~s>BPn{HHgf$Yn};~!*sU(2lClUAL#p^tn&&Fg+fu&GXHQPj_IC?_^DR8p<n5Vs
z#0s6h6no@h8FO5Z(L^6KldxC$aXzCO`Cbitp?ZJHzS_QH#yXqCUmX)B@g)kp<Y+rA
zoG>JxStvO_@d$kSV-%;Gw^jGyx71IsYI`(w;a%(JBZSh8>#&;VCJGSnr=_lUy;#-i
G*?$41Tb6_X