From b9f3cda9b8618a9b8d1cc5569d2209bd1c6cd859 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 8 Nov 2022 09:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=BA=9C=E6=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/tianfuxing/AppHome/AppHome.vue    |   2 -
 .../tianfuxing/AppHome/StoreDetail.vue        | 101 +++++++++++++++---
 .../tianfuxing/AppSquare/AppSquare.vue        |  60 ++++++++++-
 src/project/tianfuxing/AppSquare/square.png   | Bin 0 -> 1681 bytes
 .../tianfuxing/AppSquare/square_selected.png  | Bin 0 -> 2323 bytes
 5 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 src/project/tianfuxing/AppSquare/square.png
 create mode 100644 src/project/tianfuxing/AppSquare/square_selected.png

diff --git a/src/project/tianfuxing/AppHome/AppHome.vue b/src/project/tianfuxing/AppHome/AppHome.vue
index ad62167..ec3cb11 100644
--- a/src/project/tianfuxing/AppHome/AppHome.vue
+++ b/src/project/tianfuxing/AppHome/AppHome.vue
@@ -94,8 +94,6 @@
     },
 
     onLoad () {
-      this.getList()
-
       if (!this.token) {
         this.autoLogin()
       } else {
diff --git a/src/project/tianfuxing/AppHome/StoreDetail.vue b/src/project/tianfuxing/AppHome/StoreDetail.vue
index d732402..d4d2f35 100644
--- a/src/project/tianfuxing/AppHome/StoreDetail.vue
+++ b/src/project/tianfuxing/AppHome/StoreDetail.vue
@@ -10,15 +10,23 @@
     <div class="back-wrapper" @click="back" v-show="!isFixed" :style="{marginTop : statusBarHeight + 'px'}">
       <image src="/static/img/left.png"/>
     </div>
-    <div class="photo-header">
-      <image class="bg-img" src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/photo-bg.png" />
-      <h2>随手拍</h2>
-      <p>将身边文明或不文明行为拍照上传即可获得积分奖励</p>
-      <image class="right-icon" src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/right2.png" />
-    </div>
+    <image class="banner" src="https://jisheng-xiaochengxu.oss-cn-hangzhou.aliyuncs.com/admin/5bad9165-fa6e-4c81-894d-2beae426260b.png" />
     <div class="wrapper">
-      <h2>我上传的</h2>
-      <div class="list">
+      <div class="top">
+        <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png" />
+        <div class="top-right">
+          <h2>商户名称名称名称</h2>
+          <p>成都市金牛区xxxx大厦成都成都成都成都…</p>
+        </div>
+      </div>
+      <div class="detail">
+        <h2>优惠详情</h2>
+        <div class="detail-content">
+          <h3>Lv.1会员进店享受9折优惠</h3>
+          <p>需要将 input 组件 type 的值设置为 nickname，当用户在此 input 进行输入时，键盘上方会展示微信昵称。
+从基础库2.24.4版本起，在onBlur 事件触发时，微信将异步对用户输入的内容进行安全监测，若未通过安全监测，微信将清空用户输入的内容，
+建议开发者通过 form 中form-type 为submit 的button 组件收集用户输入的内容。</p>
+        </div>
       </div>
     </div>
   </div>
@@ -71,9 +79,78 @@
 
 <style lang="scss" socped>
   .StoreDetail {
-    width: 100vw;
-    overflow-x: hidden;
-    padding-bottom: 200px;
+    .banner {
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 480px;
+    }
+
+    .wrapper {
+      position: relative;
+      z-index: 2;
+      padding-top: 400px;
+      margin: 0 16px;
+
+      .top {
+        display: flex;
+        align-items: center;
+        margin-bottom: 58px;
+        padding: 24px;
+        background: #FFFFFF;
+        box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+        border-radius: 16px;
+
+        image {
+          width: 112px;
+          height: 112px;
+          margin-right: 24px;
+        }
+
+        h2 {
+          margin-bottom: 12px;
+          font-size: 34px;
+          color: #333333;
+        }
+
+        p {
+          font-size: 26px;
+          color: #999999;
+        }
+      }
+
+      .detail {
+        margin: 0 16px;
+
+        h2 {
+          margin-bottom: 42px;
+          font-size: 34px;
+          color: #1D2229;
+        }
+
+        .detail-content {
+          padding: 24px;
+          background: #FFFFFF;
+          box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+          border-radius: 32px;
+
+          h3 {
+            margin-bottom: 24px;
+            font-size: 40px;
+            color: #222222;
+          }
+
+          p {
+            line-height: 1.3;
+            font-size: 32px;
+            color: #999999;
+            text-align: justify;
+          }
+        }
+      }
+    }
 
     div {
       box-sizing: border-box;
@@ -120,7 +197,7 @@
           position: absolute;
           top: 0;
           left: 0;
-          z-index: 1;
+          z-index: 12;
           width: 40px;
           height: 40px;
           padding: 24px 20px 0 20px;
diff --git a/src/project/tianfuxing/AppSquare/AppSquare.vue b/src/project/tianfuxing/AppSquare/AppSquare.vue
index 3060e84..2181b87 100644
--- a/src/project/tianfuxing/AppSquare/AppSquare.vue
+++ b/src/project/tianfuxing/AppSquare/AppSquare.vue
@@ -1,5 +1,16 @@
 <template>
-  <div class="Square"></div>
+  <div class="AppSquare">
+    <div class="item" v-for="(item, index) in 10" :key="index">
+      <image src="https://jisheng-xiaochengxu.oss-cn-hangzhou.aliyuncs.com/admin/5bad9165-fa6e-4c81-894d-2beae426260b.png" />
+      <div class="item-bottom">
+        <div class="left">
+          <image src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png" />
+          <span>张三</span>
+        </div>
+        <p>2022-11-05 17:45</p>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -9,6 +20,51 @@
   }
 </script>
 
-<style>
+<style scoped lang="scss">
+  .AppSquare {
+    margin: 0 32px;
+    padding: 20px 0;
 
+    .item {
+      margin-bottom: 24px;
+      padding: 24px 24px 0;
+      background: #FFFFFF;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.02);
+      border-radius: 16px;
+
+      & > image {
+        width: 100%;
+        height: 360px;
+      }
+
+      .item-bottom {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 96px;
+
+        .left {
+          display: flex;
+          align-items: center;
+
+          image {
+            width: 48px;
+            height: 48px;
+            margin-right: 16px;
+            border-radius: 50%;
+          }
+
+          span {
+            font-size: 28px;
+            color: #333333;
+          }
+        }
+
+        p {
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+    }
+  }
 </style>
diff --git a/src/project/tianfuxing/AppSquare/square.png b/src/project/tianfuxing/AppSquare/square.png
new file mode 100644
index 0000000000000000000000000000000000000000..154e9897801ac52005ce013f848e0e2b4a45e8fd
GIT binary patch
literal 1681
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
bD%1ZLI=11gr#}6@00000NkvXXu0mjf{lg$#

literal 0
HcmV?d00001

diff --git a/src/project/tianfuxing/AppSquare/square_selected.png b/src/project/tianfuxing/AppSquare/square_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b79e384d74e2a539201fda9783d60f28f9d65795
GIT binary patch
literal 2323
zcmV+u3GDWXP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000QuNkl<Zc-qyP
zTa1-g6~}*Tf8RMX!!3XXUfKwyP_V-Qno3h+c!BU@(g$mz7-`~z_e6|ZDNq=$lD-(D
zHPHtX8?C0*2NQh&`e04GP+AKE2!(LbHb$UQ<Tf+se0wkV4tpnG&dhfXbFj3mWaVVe
zWq<3x?rZJgPSBFgnhk7G!`((7-mc;~iy-9P0AY9+$yz2C1^Wh`)-Pu{9~jy$Zixrc
z|Fp{c8o-h$pmR7?Rw(?)gZabKE&8b=9)xw6_Y}ZV?+!}`RidDsNFy(H$_w5C-|G=-
z00Xyg3GxX9q8!;N3UD~Sl0Mt0l4WpchiHY81aN>wS#J$9fhXKB+%W)2_>b<^ycnVG
za*VU+6lnf=n>1Q{pDG{`#5!-iH;?R)%@1u>b8M$L#v$)=a(KJwZ2?&LluBQnnp$Qn
z%orY~SCpD-Vnoqv(Dc@6WQI$<hVy?Nl+jE(x~&3F`mD6i2lgKae3~8FDVDPETfOkx
zM7xTCgdU)`&Q#}E;ow2VgHWb9=s~F|)E!JwxTkO|xK{A+vdubodLJ18AdDr60BXPn
zfU@w*x5el7AOl-<+Tu+rT>(g@8`>sUM0g8Opopv`wm>t!Un^k2<p%waJ)@Z_+U~ik
ztoDjp4v=a@vk3shBYe<VmezCXx1EK&na^e!XMikeutlSZ6=*2TI(wb|OsGL62nXa2
zJ^`R$7Hv>D>SN7=nd=<$fVx^{0eCl)t^fp+`h$Z%o-?KdqM8I~ILl0h1ugHl0sv(I
zz$tQKkEr+kApHG6a;q5tS8SISczvsAIJn<yz+2*6mT@|Q0MIrdtW#zI8SQC0z_gqq
zXx>`plfZ$h(7R%n=I6dE+7*E0pJK@RH)>w8L=TX6u!ho^6yUmLo^#BPnpcubDz)Y)
zb%15Q@J%R<dcQNn1sZx7z?EZS`3`;CAG{Fg1!_?lj)~J{f7TR#)&gL3jJpZO<uT~9
z3Df~!Xw1+KaR4DxgkVD%h$h#f!DTU=M>(R769^+fAE4YCWl_NMUid|&>?SSdQESoI
zTXhByIz_99uaeHY&c}hxPFV$*3I|a!ybAnWl>^Zt8DMEo0u(rgqB}Z3T241cDW)n-
z0N)5|TLAroDz<@4T|%(HE>*r64_Ckiu4oS)29}EOqJtlcq8;MP#m`@J${SLhZjFP{
zKW&#r$2zdoYyRk<=p>;&e4L*G8%vs$_}#qBEsa_ReAWn?6b$KiV<~|vfagVMv;nKR
z;Zo`h+5)f^0cd3GL3tuRAdB3I3`uBZjR;=_8f~->%CDl!O{xffgEAWWtJE1(0`R_`
z9o;R?qx=lY*Gn1|Zk;6lMg<-hVU5DIk^(I0Tw$*heiGxwRahyj32%kwaQ;&&R8Ssr
zyibePSHKz0u@RsIK*tE#nNlWMXW;L^XerH#!f({^LxJR$I?nIwB3#r4Zvsrpp*%eK
z1fwJXC<36c7U++zlhZvV|9=2sRRk~vI3vPy>ewq#Ym=$6%y40L56AZJ5Ss*UXLcUh
zqvpm9_N%fI7zRwG?{)^4MWHRizW_yfS>YvhTohp{ppjcijPc(woGc2OM#i-eA{fut
z!@Q6K3=gBgV-@}=PH}loO&trJV^-C}1FLdX46_7Q0W0JCYXv?hhMrFKL6t%+7^zfZ
zAMkQtAFE@$b*9z6nYu8_L)I~~LI6o~fibL6WgRdd_z&<R@TK^92HjI~ZxO!c<M!Dw
z$>rm%L(0Lj>^qwMdxU;fW<ko?V};k72d`J<lO+rFpu7}g;Q>+s>p&G2w$Xi$itv0&
zw0Wz*L`tbkYTT#FJwT%(3po|k2pdq=04}9LpvS=l1J425Cy<t<qWEEi-QM@#38_D1
zPeTQr_Wk!GgWA(n?rl?54KQMqFGS%jV9L2)V2Ubx6@FcEHRaYxN#_dR_XX{j{Tpwl
zegM;MpdWF}LFlQhlyF0Y6$qd1FkjSFc@|-B1m_}mA{#kJ_*vbu0U*mzBAIprec^+)
zjoF<lbzp7uP1mOP$poBJb^*Ug8Z9-6MVVXN&;q;r7W4TVN+UF!hl8tk&=?=vqIE;1
z_9bSV2Z4_O(7F4}MKP-U0Qfd=5TH$ys3Pq1yxPa+rmM$pYCbfaZRY{MyOhv(UlD35
z<S06(Pfx{47(mGZrSqVlEHp`#S5OX#VG+U-QRXO22Snhq3PT2d=RM)|G+cQQ?v^%l
z#-w_VScmBN!sLB9Cq^uD$|-IFK{*M*sd5bEwVs@luMWypT4=!r75^Mbli@7^5F3FM
zIIFmEnzYOqP8}SSYhE+c>5g0qZlHIh;8C9zPlj20@n+3y1^^dlah=d&D{Yu-Jv0!S
zfV2pIdUD3u33R8@!5RfH8g@ZpCv<$L6wYCT@Lk^z%=Ja=z$Pg~87T>1!cHjchW=ZS
zEO(jqWQ}k!wdNfF+OQJ}yP>e13(K^yRO@QJJ}o2BJHYIy`7>cB6b{ZL3L^}mJPw$O
znE-)PCS$I%%udz3UBQZ$AUvyU3k=1(0Li!rG>qYF(0tg=g)N;34nTz814Ww@DpqOE
zo6J#xi$FcOWa1V}Xtc!r-V*b=29T&x&@dT?`+E5YK&=LGW9{PW-$d9CP*qt)kl#Kj
zc6yzoIh+ET(ei1ikrL;TMU{KQdOdXpT>&`0OEj$4M@G@KCoOI5lB4Z`Qm|KamY0XI
zhjz-jDLDso!zqEc4O|m$CJO_jB3u!;VBig7I55)SYU&KSx}izvTW?Czr9`+M3O6i1
zojwC>YS;5y0e~>11OE*C=vJ*?gIbm$roiRBG+x;##sBS&tP}chx7GhGm2lVPEBJjV
z>mmqRfn@Qow4}8b;@w)K@<Q?U0dywQ7X@^D(HbtHtWV8Ye5I<^q#?>=KmqCYGYNl3
z01QQ8MwRCA?eY!pa({8kR^UUO3SAna-WNCZnZbECGT!B0$TC(6d_{x<#$ZT--VGG)
t6b9lr8vfD4vv9Xj*!KBA%<jaq{s+CoDT<{Gk_!L;002ovPDHLkV1g51HxvK>

literal 0
HcmV?d00001