Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

src/components/opinionDialog.vue

@@ -5,7 +5,7 @@
 
           <el-form-item label="意见反馈：" :label-width="formLabelWidth" prop="opinion">
             <el-input type="textarea" :rows="10" :maxlength="maxlength" v-model="form.opinion" autocomplete="off" placeholder="请告诉我们您遇到的问题或者建议"></el-input>
-            <span class="text-count">{{currentCount}}/2000</span>
+            <span class="text-count">{{currentCount}}/{{maxlength}}</span>
           </el-form-item>
 
           <el-form-item label="上传图片：" :label-width="formLabelWidth" prop="imgs">
@@ -23,9 +23,10 @@
               :on-success="handleSuccess"
               :on-error="handleError"
               :on-exceed="handleExceed"
-              :disabled="addImageDisabled"
               :file-list="fileList">
-              <el-button size="small" type="primary" @click="addImage" :disabled="addImageDisabled">添加图片</el-button>
+              <!--:disabled="addImageDisabled"-->
+              <!--<el-button size="small" type="primary" @click="addImage" :disabled="addImageDisabled">添加图片</el-button>-->
+              <el-button size="small" type="primary" v-if="!addImageDisabled" @click="addImage">添加图片</el-button>
               <div slot="tip" class="el-upload__tip">最多5张，每张小于5M，支持jpg，png，bmp</div>
             </el-upload>
           </el-form-item>
@@ -89,7 +90,7 @@
   export default {
     data(){
       return{
-        maxlength: 2000,
+        maxlength: 1000,
         form: {
           opinion: '',
           imgs: '',
@@ -103,6 +104,7 @@
             { required: true, message: '请输入意见反馈', trigger: 'blur' }
           ]
         },
+        imgDomin: '',
         addImageDisabled: false,
         imgLimit: 5,// 最多允许上传的图片个数
         action: 'https://upload.qiniup.com/',
@@ -117,7 +119,7 @@
       }
     },
     created(){
-//      this.token = 'D34A213A354849A0B08A241771F7A675';
+//      this.token = 'C712F412E096492B84E2B1D636565626';
       this.token = localStorage.getItem('storageToken');
       this.headers.token = this.token
     },
@@ -150,6 +152,10 @@
       submitFrom(formName){
         this.$refs[formName].validate((valid) => {
           if (valid) {
+            this.urlString = '';
+            this.fileList.forEach((item)=>{
+              this.urlString += `${this.imgDomin}/${item.response.key};`
+            })
             const data = {
               input_text: this.form.opinion,
               system_type: 'workStation',
@@ -185,10 +191,18 @@
         this.imgFile.key = `qiniu/image/feedback/${year}/${month}/${file.name}`;
         this.imgFile.token = this.imgToken;
       },
-      handleRemove(){},
+      handleRemove(file, fileList){
+        this.fileList = fileList
+        this.addImageDisabled = false;
+      },
       handleSuccess(response, file, fileList){
         const imgDomin = uploadImg();
-        this.urlString += `${imgDomin}/${response.key};`
+        this.imgDomin = imgDomin;
+//        this.urlString += `${imgDomin}/${response.key};`
+//        this.fileList.forEach((item)=>{
+//          this.urlString += `${imgDomin}/${response.key};`
+//        })
+        this.fileList = fileList;
         this.$message.success(`上传成功！`);
         if(fileList.length>=this.imgLimit){
           this.addImageDisabled = true;

src/utils/fetch.js

 import axios from 'axios'
+import { Loading } from 'element-ui';
 import store from '../store'
 // import { getHostnameAndPort } from '../utils'
 // axios.defaults.withCredentials = true
@@ -9,8 +10,41 @@ const service = axios.create({
   withCredentials: false
 })
 
+/*loading*/
+let loadingInstance = () => {
+  return Loading.service({
+    lock: true,
+    text: 'Loading',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
+}
+let loading;
+let needLoadingRequestCount = 0;
+let showFullScreenLoading = () => {
+  if (needLoadingRequestCount === 0) {
+    loadingInstance();
+  }
+  needLoadingRequestCount++;
+};
+let tryHideFullScreenLoading = () => {
+  if (needLoadingRequestCount > 0) {
+    needLoadingRequestCount--;
+  }
+  if (needLoadingRequestCount === 0) {
+    loadingInstance().close();
+  }
+};
+
+
+
 // request拦截器
 service.interceptors.request.use(config => {
+  if (config.noLoading) {
+  }else{
+    showFullScreenLoading();
+  }
+
   const noSysCode = config.headers.noSysCode;
   if(noSysCode){
     delete config.headers.sysCode;
@@ -36,12 +70,18 @@ service.interceptors.request.use(config => {
   return config
 }, error => {
  // logger.debug('service.interceptors.request: ', error)
+  tryHideFullScreenLoading();
   Promise.reject(error)
 })
 
 // respone拦截器
 service.interceptors.response.use(
   response => {
+    if (response.config.noLoading) {
+    }else{
+      tryHideFullScreenLoading()
+    }
+
     const res = response.data
     /*
       baseUrl时，返回000000为成功
@@ -55,6 +95,8 @@ service.interceptors.response.use(
   },
   error => {
   //  logger.error('err' + error)
+    tryHideFullScreenLoading();
+    
     return Promise.reject(error)
   }
 )