李万涛 преди 1 година
родител
ревизия
f509b26c8a

+ 7 - 1
api/robot/index.js

xqd
@@ -24,4 +24,10 @@ export const voiceList = (params, config = {}) => http.post('index.php/api.Digit
 export const backList = (params, config = {}) => http.post('index.php/api.Digit/getBackList', params, config)
 
 //数字人草稿列表
-export const draftList = (params, config = {}) => http.post('index.php/api.Digit/draftList', params, config)
+export const draftList = (params, config = {}) => http.post('index.php/api.Digit/draftList', params, config)
+
+//注册
+export const register = (params, config = {}) => http.post('index.php/api.Digit/register', params, config)
+
+//登录
+export const login = (params, config = {}) => http.post('index.php/api.Digit/login', params, config)

+ 28 - 27
components/wike-tabbar/wike-tabbar.vue

xqd xqd
@@ -67,24 +67,25 @@
 					showType: "iconfont", //img/图片模式,iconfont/字体图标模式
 					borderColor: "#d3d3d3",
 					bgColor: "#ffffff",
-					list: [{
-							pagePath: "/pages/index/index",
-							navigateType: "switchTab",
-							showBig: false,
-							fontClass: "tn-icon-home-capsule",
-							"iconPath": "/static/images/tabs/index.png",
-							"selectedIconPath": "/static/images/tabs/indexs.png",
-							"text": "首页"
-						},
-						{
-							pagePath: "/pages/template/template",
-							navigateType: "switchTab",
-							showBig: false,
-							fontClass: "tn-icon-cube",
-							"iconPath": "/static/images/tabs/joblist.png",
-							"selectedIconPath": "/static/images/tabs/joblists.png",
-							"text": "应用"
-						},
+					list: [
+						// {
+						// 	pagePath: "/pages/index/index",
+						// 	navigateType: "switchTab",
+						// 	showBig: false,
+						// 	fontClass: "tn-icon-home-capsule",
+						// 	"iconPath": "/static/images/tabs/index.png",
+						// 	"selectedIconPath": "/static/images/tabs/indexs.png",
+						// 	"text": "首页"
+						// },
+						// {
+						// 	pagePath: "/pages/template/template",
+						// 	navigateType: "switchTab",
+						// 	showBig: false,
+						// 	fontClass: "tn-icon-cube",
+						// 	"iconPath": "/static/images/tabs/joblist.png",
+						// 	"selectedIconPath": "/static/images/tabs/joblists.png",
+						// 	"text": "应用"
+						// },
 						{
 							pagePath: "/pages/robot/index",
 							navigateType: "switchTab",
@@ -94,15 +95,15 @@
 							"selectedIconPath": "/static/images/tabs/joblists.png",
 							"text": "数字人"
 						},
-						{
-							pagePath: "/pages/painting/painting",
-							navigateType: "switchTab",
-							showBig: false,
-							fontClass: "tn-icon-image",
-							"iconPath": "/static/images/tabs/joblist.png",
-							"selectedIconPath": "/static/images/tabs/joblists.png",
-							"text": "绘画"
-						},
+						// {
+						// 	pagePath: "/pages/painting/painting",
+						// 	navigateType: "switchTab",
+						// 	showBig: false,
+						// 	fontClass: "tn-icon-image",
+						// 	"iconPath": "/static/images/tabs/joblist.png",
+						// 	"selectedIconPath": "/static/images/tabs/joblists.png",
+						// 	"text": "绘画"
+						// },
 						// {
 						// 	pagePath: "/pages/signin/signin",
 						// 	navigateType: "switchTab",

+ 17 - 9
pages/robot/generate/index.scss

xqd xqd xqd
@@ -21,15 +21,20 @@ page {
 			.top{
 				display: flex;
 				justify-content: center;
-				.videoBox{
-					// width: 442rpx;
-					// height: 786rpx;
-					width: 80%;
-					min-height: 465rpx;
-					background: #ccc;
+				.videoBox1{
+					width: 380rpx;
+					aspect-ratio: 9/16;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.videoBox2{
+					height: 380rpx;
+					aspect-ratio: 16/9;
 					image{
 						width: 100%;
-						// height: 100%;
+						height: 100%;
 					}
 				}
 			}
@@ -38,10 +43,11 @@ page {
 				display: flex;
 				justify-content: space-between;
 				height: 96rpx;
-				background: #ccc;
+				background: #26b3a0;
 				margin-top: 30rpx;
 				padding-left: 40rpx;
 				padding-right: 40rpx;
+				color: white;
 				.barItem{
 					display: flex;
 					align-items: center;
@@ -614,7 +620,9 @@ page {
 			.label{
 			}
 			.con{
-				
+				display: flex;
+				align-items: center;
+				padding-top: 5rpx;
 			}
 			.conImg{
 				width:50rpx;

+ 99 - 27
pages/robot/generate/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -4,14 +4,23 @@
 		<view class="pos">
 		</view>
 		<view class="context">
-			<view class="top">
-				<view class="videoBox">
-					<image v-if="selBgPic" :src="selBgPic"></image>
-					<view v-else class="emptyVideo"></view>
+			<view class="top" @click="show4=true">
+				<view class="videoBox1" v-if="bgItem.scale==1&&selBgPic">
+					<image class="img16" :src="selBgPic" mode=""></image>
+					<!-- <view v-else class="emptyVideo" style="background: #ccc;height: 100%;"></view> -->
+				</view>
+				<view class="videoBox2" v-if="bgItem.scale==2&&selBgPic" :style="{}">
+					<image class="img16" :src="selBgPic" mode=""></image>
+				</view>
+				<!-- <view class="videoBox2" v-if="!bgItem.scale&&selBgPic" :style="{}">
+					<image class="img16" :src="selBgPic" mode=""></image>
+				</view> -->
+				<view class="videoBox" v-if="!bgItem.scale&&!selBgPic" :style="{minHeight:!selBgPic?'465rpx':''}">
+					<view class="emptyVideo" style="background: #ccc;height: 100%;"></view>
 				</view>
 			</view>
 			<view class="selCon">
-				<view class="item">
+				<view class="item" @click="show=true">
 					<view class="label">
 						语速:
 					</view>
@@ -19,14 +28,14 @@
 						{{roundRate}}X
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" @click="show1=true">
 					<view class="label">
 						声音:{{selVoiceItem.name}}
 					</view>
 					<image class="conImg" :src="selVoiceItem.url">
 					</image>
 				</view>
-				<view class="item">
+				<view class="item" @click="show3=true">
 					<view class="label">
 						角色:{{selRoleItem.name}}
 					</view>
@@ -36,8 +45,9 @@
 			</view>
 			<view class="centerMenuBar">
 				<view class="barItem" v-for="(item,index) in menuList" @click="handleSetBox(item)">
-					<view class="left">
-						<image src="/static/images/head.jpg" mode=""></image>
+					<view class="left"
+						style="display: flex;justify-content: center;align-items: center;background: #fff;border-radius: 50%;">
+						<text class="iconfont " :class="[item.icon]" style="color: #26b3a0;font-weight: 600;"></text>
 					</view>
 					<view class="right">
 						{{item.name}}
@@ -90,7 +100,7 @@
 			</view>
 		</u-popup>
 		<!-- 声音 -->
-		<u-popup :show="show1" @close="close" @open="open">
+		<u-popup :show="show1" @close="close1" @open="open">
 			<view class="contentBox">
 				<view class="toolBar">
 					<view class="cancel" @click="show1=false">
@@ -133,7 +143,7 @@
 			</view>
 		</u-popup>
 		<!-- 模型 -->
-		<u-popup :show="show3" @close="close" @open="open">
+		<u-popup :show="show3" @close="close3" @open="open">
 			<view class="contentBox2">
 				<view class="toolBar">
 					<view class="cancel" @click="show3=false">
@@ -171,7 +181,7 @@
 		</u-popup>
 
 		<!-- 背景 -->
-		<u-popup :show="show4" @close="close" @open="open">
+		<u-popup :show="show4" @close="close4" @open="open">
 			<view class="contentBox2">
 				<view class="toolBar">
 					<view class="cancel" @click="show4=false">
@@ -311,6 +321,9 @@
 	export default {
 		data() {
 			return {
+				bgItem: {
+
+				},
 				show5: false,
 
 				show4: false,
@@ -385,19 +398,19 @@
 				value: 1,
 				show: false,
 				menuList: [{
-						icon: '',
+						icon: 'icon-sudu',
 						name: '全局语速'
 					},
 					{
-						icon: '',
+						icon: 'icon-beijingtupian',
 						name: '声音'
 					},
 					{
-						icon: '',
+						icon: 'icon-jurassic_add-user',
 						name: '角色'
 					},
 					{
-						icon: '',
+						icon: 'icon-beijingtupian',
 						name: '背景'
 					},
 				],
@@ -418,7 +431,8 @@
 				detail: {},
 
 				roundRate: 1,
-				isGenerate: false
+				isGenerate: false,
+				isCreate: false
 			};
 		},
 		computed: {
@@ -431,7 +445,21 @@
 		onUnload() {
 
 		},
-		onLoad() {
+		onLoad(o) {
+			if (o.type == 'create') {
+				this.isCreate = true
+				this.selRoleId = 5
+				this.selBgId = 0
+				this.selVoiceId = 9
+				this.roundRate = 1
+				this.voiceRate = 1
+				return
+				console.log('create')
+			}
+
+
+
+
 			this.detail = getApp().draftDetail
 
 			this.robotName = getApp().draftDetail.name
@@ -442,21 +470,26 @@
 			this.voiceRate = getApp().draftDetail.stage
 
 			this.selBgPic = getApp().draftDetail.backs.url
+			this.bgItem = getApp().draftDetail.backs
+
 			this.roundRate = getApp().draftDetail.stage
 			this.selVoiceItem = getApp().draftDetail.audios
 			this.selRoleItem = getApp().draftDetail.roles
-
-			console.log('传过来的草稿项:', this.detail);
+			console.log('传过来的草稿项:', this.detail, this.selBgPic);
 		},
 		async onShow() {
 			let res = await roleList({})
 			if (res.code == 0) {
-				// this.roleList = res.data
+
 				this.roleList = res.msg
 				console.log('数字人角色列表返回值:', res);
 				this.currTabIndexModal = res.msg.findIndex((item, index) => {
 					return item.id == this.selRoleId + 1
 				})
+
+				if (this.isCreate) {
+					this.selRoleItem = this.roleList[5]
+				}
 			} else {
 				uni.showToast({
 					title: res.msg,
@@ -472,6 +505,9 @@
 				this.currTabIndexAll = res1.msg.findIndex((item, index) => {
 					return item.id == this.selVoiceId + 1
 				})
+				if (this.isCreate) {
+					this.selVoiceItem = this.allList[9]
+				}
 
 			} else {
 				uni.showToast({
@@ -488,6 +524,10 @@
 				this.currTabIndexBg = res3.msg.findIndex((item, index) => {
 					return item.id == this.selBgId + 1
 				})
+				if (this.isCreate) {
+					this.selBgPic = this.bgPicList[0].url
+					this.bgItem = this.bgPicList[0]
+				}
 				console.log('index3', this.currTabIndexBgc);
 			} else {
 				uni.showToast({
@@ -501,7 +541,20 @@
 		},
 
 		methods: {
+			close() {
+				this.show = false
+			},
+			close1() {
+				this.show1 = false
+			},
+			close3() {
+				this.show3 = false
+			},
+			close4() {
+				this.show4 = false
+			},
 			handleSelBg(item, index) {
+				this.bgItem = item
 				this.selBgPic = item.url
 				this.selBgId = item.id - 1
 				this.currTabIndexBg = index
@@ -520,12 +573,23 @@
 				let parmas = {
 					name: this.robotName,
 					content: this.textAreaValue,
-					role: this.selRoleId,
-					back: this.selBgId,
-					audio: this.selVoiceId,
+					// role: this.selRoleId,
+					// back: this.selBgId,
+					// audio: this.selVoiceId,
 					stage: this.roundRate,
 					is_draft: 1
 				}
+				if (this.selRoleId != -1) {
+					parmas['role'] = this.selRoleId
+				}
+				if (this.selBgId != -1) {
+					parmas['back'] = this.selBgId
+				}
+				if (this.selVoiceId != -1) {
+					parmas['audio'] = this.selVoiceId
+				}
+
+
 				console.log('保存数字人草稿参数:', parmas);
 				let res = await generateWork(parmas)
 				if (res.code == 0) {
@@ -536,6 +600,11 @@
 					setTimeout(() => {
 						uni.navigateBack()
 					}, 1500)
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
 				}
 				console.log('保存数字人草稿返回值:', res);
 			},
@@ -567,9 +636,15 @@
 						title: '创建数字人成功!',
 						icon: 'success'
 					})
+					getApp().from = 'create'
 					setTimeout(() => {
 						uni.navigateBack()
 					}, 1500)
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
 				}
 				console.log('生成数字人返回值:', res);
 			},
@@ -622,9 +697,6 @@
 			handleConfirm(e) {
 				this.showMoreMenu = false
 			},
-			close() {
-				// console.log('close()');
-			},
 			open() {
 				// console.log('open() ');
 			}

+ 19 - 14
pages/robot/index.scss

xqd xqd xqd xqd xqd
@@ -16,6 +16,7 @@ page {
 		.createPro{
 			border-radius: 15rpx;
 			height: 306rpx;
+			// aspect-ratio: 7/3;
 			background: #999;
 			display: flex;
 			align-items: center;
@@ -52,7 +53,9 @@ page {
 				}
 				.draftList{
 					display: flex;
+					justify-content: space-between;
 					flex-wrap: wrap;
+					justify-content: space-between;
 					.itemBox{
 						width: 50%;
 						display: flex;
@@ -60,28 +63,29 @@ page {
 						align-items: center;
 						margin-bottom: 30rpx;
 						.top{
-							width: 320rpx;
-							min-height: 470rpx;
-							background: #ccc;
+							width: 95%;
 							border-radius: 15rpx;
 							position: relative;
+							aspect-ratio: 9/16;
+							background: #ccc;
+							z-index: 1;
 							image{
 								width: 100%;
-								// height: auto;
+								height:100%;
 								border-radius: 15rpx;
 							}
 							
 							.preloader_1 {
 								position: absolute;
-								// right: 8%;
-								// bottom: 12%;
-								// position: fixed;
-								// right: 58%;
 								margin-right: 65px;
 								top:50%;
-								left: 30%;
-								transform: translateX(-50%);
-								background: #ccc;
+								width: 100%;
+							
+								left:50%;
+								transform: translateX(-5%);
+								background: red;
+								width: 100%;
+								z-index: 9;
 							}
 							
 							.preloader_1 view {
@@ -145,7 +149,8 @@ page {
 							align-items: center;
 							justify-content: space-between;
 							margin-top: 15rpx;
-							width: 320rpx;
+							// width: 320rpx;
+							width: 95%;
 							padding-right: 25rpx;
 							.left{
 								
@@ -165,10 +170,10 @@ page {
 	}
 
 	.tipBox{
-		// position: relative;
 		.tip{
 			position: absolute;
 			bottom: 25%;
-			left: 30%;
+		width: 100%;
+		text-align: center;
 		}
 	}

+ 53 - 11
pages/robot/index.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -16,14 +16,15 @@
 					</view>
 				</view>
 			</view>
-			<view class="draft">
+			<view class="draft" v-if="draftList.length!=0">
 				<view class="draftLabel">
 					草稿
 				</view>
 				<view class="draftList">
 					<view class="itemBox" v-for="(item,index) in draftList" @click="toCreateDetail(item)">
-						<view class="top">
-							<image src="/static/images/head.jpg" mode=""></image>
+						<view class="top"
+							style="display: flex;justify-content: center;align-items: center;aspect-ratio: 4/3;">
+							<text class="iconfont icon-caogao" style="color: white;font-size: 46rpx;"></text>
 						</view>
 						<view class="bottom">
 							<view class="left">
@@ -44,11 +45,12 @@
 				</view>
 				<view class="draftList">
 					<view class="itemBox" v-for="(item,index) in workList" @click="goWorkDetail(item)">
-						<view class="top">
-							<image :src="item.cover" mode="" v-if="item.state"></image>
+						<view class="top" :style="{minHeight:isPc?'rpx':'470rpx'}">
+							<image :src="item.cover" mode="aspectFit" v-if="item.state">
+							</image>
 
 							<view class="tipBox" v-else>
-								<view class="preloader_1">
+								<view class="preloader_1" :style="{left:isPc?'':'40%'}">
 									<view></view>
 									<view></view>
 									<view></view>
@@ -81,8 +83,9 @@
 			<!-- <button @click="test">测试网络请求</button> -->
 
 
-			<u-picker :showIcon="true" :show="showMoreMenu" :columns="columns" title="更多" confirmColor=""
-				@cancel="showMoreMenu=false" @confirm="handleConfirm"></u-picker>
+			<u-picker :closeOnClickOverlay="true" :showIcon="true" :show="showMoreMenu" :columns="columns" title="更多"
+				confirmColor="" @cancel="showMoreMenu=false" @confirm="handleConfirm"
+				@close="showMoreMenu=false"></u-picker>
 
 			<wike-tabbar :onTabbar="true" :isShowAnimate="true"></wike-tabbar>
 		</view>
@@ -111,7 +114,9 @@
 				delItem: {},
 				delIndex: -1,
 
-				is_wx: false
+				is_wx: false,
+				isPc: false,
+				timer: null
 			};
 		},
 		computed: {
@@ -124,10 +129,45 @@
 		onUnload() {
 
 		},
-		onLoad() {
+		onLoad(o) {
+
+
 
 		},
 		onShow() {
+			let _this = this
+			if (getApp().from == 'create') {
+				_this.timer = setInterval(async () => {
+					let res = await workList({})
+					if (res.code == 0) {
+						_this.workList = res.data
+						let allSuc = res.data.every((item, index) => {
+							return item.state == 1
+						})
+						if (allSuc) {
+							clearInterval(_this.timer)
+						}
+						console.log('定时器--数字人作品列表返回值:', res);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				}, 10000)
+			}
+			getApp().from = ''
+
+			const userAgent = navigator.userAgent.toLowerCase();
+			if (/ipad|iphone|midp|rv:1.2.3.4|ucweb|android|windows ce|windows mobile/.test(userAgent)) {
+				// 移动端
+				console.log('移动端')
+				this.isPc = false
+			} else {
+				// pc端
+				this.isPc = true
+				console.log('PC端')
+			}
 			// console.log('1213', download);
 			this.getIndexData()
 			this.is_wx = this.is_weixin()
@@ -255,7 +295,7 @@
 			},
 			handleCreatePro() {
 				uni.navigateTo({
-					url: '/pages/robot/generate/index'
+					url: '/pages/robot/generate/index?type=create'
 				})
 			},
 			handleShowMoreMenu(item, index) {
@@ -325,6 +365,8 @@
 					} else {
 						if (detectDeviceType()) {
 							// PC端
+							// this.delItem.url = 'http://www.liwantao.top/test.mp4'
+
 							downLoad3(this.delItem.url, '数字人' + this.delItem.name + '视频', 'video/mp4')
 						} else {
 							// 其他移动端浏览器

+ 449 - 373
pages/user/signin.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -4,58 +4,50 @@
 			<tn-nav-bar backgroundColor="#fff" :bottomShadow="false">登录</tn-nav-bar>
 			<view :style="{height: tobheight+'px'}"></view>
 		</view>
-		<block >
+		<block>
 			<view class="signin">
-					<!-- 注册账户 -->
-				</view>
-				<view class="site_logo">
-					<image class="weixin" :src="appInfo.site_logo_path" mode="aspectFill"></image>
-				</view>
-				<view class="site_name">{{appInfo.site_name}}</view>
-				<view class="detailed">
-					<view class="">欢迎畅游{{appInfo.site_name}}</view>
-					<view class="">登录后,可免费获得问答及优惠套餐等服务</view>
-				</view>
-				<u-popup :show="showlogin" mode="bottom" :round="10" closeable @close="showlogin = false">
+				<!-- 注册账户 -->
+			</view>
+			<view class="site_logo">
+				<image class="weixin" :src="appInfo.site_logo_path" mode="aspectFill"></image>
+			</view>
+			<view class="site_name">{{appInfo.site_name}}</view>
+			<view class="detailed">
+				<view class="">欢迎畅游{{appInfo.site_name}}</view>
+				<view class="">登录后,可免费获得问答及优惠套餐等服务</view>
+			</view>
+			<u-popup :show="showlogin" mode="bottom" :round="10" closeable @close="showlogin = false">
 				<view class="container">
 					<view class="textl_ogin">{{showlogon?'账号密码登录':'账号密码注册'}}</view>
-					<!-- 账号密码登录 -->	 
-						<view class="login">
-							<view class="input u-flex align-center">
-								<u-icon name="account-fill" color="#26B3A0" size="24"></u-icon>
-								<input class="vs-flex-item" v-model="accountLogin.account" :maxlength="11" placeholder="请输入账号" />
-							</view>
-							<view class="input u-flex align-center">
-								<u-icon name="lock-fill" color="#26B3A0" size="24"></u-icon>
-								<input
-									class="vs-flex-item"
-									type="text"
-									:password="password"
-									v-model="accountLogin.password"
-									placeholder="请输入登录密码"
-									placeholder-class="input-placeholder"
-								/>
-								<u-icon @click="password = !password" :name="password ? 'eye-off' : 'eye-fill'" color="#26B3A0" size="18"></u-icon>
-							</view>
-							<view v-if="!showlogon" class="input u-flex align-center">
-								<u-icon name="lock-fill" color="#26B3A0" size="24"></u-icon>
-								<input
-									class="vs-flex-item"
-									type="text"
-									:password="twopassword"
-									v-model="password2"
-									placeholder="请再次确认登录密码"
-									placeholder-class="input-placeholder"
-								/>
-								<u-icon @click="twopassword = !twopassword" :name="twopassword ? 'eye-off' : 'eye-fill'" color="#26B3A0" size="18"></u-icon>
-							</view>
+					<!-- 账号密码登录 -->
+					<view class="login">
+						<view class="input u-flex align-center">
+							<u-icon name="account-fill" color="#26B3A0" size="24"></u-icon>
+							<input class="vs-flex-item" v-model="accountLogin.account" :maxlength="11"
+								placeholder="请输入账号" />
+						</view>
+						<view class="input u-flex align-center">
+							<u-icon name="lock-fill" color="#26B3A0" size="24"></u-icon>
+							<input class="vs-flex-item" type="text" :password="password" v-model="accountLogin.password"
+								placeholder="请输入登录密码" placeholder-class="input-placeholder" />
+							<u-icon @click="password = !password" :name="password ? 'eye-off' : 'eye-fill'"
+								color="#26B3A0" size="18"></u-icon>
 						</view>
-						<view @click="getlogin()" hover-class="hoversubmit" class="signinnow">{{showlogon?'立即登录':'立即注册'}}</view>
+						<!-- 	<view v-if="!showlogon" class="input u-flex align-center">
+							<u-icon name="lock-fill" color="#26B3A0" size="24"></u-icon>
+							<input class="vs-flex-item" type="text" :password="twopassword" v-model="password2"
+								placeholder="请再次确认登录密码" placeholder-class="input-placeholder" />
+							<u-icon @click="twopassword = !twopassword" :name="twopassword ? 'eye-off' : 'eye-fill'"
+								color="#26B3A0" size="18"></u-icon>
+						</view> -->
+					</view>
+					<view @click="getlogin()" hover-class="hoversubmit" class="signinnow">{{showlogon?'立即登录':'立即注册'}}
+					</view>
 				</view>
-				</u-popup>
+			</u-popup>
 			<!-- #ifdef MP-WEIXIN -->
 			<view class="flxe justify-center">
-				<view class="grant" @click="showAuthorizationModal = true">				
+				<view class="grant" @click="showAuthorizationModal = true">
 					<u-icon name="weixin-fill" color="#ffffff" size="26"></u-icon>
 					<view class="dlu">微信授权登录</view>
 				</view>
@@ -72,21 +64,23 @@
 						</view>
 					</view>
 					<view v-if="appInfo.is_account&&appInfo.is_account==1" class="flxe justify-center">
-						<view class="grants" @click="showlogon = true,showlogin = true">						
+						<view class="grants" @click="showlogon = true,showlogin = true">
 							<u-icon name="account-fill" color="#199063" size="26"></u-icon>
 							<view class="dlu">账号密码登录</view>
 						</view>
 					</view>
-						<view v-if="appInfo.is_account&&appInfo.is_account==1" @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">未注册账号?点击去注册></view>
+					<view v-if="appInfo.is_account&&appInfo.is_account==1" @click="showlogon = false,showlogin = true"
+						class="toregister flxe justify-center">未注册账号?点击去注册></view>
 				</block>
 				<block v-if="appInfo.h5_run_mode == 2">
 					<view class="flxe justify-center">
-						<view class="grants" @click="showlogon = true,showlogin = true">						
+						<view class="grants" @click="showlogon = true,showlogin = true">
 							<u-icon name="account-fill" color="#199063" size="26"></u-icon>
 							<view class="dlu">账号密码登录</view>
 						</view>
 					</view>
-						<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">未注册账号?点击去注册></view>
+					<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">
+						未注册账号?点击去注册></view>
 				</block>
 				<block v-if="appInfo.h5_run_mode == 3">
 					<view v-if="platform == 'wxOfficialAccount'" class="flxe justify-center">
@@ -97,16 +91,17 @@
 					</view>
 					<block v-if="platform == 'H5'">
 						<view class="flxe justify-center">
-							<view class="grants" @click="showlogon = true,showlogin = true">						
+							<view class="grants" @click="showlogon = true,showlogin = true">
 								<u-icon name="account-fill" color="#199063" size="26"></u-icon>
 								<view class="dlu">账号密码登录</view>
 							</view>
 						</view>
-							<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">未注册账号?点击去注册></view>
+						<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">
+							未注册账号?点击去注册></view>
 					</block>
 				</block>
 			</block>
-			
+
 			<block v-else>
 				<view v-if="platform == 'wxOfficialAccount'" class="flxe justify-center">
 					<view class="grant" @click="thirdLogin('wechat')">
@@ -116,67 +111,81 @@
 				</view>
 				<block v-if="platform == 'H5'">
 					<view class="flxe justify-center">
-						<view class="grants" @click="showlogon = true,showlogin = true">						
+						<view class="grants" @click="showlogon = true,showlogin = true">
 							<u-icon name="account-fill" color="#199063" size="26"></u-icon>
 							<view class="dlu">账号密码登录</view>
 						</view>
 					</view>
-						<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">未注册账号?点击去注册></view>
+					<view @click="showlogon = false,showlogin = true" class="toregister flxe justify-center">
+						未注册账号?点击去注册></view>
 				</block>
 			</block>
 			<!-- #endif -->
 			<!-- <view class="">{{appInfo.h5_run_mode}}</view> -->
-				<view @tap="agree = true" class="flxe align-center justify-center" style="margin-top: 50rpx;">
-					<u-icon name="checkmark-circle-fill" :color="agree?'#07C160':'#ededed'" size="16"></u-icon>
-					<view class="clause">我已阅读并同意:<view @tap.stop="agreement('privacy')" style="color: #34c758;">《隐私政策》</view>和<view @tap.stop="agreement('use')" style="color: #34c758;">《使用协议》</view></view>
+			<view @tap="agree = true" class="flxe align-center justify-center" style="margin-top: 50rpx;">
+				<u-icon name="checkmark-circle-fill" :color="agree?'#07C160':'#ededed'" size="16"></u-icon>
+				<view class="clause">我已阅读并同意:<view @tap.stop="agreement('privacy')" style="color: #34c758;">《隐私政策》
+					</view>和<view @tap.stop="agreement('use')" style="color: #34c758;">《使用协议》</view>
 				</view>
+			</view>
 		</block>
 		<wike-loading-page :isLoading="isLoading"></wike-loading-page>
-		<tnui-wx-user-info
-		          v-model="showAuthorizationModal"
-		          @updated="updatedUserInfoEvent"
-		        ></tnui-wx-user-info>
+		<tnui-wx-user-info v-model="showAuthorizationModal" @updated="updatedUserInfoEvent"></tnui-wx-user-info>
 	</view>
 </template>
 
 <script>
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
 	import wechat from '@/common/wechat/wechat';
 	import TnuiWxUserInfo from '@/components/tnui-wx-user-info/tnui-wx-user-info';
+
+	import {
+		register,
+		login
+	} from '@/api/robot/index.js'
 	export default {
-		 components: { TnuiWxUserInfo },
+		components: {
+			TnuiWxUserInfo
+		},
 		data() {
 			return {
-				agree:true,
+				agree: true,
 				showAuthorizationModal: false,
-				tobheight:45,
+				tobheight: 45,
 				platform: this.$platform.get(),
-				h5_runmode:['wxOfficialAccount','H5'],
-				isLoading:true,
-				showlogin:false,
-				password:true,
-				twopassword:true,
-				accountLogin:{account:'',
-password:'',},
-password2:'',
-                showlogon:true,
-				route:''
+				h5_runmode: ['wxOfficialAccount', 'H5'],
+				isLoading: true,
+				showlogin: false,
+				password: true,
+				twopassword: true,
+				accountLogin: {
+					account: '',
+					password: '',
+				},
+				password2: '',
+				showlogon: true,
+				route: ''
 				// register:0
 			}
 		},
 		computed: {
-			...mapGetters(['appInfo','userInfo','isLogin'])
+			...mapGetters(['appInfo', 'userInfo', 'isLogin'])
 		},
 		onLoad(option) {
 			// console.log(option);
 			const that = this;
 			that.isLoading = false
-			if(that.platform == 'wxMiniProgram'){
-			var menumtop = uni.getMenuButtonBoundingClientRect().top - uni.getSystemInfoSync().statusBarHeight
-			var paddingtop = uni.getSystemInfoSync().statusBarHeight + menumtop
-			that.tobheight = (menumtop+paddingtop+uni.getMenuButtonBoundingClientRect().height)
+			if (that.platform == 'wxMiniProgram') {
+				var menumtop = uni.getMenuButtonBoundingClientRect().top - uni.getSystemInfoSync().statusBarHeight
+				var paddingtop = uni.getSystemInfoSync().statusBarHeight + menumtop
+				that.tobheight = (menumtop + paddingtop + uni.getMenuButtonBoundingClientRect().height)
 			}
-			console.log(that.appInfo.h5_run_mode,that.platform);
+			console.log(that.appInfo.h5_run_mode, that.platform);
 			// #ifdef H5
 			const {
 				code,
@@ -185,51 +194,53 @@ password2:'',
 			} = option;
 			that.option = option;
 			if (code && scope !== 'snsapi_base') {
-				that.$http('wechat.wechatAuth',{code: option.code},
-				).then(res => {
+				that.$http('wechat.wechatAuth', {
+					code: option.code
+				}, ).then(res => {
 					// console.log(res);				
-					if(res.code == 0){
+					if (res.code == 0) {
 						uni.setNavigationBarTitle({
 							title: that.appInfo.site_name
 						});
 						that.$store.dispatch('getUserInfo', res.data.token);
 						// if(!res.data.phone){
-							
+
 						// 	that.showAuthorizationModal = true;
 						// }else{
-							uni.showToast({
-								title:'登录成功'
-							})
-							setTimeout(function(){
-							
+						uni.showToast({
+							title: '登录成功'
+						})
+						setTimeout(function() {
+
 							const value = uni.getStorageSync('route');
 							// console.log(value);
-								if (value) {
-									if(value == '/pages/chat/chat' || value == '/pages/template/detail' || value == '/pages/painting/draw'){
-										uni.reLaunch({
-											url: value,
-										})
-										uni.removeStorageSync('route');
-										return;
-									}
-									uni.switchTab({
-										url: value
+							if (value) {
+								if (value == '/pages/chat/chat' || value == '/pages/template/detail' ||
+									value == '/pages/painting/draw') {
+									uni.reLaunch({
+										url: value,
 									})
 									uni.removeStorageSync('route');
-								}else{
-									uni.switchTab({
-										url:'/pages/user/user'
-									})
+									return;
 								}
-							},1000);
+								uni.switchTab({
+									url: value
+								})
+								uni.removeStorageSync('route');
+							} else {
+								uni.switchTab({
+									url: '/pages/user/user'
+								})
+							}
+						}, 1000);
 						// }
-						
-						
+
+
 					}
 				});
 			}
 			// #endif
-			
+
 		},
 		methods: {
 			...mapActions(['getUserInfo']),
@@ -257,16 +268,16 @@ password2:'',
 					// that.nickName = user.nickName;
 					// that.closeAuthModal();
 					that.getUserInfo();
-					
-					
+
+
 				}
 				if (user.errMsg == 'getUserProfile:fail auth deny') {
 					// this.mobilelogin = false;
 					uni.showToast({
-						title:'已取消登录',
-						icon:'none'
+						title: '已取消登录',
+						icon: 'none'
 					})
-				}else{					
+				} else {
 					that.shgfgh()
 				}
 				// #endif
@@ -278,8 +289,8 @@ password2:'',
 			// 		}
 			// 	})
 			// },
-			updatedUserInfoEvent(e){
-				
+			updatedUserInfoEvent(e) {
+
 				// console.log(e);
 				// uni.showToast({
 				// 	title:'已取消登录',
@@ -288,333 +299,398 @@ password2:'',
 				// uni.navigateBack({
 				// })
 			},
-			getlogin(){
-				if(!this.accountLogin.account){
+			async getlogin() {
+				if (!this.accountLogin.account) {
 					uni.showToast({
-						title:'请输入账号',
-						icon:'none'
+						title: '请输入账号',
+						icon: 'none'
 					})
 					return;
 				}
-				if(!uni.$u.test.rangeLength(this.accountLogin.account, [4, 16])){
+				if (!uni.$u.test.rangeLength(this.accountLogin.account, [4, 16])) {
 					uni.showToast({
-						title:'账号不能低于4位和高于16位',
-						icon:'none'
+						title: '账号不能低于4位和高于16位',
+						icon: 'none'
 					})
 					return;
 				}
-				if(!this.accountLogin.password){
+				if (!this.accountLogin.password) {
 					uni.showToast({
-						title:'请输入密码',
-						icon:'none'
+						title: '请输入密码',
+						icon: 'none'
 					})
 					return;
 				}
-				if(!uni.$u.test.rangeLength(this.accountLogin.password, [4, 16])){
+				if (!uni.$u.test.rangeLength(this.accountLogin.password, [4, 16])) {
 					uni.showToast({
-						title:'密码不能低于4位和高于16位',
-						icon:'none'
+						title: '密码不能低于4位和高于16位',
+						icon: 'none'
 					})
 					return;
 				}
-				
-				 if (/.*[\u4e00-\u9fa5]+.*$/.test(this.accountLogin.password)){
-					 uni.showToast({
-					 	title:'密码不能含有汉字',
-					 	icon:'none'
-					 })
-					 return;
-				 }
-				if(!this.showlogon&&!this.password2){
+
+				if (/.*[\u4e00-\u9fa5]+.*$/.test(this.accountLogin.password)) {
 					uni.showToast({
-						title:'请再次确认密码',
-						icon:'none'
+						title: '密码不能含有汉字',
+						icon: 'none'
 					})
 					return;
 				}
-				
-				if(!uni.$u.test.enOrNum(this.accountLogin.password)||!uni.$u.test.enOrNum(this.password2)){
+				// if (!this.showlogon && !this.password2) {
+				// 	uni.showToast({
+				// 		title: '请再次确认密码',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+
+				if (!uni.$u.test.enOrNum(this.accountLogin.password) || !uni.$u.test.enOrNum(this.password2)) {
 					uni.showToast({
-						title:'密码只能是字母和数字',
-						icon:'none'
+						title: '密码只能是字母和数字',
+						icon: 'none'
 					})
 					return;
 				}
-				if(!this.showlogon&&this.accountLogin.password != this.password2){
-					uni.showToast({
-						title:'两次密码不相同,请重新确认',
-						icon:'none'
+				// if (!this.showlogon && this.accountLogin.password != this.password2) {
+				// 	uni.showToast({
+				// 		title: '两次密码不相同,请重新确认',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+
+				// 新登录接口
+				if (!this.showlogon) {
+					let res = await register({
+						account: this.accountLogin.account,
+						password: this.accountLogin.password
 					})
-					return;
-				}
-				this.$http(this.showlogon?'user.login':'user.register',this.accountLogin).then(res=>{
-						if (res.code === 0) {
-							var z = this.showlogon?'登录成功':'注册登录成功'
-							
-								this.$store.dispatch('getUserInfo', this.showlogon?res.data.user.token:res.data.token);
-							
-							
-							uni.showToast({
-								title:z
+					console.log('注册参数:', {
+						account: this.accountLogin.account,
+						password: this.accountLogin.password
+					});
+					console.log('注册返回值:', res);
+					if (res.code == 0) {
+						this.showlogon = true
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				} else {
+					let res = await login({
+						account: this.accountLogin.account,
+						password: this.accountLogin.password
+					})
+					console.log('登录参数:', {
+						account: this.accountLogin.account,
+						password: this.accountLogin.password
+					});
+					if (res.code == 0) {
+						uni.setStorageSync('token', res.data.token)
+						uni.showToast({
+							title: '登录成功',
+							icon: 'none'
+						})
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/robot/index'
 							})
-							setTimeout(function(){
+						}, 1500)
+						console.log('登录返回值:', res, res.data.token);
+					}
+				}
+				return
+
+
+				this.$http(this.showlogon ? 'user.login' : 'user.register', this.accountLogin).then(res => {
+					if (res.code === 0) {
+						var z = this.showlogon ? '登录成功' : '注册登录成功'
+
+						this.$store.dispatch('getUserInfo', this.showlogon ? res.data.user.token : res.data
+							.token);
+
+
+						uni.showToast({
+							title: z
+						})
+						setTimeout(function() {
 							// uni.switchTab({
 							// 	url:'/pages/user/user'
 							// })
 							const value = uni.getStorageSync('route');
 							// console.log(value);
-								if (value) {
-									if(value == '/pages/chat/chat' || value == '/pages/painting/draw' || value == '/pages/user/member/member'){
-										uni.reLaunch({
-											url: value,
-										})
-										uni.removeStorageSync('route');
-										return;
-									}
-									if(value.indexOf('/pages/template/detail') > -1){
-										uni.reLaunch({
-											url: value,
-										})
-										uni.removeStorageSync('route');
-										return;
-									}
-									uni.switchTab({
-										url: value
+							if (value) {
+								if (value == '/pages/chat/chat' || value == '/pages/painting/draw' ||
+									value == '/pages/user/member/member') {
+									uni.reLaunch({
+										url: value,
 									})
 									uni.removeStorageSync('route');
-								}else{
-									uni.switchTab({
-										url:'/pages/user/user'
+									return;
+								}
+								if (value.indexOf('/pages/template/detail') > -1) {
+									uni.reLaunch({
+										url: value,
 									})
+									uni.removeStorageSync('route');
+									return;
 								}
-							},1000);
-						}else{
-							// var z = this.showlogon?'登录失败':'注册登录失败'
-							// uni.showToast({
-							// 	title:z,
-							// 	icon:'none'
-							// })
-						}
-					})
+								uni.switchTab({
+									url: value
+								})
+								uni.removeStorageSync('route');
+							} else {
+								uni.switchTab({
+									url: '/pages/user/user'
+								})
+							}
+						}, 1000);
+					} else {
+						// var z = this.showlogon?'登录失败':'注册登录失败'
+						// uni.showToast({
+						// 	title:z,
+						// 	icon:'none'
+						// })
+					}
+				})
 			},
-			shgfgh(){
+			shgfgh() {
 				let that = this;
-				
+
 				// setTimeout(function(){
-					
-						uni.showToast({
-							title:'登录成功'
-						})
-						setTimeout(function(){
-						// uni.navigateBack()
-						uni.switchTab({
-							url:'/pages/user/user'
-						})
-						},1000);
-					
+
+				uni.showToast({
+					title: '登录成功'
+				})
+				setTimeout(function() {
+					// uni.navigateBack()
+					uni.switchTab({
+						url: '/pages/user/user'
+					})
+				}, 1000);
+
 				// },2000);
 			},
-			agreement(e){
+			agreement(e) {
 				uni.navigateTo({
-					url:'./public/agreement?type='+e
+					url: './public/agreement?type=' + e
 				})
 			},
 			// 绑定手机号
 			async getphone(e) {
 				let that = this;
-				   // uni.showLoading({
-				   // 	title:'绑定中...'
-				   // })
-					let res = await wechat.getPhoneNumber(e.detail);
-					// console.log(res)
-					if(res.code === 0){
-						// uni.showToast({
-						// 	title:that.cur?'绑定成功':'登录成功',
-						// 	duration:1500
-						// })
-						// that.whether = true;
-						// that.$store.commit('userInfo',res.data)
-						// uni.navigateTo({
-						// 	url:'/pages/public/webview?url=https://y.iduomi.cc/api/wechat_login.html'
-						// })
-					}				
+				// uni.showLoading({
+				// 	title:'绑定中...'
+				// })
+				let res = await wechat.getPhoneNumber(e.detail);
+				// console.log(res)
+				if (res.code === 0) {
+					// uni.showToast({
+					// 	title:that.cur?'绑定成功':'登录成功',
+					// 	duration:1500
+					// })
+					// that.whether = true;
+					// that.$store.commit('userInfo',res.data)
+					// uni.navigateTo({
+					// 	url:'/pages/public/webview?url=https://y.iduomi.cc/api/wechat_login.html'
+					// })
+				}
 			},
 		}
 	}
 </script>
 
 <style lang="scss">
-.signin{
-	font-weight: 700;
-	    font-size: 20px;
-	    color: #101010;
+	.signin {
+		font-weight: 700;
+		font-size: 20px;
+		color: #101010;
 		margin: 45rpx 76rpx 76rpx;
-		
-}
-.site_logo{
-	width: 100%;
-	display: flex;
-	justify-content: center;
-}
-.weixin{
-				width: 160rpx;
-				height: 160rpx;
-				border-radius: 50%;
-		}
-.site_name{
-	width: 100%;
-	display: flex;
-	justify-content: center;
-	font-size: 36rpx;
-	margin-top: 30rpx;
-	font-weight: bold;
-}
-.detailed{
-	color: #999;
-	font-size: 28rpx;
-	margin-top: 80rpx;
-	width: 100%;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	align-items: center;
-}
-.grant{
-	background:linear-gradient(to right, #00ca88, #00BCD4);
-	border: 1px solid #199063;
-	width: 80%;
-	height: 42px;
-	border-radius: 50rpx;
-	font-size: 28rpx;
-	color: #fff;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: bold;
-	margin-top: 180rpx;
-	position: relative;
-	.dlu{
-		padding-left: 12rpx;
+
 	}
-	.button{
-		position: absolute;
+
+	.site_logo {
 		width: 100%;
-		height: 80rpx;
-		opacity: 0;
+		display: flex;
+		justify-content: center;
 	}
-}
-
-.toregister{
-	font-size: 26rpx;
-	    margin-top: 16rpx;
-	    color: #c7c7cc;
-}
-.grants{
-	// background:linear-gradient(to right,#199063,#26C47D);
-	border: 1px solid #199063;
-	// background: #fff;
-	width: 80%;
-	height: 42px;
-	border-radius: 50rpx;
-	font-size: 28rpx;
-	color: #199063;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: bold;
-	margin-top: 38rpx;
-	position: relative;
-	.dlu{
-		padding-left: 12rpx;
+
+	.weixin {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 50%;
 	}
-	.button{
-		position: absolute;
+
+	.site_name {
 		width: 100%;
-		height: 80rpx;
-		opacity: 0;
+		display: flex;
+		justify-content: center;
+		font-size: 36rpx;
+		margin-top: 30rpx;
+		font-weight: bold;
+	}
+
+	.detailed {
+		color: #999;
+		font-size: 28rpx;
+		margin-top: 80rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
 	}
-}
-.clause{
-	display: flex;
-	justify-content: center;
-	font-size: 26rpx;
-	color: #c7c7cc;
-	
-	margin-left: 12rpx;
-}
-
-.getbutton{
-	position: absolute;
-	width: 100%;
-	height: 80rpx;
-	opacity: 0;
-	margin-top: 180rpx;
-}
-
-.container {
-	margin-top: 60rpx;
-	
-	.bg {
+
+	.grant {
+		background: linear-gradient(to right, #00ca88, #00BCD4);
+		border: 1px solid #199063;
+		width: 80%;
+		height: 42px;
+		border-radius: 50rpx;
+		font-size: 28rpx;
+		color: #fff;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		font-weight: bold;
+		margin-top: 180rpx;
 		position: relative;
-		height: 400rpx;
-		margin-bottom: 80rpx;
-	}
-	.topimg {
-		image {
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 50%;
+
+		.dlu {
+			padding-left: 12rpx;
+		}
+
+		.button {
+			position: absolute;
+			width: 100%;
+			height: 80rpx;
+			opacity: 0;
 		}
 	}
-	.textl_ogin {
-		font-size: 40rpx;
-		margin: 0 60rpx 50rpx;
-		font-weight: bold;
-	}
-	.login{
-		margin-bottom: 80rpx;
+
+	.toregister {
+		font-size: 26rpx;
+		margin-top: 16rpx;
+		color: #c7c7cc;
 	}
-	.signinnow{
-		background: #26C47D;
-		font-size: 34rpx;
-		color: #fff;
-		margin: 0 60rpx 40rpx;
-		text-align: center;
-		line-height: 90rpx;
-		height: 90rpx;
-		border-radius: 16rpx;
+
+	.grants {
+		// background:linear-gradient(to right,#199063,#26C47D);
+		border: 1px solid #199063;
+		// background: #fff;
+		width: 80%;
+		height: 42px;
+		border-radius: 50rpx;
+		font-size: 28rpx;
+		color: #199063;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		font-weight: bold;
-	}
-	.input {
-		// width: 630rpx;
-		height: 100rpx;
-		padding: 0 30rpx;
-		background: #f7f7f7;
-		border-radius: 16rpx;
-	    flex-direction: row;
-		// margin-left: 60rpx;
-		// margin-bottom: 40rpx;
-		margin: 0 60rpx 40rpx;
-		font-style: normal;
-		font-size: 30rpx;
-		font-family: Droid Sans Fallback;
-		&-icon {
-			width: 30rpx;
-			height: 38rpx;
+		margin-top: 38rpx;
+		position: relative;
+
+		.dlu {
+			padding-left: 12rpx;
+		}
+
+		.button {
+			position: absolute;
+			width: 100%;
+			height: 80rpx;
+			opacity: 0;
 		}
 	}
-	.hoversubmit{
-						background: #F7F7F7;
-						color: #ACACB3;
-					}
-	.vs-flex-item {
-		flex: 1;
-		margin-left: 16rpx;
+
+	.clause {
+		display: flex;
+		justify-content: center;
+		font-size: 26rpx;
+		color: #c7c7cc;
+
+		margin-left: 12rpx;
 	}
-}
 
+	.getbutton {
+		position: absolute;
+		width: 100%;
+		height: 80rpx;
+		opacity: 0;
+		margin-top: 180rpx;
+	}
+
+	.container {
+		margin-top: 60rpx;
+
+		.bg {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			height: 400rpx;
+			margin-bottom: 80rpx;
+		}
+
+		.topimg {
+			image {
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 50%;
+			}
+		}
+
+		.textl_ogin {
+			font-size: 40rpx;
+			margin: 0 60rpx 50rpx;
+			font-weight: bold;
+		}
+
+		.login {
+			margin-bottom: 80rpx;
+		}
+
+		.signinnow {
+			background: #26C47D;
+			font-size: 34rpx;
+			color: #fff;
+			margin: 0 60rpx 40rpx;
+			text-align: center;
+			line-height: 90rpx;
+			height: 90rpx;
+			border-radius: 16rpx;
+			font-weight: bold;
+		}
+
+		.input {
+			// width: 630rpx;
+			height: 100rpx;
+			padding: 0 30rpx;
+			background: #f7f7f7;
+			border-radius: 16rpx;
+			flex-direction: row;
+			// margin-left: 60rpx;
+			// margin-bottom: 40rpx;
+			margin: 0 60rpx 40rpx;
+			font-style: normal;
+			font-size: 30rpx;
+			font-family: Droid Sans Fallback;
+
+			&-icon {
+				width: 30rpx;
+				height: 38rpx;
+			}
+		}
 
-</style>
+		.hoversubmit {
+			background: #F7F7F7;
+			color: #ACACB3;
+		}
+
+		.vs-flex-item {
+			flex: 1;
+			margin-left: 16rpx;
+		}
+	}
+</style>

+ 1209 - 1064
pages/user/user.vue

xqd xqd xqd xqd xqd xqd xqd
@@ -1,17 +1,20 @@
 <template>
 	<view>
 		<view class="user" v-if="appInfo.page_template == 2 || appInfo.page_template == 1">
-			
+
 			<!-- 头部 -->
-			<view class="user-wrap" :style="{ backgroundImage: `url(${appInfo.user_bg_path ? appInfo.user_bg_path : 'https://source.iduomi.cc/user_bg.jpg'})` }">
+			<view class="user-wrap"
+				:style="{ backgroundImage: `url(${appInfo.user_bg_path ? appInfo.user_bg_path : 'https://source.iduomi.cc/user_bg.jpg'})` }">
 				<view class="setting iconfont icon31shezhi"></view>
 				<view v-if="isLogin" class="info">
-					<image @click="modify" class="avatar" mode="aspectFill" :src="userInfo.avatar ? userInfo.avatar : '/static/images/head.jpg'"></image>
-					<view class="nickname" >
-						<text @click="copyText(userInfo.id_number)">{{ userInfo.nickname ? userInfo.nickname : '默认用户'}}</text>
+					<image @click="modify" class="avatar" mode="aspectFill"
+						:src="userInfo.avatar ? userInfo.avatar : '/static/images/head.jpg'"></image>
+					<view class="nickname">
+						<text
+							@click="copyText(userInfo.id_number)">{{ userInfo.nickname ? userInfo.nickname : '默认用户'}}</text>
 						<u-icon name="edit-pen" color="#18b566" size="20" @click="modify"></u-icon>
 					</view>
-						
+
 				</view>
 				<view v-else class="info" @click="getlogin">
 					<image class="avatar" mode="aspectFill" src="/static/images/head.jpg"></image>
@@ -20,62 +23,62 @@
 			</view>
 
 			<!-- 订单状态 -->
-			<view class="order-status">
+			<view class="order-status" v-if="false">
 				<view class="status-wrap">
 					<!-- 单元格 -->
 					<view class="cell" style="background: #000000d4;height: 112rpx;">
 						<view class="cell-left">
-							<!-- <image class="cell-icon" src="/static/images/user/icon-order.png" mode="aspectFill"></image> -->
 							<u-icon name="integral" color="#ffd465" size="24"></u-icon>
-							<!-- <view class="u-flex"> -->
 							<block v-if="appInfo.number_member">
 								<block v-if="appInfo.number_member == 1">
-									<view class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</view>
+									<view class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">
+										{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}
+									</view>
 								</block>
 							</block>
 							<block v-else>
-								<view class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</view>
+								<view class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">
+									{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}
+								</view>
 							</block>
 							<block v-if="appInfo.number_member">
-								<view v-if="appInfo.time_member&&appInfo.number_member == 1&&appInfo.time_member == 1" class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">|</view>
+								<view v-if="appInfo.time_member&&appInfo.number_member == 1&&appInfo.time_member == 1"
+									class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">|
+								</view>
 							</block>
 							<block v-else>
-								<view v-if="appInfo.time_member&&appInfo.time_member == 1" class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">|</view>
+								<view v-if="appInfo.time_member&&appInfo.time_member == 1" class="cell-text"
+									style="color: #ffd465;font-size: 30rpx;font-weight: bold;">|</view>
 							</block>
-							<block  v-if="appInfo.time_member && appInfo.time_member == 1">
-								<view  style="flex-direction: column;display: flex;">
+							<block v-if="appInfo.time_member && appInfo.time_member == 1">
+								<view style="flex-direction: column;display: flex;">
 									<view class="cell-text" style="color: #ffd465;font-size: 30rpx;font-weight: bold;">
 										会员套餐:{{ userData.is_validity == 1 ? (userData.vip_time == 9999?'永久':userData.countdown+'天') : '0天' }}
-										
+
 									</view>
-									
-									
 								</view>
-								
-								
 							</block>
-							<!-- </view> -->
 						</view>
-						<!-- <view class="iconfont iconmore1"></view> -->
+
+
 						<!-- #ifdef MP-WEIXIN -->
-						<navigator v-if="device != 'ios'" class="b-btn" :url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'" @click="getroute">立即充值</navigator>
-						<navigator v-else-if="device == 'ios'&&show_ios_pay" class="b-btn" :url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'" @click="getroute">立即充值</navigator>
+						<navigator v-if="device != 'ios'" class="b-btn"
+							:url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'" @click="getroute">立即充值
+						</navigator>
+						<navigator v-else-if="device == 'ios'&&show_ios_pay" class="b-btn"
+							:url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'" @click="getroute">立即充值
+						</navigator>
 						<!-- #endif -->
 						<!-- #ifdef H5 -->
-						<navigator class="b-btn" :url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'" @click="getroute">立即充值</navigator>
+						<navigator class="b-btn" :url="isLogin ? '/pages/user/member/member' : '/pages/user/signin'"
+							@click="getroute">立即充值</navigator>
 						<!-- #endif -->
 					</view>
 
-					<!-- 订单状态 -->
-					<!-- <view class="status-list">
-					<view class="status-item" hover-class="btn-hover" v-for="(item, index) in orderStatusList" :key="index">
-						<view class="item-icon" :class="item.icon"></view>
-						<view class="item-text">{{ item.name }}</view>
-					</view>
-				</view> -->
+
 				</view>
 			</view>
-            
+
 			<!-- 滑动导航 -->
 			<!-- <view style="border-radius: 20rpx; overflow: hidden; margin: 0 20rpx;">
 			<com-nav :list="list" :col="4"></com-nav>
@@ -84,12 +87,8 @@
 				<view class="com-wrap">
 					<!-- #ifdef MP-WEIXIN -->
 					<view v-if="appInfo.wxad_user && appInfo.wxad_user >= 1">
-						<wike-flow-main
-							:flowtype="appInfo.wxad_user"
-							:banner_id="appInfo.banner_id"
-							:video_banner_id="appInfo.video_banner_id"
-							:native_id="appInfo.native_id"
-						></wike-flow-main>
+						<wike-flow-main :flowtype="appInfo.wxad_user" :banner_id="appInfo.banner_id"
+							:video_banner_id="appInfo.video_banner_id" :native_id="appInfo.native_id"></wike-flow-main>
 					</view>
 					<!-- #endif -->
 				</view>
@@ -106,7 +105,7 @@
 				</view>
 			</view>
 			<!-- 用户功能 -->
-			<view class="com-item">
+			<!-- <view class="com-item">
 				<view class="com-wrap">
 					<view class="cell" @click="showcarmi = true">
 						<view class="cell-left">
@@ -115,40 +114,52 @@
 						</view>
 						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
 					</view>
-					
-					<navigator class="cell" v-for="(item, index) in userList" :key="index" :url="isLogin ? item.url : '/pages/user/signin'" @click="getroute">
+					<navigator class="cell" v-for="(item, index) in userList" :key="index" :url="item.url"
+						@click="getroute">
 						<view class="cell-left">
-							<!-- <image class="cell-icon" :src="item.icon" mode="aspectFill"></image> -->
 							<u-icon :name="item.icon" :color="item.color" size="22"></u-icon>
 							<view class="cell-text">{{ item.title }}</view>
 						</view>
-						<!-- <view class="iconfont iconmore1"></view> -->
 						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
 					</navigator>
-					<navigator class="cell"  :url="isLogin ? '/pages/user/member/record' : '/pages/user/signin'" @click="getroute">
+					<navigator class="cell" :url="isLogin ? '/pages/user/member/record' : '/pages/user/signin'"
+						@click="getroute">
 						<view class="cell-left">
-							<!-- <image class="cell-icon" :src="item.icon" mode="aspectFill"></image> -->
 							<u-icon name="bookmark-fill" color="#892fe8" size="22"></u-icon>
 							<view class="cell-text">{{appInfo.number_alias?appInfo.number_alias:'点数'}}/会员套餐记录</view>
 						</view>
-						<!-- <view class="iconfont iconmore1"></view> -->
 						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
 					</navigator>
 				</view>
-			</view>
+			</view> -->
 
 			<!-- 用户服务 -->
 			<view class="com-item">
 				<view class="com-wrap">
-					<view v-if="qrcode" class="cell" @click="getqrcode">
-					<view class="cell-left">
-						<u-icon name="scan" color="#007aff" size="22"></u-icon>
-						<view class="cell-text">关注公众号</view>
+					<view v-if="qrcode" class="cell" @click="getlogin">
+						<view class="cell-left">
+							<!-- <u-icon name="scan" color="#007aff" size="22"></u-icon> -->
+							<view class="cell-text">立即登录</view>
+						</view>
+						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
 					</view>
-					<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
-					<!-- <button openType="contact" style="width: 85%;  background-color: red; position: absolute; opacity: 0;height: 10%;"></button> -->
-				</view>
-                     <!-- <view class="cell">
+
+					<view v-if="qrcode" class="cell" @click="loginout">
+						<view class="cell-left">
+							<!-- <u-icon name="scan" color="#007aff" size="22"></u-icon> -->
+							<view class="cell-text">退出登录</view>
+						</view>
+						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
+					</view>
+
+					<!-- 	<view v-if="qrcode" class="cell" @click="getqrcode">
+						<view class="cell-left">
+							<u-icon name="scan" color="#007aff" size="22"></u-icon>
+							<view class="cell-text">关注公众号</view>
+						</view>
+						<u-icon name="arrow-right" color="#9e9e9e" size="18"></u-icon>
+					</view> -->
+					<!-- <view class="cell">
                      	<view class="cell-left">
                      		<u-icon name="minus-circle-fill" color="#26B3A0" size="22"></u-icon>
                      		<view class="cell-text">使用教程</view>
@@ -162,214 +173,245 @@
 							<u-icon :name="item.icon" :color="item.color" size="22"></u-icon>
 							<view class="cell-text">{{ item.title }}</view>
 						</view>
-						<view v-if="item.text"  class="iconmore1">{{item.text}}</view>
+						<view v-if="item.text" class="iconmore1">{{item.text}}</view>
 						<u-icon v-else name="arrow-right" color="#9e9e9e" size="18"></u-icon>
 					</navigator>
 				</view>
 			</view>
 			<view class="com-item"><wike-ad></wike-ad></view>
 		</view>
-        
+
 		<block v-if="appInfo.page_template == 3">
 			<view class="top-backgroup">
-			  <image src='https://tnuiimage.tnkjapp.com/my/my-bg4.png' mode='widthFix' class='backgroud-image'></image>
+				<image src='https://tnuiimage.tnkjapp.com/my/my-bg4.png' mode='widthFix' class='backgroud-image'>
+				</image>
 			</view>
 			<view class="about__wrap" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			  <!-- 图标logo/头像 -->
-			  <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-bottom" style="margin-top: -450rpx;">
-			    <view class="justify-content-item">
-			      <view class="tn-flex tn-flex-col-center tn-flex-row-left">
-			        <view class="logo-pic tn-shadow">
-			          <view class="logo-image">
-			            <image class="avatar" mode="aspectFill" :src="userInfo.avatar ? userInfo.avatar : '/static/images/head.jpg'"></image>
-			          </view>
-			        </view>
-			        <view class="tn-padding-right">
-			          <view class="tn-padding-right tn-padding-left-sm">
-			            <text class="tn-color-cat tn-text-xl tn-text-bold">{{ userInfo.nickname ? userInfo.nickname : '默认用户'}}</text>
-			            <!-- <text class=" tn-round tn-text-xs tn-bg-red tn-color-white tn-margin-left-sm" style="padding: 10rpx 20rpx;" @click="tn('/minePages/realname')">
+				<!-- 图标logo/头像 -->
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin-bottom"
+					style="margin-top: -450rpx;">
+					<view class="justify-content-item">
+						<view class="tn-flex tn-flex-col-center tn-flex-row-left">
+							<view class="logo-pic tn-shadow">
+								<view class="logo-image">
+									<image class="avatar" mode="aspectFill"
+										:src="userInfo.avatar ? userInfo.avatar : '/static/images/head.jpg'"></image>
+								</view>
+							</view>
+							<view class="tn-padding-right">
+								<view class="tn-padding-right tn-padding-left-sm">
+									<text
+										class="tn-color-cat tn-text-xl tn-text-bold">{{ userInfo.nickname ? userInfo.nickname : '默认用户'}}</text>
+									<!-- <text class=" tn-round tn-text-xs tn-bg-red tn-color-white tn-margin-left-sm" style="padding: 10rpx 20rpx;" @click="tn('/minePages/realname')">
 			              未实名
 			            </text> -->
-			          </view>
-			          <view class="tn-padding-right tn-padding-top-xs tn-padding-left-sm tn-text-ellipsis">
-			            <text class="tn-color-gray tn-padding-left-sm tn-text-sm">id编号 {{userInfo.id_number}}</text>
-			          </view>
-			        </view>
-			
-			      </view>
-			    </view>
-			  </view>
-			  <view class="tn-margin-top-xl">
-			    <view class="button-vip tn-flex tn-flex-row-between tn-flex-col-center tn-shadow-blur" style="background: linear-gradient(-120deg, #3E445A, #31374A, #2B3042, #262B3C);">
-			      
-			      <view class="tn-margin-left">
-			        <view class='title u-flex'style="color: #F1C68E;">
-			          <!-- <text class="tn-text-bold tn-text-xl">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</text> -->
-					  <block v-if="appInfo.number_member">
-					  	<block v-if="appInfo.number_member == 1">
-					  		<view class="tn-text-bold tn-text-xl">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</view>
-					  	</block>
-					  </block>
-					  <block v-else>
-					  	<view class="tn-text-bold tn-text-xl">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</view>
-					  </block>
-					  <block v-if="appInfo.number_member">
-					  	<view v-if="appInfo.time_member&&appInfo.number_member == 1&&appInfo.time_member == 1" class="tn-text-bold tn-text-xl">|</view>
-					  </block>
-					  <block v-else>
-					  	<view v-if="appInfo.time_member&&appInfo.time_member == 1" class="tn-text-bold tn-text-xl">|</view>
-					  </block>
-					  <block v-if="appInfo.time_member && appInfo.time_member == 1">
-					  	
-					  	<view class="tn-text-bold tn-text-xl">
-					  		会员套餐:{{ userData.is_validity == 1 ? (userData.vip_time == 9999?'永久':userData.countdown+'天') : '0天' }}
-					  	</view>
-					  </block>
-			          <!-- <text class="tn-icon-vip-text tn-text-center" style="position: absolute;margin: -22rpx 0 0 0;font-size: 92rpx;"></text> -->
-			        </view>
-			        <view class='tn-color-white tn-text-sm tn-padding-top-sm'>邀请好友赚取更多积分</view>
-			      </view>
-			      <view class="tn-margin-right">
-			        <tn-button shape="round" backgroundColor="#F1C68E" fontColor="#634738" padding="10rpx 0" width="160rpx" shadow @click="jump(isLogin ? '/pages/user/member/member' : '/pages/user/signin')">
-			          <!-- <text class="tn-icon-vip tn-padding-right-sm tn-text-lg"></text> -->
-			          <text class="tn-text-bold" >充值</text>
-			        </tn-button>
-			      </view>
-			      
-			    </view>
-			  </view>
-			  <!-- 方式12 start-->
-			  <view class="about-shadow tn-margin-top-lg tn-padding-top-sm tn-padding-bottom-sm tn-bg-white">
-			    <view class="tn-flex tn-flex-row-center tn-radius tn-padding-top">
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="showcarmi = true">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-cube tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">卡密兑换</text>
-			          </view>
-			        </view>
-			      </view> 
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/commission/index')" v-if="is_commission==1">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-signpost tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">我的团队</text>
-			          </view>
-			        </view>
-			      </view>
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/draw/draw')" v-if="appInfo.is_aipainting&&appInfo.is_aipainting == 1">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-refund tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">绘画记录</text>
-			          </view>
-			        </view>
-			      </view>
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/takenotes/takenotes')">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-constellation tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">问答记录</text>
-			          </view>
-			        </view>
-			      </view>
-			    </view>
-			    <view class="tn-flex tn-flex-row-center tn-radius tn-padding-top">
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/userinfo')">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-order tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">修改用户信息</text>
-			          </view>
-			        </view>
-			      </view>
-			      <view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/member/record')">
-			        <view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-			          <view class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
-			            <view class="tn-icon-calendar tn-color-cat"></view>
-			          </view>
-			          <view class="tn-text-center">
-			            <text class="tn-text-ellipsis">{{appInfo.number_alias?appInfo.number_alias:'点数'}}/会员套餐记录</text>
-			          </view>
-			        </view>
-			      </view>
-			    </view>
-			  </view>
+								</view>
+								<view class="tn-padding-right tn-padding-top-xs tn-padding-left-sm tn-text-ellipsis">
+									<text class="tn-color-gray tn-padding-left-sm tn-text-sm">id编号
+										{{userInfo.id_number}}</text>
+								</view>
+							</view>
+
+						</view>
+					</view>
+				</view>
+				<view class="tn-margin-top-xl">
+					<view class="button-vip tn-flex tn-flex-row-between tn-flex-col-center tn-shadow-blur"
+						style="background: linear-gradient(-120deg, #3E445A, #31374A, #2B3042, #262B3C);">
+
+						<view class="tn-margin-left">
+							<view class='title u-flex' style="color: #F1C68E;">
+								<!-- <text class="tn-text-bold tn-text-xl">{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}</text> -->
+								<block v-if="appInfo.number_member">
+									<block v-if="appInfo.number_member == 1">
+										<view class="tn-text-bold tn-text-xl">
+											{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}
+										</view>
+									</block>
+								</block>
+								<block v-else>
+									<view class="tn-text-bold tn-text-xl">
+										{{appInfo.number_alias?appInfo.number_alias+':':'点数:'}}{{ userData.coin ? userData.coin : 0 }}
+									</view>
+								</block>
+								<block v-if="appInfo.number_member">
+									<view
+										v-if="appInfo.time_member&&appInfo.number_member == 1&&appInfo.time_member == 1"
+										class="tn-text-bold tn-text-xl">|</view>
+								</block>
+								<block v-else>
+									<view v-if="appInfo.time_member&&appInfo.time_member == 1"
+										class="tn-text-bold tn-text-xl">|</view>
+								</block>
+								<block v-if="appInfo.time_member && appInfo.time_member == 1">
+
+									<view class="tn-text-bold tn-text-xl">
+										会员套餐:{{ userData.is_validity == 1 ? (userData.vip_time == 9999?'永久':userData.countdown+'天') : '0天' }}
+									</view>
+								</block>
+								<!-- <text class="tn-icon-vip-text tn-text-center" style="position: absolute;margin: -22rpx 0 0 0;font-size: 92rpx;"></text> -->
+							</view>
+							<view class='tn-color-white tn-text-sm tn-padding-top-sm'>邀请好友赚取更多积分</view>
+						</view>
+						<view class="tn-margin-right">
+							<tn-button shape="round" backgroundColor="#F1C68E" fontColor="#634738" padding="10rpx 0"
+								width="160rpx" shadow
+								@click="jump(isLogin ? '/pages/user/member/member' : '/pages/user/signin')">
+								<!-- <text class="tn-icon-vip tn-padding-right-sm tn-text-lg"></text> -->
+								<text class="tn-text-bold">充值</text>
+							</tn-button>
+						</view>
+
+					</view>
+				</view>
+				<!-- 方式12 start-->
+				<view class="about-shadow tn-margin-top-lg tn-padding-top-sm tn-padding-bottom-sm tn-bg-white">
+					<view class="tn-flex tn-flex-row-center tn-radius tn-padding-top">
+						<view class="tn-padding-sm tn-margin-xs tn-radius" @click="showcarmi = true">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-cube tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis">卡密兑换</text>
+								</view>
+							</view>
+						</view>
+						<view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/commission/index')"
+							v-if="is_commission==1">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-signpost tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis">我的团队</text>
+								</view>
+							</view>
+						</view>
+						<view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/draw/draw')"
+							v-if="appInfo.is_aipainting&&appInfo.is_aipainting == 1">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-refund tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis">绘画记录</text>
+								</view>
+							</view>
+						</view>
+						<view class="tn-padding-sm tn-margin-xs tn-radius"
+							@click="jump('/pages/user/takenotes/takenotes')">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-constellation tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis">问答记录</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="tn-flex tn-flex-row-center tn-radius tn-padding-top">
+						<view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/userinfo')">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-order tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis">修改用户信息</text>
+								</view>
+							</view>
+						</view>
+						<view class="tn-padding-sm tn-margin-xs tn-radius" @click="jump('/pages/user/member/record')">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-grey--light">
+									<view class="tn-icon-calendar tn-color-cat"></view>
+								</view>
+								<view class="tn-text-center">
+									<text
+										class="tn-text-ellipsis">{{appInfo.number_alias?appInfo.number_alias:'点数'}}/会员套餐记录</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			<view class="tn-margin-top-lg tn-padding-top-sm tn-padding-bottom-sm" style="padding:30rpx">
 				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="getqrcode">
-				  <view class="tn-flex tn-flex-col-center">
-				    <view
-				      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-				      <view class="tn-icon-qr-code"></view>
-				    </view>
-				    <view class="tn-margin-left-sm tn-flex-1">关注公众号</view>
-				    <view class="tn-color-gray tn-icon-right"></view>
-				  </view>
+					<view class="tn-flex tn-flex-col-center">
+						<view class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center"
+							style="color: #7C8191;">
+							<view class="tn-icon-qr-code"></view>
+						</view>
+						<view class="tn-margin-left-sm tn-flex-1">关注公众号</view>
+						<view class="tn-color-gray tn-icon-right"></view>
+					</view>
+				</tn-list-cell>
+				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30"
+					@click="jump('/pages/user/orderrecord/orderrecord')">
+					<view class="tn-flex tn-flex-col-center">
+						<view class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center"
+							style="color: #7C8191;">
+							<view class="tn-icon-shopbag-fill"></view>
+						</view>
+						<view class="tn-margin-left-sm tn-flex-1">订单记录</view>
+						<view class="tn-color-gray tn-icon-right"></view>
+					</view>
+				</tn-list-cell>
+				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30"
+					@click="jump('/pages/user/public/kefu')">
+					<view class="tn-flex tn-flex-col-center">
+						<view class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center"
+							style="color: #7C8191;">
+							<view class="tn-icon-science-fill"></view>
+						</view>
+						<view class="tn-margin-left-sm tn-flex-1">客服中心</view>
+						<view class="tn-color-gray tn-icon-right"></view>
+					</view>
+				</tn-list-cell>
+				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30"
+					@click="jump('/pages/user/public/agreement?type=aboutus')">
+					<view class="tn-flex tn-flex-col-center">
+						<view class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center"
+							style="color: #7C8191;">
+							<view class="tn-icon-light-fill"></view>
+						</view>
+						<view class="tn-margin-left-sm tn-flex-1">关于我们</view>
+						<view class="tn-color-gray tn-icon-right"></view>
+					</view>
 				</tn-list-cell>
-				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="jump('/pages/user/orderrecord/orderrecord')">
-				  <view class="tn-flex tn-flex-col-center">
-				    <view
-				      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-				      <view class="tn-icon-shopbag-fill"></view>
-				    </view>
-				    <view class="tn-margin-left-sm tn-flex-1">订单记录</view>
-				    <view class="tn-color-gray tn-icon-right"></view>
-				  </view>
+				<tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30">
+					<view class="tn-flex tn-flex-col-center">
+						<view class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center"
+							style="color: #7C8191;">
+							<view class="tn-icon-expand"></view>
+						</view>
+						<view class="tn-margin-left-sm tn-flex-1">版本</view>
+						<view>4.6.2</view>
+					</view>
 				</tn-list-cell>
-			  <tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="jump('/pages/user/public/kefu')">
-			    <view class="tn-flex tn-flex-col-center">
-			      <view
-			        class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-			        <view class="tn-icon-science-fill"></view>
-			      </view>
-			      <view class="tn-margin-left-sm tn-flex-1">客服中心</view>
-			      <view class="tn-color-gray tn-icon-right"></view>
-			    </view>
-			  </tn-list-cell>
-			  <tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" @click="jump('/pages/user/public/agreement?type=aboutus')">
-			    <view class="tn-flex tn-flex-col-center">
-			      <view
-			        class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-			        <view class="tn-icon-light-fill"></view>
-			      </view>
-			      <view class="tn-margin-left-sm tn-flex-1">关于我们</view>
-			      <view class="tn-color-gray tn-icon-right"></view>
-			    </view>
-			  </tn-list-cell>
-			  <tn-list-cell :hover="true" :unlined="true" :radius="true" :fontSize="30" >
-			    <view class="tn-flex tn-flex-col-center">
-			      <view
-			        class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
-			        <view class="tn-icon-expand"></view>
-			      </view>
-			      <view class="tn-margin-left-sm tn-flex-1">版本</view>
-			      <view >4.6.2</view>
-			    </view>
-			  </tn-list-cell>
 			</view>
-			
+
 		</block>
-		
+
 		<u-popup :show="showcarmi" mode="center" :round="10" @close="showcarmi = false">
 			<view class="carmimodal">
-				<view class="carmiclose" @click="showcarmi = false"><u-icon name="close-circle-fill" color="#fff" size="22"></u-icon></view>
+				<view class="carmiclose" @click="showcarmi = false"><u-icon name="close-circle-fill" color="#fff"
+						size="22"></u-icon></view>
 
 				<view class="carmititle">输入卡密兑换</view>
-				<view class="carmiinput"><u--input placeholder="请输入卡密" border="surround" clearable v-model="carmi"></u--input></view>
+				<view class="carmiinput"><u--input placeholder="请输入卡密" border="surround" clearable
+						v-model="carmi"></u--input></view>
 				<view @click="exchange" class="carmiexchange">立即兑换</view>
 				<view v-if="appInfo.kf_qrcode_path" class="kf_qrcode tn-flex justify-center">
-					<u--image :showLoading="true" :src="appInfo.kf_qrcode_path" width="100px" height="100px" @click="clickuimage(appInfo.kf_qrcode_path)"></u--image>
+					<u--image :showLoading="true" :src="appInfo.kf_qrcode_path" width="100px" height="100px"
+						@click="clickuimage(appInfo.kf_qrcode_path)"></u--image>
 				</view>
 				<view v-if="appInfo.kf_qrcode_path" class="u-text-center">
 					<!-- #ifdef MP-WEIXIN -->
@@ -383,889 +425,992 @@
 		</u-popup>
 		<u-popup :show="packagedetails" @close="packagedetails = false" :round="15" closeable>
 			<view class="select u-flex justify-center"><text>我的会员套餐详情</text></view>
-			<u-notice-bar speed="60" :text="'当会员套餐内限量次数为0后再次使用会扣除当前已经拥有的'+(appInfo.number_alias ? appInfo.number_alias : '点数')"></u-notice-bar>
+			<u-notice-bar speed="60"
+				:text="'当会员套餐内限量次数为0后再次使用会扣除当前已经拥有的'+(appInfo.number_alias ? appInfo.number_alias : '点数')"></u-notice-bar>
 			<view class="expand u-flex flex-wrap">
-			<view v-if="userData.vip_info&&userData.vip_info.gpt35_times == -1 || userData.vip_info&&userData.vip_info.gpt35_times > 0" class="surplus u-flex align-center">
-				<view class="item">{{appInfo.gpt35_alias ? appInfo.gpt35_alias : 'ChatGPT 3.5'}} - {{userData.vip_info.gpt35_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.gpt35_times == -1?'无限量':userData.vip_info.gpt35_times+'次'}}({{userData.vip_info.gpt35_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.gpt35_used}}次)</view>
-				
-			</view>	
-			<view v-if="userData.vip_info&&userData.vip_info.gpt4_times == -1 || userData.vip_info&&userData.vip_info.gpt4_times > 0" class="surplus u-flex align-center" style="background: #f9ae3d;">
-				<view class="item">{{appInfo.gpt4_alias ? appInfo.gpt4_alias : 'ChatGPT 4.0'}} - {{userData.vip_info.gpt4_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.gpt4_times == -1?'无限量':userData.vip_info.gpt4_times+'次'}}({{userData.vip_info.gpt4_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.gpt4_used}}次)</view>
-			</view>	
-			<view v-if="userData.vip_info&&userData.vip_info.sd_times == -1 || userData.vip_info&&userData.vip_info.sd_times > 0" class="surplus u-flex align-center" style="background: #3c9cff;">
-				<view class="item">StableDiffusion绘图 - {{userData.vip_info.sd_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.sd_times == -1?'无限量':userData.vip_info.sd_times+'次'}}({{userData.vip_info.sd_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.sd_used}}次)</view>
-			</view>
-			<view v-if="userData.vip_info&&userData.vip_info.mj_times == -1 || userData.vip_info&&userData.vip_info.mj_times > 0" class="surplus u-flex align-center" style="background: #26b3a0;">
-				<view class="item">MidJourney绘图 - {{userData.vip_info.mj_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.mj_times == -1?'无限量':userData.vip_info.mj_times+'次'}}({{userData.vip_info.mj_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.mj_used}}次)</view>
-			</view>
+				<view
+					v-if="userData.vip_info&&userData.vip_info.gpt35_times == -1 || userData.vip_info&&userData.vip_info.gpt35_times > 0"
+					class="surplus u-flex align-center">
+					<view class="item">{{appInfo.gpt35_alias ? appInfo.gpt35_alias : 'ChatGPT 3.5'}} -
+						{{userData.vip_info.gpt35_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.gpt35_times == -1?'无限量':userData.vip_info.gpt35_times+'次'}}({{userData.vip_info.gpt35_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.gpt35_used}}次)
+					</view>
+
+				</view>
+				<view
+					v-if="userData.vip_info&&userData.vip_info.gpt4_times == -1 || userData.vip_info&&userData.vip_info.gpt4_times > 0"
+					class="surplus u-flex align-center" style="background: #f9ae3d;">
+					<view class="item">{{appInfo.gpt4_alias ? appInfo.gpt4_alias : 'ChatGPT 4.0'}} -
+						{{userData.vip_info.gpt4_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.gpt4_times == -1?'无限量':userData.vip_info.gpt4_times+'次'}}({{userData.vip_info.gpt4_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.gpt4_used}}次)
+					</view>
+				</view>
+				<view
+					v-if="userData.vip_info&&userData.vip_info.sd_times == -1 || userData.vip_info&&userData.vip_info.sd_times > 0"
+					class="surplus u-flex align-center" style="background: #3c9cff;">
+					<view class="item">StableDiffusion绘图 -
+						{{userData.vip_info.sd_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.sd_times == -1?'无限量':userData.vip_info.sd_times+'次'}}({{userData.vip_info.sd_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.sd_used}}次)
+					</view>
+				</view>
+				<view
+					v-if="userData.vip_info&&userData.vip_info.mj_times == -1 || userData.vip_info&&userData.vip_info.mj_times > 0"
+					class="surplus u-flex align-center" style="background: #26b3a0;">
+					<view class="item">MidJourney绘图 -
+						{{userData.vip_info.mj_type == 'time'?'每日':'总'}}限量:{{userData.vip_info.mj_times == -1?'无限量':userData.vip_info.mj_times+'次'}}({{userData.vip_info.mj_type == 'time'?'今日已用量:':'总用量:'}}{{userData.vip_info.mj_used}}次)
+					</view>
+				</view>
 			</view>
 		</u-popup>
 		<block v-if="is_aipainting">
-			<wike-tabbar2 v-if="appInfo.page_template == 3" :is_aipainting="is_aipainting" :onTabbar="true" :isShowAnimate="true" :appInfos="appInfo.page_template"></wike-tabbar2>
-			<wike-tabbar v-else :onTabbar="true" :is_aipainting="is_aipainting" :isShowAnimate="true" :appInfos="appInfo.page_template"></wike-tabbar>
+			<wike-tabbar2 v-if="appInfo.page_template == 3" :is_aipainting="is_aipainting" :onTabbar="true"
+				:isShowAnimate="true" :appInfos="appInfo.page_template"></wike-tabbar2>
+			<wike-tabbar v-else :onTabbar="true" :is_aipainting="is_aipainting" :isShowAnimate="true"
+				:appInfos="appInfo.page_template"></wike-tabbar>
 		</block>
 		<wike-modal-qrcode :qrcode="qrcode" :showconcern="showconcern" @concernclose="concernclose"></wike-modal-qrcode>
+
+		<wike-tabbar :onTabbar="true" :isShowAnimate="true"></wike-tabbar>
 	</view>
 </template>
 
 <script>
-import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-import { API_ROOT } from '@/common/request/request';
-let interstitialAd = null,
-	timer,
-	time2;
-export default {
-	components: {},
-	data() {
-		return {
-			// API_ROOT: API_ROOT,
-			perfectResume: false, //简历是否完善
-			tobheight: 45,
-			platform: this.$platform.get(),
-			showrealname: false,
-			showworkermy: false,
-			avatar: '',
-			isLoading: true,
-			// userInfo: {
-			// 	headPicUrl: '/static/images/user/avatar.jpg',
-			// 	nickName: '史蒂芬.林'
-			// },
-			orderStatusList: [
-				{ name: '待付款', icon: 'iconfont icon31daifukuan', status: 10 },
-				{ name: '待发货', icon: 'iconfont icon31daifahuo', status: 30 },
-				{ name: '待收货', icon: 'iconfont icon31daishouhuo', status: 40 },
-				{ name: '待评价', icon: 'iconfont icon31daipingjia', status: 50 },
-				{ name: '已完成', icon: 'iconfont icon31yiguanzhudianpu', status: 55 }
-			],
-			currentIndex: 0,
-			list: [
-				{
-					icon: '/static/images/user/class-01.png',
-					text: '我的电子券'
-				},
-				{
-					icon: '/static/images/user/class-02.png',
-					text: '退换/售后'
-				},
-				{
-					icon: '/static/images/user/class-03.png',
-					text: '我的积分'
-				},
-				{
-					icon: '/static/images/user/class-04.png',
-					text: '送礼提醒'
-				}
-			],
-			userList: [
-				{
-					title: '订单记录',
-					icon: 'shopping-cart-fill',
-					path: 'coupon-fill',
-					url: '/pages/user/orderrecord/orderrecord',
-					color:'#26b3a0'
-				},
-				{
-					title: '问答记录',
-					icon: 'question-circle-fill',
-					path: 'collect-list',
-					url: '/pages/user/takenotes/takenotes',
-					color:'#31c9e8'
-				},
-				{
-					title: '修改用户信息',
-					icon: 'setting-fill',
-					path: 'collect-list',
-					url: '/pages/user/userinfo',
-					color:'#5ac725'
-				},
-				// {
-				// 	title: '次数/时长记录',
-				// 	icon: 'bookmark-fill',
-				// 	url: '/pages/user/member/record'
-				// }
-			],
-			serverList: [
-				{
-					title: '客服中心',
-					icon: 'server-fill',
-					path: '/pages/user/public/kefu',
-					color:'#e83a30'
-				},
-				{
-					title: '关于我们',
-					icon: 'account-fill',
-					path: '/pages/user/public/agreement?type=aboutus',
-					color:'#ffa726'
-				},
-				{
-					title: '版本',
-					icon: 'pushpin-fill',
-					text: '4.6.2',
-					color:'#24f083'
-				}
-			],
-			commission_setting: {},
-			showcarmi: false,
-			carmi: '',
-			qrcode:'',
-			is_aipainting:'',
-			showconcern:false,
-			gzhqrcode:'',
-			packagedetails:false,
-			plan:{},
-			show_ios_pay: false,
-			device: this.$platform.device(),
-			// commission_alias:'分销中心'
-		};
-	},
-	computed: {
-		...mapGetters(['appInfo', 'homeTemplate', 'isLogin', 'userInfo', 'userData'])
-	},
-  
-	onShow: function() {
-		if (this.isLogin) {
-			this.getUserData();
-			if (this.$ws.socketStatus()) {
-				this.$ws.completeClose();
-			}
-		}
-		this.systemwechat()
-		// this.$store.dispatch('tabbarInit')
-	},
-
-	onLoad() {
-		this.isLoading = false;
-		if (!this.isLogin) {
-			uni.navigateTo({
-				url: '/pages/user/signin'
-			});
-			uni.setStorageSync('route', '/pages/user/user');
-		}
-		this.getCommissionSetting();
-		this.getPlan();
-		// this.systemwechat()
-		// console.log(API_ROOT);
-	},
-	onReady() {
-		let that = this;
-		// #ifdef MP-WEIXIN
-		clearTimeout(timer);
-		// 在适合的场景显示插屏广告
-		timer = setTimeout(function() {
-			// 在页面onLoad回调事件中创建插屏广告实例
-			if (wx.createInterstitialAd && that.appInfo.interstitial_status == 1) {
-				interstitialAd = wx.createInterstitialAd({
-					adUnitId: that.appInfo.interstitial_id
-				});
-				interstitialAd.onLoad(() => {});
-				interstitialAd.onError(err => {});
-				interstitialAd.onClose(() => {
-					if (that.appInfo.interstitial_infinite_status  && that.appInfo.interstitial_infinite_status == 1) {
-					         that.showInterstitial();
-					 }else{
-					        interstitialAd.show().catch(err => {
-					        console.error(err);
-					});
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import {
+		API_ROOT
+	} from '@/common/request/request';
+	let interstitialAd = null,
+		timer,
+		time2;
+	export default {
+		components: {},
+		data() {
+			return {
+				// API_ROOT: API_ROOT,
+				perfectResume: false, //简历是否完善
+				tobheight: 45,
+				platform: this.$platform.get(),
+				showrealname: false,
+				showworkermy: false,
+				avatar: '',
+				isLoading: true,
+				// userInfo: {
+				// 	headPicUrl: '/static/images/user/avatar.jpg',
+				// 	nickName: '史蒂芬.林'
+				// },
+				orderStatusList: [{
+						name: '待付款',
+						icon: 'iconfont icon31daifukuan',
+						status: 10
+					},
+					{
+						name: '待发货',
+						icon: 'iconfont icon31daifahuo',
+						status: 30
+					},
+					{
+						name: '待收货',
+						icon: 'iconfont icon31daishouhuo',
+						status: 40
+					},
+					{
+						name: '待评价',
+						icon: 'iconfont icon31daipingjia',
+						status: 50
+					},
+					{
+						name: '已完成',
+						icon: 'iconfont icon31yiguanzhudianpu',
+						status: 55
 					}
-				});
-				interstitialAd.show().catch(err => {
-					console.error(err);
-				});
-			}
-		}, 4000);
-		// #endif
-	},
-	onUnload() {
-		clearInterval(time2);
-	},
-	methods: {
-		...mapActions(['getUserInfo', 'showAuthModal', 'getUserData']),
-		getPlan(){
-			let that = this;
-			this.$http('conf.getGroupConf', {
-				group: 'system.plan'
-			}).then(res => {
-				if (res.code == 0) {
-					this.plan = res.data;
-					if (res.data.is_ios_pay == 1 && that.checkTimeLimit()) {
-						// ios可以付钱
-						that.show_ios_pay = true
+				],
+				currentIndex: 0,
+				list: [{
+						icon: '/static/images/user/class-01.png',
+						text: '我的电子券'
+					},
+					{
+						icon: '/static/images/user/class-02.png',
+						text: '退换/售后'
+					},
+					{
+						icon: '/static/images/user/class-03.png',
+						text: '我的积分'
+					},
+					{
+						icon: '/static/images/user/class-04.png',
+						text: '送礼提醒'
 					}
-					// uni.setNavigationBarTitle({
-					// 	title: this.appInfo.site_name
-					// });
-				}
-			});
+				],
+				// userList: [{
+				// 		title: '订单记录',
+				// 		icon: 'shopping-cart-fill',
+				// 		path: 'coupon-fill',
+				// 		url: '/pages/user/orderrecord/orderrecord',
+				// 		color: '#26b3a0'
+				// 	},
+				// 	{
+				// 		title: '问答记录',
+				// 		icon: 'question-circle-fill',
+				// 		path: 'collect-list',
+				// 		url: '/pages/user/takenotes/takenotes',
+				// 		color: '#31c9e8'
+				// 	},
+				// 	{
+				// 		title: '修改用户信息',
+				// 		icon: 'setting-fill',
+				// 		path: 'collect-list',
+				// 		url: '/pages/user/userinfo',
+				// 		color: '#5ac725'
+				// 	},
+				// ],
+				// serverList: [{
+				// 		title: '客服中心',
+				// 		icon: 'server-fill',
+				// 		path: '/pages/user/public/kefu',
+				// 		color: '#e83a30'
+				// 	},
+				// 	{
+				// 		title: '关于我们',
+				// 		icon: 'account-fill',
+				// 		path: '/pages/user/public/agreement?type=aboutus',
+				// 		color: '#ffa726'
+				// 	},
+				// 	{
+				// 		title: '版本',
+				// 		icon: 'pushpin-fill',
+				// 		text: '4.6.2',
+				// 		color: '#24f083'
+				// 	}
+				// ],
+				commission_setting: {},
+				showcarmi: false,
+				carmi: '',
+				qrcode: '',
+				is_aipainting: '',
+				showconcern: false,
+				gzhqrcode: '',
+				packagedetails: false,
+				plan: {},
+				show_ios_pay: false,
+				device: this.$platform.device(),
+				// commission_alias:'分销中心'
+			};
 		},
-		getlogin() {
-			// console.log(2222);
-			uni.navigateTo({
-				url: '/pages/user/signin'
-			});
-			uni.setStorageSync('route', '/pages/user/user');
+		computed: {
+			...mapGetters(['appInfo', 'homeTemplate', 'isLogin', 'userInfo', 'userData'])
 		},
-		systemwechat(){
-			this.$http('conf.getGroupConf', { group: 'system.wechat' }).then(res => {
-				if (res.code == 0) {
-					this.qrcode = res.data.qrcode_path
-					const focuson = uni.getStorageSync('focuson');
-					// console.log(focuson);
-					if(!focuson){
-						if(this.qrcode){
-							if(this.isLogin&&this.appInfo.is_show_logged_qrcode == 1  ){
-								this.showconcern = true
-							}
-						}
-					}
+
+		onShow: function() {
+			if (this.isLogin) {
+				this.getUserData();
+				if (this.$ws.socketStatus()) {
+					this.$ws.completeClose();
 				}
-				})
+			}
+			this.systemwechat()
+			// this.$store.dispatch('tabbarInit')
 		},
-		concernclose(){
-			this.showconcern = false
+
+		onLoad() {
+			this.isLoading = false;
+			// if (!this.isLogin) {
+			// 	uni.navigateTo({
+			// 		url: '/pages/user/signin'
+			// 	});
+			// 	uni.setStorageSync('route', '/pages/user/user');
+			// }
+			this.getCommissionSetting();
+			this.getPlan();
+			// this.systemwechat()
+			// console.log(API_ROOT);
 		},
-		copyText(text) {
-			uni.setClipboardData({
-				data: text,
-				success: function() {
-					// console.log('success');
-					uni.showToast({
-						title: '用户编号复制成功'
+		onReady() {
+			let that = this;
+			// #ifdef MP-WEIXIN
+			clearTimeout(timer);
+			// 在适合的场景显示插屏广告
+			timer = setTimeout(function() {
+				// 在页面onLoad回调事件中创建插屏广告实例
+				if (wx.createInterstitialAd && that.appInfo.interstitial_status == 1) {
+					interstitialAd = wx.createInterstitialAd({
+						adUnitId: that.appInfo.interstitial_id
+					});
+					interstitialAd.onLoad(() => {});
+					interstitialAd.onError(err => {});
+					interstitialAd.onClose(() => {
+						if (that.appInfo.interstitial_infinite_status && that.appInfo
+							.interstitial_infinite_status == 1) {
+							that.showInterstitial();
+						} else {
+							interstitialAd.show().catch(err => {
+								console.error(err);
+							});
+						}
+					});
+					interstitialAd.show().catch(err => {
+						console.error(err);
 					});
 				}
-			});
+			}, 4000);
+			// #endif
 		},
-		modify(){
-			uni.navigateTo({
-				url:'/pages/user/userinfo'
-			})
+		onUnload() {
+			clearInterval(time2);
 		},
-		clickuimage(e){
-		
-			uni.previewImage({
-				urls:[e]
-			})
-		},
-		// systemwechat(){
-		// 	this.$http('conf.getGroupConf', { group: 'system.wechat' }).then(res => {
-		// 		if (res.code == 0) {
-		// 			if(res.data.qrcode){
-		// 				this.qrcode = res.data.qrcode_path
-		// 			}
-		// 		}
-		// 		})
-		// },
-		getCommissionSetting() {
-			this.$http('conf.getGroupConf', { group: 'system.commission' }).then(res => {
-				if (res.code == 0) {
-					uni.setNavigationBarTitle({
-						title: this.appInfo.site_name
-					});
-					// this.is_aipainting = this.appInfo.is_aipainting
-					if (res.data.is_commission == 1) {
-						let obj = {
-							title: res.data.commission_alias?res.data.commission_alias:'分销中心',
-							icon: 'grid-fill',
-							path: 'address-list',
-							url: '/pages/user/commission/index',
-							color:'#ffca28'
-						};
-						this.userList.splice(0, 0, obj);
+		methods: {
+			loginout() {
+				let that = this;
+				uni.showModal({
+					confirmColor: '#26B3A0',
+					title: '提示',
+					content: '确认退出登录?',
+					success: function(res) {
+						if (res.confirm) {
+							uni.removeStorageSync('token')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '/pages/user/signin'
+								})
+							}, 1500)
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
 					}
-					if(this.appInfo.is_aipainting&&this.appInfo.is_aipainting == 1){
-						let draw = {
-							title: '绘画记录',
-							icon: 'edit-pen-fill',
-							path: 'address-list',
-							url: '/pages/user/draw/draw',
-							color:'#3c9cff'
-						};
-						this.userList.splice(1, 0, draw);
-						this.is_aipainting = '1'
-					}else{
-						this.is_aipainting = '2'
+				});
+			},
+
+			...mapActions(['getUserInfo', 'showAuthModal', 'getUserData']),
+			getPlan() {
+				let that = this;
+				this.$http('conf.getGroupConf', {
+					group: 'system.plan'
+				}).then(res => {
+					if (res.code == 0) {
+						this.plan = res.data;
+						if (res.data.is_ios_pay == 1 && that.checkTimeLimit()) {
+							// ios可以付钱
+							that.show_ios_pay = true
+						}
+						// uni.setNavigationBarTitle({
+						// 	title: this.appInfo.site_name
+						// });
 					}
-					
-				}
-			});
-		},
-		getroute() {
-			if (!this.isLogin) {
-				uni.setStorageSync('route', '/pages/user/user');
-			}
-		},
-		exchange() {
-			if (!this.isLogin) {
+				});
+			},
+			getlogin() {
+				// console.log(2222);
 				uni.navigateTo({
 					url: '/pages/user/signin'
 				});
 				uni.setStorageSync('route', '/pages/user/user');
-				return;
-			}
-			uni.showLoading({
-				title: '卡密兑换中...'
-			});
-			this.$http('member.kami', { code: this.carmi }).then(res => {
-				if (res.code == 0) {
-					uni.showToast({
-						title: '兑换成功'
-					});
-					this.getUserData();
-					this.showcarmi = false;
+			},
+			systemwechat() {
+				this.$http('conf.getGroupConf', {
+					group: 'system.wechat'
+				}).then(res => {
+					if (res.code == 0) {
+						this.qrcode = res.data.qrcode_path
+						const focuson = uni.getStorageSync('focuson');
+						// console.log(focuson);
+						if (!focuson) {
+							if (this.qrcode) {
+								if (this.isLogin && this.appInfo.is_show_logged_qrcode == 1) {
+									this.showconcern = true
+								}
+							}
+						}
+					}
+				})
+			},
+			concernclose() {
+				this.showconcern = false
+			},
+			copyText(text) {
+				uni.setClipboardData({
+					data: text,
+					success: function() {
+						// console.log('success');
+						uni.showToast({
+							title: '用户编号复制成功'
+						});
+					}
+				});
+			},
+			modify() {
+				uni.navigateTo({
+					url: '/pages/user/userinfo'
+				})
+			},
+			clickuimage(e) {
+
+				uni.previewImage({
+					urls: [e]
+				})
+			},
+			// systemwechat(){
+			// 	this.$http('conf.getGroupConf', { group: 'system.wechat' }).then(res => {
+			// 		if (res.code == 0) {
+			// 			if(res.data.qrcode){
+			// 				this.qrcode = res.data.qrcode_path
+			// 			}
+			// 		}
+			// 		})
+			// },
+			getCommissionSetting() {
+				this.$http('conf.getGroupConf', {
+					group: 'system.commission'
+				}).then(res => {
+					if (res.code == 0) {
+						uni.setNavigationBarTitle({
+							title: this.appInfo.site_name
+						});
+						// this.is_aipainting = this.appInfo.is_aipainting
+						if (res.data.is_commission == 1) {
+							let obj = {
+								title: res.data.commission_alias ? res.data.commission_alias : '分销中心',
+								icon: 'grid-fill',
+								path: 'address-list',
+								url: '/pages/user/commission/index',
+								color: '#ffca28'
+							};
+							this.userList.splice(0, 0, obj);
+						}
+						if (this.appInfo.is_aipainting && this.appInfo.is_aipainting == 1) {
+							let draw = {
+								title: '绘画记录',
+								icon: 'edit-pen-fill',
+								path: 'address-list',
+								url: '/pages/user/draw/draw',
+								color: '#3c9cff'
+							};
+							this.userList.splice(1, 0, draw);
+							this.is_aipainting = '1'
+						} else {
+							this.is_aipainting = '2'
+						}
+
+					}
+				});
+			},
+			getroute() {
+				if (!this.isLogin) {
+					uni.setStorageSync('route', '/pages/user/user');
 				}
-			});
-		},
-		getuserinfo() {
-			uni.navigateTo({
-				url: '/pages/user/userinfo'
-			});
-		},
-		getPersonalRealNameInfo() {
-			this.$http('vertify.getPersonalRealNameInfo').then(res => {
-				if (res.code == 0) {
-					this.showrealname = false;
-				} else {
-					this.showrealname = true;
+			},
+			exchange() {
+				if (!this.isLogin) {
+					uni.navigateTo({
+						url: '/pages/user/signin'
+					});
+					uni.setStorageSync('route', '/pages/user/user');
+					return;
 				}
-			});
-		},
-		jump(e){
-			console.log(e);
-			uni.navigateTo({
-				url:e
-			})
-		},
-		workermy() {
-			this.$http('worker.my').then(res => {
-				if (res.code == 0) {
-					if (res.data.name) {
-						this.showworkermy = true;
+				uni.showLoading({
+					title: '卡密兑换中...'
+				});
+				this.$http('member.kami', {
+					code: this.carmi
+				}).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '兑换成功'
+						});
+						this.getUserData();
+						this.showcarmi = false;
+					}
+				});
+			},
+			getuserinfo() {
+				uni.navigateTo({
+					url: '/pages/user/userinfo'
+				});
+			},
+			getPersonalRealNameInfo() {
+				this.$http('vertify.getPersonalRealNameInfo').then(res => {
+					if (res.code == 0) {
+						this.showrealname = false;
+					} else {
+						this.showrealname = true;
+					}
+				});
+			},
+			jump(e) {
+				console.log(e);
+				uni.navigateTo({
+					url: e
+				})
+			},
+			workermy() {
+				this.$http('worker.my').then(res => {
+					if (res.code == 0) {
+						if (res.data.name) {
+							this.showworkermy = true;
+						} else {
+							this.showworkermy = false;
+						}
 					} else {
 						this.showworkermy = false;
 					}
-				} else {
-					this.showworkermy = false;
-				}
-			});
-		},
-		getfeedback() {
-			uni.showModal({
-				content: '请联系客服,提供您的宝贵意见',
-				title: '提示',
-				confirmText: '联系客服',
-				confirmColor: '#00ca88',
-				success(res) {
-					if (res.confirm) {
-						uni.navigateTo({
-							url: '/pages/user/public/kefu'
-						});
+				});
+			},
+			getfeedback() {
+				uni.showModal({
+					content: '请联系客服,提供您的宝贵意见',
+					title: '提示',
+					confirmText: '联系客服',
+					confirmColor: '#00ca88',
+					success(res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/user/public/kefu'
+							});
+						}
 					}
-				}
-			});
-		},
-		getqrcode(){
-			// console.log(this.qrcode);
-			uni.previewImage({
-				urls:[this.qrcode]
-			})
-		},
-		showInterstitial() {
-			time2 = setInterval(
-				function() {
-					interstitialAd.show().catch(err => {
-						console.error(err);
-					});
-				},
-				this.appInfo.gap ? this.appInfo.gap * 1000 : 12000
-			);
+				});
+			},
+			getqrcode() {
+				// console.log(this.qrcode);
+				uni.previewImage({
+					urls: [this.qrcode]
+				})
+			},
+			showInterstitial() {
+				time2 = setInterval(
+					function() {
+						interstitialAd.show().catch(err => {
+							console.error(err);
+						});
+					},
+					this.appInfo.gap ? this.appInfo.gap * 1000 : 12000
+				);
+			}
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-page {
-	background: #f2f2f2;
-}
-.btn-hover {
-	background: #f2f2f2 !important;
-}
-.user {
-	// height: 1800rpx;
-	padding-bottom: 200rpx;
-	.user-wrap {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 56vw;
-		padding: 30rpx;
-		z-index: 9;
-		// border-radius: 0 0 20% 20%;
-		// background: url('https://mp-ea41a5d2-ea75-4ec6-aa57-ac841611f485.cdn.bspapp.com/cloudstorage/796de0fd-c730-40b8-9177-1250bb76d0a3.jpg') no-repeat;
-		background-size: cover;
-		.setting {
-			color: #fff;
-			position: absolute;
-			top: 60rpx;
-			left: 60rpx;
-			font-size: 50rpx;
-		}
-		.info {
-			position: absolute;
-			text-align: center;
-			.avatar {
-				width: 150rpx;
-				height: 150rpx;
-				border-radius: 50%;
-				border: 4px solid #fff;
-			}
-			.nickname {
+	page {
+		background: #f2f2f2;
+	}
+
+	.btn-hover {
+		background: #f2f2f2 !important;
+	}
+
+	.user {
+		// height: 1800rpx;
+		padding-bottom: 200rpx;
+
+		.user-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 56vw;
+			padding: 30rpx;
+			z-index: 9;
+			// border-radius: 0 0 20% 20%;
+			// background: url('https://mp-ea41a5d2-ea75-4ec6-aa57-ac841611f485.cdn.bspapp.com/cloudstorage/796de0fd-c730-40b8-9177-1250bb76d0a3.jpg') no-repeat;
+			background-size: cover;
+
+			.setting {
 				color: #fff;
-				font-size: 30rpx;
-				margin-top: 20rpx;
-				font-weight: bold;
-				display: flex;
+				position: absolute;
+				top: 60rpx;
+				left: 60rpx;
+				font-size: 50rpx;
+			}
+
+			.info {
+				position: absolute;
+				text-align: center;
+
+				.avatar {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 50%;
+					border: 4px solid #fff;
+				}
+
+				.nickname {
+					color: #fff;
+					font-size: 30rpx;
+					margin-top: 20rpx;
+					font-weight: bold;
+					display: flex;
+				}
 			}
 		}
-	}
-	.order-status {
-		padding: 0 30rpx;
-		margin-top: -8vw;
-		.status-wrap {
-			border-radius: 25rpx;
-			overflow: hidden;
-			.status-list {
-				display: flex;
-				justify-content: space-evenly;
-				align-items: center;
-				background: #fff;
-				padding-top: 30rpx;
-				padding-bottom: 30rpx;
-				.status-item {
-					flex: 1;
+
+		.order-status {
+			padding: 0 30rpx;
+			margin-top: -8vw;
+
+			.status-wrap {
+				border-radius: 25rpx;
+				overflow: hidden;
+
+				.status-list {
 					display: flex;
-					flex-direction: column;
-					justify-content: center;
+					justify-content: space-evenly;
 					align-items: center;
-					.item-icon {
-						line-height: 1;
-						font-size: 65rpx;
-						color: #bbb;
-					}
-					.item-text {
-						font-size: 28rpx;
-						color: #666;
-						margin-top: 5rpx;
+					background: #fff;
+					padding-top: 30rpx;
+					padding-bottom: 30rpx;
+
+					.status-item {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+
+						.item-icon {
+							line-height: 1;
+							font-size: 65rpx;
+							color: #bbb;
+						}
+
+						.item-text {
+							font-size: 28rpx;
+							color: #666;
+							margin-top: 5rpx;
+						}
 					}
 				}
 			}
 		}
+
+		.com-item {
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			margin-top: 20rpx;
+
+			.com-wrap {
+				border-radius: 25rpx;
+				overflow: hidden;
+			}
+		}
+
+		.cell {
+			height: 110rpx;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background: #fff;
+			border-bottom: 1px solid #f8f8f8;
+
+			&:active {
+				background: #f2f2f2;
+			}
+
+			&:last-child {
+				border-bottom: none !important;
+			}
+
+			.cell-left {
+				display: flex;
+				align-items: center;
+
+				.cell-icon {
+					width: 50rpx;
+					height: 50rpx;
+				}
+
+				.cell-text {
+					color: #666;
+					font-size: 32rpx;
+					margin-left: 20rpx;
+					// font-size: 30rpx;
+				}
+			}
+
+			.iconfont {
+				font-size: 40rpx;
+				color: #999;
+			}
+		}
+	}
+
+	.b-btn {
+		// position: absolute;
+		// right: 20upx;
+		// top: 24upx;
+		width: 132upx;
+		height: 50upx;
+		text-align: center;
+		line-height: 50upx;
+		font-size: 24upx;
+		color: #36343c;
+		border-radius: 30px;
+		background: #ffd465;
+		z-index: 1;
+	}
+
+	.carmimodal {
+		width: 600rpx;
+		border-radius: 20rpx;
+		position: relative;
+
+		.carmiclose {
+			position: absolute;
+			right: 15rpx;
+			top: 15rpx;
+		}
+
+		.carmititle {
+			background: linear-gradient(to right, #00ca88, #00BCD4);
+			color: #fff;
+			height: 120rpx;
+			line-height: 120rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+			text-align: center;
+			border-radius: 20rpx 20rpx 0 0;
+			margin-bottom: 60rpx;
+		}
+
+		.carmiinput {
+			margin: 30rpx;
+		}
+
+		.carmiexchange {
+			margin: 80rpx 30rpx 90rpx 30rpx;
+			background: linear-gradient(to right, #00ca88, #00BCD4);
+			color: #fff;
+			border-radius: 80rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+		}
+
+		.kf_qrcode {
+			// margin-left: 200rpx;
+			margin-bottom: 30rpx;
+		}
+	}
+
+	/* 顶部背景图 start */
+	.top-backgroup {
+		height: 450rpx;
+		z-index: -1;
+
+		.backgroud-image {
+			width: 100%;
+			height: 450rpx;
+			// z-index: -1;
+		}
+	}
+
+	/* 顶部背景图 end */
+	.mine {
+		max-height: 100vh;
+	}
+
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
+
+	.tn-color-cat {
+		color: #1D2541;
+	}
+
+	.tn-bg-cat {
+		background-color: #1D2541;
 	}
-	.com-item {
-		padding-left: 30rpx;
-		padding-right: 30rpx;
-		margin-top: 20rpx;
-		.com-wrap {
-			border-radius: 25rpx;
-			overflow: hidden;
+
+
+	/* 自定义导航栏内容 start */
+	.custom-nav {
+		height: 100%;
+
+		&__back {
+			margin: auto 5rpx;
+			font-size: 40rpx;
+			margin-right: 10rpx;
+			flex-basis: 5%;
+			width: 100rpx;
+			position: absolute;
 		}
 	}
-	.cell {
+
+	/* 自定义导航栏内容 end */
+
+
+	/* 顶部背景图 end */
+
+
+	/* 用户头像 start */
+	.logo-image {
+		width: 110rpx;
 		height: 110rpx;
-		padding-left: 30rpx;
-		padding-right: 30rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		background: #fff;
-		border-bottom: 1px solid #f8f8f8;
-		&:active {
-			background: #f2f2f2;
+		position: relative;
+		overflow: hidden;
+		border-radius: 50%;
+	}
+
+	.logo-pic {
+		background-size: cover;
+		background-repeat: no-repeat;
+		// background-attachment:fixed;
+		background-position: top;
+		border: 8rpx solid rgba(255, 255, 255, 0.05);
+		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
+		border-radius: 50%;
+		overflow: hidden;
+		// background-color: #FFFFFF;
+	}
+
+	/* 页面 start*/
+	.about-shadow {
+		border-radius: 15rpx;
+		box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
+	}
+
+	.about {
+
+		&__wrap {
+			position: relative;
+			z-index: 1;
+			margin: 20rpx 30rpx;
 		}
-		&:last-child {
-			border-bottom: none !important;
+	}
+
+	/* 页面 end*/
+
+	/* 图标容器15 start */
+	.icon15 {
+		&__item {
+			width: 30%;
+			background-color: #FFFFFF;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 100rpx;
+				height: 100rpx;
+				font-size: 60rpx;
+				border-radius: 50%;
+				margin-bottom: 18rpx;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+
+
+				}
+			}
 		}
-		.cell-left {
-			display: flex;
-			align-items: center;
-			.cell-icon {
-				width: 50rpx;
-				height: 50rpx;
+	}
+
+	/* 图标容器12 start */
+	.tn-three {
+		position: absolute;
+		top: 50%;
+		right: 50%;
+		bottom: 50%;
+		left: 50%;
+		transform: translate(-38rpx, -16rpx) rotateX(30deg) rotateY(20deg) rotateZ(-30deg);
+		text-shadow: -1rpx 2rpx 0 #f0f0f0, -2rpx 4rpx 0 #f0f0f0, -10rpx 20rpx 30rpx rgba(0, 0, 0, 0.2);
+	}
+
+	.icon20 {
+		&__item {
+			width: 30%;
+			background-color: #FFFFFF;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 100rpx;
+				height: 100rpx;
+				font-size: 60rpx;
+				border-radius: 50%;
+				margin-bottom: 18rpx;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+					background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
+				}
 			}
-			.cell-text {
-				color: #666;
-				font-size: 32rpx;
-				margin-left: 20rpx;
-				// font-size: 30rpx;
+		}
+	}
+
+
+
+	.button-vip {
+		width: 100%;
+		height: 150rpx;
+		border-radius: 15rpx;
+		position: relative;
+		z-index: 1;
+
+		&::after {
+			content: " ";
+			position: absolute;
+			z-index: -1;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			bottom: 0;
+			border-radius: inherit;
+			opacity: 1;
+			transform: scale(1, 1);
+			background-size: 100% 100%;
+			background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
+		}
+	}
+
+
+	/* 图标容器12 start */
+	.icon12 {
+		&__item {
+			width: 30%;
+			background-color: #FFFFFF;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 15rpx;
+				height: 15rpx;
+				font-size: 50rpx;
+				border-radius: 50%;
+				margin-bottom: 38rpx;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+
+				}
 			}
 		}
-		.iconfont {
-			font-size: 40rpx;
-			color: #999;
+	}
+
+	/* 图标容器1 start */
+	.icon1 {
+		&__item {
+			// width: 30%;
+			background-color: #FFFFFF;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 40rpx;
+				height: 40rpx;
+				font-size: 40rpx;
+				border-radius: 50%;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+					background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
+				}
+			}
 		}
 	}
-}
-
-.b-btn {
-	// position: absolute;
-	// right: 20upx;
-	// top: 24upx;
-	width: 132upx;
-	height: 50upx;
-	text-align: center;
-	line-height: 50upx;
-	font-size: 24upx;
-	color: #36343c;
-	border-radius: 30px;
-	background: #ffd465;
-	z-index: 1;
-}
-
-.carmimodal {
-	width: 600rpx;
-	border-radius: 20rpx;
-	position: relative;
-	.carmiclose {
-		position: absolute;
-		right: 15rpx;
-		top: 15rpx;
+
+	.avatar {
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 50%;
+		border: 3px solid #fff;
 	}
-	.carmititle {
-		background: linear-gradient(to right, #00ca88, #00BCD4);
-		color: #fff;
-		height: 120rpx;
-		line-height: 120rpx;
-		font-size: 32rpx;
-		font-weight: bold;
-		text-align: center;
-		border-radius: 20rpx 20rpx 0 0;
-		margin-bottom: 60rpx;
+
+	.iconmore1 {
+		font-size: 24rpx;
 	}
-	.carmiinput {
+
+	.select {
+		font-weight: bold;
+		font-size: 32rpx;
 		margin: 30rpx;
 	}
-	.carmiexchange {
-		margin: 80rpx 30rpx 90rpx 30rpx;
-		background: linear-gradient(to right, #00ca88, #00BCD4);
-		color: #fff;
-		border-radius: 80rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-	}
-	.kf_qrcode{
-		// margin-left: 200rpx;
-		margin-bottom: 30rpx;
+
+	.expand {
+		// margin: 30rpx;
+		// position: relative;
+		padding: 30rpx;
+
+		// background: linear-gradient(to right, #00ca88, #00BCD4);
+		.surplus {
+			color: #fff;
+			font-size: 26rpx;
+			background: #e11462bf;
+			border-radius: 50rpx;
+			padding: 8rpx 12rpx;
+			margin-right: 20rpx;
+			margin-bottom: 15rpx;
+
+			.item {
+				margin-left: 10rpx;
+			}
+		}
 	}
-}
-
-/* 顶部背景图 start */
-  .top-backgroup {
-    height: 450rpx;
-    z-index: -1;
-  
-    .backgroud-image {
-      width: 100%;
-      height: 450rpx;
-      // z-index: -1;
-    }
-  }
-  
-  /* 顶部背景图 end */
-  .mine{
-    max-height: 100vh;
-  }
-  /* 底部安全边距 start*/
-  .tn-tabbar-height {
-  	min-height: 120rpx;
-  	height: calc(140rpx + env(safe-area-inset-bottom) / 2);
-    height: calc(140rpx + constant(safe-area-inset-bottom));
-  }
-  
-  .tn-color-cat{
-    color: #1D2541;
-  }
-  .tn-bg-cat{
-    background-color: #1D2541;
-  }
-  
-  
-  /* 自定义导航栏内容 start */
-  .custom-nav {
-    height: 100%;
-    
-    &__back {
-      margin: auto 5rpx;
-      font-size: 40rpx;
-      margin-right: 10rpx;
-      flex-basis: 5%;
-      width: 100rpx;
-      position: absolute;
-    }
-  }
-  /* 自定义导航栏内容 end */
-  
-  
-  /* 顶部背景图 end */
-  
-  
-  /* 用户头像 start */
-  .logo-image {
-    width: 110rpx;
-    height: 110rpx;
-    position: relative;
-    overflow: hidden;
-    border-radius: 50%;
-  }
-  
-  .logo-pic {
-    background-size: cover;
-    background-repeat: no-repeat;
-    // background-attachment:fixed;
-    background-position: top;
-    border: 8rpx solid rgba(255,255,255,0.05);
-    box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
-    border-radius: 50%;
-    overflow: hidden;
-    // background-color: #FFFFFF;
-  }
-  
-  /* 页面 start*/
-  .about-shadow {
-    border-radius: 15rpx;
-    box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
-  }
-  
-  .about {
-  
-    &__wrap {
-      position: relative;
-      z-index: 1;
-      margin: 20rpx 30rpx;
-    }
-  }
-  
-  /* 页面 end*/
-  
-  /* 图标容器15 start */
-  .icon15 {
-    &__item {
-      width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-      
-      &--icon {
-        width: 100rpx;
-        height: 100rpx;
-        font-size: 60rpx;
-        border-radius: 50%;
-        margin-bottom: 18rpx;
-        position: relative;
-        z-index: 1;
-        
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-  
-            
-        }
-      }
-    }
-  }
-  
-  /* 图标容器12 start */
-  .tn-three{
-      position: absolute;
-      top: 50%;
-      right: 50%;
-      bottom: 50%;
-      left: 50%;
-      transform: translate(-38rpx, -16rpx) rotateX(30deg) rotateY(20deg) rotateZ(-30deg);
-      text-shadow: -1rpx 2rpx 0 #f0f0f0, -2rpx 4rpx 0 #f0f0f0, -10rpx 20rpx 30rpx rgba(0, 0, 0, 0.2);
-  }
-  .icon20 {
-    &__item {
-      width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-      
-      &--icon {
-        width: 100rpx;
-        height: 100rpx;
-        font-size: 60rpx;
-        border-radius: 50%;
-        margin-bottom: 18rpx;
-        position: relative;
-        z-index: 1;
-        
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-          background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
-        }
-      }
-    }
-  }
-  
-  
-  
-  .button-vip {
-    width: 100%;
-    height: 150rpx;
-    border-radius: 15rpx;
-    position: relative;
-    z-index: 1;
-    
-    &::after {
-      content: " ";
-      position: absolute;
-      z-index: -1;
-      width: 100%;
-      height: 100%;
-      left: 0;
-      bottom: 0;
-      border-radius: inherit;
-      opacity: 1;
-      transform: scale(1, 1);
-      background-size: 100% 100%;
-      background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
-    }    
-  }
-  
-  
-  /* 图标容器12 start */
-  .icon12 {
-    &__item {
-      width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-  
-      &--icon {
-        width: 15rpx;
-        height: 15rpx;
-        font-size: 50rpx;
-        border-radius: 50%;
-        margin-bottom: 38rpx;
-        position: relative;
-        z-index: 1;
-        
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-            
-        }
-      }
-    }
-  }
-  
-  /* 图标容器1 start */
-  .icon1 {
-    &__item {
-      // width: 30%;
-      background-color: #FFFFFF;
-      border-radius: 10rpx;
-      padding: 30rpx;
-      margin: 20rpx 10rpx;
-      transform: scale(1);
-      transition: transform 0.3s linear;
-      transform-origin: center center;
-  
-      &--icon {
-        width: 40rpx;
-        height: 40rpx;
-        font-size: 40rpx;
-        border-radius: 50%;
-        position: relative;
-        z-index: 1;
-  
-        &::after {
-          content: " ";
-          position: absolute;
-          z-index: -1;
-          width: 100%;
-          height: 100%;
-          left: 0;
-          bottom: 0;
-          border-radius: inherit;
-          opacity: 1;
-          transform: scale(1, 1);
-          background-size: 100% 100%;
-          background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg.png);
-        }
-      }
-    }
-  }
-  .avatar {
-  	width: 110rpx;
-  	height: 110rpx;
-  	border-radius: 50%;
-  	border: 3px solid #fff;
-  }
-  .iconmore1{
-	  font-size: 24rpx;
-  }
-  .select {
-  	font-weight: bold;
-  	font-size: 32rpx;
-  	margin: 30rpx;
-  }
-  .expand {
-  		// margin: 30rpx;
-  		// position: relative;
-  		padding: 30rpx;
-  		// background: linear-gradient(to right, #00ca88, #00BCD4);
-  		.surplus {
-  			color: #fff;
-  			font-size: 26rpx;
-  			background: #e11462bf;
-  			border-radius: 50rpx;
-  			padding: 8rpx 12rpx;
-  			margin-right: 20rpx;
-  			margin-bottom: 15rpx;
-  	
-  			.item {
-  				margin-left: 10rpx;
-  			}
-  		}
-  	}
-</style>
+</style>

+ 84 - 60
pages/user/userinfo.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -5,20 +5,23 @@
 			<view :style="{ height: tobheight + 'px' }"></view>
 		</view>
 		<form @submit="formSubmit">
-			<view class='personal-data' >
+			<view class='personal-data'>
 				<view class='list'>
 					<view class='item acea-row row-between-wrapper'>
 						<view>头像</view>
 						<view class="avatar-box" @click.stop='uploadpic'>
-							<image mode="aspectFill" :src="userinfo.avatar?userinfo.avatar:'/static/images/head.jpg'"></image>
+							<image mode="aspectFill" :src="userinfo.avatar?userinfo.avatar:'/static/images/head.jpg'">
+							</image>
 						</view>
 						<!-- #ifdef MP-WEIXIN -->
-						<button style="padding: 0;" class="getbutton" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"></button>
+						<button style="padding: 0;" class="getbutton" open-type="chooseAvatar"
+							@chooseavatar="onChooseAvatar"></button>
 						<!-- #endif -->
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>昵称</view>
-						<view class='input'><input type='nickname' name='nickname' placeholder="请输入昵称" :value='userinfo.nickname'></input>
+						<view class='input'><input type='nickname' name='nickname' placeholder="请输入昵称"
+								:value='userinfo.nickname'></input>
 						</view>
 					</view>
 					<view v-if="userinfo.id_number" class='item acea-row row-between-wrapper'>
@@ -37,9 +40,12 @@
 					</view>
 					<!-- #endif -->
 				</view>
-				<button class='modifyBnt' style="background: linear-gradient(to right, #00ca88, #00BCD4);" hover-class="hoversubmit" formType="submit">保存修改</button>
+				<button class='modifyBnt' style="background: linear-gradient(to right, #00ca88, #00BCD4);"
+					hover-class="hoversubmit" formType="submit">保存修改</button>
 				<!-- #ifdef H5 || APP-PLUS -->
-				<view class="modifyBnt bg-color" style="margin-top: 40rpx;background: #ededed;color: #00ca88;border: 1px solid #00ca88;" @click="outLogin">退出登录</view>
+				<view class="modifyBnt bg-color"
+					style="margin-top: 40rpx;background: #ededed;color: #00ca88;border: 1px solid #00ca88;"
+					@click="outLogin">退出登录</view>
 				<!-- #endif -->
 			</view>
 		</form>
@@ -48,8 +54,15 @@
 </template>
 
 <script>
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-	import { apiurl } from '@/common/request/request';
+	import {
+		mapMutations,
+		mapActions,
+		mapState,
+		mapGetters
+	} from 'vuex';
+	import {
+		apiurl
+	} from '@/common/request/request';
 	// import Header from '@/components/header.vue';
 	export default {
 		// components: {
@@ -67,14 +80,14 @@
 				canvasStatus: false,
 				fileSizeString: '',
 				version: '',
-				ifimg:false,
+				ifimg: false,
 				userinfo: {},
 				tobheight: 45,
 				platform: this.$platform.get(),
 			};
 		},
 		computed: {
-			...mapGetters(['appInfo','isLogin','userInfo'])
+			...mapGetters(['appInfo', 'isLogin', 'userInfo'])
 		},
 		onLoad() {
 			let that = this;
@@ -84,7 +97,7 @@
 				var paddingtop = uni.getSystemInfoSync().statusBarHeight + menumtop;
 				this.tobheight = menumtop + paddingtop + uni.getMenuButtonBoundingClientRect().height;
 			}
-			
+
 		},
 		methods: {
 			...mapActions(['logout']),
@@ -93,8 +106,8 @@
 					title: '当前为最新版本'
 				});
 			},
-			
-            onChooseAvatar(e){
+
+			onChooseAvatar(e) {
 				var that = this;
 				// console.log(e.detail.avatarUrl);
 				// this.userinfo.avatar = e.detail.avatarUrl
@@ -111,10 +124,10 @@
 						if (a.code == 0) {
 							that.userinfo.avatar = a.data.path
 							that.ifimg = true
-						}else{
+						} else {
 							uni.showToast({
-								title:'上传图片失败',
-								icon:'none'
+								title: '上传图片失败',
+								icon: 'none'
 							})
 							that.ifimg = false
 						}
@@ -196,7 +209,7 @@
 					});
 				}
 			},
-			
+
 			/**
 			 * 小程序设置
 			 */
@@ -205,7 +218,7 @@
 					success: function(res) {}
 				});
 			},
-			
+
 			/**
 			 * 退出登录
 			 * 
@@ -221,16 +234,19 @@
 							if (res.confirm) {
 								// getLogout()
 								// 	.then(res => {
-										// console.log(res.code);
-										// uni.clearStorage()
-										that.logout();
-										// that.$store.commit("LOGOUT");
-										uni.navigateBack({})
-										// uni.reLaunch({
-										// 	url: '/pages/index/index'
-										// })
-									// })
-									// .catch(err => {});
+								// console.log(res.code);
+								// uni.clearStorage()
+								that.logout();
+								// that.$store.commit("LOGOUT");
+								// uni.navigateBack({})
+								uni.redirectTo({
+									url: '/pages/user/signin'
+								})
+								// uni.reLaunch({
+								// 	url: '/pages/index/index'
+								// })
+								// })
+								// .catch(err => {});
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
@@ -238,7 +254,7 @@
 					});
 				}
 			},
-			
+
 			/**
 			 * 上传文件
 			 * 
@@ -264,10 +280,10 @@
 								if (a.code == 0) {
 									that.userinfo.avatar = a.data.path
 									that.ifimg = true
-								}else{
+								} else {
 									uni.showToast({
-										title:'上传图片失败',
-										icon:'none'
+										title: '上传图片失败',
+										icon: 'none'
 									})
 									that.ifimg = false
 								}
@@ -283,28 +299,32 @@
 			formSubmit: function(e) {
 				let that = this,
 					value = e.detail.value;
-				
-				if (!that.ifimg&&!that.userInfo.avatar) return that.$u.toast('保存失败,请上传头像');
-				if (value.nickname == that.userinfo.nickname&&!that.userInfo.nickname) return that.$u.toast('保存失败,请填写昵称');
+
+				if (!that.ifimg && !that.userInfo.avatar) return that.$u.toast('保存失败,请上传头像');
+				if (value.nickname == that.userinfo.nickname && !that.userInfo.nickname) return that.$u.toast(
+					'保存失败,请填写昵称');
 				if (value.nickname == that.userinfo.nickname && !that.ifimg) return that.$u.toast('保存失败,您并没有修改');
-				that.$http('user.profile',{nickname: value.nickname,avatar: that.userinfo.avatar}).then( res => {
-					if(res.code == 0){
+				that.$http('user.profile', {
+					nickname: value.nickname,
+					avatar: that.userinfo.avatar
+				}).then(res => {
+					if (res.code == 0) {
 						uni.showToast({
-							title:'保存中...',
-							duration:1000,
-							icon:'loading'						,
+							title: '保存中...',
+							duration: 1000,
+							icon: 'loading',
 						})
 						that.$store.dispatch('getUserInfo')
 						setTimeout(function() {
-						uni.showToast({
-							title:'保存成功',
-							duration:1000						,
-						})
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
+							uni.showToast({
+								title: '保存成功',
+								duration: 1000,
+							})
+							setTimeout(function() {
+								uni.navigateBack()
+							}, 1000);
 						}, 1000);
-					}else{
+					} else {
 						that.$u.toast('保存失败,请重试');
 					}
 				})
@@ -313,10 +333,11 @@
 	}
 </script>
 
-<style  lang="scss">
-	page{
+<style lang="scss">
+	page {
 		background: #ededed;
 	}
+
 	.cartcolor {
 		color: var(--view-theme);
 		border: 1px solid var(--view-theme);
@@ -476,7 +497,8 @@
 		line-height: 90rpx;
 		margin: 76rpx auto 0 auto;
 	}
-	.personal-data .hoversubmit{
+
+	.personal-data .hoversubmit {
 		background: #f7f7f7;
 		color: #acacb3;
 	}
@@ -500,20 +522,22 @@
 			border-radius: 50%;
 		}
 	}
-	
+
 	.acea-row {
-	    display: flex;
-	    flex-wrap: wrap;
+		display: flex;
+		flex-wrap: wrap;
 	}
+
 	.acea-row.row-between-wrapper {
-	    align-items: center;
-	    justify-content: space-between;
+		align-items: center;
+		justify-content: space-between;
 	}
-	
-	.bg-color{
+
+	.bg-color {
 		background-color: #333;
 	}
-	.getbutton{
+
+	.getbutton {
 		position: absolute;
 		width: 96rpx;
 		height: 96rpx;
@@ -521,4 +545,4 @@
 		right: 30rpx;
 		// margin-top: 180rpx;
 	}
-</style>
+</style>

+ 23 - 3
static/fonts/iconfont.css

xqd xqd
@@ -1,9 +1,9 @@
 @font-face {
 	font-family: "iconfont";
 	/* Project id 4174490 */
-	src: url('@/static/fonts/iconfont.woff2?t=1689754571387') format('woff2'),
-		url('@/static/fonts/iconfont.woff?t=1689754571387') format('woff'),
-		url('@/static/fonts/iconfont.ttf?t=1689754571387') format('truetype');
+	src: url('@/static/fonts/iconfont.woff2?t=1690179849451') format('woff2'),
+		url('@/static/fonts/iconfont.woff?t=1690179849451') format('woff'),
+		url('@/static/fonts/iconfont.ttf?t=1690179849451') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,26 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.icon-beijingtupian:before {
+	content: "\e833";
+}
+
+.icon-sudu:before {
+	content: "\e619";
+}
+
+.icon-jurassic_add-user:before {
+	content: "\e6ed";
+}
+
+.icon-shengyin:before {
+	content: "\e8b8";
+}
+
+.icon-caogao:before {
+	content: "\e760";
+}
+
 .icon-shaixuanguolv:before {
 	content: "\e8d7";
 }

BIN
static/fonts/iconfont.ttf


BIN
static/fonts/iconfont.woff


BIN
static/fonts/iconfont.woff2