Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/assets/styles/portal-index.scss

@@ -487,9 +487,12 @@
     padding: 25px 40px;
     .personal-box {
       margin-left: 0px;
-      margin-top: 0px;
+      margin-top: 10px;
       margin-bottom: 0px;
     }
+    .personal-ul{
+      margin-top: 7px;
+    }
 
   }
 

src/components/ImageUpload/artimgUpload.vue

@@ -16,8 +16,8 @@
       :show-file-list="false"
       :headers="headers"
       style="display: inline-block;">
-      <el-image v-if="!value" :src="value" style="width:100%;height:100%;">
-        <div slot="error" class="image-slot" >
+      <el-image v-if="!value" :src="value" :style="`width:${width};height:${height};`">
+        <div slot="error" class="image-slot">
            <i class="el-icon-upload"></i>
   <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
   <div class="el-upload__tip" slot="tip">只能上传jpg/png/bmp/jpeg文件，且不超过500kb</div>
@@ -169,7 +169,14 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
+ ::v-deep .el-upload-dragger{
+  width: 100% !important;
+  height: 100% !important;
+}
+  .image-upload{
+    width: 410px;
+    height: 168px;
+  }
   .image-card .el-upload--picture-card,.image-card .el-upload-list--picture-card .el-upload-list__item{
       background-color: #fbfdff;
       border: 1px dashed #c0ccda;
@@ -183,6 +190,7 @@ export default {
     border-radius: 6px;
     box-sizing: border-box;
     vertical-align: top;
+    line-height: 100%;
 }
   .image-uploader .el-upload {
     border: 1px dashed #d9d9d9;

src/components/Qa/addQuestion.vue

@@ -13,10 +13,10 @@
         <el-input class="title-input"   v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于100" maxlength="100"></el-input>
       </el-form-item>
         <el-form-item label="封面">
-        <imageUpload dir="qa" width="410px" height="168px" :value="imageShowUrl" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
+        <imageUpload :value="imageShowUrl" dir="qa" width="410px" height="168px"  @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
         <!-- <el-upload
           :action="uploadFileUrl"
-          :show-file-list="false"
+          :show-file-list="false"         
           :headers="headers"
           list-type="picture-card"
           :on-success="handleAvatarSuccess"
@@ -67,6 +67,7 @@
   export default{
     data(){
       return {
+        fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
         askFormCheckedShow:false,
         askFormRules: {
           title: [{ required: true, message: '请输入问题标题', trigger: 'blur' }, { max: 100, message: '字符长度不能高于100', trigger: 'blur' }],
@@ -91,8 +92,10 @@
       },
       handleUploadSuccess(file) {
 		// console.log(file.result.httpPath,'是否会fig以后关于和',file.result.filePath)
-        this.imageShowUrl=file.result.httpPath;
         this.askForm.images=file.result.filePath
+        this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
+        // console.log(this.fileBaseUrl)
+        console.log(file)
       },
       handleRemoveSuccess(file) {
         this.imageShowUrl=''

src/views/Index.vue

@@ -116,7 +116,7 @@
                       <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon>
                     </div>
                     <div v-if="course.score">
-                      <span class="course-score-value">{{ toScore(course.score) }}分</span>
+                      <span class="course-score-value" style="margin-left:10px">{{ toScore(course.score) }}分</span>
                     </div>
                     <div v-else class="course-score-no">未评分</div>
                   </div>
@@ -1023,7 +1023,7 @@
       padding-right: 40px;
       box-sizing: border-box;
       display: flex;
-      margin-top: 20px;
+      // margin-top: 20px;
       justify-content: space-between;
       position: relative;
       .personal-box-img {