diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index 3fe1934d..9997a9ca 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -146,9 +146,9 @@
       },
 
       getList () {
-        this.$http.post(`/api/appalbumphoto/list`).then(res => {
+        this.$http.post(`/api/appalbumphoto/DetailByAlbumID?albumId=${this.id}`).then(res => {
           if (res.code === 0) {
-            this.list = res.data.records
+            this.list = res.data
           }
         })
       }
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index ae9ec656..8614eec3 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -30,7 +30,6 @@
         </div>
       </div>
     </div>
-    <image class="newImg" @click="waterSrc = ''" :src="waterSrc" v-if="waterSrc" />
     <div class="photo-tabbar"  data-html2canvas-ignore>
       <div class="item" @click="back">
         <image src="./images/fanhui.png" />
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
index af612597..27561539 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
@@ -65,7 +65,6 @@
           if (v.length) {
             const weather = v.filter(v => v.type === '2')[0]
             const remark = v.filter(v => v.type === '4')[0]
-            console.log(v)
             this.isShowWeather = weather.status === '1'
             this.isShowRemark = remark.status === '1'
             this.remark = remark.defaultValue || ''
@@ -89,9 +88,7 @@
       this.getLocation()
 
       uni.$on('change', e => {
-        this.configList = [
-          ...e
-        ]
+        this.configList = e
       })
     },
 
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue
index b61daa44..b6e80251 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue
@@ -1,30 +1,42 @@
 <template>
   <div class="Watermark3" @click="linkTo('./WatermarkConfig')">
     <div class="top">
-      <h2>巡查</h2>
-      <span>陶白白</span>
+      <h2 v-if="isShowTitle">{{ title }}</h2>
+      <span v-if="isShowName">{{ name }}</span>
     </div>
     <div class="middle">
-      <h2>{{ time }}</h2>
-      <span>晴 7℃</span>
+      <h2 v-if="isShowTime">{{ time }}</h2>
+      <span v-if="isShowWeather">{{ weather }}</span>
     </div>
-    <p>{{ date }} {{ weekCn }}</p>
-    <div class="text">
-      <span>铁路巡检</span>
+    <p v-if="isShowDate">{{ date }} {{ weekCn }}</p>
+    <div class="text" v-if="isShowMatters">
+      <span>{{ matters }}</span>
       <image src="./../../images/quotes.png" />
     </div>
   </div>
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
         week: '',
-        timer: null
+        timer: null,
+        name: '',
+        weather: '晴转多云',
+        title: '巡检水印',
+        configList: [],
+        matters: '',
+        isShowWeather: false,
+        isShowDate: false,
+        isShowTitle: false,
+        isShowTime: false,
+        isShowName: false,
+        isShowMatters: false
       }
     },
 
@@ -54,7 +66,33 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const weather = v.filter(v => v.type === '2')[0]
+            const date = v.filter(v => v.type === '1')[0]
+            const time = v.filter(v => v.type === '0')[0]
+            const title = v.filter(v => v.type === '5')[0]
+            const name = v.filter(v => v.type === '6')[0]
+            const matters = v.filter(v => v.type === '7')[0]
+            this.isShowWeather = weather.status === '1'
+            this.isShowDate = date.status === '1'
+            this.isShowTitle = title.status === '1'
+            this.isShowTime = time.status === '1'
+            this.isShowName = name.status === '1'
+            this.isShowMatters = matters.status === '1'
+            this.title = title.defaultValue || ''
+            this.name = name.defaultValue || ''
+            this.matters = matters.defaultValue || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -63,6 +101,10 @@
         this.time = this.$dayjs().format('HH:mm')
         this.week = new Date().getDay()
       }, 1000)
+
+      uni.$on('change', e => {
+        this.configList = e
+      })
     },
 
     destroyed () {
@@ -70,9 +112,8 @@
     },
 
     methods: {
-      ...mapActions(['injectJWeixin']),
-
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
@@ -139,12 +180,12 @@
       border-bottom: 4px solid #FFE97A;
 
       h2 {
-        width: 100px;
         height: 56px;
         line-height: 56px;
+        padding: 0 6px;
         text-align: center;
         color: #498abe;
-        font-size: 32px;
+        font-size: 30px;
         border-radius: 6px 6px 0 0;
         background: #FFE97A;
       }
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue
index e2b8514b..ace085fc 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue
@@ -6,23 +6,30 @@
       </div>
       <div class="right">
         <h2>{{ date }} </h2>
-        <p>{{ weekCn }} 晴 7℃</p>
+        <p>{{ weekCn }}</p>
       </div>
     </div>
-    <p>武汉市·绿地蓝海国际A座</p>
-    <div class="text">#这是一条备注信息</div>
+    <p>{{ address }}</p>
+    <div class="text" v-if="isShowRemark">{{ remark }}</div>
   </div>
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
+  import { mapActions } from 'vuex'
+
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
         week: '',
-        timer: null
+        timer: null,
+        address: '武汉市·绿地蓝海A座',
+        remark: '',
+        configList: [],
+        isShowRemark: false
       }
     },
 
@@ -52,7 +59,21 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const remark = v.filter(v => v.type === '4')[0]
+            this.isShowRemark = remark.status === '1'
+            this.remark = remark.defaultValue || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -61,6 +82,10 @@
         this.time = this.$dayjs().format('HH:mm')
         this.week = new Date().getDay()
       }, 1000)
+
+      uni.$on('change', e => {
+        this.configList = e
+      })
     },
 
     destroyed () {
@@ -71,6 +96,7 @@
       ...mapActions(['injectJWeixin']),
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue
index 9d748119..df63ad3e 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue
@@ -1,37 +1,86 @@
 <template>
   <div class="Watermark6" @click="linkTo('./WatermarkConfig')">
     <div class="title">
-      <h2>我是标题</h2>
+      <h2>{{ title }}</h2>
     </div>
     <div class="info">
       <div class="info-item">
         <label>时间：</label>
-        <span>{{ date }}</span>
+        <span>{{ date }} {{ weekCn}} {{ time }}</span>
       </div>
       <div class="info-item">
         <label>地点：</label>
-        <span>武汉市·绿地蓝海A座</span>
+        <span>{{ address }}</span>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
+  import { mapActions } from 'vuex'
+
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
-        timer: null
+        timer: null,
+        week: '',
+        title: '定格在这一刻',
+        address: '武汉市·绿地蓝海A座',
       }
     },
 
+    computed: {
+      weekCn() {
+        if (this.week === 1) {
+          return '星期一'
+        }
+        if (this.week === 2) {
+          return '星期二'
+        }
+        if (this.week === 3) {
+          return '星期三'
+        }
+        if (this.week === 4) {
+          return '星期四'
+        }
+        if (this.week === 5) {
+          return '星期五'
+        }
+
+        if (this.week === 6) {
+          return '星期六'
+        }
+
+        return '星期天'
+      }
+    },
+
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
-      this.date = this.$dayjs().format('YYYY-MM-DD HH:mm')
+      this.configList = JSON.parse(JSON.stringify(this.config))
+      this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
+      this.time = this.$dayjs().format('HH:mm')
+      this.week = new Date().getDay()
 
       this.timer = setInterval(() => {
-        this.date = this.$dayjs().format('YYYY-MM-DD HH:mm')
+        this.time = this.$dayjs().format('HH:mm')
       }, 1000)
+
+      uni.$on('change', e => {
+        this.configList = e
+      })
     },
 
     destroyed () {
@@ -42,6 +91,7 @@
       ...mapActions(['injectJWeixin']),
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
@@ -52,7 +102,7 @@
 
 <style lang="scss" scoped>
   .Watermark6 {
-    width: 440px;
+    width: 450px;
     box-sizing: border-box;
 
     h2 {
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue
index cb3c8ef7..b40585e3 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue
@@ -2,23 +2,15 @@
   <div class="Watermark4" @click="linkTo('./WatermarkConfig')">
     <div class="top">
       <image src="./../../images/fangyishuiyin.png" />
-      <h2>日常消杀</h2>
+      <h2>{{ title }}</h2>
     </div>
     <div class="Watermark4-body">
-      <h2>{{ time }}</h2>
-      <p>{{ date }} {{ weekCn }}</p>
+      <h2 v-if="isShowTime">{{ time }}</h2>
+      <p v-if="isShowDate">{{ date }} {{ weekCn }}</p>
       <div class="info">
-        <div class="info-item">
+        <div class="info-item" v-if="isShowAddress">
           <label>地点：</label>
-          <span>武汉市·绿地蓝海A座</span>
-        </div>
-        <div class="info-item">
-          <label>人员：</label>
-          <span>陶白白</span>
-        </div>
-        <div class="info-item">
-          <label>备注：</label>
-          <span>这是一条很长的备注信息</span>
+          <span>{{ address }}</span>
         </div>
       </div>
     </div>
@@ -26,14 +18,22 @@
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
+  import { mapActions } from 'vuex'
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
         week: '',
-        timer: null
+        timer: null,
+        title: '日常消杀',
+        address: '武汉市·绿地蓝海国际A座',
+        configList: [],
+        isShowAddress: true,
+        isShowDate: true,
+        isShowTime: true
       }
     },
 
@@ -63,7 +63,26 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const title = v.filter(v => v.type === '3')[0]
+            const address = v.filter(v => v.type === '4')[0]
+            const date = v.filter(v => v.type === '4')[0]
+            const time = v.filter(v => v.type === '4')[0]
+            this.isShowAddress = address.status === '1'
+            this.isShowDate = date.status === '1'
+            this.isShowTime = time.status === '1'
+            this.title = title.title || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -72,6 +91,10 @@
         this.time = this.$dayjs().format('HH:mm')
         this.week = new Date().getDay()
       }, 1000)
+
+      uni.$on('change', e => {
+        this.configList = e
+      })
     },
 
     destroyed () {
@@ -82,6 +105,7 @@
       ...mapActions(['injectJWeixin']),
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue
index 945b4bb9..e15f44bb 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue
@@ -1,33 +1,33 @@
 <template>
   <div class="Watermark5" @click="linkTo('./WatermarkConfig')">
     <div class="top">
-      <h2>走访慰问</h2>
+      <h2>{{ title }}</h2>
       <div class="right">
-        <h2>{{ time }}</h2>
-        <p>{{ date }}</p>
+        <h2 v-if="isShowTime">{{ time }}</h2>
+        <p v-if="isShowDate">{{ date }}</p>
       </div>
     </div>
     <div class="info">
       <div class="info-item">
-        <label>人员：</label>
-        <span>陶白白</span>
+        <label>网格员：</label>
+        <span>{{ gridUserName }}</span>
       </div>
-      <div class="info-item">
+      <div class="info-item" v-if="isShowGridName">
         <label>网格：</label>
-        <span>迁延街第一网格</span>
+        <span>{{ gridName }}</span>
       </div>
-      <div class="info-item">
+      <div class="info-item" v-if="isShowAddress">
         <label>地点：</label>
-        <span>武汉市·绿地蓝海A座</span>
+        <span>{{ address }}</span>
       </div>
-      <div class="info-item">
+      <div class="info-item" v-if="isServiceName">
         <label>服务对象：</label>
-        <span>王一一</span>
+        <span>{{ serviceName }}</span>
       </div>
     </div>
-    <div class="bottom">
+    <div class="bottom" v-if="isShowText">
       <span>工作纪实</span>
-      <i>网格员工作纪实</i>
+      <i>{{ text }}</i>
     </div>
     <div class="line"></div>
   </div>
@@ -36,12 +36,26 @@
 <script>
   import {mapActions} from 'vuex'
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
         week: '',
-        timer: null
+        address: '',
+        title: '',
+        timer: null,
+        gridUserName: '',
+        gridName: '',
+        isShowAddress: true,
+        isShowDate: true,
+        isShowTime: true,
+        isShowGridName: true,
+        serviceName: '',
+        isServiceName: false,
+        text: '',
+        isShowText: '',
       }
     },
 
@@ -71,7 +85,38 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const address = v.filter(v => v.type === '3')[0]
+            const date = v.filter(v => v.type === '1')[0]
+            const time = v.filter(v => v.type === '0')[0]
+            const gridUserName = v.filter(v => v.type === '9')[0]
+            const gridName = v.filter(v => v.type === '10')[0]
+            const title = v.filter(v => v.type === '8')[0]
+            const serviceName = v.filter(v => v.type === '11')[0]
+            const text = v.filter(v => v.type === '12')[0]
+            this.isShowAddress = address.status === '1'
+            this.isShowDate = date.status === '1'
+            this.isShowGridName = gridName.status === '1'
+            this.isServiceName = serviceName.status === '1'
+            this.isShowText = text.status === '1'
+            this.isShowDate = date.status === '1'
+            this.isShowTime = time.status === '1'
+            this.title = title.defaultValue || ''
+            this.gridUserName = gridUserName.defaultValue || ''
+            this.gridName = gridName.defaultValue || ''
+            this.serviceName = serviceName.defaultValue || ''
+            this.text = text.defaultValue || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -80,6 +125,10 @@
         this.time = this.$dayjs().format('HH:mm')
         this.week = new Date().getDay()
       }, 1000)
+
+      uni.$on('change', e => {
+        this.configList = e
+      })
     },
 
     destroyed () {
@@ -90,6 +139,7 @@
       ...mapActions(['injectJWeixin']),
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue
index 9f9e8318..2918ccd4 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue
@@ -1,27 +1,34 @@
 <template>
   <div class="Watermark7" @click="linkTo('./WatermarkConfig')">
     <image src="../../images/hjws.png" />
-    <h2>整好环境卫生</h2>
+    <h2>{{ title }}</h2>
     <div class="middle">
       <div class="top">
         <h2>{{ time }}</h2>
-        <span>多云 7℃</span>
+        <span>{{ weather }}</span>
       </div>
       <div class="bottom">{{ date }} {{ weekCn }}</div>
     </div>
-    <div class="bottom">武汉市·绿地蓝海A座</div>
+    <div class="bottom" v-if="isShowAddress">{{ address }}</div>
   </div>
 </template>
 
 <script>
   import {mapActions} from 'vuex'
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
+        title: '',
         week: '',
-        timer: null
+        weather: '晴转多云',
+        address: '武汉市·绿地蓝海国际A座',
+        timer: null,
+        isShowAddress: true,
+        configList: []
       }
     },
 
@@ -51,7 +58,23 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const address = v.filter(v => v.type === '3')[0]
+            const title = v.filter(v => v.type === '5')[0]
+            console.log(address)
+            this.isShowAddress = address.status === '1'
+            this.title = title.defaultValue || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -61,6 +84,10 @@
         this.week = new Date().getDay()
       }, 1000)
 
+      uni.$on('change', e => {
+        this.configList = e
+      })
+
       this.injectJWeixin(['getLocation']).then(res => {
         console.log(res)
         wx.getLocation({
@@ -97,6 +124,7 @@
       },
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue
index d5997f4e..2013ee1e 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="Watermark8" @click="linkTo('./WatermarkConfig')">
+  <div class="Watermark8">
     <h2>{{ date }}</h2>
     <div>{{ day }}</div>
     <p>{{ lunar }} {{ weekCn }}</p>