merge

apis/interfaces/account.js

@@ -9,12 +9,22 @@
 import { request } from '../index'
 
 // dt账户
-const dt = (data) =>{
+const dt = () =>{
 	return request({
 		url: "user/account/dt_logs"
 	})
 }
 
-export {
-	dt
+// 充值
+const recharge = (data) => {
+	return request({
+		url: "user/transaction/recharge",
+		method: "POST",
+		data
+	})
+}
+
+export {
+	dt,
+	recharge
 }

apis/interfaces/life.js

@@ -0,0 +1,21 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 共力人生
+ */
+
+import { request } from '../index'
+
+// 共力人生
+const life = () =>{
+	return request({
+		url: "user/life"
+	})
+}
+
+
+export {
+	life
+}

apis/interfaces/vip.js

@@ -0,0 +1,36 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 会员
+ */
+
+import { request } from '../index'
+
+// 会员信息
+const vip = () =>{
+	return request({
+		url: "user/identities"
+	})
+}
+
+// 开通会员
+const vipPay = () => {
+	return request({
+		url: ''
+	})
+}
+
+// 获取支付信息
+const payInfo = () => {
+	return request({
+		url: ''
+	})
+}
+
+export {
+	vip,
+	vipPay,
+	payInfo
+}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "ZH-HEALTH",
-    "appid" : "__UNI__C29473D",
+    "appid" : "__UNI__DE7B0E6",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
     "versionName" : "1.0.22",
     "versionCode" : 100,
@@ -23,7 +23,6 @@
         },
         /* 模块配置 */
         "modules" : {
-            "OAuth" : {},
             "Payment" : {},
             "Share" : {},
             "SQLite" : {},
@@ -75,9 +74,7 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "oauth" : {
-                    "univerify" : {}
-                },
+                "oauth" : {},
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "android" ],

pages.json

@@ -193,8 +193,7 @@
 						"buttons": [{
 							"text": "充值",
 							"width": "60",
-							"fontSize": "14",
-							"fontWeight": "bold"
+							"fontSize": "14"
 						}]
 					}
 				}
@@ -204,7 +203,16 @@
 			"name": "AccountRecharge",
 			"style": {
 				"navigationBarTitleText": "DT积分充值",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "充值记录",
+							"width": "80",
+							"fontSize": "14"
+						}]
+					}
+				}
 			}
 		}, {
 			"path": "pages/vip/vip",
@@ -221,6 +229,15 @@
 				"navigationBarTitleText": "共力会员协议"
 			}
 		}, {
+			"path": "pages/team/index",
+			"name": "Team",
+			"style": {
+				"navigationBarTitleText": "共力团队",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
 		    "path" : "pages/store/shop/shopDetail",
 		    "name": "ShopDetail",
 		    "style": {

pages/account/recharge.vue

@@ -1,19 +1,195 @@
 <template>
-	<view>
-		充值
+	<view class="recharge">
+		<view class="recharge-block">
+			<view class="recharge-title">
+				充值金额 <uni-icons class="recharge-title-icon" size="20" @click="rechargeToast" type="info-filled" color="#ddd"></uni-icons>
+			</view>
+			<view class="recharge-input">
+				<label>￥</label>
+				<input type="digit" v-model="priceValue" placeholder="输入充值金额" />
+			</view>
+		</view>
+		<view class="recharge-block">
+			<view class="recharge-title">
+				快速充值
+			</view>
+			<view class="recharge-fast">
+				<view class="recharge-fast-item" @click="onRecharge(50)">
+					<view class="recharge-fast-price">50<text>元</text></view>
+					<view class="recharge-fast-numb">50<text>DT积分</text></view>
+				</view>
+				<view class="recharge-fast-item" @click="onRecharge(100)">
+					<view class="recharge-fast-price">100<text>元</text></view>
+					<view class="recharge-fast-numb">100<text>DT积分</text></view>
+				</view>
+				<view class="recharge-fast-item" @click="onRecharge(200)">
+					<view class="recharge-fast-price">200<text>元</text></view>
+					<view class="recharge-fast-numb">200<text>DT积分</text></view>
+				</view>
+				<view class="recharge-fast-item" @click="onRecharge(500)">
+					<view class="recharge-fast-price">500<text>元</text></view>
+					<view class="recharge-fast-numb">500<text>DT积分</text></view>
+				</view>
+				<view class="recharge-fast-item" @click="onRecharge(1000)">
+					<view class="recharge-fast-price">1000<text>元</text></view>
+					<view class="recharge-fast-numb">1000<text>DT积分</text></view>
+				</view>
+				<view class="recharge-fast-item" @click="onRecharge(5000)">
+					<view class="recharge-fast-price">5000<text>元</text></view>
+					<view class="recharge-fast-numb">5000<text>DT积分</text></view>
+				</view>
+			</view>
+		</view>
+		<view class="recharge-btn">
+			<button :disabled="this.priceValue === ''" @click="onRecharge">充值</button>
+			<view class="recharge-text">提示：暂时仅支持使用微信支付充值</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import { recharge } from "@/apis/interfaces/account"
 	export default {
 		data() {
 			return {
-				
+				priceValue: ''
 			};
+		},
+		methods: {
+			// 充值说明
+			rechargeToast(){
+				uni.showModal({
+					title: '充值说明',
+					content: '充值比例为1：1',
+					showCancel:false
+				})
+			},
+			
+			// 充值
+			onRecharge(value){
+				uni.showLoading({
+					title: '加载中'
+				})
+				recharge({
+					amount: typeof(value) === 'number' ? value: this.priceValue
+				}).then(res => {
+					console.log(res)
+					uni.requestPayment({
+						provider: 'wxpay',
+						orderInfo: res,
+						success: res => {
+							console.log(res)
+						},
+						fail(err) {
+							console.log(err)
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		},
+		onNavigationBarButtonTap() {
+			console.log('充值记录')
 		}
 	}
 </script>
 
 <style lang="scss">
-
+	.recharge{
+		background: $window-color;
+		min-height: 100vh;
+		padding-top: $padding;
+		box-sizing: border-box;
+		.recharge-block{
+			background-color: white;
+			border-radius: $radius;
+			padding: $padding;
+			margin: 0 $margin $margin $margin;
+			.recharge-title{
+				font-weight: bold;
+				color: #333;
+				font-size: 30rpx;
+				line-height: 50rpx;
+				.recharge-title-icon{
+					margin-left: $margin/2;
+					vertical-align: middle;
+				}
+			}
+			.recharge-input{
+				position: relative;
+				height: 90rpx;
+				padding-left: 40rpx;
+				padding-top: 20rpx;
+				label{
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					line-height: 74rpx;
+					font-weight: bold;
+					font-size: 34rpx;
+				}
+				input{
+					height: 90rpx;
+					font-size: 46rpx;
+				}
+			}
+		}
+		// 充值金额选择
+		.recharge-fast{
+			padding-top: $padding/2;
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 -10rpx;
+			&-item{
+				width: calc(33.33% - 20rpx);
+				margin: 10rpx;
+				text-align: center;
+				border:solid 1px $main-color;
+				box-sizing: border-box;
+				border-radius: 10rpx;
+				height: 140rpx;
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+			}
+			.recharge-fast-numb{
+				font-size: 24rpx;
+				color: gray;
+			}
+			.recharge-fast-price{
+				color: $main-color;
+				font-weight: bold;
+				font-size: 34rpx;
+			}
+		}
+		// 充值
+		.recharge-btn{
+			padding: $padding;
+			button{
+				height: 90rpx;
+				line-height: 90rpx;
+				background: $main-color;
+				color: white;
+				font-weight: bold;
+				font-size: 34rpx;
+				border-radius: 45rpx;
+				&::after{
+					display: none;
+				}
+				&[disabled]{
+					opacity: .6;
+				}
+			}
+			.recharge-text{
+				padding: $padding 0;
+				font-size: 26rpx;
+				text-align: center;
+				color: gray;
+			}
+		}
+	}
 </style>

pages/life/life.vue

@@ -3,71 +3,56 @@
 		<!-- 账户信息 -->
 		<view class="life-header">
 			<view class="life-header-flex">
-				<view class="life-header-item">共力值：0.00</view>
-				<view class="life-header-item">余额：0.00</view>
+				<view class="life-header-item">0.00共力值</view>
 			</view>
 		</view>
 		<!-- 共力人生 -->
 		<view class="life-cover">
 			<image class="life-cover-back" :src="require('@/static/life/back.png')"></image>
 			<view class="life-role">
-				<image class="life-role-src" :src="require('@/static/role/1.png')" mode="widthFix"/>
+				<image class="life-role-src" :src="figurePath" mode="widthFix"/>
 				<view class="life-role-content">
-					<view class="life-role-nick">唐明明</view>
+					<view class="life-role-nick">{{nickname || '-'}}</view>
 					<view class="life-role-card">
-						<image :src="require('@/static/role/role_icon_00.png')" mode="widthFix"></image>
+						<image :src="identity.button_cover_url" mode="widthFix"></image>
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 功能入口 -->
-		<view class="life-nav">
-			<view class="life-nav-item">
-				<image :src="require('@/static/life/icon_00.png')" mode="widthFix" />
-				<view>共力健康</view>
-			</view>
-			<view class="life-nav-item">
-				<image :src="require('@/static/life/icon_01.png')" mode="widthFix" />
-				<view>共力文娱</view>
-			</view>
-			<view class="life-nav-item">
-				<image :src="require('@/static/life/icon_02.png')" mode="widthFix" />
-				<view>共力发展</view>
-			</view>
-		</view>
 		<view class="life-flex">
-			<view class="life-flex-item house">
+			<view class="life-flex-item house" @click="onNav({name: 'Store'}, 'tab')">
 				<view class="house-content">
-					<view class="house-title">共力生活</view>
+					<view class="house-title">DT商城</view>
 					<view class="house-subtitle">共力共慧</br>健康生活馆</view>
 				</view>
 				<image src="../../static/img/house_back.jpg" mode="aspectFill"></image>
 			</view>
 			<view class="life-flex-item both">
-				<view class="both-item team">
+				<view class="both-item team" @click="onToast('共力文娱暂未开放尽情期待')">
 					<view class="team-content">
-						<view class="team-title">DTS</view>
-						<view class="team-subtitle">数字化产权交易</view>
+						<view class="team-title">共力文娱</view>
+						<view class="team-subtitle">文娱短视频近期开放</view>
 					</view>
 					<image src="../../static/img/text_back.jpg" mode="aspectFill"></image>
 				</view>
-				<view class="both-item team">
+				<view class="both-item team" @click="onNav({name: 'Team'})">
 					<view class="team-content">
 						<view class="team-title">共力团队</view>
 						<view class="team-subtitle">
-							近期3人加入家族</br>
-							近期3人加入部落
+							近期{{children.indirect}}人成为伙伴</br>
+							近期{{children.recommend}}人加入家族
 						</view>
 					</view>
 					<image src="../../static/img/team_back.jpg" mode="aspectFill"></image>
 				</view>
 			</view>
-			<view class="life-flex-item other">
+			<view class="life-flex-item other" @click="onToast('消息中心暂未开放尽情期待')">
 				<view class="other-title">
 					<image src="../../static/life/icon_05.png" mode="widthFix"></image>
 					消息中心
 				</view>
-				<view class="other-subtitle">1条消息</view>
+				<view class="other-subtitle">{{message > 0 ? message + '条未读消息': '暂无消息'}}</view>
 				<image class="other-back" src="../../static/life/icon_07.png"></image>
 			</view>
 			<view class="life-flex-item other">
@@ -75,18 +60,18 @@
 					<image src="../../static/life/icon_03.png" mode="widthFix"></image>
 					邀请朋友
 				</view>
-				<view class="other-subtitle">2个邀请码可使用</view>
+				<view class="other-subtitle">加速共力值增长</view>
 				<image class="other-back" src="../../static/life/icon_08.png"></image>
 			</view>
-			<view class="life-flex-item other">
+			<view class="life-flex-item other" @click="onNav({name: 'Order'})">
 				<view class="other-title">
 					<image src="../../static/life/icon_04.png" mode="widthFix"></image>
 					我的订单
 				</view>
-				<view class="other-subtitle">暂无订单</view>
+				<view class="other-subtitle">{{order.all || '暂无订单'}}</view>
 				<image class="other-back" src="../../static/life/icon_09.png"></image>
 			</view>
-			<view class="life-flex-item other">
+			<view class="life-flex-item other" @click="onToast('共力好友暂未开放尽情期待')">
 				<view class="other-title">
 					<image src="../../static/life/icon_06.png" mode="widthFix"></image>
 					共力好友
@@ -99,25 +84,79 @@
 </template>
 
 <script>
+	import { life } from '@/apis/interfaces/life.js'
     export default {
         data() {
             return {
-                
+                nickname: '',
+				figurePath: '',
+				identity: {
+					button_cover_url: ''
+				},
+				children: {
+					recommend: 0,
+					indirect : 0
+				},
+				message: 0,
+				order: {
+					all: 0,
+					init: 0,
+					pay: 0,
+					delivered: 0
+				}
             };
+        },
+		created() {
+			// 共力人生
+			life().then(res => {
+				this.nickname  = res.nickname
+				this.figurePath = res.figure_path
+				this.identity   = res.identity
+				this.children   = res.children
+				this.message	= res.message
+				this.order		= res.order
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			// 我的订单
+			onNav(name, type){
+				if(type){
+					this.$Router.pushTab({...name})
+					return
+				}
+				this.$Router.push({...name})
+			},
+			// 开发中提示
+			onToast(title){
+				uni.showToast({
+					title,
+					icon : 'none'
+				})
+			}
 		}
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.life{
 		min-height: 100vh;
 		background: #f8f8f8;
 	}
 	// 功能栏目
 	.life-flex{
-		padding: 0 20rpx 30rpx;
+		padding: 30rpx 20rpx 30rpx;
+		border-radius: 30rpx;
+		margin-top: -30rpx;
+		background: $window-color;
 		display: flex;
 		flex-wrap: wrap;
+		position: relative;
+		z-index: 1;
 		.life-flex-item{
 			background: white;
 			border-radius: 20rpx;
@@ -147,12 +186,12 @@
 					justify-content: space-between;
 					.house-title{
 						color: white;
-						font-size: 46rpx;
+						font-size: 36rpx;
 						font-weight: bold;
 					}
 					.house-subtitle{
 						color: white;
-						font-size: 30rpx;
+						font-size: 26rpx;
 					}
 				}
 			}
@@ -219,12 +258,12 @@
 							justify-content: space-between;
 							.team-title{
 								color: white;
-								font-size: 46rpx;
+								font-size: 36rpx;
 								font-weight: bold;
 							}
 							.team-subtitle{
 								color: white;
-								font-size: 26rpx;
+								font-size: 24rpx;
 							}
 						}
 					}
@@ -244,14 +283,14 @@
 					right: 0;
 				}
 				.other-title{
-					font-size: 40rpx;
+					font-size: 36rpx;
 					font-weight: bold;
 					color: #333;
 					image{
-						width: 42rpx;
+						width: 36rpx;
 						vertical-align: middle;
 						margin-bottom: 4rpx;
-						margin-right: 5rpx;
+						margin-right: 10rpx;
 					}	
 				}
 				.other-subtitle{
@@ -297,15 +336,14 @@
 		left: 0;
 		right: 0;
 		z-index: 999;
-		background-color: rgba(255, 255, 255, 1);
 		@extend .ios-top;
 		.life-header-flex{
 			padding: 20rpx 30rpx 30rpx;
 			display: flex;
+			justify-content: center;
 			height: 70rpx;
 			line-height: 70rpx;
 			.life-header-item{
-				border:solid 1px #ddd;
 				border-radius: 35rpx;
 				padding: 0 20rpx;
 				margin-right: 20rpx;
@@ -341,12 +379,12 @@
 				font-weight: bold;
 				.life-role-nick{
 					color: #333;
-					font-size: 50rpx;
+					font-size: 40rpx;
 				}
 				.life-role-card{
 					padding-top: 10rpx;
 					image{
-						width: 150rpx;
+						width: 240rpx;
 					}
 				}
 			}

pages/team/index.vue

@@ -0,0 +1,23 @@
+<template>
+	<view>
+		共力团队
+		
+		<view>共力家族</view>
+		<view>共力伙伴</view>
+		<view>供应商</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/vip/vip.vue

@@ -1,33 +1,37 @@
 <template>
-	<view class="vip">
+	<view :class="{'vip': isOpen}">
 		<view class="vip-card">
 			<view class="vip-user">
-				<image class="user-cover" src="" mode="aspectFill"></image>
-				<view class="user-nickname">唐明阳</view>
-				<view class="user-date">到期日期：2023-06-07</view>
-				<view class="vip-renewal">续费</view>
+				<image class="user-cover" :src="user.avatar" mode="aspectFill"></image>
+				<view class="user-nickname">{{user.nickname}}</view>
+				<view class="user-date">到期日期：{{identity.ended_at}}</view>
+				<view class="vip-renewal" v-if="!isOpen">续费</view>
 			</view>
 			<view class="user-cards">
-				<image class="vip-icon" src="/static/vip/lv_04.png" mode="widthFix"></image>
+				<image class="vip-icon" :src="identity.cover_url" mode="widthFix"></image>
 				<view>
-					<view class="vip-lv">共力践行者</view>
+					<view class="vip-lv">{{identity.identity_text}}</view>
+					<block>
 						<view class="vip-progress">
 							<view class="vip-progress-loding" style="width: 50%;"></view>
 						</view>
 						<view class="vip-loding">
 							<view>0/0共分</view>
 						</view>
+					</block>
 				</view>
-				<navigator class="vip-more">成长体系<uni-icons size="14" type="forward" color="#9f5529"></uni-icons></navigator>
+				<navigator class="vip-more" hover-class="none">成长体系<uni-icons size="14" type="forward" color="#9f5529"></uni-icons></navigator>
 			</view>
 		</view>
 		<view class="vip-content">
-			<view class="vip-content-title">距离 *** 还需条件</view>
+			<block v-if="secondRule.length > 0">
+				<view class="vip-content-title">距离<text>{{nextIdentity.identity_text}}</text>还需条件</view>
 				<view class="vip-up-conditions">
 					<view class="vip-up-conditions-item"><text>10/10</text>家庭会员</view>
 					<view class="vip-up-conditions-item"><text>9/100</text>邀请家族会员员</view>
 					<view class="vip-up-conditions-item"><text>10/10000</text>伙伴</view>
 				</view>
+			</block>
 			<view class="vip-content-title">会员特权</view>
 			<view class="vip-privilege">
 				<view class="vip-privilege-item" v-for="(item, index) in 8" :key="index">
@@ -38,12 +42,11 @@
 			</view>
 			<view class="vip-content-title">会员折扣说明</view>
 			<view class="vip-content-rich">
-				<view>前1000名会员享受会员费5折优惠</view>
-				<view>前1001-2000名会员享受会员费5折优惠</view>
-				<view>前2001-5000名会员享受会员费5折优惠</view>
+				<view v-for="(item,index) in prices" :key="index">前{{item.open_number}} - {{item.open_number + item.stock}}名享开通会员折扣价{{item.price}}元</view>
+				<view>10000后会员恢复原价199.00元</view>
 			</view>
 		</view>
-		<view class="footer-vip">
+		<view class="footer-vip" v-if="isOpen">
 			<button @click="onOpenVip">开通会员</button>
 			<view class="footer-text">开通即表示同意共力生态<navigator url="./agreement">《会员开通协议》</navigator></view>
 		</view>
@@ -51,16 +54,61 @@
 </template>
 
 <script>
+	import { vip, vipPay, submitOrder } from '@/apis/interfaces/vip.js'
 	export default {
 		data() {
 			return {
-				
+				// 用户信息
+				user: {
+					username: '-',
+					nickname: '-',
+					avatar	: '-',
+				},
+				// 当前身份
+				identity: {
+					identity_text: '',
+					cover_url: '',
+					ended_at: ''
+				},
+				// 下级身份
+				nextIdentity:{
+					identity_text: ''
+				},
+				// 升级条件
+				secondRule: [],
+				// 会员特权
+				rights: [],
+				// 会员折扣说明
+				prices: [],
+				// 是否可续费
+				isOpen: true
 			};
 		},
+		onShow() {
+			vip().then(res =>{
+				console.log(res)
+				this.isOpen = res.is_open
+				this.prices = res.prices
+				this.rights = res.rights
+				this.secondRule = res.second_rule
+				this.nextIdentity = res.next_identity
+				this.identity = res.identity
+				this.user = res.user
+			}).catch(err => {
+				console.log(err)
+			})
+		},
 		methods: {
 			onOpenVip(){
+				// 获取订单
+				vipPay().then(orderNo => {
+					// 支付参数
+					submitOrder({
+						orderNo
+					}).then(orderInfo => {
 						uni.requestPayment({
 							provider : "wxpay",
+							orderInfo,
 							success: res => {
 								console.log(res)
 							},
@@ -68,6 +116,18 @@
 								console.log(err)
 							}
 						})
+					}).catch(err =>{
+						uni.showToast({
+							title: err.message,
+							icon : 'none'
+						})
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
 			}
 		}
 	}
@@ -187,6 +247,10 @@
 				width: 10rpx;
 				height: 30rpx;
 			}
+			text{
+				color: #fcc590;
+				padding: 0 10rpx;
+			}
 		}
 		.vip-up-conditions{
 			padding-top: 10rpx;
@@ -203,7 +267,6 @@
 			}
 		}
 		.vip-content-rich{
-			padding: 30rpx 0 0;
 			font-size: 28rpx;
 			line-height: 50rpx;
 			color: gray;
@@ -238,9 +301,18 @@
 			}
 		}
 	}
+	// 会员
+	.vip{
+		padding-bottom: ($padding*3) + 140;
+	}
 	// 会员支付
 	.footer-vip{
+		position: fixed;
+		bottom: 0;
+		width: 100%;
 		padding: $padding;
+		box-sizing: border-box;
+		background: white;
 		button{
 			height: 90rpx;
 			line-height: 90rpx;
@@ -258,6 +330,7 @@
 		.footer-text{
 			font-size: 26rpx;
 			color: #888;
+			line-height: 50rpx;
 			text-align: center;
 			padding: $padding 0;
 			navigator{

unpackage/dist/build/app-plus/static/im/emoji.js

@@ -1,795 +0,0 @@
-var EmojiFactory = {
-	"u1F603": {
-		"en": "Smiley Face",
-		"zh": "绗戣劯",
-		"tag": "\uD83D\uDE03",
-		"position": "-75px 0px"
-	},
-	"u1F600": {
-		"en": "Grinning Face",
-		"zh": "绗戝樆鍢<E6A886>",
-		"tag": "\uD83D\uDE00",
-		"position": "0px 0px"
-	},
-	"u1F60A": {
-		"en": "Smiley",
-		"zh": "寰瑧",
-		"tag": "\uD83D\uDE0A",
-		"position": "-1725px 0px"
-	},
-	"u263A": {
-		"en": "Cute",
-		"zh": "钀岃悓鍝<E68293>",
-		"tag": "\u263A",
-		"position": "-2950px 0px"
-	},
-	"u1F609": {
-		"en": "Winking Face",
-		"zh": "鐪ㄧ溂",
-		"tag": "\uD83D\uDE09",
-		"position": "-200px 0px"
-	},
-	"u1F60D": {
-		"en": "Heart Eyes",
-		"zh": "鑹茶糠杩<E7B3A0>",
-		"tag": "\uD83D\uDE0D",
-		"position": "-1800px 0px"
-	},
-	"u1F618": {
-		"en": "Blowing Kiss",
-		"zh": "椋炲惢",
-		"tag": "\uD83D\uDE18",
-		"position": "-375px 0px"
-	},
-	"u1F61A": {
-		"en": "Kiss Face",
-		"zh": "涔堜箞鍝<E7AE9E>",
-		"tag": "\uD83D\uDE1A",
-		"position": "-1875px 0px"
-	},
-	"u1F61C": {
-		"en": "Crazy Face",
-		"zh": "璋冪毊",
-		"tag": "\uD83D\uDE1C",
-		"position": "-1900px 0px"
-	},
-	"u1F61D": {
-		"en": "Tongue Out",
-		"zh": "鍚愯垖澶<E59E96>",
-		"tag": "\uD83D\uDE1D",
-		"position": "-1925px 0px"
-	},
-	"u1F633": {
-		"en": "Flushed Face",
-		"zh": "鑴哥孩",
-		"tag": "\uD83D\uDE33",
-		"position": "-625px 0px"
-	},
-	"u1F601": {
-		"en": "Grinning With Smiling",
-		"zh": "闇查娇鑰岀瑧",
-		"tag": "\uD83D\uDE01",
-		"position": "-25px 0px"
-	},
-	"u1F614": {
-		"en": "Pensive",
-		"zh": "娌夋€<E5A48B>",
-		"tag": "\uD83D\uDE14",
-		"position": "-300px 0px"
-	},
-	"u1F60C": {
-		"en": "Pleased",
-		"zh": "婊℃剰",
-		"tag": "\uD83D\uDE0C",
-		"position": "-1775px 0px"
-	},
-	"u1F612": {
-		"en": "Dissatisfied",
-		"zh": "涓嶆弧",
-		"tag": "\uD83D\uDE12",
-		"position": "-250px 0px"
-	},
-	"u1F61F": {
-		"en": "Worried Face",
-		"zh": "鑻︾摐鑴<E69190>",
-		"tag": "\uD83D\uDE1F",
-		"position": "-1975px 0px"
-	},
-	"u1F61E": {
-		"en": "Disappointed Face",
-		"zh": "澶辨湜",
-		"tag": "\uD83D\uDE1E",
-		"position": "-1950px 0px"
-	},
-	"u1F623": {
-		"en": "Helpless Face",
-		"zh": "鏃犲姪",
-		"tag": "\uD83D\uDE23",
-		"position": "-450px 0px"
-	},
-	"u1F62D": {
-		"en": "Crying",
-		"zh": "浼ゅ績",
-		"tag": "\uD83D\uDE22",
-		"position": "-425px 0px"
-	},
-	"u1F602": {
-		"en": "Laughing Tears",
-		"zh": "鍠滄瀬鑰屾常",
-		"tag": "\uD83D\uDE02",
-		"position": "-50px 0px"
-	},
-	"u1F622": {
-		"en": "Sobbing",
-		"zh": "鍝常",
-		"tag": "\uD83D\uDE2D",
-		"position": "-2075px 0px"
-	},
-	"u1F62A": {
-		"en": "Sleepy Face",
-		"zh": "鍥<>",
-		"tag": "\uD83D\uDE2A",
-		"position": "-2000px 0px"
-	},
-	"u1F630": {
-		"en": "Cold Sweat",
-		"zh": "鍐锋睏",
-		"tag": "\uD83D\uDE30",
-		"position": "-550px 0px"
-	},
-	"u1F605": {
-		"en": "Happy Sweat",
-		"zh": "灏村艾",
-		"tag": "\uD83D\uDE05",
-		"position": "-100px 0px"
-	},
-	"u1F613": {
-		"en": "Sweat",
-		"zh": "姹<>",
-		"tag": "\uD83D\uDE13",
-		"position": "-275px 0px"
-	},
-	"u1F62B": {
-		"en": "Tired Face",
-		"zh": "鎶撶媯",
-		"tag": "\uD83D\uDE2B",
-		"position": "-2025px 0px"
-	},
-	"u1F629": {
-		"en": "Weary Face",
-		"zh": "鐤叉儷",
-		"tag": "\uD83D\uDE29",
-		"position": "-525px 0px"
-	},
-	"u1F628": {
-		"en": "Fearful Face",
-		"zh": "鍙€<EE889B>",
-		"tag": "\uD83D\uDE28",
-		"position": "-500px 0px"
-	},
-	"u1F631": {
-		"en": "Scream",
-		"zh": "灏栧彨",
-		"tag": "\uD83D\uDE31",
-		"position": "-575px 0px"
-	},
-	"u1F621": {
-		"en": "Angry Face",
-		"zh": "鐢熸皵",
-		"tag": "\uD83D\uDE21",
-		"position": "-400px 0px"
-	},
-	"u1F624": {
-		"en": "Mad Face",
-		"zh": "鎬掓皵鍐插啿",
-		"tag": "\uD83D\uDE24",
-		"position": "-475px 0px"
-	},
-	"u1F616": {
-		"en": "Confounded Face",
-		"zh": "钂欑緸",
-		"tag": "\uD83D\uDE16",
-		"position": "-350px 0px"
-	},
-	"u1F606": {
-		"en": "Big Grin",
-		"zh": "澶х瑧",
-		"tag": "\uD83D\uDE06",
-		"position": "-125px 0px"
-	},
-	"u1F60B": {
-		"en": "Hungry",
-		"zh": "棣<>",
-		"tag": "\uD83D\uDE0B",
-		"position": "-1750px 0px"
-	},
-	"u1F637": {
-		"en": "Mask Face",
-		"zh": "鍙ｇ僵",
-		"tag": "\uD83D\uDE37",
-		"position": "-725px 0px"
-	},
-	"u1F60E": {
-		"en": "Sunglasses",
-		"zh": "澧ㄩ暅",
-		"tag": "\uD83D\uDE0E",
-		"position": "-1825px 0px"
-	},
-	"u1F634": {
-		"en": "Sleeping",
-		"zh": "鐫＄湢",
-		"tag": "\uD83D\uDE34",
-		"position": "-650px 0px"
-	},
-	"u1F635": {
-		"en": "Dizzy Face",
-		"zh": "澶存檿鐪艰姳",
-		"tag": "\uD83D\uDE35",
-		"position": "-675px 0px"
-	},
-	"u1F632": {
-		"en": "Shocked Face",
-		"zh": "闇囨儕",
-		"tag": "\uD83D\uDE32",
-		"position": "-600px 0px"
-	},
-	"u1F608": {
-		"en": "Purple Devil",
-		"zh": "灏忔伓榄<E4BC93>",
-		"tag": "\uD83D\uDE08",
-		"position": "-175px 0px"
-	},
-	"u1F47F": {
-		"en": "Devil",
-		"zh": "鎭堕瓟",
-		"tag": "\uD83D\uDC7F",
-		"position": "-1600px 0px"
-	},
-	"u1F62F": {
-		"en": "Surprised Face",
-		"zh": "鎯婂憜",
-		"tag": "\uD83D\uDE2F",
-		"position": "-2100px 0px"
-	},
-	"u1F62C": {
-		"en": "Grimacing Face",
-		"zh": "鎵鑴<EE8397>",
-		"tag": "\uD83D\uDE2C",
-		"position": "-2050px 0px"
-	},
-	"u1F615": {
-		"en": "Confused",
-		"zh": "鍥版儜",
-		"tag": "\uD83D\uDE15",
-		"position": "-325px 0px"
-	},
-	"u1F636": {
-		"en": "Mouthless",
-		"zh": "鏃犲彛",
-		"tag": "\uD83D\uDE36",
-		"position": "-700px 0px"
-	},
-	"u1F607": {
-		"en": "Halo",
-		"zh": "澶╀娇鍏夌幆",
-		"tag": "\uD83D\uDE07",
-		"position": "-150px 0px"
-	},
-	"u1F60F": {
-		"en": "Smirking Face",
-		"zh": "鍌荤瑧",
-		"tag": "\uD83D\uDE0F",
-		"position": "-1850px 0px"
-	},
-	"u1F611": {
-		"en": "Expressionless Face",
-		"zh": "闈㈡棤琛ㄦ儏",
-		"tag": "\uD83D\uDE11",
-		"position": "-225px 0px"
-	},
-	"u1F648": {
-		"en": "See No Monkey",
-		"zh": "涓嶇湅",
-		"tag": "\uD83D\uDE48",
-		"position": "-2675px 0px"
-	},
-	"u1F649": {
-		"en": "Hear No Monkey",
-		"zh": "涓嶅惉",
-		"tag": "\uD83D\uDE49",
-		"position": "-2700px 0px"
-	},
-	"u1F64A": {
-		"en": "No Speaking",
-		"zh": "闂槾",
-		"tag": "\uD83D\uDE4A",
-		"position": "-2125px 0px"
-	},
-	"u1F47D": {
-		"en": "Alien",
-		"zh": "澶栨槦浜<E6A7A6>",
-		"tag": "\uD83D\uDC7D",
-		"position": "-1575px 0px"
-	},
-	"u1F4A9": {
-		"en": "Pile Of Poo",
-		"zh": "渚夸究",
-		"tag": "\uD83D\uDCA9",
-		"position": "-1025px 0px"
-	},
-	"u1F494": {
-		"en": "Broken Heart",
-		"zh": "蹇冪",
-		"tag": "\uD83D\uDC94",
-		"position": "-2600px 0px"
-	},
-	"u1F525": {
-		"en": "Fire",
-		"zh": "鐏<>",
-		"tag": "\uD83D\uDD25",
-		"position": "-2625px 0px"
-	},
-	"u1F4A2": {
-		"en": "Anger",
-		"zh": "鎰ゆ€<E38286>",
-		"tag": "\uD83D\uDCA2",
-		"position": "-950px 0px"
-	},
-	"u1F4A4": {
-		"en": "Zzz",
-		"zh": "ZZZ",
-		"tag": "\uD83D\uDCA4",
-		"position": "-1000px 0px"
-	},
-	"u1F6AB": {
-		"en": "Prohibited",
-		"zh": "绂佹",
-		"tag": "\uD83D\uDEAB",
-		"position": "-1175px 0px"
-	},
-	"u2B50": {
-		"en": "Star",
-		"zh": "鏄熸槦",
-		"tag": "\u2B50",
-		"position": "-2750px 0px"
-	},
-	"u26A1": {
-		"en": "Lightning Bolt",
-		"zh": "闂數",
-		"tag": "\u26A1",
-		"position": "-2825px 0px"
-	},
-	"u1F319": {
-		"en": "Drescent Moon",
-		"zh": "寮湀",
-		"tag": "\uD83C\uDF19",
-		"position": "-2175px 0px"
-	},
-	"u2600": {
-		"en": "Sunny",
-		"zh": "鏅存湕",
-		"tag": "\u2600",
-		"position": "-3075px 0px"
-	},
-	"u26C5": {
-		"en": "Cloudy",
-		"zh": "澶氫簯",
-		"tag": "\u26C5",
-		"position": "-2900px 0px"
-	},
-	"u2601": {
-		"en": "Cloud",
-		"zh": "浜戝僵",
-		"tag": "\u2601",
-		"position": "-3100px 0px"
-	},
-	"u2744": {
-		"en": "Snowflake",
-		"zh": "闆姳",
-		"tag": "\u2744",
-		"position": "-3175px 0px"
-	},
-	"u2614": {
-		"en": "Umbrella",
-		"zh": "闆ㄤ紴",
-		"tag": "\u2614",
-		"position": "-3125px 0px"
-	},
-	"u26C4": {
-		"en": "Snowman",
-		"zh": "闆汉",
-		"tag": "\u26C4",
-		"position": "-2875px 0px"
-	},
-	"u1F44D": {
-		"en": "Thumbs Up",
-		"zh": "璧<>",
-		"tag": "\uD83D\uDC4D",
-		"position": "-1400px 0px"
-	},
-	"u1F44E": {
-		"en": "Thumbs Down",
-		"zh": "鍠濆€掑僵",
-		"tag": "\uD83D\uDC4E",
-		"position": "-1425px 0px"
-	},
-	"u1F91D": {
-		"en": "Handshake",
-		"zh": "鎻℃墜",
-		"tag": "\uD83E\uDD1D",
-		"position": "-3200px 0px"
-	},
-	"u1F44C": {
-		"en": "Ok Hand",
-		"zh": "娌￠棶棰<E6A3B6>",
-		"tag": "\uD83D\uDC4C",
-		"position": "-1375px 0px"
-	},
-	"u1F44A": {
-		"en": "Raised Fist",
-		"zh": "涓捐捣鎷冲ご",
-		"tag": "\u270A",
-		"position": "-2975px 0px"
-	},
-	"u270A": {
-		"en": "Oncoming Fist",
-		"zh": "鍑绘嫵",
-		"tag": "\uD83D\uDC4A",
-		"position": "-1350px 0px"
-	},
-	"u270C": {
-		"en": "Victory Hand",
-		"zh": "鑰<>",
-		"tag": "\u270C",
-		"position": "-3025px 0px"
-	},
-	"u270B": {
-		"en": "Raised Hand",
-		"zh": "涓炬墜",
-		"tag": "\u270B",
-		"position": "-3000px 0px"
-	},
-	"u1F64F": {
-		"en": "Folded Hands",
-		"zh": "绁堢シ",
-		"tag": "\uD83D\uDE4F",
-		"position": "-2150px 0px"
-	},
-	"u261D": {
-		"en": "Pointing Up",
-		"zh": "绗竴",
-		"tag": "\u261D",
-		"position": "-2925px 0px"
-	},
-	"u1F44F": {
-		"en": "Clapping Hands",
-		"zh": "榧撴帉",
-		"tag": "\uD83D\uDC4F",
-		"position": "-1450px 0px"
-	},
-	"u1F4AA": {
-		"en": "Flexed Biceps",
-		"zh": "鑲岃倝",
-		"tag": "\uD83D\uDCAA",
-		"position": "-1050px 0px"
-	},
-	"u1F46A": {
-		"en": "Family",
-		"zh": "瀹跺涵",
-		"tag": "\uD83D\uDC6A",
-		"position": "-1475px 0px"
-	},
-	"u1F46B": {
-		"en": "Couple",
-		"zh": "鎯呬荆",
-		"tag": "\uD83D\uDC6B",
-		"position": "-1500px 0px"
-	},
-	"u1F47C": {
-		"en": "Baby Angel",
-		"zh": "瀹濊礉澶╀娇",
-		"tag": "\uD83D\uDC7C",
-		"position": "-1550px 0px"
-	},
-	"u1F434": {
-		"en": "Horse",
-		"zh": "椹<>",
-		"tag": "\uD83D\uDC34",
-		"position": "-2475px 0px"
-	},
-	"u1F436": {
-		"en": "Dog",
-		"zh": "鐙<>",
-		"tag": "\uD83D\uDC36",
-		"position": "-2500px 0px"
-	},
-	"u1F437": {
-		"en": "Pig",
-		"zh": "鐚<>",
-		"tag": "\uD83D\uDC37",
-		"position": "-2525px 0px"
-	},
-	"u1F47B": {
-		"en": "Ghost",
-		"zh": "楝<>",
-		"tag": "\uD83D\uDC7B",
-		"position": "-1525px 0px"
-	},
-	"u1F339": {
-		"en": "Rose",
-		"zh": "鐜懓",
-		"tag": "\uD83C\uDF39",
-		"position": "-2225px 0px"
-	},
-	"u1F33B": {
-		"en": "Sunflower",
-		"zh": "鍚戞棩钁<E6A3A9>",
-		"tag": "\uD83C\uDF3B",
-		"position": "-1250px 0px"
-	},
-	"u1F332": {
-		"en": "Pine Tree",
-		"zh": "鏉炬爲",
-		"tag": "\uD83C\uDF32",
-		"position": "-2200px 0px"
-	},
-	"u1F384": {
-		"en": "Christmas Tree",
-		"zh": "鍦ｈ癁鏍<E79981>",
-		"tag": "\uD83C\uDF84",
-		"position": "-2400px 0px"
-	},
-	"u1F381": {
-		"en": "Wrapped Gift",
-		"zh": "绀肩墿",
-		"tag": "\uD83C\uDF81",
-		"position": "-2350px 0px"
-	},
-	"u1F389": {
-		"en": "Party Popper",
-		"zh": "鑱氫細绀艰姳",
-		"tag": "\uD83C\uDF89",
-		"position": "-2425px 0px"
-	},
-	"u1F4B0": {
-		"en": "Money Bag",
-		"zh": "閽辫",
-		"tag": "\uD83D\uDCB0",
-		"position": "-1075px 0px"
-	},
-	"u1F382": {
-		"en": "Birthday Cake",
-		"zh": "鐢熸棩铔嬬硶",
-		"tag": "\uD83C\uDF82",
-		"position": "-2375px 0px"
-	},
-	"u1F356": {
-		"en": "Barbecue",
-		"zh": "BBQ",
-		"tag": "\uD83C\uDF56",
-		"position": "-2275px 0px"
-	},
-	"u1F35A": {
-		"en": "Cooked Rice",
-		"zh": "绫抽キ",
-		"tag": "\uD83C\uDF5A",
-		"position": "-1275px 0px"
-	},
-	"u1F366": {
-		"en": "Ice Cream",
-		"zh": "鍐版穱娣<E7A9B1>",
-		"tag": "\uD83C\uDF66",
-		"position": "-2300px 0px"
-	},
-	"u1F36B": {
-		"en": "Chocolate Bar",
-		"zh": "宸у厠鍔<E58EA0>",
-		"tag": "\uD83C\uDF6B",
-		"position": "-1300px 0px"
-	},
-	"u1F349": {
-		"en": "Watermelon",
-		"zh": "瑗跨摐",
-		"tag": "\uD83C\uDF49",
-		"position": "-2250px 0px"
-	},
-	"u1F377": {
-		"en": "Wine Glass",
-		"zh": "绾㈤厭",
-		"tag": "\uD83C\uDF77",
-		"position": "-2325px 0px"
-	},
-	"u1F37B": {
-		"en": "Cheers",
-		"zh": "骞叉澂",
-		"tag": "\uD83C\uDF7B",
-		"position": "-1325px 0px"
-	},
-	"u2615": {
-		"en": "Coffee",
-		"zh": "鍜栧暋",
-		"tag": "\u2615",
-		"position": "-3150px 0px"
-	},
-	"u1F3C0": {
-		"en": "Basketball",
-		"zh": "绡悆",
-		"tag": "\uD83C\uDFC0",
-		"position": "-825px 0px"
-	},
-	"u26BD": {
-		"en": "Soccer Ball",
-		"zh": "瓒崇悆",
-		"tag": "\u26BD",
-		"position": "-2850px 0px"
-	},
-	"u1F3C2": {
-		"en": "Snowboarder",
-		"zh": "鍗曟澘婊戦洩",
-		"tag": "\uD83C\uDFC2",
-		"position": "-850px 0px"
-	},
-	"u1F3A4": {
-		"en": "Microphone",
-		"zh": "楹﹀厠椋<E58EA0>",
-		"tag": "\uD83C\uDFA4",
-		"position": "-750px 0px"
-	},
-	"u1F3B5": {
-		"en": "Musical Note",
-		"zh": "闊充箰",
-		"tag": "\uD83C\uDFB5",
-		"position": "-800px 0px"
-	},
-	"u1F3B2": {
-		"en": "Game Die",
-		"zh": "楠板瓙",
-		"tag": "\uD83C\uDFB2",
-		"position": "-775px 0px"
-	},
-	"u1F004": {
-		"en": "Mahjong Red Dragon",
-		"zh": "楹诲皢",
-		"tag": "\uD83C\uDC04",
-		"position": "-900px 0px"
-	},
-	"u1F451": {
-		"en": "Crown",
-		"zh": "鐜嬪啝",
-		"tag": "\uD83D\uDC51",
-		"position": "-2550px 0px"
-	},
-	"u1F484": {
-		"en": "Lipstick",
-		"zh": "鍙ｇ孩",
-		"tag": "\uD83D\uDC84",
-		"position": "-2575px 0px"
-	},
-	"u1F48B": {
-		"en": "Kiss",
-		"zh": "鍚<>",
-		"tag": "\uD83D\uDC8B",
-		"position": "-1650px 0px"
-	},
-	"u1F48D": {
-		"en": "Ring",
-		"zh": "鎴掓寚",
-		"tag": "\uD83D\uDC8D",
-		"position": "-1675px 0px"
-	},
-	"u1F4DA": {
-		"en": "Books",
-		"zh": "涔︾睄",
-		"tag": "\uD83D\uDCDA",
-		"position": "-1100px 0px"
-	},
-	"u1F393": {
-		"en": "Graduation Cap",
-		"zh": "姣曚笟甯<E7AC9F>",
-		"tag": "\uD83C\uDF93",
-		"position": "-2450px 0px"
-	},
-	"u270F": {
-		"en": "Pencil",
-		"zh": "閾呯瑪",
-		"tag": "\u270F",
-		"position": "-3050px 0px"
-	},
-	"u1F3E1": {
-		"en": "House With Garden",
-		"zh": "鎴垮瓙",
-		"tag": "\uD83C\uDFE1",
-		"position": "-875px 0px"
-	},
-	"u1F6BF": {
-		"en": "Shower",
-		"zh": "娣嬫荡",
-		"tag": "\uD83D\uDEBF",
-		"position": "-1200px 0px"
-	},
-	"u1F4A1": {
-		"en": "Light Bulb",
-		"zh": "鐏场",
-		"tag": "\uD83D\uDCA1",
-		"position": "-925px 0px"
-	},
-	"u1F4DE": {
-		"en": "Telephone Receiver",
-		"zh": "鐢佃瘽鍚瓛",
-		"tag": "\uD83D\uDCDE",
-		"position": "-1125px 0px"
-	},
-	"u1F4E2": {
-		"en": "Loudspeaker",
-		"zh": "鎵╅煶鍣<E785B6>",
-		"tag": "\uD83D\uDCE2",
-		"position": "-1150px 0px"
-	},
-	"u1F556": {
-		"en": "Clock",
-		"zh": "琛<>",
-		"tag": "\uD83D\uDD56",
-		"position": "-2650px 0px"
-	},
-	"u23F0": {
-		"en": "Alarm Clock",
-		"zh": "闂归挓",
-		"tag": "\u23F0",
-		"position": "-2775px 0px"
-	},
-	"u23F3": {
-		"en": "Hourglass",
-		"zh": "娌欐紡",
-		"tag": "\u23F3",
-		"position": "-2800px 0px"
-	},
-	"u1F4A3": {
-		"en": "Bomb",
-		"zh": "鐐稿脊",
-		"tag": "\uD83D\uDCA3",
-		"position": "-975px 0px"
-	},
-	"u1F52B": {
-		"en": "Pistol",
-		"zh": "鎵嬫灙",
-		"tag": "\uD83D\uDD2B",
-		"position": "-1700px 0px"
-	},
-	"u1F48A": {
-		"en": "Capsule",
-		"zh": "鑽<>",
-		"tag": "\uD83D\uDC8A",
-		"position": "-1625px 0px"
-	},
-	"u1F680": {
-		"en": "Rocket",
-		"zh": "鐏",
-		"tag": "\uD83D\uDE80",
-		"position": "-2725px 0px"
-	},
-	"u1F30F": {
-		"en": "Globe",
-		"zh": "鍦扮悆",
-		"tag": "\uD83C\uDF0F",
-		"position": "-1225px 0px"
-	}
-};
-let EmojiList = []
-
-function setEmojiList() {
-	EmojiList.length = 0;
-	for (var unicode in EmojiFactory) {
-		var detail = EmojiFactory[unicode];
-		if (detail.tag) {
-			var lang = 'en';
-			var symbol = detail[lang];
-			EmojiList.push({
-				unicode: unicode,
-				symbol: '[' + symbol + ']',
-				emoji: detail.tag,
-			});
-		}
-	}
-}
-setEmojiList()
-export default EmojiList