From caf2d5f0dac77309c35eb17d8ea84d0750bdeab8 Mon Sep 17 00:00:00 2001
From: xiayt <x1027869635@gmail.com>
Date: Tue, 29 Nov 2022 13:56:24 +0800
Subject: [PATCH] feat:意见反馈修改

---
 src/views/GrowUp/MyAlbum.vue | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------
 src/views/Home/HomeYX.vue    |   4 ++--
 src/views/Home/MyCollect.vue |  14 ++++++++++----
 3 files changed, 133 insertions(+), 110 deletions(-)

diff --git a/src/views/GrowUp/MyAlbum.vue b/src/views/GrowUp/MyAlbum.vue
index cdcc9ca..323e875 100644
--- a/src/views/GrowUp/MyAlbum.vue
+++ b/src/views/GrowUp/MyAlbum.vue
@@ -2,10 +2,16 @@
   <div id="MyAlbum">
     <div class="photo_box">
       <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getUserAlbum">
-        <div class="day_box" v-for="(dayItem,dayIndex) in photoArr" :key="dayIndex">
-          <p class="day_time">{{dayItem.time}}</p>
-          <div class="item" v-for="(item,index) in dayItem.photos" :key="index" :style="'background-image:url('+item.img+')'" @click="handlePhoto(dayIndex,index)">
-            <div class="check_icon" :class="item.checked?'checked':''" v-if="controlStatus=='del'">
+        <div class="day_box" v-for="(dayItem, dayIndex) in photoArr" :key="dayIndex">
+          <p class="day_time">{{ dayItem.time }}</p>
+          <div
+            class="item"
+            v-for="(item, index) in dayItem.photos"
+            :key="index"
+            :style="'background-image:url(' + item.img + ')'"
+            @click="handlePhoto(dayIndex, index)"
+          >
+            <div class="check_icon" :class="item.checked ? 'checked' : ''" v-if="controlStatus == 'del'">
               <van-icon class="icon" name="success" />
             </div>
           </div>
@@ -13,22 +19,22 @@
       </van-list>
     </div>
     <div class="control_panel">
-      <p class="control_btn" @click="controlStatus='control'" v-if="controlStatus=='default'">管理相册({{spaceSize}}/2G)</p>
-      <div class="control_box" v-if="controlStatus=='control'">
+      <p class="control_btn" @click="controlStatus = 'control'" v-if="controlStatus == 'default'">管理相册({{ spaceSize }}/2G)</p>
+      <div class="control_box" v-if="controlStatus == 'control'">
         <van-uploader multiple :after-read="afterRead">
           <div class="btn add">
             <van-icon class="icon" name="add-o" />
             <p class="text">添加</p>
           </div>
         </van-uploader>
-        <div class="btn del" @click="controlStatus='del'">
+        <div class="btn del" @click="controlStatus = 'del'">
           <van-icon class="icon" name="delete-o" />
           <p class="text">删除</p>
         </div>
-        <van-button class="blue_btn" type="info" round color="#3074FF" @click="controlStatus='default'">完成</van-button>
+        <van-button class="blue_btn" type="info" round color="#3074FF" @click="controlStatus = 'default'">完成</van-button>
       </div>
-      <p class="cancel_btn" @click="controlStatus='control'" v-if="controlStatus=='del'">取消</p>
-      <p class="del_btn" @click="handleDel" v-if="controlStatus=='del'">删除相片</p>
+      <p class="cancel_btn" @click="controlStatus = 'control'" v-if="controlStatus == 'del'">取消</p>
+      <p class="del_btn" @click="handleDel" v-if="controlStatus == 'del'">删除相片</p>
     </div>
     <van-image-preview v-model="showPreview" :images="previewArr" :start-position="startPosition" @change="previewChange">
     </van-image-preview>
@@ -37,11 +43,11 @@
 <script>
 import Axios from 'axios'
 export default {
-  data () {
+  data() {
     return {
       userInfo: '',
-      photoArr: [],//照片数组
-      total: '',//照片总数
+      photoArr: [], //照片数组
+      total: '', //照片总数
       showPreview: false,
       startPosition: 0,
       previewIndex: 0,
@@ -50,16 +56,16 @@ export default {
       pageNum: 1,
       loading: false,
       finished: false,
-      controlStatus: 'default',//默认状态:default 管理状态:control 删除状态:del
-      delIds: [],//需要删除的图片id数组
-      uploadImgList: [],//上传图片数组
-      spaceSize:[],//用户空间
+      controlStatus: 'default', //默认状态:default 管理状态:control 删除状态:del
+      delIds: [], //需要删除的图片id数组
+      uploadImgList: [], //上传图片数组
+      spaceSize: [], //用户空间
     }
   },
-  mounted () {
-    var userInfo = localStorage.getItem('userInfo');
+  mounted() {
+    var userInfo = localStorage.getItem('userInfo')
     if (userInfo) {
-      this.userInfo = JSON.parse(userInfo);
+      this.userInfo = JSON.parse(userInfo)
     }
 
     // this.getUserAlbum()//获取当前用户相关的商户相册
@@ -67,50 +73,56 @@ export default {
   },
   methods: {
     //获取当前用户相关的商户相册
-    getUserAlbum () {
-      this.loading = true;
-      this.yxAxios.post(`${this.proxyUrl}/api/growth/photo/userAlbum`,{
-        "centerNo": this.userInfo.centerNo,
-        pageSize: this.pageSize,
-        pageNum: this.pageNum,
-      }).then((res) => {
-        console.log('相册详情:', res)
-        this.loading = false
-        if (res.data.code == 200) {
-          this.formatPhoto(res.data.rows)
-          this.total = res.data.total
-          if (this.pageSize * this.pageNum >= res.data.total) {
-            this.finished = true
+    getUserAlbum() {
+      this.loading = true
+      this.yxAxios
+        .post(`${this.proxyUrl}/api/growth/photo/userAlbum`, {
+          centerNo: this.userInfo.centerNo,
+          pageSize: this.pageSize,
+          pageNum: this.pageNum,
+        })
+        .then((res) => {
+          console.log('相册详情:', res)
+          this.loading = false
+          if (res.data.code == 200) {
+            this.formatPhoto(res.data.rows)
+            this.total = res.data.total
+            if (this.pageSize * this.pageNum >= res.data.total) {
+              this.finished = true
+            } else {
+              this.pageNum++
+            }
           } else {
-            this.pageNum++
+            // this.$toast(res.data.message);
+            console.log(res.data.message)
           }
-        } else {
-          this.$toast(res.data.message);
-        }
-      })
+        })
     },
     // 获取用户空间大小
-    getUserSpaceSize () {
-      this.yxAxios.post(`${this.proxyUrl}/api/growth/photo/getUserSpaceSize`,{
-        "centerNo": this.userInfo.centerNo,
-      }).then((res) => {
-        console.log('空间大小:', res)
-        if (res.data.code == 200) {
-          const sizeM = res.data.data/1024/1024;
-          if(sizeM/1024>1000){
-            this.spaceSize = (sizeM/1024).toFixed(2)+'G'
-          }else{
-            this.spaceSize = (sizeM).toFixed(2)+'M'
+    getUserSpaceSize() {
+      this.yxAxios
+        .post(`${this.proxyUrl}/api/growth/photo/getUserSpaceSize`, {
+          centerNo: this.userInfo.centerNo,
+        })
+        .then((res) => {
+          console.log('空间大小:', res)
+          if (res.data.code == 200) {
+            const sizeM = res.data.data / 1024 / 1024
+            if (sizeM / 1024 > 1000) {
+              this.spaceSize = (sizeM / 1024).toFixed(2) + 'G'
+            } else {
+              this.spaceSize = sizeM.toFixed(2) + 'M'
+            }
+            console.log(this.spaceSize)
+          } else {
+            // this.$toast(res.data.message);
+            console.log(res.data.message)
           }
-          console.log(this.spaceSize)
-        } else {
-          this.$toast(res.data.message);
-        }
-      })
+        })
     },
     // 处理照片数组
-    formatPhoto (data) {
-      let photoArr = this.photoArr;
+    formatPhoto(data) {
+      let photoArr = this.photoArr
       var weekArr = ['一', '二', '三', '四', '五', '六', '日']
       for (let i in data) {
         let week = this.Moment(data[i].createTime).isoWeekday()
@@ -119,14 +131,14 @@ export default {
         if (photoArr.length == 0) {
           photoArr.push({
             time: data[i].time,
-            photos: [data[i]]
+            photos: [data[i]],
           })
         } else if (photoArr[photoArr.length - 1].time == data[i].time) {
           photoArr[photoArr.length - 1].photos.push(data[i])
         } else {
           photoArr.push({
             time: data[i].time,
-            photos: [data[i]]
+            photos: [data[i]],
           })
         }
       }
@@ -134,11 +146,11 @@ export default {
       this.photoArr = photoArr
     },
     // 预览图切换
-    previewChange (index) {
+    previewChange(index) {
       this.previewIndex = index
     },
     // 点击照片
-    handlePhoto (dayIndex, index) {
+    handlePhoto(dayIndex, index) {
       // 先判断状态，删除操作时为选择图片，默认状态为预览图片操作,操作状态不触发事件
       if (this.controlStatus == 'del') {
         this.photoArr[dayIndex].photos[index].checked = !this.photoArr[dayIndex].photos[index].checked
@@ -150,14 +162,14 @@ export default {
         this.previewArr = previewArr
         this.startPosition = index
         this.previewIndex = index
-        this.showPreview = true;
+        this.showPreview = true
       }
     },
 
     // 点击删除照片
-    handleDel () {
+    handleDel() {
       // 计算需要删除的图片
-      let delIds = [];
+      let delIds = []
       for (let i in this.photoArr) {
         for (let j in this.photoArr[i].photos) {
           if (this.photoArr[i].photos[j].checked) {
@@ -169,67 +181,68 @@ export default {
       if (this.delIds.length == 0) {
         this.$toast('请至少选择一张照片')
       } else {
-        this.$dialog.confirm({
-          title: '警告',
-          message: '确认删除照片？',
-        })
+        this.$dialog
+          .confirm({
+            title: '警告',
+            message: '确认删除照片？',
+          })
           .then(() => {
             this.delPhotoByIds()
           })
           .catch(() => {
             // on cancel
-          });
+          })
       }
     },
     // 删除照片操作
-    delPhotoByIds () {
+    delPhotoByIds() {
       this.$toast.loading({
         message: '正在删除...',
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
       this.http.removePersonPhoto(this.delIds.join(',')).then((res) => {
         this.$toast.clear()
         if (res.code == 200) {
-          this.$toast('删除成功');
-          this.controlStatus = 'control';
-          this.pageReload()//删除成功后页面重新加载
+          this.$toast('删除成功')
+          this.controlStatus = 'control'
+          this.pageReload() //删除成功后页面重新加载
         } else {
-          this.$toast(res.message);
+          this.$toast(res.message)
         }
       })
     },
     // 页面数据重新加载
-    pageReload () {
-      this.pageNum = 1;
-      this.finished = false;
-      this.photoArr = [];
+    pageReload() {
+      this.pageNum = 1
+      this.finished = false
+      this.photoArr = []
       this.getUserAlbum()
       this.getUserSpaceSize()
     },
     // 读取到文件后
-    afterRead (file) {
+    afterRead(file) {
       if (Array.isArray(file)) {
         this.fileUpload(file, 0)
       } else {
         this.fileUpload([file], 0)
-
       }
     },
     // 上传照片到文件服务器
-    fileUpload (files, index) {
+    fileUpload(files, index) {
       this.$toast.loading({
         message: `上传中 ${index + 1}/${files.length}...`,
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
       let size = files[index].file.size
       let params = new FormData()
       params.append('file', files[index].file, files[index].file.name)
       let config = {
-        headers: { //添加请求头
-          'Content-Type': 'multipart/form-data'
-        }
+        headers: {
+          //添加请求头
+          'Content-Type': 'multipart/form-data',
+        },
       }
       Axios.post('https://market.myjxt.com:51311/file/fileUpload', params, config).then((res) => {
         this.$toast.clear()
@@ -247,27 +260,29 @@ export default {
       })
     },
     // 上传照片
-    uploadUserAlbum () {
+    uploadUserAlbum() {
       this.$toast.loading({
         message: `同步照片到我的相册...`,
         duration: 0,
-        forbidClick: true
+        forbidClick: true,
       })
-      this.http.uploadUserAlbum({
-        "centerNo": this.userInfo.centerNo,
-        "imgList": this.uploadImgList
-      }).then((res) => {
-        this.$toast.clear()
-        if (res.code == 200) {
-          this.$toast('同步完成');
-          this.uploadImgList = [];
-          this.pageReload()//上传完成后页面重新加载
-        } else {
-          this.$toast(res.message);
-        }
-      })
-    }
-  }
+      this.http
+        .uploadUserAlbum({
+          centerNo: this.userInfo.centerNo,
+          imgList: this.uploadImgList,
+        })
+        .then((res) => {
+          this.$toast.clear()
+          if (res.code == 200) {
+            this.$toast('同步完成')
+            this.uploadImgList = []
+            this.pageReload() //上传完成后页面重新加载
+          } else {
+            this.$toast(res.message)
+          }
+        })
+    },
+  },
 }
 </script>
 <style lang="scss">
@@ -394,7 +409,9 @@ export default {
 <style lang="scss">
 // 长辈版
 .elder {
-  #MyAlbum .control_panel .control_btn, #MyAlbum .control_panel .cancel_btn, #MyAlbum .control_panel .del_btn{
+  #MyAlbum .control_panel .control_btn,
+  #MyAlbum .control_panel .cancel_btn,
+  #MyAlbum .control_panel .del_btn {
     font-size: 36px;
   }
 }
diff --git a/src/views/Home/HomeYX.vue b/src/views/Home/HomeYX.vue
index 4feddd6..719464f 100644
--- a/src/views/Home/HomeYX.vue
+++ b/src/views/Home/HomeYX.vue
@@ -45,13 +45,13 @@
         </div>
         <van-icon name="arrow" />
       </div>
-      <div class="item" @click="handleClearCache">
+      <!-- <div class="item" @click="handleClearCache">
         <div class="left">
           <van-icon class="icon" name="user-circle-o" />
           <span>清除缓存</span>
         </div>
         <van-icon name="arrow" />
-      </div>
+      </div> -->
       <div class="item" @click="handelElder">
         <div class="left">
           <van-icon class="icon" name="friends-o" />
diff --git a/src/views/Home/MyCollect.vue b/src/views/Home/MyCollect.vue
index de8afe0..e23f308 100644
--- a/src/views/Home/MyCollect.vue
+++ b/src/views/Home/MyCollect.vue
@@ -39,7 +39,8 @@ export default {
           if (res.data.code == 200) {
             this.CollectList = res.data.rows
           } else {
-            this.$toast.fail(res.data.message)
+            console.log(res.data.message)
+            // this.$toast.fail(res.data.message)
           }
         })
     },
@@ -62,7 +63,10 @@ export default {
       }
     },
     handleCourse(item) {
-      this.$router.push({ name: 'ServiceAbroadDetail', query: { courseId: item.productId, publicName: localStorage.getItem('publicName') } })
+      this.$router.push({
+        name: 'ServiceAbroadDetail',
+        query: { courseId: item.productId, publicName: localStorage.getItem('publicName') },
+      })
     },
     // 点击按钮取消收藏
     deleteCollect(index) {
@@ -87,7 +91,8 @@ export default {
             this.$toast('取消收藏成功')
             this.getMyCollect()
           } else {
-            this.$toast.fail(res.data.message)
+            console.log(res.data.message)
+            // this.$toast.fail(res.data.message)
           }
         })
     },
@@ -147,7 +152,8 @@ export default {
 <style lang="scss">
 // 长辈版
 .elder {
-  #MyCollect .collect_item .right .course_name,#MyCollect .collect_item .right .course_price{
+  #MyCollect .collect_item .right .course_name,
+  #MyCollect .collect_item .right .course_price {
     font-size: 36px;
   }
 }
--
libgit2 0.21.0