no message

common/css/common.css

@@ -367,6 +367,9 @@ image {
 .p-t-20{
 	padding-top: 20rpx;
 }
+.pb-5 {
+	padding-bottom: 5rpx;
+}
 .p-b-20 {
 	padding-bottom: 20rpx;
 }

components/en-from/en-upload/en-upload.vue

@@ -1,592 +1,604 @@
 <template>
-  <view class="con">
-    <movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
-      <block v-for="(item, index) in imageList" :key="item.id">
-        <movable-view class="view" :x="item.x" :y="item.y" direction="all" :damping="40" :disabled="item.disable"
-                      @change="onChange($event, item)" @touchstart="touchstart(item)" @mousedown="touchstart(item)"
-                      @touchend="touchend(item)" @mouseup="touchend(item)"
-                      :style="{ width: viewWidth + 'px', height: viewWidth + 'px', 'z-index': item.zIndex, opacity: item.opacity }">
-          <view class="area-con" @click.stop="examineImgOne(index)"
-                :style="{ width: childWidth, height: childWidth, transform: 'scale(' + item.scale + ')' }">
-            <image  class="pre-image" :src="item.src+(imgType===1?'':'?x-oss-process=video/snapshot,t_7000,f_jpg,w_600,h_0,m_fast')" mode="aspectFill"></image>
-            <text v-if="imgType===2" class="bf-img iconfont"> &#xea82;</text>
-            <view class="del-con" @click.stop="delImage(item, index)" @touchstart.stop="delImageMp(item, index)"
-                  @touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
-              <view class="del-wrap">
-<!--                <image class="del-image"-->
-<!--                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">-->
-<!--                </image>-->
-                <text  class="del-image iconfont"> &#xe603;</text>
-              </view>
-            </view>
-          </view>
-        </movable-view>
-      </block>
-      <view class="add" v-if="imageList.length < number"
-            :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }" @click="selectMultimedia">
-        <view class="add-wrap" :style="{ width: childWidth, height: childWidth }">
-          <view class="video-data">
-            <text class="video-img iconfont" >&#xe658;</text>
-          </view>
-        </view>
-      </view>
-    </movable-area>
-  </view>
+	<view class="con">
+		<movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
+			<block v-for="(item, index) in imageList" :key="item.id">
+				<movable-view class="view" :x="item.x" :y="item.y" direction="all" :damping="40"
+					:disabled="item.disable" @change="onChange($event, item)" @touchstart="touchstart(item)"
+					@mousedown="touchstart(item)" @touchend="touchend(item)" @mouseup="touchend(item)"
+					:style="{ width: viewWidth + 'px', height: viewWidth + 'px', 'z-index': item.zIndex, opacity: item.opacity }">
+					<view class="area-con" @click.stop="examineImgOne(index)"
+						:style="{ width: childWidth, height: childWidth, transform: 'scale(' + item.scale + ')' }">
+						<image class="pre-image"
+							:src="item.src+(imgType===1?'':'?x-oss-process=video/snapshot,t_7000,f_jpg,w_600,h_0,m_fast')"
+							mode="aspectFill"></image>
+						<text v-if="imgType===2" class="bf-img iconfont"> &#xea82;</text>
+						<view class="del-con" @click.stop="delImage(item, index)"
+							@touchstart.stop="delImageMp(item, index)" @touchend.stop="nothing()"
+							@mousedown.stop="nothing()" @mouseup.stop="nothing()">
+							<view class="del-wrap">
+								<!--                <image class="del-image"-->
+								<!--                       src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">-->
+								<!--                </image>-->
+								<text class="del-image iconfont"> &#xe603;</text>
+							</view>
+						</view>
+					</view>
+				</movable-view>
+			</block>
+			<view class="add" v-if="imageList.length < number"
+				:style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }"
+				@click="selectMultimedia">
+				<view class="add-wrap" :style="{ width: childWidth, height: childWidth }">
+					<view class="video-data">
+						<text class="video-img iconfont">&#xe658;</text>
+					</view>
+				</view>
+			</view>
+		</movable-area>
+	</view>
 </template>
 
 <script>
-import tools from "@/service/tools";
-import {upLoadingFileOss} from "@/service/upLoadingFile";
+	import tools from "@/service/tools";
+	import {
+		upLoadingFileOss
+	} from "@/service/upLoadingFile";
 
-export default {
-  components:{
+	export default {
+		components: {
 
-  },
-  data() {
-    return {
-      imageList: [],
-      previewList:[],
-      width: 0,
-      add: {
-        x: 0,
-        y: 0
-      },
-      current: 0,
-      colsValue: 0,
-      viewWidth: 0,
-      tempItem: null,
-      timer: null,
-      changeStatus: true,
-      preStatus: true,
-      ossClient:null
-    }
-  },
-  props: {
-    // 返回排序后图片
-    list: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    },
-    imgType: {
-      type: Number,
-      default: 1
-    },
-    fileNum: {
-      type: Number,
-      default: 9
-    },
-    // 选择图片数量限制
-    number: {
-      type: Number,
-      default: 100
-    },
-    // 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
-    imageWidth: {
-      type: Number,
-      default: 230
-    },
-    // 图片列数（cols > 0 则 imageWidth 无效）
-    cols: {
-      type: Number,
-      default: 0
-    },
-    // 图片周围空白填充，单位 rpx
-    padding: {
-      type: Number,
-      default: 10
-    },
-    // 拖动图片时放大倍数 [0, ∞)
-    scale: {
-      type: Number,
-      default: 1.1
-    },
-    // 拖动图片时不透明度
-    opacity: {
-      type: Number,
-      default: 0.7
-    },
-    // 自定义添加（需配合 @aaddImage 事件使用）
-    custom: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    areaHeight() {
-      if (this.imageList.length < this.number) {
-        return Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth + 'px'
-      } else {
-        return Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      }
-    },
-    childWidth() {
-      return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
-    },
-  },
-  created() {
-    this.width = uni.getSystemInfoSync().windowWidth
-    this.viewWidth = this.rpx2px(this.imageWidth)
-  },
-  mounted() {
-    const query = uni.createSelectorQuery().in(this)
-    query.select('.area').boundingClientRect(data => {
-      this.colsValue = Math.floor(data.width / this.viewWidth)
-      if (this.cols > 0) {
-        this.colsValue = this.cols
-        this.viewWidth = data.width / this.cols
-      }
-      for (let item of this.list) {
-        this.addProperties(item)
-      }
-    })
-    query.exec()
-  },
-  methods: {
-    examineImgOne( index) {
-      // this.$emit('examineImgOne',index)
-      // this.previewList = this.list
-      // this.current = index
-      // this.$refs.previewImage.open(index);
-      let imgList = []
-      this.imageList.forEach((item)=>{
-        console.log(item)
-        imgList.push(item.src)
-      })
-      uni.previewImage({
-        urls: imgList,
-        current: index,
-        success: () => {
+		},
+		data() {
+			return {
+				imageList: [],
+				previewList: [],
+				width: 0,
+				add: {
+					x: 0,
+					y: 0
+				},
+				current: 0,
+				colsValue: 0,
+				viewWidth: 0,
+				tempItem: null,
+				timer: null,
+				changeStatus: true,
+				preStatus: true,
+				ossClient: null
+			}
+		},
+		props: {
+			// 返回排序后图片
+			list: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			imgType: {
+				type: Number,
+				default: 1
+			},
+			fileNum: {
+				type: Number,
+				default: 9
+			},
+			// 选择图片数量限制
+			number: {
+				type: Number,
+				default: 100
+			},
+			// 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
+			imageWidth: {
+				type: Number,
+				default: 230
+			},
+			// 图片列数（cols > 0 则 imageWidth 无效）
+			cols: {
+				type: Number,
+				default: 0
+			},
+			// 图片周围空白填充，单位 rpx
+			padding: {
+				type: Number,
+				default: 10
+			},
+			// 拖动图片时放大倍数 [0, ∞)
+			scale: {
+				type: Number,
+				default: 1.1
+			},
+			// 拖动图片时不透明度
+			opacity: {
+				type: Number,
+				default: 0.7
+			},
+			// 自定义添加（需配合 @aaddImage 事件使用）
+			custom: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			areaHeight() {
+				if (this.imageList.length < this.number) {
+					return Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth + 'px'
+				} else {
+					return Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				}
+			},
+			childWidth() {
+				return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
+			},
+		},
+		created() {
+			this.width = uni.getSystemInfoSync().windowWidth
+			this.viewWidth = this.rpx2px(this.imageWidth)
+		},
+		mounted() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select('.area').boundingClientRect(data => {
+				this.colsValue = Math.floor(data.width / this.viewWidth)
+				if (this.cols > 0) {
+					this.colsValue = this.cols
+					this.viewWidth = data.width / this.cols
+				}
+				for (let item of this.list) {
+					this.addProperties(item)
+				}
+			})
+			query.exec()
+		},
+		methods: {
+			examineImgOne(index) {
+				// this.$emit('examineImgOne',index)
+				// this.previewList = this.list
+				// this.current = index
+				// this.$refs.previewImage.open(index);
+				let imgList = []
+				this.imageList.forEach((item) => {
+					console.log(item)
+					imgList.push(item.src)
+				})
+				uni.previewImage({
+					urls: imgList,
+					current: index,
+					success: () => {
 
-        }
-      })
-    },
-    startList(imgList){
-      if(imgList.length<=0){
-        let maxImageNum=this.imageList.length
-        if(maxImageNum>0){
-          for (let i=maxImageNum;i>0;--i){
-            let keyNum=i-1;
-            this.delImage(this.imageList[keyNum],keyNum)
-          }
-        }
-      }else {
-        imgList.forEach((item)=>{
-          this.addProperties(item)
-        })
-      }
+					}
+				})
+			},
+			startList(imgList) {
+				if (imgList.length <= 0) {
+					let maxImageNum = this.imageList.length
+					if (maxImageNum > 0) {
+						for (let i = maxImageNum; i > 0; --i) {
+							let keyNum = i - 1;
+							this.delImage(this.imageList[keyNum], keyNum)
+						}
+					}
+				} else {
+					imgList.forEach((item) => {
+						this.addProperties(item)
+					})
+				}
 
-    },
-    onChange(e, item) {
-      if (!item) return
-      item.oldX = e.detail.x
-      item.oldY = e.detail.y
-      if (e.detail.source === 'touch') {
-        if (item.moveEnd) {
-          item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY - item
-              .absY * this.viewWidth, 2))
-        }
-        let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
-        if (x >= this.colsValue) return
-        let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
-        let index = this.colsValue * y + x
-        if (item.index != index && index < this.imageList.length) {
-          this.changeStatus = false
-          for (let obj of this.imageList) {
-            if (item.index > index && obj.index >= index && obj.index < item.index) {
-              this.change(obj, 1)
-            } else if (item.index < index && obj.index <= index && obj.index > item.index) {
-              this.change(obj, -1)
-            } else if (obj.id != item.id) {
-              obj.offset = 0
-              obj.x = obj.oldX
-              obj.y = obj.oldY
-              setTimeout(() => {
-                this.$nextTick(() => {
-                  obj.x = obj.absX * this.viewWidth
-                  obj.y = obj.absY * this.viewWidth
-                })
-              }, 0)
-            }
-          }
-          item.index = index
-          item.absX = x
-          item.absY = y
-          this.sortList()
-        }
-      }
-    },
-    change(obj, i) {
-      obj.index += i
-      obj.offset = 0
-      obj.x = obj.oldX
-      obj.y = obj.oldY
-      obj.absX = obj.index % this.colsValue
-      obj.absY = Math.floor(obj.index / this.colsValue)
-      setTimeout(() => {
-        this.$nextTick(() => {
-          obj.x = obj.absX * this.viewWidth
-          obj.y = obj.absY * this.viewWidth
-        })
-      }, 0)
-    },
-    touchstart(item) {
-      this.imageList.forEach(v => {
-        v.zIndex = v.index + 9
-      })
-      item.zIndex = 99
-      item.moveEnd = true
-      this.tempItem = item
-      this.timer = setTimeout(() => {
-        item.scale = this.scale
-        item.opacity = this.opacity
-        clearTimeout(this.timer)
-        this.timer = null
-      }, 200)
-    },
-    touchend(item) {
-      this.previewImage(item)
-      item.scale = 1
-      item.opacity = 1
-      item.x = item.oldX
-      item.y = item.oldY
-      item.offset = 0
-      item.moveEnd = false
-      setTimeout(() => {
-        this.$nextTick(() => {
-          item.x = item.absX * this.viewWidth
-          item.y = item.absY * this.viewWidth
-          this.tempItem = null
-          this.changeStatus = true
-        })
-      }, 0)
-    },
-    previewImage(item) {
-      console.log(item)
-      if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
-        clearTimeout(this.timer)
-        this.timer = null
-        let src = this.list.findIndex(v => v === item.src)
-        uni.previewImage({
-          urls: this.list,
-          current: src,
-          success: () => {
-            this.preStatus = false
-            setTimeout(() => {
-              this.preStatus = true
-            }, 600)
-          }
-        })
-      } else if (this.timer) {
-        clearTimeout(this.timer)
-        this.timer = null
-      }
-    },
-    mouseenter() {
-      //#ifdef H5
-      this.imageList.forEach(v => {
-        v.disable = false
-      })
-      //#endif
+			},
+			onChange(e, item) {
+				if (!item) return
+				item.oldX = e.detail.x
+				item.oldY = e.detail.y
+				if (e.detail.source === 'touch') {
+					if (item.moveEnd) {
+						item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY -
+							item
+							.absY * this.viewWidth, 2))
+					}
+					let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
+					if (x >= this.colsValue) return
+					let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
+					let index = this.colsValue * y + x
+					if (item.index != index && index < this.imageList.length) {
+						this.changeStatus = false
+						for (let obj of this.imageList) {
+							if (item.index > index && obj.index >= index && obj.index < item.index) {
+								this.change(obj, 1)
+							} else if (item.index < index && obj.index <= index && obj.index > item.index) {
+								this.change(obj, -1)
+							} else if (obj.id != item.id) {
+								obj.offset = 0
+								obj.x = obj.oldX
+								obj.y = obj.oldY
+								setTimeout(() => {
+									this.$nextTick(() => {
+										obj.x = obj.absX * this.viewWidth
+										obj.y = obj.absY * this.viewWidth
+									})
+								}, 0)
+							}
+						}
+						item.index = index
+						item.absX = x
+						item.absY = y
+						this.sortList()
+					}
+				}
+			},
+			change(obj, i) {
+				obj.index += i
+				obj.offset = 0
+				obj.x = obj.oldX
+				obj.y = obj.oldY
+				obj.absX = obj.index % this.colsValue
+				obj.absY = Math.floor(obj.index / this.colsValue)
+				setTimeout(() => {
+					this.$nextTick(() => {
+						obj.x = obj.absX * this.viewWidth
+						obj.y = obj.absY * this.viewWidth
+					})
+				}, 0)
+			},
+			touchstart(item) {
+				this.imageList.forEach(v => {
+					v.zIndex = v.index + 9
+				})
+				item.zIndex = 99
+				item.moveEnd = true
+				this.tempItem = item
+				this.timer = setTimeout(() => {
+					item.scale = this.scale
+					item.opacity = this.opacity
+					clearTimeout(this.timer)
+					this.timer = null
+				}, 200)
+			},
+			touchend(item) {
+				this.previewImage(item)
+				item.scale = 1
+				item.opacity = 1
+				item.x = item.oldX
+				item.y = item.oldY
+				item.offset = 0
+				item.moveEnd = false
+				setTimeout(() => {
+					this.$nextTick(() => {
+						item.x = item.absX * this.viewWidth
+						item.y = item.absY * this.viewWidth
+						this.tempItem = null
+						this.changeStatus = true
+					})
+				}, 0)
+			},
+			previewImage(item) {
+				console.log(item)
+				if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+					clearTimeout(this.timer)
+					this.timer = null
+					let src = this.list.findIndex(v => v === item.src)
+					uni.previewImage({
+						urls: this.list,
+						current: src,
+						success: () => {
+							this.preStatus = false
+							setTimeout(() => {
+								this.preStatus = true
+							}, 600)
+						}
+					})
+				} else if (this.timer) {
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+			},
+			mouseenter() {
+				//#ifdef H5
+				this.imageList.forEach(v => {
+					v.disable = false
+				})
+				//#endif
 
-    },
-    mouseleave() {
-      //#ifdef H5
-      if (this.tempItem) {
-        this.imageList.forEach(v => {
-          v.disable = true
-          v.zIndex = v.index + 1
-          v.offset = 0
-          v.moveEnd = false
-          if (v.id == this.tempItem.id) {
-            if (this.timer) {
-              clearTimeout(this.timer)
-              this.timer = null
-            }
-            v.scale = 1
-            v.opacity = 1
-            v.x = v.oldX
-            v.y = v.oldY
-            this.$nextTick(() => {
-              v.x = v.absX * this.viewWidth
-              v.y = v.absY * this.viewWidth
-              this.tempItem = null
-            })
-          }
-        })
-        this.changeStatus = true
-      }
-      //#endif
-    },
-    selectMultimedia() {
-      if (this.imgType === 1) {
-        //图片选择
-        this.uploadingImg();
-      } else {
-        //视频选择
-        this.uploadingVideo();
-      }
-    },
-    uploadingImg() {
-      if (this.list.length > 100) {
-        tools.error('最多上传100张')
-        return;
-      }
-      uni.chooseImage({
-        count: this.fileNum, //默认9
-        sizeType: 'original', //可以指定是原图还是压缩图，默认二者都有 'camera' : 'album'
-        sourceType: ['album'],
-        success: (res) => {
-          console.log(res.tempFiles)
-          if (res.tempFiles !== undefined) {
-            console.log(res.tempFiles)
-            console.log('--------------------')
-            res.tempFiles.forEach((file) => {
-              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);
-                  }
-                }
-              }
-            })
-          }
-        },
-        fail: (e) => {
-          console.log(e)
-        }
-      });
-    },
-    uploadingVideo() {
-      uni.chooseVideo({
-        sourceType: ['album'],
-        maxDuration: 60,
-        success: (res) => {
-          console.log(res)
-          this.uploadingFile(res.tempFile);
-        }
-      });
-    },
-    uploadingFile(file) {
-      //图片上传
-      tools.showLoading();
-      console.log('----------------asdsa')
-      upLoadingFileOss(file).then((res) => {
-        console.log('----------------------上传成功')
-        console.log(res)
-        if (res) {
-          console.log(res)
-          console.log('------------url')
-          this.addProperties(res)
-          tools.hideLoading();
-        }else {
-          tools.hideLoading();
-          tools.error('上传失败')
-        }
-      }).catch((err) => {
-        tools.hideLoading();
-      })
-    },
-    addImages() {
-      if (this.custom) {
-        this.$emit('addImage')
-      } else {
-        let checkNumber = this.number - this.imageList.length
-        uni.chooseImage({
-          count: checkNumber,
-          sourceType: ['album', 'camera'],
-          success: res => {
-            let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res.tempFilePaths.length
-            for (let i = 0; i < count; i++) {
-              this.addProperties(res.tempFilePaths[i])
-            }
-          }
-        })
-      }
-    },
-    addImage(image) {
-      this.addProperties(image)
-    },
-    delImage(item, index) {
-      this.imageList.splice(index, 1)
-      for (let obj of this.imageList) {
-        if (obj.index > item.index) {
-          obj.index -= 1
-          obj.x = obj.oldX
-          obj.y = obj.oldY
-          obj.absX = obj.index % this.colsValue
-          obj.absY = Math.floor(obj.index / this.colsValue)
-          this.$nextTick(() => {
-            obj.x = obj.absX * this.viewWidth
-            obj.y = obj.absY * this.viewWidth
-          })
-        }
-      }
-      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
-      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      this.sortList()
-    },
-    delImageMp(item, index) {
-      //#ifdef MP
-      this.delImage(item, index)
-      //#endif
-    },
-    sortList() {
-      let list = this.imageList.slice()
-      list.sort((a, b) => {
-        return a.index - b.index
-      })
-      for (let i = 0; i < list.length; i++) {
-        list[i] = list[i].src
-      }
-      // this.$emit('update:list', list)
-      this.$emit('input', list)
-    },
-    addProperties(item) {
-      console.log('------------------addProperties')
-      console.log(item)
-      let absX = this.imageList.length % this.colsValue
-      let absY = Math.floor(this.imageList.length / this.colsValue)
-      let x = absX * this.viewWidth
-      let y = absY * this.viewWidth
-      this.imageList.push({
-        src: item,
-        x,
-        y,
-        oldX: x,
-        oldY: y,
-        absX,
-        absY,
-        scale: 1,
-        zIndex: 9,
-        opacity: 1,
-        index: this.imageList.length,
-        id: this.guid(),
-        disable: false,
-        offset: 0,
-        moveEnd: false
-      })
-      this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
-      this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
-      this.sortList()
-    },
-    nothing() {},
-    rpx2px(v) {
-      return this.width * v / 750
-    },
-    guid() {
-      function S4() {
-        return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-      }
-      return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
-    }
-  }
-}
+			},
+			mouseleave() {
+				//#ifdef H5
+				if (this.tempItem) {
+					this.imageList.forEach(v => {
+						v.disable = true
+						v.zIndex = v.index + 1
+						v.offset = 0
+						v.moveEnd = false
+						if (v.id == this.tempItem.id) {
+							if (this.timer) {
+								clearTimeout(this.timer)
+								this.timer = null
+							}
+							v.scale = 1
+							v.opacity = 1
+							v.x = v.oldX
+							v.y = v.oldY
+							this.$nextTick(() => {
+								v.x = v.absX * this.viewWidth
+								v.y = v.absY * this.viewWidth
+								this.tempItem = null
+							})
+						}
+					})
+					this.changeStatus = true
+				}
+				//#endif
+			},
+			selectMultimedia() {
+				if (this.imgType === 1) {
+					//图片选择
+					this.uploadingImg();
+				} else {
+					//视频选择
+					this.uploadingVideo();
+				}
+			},
+			uploadingImg() {
+				if (this.list.length > 100) {
+					tools.error('最多上传100张')
+					return;
+				}
+				uni.chooseImage({
+					count: this.fileNum, //默认9
+					sizeType: 'original', //可以指定是原图还是压缩图，默认二者都有 'camera' : 'album'
+					sourceType: ['album'],
+					success: (res) => {
+						console.log(res.tempFiles)
+						if (res.tempFiles !== undefined) {
+							console.log(res.tempFiles)
+							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);
+										}
+									}
+								}
+							})
+						}
+					},
+					fail: (e) => {
+						console.log(e)
+					}
+				});
+			},
+			uploadingVideo() {
+				uni.chooseVideo({
+					sourceType: ['album'],
+					maxDuration: 60,
+					success: (res) => {
+						console.log(res)
+						this.uploadingFile(res.tempFile);
+					}
+				});
+			},
+			uploadingFile(file) {
+				//图片上传
+				tools.showLoading();
+				console.log('----------------asdsa')
+				upLoadingFileOss(file).then((res) => {
+					console.log('----------------------上传成功')
+					console.log(res)
+					if (res) {
+						console.log(res)
+						console.log('------------url')
+						this.addProperties(res)
+						tools.hideLoading();
+					} else {
+						tools.hideLoading();
+						tools.error('上传失败')
+					}
+				}).catch((err) => {
+					tools.hideLoading();
+				})
+			},
+			addImages() {
+				if (this.custom) {
+					this.$emit('addImage')
+				} else {
+					let checkNumber = this.number - this.imageList.length
+					uni.chooseImage({
+						count: checkNumber,
+						sourceType: ['album', 'camera'],
+						success: res => {
+							let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res
+								.tempFilePaths.length
+							for (let i = 0; i < count; i++) {
+								this.addProperties(res.tempFilePaths[i])
+							}
+						}
+					})
+				}
+			},
+			addImage(image) {
+				this.addProperties(image)
+			},
+			delImage(item, index) {
+				this.imageList.splice(index, 1)
+				for (let obj of this.imageList) {
+					if (obj.index > item.index) {
+						obj.index -= 1
+						obj.x = obj.oldX
+						obj.y = obj.oldY
+						obj.absX = obj.index % this.colsValue
+						obj.absY = Math.floor(obj.index / this.colsValue)
+						this.$nextTick(() => {
+							obj.x = obj.absX * this.viewWidth
+							obj.y = obj.absY * this.viewWidth
+						})
+					}
+				}
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				this.sortList()
+			},
+			delImageMp(item, index) {
+				//#ifdef MP
+				this.delImage(item, index)
+				//#endif
+			},
+			sortList() {
+				let list = this.imageList.slice()
+				list.sort((a, b) => {
+					return a.index - b.index
+				})
+				for (let i = 0; i < list.length; i++) {
+					list[i] = list[i].src
+				}
+				// this.$emit('update:list', list)
+				this.$emit('input', list)
+			},
+			addProperties(item) {
+				console.log('------------------addProperties')
+				console.log(item)
+				let absX = this.imageList.length % this.colsValue
+				let absY = Math.floor(this.imageList.length / this.colsValue)
+				let x = absX * this.viewWidth
+				let y = absY * this.viewWidth
+				this.imageList.push({
+					src: item,
+					x,
+					y,
+					oldX: x,
+					oldY: y,
+					absX,
+					absY,
+					scale: 1,
+					zIndex: 9,
+					opacity: 1,
+					index: this.imageList.length,
+					id: this.guid(),
+					disable: false,
+					offset: 0,
+					moveEnd: false
+				})
+				this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+				this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+				this.sortList()
+			},
+			nothing() {},
+			rpx2px(v) {
+				return this.width * v / 750
+			},
+			guid() {
+				function S4() {
+					return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+				}
+				return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import url("../../static/css/en-common.css");
-.con {
-  padding: 30rpx;
+	@import url("../../static/css/en-common.css");
 
-  .area {
-    width: 100%;
+	.con {
+		padding: 30rpx;
 
-    .view {
-      display: flex;
-      justify-content: center;
-      align-items: center;
+		.area {
+			width: 100%;
 
-      .area-con {
-        position: relative;
+			.view {
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-        .pre-image {
-          width: 100%;
-          height: 100%;
-          border-radius: 10rpx;
-        }
+				.area-con {
+					position: relative;
 
-        .bf-img {
-          width: 40rpx;
-          height: 40rpx;
-          position: absolute;
-          left: 50%;
-          top: 50%;
-          //margin: -20rpx 0 0 -20rpx;
-          z-index: 2;
-        }
+					.pre-image {
+						width: 100%;
+						height: 100%;
+						border-radius: 10rpx;
+					}
 
-        .del-con {
-          position: absolute;
-          top: 5rpx;
-          right: 5rpx;
-          //padding: 0 0 20rpx 20rpx;
+					.bf-img {
+						width: 40rpx;
+						height: 40rpx;
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						//margin: -20rpx 0 0 -20rpx;
+						z-index: 2;
+					}
 
-          .del-wrap {
-            width: 36rpx;
-            height: 36rpx;
-            //background-color: rgba(0, 0, 0, 0.4);
-            border-radius: 0 0 0 10rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
+					.del-con {
+						position: absolute;
+						top: 5rpx;
+						right: 5rpx;
+						//padding: 0 0 20rpx 20rpx;
 
-            .del-image {
-              //width: 20rpx;
-              //height: 20rpx;
-            }
-          }
-        }
-      }
-    }
+						.del-wrap {
+							width: 36rpx;
+							height: 36rpx;
+							//background-color: rgba(0, 0, 0, 0.4);
+							border-radius: 0 0 0 10rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
 
-    .add {
-      position: absolute;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+							.del-image {
+								//width: 20rpx;
+								//height: 20rpx;
+							}
+						}
+					}
+				}
+			}
 
-      .add-wrap {
-        // display: flex;
-        // justify-content: center;
-        // align-items: center;
-        background: #F7F7F7;
-        border-radius: 10rpx;
+			.add {
+				position: absolute;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-        .add-img {
-          width: 80rpx;
-          height: 80rpx;
-          margin: 0 auto;
-          padding-top: 44rpx;
-        }
+				.add-wrap {
+					// display: flex;
+					// justify-content: center;
+					// align-items: center;
+					background: #F7F7F7;
+					border-radius: 10rpx;
 
-        .names {
-          color: #6F6F6F;
-          font-size: 28rpx;
-          text-align: center;
-        }
-        .video-data{
-          width: 212rpx;
-          height: 212rpx;
-          //background-color: #fff;
-          text-align: center;
-          line-height: 212rpx;
-          .video-img {
-            font-size: 100rpx;
-            color: #333333;
-          }
-        }
+					.add-img {
+						width: 80rpx;
+						height: 80rpx;
+						margin: 0 auto;
+						padding-top: 44rpx;
+					}
 
-      }
-    }
-  }
-}
-</style>
+					.names {
+						color: #6F6F6F;
+						font-size: 28rpx;
+						text-align: center;
+					}
+
+					.video-data {
+						width: 212rpx;
+						height: 212rpx;
+						//background-color: #fff;
+						text-align: center;
+						line-height: 212rpx;
+
+						.video-img {
+							font-size: 100rpx;
+							color: #333333;
+						}
+					}
+
+				}
+			}
+		}
+	}
+</style>

pages-buy/dry-clean.vue

@@ -8,7 +8,7 @@
 				<view class="display-flex mb-16">
 					<view class="w410 fs-40 fw-600 text-overflow-ellipsis-one">{{siteData.name?siteData.name:'请选择站点'}}
 					</view>
-					<view class="fs-28 fw-400 fc-41ABF5 text-align-right" @click="selectsShop()">【切换站点】</view>
+					<view class="fs-28 fw-400 fc-41ABF5 text-align-right" @click="selectsShop()">【{{siteData.name?'切换':'选择'}}站点】</view>
 				</view>
 				<view class="display-flex">
 					<view v-if="siteData.city_name||siteData.address" class="w410 fs-26 fw-400 fc-9">

pages-my/appraise.vue

@@ -41,12 +41,12 @@
 						请输入你的评价内容
 					</view>
 					<view class="textarea-box">
-						<textarea v-model="formData.content" placeholder-style="color:#ccc" auto-height maxlength='100'
+						<textarea class="textarea" v-model="formData.content" placeholder-style="color:#ccc" auto-height maxlength='100'
 							placeholder="请输入" />
 					</view>
 					<view class="up-img-box align-items-center flex-wrap-wrap">
 						<view class="up-img" v-for="(item, index) in formData.images" :key="index">
-							<image class="img" :src="item" mode=""></image>
+							<image class="img" :src="item" mode="aspectFill"></image>
 							<uni-icons @click="deleteImg(index)" class="delete-icons" color="#000" type="clear"
 								size="20"></uni-icons>
 						</view>
@@ -209,6 +209,9 @@
 		width: 100%;
 		height: 200rpx;
 	}
+	.textarea{
+		height: 200rpx;
+	}
 
 	.up-img {
 		width: 204rpx;

pages-order/laundry-info.vue

@@ -3,7 +3,7 @@
 		<Nav title=" " leftIconColor="#333" titleColor="#333" bgckgroundBox='transparent'></Nav>
 		<image class="bg-img" src="@/static/img/order/bg.png" mode=""></image>
 		<view class="p-24-24-0 box-border-box">
-			<view class="mb-24" v-show="infoData.order_status == 1">
+			<view class="mb-24" v-if="infoData.order_status == 1">
 				<view class="fs-40 fc-3 mb-8">
 					{{infoData.order_status_str}}，剩余{{time.m}}:{{time.s}}
 				</view>
@@ -11,7 +11,7 @@
 					10分钟内未支付，订单将自动取消
 				</view>
 			</view>
-			<view class="mb-24">
+			<view class="mb-24" v-else>
 				<view class="fs-48 fc-3 fw-600">
 					{{infoData.order_status_str}}
 				</view>
@@ -20,7 +20,7 @@
 				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3" v-show="infoData.order_status == 1">
 					请尽快支付
 				</view>
-				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3" v-show="infoData.order_status == 4">
+				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3" v-show="infoData.order_status == 5 || infoData.order_status == 6">
 					感谢你对君子校园的信任，期待你再次光临
 				</view>
 				<view class="align-items-center flex-wrap-wrap">
@@ -129,7 +129,7 @@
 						{{infoData.pay_type_str}}
 					</view>
 				</view>
-				<view class="display-flex flex-justify-space mb-26">
+				<view class="display-flex flex-justify-space">
 					<view class="fs-28 fc-9">
 						备注
 					</view>
@@ -170,7 +170,7 @@
 		},
 		onLoad(data) {
 			if (data) {
-				console.log(data);
+				// console.log(data);
 				this.laundryOrderInfo(data.orderId)
 			}
 		},

pages-school/circle-info.vue

@@ -8,9 +8,9 @@
 							mode="scaleToFill"></image>
 						<view class="info-nav display-flex">
 							<image :src="obj.head_img" mode=""></image>
-							<view class="">
-								<view class="fs-32 fw-600 w348 text-overflow-ellipsis-one">{{obj.nickname||''}}</view>
-								<view class="fs-24 fc-9 fw-400">{{obj.created_date||''}}</view>
+							<view class="pb-5">
+								<view class="fs-28 fw-600 w348 text-overflow-ellipsis-one">{{obj.nickname||''}}</view>
+								<view class="fs-20 fc-9 fw-400 mb-10">{{obj.created_date||''}}</view>
 							</view>
 						</view>
 					</view>
@@ -65,14 +65,17 @@
 										{{item.nickname}}
 										<span v-if="item.is_author == 1"
 											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-										<view class="ml-10" v-if="item.is_self == 1" @click="delInfo(item, i, 1, i)">
-											<uni-icons type="trash" size="18"></uni-icons>
-										</view>
+
 									</view>
-									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
+									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item,i,i)">
 										{{item.content}}
 									</view>
-									<view class="fs-24 fw-400 fc-9 mb-8">{{item.created_date}}</view>
+									<view class="align-items-center mb-8">
+										<view class="fs-24 fw-400 fc-9">{{item.created_date}}</view>
+										<uni-icons class="ml-10" v-if="item.is_self == 1"
+											@click="delInfo(item, i, 1, i)" type="trash" size="18"
+											color="#BFBFBF"></uni-icons>
+									</view>
 								</view>
 								<view class="display-flex" @click.stop="handUp(2,item)">
 									<uni-icons type="hand-up" size="20"
@@ -98,15 +101,16 @@
 													</view>
 													<span v-if="info.is_author == 1"
 														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-													<view class="ml-10" v-if="info.is_self == 1"
-														@click="delInfo(info, index, 2 ,i)">
-														<uni-icons type="trash" size="18"></uni-icons>
-													</view>
 												</view>
-												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info,index)">
+												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info,index,i)">
 													{{info.content}}
 												</view>
-												<view class="fs-24 fw-400 fc-9 mb-8">{{info.created_date}}</view>
+												<view class="align-items-center mb-8">
+													<view class="fs-24 fw-400 fc-9 ">{{info.created_date}}</view>
+													<uni-icons type="trash" size="18" class="ml-10"
+														v-if="info.is_self == 1"
+														@click="delInfo(info, index, 2 ,i)" color="#BFBFBF"></uni-icons>
+												</view>
 											</view>
 											<view class="display-flex" @click.stop="handUp(2,info)">
 												<uni-icons type="hand-up" size="20"
@@ -129,10 +133,13 @@
 		</scroll-view>
 
 		<view class="card-5 align-items-center flex-justify-space box-border-box boder-b-t">
-			<!-- <view class="input-box-box fs-28 fc-9 mr-20" @click.stop="openInput(0,'')">友善评论，文明发言</view> -->
-			<input class="fs-input" :focus='focus' v-model="msgData.content" @click.stop="openInput(0,'')" type="text"
-				@focus='inputFocus(true)' @blur='inputFocus(false)' />
-			<view class="display-flex" v-if="!inputRightType">
+			<view class="input-box-box fs-28 fc-9 mr-20" @click.stop="openInput(0,'','','')">友善评论，文明发言</view>
+			<!-- 			<input class="fs-input" :focus='focus' v-model="msgData.content" @click.stop="openInput(0,'','','')"
+				type="text" @focus='inputFocus(true)' @blur='inputFocus(false)' /> -->
+			<!-- 			<textarea class="fs-input fs-36 fc-3" :focus='focus' v-model="msgData.content"
+				@click.stop="openInput(0,'','','')" @focus='inputFocus(true)' @blur='inputFocus(false)' auto-height /> -->
+
+			<view class="display-flex flex-shrink0">
 				<view class="align-items-center mr-20" @click.stop="handUp(1,obj)">
 					<uni-icons type="hand-up" size="22" :color="obj.is_like==1?'#FD5C02':'#999'"></uni-icons>
 					<view :class="obj.is_like==1?'fc-FD5C02':'fc-9'">
@@ -145,13 +152,20 @@
 					<view class="fs-24 fc-9">举报</view>
 				</view>
 			</view>
-			<image v-else class="wh64" @click.stop="save()" src="@/static/img/school/fs.png" mode=""></image>
+			<!-- <image v-else class="wh64" @click.stop="save()" src="@/static/img/school/fs.png" mode=""></image> -->
 		</view>
 
 		<uni-popup ref="popup" type="bottom">
-			<view class="pop-input align-items-center">
-				<input class="fs-input" focus type="text" />
-				<!-- 				<view class="head-pop flex-justify-space align-items-center mb-24 box-border-box p-24">
+			<view class="pop-input">
+				<view class="text-align-right mb-20 fs-30 fc-41ABF5" @click.stop="save()">
+					发送
+				</view>
+				<textarea class="fs-input fs-28 fc-3" :focus='focus' v-model="msgData.content" placeholder='友善评论，文明发言'
+					maxlength="100" placeholder-class='fs-28 fc-9 fw-600' @focus='inputFocus(true)'
+					@blur='inputFocus(false)' @keyboardheightchange='keyboardheightchange' />
+				<view :style="[{'height': KeyboardHeight +'px'}]"> </view>
+				<!-- 				<input class="fs-input" focus type="text" />
+				<view class="head-pop flex-justify-space align-items-center mb-24 box-border-box p-24">
 					<view class="fs-28 fw-600 fc-41ABF5"></view>
 					<view class="fs-36 fc-0 fw-600">评论</view>
 					<uni-icons @click="closeInput()" type="closeempty" size="24"></uni-icons>
@@ -159,7 +173,8 @@
 				<view class="scroll-view-css">
 					<view class="bgc-f box-border-box p-32">
 						<view class="fs-34 fw-600 mb-20">评论</view>
-						<textarea v-model="msgData.content" maxlength="100" class=" fs-24" placeholder='友善评论，文明发言'></textarea>
+						<textarea v-model="msgData.content" maxlength="100" class=" fs-24"
+							placeholder='友善评论，文明发言'></textarea>
 					</view>
 				</view>
 				<view class="box-border-box p-24">
@@ -169,17 +184,17 @@
 		</uni-popup>
 
 		<uni-popup ref="popupRepot" type="bottom">
-			<view class="pop-box pop-h-30 box-border-box p-24">
+			<view class="pop-box pop-h-30 box-border-box p-24" :style="'bottom:'+KeyboardHeight+'px;'">
 				<view class="head-pop flex-justify-space align-items-center mb-24">
 					<uni-icons @click.stop="closePop(1)" type="closeempty" size="24"></uni-icons>
 					<view class="fs-36 fc-0 fw-600">请输入举报内容</view>
-					<view class="fs-28 fw-600 fc-41ABF5">确定</view>
+					<view class="fs-28 fw-600 fc-41ABF5" @click.stop="closePop(2)">确定</view>
 				</view>
 				<view class="scroll-view-css">
 					<textarea style="height: 100%;" v-model="reportData.content" class=" fs-24" :maxlength='50'
 						placeholder='请输入举报内容'></textarea>
 				</view>
-				<view @click.stop="closePop(2)" class="b-bottom text-align-center fs-32 fw-600 fc-f">确认举报</view>
+				<!-- <view @click.stop="closePop(2)" class="b-bottom text-align-center fs-32 fc-3 fw-600 fc-f">确认举报</view> -->
 			</view>
 		</uni-popup>
 	</view>
@@ -203,7 +218,6 @@
 		},
 		data() {
 			return {
-				inputRightType: false,
 				isAJAX: false,
 				news_id: '',
 				obj: {
@@ -232,6 +246,9 @@
 				focus: false,
 				msgType: 0, // 消息类型
 				msgIndex: 0, // 列表一级索引
+				msgI: 0,
+				KeyboardHeight: 0, // 键盘高度
+				// showKeyNum: 0, //键盘打开的次数
 			}
 		},
 		onLoad(e) {
@@ -239,12 +256,30 @@
 			this.msgData.news_id = e.news_id;
 			this.getInfo();
 			this.getList();
+			uni.onKeyboardHeightChange(res => {
+				console.log('log', res);
+				this.KeyboardHeight = res.height
+			})
 		},
 		methods: {
+			// keyboardheightchange(e) {
+			// 	this.keyboardHeight = e.detail.height;
+			// 	console.log(this.keyboardHeight, '1111111111');
+			// 	this.showKeyNum++;
+			// 	setTimeout(() => {
+			// 		uni.pageScrollTo({
+			// 			scrollTop: 2000
+			// 		});
+			// 	}, 200)
+			// },
+			// hideBorad() {
+			// 	this.showKeyNum = 2;
+			// 	this.keyboardHeight = 0;
+			// },
 			inputFocus(type) {
-				this.inputRightType = type
 				if (!type) {
 					this.focus = false
+					// this.hideBorad()
 				}
 				this.$forceUpdate()
 			},
@@ -359,9 +394,11 @@
 					tools.error(res.msg);
 				}
 			},
-			openInput(type, item, index) {
+			openInput(type, item, index, i) {
+				console.log(index, i, '$$$$$$$$$$$$$$$$$');
 				this.msgIndex = index
 				this.msgType = type
+				this.msgI = i
 				if (type == 0) {
 					this.msgData.remark_id = 0;
 				} else if (type == 1) {
@@ -371,8 +408,13 @@
 					this.msgData.remark_id = item.remark_id;
 					this.msgData.reply_id = item.m_id;
 				}
-				this.focus = true
-				// this.$refs.popup.open();
+				this.$refs.popup.open();
+				setTimeout(() => {
+					this.focus = true
+					// this.$forceUpdate()
+				}, 500);
+
+				// console.log(this.focus, '是否聚焦');
 			},
 			closeInput() {
 				this.$refs.popup.close();
@@ -393,24 +435,28 @@
 							this.closeInput()
 							if (this.msgType == 0) {
 								this.list.unshift(res.data)
+								this.$forceUpdate()
 							} else if (this.msgType == 1) {
 								let replyList = []
-								this.list[this.msgIndex].count += 1
+									++this.list[this.msgI].count
+								console.log(this.list[this.msgIndex], '二级');
 								if (this.list[this.msgIndex].replyList) {
-									this.list[this.msgIndex].replyList.unshift(res.data)
+									this.list[this.msgIndex].replyList.push(res.data)
 								} else {
 									this.list[this.msgIndex].replyList = replyList
-									this.list[this.msgIndex].replyList.unshift(res.data)
+									this.list[this.msgIndex].replyList.push(res.data)
+									this.$forceUpdate()
 								}
-								console.log(this.list[this.msgIndex], '############');
-								// this.$forceUpdate()
 							} else {
-								this.list[this.msgIndex].count += 1
-								this.list[this.msgIndex].replyList.push(res.data)
+								console.log(this.list[this.msgIndex]);
+								++this.list[this.msgI].count
+								this.list[this.msgI].replyList.push(res.data)
+								this.$forceUpdate()
 							}
-							this.$forceUpdate()
+							console.log(this.list[this.msgIndex]);
 							this.msgIndex = 0
 							this.msgType = 0
+							this.msgI = 0
 							// this.list = [];
 							// this.page = 1;
 							// this.getList();
@@ -433,8 +479,8 @@
 						tools.success('删除成功')
 						setTimeout(() => {
 							this.isAJAX = false;
-							console.log();
-							this.list[i].count -= 1
+							console.log(this.list[i], '88888888888888888');
+							--this.list[i].count
 							if (type == 1) {
 								this.list.splice(index, 1)
 							} else {
@@ -499,13 +545,13 @@
 
 	.fs-input {
 		flex: 1;
-		margin: 0 32rpx 0 0;
-		height: 72rpx;
-		line-height: 72rpx;
+		width: 100%;
+		height: 170rpx !important;
+		// line-height: 72rpx;
 		background: #F2F2F2;
-		border-radius: 200rpx;
+		border-radius: 20rpx;
 		box-sizing: border-box;
-		padding: 0 24rpx;
+		padding: 20rpx 24rpx;
 	}
 
 	.wh64 {
@@ -530,7 +576,8 @@
 		}
 
 		.card-5 {
-			padding: 20rpx 24rpx 20rpx 24rpx;
+			height: 98rpx;
+			padding: 9rpx 24rpx 9rpx 32rpx;
 
 			image {
 				width: 40rpx;
@@ -596,7 +643,7 @@
 			height: auto;
 			background-color: #fff;
 			border-top: 1rpx solid #ccc;
-			padding: 9rpx 24rpx 9rpx 32rpx;
+			padding: 15rpx 24rpx;
 			box-sizing: border-box;
 			// .save-box{
 			// 	text-align: center;

pages-school/school-circle.vue

@@ -12,7 +12,8 @@
 						</view>
 					</view>
 					<view class="nav-title w-390 text-overflow-ellipsis-one text-align-center fs-36 fw-400">
-						{{schoolData.school_name}}</view>
+						{{schoolData.school_name}}
+					</view>
 				</view>
 			</template>
 		</Nav>
@@ -51,7 +52,8 @@
 			</EnBlank>
 		</view>
 
-		<scroll-view v-else scroll-y="true" class="scroll-view-css pl-24 pr-24 box-border-box bgc-F5F4F9" @scrolltolower="scrolltolower">
+		<scroll-view v-else scroll-y="true" class="scroll-view-css pl-24 pr-24 box-border-box bgc-F5F4F9"
+			@scrolltolower="scrolltolower">
 			<view class="card-box box-border-box p-24 bgc-f flex-justify-space" v-for="(item,i) in list" :key="i"
 				@click.stop="toDet(item)">
 				<image class="card-head" :src="item.head_img" mode="scaleToFill"></image>
@@ -320,15 +322,14 @@
 				alumni_str: '' // 校友圈提示
 			}
 		},
-		onShow() {
+		onShow() {},
+		mounted() {
 			let circleSchoolId = uni.getStorageSync('circleSchoolId');
 			let schoolName = uni.getStorageSync('school_name');
 			let circleSchoolName = uni.getStorageSync('circleSchoolName');
 			this.schoolData.school_name = circleSchoolId ? circleSchoolName : schoolName;
-
 			this.classList = [];
 			this.getTopic();
-
 			this.list = [];
 			this.fromData.page = 1;
 			this.getList();

pages-takeout/goods-order.vue

@@ -25,7 +25,7 @@
 						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
 					</view>
 				</view>
-<!-- 				<view class="box-input flex-justify-space box-border-box p-b-20 mb-20">
+				<!-- 				<view class="box-input flex-justify-space box-border-box p-b-20 mb-20">
 					<view class="fs-28 fw-600">配送方式</view>
 					<view class="fs-24 fw-400 sd-box fc-FB3D03">送达宿舍</view>
 				</view> -->
@@ -304,8 +304,9 @@
 										this.isAJAX = false;
 										setTimeout(() => {
 											uni.switchTab({
-												url: "/pages/order/index"
+												url: '/pages/order/index'
 											})
+											uni.setStorageSync('orderPayType', 1)
 										}, 1000)
 									},
 									fail: (err) => {
@@ -313,8 +314,9 @@
 										tools.error("支付失败");
 										setTimeout(() => {
 											uni.switchTab({
-												url: "/pages/order/index"
+												url: '/pages/order/index'
 											})
+											uni.setStorageSync('orderPayType', 1)
 										}, 1000)
 									},
 								});
@@ -323,8 +325,9 @@
 								tools.error("支付失败");
 								setTimeout(() => {
 									uni.switchTab({
-										url: "/pages/order/index"
+										url: '/pages/order/index'
 									})
+									uni.setStorageSync('orderPayType', 1)
 								}, 1000)
 							}
 						})

pages-takeout/shop.vue

@@ -278,7 +278,7 @@
 								if (res.code === 1) {
 									tools.success(res.msg)
 									this.getShopIngList()
-                  this.$refs.popupBuy.close()
+									this.$refs.popupBuy.close()
 								} else {
 									tools.error(res.msg)
 								}

pages/order/index.vue

@@ -126,7 +126,7 @@
 							立即支付
 						</view>
 						<view class="item-but but-class-one fs-28" @click.stop="openCode(item)"
-							v-if="type == 5 && item.order_status == 2 || type == 5 && item.order_status == 3 || type == 5 && item.order_status == 4">
+							v-if="type == 5 && item.order_status == 2 || type == 5 && item.order_status == 4">
 							二维码
 						</view>
 						<view @click.stop="goToUrl('takeOut', item)" class="item-but but-class-one fs-28 mr-18"
@@ -158,10 +158,10 @@
 				</view>
 			</view>
 		</scroll-view>
-		<uni-popup ref="popup" border-radius="10px 10px 10px 10px" @maskClick=maskClick>
-			<view class="bgc-f b-rad-20">
+		<uni-popup ref="popup" border-radius="10px 10px 10px 10px" @maskClick='maskClick'>
+			<view class="bgc-f b-rad-20" v-if="qrcodeData">
 				<!-- <UniQrcode :text="qrcodeData"></UniQrcode> -->
-				<!-- <uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode> -->
+				<uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode>
 			</view>
 		</uni-popup>
 	</view>
@@ -244,7 +244,12 @@
 			};
 		},
 		onShow() {
-			this.resetList();
+			let orderPayType = uni.getStorageSync('orderPayType')
+			if (orderPayType) {
+				this.selectType(orderPayType)
+			} else {
+				this.resetList();
+			}
 		},
 		methods: {
 			openCode(item) {
@@ -712,10 +717,11 @@
 </script>
 
 <style lang="scss" scoped>
-	.nav-b{
+	.nav-b {
 		position: relative;
 		z-index: -1 !important;
 	}
+
 	.nav-box {
 		padding: 26rpx 44rpx;
 		overflow-x: scroll;