日报分享

src/components/share.vue

@@ -60,25 +60,32 @@
           <div :class="['text']">{{ filterText(index) }}</div>
           <div class="content">{{ item.dayContent }}</div>
         </template> -->
-        <div :class="['text']">今日机会与挑战总结</div>
-        <div class="content">
-          {{ reportTarget.reportContents.length ? reportTarget.reportContents[0].dayContent : '' }}
-        </div>
-        <div :class="['text']">明日工作计划</div>
-        <div class="content">
-          {{ reportTarget.reportContents.length ? reportTarget.reportContents[1].dayContent : '' }}
-        </div>
-        <div class="text">今日拜访照片</div>
-        <div class="content-photos">
-          <template v-for="item in photosData">
-            <img
-              :src="'data:image/jpg;base64,' + item"
-              crossorigin="anonymous"
-              referrerpolicy="no-referrer"
-              alt=""
-              style="display: block" />
-          </template>
-          <!-- <template v-for="item in urlList">
+        <template v-if="checkedPlan">
+          <div :class="['text']">今日机会与挑战总结</div>
+          <div class="content">
+            {{
+              reportTarget.reportContents.length ? reportTarget.reportContents[0].dayContent : ''
+            }}
+          </div>
+          <div :class="['text']">明日工作计划</div>
+          <div class="content">
+            {{
+              reportTarget.reportContents.length ? reportTarget.reportContents[1].dayContent : ''
+            }}
+          </div>
+        </template>
+        <template v-if="photosData && photosData.length">
+          <div class="text">今日拜访照片</div>
+          <div class="content-photos">
+            <template v-for="item in photosData">
+              <img
+                :src="'data:image/jpg;base64,' + item"
+                crossorigin="anonymous"
+                referrerpolicy="no-referrer"
+                alt=""
+                style="display: block" />
+            </template>
+            <!-- <template v-for="item in urlList">
             <img
               :src="item + '&' + new Date().getTime()"
               crossOrigin="anonymous"
@@ -86,7 +93,8 @@
               alt=""
               style="display: block" />
           </template> -->
-        </div>
+          </div>
+        </template>
       </div>
       <div class="footerShare">
         <div class="right-text">
@@ -153,6 +161,11 @@ export default {
         return [];
       },
     },
+    // 是否显示 今日总结&明日规划
+    checkedPlan: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -324,6 +337,7 @@ export default {
     background-size: cover;
     background-attachment: local;
     width: 100%;
+    min-height: 100%;
     padding: vw(30);
     position: absolute;
     padding-bottom: vw(190);
@@ -449,6 +463,7 @@ export default {
   }
 
   .footerShare {
+    // position: absolute;
     display: flex;
     // align-items: center;
     justify-content: flex-end;

src/views/week/daily.vue

@@ -749,17 +749,17 @@ export default {
             if (res.code == 200) {
               this.$dialog
                 .alert({
-                  title: '系统提示',
-                  message: '提交成功',
+                  message: '已提交，是否分享',
                   showCancelButton: true,
                   confirmButtonText: '分享',
-                  cancelButtonText: '关闭',
+                  cancelButtonText: '返回首页',
+                  className: 'dailyShareBtn',
                 })
                 .then(() => {
                   // 跳转历史汇报详情 分享汇报
                   this.$router.replace({
                     path: 'dailyDetails',
-                    query: { reportId: res.id, source: 'daily' },
+                    query: { reportId: res.data, source: 'daily' },
                   });
                 })
                 .catch(() => {
@@ -885,7 +885,7 @@ export default {
   border-radius: 2px;
 }
 </style>
-<style>
+<style lang="scss">
 .linepAdd .van-cell__title {
   color: #1e5398;
   font-weight: 500;
@@ -920,4 +920,14 @@ export default {
 .linepAdd .contentContainer .contentContainerTitle .colorRed {
   color: red;
 }
+.dailyShareBtn {
+  .van-dialog__confirm {
+    border: 1px solid #ccc;
+    border-bottom: none;
+  }
+  .van-hairline--left {
+    background: #0057ba;
+    color: #fff;
+  }
+}
 </style>

src/views/week/dailyDetails.vue

@@ -500,7 +500,8 @@
       @setShareImg="setShareImg"
       @setDailyDetailsBox="setDailyDetailsBox"
       :urlList="urlList"
-      :reportRemarksIndex="reportRemarksIndex"></share>
+      :reportRemarksIndex="reportRemarksIndex"
+      :checkedPlan="checkedPlan"></share>
     <!--分享图片列表 -->
     <el-dialog
       title="选择分享的图片"
@@ -514,7 +515,7 @@
         <div v-for="(item, index) in reportTarget.photos" :key="index">
           <p style="margin-bottom: 10px; margin-top: 0; display: flex">
             今日总结&明日规划<van-checkbox
-              v-model="checked"
+              v-model="checkedPlan"
               style="margin-left: 10px"></van-checkbox>
           </p>
           <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
@@ -633,7 +634,7 @@ export default {
       urlList: [],
       setDailyDetailsBoxFlag: true,
       source: '',
-      checked: true, //今日总结&明日规划
+      checkedPlan: true, //今日总结&明日规划
       //
     };
   },
@@ -685,12 +686,16 @@ export default {
     },
     // 确认分享
     confirmShare() {
-      this.shareImgFlag = false;
       this.reportTarget.photos.forEach((item) => {
         item.photos.forEach((val) => {
           if (val.checked) this.urlList.push(val.fileUrl);
         });
       });
+      if (this.urlList.length == 0 && !this.checkedPlan) {
+        this.$notify({ type: 'warning', message: '请选择分享内容！', className: 'notifyIndex' });
+        return;
+      }
+      this.shareImgFlag = false;
       this.setShareFlag = true;
     },
     pviewFn(val, imgVal) {
@@ -759,7 +764,9 @@ export default {
         }
         this.imgList = imgList;
         if (this.source == 'daily') {
-          this.clickShareFlag(-1);
+          this.$nextTick(() => {
+            this.clickShareFlag(-1);
+          });
         }
       });
     },
@@ -978,4 +985,7 @@ export default {
     }
   }
 }
+.notifyIndex {
+  z-index: 999999 !important;
+}
 </style>