diff --git a/App.vue b/App.vue
index 2d488f85..7fae7b8c 100644
--- a/App.vue
+++ b/App.vue
@@ -5,9 +5,11 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
+                // request_url: 'https://new.shopxo.vip/',
                 request_url: 'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
+                // static_url: 'https://new.shopxo.vip/',
                 static_url: 'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
@@ -754,6 +756,7 @@
              * confirm_color      [string]    确认按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
              * object             [boject]    回调操作对象，点击确认回调参数1，取消回调0
              * method             [string]    回调操作对象的函数
+             * params             [obj]       携带的参数
              */
             alert(e) {
                 var msg = e.msg || null;
@@ -764,6 +767,7 @@
                     var confirm_text = e.confirm_text || '确认';
                     var cancel_color = e.cancel_color || '#000000';
                     var confirm_color = e.confirm_color || '#576B95';
+                    var params = e.params || {};
                     uni.showModal({
                         title: title,
                         content: msg,
@@ -774,7 +778,8 @@
                         confirmColor: confirm_color,
                         success(res) {
                             if ((e.object || null) != null && typeof e.object === 'object' && (e.method || null) != null) {
-                                e.object[e.method](res.confirm ? 1 : 0);
+                                params['alert_status'] = res.confirm ? 1 : 0;
+                                e.object[e.method](params);
                             }
                         },
                     });
diff --git a/common/css/page.css b/common/css/page.css
index b38f789c..c8bf6da0 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -594,6 +594,7 @@ button:before {
 .br-grey-9 {
     border: solid 1px #999999 !important;
 }
+
 .br-grey-c {
     border: solid 1px #cccccc !important;
 }
@@ -1255,9 +1256,11 @@ button[disabled].bg-grey {
 .flex-1 {
     flex: 1;
 }
+
 .flex-2 {
     flex: 2;
 }
+
 .flex-3 {
     flex: 3;
 }
diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue
index 5acd6b56..4f6dd04f 100644
--- a/components/iconfont/iconfont.vue
+++ b/components/iconfont/iconfont.vue
@@ -30,8 +30,8 @@
 <style scoped>
     /* iconfont.css全局注册需要将src切换成绝对路径 */
     /* @/static/icon/ */
-    @import url('@/static/icon/iconfont.css');
-    /* @import url('https://at.alicdn.com/t/c/font_4227145_6avx91bpfzb.css'); */
+    /* @import url('@/static/icon/iconfont.css'); */
+    @import url('https://at.alicdn.com/t/c/font_4227145_r2jv37yqfec.css');
 
     .iconfont {
         display: inline-block;
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 270d69e2..4f1585c8 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -1,8 +1,8 @@
 <template>
-    <view :class="theme_view">
+    <view :class="theme_view + ' ' + propMostClass">
         <view :class="'popup ' + (propClassname || '') + ' ' + (propShow ? 'popup-show' : 'popup-hide') + ' ' + (propAnimation ? 'animation' : '')" :disable-scroll="propDisablescroll">
             <view class="popup-mask" :style="'z-index: ' + propIndex + ';'" v-if="propMask" @tap="on_mask_tap"></view>
-            <view :class="'popup-content popup-' + (propPosition || 'bottom') + ' ' + (propIsBar ? 'popup-bar' : '') + ' ' + (propPosition === 'bottom' ? 'bottom-line-exclude' : '')" :style="position_style">
+            <view :class="'popup-content popup-' + (propPosition || 'bottom') + ' ' + (propIsRadius ? '' : 'popup-radius-0') + ' ' + (propIsBar ? 'popup-bar' : '') + ' ' + (propPosition === 'bottom' ? 'bottom-line-exclude' : '')" :style="position_style">
                 <slot></slot>
             </view>
         </view>
@@ -19,6 +19,10 @@
         },
         components: {},
         props: {
+            propMostClass: {
+                type: String,
+                default: '',
+            },
             propClassname: {
                 type: String,
                 default: '',
@@ -47,6 +51,11 @@
                 type: Boolean,
                 default: false,
             },
+            // 弹窗是否需要圆角 默认需要
+            propIsRadius: {
+                type: Boolean,
+                default: true,
+            },
             propIndex: {
                 type: Number,
                 default: 100,
@@ -60,6 +69,10 @@
                 type: String,
                 default: '',
             },
+            propStyle: {
+                type: String,
+                default: '',
+            },
         },
         // 属性值改变监听
         watch: {
@@ -70,7 +83,7 @@
         },
         computed: {
             position_style() {
-                let style = 'left:' + this.popup_content_left_value + ';' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '');
+                let style = 'left:' + this.popup_content_left_value + ';' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '') + ';' + this.propStyle;
                 return style;
             },
         },
@@ -91,13 +104,13 @@
             },
             // 左边距位置处理
             left_handle() {
-                var left = 0;
-                // #ifdef H5
-                // 处理内容左边距、避免父级设置内边距影响
-                var width = uni.getSystemInfoSync().windowWidth;
-                if (width > 800) {
-                    left = (width - 800) / 2;
-                }
+                var left = 0;
+                // #ifdef H5
+                // 处理内容左边距、避免父级设置内边距影响
+                var width = uni.getSystemInfoSync().windowWidth;
+                if (width > 800) {
+                    left = (width - 800) / 2;
+                }
                 // #endif
                 this.popup_content_left_value = left + 'px';
             },
@@ -180,6 +193,9 @@
         border-top-left-radius: 20rpx;
         border-bottom-left-radius: 20rpx;
     }
+    .popup-radius-0 {
+        border-radius: 0 !important;
+    }
     .popup-bar {
         /* #ifdef H5 || APP */
         bottom: var(--window-bottom) !important;
diff --git a/components/upload/upload.vue b/components/upload/upload.vue
index 9279f358..4105cc35 100644
--- a/components/upload/upload.vue
+++ b/components/upload/upload.vue
@@ -36,7 +36,7 @@
             // 路径类型 默认common
             propPathType:{
                 type:String,
-                default:'',
+                default:'common',
             }
         },
         data() {
diff --git a/components/yyc-easy-editor/index.vue b/components/yyc-easy-editor/index.vue
deleted file mode 100644
index 76af5923..00000000
--- a/components/yyc-easy-editor/index.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-	<view>
-		<view class="content">
-			<view class="detail" v-for="(item,index) in list" :key="index">
-				<view class="textarea" v-if="item.type==1">
-					<textarea maxlength="-1" placeholder="请输入内容" v-model="list[index].content"/>
-				</view>
-				<view class="image" v-else-if="item.type==2">
-					<image :src="item.content" mode="widthFix"></image>
-				</view>
-				<view class="video" v-else-if="item.type==3">
-					<video :src="item.content"></video>
-				</view>
-				<view class="btn-group">
-					<view :data-index="index" @tap="delItem">
-						<uni-icons type="trash" size="14"></uni-icons>
-						<text>删除</text>
-					</view>
-					<view v-if="index>0" :data-index="index" @tap="arrowthinup">
-						<uni-icons type="arrowthinup" size="14"></uni-icons>
-						<text>上移</text>
-					</view>
-					<view v-if="index<(list.length-1)" :data-index="index" @tap="arrowthindown">
-						<uni-icons type="arrowthindown" size="14"></uni-icons>
-						<text>下移</text>
-					</view>
-				</view>
-			</view>
-			<view class="footer-btn-group">
-				<view @tap="showShade">
-					<uni-icons type="plusempty" color="#197ae5" size="16"></uni-icons>
-					<text>添加</text>
-				</view>
-				<view @tap="preview" v-if="showPreview">
-					<uni-icons type="eye" color="#197ae5" size="16"></uni-icons>
-					<text>预览</text>
-				</view>
-				<view @tap="completed">
-					<uni-icons type="arrowthinright" color="#197ae5" size="16"></uni-icons>
-					<text>{{completedText}}</text>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 遮罩层 -->
-		<view class="shade" v-if="shade" @tap="closeShade">
-			<view class="shade-content" @tap.stop>
-				<view class="shade-content-item" @tap="addText">
-					<view class="shade-content-item-icon">
-						<uni-icons type="compose" size="30"></uni-icons>
-					</view>
-					<view>文字</view>
-				</view>
-				<view class="shade-content-item" @tap="addImage">
-					<view class="shade-content-item-icon">
-						<uni-icons type="image" size="30"></uni-icons>
-					</view>
-					<view>图片</view>
-				</view>
-				<view class="shade-content-item" @tap="addVideo">
-					<view class="shade-content-item-icon">
-						<uni-icons type="videocam" size="40"></uni-icons>
-					</view>
-					<view>视频</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
- 
-<script>
-export default {
-	name: 'textImageVideoEditor',
-	props: {
-		completedText: {
-			type: String,
-			default: "完成"
-		}, 
-		showPreview: {
-			type: Boolean,
-			default: true
-		},
-		list2: {
-			type: Array,
-			default: function() {
-				return [
-					{
-						type: 1,
-						content: ""
-					},
-				]
-			}
-		}, 
-	},
-	data() {
-		return {
-			shade: false,
-			list: [
-				{
-					type: 1,
-					content: ""
-				}
-			], 
-			form: {
-				image: "",
-				content: "",
-			}
-		};
-	},
-	mounted() {
-		this.list = this.list2;
-	},
-	methods:{
-		showShade(){
-			this.shade = true;
-		},
-		closeShade(){
-			this.shade = false;
-		},
-		addText(){
-			let addjson = {type: 1, content: ""}
-			this.list.push(addjson)
-			this.closeShade();
-		},
-		addImage(){
-			this.$emit("addImage")
-		},
-		addImageCompleted(imgurl){
-			let addjson = {type: 2, content: imgurl}
-			this.list.push(addjson)
-			this.closeShade();
-		},
-		addVideo(){
-			this.$emit("addVideo")
-		},
-		addVideoCompleted(videourl){
-			let addjson = {type: 3, content: videourl}
-			this.list.push(addjson)
-			this.closeShade();
-		},
-		delItem(e){
-			let index = e.currentTarget.dataset.index;
-			this.list.splice(index, 1)
-		},
-		arrowthinup(e){
-			let index = e.currentTarget.dataset.index;
-			let newList = [];
-			if(index>0){
-				for(let i in this.list){
-					if(index-i==1){
-						newList.push(this.list[index])
-						newList.push(this.list[i])
-					}else if(index==i){
-						continue;
-					}else{
-						newList.push(this.list[i])
-					}
-				}
-				this.list = newList
-			}
-		},
-		arrowthindown(e){
-			let index = e.currentTarget.dataset.index;
-			let newList = [];
-			if(index<(this.list.length-1)){
-				for(let i in this.list){
-					if(i==index){
-						newList.push(this.list[(parseInt(i)+1)])
-						newList.push(this.list[i])
-					}else if((index+1)==i){
-						continue;
-					}else{
-						newList.push(this.list[i])
-					}
-				}
-				this.list = newList
-			}
-		},
-		preview(){
-			let content = this.setContent();
-			if(content===false){
-				uni.showToast({
-					title: "你还没有添加内容哦",
-					icon:'none',
-					duration: 1000
-				});
-			}else{
-				this.$emit("preview", this.form.content)
-			}
-		},
-		completed(){
-			let content = this.setContent();
-			if(content===false){
-				uni.showToast({
-					title: "你还没有添加内容哦",
-					icon:'none',
-					duration: 1000
-				});
-			}else{
-				let data = this.form;
-				data.json = JSON.stringify(this.list)
-				this.$emit("completed", data)
-			}
-		},
-		setContent(){
-			let content = ""
-			for(let i in this.list){
-				if(this.list[i].content!=""){
-					if(this.list[i].type==1){
-						content += `<div style="width:100%;padding-top: 10px">${this.list[i].content}</div>`;
-					}
-					if(this.list[i].type==2){
-						content += `<div style="width:100%;padding-top: 10px">
-							<img src="${this.list[i].content}" style="width: 100%" />
-						</div>`;
-						// 封面图
-						if(this.form.image==""){
-							this.form.image = this.list[i].content;
-						}
-					}
-					if(this.list[i].type==3){
-						content += `<div style="width:100%;padding-top: 10px">
-							<video style="width: 100%" controls>
-							  <source src="${this.list[i].content}">
-							</video>
-						</div>`;
-					}
-				}
-				
-			}
-			if(content==""){
-				return false;
-			}
-			this.form.content = content;
-		},
-		
-		
-	}
-};
-</script>
- 
- <style lang="scss">
- 	body{
- 		background: #fff;
- 		width: 700rpx;
- 		margin: 0 auto;
- 	}
- 	.content{
- 		margin-bottom: 200rpx;
- 		.detail{
- 			margin-top: 40rpx;
- 			position: relative;
- 			border: 1px solid #eeeeee;
- 			.textarea{
- 				padding-bottom: 66rpx;
- 				textarea{
- 					width: 96%;
- 					padding: 2%;
- 				}
- 			}
- 			.image{
- 				padding-bottom: 56rpx;
- 				image{
- 					width: 100%;
- 				}
- 			}
- 			
- 			.video{
- 				padding-bottom: 56rpx;
- 				video{
- 					width: 100%;
- 				};
- 			}
- 		}
- 		
- 	}
- 	.btn-group{
- 		display: flex;
- 		position: absolute;
- 		right: 0;
- 		bottom: 0;
- 		view{
- 			width: 140rpx;
- 			height: 60rpx;
- 			line-height: 56rpx;
- 			text-align: center;
- 			font-size: 28rpx;
- 			background: #f5f5f5;
- 			border-top: 1px solid #eeeeee;
- 			border-left: 1px solid #eeeeee;
- 		}
- 	}
- 	.footer-btn-group{
- 		z-index: 9;
- 		display: flex;
- 		justify-content: space-between;
- 		align-items: center;
- 		width: 700rpx;
- 		height: 150rpx;
- 		margin: auto;
- 		background: #fff;
- 		position: fixed;
- 		left: 0;
- 		right: 0;
- 		bottom: 0;
- 		view{
- 			width: 180rpx;
- 			height: 90rpx;
- 			line-height: 90rpx;
- 			text-align: center;
- 			font-size: 32rpx;
- 			color: #197ae5;
- 			border: 1px solid #197ae5;
- 			uni-icons{
- 				position: relative;
- 				left: -10rpx;
- 			}
- 		}
- 	}
- 	.shade{
- 		position: fixed;
- 		top: 0;
- 		left: 0;
- 		bottom: 0;
- 		width: 100%;
- 		z-index: 99999999;
- 		background: rgba(12,12,12,.8);
- 		.shade-content{
- 			width: 70%;
- 			padding: 100rpx 15%;
- 			background: #fff;
- 			position: absolute;
- 			bottom: 0;
- 			display: flex;
- 			justify-content: space-between;
- 			align-items: center;
- 			.shade-content-item{
- 				width: 120rpx;
- 				text-align: center;
- 				.shade-content-item-icon{
- 					height: 120rpx;
- 					line-height: 120rpx;
- 					width: 120rpx;
- 					border: 2px solid #ccc;
- 					text-align: center;
- 				}
- 			}
- 			
- 		}
- 	}
- </style>
- 
\ No newline at end of file
diff --git a/components/yyc-easy-editor/readme.md b/components/yyc-easy-editor/readme.md
deleted file mode 100644
index e238940b..00000000
--- a/components/yyc-easy-editor/readme.md
+++ /dev/null
@@ -1,88 +0,0 @@
-
-###########说明
-1. 图标使用uni-icons，没有的请到插件市场自行安装。
-
-2. 示例代码如下：
-    list2: 初始化数据（用于编辑）
-    addImage: 图片上传
-    addVideo: 视频上传
-    showPreview: 是否显示预览
-    preview: 返回预览的html文本
-    completedText: 按钮文字
-    completed: 编辑器返回数据json
-    
-3. 提示：rich-text不能解析视频，建议使用插件市场uparse。
-
-4. 有问题，微信同QQ：736849829（请备注）。上传视频太大，不会分片，也可以v我。
-
-###########示例代码
-<template>
-    <view>
-		<textImageVideoEditor
-			ref="textImageVideoEditor"
-			:list2="initEditorList"  
-			@addImage="addImage"
-			@addVideo="addVideo"
-			:showPreview="true"
-			@preview="preview"
-			completedText="下一步"
-			@completed="completed"
-		></textImageVideoEditor>
-    </view>
-</template>
-
-<script>
-	import textImageVideoEditor from '../../components/yyc-easy-editor/index.vue'
-    export default {
-        data() {
-            return {
-				initEditorList: [
-					{
-						type:1, 
-						content:""
-					}
-				],
-            }
-        },
-		components: {
-			textImageVideoEditor
-		},
-		onLoad(options) {
-		
-		},
-        methods: {
-			preview(data){
-				console.log("预览preview！", data)
-			},
-			completed(data){
-				console.log("完成completed！", data)
-				// data: {
-				// 	  content: "富文本内容",
-				// 	  image: "提取一张图片",
-				// 	  json: "",
-				// }
-			},
-            addImage(){
-				console.log("上传图片")
-				let _this = this;
-				//这里是你上传的代码
-				//......
-				//得到imgurl
-				_this.$refs.textImageVideoEditor.addImageCompleted(imgurl); 
-            },
-            addVideo(){
-				console.log("上传视频")
-				let _this = this;
-				//这里是你上传的代码
-				//......
-				//得到videourl
-            	_this.$refs.textImageVideoEditor.addVideoCompleted(videourl);
-            },
-        }
-    }
-</script>
-
-<style lang="scss">
-	
-</style>
-
diff --git a/package.json b/package.json
index f9ff440a..8051320b 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,15 @@
 {
-    "id": "yyc-easy-editor",
-    "name": "超简洁 图文视频编辑器 文章发布",
-    "version": "1.01",
-    "description": "适合手机端，小程序的编辑器，支持文字，图片，视频，没有太多复杂臃肿的功能，容易操作。安装更简单，为你省去时间。",
+    "id": "jin-edit",
+    "name": "jin-edit—仿简书非常好用的富文本编辑器",
+    "version": "1.1",
+    "description": "仿简书非常好用的富文本编辑器",
     "keywords": [
-        "编辑器",
-        "图文视频编辑"
-    ]
+        "富文本编辑器、富文本"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6c4da59d..0ec46055 100644
--- a/pages.json
+++ b/pages.json
@@ -898,11 +898,21 @@
                         "navigationBarTitleText": "评论列表"
                     }
                 },
+                {
+                    "path": "user-list/user-list",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "我的帖子"
+                    }
+                },
                 {
                     "path": "form/form",
                     "style": {
                         "enablePullDownRefresh": true,
-                        "navigationBarTitleText": "添加/编辑博文"
+                        "navigationBarTitleText": "发布博文",
+                        "enablePullDownRefresh": false,
+                        // 禁止页面下拉
+                        "disableScroll": true
                     }
                 }
             ]
diff --git a/pages/login/login.css b/pages/login/login.css
index 99ccb3d3..dc10f174 100644
--- a/pages/login/login.css
+++ b/pages/login/login.css
@@ -5,52 +5,90 @@ page {
 /**
  * 基础
  */
-.content {
-    padding-top: 8%;
-}
 .content .icon {
-    width: 150rpx;
-    height: 150rpx !important;
+    width: 160rpx;
+    height: 160rpx !important;
+}
+
+.top-nav {
+    padding: 34rpx;
 }
 
 /**
  * 表单内容
  */
 .form-content {
-    padding: 2% 40rpx 0 40rpx;
+    padding: 34rpx;
 }
+
 .form-content .form-item,
 .form-content .code,
 .form-content .verify {
-    border-bottom: solid 1px #f7f7f7;
+    height: 50px;
+    line-height: 50px;
+    background: #F9F9F9;
+    border-radius: 25px;
+    border: 0;
 }
-.form-content .form-item,
+
 .form-content .code input,
 .form-content .verify input {
-    font-size: 28rpx;
-    color: #4e4e4e;
-    height: 40px;
-    line-height: 40px;
-    border-radius: 0;
+    height: 50px;
+    line-height: 50px;
+    padding: 0 36rpx;
 }
+
+.form-content .form-item ::v-deep .input-placeholder,
+.form-content .form-item ::v-deep .uni-input-input {
+    padding: 0 36rpx;
+    font-size: 30rpx;
+}
+
+.form-content .form-item ::v-deep .input-placeholder,
+.form-content .code input ::v-deep .input-placeholder,
+.form-content .verify input ::v-deep .input-placeholder {
+    font-size: 30rpx;
+}
+
 .form-content .code input,
 .form-content .verify input {
     width: 63%;
 }
-.form-content .code .verify-submit {
-    width: 35%;
-    height: 35px;
-    line-height: 35px;
-    top: 0;
-    right: 0;
+
+.form-content .form-item ::v-deep .uni-input-input:-webkit-autofill {
+    /* //这个地方的颜色是字体颜色，可以根据实际情况修改 */
+    /* -webkit-text-fill-color: #ededed !important;  */
+    /* //设置input输入框的背景颜色为透明色 */
+    -webkit-box-shadow: 0 0 0px 1000px #f9f9f9 inset !important;
+    /* //设置input输入框的背景颜色为透明色 */
+    background-color: #f9f9f9;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s;
 }
+
+.form-content .code ::v-deep .uni-input-input:-webkit-autofill {
+    /* //设置input输入框的背景颜色为透明色 */
+    background-color: #f9f9f9;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s;
+}
+
+.form-content .code .verify-submit {
+    padding: 0 12px;
+    height: 28px;
+    line-height: 28px;
+    top: 11px;
+    right: 36rpx;
+}
+
 .form-content .verify .verify-image {
     width: 35%;
-    height: 35px;
-    line-height: 35px;
+    height: 50px;
+    line-height: 50px;
     top: 0;
-    right: 0;
+    right: 36rpx;
 }
+
 .opt-type-list text:not(:last-child) {
     margin-right: 50rpx;
 }
@@ -59,21 +97,60 @@ page {
  * 第三方登录 - 插件
  */
 .plugins-thirdpartylogin .item {
-    width: 35rpx;
-    height: 35rpx;
+    width: 76rpx;
+    height: 76rpx;
     padding: 5rpx;
 }
+
 .plugins-thirdpartylogin .item:not(:last-child) {
-    margin-right: 10rpx;
+    margin-right: 54rpx;
 }
+
 .plugins-thirdpartylogin .item image {
-    width: 25rpx !important;
-    height: 25rpx !important;
+    width: 50rpx !important;
+    height: 50rpx !important;
 }
+
+.plugins-thirdpartylogin .item:last-of-type image {
+    width: 76rpx !important;
+    height: 76rpx !important;
+}
+
 .plugins-thirdpartylogin-bind image {
     width: 40rpx !important;
     height: 40rpx !important;
 }
+
 .plugins-thirdpartylogin-bind button {
     line-height: 40rpx;
+}
+
+.popup-login .content,
+.popup-login .footer .cancel-btn {
+    border-radius: 32rpx;
+}
+
+.popup-login .content .item:not(:last-child) {
+    border-bottom: 1px solid #eee;
+}
+
+.popup-login .content .item image {
+    width: 36rpx !important;
+    height: 36rpx !important;
+}
+
+.popup-login .content .item .login-width {
+    width: 180rpx;
+}
+
+/**
+ * 多语言
+ */
+.popup-language {
+    height: 100vh;
+}
+
+.popup-language .list {
+    height: calc(100vh - 95rpx);
+    overflow-y: auto;
 }
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 67265fd6..057ca4df 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,9 +1,23 @@
 <template>
     <view :class="theme_view">
-        <view class="content">
+        <view class="content page-bottom-fixed">
             <block v-if="(is_exist_base_data || 0) == 1">
-                <!-- 表单验证码 -->
-                <view v-if="current_opt_form == 'bind_verify'" class="form-content">
+                <view class="flex-row align-c jc-e top-nav margin-bottom-xxxl">
+                    <!-- <view @tap="back_event">
+                        <iconfont name="icon-huiyuan-guanbi" size="28rpx"></iconfont>
+                    </view> -->
+                    <view class="cr-base text-size" @tap="open_language_event">
+                        <view class="pr top-sm margin-right-sm dis-inline-block">
+                            <iconfont name="icon-login-language" size="32rpx"></iconfont>
+                        </view>
+                        {{ language }}
+                        <view class="margin-left-sm dis-inline-block">
+                            <iconfont name="icon-login-down-arrow" size="16rpx"></iconfont>
+                        </view>
+                    </view>
+                </view>
+                <!-- 绑定手机 -->
+                <view v-if="current_opt_form == 'bind_verify'" class="form-content 111">
                     <form @submit="formBind">
                         <view class="tc">
                             <image class="icon circle auto dis-block margin-bottom-xxl br" :src="(user.avatar || null) == null ? '/static/images/default-user.png' : user.avatar" mode="widthFix"></image>
@@ -26,7 +40,7 @@
                 <!-- 存在用户信息 -->
                 <block v-if="user != null">
                     <!-- 确认绑定方式 -->
-                    <view v-if="current_opt_form == 'bind' || current_opt_form == 'success'" class="form-content">
+                    <view v-if="current_opt_form == 'bind' || current_opt_form == 'success'" class="form-content 222">
                         <view class="tc">
                             <image class="icon circle auto dis-block margin-bottom-xxl br" :src="(user.avatar || null) == null ? '/static/images/default-user.png' : user.avatar" mode="widthFix"></image>
                             <view v-if="(user.nickname || null) != null" class="cr-base">{{ user.nickname }}</view>
@@ -34,16 +48,7 @@
                         <block v-if="current_opt_form == 'bind'">
                             <view class="margin-top-xxxl padding-top-xxxl">
                                 <button class="bg-main-pair br-main-pair cr-white round text-size" type="warn" hover-class="none" data-value="bind_verify" @tap="opt_form_event">手机验证码</button>
-                                <button
-                                    v-if="common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1"
-                                    class="margin-top-xxl bg-main br-main cr-white round text-size"
-                                    type="default"
-                                    hover-class="none"
-                                    open-type="getPhoneNumber"
-                                    @getphonenumber="confirm_phone_number_event"
-                                >
-                                    获取手机号码一键登录
-                                </button>
+                                <button v-if="common_user_onekey_bind_mobile_list.length > 0 && common_user_onekey_bind_mobile_list.indexOf(client_value) != -1" class="margin-top-xxl bg-main br-main cr-white round text-size" type="default" hover-class="none" open-type="getPhoneNumber" @getphonenumber="confirm_phone_number_event">获取手机号码一键登录</button>
                             </view>
                             <!-- 当前还没有账号的情况下才可以操作登录和注册绑定 -->
                             <view v-if="(user || null) == null || (user.id || null) == null" class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
@@ -85,35 +90,42 @@
                 </block>
 
                 <!-- 登录 -->
-                <view v-if="current_opt_form == 'login'" class="form-content">
+                <view v-if="current_opt_form == 'login'" class="form-content 333">
                     <form @submit="formLogin">
+                        <!-- 登录方式选择 -->
+                        <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="opt-type-list margin-vertical-xxxl">
+                            <text v-if="home_user_login_type.indexOf('username') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_username' ? 'cr-main nav-active-line' : ''" data-value="login_username" @tap="opt_type_event">账号密码</text>
+                            <text v-if="home_user_login_type.indexOf('sms') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_sms' ? 'cr-main nav-active-line' : ''" data-value="login_sms" @tap="opt_type_event">手机</text>
+                            <text v-if="home_user_login_type.indexOf('email') != -1" class="padding-vertical-sm" :class="current_opt_type === 'login_email' ? 'cr-main nav-active-line' : ''" data-value="login_email" @tap="opt_type_event">邮箱</text>
+                        </view>
+                        <view v-else class="tc cr-grey padding-vertical-main">暂时关闭了登录</view>
                         <!-- 账号密码 -->
                         <block v-if="current_opt_type == 'login_username'">
-                            <input type="text" placeholder="用户名/手机/邮箱" maxlength="60" name="accounts" class="form-item margin-vertical-main wh-auto" />
-                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto" />
-                            <view v-if="home_user_login_img_verify_state == 1" class="verify pr margin-vertical-main">
-                                <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event" />
+                            <input type="text" placeholder="用户名/手机/邮箱" maxlength="60" name="accounts" key="login_username_1" class="form-item margin-vertical-xl wh-auto" />
+                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" key="login_username_2" class="form-item margin-vertical-xl wh-auto" />
+                            <view v-if="home_user_login_img_verify_state == 1" class="verify pr margin-vertical-xl">
+                                <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" key="login_username_3" @input="form_input_image_verify_event" />
                                 <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_login" @tap="image_verify_event"></image>
                             </view>
                         </block>
                         <!-- 手机 -->
                         <block v-if="current_opt_type == 'login_sms'">
-                            <input type="number" placeholder="手机号码" maxlength="11" name="accounts" @input="form_input_mobile_event" class="form-item margin-vertical-main wh-auto" />
-                            <view class="code pr margin-vertical-main">
-                                <input type="number" placeholder="验证码" name="verify" maxlength="4" />
-                                <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                            <input type="number" placeholder="手机号码" maxlength="11" name="accounts" @input="form_input_mobile_event" key="login_sms_1" class="form-item margin-vertical-xl wh-auto" />
+                            <view class="code pr margin-vertical-xl">
+                                <input type="number" placeholder="验证码" name="verify" maxlength="4" key="login_sms_2" />
+                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
                             </view>
                         </block>
                         <!-- 邮箱 -->
                         <block v-if="current_opt_type == 'login_email'">
-                            <input type="text" placeholder="电子邮箱" maxlength="60" name="accounts" @input="form_input_email_event" class="form-item margin-vertical-main wh-auto" />
-                            <view class="code pr margin-vertical-main">
-                                <input type="number" placeholder="验证码" name="verify" maxlength="4" />
-                                <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                            <input type="text" placeholder="电子邮箱" maxlength="60" name="accounts" @input="form_input_email_event" key="login_email_1" class="form-item margin-vertical-xl wh-auto" />
+                            <view class="code pr margin-vertical-xl">
+                                <input type="number" placeholder="验证码" name="verify" maxlength="4" key="login_email_1" />
+                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
                             </view>
                         </block>
                         <!-- 协议 -->
-                        <view class="margin-top-xxxl cr-grey">
+                        <view class="margin-top-xl cr-grey">
                             <view class="dis-inline-block va-m" @tap="agreement_change">
                                 <radio-group class="dis-inline-block va-m" style="transform: scale(0.6)">
                                     <label>
@@ -121,73 +133,81 @@
                                     </label>
                                 </radio-group>
                             </view>
-                            <view class="dis-inline-block va-m"> 阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私权政策</text>》 </view>
+                            <view class="dis-inline-block va-m text-size-xs"> 阅读并同意 <text class="cr-main" @tap="agreement_event" data-value="userregister">《服务协议》</text> 与 <text class="cr-main" @tap="agreement_event" data-value="userprivacy">《隐私权政策》</text></view>
                         </view>
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认登录</button>
-                        <view class="margin-top-xxl oh">
-                            <!-- #ifdef H5 || APP -->
-                            <view v-if="(plugins_thirdpartylogin_data || null) != null && (plugins_thirdpartylogin_config || null) != null" class="plugins-thirdpartylogin fl">
-                                <block v-for="(item, index) in plugins_thirdpartylogin_data">
-                                    <view class="item dis-inline-block round" :style="'background-color:' + item.bg_color + ';'" :data-type="index" :data-url="item.login_url" @tap="plugins_thirdpartylogin_event">
-                                        <image :src="item.icon" mode="aspectFit" class="dis-block auto margin-top-xs"></image>
-                                    </view>
-                                </block>
-                            </view>
-                            <!-- #endif -->
-                            <text class="cr-grey fr" data-value="forget" @tap="opt_form_event">找回密码</text>
-                        </view>
-                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
-                            <!-- #ifdef MP -->
-                            <!-- 小程序授权登录 -->
-                            <view class="margin-bottom-xxxl tc">
-                                <text v-if="(user || null) == null" class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="auth" @tap="opt_form_event">使用授权自动登录</text>
-                                <text v-else class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="bind" @tap="opt_form_event">返回上一页</text>
-                            </view>
-                            <!-- #endif -->
+                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
                             <!-- 注册 -->
-                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="margin-bottom-xxxl tc">
-                                <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">还没账号？立即注册</text>
+                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0">
+                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">新用户注册</text>
                             </view>
-                            <!-- 登录方式选择 -->
-                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="opt-type-list margin-bottom-xl tc">
-                                <text v-if="home_user_login_type.indexOf('username') != -1" class="cr-blue" data-value="login_username" @tap="opt_type_event">账号密码</text>
-                                <text v-if="home_user_login_type.indexOf('sms') != -1" class="cr-blue" data-value="login_sms" @tap="opt_type_event">短信验证码</text>
-                                <text v-if="home_user_login_type.indexOf('email') != -1" class="cr-blue" data-value="login_email" @tap="opt_type_event">邮箱验证码</text>
+                            <text class="cr-grey-9" data-value="forget" @tap="opt_form_event">找回密码</text>
+                        </view>
+                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main br-0">
+                            <view class="bottom-line-exclude">
+                                <!-- #ifdef MP -->
+                                <!-- 小程序授权登录 -->
+                                <view class="margin-bottom-xxxl tc">
+                                    <text v-if="(user || null) == null" class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="auth" @tap="opt_form_event">使用授权自动登录</text>
+                                    <text v-else class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="bind" @tap="opt_form_event">返回上一页</text>
+                                </view>
+                                <!-- #endif -->
+                                <!-- #ifdef H5 || APP -->
+                                <view v-if="(plugins_thirdpartylogin_data || null) != null && (plugins_thirdpartylogin_config || null) != null" class="plugins-thirdpartylogin tc">
+                                    <view class="text-size-xs cr-grey-c margin-bottom-main">其他登陆方式</view>
+                                    <view class="flex-row align-c jc-c">
+                                        <block v-for="(item, key, index) in plugins_thirdpartylogin_data" v-if="index < 3">
+                                            <view class="item round flex-row align-c jc-c" :style="'background-color:' + item.bg_color + ';'" :data-type="key" :data-url="item.login_url" @tap="plugins_thirdpartylogin_event">
+                                                <image :src="item.icon" mode="aspectFit" class="dis-block auto"></image>
+                                            </view>
+                                        </block>
+                                        <view class="item dis-inline-block round" @tap="popup_login_open_event">
+                                            <image :src="login_static_url + 'more.png'" mode="aspectFit" class="dis-block auto"></image>
+                                        </view>
+                                    </view>
+                                </view>
+                                <!-- #endif -->
                             </view>
-                            <view v-else class="tc cr-grey padding-vertical-main">暂时关闭了登录</view>
                         </view>
                     </form>
                 </view>
 
                 <!-- 注册 -->
-                <view v-else-if="current_opt_form == 'reg'" class="form-content">
+                <view v-else-if="current_opt_form == 'reg'" class="form-content 444">
                     <form @submit="formReg">
+                        <!-- 注册方式选择 -->
+                        <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="opt-type-list margin-vertical-xxxl">
+                            <text v-if="home_user_reg_type.indexOf('username') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_username' ? 'cr-main nav-active-line' : ''" data-value="reg_username" @tap="opt_type_event">账号密码</text>
+                            <text v-if="home_user_reg_type.indexOf('sms') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_sms' ? 'cr-main nav-active-line' : ''" data-value="reg_sms" @tap="opt_type_event">手机</text>
+                            <text v-if="home_user_reg_type.indexOf('email') != -1" class="padding-vertical-sm" :class="current_opt_type === 'reg_email' ? 'cr-main nav-active-line' : ''" data-value="reg_email" @tap="opt_type_event">邮箱</text>
+                        </view>
+                        <view v-else class="tc cr-grey padding-vertical-main">暂时关闭了注册</view>
                         <!-- 账号密码 -->
                         <block v-if="current_opt_type == 'reg_username'">
-                            <input type="text" placeholder="用户名" maxlength="60" name="accounts" class="form-item margin-vertical-main wh-auto" />
-                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto" />
-                            <view v-if="home_user_register_img_verify_state == 1" class="verify pr margin-vertical-main">
-                                <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event" />
+                            <input type="text" placeholder="用户名" maxlength="60" name="accounts" key="reg_username_1" class="form-item margin-vertical-xl wh-auto" />
+                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" key="reg_username_2" class="form-item margin-vertical-xl wh-auto" />
+                            <view v-if="home_user_register_img_verify_state == 1" class="verify pr margin-vertical-xl">
+                                <input type="text" placeholder="验证码" name="verify" maxlength="4" :value="form_input_image_verify_value" key="reg_username_3" @input="form_input_image_verify_event" />
                                 <image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="user_reg" @tap="image_verify_event"></image>
                             </view>
                         </block>
                         <!-- 手机 -->
                         <block v-if="current_opt_type == 'reg_sms'">
-                            <input type="number" placeholder="手机号码" maxlength="11" name="accounts" @input="form_input_mobile_event" class="form-item margin-vertical-main wh-auto" />
-                            <view class="code pr margin-vertical-main">
-                                <input type="number" placeholder="验证码" name="verify" maxlength="4" />
-                                <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                            <input type="number" placeholder="手机号码" maxlength="11" name="accounts" key="reg_sms_1" @input="form_input_mobile_event" class="form-item margin-vertical-xl wh-auto" />
+                            <view class="code pr margin-vertical-xl">
+                                <input type="number" placeholder="验证码" name="verify" maxlength="4" key="reg_sms_2" />
+                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
                             </view>
-                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto" />
+                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" key="reg_sms_3" class="form-item margin-vertical-xl wh-auto" />
                         </block>
                         <!-- 邮箱 -->
                         <block v-if="current_opt_type == 'reg_email'">
-                            <input type="text" placeholder="电子邮箱" maxlength="60" name="accounts" @input="form_input_email_event" class="form-item margin-vertical-main wh-auto" />
-                            <view class="code pr margin-vertical-main">
-                                <input type="number" placeholder="验证码" name="verify" maxlength="4" />
-                                <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
+                            <input type="text" placeholder="电子邮箱" maxlength="60" name="accounts" key="reg_email_1" @input="form_input_email_event" class="form-item margin-vertical-xl wh-auto" />
+                            <view class="code pr margin-vertical-xl">
+                                <input type="number" placeholder="验证码" name="verify" maxlength="4" key="reg_email_2" />
+                                <button :class="'verify-submit pa round br text-size-sm cr-grey-9 ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
                             </view>
-                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto" />
+                            <input type="text" placeholder="登录密码" minlength="6" maxlength="18" name="pwd" password="true" key="reg_email_3" class="form-item margin-vertical-xl wh-auto" />
                         </block>
                         <!-- 协议 -->
                         <view class="margin-top-xxxl cr-grey">
@@ -198,10 +218,16 @@
                                     </label>
                                 </radio-group>
                             </view>
-                            <view class="dis-inline-block va-m"> 阅读并同意 《<text class="cr-main" @tap="agreement_event" data-value="userregister">服务协议</text>》 与 《<text class="cr-main" @tap="agreement_event" data-value="userprivacy">隐私权政策</text>》 </view>
+                            <view class="dis-inline-block va-m text-size-xs"> 阅读并同意 <text class="cr-main" @tap="agreement_event" data-value="userregister">《服务协议》</text> 与 <text class="cr-main" @tap="agreement_event" data-value="userprivacy">《隐私权政策》</text> </view>
                         </view>
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认注册</button>
-                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
+                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
+                            <!-- 登录 -->
+                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
+                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">立即登录</text>
+                            </view>
+                        </view>
+                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main br-0">
                             <!-- #ifdef MP -->
                             <!-- 小程序授权登录 -->
                             <view class="margin-bottom-xxxl tc">
@@ -209,32 +235,31 @@
                                 <text v-else class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="bind" @tap="opt_form_event">返回上一页</text>
                             </view>
                             <!-- #endif -->
-                            <!-- 登录 -->
-                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
-                                <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">已有账号？立即登录</text>
-                            </view>
-                            <!-- 注册方式选择 -->
-                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="opt-type-list margin-bottom-xl tc">
-                                <text v-if="home_user_reg_type.indexOf('username') != -1" class="cr-blue" data-value="reg_username" @tap="opt_type_event">账号密码</text>
-                                <text v-if="home_user_reg_type.indexOf('sms') != -1" class="cr-blue" data-value="reg_sms" @tap="opt_type_event">短信验证码</text>
-                                <text v-if="home_user_reg_type.indexOf('email') != -1" class="cr-blue" data-value="reg_email" @tap="opt_type_event">邮箱验证码</text>
-                            </view>
-                            <view v-else class="tc cr-grey padding-vertical-main">暂时关闭了注册</view>
                         </view>
                     </form>
                 </view>
 
                 <!-- 找回密码 -->
-                <view v-else-if="current_opt_form == 'forget'" class="form-content">
+                <view v-else-if="current_opt_form == 'forget'" class="form-content 555">
                     <form @submit="formForget">
-                        <input type="text" placeholder="手机/邮箱" maxlength="60" name="accounts" @input="form_input_accounts_event" class="form-item margin-vertical-main wh-auto" />
-                        <view class="code pr margin-vertical-main">
-                            <input type="number" placeholder="验证码" name="verify" maxlength="4" />
+                        <input type="text" placeholder="手机/邮箱" maxlength="60" name="accounts" @input="form_input_accounts_event" class="form-item margin-vertical-xl wh-auto" />
+                        <view class="code pr margin-vertical-xl">
+                            <input type="number" autocomplete="off" placeholder="验证码" name="verify" maxlength="4" />
                             <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
                         </view>
-                        <input type="text" placeholder="设置登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-main wh-auto" />
+                        <input type="text" autocomplete="off" placeholder="设置登录密码" minlength="6" maxlength="18" name="pwd" password="true" class="form-item margin-vertical-xl wh-auto" />
                         <button class="bg-main br-main cr-white round text-size margin-top-xxxl" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认提交</button>
-                        <view class="margin-top-xxxl padding-top-xxxl padding-horizontal-main padding-bottom-main">
+                        <view class="margin-top-xxl oh flex-row jc-sb align-c">
+                            <!-- 登录 -->
+                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="tc">
+                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">立即登录</text>
+                            </view>
+                            <!-- 注册 -->
+                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="tc">
+                                <text class="cr-grey-9 padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">立即注册</text>
+                            </view>
+                        </view>
+                        <view class="bottom-fixed padding-horizontal-main padding-bottom-main br-0">
                             <!-- #ifdef MP -->
                             <!-- 小程序授权登录 -->
                             <view class="margin-bottom-xxxl tc">
@@ -242,14 +267,6 @@
                                 <text v-else class="cr-red round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="bind" @tap="opt_form_event">返回上一页</text>
                             </view>
                             <!-- #endif -->
-                            <!-- 登录 -->
-                            <view v-if="(home_user_login_type || null) != null && home_user_login_type.length > 0" class="margin-bottom-xxxl tc">
-                                <text class="cr-main round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="login" @tap="opt_form_event">已有账号？立即登录</text>
-                            </view>
-                            <!-- 注册 -->
-                            <view v-if="(home_user_reg_type || null) != null && home_user_reg_type.length > 0" class="margin-bottom-xl tc">
-                                <text class="cr-main-pair round padding-top-xs padding-bottom-xs padding-horizontal-main" data-value="reg" @tap="opt_form_event">还没账号？立即注册</text>
-                            </view>
                         </view>
                     </form>
                 </view>
@@ -304,6 +321,39 @@
                         </view>
                     </view>
                 </component-popup>
+
+                <!-- 打开语言选择弹层-->
+                <component-popup :propShow="popup_language_status" propPosition="bottom" :propIsRadius="false" @onclose="popup_language_close_event">
+                    <view class="popup-language">
+                        <view class="flex-row align-c jc-sb padding-main">
+                            <view @tap="popup_language_close_event">
+                                <iconfont name="icon-huiyuan-guanbi" size="28rpx"></iconfont>
+                            </view>
+                            <view class="text-size" @tap="popup_sub_language_event"> 确认 </view>
+                        </view>
+                        <view class="br-t-f5 padding-main list">
+                            <view v-for="(item, index) in language_list" :key="index" class="spacing-mb flex-row jc-sb align-c" :class="language_index === index + 1 ? 'cr-main' : ''" :data-index="index + 1" :data-value="item" @tap="checked_language_event">
+                                {{ item }}
+                                <iconfont v-if="language_index === index + 1" name="icon-blog-checked" size="32rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+                <!-- 选择登陆方式 -->
+                <component-popup :propShow="popup_login_status" propMostClass="z-i-deep pr" propPosition="bottom" :propIsRadius="false" propStyle="background-color:transparent;" @onclose="popup_login_close_event">
+                    <view class="popup-login padding-sm">
+                        <view class="bg-white border-radius-main content">
+                            <block v-for="(item, key) in plugins_thirdpartylogin_data">
+                                <view class="item padding-lg flex-col jc-c align-c" :data-type="key" :data-url="item.login_url" @tap="plugins_thirdpartylogin_event">
+                                    <view class="flex-row align-c login-width text-size-lg"> <image :src="item.icon" mode="aspectFit" class="margin-right-main"></image>{{ item.name }} </view>
+                                </view>
+                            </block>
+                        </view>
+                        <view class="margin-top-main tc footer">
+                            <view class="padding-main text-size-lg fw-b bg-white cancel-btn" @tap="popup_login_close_event">取消</view>
+                        </view>
+                    </view>
+                </component-popup>
             </block>
             <view v-else class="margin-top-xxxl padding-top-xxxl tc">
                 <text class="cr-red">基础数据有误，如未自动加载则请手动点击加载！</text>
@@ -315,808 +365,789 @@
     </view>
 </template>
 <script>
-const app = getApp();
-import base64 from "../../common/js/lib/base64.js";
-import componentPopup from "../../components/popup/popup";
+    const app = getApp();
+    import base64 from '../../common/js/lib/base64.js';
+    import componentPopup from '../../components/popup/popup';
+    let login_static_url = app.globalData.get_static_url('thirdpartylogin', true) + 'icon/';
+
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                login_static_url: login_static_url,
+                params: null,
+                user: null,
+                prev_page: null,
+                form_input_mobile_value: '',
+                form_input_email_value: '',
+                form_input_accounts_value: '',
+                form_input_image_verify_value: '',
+                verify_submit_text: '获取验证码',
+                verify_loading: false,
+                verify_disabled: false,
+                form_submit_loading: false,
+                verify_time_total: 60,
+                temp_clear_time: null,
+                agreement_status: false,
+                verify_image_url: null,
+                popup_image_verify_status: false,
+                // 基础配置
+                is_refreshed_base_data: 0,
+                is_exist_base_data: 0,
+                common_user_onekey_bind_mobile_list: [],
+                home_site_logo_square: null,
+                home_user_login_type: [],
+                home_user_reg_type: [],
+                home_user_login_img_verify_state: 0,
+                home_user_register_img_verify_state: 0,
+                common_img_verify_state: 0,
+                client_value: app.globalData.application_client_type(),
+                // 0 确认绑定方式, 1 验证码绑定
+                current_login_bind_type: 0,
+                // 当前操作方式
+                current_opt_form: 'auth',
+                current_opt_type: 'auth',
+                current_opt_type_title: {
+                    auth: '授权用户信息',
+                    bind: '绑定手机',
+                    login_username: '账号密码登录',
+                    login_sms: '手机验证码登录',
+                    login_email: '邮箱验证码登录',
+                    reg_username: '账号密码注册',
+                    reg_sms: '手机验证码注册',
+                    reg_email: '邮箱验证码注册',
+                    forget: '密码找回',
+                    success: '登录成功',
+                },
+                // 第三方登录
+                plugins_thirdpartylogin_data: null,
+                plugins_thirdpartylogin_user: null,
+                // 错误提示信息
+                error_msg: null,
+
+                // 语言选择
+                popup_language_status: false,
+                language_list: ['中国', '美国', '韩国', '日本'],
+                language_index: 0,
+                // 实际提交的语言字段
+                language: '简体中文',
+                // 暂存的语言字段
+                language_name: '',
+
+                // 登陆方式
+                popup_login_status: false,
+            };
+        },
+
+        components: {
+            componentPopup,
+        },
+
+        // 页面加载初始化
+        onLoad(params) {
+            this.setData({
+                params: params,
+            });
+
+            // 上一个页面记录
+            var page = app.globalData.prev_page();
+            if (page != null && page != 'pages/login/login') {
+                uni.setStorageSync(app.globalData.data.cache_prev_page_key, page);
+            }
 
-export default {
-    data() {
-        return {
-            theme_view: app.globalData.get_theme_value_view(),
-            params: null,
-            user: null,
-            prev_page: null,
-            form_input_mobile_value: "",
-            form_input_email_value: "",
-            form_input_accounts_value: "",
-            form_input_image_verify_value: "",
-            verify_submit_text: "获取验证码",
-            verify_loading: false,
-            verify_disabled: false,
-            form_submit_loading: false,
-            verify_time_total: 60,
-            temp_clear_time: null,
-            agreement_status: false,
-            verify_image_url: null,
-            popup_image_verify_status: false,
-            // 基础配置
-            is_refreshed_base_data: 0,
-            is_exist_base_data: 0,
-            common_user_onekey_bind_mobile_list: [],
-            home_site_logo_square: null,
-            home_user_login_type: [],
-            home_user_reg_type: [],
-            home_user_login_img_verify_state: 0,
-            home_user_register_img_verify_state: 0,
-            common_img_verify_state: 0,
-            client_value: app.globalData.application_client_type(),
-            // 0 确认绑定方式, 1 验证码绑定
-            current_login_bind_type: 0,
-            // 当前操作方式
-            current_opt_form: "auth",
-            current_opt_type: "auth",
-            current_opt_type_title: {
-                auth: "授权用户信息",
-                bind: "绑定手机",
-                login_username: "账号密码登录",
-                login_sms: "手机验证码登录",
-                login_email: "邮箱验证码登录",
-                reg_username: "账号密码注册",
-                reg_sms: "手机验证码注册",
-                reg_email: "邮箱验证码注册",
-                forget: "密码找回",
-                success: "登录成功",
-            },
-            // 第三方登录
-            plugins_thirdpartylogin_data: null,
-            plugins_thirdpartylogin_user: null,
             // 错误提示信息
-            error_msg: null,
-        };
-    },
-
-    components: {
-        componentPopup,
-    },
-
-    // 页面加载初始化
-    onLoad(params) {
-        this.setData({
-            params: params,
-        });
-
-        // 上一个页面记录
-        var page = app.globalData.prev_page();
-        if (page != null && page != "pages/login/login") {
-            uni.setStorageSync(app.globalData.data.cache_prev_page_key, page);
-        }
-
-        // 错误提示信息
-        if ((params.msg || null) != null) {
-            var msg = base64.decode(decodeURIComponent(params.msg));
-            this.setData({
-                error_msg: msg,
-            });
-        }
-
-        // 第三方登录成功处理
-        if ((params.thirdpartylogin || null) != null) {
-            var user = JSON.parse(base64.decode(decodeURIComponent(params.thirdpartylogin)));
-            this.setData({
-                plugins_thirdpartylogin_user: user,
-            });
-            // 是否需要绑定账号
-            if ((user.is_force_bind_user || 0) != 1) {
-                uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
-            }
-        }
-
-        // 数据初始化
-        this.init();
-    },
-
-    // 页面显示
-    onShow() {
-        // 异步初始化配置
-        this.init_config();
-
-        // 分享菜单处理
-        app.globalData.page_share_handle();
-    },
-
-    methods: {
-        // 数据初始化
-        init() {
-            // 缓存初始化配置
-            this.init_config(true);
-
-            // 用户信息
-            var user = app.globalData.get_user_cache_info();
-
-            // 数据处理
-            var type = user == null ? "auth" : "bind";
-            var form = type;
-            var is_base = (this.home_site_logo_square || null) != null ? 1 : 0;
-            // #ifdef H5 || APP
-            if (user == null) {
-                // 非小程序：如果开启登录则取第一个登录方式
-                if ((this.home_user_login_type || null) != null && this.home_user_login_type.length > 0) {
-                    form = "login";
-                    // 开启登录则取第一个
-                    type = "login_" + this.home_user_login_type[0];
-
-                    // 用户登录和验证码获取开启图片验证码
-                    if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
-                        this.image_verify_event("user_login");
-                    }
-                } else {
-                    is_base = 0;
-                }
-            } else {
-                // 是否需要绑定手机
-                if (type == "bind" && !app.globalData.user_is_need_login(user)) {
-                    type = "bind";
-                    form = "success";
-                }
-            }
-            // #endif
-            uni.setNavigationBarTitle({
-                title: this.current_opt_type_title[type],
-            });
-
-            // 是否参数指定类型和表单
-            if ((this.params.opt_type || null) != null) {
-                type = this.params.opt_type;
-            }
-            if ((this.params.opt_form || null) != null) {
-                form = this.params.opt_form;
-            }
-
-            // 没有基础数据则刷新
-            if (is_base == 0 && this.is_refreshed_base_data == 0) {
-                this.cache_refresh_event();
-            }
-
-            this.setData({
-                user: user,
-                current_opt_type: type,
-                current_opt_form: form,
-                is_exist_base_data: is_base,
-                is_refreshed_base_data: 1,
-            });
-
-            // 登录成功
-            if (this.current_opt_form == "success") {
-                var page = uni.getStorageSync(app.globalData.data.cache_prev_page_key) || null;
-                if (page != null) {
-                    this.setData({ prev_page: page });
-                    setTimeout(function () {
-                        app.globalData.url_open("/" + page, true);
-                    }, 2000);
-                }
-            }
-        },
-
-        // 初始化配置
-        init_config(status) {
-            if ((status || false) == true) {
+            if ((params.msg || null) != null) {
+                var msg = base64.decode(decodeURIComponent(params.msg));
                 this.setData({
-                    home_site_logo_square: app.globalData.get_config("config.home_site_logo_square"),
-                    common_user_onekey_bind_mobile_list: app.globalData.get_config("config.common_user_onekey_bind_mobile_list", []),
-                    home_user_login_type: app.globalData.get_config("config.home_user_login_type"),
-                    home_user_reg_type: app.globalData.get_config("config.home_user_reg_type"),
-                    home_user_login_img_verify_state: app.globalData.get_config("config.home_user_login_img_verify_state"),
-                    home_user_register_img_verify_state: app.globalData.get_config("config.home_user_register_img_verify_state"),
-                    common_img_verify_state: app.globalData.get_config("config.common_img_verify_state"),
-                    plugins_thirdpartylogin_config: app.globalData.get_config("plugins_base.thirdpartylogin.data"),
-                    plugins_thirdpartylogin_data: app.globalData.get_config("plugins_thirdpartylogin_data"),
+                    error_msg: msg,
                 });
-            } else {
-                app.globalData.is_config(this, "init_config");
-            }
-        },
-
-        // 登录授权事件
-        get_user_info_event(e) {
-            // 是否已同意协议
-            if (!this.agreement_status) {
-                app.globalData.showToast("请先同意协议");
-                return false;
             }
 
-            // #ifdef MP-WEIXIN
-            uni.getUserProfile({
-                desc: "用于完善会员资料",
-                lang: "zh_CN",
-                success: (res) => {
-                    this.user_auth_code(res.userInfo);
-                },
-            });
-            // #endif
-            // #ifdef MP-QQ
-            uni.getUserInfo({
-                withCredentials: true,
-                lang: "zh_CN",
-                success: (res) => {
-                    var userinfo = res.userInfo;
-                    userinfo["encrypted_data"] = res.encryptedData;
-                    userinfo["iv"] = res.iv;
-                    this.user_auth_code(userinfo);
-                },
-            });
-            // #endif
-            // #ifdef MP-ALIPAY
-            uni.getOpenUserInfo({
-                success: (res) => {
-                    var userinfo = JSON.parse(res.response).response;
-                    this.user_auth_code(userinfo);
-                },
-            });
-            // #endif
-            // #ifdef MP-BAIDU
-            var userinfo = e.detail.userInfo;
-            userinfo["encrypted_data"] = e.detail.encryptedData;
-            userinfo["iv"] = e.detail.iv;
-            this.user_auth_code(userinfo);
-            // #endif
-            // #ifdef MP-TOUTIAO
-            uni.getUserProfile({
-                force: true,
-                success: (res) => {
-                    // 由于头条getUserProfile内置了login
-                    // 会刷新前面的login会导致后面获取手机号码数据解析失败
-                    // 这里重新获取sessionKey登录
-                    app.globalData.user_login_handle(null, null, false);
-                    // 用户授权登录
-                    this.user_auth_code(res.userInfo);
-                },
-            });
-            // #endif
-            // #ifdef MP-KUAISHOU
-            var userinfo = e.target.userInfo;
-            this.user_auth_code(e.target.userInfo);
-            // #endif
-        },
-
-        // 用户授权登录
-        // auth_data  授权数据
-        user_auth_code(auth_data) {
-            if ((auth_data || null) != null) {
-                app.globalData.user_auth_login(this, "user_auth_back_event", null, auth_data);
-            } else {
-                app.globalData.showToast("授权失败");
-            }
-        },
-
-        // 授权返回事件
-        user_auth_back_event() {
-            var user = app.globalData.get_user_cache_info();
-            this.setData({
-                user: user,
-            });
-
-            // 是否需要绑定手机号码
-            if (app.globalData.user_is_need_login(user) == false) {
-                uni.navigateBack();
+            // 第三方登录成功处理
+            if ((params.thirdpartylogin || null) != null) {
+                var user = JSON.parse(base64.decode(decodeURIComponent(params.thirdpartylogin)));
+                this.setData({
+                    plugins_thirdpartylogin_user: user,
+                });
+                // 是否需要绑定账号
+                if ((user.is_force_bind_user || 0) != 1) {
+                    uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
+                }
             }
 
-            // 初始化
+            // 数据初始化
             this.init();
         },
 
-        // 输入手机号码事件
-        form_input_mobile_event(e) {
-            this.setData({
-                form_input_mobile_value: e.detail.value,
-            });
+        // 页面显示
+        onShow() {
+            // 异步初始化配置
+            this.init_config();
+
+            // 分享菜单处理
+            app.globalData.page_share_handle();
         },
 
-        // 输入邮箱事件
-        form_input_email_event(e) {
-            this.setData({
-                form_input_email_value: e.detail.value,
-            });
-        },
+        methods: {
+            // 数据初始化
+            init() {
+                // 缓存初始化配置
+                this.init_config(true);
 
-        // 输入手机和邮箱事件
-        form_input_accounts_event(e) {
-            this.setData({
-                form_input_accounts_value: e.detail.value,
-            });
-        },
+                // 用户信息
+                var user = app.globalData.get_user_cache_info();
 
-        // 输入图片验证码事件
-        form_input_image_verify_event(e) {
-            this.setData({
-                form_input_image_verify_value: e.detail.value,
-            });
-        },
+                // 数据处理
+                var type = user == null ? 'auth' : 'bind';
+                var form = type;
+                var is_base = (this.home_site_logo_square || null) != null ? 1 : 0;
+                // #ifdef H5 || APP
+                if (user == null) {
+                    // 非小程序：如果开启登录则取第一个登录方式
+                    if ((this.home_user_login_type || null) != null && this.home_user_login_type.length > 0) {
+                        form = 'login';
+                        // 开启登录则取第一个
+                        type = 'login_' + this.home_user_login_type[0];
 
-        // 弹层图片验证码关闭
-        popup_image_verify_close_event(e) {
-            this.setData({
-                popup_image_verify_status: false,
-            });
-        },
-
-        // 弹层图片验证码确认
-        popup_image_verify_submit_event(e) {
-            this.verify_send_handle();
-        },
-
-        // 短信验证码发送事件
-        verify_send_event() {
-            // 手机号码验证：手机登录、手机注册、手机绑定
-            if (this.current_opt_type == "login_sms" || this.current_opt_type == "reg_sms" || this.current_opt_type == "bind") {
-                if ((this.form_input_mobile_value || null) == null) {
-                    app.globalData.showToast("请填写手机号码");
-                    return false;
+                        // 用户登录和验证码获取开启图片验证码
+                        if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                            this.image_verify_event('user_login');
+                        }
+                    } else {
+                        is_base = 0;
+                    }
+                } else {
+                    // 是否需要绑定手机
+                    if (type == 'bind' && !app.globalData.user_is_need_login(user)) {
+                        type = 'bind';
+                        form = 'success';
+                    }
                 }
-            }
-            // 邮箱验证：邮箱登录、邮箱注册
-            if (this.current_opt_type == "login_email" || this.current_opt_type == "reg_email") {
-                if ((this.form_input_email_value || null) == null) {
-                    app.globalData.showToast("请填写电子邮箱");
-                    return false;
+                // #endif
+                uni.setNavigationBarTitle({
+                    title: this.current_opt_type_title[type],
+                });
+
+                // 是否参数指定类型和表单
+                if ((this.params.opt_type || null) != null) {
+                    type = this.params.opt_type;
                 }
-            }
-            // 密码找回：邮箱或手机
-            if (this.current_opt_type == "forget" && (this.form_input_accounts_value || null) == null) {
-                app.globalData.showToast("请填写手机或邮箱");
-                return false;
-            }
-            // 是否开启图片验证码、绑定操作不使用图片验证码
-            if (this.current_opt_form != "bind" && this.current_opt_form != "bind_verify") {
-                if (this.common_img_verify_state == 1) {
+                if ((this.params.opt_form || null) != null) {
+                    form = this.params.opt_form;
+                }
+
+                // 没有基础数据则刷新
+                if (is_base == 0 && this.is_refreshed_base_data == 0) {
+                    this.cache_refresh_event();
+                }
+
+                this.setData({
+                    user: user,
+                    current_opt_type: type,
+                    current_opt_form: form,
+                    is_exist_base_data: is_base,
+                    is_refreshed_base_data: 1,
+                });
+
+                // 登录成功
+                if (this.current_opt_form == 'success') {
+                    var page = uni.getStorageSync(app.globalData.data.cache_prev_page_key) || null;
+                    if (page != null) {
+                        this.setData({ prev_page: page });
+                        setTimeout(function () {
+                            app.globalData.url_open('/' + page, true);
+                        }, 2000);
+                    }
+                }
+            },
+
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
                     this.setData({
-                        popup_image_verify_status: true,
+                        home_site_logo_square: app.globalData.get_config('config.home_site_logo_square'),
+                        common_user_onekey_bind_mobile_list: app.globalData.get_config('config.common_user_onekey_bind_mobile_list', []),
+                        home_user_login_type: app.globalData.get_config('config.home_user_login_type'),
+                        home_user_reg_type: app.globalData.get_config('config.home_user_reg_type'),
+                        home_user_login_img_verify_state: app.globalData.get_config('config.home_user_login_img_verify_state'),
+                        home_user_register_img_verify_state: app.globalData.get_config('config.home_user_register_img_verify_state'),
+                        common_img_verify_state: app.globalData.get_config('config.common_img_verify_state'),
+                        plugins_thirdpartylogin_config: app.globalData.get_config('plugins_base.thirdpartylogin.data'),
+                        plugins_thirdpartylogin_data: app.globalData.get_config('plugins_thirdpartylogin_data'),
                     });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 登录授权事件
+            get_user_info_event(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast('请先同意协议');
                     return false;
                 }
-            }
 
-            // 发送验证码处理
-            this.verify_send_handle();
-        },
+                // #ifdef MP-WEIXIN
+                uni.getUserProfile({
+                    desc: '用于完善会员资料',
+                    lang: 'zh_CN',
+                    success: (res) => {
+                        this.user_auth_code(res.userInfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-QQ
+                uni.getUserInfo({
+                    withCredentials: true,
+                    lang: 'zh_CN',
+                    success: (res) => {
+                        var userinfo = res.userInfo;
+                        userinfo['encrypted_data'] = res.encryptedData;
+                        userinfo['iv'] = res.iv;
+                        this.user_auth_code(userinfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-ALIPAY
+                uni.getOpenUserInfo({
+                    success: (res) => {
+                        var userinfo = JSON.parse(res.response).response;
+                        this.user_auth_code(userinfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-BAIDU
+                var userinfo = e.detail.userInfo;
+                userinfo['encrypted_data'] = e.detail.encryptedData;
+                userinfo['iv'] = e.detail.iv;
+                this.user_auth_code(userinfo);
+                // #endif
+                // #ifdef MP-TOUTIAO
+                uni.getUserProfile({
+                    force: true,
+                    success: (res) => {
+                        // 由于头条getUserProfile内置了login
+                        // 会刷新前面的login会导致后面获取手机号码数据解析失败
+                        // 这里重新获取sessionKey登录
+                        app.globalData.user_login_handle(null, null, false);
+                        // 用户授权登录
+                        this.user_auth_code(res.userInfo);
+                    },
+                });
+                // #endif
+                // #ifdef MP-KUAISHOU
+                var userinfo = e.target.userInfo;
+                this.user_auth_code(e.target.userInfo);
+                // #endif
+            },
 
-        // 短信验证码发送处理
-        verify_send_handle() {
-            // 是否开启图片验证码
-            if (this.current_opt_form != "bind" && this.current_opt_form != "bind_verify") {
-                if (this.common_img_verify_state == 1) {
-                    if ((this.form_input_image_verify_value || null) == null || this.form_input_image_verify_value.length < 4) {
-                        app.globalData.showToast("请输入有效验证码");
+            // 用户授权登录
+            // auth_data  授权数据
+            user_auth_code(auth_data) {
+                if ((auth_data || null) != null) {
+                    app.globalData.user_auth_login(this, 'user_auth_back_event', null, auth_data);
+                } else {
+                    app.globalData.showToast('授权失败');
+                }
+            },
+
+            // 授权返回事件
+            user_auth_back_event() {
+                var user = app.globalData.get_user_cache_info();
+                this.setData({
+                    user: user,
+                });
+
+                // 是否需要绑定手机号码
+                if (app.globalData.user_is_need_login(user) == false) {
+                    uni.navigateBack();
+                }
+
+                // 初始化
+                this.init();
+            },
+
+            // 输入手机号码事件
+            form_input_mobile_event(e) {
+                this.setData({
+                    form_input_mobile_value: e.detail.value,
+                });
+            },
+
+            // 输入邮箱事件
+            form_input_email_event(e) {
+                this.setData({
+                    form_input_email_value: e.detail.value,
+                });
+            },
+
+            // 输入手机和邮箱事件
+            form_input_accounts_event(e) {
+                this.setData({
+                    form_input_accounts_value: e.detail.value,
+                });
+            },
+
+            // 输入图片验证码事件
+            form_input_image_verify_event(e) {
+                this.setData({
+                    form_input_image_verify_value: e.detail.value,
+                });
+            },
+
+            // 弹层图片验证码关闭
+            popup_image_verify_close_event(e) {
+                this.setData({
+                    popup_image_verify_status: false,
+                });
+            },
+
+            // 弹层图片验证码确认
+            popup_image_verify_submit_event(e) {
+                this.verify_send_handle();
+            },
+
+            // 短信验证码发送事件
+            verify_send_event() {
+                // 手机号码验证：手机登录、手机注册、手机绑定
+                if (this.current_opt_type == 'login_sms' || this.current_opt_type == 'reg_sms' || this.current_opt_type == 'bind') {
+                    if ((this.form_input_mobile_value || null) == null) {
+                        app.globalData.showToast('请填写手机号码');
                         return false;
                     }
                 }
-            }
-
-            // 请求数据
-            var action = "";
-            var image_verify_type = "";
-            if (this.current_opt_form == "bind" || this.current_opt_form == "bind_verify") {
-                action = "appmobilebindverifysend";
-                image_verify_type = "user_bind";
-                var post_data = {
-                    mobile: this.form_input_mobile_value || "",
-                };
-                if ((post_data.mobile || null) == null) {
-                    app.globalData.showToast("请填写手机号码");
+                // 邮箱验证：邮箱登录、邮箱注册
+                if (this.current_opt_type == 'login_email' || this.current_opt_type == 'reg_email') {
+                    if ((this.form_input_email_value || null) == null) {
+                        app.globalData.showToast('请填写电子邮箱');
+                        return false;
+                    }
+                }
+                // 密码找回：邮箱或手机
+                if (this.current_opt_type == 'forget' && (this.form_input_accounts_value || null) == null) {
+                    app.globalData.showToast('请填写手机或邮箱');
                     return false;
                 }
-            } else {
-                if (this.current_opt_form == "login") {
-                    action = "loginverifysend";
-                    image_verify_type = "user_login";
-                } else if (this.current_opt_form == "reg") {
-                    action = "regverifysend";
-                    image_verify_type = "user_reg";
-                } else if (this.current_opt_form == "forget") {
-                    action = "forgetpwdverifysend";
-                    image_verify_type = "user_forget";
+                // 是否开启图片验证码、绑定操作不使用图片验证码
+                if (this.current_opt_form != 'bind' && this.current_opt_form != 'bind_verify') {
+                    if (this.common_img_verify_state == 1) {
+                        this.setData({
+                            popup_image_verify_status: true,
+                        });
+                        return false;
+                    }
                 }
-                var accounts = (this.current_opt_type == "bind_verify" || this.current_opt_type == "login_sms" || this.current_opt_type == "reg_sms" ? this.form_input_mobile_value : this.current_opt_type == "forget" ? this.form_input_accounts_value : this.form_input_email_value) || null;
-                if (accounts == null) {
-                    app.globalData.showToast("请填写账号");
-                    return false;
-                }
-                var post_data = {
-                    accounts: accounts,
-                    verify: this.form_input_image_verify_value,
-                    type: this.current_opt_type.replace("login_", "").replace("reg_", ""),
-                };
-            }
 
-            // 网络请求
-            var self = this;
-            uni.showLoading({
-                title: "发送中...",
-            });
-            this.setData({
-                verify_submit_text: "发送中",
-                verify_loading: true,
-                verify_disabled: true,
-            });
-            uni.request({
-                url: app.globalData.get_request_url(action, "user"),
-                method: "POST",
-                data: post_data,
-                dataType: "json",
-                success: (res) => {
-                    uni.hideLoading();
-                    if (res.data.code == 0) {
-                        // 是否开启图片验证码
-                        if (this.common_img_verify_state == 1) {
-                            this.setData({
-                                popup_image_verify_status: false,
-                            });
+                // 发送验证码处理
+                this.verify_send_handle();
+            },
+
+            // 短信验证码发送处理
+            verify_send_handle() {
+                // 是否开启图片验证码
+                if (this.current_opt_form != 'bind' && this.current_opt_form != 'bind_verify') {
+                    if (this.common_img_verify_state == 1) {
+                        if ((this.form_input_image_verify_value || null) == null || this.form_input_image_verify_value.length < 4) {
+                            app.globalData.showToast('请输入有效验证码');
+                            return false;
                         }
-
-                        // 倒计时处理
-                        this.setData({
-                            verify_loading: false,
-                        });
-                        var temp_time = this.verify_time_total;
-                        this.temp_clear_time = setInterval(function () {
-                            if (temp_time <= 1) {
-                                clearInterval(self.temp_clear_time);
-                                self.setData({
-                                    verify_submit_text: "获取验证码",
-                                    verify_disabled: false,
-                                });
-                            } else {
-                                temp_time--;
-                                self.setData({
-                                    verify_submit_text: "剩余 " + temp_time + " 秒",
-                                });
-                            }
-                        }, 1000);
-                    } else {
-                        this.setData({
-                            verify_submit_text: "获取验证码",
-                            verify_loading: false,
-                            verify_disabled: false,
-                            form_input_image_verify_value: "",
-                        });
-                        this.image_verify_event(image_verify_type);
-                        app.globalData.showToast(res.data.msg);
                     }
-                },
-                fail: () => {
-                    uni.hideLoading();
-                    this.setData({
-                        verify_submit_text: "获取验证码",
-                        verify_loading: false,
-                        verify_disabled: false,
-                        form_input_image_verify_value: "",
-                    });
-                    this.image_verify_event(image_verify_type);
-                    app.globalData.showToast("网络开小差了哦~");
-                },
-            });
-        },
+                }
 
-        // 绑定手机表单提交
-        formBind(e) {
-            // 数据验证
-            var client_type = app.globalData.application_client_type();
-            var field_openid = client_type + "_openid";
-            var field_unionid = client_type + "_unionid";
-            e.detail.value[field_openid] = this.user[field_openid] || "";
-            e.detail.value[field_unionid] = this.user[field_unionid] || "";
-            e.detail.value["nickname"] = this.user.nickname;
-            e.detail.value["avatar"] = this.user.avatar;
-            e.detail.value["province"] = this.user.province;
-            e.detail.value["city"] = this.user.city;
-            e.detail.value["gender"] = this.user.gender;
-            var validation = [
-                { fields: "mobile", msg: "请填写手机号码" },
-                { fields: "verify", msg: "请填写验证码" },
-            ];
-            // #ifdef MP
-            validation.push({ fields: field_openid, msg: "授权id不能为空" });
-            // #endif
-            if (app.globalData.fields_check(e.detail.value, validation)) {
-                uni.showLoading({
-                    title: "处理中...",
-                });
-                this.setData({
-                    form_submit_loading: true,
-                });
+                // 请求数据
+                var action = '';
+                var image_verify_type = '';
+                if (this.current_opt_form == 'bind' || this.current_opt_form == 'bind_verify') {
+                    action = 'appmobilebindverifysend';
+                    image_verify_type = 'user_bind';
+                    var post_data = {
+                        mobile: this.form_input_mobile_value || '',
+                    };
+                    if ((post_data.mobile || null) == null) {
+                        app.globalData.showToast('请填写手机号码');
+                        return false;
+                    }
+                } else {
+                    if (this.current_opt_form == 'login') {
+                        action = 'loginverifysend';
+                        image_verify_type = 'user_login';
+                    } else if (this.current_opt_form == 'reg') {
+                        action = 'regverifysend';
+                        image_verify_type = 'user_reg';
+                    } else if (this.current_opt_form == 'forget') {
+                        action = 'forgetpwdverifysend';
+                        image_verify_type = 'user_forget';
+                    }
+                    var accounts = (this.current_opt_type == 'bind_verify' || this.current_opt_type == 'login_sms' || this.current_opt_type == 'reg_sms' ? this.form_input_mobile_value : this.current_opt_type == 'forget' ? this.form_input_accounts_value : this.form_input_email_value) || null;
+                    if (accounts == null) {
+                        app.globalData.showToast('请填写账号');
+                        return false;
+                    }
+                    var post_data = {
+                        accounts: accounts,
+                        verify: this.form_input_image_verify_value,
+                        type: this.current_opt_type.replace('login_', '').replace('reg_', ''),
+                    };
+                }
 
                 // 网络请求
-                uni.request({
-                    url: app.globalData.get_request_url("appmobilebind", "user"),
-                    method: "POST",
-                    data: e.detail.value,
-                    dataType: "json",
-                    success: (res) => {
-                        this.user_success_handle(res);
-                    },
-                    fail: () => {
-                        uni.hideLoading();
-                        this.setData({
-                            form_submit_loading: false,
-                        });
-                        app.globalData.showToast("网络开小差了哦~");
-                    },
-                });
-            }
-        },
-
-        // 获取手机号码一键登录
-        confirm_phone_number_event(e) {
-            var encrypted_data = e.detail.encryptedData || null;
-            var iv = e.detail.iv || null;
-            var code = e.detail.code || null;
-            if ((encrypted_data != null && iv != null) || code != null) {
-                // 解密数据并绑定手机
-                var client_type = app.globalData.application_client_type();
-                var field_openid = client_type + "_openid";
-                var field_unionid = client_type + "_unionid";
-                var data = {
-                    encrypted_data: encrypted_data,
-                    iv: iv,
-                    code: code,
-                    openid: this.user[field_openid] || "",
-                    nickname: this.user.nickname || "",
-                    avatar: this.user.avatar || "",
-                    province: this.user.province || "",
-                    city: this.user.city || "",
-                    gender: this.user.gender || 0,
-                };
-                data[field_unionid] = this.user[field_unionid] || "";
-                uni.showLoading({
-                    title: "处理中...",
-                });
                 var self = this;
-                uni.request({
-                    url: app.globalData.get_request_url("onekeyusermobilebind", "user"),
-                    method: "POST",
-                    data: data,
-                    dataType: "json",
-                    success: (res) => {
-                        this.user_success_handle(res);
-                    },
-                    fail: () => {
-                        uni.hideLoading();
-                        app.globalData.showToast("网络开小差了哦~");
-                    },
-                });
-            } else {
-                var msg = e.errmsg || e.errMsg || e.detail.errmsg || e.detail.errMsg || null;
-                if (msg != null) {
-                    app.globalData.showToast(msg);
-                }
-            }
-        },
-
-        // 登录表单提交
-        formLogin(e) {
-            // 是否已同意协议
-            if (!this.agreement_status) {
-                app.globalData.showToast("请先同意协议");
-                return false;
-            }
-            // 数据验证
-            var validation = [];
-            if (this.current_opt_type == "login_sms") {
-                validation.push({ fields: "accounts", msg: "请输入手机号码" });
-            }
-            if (this.current_opt_type == "login_email") {
-                validation.push({ fields: "accounts", msg: "请输入电子邮箱" });
-            }
-            if (this.current_opt_type == "login_username") {
-                validation.push({ fields: "accounts", msg: "请输入账号" });
-                validation.push({ fields: "pwd", msg: "请输入密码" });
-            }
-            if (this.current_opt_type == "login_sms" || this.current_opt_type == "login_email" || (this.current_opt_type == "login_username" && this.home_user_login_img_verify_state == 1)) {
-                validation.push({ fields: "verify", msg: "请输入验证码" });
-            }
-            if (app.globalData.fields_check(e.detail.value, validation)) {
-                // 登录方式
-                e.detail.value["type"] = this.current_opt_type.replace("login_", "");
-
-                // #ifdef MP
-                // 小程序数据
-                var client_type = app.globalData.application_client_type();
-                if ((this.user || null) != null) {
-                    var field_openid = client_type + "_openid";
-                    var field_unionid = client_type + "_unionid";
-                    e.detail.value[field_openid] = this.user[field_openid] || "";
-                    e.detail.value[field_unionid] = this.user[field_unionid] || "";
-                } else {
-                    var login_data = app.globalData.get_login_cache_info();
-                    if (login_data != null) {
-                        var field_openid = client_type + "_openid";
-                        var field_unionid = client_type + "_unionid";
-                        e.detail.value[field_openid] = login_data["openid"] || "";
-                        e.detail.value[field_unionid] = login_data["unionid"] || "";
-                    }
-                }
-                // #endif
-
-                // 网络请求
                 uni.showLoading({
-                    title: "登录中...",
+                    title: '发送中...',
                 });
                 this.setData({
-                    form_submit_loading: true,
+                    verify_submit_text: '发送中',
+                    verify_loading: true,
+                    verify_disabled: true,
                 });
                 uni.request({
-                    url: app.globalData.get_request_url("login", "user"),
-                    method: "POST",
-                    data: e.detail.value,
-                    dataType: "json",
-                    success: (res) => {
-                        this.user_success_handle(res);
-                    },
-                    fail: () => {
-                        uni.hideLoading();
-                        this.setData({
-                            form_submit_loading: false,
-                        });
-                        app.globalData.showToast("网络开小差了哦~");
-                    },
-                });
-            }
-        },
-
-        // 注册表单提交
-        formReg(e) {
-            // 是否已同意协议
-            if (!this.agreement_status) {
-                app.globalData.showToast("请先同意协议");
-                return false;
-            }
-            // 数据验证
-            var validation = [];
-            if (this.current_opt_type == "reg_sms") {
-                validation.push({ fields: "accounts", msg: "请输入手机号码" });
-            }
-            if (this.current_opt_type == "reg_email") {
-                validation.push({ fields: "accounts", msg: "请输入电子邮箱" });
-            }
-            if (this.current_opt_type == "reg_username") {
-                validation.push({ fields: "accounts", msg: "请输入账号" });
-                validation.push({ fields: "pwd", msg: "请输入密码" });
-            }
-            if (this.current_opt_type == "reg_sms" || this.current_opt_type == "reg_email" || (this.current_opt_type == "reg_username" && this.home_user_register_img_verify_state == 1)) {
-                validation.push({ fields: "verify", msg: "请输入验证码" });
-            }
-            if (app.globalData.fields_check(e.detail.value, validation)) {
-                // 注册方式
-                e.detail.value["type"] = this.current_opt_type.replace("reg_", "");
-
-                // #ifdef MP
-                // 小程序数据
-                var client_type = app.globalData.application_client_type();
-                if ((this.user || null) != null) {
-                    var field_openid = client_type + "_openid";
-                    var field_unionid = client_type + "_unionid";
-                    e.detail.value[field_openid] = this.user[field_openid] || "";
-                    e.detail.value[field_unionid] = this.user[field_unionid] || "";
-                    e.detail.value["nickname"] = this.user.nickname;
-                    e.detail.value["avatar"] = this.user.avatar;
-                    e.detail.value["province"] = this.user.province;
-                    e.detail.value["city"] = this.user.city;
-                    e.detail.value["gender"] = this.user.gender;
-                } else {
-                    var login_data = app.globalData.get_login_cache_info();
-                    if (login_data != null) {
-                        var field_openid = client_type + "_openid";
-                        var field_unionid = client_type + "_unionid";
-                        e.detail.value[field_openid] = login_data["openid"] || "";
-                        e.detail.value[field_unionid] = login_data["unionid"] || "";
-                    }
-                }
-                // #endif
-
-                // 网络请求
-                uni.showLoading({
-                    title: "注册中...",
-                });
-                this.setData({
-                    form_submit_loading: true,
-                });
-                uni.request({
-                    url: app.globalData.get_request_url("reg", "user"),
-                    method: "POST",
-                    data: e.detail.value,
-                    dataType: "json",
-                    success: (res) => {
-                        this.user_success_handle(res);
-                    },
-                    fail: () => {
-                        uni.hideLoading();
-                        this.setData({
-                            form_submit_loading: false,
-                        });
-                        app.globalData.showToast("网络开小差了哦~");
-                    },
-                });
-            }
-        },
-
-        // 密码找回表单提交
-        formForget(e) {
-            // 数据验证
-            var validation = [
-                { fields: "accounts", msg: "请输入手机或邮箱" },
-                { fields: "verify", msg: "请输入验证码" },
-                { fields: "pwd", msg: "请设置密码" },
-            ];
-            if (app.globalData.fields_check(e.detail.value, validation)) {
-                // 网络请求
-                uni.showLoading({
-                    title: "处理中...",
-                });
-                this.setData({
-                    form_submit_loading: true,
-                });
-                uni.request({
-                    url: app.globalData.get_request_url("forgetpwd", "user"),
-                    method: "POST",
-                    data: e.detail.value,
-                    dataType: "json",
+                    url: app.globalData.get_request_url(action, 'user'),
+                    method: 'POST',
+                    data: post_data,
+                    dataType: 'json',
                     success: (res) => {
                         uni.hideLoading();
                         if (res.data.code == 0) {
-                            app.globalData.showToast(res.data.msg, "success");
-                            var self = this;
-                            setTimeout(function () {
-                                var opt_type = (self.home_user_login_type || null) != null && self.home_user_login_type.length > 0 ? "login_" + self.home_user_login_type[0] : null;
-                                self.setData({
-                                    form_submit_loading: false,
-                                    current_opt_form: "login",
-                                    current_opt_type: opt_type,
+                            // 是否开启图片验证码
+                            if (this.common_img_verify_state == 1) {
+                                this.setData({
+                                    popup_image_verify_status: false,
                                 });
-                                if (opt_type != null) {
-                                    // 是否开启图片验证码
-                                    if (self.home_user_login_img_verify_state == 1 || self.common_img_verify_state == 1) {
-                                        self.image_verify_event("user_login");
-                                    }
+                            }
+
+                            // 倒计时处理
+                            this.setData({
+                                verify_loading: false,
+                            });
+                            var temp_time = this.verify_time_total;
+                            this.temp_clear_time = setInterval(function () {
+                                if (temp_time <= 1) {
+                                    clearInterval(self.temp_clear_time);
+                                    self.setData({
+                                        verify_submit_text: '获取验证码',
+                                        verify_disabled: false,
+                                    });
+                                } else {
+                                    temp_time--;
+                                    self.setData({
+                                        verify_submit_text: '剩余 ' + temp_time + ' 秒',
+                                    });
                                 }
-                            }, 3000);
+                            }, 1000);
                         } else {
                             this.setData({
-                                form_submit_loading: false,
+                                verify_submit_text: '获取验证码',
+                                verify_loading: false,
+                                verify_disabled: false,
+                                form_input_image_verify_value: '',
                             });
+                            this.image_verify_event(image_verify_type);
                             app.globalData.showToast(res.data.msg);
                         }
                     },
                     fail: () => {
                         uni.hideLoading();
                         this.setData({
-                            form_submit_loading: false,
+                            verify_submit_text: '获取验证码',
+                            verify_loading: false,
+                            verify_disabled: false,
+                            form_input_image_verify_value: '',
                         });
-                        app.globalData.showToast("网络开小差了哦~");
+                        this.image_verify_event(image_verify_type);
+                        app.globalData.showToast('网络开小差了哦~');
                     },
                 });
-            }
-        },
+            },
 
-        // 登录和注册成功回调处理
-        user_success_handle(res) {
-            if (res.data.code == 0 && (res.data.data || null) != null) {
-                // 清除定时任务并存储用户信息
-                clearInterval(this.temp_clear_time);
-                uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+            // 绑定手机表单提交
+            formBind(e) {
+                // 数据验证
+                var client_type = app.globalData.application_client_type();
+                var field_openid = client_type + '_openid';
+                var field_unionid = client_type + '_unionid';
+                e.detail.value[field_openid] = this.user[field_openid] || '';
+                e.detail.value[field_unionid] = this.user[field_unionid] || '';
+                e.detail.value['nickname'] = this.user.nickname;
+                e.detail.value['avatar'] = this.user.avatar;
+                e.detail.value['province'] = this.user.province;
+                e.detail.value['city'] = this.user.city;
+                e.detail.value['gender'] = this.user.gender;
+                var validation = [
+                    { fields: 'mobile', msg: '请填写手机号码' },
+                    { fields: 'verify', msg: '请填写验证码' },
+                ];
+                // #ifdef MP
+                validation.push({ fields: field_openid, msg: '授权id不能为空' });
+                // #endif
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    uni.showLoading({
+                        title: '处理中...',
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
 
-                // 是否强制绑定账号处理
-                if ((this.plugins_thirdpartylogin_user || null) != null && (this.plugins_thirdpartylogin_user.is_force_bind_user || 0) == 1) {
+                    // 网络请求
                     uni.request({
-                        url: app.globalData.get_request_url("bind", "index", "thirdpartylogin"),
-                        method: "POST",
-                        data: this.plugins_thirdpartylogin_user,
-                        dataType: "json",
+                        url: app.globalData.get_request_url('appmobilebind', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
                         success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                }
+            },
+
+            // 获取手机号码一键登录
+            confirm_phone_number_event(e) {
+                var encrypted_data = e.detail.encryptedData || null;
+                var iv = e.detail.iv || null;
+                var code = e.detail.code || null;
+                if ((encrypted_data != null && iv != null) || code != null) {
+                    // 解密数据并绑定手机
+                    var client_type = app.globalData.application_client_type();
+                    var field_openid = client_type + '_openid';
+                    var field_unionid = client_type + '_unionid';
+                    var data = {
+                        encrypted_data: encrypted_data,
+                        iv: iv,
+                        code: code,
+                        openid: this.user[field_openid] || '',
+                        nickname: this.user.nickname || '',
+                        avatar: this.user.avatar || '',
+                        province: this.user.province || '',
+                        city: this.user.city || '',
+                        gender: this.user.gender || 0,
+                    };
+                    data[field_unionid] = this.user[field_unionid] || '';
+                    uni.showLoading({
+                        title: '处理中...',
+                    });
+                    var self = this;
+                    uni.request({
+                        url: app.globalData.get_request_url('onekeyusermobilebind', 'user'),
+                        method: 'POST',
+                        data: data,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                } else {
+                    var msg = e.errmsg || e.errMsg || e.detail.errmsg || e.detail.errMsg || null;
+                    if (msg != null) {
+                        app.globalData.showToast(msg);
+                    }
+                }
+            },
+
+            // 登录表单提交
+            formLogin(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast('请先同意协议');
+                    return false;
+                }
+                // 数据验证
+                var validation = [];
+                if (this.current_opt_type == 'login_sms') {
+                    validation.push({ fields: 'accounts', msg: '请输入手机号码' });
+                }
+                if (this.current_opt_type == 'login_email') {
+                    validation.push({ fields: 'accounts', msg: '请输入电子邮箱' });
+                }
+                if (this.current_opt_type == 'login_username') {
+                    validation.push({ fields: 'accounts', msg: '请输入账号' });
+                    validation.push({ fields: 'pwd', msg: '请输入密码' });
+                }
+                if (this.current_opt_type == 'login_sms' || this.current_opt_type == 'login_email' || (this.current_opt_type == 'login_username' && this.home_user_login_img_verify_state == 1)) {
+                    validation.push({ fields: 'verify', msg: '请输入验证码' });
+                }
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 登录方式
+                    e.detail.value['type'] = this.current_opt_type.replace('login_', '');
+
+                    // #ifdef MP
+                    // 小程序数据
+                    var client_type = app.globalData.application_client_type();
+                    if ((this.user || null) != null) {
+                        var field_openid = client_type + '_openid';
+                        var field_unionid = client_type + '_unionid';
+                        e.detail.value[field_openid] = this.user[field_openid] || '';
+                        e.detail.value[field_unionid] = this.user[field_unionid] || '';
+                    } else {
+                        var login_data = app.globalData.get_login_cache_info();
+                        if (login_data != null) {
+                            var field_openid = client_type + '_openid';
+                            var field_unionid = client_type + '_unionid';
+                            e.detail.value[field_openid] = login_data['openid'] || '';
+                            e.detail.value[field_unionid] = login_data['unionid'] || '';
+                        }
+                    }
+                    // #endif
+
+                    // 网络请求
+                    uni.showLoading({
+                        title: '登录中...',
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('login', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                }
+            },
+
+            // 注册表单提交
+            formReg(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast('请先同意协议');
+                    return false;
+                }
+                // 数据验证
+                var validation = [];
+                if (this.current_opt_type == 'reg_sms') {
+                    validation.push({ fields: 'accounts', msg: '请输入手机号码' });
+                }
+                if (this.current_opt_type == 'reg_email') {
+                    validation.push({ fields: 'accounts', msg: '请输入电子邮箱' });
+                }
+                if (this.current_opt_type == 'reg_username') {
+                    validation.push({ fields: 'accounts', msg: '请输入账号' });
+                    validation.push({ fields: 'pwd', msg: '请输入密码' });
+                }
+                if (this.current_opt_type == 'reg_sms' || this.current_opt_type == 'reg_email' || (this.current_opt_type == 'reg_username' && this.home_user_register_img_verify_state == 1)) {
+                    validation.push({ fields: 'verify', msg: '请输入验证码' });
+                }
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 注册方式
+                    e.detail.value['type'] = this.current_opt_type.replace('reg_', '');
+
+                    // #ifdef MP
+                    // 小程序数据
+                    var client_type = app.globalData.application_client_type();
+                    if ((this.user || null) != null) {
+                        var field_openid = client_type + '_openid';
+                        var field_unionid = client_type + '_unionid';
+                        e.detail.value[field_openid] = this.user[field_openid] || '';
+                        e.detail.value[field_unionid] = this.user[field_unionid] || '';
+                        e.detail.value['nickname'] = this.user.nickname;
+                        e.detail.value['avatar'] = this.user.avatar;
+                        e.detail.value['province'] = this.user.province;
+                        e.detail.value['city'] = this.user.city;
+                        e.detail.value['gender'] = this.user.gender;
+                    } else {
+                        var login_data = app.globalData.get_login_cache_info();
+                        if (login_data != null) {
+                            var field_openid = client_type + '_openid';
+                            var field_unionid = client_type + '_unionid';
+                            e.detail.value[field_openid] = login_data['openid'] || '';
+                            e.detail.value[field_unionid] = login_data['unionid'] || '';
+                        }
+                    }
+                    // #endif
+
+                    // 网络请求
+                    uni.showLoading({
+                        title: '注册中...',
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('reg', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            this.user_success_handle(res);
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                }
+            },
+
+            // 重置表单
+            formReset(e) {
+                console.log(e);
+            },
+
+            // 密码找回表单提交
+            formForget(e) {
+                // 数据验证
+                var validation = [
+                    { fields: 'accounts', msg: '请输入手机或邮箱' },
+                    { fields: 'verify', msg: '请输入验证码' },
+                    { fields: 'pwd', msg: '请设置密码' },
+                ];
+                if (app.globalData.fields_check(e.detail.value, validation)) {
+                    // 网络请求
+                    uni.showLoading({
+                        title: '处理中...',
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('forgetpwd', 'user'),
+                        method: 'POST',
+                        data: e.detail.value,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
                             if (res.data.code == 0) {
-                                uni.hideLoading();
-                                uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
-                                this.success_back_handle(res);
+                                app.globalData.showToast(res.data.msg, 'success');
+                                var self = this;
+                                setTimeout(function () {
+                                    var opt_type = (self.home_user_login_type || null) != null && self.home_user_login_type.length > 0 ? 'login_' + self.home_user_login_type[0] : null;
+                                    self.setData({
+                                        form_submit_loading: false,
+                                        current_opt_form: 'login',
+                                        current_opt_type: opt_type,
+                                    });
+                                    if (opt_type != null) {
+                                        // 是否开启图片验证码
+                                        if (self.home_user_login_img_verify_state == 1 || self.common_img_verify_state == 1) {
+                                            self.image_verify_event('user_login');
+                                        }
+                                    }
+                                }, 3000);
                             } else {
-                                uni.hideLoading();
                                 this.setData({
                                     form_submit_loading: false,
                                 });
@@ -1128,208 +1159,303 @@ export default {
                             this.setData({
                                 form_submit_loading: false,
                             });
-                            app.globalData.showToast("网络开小差了哦~");
+                            app.globalData.showToast('网络开小差了哦~');
                         },
                     });
+                }
+            },
+
+            // 登录和注册成功回调处理
+            user_success_handle(res) {
+                if (res.data.code == 0 && (res.data.data || null) != null) {
+                    // 清除定时任务并存储用户信息
+                    clearInterval(this.temp_clear_time);
+                    uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+
+                    // 是否强制绑定账号处理
+                    if ((this.plugins_thirdpartylogin_user || null) != null && (this.plugins_thirdpartylogin_user.is_force_bind_user || 0) == 1) {
+                        uni.request({
+                            url: app.globalData.get_request_url('bind', 'index', 'thirdpartylogin'),
+                            method: 'POST',
+                            data: this.plugins_thirdpartylogin_user,
+                            dataType: 'json',
+                            success: (res) => {
+                                if (res.data.code == 0) {
+                                    uni.hideLoading();
+                                    uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+                                    this.success_back_handle(res);
+                                } else {
+                                    uni.hideLoading();
+                                    this.setData({
+                                        form_submit_loading: false,
+                                    });
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            },
+                            fail: () => {
+                                uni.hideLoading();
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                app.globalData.showToast('网络开小差了哦~');
+                            },
+                        });
+                    } else {
+                        uni.hideLoading();
+                        this.success_back_handle(res);
+                    }
                 } else {
                     uni.hideLoading();
-                    this.success_back_handle(res);
+                    this.setData({
+                        form_submit_loading: false,
+                    });
+                    app.globalData.showToast(res.data.msg);
                 }
-            } else {
-                uni.hideLoading();
-                this.setData({
-                    form_submit_loading: false,
-                });
-                app.globalData.showToast(res.data.msg);
-            }
-        },
+            },
 
-        // 成功后处理
-        success_back_handle(res) {
-            var self = this;
-            app.globalData.showToast(res.data.msg, "success");
-            var event_callback = this.params.event_callback || null;
-            setTimeout(function () {
-                var pages = getCurrentPages();
-                if (pages.length > 1) {
-                    // 触发回调函数
-                    if (event_callback != null) {
-                        if ((pages[pages.length - 2][event_callback] || null) != null) {
-                            pages[pages.length - 2][event_callback]();
+            // 成功后处理
+            success_back_handle(res) {
+                var self = this;
+                app.globalData.showToast(res.data.msg, 'success');
+                var event_callback = this.params.event_callback || null;
+                setTimeout(function () {
+                    var pages = getCurrentPages();
+                    if (pages.length > 1) {
+                        // 触发回调函数
+                        if (event_callback != null) {
+                            if ((pages[pages.length - 2][event_callback] || null) != null) {
+                                pages[pages.length - 2][event_callback]();
+                            }
                         }
+                        // 默认返回上一页
+                        uni.navigateBack();
+                    } else {
+                        // 仅一个页面则执行成功返回
+                        self.success_event();
                     }
-                    // 默认返回上一页
-                    uni.navigateBack();
-                } else {
-                    // 仅一个页面则执行成功返回
-                    self.success_event();
+                }, 1000);
+            },
+
+            // 协议事件
+            agreement_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast('协议类型有误');
+                    return false;
                 }
-            }, 1000);
-        },
 
-        // 协议事件
-        agreement_event(e) {
-            var value = e.currentTarget.dataset.value || null;
-            if (value == null) {
-                app.globalData.showToast("协议类型有误");
-                return false;
-            }
-
-            // 是否存在协议 url 地址
-            var key = "agreement_" + value + "_url";
-            var url = app.globalData.get_config("config." + key) || null;
-            if (url == null) {
-                app.globalData.showToast("协议url地址有误");
-                return false;
-            }
-
-            // 打开 webview
-            app.globalData.open_web_view(url);
-        },
-
-        // 协议改变
-        agreement_change(e) {
-            this.setData({
-                agreement_status: !this.agreement_status,
-            });
-        },
-
-        // 表单类型事件
-        opt_form_event(e) {
-            var value = e.currentTarget.dataset.value;
-            // 手机更换绑定来源则直接返回
-            if (value == "bind" && (this.params.opt_form || null) != null && this.params.opt_form == "bind_verify") {
-                uni.navigateBack();
-            }
-
-            // 设置数据
-            var data = {
-                current_opt_form: value,
-            };
-
-            // 小程序使用授权自动登录
-            // 切换手机绑定方式
-            if (value == "auth" || value == "bind") {
-                data["current_opt_type"] = value;
-            }
-
-            // 密码找回同时设置表单类型
-            if (value == "forget") {
-                data["current_opt_type"] = "forget";
-                if (this.common_img_verify_state == 1) {
-                    this.image_verify_event("user_forget");
+                // 是否存在协议 url 地址
+                var key = 'agreement_' + value + '_url';
+                var url = app.globalData.get_config('config.' + key) || null;
+                if (url == null) {
+                    app.globalData.showToast('协议url地址有误');
+                    return false;
                 }
-            }
 
-            // 开启登录则取第一个
-            if (value == "login" && this.home_user_login_type.length > 0) {
-                data["current_opt_type"] = "login_" + this.home_user_login_type[0];
-                // 是否开启图片验证码
-                if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
-                    this.image_verify_event("user_login");
-                }
-            }
+                // 打开 webview
+                app.globalData.open_web_view(url);
+            },
 
-            // 开启注册则取第一个
-            if (value == "reg" && this.home_user_reg_type.length > 0) {
-                data["current_opt_type"] = "reg_" + this.home_user_reg_type[0];
-                // 是否开启图片验证码
-                if (this.home_user_register_img_verify_state == 1 || this.common_img_verify_state == 1) {
-                    this.image_verify_event("user_reg");
-                }
-            }
-            this.setData(data);
-
-            // 标题
-            if ((data.current_opt_type || null) != null) {
-                uni.setNavigationBarTitle({
-                    title: this.current_opt_type_title[data.current_opt_type],
-                });
-            }
-        },
-
-        // 操作类型事件
-        opt_type_event(e) {
-            var value = e.currentTarget.dataset.value || null;
-            if (value != null) {
+            // 协议改变
+            agreement_change(e) {
                 this.setData({
-                    current_opt_type: value,
+                    agreement_status: !this.agreement_status,
                 });
+            },
 
-                // 图片验证码
-                if (value == "login_username" && this.home_user_login_img_verify_state == 1) {
-                    this.image_verify_event("user_login");
+            // 表单类型事件
+            opt_form_event(e) {
+                var value = e.currentTarget.dataset.value;
+                // 手机更换绑定来源则直接返回
+                if (value == 'bind' && (this.params.opt_form || null) != null && this.params.opt_form == 'bind_verify') {
+                    uni.navigateBack();
                 }
-                if ((value == "login_sms" || value == "login_email") && this.common_img_verify_state == 1) {
-                    this.image_verify_event("user_login");
+
+                // 设置数据
+                var data = {
+                    current_opt_form: value,
+                };
+
+                // 小程序使用授权自动登录
+                // 切换手机绑定方式
+                if (value == 'auth' || value == 'bind') {
+                    data['current_opt_type'] = value;
                 }
-                if (value == "reg_username" && this.home_user_register_img_verify_state == 1) {
-                    this.image_verify_event("user_reg");
+
+                // 密码找回同时设置表单类型
+                if (value == 'forget') {
+                    data['current_opt_type'] = 'forget';
+                    if (this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_forget');
+                    }
                 }
-                if ((value == "reg_sms" || value == "reg_email") && this.common_img_verify_state == 1) {
-                    this.image_verify_event("user_reg");
+
+                // 开启登录则取第一个
+                if (value == 'login' && this.home_user_login_type.length > 0) {
+                    data['current_opt_type'] = 'login_' + this.home_user_login_type[0];
+                    // 是否开启图片验证码
+                    if (this.home_user_login_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
                 }
 
+                // 开启注册则取第一个
+                if (value == 'reg' && this.home_user_reg_type.length > 0) {
+                    data['current_opt_type'] = 'reg_' + this.home_user_reg_type[0];
+                    // 是否开启图片验证码
+                    if (this.home_user_register_img_verify_state == 1 || this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+                }
+                this.setData(data);
+
                 // 标题
-                uni.setNavigationBarTitle({
-                    title: this.current_opt_type_title[value],
-                });
-            }
-        },
+                if ((data.current_opt_type || null) != null) {
+                    uni.setNavigationBarTitle({
+                        title: this.current_opt_type_title[data.current_opt_type],
+                    });
+                }
+            },
 
-        // 图片验证码事件
-        image_verify_event(e) {
-            var type = typeof e == "string" ? e : e.currentTarget.dataset.type || null;
-            if (type !== null) {
-                var tv = app.globalData.get_timestamp();
-                var url = app.globalData.get_request_url("userverifyentry", "user", "", "type=" + type + "&t=" + tv);
+            // 操作类型事件
+            opt_type_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    this.setData({
+                        current_opt_type: value,
+                    });
+
+                    // 图片验证码
+                    if (value == 'login_username' && this.home_user_login_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
+                    if ((value == 'login_sms' || value == 'login_email') && this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_login');
+                    }
+                    if (value == 'reg_username' && this.home_user_register_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+                    if ((value == 'reg_sms' || value == 'reg_email') && this.common_img_verify_state == 1) {
+                        this.image_verify_event('user_reg');
+                    }
+
+                    // 标题
+                    uni.setNavigationBarTitle({
+                        title: this.current_opt_type_title[value],
+                    });
+                }
+            },
+
+            // 图片验证码事件
+            image_verify_event(e) {
+                var type = typeof e == 'string' ? e : e.currentTarget.dataset.type || null;
+                if (type !== null) {
+                    var tv = app.globalData.get_timestamp();
+                    var url = app.globalData.get_request_url('userverifyentry', 'user', '', 'type=' + type + '&t=' + tv);
+                    this.setData({
+                        verify_image_url: url,
+                    });
+                }
+            },
+
+            // 缓存数据刷新
+            cache_refresh_event(e) {
+                app.globalData.init_config();
+                var self = this;
+                uni.showLoading({
+                    title: '加载中...',
+                });
+                setTimeout(function () {
+                    self.init();
+                    uni.hideLoading();
+                }, 3000);
+            },
+
+            // 第三方登录事件
+            plugins_thirdpartylogin_event(e) {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast('请先同意协议');
+                    return false;
+                }
                 this.setData({
-                    verify_image_url: url,
+                    popup_login_status: false,
                 });
-            }
-        },
+                // 直接跳转到登录地址、这里还可以根据终端类型进行处理业务逻辑
+                var type = e.currentTarget.dataset.type || null;
+                var url = e.currentTarget.dataset.url || null;
+                window.location.href = url;
+            },
 
-        // 缓存数据刷新
-        cache_refresh_event(e) {
-            app.globalData.init_config();
-            var self = this;
-            uni.showLoading({
-                title: "加载中...",
-            });
-            setTimeout(function () {
-                self.init();
-                uni.hideLoading();
-            }, 3000);
-        },
+            // 第三方登录绑定账号取消
+            plugins_thirdpartylogin_cancel_event(e) {
+                uni.redirectTo({
+                    url: '/pages/login/login',
+                });
+            },
 
-        // 第三方登录事件
-        plugins_thirdpartylogin_event(e) {
-            // 是否已同意协议
-            if (!this.agreement_status) {
-                app.globalData.showToast("请先同意协议");
-                return false;
-            }
-            // 直接跳转到登录地址、这里还可以根据终端类型进行处理业务逻辑
-            var type = e.currentTarget.dataset.type || null;
-            var url = e.currentTarget.dataset.url || null;
-            window.location.href = url;
-        },
+            // 成功返回
+            success_event(e) {
+                var url = this.prev_page == null ? app.globalData.data.tabbar_pages[0] : this.prev_page;
+                app.globalData.url_open(url, true);
+            },
 
-        // 第三方登录绑定账号取消
-        plugins_thirdpartylogin_cancel_event(e) {
-            uni.redirectTo({
-                url: "/pages/login/login",
-            });
-        },
+            // 返回首页
+            back_event() {
+                app.globalData.page_back_prev_event();
+            },
 
-        // 成功返回
-        success_event(e) {
-            var url = this.prev_page == null ? app.globalData.data.tabbar_pages[0] : this.prev_page;
-            app.globalData.url_open(url, true);
+            // 打开语言选择弹窗
+            open_language_event() {
+                this.setData({
+                    popup_language_status: !this.popup_language_status,
+                });
+            },
+
+            // 关闭语言弹窗
+            popup_language_close_event() {
+                this.setData({
+                    popup_language_status: false,
+                });
+            },
+
+            // 选择语言
+            checked_language_event(e) {
+                this.setData({
+                    language_name: e.currentTarget.dataset.value,
+                    language_index: e.currentTarget.dataset.index,
+                });
+            },
+
+            // 提交语言选择
+            popup_sub_language_event() {
+                this.setData({
+                    language: this.language_name,
+                    popup_language_status: false,
+                });
+            },
+
+            // 打开登陆方式弹层
+            popup_login_open_event() {
+                // 是否已同意协议
+                if (!this.agreement_status) {
+                    app.globalData.showToast('请先同意协议');
+                    return false;
+                }
+                this.setData({
+                    popup_login_status: true,
+                });
+            },
+
+            // 关闭登陆方式弹层
+            popup_login_close_event() {
+                this.setData({
+                    popup_login_status: false,
+                });
+            },
         },
-    },
-};
+    };
 </script>
 <style>
-@import "./login.css";
+    @import './login.css';
 </style>
diff --git a/pages/logout/logout.vue b/pages/logout/logout.vue
index 80ece17c..cadd2ad8 100644
--- a/pages/logout/logout.vue
+++ b/pages/logout/logout.vue
@@ -102,7 +102,7 @@
             // 注销提交
             logout_submit_event(e) {
                 // 是否再次确认
-                if (e != 0 && e != 1) {
+                if (e.alert_status != 0 && e.alert_status != 1) {
                     app.globalData.alert({
                         msg: '账号注销后不可恢复、确定继续吗？',
                         is_show_cancel: 1,
@@ -113,7 +113,7 @@
                 }
 
                 // 注销提交
-                if (e == 1) {
+                if (e.alert_status == 1) {
                     uni.showLoading({
                         title: '处理中...',
                     });
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
index e76dc3ee..99ec8e92 100644
--- a/pages/plugins/ask/index/index.vue
+++ b/pages/plugins/ask/index/index.vue
@@ -73,7 +73,7 @@
             return {
                 theme_view: app.globalData.get_theme_value_view(),
                 status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
-                data_base: data_base,
+                data_base: {},
                 data_list: [],
                 data_total: 0,
                 data_page_total: 0,
diff --git a/pages/plugins/blog/form/form.css b/pages/plugins/blog/form/form.css
index e69de29b..3ed6c162 100644
--- a/pages/plugins/blog/form/form.css
+++ b/pages/plugins/blog/form/form.css
@@ -0,0 +1,11 @@
+.sp-editor {
+    height: 500rpx;
+}
+
+.more {
+    transition: all 0.3s ease-in-out;
+}
+.p-content {
+    max-height: 50vh;
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/form/form.vue b/pages/plugins/blog/form/form.vue
index 05e886c3..7998cc2a 100644
--- a/pages/plugins/blog/form/form.vue
+++ b/pages/plugins/blog/form/form.vue
@@ -1,53 +1,416 @@
 <template>
-    <view>
-        <textImageVideoEditor ref="textImageVideoEditor" :list2="initEditorList" @addImage="addImage" @addVideo="addVideo" :showPreview="true" @preview="preview" completedText="下一步" @completed="completed"></textImageVideoEditor>
+    <view :class="theme_view">
+        <view v-if="data_list_loding_status !== 0">
+            <form @submit="form_submit" class="form-container">
+                <view class="page-bottom-fixed padding-main">
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">标题<text class="form-group-tips-must">*</text></view>
+                                <input type="text" name="title" :value="data.title || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" placeholder="请输入" />
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">分类<text class="form-group-tips-must">*</text></view>
+                                <view class="flex-1 flex-width tr" @tap="popupOpen">
+                                    <text :class="data.type ? 'cr-black' : 'cr-grey-9'">{{ data.type || '请选择' }}</text>
+                                    <view class="pr top-sm margin-left-sm dis-inline-block">
+                                        <iconfont name="icon-qiandao-jiantou2" color="#999" size="28rpx"></iconfont>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="flex-row jc-sb align-c">
+                                <view class="form-gorup-title padding-right-main">是否启用</view>
+                                <view class="flex-1 flex-width tr">
+                                    <switch :color="theme_color" :checked="(data.is_open || 0) == 1 ? true : false" @change="is_open_event" />
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title padding-right-main">封面图片</view>
+                            <view class="margin-top-main">
+                                <component-upload :propData="data.image_list" :prop-max-num="1" :prop-path-type="editor_path_type" @call-back="retrun_image_event"></component-upload>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh">
+                        <view class="form-gorup">
+                            <view class="form-gorup-title padding-right-main">内容<text class="form-group-tips-must">*</text></view>
+                            <view class="margin-top-main sp-editor">
+                                <sp-editor :templates="data.templates" @input="rich_text_event" @upinImage="up_in_image_event"></sp-editor>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="more oh" :style="'height:' + more_height">
+                        <view class="bg-white border-radius-main pr oh spacing-mb spacing-mt">
+                            <view class="form-gorup">
+                                <view class="form-gorup-title padding-right-main">描述</view>
+                                <textarea name="desc" placeholder-class="cr-grey-9" class="cr-base" placeholder="请输入" maxlength="200" :value="data.desc"></textarea>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh spacing-mb">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">SEO标题</view>
+                                    <input type="text" name="seo_title" :value="data.seo_title || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" placeholder="请输入" />
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh spacing-mb">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">SEO关键字</view>
+                                    <input type="text" name="seo_key" :value="data.seo_key || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" placeholder="请输入" />
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bg-white border-radius-main pr oh">
+                            <view class="form-gorup">
+                                <view class="flex-row jc-sb align-c">
+                                    <view class="form-gorup-title padding-right-main">SEO描述</view>
+                                    <input type="text" name="seo_desc" :value="data.seo_desc || ''" maxlength="16" placeholder-class="cr-grey-9" class="cr-base flex-1 flex-width tr" placeholder="请输入" />
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="bg-white border-radius-main pr oh spacing-mb spacing-mt">
+                        <view class="padding-main flex-row jc-c align-c cr-grey-9" @tap="more_event">
+                            <text>{{ is_more ? '收起更多' : '展开更多' }}</text>
+                            <view class="margin-left-sm dis-inline-block">
+                                <iconfont :name="is_more ? 'icon-fenlei-top' : 'icon-mendian-jiantou2'" color="#999" size="24rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <!-- 底部操作 -->
+                <view class="bottom-fixed btn-bottom bg-white">
+                    <view class="oh bottom-line-exclude">
+                        <button class="cr-white bg-main round text-size wh-auto" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">提交</button>
+                    </view>
+                </view>
+                <component-popup :propShow="popup_status" propPosition="bottom" @onclose="popup_close_event">
+                    <view class="p-title flex-row jc-sb align-c padding-main br-b-e">
+                        <view class="text-size-lg fw-b">帖子分类</view>
+                        <view class="popup-colse" @tap="popup_close_event">
+                            <iconfont name="icon-huiyuan-guanbi" color="#333" size="28rpx"></iconfont>
+                        </view>
+                    </view>
+                    <view class="p-content padding-main">
+                        <view v-for="(item, index) in type_list" :key="index">
+                            <view class="padding-vertical-main flex-row jc-sb align-c" :class="type_index === index + 1 ? 'cr-main' : ''" :data-value="item" :data-index="index + 1" @tap="get_type_event">
+                                {{ item }}
+                                <iconfont v-if="type_index === index + 1" name="icon-blog-checked" color="#333" size="28rpx"></iconfont>
+                            </view>
+                        </view>
+                    </view>
+                </component-popup>
+            </form>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
     </view>
 </template>
 <script>
     const app = getApp();
-    import textImageVideoEditor from '@/components/yyc-easy-editor/index.vue';
+    import componentPopup from '@/components/popup/popup';
+    import componentUpload from '@/components/upload/upload';
+    import componentNoData from '@/components/no-data/no-data';
     export default {
         data() {
             return {
-                initEditorList: [
-                    {
-                        type: 1,
-                        content: '',
-                    },
-                ],
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                blog_id: '',
+                data_list_loding_status: 1,
+                data: {},
+                index: 0,
+
+                // 分类选择弹窗
+                popup_status: false,
+                type_list: ['国内资讯', '热点博文', '生活八卦', '同城交流'],
+
+                // 分类选中的值
+                type_index: 0,
+
+                // 封面图片
+                image_list: [],
+                // 路径类型
+                editor_path_type: 'common',
+
+                // 内容
+                input_length_max: 500,
+                input_value: '',
+                // 查看更多
+                more_height: '0',
+                is_more: false,
+
+                // 提交按钮
+                form_submit_loading: false,
             };
         },
         components: {
-            textImageVideoEditor,
+            componentPopup,
+            componentUpload,
+            componentNoData,
         },
-        onLoad(options) {},
+
+        onLoad(params) {
+            if (params !== null && params.goods_id) {
+                this.setData({
+                    blog_id: params.id,
+                });
+            }
+        },
+
+        onShow() {
+            // 数据加载
+            this.init();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {},
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
         methods: {
-            preview(data) {
-                console.log('预览preview！', data);
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    // 用户未绑定手机则转到登录页面
+                    if (app.globalData.user_is_need_login(user)) {
+                        uni.redirectTo({
+                            url: '/pages/login/login?event_callback=init',
+                        });
+                        return false;
+                    }
+                    this.get_data_list();
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: '用户未登录',
+                    });
+                }
             },
-            completed(data) {
-                console.log('完成completed！', data);
-                // data: {
-                // 	  content: "富文本内容",
-                // 	  image: "提取一张图片",
-                // 	  json: "",
-                // }
+            get_data_list() {
+                if (this.blog_id) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: '加载中...',
+                    });
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'goodscomments', 'intellectstools'),
+                        method: 'POST',
+                        data: { id: this.blog_id },
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    data: res.data.data.data || {},
+                                    data_list_loding_status: 3,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                                if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                data_list_loding_status: 2,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                } else {
+                    this.setData({
+                        data_list_loding_status: 3,
+                    });
+                }
             },
-            addImage() {
-                console.log('上传图片');
-                let _this = this;
-                //这里是你上传的代码
-                //......
-                //得到imgurl
-                _this.$refs.textImageVideoEditor.addImageCompleted(imgurl);
+            // 弹层打开
+            popupOpen() {
+                this.setData({
+                    popup_status: true,
+                });
             },
-            addVideo() {
-                console.log('上传视频');
-                let _this = this;
-                //这里是你上传的代码
-                //......
-                //得到videourl
-                _this.$refs.textImageVideoEditor.addVideoCompleted(videourl);
+
+            // 弹层关闭
+            popup_close_event(e) {
+                this.setData({
+                    popup_status: false,
+                });
+            },
+
+            // 是否启用
+            is_open_event(e) {
+                var new_data = this.data;
+                new_data.is_open = e.detail.value ? 1 : 0;
+                this.setData({
+                    data: new_data,
+                });
+            },
+
+            // 获取选中的分类
+            get_type_event(e) {
+                var new_data = this.data;
+                new_data.type = e.currentTarget.dataset.value;
+                this.setData({
+                    data: new_data,
+                    type_index: e.currentTarget.dataset.index,
+                    popup_status: false,
+                });
+            },
+
+            // 上传回调
+            retrun_image_event(data) {
+                var newData = this.data;
+                newData.image_list = data;
+                this.setData({
+                    data: newData,
+                });
+            },
+
+            // 回调富文本内容
+            rich_text_event(e) {
+                console.log('==== input :', e);
+                var newData = this.data;
+                newData.templates = e.html;
+                this.setData({
+                    data: newData,
+                });
+            },
+
+            // 上传图片
+            up_in_image_event(tempFiles, editorCtx) {
+                // 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+                tempFiles.forEach(async (item) => {
+                    uni.showLoading({
+                        title: '上传中请稍后',
+                        mask: true,
+                    });
+                    await uni.uploadFile({
+                        url: app.globalData.get_request_url('index', 'ueditor'),
+                        // #ifdef APP-PLUS || H5
+                        filePath: item.path,
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        filePath: item.tempFilePath,
+                        // #endif
+                        name: 'upfile',
+                        formData: {
+                            action: 'uploadimage',
+                            path_type: 'common', // 路径类型，默认common
+                        },
+                        success: function (res) {
+                            console.log(res);
+                            let data = JSON.parse(res.data);
+                            if (res.statusCode == 200) {
+                                // 上传完成后处理
+                                editorCtx.insertImage({
+                                    src: data.data.url, // 此处需要将图片地址切换成服务器返回的真实图片地址
+                                    // width: '50%',
+                                    alt: '图片',
+                                    success: function (e) {},
+                                });
+                                uni.hideLoading();
+                            }
+                        },
+                        fail: function (e) {
+                            console.log(e);
+                            app.globalData.showToast(e.errMsg);
+                            uni.hideLoading();
+                        },
+                    });
+                });
+            },
+
+            // 更多内容
+            more_event() {
+                this.setData({
+                    more_height: !this.is_more ? '708rpx' : '0',
+                    is_more: !this.is_more,
+                });
+            },
+
+            // 表单提交
+            form_submit(e) {
+                console.log(e);
+                console.log(this.data);
+                // 数据验证
+                var validation = [
+                    { fields: 'title', msg: '请输入标题' },
+                    { fields: 'type', msg: '请选择分类' },
+                    { fields: 'templates', msg: '请输入内容' },
+                ];
+                var validate = {
+                    type: this.data.type,
+                    templates: this.data.templates,
+                    title: e.detail.value.title,
+                };
+                if (app.globalData.fields_check(validate, validation)) {
+                    uni.showLoading({
+                        title: '提交中...',
+                    });
+                    this.setData({
+                        form_submit_loading: true,
+                    });
+                    var newData = {
+                        ...e.detail.value,
+                        ...validate,
+                    };
+                    // 网络请求
+                    uni.request({
+                        url: app.globalData.get_request_url('save', 'goodscomments', 'intellectstools'),
+                        method: 'POST',
+                        data: newData,
+                        dataType: 'json',
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                setTimeout(function () {
+                                    app.globalData.page_back_prev_event();
+                                }, 2000);
+                            } else {
+                                this.setData({
+                                    form_submit_loading: false,
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast('提交失败，请重试！');
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                form_submit_loading: false,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                }
             },
         },
     };
diff --git a/pages/plugins/blog/user-list/user-list.css b/pages/plugins/blog/user-list/user-list.css
new file mode 100644
index 00000000..df5cfac6
--- /dev/null
+++ b/pages/plugins/blog/user-list/user-list.css
@@ -0,0 +1,20 @@
+.blog-img {
+    width: 236rpx;
+    height: 182rpx;
+}
+
+.badge {
+    display: inline-block;
+    height: 32rpx;
+    line-height: 32rpx;
+    background: rgb(82 196 26 / 10%);
+    border-radius: 18rpx;
+    font-size: 10px;
+    color: #52C41A;
+    padding: 0 16rpx;
+}
+.add-icon {
+    height: 80rpx;
+    line-height: 76rpx;
+    margin-right: 6rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/blog/user-list/user-list.vue b/pages/plugins/blog/user-list/user-list.vue
new file mode 100644
index 00000000..0b8f5910
--- /dev/null
+++ b/pages/plugins/blog/user-list/user-list.vue
@@ -0,0 +1,206 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="data.length > 0">
+            <view class="page-bottom-fixed padding-top-main">
+                <view v-for="(item, index) in data" class="bg-white spacing-mb" :key="index">
+                    <view class="padding-main flex-row">
+                        <view>
+                            <image class="blog-img radius" :src="item.images" mode="aspectFit"></image>
+                        </view>
+                        <view class="flex-1 flex-width padding-left-main">
+                            <view class="multi-text text-size fw-b margin-bottom-xs">{{ item.title }}</view>
+                            <view class="text-size-sm cr-grey-9 margin-bottom-sm">{{ item.date }}</view>
+                            <view class="badge">{{ item.reviewed === 1 ? '已审核' : '未审核' }}</view>
+                        </view>
+                    </view>
+                    <view class="br-t-f5 padding-vertical-main flex-row jc-sa align-c text-size tc">
+                        <view class="cr-base flex-1 divider-r-f5" :data-value="'/pages/plugins/blog/form/form?id=' + item.id" @tap="url_event">
+                            <view class="pr top-xs margin-right-xs dis-inline-block">
+                                <iconfont name="icon-wenda-wytw" size="32rpx"></iconfont>
+                            </view>
+                            编辑
+                        </view>
+                        <view class="cr-main flex-1" :data-id="item.id" @tap="del_event">
+                            <view class="pr top-xs margin-right-xs dis-inline-block">
+                                <iconfont name="icon-blog-del" size="32rpx"></iconfont>
+                            </view>
+                            删除
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 底部操作 -->
+            <view class="bottom-fixed btn-bottom bg-white">
+                <view class="oh bottom-line-exclude">
+                    <button class="cr-main bg-white br-main round text-size wh-auto flex-row align-c jc-c" type="default" hover-class="none" data-value="/pages/plugins/blog/form/form" @tap="url_event">
+                        <view class="add-icon">
+                            <iconfont name="icon-xzdz-tianjiabiaoq" size="32rpx"></iconfont>
+                        </view>
+                        新增
+                    </button>
+                </view>
+            </view>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from '@/components/no-data/no-data';
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                theme_color: app.globalData.get_theme_color(),
+                data_list_loding_status: 1,
+                data: [
+                    {
+                        id: '1',
+                        images: 'http://shopxo.com/static/upload/images/plugins_homemiddleadv/2023/08/18/1692328288709779.png',
+                        title: '歌手2024惊艳登场，陈出生、两进入领衔，人气爆棚啦！！！！！',
+                        date: '2023-09-04 10:12:50',
+                        reviewed: 1,
+                    },
+                ],
+            };
+        },
+        components: {
+            componentNoData,
+        },
+
+        onLoad(params) {},
+
+        onShow() {
+            // 数据加载
+            this.init();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {},
+
+        // 页面销毁时执行
+        onUnload: function () {},
+
+        methods: {
+            init() {
+                var user = app.globalData.get_user_info(this, 'init');
+                if (user != false) {
+                    // 用户未绑定手机则转到登录页面
+                    if (app.globalData.user_is_need_login(user)) {
+                        uni.redirectTo({
+                            url: '/pages/login/login?event_callback=init',
+                        });
+                        return false;
+                    }
+                    this.get_data_list();
+                } else {
+                    // 提示错误
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: '用户未登录',
+                    });
+                }
+            },
+            get_data_list() {
+                // 加载loding
+                uni.showLoading({
+                    title: '加载中...',
+                });
+                this.setData({
+                    data_list_loding_status: 1,
+                });
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'goodscomments', 'intellectstools'),
+                    method: 'POST',
+                    success: (res) => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            this.setData({
+                                // data: res.data.data.data || [],
+                                data_list_loding_status: 3,
+                            });
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0,
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        this.setData({
+                            data_list_loding_status: 2,
+                        });
+                        app.globalData.showToast('网络开小差了哦~');
+                    },
+                });
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
+            // 删除blog
+            del_event(e) {
+                // 是否再次确认
+                if (e.alert_status != 0 && e.alert_status != 1) {
+                    app.globalData.alert({
+                        msg: '确定要删除这条帖子吗？',
+                        is_show_cancel: 1,
+                        object: this,
+                        params: { id: e.currentTarget.dataset.id },
+                        method: 'del_event',
+                    });
+                    return false;
+                }
+                if (e.alert_status == 1) {
+                    // 加载loding
+                    uni.showLoading({
+                        title: '加载中...',
+                    });
+                    this.setData({
+                        data_list_loding_status: 1,
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'goodscomments', 'intellectstools'),
+                        method: 'POST',
+                        data: { id: e.id },
+                        success: (res) => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                this.setData({
+                                    // data: res.data.data.data || [],
+                                    data_list_loding_status: 3,
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                });
+                                if (app.globalData.is_login_check(res.data, this, 'del_event')) {
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            uni.hideLoading();
+                            this.setData({
+                                data_list_loding_status: 2,
+                            });
+                            app.globalData.showToast('网络开小差了哦~');
+                        },
+                    });
+                }
+            },
+        },
+    };
+</script>
+<style>
+    @import './user-list.css';
+</style>
diff --git a/uni_modules/sp-editor/changelog.md b/uni_modules/sp-editor/changelog.md
new file mode 100644
index 00000000..01cb2bdb
--- /dev/null
+++ b/uni_modules/sp-editor/changelog.md
@@ -0,0 +1,15 @@
+## 1.0.3（2023-10-13）
+	1. 更新readme文档
+	2. 更新调整组件示例项目，添加插件代码中部分注释
+## 1.0.2（2023-10-13）
+	1. 更新uni_modules规范，可一键导入组件
+	2. 更新组件示例项目（包括使用uniCloud.uploadFile多选上传图片示例方法）
+## 1.0.1（2023-10-12）
+	1. 修复小程序中自动聚焦滚动到富文本组件区域的bug
+	2. 略微调整了富文本上方toolbar工具栏中按钮的大小尺寸
+## 1.0.0（2023-9-19）
+	1. 新增字体与背景颜色板
+	2. 可自定义预设内容模板
+	3. 解决官方样例在小程序和app部分报错不兼容的问题
+	4. 可配合云存储上传富文本中插入的图片 本质上是基于官方内置富文本editor组件改版封装，所以官方有的功能都有，官方能兼容的也都兼容
+
diff --git a/uni_modules/sp-editor/components/sp-editor/color-picker.vue b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
new file mode 100644
index 00000000..ac6c30c2
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
@@ -0,0 +1,784 @@
+<template>
+	<view v-if="show" class="t-wrapper" @touchmove.stop.prevent="moveHandle">
+		<view class="t-mask" :class="{active:active}" @click.stop="close"></view>
+		<view class="t-box" :class="{active:active}">
+			<view class="t-header">
+				<view class="t-header-button" @click="close">取消</view>
+				<view class="t-header-button" @click="confirm">确认</view>
+			</view>
+			<view class="t-color__box" :style="{ background: 'rgb(' + bgcolor.r + ',' + bgcolor.g + ',' + bgcolor.b + ')'}">
+				<view class="t-background boxs" @touchstart="touchstart($event, 0)" @touchmove="touchmove($event, 0)" @touchend="touchend($event, 0)">
+					<view class="t-color-mask"></view>
+					<view class="t-pointer" :style="{ top: site[0].top - 8 + 'px', left: site[0].left - 8 + 'px' }"></view>
+				</view>
+			</view>
+			<view class="t-control__box">
+				<view class="t-control__color">
+					<view class="t-control__color-content" :style="{ background: 'rgba(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ',' + rgba.a + ')' }"></view>
+				</view>
+				<view class="t-control-box__item">
+					<view class="t-controller boxs" @touchstart="touchstart($event, 1)" @touchmove="touchmove($event, 1)" @touchend="touchend($event, 1)">
+						<view class="t-hue">
+							<view class="t-circle" :style="{ left: site[1].left - 12 + 'px' }"></view>
+						</view>
+					</view>
+					<view class="t-controller boxs" @touchstart="touchstart($event, 2)" @touchmove="touchmove($event, 2)" @touchend="touchend($event, 2)">
+						<view class="t-transparency">
+							<view class="t-circle" :style="{ left: site[2].left - 12 + 'px' }"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="t-result__box">
+				<view v-if="mode" class="t-result__item">
+					<view class="t-result__box-input">{{hex}}</view>
+					<view class="t-result__box-text">HEX</view>
+				</view>
+				<template v-else>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.r}}</view>
+						<view class="t-result__box-text">R</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.g}}</view>
+						<view class="t-result__box-text">G</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.b}}</view>
+						<view class="t-result__box-text">B</view>
+					</view>
+					<view class="t-result__item">
+						<view class="t-result__box-input">{{rgba.a}}</view>
+						<view class="t-result__box-text">A</view>
+					</view>
+				</template>
+
+				<view class="t-result__item t-select" @click="select">
+					<view class="t-result__box-input">
+						<view>切换</view>
+						<view>模式</view>
+					</view>
+				</view>
+			</view>
+			<view class="t-alternative">
+				<view class="t-alternative__item" v-for="(item,index) in colorList" :key="index">
+					<view class="t-alternative__item-content" :style="{ background: 'rgba(' + item.r + ',' + item.g + ',' + item.b + ',' + item.a + ')' }"
+					 @click="selectColor(item)">
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			color: {
+				type: Object,
+				default () {
+					return {
+						r: 0,
+						g: 0,
+						b: 0,
+						a: 0
+					}
+				}
+			},
+			spareColor: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				active: false,
+				// rgba 颜色
+				rgba: {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 1
+				},
+				// hsb 颜色
+				hsb: {
+					h: 0,
+					s: 0,
+					b: 0
+				},
+				site: [{
+					top: 0,
+					left: 0
+				}, {
+					left: 0
+				}, {
+					left: 0
+				}],
+				index: 0,
+				bgcolor: {
+					r: 255,
+					g: 0,
+					b: 0,
+					a: 1
+				},
+				hex: '#000000',
+				mode: true,
+				colorList: [{
+					r: 244,
+					g: 67,
+					b: 54,
+					a: 1
+				}, {
+					r: 233,
+					g: 30,
+					b: 99,
+					a: 1
+				}, {
+					r: 156,
+					g: 39,
+					b: 176,
+					a: 1
+				}, {
+					r: 103,
+					g: 58,
+					b: 183,
+					a: 1
+				}, {
+					r: 63,
+					g: 81,
+					b: 181,
+					a: 1
+				}, {
+					r: 33,
+					g: 150,
+					b: 243,
+					a: 1
+				}, {
+					r: 3,
+					g: 169,
+					b: 244,
+					a: 1
+				}, {
+					r: 0,
+					g: 188,
+					b: 212,
+					a: 1
+				}, {
+					r: 0,
+					g: 150,
+					b: 136,
+					a: 1
+				}, {
+					r: 76,
+					g: 175,
+					b: 80,
+					a: 1
+				}, {
+					r: 139,
+					g: 195,
+					b: 74,
+					a: 1
+				}, {
+					r: 205,
+					g: 220,
+					b: 57,
+					a: 1
+				}, {
+					r: 255,
+					g: 235,
+					b: 59,
+					a: 1
+				}, {
+					r: 255,
+					g: 193,
+					b: 7,
+					a: 1
+				}, {
+					r: 255,
+					g: 152,
+					b: 0,
+					a: 1
+				}, {
+					r: 255,
+					g: 87,
+					b: 34,
+					a: 1
+				}, {
+					r: 121,
+					g: 85,
+					b: 72,
+					a: 1
+				}, {
+					r: 158,
+					g: 158,
+					b: 158,
+					a: 1
+				}, {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 0.5
+				}, {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 0
+				}, ]
+			};
+		},
+		created() {
+			this.rgba = this.color;
+			if (this.spareColor.length !== 0) {
+				this.colorList = this.spareColor;
+			}
+		},
+		methods: {
+			/**
+			 * 初始化
+			 */
+			init() {
+				// hsb 颜色
+				this.hsb = this.rgbToHex(this.rgba);
+				// this.setColor();
+				this.setValue(this.rgba);
+			},
+			moveHandle() {},
+			open() {
+				this.show = true;
+				this.$nextTick(() => {
+					this.init();
+					setTimeout(() => {
+						this.active = true;
+						setTimeout(() => {
+							this.getSelectorQuery();
+						}, 350)
+					}, 50)
+				})
+
+			},
+			close() {
+				this.active = false;
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false;
+					}, 500)
+				})
+			},
+			confirm() {
+				this.close();
+				this.$emit('confirm', {
+					rgba: this.rgba,
+					hex: this.hex
+				})
+			},
+			// 选择模式
+			select() {
+				this.mode = !this.mode
+			},
+			// 常用颜色选择
+			selectColor(item) {
+				this.setColorBySelect(item)
+			},
+			touchstart(e, index) {
+				const {
+					pageX,
+					pageY
+				} = e.touches[0];
+				this.pageX = pageX;
+				this.pageY = pageY;
+				this.setPosition(pageX, pageY, index);
+			},
+			touchmove(e, index) {
+				const {
+					pageX,
+					pageY
+				} = e.touches[0];
+				this.moveX = pageX;
+				this.moveY = pageY;
+				this.setPosition(pageX, pageY, index);
+			},
+			touchend(e, index) {},
+			/**
+			 * 设置位置
+			 */
+			setPosition(x, y, index) {
+				this.index = index;
+				const {
+					top,
+					left,
+					width,
+					height
+				} = this.position[index];
+				// 设置最大最小值
+
+				this.site[index].left = Math.max(0, Math.min(parseInt(x - left), width));
+				if (index === 0) {
+					this.site[index].top = Math.max(0, Math.min(parseInt(y - top), height));
+					// 设置颜色
+					this.hsb.s = parseInt((100 * this.site[index].left) / width);
+					this.hsb.b = parseInt(100 - (100 * this.site[index].top) / height);
+					this.setColor();
+					this.setValue(this.rgba);
+				} else {
+					this.setControl(index, this.site[index].left);
+				}
+			},
+			/**
+			 * 设置 rgb 颜色
+			 */
+			setColor() {
+				const rgb = this.HSBToRGB(this.hsb);
+				this.rgba.r = rgb.r;
+				this.rgba.g = rgb.g;
+				this.rgba.b = rgb.b;
+			},
+			/**
+			 * 设置二进制颜色
+			 * @param {Object} rgb
+			 */
+			setValue(rgb) {
+				this.hex = '#' + this.rgbToHex(rgb);
+			},
+			setControl(index, x) {
+				const {
+					top,
+					left,
+					width,
+					height
+				} = this.position[index];
+
+				if (index === 1) {
+					this.hsb.h = parseInt((360 * x) / width);
+					this.bgcolor = this.HSBToRGB({
+						h: this.hsb.h,
+						s: 100,
+						b: 100
+					});
+					this.setColor()
+				} else {
+					this.rgba.a = (x / width).toFixed(1);
+				}
+				this.setValue(this.rgba);
+			},
+			/**
+			 * rgb 转 二进制 hex
+			 * @param {Object} rgb
+			 */
+			rgbToHex(rgb) {
+				let hex = [rgb.r.toString(16), rgb.g.toString(16), rgb.b.toString(16)];
+				hex.map(function(str, i) {
+					if (str.length == 1) {
+						hex[i] = '0' + str;
+					}
+				});
+				return hex.join('');
+			},
+			setColorBySelect(getrgb) {
+				const {
+					r,
+					g,
+					b,
+					a
+				} = getrgb;
+				let rgb = {}
+				rgb = {
+					r: r ? parseInt(r) : 0,
+					g: g ? parseInt(g) : 0,
+					b: b ? parseInt(b) : 0,
+					a: a ? a : 0,
+				};
+				this.rgba = rgb;
+				this.hsb = this.rgbToHsb(rgb);
+				this.changeViewByHsb();
+			},
+			changeViewByHsb() {
+				const [a, b, c] = this.position;
+				this.site[0].left = parseInt(this.hsb.s * a.width / 100);
+				this.site[0].top = parseInt((100 - this.hsb.b) * a.height / 100);
+				this.setColor(this.hsb.h);
+				this.setValue(this.rgba);
+				this.bgcolor = this.HSBToRGB({
+					h: this.hsb.h,
+					s: 100,
+					b: 100
+				});
+
+				this.site[1].left = this.hsb.h / 360 * b.width;
+				this.site[2].left = this.rgba.a * c.width;
+
+			},
+			/**
+			 * hsb 转 rgb
+			 * @param {Object} 颜色模式  H(hues)表示色相，S(saturation)表示饱和度，B（brightness）表示亮度
+			 */
+			HSBToRGB(hsb) {
+				let rgb = {};
+				let h = Math.round(hsb.h);
+				let s = Math.round((hsb.s * 255) / 100);
+				let v = Math.round((hsb.b * 255) / 100);
+				if (s == 0) {
+					rgb.r = rgb.g = rgb.b = v;
+				} else {
+					let t1 = v;
+					let t2 = ((255 - s) * v) / 255;
+					let t3 = ((t1 - t2) * (h % 60)) / 60;
+					if (h == 360) h = 0;
+					if (h < 60) {
+						rgb.r = t1;
+						rgb.b = t2;
+						rgb.g = t2 + t3;
+					} else if (h < 120) {
+						rgb.g = t1;
+						rgb.b = t2;
+						rgb.r = t1 - t3;
+					} else if (h < 180) {
+						rgb.g = t1;
+						rgb.r = t2;
+						rgb.b = t2 + t3;
+					} else if (h < 240) {
+						rgb.b = t1;
+						rgb.r = t2;
+						rgb.g = t1 - t3;
+					} else if (h < 300) {
+						rgb.b = t1;
+						rgb.g = t2;
+						rgb.r = t2 + t3;
+					} else if (h < 360) {
+						rgb.r = t1;
+						rgb.g = t2;
+						rgb.b = t1 - t3;
+					} else {
+						rgb.r = 0;
+						rgb.g = 0;
+						rgb.b = 0;
+					}
+				}
+				return {
+					r: Math.round(rgb.r),
+					g: Math.round(rgb.g),
+					b: Math.round(rgb.b)
+				};
+			},
+			rgbToHsb(rgb) {
+				let hsb = {
+					h: 0,
+					s: 0,
+					b: 0
+				};
+				let min = Math.min(rgb.r, rgb.g, rgb.b);
+				let max = Math.max(rgb.r, rgb.g, rgb.b);
+				let delta = max - min;
+				hsb.b = max;
+				hsb.s = max != 0 ? 255 * delta / max : 0;
+				if (hsb.s != 0) {
+					if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta;
+					else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta;
+					else hsb.h = 4 + (rgb.r - rgb.g) / delta;
+				} else hsb.h = -1;
+				hsb.h *= 60;
+				if (hsb.h < 0) hsb.h = 0;
+				hsb.s *= 100 / 255;
+				hsb.b *= 100 / 255;
+				return hsb;
+			},
+			getSelectorQuery() {
+				const views = uni.createSelectorQuery().in(this);
+				views
+					.selectAll('.boxs')
+					.boundingClientRect(data => {
+						if (!data || data.length === 0) {
+							setTimeout(() => this.getSelectorQuery(), 20)
+							return
+						}
+						this.position = data;
+						// this.site[0].top = data[0].height;
+						// this.site[0].left = 0;
+						// this.site[1].left = data[1].width;
+						// this.site[2].left = data[2].width;
+						this.setColorBySelect(this.rgba);
+					})
+					.exec();
+			}
+		},
+		watch: {
+			spareColor(newVal) {
+				this.colorList = newVal;
+			}
+		}
+	};
+</script>
+
+<style>
+	.t-wrapper {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		box-sizing: border-box;
+		z-index: 9999;
+	}
+
+	.t-box {
+		width: 100%;
+		position: absolute;
+		bottom: 0;
+		padding: 30upx 0;
+		padding-top: 0;
+		background: #fff;
+		transition: all 0.3s;
+		transform: translateY(100%);
+	}
+
+	.t-box.active {
+		transform: translateY(0%);
+	}
+
+	.t-header {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 100upx;
+		border-bottom: 1px #eee solid;
+		box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
+		background: #fff;
+	}
+
+	.t-header-button {
+		display: flex;
+		align-items: center;
+		width: 150upx;
+		height: 100upx;
+		font-size: 30upx;
+		color: #666;
+		padding-left: 20upx;
+	}
+
+	.t-header-button:last-child {
+		justify-content: flex-end;
+		padding-right: 20upx;
+	}
+
+	.t-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+		z-index: -1;
+		transition: all 0.3s;
+		opacity: 0;
+	}
+
+	.t-mask.active {
+		opacity: 1;
+	}
+
+	.t-color__box {
+		position: relative;
+		height: 400upx;
+		background: rgb(255, 0, 0);
+		overflow: hidden;
+		box-sizing: border-box;
+		margin: 0 20upx;
+		margin-top: 20upx;
+		box-sizing: border-box;
+	}
+
+	.t-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+	}
+
+	.t-color-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		width: 100%;
+		height: 400upx;
+		background: linear-gradient(to top, #000, rgba(0, 0, 0, 0));
+	}
+
+	.t-pointer {
+		position: absolute;
+		bottom: -8px;
+		left: -8px;
+		z-index: 2;
+		width: 15px;
+		height: 15px;
+		border: 1px #fff solid;
+		border-radius: 50%;
+	}
+
+	.t-show-color {
+		width: 100upx;
+		height: 50upx;
+	}
+
+	.t-control__box {
+		margin-top: 50upx;
+		width: 100%;
+		display: flex;
+		padding-left: 20upx;
+		box-sizing: border-box;
+	}
+
+	.t-control__color {
+		flex-shrink: 0;
+		width: 100upx;
+		height: 100upx;
+		border-radius: 50%;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 36upx 36upx;
+		background-position: 0 0, 18upx 18upx;
+		border: 1px #eee solid;
+		overflow: hidden;
+	}
+
+	.t-control__color-content {
+		width: 100%;
+		height: 100%;
+	}
+
+	.t-control-box__item {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 30upx;
+	}
+
+	.t-controller {
+		position: relative;
+		width: 100%;
+		height: 16px;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 32upx 32upx;
+		background-position: 0 0, 16upx 16upx;
+	}
+
+	.t-hue {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%);
+	}
+
+	.t-transparency {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to right, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0));
+	}
+
+	.t-circle {
+		position: absolute;
+		/* right: -10px; */
+		top: -2px;
+		width: 20px;
+		height: 20px;
+		box-sizing: border-box;
+		border-radius: 50%;
+		background: #fff;
+		box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
+	}
+
+	.t-result__box {
+		margin-top: 20upx;
+		padding: 10upx;
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+	}
+
+	.t-result__item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 10upx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.t-result__box-input {
+		padding: 10upx 0;
+		width: 100%;
+		font-size: 28upx;
+		box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+		color: #999;
+		text-align: center;
+		background: #fff;
+	}
+
+	.t-result__box-text {
+		margin-top: 10upx;
+		font-size: 28upx;
+		line-height: 2;
+	}
+
+	.t-select {
+		flex-shrink: 0;
+		width: 150upx;
+		padding: 0 30upx;
+	}
+
+	.t-select .t-result__box-input {
+		border-radius: 10upx;
+		border: none;
+		color: #999;
+		box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.1);
+		background: #fff;
+	}
+
+	.t-select .t-result__box-input:active {
+		box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.1);
+	}
+
+	.t-alternative {
+		display: flex;
+		flex-wrap: wrap;
+		/* justify-content: space-between; */
+		width: 100%;
+		padding-right: 10upx;
+		box-sizing: border-box;
+	}
+
+	.t-alternative__item {
+		margin-left: 12upx;
+		margin-top: 10upx;
+		width: 50upx;
+		height: 50upx;
+		border-radius: 10upx;
+		background-color: #fff;
+		background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+			linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+		background-size: 36upx 36upx;
+		background-position: 0 0, 18upx 18upx;
+		border: 1px #eee solid;
+		overflow: hidden;
+	}
+
+	.t-alternative__item-content {
+		width: 50upx;
+		height: 50upx;
+		background: rgba(255, 0, 0, 0.5);
+	}
+
+	.t-alternative__item:active {
+		transition: all 0.3s;
+		transform: scale(1.1);
+	}
+</style>
diff --git a/uni_modules/sp-editor/components/sp-editor/editor-icon.css b/uni_modules/sp-editor/components/sp-editor/editor-icon.css
new file mode 100644
index 00000000..0018669f
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/editor-icon.css
@@ -0,0 +1,238 @@
+@font-face {
+    font-family: 'iconfont';
+    src: url('data:font/truetype;charset=utf-8;base64,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AAsAJgFuAAoAQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdAAKAAAKQ3JlYXRlZCBieSBpY29uZm9udAoAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkEcmVkbwlzZWxlY3RhbGwHcHJldmlldwR1bmRvBGRhdGUHY2xlYXJ1cBU3MjNiaWFuamlxaV9kdWFuaG91anUWNzIyYmlhbmppcWlfZHVhbnFpYW5qdQotY2hlY2tsaXN0DWRpcmVjdGlvbi1sdHINZGlyZWN0aW9uLXJ0bAtmb250Ymdjb2xvcg1jbGVhcmVkZm9ybWF0BGZvbnQHb3V0ZGVudAhmb250c2l6ZQp0ZXh0X2NvbG9yD2Zvcm1hdC1oZWFkZXItMg9mb3JtYXQtaGVhZGVyLTMLbGluZS1oZWlnaHQPZm9ybWF0LWhlYWRlci0xD2Zvcm1hdC1oZWFkZXItNA9mb3JtYXQtaGVhZGVyLTUPZm9ybWF0LWhlYWRlci02EUNoYXJhY3Rlci1TcGFjaW5nBmluZGVudAZiYW9jdW4IcXVhbnBpbmcFZnV6aGkHc2hhbmNodQxiaWFuamlzZWt1YWkJZmVuZ2V4aWFuB2RpYW56YW4MY2hhcnVsaWFuamllC2NoYXJ1dHVwaWFuCnd1eHVwYWlsaWUManV6aG9uZ2R1aXFpB3lpbnlvbmcLeW91eHVwYWlsaWUIeW91ZHVpcWkJeml0aWRhaW1hCHhpYW9saWFuCXppdGlqaWFjdQ96aXRpc2hhbmNodXhpYW4Neml0aXNoYW5nYmlhbwp6aXRpYmlhb3RpDnppdGl4aWFodWF4aWFuCXppdGl4aWV0aQl6aXRpeWFuc2UIenVvZHVpcWkJeml0aXl1bGFuC3ppdGl4aWFiaWFvC3p1b3lvdWR1aXFpB2R1aWdvdXgGZ3VhbmJpDnNoZW5neWluX3NoaXRpAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwA6AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANhk6GIAAAAA2GToYg==') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-redo:before {
+  content: "\e627";
+}
+
+.icon-undo:before {
+  content: "\e633";
+}
+
+.icon-indent:before {
+  content: "\eb28";
+}
+
+.icon-outdent:before {
+  content: "\e6e8";
+}
+
+.icon-fontsize:before {
+  content: "\e6fd";
+}
+
+.icon-format-header-1:before {
+  content: "\e860";
+}
+
+.icon-format-header-4:before {
+  content: "\e863";
+}
+
+.icon-format-header-5:before {
+  content: "\e864";
+}
+
+.icon-format-header-6:before {
+  content: "\e865";
+}
+
+.icon-clearup:before {
+  content: "\e64d";
+}
+
+.icon-preview:before {
+  content: "\e631";
+}
+
+.icon-date:before {
+  content: "\e63e";
+}
+
+.icon-fontbgcolor:before {
+  content: "\e678";
+}
+
+.icon-clearedformat:before {
+  content: "\e67e";
+}
+
+.icon-font:before {
+  content: "\e684";
+}
+
+.icon-723bianjiqi_duanhouju:before {
+  content: "\e65f";
+}
+
+.icon-722bianjiqi_duanqianju:before {
+  content: "\e660";
+}
+
+.icon-text_color:before {
+  content: "\e72c";
+}
+
+.icon-format-header-2:before {
+  content: "\e75c";
+}
+
+.icon-format-header-3:before {
+  content: "\e75d";
+}
+
+.icon--checklist:before {
+  content: "\e664";
+}
+
+.icon-baocun:before {
+  content: "\ec09";
+}
+
+.icon-line-height:before {
+  content: "\e7f8";
+}
+
+.icon-quanping:before {
+  content: "\ec13";
+}
+
+.icon-direction-rtl:before {
+  content: "\e66e";
+}
+
+.icon-direction-ltr:before {
+  content: "\e66d";
+}
+
+.icon-selectall:before {
+  content: "\e62b";
+}
+
+.icon-fuzhi:before {
+  content: "\ec7a";
+}
+
+.icon-shanchu:before {
+  content: "\ec7b";
+}
+
+.icon-bianjisekuai:before {
+  content: "\ec7c";
+}
+
+.icon-fengexian:before {
+  content: "\ec7f";
+}
+
+.icon-dianzan:before {
+  content: "\ec80";
+}
+
+.icon-charulianjie:before {
+  content: "\ec81";
+}
+
+.icon-charutupian:before {
+  content: "\ec82";
+}
+
+.icon-wuxupailie:before {
+  content: "\ec83";
+}
+
+.icon-juzhongduiqi:before {
+  content: "\ec84";
+}
+
+.icon-yinyong:before {
+  content: "\ec85";
+}
+
+.icon-youxupailie:before {
+  content: "\ec86";
+}
+
+.icon-youduiqi:before {
+  content: "\ec87";
+}
+
+.icon-zitidaima:before {
+  content: "\ec88";
+}
+
+.icon-xiaolian:before {
+  content: "\ec89";
+}
+
+.icon-zitijiacu:before {
+  content: "\ec8a";
+}
+
+.icon-zitishanchuxian:before {
+  content: "\ec8b";
+}
+
+.icon-zitishangbiao:before {
+  content: "\ec8c";
+}
+
+.icon-zitibiaoti:before {
+  content: "\ec8d";
+}
+
+.icon-zitixiahuaxian:before {
+  content: "\ec8e";
+}
+
+.icon-zitixieti:before {
+  content: "\ec8f";
+}
+
+.icon-zitiyanse:before {
+  content: "\ec90";
+}
+
+.icon-zuoduiqi:before {
+  content: "\ec91";
+}
+
+.icon-zitiyulan:before {
+  content: "\ec92";
+}
+
+.icon-zitixiabiao:before {
+  content: "\ec93";
+}
+
+.icon-zuoyouduiqi:before {
+  content: "\ec94";
+}
+
+.icon-duigoux:before {
+  content: "\ec9e";
+}
+
+.icon-guanbi:before {
+  content: "\eca0";
+}
+
+.icon-shengyin_shiti:before {
+  content: "\eca5";
+}
+
+.icon-Character-Spacing:before {
+  content: "\e964";
+}
diff --git a/uni_modules/sp-editor/components/sp-editor/iconfont.ttf b/uni_modules/sp-editor/components/sp-editor/iconfont.ttf
new file mode 100644
index 00000000..8ade3a4c
Binary files /dev/null and b/uni_modules/sp-editor/components/sp-editor/iconfont.ttf differ
diff --git a/uni_modules/sp-editor/components/sp-editor/sp-editor.vue b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
new file mode 100644
index 00000000..538620ea
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
@@ -0,0 +1,280 @@
+<template>
+    <view class="wrapper">
+        <view class="editor-wrapper" :class="tools.length > 8 ? 'two-row' : 'one-row'">
+            <editor id="editor" class="ql-container" show-img-size show-img-toolbar show-img-resize :placeholder="placeholder" :read-only="readOnly" @statuschange="onStatusChange" @ready="onEditorReady" @input="onEditorInput"></editor>
+        </view>
+        <PickerColor ref="colorPicker" :color="{ r: 0, g: 0, b: 0, a: 1 }" @confirm="confirmColor"></PickerColor>
+        <view class="toolbar" @tap="format">
+            <!-- 字体加粗 -->
+            <view v-if="tools.indexOf('bold') !== -1" :class="formats.bold ? 'ql-active' : ''" class="iconfont icon-zitijiacu" data-name="bold"></view>
+            <!-- 斜体 -->
+            <view v-if="tools.indexOf('italic') !== -1" :class="formats.italic ? 'ql-active' : ''" class="iconfont icon-zitixieti" data-name="italic"></view>
+            <!-- 下划线 -->
+            <view v-if="tools.indexOf('underline') !== -1" :class="formats.underline ? 'ql-active' : ''" class="iconfont icon-zitixiahuaxian" data-name="underline"></view>
+            <!-- 字体删除线 -->
+            <view v-if="tools.indexOf('strike') !== -1" :class="formats.strike ? 'ql-active' : ''" class="iconfont icon-zitishanchuxian" data-name="strike"></view>
+            <!-- #ifndef MP-BAIDU -->
+            <!-- 左对齐 -->
+            <view v-if="tools.indexOf('left') !== -1" :class="formats.align === 'left' ? 'ql-active' : ''" class="iconfont icon-zuoduiqi" data-name="align" data-value="left"></view>
+            <!-- #endif -->
+            <!-- 居中对齐 -->
+            <view v-if="tools.indexOf('center') !== -1" :class="formats.align === 'center' ? 'ql-active' : ''" class="iconfont icon-juzhongduiqi" data-name="align" data-value="center"></view>
+            <!-- 右对齐 -->
+            <view v-if="tools.indexOf('right') !== -1" :class="formats.align === 'right' ? 'ql-active' : ''" class="iconfont icon-youduiqi" data-name="align" data-value="right"></view>
+            <!-- #ifndef MP-BAIDU -->
+            <view v-if="tools.indexOf('fontSize') !== -1" :class="formats.fontSize === '24px' ? 'ql-active' : ''" class="iconfont icon-fontsize" data-name="fontSize" data-value="24px"></view>
+            <!-- #endif -->
+            <view v-if="tools.indexOf('color') !== -1" :style="{ color: textColor }" class="iconfont icon-text_color" data-name="color" :data-value="textColor"></view>
+            <view v-if="tools.indexOf('fontbgcolor') !== -1" :style="{ color: backgroundColor }" class="iconfont icon-fontbgcolor" data-name="background-color" :data-value="backgroundColor"></view>
+            <view v-if="tools.indexOf('ordered') !== -1" :class="formats.list === 'ordered' ? 'ql-active' : ''" class="iconfont icon-youxupailie" data-name="list" data-value="ordered"></view>
+            <view v-if="tools.indexOf('bullet') !== -1" :class="formats.list === 'bullet' ? 'ql-active' : ''" class="iconfont icon-wuxupailie" data-name="list" data-value="bullet"></view>
+
+            <view v-if="tools.indexOf('images') !== -1" class="iconfont icon-charutupian" @tap="insertImage"></view>
+            <view v-if="tools.indexOf('undo') !== -1" class="iconfont icon-undo" @tap="undo"></view>
+            <view v-if="tools.indexOf('redo') !== -1" class="iconfont icon-redo" @tap="redo"></view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import PickerColor from './color-picker.vue';
+    export default {
+        components: {
+            PickerColor,
+        },
+        props: {
+            placeholder: {
+                type: String,
+                default: '写点什么吧 ~',
+            },
+            // 是否只读
+            readOnly: {
+                type: Boolean,
+                default: false,
+            },
+            // 最大字数限制，-1不限
+            maxlength: {
+                type: Number,
+                default: -1,
+            },
+            // 初始模板
+            templates: {
+                type: String,
+                default: '',
+            },
+            tools: {
+                type: Array,
+                default: () => {
+                    return ['bold', 'color', 'underline', 'left', 'center', 'right', 'fontSize', 'images'];
+                },
+            },
+        },
+        data() {
+            return {
+                formats: {},
+                textColor: '',
+                backgroundColor: '',
+                curColor: 'text',
+            };
+        },
+        onLoad() {
+            // #ifndef MP-BAIDU
+            uni.loadFontFace({
+                family: 'Pacifico',
+                source: 'url("https://sungd.github.io/Pacifico.ttf")',
+            });
+            // #endif
+        },
+        methods: {
+            onEditorReady() {
+                // #ifdef MP-BAIDU
+                this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
+                // #endif
+
+                // #ifdef APP-PLUS || MP-WEIXIN || H5
+                uni.createSelectorQuery()
+                    .in(this)
+                    .select('#editor')
+                    .context((res) => {
+                        this.editorCtx = res.context;
+                        // 启用preRender方法时会预先渲染templates内容，但是在小程序中会导致页面自动聚焦至富文本的区域
+                        if (this.templates) {
+                            this.preRender();
+                        }
+                    })
+                    .exec((result) => {});
+                // #endif
+            },
+            preRender() {
+                // 初始化富文本时自带的文字模板
+                this.editorCtx.setContents({
+                    html: this.templates,
+                });
+            },
+            undo() {
+                this.editorCtx.undo();
+            },
+            redo() {
+                this.editorCtx.redo();
+            },
+            format(e) {
+                let { name, value } = e.target.dataset;
+                if (!name) return;
+                console.log('==== name :', name);
+                switch (name) {
+                    case 'color':
+                    case 'background-color':
+                        this.curColor = name;
+                        this.showPicker();
+                        break;
+                    default:
+                        this.editorCtx.format(name, value);
+                        break;
+                }
+            },
+            showPicker() {
+                this.$refs.colorPicker.open();
+            },
+            confirmColor(e) {
+                switch (this.curColor) {
+                    case 'color':
+                        this.textColor = e.hex;
+                        this.editorCtx.format('color', e.hex);
+                        break;
+                    case 'background-color':
+                        this.backgroundColor = e.hex;
+                        this.editorCtx.format('background-color', e.hex);
+                        break;
+                }
+            },
+            onStatusChange(e) {
+                this.formats = e.detail;
+                // console.log('==== e :', e, this.textColor)
+            },
+            insertImage() {
+                // #ifdef APP-PLUS || H5
+                uni.chooseImage({
+                    // count: 1, // 默认9
+                    success: (res) => {
+                        const { tempFiles } = res;
+                        /**
+                         * 使用uniCloud.uploadFile进行云存储时，需要开启$emit('upinImage')事件，
+                         * 再注释掉insertImage，否则在富文本中插入的图片都是本地路径。
+                         * 一般可能需要在传给父组件的upinImage事件中，先遍历tempFiles，
+                         * 再用uploadFile拿到云存储的图片路径，
+                         * 最后将该路径insertImage到src属性中。
+                         * 这一过程等于是将下方注释掉的this.editorCtx.insertImage方法移到父组件中，
+                         * 由使用者在父组件中使用子传父的upinImage方法中的editorCtx参数，手动调用editorCtx.insertImage操作
+                         */
+                        this.$emit('upinImage', tempFiles, this.editorCtx);
+                        /* this.editorCtx.insertImage({
+						src: tempFiles[0].path,
+						width: '80%',
+						success: function () {}
+					}) */
+                    },
+                    fail() {
+                        uni.showToast({
+                            title: '未授权访问相册权限，请授权后使用',
+                            icon: 'none',
+                        });
+                    },
+                });
+                // #endif
+
+                // #ifdef MP-WEIXIN
+                // 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
+                uni.chooseMedia({
+                    // count: 1, // 默认9
+                    mediaType: ['image', 'video'],
+                    sourceType: ['album', 'camera'],
+                    success: (res) => {
+                        // 同上chooseImage处理
+                        const { tempFiles } = res;
+                        this.$emit('upinImage', tempFiles, this.editorCtx);
+                    },
+                    fail() {
+                        uni.showToast({
+                            title: '未授权访问相册权限，请授权后使用',
+                            icon: 'none',
+                        });
+                    },
+                });
+                // #endif
+            },
+            onEditorInput(e) {
+                let maxlength = parseInt(this.maxlength);
+
+                this.editorCtx.getContents({
+                    success: (res) => {
+                        let { html, text } = res;
+                        let textStr = text.replace(/\s/g, '');
+
+                        if (textStr.length > maxlength && maxlength != -1) {
+                            uni.showModal({
+                                content: `超过${maxlength}字数啦~`,
+                                confirmText: '确定',
+                                showCancel: false,
+                                success: ({ confirm, cancel }) => {},
+                            });
+                        } else {
+                            this.$emit('input', { html, text });
+                        }
+                    },
+                });
+            },
+        },
+    };
+</script>
+
+<style scoped>
+    @import './editor-icon.css';
+
+    .wrapper {
+        height: 100%;
+    }
+
+    .iconfont {
+        display: inline-block;
+        padding: 16rpx 0;
+        width: 12.5%;
+        cursor: pointer;
+        font-size: 20px;
+        text-align: center;
+    }
+
+    .toolbar {
+        box-sizing: border-box;
+        border-top: 1px solid #e4e4e4;
+        font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+    }
+
+    .editor-wrapper {
+        overflow: auto;
+    }
+
+    .editor-wrapper.one-row {
+        height: calc(100% - 80rpx);
+    }
+
+.editor-wrapper.two-row {
+    height: calc(100% - 160rpx);
+}
+
+    .ql-container {
+        padding: 8rpx 16rpx;
+        box-sizing: border-box;
+        width: 100%;
+        height: 100%;
+        line-height: 1.5;
+    }
+
+    ::v-deep .ql-editor.ql-blank::before {
+        font-style: normal;
+        color: #cccccc;
+    }
+
+    .ql-active {
+        color: #66ccff;
+    }
+</style>
diff --git a/uni_modules/sp-editor/package.json b/uni_modules/sp-editor/package.json
new file mode 100644
index 00000000..83872a72
--- /dev/null
+++ b/uni_modules/sp-editor/package.json
@@ -0,0 +1,83 @@
+{
+	"id": "sp-editor",
+	"displayName": "sp-editor",
+	"version": "1.0.3",
+	"description": "官方内置富文本editor组件改版",
+	"keywords": [
+        "富文本",
+        "editor",
+        "编辑器"
+    ],
+	"repository": "",
+    "engines": {
+        "HBuilderX": "^3.5.1"
+	},
+	"dcloudext": {
+		"type": "component-vue",
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+		"npmurl": ""
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "u"
+				},
+				"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",
+					"字节跳动": "u",
+					"QQ": "y",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/sp-editor/readme.md b/uni_modules/sp-editor/readme.md
new file mode 100644
index 00000000..c4d74853
--- /dev/null
+++ b/uni_modules/sp-editor/readme.md
@@ -0,0 +1,70 @@
+# sp-editor
+
+## props参数
+
+```
+props: {
+	placeholder: {
+		type: String,
+		default: '写点什么吧 ~'
+	},
+	// 是否只读
+	readOnly: {
+		type: Boolean,
+		default: false
+	},
+	// 最大字数限制，-1不限
+	maxlength: {
+		type: Number,
+		default: -1
+	},
+	// 初始模板
+	templates: {
+		type: String,
+		default: ''
+	}
+}
+```
+
+## emit方法
+
+```
+<template>
+	<sp-editor @input="input" @upinImage="upinImage"></sp-editor>
+</template>
+
+<script setup>
+function input(e) {
+	console.log('==== input :', e)
+}
+
+function upinImage(tempFiles, editorCtx) {
+	// 使用 uniCloud.uploadFile 上传图片的示例方法（可适用多选上传）
+	tempFiles.forEach(async (item) => {
+		uni.showLoading({
+			title: '上传中请稍后',
+			mask: true
+		})
+		let upfile = await uniCloud.uploadFile({
+			filePath: item.path,
+			// 同名会导致报错 policy_does_not_allow_file_overwrite
+			// cloudPath可由 想要存储的文件夹/文件名 拼接，若不拼文件夹名则默认存储在cloudstorage文件夹中
+			cloudPath: `cloudstorage/${item.name}`,
+			cloudPathAsRealPath: true
+		})
+		editorCtx.insertImage({
+			src: upfile.fileID,
+			width: '80%',
+			success: function () {
+				uni.hideLoading()
+			}
+		})
+	})
+}
+</script>
+
+```
+
+## 注意事项
+	1. 该组件在使用过程中推荐在外层套上个父盒子，并给父盒子高度，组件在封装时进行了高度计算，会自动撑满父盒子
+	2. 如遇到在内置浏览器中发生无法拖动调节颜色板的问题，只需调出开发者调试面板，点击重置左上角选择dom的箭头后，便能调出模拟器手势光标，便可正常拖动了
\ No newline at end of file