zhang %!s(int64=2) %!d(string=hai) anos
pai
achega
7d79c6301a

+ 4 - 0
.gitignore

@@ -0,0 +1,4 @@
+/unpackage/dist
+/unpackage/chart
+/unpackage
+/.hbuilderx

+ 1 - 1
api/game.js

@@ -20,7 +20,7 @@ export function test(data) {
 }
 
 // 互娱  k线
-export default function SZlineData(data) {
+export  function SZlineData(data) {
 	return request({
 		url: '/api/kline/0',
 		method: 'get',

+ 14 - 18
pages.json

@@ -11,7 +11,7 @@
 		
 		// 质押
 		{
-				"path": "pages/pledge/pledge",
+				"path": "pages/index/pledge",
 				"style": {
 					"navigationBarTitleText": "互娛共享",
 					"navigationStyle": "custom"
@@ -20,7 +20,7 @@
 		
 		// 互娱
 		{
-				"path": "pages/entertainment/entertainment",
+				"path": "pages/index/entertainment",
 				"style": {
 					"navigationBarTitleText": "",
 					"navigationStyle": "custom"
@@ -29,23 +29,14 @@
 		
 		// 资讯
 		{
-				"path": "pages/information/information",
+				"path": "pages/index/information",
 				"style": {
 					"navigationBarTitleText": "",
 					"navigationStyle": "custom"
 				}
 		},
 		
-		// 我的
-		{
-			"path": "pages/user/user",
-			"style": {
-				// #ifndef MP-WEIXIN
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "个人中心"
-			}
-		},
+		
 		
 		{
 			"path": "pages/public/register",
@@ -125,7 +116,7 @@
 		},
 		
 		{
-			"path": "pages/user/user",
+			"path": "pages/index/user",
 			"style": {
 				// #ifndef MP-WEIXIN
 				"navigationStyle": "custom",
@@ -364,31 +355,36 @@
 		"borderStyle": "black",
 		"backgroundColor": "#000000",
 		"list": [{
+			    // "visible":false,
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabBar/shouye.png",
 				"selectedIconPath": "static/tabBar/shouye-home.png",
 				"text": "首頁"
 			},
 			{
-				"pagePath": "pages/pledge/pledge",
+				// "visible":false,
+				"pagePath": "pages/index/pledge",
 				"iconPath": "static/tabBar/baoya.png",
 				"selectedIconPath": "static/tabBar/baoya-home.png",
 				"text": "質押"
 			},
 			{
-				"pagePath": "pages/entertainment/entertainment",
+				// "visible":false,
+				"pagePath": "pages/index/entertainment",
 				"iconPath": "static/tabBar/huyu.png",
 				"selectedIconPath": "static/tabBar/huyu-home.png",
 				"text": "互娛"
 			},
 			{
-				"pagePath": "pages/information/information",
+				// "visible":false,
+				"pagePath": "pages/index/information",
 				"iconPath": "static/tabBar/zixun.png",
 				"selectedIconPath": "static/tabBar/zixun-home.png",
 				"text": "資訊"
 			},
 			{
-				"pagePath": "pages/user/user",
+				// "visible":false,
+				"pagePath": "pages/index/user",
 				"iconPath": "static/tabBar/my.png",
 				"selectedIconPath": "static/tabBar/my-home.png",
 				"text": "我的"

+ 0 - 106
pages/index/artDetail.vue

@@ -1,106 +0,0 @@
-<template>
-	<view class="center">
-		<view class="title clamp">{{ item.title }}</view>
-		<view class="tip flex">
-			<view class="tip-left">作者:{{ item.author }}</view>
-			<view class="tip-right">{{ item.add_time }}</view>
-		</view>
-		<view class="main" v-for="(ls, index) in item.content" :key="index">
-			<view v-if="ls.type == 'rich-text'" v-html="ls.value" class="main"></view>
-			<video v-if="ls.type == 'video' && ls.value" :src="ls.value" style="width:100%;height: 300px"
-				frameborder="0"></video>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		details
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				id: '',
-				item: ''
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			this.loadData();
-		},
-		methods: {
-			loadData() {
-				details({}, this.id).then(({
-					data
-				}) => {
-					console.log(data);
-					data.content = data.content.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g,
-						'<p class="pHeight"><img');
-					data.content = this.getVideo(data.content);
-					this.item = data;
-				});
-			},
-			// 富文本视频解析
-			getVideo(data) {
-				let videoList = [];
-				let videoReg = /<video.*?(?:>|\/>)/gi; //匹配到字符串中的 video 标签
-				let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i; //匹配到字符串中的 video 标签 的路径
-				let arr = data.match(videoReg) || []; // arr 为包含所有video标签的数组
-				let articleList = data.split('</video>'); // 把字符串  从视频标签分成数组
-				arr.forEach((item, index) => {
-					var src = item.match(srcReg);
-					videoList.push(src[1]); //所要显示的字符串中 所有的video 标签 的路径
-				});
-				let needArticleList = [];
-				articleList.forEach((item, index) => {
-					if (item != '' && item != undefined) {
-						//  常见的标签渲染
-						needArticleList.push({
-							type: 'rich-text',
-							value: item + '</video>'
-						});
-					}
-					let articleListLength = articleList.length; // 插入到原有video 标签位置
-					if (index < articleListLength && videoList[index] != undefined) {
-						needArticleList.push({
-							type: 'video',
-							value: videoList[index]
-						});
-					}
-				});
-				return needArticleList;
-			}
-		}
-	};
-</script>
-
-<style lang="less">
-	.center {
-		width: 100%;
-		height: 100%;
-	}
-
-	.title {
-		padding: 30rpx 30rpx 0 24rpx;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #333333;
-	}
-
-	.tip {
-		padding: 38rpx 32rpx 28rpx 24rpx;
-		font-size: 24rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-		border-bottom: 1px solid #e9e9e9;
-	}
-
-	/deep/ .main {
-		.rich-img {
-			width: 100% !important;
-			height: auto;
-		}
-	}
-</style>

+ 0 - 0
pages/entertainment/entertainment.vue → pages/index/entertainment.vue


+ 34 - 5
pages/index/index.vue

@@ -13,7 +13,9 @@
 					<image class="langTip" src="../../static/shouye/shouye2.png" mode="scaleToFill"></image>
 				</view>
 				<view class="text1  margin-r-10">
-					繁體中文
+					<picker :range="langList" range-key='label' @change="selectLang">
+						<view>{{label}}</view>
+					</picker>
 				</view>
 				<view class="icon1">
 					<image class="langTipDom" src="../../static/shouye/shouye3.png" mode="scaleToFill"></image>
@@ -36,13 +38,13 @@
 		<!-- 底部 -->
 		<view class="tra flex margin-b-10">
 			<view class="tra-item">
-				名稱
+				{{$t('home.b8')}}
 			</view>
 			<view class="tra-item">
-				最新價格
+				{{$t('home.k1')}}
 			</view>
 			<view class="tra-item">
-				24h漲跌幅
+				{{$t('home.b0')}}
 			</view>
 		</view>
 		<!-- 每一项 -->
@@ -63,6 +65,7 @@
 	</view>
 </template>
 <script>
+	import { mapState, mapActions } from "vuex";
 	export default {
 		data() {
 			return {
@@ -105,10 +108,36 @@
 					}],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				}
+				},
 			}
 		},
+		computed: {
+		  ...mapState({
+		    langList: "langList",
+		    lang: "lang",
+		  }),
+		  label() {
+			  const label = this.langList.find((item) =>{ 
+				  console.log(this.lang,item.value);
+				return  item.value == this.lang
+				}).label;
+		    return label
+		  }
+		},
 		methods: {
+			  ...mapActions({
+			    setLang: "setLang",
+			  }),
+			  getCurrent(){
+			      let pages = getCurrentPages();
+			      let curPage = pages[pages.length - 1];
+			      return curPage
+			  },
+			  selectLang(value) {
+			    this.setLang(this.langList[value.detail.value].value);
+			    let path = '/'+this.getCurrent().route
+			  },
+			
 			loadData(source) {
 				//这里是将订单挂载到tab列表下
 				let navItem = this.navList;

+ 119 - 0
pages/index/information.vue

@@ -0,0 +1,119 @@
+<template>
+	<view class="content">
+		<view class="list" @click="navigator">
+			<image class="img" src="../../static/img/zixun1.png" mode=""></image>
+			<view class="text">
+				互娛遊戲玩法介紹
+			</view>
+		</view>
+		<view class="">xian</view>
+		<view class="list" @click="navigatorT"> 
+			<image class="img" src="../../static/img/zixun2.png" mode=""></image>
+			<view class="text">
+				互娛遊戲推廣計劃
+			</view>
+		</view>
+		<view class="">xian</view>
+		<view class="list" @click="navigatorY">
+			<image class="img" src="../../static/img/zixun3.png" mode=""></image>
+			<view class="text">
+				互娛遊戲舉例
+			</view>
+		</view>
+		<view class="">xian</view>
+		<view class="list" @click="navigatorH">
+			<image class="img" src="../../static/img/zixun4.png" mode=""></image>
+			<view class="text">
+				互娛共享
+			</view>
+		</view>
+		<view class="">xian</view>
+		
+		<view class="tit">
+			項目亮點
+		</view>
+		<image class="img" src="../../static/img/zixun5.png" mode="" ></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		methods: {
+			navigator() {
+				uni.navigateTo({
+					url: '/pages/introduce/introduce'
+				})
+			},
+			navigatorT() {
+				uni.navigateTo({
+					url: '/pages/promotion/promotion'
+				})
+			},
+			navigatorY() {
+				uni.navigateTo({
+					url: '/pages/game/game'
+				})
+			},
+			navigatorH() {
+				uni.switchTab({
+					url: '/pages/entertainment/entertainment'
+				})
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+.content{
+	width: 750rpx;
+	height: 1800rpx;
+	background-color: #000000;
+}
+
+.list {
+	height: 180rpx;
+	display: flex;
+	justify-content: start;
+	.img {
+		margin-left: 30rpx;
+		margin-top: 20rpx;
+		width: 200rpx;
+		height: 160rpx;
+	}
+	.text {
+		margin-left: 15rpx;
+		margin-top: 30rpx;
+		// width: 237rpx;
+		height: 29rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+		line-height: 39rpx;
+	}
+}
+	
+	
+
+.tit {
+	margin-top: 40rpx;
+	margin-left: 279rpx;
+	// width: 191rpx;
+	height: 46rpx;
+	font-size: 49rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 21rpx;
+}
+
+.img {
+	margin-top: 26rpx;
+	margin-left: 11rpx;
+	width: 728rpx;
+	height: 538rpx;
+}
+</style>

+ 229 - 0
pages/index/pledge.vue

@@ -0,0 +1,229 @@
+<template>
+	<view class="all">
+		<view class="top">
+			<text>互娛共享</text>
+		</view>
+		<view class="img">
+			<image
+				src="../../static/img/zhiya2.png"
+				mode=""
+				style="width: 696rpx; height: 254rpx"></image>
+		</view>
+		<view @click="navigator"
+			class="my"
+			flex>
+			<image
+				src="../../static/img/zhiya3.png"
+				mode=""
+				style="
+					width: 40rpx;
+					height: 40rpx;
+					margin-left: 50rpx;
+					margin-top: 23rpx;
+					margin-bottom: 22rpx;
+				"></image>
+			<view>我的質押</view>
+			<image
+				class="right"
+				src="../../static/img/zhiya1.png"
+				style="width: 16rpx; height: 26rpx"
+				mode=""></image>
+		</view>
+		<view class="buttom" flex v-for="item in 12">
+			<view class="le" @click="nav">
+				<view
+					class="le1"
+					style="
+						height: 32rpx;
+						font-size: 33rpx;
+						font-weight: 800;
+						color: #ffffff;
+						line-height: 43rpx;
+					">
+					質押投資一
+				</view>
+				<view
+					class="le1"
+					style="
+						height: 19rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 800;
+						color: #feb041;
+						line-height: 43rpx;
+					">
+					20U起投 | 1天
+				</view>
+				<view
+					class="le1"
+					style="
+						height: 19rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 800;
+						color: #feb041;
+						line-height: 43rpx;
+					">
+					總額:1234534.3456U
+				</view>
+				<view class="le2">
+					<button
+						style="
+							width: 308rpx;
+							height: 16rpx;
+							background: #ebebeb;
+							opacity: 0.38;
+							border-radius: 8rpx;
+							margin-top: 50rpx;
+						"></button>
+					<p style="">42.94%</p>
+				</view>
+			</view>
+			<view class="ri">
+				<view class="r1"> 1.00% </view>
+				<view class="r2"> 日均收益率 </view>
+				<view class="r3">
+					<view style="background: #feb041; border-radius: 6rpx; width: 139rpx; height: 44rpx;">
+						<text
+							style="
+							padding-top: 23rpx;
+							margin-left: 20rpx;
+							    text-align: center;
+								width: 82rpx;
+								height: 20rpx;
+								font-size: 21rpx;
+								font-family: PingFang SC;
+								font-weight: 800;
+								color: #191a1f;
+							"
+							>立即加入</text>
+						</view>
+				</view>
+			</view>
+		</view>
+		<view class="aa">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		methods: {
+			navigator() {
+				uni.navigateTo({
+					url: '/pages/myPledge/myPledge'
+				})
+			},
+			nav() {
+				uni.navigateTo({
+					url: '/pages/zyXingqing/zyXingqing'
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.all {
+		width: 750rpx;
+		height: 100%;
+		background-color: #000000;
+	}
+	.top {
+		// margin-top: 77rpx;
+		padding-top: 40rpx;
+		margin-left: 305rpx;
+		height: 34rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+		line-height: 55rpx;
+	}
+
+	.img {
+		margin-left: 27rpx;
+		margin-top: 58rpx;
+	}
+	.my {
+		margin-top: 23rpx;
+		background-color: #191a1f;
+		display: flex;
+
+		view {
+			flex-grow: 1;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ffffff;
+			padding-left: 20rpx;
+			padding-top: 20rpx;
+		}
+
+		.right {
+			width: 16rpx;
+			height: 26rpx;
+			margin-top: 26rpx;
+		}
+	}
+
+	.buttom {
+		display: flex;
+		justify-content: space-between;
+		width: 696rpx;
+		height: 252rpx;
+		background: #191a1f;
+		border-radius: 18rpx;
+		margin-left: 28rpx;
+		margin-top: 20rpx;
+		margin-bottom: 8rpx;
+	}
+	.le1 {
+		margin-left: 28rpx;
+		margin-top: 24rpx;
+	}
+	.le2 {
+		margin-left: 25rpx;
+
+		p {
+			height: 17rpx;
+			font-size: 21rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 43rpx;
+		}
+	}
+	
+	.r1 {
+		margin-top: 35rpx;
+		height: 36rpx;
+		font-size: 47rpx;
+		font-family: PingFang SC;
+		font-weight: 800;
+		color: #FF0102;
+		line-height: 43rpx;
+	}
+	.r2 {
+		margin-top: 25rpx;
+		height: 20rpx;
+		font-size: 21rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+		line-height: 43rpx;
+	}
+	
+	.r3{
+		margin-top: 50rpx;
+	}
+	.aa {
+		width: 750rpx;
+		height: 20rpx;
+		background-color: #000000;
+	}
+</style>

+ 0 - 177
pages/index/sign.vue

@@ -1,177 +0,0 @@
-<template>
-	<view>
-		<view class="title-box">
-			<view class=" title-conetnt  position-relative">
-				<view class="title-img"><image src="/static/img/img08.png" mode="aspectFit"></image></view>
-				<view class="title-content-box">
-					<view class="title-text">已连续签到</view>
-					<view class="title-day-text">
-						<text class="title-day">{{actionDay}}</text>
-						<text>天</text>
-					</view>
-					<view class="title-button" :class="{'signAction':signTrue}" @click="signTrue?'':integral()">{{signTrue?'已签到':'立即签到'}}</view>
-				</view>
-			</view>
-			<view class="title-tip"><text>共获得{{sum_integral}}积分,总签到{{allSign}}天</text></view>
-		</view>
-		<calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" checksIcon="/static/img/img07.png"></calendar>
-	</view>
-</template>
-
-<script>
-import calendar from '../../components/ss-calendar/ss-calendar.vue';
-import { signList, integral,signUser } from '@/api/functionalUnit.js';
-export default {
-	components: {
-		calendar
-	},
-	data() {
-		return {
-			money: '', //保存当前月份
-			year: '', //保存当前年份
-			day: '', //保存当前日期
-			signList: [] ,//签到日子列表
-			actionDay:0,//连续签到天数
-			allSign:0,//累计签到
-			sum_integral:0,//累计获得积分
-			signTrue:false,
-		};
-	},
-	onLoad() {
-		this.signUser();
-		this.getData();
-		this.loadList();
-	},
-	methods: {
-		// 获取当前时间
-		getData(current) {
-			const date = current ? new Date(current) : new Date();
-			this.year = date.getFullYear();//保存当前年份
-			this.month = date.getMonth() + 1;//保存当前月份
-			this.day = date.getDate();//保存当前日期
-		},
-		//获取签到用户信息
-		signUser(){
-			signUser({all:1}).then(({data}) => {
-				this.actionDay = data.sign_num;//连续签到天数
-				this.allSign = data.sum_sgin_day;//累计签到天数
-				this.sum_integral = data.sum_integral;//累计总积分
-			})
-		},
-		// 签到
-		integral() {
-			integral({})
-				.then(e => {
-					// 改为已签到
-					this.signTrue = true;
-					this.actionDay++;
-					// 保存签到成功
-					this.signList.push(this.day);
-					uni.showToast({
-						title: '签到成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 获取签到列表
-		loadList() {
-			let obj = this;
-			let present = this.day; //保存当前天数用于后续计算
-			let actionDay = 0; //用于计算活跃天数
-			let arr = []; //保存返回数组;
-			signList({
-				page: 1,
-				limit: 31
-			}).then(e => {
-				arr = e.data.map((e, ind) => {
-					let time = e.add_time.split('-');
-					let day = parseInt(time[2].replace(/^0/i, ''));
-					let year = time[0];
-					let month = +time[1];
-					if (obj.year == year && obj.month == month) {
-						return day;
-					}
-				});
-				this.signList = arr;
-				// 判断今天是否已经签到
-				if(arr[0]==this.day){
-					this.signTrue = true;
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-}
-.sign-date-box {
-	margin: 25rpx;
-	border-radius: 15rpx;
-	margin-top: -70rpx;
-}
-.title-box {
-	background-color: $base-color;
-	padding-top: 120rpx;
-	color: #ffffff;
-	height: 590rpx;
-	.title-conetnt {
-		height: 350rpx;
-		width: 350rpx;
-		margin: 0 auto;
-		text-align: center;
-		.title-img {
-			position: absolute;
-			top: 0;
-			left: 0;
-			height: 100%;
-			width: 100%;
-			image {
-				height: 100%;
-				width: 100%;
-			}
-		}
-		.title-content-box {
-			position: absolute;
-			width: 100%;
-			.title-day-text {
-				padding: 20rpx;
-				font-size: $font-base - 2rpx;
-				.title-day {
-					font-size: 60rpx;
-				}
-			}
-			.title-text {
-				font-size: 26rpx;
-				padding-top: 100rpx;
-			}
-			.title-button {
-				background-color: #fe7e51;
-				border-radius: 99rpx;
-				width: 200rpx;
-				height: 64rpx;
-				margin: 0 auto;
-				line-height: 64rpx;
-				text-align: center;
-				font-size: $font-base;
-				&.signAction{
-					background-color: $font-color-light;
-				}
-			}
-		}
-	}
-}
-.title-tip {
-	color: #ffffff;
-	font-size: $font-base - 2rpx;
-	padding-top: 20rpx;
-	text-align: center;
-	margin-top: -40rpx;
-}
-</style>

+ 554 - 0
pages/index/user.vue

@@ -0,0 +1,554 @@
+<template>
+	<view class="container">
+		<view class="top">
+			<view class="my">我的</view>
+			<view class="userinfo">
+				<view class="img">
+					<image class="image" src="../../static/error/missing-face.png" mode=""></image>
+				</view>
+				<view class="info">
+					<view>
+						<text class="infor" style="margin-left: -160rpx;">v790d7v...v469874561</text>
+					</view>
+					<view >
+						<image class="in" style="margin-left: -160rpx; margin-top: 15rpx;" src="../../static/shouye/huiyuan.png" mode=""></image>
+					</view>
+				</view>
+				<view class="" >
+					<image @click="showY" class="inf" src="../../static/shouye/userinfo.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="aaa"></view>
+		<!-- 余额 -->
+		<view class="body">
+			<view v-if="show" class="yue">
+				<view class="te">
+					餘額
+				</view>
+				<view class="tex">
+					12356.00
+				</view>
+				<view class="btn">
+					<button class="btn1" @click="navigator"> <text>充值</text> </button>
+					<button class="btn1" @click="navigatorT"> <text>提現</text> </button>
+				</view>
+			</view>
+			
+			<view v-else class="yue1">
+				<view class="tj">統計表</view>
+				<view class="ljcz">
+					<view class="lj">累計充值</view>
+					<view class="ljsu">0.000</view>
+				</view>
+				<view class="ljcz">
+					<view class="lj1">累計提現</view>
+					<view class="ljsu1">0.000</view>
+				</view>
+				<view class="ljcz">
+					<view class="lj1">累計收益</view>
+					<view class="ljsu1">0.000</view>
+				</view>
+				<view class="ljcz">
+					<view class="lj1">個人交易總量</view>
+					<view class="ljsu1">0.000</view>
+				</view>
+				<view class="ljcz">
+					<view class="lj1">團隊交易總量</view>
+					<view class="ljsu1">0.000</view>
+				</view>
+			</view>
+			
+		<!-- 列表 -->
+		<view class="gj">
+			我的工具
+		</view>
+		
+		<view class="user-list flex" @click="navTo('/pages/user/team')">
+			<image src="../../static/shouye/yue.png" mode="" class="left-img"></image>
+			<view class="">
+				餘額明細       
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<!-- 额外添加 -->
+		<view class="user-list flex" @click="navTo('/pages/user/shareQrCode')">
+			<image src="../../static/shouye/money.png" mode="" class="left-img"></image>
+			<view class="">
+				互娛記錄
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<!-- 额外添加 -->
+		<view class="user-list flex" @click="navTo('/pages/tabulation/tabulation')">
+			<image src="../../static/shouye/liebiao.png" mode="" class="left-img"></image>
+			<view class="">
+				會員列表
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/user/favorites')">
+			<image src="../../static/shouye/liebiao.png" mode="" class="left-img"></image>
+			<view class="">
+				分享鏈接
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="openKf()">
+			<image src="../../static/shouye/liuyan.png" mode="" class="left-img"></image>
+			<view class="">
+				在線留言
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/transaction/transaction')">
+			<image src="../../static/shouye/jiaoyi.png" mode="" class="left-img"></image>
+			<view class="">
+				交易密碼
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="user-list flex" @click="navTo('/pages/public/login')">
+			<image src="../../static/shouye/tuichu.png" mode="" class="left-img"></image>
+			<view class="">
+			   退出登錄 
+			</view>
+			<image src="../../static/icon/back.png" mode="" class="right-img"></image>
+		</view>
+		<view class="" style="height: 20rpx;">
+		</view>
+		</view>
+		
+		<view class="" style="width: 750rpx; height: 30rpx; background-color: #000;"></view>
+	</view>
+	
+</template>
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		getUserInfo,
+		// check,
+		// getLevelList
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem
+		},
+		data() {
+			return {
+				current: 2,
+				store_name: '',
+				achievement: '',
+				code: '',
+				levelList: [],
+				show: true
+			};
+		},
+		onShow() {
+			// 判断是否已经登录
+			// if (this.hasLogin) {
+			// 	this.loadBaseData();
+			// }
+			this.loadBaseData();
+		},
+		filters: {
+			phone(e) {
+				var subStr1 = e.substr(0, 3);
+				var subStr2 = e.substr(e.length - 4, 4);
+				var subStr = subStr1 + '...' + subStr2;
+				e = subStr;
+				return e;
+			}
+		},
+		onReady() {
+			// 初始化获取页面宽度
+			uni.createSelectorQuery()
+				.select('.container')
+				.fields({
+						size: true
+					},
+					data => {
+						// 计算最多下拉的高度
+						this.userDowm = Math.floor((data.width / 750) * 185);
+						// 计算最大触发修改高度事件
+						this.userMaxDowm = Math.floor((data.width / 750) * 250);
+					}
+				)
+				.exec();
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		methods: {
+			showY(){
+				this.show = !this.show
+			},
+			navigatorT() {
+				uni.navigateTo({
+					url: '/pages/withdrawal/withdrawal'
+				})
+			},
+			navigator() {
+				uni.navigateTo({
+					url: '/pages/recharge/recharge'
+				})
+			},
+		
+			
+			// ...mapMutations('user', ['setUserInfo']),
+			// sqdl() {
+			// 	if (this.hasLogin) {
+			// 		if (this.userInfo.enroll_status == 1) {
+
+			// 			uni.showModal({
+			// 				title: "提示",
+			// 				content: '您提交的申请正在审核中,请耐心等待审核'
+			// 			})
+			// 		} else {
+			// 			this.navTo('/pages/user/sqdl')
+			// 		}
+			// 	} else {
+			// 		this.navTo('/pages/user/sqdl')
+			// 	}
+			// },
+			// qhx() {
+			// 	check({
+			// 			verify_code: this.code,
+			// 			is_confirm: 1 //1是核销,0是查看
+			// 		})
+			// 		.then(e => {
+			// 			this.$api.msg('核销成功');
+			// 			this.close();
+			// 		})
+			// 		.catch(e => {
+			// 			console.log(e);
+			// 		});
+			// },
+			// sao() {
+			// 	let obj = this;
+
+			// 	// #ifndef H5
+			// 	uni.scanCode({
+			// 		success(e) {
+			// 			obj.code = e.result;
+			// 			obj.$refs.popuphx.open();
+			// 			console.log(obj.$refs.popuphx);
+			// 		}
+			// 	});
+			// 	// #endif
+			// },
+			// comfirm(text) {
+			// 	console.log(text);
+			// 	const result = this.uniCopy(text);
+			// 	if (result === false) {
+			// 		uni.showToast({
+			// 			title: '不支持'
+			// 		});
+			// 	} else {
+			// 		uni.showToast({
+			// 			title: '复制成功',
+			// 			icon: 'none'
+			// 		});
+			// 	}
+			// 	this.$refs.popupkf.close();
+			// },
+			
+			// 加载初始数据
+			loadBaseData() {
+				const obj = this
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						obj.setUserInfo(data);
+
+					})
+					.catch(e => {
+						console.log(e);
+					});
+
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画,所以用view
+			 */
+			navTo(url) {
+				console.log(url);
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
+			close() {
+				this.$refs.popuphx.close();
+				this.code = '';
+			},
+			
+			// 打开绑定
+			open() {
+				this.$refs.gspass.open();
+			},
+			cast() {
+				set_waiter({
+						uid: this.id
+					})
+					.then(e => {
+						this.$api.msg('绑定成功');
+						this.$refs.gspass.close();
+						this.id = '';
+					})
+					.catch(err => {
+						this.$refs.gspass.close();
+						this.id = '';
+					});
+			},
+			// cancelpass() {
+			// 	this.$refs.gspass.close();
+			// 	this.id = '';
+			// }
+		}
+	};
+</script>
+<style lang="scss">
+	.container {
+		width: 750rpx;
+		height: 100%;
+	}
+	
+	.top {
+		width: 750rpx;
+		height: 327rpx;
+		background-color: #000000;
+	}
+	.my {
+		margin-left: 40rpx;
+		padding-top: 40rpx;
+		height: 45rpx;
+		font-size: 48rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 48rpx;
+	}
+	
+	.userinfo {
+		padding-top: 80rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	
+	.image {
+		margin-left: 40rpx;
+		width: 125rpx;
+		height: 125rpx;
+		
+	}
+	
+	.infor {
+		height: 23rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 48rpx;
+	}
+	.in {
+		width: 128rpx;
+		height: 45rpx;
+	}
+	.inf {
+		margin-top: 25rpx;
+		width: 48rpx;
+		height: 48rpx;
+	}
+
+.aaa {
+	width: 750rpx;
+	height: 20rpx;
+	background-color: #191a1f;
+}
+//  body
+.body {
+	width: 750rpx;
+	height: 1273rpx;
+	background-color: #191a1f;
+}
+.yue {
+	width: 700rpx;
+	height: 283rpx;
+	margin-left: 24rpx;
+	background-color: #000000;
+	
+}
+.yue1 {
+	width: 700rpx;
+	height: 360rpx;
+	margin-left: 24rpx;
+	background-color: #000000;
+}
+.tj {
+	height: 28rpx;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	margin-left: 307rpx;
+	padding-top: 35rpx;
+}
+.ljcz {
+	display: flex;
+	justify-content: space-between;
+}
+.lj {
+	height: 23rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	opacity: 0.65;
+	margin-top: 61rpx;
+	margin-left: 31rpx;
+}
+.ljsu {
+	height: 18rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	margin-top: 63rpx;
+	margin-right: 33rpx;
+}
+.lj1 {
+	height: 23rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	opacity: 0.65;
+	margin-top: 31rpx;
+	margin-left: 31rpx;
+}
+.ljsu1{
+	height: 18rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	margin-top: 33rpx;
+	margin-right: 33rpx;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.te {
+	// margin-top: 40rpx;
+	padding-top: 40rpx;
+	margin-left: 325rpx;
+	height: 25rpx;
+	font-size: 26rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+}
+.tex {
+	margin-left: 274rpx;
+	padding-top: 40rpx;
+	height: 37rpx;
+	font-size: 48rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+.btn {
+	margin-top: 100rpx;
+	display: flex;
+	justify-content: space-between;
+}
+.btn1 {
+	width: 276rpx;
+	height: 72rpx;
+	background: #FDB242;
+	border-radius: 10rpx;
+}
+
+.gj {
+	margin-top: 50rpx;
+	margin-left: 20rpx;
+	height: 34rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	line-height: 30rpx;
+}
+
+	.user-list {
+		width: 691rpx;
+		height: 104rpx;
+		background: #191a1f;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 28rpx;
+		margin: 20rpx auto;
+		padding: 0 25rpx;
+
+		.left-img {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		view {
+			padding-left: 20rpx;
+			flex-grow: 1;
+			font-size: 29rpx;
+			font-weight: bold;
+			color: #5D5D5D;
+		}
+
+		.right-img {
+			width: 13rpx;
+			height: 23rpx;
+		}
+	}
+
+	.sqdl {
+		display: block;
+		width: 689rpx;
+		margin: 20rpx auto 20rpx;
+	}
+</style>