Merge branch 'master' of http://8.210.64.198:30000/sunran/asd-mobild

src/views/weibao/api/index.js

@@ -122,12 +122,19 @@ export function pageAppProject(data) {
     })
 }
 // 上传图片
-export function uploadImage(data) {
+export function uploadImage(data, callback) {
     return request({
         url: '/pmadmin/app/image/uploadImage',
         method: 'post',
         data,
-        type: 'formData'
+        type: 'formData',
+        onUploadProgress: function (progressEvent) { //原生获取上传进度的事件
+            if (progressEvent.lengthComputable) {
+                //属性lengthComputable主要表明总共需要完成的工作量和已经完成的工作是否可以被测量
+                //如果lengthComputable为false，就获取不到progressEvent.total和progressEvent.loaded
+                callback(progressEvent);
+            }
+        }
     })
 }
 // 创建服务项目

src/views/weibao/components/vanUploader.vue

@@ -42,6 +42,7 @@ export default {
       multiMediaUrl: [],
       imgUrl: [],
       fileList: [],
+      progress: '',
     }
   },
   watch: {
@@ -58,10 +59,12 @@ export default {
       this.multiMediaUrl = []
     },
     beforeRead2(file) {
+      console.log(file.size > 50 * 1024 * 1024)
       if (file.size > 50 * 1024 * 1024) {
         this.$toast('视频不能超过50MB')
         return
       }
+      return true
     },
     // 返回布尔值
     beforeRead(file) {
@@ -129,7 +132,10 @@ export default {
     },
     async uploading(formDate, file) {
       console.log(formDate, 'formDate')
-      var res = await uploadImage(formDate)
+      var res = await uploadImage(formDate, function (e) {
+        var progress = Math.floor((e.loaded / e.total) * 100) + '%'
+        file.message = '上传中' + progress
+      })
       if (res.code == '0000') {
         file.status = 'success'
         file.message = '成功'

src/views/weibao/views/consultation/details.vue

@@ -46,7 +46,7 @@
         <div>
           <p>照片：</p>
           <div class="boximg">
-            <div v-for="(item,index) in pics" :key="index">
+            <div v-for="(item,index) in picsArr" :key="index">
               <van-image fit="contain" lazy-load :src="item" alt="" @click="showPopup" />
             </div>
           </div>
@@ -81,7 +81,9 @@ export default {
       id: '',
       orgform: {},
       pics: [],
+      picsArr: [],
       videos: [],
+      videourl: '',
     }
   },
   created() {
@@ -96,6 +98,11 @@ export default {
       const res = await consultationDetail({ id: this.id })
       this.form = res.data
       this.pics = res.data.pics.split(',')
+      this.pics.forEach((item) => {
+        if (item.indexOf('.jpg') || item.indexOf('.png')) {
+          this.picsArr.push(item.replace('/cgpimage/', '/cgpimage/240x240/'))
+        }
+      })
       if (!res.data.videos) return
       this.videos = res.data.videos.split(',')
     },

src/views/weibao/views/followUp/details.vue

@@ -41,7 +41,7 @@
       <div>
         <p>照片：</p>
         <div class="boximg">
-          <div v-for="(item,index) in pics" :key="index">
+          <div v-for="(item,index) in picsArr" :key="index">
             <van-image lazy-load fit="contain" :src="item" alt="" @click="showPopup" />
           </div>
         </div>
@@ -75,6 +75,7 @@ export default {
       dataList: '',
       appendFile: '',
       pics: [],
+      picsArr: [],
       videos: [],
     }
   },
@@ -87,6 +88,12 @@ export default {
       const res = await followUpHistoryDetail({ id: this.id })
       this.dataList = res.data
       this.pics = res.data.pics.split(',')
+      this.pics.forEach((item) => {
+        console.log(item)
+        if (item.indexOf('.jpg') || item.indexOf('.png')) {
+          this.picsArr.push(item.replace('/cgpimage/', '/cgpimage/240x240/'))
+        }
+      })
       if (!res.data.videos) return
       this.videos = res.data.videos.split(',')
     },

src/views/weibao/views/loveHelp/details.vue

@@ -93,7 +93,7 @@
           <div>
             <p>照片：</p>
             <div class="boximg">
-              <div v-for="(item,index) in pics" :key="index">
+              <div v-for="(item,index) in picsArr" :key="index">
                 <van-image lazy-load fit="contain" :src="item" alt="" @click="showPopup" />
               </div>
             </div>
@@ -155,7 +155,9 @@ export default {
       id: '',
       orgId: '',
       pics: [],
+      picsArr: [],
       videos: [],
+      videourl: '',
     }
   },
   created() {
@@ -197,6 +199,12 @@ export default {
       const res = await lovingHelpDetail({ id: this.id })
       this.form = res.data
       this.pics = res.data.pics.split(',')
+      this.pics.forEach((item) => {
+        console.log(item)
+        if (item.indexOf('.jpg') || item.indexOf('.png')) {
+          this.picsArr.push(item.replace('/cgpimage/', '/cgpimage/240x240/'))
+        }
+      })
       if (!res.data.videos) return
       this.videos = res.data.videos.split(',')
     },

src/views/weibao/views/reporting/details.vue

@@ -34,7 +34,7 @@
         <div>
           <p>照片：</p>
           <div class="boximg">
-            <div v-for="(item,index) in pics" :key="index">
+            <div v-for="(item,index) in picsArr" :key="index">
               <van-image lazy-load fit="contain" :src="item" alt="" @click="show=true" />
             </div>
           </div>
@@ -68,6 +68,7 @@ export default {
       id: '',
       orgform: {},
       pics: [],
+      picsArr: [],
       videos: [],
       videourl: '',
     }
@@ -81,6 +82,12 @@ export default {
       const res = await mandatoryDetail({ id: this.id })
       this.form = res.data
       this.pics = res.data.pics.split(',')
+      this.pics.forEach((item) => {
+        console.log(item)
+        if (item.indexOf('.jpg') || item.indexOf('.png')) {
+          this.picsArr.push(item.replace('/cgpimage/', '/cgpimage/240x240/'))
+        }
+      })
       if (!res.data.videos) return
       this.videos = res.data.videos.split(',')
     },

src/views/weibao/views/reporting/initiateConsultation.vue

@@ -10,8 +10,8 @@
         </van-row>
         <van-row class="cell">
           <van-col span="6">报告时间：</van-col>
-          <van-col span="18" @click="dateshow=true">
-            <van-field v-model="form.mandatoryDate" :rules="[{ required: true}]" placeholder="请输入报告时间" disabled />
+          <van-col span="18">
+            <van-field clickable readonly v-model="form.mandatoryDate" :rules="[{ required: true}]" placeholder="请输入报告时间" @click="dateshow=true" />
             <!-- {{form.mandatoryDate?form.mandatoryDate:'请选择'}} -->
           </van-col>
           <van-popup v-model="dateshow" position="bottom" :style="{ height: '50%' }">
@@ -28,7 +28,7 @@
         <van-row class="cell">
           <van-col span="8">报告所在地：</van-col>
           <van-col span="16">
-            <van-field v-model="form.streetName" :rules="[{ required: true}]" @click="streetShow=true" placeholder="请选择报告所在地" disabled />
+            <van-field clickable readonly v-model="form.streetName" :rules="[{ required: true}]" @click="streetShow=true" placeholder="请选择报告所在地" />
           </van-col>
           <van-popup v-model="streetShow" position="bottom" :style="{ height: '50%' }">
             <van-picker default-index="2" show-toolbar :columns="streetList" @confirm="onConfirm" @cancel="streetShow=false" value-key="name" />

src/views/weibao/views/specialServices/details.vue

@@ -48,7 +48,7 @@
         <div>
           <p>照片：</p>
           <div class="boximg">
-            <div v-for="(item,index) in imgUrl" :key="index">
+            <div v-for="(item,index) in imgUrlArr" :key="index">
               <van-image lazy-load fit="contain" :src="item" alt="" @click="showPopup" />
             </div>
           </div>
@@ -79,6 +79,7 @@ export default {
       showvideoplay: false,
       appendFile: [],
       imgUrl: [],
+      imgUrlArr: [],
       multiMediaUrl: '',
       form: {
         fileList: [],
@@ -102,6 +103,12 @@ export default {
       this.form = res.data
       this.address = this.form.streetName + this.form.address
       this.imgUrl = res.data.imgUrl.split(',')
+      this.imgUrl.forEach((item) => {
+        console.log(item)
+        if (item.indexOf('.jpg') || item.indexOf('.png')) {
+          this.imgUrlArr.push(item.replace('/cgpimage/', '/cgpimage/240x240/'))
+        }
+      })
       if (!res.data.multiMediaUrl) return
       this.multiMediaUrl = res.data.multiMediaUrl.split(',')
     },

src/views/zhulao/views/classRoom/index.vue

@@ -92,6 +92,7 @@ export default {
 <style lang="scss" scoped>
 .page {
   background-color: #f5f5f5;
+  height: 100%;
 }
 .van-tabs {
   border-bottom: 0;

src/views/zhulao/views/home/newsDetails.vue

@@ -28,5 +28,10 @@ export default {
 .main {
   padding: 0 30px;
   font-size: 24px;
+  padding-bottom: 30px;
+  ::v-deep p {
+    margin: 0 !important;
+    padding: 0 !important;
+  }
 }
 </style>