瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-it-html into deploy

1004749546@qq.com 4 年之前
父節點
當前提交
f00ccd682f

+ 3 - 4
src/components/UploadFile/index.vue

@@ -7,7 +7,6 @@
       @preview="handlePreview"
       @change="handleChange"
       :beforeUpload="beforeUpload"
-      :preview-file="previewFile"
       :data="params"
       :value="comVal"
     >
@@ -116,7 +115,7 @@ export default {
       if (this.listType == 'text') {
         return
       }
-      console.log(file,'8888888888')
+      console.log(file, '8888888888')
       this.previewImage = file.url || file.thumbUrl
       // this.previewImage = file.response.data
       this.previewVisible = true
@@ -172,9 +171,9 @@ export default {
 
       // 文件大小
       const isLt2M = file.size / 1024 / 1024 < this.fileSize
-      if (!isLt2M ) {
+      if (!isLt2M) {
         if (tip != 0) {
-          if (this.fileType !='video/mp4') {
+          if (this.fileType != 'video/mp4') {
             this.$message.error('图片不能超过 ' + this.fileSize + 'MB!')
           } else {
             this.$message.error('视频不能超过 ' + this.fileSize + 'MB!')

+ 1 - 1
src/utils/request.js

@@ -63,7 +63,7 @@ service.interceptors.response.use((response) => {
       }
     })
   }
-  if ((response.data.status == '401' || response.data.status == '900' || response.data.status == '500') && window.location.pathname != '/user/login') {
+  if ((response.data.status == '401' || response.data.status == '900') && window.location.pathname != '/user/login') {
     notification.destroy()
     notification.error({
       message: '提示',

+ 1 - 2
src/views/appSetting/bannerSetting.vue

@@ -55,7 +55,6 @@
           <v-select
             ref="position"
             code="ADVERT_POSITION"
-            v-model="formData.position"
             allowClear
             id="bannerSetting-position"
             placeholder="请选择广告图位置"
@@ -103,7 +102,7 @@
               :disabled="disabled"
               @change="getbannerImage"
               listType="picture-card"
-              upText="上传图片">
+              upText="上传">
             </Upload>
             <img v-else :src="formData.photoPath" style="width:100px ;height: auto;" />
           </div>

+ 1 - 1
src/views/tenants/tenantsModal.vue

@@ -422,7 +422,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.warning(res.message)
+              this.$message.error(res.message)
             }
           })
         }