From 28f8385ac414ac3cb0df602ac3c1c727d58a6c4c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 31 May 2022 12:10:13 +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/AddReport.vue | 79 +++++++++++++++-----------
 src/saas/AppCountryAlbum/Watermark.vue |  4 +-
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index f27d1c0f..043bddda 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -2,18 +2,24 @@
   <div class="report">
     <components class="report-item" ref="reportItem" :config="currConfig" v-if="currConfig.length" :is="component"></components>
     <div class="report-list" data-html2canvas-ignore>
-      <div
-        class="report-item"
-        :key="index"
-        v-for="(item, index) in configList"
-        :class="[currIndex === index ? 'active' : '']"
-        @click="changeComponent(item, index)">
-        <image class="img" :src="item.thum" />
-        <image class="checked" v-if="currIndex === index" src="./images/xuanzhong.png" />
-        <span @click="toEdit">编辑</span>
+      <div class="report-btns">
+        <span @click="back">返回</span>
+        <h2>拼图模板</h2>
+        <span @click="save">保存</span>
+      </div>
+      <div class="report-wrapper">
+        <div
+          class="report-item"
+          :key="index"
+          v-for="(item, index) in configList"
+          :class="[currIndex === index ? 'active' : '']"
+          @click="changeComponent(item, index)">
+          <image class="img" :src="item.thum" />
+          <image class="checked" v-if="currIndex === index" src="./images/xuanzhong.png" />
+          <span @click="toEdit">编辑</span>
+        </div>
       </div>
     </div>
-    <div class="report-btn" data-html2canvas-ignore @click="save">完成</div>
   </div>
 </template>
 
@@ -66,6 +72,12 @@
         })
       },
 
+      back () {
+        uni.navigateBack({
+          delta: 1
+        })
+      },
+
       toEdit () {
         this.$refs.reportItem.linkTo()
       },
@@ -124,25 +136,25 @@
 <style lang="scss" scoped>
   .report {
     position: relative;
-    padding-bottom: 240px;
+    padding-bottom: 330px;
 
-    .report-btn {
-      position: fixed;
-      bottom: 272px;
-      left: 32px;
-      z-index: 11;
-      width: 144px;
-      height: 64px;
-      line-height: 64px;
-      text-align: center;
-      background: #FFFFFF;
-      font-size: 32px;
-      color: #408EF6;
-      box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.1);
-      border-radius: 40px;
+    .report-btns {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 96px;
+      padding: 0 32px;
 
-      &:active {
-        opacity: 0.7;
+      span {
+        color: #222222;
+        font-size: 32px;
+        font-weight: 600;
+      }
+
+      h2 {
+        color: #333333;
+        font-size: 28px;
+        font-weight: 600;
       }
     }
 
@@ -157,16 +169,19 @@
 
     .report-list {
       position: fixed;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
       left: 0;
       bottom: 0;
       width: 100%;
-      height: 240px;
-      padding: 0 24px;
+      padding-bottom: 16px;
       background: #FFFFFF;
 
+      .report-wrapper {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 24px;
+      }
+
       .report-item {
         position: relative;
         width: 176px;
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 1daa852f..1af2905c 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="photo" :class="[isHide ? 'home-active' : '']" :style="{height: height + 'px'}" @click="isHide = true">
+  <div class="photo" :class="[isHide ? 'home-active' : '']" :style="{height: height + 'px'}">
     <div class="photo-top" data-html2canvas-ignore>
       <div class="photo-top__middle" @click="isShowAlbum = true">
         <span>保存至：{{ albumName || '默认相册' }}</span>
@@ -19,7 +19,7 @@
     </div>
     <div class="photo-bottom" data-html2canvas-ignore>
       <div class="photo-bottom__top">
-        <span></span>
+        <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>