From 867596892e235866a7ceca62e45573f92a980593 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 10:05:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/AlbumDetail.vue       |   2 +-
 src/saas/AppCountryAlbum/EditAlbum.vue         |   2 +-
 src/saas/AppCountryAlbum/components/Home.vue   |   4 ++--
 src/saas/AppCountryAlbum/components/Tabbar.vue |   6 +++---
 src/saas/AppCountryAlbum/images/loading.png    | Bin 0 -> 3710 bytes
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 src/saas/AppCountryAlbum/images/loading.png

diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index f2485a17..ad2ae741 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -48,7 +48,7 @@
       <div class="photo-item__wrapper">
         <div class="photo-item" @click="linkTo('./Photo?id=' + item.id)" v-for="(item, index) in list" :key="index">
           <!-- <image :src="item.photoUrl" mode="aspectFill" /> -->
-          <u-lazy-load :image="item.photoUrl" img-mode="aspectFill"></u-lazy-load>
+          <u-lazy-load :image="item.photoUrl" :loading-img="$cdn + 'watermark/loading.png'" img-mode="aspectFill"></u-lazy-load>
           <div class="photo-item__text">
             <h2><AiOpenData v-if="item.createUserId" type="userName" :openid="item.createUserId"></AiOpenData></h2>
             <p>{{ item.createTime }}</p>
diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue
index 3b6b1cad..36846600 100644
--- a/src/saas/AppCountryAlbum/EditAlbum.vue
+++ b/src/saas/AppCountryAlbum/EditAlbum.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="EditAlbum" v-if="pageShow">
     <div class="img-item" v-for="(item, index) in list" :key="index" @click="choose(index)">
-      <u-lazy-load class="img" :image="item.photoUrl" img-mode="aspectFill"></u-lazy-load>
+      <u-lazy-load class="img" :loading-img="$cdn + 'watermark/loading.png'" :image="item.photoUrl" img-mode="aspectFill"></u-lazy-load>
       <span class="icon" v-if="!item.checked"></span>
       <image class="icon" v-else src="./images/img-choose.png" />
     </div>
diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue
index 51010240..48a3e643 100644
--- a/src/saas/AppCountryAlbum/components/Home.vue
+++ b/src/saas/AppCountryAlbum/components/Home.vue
@@ -54,7 +54,7 @@
       <div class="album-list__wrapper">
         <div class="item" v-for="(item, index) in list" :key="index" @click="linkTo('./AlbumDetail?id=' + item.id)">
           <span v-if="item.photoHasRead === 'NO'">未查看</span>
-          <image src="./../images/icon.png" v-if="!item.lastPhotoUrl" />
+          <image src="./../images/icon.png" :loading-img="$cdn + 'watermark/loading.png'" v-if="!item.lastPhotoUrl" />
           <u-lazy-load class="item-img" :image="item.lastPhotoUrl" v-else img-mode="aspectFill"></u-lazy-load>
           <div class="item-bottom">
             <h2>{{ item.albumName }}</h2>
@@ -90,7 +90,7 @@
         countPhotoNo: '',
         countPhotographer: '',
         list: [],
-        msgInfo: {}
+        msgInfo: {},
       }
     },
     computed: { ...mapState(['user']) },
diff --git a/src/saas/AppCountryAlbum/components/Tabbar.vue b/src/saas/AppCountryAlbum/components/Tabbar.vue
index 1afb65fe..23fea5c1 100644
--- a/src/saas/AppCountryAlbum/components/Tabbar.vue
+++ b/src/saas/AppCountryAlbum/components/Tabbar.vue
@@ -29,10 +29,10 @@
 
     computed: {
       tabBar() {
-        const link = icon => `${this.$cdn}askform/${icon}.png`
+        const link = icon => `${this.$cdn}watermark/${icon}.png`
         return [
-          {text: "相册", iconPath: "bdlb1", selectedIconPath: "bdlb2"},
-          {text: "组织", iconPath: "xjxm1", selectedIconPath: "xjxm2"}
+          {text: "相册", iconPath: "xiangce", selectedIconPath: "xiangce-active"},
+          {text: "组织", iconPath: "zuzhi", selectedIconPath: "zuzhi-active"}
         ].map(e => ({
           ...e,
           iconPath: link(e.iconPath),
diff --git a/src/saas/AppCountryAlbum/images/loading.png b/src/saas/AppCountryAlbum/images/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..88deb680fdb8872a2e6b1096529c702dabda740c
GIT binary patch
literal 3710
zcmeHKdsLEV82`AKsFgUiQ`(4ZrQ0Yxb(T5}zSK_H7PT%5&81~RZKYW&AyFV_=AyKl
zv|}gT+39$irG`zkD9jQ_Le@I-284>`8Ui9iZUTGR<?R3c%^%Ns-plW~oag<%_xZh5
z+bA371xE!#5Hv4iQ~GuYLTvI0W)4_c9YJ3M6yo^yjj2#`-{QAmlAce^pl#U#eE`N7
z2vK<mLi-><qJTgUssRC^fJXS%8j%0)A~rRk{u}#%_sGkdK+xYZ(%0`~APnle=hP=~
z60?J{qUuFWTiAQqhpvv@N6Fi)aO;e?W2P&$v)|jDg>9bMJlb2nv-VQ>VNv$}Pgg%P
zm1(Oity={vZp~MSko(BW`<vfXh`t+|G!BZ!Tk<nkX&#B$h0GMv;NjY6y-6>pWorrY
zU-`3J?eR!7W|kcw=~%N?en&xju1%1hbW9Jw*6hyX1rjZRi-^vKWcl=rr*Y#FVl}_I
zKW=Zy3#n@YjltSagz!{($t3N=lcSfL@>n(zSx=mEtW?5qR4%cxH9SR5KfS6j#Y7&f
z55vPF39<1KjY8m<R16fe_tby(ifmG{3-F=JD3d`<UFI+{y_al0;I1&L&TcjK8lPBh
zY$1iql5Ko)3hSQN<-BdSwFGmd>p2j2BA913^n^UHwd}=tKXw&G${f$lqYvHW9y8%$
z9mKtiy>?L~aOsBVmsC1bef@ED3$dxk95=QSfs9?=`sm9W^RBN<AsNxfJQX};5-wA;
z93F`XprJz9Np4FyS@hK7xM@xBv^yib{Hbd}*f_4WP&mLJHa+JLSJG=N`o%qW&(1}n
zDZ6sr0!do<fRx<dc!du{>x!A$;TAvEt$;@|xkV*zr%c#xQ3dvxGjXP+@W_>b+OOKq
zt75f#N_(-mWCRj@Bl6mjY;s@{d+M7UP+9!XNcs6iGQFE}4g$NhXkq1&Ov!2Acyn%h
z(StH(b^QdDFbB*(=l*owL5afuZG{}dEdYx#_?qvJV)1Z809vq)08Tg^#;1+qVGbOE
zIZ#3c*s~n?Ot-I$3$U`8RuB=3;Lfcm2N71{YYh9qDd3UFMZtl<Sr&{}J&6IfX!Poc
z`M}vd4%}Y30oY<N2jUh3X9p47!=b)R!?3b#iGQW<PsCpl|2N|QYy9_!|7P{~8h`io
z^O65gj0OuN9WPA+z^mZgBRaM)uT7l_s2iYat?g#5{*%e2HHQ6wvE@cC6w>g80>JYi
zZexH%VHjMMLvk0?0chi@cvWI;e&-)gs$Hgpy4S<E${DkOx-nwn3&akm@s44k?(yIS
z<y{bj(-qDgdYTqJA!;KOl0`x<4QL4TvaXB}UXg9=swR22)NY)r7_$r#>XekIp7L0*
z8A08{I5>9d!VfZMr%dkc6ndr38I8^bcr~Z%{h-^#Cb36zRa4(Dv`y&xgi(FPlg*Q)
zZ1JgC)efYY8id6k#ZpxX(F~rBm4i%@va*=wZlf|L>7&^gc;o=OKe5?R;<f+cw0BtE
zaoI08PI_)CJg+<<M4|G>jvy=}GT@E;ckl>!o7gAKQsS#a%gRPr?>;K~cKW4tXdGnn
z(3i=F%Z?sY*}rZ#iU5phTqA3PD(RQW>zoXxh&6uhnX(u7vL6ZNsQ|+-Zu!DK&hKWh
zvWauY&8UfDwfdiz6g7>R=PoTB;_3ARl)dZ9ctTK3`>vqd<UaGWt%N%A6}tMmmc%ej
i8=I{8)^fh%xF@t~EslQr%tedu?U%8ElHQz}d-_kU3BIWS

literal 0
HcmV?d00001