From a1ddb7ab6066b8867a91dfde8a4282cb50f08a15 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 2 Nov 2022 14:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/tianfuxing/AppHome/AppHome.vue    |  12 +-
 .../tianfuxing/AppHome/PhotoReport.vue        | 106 +++++++++++++-----
 src/project/tianfuxing/AppHome/home.png       | Bin 0 -> 965 bytes
 .../tianfuxing/AppHome/home_selected.png      | Bin 0 -> 1000 bytes
 src/project/tianfuxing/AppMy/me.png           | Bin 0 -> 993 bytes
 src/project/tianfuxing/AppMy/me_selected.png  | Bin 0 -> 1035 bytes
 6 files changed, 83 insertions(+), 35 deletions(-)
 create mode 100644 src/project/tianfuxing/AppHome/home.png
 create mode 100644 src/project/tianfuxing/AppHome/home_selected.png
 create mode 100644 src/project/tianfuxing/AppMy/me.png
 create mode 100644 src/project/tianfuxing/AppMy/me_selected.png

diff --git a/src/project/tianfuxing/AppHome/AppHome.vue b/src/project/tianfuxing/AppHome/AppHome.vue
index ee73ace..ddf14a0 100644
--- a/src/project/tianfuxing/AppHome/AppHome.vue
+++ b/src/project/tianfuxing/AppHome/AppHome.vue
@@ -79,21 +79,21 @@
             size: 10
           }
         }).then(res => {
-          if (res.code === 200) {
+          if (res.code === 0) {
             this.$hideLoading()
-            if (this.page > 1) {
-              this.list = [...this.list, ...res.data]
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records]
             } else {
-              this.list = res.data
+              this.list = res.data.records
             }
 
-            if (res.data.length < 10) {
+            if (res.data.records.length < 10) {
               this.isMore = true
 
               return false
             }
 
-            this.page = this.page + 1
+            this.current = this.current + 1
           } else {
             this.isMore = true
           }
diff --git a/src/project/tianfuxing/AppHome/PhotoReport.vue b/src/project/tianfuxing/AppHome/PhotoReport.vue
index 7285693..e7c67fe 100644
--- a/src/project/tianfuxing/AppHome/PhotoReport.vue
+++ b/src/project/tianfuxing/AppHome/PhotoReport.vue
@@ -18,24 +18,25 @@
     <div class="phone-wrapper">
       <h2>我上传的</h2>
       <div class="list">
-        <div class="item" v-for="(item, index) in 10" :key="index">
-          <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/photo-bg.png" />
-          <span>待审核</span>
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <image :src="item.accessUrl" mode="aspectFill" />
+          <span :class="'status-' + item.status">{{ mapStatus(item.status) }}</span>
           <div class="bottom">
-            <i>10-15 19:25</i>
-            <span>积分+5</span>
+            <i>{{ $dayjs(item.createTime).format('MM-DD HH:mm') }}</i>
+            <span v-if="item.integral > 0">积分+{{ item.integral }}</span>
           </div>
         </div>
       </div>
+      <AiEmpty v-if="!list.length"></AiEmpty>
     </div>
     <div class="btn-wrapper">
       <div class="btn" @click="upload" hover-class="text-hover">拍照上传</div>
     </div>
-    <AiLogin ref="login"/>
   </div>
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   export default {
     name: 'PhotoReport',
     appName: '随手拍',
@@ -47,11 +48,19 @@
         statusBarHeight: 20,
         list: [],
         hideStatus: false,
-        pageShow: false
+        pageShow: false,
+        current: 1,
+        isMore: false
       }
     },
 
+    computed: {
+      ...mapState(['user', 'token'])
+    },
+
     onLoad () {
+      this.$loading()
+      this.getList()
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
     },
     methods: {
@@ -73,11 +82,19 @@
         })
       },
 
+      mapStatus (status) {
+        return {
+          '0': '待审核',
+          '1': '审核通过',
+          '2': '审核拒绝'
+        }[status]
+      },
+
       upload () {
         this.imgList = []
         this.hideStatus = false
         uni.chooseImage({
-          count: this.limit,
+          count: 1,
           sizeType: ['compressed'],
           sourceType: ['album', 'camera'],
           success: (res) => {
@@ -103,7 +120,7 @@
 
       uploadFile (img, total) {
         uni.uploadFile({
-          url: this.$instance.defaults.baseURL + '/admin/file/add',
+          url: this.$instance.defaults.baseURL + '/api/file/add',
           filePath: img,
           name: 'file',
           header: {
@@ -122,16 +139,22 @@
           complete: () => {
             this.$nextTick(() => {
               if (this.imgList.length === total && this.hideStatus) {
-                this.$instance.post(`/app/appvillagepicturealbum/addPictures`, {
-                  areaName: uni.getStorageSync('areaName'),
-                  areaId: uni.getStorageSync('areaId'),
-                  type: this.type,
-                  urlList: this.imgList
+                this.$instance.post(`/appwechatescalation/addOrUpdate`, {
+                  type: 0,
+                  listType: 0,
+                  openId: this.user.openId,
+                  accessUrl: this.imgList[0]
                 }).then(res => {
                   if (res.code == 0) {
-                    this.getList(this.type)
-                    this.getTotalInfo(this.type)
-                    uni.$emit('update')
+                    this.$dialog.alert({
+                      title: '温馨提示',
+                      content: '上传成功！请等待后台人员审核'
+                    }).then(() => {
+                    }).catch(() => {
+                    })
+                    this.isMore = false
+                    this.current = 1
+                    this.getList()
                   }
                   this.$hideLoading()
                   this.hideStatus = false
@@ -142,21 +165,34 @@
         })
       },
 
-      getList (type) {
-        this.$instance.post(`/app/appvillagepicturealbum/queryAlbum?areaId=${uni.getStorageSync('areaId')}&type=${type}`).then(res => {
-          if (res.code === 0) {
-            this.list = Object.keys(res.data).map(v => {
-              return {
-                name: v,
-                list: res.data[v]
-              }
-            })
+      getList () {
+        if (this.isMore) return
 
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
+        this.$instance.post(`/appwechatescalation/list`, null, {
+          params: {
+            current: this.current,
+            size: 10
           }
+        }).then(res => {
+          if (res.code === 0) {
+            this.$hideLoading()
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records]
+            } else {
+              this.list = res.data.records
+            }
 
+            if (res.data.records.length < 10) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
+          } else {
+            this.isMore = true
+          }
+        }).catch(() => {
           this.$hideLoading()
         })
       }
@@ -164,6 +200,10 @@
 
     onPageScroll (params) {
       this.isFixed = params.scrollTop > 60
+    },
+
+    onReachBottom () {
+      this.getList()
     }
   }
 </script>
@@ -303,6 +343,14 @@
           color: #FF883C;
           background: rgba($color: #000000, $alpha: 0.8);
           border-radius: 8px;
+
+          &.status-1 {
+            color: #3BBC37;
+          }
+
+          &.status-2 {
+            color: red;
+          }
         }
 
         .bottom {
diff --git a/src/project/tianfuxing/AppHome/home.png b/src/project/tianfuxing/AppHome/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..c39927f8123adbc9e7835c14ace6b7610b25a863
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFFG)l}RA>e5Sv_bIVHm#rp}{1S
zfZz~t5e$hClT-&M2P?RUn^QXpf@2FJ3Q`0|yLAv;q(c!31swzx?BJyNF<?RlAqW8#
zp-Tc8LK2@>E|<&Ya^HKo@6t%`;Ap<@d*A2heZTujqbT0tRp5A6z~_eja=Cn|*XwNp
zJFnsw1A)M1Hk<t-n@_rdVzKxLBA*Nf1HWFZ&*$r7{5YS_Kh@7W{Vdf$p-^}RLF)oh
zTg%JK8-f`2vJ?YUZB+g_Snn{IU!W6r)vhp8%)=ZTK-EJKvI7&h%_+=hk@E^UtLR48
zJc2hnwoiE}qo_usaT23_yW$B!&DmEmMxZu7&D?={y&i41+pocQ)h4Gg{2&sE+)O5u
zE#m@bJd=THwHohqI&VR6nM1;e`5X?1Z=}=dLq_aah;0K9e+J^;1LeXPlJmhgm{@^{
zUv{8u87P%XXR&ub;5=uCgd2+s`#a8Sxm@lCH-~)@S1OhB{eJ(GTjEJDVG{>&aSgCK
zfLDWy0DcF8(_CODap=Myzu$iyuO44TIKmD<{1u4*I4|)en7D|OxE&b)z=~S=B@vM9
zb(mNpZqi_dJ+%XP!rlVF8vvcM0&sJUxJd(PnZ{#k0C$^JB<um;#I(eD&8r&rR814K
z69(Y+9+F-nGB6Q+bQ1y6MB0oJ#tb0f0RpxW%(^=n!Q33HnzmJq8kHs#En3HZqxboR
zKX8lPz{75fglZjt_=gLxTotI-su{q;<M;n!K(AFZ0P$;BsNkgUt_yjPHqr=jYeRwB
zH87ko{>4QzFwV_$jBjj~8ucBRr!Hw+o&jm4oDnEEW1eMNC=^l>iG&i3M*qdNS}mp7
zY%1NZqklk{a!NNq;!~-V5)6)@<MFr>i^Y^$ttQ=s^lN}BuNOZo8_m(0>_fVN;kGdo
zYPDt-&zX~MfVR-I!)k3>j%Z%G0TH3>b<cq8irU5VI$*bAvg1cj8%fCcp+gc959U~G
zp`W~3xDqAg=5*k|6=^(BA-B)~o}Tx?W&4K*o<7T{LzUYyNN6CF$ut3!0m?2;VM{I9
nc#FibOPs{bOYx$Pt^$7nuyhx>ozM>600000NkvXXu0mjfxI2~?

literal 0
HcmV?d00001

diff --git a/src/project/tianfuxing/AppHome/home_selected.png b/src/project/tianfuxing/AppHome/home_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..a37c2179d635368976b7fcb1d7b6ff8c52cc4f84
GIT binary patch
literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFQb|NXRA>e5SxsmYK@@(ITGAkq
zq8@sv^q}HJupsr|K}^yhS|}a_PZfn?#A6GssHtgU4+_mquu@R*AVN=-TKsE@f(J!V
z@FIE%7OWs5<WQwF&-bc{+s*FmY%<#fx&tA*@9+D*nYTZa0Qke7fsH)_!VCGaG<G3C
zifZrwSN|;mrJj$7H@fk(3y5a$5)>g#0s=;|1XLu;$Xrs48SS+mYZVYl<2WD;NJ$CE
z=0?PzG{%Kfi+~hj;6(-|5TRcMTL_pul!Qb|h@wioET(1wXD6`v(<0m>kdrbX3*Up?
zZP0fsA(kzC%BGqGoW6}M`7ba<ZPTNSXbcoE)3F0i+&LqD8O?5vs}|6E4a0@sFiqqS
zy8*0-6)+zTLhtmjC{*|q3{?p@lEtmd1(>Bf%>e}r#}Fd%x;YF-9}kEhj=`n?*8+}R
z$F`*<cuIBlnrhX0`XLm8_@g1Q=%$b>0nw}2fh+Kg0Cu?naS{7jG(q>=Wsz6SQ5F!%
z;2wGuG5L1Y;#I~i&;zeKmlPjW^4B~q?GoZ+*hv@bOY(b7o+-35)+(kQA%op<1*mNf
zQrpZ>POBkrJq~|TJM~aIy^?`RS0FZuacY|<bs*22TN!(mgG7O?fLI2PqkxC>dazlN
z@2QKinFDjN1F{rAZPQ1|Q}hYiC9ap9IWQOIWQAEFfZpZLV-fCBQj=9eJ#5T{IWadg
z{u%+%G+rno+@QOF<Hc<*<oP*qVs6aQh*c&^>INua+~{o7<A8uc+TCTDUwH-Sz2;)0
z5;pTPaxDv>w)tibY}j)H*RlY*U7ezx(tGNuns-TF31@E1k-3&I%GW^2VE&Gb(mkM#
zBX@-;OGbGGBry%`@&(j;c{X`LV0#!K5eMk(_*?y59$<p@aNn!i^~xD)7r^8v&jD-+
z{RfWG=Cf-jK>tnsBD7xvJo85KB^hjEpYEYuK&fr4h{}9c@hUd$0=7{L*$tV`F2~8P
zU4RpyZoe-;_l&x&=dXa<8PgrF{XrH@>!v8Lw*gv6z*qSkc<5EYc3c60Fz+EnX=xQ~
zM*+bW7@{qa>pvc(%oLoA$=FVzjsj+f#R3)DM+NWGuSMRs6JanGV=}gr0N-El8TbQH
WuGuxqORIJO0000<MNUMnLSTY2BB9Ix

literal 0
HcmV?d00001

diff --git a/src/project/tianfuxing/AppMy/me.png b/src/project/tianfuxing/AppMy/me.png
new file mode 100644
index 0000000000000000000000000000000000000000..03b531e43c595fe513714a8a21f4a46145487440
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFOG!jQRA>e5S-)#jQ50^{1QIX~
zLI!IGp^K0qkYsZzxE1^{baQbLr6RbvivNIuSac|45jtcLg>FJ!+>$_sKo`M5>rm)m
zg#_};?~6CkXWz+t=ib|BF&8fH-5=*W-*?V?H}}3QEX>P10{?de5<ca(TCL@NzkdUm
zYopO<C6P!h5g+&axc`jXom49Iu2?L7WxtQ&ML@IJTpA9CPeJGo>S6@30miGzWb#R=
zRN9Z28#(MO0OYTO{2O@6MS2TPID&}V5b-|Pt!pK9(}T0?_4-3R9&gdBB~PFnZHW;?
z)wQfMz{ryTs#6f~ZVXXx*=E8@fO+Qk7)4#Y#MykDuGqX2R?#yrtS|CZl{1*4LTNyq
z0WOujUhfM4qgETqr_?`4r_-0UORPErW}Wv<o}v~Fwj?mLUo8MAYoSPfI@Q=}0a$fb
z{BS*qVuP&~FxeiQbno6{gRK_ePSY=fS^(1Qynm4-*kG##AkExWo=UO7Rto_0ol{}|
z8&r+07Qp>Hd~r+cy9^Ar3Rf+_{8Cm`UgAxzYJY_Zs}?Xe!eIp0Bi?%|+{_VEU91Ff
z*T};NUb>;$;~xgZFb5l})y+x(IdK1uW$%%T2-*_E_AEdi>fI=fj+Zliq@)l=kB1T5
zZlT6moj7NUHZG9|#<)0VU;@PJnfa`O$0m;x)Fz(c6zT&+(&`1|(G>5%OVmCxvH_ff
z;{l0tug(CzBCLb-CY<JtgCDrQ0D)I=g_tw-ec17f#ChTX^8lC|l}e??cH9zMz$EGb
zUKhZ7An^fXyAbmUWWFIw<A|c2$JiybuVQ=^W7lv^3ph1RHev|~iMrt1Pq!u;Qw6l!
z?F*ew=QU_aQTM}GMyX}9*?WaT;ZT|)3IO?Y-EMam>8?n|v*<@Q>X}St6(W9y`Ada$
zvJa7ej*B(<a=9FUZZsN!cH9O7h(JEW{JUW`;#LC6`I-D*DK{k|q5vqLER&M$%=)Ks
z5e3YQoui|<0LK72o6j@g970C`@pk~Y-%&5x;@htKf<JNzEz=&MkD(TSr&Hu23c#NY
zkHJ;kgUnFJq2UthQWU^%G%zf}Y8zEdVJNDfPWs#?2b=FjekjaQq9gDNY0or+k>Osu
P00000NkvXXu0mjfs`RPk

literal 0
HcmV?d00001

diff --git a/src/project/tianfuxing/AppMy/me_selected.png b/src/project/tianfuxing/AppMy/me_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..dff9fcad51a427fe6d821489f29d35b1be45360f
GIT binary patch
literal 1035
zcmV+m1oZofP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFbxA})RA>e5Sifr&Q4pS&Un^)V
zBv%+Mgfw<G>8vg)5(Iw~*V)*JauU$OfS@4}gftPvpoMUaU~z>gNDw8lvGWhG5iB$o
zcW2>gak(VVZ`R$z%k8_{ncZ9r-ooAP&c6BP`{uo!on4~d*2}>EodJ`k{K<KHcx{c&
zSxaZg(wHS0Wqbr##os4m=+)2=y;zzyU($-3ihxt|c66ggvmkW|<onx^gNO}WFZ6pf
z^Jdztwi_GgT4Dj&yY?)y{S?39H~|}D3{^2J7guhZmkpcZpikk`a5*t&r_3fj7n5fM
z2xec#XaFh>)HA@DX98H~iIM;Uo3@WGXlFttfY<zbjXtU}AC+Y+rvZ<SYVHYD_WT=G
zy5^&Zhc;jZMIf}q-iv2|OJ%J_pF35X*bIV!T%A0Rjz~+acm{$x-?mgr$@6$l2xCiq
z#RB|?lr&1r@fvKg0Nl7^G5N@cDX_%?!uCMUuCs>*TP&b6jqZ*R3qaXQ+`qUaYOuuu
zxT|y#NNiVNiv@5?oS3KsK!Yt7!2NvC5<6(<%#6v{Qg5+<;7M7K28uDhAbkomrdR+w
z@yiJAg(@GXvH{D-RDh`j_+2AjMo=|26)~G!d<<Y|I#C8v31CO=-?475ClSHEjG=uO
zU>?9ow(aUyN|w&q<ChU+@(EXxPU+w=JeGZuWIl|Ocm_fs-tU^vDwFqYrdFp#EWiO&
zk89c+F!&tv5FPHiH%R%VTc-4PLgE~YXJBI1=BxpEOBoITfFJmK03na!3JHi`1;!LQ
z(EUD9LnUJ=zdU1#afpXwVhaefj)1w)xoK~x4zRZnw}LhP9@oC^&5)nbUnO7cA-u30
z2gxijPJ;YklYejmjG|;VVhPxq^{Bw9+61%FR>0{6d!SyW$Ih&$%DNSdXJc@fuDrfs
zzPDceV{r<|E!utMGOb|PxXZaq_75W?lr84X&!~6<QAV~^Ds&$^HTmT`&BzmT&F6x%
z@k*H%F#d9skF%A)vJrpchzgK~4Ta&n3&$xSER!zBuG)i=9Tn3pAZqkKXzK~s=}GC$
zz)sJA^ErS9?Hel5K`p@qb-y(vb8&3WC4{Eyox`W==5}110=zwR6McrW2kDjy=D=KB
z@tgwq8x0(f0pOXxoLmUoWyiAN*vvumy=c2=^>DXl;5V3H4*E~|h{pf`002ovPDHLk
FV1ghz#N+?~

literal 0
HcmV?d00001