1、优化上传图片问题

2、隐藏红包问题
3、调整字眼

src/components/FileUpload/index.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import {getToken} from "@/utils/auth";
+import { uploadOSSUrl, getUploadHeaders } from "@/utils/upload";
 
 export default {
   name: "FileUpload",
@@ -74,7 +74,7 @@ export default {
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS", // 上传的图片服务器地址
+      uploadFileUrl: uploadOSSUrl,
       fileList: [],
       videoDuration: 0,
       videoTime: "",
@@ -106,9 +106,7 @@ export default {
   },
   computed: {
     headers() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
     // 是否显示提示
     showTip() {

src/components/ImageUpload/index.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { uploadOSSUrl, getUploadHeaders } from "@/utils/upload";
 
 import { Loading } from 'element-ui';
 
@@ -77,7 +77,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API+"/common/uploadOSS", // 上传的图片服务器地址
+      uploadImgUrl: uploadOSSUrl,
       fileList: []
     };
   },
@@ -105,9 +105,7 @@ export default {
   },
   computed: {
     headers() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
     // 是否显示提示
     showTip() {

src/components/Material/index.vue

@@ -144,7 +144,7 @@
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial, exportMaterial } from "@/api/store/material";
 import { getAllMaterialGroup,listMaterialGroup, getMaterialGroup, delMaterialGroup, addMaterialGroup, updateMaterialGroup, exportMaterialGroup } from "@/api/store/materialGroup";
 import { Loading } from 'element-ui';
-import { getToken } from "@/utils/auth";
+import { uploadOSSUrl, getUploadHeaders } from "@/utils/upload";
 export default {
   name: 'ImageSelect',
   props: {
@@ -184,7 +184,7 @@ export default {
   data() {
     return {
       finalQuality:1,
-      uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
+      uploadUrl: uploadOSSUrl,
       dialogVisible: false,
       url: '',
       listDialogVisible: false,
@@ -210,9 +210,7 @@ export default {
   },
   computed: {
     headers() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
   },
   mounted(){

src/components/Material/single.vue

@@ -135,7 +135,7 @@
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial, exportMaterial } from "@/api/store/material";
 import { getAllMaterialGroup,listMaterialGroup, getMaterialGroup, delMaterialGroup, addMaterialGroup, updateMaterialGroup, exportMaterialGroup } from "@/api/store/materialGroup";
 import { Loading } from 'element-ui';
-import { getToken } from "@/utils/auth";
+import { uploadOSSUrl, getUploadHeaders } from "@/utils/upload";
 export default {
   name: 'ImageSelect',
   props: {
@@ -178,7 +178,7 @@ export default {
     return {
       finalQuality:1,
       myValue: this.value,
-      uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
+      uploadUrl: uploadOSSUrl,
       dialogVisible: false,
       url: '',
       listDialogVisible: false,
@@ -204,9 +204,7 @@ export default {
   },
   computed: {
     headers() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
   },
   mounted(){

src/components/SingleImageUpload/index.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { getUploadHeaders, uploadOSSUrl } from "@/utils/upload";
 
 const TEXT = {
   preview: "\u9884\u89c8",
@@ -83,15 +83,13 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS",
+      uploadUrl: uploadOSSUrl,
       text: TEXT,
     };
   },
   computed: {
     uploadHeaders() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
   },
   methods: {

src/main.js

@@ -31,6 +31,16 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 import * as echarts from "echarts";
 
+import { getUploadHeaders } from "@/utils/upload";
+
+Vue.mixin({
+  computed: {
+    uploadHeaders() {
+      return getUploadHeaders();
+    },
+  },
+});
+
 // 全局方法挂载
 
 import { VueJsonp } from 'vue-jsonp'

src/views/chat/chatKeyword/index.vue

@@ -132,6 +132,7 @@
             v-model="form.qwCode"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/company/companyUser/indexAll.vue

@@ -1597,6 +1597,7 @@ export default {
       try {
         const response = await axios.post(this.uploadUrl, formData, {
           headers: {
+            ...this.uploadHeaders,
             'Content-Type': 'multipart/form-data',
           },
           onUploadProgress: progressEvent => {

src/views/company/components/companyProfit.vue

@@ -115,6 +115,7 @@
               v-model="form.imgUrl"
               class="avatar-uploader"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :show-file-list="false"
               :on-success="handleSuccess"
               :before-upload="beforeUpload">

src/views/components/course/userCourseCatalogDetails.vue

@@ -119,7 +119,8 @@
         </el-form-item>
 
         <el-form-item label="视频缩略图" prop="thumbnail">
-          <el-upload v-model="form.thumbnail" class="avatar-uploader" :action="uploadUrl" :show-file-list="false"
+          <el-upload v-model="form.thumbnail" class="avatar-uploader" :action="uploadUrl"
+            :headers="uploadHeaders" :show-file-list="false"
                      :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
             <img v-if="form.thumbnail" :src="form.thumbnail" class="avatar" width="300px">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>

src/views/course/courseFinishTemp/index.vue

@@ -279,6 +279,7 @@
                           v-model="item.fileUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessFile(res, file, item)"
                           :before-upload="beforeAvatarUploadFile">
@@ -297,6 +298,7 @@
                           v-model="item.videoUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessVideo(res, file, item)"
                           :before-upload="beforeAvatarUploadVideo">
@@ -379,6 +381,7 @@
                           v-model="item.fileUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessFile(res, file, item)"
                           :before-upload="beforeAvatarUploadFile">
@@ -397,6 +400,7 @@
                           v-model="item.videoUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessVideo(res, file, item)"
                           :before-upload="beforeAvatarUploadVideo">

src/views/course/courseFinishTempParent/index.vue

@@ -207,6 +207,7 @@
                           v-model="item.fileUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessFile(res, file, item)"
                           :before-upload="beforeAvatarUploadFile">
@@ -225,6 +226,7 @@
                           v-model="item.videoUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessVideo(res, file, item)"
                           :before-upload="beforeAvatarUploadVideo">
@@ -307,6 +309,7 @@
                           v-model="item.fileUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessFile(res, file, item)"
                           :before-upload="beforeAvatarUploadFile">
@@ -325,6 +328,7 @@
                           v-model="item.videoUrl"
                           class="avatar-uploader"
                           :action="uploadUrl"
+            :headers="uploadHeaders"
                           :show-file-list="false"
                           :on-success="(res, file) => handleAvatarSuccessVideo(res, file, item)"
                           :before-upload="beforeAvatarUploadVideo">

src/views/course/userVideo/index.vue

@@ -272,6 +272,7 @@
             v-model="form.thumbnail"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/adv/index.vue

@@ -169,6 +169,7 @@
                       v-model="form.imageUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/appVersion/index.vue

@@ -128,6 +128,7 @@
             accept=".apk"
             class="upload-demo"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :before-upload="beforeUpload"
             :on-success="handleSuccess"
             :on-preview="handlePreview"
@@ -145,6 +146,7 @@
             accept=".wgt"
             class="upload-demo"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :before-upload="beforeUpload"
             :on-success="handleWgtSuccess"
             :on-preview="handlePreview"
@@ -162,6 +164,7 @@
             accept=".zip"
             class="upload-demo"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :before-upload="beforeUpload"
             :on-success="handleSuccess"
             :on-preview="handlePreview"
@@ -186,6 +189,7 @@
             accept=".apk"
             class="upload-demo"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :before-upload="beforeUploadBaidu"
             :on-success="handleSuccessBaidu"
             :on-preview="handlePreviewBaidu"

src/views/his/article/index.vue

@@ -184,6 +184,7 @@
                   v-model="form.imageUrl"
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="handleAvatarSuccess"
                   :before-upload="beforeAvatarUpload">

src/views/his/articleCate/index.vue

@@ -133,6 +133,7 @@
             v-model="form.imgUrl"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/caseArticle/index.vue

@@ -172,6 +172,7 @@
                       v-model="form.imgUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/chineseMedicine/index.vue

@@ -167,6 +167,7 @@
                       v-model="form.imgUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/department/index.vue

@@ -157,6 +157,7 @@
             v-model="form.iconUrl"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/doctorArticle/index.vue

@@ -189,6 +189,7 @@
                       v-model="form.imageUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">
@@ -206,6 +207,7 @@
                ref="upload"
                class="upload-demo"
                :action="uploadUrl"
+            :headers="uploadHeaders"
                :on-success="handleSuccess"
                :before-upload="beforeUpload"
                :limit="1"

src/views/his/doctorArticleCate/index.vue

@@ -133,6 +133,7 @@
             v-model="form.imgUrl"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/famousPrescribe/index.vue

@@ -182,6 +182,7 @@
                       v-model="form.imgUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/homeArticle/index.vue

@@ -152,6 +152,7 @@
           <el-upload
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleImageUrlSuccess"
             :before-upload="beforeImageUrlUpload">
@@ -171,6 +172,7 @@
               ref="upload"
               class="upload-demo"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :on-success="handleVideoSuccess"
               :before-upload="beforeVideoUpload"
               :limit="1"

src/views/his/homeCategory/index.vue

@@ -122,6 +122,7 @@
           <el-upload
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleImageUrlSuccess"
             :before-upload="beforeImageUrlUpload">

src/views/his/hospital/index.vue

@@ -255,6 +255,7 @@
             v-model="form.imgUrl"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">
@@ -295,6 +296,7 @@
            v-model="form.sealUrl"
            class="avatar-uploader"
            :action="uploadUrl2"
+            :headers="uploadHeaders"
            :show-file-list="false"
            :on-success="handleAvatarSuccess2"
            :before-upload="beforeAvatarUpload">

src/views/his/medicatedFood/index.vue

@@ -160,6 +160,7 @@
                       v-model="form.imgUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/package/index.vue

@@ -257,6 +257,7 @@
               v-model="form.imgUrl"
               class="avatar-uploader"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :show-file-list="false"
               :on-success="handleAvatarSuccess"
               :before-upload="beforeAvatarUpload">

src/views/his/packageCate/index.vue

@@ -136,6 +136,7 @@
             v-model="form.imgUrl"
             class="avatar-uploader"
             :action="uploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/reward/index.vue

@@ -164,6 +164,7 @@
                 v-model="form.closeChestUrl"
                 class="avatar-uploader"
                 :action="uploadUrl"
+            :headers="uploadHeaders"
                 :show-file-list="false"
                 :on-success="handleSuccessClose"
                 :before-upload="beforeUpload">
@@ -178,6 +179,7 @@
                 v-model="form.openChestUrl"
                 class="avatar-uploader"
                 :action="uploadUrl"
+            :headers="uploadHeaders"
                 :show-file-list="false"
                 :on-success="handleSuccessOpen"
                 :before-upload="beforeUpload">
@@ -258,6 +260,7 @@
                   <el-upload
                     class="spin-icon-uploader"
                     :action="uploadUrl"
+            :headers="uploadHeaders"
                     :show-file-list="false"
                     :before-upload="beforeUpload"
                     accept="image/*"
@@ -366,6 +369,7 @@
                   <el-upload
                     class="spin-icon-uploader"
                     :action="uploadUrl"
+            :headers="uploadHeaders"
                     :show-file-list="false"
                     :before-upload="beforeUpload"
                     accept="image/*"
@@ -478,6 +482,7 @@
                   <el-upload
                     class="spin-icon-uploader"
                     :action="uploadUrl"
+            :headers="uploadHeaders"
                     :show-file-list="false"
                     :before-upload="beforeUpload"
                     accept="image/*"

src/views/his/store/index.vue

@@ -212,6 +212,7 @@
                  v-model="form.logoUrl"
                  class="avatar-uploader"
                  :action="uploadUrl"
+            :headers="uploadHeaders"
                  :show-file-list="false"
                  :on-success="handleAvatarSuccess"
                  :before-upload="beforeAvatarUpload">
@@ -228,6 +229,7 @@
             v-model="form.licenseImages"
             class="avatar-uploader"
             :action="licenseuploadUrl"
+            :headers="uploadHeaders"
             :show-file-list="false"
             :on-success="licensehandleAvatarSuccess"
             :before-upload="beforeAvatarUpload">

src/views/his/storeProduct/index.vue

@@ -350,6 +350,7 @@
               ref="uploadVideo"
               class="upload-demo"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :on-success="handleSuccess"
               :before-upload="beforeUpload"
               :limit="1"

src/views/his/storeProductCategory/index.vue

@@ -138,6 +138,7 @@
                       v-model="form.pic"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/his/testTemp/index.vue

@@ -163,6 +163,7 @@
                               v-model="form.img"
                               class="avatar-uploader"
                               :action="uploadUrl"
+            :headers="uploadHeaders"
                               :show-file-list="false"
                               :on-success="handleAvatarSuccess"
                               :before-upload="beforeAvatarUpload">

src/views/his/vessel/index.vue

@@ -172,6 +172,7 @@
                       v-model="form.imgUrl"
                       class="avatar-uploader"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :show-file-list="false"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">

src/views/hisStore/adv/index.vue

@@ -141,6 +141,7 @@
               v-model="form.icon"
               class="avatar-uploader"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :show-file-list="false"
               :on-success="handleAvatarSuccess"
               :before-upload="beforeAvatarUpload">
@@ -154,6 +155,7 @@
               ref="upload"
               class="upload-demo"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :on-success="handleSuccess"
               :before-upload="beforeUpload"
               :limit="1"

src/views/hisStore/store/index.vue

@@ -234,6 +234,7 @@
                 v-model="form.logoUrl"
                 class="avatar-uploader"
                 :action="uploadUrl"
+            :headers="uploadHeaders"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess"
                 :before-upload="beforeAvatarUpload">
@@ -293,6 +294,7 @@
               <el-upload
                 class="avatar-uploader"
                 :action="uploadUrl"
+            :headers="uploadHeaders"
                 :show-file-list="false"
                 :on-success="(response, file) => handleFileSuccess(response, file, 'businessLicense')"
                 :before-upload="beforeAvatarUpload">
@@ -321,6 +323,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'drugLicense')"
                   :before-upload="beforeAvatarUpload">
@@ -348,6 +351,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'medicalDevice1')"
                   :before-upload="beforeAvatarUpload">
@@ -375,6 +379,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'medicalDevice2')"
                   :before-upload="beforeAvatarUpload">
@@ -402,6 +407,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'medicalDevice3')"
                   :before-upload="beforeAvatarUpload">
@@ -429,6 +435,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'foodLicense')"
                   :before-upload="beforeAvatarUpload">
@@ -456,6 +463,7 @@
                 <el-upload
                   class="avatar-uploader"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :show-file-list="false"
                   :on-success="(response, file) => handleFileSuccess(response, file, 'medicalLicense')"
                   :before-upload="beforeAvatarUpload">

src/views/hisStore/storeProduct/index.vue

@@ -569,6 +569,7 @@
                       ref="upload"
                       class="upload-demo"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :on-success="handleSuccess"
                       :before-upload="beforeUpload"
                       :limit="1"

src/views/hisStore/storeProduct/indexZm.vue

@@ -604,6 +604,7 @@
                       ref="upload"
                       class="upload-demo"
                       :action="uploadUrl"
+            :headers="uploadHeaders"
                       :on-success="handleSuccess"
                       :before-upload="beforeUpload"
                       :limit="1"

src/views/hisStore/storeProductAudit/index.vue

@@ -343,6 +343,7 @@
               ref="upload"
               class="upload-demo"
               :action="uploadUrl"
+            :headers="uploadHeaders"
               :on-success="handleSuccess"
               :before-upload="beforeUpload"
               :limit="1"

src/views/live/liveConfig/liveRedConf.vue

@@ -95,7 +95,7 @@
       <el-table-column label="有效时间 单位：分" align="center" prop="duration" />
       <el-table-column label="红包类型" align="center" prop="redType" :formatter="redTypeFormatter"/>
       <el-table-column label="直播间ID" align="center" prop="liveId" />
-      <el-table-column label="福币数量" align="center" prop="redNum" />
+      <el-table-column label="积分数量" align="center" prop="redNum" />
       <el-table-column label="可中奖份量" align="center" prop="totalLots" />
       <el-table-column label="实际发放奖励份量" align="center" prop="totalSend" />
       <el-table-column label="红包标题" align="center" prop="desc" />
@@ -177,8 +177,8 @@
         <el-form-item label="直播间ID" prop="liveId">
           <el-input v-model="form.liveId" placeholder="请输入直播间ID" :disabled="canLiveId"/>
         </el-form-item>
-        <el-form-item label="福币数" prop="redNum">
-          <el-input v-model="form.redNum" placeholder="请输入福币数量" />
+        <el-form-item label="积分数" prop="redNum">
+          <el-input v-model="form.redNum" placeholder="请输入积分数量" />
         </el-form-item>
         <el-form-item label="中奖份量" prop="totalLots">
           <el-input v-model="form.totalLots" placeholder="请输入可中奖份量" />
@@ -253,7 +253,7 @@ export default {
           { required: true, message: "直播间ID不能为空", trigger: "blur" }
         ],
         redNum: [
-          { required: true, message: "福币数量不能为空", trigger: "blur" }
+          { required: true, message: "积分数量不能为空", trigger: "blur" }
         ],
         totalLots: [
           { required: true, message: "可中奖份量不能为空", trigger: "blur" }

src/views/live/liveConfig/watchReward.vue

@@ -577,10 +577,10 @@ export default {
       },
       // 添加实施动作选项
       actionOptions: [
-        {
+  /*      {
           label: '现金红包',
           value: '1'
-        },
+        },*/
         {
           label: '积分红包',
           value: '2'

src/views/live/liveUserRedRecord/index.vue

@@ -86,7 +86,7 @@
       <el-table-column label="抽奖ID" align="center" prop="redId" />
       <el-table-column label="直播间ID" align="center" prop="liveId" />
       <el-table-column label="中奖用户ID" align="center" prop="userId" />
-      <el-table-column label="福币数量" align="center" prop="integral" />
+      <el-table-column label="积分数量" align="center" prop="integral" />
       <el-table-column label="创建日期" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

src/views/qw/friendMaterial/index.vue

@@ -70,6 +70,7 @@
                 <el-col :span="12" style="text-align: right;">
                   <el-upload
                     :action="uploadUrl"
+                    :headers="uploadHeaders"
                     :file-list="[]"
                     :on-progress="handleProgress"
                     :before-upload="beforeUpload"

src/views/qw/sop/ImageUpload.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { uploadOSSUrl, getUploadHeaders } from "@/utils/upload";
 
 export default {
   name: "ImageUpload",
@@ -73,7 +73,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl:"",
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS",
+      uploadUrl: uploadOSSUrl,
       fileList: []
     };
   },
@@ -105,9 +105,7 @@ export default {
   },
   computed: {
     headers() {
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
+      return getUploadHeaders();
     },
     // 是否显示提示
     showTip() {

src/views/qw/sopTemp/addSopTemp.vue

@@ -202,6 +202,7 @@
                                                 v-model="setList.fileUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessFile(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadFile">
@@ -220,6 +221,7 @@
                                                 v-model="setList.videoUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessVideo(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadVideo">

src/views/qw/sopTemp/addSopTempOld.vue

@@ -167,6 +167,7 @@
                                         v-model="content.fileUrl"
                                         class="avatar-uploader"
                                         :action="uploadUrl"
+            :headers="uploadHeaders"
                                         :show-file-list="false"
                                         :on-success="(res, file) => handleAvatarSuccessFile(res, file, content)"
                                         :before-upload="beforeAvatarUploadFile">
@@ -185,6 +186,7 @@
                                         v-model="content.videoUrl"
                                         class="avatar-uploader"
                                         :action="uploadUrl"
+            :headers="uploadHeaders"
                                         :show-file-list="false"
                                         :on-success="(res, file) => handleAvatarSuccessVideo(res, file, content)"
                                         :before-upload="beforeAvatarUploadVideo">
@@ -202,6 +204,7 @@
                                           v-model="content.voiceUrl"
                                           class="avatar-uploader"
                                           :action="uploadUrl"
+            :headers="uploadHeaders"
                                           :show-file-list="false"
                                           :on-success="(res, file) => handleAvatarSuccessVoice(res, file, content)"
                                           :before-upload="beforeAvatarUploadVoice">

src/views/qw/sopTemp/updateSopTemp.vue

@@ -386,6 +386,7 @@
                                                 v-model="setList.fileUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessFile(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadFile">
@@ -406,6 +407,7 @@
                                                 v-model="setList.videoUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessVideo(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadVideo">

src/views/qw/sopTemp/updateSopTemp2.vue

@@ -169,6 +169,7 @@
                                                 v-model="setList.fileUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessFile(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadFile">
@@ -187,6 +188,7 @@
                                                 v-model="setList.videoUrl"
                                                 class="avatar-uploader"
                                                 :action="uploadUrl"
+            :headers="uploadHeaders"
                                                 :show-file-list="false"
                                                 :on-success="(res, file) => handleAvatarSuccessVideo(res, file, setList)"
                                                 :before-upload="beforeAvatarUploadVideo">

src/views/qw/sopTemp/updateSopTempOld.vue

@@ -159,6 +159,7 @@
                                         v-model="content.fileUrl"
                                         class="avatar-uploader"
                                         :action="uploadUrl"
+            :headers="uploadHeaders"
                                         :show-file-list="false"
                                         :on-success="(res, file) => handleAvatarSuccessFile(res, file, content)"
                                         :before-upload="beforeAvatarUploadFile">
@@ -177,6 +178,7 @@
                                         v-model="content.videoUrl"
                                         class="avatar-uploader"
                                         :action="uploadUrl"
+            :headers="uploadHeaders"
                                         :show-file-list="false"
                                         :on-success="(res, file) => handleAvatarSuccessVideo(res, file, content)"
                                         :before-upload="beforeAvatarUploadVideo">
@@ -194,6 +196,7 @@
                                         v-model="content.voiceUrl"
                                         class="avatar-uploader"
                                         :action="uploadUrl"
+            :headers="uploadHeaders"
                                         :show-file-list="false"
                                         :on-success="(res, file) => handleAvatarSuccessVoice(res, file, content)"
                                         :before-upload="beforeAvatarUploadVoice">

src/views/system/config/config.vue

@@ -1987,6 +1987,7 @@
                 ref="upload"
                 class="upload-demo"
                 :action="uploadUrl"
+            :headers="uploadHeaders"
                 :on-success="handleSuccess"
                 :before-upload="beforeUpload"
                 :limit="1"
@@ -2073,6 +2074,7 @@
                   ref="upload"
                   class="upload-demo"
                   :action="uploadUrl"
+            :headers="uploadHeaders"
                   :on-success="appHandleSuccess"
                   :before-upload="beforeUpload"
                   :limit="1"

src/views/system/config/config2.vue

@@ -1263,6 +1263,7 @@
                  ref="upload"
                  class="upload-demo"
                  :action="uploadUrl"
+            :headers="uploadHeaders"
                  :on-success="handleSuccess"
                  :before-upload="beforeUpload"
                  :limit="1"