Browse Source

no message

DESKTOP-70VPDLK\Administrator 2 years ago
parent
commit
5d40824ed8

+ 11 - 15
components/en-from/en-upload/en-upload.vue

@@ -351,20 +351,16 @@
 							console.log('--------------------')
 							res.tempFiles.forEach((file) => {
 								console.log(file.size,"+++++++++++++");
-								if (file.size > (1048576 * 3)) {
-									tools.error('上传的图片最大3MB')
-								} else {
-									if (this.list.length > 100) {
-										tools.error('最多上传100张')
-									} else {
-										console.log('--aaaaaaaaaa------------------')
-										if (tools.getPlatform() === 'H5') {
-											this.uploadingFile(file);
-										} else {
-											this.uploadingFile(file.path);
-										}
-									}
-								}
+                if (this.list.length > 100) {
+                  tools.error('最多上传100张')
+                } else {
+                  console.log('--aaaaaaaaaa------------------')
+                  if (tools.getPlatform() === 'H5') {
+                    this.uploadingFile(file);
+                  } else {
+                    this.uploadingFile(file.path);
+                  }
+                }
 							})
 						}
 					},
@@ -605,4 +601,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 6 - 6
pages-school/circle-info.vue

@@ -438,10 +438,10 @@
 					this.msgData.reply_id = item.m_id;
 				}
 				this.$refs.popup.open();
-				setTimeout(() => {
-					this.focus = true
-					// this.$forceUpdate()
-				}, 500);
+				// setTimeout(() => {
+				// 	this.focus = true
+				// 	// this.$forceUpdate()
+				// }, 500);
 
 				// console.log(this.focus, '是否聚焦');
 			},
@@ -490,7 +490,7 @@
 							// this.page = 1;
 							// this.getList();
 							this.getInfo();
-							
+
 							// remark
 						}, 1500)
 					} else {
@@ -752,4 +752,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 24 - 16
pages-takeout/replace-take.vue

@@ -241,7 +241,7 @@
 			getCard() {
 				getShopIngList({
 					type: 2,
-					school_id: this.schoolData.school_id 
+					school_id: this.schoolData.school_id
 				}).then((res) => {
 					if (res.code === 1) {
 						this.cardData = res.data;
@@ -257,20 +257,28 @@
 								}
 							}
 							// 初始设置code 输入框数量
-							if (this.isInitial) {
-								let saveData = uni.getStorageSync('saveData')
-								if (saveData) {
-									return
-								} else {
-									this.pickup_code = [];
-									for (let i = 0; i < this.cardData.total_num; i++) {
-										let obj = {
-											code: ''
-										};
-										this.pickup_code.push(obj);
-									}
-								}
-							}
+              console.log(this.pickup_code.length,this.cardData.total_num)
+              console.log(this.pickup_code.length<this.cardData.total_num)
+              if(this.pickup_code.length<this.cardData.total_num){
+                let maxNum = this.cardData.total_num-this.pickup_code.length
+                console.log(maxNum)
+                console.log('易安居完成asssssssssssssssssssss')
+                for (let i = 0; i < maxNum; i++) {
+                  let obj = {
+                    code: ''
+                  };
+                  this.pickup_code.push(obj);
+                  console.log( '---------------易安居完成'+i )
+                }
+                console.log( this.pickup_code)
+              }
+              // let saveData = uni.getStorageSync('saveData')
+              // if (saveData) {
+              //   return
+              // } else {
+              //   this.pickup_code = [];
+              //
+              // }
 						} else {
 							this.list.forEach(t => {
 								t.number = 0;
@@ -629,4 +637,4 @@
 		}
 
 	}
-</style>
+</style>