shaogen1995 4 лет назад
Родитель
Сommit
5fedf15eae

+ 1 - 1
src/pages/collection/collectionYearEdit.vue

@@ -40,7 +40,7 @@ export default {
         name: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入年代名称", trigger: "blur" }],
+        name: [{ required: true, message: "请输入年代名称", trigger: "blur" },{ max: 16, message: '不能超过16个字', trigger: 'blur' }],
       },
     };
   },

+ 23 - 1
src/pages/home/rotation.vue

@@ -35,6 +35,8 @@
         </div>
       </div>
     </div>
+    <!-- 点击移动图片后的遮罩 -->
+    <div class="bigBox" v-if="bigBoxShow">正 在 处 理...</div>
   </div>
 </template>
 
@@ -56,6 +58,7 @@ export default {
     return {
       crumbData,
       dataList: [],
+      bigBoxShow:false
     };
   },
   computed: {},
@@ -134,6 +137,7 @@ export default {
         });
     },
     switchPic(type,item){
+      this.bigBoxShow=true
       let len = this.dataList.length;
       if(len === 1) {
         type === 'pre'? common.tip("warning", "已是第一张"): common.tip("warning", "已是最后一张")
@@ -161,8 +165,13 @@ export default {
       }
       Promise.all([this.changeOrder(currentItem),this.changeOrder(type === 'pre'?preCurrentItem:nextCurrentItem)]).then(([res1,res2]) =>{
         if(res1.code === 0 && res2.code === 0) {
-          common.tip("success","移动成功");
           this.getList()
+          this.$nextTick(()=>{
+            setTimeout(() => {
+              this.bigBoxShow=false
+              common.tip("success","移动成功");
+            }, 200);
+          })
         }
         else {
           common.tip("error", "移动成功,请联系管理员");
@@ -182,6 +191,19 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.bigBox{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0,0,0,.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 30px;
+  color: #fff;
+}
 .table-interface {
   height: calc(100% - 3rem);
   overflow-y: auto;

+ 4 - 1
src/pages/home/rotationEdit.vue

@@ -166,7 +166,7 @@ export default {
       this.refresh = "刷新了";
     },
     beforeIconUpload(file) {
-      // console.log('上传文件前校验', file)
+      console.log('上传文件前校验', file)
       // 限制图片大小和格式
       const sizeOk = file.size / 1024 / 1024 < 10
       const typeOk =
@@ -179,6 +179,9 @@ export default {
         } else if (!sizeOk) {
           this.$message.error('照片大小超过10M!')
           reject(file)
+        }else if(file.name.length>32){
+          this.$message.error('照片名字不能超过32个字!')
+          reject(file)
         } else {
           resolve(file)
         }

+ 15 - 4
src/pages/news/bookEdit.vue

@@ -49,6 +49,7 @@
                 v-if="ruleForm.thumb"
                 :src="OSSURL + ruleForm.thumb"
                 class="avatar"
+                :key="ruleForm.thumb"
               />
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               <!-- 单纯用来刷新视图的变化的 -->
@@ -100,9 +101,14 @@ export default {
       headerObj: {
         token: window.localStorage.getItem("token"),
       },
-      ruleForm: {},
+      ruleForm: {
+        thumb:'',
+        name:'',
+        pubDate:'',
+        description:''
+      },
       rules: {
-        name: [{ required: true, message: "请输入书籍名称", trigger: "blur" }],
+        name: [{ required: true, message: "请输入书籍名称", trigger: "blur" },{ max: 32, message: '不能超过32个字', trigger: 'blur' }],
         description: [
           { required: true, message: "请输入书籍介绍", trigger: "blur" },
         ],
@@ -175,8 +181,10 @@ export default {
     },
     handleError() {},
     handleIconSuccess(res) {
+      console.log('上传图片成功',res);
       let { data } = res;
       this.ruleForm.thumb = data.ossPath;
+      console.log(9999,this.ruleForm.thumb);
       // 刷新下页面
       this.refresh = "刷新了";
     },
@@ -201,8 +209,11 @@ export default {
   },
   watch: {
     iframeData: {
-      handler: function () {
-        this.ruleForm = this.iframeData;
+      handler: function (newVal) {
+        if(newVal.source==='0') {
+          console.log('我是新增');
+        }else  this.ruleForm = this.iframeData;
+        
       },
       deep: true,
       immediate: true,

+ 6 - 2
src/pages/news/newEdit.vue

@@ -103,7 +103,7 @@ export default {
         wxUrl: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        name: [{ required: true, message: "请输入标题", trigger: "blur" },{ max: 32, message: '不能超过32个字', trigger: 'blur' }],
         type: [{ required: true, message: "请选择类别", trigger: "blur" }],
         source: [{ required: true, message: "请选择来源", trigger: "blur" }],
         // content: [{ required: true, message: "请输入内容", trigger: "blur" }],
@@ -174,7 +174,11 @@ export default {
       // console.log('this.form',this.form)
       let { name, type, id, code, source, wxUrl } = this.form;
       let data = { name, type, id, code, source, wxUrl };
-      if (this.form.source === "edit") data.content = this.editor.txt.html();
+      if (this.form.source === "edit") {
+        data.content = this.editor.txt.html();
+        //把微信链接变成空
+        data.wxUrl=''
+        }
       else data.content = "";
       // console.log(666,data);
       if (data.content === undefined) data.content = " ";