From 9e65e9bf767c7bc28ecbd5eda762ba66034b0689 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 31 May 2022 14:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/Watermark.vue        |  82 ++++++++++++++----
 .../images/shangchuan-black.png               | Bin 0 -> 458 bytes
 .../AppCountryAlbum/images/shuiyin-white.png  | Bin 0 -> 1029 bytes
 3 files changed, 63 insertions(+), 19 deletions(-)
 create mode 100644 src/saas/AppCountryAlbum/images/shangchuan-black.png
 create mode 100644 src/saas/AppCountryAlbum/images/shuiyin-white.png

diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 1af2905c..21e7d785 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -14,13 +14,12 @@
         :style="{left: x + 'px', top: y + 'px' }"
         @touchstart="onTouchstart"
         @touchmove="onTouchmove">
-        <component :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
+        <component ref="WatermarkItem" :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
       </div>
     </div>
     <div class="photo-bottom" data-html2canvas-ignore>
       <div class="photo-bottom__top">
         <span @click.stop="isHide = true">取消</span>
-        <!-- <image src="./images/clear.png" @click.stop="isHide = true, currIndex = -1" /> -->
         <h2>水印</h2>
         <span @click.stop="isHide = true">确定</span>
       </div>
@@ -41,23 +40,31 @@
           :key="item.id"
           @click.stop="currIndex = index">
           <image :src="item.thum" />
+          <span v-show="currIndex === index" @click.stop="toEdit">编辑</span>
           <image class="checked" v-if="currIndex === index" src="./images/xuanzhong.png" />
           <div class="water-item__bottom">{{ item.name }}</div>
         </div>
       </div>
     </div>
     <div class="photo-tabbar"  data-html2canvas-ignore>
-      <div class="item" @click.stop="back">
-        <image src="./images/fanhui.png" />
-        <div>返回</div>
-      </div>
-      <div class="item" @click.stop="isHide = false">
-        <image src="./images/shuiyin.png" />
-        <div>水印</div>
-      </div>
-      <div class="item" @click.stop="save">
-        <image src="./images/shangchuan.png" />
-        <div>上传</div>
+      <h2>编辑图片</h2>
+      <div class="tabbar-wrapper">
+        <div class="item" @click.stop="back">
+          <image src="./images/fanhui-black.png" />
+          <div>返回</div>
+        </div>
+        <div class="item" @click.stop="isHide = false">
+          <image src="./images/shuiyin-white.png" />
+          <div>水印</div>
+        </div>
+        <div class="item" @click.stop="isHide = false">
+          <image src="./images/jiancai.png" />
+          <div>剪裁</div>
+        </div>
+        <div class="item" @click.stop="save">
+          <image src="./images/shangchuan-black.png" />
+          <div>上传</div>
+        </div>
       </div>
     </div>
     <u-popup v-model="isShowAlbum" :closeable="false" border-radius="32" height="70%" mode="bottom">
@@ -210,6 +217,10 @@
         }
       },
 
+      toEdit () {
+        this.$refs.WatermarkItem.linkTo('./WatermarkConfig')
+      },
+
       save () {
         this.isHide = true
         this.$loading()
@@ -284,10 +295,11 @@
               this.$http.post('/api/appdvcpconfig/apiForward', `https://apis.map.qq.com/ws/geocoder/v1/?location=${lat},${lng}&key=3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY&get_poi=1`).then(res => {
                 if (res.code === 0) {
                   const data = res.data.result
+                  alert(JSON.stringify(data))
                   uni.setStorageSync('address', {
                     lat,
                     lng,
-                    address: data.title,
+                    address: data.address,
                     cityCode: `${data.ad_info.adcode}`
                   })
 
@@ -557,15 +569,31 @@
     }
 
     .photo-tabbar {
-      display: flex;
       position: fixed;
-      align-items: center;
       bottom: 0;
       left: 0;
       z-index: 10;
       width: 100%;
-      height: 160px;
-      background: #1E1E21;
+      padding-bottom: 40px;
+      background: #FFFFFF;
+      border-radius: 32px 32px 0px 0px;
+      border: 1px solid #DDDDDD;
+      overflow: hidden;
+
+      h2 {
+        width: 750px;
+        height: 96px;
+        line-height: 96px;
+        margin-bottom: 20px;
+        text-align: center;
+        color: #333333;
+        font-size: 28px;
+      }
+
+      & > div {
+        align-items: center;
+        display: flex;
+      }
 
       .item {
         flex: 1;
@@ -579,7 +607,7 @@
 
         div {
           font-size: 28px;
-          color: #fff;
+          color: #333;
         }
       }
     }
@@ -625,6 +653,22 @@
             height: 200px;
           }
 
+          span {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            z-index: 1;
+            width: 128px;
+            height: 56px;
+            line-height: 56px;
+            text-align: center;
+            background: rgba(0, 0, 0, 0.8);
+            border-radius: 8px;
+            color: #fff;
+            font-size: 32px;
+            transform: translate(-50%, -50%);
+          }
+
           &:first-child {
             flex-direction: column;
             background: #E4E7EB;
diff --git a/src/saas/AppCountryAlbum/images/shangchuan-black.png b/src/saas/AppCountryAlbum/images/shangchuan-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9a778a2d57e1e9b8aad2531f4665b40e6a08e38
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB7>k44ofy`glX(f`I0g8GxB_V)
zFg7;U*4Eb7*Ecma1+tBdj36YCVPaweWTOFy0*Ija&P*ww5uznQe!&b(tUTHV=7FK%
z^<9&e+_>}j(~sZ(_8Fb(2U;!a>Eaj?aro_x)9acQL|PMH$*vFmbN_#+^@cFRl}!_h
zt!`vzeEapN?MS1Sr;3oL!<N1`l8YZ#2?SqZOX}(t_m9~d@#xu6!L5wbjC+*y=CNHc
zJR-^%Ab5nIalxUZyb%Wi3d8H06Cdr{)1<g4^l!s=*WEiB%a1zevfmTl?3~HJ@8}u-
zHE*YHa9GNFWuNu+Ye8l!wygY{e>CbP!z!IG(uFKj8<@B>5(Iv%eewIx`-8VXGyPMr
zU|P9*I@9BqF8m_z5*WWM7nZ%St6BHLT)&V5Q+8MVWC>ZWe3HRN_UIo@o|8WVESZC&
zWA6DxZ4ow@9^T9wm#O!?!eq0xxjBFPVomn&e2u$&)+=|_?KyO8-)f<s;>r^}{^{yp
XIb|@lE%D%eP%L=5`njxgN@xNAm0q%a

literal 0
HcmV?d00001

diff --git a/src/saas/AppCountryAlbum/images/shuiyin-white.png b/src/saas/AppCountryAlbum/images/shuiyin-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c35ab52b7aa1752993ec02b5474e6ec559e9520
GIT binary patch
literal 1029
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB7>k44ofy`glX(eby9D@zxB>;?
zz`?;mTU%R2Ma9z6(%9G-$W~WZH#awjuz@6yZE9)?WB^G60|PTNGa%c@$jHRR1jsNn
zG=wvN3V>Xo8i*`V9LRtx21>!XKn7eRTo9rXNWvKqDYyv4B8VV_4VQvwfe6B-fGXiy
zfD8y5Za6XnVh$b>%_TsUky^%cfPt7@666=mz{teR!p6?Y#ly?TFC-!^At|e%sH~!{
zp{1j%Z(w3-VeR1L=I-Se7#bEH5g8Q|pO%@OS6o_ARa@8G+Bs>;)S0tp&sn@=#fnvH
z*KgRpXW!AI$Bv&kefHdiOE+)dd-&+dvsZ85efaX@$IoAXU8-BzfYJEF)5S3);_%xU
z>A{B_1lk-~k9z4WNU|02eiJAnDysaAk3(Y-qu_^s|I5t{gc3Z8+MnO}RQKqa+4-0o
zlkOVN<dHP`(w_R5IZ?Aabjs92jQ89ci#sIOtnPWCa3u1trO%Q%_q`5nZclkUgTGMB
zRG7QH#_*<A%Jt_vCnZP}zLwsloG_#0<vjk1%7Z?iw9*v$UFI4`J**AxxKgRXn!on1
z{jY~L9X2uob1trz)PE4)s20ciVQbizjtBh4ycc-p37URlest4!dQe_R!Phwt75`;S
z7I`!={4P(zo5ifZ4ER>$wHdl?acC)wC=EU|Lp$EQ_;2#$&8P3Zz5BrFeCMJC+qb41
zPSjb+v@lNdXSLSU>m6$!cI}$*Lg%Szh;gVwgjV-$E+<ie_gCvW1b%$`v?Gc^?U91#
zKhd@P5_7-z@Rw~rxiOBx?}W5((ag#f{1wY|L>FY<XQ)&EkhgM$W!M4!rT_UqT#B4>
zxa07A)|?W*d>K8h1APlK{vLSotng2$+FI=ci=7ni*6Z<|ZqPmY?Asj4f@K@(<W@+}
z*k>2<`HR_<hQ&o2XJnaQWX_+bR~8l!&a0novt(=dRgZ76jcyu^qViQvnRPE#M+*vN
zZc{olTlLvnna^#LE4|O`$xOEoGmx*j(Vupv-Tm8R-QSFJ{)#gG_U_T&k!F~3;==mN
Y)*WsuZy#{FpaROjp00i_>zopr0AZwfjQ{`u

literal 0
HcmV?d00001