From d72daf3a2053d27c8884741afdc4c7d56c10b900 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Tue, 23 Jul 2024 15:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/XJ-comment/componets/common.vue    |   41 +-
 components/XJ-comment/index.vue               |  841 +++++-----
 .../douyin-scrollview/douyin-scrollview.nvue  | 1487 -----------------
 pages.json                                    |    1 +
 pages/index/index.vue                         |   23 +-
 pages/videoCircle/index - 副本 (2).vue        |  756 ---------
 pages/videoCircle/index.vue                   |  249 ++-
 uni_modules/uni-easyinput/changelog.md        |  115 ++
 .../components/uni-easyinput/common.js        |   54 +
 .../uni-easyinput/uni-easyinput.vue           |  676 ++++++++
 uni_modules/uni-easyinput/package.json        |   88 +
 uni_modules/uni-easyinput/readme.md           |   11 +
 uni_modules/uni-tag/changelog.md              |   23 +
 .../uni-tag/components/uni-tag/uni-tag.vue    |  252 +++
 uni_modules/uni-tag/package.json              |   84 +
 uni_modules/uni-tag/readme.md                 |   13 +
 16 files changed, 2023 insertions(+), 2691 deletions(-)
 delete mode 100644 components/douyin-scrollview/douyin-scrollview.nvue
 delete mode 100644 pages/videoCircle/index - 副本 (2).vue
 create mode 100644 uni_modules/uni-easyinput/changelog.md
 create mode 100644 uni_modules/uni-easyinput/components/uni-easyinput/common.js
 create mode 100644 uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
 create mode 100644 uni_modules/uni-easyinput/package.json
 create mode 100644 uni_modules/uni-easyinput/readme.md
 create mode 100644 uni_modules/uni-tag/changelog.md
 create mode 100644 uni_modules/uni-tag/components/uni-tag/uni-tag.vue
 create mode 100644 uni_modules/uni-tag/package.json
 create mode 100644 uni_modules/uni-tag/readme.md

diff --git a/components/XJ-comment/componets/common.vue b/components/XJ-comment/componets/common.vue
index 65b97c4..b2e327b 100644
--- a/components/XJ-comment/componets/common.vue
+++ b/components/XJ-comment/componets/common.vue
@@ -3,7 +3,7 @@
     <view class="top">
       <view class="top_left">
         <img class="user_avatar" :src="data.user_avatar" />
-        <uni-tag
+       <!-- <uni-tag
           v-if="data.owner"	
           class="tag"
           type="primary"
@@ -11,11 +11,15 @@
           text="作者"
           size="mini"
           circle
-        />
-        <span class="user_name">{{ data.user_name }}</span>
-        <span class="user_name">{{ cReplyName }}</span>
+        /> -->
+		<view class="top_left_time">
+			<span class="user_name">{{ data.user_name }}</span>
+			 <span class="create_time" style="color: #fff;">{{ data.create_time }}</span>
+		</view>
+       
+        <!-- <span class="user_name">{{ cReplyName }}</span> -->
       </view>
-      <view class="top_right" @tap="likeClick(data)">
+      <!-- <view class="top_right" @tap="likeClick(data)">
         <span :class="[data.is_like ? 'active' : '', 'like_count']">{{
           cLikeCount
         }}</span>
@@ -31,25 +35,25 @@
           size="24"
           color="#999"
         ></uni-icons>
-      </view>
+      </view> -->
     </view>
     <view class="content" @tap="replyClick(data)">
       {{ c_content }}
-      <span
+     <!-- <span
         class="shrink"
         v-if="isShrink"
         @tap.stop="expandContentFun(data.user_content)"
         >...展开</span
-      >
+      > -->
     </view>
     <view class="bottom">
-      <span class="create_time">{{ data.create_time }}</span>
-      <span
+      <!-- <span class="create_time">{{ data.create_time }}</span> -->
+     <!-- <span
         v-if="data.owner"
         class="delete"
         @tap="deleteClick(data)"
         >删除</span
-      >
+      > -->
      <!-- <span v-else class="reply" @tap="replyClick(data)"
         >回复</span> -->
     </view>
@@ -86,9 +90,6 @@ export default {
         : this.data.like_count;
     }
   },
-  mounted() {
-  	console.log("回复名字为：" ,this.data);
-  },
   methods: {
 	  // 展开评论
     expandContentFun() {
@@ -126,6 +127,13 @@ export default {
   text-overflow: ellipsis; //溢出省略号显示
 }
 ////////////////////////
+.top_left_time{
+	display: flex;
+	flex-direction: row;
+	align-items: baseline;
+	justify-content: space-between;
+	width: 100%;
+}
 .comment_item {
   font-size: 28rpx;
   .top {
@@ -135,6 +143,7 @@ export default {
       display: flex;
       align-items: center;
       overflow: hidden;
+	  width: 100%;
       .user_avatar {
         width: 68rpx;
         height: 68rpx;
@@ -163,9 +172,9 @@ export default {
   .content {
     padding: 10rpx;
     margin-left: 70rpx;
-    color: $uni-text-color;
+    color: #fff;
     &:active {
-      background-color: $uni-bg-color-hover;
+      // background-color: $uni-bg-color-hover;
     }
     .shrink {
       padding: 20rpx 20rpx 20rpx 0rpx;
diff --git a/components/XJ-comment/index.vue b/components/XJ-comment/index.vue
index 8cab6ce..4b022cb 100644
--- a/components/XJ-comment/index.vue
+++ b/components/XJ-comment/index.vue
@@ -1,400 +1,473 @@
 <template>
-	<view>
-  <view class="c_total">评论 {{ tableTotal }}</view>
-  <template v-if="dataList && dataList.length">
-    <view class="c_comment" v-for="(item1, index1) in dataList" :key="item1.id">
-      <!-- 一级评论 -->
-      <CommonComp
-        :data="item1"
-        @likeClick="() => likeClick({ item1, index1 })"
-        @replyClick="() => replyClick({ item1, index1 })"
-        @deleteClick="() => deleteClick({ item1, index1 })"
-      />
-      <view
-        class="children_item"
-        v-if="item1.children && item1.children.length"
-      >
-        <!-- 二级评论 -->
-        <CommonComp
-          v-for="(item2, index2) in item1.childrenShow"
-          :key="item2.id"
-          :data="item2"
-          :pData="item1"
-          @likeClick="() => likeClick({ item1, index1, item2, index2 })"
-          @replyClick="() => replyClick({ item1, index1, item2, index2 })"
-          @deleteClick="() => deleteClick({ item1, index1, item2, index2 })"
-        />
-        <!-- 展开折叠的二级评论 -->
-        <view
-          class="expand_reply"
-          v-if="expandTxtShow({ item1, index1 })"
-          @tap="() => expandReplyFun({ item1, index1 })"
-        >
-          <span class="txt">
-            展开{{ item1.children.length - item1.childrenShow.length }}条回复
-          </span>
-          <uni-icons type="down" size="24" color="#007aff"></uni-icons>
-        </view>
-      </view>
-    </view>
-  </template>
-  <!-- 空盒子 -->
-  <view class="empty_box" v-else>
-    <uni-icons type="chatboxes" size="36" color="#c0c0c0"></uni-icons>
-    <view>
-      <span class="txt"> 这里是一片荒草地, </span>
-      <span class="txt click" @click="() => newCommentFun()">说点什么...</span>
-    </view>
-  </view>
-  <!-- 评论弹窗 -->
-  <uni-popup ref="cPopupRef" type="bottom" @change="popChange">
-    <view class="c_popup_box">
-      <view class="reply_text">
-        <template v-if="Object.keys(replyTemp).length">
-          <span class="text_aid">回复给</span>
-          <span class="text_main">{{
+	
+	<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="loadMore">
+		<!-- <view class="c_total">评论 {{ tableTotal }}</view> -->
+		<template v-if="dataList && dataList.length">
+			<view class="c_comment" v-for="(item1, index1) in dataList" :key="item1.id">
+				<!-- 一级评论 -->
+				<CommonComp :data="item1" />
+				<!-- 下边三个方法是 一级评论点击回复 -->
+				<!-- @likeClick="() => likeClick({ item1, index1 })"
+				  @replyClick="() => replyClick({ item1, index1 })"
+				  @deleteClick="() => deleteClick({ item1, index1 })" -->
+				<view class="children_item" v-if="item1.children && item1.children.length">
+					<!-- 二级评论 -->
+					<CommonComp v-for="(item2, index2) in item1.childrenShow" :key="item2.id" :data="item2"
+						:pData="item1" />
+						<!-- 下边三个方法是 二级评论点击回复 -->
+						<!-- @likeClick="() => likeClick({ item1, index1, item2, index2 })"
+						@replyClick="() => replyClick({ item1, index1, item2, index2 })"
+						@deleteClick="() => deleteClick({ item1, index1, item2, index2 })" -->
+					<!-- 展开折叠的二级评论 -->
+					<view class="expand_reply" v-if="expandTxtShow({ item1, index1 })"
+						@tap="() => expandReplyFun({ item1, index1 })">
+						<span class="txt">
+							展开{{ item1.children.length - item1.childrenShow.length }}条回复
+						</span>
+						<uni-icons type="down" size="24" color="#007aff"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 空盒子 -->
+		<view class="empty_box" v-else>
+			<uni-icons type="chatboxes" size="36" color="#c0c0c0"></uni-icons>
+			<view>
+				<span class="txt"> 这里是一片荒草地, </span>
+				<span class="txt click" @click="() => newCommentFun()">说点什么...</span>
+			</view>
+		</view>
+		<!-- 评论弹窗 -->
+		<uni-popup ref="cPopupRef" type="bottom" @change="popChange">
+			<view class="c_popup_box">
+				<view class="reply_text">
+					<template v-if="Object.keys(replyTemp).length">
+						<span class="text_aid">回复给</span>
+						<span class="text_main">{{
             replyTemp.item1.item2
               ? replyTemp.item1.item2.user_name
               : replyTemp.item1.item1.user_name
           }}</span>
-        </template>
-        <span v-else class="text_main">发表新评论</span>
-      </view>
-      <view class="content">
-        <view class="text_area">
-          <uni-easyinput
-            class="text_area"
-            type="textarea"
-            v-model="commentValue"
-            :placeholder="commentPlaceholder"
-            :focus="focus"
-            trim
-            autoHeight
-            maxlength="300"
-          ></uni-easyinput>
-        </view>
-        <view class="send_btn" @tap="() => sendClick()">发送</view>
-      </view>
-    </view>
-  </uni-popup>
-  <!-- 删除弹窗 -->
-  <uni-popup ref="delPopupRef" type="dialog">
-    <uni-popup-dialog
-      mode="base"
-      title=""
-      content="确定删除这条评论吗?"
-      :before-close="true"
-      @close="delCloseFun"
-      @confirm="delConfirmFun"
-    ></uni-popup-dialog>
-  </uni-popup>
-  </view>
+					</template>
+					<span v-else class="text_main">发表新评论</span>
+				</view>
+				<view class="content">
+					<view class="text_area">
+						<uni-easyinput class="text_area" type="textarea" v-model="commentValue"
+							:placeholder="commentPlaceholder" :focus="focus" trim autoHeight
+							maxlength="300"></uni-easyinput>
+					</view>
+					<view class="send_btn" @tap="() => sendClick()">发送</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 删除弹窗 -->
+		<uni-popup ref="delPopupRef" type="dialog">
+			<uni-popup-dialog mode="base" title="" content="确定删除这条评论吗?" :before-close="true" @close="delCloseFun"
+				@confirm="delConfirmFun"></uni-popup-dialog>
+		</uni-popup>
+	</scroll-view>
 </template>
 
 <script>
-import CommonComp from "./componets/common";
+	import CommonComp from "./componets/common";
 
-export default {
-  components: {
-    CommonComp
-  },
-  props: {
-    userInfo: {
-      type: Object,
-      default: () => ({})
-    },
-    tableData: {
-      type: Array,
-      default: () => []
-    },
-    tableTotal: {
-      type: Number,
-      default: 0
-    },
-    deleteMode: {
-      type: String,
-      default: "all"
-    }
-  },
-  data() {
-    return {
-      dataList: [],
-      replyTemp: {},
-      isNewComment: false,
-      focus: false,
-      commentValue: "",
-      commentPlaceholder: "说点什么...",
-      delTemp: {},
-	  index:0,
-    };
-  },
-  watch: {
-    tableData: {
-      handler(newVal) {
-        if (newVal.length !== this.dataList.length) {
-          this.dataList = this.treeTransForm(newVal);
-		  console.log("this.dataList:",this.dataList);
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    treeTransForm(data) {
-      let newData = JSON.parse(JSON.stringify(data));
-      let result = [];
-      let map = {};
-      newData.forEach((item, i) => {
-        item.owner = item.id === this.userInfo.id;
-        map[item.id] = item;
-      });
-      newData.forEach((item) => {
-        let parent = map[item.parent_id];
-        if (parent) {
-          (parent.children || (parent.children = [])).push(item);
-          if (parent.children.length === 1) {
-            (parent.childrenShow = []).push(item);
-          }
-        } else {
-          result.push(item);
-        }
-      });
-      return result;
-    },
-	setLike(item) {
-      item.is_like = !item.is_like;
-      item.like_count = item.is_like ? item.like_count + 1 : item.like_count - 1;
-    },
-    likeClick({ item1, index1, item2, index2 }) {
-      let item = item2 || item1;
-      this.setLike(item);
-      this.$emit("likeFun", { params: item }, (res) => {
-        this.setLike(item);
-      });
-    },
-    replyClick(item1, index1, item2, index2) {
-      this.replyTemp = JSON.parse(JSON.stringify({ item1, index1, item2, index2 }));
-	  console.log(this.replyTemp,"===========");
-      this.$refs.cPopupRef.open();
-    },
-    newCommentFun() {
-      this.isNewComment = true;
-      this.$refs.cPopupRef.open();
-    },
-    popChange(e) {
-      if (!e.show) {
-        this.commentValue = "";
-        this.replyTemp = {};
-        this.isNewComment = false;
-      }
-      this.focus = e.show;
-    },
-    sendClick() {
-      let { item1, index1, item2, index2 } = this.replyTemp;
-      let item = item2 || item1;
-	  console.log(item);
-      let params = {};
-      if (this.isNewComment) {
-        params.id = Math.random();
-        params.parent_id = null;
-        params.reply_id = null;
-        params.reply_name = null;
-      } else {
-		params.id= Math.random(),
-		params.parent_id = item.item1?.parent_id ?? item.item1.id,
-		params.reply_id = item.item1.id,
-		params.reply_name = item.item2 ? item.item2.user_name : item.item1.user_name
-        
-      }
-      params = {
-        ...params,
-        user_name: this.userInfo.user_name,
-        user_avatar: this.userInfo.user_avatar,
-        user_content: this.commentValue,
-        is_like: false,
-        like_count: 0,
-        create_time: "刚刚",
-        owner: true
-      };
-	  
-	  console.log("params: ",params);
+	export default {
+		components: {
+			CommonComp
+		},
+		props: {
+			userInfo: {
+				type: Object,
+				default: () => ({})
+			},
+			tableData: {
+				type: Array,
+				default: () => []
+			},
+			tableTotal: {
+				type: Number,
+				default: 0
+			},
+			deleteMode: {
+				type: String,
+				default: "all"
+			}
+		},
+		data() {
+			return {
+				isLoading: false, // 是否正在加载
+				dataList: [],
+				replyTemp: {},
+				isNewComment: false,
+				focus: false,
+				commentValue: "",
+				commentPlaceholder: "说点什么...",
+				delTemp: {},
+				index: 0,
+			};
+		},
+		watch: {
+			tableData: {
+				handler(newVal) {
+					if (newVal.length !== this.dataList.length) {
+						this.dataList = this.treeTransForm(newVal);
+						console.log("this.dataList:", this.dataList);
+					}
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		onPageScroll : function(e) { //nvue暂不支持滚动监听，可用bindingx代替
+			console.log("滚动距离为：" + e.scrollTop);
+		},
+		methods: {
+			loadMore() {
+			  if (this.isLoading) return;
+			  this.isLoading = true;
+			  if(this.openLoadMore){
+			  	this.$emit("loadMore")
+			  }
+			  console.log(111)
+			  // 模拟异步加载数据的过程
+			  // setTimeout(() => {
+			  //   const moreData = [...Array(20).keys()].map(i => `Item ${this.list.length + i + 1}`);
+			  //   this.list.push(...moreData);
+			  //   this.isLoading = false;
+			  // }, 1000);
+			},
+			treeTransForm(data) {
+				let newData = JSON.parse(JSON.stringify(data));
+				let result = [];
+				let map = {};
+				newData.forEach((item, i) => {
+					item.owner = item.id === this.userInfo.id;
+					map[item.id] = item;
+				});
+				newData.forEach((item) => {
+					let parent = map[item.parent_id];
+					if (parent) {
+						(parent.children || (parent.children = [])).push(item);
+						if (parent.children.length === 1) {
+							(parent.childrenShow = []).push(item);
+						}
+					} else {
+						result.push(item);
+					}
+				});
+				return result;
+			},
+			setLike(item) {
+				item.is_like = !item.is_like;
+				item.like_count = item.is_like ? item.like_count + 1 : item.like_count - 1;
+			},
+			likeClick({
+				item1,
+				index1,
+				item2,
+				index2
+			}) {
+				let item = item2 || item1;
+				this.setLike(item);
+				this.$emit("likeFun", {
+					params: item
+				}, (res) => {
+					this.setLike(item);
+				});
+			},
+			replyClick(item1, index1, item2, index2) {
+				this.replyTemp = JSON.parse(JSON.stringify({
+					item1,
+					index1,
+					item2,
+					index2
+				}));
+				console.log(this.replyTemp, "===========");
+				this.$refs.cPopupRef.open();
+			},
+			newCommentFun() {
+				this.isNewComment = true;
+				this.$refs.cPopupRef.open();
+			},
+			popChange(e) {
+				if (!e.show) {
+					this.commentValue = "";
+					this.replyTemp = {};
+					this.isNewComment = false;
+				}
+				this.focus = e.show;
+			},
+			sendClick() {
+				let {
+					item1,
+					index1,
+					item2,
+					index2
+				} = this.replyTemp;
+				let item = item2 || item1;
+				console.log('item=====', item);
+				let params = {};
+				if (this.isNewComment) {
+					params.id = this.tableData.id;
+					params.parent_id = this.tableData.parent_id;
+					params.reply_id = this.tableData.reply_id;
+					params.reply_name = this.tableData.reply_name;
+				} else {
+					params.id = this.tableData.id,
+						params.parent_id = item.item1?.parent_id ?? item.item1.id,
+						params.reply_id = item.item1.id,
+						params.reply_name = item.item2 ? item.item2.user_name : item.item1.user_name
 
-      uni.showLoading({
-        title: "正在发送",
-        mask: true
-      });
-      this.$emit("replyFun", { params }, (res) => {
-        uni.hideLoading();
-        params = { ...params, id: res.id };
-        if (this.isNewComment) {
-          this.dataList.push(params);
-        } else {
-			console.log(this.dataList);
-          let c_data = this.dataList[item.index1];
-          (c_data.children || (c_data.children = [])).push(params);
-          if (
-            c_data.children.length === (c_data.childrenShow || (c_data.childrenShow = [])).length + 1
-          ) {
-            c_data.childrenShow.push(params);
-          }
-        }
-        this.$emit("update:tableTotal", this.tableTotal + 1);
-        this.$refs.cPopupRef.close();
-      });
-    },
-    deleteClick(item1, index1, item2, index2) {
-      this.delTemp = JSON.parse(JSON.stringify({ item1, index1, item2, index2 }));
-      this.$refs.delPopupRef.open();
-    },
-    delCloseFun() {
-      this.delTemp = {};
-      this.$refs.delPopupRef.close();
-    },
-    delConfirmFun({ item1, index1, item2, index2 } = this.delTemp) {
-      let c_data = this.dataList[index1];
-      uni.showLoading({
-        title: "正在删除",
-        mask: true
-      });
-      if (index2 >= 0) {
-        this.$emit("deleteFun", { params: [c_data.children[index2].id] }, (res) => {
-          uni.hideLoading();
-          this.$emit("update:tableTotal", this.tableTotal - 1);
-          c_data.children.splice(index2, 1);
-          c_data.childrenShow.splice(index2, 1);
-        });
-      } else {
-        if (c_data.children && c_data.children.length) {
-          switch (this.deleteMode) {
-            case "bind":
-              c_data.user_content = "当前评论内容已被移除";
-              break;
-            case "only":
-              this.$emit("deleteFun", {
-                mode: this.deleteMode,
-                params: [c_data.id]
-              }, (res) => {
-                uni.hideLoading();
-                this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
-                this.dataList.splice(index1, 1);
-              });
-              break;
-            default:
-              let delIdArr = [c_data.id];
-              c_data.children.forEach((_, i) => {
-                delIdArr.push(_.id);
-              });
-              this.$emit("deleteFun", { params: delIdArr, mode: this.deleteMode }, (res) => {
-                uni.hideLoading();
-                this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
-                this.dataList.splice(index1, 1);
-              });
-              break;
-          }
-        } else {
-          this.$emit("deleteFun", { params: [c_data.id] }, (res) => {
-            uni.hideLoading();
-            this.$emit("update:tableTotal", this.tableTotal - 1);
-            this.dataList.splice(index1, 1);
-          });
-        }
-      }
-      this.delCloseFun();
-    },
-    expandTxtShow(item1, index1) {
-      return (
-        item1.childrenShow &&
-        item1.childrenShow.length &&
-        item1.children.length - item1.childrenShow.length
-      );
-    },
-    expandReplyFun(item1, index1) {
-      let csLen = this.dataList[index1].childrenShow.length;
-      this.dataList[index1].childrenShow.push(
-        ...this.dataList[index1].children.slice(csLen, csLen + 6)
-      );
-    }
-  }
-};
+				}
+				params = {
+					...params,
+					user_name: this.userInfo.user_name,
+					user_avatar: this.userInfo.user_avatar,
+					user_content: this.commentValue,
+					is_like: false,
+					like_count: 0,
+					create_time: "刚刚",
+					owner: true
+				};
+
+				uni.showLoading({
+					title: "正在发送",
+					mask: true
+				});
+				this.$emit("replyFun", {
+					params
+				}, (res) => {
+					uni.hideLoading();
+					params = {
+						...params,
+						id: res.id
+					};
+					if (this.isNewComment) {
+						this.dataList.push(params);
+					} else {
+						console.log(this.dataList);
+						let c_data = this.dataList[item.index1];
+						(c_data.children || (c_data.children = [])).push(params);
+						if (
+							c_data.children.length === (c_data.childrenShow || (c_data.childrenShow = [])).length +
+							1
+						) {
+							c_data.childrenShow.push(params);
+						}
+					}
+					this.$emit("update:tableTotal", this.tableTotal + 1);
+					this.$refs.cPopupRef.close();
+				});
+			},
+			deleteClick(item1, index1, item2, index2) {
+				this.delTemp = JSON.parse(JSON.stringify({
+					item1,
+					index1,
+					item2,
+					index2
+				}));
+				this.$refs.delPopupRef.open();
+			},
+			delCloseFun() {
+				this.delTemp = {};
+				this.$refs.delPopupRef.close();
+			},
+			delConfirmFun({
+				item1,
+				index1,
+				item2,
+				index2
+			} = this.delTemp) {
+				let c_data = this.dataList[index1];
+				uni.showLoading({
+					title: "正在删除",
+					mask: true
+				});
+				if (index2 >= 0) {
+					this.$emit("deleteFun", {
+						params: [c_data.children[index2].id]
+					}, (res) => {
+						uni.hideLoading();
+						this.$emit("update:tableTotal", this.tableTotal - 1);
+						c_data.children.splice(index2, 1);
+						c_data.childrenShow.splice(index2, 1);
+					});
+				} else {
+					if (c_data.children && c_data.children.length) {
+						switch (this.deleteMode) {
+							case "bind":
+								c_data.user_content = "当前评论内容已被移除";
+								break;
+							case "only":
+								this.$emit("deleteFun", {
+									mode: this.deleteMode,
+									params: [c_data.id]
+								}, (res) => {
+									uni.hideLoading();
+									this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
+									this.dataList.splice(index1, 1);
+								});
+								break;
+							default:
+								let delIdArr = [c_data.id];
+								c_data.children.forEach((_, i) => {
+									delIdArr.push(_.id);
+								});
+								this.$emit("deleteFun", {
+									params: delIdArr,
+									mode: this.deleteMode
+								}, (res) => {
+									uni.hideLoading();
+									this.$emit("update:tableTotal", this.tableTotal - c_data.children.length + 1);
+									this.dataList.splice(index1, 1);
+								});
+								break;
+						}
+					} else {
+						this.$emit("deleteFun", {
+							params: [c_data.id]
+						}, (res) => {
+							uni.hideLoading();
+							this.$emit("update:tableTotal", this.tableTotal - 1);
+							this.dataList.splice(index1, 1);
+						});
+					}
+				}
+				this.delCloseFun();
+			},
+			expandTxtShow(item1, index1) {
+				return (
+					item1.childrenShow &&
+					item1.childrenShow.length &&
+					item1.children.length - item1.childrenShow.length
+				);
+			},
+			expandReplyFun(item1, index1) {
+				let csLen = this.dataList[index1].childrenShow.length;
+				this.dataList[index1].childrenShow.push(
+					...this.dataList[index1].children.slice(csLen, csLen + 6)
+				);
+			}
+		}
+	};
 </script>
 </script>
 
 <style lang="scss" scoped>
-////////////////////////
-.center {
-  display: flex;
-  align-items: center;
-}
-////////////////////////
-.c_total {
-  padding: 20rpx 30rpx 0 30rpx;
-  font-size: 28rpx;
-}
-.empty_box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  padding: 150rpx 10rpx;
-  font-size: 28rpx;
-  .txt {
-    color: $uni-text-color-disable;
-  }
-  .click {
-    color: $uni-color-primary;
-  }
-}
-.c_comment {
-  padding: 20rpx 30rpx;
-  font-size: 28rpx;
+	////////////////////////
+	.center {
+		display: flex;
+		align-items: center;
+	}
 
-  .children_item {
-    padding: 20rpx 30rpx;
-    margin-top: 10rpx;
-    margin-left: 80rpx;
-    // background-color: $uni-bg-color-grey;
-    .expand_reply {
-      margin-top: 10rpx;
-      margin-left: 80rpx;
-      .txt {
-        font-weight: 600;
-        color: $uni-color-primary;
-      }
-    }
-  }
-}
-.c_popup_box {
-  background-color: #fff;
-  .reply_text {
-    @extend .center;
-    padding: 20rpx 20rpx 0 20rpx;
-    font-size: 26rpx;
-    .text_aid {
-      color: $uni-text-color-grey;
-      margin-right: 5rpx;
-    }
-    .text_main {
-    }
-  }
-  .content {
-    @extend .center;
-    .text_area {
-      flex: 1;
-      padding: 20rpx;
-    }
-    .send_btn {
-      @extend .center;
-      justify-content: center;
-      width: 120rpx;
-      height: 60rpx;
-      border-radius: 20rpx;
-      font-size: 28rpx;
-      color: #fff;
-      background-color: $uni-color-primary;
-      margin-right: 20rpx;
-    }
-  }
-}
-</style>
+	////////////////////////
+	.scroll-Y {
+			height: 940rpx;
+		}
+		.scroll-view_H {
+			white-space: nowrap;
+			width: 100%;
+		}
+		.scroll-view-item {
+			height: 300rpx;
+			line-height: 300rpx;
+			text-align: center;
+			font-size: 36rpx;
+		}
+		.scroll-view-item_H {
+			display: inline-block;
+			width: 100%;
+			height: 300rpx;
+			line-height: 300rpx;
+			text-align: center;
+			font-size: 36rpx;
+		}
+	// .template-view {
+	// 	height: 430px;
+	// 	overflow: auto;
+	// }
 
+	.c_total {
+		padding: 20rpx 30rpx 0 30rpx;
+		font-size: 28rpx;
+		color: #fff;
+	}
+
+	.empty_box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		padding: 150rpx 10rpx;
+		font-size: 28rpx;
+
+		.txt {
+			color: $uni-text-color-disable;
+		}
+
+		.click {
+			color: $uni-color-primary;
+		}
+	}
+
+	.c_comment {
+		padding: 20rpx 30rpx;
+		font-size: 28rpx;
+
+		.children_item {
+			padding: 20rpx 30rpx;
+			margin-top: 10rpx;
+			margin-left: 80rpx;
+
+			// background-color: $uni-bg-color-grey;
+			.expand_reply {
+				margin-top: 10rpx;
+				margin-left: 80rpx;
+
+				.txt {
+					font-weight: 600;
+					color: $uni-color-primary;
+				}
+			}
+		}
+	}
+
+	.c_popup_box {
+		background-color: #fff;
+
+		.reply_text {
+			@extend .center;
+			padding: 20rpx 20rpx 0 20rpx;
+			font-size: 26rpx;
+
+			.text_aid {
+				color: $uni-text-color-grey;
+				margin-right: 5rpx;
+			}
+
+			.text_main {}
+		}
+
+		.content {
+			@extend .center;
+
+			.text_area {
+				flex: 1;
+				padding: 20rpx;
+			}
+
+			.send_btn {
+				@extend .center;
+				justify-content: center;
+				width: 120rpx;
+				height: 60rpx;
+				border-radius: 20rpx;
+				font-size: 28rpx;
+				color: #fff;
+				background-color: $uni-color-primary;
+				margin-right: 20rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/douyin-scrollview/douyin-scrollview.nvue b/components/douyin-scrollview/douyin-scrollview.nvue
deleted file mode 100644
index daa232f..0000000
--- a/components/douyin-scrollview/douyin-scrollview.nvue
+++ /dev/null
@@ -1,1487 +0,0 @@
-<template>
-	<view style="">
-		<view style="height: 45upx;"></view>
-		<image @click="closeSheet" src="@/static/douyin/cuowu.png" style="width: 28upx; height: 28upx; opacity: 0.6; position: absolute; right: 30upx; margin-top: 30upx;"></image>
-		<text style="font-size: 12px; font-weight: bold; text-align: center; color: #FFFFFF;">{{pinlunNum}}条评论</text>
-		<!-- 
-		 
-		 评论内容
-		 
-		 目前仅适配了 App
-		 
-		 后期会继续优化
-		 
-		 
-		 
-		 · 项目使用真实数据
-		 
-		 · 由于项目使用的是 nvue 所以摒弃了 bug 很多的 rich-text
-		 
-		 
-		 
-		 -->
-		<view :style="'width: '+ Width +'px; height: '+ (Height/num) +'px; margin-top: 20upx; background-color: #242424; display: flex; flex-direction: column;'">
-			<text v-if="pinlunList.length == 0" :style="'font-size: 14px; font-weight: bold; color: #a3a1a4; margin-top: 150upx; margin-left: '+ (Width/2.9) +'px; position: absolute;'">～ 快来评论吧 ～</text>
-			<list :show-scrollbar="false" :scrollable="true">
-				<cell v-for="(list,index) in pinlunList" :key="index">
-					<view :style="'width: '+ Width +'px; display: flex; flex-direction: row;'">
-						<!-- 1.用户的头像 -->
-						<image :src="list.headimage" mode="aspectFill" style="width: 75upx; height: 75upx; border-radius: 50upx; margin-top: 40upx; margin-left: 30upx;"></image>
-						<!-- 2.一级评论 -->
-						<view :style="'width: '+ (Width*0.8) +'px; display: flex;  flex-direction: column; margin-top: 40upx; margin-left: 20upx;'">
-							<!-- 3.用户名称，并自动判断是否为视频作者 -->
-							<view style="display: flex; flex-direction: row;">
-								<text style="font-size: 12px; font-weight: bold; color: #a3a1a4;">{{list.username}}</text>
-								<!-- 4.如果是视频作者就显示 作者 -->
-								<view v-if="videouserID == list.userID" style="background-color: #E43D33; border-radius: 5upx; margin-left: 15upx;">
-									<text style="font-size: 8px; font-weight: bold; padding: 5upx; padding-left: 8upx; padding-right: 8upx; font-weight: bold; color: #FFFFFF;">作者</text>
-								</view>
-							</view>
-							<!-- 5. 
-							
-							由于 rich-text 有很多 bug 
-							所以这里已经摒弃了，
-							使用自研文本解析器 
-							
-							-->
-							<view v-if="list.pinlunContent.length !== 0" @click="huifu(index)" :style="'width: '+ (Width*0.78) +'px; display: flex; flex-direction: row; flex-wrap: wrap; margin-top: 14upx;'">
-								<block v-for="(lili,inde) in list.pinlunContent[0].children" :key="inde">
-									<text v-if="lili.name == 'text'" :style="'font-size: 15px; font-weight: bold; color: #FFFFFF; margin-left: -3upx;'">{{lili.text}}</text>
-									<image v-if="lili.name == 'img'" :src="lili.attrs.src" style="width: 42upx; height: 42upx; margin-left: 2upx; margin-right: 2upx; margin-top: -4upx;"></image>
-								</block>
-							</view>
-							<!-- 6.如果用户输入了 GIF 表情，就会在这里显示 -->
-							<image v-if="list.imageURL !== ''" :src="list.imageURL" mode="aspectFill" style="width: 140upx; height: 140upx; margin-top: 20upx; border-radius: 10upx;"></image>
-							<!-- 7.这里就是 时间、回复、点赞、点赞量显示的地方 -->
-							<view :style="'width: '+ (Width*0.8) +'px; height: 40upx; display: flex; flex-direction: row; margin-top: 25upx;'">
-								<text style="font-size: 12px; color: #a3a1a4;">{{list.time}}</text>
-								<text @click="huifu(index)" style="font-size: 12px; font-weight: bold; color: #a3a1a4; margin-left: 20upx;">回复</text>
-								<text v-if="userID == list.userID" @click="deletepinlun(index)" style="font-size: 12px; font-weight: bold; color: #a3a1a4; margin-left: 20upx;">删除</text>
-								<image v-if="!list.mylike" @click="tolike(index)" src="@/static/douyin/dianzan-7.png" style="width: 35upx; height: 35upx; position: absolute; right: 45upx; margin-left: 5upx;"></image>
-								<image v-if="list.mylike" @click="tolike(index)" src="@/static/douyin/dianzan-6.png" style="width: 35upx; height: 35upx; position: absolute; right: 45upx; margin-left: 5upx;"></image>
-								<text @click="tolike(index)" style="font-size: 12px; color: #a3a1a4; position: absolute; right: 90upx; margin-top: 10upx;">{{list.like.length}}</text>
-							</view>
-							<!-- 8.用户回复的子评论会显示在这里 
-							
-							这里 update 用于刷新视图
-							
-							-->
-							<block v-for="(li,inde) in list.sonPinlun" v-if="update" :key="inde">
-								<view :style="'width: '+ (Width*0.8) +'px; display: flex; flex-direction: row;'">
-									<!-- 9.子评论 用户头像 -->
-									<image :src="li.headimage" mode="aspectFill" style="width: 45upx; height: 45upx; border-radius: 50upx; margin-top: 40upx;"></image>
-									<!-- 10.动态计算宽度 子评论列表 -->
-									<view :style="'width: '+ (Width*0.8*0.85) +'px; display: flex;  flex-direction: column; margin-top: 40upx; margin-left: 20upx;'">
-										<view style="display: flex; flex-direction: row;">
-											<view style="display: flex; flex-direction: row;">
-												<!-- 11.回复评论的人显示在这里 -->
-												<text style="font-size: 12px; font-weight: bold; color: #a3a1a4;">{{li.huifuUser}}</text>
-												<!-- 12.同时要判断评论人是不是作者，如果是作者就在这里显示 -->
-												<view v-if="videouserID == li.userID" style="background-color: #E43D33; border-radius: 5upx; margin-left: 15upx;">
-													<text style="font-size: 8px; font-weight: bold; padding: 5upx; padding-left: 8upx; padding-right: 8upx; font-weight: bold; color: #FFFFFF;">作者</text>
-												</view>
-											</view>
-											<!-- 13.图片是一个向右的小图标 -->
-											<image src="@/static/douyin/you-3.png" style="width: 20upx; height: 20upx; margin-top: 5upx; margin-left: 10upx;"></image>
-											<!-- 14.被回复用户的名称 会显示在这里 -->
-											<view style="display: flex; flex-direction: row; margin-left: 10upx;">
-												<text style="font-size: 12px; font-weight: bold; color: #a3a1a4;">{{li.gethuifuUser}}</text>
-												<!-- 15.同时要判断评论人是不是作者，如果是作者就在这里显示 -->
-												<view v-if="videouserID == li.gethuifuUserID" style="background-color: #E43D33; border-radius: 5upx; margin-left: 15upx;">
-													<text style="font-size: 8px; font-weight: bold; padding: 5upx; padding-left: 8upx; padding-right: 8upx; font-weight: bold; color: #FFFFFF;">作者</text>
-												</view>
-											</view>
-										</view>
-										<!-- 16.
-										
-										由于 rich-text 有很多 bug 
-										所以这里已经摒弃了，
-										使用自研文本表情解析器 
-										
-										-->
-										<view v-if="li.pinlunContent.length !== 0" @click="sonhuifu(index,inde)" :style="'width: '+ (Width*0.8*0.85) +'px; display: flex; flex-direction: row; flex-wrap: wrap; margin-top: 14upx;'">
-											<block v-for="(lili,inde) in li.pinlunContent[0].children" :key="inde">
-												<text v-if="lili.name == 'text'" :style="'font-size: 15px; font-weight: bold; color: #FFFFFF; margin-left: -3upx;'">{{lili.text}}</text>
-												<image v-if="lili.name == 'img'" :src="lili.attrs.src" style="width: 42upx; height: 42upx; margin-left: 2upx; margin-right: 2upx; margin-top: -2upx;"></image>
-											</block>
-										</view>
-										<!-- 17.如果 子评论 用户输入了 GIF 表情，就会在这里显示 -->
-										<image v-if="li.imageURL !== ''" :src="li.imageURL" mode="aspectFill" style="width: 140upx; height: 140upx; margin-top: 20upx; border-radius: 10upx;"></image>
-										<!-- 18.这里就是 时间、回复、点赞、点赞量显示的地方 -->
-										<view :style="'width: '+ (Width*0.8*0.85) +'px; height: 40upx; display: flex; flex-direction: row; margin-top: 25upx;'">
-											<text style="font-size: 12px; color: #a3a1a4;">{{li.time}}</text>
-											<text @click="sonhuifu(index,inde)" style="font-size: 12px; font-weight: bold; color: #a3a1a4; margin-left: 20upx;">回复</text>
-											<text @click="deletesonpinlun(index,inde)" v-if="userID == li.userID" style="font-size: 12px; font-weight: bold; color: #a3a1a4; margin-left: 20upx;">删除</text>
-											<image v-if="!pinlun_list[index].sonPinlun[inde].mylike" @click="tosonlike(index,inde)" src="@/static/douyin/dianzan-7.png" style="width: 35upx; height: 35upx; position: absolute; right: 20upx; margin-left: 5upx;"></image>
-											<image v-if="pinlun_list[index].sonPinlun[inde].mylike" @click="tosonlike(index,inde)" src="@/static/douyin/dianzan-6.png" style="width: 35upx; height: 35upx; position: absolute; right: 20upx; margin-left: 5upx;"></image>
-											<text @click="tosonlike(index,inde)" style="font-size: 12px; color: #a3a1a4; position: absolute; right: 62upx; margin-top: 10upx;">{{li.like.length}}</text>
-										</view>
-									</view>
-								</view>
-							</block>
-							<!-- 19。显示 【展开xx条评论】、【收起评论】 -->
-							<view v-if="list.sonpinlunLength !== 0" @click="zhangkai(index)" :style="'width: '+ (Width*0.8) +'px; display: flex; flex-direction: row; margin-top: 30upx;'">
-								<view style="width: 60upx; height: 1px; background-color: #a3a1a4; opacity: 0.6; margin-top: 13upx;"></view>
-								<text style="font-size: 12px; font-weight: bold; color: #cdcbd4; margin-left: 12upx;">{{list.sonpinlunText}}</text>
-							</view>
-						</view>
-					</view>
-					<!-- 20.留一定的高度以免视图被遮挡 -->
-					<view v-if="index == (pinlunList.length-1)" :style="'width: '+ Width +'px; height: 80px;'"></view>
-				</cell>
-			</list>
-		</view>
-		<!-- 21.底部，模拟假的输入框 -->
-		<view v-if="show && ischangepinlun==false" @touchstart="openPinglun" :style="'width: '+ Width +'px; height: '+ plHeight +'px; background-color: #000000; position: fixed; bottom: 0;'">
-			<view :style="'width: '+ (Width-30) +'px; height: 42px; margin-left: 15px; margin-top: 20upx; background-color: #181818; border-radius: 100upx; display: flex; flex-direction: row;'">
-				<text v-if="platform=='ios'" style="font-size: 14px; color: #a3a1a4; margin-top: 20upx; margin-left: 30upx;">有爱评论，说点好听的～</text>
-				<text v-if="platform!=='ios'" style="font-size: 14px; color: #a3a1a4; margin-top: 25upx; margin-left: 30upx;">有爱评论，说点好听的～</text>
-				<!-- <image src="@/static/douyin/atuser-2.png" style="width: 70upx; margin-top: 15upx; height: 70upx; position: absolute; right: 110upx; margin-top: 10upx;"></image> -->
-				<image src="@/static/douyin/biaoqing.png" style="width: 50upx; margin-top: 15upx; height: 50upx; position: absolute; right: 25upx;"></image>
-			</view>
-		</view>
-		<view v-if="show && ischangepinlun==true" @touchstart="openPinglun" :style="'width: '+ Width +'px; height: '+ plHeight +'px; background-color: #000000;'">
-			<view :style="'width: '+ (Width-30) +'px; height: 42px; margin-left: 15px; margin-top: 20upx; background-color: #181818; border-radius: 100upx; display: flex; flex-direction: row;'">
-				<text v-if="platform=='ios'" style="font-size: 14px; color: #a3a1a4; margin-top: 20upx; margin-left: 30upx;">有爱评论，说点好听的～</text>
-				<text v-if="platform!=='ios'" style="font-size: 14px; color: #a3a1a4; margin-top: 25upx; margin-left: 30upx;">有爱评论，说点好听的～</text>
-				<!-- <image src="@/static/douyin/atuser-2.png" style="width: 70upx; margin-top: 15upx; height: 70upx; position: absolute; right: 110upx; margin-top: 10upx;"></image> -->
-				<image src="@/static/douyin/biaoqing.png" style="width: 50upx; margin-top: 15upx; height: 50upx; position: absolute; right: 25upx;"></image>
-			</view>
-		</view>
-		<!-- 
-		
-		下面就是真正的评论框
-		
-		包含：
-		1.输入框
-		2.表情输入框
-		3.GIF表情库
-		4.最近使用表情和全部表情
-		5.自己上传表情
-		6. @ 自己的好友
-		7.自带微博表情 和 QQ 表情
-		8.能记忆输入
-		
-		 -->
-		<uni-popup type="bottom" ref="openPinglun" @touchmove.stop.prevent="movehandle" @change="change">
-			<view style="display: flex; flex-direction: column;">
-				<view @click="openPinglun" :style="'width: '+ Width +'px; background-color: #FFFFFF; display: flex; flex-direction: row;'">
-					<view :style="'width: '+ (Width-30)*percent +'px; margin-left: 15px; margin-top: 20upx; background-color: #f2f0f4; border-radius: '+ borderRadius +'upx; margin-bottom: 20upx; display: flex; flex-direction: row;'">
-						<!-- 
-						9.输入框 
-						 -->
-						<textarea 
-						:style="'width: '+ (Width*0.6)*percent +'px; height: 20px; margin-bottom: 20upx; font-size: 15px; color: #000000; margin-top: 20upx; margin-left: 30upx;'" 
-						:placeholder="placeholder"
-						:cursor-spacing="cursorSpacing" 
-						:auto-focus="autoFocus" 
-						:auto-height="autoHeight" 
-						:adjust-position="adjustPosition"
-						v-model="value" 
-						maxlength="150"
-						@linechange="linechange"
-						@keyboardheightchange="keyboardheightchange"
-						@focus="focus"
-						@click="clickTextarea"
-						@blur="blur"
-						></textarea>
-						<!-- <image src="@/static/douyin/atuser.png" style="width: 70upx; height: 70upx; position: absolute; right: 110upx; margin-top: 8upx;"></image> -->
-						<!-- 10.点击表情展开评论框 -->
-						<image v-if="!isopen" @click="toemoji" src="@/static/douyin/biaoqing-2.png" style="width: 50upx; margin-top: 15upx; height: 50upx; position: absolute; right: 25upx;"></image>
-						<image v-if="isopen" @click="toemoji" src="@/static/douyin/jianpan.png" style="width: 50upx; margin-top: 15upx; height: 50upx; position: absolute; right: 25upx;"></image>
-					</view>
-					<!-- 11.发送按钮
-					 
-					 符合：有内容、或者是输入 GIF 图片都可以通过
-					 
-					 -->
-					<view v-if="(value!=='' || imageURL !== '') && isSend" @click="sendSMS" style="width: 30px; height: 30px; border-radius: 40px; background-color: #ff1a63; margin-top: 30upx; margin-left: 20upx;">
-						<image src="@/static/douyin/shangyi.png" style="width: 30upx; height: 30upx; margin-top: 16upx; margin-left: 16upx;"></image>
-					</view>
-				</view>
-			</view>
-			<!-- 12.用于显示用户选择的 GIF 图片 -->
-			<view v-if="isShowImage" :style="'width: '+ Width +'px; height: 75px; background-color: #FFFFFF;'">
-				<view style="display: flex; flex-direction: row;">
-					<image :src="imageURL" mode="aspectFill" style="width: 120upx; height: 120upx; margin-top: 10upx; margin-left: 50upx;"></image>
-					<image @click="deleteimageURL" src="@/static/douyin/zfxsc.png" style="width: 30upx; height: 30upx; position: absolute; margin-left: 140upx; margin-top: 12upx;"></image>
-				</view>
-			</view>
-			<!-- 13.
-			
-			表情 区
-			
-			-->
-			<view :style="'width: '+ Width +'px; height: '+ emojiHeight +'px; background-color: #FFFFFF;'">
-				<!-- 
-				isToShow：这个参数用于控制显示，不动它即可 
-				 -->
-				<block v-if="isToShow">
-					<!-- 14.表情选择栏：
-					 
-					 最近输入的 GIF 图在：timeEmoji
-					 默认展示的 表情 ：nowEmoji
-					 自己上传的图片：likeEmoji
-					 GIF 图片库：gifEmoji
-					 
-					 -->
-					<scroll-view :style="'width: '+ Width +'px; height: 40px; background-color: #FFFFFF;'" :scroll-x="true" style="display: flex; flex-direction: row;" :show-scrollbar="false">
-						<view :style="'display: flex; flex-direction: row; width: '+ Width +'px; padding-top: 10upx; padding-bottom: 10upx; border-bottom: 1upx solid #f3f1f4;'">
-							<view :style="'width: 90upx; height: 60upx; border-radius: 60upx; position: absolute; background-color: #f8f4f7; margin-top: -8upx; margin-left: '+ (Width*0.04)*currentNum +'px;'"></view>
-							<image @click="timeEmoji" src="@/static/douyin/time.png" style="width: 45upx; height: 45upx; margin-left: 50upx;"></image>
-							<image @click="nowEmoji" src="@/static/douyin/biaoqing-2.png" style="width: 50upx; height: 50upx; margin-left: 50upx; margin-top: -5upx;"></image>
-							<image @click="likeEmoji" src="@/static/douyin/xianxing.png" style="width: 55upx; height: 55upx; margin-left: 50upx; margin-top: -5upx;"></image>
-							<view @click="gifEmoji" style="width: 45upx; height: 45upx; border-radius: 55upx; border: 2px solid #303133; margin-left: 52upx; margin-top: 0upx;">
-								<image src="@/static/douyin/gif-2.png" style="width: 35upx; height: 35upx;"></image>
-							</view>
-						</view>
-					</scroll-view>
-					<!-- 15.表情选择栏：
-					 
-					 最近输入的 GIF 图在：timeEmoji
-					 默认展示的 表情 ：nowEmoji
-					 自己上传的图片：likeEmoji
-					 GIF 图片库：gifEmoji
-					 
-					 -->
-					<swiper :style="'width: '+ Width +'px; height: '+ (emojiHeight-40) +'px; background-color: #FFFFFF;'" :current="current" @change="currentChange">
-						<swiper-item>
-							<scroll-view :style="'width: '+ Width +'px; height: '+ (emojiHeight-40) +'px; background-color: #FFFFFF;'" :scroll-y="true">
-								<text v-if="nowImage.length !== 0" @click="qingkonGIF" style="font-size: 12px; margin-top: 20upx; position: absolute; right: 40upx; color: #007AFF;">清空</text>
-								<view style="display: flex; flex-direction: row; flex-wrap: wrap; margin-top: 40upx;">
-									<block v-for="(list,index) in nowImage" :key="index">
-										<image @click="clicknowImage(index)" :src="list" mode="aspectFill" style="width: 120upx; height: 120upx; margin-top: 40upx; margin-left: 55upx;"></image>
-										<image @click="deletenowImage(index)" src="@/static/douyin/zfxsc.png" style="width: 30upx; height: 30upx; position: absolute; right: 0; margin-top: 40upx;"></image>
-									</block>
-									<block v-if="nowImage.length == 0">
-										<text :style="'font-size: 14px; color: #999999; margin-top: 200upx; margin-left: '+ (Width/3.2) +'px;'">～ 您还没使用过图片 ～</text>
-									</block>
-								</view>
-								<view :style="'width: '+ Width +'px; height: 80px;'"></view>
-							</scroll-view>
-						</swiper-item>
-						<swiper-item>
-							<scroll-view :style="'width: '+ Width +'px; height: '+ (emojiHeight-40) +'px; background-color: #FFFFFF;'" :scroll-y="true">
-								<block v-if="nowTimeEmojiList.length !== 0">
-									<text style="font-size: 12px; margin-top: 20upx; margin-left: 30upx;">最近使用</text>
-									<text @click="qingkon" style="font-size: 12px; margin-top: 20upx; position: absolute; right: 40upx; color: #007AFF;">清空</text>
-									<view style="display: flex; flex-direction: row; flex-wrap: wrap; margin-bottom: 20upx;">
-										<!-- QQ - 表情包 -->
-										<block v-for="(list,index) in nowTimeEmojiList" :key="index">
-											<image @click="clicknowTimeEmoji(index)" :src="'../../static/emojis/qq/'+list.url+''" style="width: 35px; height: 35px; margin-top: 30upx; margin-left: 36upx;"></image>
-										</block>
-										<!-- 新浪微博 - 表情包 -->
-										<!-- <block v-for="(list,index) in sinaEmojilist">
-											<image @click="clicksinaEmoji(index)" :src="list.url" style="width: 35px; height: 35px; margin-top: 30upx; margin-left: 36upx;"></image>
-										</block> -->
-									</view>
-								</block>
-								<text style="font-size: 12px; margin-top: 20upx; margin-left: 30upx;">全部表情</text>
-								<view style="display: flex; flex-direction: row; flex-wrap: wrap;">
-									<!-- QQ - 表情包 -->
-									<block v-for="(list,index) in emojilist" :key="index">
-										<image @click="clickEmoji(index)" :src="'../../static/emojis/qq/'+list.url+''" style="width: 35px; height: 35px; margin-top: 30upx; margin-left: 36upx;"></image>
-									</block>
-									<!-- 新浪微博 - 表情包 -->
-									<!-- <block v-for="(list,index) in sinaEmojilist">
-										<image @click="clicksinaEmoji(index)" :src="list.url" style="width: 35px; height: 35px; margin-top: 30upx; margin-left: 36upx;"></image>
-									</block> -->
-								</view>
-								<view :style="'width: '+ Width +'px; height: 80px;'"></view>
-							</scroll-view>
-							<view v-if="platform=='ios'" style="position: absolute; display: flex; flex-direction: row; bottom: 0; right: 0; width: 300upx; height: 160upx; background-color: #FFFFFF; box-shadow: -20px -40px 20px 60upx #FFFFFF; border-radius: 2upx;">
-								<view @click="undo" style="width: 130upx; height: 60upx; margin-top: 20upx; border-radius: 40upx; border: 1upx solid #c6c5c8;">
-									<image src="@/static/douyin/shanchu-3.png" style="width: 45upx; height: 30upx; margin-top: 15upx; margin-left: 40upx;"></image>
-								</view>
-								<!-- 16.发送按钮
-								 
-								 符合：有内容、或者是输入 GIF 图片都可以通过
-								 
-								 -->
-								<view v-if="(value!=='' || imageURL !== '') && isSend" @click="sendSMS" style="width: 130upx; height: 60upx; margin-top: 20upx; margin-left: 20upx; border-radius: 40upx; background-color: #ff1a63;">
-									<text style="font-size: 14px; font-weight: bold; text-align: center; color: #FFFFFF; padding-top: 10upx;">发送</text>
-								</view>
-								<view v-if="(value == '' && imageURL == '') && isSend" style="width: 130upx; height: 60upx; margin-top: 20upx; margin-left: 20upx; border-radius: 40upx; background-color: #bab9bb;">
-									<text style="font-size: 14px; font-weight: bold; text-align: center; color: #FFFFFF; padding-top: 10upx;">发送</text>
-								</view>
-							</view>
-							<view v-if="platform!=='ios'" style="position: absolute; display: flex; flex-direction: row; bottom: 20upx; right: 20upx; width: 300upx; height: 80upx; padding: 10upx; background-color: #eceef1; border-radius: 20upx;">
-								<view @click="undo" style="width: 130upx; height: 60upx; margin-top: 0; border-radius: 40upx; border: 1upx solid #c6c5c8;">
-									<image src="@/static/douyin/shanchu-3.png" style="width: 45upx; height: 30upx; margin-top: 15upx; margin-left: 40upx;"></image>
-								</view>
-								<!-- 16.发送按钮
-								 
-								 符合：有内容、或者是输入 GIF 图片都可以通过
-								 
-								 -->
-								<view v-if="(value!=='' || imageURL !== '') && isSend" @click="sendSMS" style="width: 130upx; height: 60upx; margin-top: 0; margin-left: 20upx; border-radius: 40upx; background-color: #ff1a63;">
-									<text style="font-size: 14px; font-weight: bold; text-align: center; color: #FFFFFF; padding-top: 10upx;">发送</text>
-								</view>
-								<view v-if="(value == '' && imageURL == '') && isSend" style="width: 130upx; height: 60upx; margin-top: 0; margin-left: 20upx; border-radius: 40upx; background-color: #bab9bb;">
-									<text style="font-size: 14px; font-weight: bold; text-align: center; color: #FFFFFF; padding-top: 10upx;">发送</text>
-								</view>
-							</view>
-						</swiper-item>
-						<swiper-item>
-							<scroll-view :style="'width: '+ Width +'px; height: '+ (emojiHeight-40) +'px; background-color: #FFFFFF;'" :scroll-y="true">
-								<view style="display: flex; flex-direction: row; flex-wrap: wrap;">
-									<view v-if="platform=='ios'" @click="addlikeImage" style="width: 120upx; height: 120upx; border-radius: 10upx; border: 1upx dashed #000000; margin-top: 40upx; margin-left: 55upx;">
-										<image src="@/static/douyin/jia-9.png" style="width: 50upx; height: 50upx; margin-top: 35upx; margin-left: 35upx;"></image>
-									</view>
-									<view v-if="platform!=='ios'" @click="addlikeImage" style="width: 120upx; height: 120upx; border-radius: 10upx; border: 1px solid #000000; margin-top: 40upx; margin-left: 55upx;">
-										<image src="@/static/douyin/jia-9.png" style="width: 50upx; height: 50upx; margin-top: 35upx; margin-left: 35upx;"></image>
-									</view>
-									<block v-for="(list,index) in likeImage" :key="index">
-										<image @click="clickLikeImage(index)" :src="list" mode="aspectFill" style="width: 120upx; height: 120upx; margin-top: 40upx; margin-left: 55upx;"></image>
-										<image @click="deleteImage(index)" src="@/static/douyin/zfxsc.png" style="width: 30upx; height: 30upx; position: absolute; right: 0; margin-top: 40upx;"></image>
-									</block>
-								</view>
-								<view :style="'width: '+ Width +'px; height: 80px;'"></view>
-							</scroll-view>
-						</swiper-item>
-						<swiper-item>
-							<scroll-view :style="'width: '+ Width +'px; height: '+ (emojiHeight-40) +'px; background-color: #FFFFFF;'" :scroll-y="true" @scrolltolower="scrolltolowerGIF">
-								<view style="display: flex; flex-direction: row; flex-wrap: wrap;">
-									<view v-if="platform=='ios'" @click="searchGIF" style="width: 120upx; height: 120upx; border-radius: 10upx; border: 1upx dashed #000000; margin-top: 40upx; margin-left: 55upx;">
-										<image src="@/static/douyin/sousuo-7.png" style="width: 50upx; height: 50upx; margin-top: 35upx; margin-left: 35upx;"></image>
-									</view>
-									<view v-if="platform!=='ios'" @click="searchGIF" style="width: 120upx; height: 120upx; border-radius: 10upx; border: 1px solid #000000; margin-top: 40upx; margin-left: 55upx;">
-										<image src="@/static/douyin/sousuo-7.png" style="width: 50upx; height: 50upx; margin-top: 35upx; margin-left: 35upx;"></image>
-									</view>
-									<block v-for="(list,index) in gifAndpnglist" :key="index">
-										<image @click="clickGIF(index)" :src="list.url" mode="aspectFill" style="width: 120upx; height: 120upx; margin-top: 40upx; margin-left: 55upx;"></image>
-									</block>
-								</view>
-								<view :style="'width: '+ Width +'px; height: 80px;'"></view>
-							</scroll-view>
-						</swiper-item>
-					</swiper>
-				</block>
-				<block v-if="!isToShow">
-					<!-- 这里为空即可，不加任何东西 -->
-				</block>
-			</view>
-		</uni-popup>
-		<!-- 1.
-		 
-		 这个弹窗用于搜索 GIF
-		 
-		 -->
-		<uni-popup type="bottom" ref="searchEmoji" @touchmove.stop.prevent="movesearch" @change="searchGIFChange">
-			<view v-if="searchGIFValue !== ''" :style="'width: '+ Width +'px; height: 80px; border-bottom: 1upx solid #e3e1e5; background-color: #FFFFFF; border-top-left-radius: 20upx; border-top-right-radius: 20upx;'">
-				<!-- 2.
-				 
-				 搜出来的 GIF 都在这里
-				 
-				 -->
-				<scroll-view :style="'width: '+ Width +'px; height: 80px; border-bottom: 1upx solid #e3e1e5; display: flex; flex-direction: row;'" :scroll-x="true" style="display: flex; flex-direction: row;" :show-scrollbar="false">
-					<block v-for="(list,index) in GifList" :key="index">
-						<image @click="selectGIF(index)" :src="list.url" mode="aspectFill" style="width: 120upx; height: 120upx; margin-top: 20upx; margin-left: 20upx;"></image>
-					</block>
-					<view style="width: 20upx; height: 120upx; margin-left: 10upx;"></view>
-				</scroll-view>
-			</view>
-			<!-- 3.
-			 动态图输入框
-			 -->
-			<view :style="'width: '+ Width +'px; background-color: #FFFFFF; display: flex; flex-direction: row;'">
-				<view :style="'width: '+ (Width-30) +'px; margin-left: 15px; margin-top: 20upx; background-color: #FFFFFF; margin-bottom: 20upx; display: flex; flex-direction: row;'">
-					<input 
-					:style="'width: '+ (Width*0.8) +'px; height: 20px; margin-bottom: 20upx; font-size: 15px; color: #000000; margin-top: 15upx; margin-left: 30upx;'" 
-					placeholder="搜索表情包" 
-					v-model="searchGIFValue" 
-					:auto-focus="true"
-					:adjust-position="false"
-					@blur="blurGIF"
-					/>
-					<image v-if="searchGIFValue !== ''" @click="clearSearchValue" src="@/static/douyin/chacha-4.png" style=" width: 25upx; height: 25upx; margin-top: 20upx; margin-left: 30upx;"></image>
-				</view>
-			</view>
-			<view v-if="platform=='ios'" :style="'width: '+ Width +'px; height: '+ (emojiHeight+40) +'px; background-color: #FFFFFF;'">
-				<!-- 这里不要动就行 -->
-			</view>
-			<view v-if="platform!=='ios'" :style="'width: '+ Width +'px; height: '+ emojiHeight +'px; background-color: #FFFFFF;'">
-				<!-- 这里不要动就行 -->
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	// 1.先引入表情库，（完全手撸，十分繁琐）（这个是 QQ 的表情库）
-	import emojiList from '@/common/emoji/biaoqin.js'
-	// 2.这个表情库是新浪微博 的表情库
-	import sinaEmojiList from '@/common/emoji/sina.js'
-	// 3.这个一定要引入进来，用来解析生成的 <html>【🌟🌟🌟🌟🌟】十分重要【这里已经对原来的文件进行了改编】
-	import parsehtml from '@/common/html-parse/parse_html.js'
-	// 4.这里引入时间函数 用来上传时用的
-	import time from '@/common/time-utils/currentData.js'
-	export default {
-		name:"douyin-scrollview",
-		props: {
-			Width: Number,
-			Height : Number,
-			deleteIOSHeight: Number,
-			deleteAndroidHeight: Number
-		},
-		data() {
-			return {
-				// 每一个参数都重要
-				// 解释如下：
-				// ----- start ----- 评论输入框部分
-				num: 1.15,//用来处理评论的高度
-				plHeight: 0,//评论高度
-				value: "",//用户在输入框输入信息的数据
-				autoHeight: false,//这个默认即可（用于评论框自动适应高度）
-				borderRadius: 100,//评论框圆角大小
-				lineheight: 0,//默认即可（用于处理评论框高度）
-				percent: 1,//默认（用于处理发送按钮已经评论框宽度）
-				show: true,//默认（是否显示评论框）
-				emojiHeight: 0,//表情区域的高度
-				emojiheight: 0,//用于处理表情区域的高度
-				cursorSpacing: 20,//键盘距离输入框的距离
-				autoFocus: true,//是否自动聚焦（默认聚焦）
-				isopen: false,//(默认不展开)
-				isToShow: false,//默认
-				adjustPosition: false,//默认
-				placeholder: "有爱评论，说点好听的～",
-				
-				// 
-				current: 1,//当前切换的位置
-				emojilist: [],//表情数组
-				nowTimeEmojiList: [],//最近输入的表情
-				sinaEmojilist: [],//新浪微博表情
-				currentNum: 4.4,//默认
-				likeImage: [],//默认
-				nowImage: [],//默认
-				
-				gifAndpngList: [],//默认
-				gifAndpnglist: [],//默认
-				
-				searchGIFValue: "",//默认
-				isSearcopen: false,//默认
-				GifList: [],//默认
-				isShowImage: false,//默认
-				imageURL: "",//默认
-				
-				platform: "",//默认
-				systemVerson: "",//系统版本
-				ischangepinlun: true,//默认显示全面屏手机评论样式
-				
-				// ----- end ----- 评论输入框部分
-				
-				// ----- start ----- 评论内容部分
-				pinlunList: [],//用于在界面展示的 评论数组
-				pinlunListX: [],//这个是用来存储原始评论数据的数组
-				pinlun_list: [],//用于存储界面 评论数组 的副本
-				pinlunNum: 0,//总评论数量
-				videoID: "",//当前视频的 ID
-				isSend: true,//默认
-				userID: "",//当前用户的 ID
-				videouserID: "",//当前视频作者的 ID
-				update: true,//用于刷新视图
-				
-				huifuUser: "",//回复信息的人的名字
-				gethuifuUser: "",//被回复的人（也就是接收者的名字）
-				gethuifuUserID: "",//被回复的人的 ID
-				istohuifu: false,//是否是去回复（默认不是）
-				huifuindex: 0,//回复信息所在下标
-				iszhangkai: false,//默认不展开评论
-				
-				// ----- end ----- 评论内容部分
-			};
-		},
-		watch:{
-			// 监听 输入表情值 并搜索 GIF 表情
-			searchGIFValue(val){
-				this.isopen = false;
-				if(val !== ''){
-					var sms = []
-					for(let i=0;i<this.gifAndpngList.length;i++){
-						if(this.gifAndpngList[i].name.indexOf(val) !== -1){
-							sms.push(this.gifAndpngList[i]);
-						}
-					}
-					this.GifList = sms;
-				}
-			},
-			// 监听 输入框输入数据
-			value(val){
-				if(val == ""){
-					this.autoHeight = false
-					if(this.imageURL !== ''){
-						this.percent = 0.9
-					} else {
-						this.percent = 1
-					}
-				} else {
-					this.autoHeight = true
-					this.percent = 0.9
-				}
-			},
-			// 监听 GIF图片（用户选择一个 GIF 图片以后这个值就会被赋值）
-			imageURL(val){
-				if(val !== ''){
-					this.percent = 0.9
-				} else {
-					if(this.value == ''){
-						this.percent = 1
-					}
-				}
-			},
-			// 监听 输入框 高度变化
-			lineheight(newVal,oldVal){
-				if(Math.abs(newVal) < 30){
-					this.borderRadius = 100
-				} else {
-					this.borderRadius = 30
-				}
-			}
-		},
-		/*
-		打开组件之后开始执行下面方法
-		*/ 
-		created(){
-			// 1.isToShow 用于输入框显示（默认不改）
-			this.isToShow = false;
-			// 2.判断当前设备信息
-			var model = uni.getSystemInfoSync().model;
-			// 3.判断当前设备信息
-			this.platform = uni.getSystemInfoSync().platform;
-			// 3.1 获取系统版本
-			var systemVerson = uni.getSystemInfoSync().system
-			if(systemVerson.split(' ')[0] == "Android"){
-				if(systemVerson.split(' ')[1] < 9){
-					// 低端安卓机
-					this.ischangepinlun = false//小于安卓 8
-					this.windowHeight = uni.getSystemInfoSync().screenHeight;
-					this.emojiHeight = this.windowHeight/2.1 - this.deleteAndroidHeight;
-				} else {
-					// 全面屏安卓机
-					this.ischangepinlun = true//全面屏
-					this.windowHeight = uni.getSystemInfoSync().screenHeight;
-					this.emojiHeight = this.windowHeight/2.6 - this.deleteAndroidHeight;
-				}
-			} else {
-				if(uni.getSystemInfoSync().platform == 'ios' && (model !== 'iPhone6' || model !== 'iPhone6s' || model !== 'iPhone7' || model !== 'iPhone8')){
-					// 全面屏iPhone
-					this.ischangepinlun = true//全面屏
-					this.windowHeight = uni.getSystemInfoSync().screenHeight;
-					this.emojiHeight = this.windowHeight/2.2 - this.deleteIOSHeight;
-				} else {
-					// 非全面屏iPhone
-					this.ischangepinlun = false
-					this.windowHeight = uni.getSystemInfoSync().screenHeight;
-					this.emojiHeight = this.windowHeight/2.1 - this.deleteIOSHeight;
-				}
-			}
-			// 4.获取当前 视频 ID
-			this.videoID = uni.getStorageSync("videoID");
-			// 5.获取当前 用户 ID
-			this.userID = uni.getStorageSync("user")._id;
-			// 6.获取评论信息
-			this.getnewpinlun();
-			// 7.根据设备信息，处理评论区域高度
-			if(uni.getSystemInfoSync().platform == 'ios' && (model !== 'iPhone6' || model !== 'iPhone6s' || model !== 'iPhone7' || model !== 'iPhone8')){
-				this.num = 1.25
-			} else {
-				this.num = 1.15
-			}
-			if(uni.getSystemInfoSync().platform=='ios'){
-				this.adjustPosition = true
-			} else {
-				this.adjustPosition = false
-			}
-			this.plHeight = this.Height-(this.Height/this.num);
-			console.log(this.plHeight);
-			// 8.聚焦输入
-			this.focus();
-			// 9.判断是否有 GIF 图片
-			if(this.imageURL !== ''){
-				this.percent = 0.9
-			}
-			// 10.把之前准备好的 emoji 表情赋值给 数组，用于展示
-			this.emojilist = emojiList
-			this.sinaEmojilist = sinaEmojiList
-			// 11.看看有没有喜欢的 GIF，有的话赋值
-			this.likeImage = uni.getStorageSync("likeImage");
-			// 11.看看有没有当前的 GIF，有的话赋值
-			this.nowImage = uni.getStorageSync("nowImage");
-			// 11.看看有没有当前的 emoji ，有的话赋值
-			this.nowTimeEmojiList = uni.getStorageSync("nowTimeEmojiList");
-			// 12.请求 GIF 表情库（这里的表情库都存在 json 文件里面了）
-			/*
-			1.资源来源
-			
-			GitHub：https://github.com/zhaoolee/ChineseBQB
-			Gitee：https://gitee.com/mirrors/ChineseBQB
-			
-			这两个库 数据都是同步的，可以去参考，国内的话可以用 gitee 访问下载，如何丢到服务器里面
-			
-			*/
-			uni.request({
-				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131/bf6f0d2e-e065-4685-a104-218c42add104.json',
-				success: (res) => {
-					var gifAndpngList = res.data.data
-					var sms = []
-					for(let i=0;i<gifAndpngList.length;i++){
-						/*
-						它的资源很多，这里只获取 gif 部分
-						*/
-						if(gifAndpngList[i].name.indexOf("gif") !== -1){
-							sms.push(gifAndpngList[i])
-						}
-					}
-					this.gifAndpngList = sms
-				}
-			})
-		},
-		methods:{
-			/*
-			
-			---- 第一段，这里面含有 http 后台真实请求，以及返回处理的操作以及数据
-			
-			【🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟】
-			
-			---- start ----
-			
-			*/ 
-			getnewpinlun(){
-				// 这里是对评论信息做处理
-				uni.request({
-					url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-					method: 'POST',
-					data:{
-						info: 'videoID_pinlun',
-						_id: this.videoID
-					},
-					success: (res) => {
-						// console.log(res);
-						this.pinlunList = [];
-						this.pinlunListX = [];
-						var pin = res.data.data[0].pinlun;
-						var pins = res.data.data[0].pinlun;
-						this.videouserID = res.data.data[0].userID;
-						for(let i=0;i<pin.length;i++){
-							if(pin[i].sonPinlun.length !== 0){
-								let likeinfo = pin[i].like.indexOf(uni.getStorageSync("user")._id);
-								if(likeinfo !== -1){
-									pin[i].mylike = true;
-								} else {
-									pin[i].mylike = false;
-								}
-								let List = pin[i].sonPinlun;
-								let msm = []
-								for(let j=0;j<List.length;j++){
-									let likeinf = List[j].like.indexOf(uni.getStorageSync("user")._id);
-									if(likeinf !== -1){
-										pin[i].sonPinlun[j].mylike = true;
-									} else {
-										pin[i].sonPinlun[j].mylike = false;
-									}
-									msm.unshift(List[j]);
-								}
-								pin[i].sonPinlun = msm;
-								pin[i].sonpinlunText = "展开" + pin[i].sonPinlun.length + "条回复";
-								pin[i].sonpinlunLength = pin[i].sonPinlun.length;
-								pin[i].sonPinlun = []
-								this.pinlunList.unshift(pin[i]);
-							} else {
-								let likeinfo = pin[i].like.indexOf(uni.getStorageSync("user")._id);
-								if(likeinfo !== -1){
-									pin[i].mylike = true;
-								} else {
-									pin[i].mylike = false;
-								}
-								pin[i].sonpinlunLength = 0;
-								this.pinlunList.unshift(pin[i]);
-							}
-						}
-						uni.request({
-							url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-							method: 'POST',
-							data:{
-								info: 'videoID_pinlun',
-								_id: this.videoID
-							},
-							success: (resa) => {
-								// console.log(res);
-								var pins = resa.data.data[0].pinlun;
-								this.pinlunNum = pins.length;
-								for(let i=0;i<pins.length;i++){
-									if(pins[i].sonPinlun.length !== 0){
-										this.pinlunNum += pins[i].sonPinlun.length;
-										let likeinfo = pins[i].like.indexOf(uni.getStorageSync("user")._id);
-										if(likeinfo !== -1){
-											pins[i].mylike = true;
-										} else {
-											pins[i].mylike = false;
-										}
-										let List = pins[i].sonPinlun;
-										let msm = []
-										for(let j=0;j<List.length;j++){
-											let likeinf = List[j].like.indexOf(uni.getStorageSync("user")._id);
-											if(likeinf !== -1){
-												pins[i].sonPinlun[j].mylike = true;
-											} else {
-												pins[i].sonPinlun[j].mylike = false;
-											}
-											msm.unshift(List[j]);
-										}
-										pins[i].sonPinlun = msm;
-										pins[i].sonpinlunText = "展开" + pins[i].sonPinlun.length + "条回复";
-										pins[i].sonpinlunLength = pins[i].sonPinlun.length;
-										this.pinlun_list.unshift(pins[i]);
-									} else {
-										let likeinfo = pins[i].like.indexOf(uni.getStorageSync("user")._id);
-										if(likeinfo !== -1){
-											pins[i].mylike = true;
-										} else {
-											pins[i].mylike = false;
-										}
-										pins[i].sonpinlunLength = 0;
-										this.pinlun_list.unshift(pins[i]);
-									}
-								}
-								// console.log(this.pinlun_list);
-								this.pinlunListX = resa.data.data[0].pinlun;
-							}
-						})
-					}
-				})
-			},
-			sendSMS(){
-				if(this.userID !== ''){
-					// 1.先处理表情信息
-					var str = this.value;
-					var stri = ""
-					var nodes = ""
-					if(this.value !== ''){
-						let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g,(item, index)=>{
-							console.log("item: " + item);
-							for(let i=0;i<this.emojilist.length;i++){
-								let row = this.emojilist[i];
-								if(row.alt==item){
-									//在线表情路径，图文混排必须使用网络路径，请上传一份表情到你的服务器后再替换此路径 
-									//比如你上传服务器后，你的100.gif路径为https://www.xxx.com/emoji/100.gif 则替换onlinePath填写为https://www.xxx.com/emoji/
-									let onlinePath = 'https://static-2908110e-6da2-4899-8b44-d45c153457ad.bspapp.com/emojis/qq/'
-									let imgstr = '<img id="img" src="' + onlinePath + row.url + '" style="">';
-									// console.log("imgstr: " + imgstr);
-									return imgstr;
-								}
-							}
-						});
-						stri = '<div>'+replacedStr+'</div>';
-						nodes = parsehtml(stri);
-					} else {
-						nodes = [];
-					}
-					var msg = {};
-					// 2.处理完成之后判断
-					if(this.istohuifu){
-						// 如果是真的代表是回复消息
-						msg = {
-							userID: uni.getStorageSync("user")._id,
-							username: uni.getStorageSync("user").username,
-							headimage: uni.getStorageSync("user").headimage,
-							pinlunContent: nodes,
-							time: time.getDate(),
-							like: [],
-							imageURL: this.imageURL,
-							huifuUser: this.huifuUser,
-							gethuifuUser: this.gethuifuUser,
-							gethuifuUserID: this.gethuifuUserID,
-						}
-						this.pinlunListX[(this.pinlunListX.length-1)-this.huifuindex].sonPinlun.push(msg);
-						var pin = this.pinlunListX;
-						this.isSend = false;
-						// 3. 评论正在发送
-						uni.showLoading({
-							title: '正在发送...'
-						})
-						uni.request({
-							url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-							method: 'POST',
-							data:{
-								info: 'add_pinlun',
-								_id: this.videoID,
-								pinlun: pin
-							},
-							success: (resx) => {
-								// console.log(resx);
-								/*
-								4.评论发送成功
-								（1）把输入框清空
-								（2）GIF 图片也清理一下
-								（3）关闭输入框
-								（4）isSend用来防止 用户多次点击发送信息
-								（5）最后就是更新评论信息
-								*/ 
-								uni.hideLoading();
-								this.value = "";
-								this.imageURL = "";
-								this.$refs.openPinglun.close();
-								this.isSend = true;
-								this.getnewpinlun();
-							}
-						})
-					} else {
-						// 直接发信息
-						msg = {
-							userID: uni.getStorageSync("user")._id,
-							username: uni.getStorageSync("user").username,
-							headimage: uni.getStorageSync("user").headimage,
-							pinlunContent: nodes,
-							time: time.getDate(),
-							sonPinlun: [],
-							like: [],
-							imageURL: this.imageURL
-						}
-						// console.log(msg);
-						this.isSend = false;
-						uni.showLoading({
-							title: '正在发送...'
-						})
-						uni.request({
-							url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-							method: 'POST',
-							data:{
-								info: 'videoID_pinlun',
-								_id: this.videoID
-							},
-							success: (res) => {
-								// console.log(res);
-								var pin = res.data.data[0].pinlun;
-								pin.push(msg);
-								uni.request({
-									url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-									method: 'POST',
-									data:{
-										info: 'add_pinlun',
-										_id: this.videoID,
-										pinlun: pin
-									},
-									success: (resx) => {
-										// console.log(resx);
-										/*
-										5.评论发送成功
-										（1）把输入框清空
-										（2）GIF 图片也清理一下
-										（3）关闭输入框
-										（4）isSend用来防止 用户多次点击发送信息
-										（5）最后就是更新评论信息
-										*/ 
-										uni.hideLoading();
-										this.value = "";
-										this.imageURL = "";
-										this.$refs.openPinglun.close();
-										this.isSend = true;
-										this.getnewpinlun();
-									}
-								})
-							}
-						})
-					}
-				} else {
-					uni.showModal({
-						title: '警告提示',
-						content: '在插件测试过程中保证有用户ID，否则无法显示评论用户信息，请退回《user.vue》,从《user.vue》页面进入主页!'
-					})
-				}
-			},
-			tolike(index){
-				// 处理评论
-				if(this.pinlunList[index].mylike == false){
-					this.pinlunListX[(this.pinlunListX.length-1)-index].like.push(uni.getStorageSync("user")._id);
-				} else {
-					var sms = []
-					for(let i=0;i<this.pinlunListX[(this.pinlunListX.length-1)-index].like.length;i++){
-						if(this.pinlunListX[(this.pinlunListX.length-1)-index].like[i] !== uni.getStorageSync("user")._id){
-							sms.push(this.pinlunListX[(this.pinlunListX.length-1)-index].like[i]);
-						}
-					}
-					this.pinlunListX[(this.pinlunListX.length-1)-index].like = sms;
-				}
-				uni.request({
-					url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-					method: 'POST',
-					data:{
-						info: 'add_pinlun',
-						_id: this.videoID,
-						pinlun: this.pinlunListX
-					},
-					success: (resx) => {
-						this.getnewpinlun();
-					}
-				})
-			},
-			tosonlike(index,inde){
-				// 处理子评论
-				console.log(this.pinlun_list[index].sonPinlun[inde].mylike);
-				if(this.pinlun_list[index].sonPinlun[inde].mylike == false){
-					this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun[(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun.length-1)-inde].like.push(uni.getStorageSync("user")._id);
-				} else {
-					var sms = []
-					for(let i=0;i<this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun[(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun.length-1)-inde].like.length;i++){
-						if(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun[(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun.length-1)-inde].like[i] !== uni.getStorageSync("user")._id){
-							sms.push(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun[(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun.length-1)-inde].like[i]);
-						}
-					}
-					this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun[(this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun.length-1)-inde].like = sms;
-				}
-				uni.request({
-					url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-					method: 'POST',
-					data:{
-						info: 'add_pinlun',
-						_id: this.videoID,
-						pinlun: this.pinlunListX
-					},
-					success: (resx) => {
-						this.getnewpinlun();
-					}
-				})
-			},
-			zhangkai(index){
-				// 1.点击展开评论，一开始是不展开的（如果点击展开，就把 评论的副本的子评论赋值给当前页面页面评论，这样当前页面就可以显示子评论了）
-				if(this.iszhangkai == false){
-					this.iszhangkai = true;
-					this.pinlunList[index].sonPinlun = this.pinlun_list[index].sonPinlun;
-					this.pinlunList[index].sonpinlunText = "收起评论"
-					this.update = false;
-					this.update = true;
-				} else {
-					this.iszhangkai = false;
-					this.pinlunList[index].sonPinlun = [];
-					this.pinlunList[index].sonpinlunText = "展开" + this.pinlun_list[index].sonPinlun.length + "条回复";
-					this.update = false;
-					this.update = true;
-				}
-			},
-			deletesonpinlun(index,inde){
-				// 删除 子评论（由于评论是按照时间顺序展示的，所以这里的赋值都是取反的）
-				uni.showModal({
-					title: '确定删除？',
-					success: (re) => {
-						if(re.confirm){
-							uni.showLoading({
-								title: "正在删除"
-							})
-							let List = this.pinlunList[index].sonPinlun;
-							let msm = []
-							for(let j=0;j<List.length;j++){
-								if(j !== inde){
-									msm.unshift(List[j]);
-								}
-							}
-							this.pinlunListX[(this.pinlunListX.length-1)-index].sonPinlun = msm;
-							var pin = this.pinlunListX;
-							uni.request({
-								url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-								method: 'POST',
-								data:{
-									info: 'add_pinlun',
-									_id: this.videoID,
-									pinlun: pin
-								},
-								success: (resx) => {
-									uni.hideLoading();
-									this.getnewpinlun();
-								}
-							})
-						}
-					}
-				})
-			},
-			deletepinlun(index){
-				// 删除 评论（子评论也将被删除）
-				uni.showModal({
-					title: '确定删除？',
-					content: '删除后子评论将被删除',
-					success: (re) => {
-						if(re.confirm){
-							uni.showLoading({
-								title: "正在删除"
-							})
-							var sms = []
-							for(let i=0;i<this.pinlunListX.length;i++){
-								if(i !== ((this.pinlunListX.length-1)-index)){
-									sms.push(this.pinlunListX[i]);
-								}
-							}
-							// console.log(this.pinlunListX)
-							uni.request({
-								url: 'https://fc-mp-bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.next.bspapp.com/video',
-								method: 'POST',
-								data:{
-									info: 'add_pinlun',
-									_id: this.videoID,
-									pinlun: sms
-								},
-								success: (resx) => {
-									uni.hideLoading();
-									this.getnewpinlun();
-								}
-							})
-						}
-					}
-				})
-			},
-			addlikeImage(){
-				uni.showModal({
-					title: '⏰演示项目提醒⏰',
-					content: '请前往 douyin-scrollview.nvue组件\naddlikeImage()函数进行配置',
-					success: () => {
-						// uni.chooseImage({
-						//     count: 1,
-						//     success: (res)=> {
-						// 		var tempFilePaths = res.tempFilePaths;
-						// 		uni.saveFile({
-						// 			tempFilePath: tempFilePaths[0],
-						// 			success: (re)=> {
-						// 				var background = re.savedFilePath;
-						// 				var imge = ""
-						// 				// 使用 uni.uploadFile()
-						// 				/*
-						// 				把返回的链接信息给 imge 即可
-										
-						// 				最后把图片链接，填入喜欢的图片中
-						// 				*/ 
-						// 				if(uni.getStorageSync("likeImage").length == 0){
-						// 					this.likeImage = []
-						// 					this.likeImage.push(imge)
-						// 					uni.setStorageSync("likeImage",this.likeImage);
-						// 				} else {
-						// 					this.likeImage = uni.getStorageSync("likeImage");
-						// 					this.likeImage.push(imge)
-						// 					uni.setStorageSync("likeImage",this.likeImage);
-						// 				}
-						// 			}
-						// 		})
-						//     }
-						// })
-					}
-				})
-			},
-			
-			/*
-			【🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟🌟】
-			
-			----- end -----
-			*/ 
-			
-			sonhuifu(index,inde){
-				// 1.子评论回复
-				/*
-				（1）先处理回复人信息
-				（2）处理被回复人信息
-				（3）改变 “发送” 状态
-				（4）打开评论框
-				*/
-				this.huifuUser = uni.getStorageSync("user").username;
-				this.gethuifuUser = this.pinlunList[index].sonPinlun[inde].username;
-				this.gethuifuUserID = this.pinlunList[index].sonPinlun[inde].userID;
-				this.istohuifu = true;
-				this.placeholder = "回复：" + this.gethuifuUser;
-				this.huifuindex = index;
-				this.openPinglun();
-			},
-			huifu(index){
-				// 1.评论回复
-				/*
-				（1）先处理回复人信息
-				（2）处理被回复人信息
-				（3）改变 “发送” 状态
-				（4）打开评论框
-				*/
-				this.huifuUser = uni.getStorageSync("user").username;
-				this.gethuifuUser = this.pinlunList[index].username;
-				this.gethuifuUserID = this.pinlunList[index].userID;
-				this.istohuifu = true;
-				this.placeholder = "回复：" + this.pinlunList[index].username;
-				this.huifuindex = index;
-				this.openPinglun();
-			},
-			clicknowImage(index){
-				// 点击 GIF 图片信息
-				this.imageURL = this.nowImage[index];
-				this.isShowImage = true;
-			},
-			selectGIF(index){
-				// 选择 GIF 图片
-				/*
-				（1）获取 GIF 链接
-				（2）清理搜索的 GIF 输入框信息
-				（3）缓存 GIF 图片信息
-				*/ 
-				this.imageURL = this.GifList[index].url;
-				this.isShowImage = true;
-				this.searchGIFValue = ""
-				this.$refs.searchEmoji.close();
-				if(uni.getStorageSync("nowImage").length == 0){
-					this.nowImage = []
-					this.nowImage.push(this.imageURL)
-					uni.setStorageSync("nowImage",this.nowImage);
-				} else {
-					this.nowImage = uni.getStorageSync("nowImage");
-					let isTrue = true;
-					for(let i=0;i<this.nowImage.length;i++){
-						if(this.imageURL == this.nowImage[i]){
-							isTrue = false;
-						}
-					}
-					if(isTrue){
-						this.nowImage.push(this.imageURL)
-					}
-					uni.setStorageSync("nowImage",this.nowImage);
-				}
-			},
-			deleteimageURL(){
-				// 清理 GIF 图片
-				this.imageURL = "";
-				this.isShowImage = false;
-			},
-			clickGIF(index){
-				// 在选择 GIF 列表，点击 GIF 图片，选择图片
-				/*
-				（1）获取 GIF 链接
-				（2）清理搜索的 GIF 输入框信息
-				（3）缓存 GIF 图片信息
-				*/ 
-				this.imageURL = this.gifAndpnglist[index].url;
-				this.isShowImage = true;
-				if(uni.getStorageSync("nowImage").length == 0){
-					this.nowImage = []
-					this.nowImage.push(this.imageURL)
-					uni.setStorageSync("nowImage",this.nowImage);
-				} else {
-					this.nowImage = uni.getStorageSync("nowImage");
-					let isTrue = true;
-					for(let i=0;i<this.nowImage.length;i++){
-						if(this.imageURL == this.nowImage[i]){
-							isTrue = false;
-						}
-					}
-					if(isTrue){
-						this.nowImage.push(this.imageURL)
-					}
-					uni.setStorageSync("nowImage",this.nowImage);
-				}
-			},
-			clearSearchValue(){
-				// 点击搜索 GIF 的小叉叉，清理输入的值
-				this.searchGIFValue = ""
-			},
-			blurGIF(){
-				// 搜索 GIF 图片失去聚焦时
-				// 关闭 GIF 输入框
-				if(this.searchGIFValue == ''){
-					this.$refs.searchEmoji.close();
-				}
-			},
-			searchGIF(){
-				// 点击搜索 GIF 图片
-				// 打开输入框
-				if(uni.getSystemInfoSync().platform=='ios'){
-					this.$refs.searchEmoji.open('bottom');
-				} else {
-					setTimeout(()=>{
-						this.$refs.searchEmoji.open('bottom');
-					},500)
-				}
-			},
-			deletenowImage(index){
-				// 删除当前图片
-				var sms = []
-				for(let i=0;i<this.nowImage.length;i++){
-					if(this.nowImage[i] !== this.nowImage[index]){
-						sms.push(this.nowImage[i])
-					}
-				}
-				this.nowImage = sms;
-				uni.setStorageSync("nowImage",this.nowImage);
-			},
-			clickLikeImage(index){
-				// 点击喜欢的图片之后
-				/*
-				（1）获取图片信息
-				（2）缓存图片 在本地
-				*/ 
-				if(uni.getStorageSync("nowImage").length == 0){
-					this.nowImage = []
-					this.nowImage.push(this.likeImage[index])
-					uni.setStorageSync("nowImage",this.nowImage);
-				} else {
-					this.nowImage = uni.getStorageSync("nowImage");
-					let isTrue = true;
-					for(let i=0;i<this.nowImage.length;i++){
-						if(this.likeImage[index] == this.nowImage[i]){
-							isTrue = false;
-						}
-					}
-					if(isTrue){
-						this.nowImage.push(this.likeImage[index])
-					}
-					uni.setStorageSync("nowImage",this.nowImage);
-				}
-			},
-			deleteImage(index){
-				// 删除 图片
-				/*
-				（1）更新当前 GIF 图片列表
-				（2）同时去看看 最近使用图片里面有没有当前要删除的图片，
-					如果有的话就一同删除掉
-				*/ 
-				uni.showModal({
-					title: '确定删除？',
-					success: (re) => {
-						if(re.confirm){
-							uni.removeSavedFile({
-								filePath: this.likeImage[index],
-								success: () => {
-									var sms = []
-									for(let i=0;i<this.likeImage.length;i++){
-										if(this.likeImage[i] !== this.likeImage[index]){
-											sms.push(this.likeImage[i])
-										}
-									}
-									var smh = []
-									for(let i=0;i<this.nowImage.length;i++){
-										if(this.nowImage[i] !== this.likeImage[index]){
-											smh.push(this.nowImage[i])
-										}
-									}
-									this.nowImage = smh;
-									uni.setStorageSync("nowImage",this.nowImage);
-									this.likeImage = sms;
-									uni.setStorageSync("likeImage",this.likeImage);
-								}
-							});
-						}
-					}
-				})
-			},
-			
-			qingkonGIF(){
-				// 清空当前 GIF 图片
-				uni.showModal({
-					title: '确定清空？',
-					success: (re) => {
-						if(re.confirm){
-							this.nowImage = []
-							uni.removeStorageSync("nowImage");
-						}
-					}
-				})
-			},
-			searchGIFChange(e){
-				
-			},
-			change(e){
-				// 输入框开关变化
-				/*
-				（1）如果打开输入框（show == true）
-					- 此时请求 GIF 列表图片信息
-				（2）如果关闭输入框
-					- 恢复默认设置
-				*/ 
-				this.isToShow = false;
-				if(e.show == true){
-					this.show = false;
-					this.getGif();
-				} else {
-					uni.hideKeyboard();
-					this.show = true
-					this.autoFocus = true;
-					this.isopen = false;
-					this.current = 1;
-					this.currentNum = 4.4;
-					this.isShowImage = false;
-					this.cursorSpacing = 20;
-					this.placeholder = "有爱评论，说点好听的～";
-					this.istohuifu = false;
-				}
-			},
-			/*
-			
-			以下方法都是输入框 状态变化，以及逻辑切换等信息
-			
-			虽然不起眼但是很重要 【🌟🌟🌟🌟🌟】
-			
-			（如果是要复制的话都是要复制的）
-			
-			*/ 
-			// ------- start -------
-			clickTextarea(){
-				this.isopen = false;
-				if(uni.getSystemInfoSync().platform == 'ios'){
-					this.autoFocus = false;
-					setTimeout(()=>{
-						this.autoFocus = true;
-					},200)
-				}
-			},
-			closeSheet(){
-				this.$emit('closeScrollview');
-			},
-			movehandle(){},
-			movesearch(){},
-			openPinglun(){
-				this.$refs.openPinglun.open('bottom')
-			},
-			linechange(event){
-				this.lineheight = event.detail.height
-			},
-			keyboardheightchange(){},
-			blur(){
-				uni.hideKeyboard();
-			},
-			focus(){
-				if(uni.getSystemInfoSync().platform == 'ios'){
-					this.autoFocus = false;
-					this.isopen = true;
-				}
-				setTimeout(()=>{
-					this.autoFocus = true;
-					this.isopen = false;
-					setTimeout(()=>{
-						if(uni.getSystemInfoSync().platform == 'ios'){
-							this.isToShow = true;
-						}
-						if(this.imageURL !== ''){
-							this.isShowImage = true;
-						}
-					},1500)
-				},20)
-			},
-			toemoji(){
-				if(this.isopen==false){
-					this.isopen = true;
-					setTimeout(()=>{
-						this.isToShow = true;
-					},500)
-					uni.hideKeyboard();
-				} else {
-					if(uni.getSystemInfoSync().platform == 'ios'){
-						this.isShowImage = false;
-					} else {
-						this.isToShow = false;
-					}
-					this.isopen = false;
-					this.autoFocus = false;
-					setTimeout(()=>{
-						this.autoFocus = true;
-						if(this.imageURL !== ''){
-							setTimeout(()=>{
-								this.isShowImage = true;
-							},1300)
-						}
-					},20)
-				}
-			},
-			undo(){
-				if(this.value !== ""){
-					var str = ""
-					for(let i=0;i<this.value.length-1;i++){
-						str += this.value[i]
-					}
-					this.value = str;
-				}
-			},
-			timeEmoji(){
-				this.currentNum = 1
-				this.current = 0
-			},
-			nowEmoji(){
-				this.currentNum = 4.3
-				this.current = 1
-			},
-			likeEmoji(){
-				this.currentNum = 7.6
-				this.current = 2
-			},
-			gifEmoji(){
-				this.currentNum = 11.0
-				this.current = 3
-			},
-			qingkon(){
-				uni.showModal({
-					title: '确定清空？',
-					success: (re) => {
-						if(re.confirm){
-							this.nowTimeEmojiList = []
-							uni.removeStorageSync("nowTimeEmojiList");
-						}
-					}
-				})
-			},
-			clicknowTimeEmoji(index){
-				var str = this.nowTimeEmojiList[index].alt;
-				this.value += str;
-			},
-			clickEmoji(index){
-				// console.log(this.emojilist[index])
-				var str = this.emojilist[index].alt;
-				this.value += str;
-				if(uni.getStorageSync("nowTimeEmojiList").length == 0){
-					this.nowTimeEmojiList = []
-					this.nowTimeEmojiList.push(this.emojilist[index])
-					uni.setStorageSync("nowTimeEmojiList",this.nowTimeEmojiList);
-				} else {
-					this.nowTimeEmojiList = uni.getStorageSync("nowTimeEmojiList");
-					let isTrue = true;
-					for(let i=0;i<this.nowTimeEmojiList.length;i++){
-						if(this.emojilist[index].alt == this.nowTimeEmojiList[i].alt){
-							isTrue = false;
-						}
-					}
-					if(isTrue){
-						this.nowTimeEmojiList.push(this.emojilist[index])
-					}
-					uni.setStorageSync("nowTimeEmojiList",this.nowTimeEmojiList);
-				}
-			},
-			clicksinaEmoji(index){
-				console.log(this.sinaEmojilist[index])
-			},
-			currentChange(e){
-				var num = e.detail.current + 1
-				switch (num){
-					case 1:
-					this.currentNum = 1
-						break;
-					case 2:
-					this.currentNum = 4.3
-						break;
-					case 3:
-					this.currentNum = 7.6
-						break;
-					case 4:
-					this.currentNum = 11.0
-						break;
-					default:
-						break;
-				}
-			},
-			getGif(){
-				var list = []
-				for(let i=0;i<15;i++){
-					var num = Math.round(Math.random()*this.gifAndpngList.length);
-					list.push(this.gifAndpngList[num]);
-				}
-				this.gifAndpnglist = list
-			},
-			scrolltolowerGIF(){
-				for(let i=0;i<15;i++){
-					var num = Math.round(Math.random()*this.gifAndpngList.length);
-					this.gifAndpnglist.push(this.gifAndpngList[num]);
-				}
-			}
-			// ------- end -------
-		}
-	}
-</script>
-
-<style>
-	
-</style>
diff --git a/pages.json b/pages.json
index b6f7613..3fa73ff 100644
--- a/pages.json
+++ b/pages.json
@@ -47,6 +47,7 @@
 			"style": {
 				"navigationBarTitleText": "视频圈",
 				"enablePullDownRefresh": true,
+				"onReachBottomDistance":200,
 				"navigationStyle": "custom",
 				"app-plus": {
 					"titleNView": false
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8098bc3..4c7fca3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -191,7 +191,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="body-view" style="display: none;">
+			<view class="body-view">
 				<!-- 使用scroll-view实现tabs滑动切换 -->
 				<scroll-view class="top-menu-view" scroll-x="true" scroll-with-animation :scroll-left="scrollLeft">
 					<view class="menu-topic-view" v-for="(item,index) in tabs" :id="'tabNum'+item.id" :key="index" @click="swichMenu(index)">
@@ -207,9 +207,23 @@
 				<swiper class="swiper-box-list" :current="currentTab" @change="swiperChange">
 					<swiper-item class="swiper-topic-list" v-for="item in swiperDateList" :key="item.id">
 						<view class="swiper-item-card">
-							<view class="swiper-back-img">
+							<!-- <view class="swiper-back-img">
 								<image src="../../static/bofang.png" mode="widthFix"></image>
-							</view>
+							</view> -->
+							<video
+							:loop="true"
+							:controls="true"
+							:autoplay="false"
+							:http-cache="true"
+							:page-gesture="true"
+							:show-fullscreen-btn="true"
+							:show-loading="true"
+							:show-center-play-btn="true"
+							:enable-progress-gesture="true"
+							style="width: 100%;height: 162px;"
+							src="http://1.92.152.160/file/uploadPath/2024/07/18/3b23e6ea30fd2f2502b6a31334481143.mp4"
+							:poster="'http://1.92.152.160/file/uploadPath/2024/07/18/20240718170642301190.png'"
+							></video>
 							<view class="swiper-item">
 								<span>{{item.name}}</span>
 								<span>{{item.content}}</span>
@@ -1082,6 +1096,9 @@
 </script>
 
 <style scoped>
+	.top-menu-view /deep/.uni-scroll-view-content{
+		justify-content: space-around;
+	}
 	.salogo{
 		width: 140rpx;
 		height: 36rpx;
diff --git a/pages/videoCircle/index - 副本 (2).vue b/pages/videoCircle/index - 副本 (2).vue
deleted file mode 100644
index 7f17798..0000000
--- a/pages/videoCircle/index - 副本 (2).vue	
+++ /dev/null
@@ -1,756 +0,0 @@
-<template>
-	<view>
-		<!-- 
-		注意：这是 H5、微信小程序界面，请勿和 new_index.nvue、index.nvue 混用
-		 
-		1. new_index.nvue、index.nvue这两个是App页面
-		 
-		2. 另外：data.js 是上一版本留下的假数据，这一版改成了 URL 请求了（如不需要可以删除，也可作为后端请求参考）
-		 
-		3. 请各位大神多多留手，我已经把请求内存开到最大了
-		 
-		4. 视频 id 切记是字符串类型 -->
-		<image v-if="isShowAixin" src="@/static/img/index/aixining.png" :style="'position: fixed; margin-left: '+ aixinLeft +'px; margin-top: '+ aixinTop +'px; width: 70px; height: 65px; transform: rotate('+ Rotate +'deg);'"></image>
-		<swiper :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; background-color: #000000;'" :vertical="true" @animationfinish="animationfinish" @change="change" :current="current" :indicator-dots="false" :duration="duration">
-			<swiper-item v-for="(list,index) in dataList" :key="index" style="height: 98%;">
-				<view v-if="Math.abs(k-index)<=1">
-					<view>
-						<!-- 
-						1.v-if：用于控制视频在节点的渲染数
-						2.muted的默认值是 false，代表默认是禁音视频的
-						3.http-cache默认开启视频缓存
-						4.poster（封面（方案一））：这里的封面默认处理存储在阿里云的视频
-						5.show-loading：这里默认去掉播放转圈的标志
-						v-if="Math.abs(k-index)<=1"
-						 -->
-						<video
-						v-if="isShow"
-						:id="list._id+''+index"
-						:loop="true"
-						:muted="list.isplay"
-						:controls="false"
-						:autoplay="true"
-						:http-cache="f"
-						:page-gesture="false"
-						:show-fullscreen-btn="false"
-						:show-loading="false"
-						:show-center-play-btn="false"
-						:enable-progress-gesture="false"
-						:src="list.src"
-						@ended="ended"
-						@click="tapVideoHover(list.state,$event)"
-						@timeupdate="timeupdate($event,index)"
-						:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; background-color: #000000; z-index: 8;'"
-						:poster="list.src+'?x-oss-process=video/snapshot,t_100,f_jpg'"
-						></video>
-						<!-- 
-						1.这里是封面（方案二）：这里的封面可以自定义。
-						2.也在代码中做了批注，两种方案可以共存，不会相互影响。
-						-->
-						<image
-						v-if="!list.playIng"
-						:src="list.src+'?x-oss-process=video/snapshot,t_100,f_jpg'"
-						:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; position: absolute; z-index: 6;'"
-						mode="aspectFit"
-						></image>
-					</view>
-					<!-- 播放状态：pause 的时候就会暂停 -->
-					<view class="videoHover" @click="tapVideoHover(list.state,$event)" @touchstart="touchstartHover" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;z-index:14;'">
-						<image v-if="list.state=='pause'" class="playState" src="@/static/img/index/play.png"></image>
-					</view>
-					<view class="userInfo">
-						<!-- 1.头像 -->
-						<image @click="tozuozhe" class="userAvatar" :src="list.href" mode="aspectFill"></image>
-						<!-- 2.点赞 -->
-						<view class="list-view" @click="cLike(list.like);" style="opacity: 0.9; margin-top: 17px;">
-							<image v-if="list.like" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-							<image v-if="!list.like" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':list.like}">{{list.like_n}}</text>
-						</view>
-						<!-- 3.评论 -->
-						<view class="comment list-view" @click="toComment(index)" style="opacity: 0.9; margin-top: 17px;">
-							<image src="@/static/img/index/liaotian-2.png" style="width: 35px; height: 35px; position: absolute; right: 7px;"></image>
-							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; font-weight: bold; text-align: center; margin-top: 40px;">{{list.sms_n}}</text>
-						</view>
-						<!-- 4.分享 -->
-						<view class="list-view" @click="share" style="opacity: 0.9; margin-top: 17px;">
-							<image src="@/static/img/index/share-fill.png" style="width: 40px; height: 40px; position: absolute; right: 5px;"></image>
-							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; font-weight: bold; margin-top: 40px;">分享</text>
-						</view>
-						<view class="list-view" @click="dealVoice" style="margin-top: 17px;">
-							<view style="width: 48px; height: 48px; border-radius: 50px; position: absolute; right: 2.5px;">
-								<image :style="'width: 48px; height: 48px; border-radius: 50px; transform: rotate('+ rotates +'deg);'" src="@/static/img/index/bfq.png" mode="aspectFill"></image>
-								<image v-if="showPlay" :style="'width: 30px; height: 30px; margin-top: 9px; margin-left: 9px; position: absolute; border-radius: 50px; transform: rotate('+ rotates +'deg);'" :src="list.href" mode="aspectFill"></image>
-							</view>
-						</view>
-					</view>
-					<!-- 最底下的文字部分 -->
-					<view class="content">
-						<text class="userName" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.title}}</text><!-- i={{i}} -->
-						<text class="words" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.msg}}-{{k+1}}</text><!-- k={{k}} -->
-					</view>
-					<!-- 进度条 -->
-					<view v-if="k === index" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend" :style="'width: '+ (windowWidth - (windowWidth*0.10)) +'px; margin-left: '+ (windowWidth * 0.05) +'px; height: 40px; position: absolute;bottom: 0px;margin-bottom: 6px;z-index: 14;'">
-						<!-- 不拖动情况下 -->
-						<view>
-							<!-- 1.底部背景进度条 -->
-							<view :style="'width: '+ (windowWidth - (windowWidth*0.10)) +'px; margin-top: 18px; height: 5px; border-radius: 10px; background-color: #999999; opacity: 0.6;'"></view>
-							<!-- 2.播放的进度条 -->
-							<view v-if="isTouch==false" :style="'width: '+ ((windowWidth - (windowWidth*0.10)) * progressBarPercent) +'px; position: absolute;top: 0; margin-top: 18px;  height: 5px; border-radius: 10px; background-color: #e6e4e7; '"></view>
-							<!--  -->
-							<view v-if="isTouch==true" :style="'width: '+ (videoStartPositon + addPositon) +'px; position: absolute;top: 0; margin-top: 18px; height: 5px; border-radius: 10px; background-color: #e6e4e7; '"></view>
-						</view>
-					</view>
-				</view>
-			</swiper-item>
-		</swiper>
-		<uni-popup type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
-			<view :style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px; background-color: #242424; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-				<!-- 
-				 注意：
-				 deleteIOSHeight
-				 deleteAndroidHeight
-				 这两个参数用于控制评论等的高度
-				 -->
-				<douyin-scrollview
-				:Width="windowWidth"
-				:Height="(boxStyle.height/1.23)"
-				:deleteIOSHeight="36"
-				:deleteAndroidHeight="15"
-				@closeScrollview="closeScrollview"
-				></douyin-scrollview>
-			</view>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	// import userList from '../new_index/data.js'//这个是假数据
-	let audo = uni.createInnerAudioContext()
-	audo.loop = true
-	import douyinScrollview from '../../components/douyin-scrollview/douyin-scrollview.vue'
-	export default {
-		components:{
-			douyinScrollview
-		},
-		data() {
-			return {
-				windowWidth: 0,
-				windowHeight: 0,
-				platform: "",
-				model: "",
-				deleteHeight: 0,
-				dataList: [],
-				k: 0,
-				oldVideo: "",
-				voice: "",
-				timeout: "",
-				current: 0,
-				boxStyle:{//视频，图片封面样式🌟💗
-					'height': 0,
-					'width': 0,
-				},
-				
-				videoID: "",
-				isShow: false,
-				
-				showPlay: false,//转轮显示控制
-				rotates: 0,//转轮旋转角度
-				rotateTime: "",//转轮递归事件控制
-				xrotats: "",
-				
-				mpcleartime: "",
-				
-				isClick: false,
-				
-				changeTimeout: "",
-				mptime: 0,
-				mpstartTime: 0,
-				
-				duration: 500,
-				// -- 进度条相关 -- start
-				videoStartPositon: 0,
-				progressBarPercent: 0,
-				touchStartPosition: 0,
-				addPositon: 0,
-				timeduration: 0,
-				isTouch: false,
-				// -- 进度条相关 -- end
-				// 引入评论 - 参数
-				heightNum: 1.18,
-				
-				// 双击点赞参数
-				touchNum: 0,
-				aixinLeft: 0,
-				aixinTop: 0,
-				isShowAixin: false,
-				Rotate: 0,
-				
-				isShow1: false,//控制渲染变量1
-				isShow2: false,//控制渲染变量2 ： 专门控制 uni-popup
-				currents: 0,//用于左右滑动，0代表视频界面，1代表右滑界面🌟💗
-			}
-		},
-		
-		watch:{
-			async k(k,old_k){
-				// console.log(k, old_k)
-				this.progressBarPercent = 0;
-				// #ifndef MP
-				this.clearToTime();
-				// #endif
-				this.isShow = false
-				this.dataList[old_k].playIng = false//如果视频暂停，就加载封面
-				this.dataList[old_k].isplay = true
-				this.dataList[old_k].state = 'pause'
-				console.log('预留第' + (old_k + 1) + '个视频：' + this.dataList[old_k]._id+''+old_k)
-				// 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
-				uni.createVideoContext(this.dataList[old_k]._id + '' + old_k,this).stop()//如果视频暂停，那么旧视频停止，这里的this.dataList[old_k]._id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
-				console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～')//提示
-				this.dataList[k].state = 'play'
-				this.isShow = true
-				this.xrotats = setTimeout(()=>{
-					this.showPlay = true;
-					// #ifndef MP
-					this.rotateX();
-					// #endif
-				},200)
-				// #ifdef MP
-				// 如果是小程序端
-				clearTimeout(this.changeTimeout);
-				this.dataList[k].isplay = false
-				setTimeout(()=>{
-					this.dataList[k].playIng = true
-				},250)
-				if(this.mptime < 0.2){
-					this.changeTimeout = setTimeout(()=>{
-						uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-					},1400)
-				} else {
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-				}
-				// #endif
-				// #ifdef H5
-				this.dataList[k].isplay = true
-				audo.src = this.dataList[k].src
-				if(this.isClick){
-					setTimeout(()=>{
-						if (typeof WeixinJSBridge == "undefined") {
-							setTimeout(()=>{
-								audo.play()
-								uni.createVideoContext(this.dataList[k]._id+''+k,this).seek(0)
-								uni.createVideoContext(this.dataList[k]._id+''+k,this).play()
-								setTimeout(()=>{
-									this.dataList[k].playIng = true
-								},650)
-							},500)
-						} else {
-							WeixinJSBridge.invoke('getNetworkType', {}, e => {
-								setTimeout(()=>{
-									audo.play()
-									uni.createVideoContext(this.dataList[k]._id+''+k,this).seek(0)
-									uni.createVideoContext(this.dataList[k]._id+''+k,this).play()
-									setTimeout(()=>{
-										this.dataList[k].playIng = true
-									},850)
-								},200)
-							})
-						}
-					},200)
-				} else {
-					audo.pause()
-					this.dataList[k].state = 'pause'
-					uni.createVideoContext(this.dataList[k]._id+''+k,this).seek(0)
-					uni.createVideoContext(this.dataList[k]._id+''+k,this).pause()
-				}
-				// #endif
-				var p = k+1;
-				console.log('预加载第' + (p + 1) + '个视频：' + this.dataList[p]._id+''+p)
-			}
-		},
-		onLoad() {
-			this.platform = uni.getSystemInfoSync().platform
-			this.model = uni.getSystemInfoSync().model
-			var model = this.model
-			if(this.platform == 'ios' && (model !== 'iPhone6' || model !== 'iPhone6s' || model !== 'iPhone7' || model !== 'iPhone8')){
-				this.deleteHeight = 0//有 tabbar的 修改这里可以改变视频高度
-			}
-			this.windowWidth = uni.getSystemInfoSync().windowWidth
-			this.windowHeight = uni.getSystemInfoSync().windowHeight
-			this.boxStyle.width = this.windowWidth + 'px'//给宽度加px
-			this.boxStyle.height = this.windowHeight - this.deleteHeight;//有 tabbar的 修改这里可以改变视频高度
-			this.get() //刚进入页面加载数据
-			// #ifndef MP
-			this.rotateX();
-			// #endif
-		},
-		onShow(){
-			console.log('回到前台');
-			if(this.dataList.length !== 0){
-				// #ifdef MP
-				this.dataList[this.k].state = 'play';
-				uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-				// #endif
-				// #ifdef H5
-				if(this.isClick){
-					this.dataList[this.k].state = 'play';
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-					audo.play()
-				}
-				// #endif
-			}
-		},
-		onHide(){
-			// #ifdef MP
-			this.dataList[this.k].state = 'pause';
-			uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).pause()
-			// #endif
-			// #ifdef H5
-			if(this.isClick){
-				this.dataList[this.k].state = 'pause';
-				uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).pause()
-				audo.pause()
-			}
-			// #endif
-			console.log('到后台');
-		},
-		methods: {
-			closeScrollview(){
-				// 点击评论里面的叉叉，就会关闭评论
-				this.$refs.pinglun.close('bottom');
-			},
-			onTabItemTaps() {
-			    if (uni.getSystemInfoSync().platform == "ios") {
-			        let UIImpactFeedbackGenerator = plus.ios.importClass('UIImpactFeedbackGenerator');
-			        let impact = new UIImpactFeedbackGenerator();
-			        impact.prepare();
-			        impact.init(1);
-			        impact.impactOccurred();
-			    }
-			    if (uni.getSystemInfoSync().platform == "android") {
-			        uni.vibrateShort({
-			            success: () => {
-			                console.log('点击震动');
-			            }
-			        });
-			    }
-			},
-			// 双击点赞效果
-			touchstartHover(event){
-				if(this.touchNum >= 1){
-					// console.log('双击 -- X坐标：'+ event.touches[0].screenX);
-					// console.log('双击 -- Y坐标：'+ event.touches[0].screenY);
-					this.aixinLeft = event.touches[0].screenX - 50;
-					this.aixinTop =  event.touches[0].screenY - 50;
-					this.isShowAixin = true;
-					let max = 40; let min = -40;
-					this.Rotate = Math.floor(Math.random() * (max - min + 1)) + min;
-					setTimeout(()=>{
-						this.isShowAixin = false;
-					},700)
-					this.onTabItemTaps();
-				}
-			},
-			tozuozhe(){
-				this.currents = 1//点击头像以后就会切换
-			},
-			mpTouchend(){
-				this.mptime = (new Date()/1000) - this.mpstartTime;
-			},
-			mpTouchstart(){
-				this.mpstartTime = (new Date()/1000);
-			},
-			dealVoice(){
-				uni.showToast({
-					title: '处理声音',
-					icon: 'none'
-				})
-			},
-			clearToTime(){
-				//清理定时器
-				for(let i=0;i<20;i++){
-					clearTimeout(this.rotateTime);
-					clearTimeout(this.xrotats);
-					this.showPlay = false;
-					this.rotates = 0;
-				}
-			},
-			clearTime(){
-				//清理定时器
-				for(let i=0;i<20;i++){
-					clearTimeout(this.rotateTime);
-					clearTimeout(this.xrotats);
-				}
-			},
-			rotateX(){
-				// clearTimeout(this.rotateTime);
-				this.rotateTime = setTimeout(()=>{
-					this.rotateX();
-					this.showPlay = true;
-					this.rotates += 1;
-				},30)
-			},
-			
-			ended(){
-				// 1.播放当前视频结束时触发，自动切换下一个视频
-				// this.current = this.k+1
-			},
-			// ---- 进度条相关 --- start
-			touchstart(e){
-				this.isTouch = true;
-				// #ifdef H5
-				if(this.isTouch == true){
-					this.addPositon = 0;
-					console.log("touchstart",this.windowWidth);
-					this.videoStartPositon = (this.windowWidth - (this.windowWidth*0.10)) * this.progressBarPercent;
-					this.touchStartPosition = e.changedTouches[0].clientX;
-				}
-				// #endif
-				// #ifdef MP
-				this.addPositon = 0;
-				this.videoStartPositon = (this.windowWidth - (this.windowWidth*0.10)) * this.progressBarPercent;
-				this.touchStartPosition = e.changedTouches[0].clientX;
-				// #endif
-			},
-			touchmove(e){
-				console.log("touchmove",e);
-				// #ifdef H5
-				if(this.isTouch == true){
-					let num = e.changedTouches[0].clientX - this.touchStartPosition;
-					if((this.videoStartPositon + num) <= (this.windowWidth - (this.windowWidth*0.10))) {
-						this.addPositon = e.changedTouches[0].clientX - this.touchStartPosition;
-					} else {
-						this.addPositon = 0;
-						this.videoStartPositon = (this.windowWidth - (this.windowWidth*0.10));
-					}
-				}
-				// #endif
-				// #ifdef MP
-				let num = e.changedTouches[0].clientX - this.touchStartPosition;
-				if((this.videoStartPositon + num) <= (this.windowWidth - (this.windowWidth*0.10))) {
-					this.addPositon = e.changedTouches[0].clientX - this.touchStartPosition;
-				} else {
-					this.addPositon = 0;
-					this.videoStartPositon = (this.windowWidth - (this.windowWidth*0.10));
-				}
-				// #endif
-			},
-			touchend(e){
-				// #ifdef H5
-				if(this.isClick){
-					let per = Number( (this.videoStartPositon+this.addPositon) / (this.windowWidth - (this.windowWidth*0.10)) );
-					let timeSubmit = parseInt( this.timeduration * per )
-					audo.seek(timeSubmit)
-					audo.play()
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).seek(timeSubmit)
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-					this.dataList[this.k].state = 'play'
-					setTimeout(()=>{
-						this.isTouch = false;
-					},500)
-				}
-				// #endif
-				// #ifdef MP
-				let per = Number( (this.videoStartPositon+this.addPositon) / (this.windowWidth - (this.windowWidth*0.10)) );
-				let timeSubmit = parseInt( this.timeduration * per )
-				audo.seek(timeSubmit)
-				audo.play()
-				uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).seek(timeSubmit)
-				uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-				setTimeout(()=>{
-					this.isTouch = false;
-				},500)
-				// #endif
-			},
-			timeupdate(event,index){
-				// 触发进度条更新
-				// console.log(event,index);
-				if(index === this.k){
-					this.timeduration = event.detail.duration;
-					this.progressBarPercent = parseFloat( Number( event.detail.currentTime / event.detail.duration ) );
-				}
-			},
-			// ---- 进度条相关 --- ending
-			doubleLike(){
-				if(this.dataList[this.k].like == false){
-					this.dataList[this.k].like_n += 1;
-					this.dataList[this.k].like = true;
-				}
-				/*
-				点赞
-				*/
-			},
-			//点击播放&&暂停
-			tapVideoHover(state,event){
-				this.dataList[this.k].isShowimage = false
-				this.dataList[this.k].isShowProgressBarTime = false
-				this.ProgressBarOpacity = 0.5
-				this.dotWidth = 0
-				console.log('state--',state);
-				// 1.启用双击点赞 --- start
-				this.touchNum++;
-				setTimeout(()=>{
-					if(this.touchNum == 1){
-						if(state=='play'||state=='continue'){
-							this.dataList[this.k].state = 'pause';
-						}else{
-							this.dataList[this.k].state = 'continue';
-						}
-						if(this.dataList[this.k].state == 'continue'){
-							uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play();//暂停以后继续播放
-							this.clearTime();
-							setTimeout(()=>{
-								this.rotateX();
-							},50)
-						}
-						if(this.dataList[this.k].state == 'pause'){
-							uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).pause();//暂停以后继续播放
-							this.clearTime();
-						}
-					}
-					if(this.touchNum >= 2){
-						this.doubleLike();
-					}
-					this.touchNum = 0;
-				},200)
-				// --------------- ending
-				// 2. 不启用双击点赞 start
-				// if(state=='play'||state=='continue'){
-				// 	this.dataList[this.k].state = 'pause';
-				// }else{
-				// 	this.dataList[this.k].state = 'continue';
-				// }
-				// if(this.dataList[this.k].state == 'continue'){
-				// 	uni.createVideoContext(this.dataList[this.k]._id,this).play();//暂停以后继续播放
-				// }
-				// if(this.dataList[this.k].state == 'pause'){
-				// 	uni.createVideoContext(this.dataList[this.k]._id,this).pause();//暂停以后继续播放
-				// }
-				// --------------- ending
-			},
-			//点击播放&&暂停
-			tapVideoHovers(state,event){
-				console.log('state--',state);
-				if(state=='play'||state=='continue'){
-					this.dataList[this.k].state = 'pause';
-				}else{
-					this.dataList[this.k].state = 'continue';
-				}
-				if(this.dataList[this.k].state == 'continue'){
-					this.isClick = true;
-					this.dataList[this.k].playIng = true
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play();//暂停以后继续播放
-					// #ifdef MP
-					this.dataList[this.k].isplay = false
-					// #endif
-					// #ifdef H5
-					audo.play()
-					// #endif
-				}
-				if(this.dataList[this.k].state == 'pause'){
-					uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).pause();//暂停以后继续播放
-					// #ifdef MP
-					this.dataList[this.k].isplay = true
-					// #endif
-					// #ifdef H5
-					audo.pause()
-					// #endif
-				}
-			},
-			change(event){
-				this.k = event.detail.current
-			},
-			animationfinish(event){
-				// 1.这里进行判断，如果是最后一个视频就进入 get() 方法加载视频进入列表
-				if(this.k == this.dataList.length - 1){
-					this.GET()
-				}
-			},
-			//每一组结束时新的请求
-			GET(){
-				uni.request({
-					url: 'https://bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.bspapp.com/video',
-					method: 'POST',
-					data:{
-						info: 'get_video'
-					},
-					success: (res) => {
-						var msg = res.data.data
-						// 2.这里把视频添加到视频列表
-						for (let i = 0; i < msg.length; i++) {
-							this.dataList.push(msg[i])
-						}
-					}
-				})
-			},
-			get(){
-				// 1.这里引入后端请求数据
-				// var msg = userList
-				uni.request({
-					url: 'https://bdb24c6d-8c19-4f80-8e7e-c9c9f037f131.bspapp.com/video',
-					method: 'POST',
-					data:{
-						info: 'get_video'
-					},
-					success: (res) => {
-						this.isShow = false;
-						var msg = res.data.data
-						// 2.这里把视频添加到视频列表
-						for (let i = 0; i < msg.length; i++) {
-							this.dataList.push(msg[i])
-						}
-						// 3.播放当前视频
-						setTimeout(()=>{
-							this.isShow = true;
-							// #ifdef H5
-							this.dataList[this.k].isplay = true
-							// #endif
-							// #ifdef MP
-							// 如果是小程序端
-							this.dataList[this.k].isplay = false
-							this.dataList[this.k].state = 'play'
-							// #endif
-							this.dataList[this.k].playIng = true
-							setTimeout(()=>{
-								// #ifdef H5
-								uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).seek(0)
-								uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).pause()
-								this.dataList[this.k].state = 'pause';
-								audo.src = this.dataList[this.k].src;
-								// #endif
-								// #ifdef MP
-								uni.createVideoContext(this.dataList[this.k]._id+''+this.k,this).play()
-								// #endif
-							},500)
-						},200)
-						this.videoID = this.dataList[this.k]._id
-					}
-				})
-			},
-			share(){
-				uni.showToast({
-					title: '分享',
-					icon: 'none'
-				})
-			},
-			toComment(index){
-				// 注意点击评论之后会执行这里
-				/*
-				（1）先加载缓冲
-				（2）获取当前视频 ID 信息
-				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
-					- 一定要记得看 index.vue 里面
-					 uni.setStorageSync("user",this.peopleList[i]);
-					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
-					 记得写一下。
-					 
-				（4）打开评论
-				*/ 
-				uni.showToast({
-					title: '加载中...',
-					icon: 'none',
-					position: 'bottom',
-					duration: 300
-				})
-				uni.setStorageSync("videoID",this.dataList[index]._id);
-				this.videoID = this.dataList[index]._id;
-				this.$refs.pinglun.open('bottom')
-			},
-			cLike(sss){
-				this.dataList[this.k].like = !this.dataList[this.k].like
-				const video = this.dataList[this.k];
-				sss?video.like_n -= 1:video.like_n += 1;
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.list-view{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	.container {background-color: #000000;}
-	.item {
-		/* width : 750rpx; */
-		background-color: #000000;
-		position: relative;
-	}
-	.videoHover{
-		position: absolute;
-		top: 0;
-		left: 0;
-		flex: 1;
-		background-color: rgba(0,0,0,0.1);
-		justify-content: center;
-		align-items: center;
-		display: flex;
-		/* border-style: dashed;
-		border-color: #DD524D;
-		border-width: 1px; */
-	}
-	.playState{
-		width:  160rpx;
-		height: 160rpx;
-		opacity: 0.2;
-	}
-	.userInfo{
-		position: absolute;
-		bottom:110px;
-		right: 10px;
-		display: flex;
-		flex-direction: column;
-		z-index: 18;
-	}
-	.userAvatar{
-		border-radius: 500%;
-		border-style: solid;
-		border-width: 2px;
-		border-color: #ffffff;
-	}
-	.userAvatar{
-		width : 100rpx;
-		height: 100rpx;
-	}
-	.likeIco,.shareIco,.commentIco{
-		width : 60rpx;
-		height: 60rpx;
-		margin-top: 15px;
-	}
-	.likeNum,.commentNum,.shareTex{
-		color: #ffffff;
-		font-size: 30rpx;
-		text-align: center;
-		margin: 5px;
-	}
-	.likeNumActive{
-		color: red;
-	}
-	.content{
-	  width: 620rpx;
-	  z-index: 99;
-	  position: absolute;
-	  bottom: 50px;
-	  /* justify-content: center; */
-	  padding: 15rpx;
-	  flex-direction: column;
-	  justify-content: flex-start;
-	  color: #ffffff;
-	  z-index: 12;
-	  /* background-color: aqua; */
-	}
-	.userName {
-	  font-size: 30rpx;
-	  color: #ffffff;
-	  margin-top: 80upx;
-	}
-	.words {
-	  margin-top: 10rpx;
-	  font-size: 30rpx;
-	  color: #ffffff;
-	}
-	.root{
-		background-color: #000000;
-	}
-</style>
diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index 3a77e43..4a30fa6 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -51,12 +51,12 @@
 					</view>
 					<view class="userInfo">
 						<!-- 1.头像 -->
-						<image @click="tozuozhe" class="userAvatar" :src="list.artificerImg" mode="aspectFill"></image>
+						<image @click="tozuozhe(list)" class="userAvatar" :src="list.artificerImg" mode="aspectFill"></image>
 						<!-- 2.点赞 -->
-						<view class="list-view" @click="cLike(list.like);" style="opacity: 0.9; margin-top: 17px;">
-							<image v-if="list.like" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-							<image v-if="!list.like" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
-							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':list.like}">{{list.dzs}}</text>
+						<view class="list-view" @click="cLike(list.sfdz);" style="opacity: 0.9; margin-top: 17px;">
+							<image v-if="list.sfdz=='1'" src="@/static/img/index/xin.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
+							<image v-if="list.sfdz=='0'" src="@/static/img/index/xin-2.png" style="width: 40px; height: 40px; position: absolute; right: 6px;"></image>
+							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; margin-top: 40px; font-weight: bold;" :class="{'likeNumActive':list.sfdz}">{{list.dzs}}</text>
 						</view>
 						<!-- 3.评论 -->
 						<view class="comment list-view" @click="toComment(index)" style="opacity: 0.9; margin-top: 17px;">
@@ -68,12 +68,12 @@
 							<image src="@/static/img/index/share-fill.png" style="width: 40px; height: 40px; position: absolute; right: 5px;"></image>
 							<text style="color: #FFFFFF; margin-top: 5px; font-size: 14px; text-align: center; font-weight: bold; margin-top: 40px;">分享</text>
 						</view> -->
-						<view @click="dealVoice" class="list-view" style="margin-top: 17px;">
+						<!-- <view @click="dealVoice" class="list-view" style="margin-top: 17px;">
 							<view style="width: 48px; height: 48px; border-radius: 50px; position: absolute; right: 2.5px;">
 								<image :style="'width: 48px; height: 48px; border-radius: 50px; transform: rotate('+ rotates +'deg);'" src="@/static/img/index/bfq.png" mode="aspectFill"></image>
 								<image v-if="showPlay" :style="'width: 30px; height: 30px; margin-top: 9px; margin-left: 9px; position: absolute; border-radius: 50px; transform: rotate('+ rotates +'deg);'" :src="list.href" mode="aspectFill"></image>
 							</view>
-						</view>
+						</view> -->
 					</view>
 					<!-- 最底下的文字部分 -->
 					<view class="content" style="display: flex;flex-direction: column;">
@@ -95,9 +95,10 @@
 				</view>
 			</swiper-item>
 		</swiper>
-		<uni-popup type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
-			<view :style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px; background-color: #242424; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-				
+		<uni-popup class="uni-popup" type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
+			<view class="popup-content" :style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px;'">
+				    <CComment ref="ccRef" :userInfo="userInfo" :tableData="tableData" :tableTotal="tableTotal" likeFun="likeFun" @replyFun="replyFun" @deleteFun="deleteFun" :deleteMode="deleteMode"></CComment>
+						<div class="btn" @click="openComment">发一条新评论</div>
 				<!-- <douyin-scrollview
 				:Width="windowWidth"
 				:Height="(boxStyle.height/1.23)"
@@ -115,13 +116,23 @@
 	let audo = uni.createInnerAudioContext()
 	audo.loop = true
 	import douyinScrollview from '@/components/douyin-scrollview/douyin-scrollview.vue'
+	import CComment from "@/components/XJ-comment/index";
 	export default {
 		components:{
-			douyinScrollview
+			douyinScrollview,
+			CComment
 		},
 		data() {
 			return {
-				
+				 ccRef: null,
+				userInfo: {
+					id: 120,
+					user_name: "🍁",
+					user_avatar: "https://pic1.zhimg.com/80/v2-a79071a705f55c5d88f6c74e6111fe84_720w.webp",
+				},
+				tableTotal: 4,
+				tableData: [],
+				deleteMode: "all",
 				windowWidth: 0,
 				windowHeight: 0,
 				platform: "",
@@ -272,6 +283,7 @@
 			// #ifndef MP
 			this.rotateX();
 			// #endif
+			
 		},
 		onShow(){
 			console.log('回到前台');
@@ -303,7 +315,126 @@
 			// #endif
 			console.log('到后台');
 		},
+		
 		methods: {
+			openComment() {//点击发布新评论按钮
+				this.$refs.ccRef.newCommentFun();
+			},
+			likeFun(params, callback) {//评论点赞返回
+				console.log("likeFun", params);
+				// Implement your logic for likeFun
+			},
+			toComment(index){
+				// 注意点击评论之后会执行这里
+				/*
+				（1）先加载缓冲
+				（2）获取当前视频 ID 信息
+				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
+					- 一定要记得看 index.vue 里面
+					 uni.setStorageSync("user",this.peopleList[i]);
+					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
+					 记得写一下。
+					 
+				（4）打开评论
+				*/ 
+				uni.showToast({
+					title: '加载中...',
+					icon: 'none',
+					position: 'bottom',
+					duration: 300
+				})
+				uni.setStorageSync("videoID",this.dataList[index].id);
+				this.videoID = this.dataList[index].id;
+				this.$refs.pinglun.open('bottom');
+				this.getPingL(this.videoID);
+			},
+			getPingL(shipinquanId){//获取评论列表
+				var data={
+					page: this.page,
+					limit:310,
+					shipinquanId:shipinquanId
+				}
+				this.$Request.get("/app/shipinquan/contentlist", data).then(res => {
+					if (res.code == 0) {
+							var msg = res.data.records||{}
+							this.tableTotal=res.data.total;
+							var list=[];
+							// for (let i = 0; i < msg.length; i++) {
+							// 	list.push(msg[i])
+							// }
+							
+							this.tableData = msg.map(item => {
+							  return {
+							    ...item,
+							   parent_id: null,
+							   reply_id: null,
+							   reply_name: null,
+							   user_name: item.name?item.name:'盛安',
+							   user_avatar: item.filePath?item.filePath:'../../static/logo.png',
+							   user_content: item.content,
+							   is_like: true,
+							   like_count: 8,
+							   create_time: item.createTime
+							  };
+							});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				});
+			},
+			replyFun(params, callback) {
+				// console.log("replyFun", params);
+				  var data={
+				  	createBy:uni.getStorageSync('userId'),
+					content:params.params.user_content,
+				  	shipinquanId:this.videoID,
+				  }
+				  this.$Request.post("/app/shipinquan/addContent",data).then(res => {
+				  	if (res.code == 0) {
+						 setTimeout(() => this.getPingL(this.videoID), 500);
+						uni.hideLoading();
+				  			 callback(this.videoID);
+				  	} else {
+						uni.hideLoading();
+				  		uni.showToast({
+				  			title: res.msg,
+				  			icon: 'none'
+				  		})
+				  	}
+				  });
+				  // const res = { id: Math.random() }; // 很重要的回参! 必须拿到后端返回评论id! 删除需要!
+				  // setTimeout(() => callback(res), 500); // 目前为了展示效果, 直接执行callback
+			},
+
+			deleteFun({ params, mode }, callback) {
+
+			  console.log("deleteFun", { params, mode });
+			  // 当请求成功, 调用callback执行评论删除;
+			  switch (this.deleteMode) {
+				case "bind":
+				  // 逻辑: 调用接口进行评论内容修改 update
+				  setTimeout(() => callback(), 500); // 目前为了展示效果, 直接执行callback
+				  break;
+				case "only":
+				  // 逻辑: 调用接口删除一个评论 delete
+				  setTimeout(() => callback(), 500); // 目前为了展示效果, 直接执行callback
+				  break;
+				default:
+				  // all
+				  // 逻辑: 调用接口删除多个评论 [delete]
+				  // Demo如下:
+				  // axios.post("http://xxx/delete", { ids: params }).then((res) => {
+				  //   if (res.code === 0) {
+				  //     callback(res);
+				  //   }
+				  // });
+				  setTimeout(() => callback(), 500); // 目前为了展示效果, 直接执行callback
+				  break;
+			  }
+			},
 			closeScrollview(){
 				// 点击评论里面的叉叉，就会关闭评论
 				this.$refs.pinglun.close('bottom');
@@ -340,7 +471,11 @@
 					this.onTabItemTaps();
 				}
 			},
-			tozuozhe(){
+			tozuozhe(item){
+				// console.log("itemitemitemitemitem",item)
+				uni.reLaunch({
+					url:'/pages/therapist/orderDetail?artificerId='+item.createBy+'&classifyId='+'undefined'
+				})
 				this.currents = 1//点击头像以后就会切换
 			},
 			mpTouchend(){
@@ -379,7 +514,6 @@
 					this.rotates += 1;
 				},30)
 			},
-			
 			ended(){
 				// 1.播放当前视频结束时触发，自动切换下一个视频
 				// this.current = this.k+1
@@ -437,9 +571,24 @@
 			},
 			// ---- 进度条相关 --- ending
 			doubleLike(){
-				if(this.dataList[this.k].like == false){
-					this.dataList[this.k].dzs += 1;
-					this.dataList[this.k].like = true;
+				if(this.dataList[this.k].sfdz == '0'){
+					
+					var data={
+						createBy:uni.getStorageSync('userId'),
+						shipinquanId:this.dataList[this.k].id,
+					}
+					this.$Request.post("/app/shipinquan/addDianzan", data).then(res => {
+						if (res.code == 0) {
+								this.dataList[this.k].dzs += 1;
+								this.dataList[this.k].sfdz = '1';
+						} else {
+							this.dataList[this.k].sfdz ='0'
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+						}
+					});
 				}
 				/*
 				点赞
@@ -644,42 +793,20 @@
 					icon: 'none'
 				})
 			},
-			toComment(index){
-				// 注意点击评论之后会执行这里
-				/*
-				（1）先加载缓冲
-				（2）获取当前视频 ID 信息
-				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
-					- 一定要记得看 index.vue 里面
-					 uni.setStorageSync("user",this.peopleList[i]);
-					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
-					 记得写一下。
-					 
-				（4）打开评论
-				*/ 
-				uni.showToast({
-					title: '加载中...',
-					icon: 'none',
-					position: 'bottom',
-					duration: 300
-				})
-				uni.setStorageSync("videoID",this.dataList[index].id);
-				this.videoID = this.dataList[index].id;
-				this.$refs.pinglun.open('bottom')
-			},
+			
 			cLike(sss){
 				var data={
-					createBy:this.dataList[this.k].createBy,
+					createBy:uni.getStorageSync('userId'),
 					shipinquanId:this.dataList[this.k].id,
 				}
-				this.dataList[this.k].like = !this.dataList[this.k].like
-				if(this.dataList[this.k].like==true){
+				this.dataList[this.k].sfdz = !this.dataList[this.k].sfdz
+				if(this.dataList[this.k].sfdz=='1'){
 					this.$Request.post("/app/shipinquan/addDianzan", data).then(res => {
 						if (res.code == 0) {
 								const video = this.dataList[this.k];
 								sss=video.dzs += 1;
 						} else {
-							this.dataList[this.k].like =false
+							this.dataList[this.k].sfdz ='0'
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'
@@ -688,12 +815,13 @@
 					});
 					
 				}else{//取消点赞
+				this.dataList[this.k].sfdz ='0'
 					this.$Request.post("/app/shipinquan/delDianzan", data).then(res => {
 						if (res.code == 0) {
 								const video = this.dataList[this.k];
 								sss=video.dzs -= 1;
 						} else {
-							this.dataList[this.k].like =true
+							this.dataList[this.k].sfdz ='0'
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'
@@ -709,6 +837,37 @@
 </script>
 
 <style scoped>
+	.uni-popup{
+		width: 100%;
+		height: 500px;
+		overflow: auto;
+	}
+	.popup-content{
+	  width: 100%;
+	  height: 100%;
+	 background-color: #242424;
+	 border-top-left-radius: 10px; 
+	 border-top-right-radius: 10px;
+	 position: relative;
+	  display: flex;
+	  flex-direction: column;
+	}
+	/deep/uni-tabbar /deep/.uni-tabbar-bottom /deep/.uni-tabbar{
+		z-index: 998;
+	}
+	
+	.btn {
+	  text-align: center;
+	  color: #fff;
+	  padding: 20rpx;
+	  margin: 20rpx;
+	  border-radius: 20rpx;
+	  background-color: #2979ff;
+	  position: fixed;
+	  bottom: 0px;
+	  z-index: 666;
+	  width: 90%;
+	}
 	.list-view{
 		display: flex;
 		flex-direction: column;
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
new file mode 100644
index 0000000..84c72eb
--- /dev/null
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,115 @@
+## 1.1.19（2024-07-18）
+- 修复 初始值传入 null 导致input报错的bug
+## 1.1.18（2024-04-11）
+- 修复 easyinput组件双向绑定问题
+## 1.1.17（2024-03-28）
+- 修复 在头条小程序下丢失事件绑定的问题
+## 1.1.16（2024-03-20）
+- 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
+## 1.1.15（2024-02-21）
+- 新增 左侧插槽：left
+## 1.1.14（2024-02-19）
+- 修复 onBlur的emit传值错误
+## 1.1.12（2024-01-29）
+- 补充 adjust-position文档属性补充
+## 1.1.11（2024-01-29）
+- 补充 adjust-position属性传递值：（Boolean）当键盘弹起时，是否自动上推页面
+## 1.1.10（2024-01-22）
+- 去除 移除无用的log输出
+## 1.1.9（2023-04-11）
+- 修复 vue3 下 keyboardheightchange 事件报错的bug
+## 1.1.8（2023-03-29）
+- 优化 trim 属性默认值
+## 1.1.7（2023-03-29）
+- 新增 cursor-spacing 属性
+## 1.1.6（2023-01-28）
+- 新增 keyboardheightchange 事件，可监听键盘高度变化
+## 1.1.5（2022-11-29）
+- 优化 主题样式
+## 1.1.4（2022-10-27）
+- 修复 props 中背景颜色无默认值的bug
+## 1.1.0（2022-06-30）
+
+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
+- 新增 clear 事件，点击右侧叉号图标触发
+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
+
+## 1.0.5（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.4（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.3（2022-05-20）
+
+- 修复 关闭图标某些情况下无法取消的 bug
+
+## 1.0.2（2022-04-12）
+
+- 修复 默认值不生效的 bug
+
+## 1.0.1（2022-04-02）
+
+- 修复 value 不能为 0 的 bug
+
+## 1.0.0（2021-11-19）
+
+- 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+
+## 0.1.4（2021-08-20）
+
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+
+## 0.1.3（2021-08-11）
+
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+
+## 0.1.2（2021-07-30）
+
+- 优化 vue3 下事件警告的问题
+
+## 0.1.1
+
+- 优化 errorMessage 属性支持 Boolean 类型
+
+## 0.1.0（2021-07-13）
+
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+
+## 0.0.16（2021-06-29）
+
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+
+## 0.0.15（2021-06-21）
+
+- 修复 passwordIcon 属性拼写错误的 bug
+
+## 0.0.14（2021-06-18）
+
+- 新增 passwordIcon 属性，当 type=password 时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+
+## 0.0.13（2021-06-04）
+
+- 修复 disabled 状态可清出内容的 bug
+
+## 0.0.12（2021-05-12）
+
+- 新增 组件示例地址
+
+## 0.0.11（2021-05-07）
+
+- 修复 input-border 属性不生效的问题
+
+## 0.0.10（2021-04-30）
+
+- 修复 ios 遮挡文字、显示一半的问题
+
+## 0.0.9（2021-02-05）
+
+- 调整为 uni_modules 目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
new file mode 100644
index 0000000..fde8d3c
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,54 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+	let timer;
+	return function() {
+		let context = this,
+			args = arguments;
+		if (timer) clearTimeout(timer);
+		if (immediate) {
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait);
+			if (callNow) func.apply(context, args);
+		} else {
+			timer = setTimeout(() => {
+				func.apply(context, args);
+			}, wait)
+		}
+	}
+}
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+ */
+export const throttle = (func, wait = 1000, type = 1) => {
+	let previous = 0;
+	let timeout;
+	return function() {
+		let context = this;
+		let args = arguments;
+		if (type === 1) {
+			let now = Date.now();
+
+			if (now - previous > wait) {
+				func.apply(context, args);
+				previous = now;
+			}
+		} else if (type === 2) {
+			if (!timeout) {
+				timeout = setTimeout(() => {
+					timeout = null;
+					func.apply(context, args)
+				}, wait)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
new file mode 100644
index 0000000..93506d6
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,676 @@
+<template>
+	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="22"></uni-icons>
+			<slot name="left">
+			</slot>
+			<!-- #ifdef MP-ALIPAY -->
+			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+			<!-- #ifndef MP-ALIPAY -->
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+
+			<template v-if="type === 'password' && passwordIcon">
+				<!-- 开启密码时显示小眼睛 -->
+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" :type="showPassword ? 'eye-slash-filled' : 'eye-filled'" :size="22" :color="focusShow ? primaryColor : '#c0c4cc'" @click="onEyes"></uni-icons>
+			</template>
+			<template v-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')" size="22"></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons v-if="clearable && isVal && !disabled && type !== 'textarea'" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" type="clear" :size="clearSize" :color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'" @click="onClear"></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Easyinput 输入框
+	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+	 * @property {String}	value	输入内容
+	 * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+	 * 	@value text			文本输入键盘
+	 * 	@value textarea	多行文本输入键盘
+	 * 	@value password	密码输入键盘
+	 * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {String }	placeholder	输入框的提示文字
+	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
+	 * @property {Boolean}	disabled	是否禁用（默认false）
+	 * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+	 * @property {String}	prefixIcon	输入框头部图标
+	 * @property {String}	suffixIcon	输入框尾部图标
+	 * @property {String}	primaryColor	设置主题色（默认#2979ff）
+	 * @property {Boolean}	trim	是否自动去除两端的空格
+	 * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
+	 * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
+	 * @value both	去除两端空格
+	 * @value left	去除左侧空格
+	 * @value right	去除右侧空格
+	 * @value start	去除左侧空格
+	 * @value end		去除右侧空格
+	 * @value all		去除全部空格
+	 * @value none	不去除空格
+	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+	 * @property {Object}	styles	自定义颜色
+	 * @event {Function}	input	输入框内容发生变化时触发
+	 * @event {Function}	focus	输入框获得焦点时触发
+	 * @event {Function}	blur	输入框失去焦点时触发
+	 * @event {Function}	confirm	点击完成按钮时触发
+	 * @event {Function}	iconClick	点击图标时触发
+	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+	 */
+	function obj2strClass(obj) {
+		let classess = '';
+		for (let key in obj) {
+			const val = obj[key];
+			if (val) {
+				classess += `${key} `;
+			}
+		}
+		return classess;
+	}
+
+	function obj2strStyle(obj) {
+		let style = '';
+		for (let key in obj) {
+			const val = obj[key];
+			style += `${key}:${val};`;
+		}
+		return style;
+	}
+	export default {
+		name: 'uni-easyinput',
+		emits: [
+			'click',
+			'iconClick',
+			'update:modelValue',
+			'input',
+			'focus',
+			'blur',
+			'confirm',
+			'clear',
+			'eyes',
+			'change',
+			'keyboardheightchange'
+		],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			}
+		},
+		props: {
+			name: String,
+			value: [Number, String],
+			modelValue: [Number, String],
+			type: {
+				type: String,
+				default: 'text'
+			},
+			clearable: {
+				type: Boolean,
+				default: true
+			},
+			autoHeight: {
+				type: Boolean,
+				default: false
+			},
+			placeholder: {
+				type: String,
+				default: ' '
+			},
+			placeholderStyle: String,
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 140
+			},
+			confirmType: {
+				type: String,
+				default: 'done'
+			},
+			clearSize: {
+				type: [Number, String],
+				default: 24
+			},
+			inputBorder: {
+				type: Boolean,
+				default: true
+			},
+			prefixIcon: {
+				type: String,
+				default: ''
+			},
+			suffixIcon: {
+				type: String,
+				default: ''
+			},
+			trim: {
+				type: [Boolean, String],
+				default: false
+			},
+			cursorSpacing: {
+				type: Number,
+				default: 0
+			},
+			passwordIcon: {
+				type: Boolean,
+				default: true
+			},
+			adjustPosition: {
+				type: Boolean,
+				default: true
+			},
+			primaryColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {
+						color: '#333',
+						backgroundColor: '#fff',
+						disableColor: '#F7F6F6',
+						borderColor: '#e5e5e5'
+					};
+				}
+			},
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// #ifdef MP-ALIPAY
+			enableNative: {
+				type: Boolean,
+				default: false
+			}
+			// #endif
+		},
+		data() {
+			return {
+				focused: false,
+				val: '',
+				showMsg: '',
+				border: false,
+				isFirstBorder: false,
+				showClearIcon: false,
+				showPassword: false,
+				focusShow: false,
+				localMsg: '',
+				isEnter: false // 用于判断当前是否是使用回车操作
+			};
+		},
+		computed: {
+			// 输入框内是否有值
+			isVal() {
+				const val = this.val;
+				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+				if (val || val === 0) {
+					return true;
+				}
+				return false;
+			},
+
+			msg() {
+				// console.log('computed', this.form, this.formItem);
+				// if (this.form) {
+				// 	return this.errorMessage || this.formItem.errMsg;
+				// }
+				// TODO 处理头条 formItem 中 errMsg 不更新的问题
+				return this.localMsg || this.errorMessage;
+			},
+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+			inputMaxlength() {
+				return Number(this.maxlength);
+			},
+
+			// 处理外层样式的style
+			boxStyle() {
+				return `color:${
+					this.inputBorder && this.msg ? '#e43d33' : this.styles.color
+				};`;
+			},
+			// input 内容的类和样式处理
+			inputContentClass() {
+				return obj2strClass({
+					'is-input-border': this.inputBorder,
+					'is-input-error-border': this.inputBorder && this.msg,
+					'is-textarea': this.type === 'textarea',
+					'is-disabled': this.disabled,
+					'is-focused': this.focusShow
+				});
+			},
+			inputContentStyle() {
+				const focusColor = this.focusShow ?
+					this.primaryColor :
+					this.styles.borderColor;
+				const borderColor =
+					this.inputBorder && this.msg ? '#dd524d' : focusColor;
+				return obj2strStyle({
+					'border-color': borderColor || '#e5e5e5',
+					'background-color': this.disabled ?
+						this.styles.disableColor : this.styles.backgroundColor
+				});
+			},
+			// input右侧样式
+			inputStyle() {
+				const paddingRight =
+					this.type === 'password' || this.clearable || this.prefixIcon ?
+					'' :
+					'10px';
+				return obj2strStyle({
+					'padding-right': paddingRight,
+					'padding-left': this.prefixIcon ? '' : '10px'
+				});
+			}
+		},
+		watch: {
+			value(newVal) {
+				// fix by mehaotian 解决 值为null的情况下，input报错的bug
+				if (newVal === null) {
+					this.val = '';
+					return
+				}
+				this.val = newVal;
+			},
+			modelValue(newVal) {
+				if (newVal === null) {
+					this.val = '';
+					return
+				}
+				this.val = newVal;
+			},
+			focus(newVal) {
+				this.$nextTick(() => {
+					this.focused = this.focus;
+					this.focusShow = this.focus;
+				});
+			}
+		},
+		created() {
+			this.init();
+			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
+			if (this.form && this.formItem) {
+				this.$watch('formItem.errMsg', newVal => {
+					this.localMsg = newVal;
+				});
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.focused = this.focus;
+				this.focusShow = this.focus;
+			});
+		},
+		methods: {
+			/**
+			 * 初始化变量值
+			 */
+			init() {
+				if (this.value || this.value === 0) {
+					this.val = this.value;
+				} else if (
+					this.modelValue ||
+					this.modelValue === 0 ||
+					this.modelValue === ''
+				) {
+					this.val = this.modelValue; 
+				} else {
+					// fix by ht 如果初始值为null，则input报错，待框架修复
+					this.val = '';
+				}
+			},
+
+			/**
+			 * 点击图标时触发
+			 * @param {Object} type
+			 */
+			onClickIcon(type) {
+				this.$emit('iconClick', type);
+			},
+
+			/**
+			 * 显示隐藏内容，密码框时生效
+			 */
+			onEyes() {
+				this.showPassword = !this.showPassword;
+				this.$emit('eyes', this.showPassword);
+			},
+
+			/**
+			 * 输入时触发
+			 * @param {Object} event
+			 */
+			onInput(event) {
+				let value = event.detail.value;
+				// 判断是否去除空格
+				if (this.trim) {
+					if (typeof this.trim === 'boolean' && this.trim) {
+						value = this.trimStr(value);
+					}
+					if (typeof this.trim === 'string') {
+						value = this.trimStr(value, this.trim);
+					}
+				}
+				if (this.errMsg) this.errMsg = '';
+				this.val = value;
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', value);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 获取焦点时触发
+			 * @param {Object} event
+			 */
+			onFocus() {
+				this.$nextTick(() => {
+					this.focused = true;
+				});
+				this.$emit('focus', null);
+			},
+
+			_Focus(event) {
+				this.focusShow = true;
+				this.$emit('focus', event);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 失去焦点时触发
+			 * @param {Object} event
+			 */
+			onBlur() {
+				this.focused = false;
+				this.$emit('blur', null);
+			},
+			_Blur(event) {
+				let value = event.detail.value;
+				this.focusShow = false;
+				this.$emit('blur', event);
+				// 根据类型返回值，在event中获取的值理论上讲都是string
+				if (this.isEnter === false) {
+					this.$emit('change', this.val);
+				}
+				// 失去焦点时参与表单校验
+				if (this.form && this.formItem) {
+					const { validateTrigger } = this.form;
+					if (validateTrigger === 'blur') {
+						this.formItem.onFieldChange();
+					}
+				}
+			},
+
+			/**
+			 * 按下键盘的发送键
+			 * @param {Object} e
+			 */
+			onConfirm(e) {
+				this.$emit('confirm', this.val);
+				this.isEnter = true;
+				this.$emit('change', this.val);
+				this.$nextTick(() => {
+					this.isEnter = false;
+				});
+			},
+
+			/**
+			 * 清理内容
+			 * @param {Object} event
+			 */
+			onClear(event) {
+				this.val = '';
+				// TODO 兼容 vue2
+				this.$emit('input', '');
+				// TODO 兼容 vue2
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', '');
+				// 点击叉号触发
+				this.$emit('clear');
+			},
+
+			/**
+			 * 键盘高度发生变化的时候触发此事件
+			 * 兼容性：微信小程序2.7.0+、App 3.1.0+
+			 * @param {Object} event
+			 */
+			onkeyboardheightchange(event) {
+				this.$emit('keyboardheightchange', event);
+			},
+
+			/**
+			 * 去除空格
+			 */
+			trimStr(str, pos = 'both') {
+				if (pos === 'both') {
+					return str.trim();
+				} else if (pos === 'left') {
+					return str.trimLeft();
+				} else if (pos === 'right') {
+					return str.trimRight();
+				} else if (pos === 'start') {
+					return str.trimStart();
+				} else if (pos === 'end') {
+					return str.trimEnd();
+				} else if (pos === 'all') {
+					return str.replace(/\s+/g, '');
+				} else if (pos === 'none') {
+					return str;
+				}
+				return str;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-error: #e43d33;
+	$uni-border-1: #dcdfe6 !default;
+
+	.uni-easyinput {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+		position: relative;
+		text-align: left;
+		color: #333;
+		font-size: 14px;
+	}
+
+	.uni-easyinput__content {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+		// min-height: 36px;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// 处理border动画刚开始显示黑色的问题
+		border-color: #fff;
+		transition-property: border-color;
+		transition-duration: 0.3s;
+	}
+
+	.uni-easyinput__content-input {
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
+		font-size: 14px;
+		height: 35px;
+		// min-height: 36px;
+
+		/*ifdef H5*/
+		& ::-ms-reveal {
+			display: none;
+		}
+
+		& ::-ms-clear {
+			display: none;
+		}
+
+		& ::-o-clear {
+			display: none;
+		}
+
+		/*endif*/
+	}
+
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		// font-weight: 200;
+	}
+
+	.is-textarea {
+		align-items: flex-start;
+	}
+
+	.is-textarea-icon {
+		margin-top: 5px;
+	}
+
+	.uni-easyinput__content-textarea {
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1.5;
+		font-size: 14px;
+		margin: 6px;
+		margin-left: 0;
+		height: 80px;
+		min-height: 80px;
+		/* #ifndef APP-NVUE */
+		min-height: 80px;
+		width: auto;
+		/* #endif */
+	}
+
+	.input-padding {
+		padding-left: 10px;
+	}
+
+	.content-clear-icon {
+		padding: 0 5px;
+	}
+
+	.label-icon {
+		margin-right: 5px;
+		margin-top: -1px;
+	}
+
+	// 显示边框
+	.is-input-border {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border: 1px solid $uni-border-1;
+		border-radius: 4px;
+		/* #ifdef MP-ALIPAY */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-error-message {
+		position: absolute;
+		bottom: -17px;
+		left: 0;
+		line-height: 12px;
+		color: $uni-error;
+		font-size: 12px;
+		text-align: left;
+	}
+
+	.uni-error-msg--boeder {
+		position: relative;
+		bottom: 0;
+		line-height: 22px;
+	}
+
+	.is-input-error-border {
+		border-color: $uni-error;
+
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);
+		}
+	}
+
+	.uni-easyinput--border {
+		margin-bottom: 0;
+		padding: 10px 15px;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+	}
+
+	.uni-easyinput-error {
+		padding-bottom: 0;
+	}
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	.is-disabled {
+		background-color: #f7f6f6;
+		color: #d5d5d5;
+
+		.uni-easyinput__placeholder-class {
+			color: #d5d5d5;
+			font-size: 12px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
new file mode 100644
index 0000000..2939256
--- /dev/null
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.1.19",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
new file mode 100644
index 0000000..f1faf8f
--- /dev/null
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
new file mode 100644
index 0000000..ddee87a
--- /dev/null
+++ b/uni_modules/uni-tag/changelog.md
@@ -0,0 +1,23 @@
+## 2.1.1（2024-03-20）
+- 优化 app下边框过窄导致不显示的bug
+## 2.1.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)
+## 2.0.0（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+- 移除 插槽
+- 移除 type 属性的 royal 选项
+## 1.1.1（2021-08-11）
+- type 不是 default 时，size 为 small 字体大小显示不正确
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-06-18）
+- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
+## 1.0.6（2021-06-04）
+- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
+## 1.0.5（2021-05-10）
+- 修复 royal 类型无效的bug
+- 修复 uni-tag 宽度不自适应的bug
+- 新增 uni-tag 支持属性 custom-style 自定义样式
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..7274436
--- /dev/null
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -0,0 +1,252 @@
+<template>
+	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick">{{text}}</text>
+</template>
+
+<script>
+	/**
+	 * Tag 标签
+	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
+	 * @property {String} text 标签内容
+	 * @property {String} size = [default|small|mini] 大小尺寸
+	 * 	@value default 正常
+	 * 	@value small 小尺寸
+	 * 	@value mini 迷你尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error]  颜色类型
+	 * 	@value default 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @event {Function} click 点击 Tag 触发事件
+	 */
+
+	export default {
+		name: "UniTag",
+		emits: ['click'],
+		props: {
+			type: {
+				// 标签类型default、primary、success、warning、error、royal
+				type: String,
+				default: "default"
+			},
+			size: {
+				// 标签大小 normal, small
+				type: String,
+				default: "normal"
+			},
+			// 标签内容
+			text: {
+				type: String,
+				default: ""
+			},
+			disabled: {
+				// 是否为禁用状态
+				type: [Boolean, String],
+				default: false
+			},
+			inverted: {
+				// 是否为空心
+				type: [Boolean, String],
+				default: false
+			},
+			circle: {
+				// 是否为圆角样式
+				type: [Boolean, String],
+				default: false
+			},
+			mark: {
+				// 是否为标记样式
+				type: [Boolean, String],
+				default: false
+			},
+			customStyle: {
+				type: String,
+				default: ''
+			}
+		},
+		computed: {
+			classes() {
+				const {
+					type,
+					disabled,
+					inverted,
+					circle,
+					mark,
+					size,
+					isTrue
+				} = this
+				const classArr = [
+					'uni-tag--' + type,
+					'uni-tag--' + size,
+					isTrue(disabled) ? 'uni-tag--disabled' : '',
+					isTrue(inverted) ? 'uni-tag--' + type + '--inverted' : '',
+					isTrue(circle) ? 'uni-tag--circle' : '',
+					isTrue(mark) ? 'uni-tag--mark' : '',
+					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
+					isTrue(inverted) ? 'uni-tag--inverted uni-tag-text--' + type : '',
+					size === 'small' ? 'uni-tag-text--small' : ''
+				]
+				// 返回类的字符串，兼容字节小程序
+				return classArr.join(' ')
+			}
+		},
+		methods: {
+			isTrue(value) {
+				return value === true || value === 'true'
+			},
+			onClick() {
+				if (this.isTrue(this.disabled)) return
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #18bc37 !default;
+	$uni-warning: #f3a73f !default;
+	$uni-error: #e43d33 !default;
+	$uni-info: #8f939c !default;
+
+
+	$tag-default-pd: 4px 7px;
+	$tag-small-pd: 2px 5px;
+	$tag-mini-pd: 1px 3px;
+
+	.uni-tag {
+		line-height: 14px;
+		font-size: 12px;
+		font-weight: 200;
+		padding: $tag-default-pd;
+		color: #fff;
+		border-radius: 3px;
+		background-color: $uni-info;
+		border-width: 1px;
+		border-style: solid;
+		border-color: $uni-info;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+
+		// size attr
+		&--default {
+			font-size: 12px;
+		}
+
+		&--default--inverted {
+			color: $uni-info;
+			border-color: $uni-info;
+		}
+
+		&--small {
+			padding: $tag-small-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		&--mini {
+			padding: $tag-mini-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		// type attr
+		&--primary {
+			background-color: $uni-primary;
+			border-color: $uni-primary;
+			color: #fff;
+		}
+
+		&--success {
+			color: #fff;
+			background-color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning {
+			color: #fff;
+			background-color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error {
+			color: #fff;
+			background-color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--primary--inverted {
+			color: $uni-primary;
+			border-color: $uni-primary;
+		}
+
+		&--success--inverted {
+			color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning--inverted {
+			color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error--inverted {
+			color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--inverted {
+			background-color: #fff;
+		}
+
+		// other attr
+		&--circle {
+			border-radius: 15px;
+		}
+
+		&--mark {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
+			border-top-right-radius: 15px;
+			border-bottom-right-radius: 15px;
+		}
+
+		&--disabled {
+			opacity: 0.5;
+			/* #ifdef H5 */
+			cursor: not-allowed;
+			/* #endif */
+		}
+	}
+
+
+	.uni-tag-text {
+		color: #fff;
+		font-size: 14px;
+
+		&--primary {
+			color: $uni-primary;
+		}
+
+		&--success {
+			color: $uni-success;
+		}
+
+		&--warning {
+			color: $uni-warning;
+		}
+
+		&--error {
+			color: $uni-error;
+		}
+
+		&--small {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
new file mode 100644
index 0000000..71b41eb
--- /dev/null
+++ b/uni_modules/uni-tag/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-tag",
+  "displayName": "uni-tag 标签",
+  "version": "2.1.1",
+  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "",
+    "tag",
+    "标签"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-tag/readme.md b/uni_modules/uni-tag/readme.md
new file mode 100644
index 0000000..6e78ff5
--- /dev/null
+++ b/uni_modules/uni-tag/readme.md
@@ -0,0 +1,13 @@
+
+
+## Tag 标签
+> **组件名：uni-tag**
+> 代码块： `uTag`
+
+
+用于展示1个或多个文字标签，可点击切换选中、不选中的状态 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tag)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+