cmy 6 bulan lalu
induk
melakukan
0513f5da49

+ 10 - 0
api/game.js

@@ -17,6 +17,16 @@ export  function sellPush(data) {
 		data
 	});
 }
+
+// 单个挂出详情
+export  function getSell(data) {
+	return request({
+		url: `/api/sell/${data.id}`,
+		method: 'get',
+		data
+	});
+}
+
 // 买入订单
 export  function sellBuy(data) {
 	return request({

+ 275 - 0
pages - 副本.json

@@ -0,0 +1,275 @@
+{
+	"pages": [
+		// 首页
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "Home",
+				"navigationStyle": "custom"
+			}
+		},
+		// 质押
+		{
+			"path": "pages/index/pledge",
+			"style": {
+				"navigationBarTitleText": "C2C交易",
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "我的订单 ",
+							"float": "right",
+							"color": "#1356FF",
+							"fontSize": "14px"
+						}]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/register",
+			"style": {
+				"navigationBarTitleText": "注册",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/wxLogin",
+			"style": {
+				"navigationBarTitleText": "微信登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/forget",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "资产",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/redirect/redirect",
+			"style": {
+				"navigationBarTitleText": "微信登录跳转页面",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/index/recharge",
+			"style": {
+				"navigationBarTitleText": "充值",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/personal",
+			"style": {
+				"navigationBarTitleText": "实名认证",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/order",
+			"style": {
+				"navigationBarTitleText": "C2C订单",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#051137",
+				"navigationBarTextStyle": "white"
+			}
+		}
+	],
+	"subPackages": [{ // 模块分包
+		"root": "pages/user",
+		"name": "shop",
+		"pages": [
+			{
+				"path": "set/team",
+				"style": {
+					"navigationBarTitleText": "我的推广",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "set/bindBank",
+				"style": {
+					"navigationBarTitleText": "我的银行卡",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "set/editBank",
+				"style": {
+					"navigationBarTitleText": "银行卡信息",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "transfer",
+				"style": {
+					"navigationBarTitleText": "转账",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "collection",
+				"style": {
+					"navigationBarTitleText": "收款",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "withdrawal",
+				"style": {
+					"navigationBarTitleText": "提币",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "money",
+				"style": {
+					"navigationBarTitleText": "记录",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "set/set",
+				"style": {
+					"navigationBarTitleText": "设置",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			}, {
+				"path": "set/transaction",
+				"style": {
+					"navigationBarTitleText": "交易密码",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+
+			},
+			{
+				"path": "set/password",
+				"style": {
+					"navigationBarTitleText": "修改密码",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "set/userinfo",
+				"style": {
+					"navigationBarTitleText": "修改资料",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "set/shareQrCode",
+				"style": {
+					"navigationBarTitleText": "推广码",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "favorites",
+				"style": {
+					"navigationBarTitleText": "推廣海報",
+					"navigationBarBackgroundColor": "#051137",
+					"navigationBarTextStyle": "white"
+				}
+			}
+		]
+	}],
+	"tabBar": {
+		"color": "#093AAA",
+		"selectedColor": "#1254F9",
+		"borderStyle": "black",
+		"backgroundColor": "#051137",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/shouye.png",
+				"selectedIconPath": "static/tabBar/shouye-home.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/index/pledge",
+				"iconPath": "static/tabBar/baoya.png",
+				"selectedIconPath": "static/tabBar/baoya-home.png",
+				"text": "C2C交易"
+			},
+			{
+				"pagePath": "pages/index/user",
+				"iconPath": "static/tabBar/my.png",
+				"selectedIconPath": "static/tabBar/my-home.png",
+				"text": "资产"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "加载中",
+		"navigationBarBackgroundColor": "#fff",
+		"backgroundColor": "#fff"
+		// "titleNView": false
+	}
+}

+ 4 - 140
pages.json

@@ -27,15 +27,6 @@
 				}
 			}
 		},
-		// 互娱
-		{
-			"path": "pages/index/entertainment",
-			"style": {
-				"navigationBarTitleText": "Game",
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-		},
 		{
 			"path": "pages/public/register",
 			"style": {
@@ -98,74 +89,6 @@
 				}
 			}
 		},
-
-		{
-			"path": "pages/myPledge/myPledge",
-			"style": {
-				"navigationBarTitleText": "我的质押",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/introduce/introduce",
-			"style": {
-				"navigationBarTitleText": "玩法介绍",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/introduce/promotion",
-			"style": {
-				"navigationBarTitleText": "推广计划",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-
-		},
-		{
-			"path": "pages/introduce/game",
-			"style": {
-				"navigationBarTitleText": "游戏举例",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/introduce/pkedetail",
-			"style": {
-				"navigationBarTitleText": "PKR介绍",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-		},
-
-
-
-		{
-			"path": "pages/myPledge/zyXingqing",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/game/history",
-			"style": {
-				"navigationBarTitleText": "历史列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
-			}
-		},
 		{
 			"path": "pages/index/recharge",
 			"style": {
@@ -185,36 +108,18 @@
 			}
 		},
 		{
-			"path": "pages/index/transaction",
-			"style": {
-				"navigationBarTitleText": "交易密码",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#051137",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/information",
-			"style": {
-				"navigationBarTitleText": "收款信息",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#051137",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/index/service",
+			"path": "pages/index/order",
 			"style": {
-				"navigationBarTitleText": "联系客服",
+				"navigationBarTitleText": "C2C订单",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#051137",
 				"navigationBarTextStyle": "white"
 			}
 		},
 		{
-			"path": "pages/index/order",
+			"path": "pages/index/orderDetail",
 			"style": {
-				"navigationBarTitleText": "C2C订单",
+				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#051137",
 				"navigationBarTextStyle": "white"
@@ -275,22 +180,6 @@
 					"navigationBarBackgroundColor": "#051137",
 					"navigationBarTextStyle": "white"
 				}
-			},{
-				"path": "money/recharge",
-				"style": {
-					"navigationBarTitleText": "充值",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#051137",
-					"navigationBarTextStyle": "white"
-				}
-			},
-			{
-				"path": "money/withdrawal",
-				"style": {
-					"navigationBarTitleText": "奖励提现",
-					"navigationBarBackgroundColor": "#051137",
-					"navigationBarTextStyle": "white"
-				}
 			},
 			{
 				"path": "money",
@@ -300,13 +189,6 @@
 					"navigationBarTextStyle": "white"
 				}
 			},
-			{
-				"path": "money/team",
-				"style": {
-					"navigationBarTitleText": "錢包",
-					"navigationStyle": "custom"
-				}
-			},
 			{
 				"path": "set/set",
 				"style": {
@@ -340,24 +222,6 @@
 					"navigationBarTextStyle": "white"
 				}
 			},
-			{
-				"path": "vip/tabulation",
-				"style": {
-					"navigationBarTitleText": "会员列表",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#051137",
-					"navigationBarTextStyle": "white"
-				}
-			},
-			{
-				"path": "vip/details",
-				"style": {
-					"navigationBarTitleText": "他的粉絲",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#051137",
-					"navigationBarTextStyle": "white"
-				}
-			},
 			{
 				"path": "set/shareQrCode",
 				"style": {

+ 0 - 126
pages/game/history.vue

@@ -1,126 +0,0 @@
-<template>
-	<view class="all padding-v-30 padding-c-30">
-		<view class="list padding-v-10 flex" v-for="(item,ind) in list" :key="ind">
-			<view class="le">
-				<view class="qs padding-b-10">{{$t('set.a7')}}{{item.no}}{{$t('set.a8')}}</view>
-				<view class="dy padding-b-10" v-if="item.result_info">{{item.result_info.c}}</view>
-				<view class="dy padding-b-10" v-else>{{ $t("enter.a2") }}</view>
-			</view>
-			<view class="ri flex" v-if="item.result">
-				<template v-for="it in item.arr " v-if="it.value==1">
-					<view class="sx green" v-if="it.type==1">{{ $t("enter.u6") }}</view>
-					<view class="sx green" v-if="it.type==3">{{ $t("enter.u5") }}</view>
-					<view class="sx " v-if="it.type==2">{{ $t("enter.u4") }}</view>
-					<view class="sx" v-if="it.type==4">{{ $t("enter.u7") }}</view>
-				</template>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getGame
-	} from "@/api/game.js";
-	import empty from '@/components/empty';
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				id: '',
-				page: 1,
-				limit: 20,
-				loadingType: 'more',
-				loaded: false,
-				list: []
-			}
-		},
-		onLoad(option) {
-			this.id = option.id;
-			this.gameBetList()
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a2"),
-			});
-		},
-		onReachBottom() {
-			this.gameBetList()
-		},
-		methods: {
-			gameBetList() {
-				let that = this
-				if (that.loadingType == 'loading' || that.loadingType == 'noMore') {
-					return
-				}
-				getGame({
-					page: that.page,
-					limit: that.limit,
-				},that.id).then(({data}) => {
-					let list = data.list.map((res)=>{
-						if(res.result_info){
-							res.result_info.c = (Number(res.result_info.c).toFixed(data.game.decimal))
-						}
-						if(res.result){
-							
-							let arr = [];
-							const ar  =res.result.split(",")
-							console.log(ar,'ar');
-							for (let i = 0; i < ar.length; i++) {
-								const s = ar[i].split(':');
-								arr.push({
-									type:s[0],
-									value:s[1]
-								})
-							}
-							res.arr = arr;
-						}
-						return res
-					})
-					that.list = that.list.concat(list)
-					that.page++
-					console.log('11111111', that.list);
-					if (list.length == that.limit) {
-						that.loadingType = 'more'
-					} else {
-						that.loadingType = 'noMore'
-					}
-					that.loaded = true
-				})
-			}
-		},
-	};
-</script>
-
-<style lang="scss">
-
-	.list {
-		line-height: 1;
-		border-bottom: 1px solid $border-color-light;
-		.le {
-			font-weight: bold;
-			.qs {
-				font-size: 20rpx;
-				color: #ffffff;
-			}
-
-			.dy {
-				font-size: 46rpx;
-				color: #fdb242;
-			}
-
-		}
-		.ri {
-			.sx {
-				padding-left: 10rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #df5660;
-				&.green{
-					color: $color-green;
-				}
-			}
-		}
-	}
-	
-</style>

+ 0 - 759
pages/index/entertainment.vue

@@ -1,759 +0,0 @@
-<template>
-	<view class="all">
-		<view class="padding-t-30"></view>
-		<view class="top-content">
-			<view class="top-one flex">
-				<view class="action-title">
-					<text v-if="history.next">{{$t('indexenter.第')}}{{history.next.no}}{{$t('indexenter.期')}}</text>
-					<text v-else>loading...</text>
-				</view>
-				<view class="end-time">
-					<text>{{$t('indexenter.距离结束')}}</text>
-					<text class="time">
-						<text v-if="time.H<10">0</text>
-						{{time.H}}:
-						<text v-if="time.M<10">0</text>
-						{{time.M}}:
-						<text v-if="time.S<10">0</text>
-						{{time.S}}
-					</text>
-				</view>
-			</view>
-			<view class="top-two flex" v-if="history.list.length>0">
-				<view class="old-title flex-start">
-					<text>{{$t('indexenter.第')}}{{history.list[0].no}}{{$t('indexenter.期')}}</text>
-					<image v-for="ls in history.list[0].result_info" class="dice"
-						:src="`../../static/img/dice${ls}.png`" mode="scaleToFill"></image>
-				</view>
-				<view class="old-num">
-					<!-- {{$t('indexenter.竞猜数')}}:10 -->
-					{{$t('indexenter.结果')}}:
-					<text class="margin-l-10"
-						v-for="ll in history.list[0].typelist">{{$t(`indexenter.${ll.type}`)}}</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="number flex">
-			<view class="item-num" :class="{action:ind==actiontype}" v-for="(item,ind) in history.base.include_function"
-				@click="actiontype=ind">
-				<view class="type">
-					{{$t(`indexenter.${item.name}`)}}
-				</view>
-				<view class="percentage">
-					{{item.bfb}}%
-				</view>
-			</view>
-		</view>
-		<view class="money-list flex">
-			<view class="list-ls flex" @click="upOnBtnData.value=item.value" v-for="(item,ind) in moneyList">
-				<view class="image">
-					<image class="img" :src="item.url" mode="widthFix"></image>
-				</view>
-				<view class="list">
-					{{item.value}}
-				</view>
-			</view>
-		</view>
-		<view class="pay-title padding-l-30">
-			{{$t('indexenter.竞猜总额')}}(USDT):
-		</view>
-		<view class="pay-money-box flex padding-c-30 padding-v-10">
-			<input class="pay-money" type="number" v-model="upOnBtnData.value" />
-			<view class="buttom-del" @click="upOnBtnData.value=0">
-				{{$t('indexenter.清空')}}
-			</view>
-		</view>
-		<view class="pay-title padding-c-30 flex padding-v-20">
-			<view>
-				{{$t('indexenter.竞猜总额')}}:
-			</view>
-			<view class="font-color-yellow">
-				0
-				USDT
-			</view>
-		</view>
-		<view class="push-buttom" @click="onPayBet">
-			{{$t('indexenter.确认')}}
-		</view>
-
-		<view class="chz flex" @click="nav('/pages/user/money/recharge')">
-			<view>
-				<view class="yue padding-b-10">{{$t('enter.u15')}}</view>
-				<view class="yes">{{userWallet}}USDT</view>
-			</view>
-			<view class="flex-start">
-				<view class="quc">{{$t('enter.u16')}}</view>
-				<image class="choz" src="../../static/img/img39.png" mode="scaleToFill"></image>
-			</view>
-		</view>
-
-		<view class="history-title padding-l-30 margin-t-30 flex-start">
-			<view :class="{action:historyType==0}" @click="historyType=0">
-				{{$t('indexenter.押注记录')}}
-			</view>
-			<view class="margin-l-30" :class="{action:historyType==1}" @click="historyType=1">
-				{{$t('indexenter.近期记录')}}
-			</view>
-		</view>
-
-		<view class="history-list">
-			<view class="history-title-type flex">
-				<view class="history-item">
-					{{$t('indexenter.期号')}}
-				</view>
-				<view class="history-item" v-if="historyType==0">
-					{{$t('indexenter.竞猜值')}}
-				</view>
-				<view class="history-item">
-					{{$t('indexenter.竞猜数')}}
-				</view>
-				<view class="history-item">
-					{{$t('indexenter.结果')}}
-				</view>
-			</view>
-			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in betList.list" :key="ind"
-				v-if="historyType==0">
-				<view class="history-item font-color-yellow"
-					:class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
-					{{item.room.no}}
-				</view>
-				<view class="history-item font-color-red">
-					<text class="margin-l-10" v-for="(ll,ind) in history.base.include_function"
-						v-if="item.bet==ll.id">{{$t(`indexenter.${ll.name}`)}}</text>
-				</view>
-				<view class="history-item font-color-red">
-					{{item.room.result_info||$t('enter.a2')}}
-				</view>
-				<view class="history-item font-color-yellow" v-if="item.typelist.length>0">
-					<text class="margin-l-10" v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
-				</view>
-				<view class="history-item font-color-yellow" v-else>
-					{{$t('enter.a2')}}
-				</view>
-			</view>
-			<view class="history-title-type flex margin-t-30" v-for="(item,ind) in history.list" :key="ind"
-				v-if="historyType==1">
-				<view class="history-item font-color-yellow"
-					:class="{'font-color-gray':item.result==0,'font-color-red':item.result==1}">
-					{{item.no}}
-				</view>
-				<!-- <view class="history-item font-color-red">
-					<text class="margin-l-10"
-						 v-for="(ll,ind) in history.base.include_function" v-if="item.bet==ll.id">{{$t(`indexenter.${ll.name}`)}}</text>
-				</view> -->
-				<view class="history-item font-color-red flex">
-					<image v-for="ls in item.result_info" class="dice-number" :src="`../../static/img/dice${ls}.png`"
-						mode="scaleToFill"></image>
-				</view>
-				<view class="history-item font-color-yellow" v-if="item.typelist.length>0">
-					<text class="margin-l-10" v-for="ll in item.typelist">{{$t(`indexenter.${ll.type}`)}}</text>
-				</view>
-				<view class="history-item font-color-yellow" v-else>
-					{{$t('enter.a2')}}
-				</view>
-			</view>
-		</view>
-
-
-		<uni-popup type="bottom" ref="popup" :mask-click="false" @maskClick='colsePayPassword'>
-			<inputPassword @commit='KeyInfo' @colse='colsePayPassword'></inputPassword>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {} from "@/api/game.js";
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getGame,
-		getGameList,
-		gameWallet,
-		gameBetList,
-		gameBetIn,
-		// gameTest
-	} from "@/api/game.js";
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	import {
-		getTime
-	} from '@/utils/rocessor.js';
-	import inputPassword from "@/components/input-password/input-password.vue";
-	export default {
-		components: {
-			inputPassword
-		},
-		computed: {
-			...mapState("user", ["hasLogin"]),
-		},
-		data() {
-			return {
-				historyType: 0, //记录类型
-				// 当前选中的大小奇偶
-				actiontype: 0,
-				id: '',
-				moneyList: [{
-						url: '/static/img/money_pay_1.png',
-						value: 5
-					}, {
-						url: '/static/img/money_pay_2.png',
-						value: 10
-					},
-					{
-						url: '/static/img/money_pay_3.png',
-						value: 30
-					},
-					{
-						url: '/static/img/money_pay_4.png',
-						value: 50
-					}
-				],
-				// 游戏信息
-				time: {
-					H: 0,
-					M: 0,
-					S: 0,
-					// 保存倒计时对象
-					t: ''
-				},
-				// 游戏信息
-				history: {
-					list: [], //游戏进行记录
-					page: 1,
-					limit: 10,
-					// 基础数据
-					base: {},
-					next: "",
-					now: {}
-				},
-				// 游戏押注记录
-				betList: {
-					list: [], //游戏进行记录
-					page: 1,
-					limit: 5,
-				},
-				userWallet: 0,
-				upOnBtnData: {
-					type: '',
-					// 当前输入的密码
-					passwordArr: '',
-					value: 0,
-				},
-				// 保存获取下次游戏对象
-				getNextTimeObj: '',
-				loadPage:true,
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			uni.setNavigationBarTitle({
-				title: option.title
-			});
-		},
-		onShow() {
-			if (!this.hasLogin) {
-				uni.showModal({
-					title: this.$t('enter.c4'),
-					content: this.$t('enter.b5'),
-					cancelText: this.$t('indexenter.取消'),
-					confirmText: this.$t('indexenter.确定'),
-					success: (e) => {
-						// 判断是否点击确认按钮
-						if (e.confirm) {
-							// 保存当前页面地址
-							saveUrl()
-							// 跳转页面
-							interceptor()
-						}
-					}
-				})
-				return
-			}
-			this.getUserWallet();
-			this.gameInit(this.id);
-		},
-		// 关闭循环
-		onHide() {
-			const that = this;
-			// 倒计时清理
-			that.initData();
-		},
-		onUnload() {
-			const that = this;
-			that.initData();
-		},
-		methods: {
-			getTime,
-			// 初始化
-			gameInit(id) {
-				console.log('id', id);
-				// await gameTest();
-				// 获取基础信息
-				this.getGame(id);
-			},
-			// 获取游戏信息
-			getGame(id) {
-				const that = this;
-				getGame({
-					page: that.history.page,
-					limit: that.history.limit
-				}, id).then(({
-					data
-				}) => {
-					that.history.base = data.game || {};
-					that.history.base.include_function = that.history.base.include_function.map((res) => {
-						res.bfb = res.ratio * 1 * that.history.base.success_ratio / 100;
-						return res
-					})
-					that.history.next = data.now_game || '';
-					that.history.now = data.now_game || '';
-
-					if (data.list) {
-						that.history.list = data.list.map((res) => {
-							res.result_info = res.result_info.split(",");
-							res.typelist = that.resultLottery(res.result);
-							return res
-						});
-						console.log(that.history.list, 'that.history.list');
-					} else {
-						that.history.list = [];
-					}
-					// 判断是否不存在游戏,并且没有倒计时对象,且在当前页面
-					if (that.loadPage && !that.history.next) {
-						that.getNextTimeObj = setTimeout(() => {
-							that.getGame(id)
-						}, 1000)
-						return
-					}
-					if (that.history.next && that.getNextTimeObj) {
-						clearTimeout(that.getNextTimeObj);
-						// 清空倒计时对象
-						that.getNextTimeObj = '';
-					}
-					// 判断是否有活动并且正在进行中
-					if (that.history.next && !that.getNextTimeObj) {
-						that.opTiem();
-						that.gameBetList()
-					}
-				})
-			},
-			// 处理中奖信息数据
-			resultLottery(st) {
-				const that = this;
-				let typelist = [];
-				if (st) {
-					st.split(",").forEach((r) => {
-						const ar = r.split(':');
-						if (ar[1] == '1') {
-							for (let i = 0; i < that.history.base.include_function.length; i++) {
-								if (that.history.base.include_function[i].id == ar[0] * 1) {
-									typelist.push({
-										type: that.history.base.include_function[i].name
-									})
-									break
-								}
-							}
-						}
-					});
-				}
-				return typelist
-			},
-			// 游戏押注记录
-			gameBetList() {
-				const that = this;
-				if (that.historyType == 0) {
-					const lineNum = that.history.base.decimal;
-					gameBetList({
-						page: 1,
-						limit: 10,
-						id: that.history.base.id,
-					}).then(({
-						data
-					}) => {
-						that.betList.list = data.bet_log.map((res) => {
-							res.typelist = that.resultLottery(res.room.result);
-							return res
-						});
-					})
-				}
-
-			},
-			// 开始倒计时
-			async opTiem() {
-				const that = this;
-				try {
-					// 判斷是否有游戲信息并且有正在進行中游戏
-					if (that.history.base.id && that.history.next) {
-						// console.log(that.history.base.id, that.history.next,
-						// 	'that.history.base.id && that.history.next');
-						that.time.t = setInterval(() => {
-							that.getOutTime();
-						}, 1000)
-					}
-				} catch (e) {
-					console.log(e, '定时');
-				}
-			},
-			// 清除加载
-			initData() {
-				const that = this;
-				that.loadPage = false;
-				// 关闭倒计时
-				clearTimeout(that.getNextTimeObj);
-				clearInterval(that.time.t);
-				// 清空倒计时对象
-				that.getNextTimeObj = '';
-				that.time = {
-					H: 0,
-					M: 0,
-					S: 0,
-					t: ''
-				};
-			},
-			// 点击触发支付事件
-			onPayBet() {
-				if (!this.upOnBtnData.value) {
-					uni.showToast({
-						title: this.$t('enter.a9'),
-						icon: "error"
-					})
-					return
-				}
-				if (!this.history.next) {
-					uni.showModal({
-						title: this.$t('enter.c4'),
-						content: this.$t('enter.a3'),
-						showCancel: false,
-						confirmText: this.$t('indexenter.确定'),
-					});
-					return
-				}
-				this.upOnBtnData.type = this.history.base.include_function[this.actiontype].id;
-				this.openPayPassword();
-			},
-			// 打开支付弹窗
-			openPayPassword() {
-				this.upOnBtnData.show = true;
-				this.$refs.popup.open();
-			},
-			// 关闭支付弹窗
-			colsePayPassword() {
-				this.upOnBtnData.show = false;
-				this.$refs.popup.close();
-			},
-			// 密码输入完成后调用下注
-			KeyInfo(val) {
-				const that = this;
-				that.upOnBtnData.passwordArr = val;
-				const name = that.$t(`indexenter.${that.history.base.include_function[that.actiontype].name}`)
-				that.colsePayPassword();
-				uni.showModal({
-					title: that.$t('enter.c4'),
-					content: `${that.$t('enter.a8')}${that.upOnBtnData.value}USDT${that.$t('enter.a10')}${that.history.next.no}${name}`,
-					cancelText: that.$t('indexenter.取消'),
-					confirmText: that.$t('indexenter.确定'),
-					success: res => {
-						if (res.confirm) {
-							that.gameBetIn();
-						}
-					},
-				});
-			},
-			// 参与压住
-			gameBetIn(type) {
-				const that = this;
-				const upData = {
-					id: that.history.next.id,
-					bet: that.upOnBtnData.type,
-					num: that.upOnBtnData.value,
-					trade_password: that.upOnBtnData.passwordArr
-				};
-				uni.showLoading({
-					mask: true
-				})
-				that.upOnBtnData.value = '';
-				gameBetIn(upData).then((res) => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.msg
-					});
-					that.gameBetList();
-					that.getUserWallet();
-				}).catch((res) => {
-					uni.hideLoading();
-					uni.showToast({
-						title: res.msg
-					});
-				})
-			},
-			// 获取用户余额信息
-			getUserWallet() {
-				gameWallet().then((res) => {
-					const balance = Number(res.data.back.USDT.money.money);
-					this.userWallet = balance.toFixed(2);
-					// this.userWallet = +res.data.back.USDT.money.money
-				})
-			},
-			// 获取倒计时时间
-			getOutTime() {
-				const that = this;
-				const da = (new Date()).getTime();
-				const timenum = that.history.next.close_time * 1000 - da;
-				// console.log(timenum, that.history.next.open_time, da, '计算');
-				if (timenum > 0) {
-					that.time.H = Math.floor(timenum / 1000 / 60 / 60);
-					that.time.S = Math.floor(timenum / 1000 % 60)
-					that.time.M = Math.floor(timenum / 1000 / 60 % 60);
-				}
-				if (that.time.H == 0 && that.time.M == 0 && that.time.S == 0) {
-					console.log('归0');
-					clearInterval(that.time.t);
-					// 延时调用防止数据重复加载
-					setTimeout(() => {
-						that.getGame(that.history.base.id);
-					}, 2000)
-				}
-
-			},
-			// 页面跳转
-			nav(url) {
-				console.log('tz');
-				if (!this.hasLogin) {
-					uni.showModal({
-						title: this.$t('enter.c4'),
-						content: this.$t('enter.b5'),
-						cancelText: this.$t('indexenter.取消'),
-						confirmText: this.$t('indexenter.确定'),
-						success: (e) => {
-							// 判断是否点击确认按钮
-							if (e.confirm) {
-								// 保存当前页面地址
-								saveUrl()
-								// 跳转页面
-								interceptor()
-							}
-						}
-					})
-					return
-				}
-				uni.navigateTo({
-					url,
-					fail(err) {
-						console.log(err);
-					}
-				});
-			},
-		},
-	};
-</script>
-
-<style lang="scss">
-	$yellow: #FDAF41;
-
-	.all {
-		width: 750rpx;
-		/* height: 2500rpx; */
-		height: 100%;
-		padding-top: var(--status-bar-height);
-		padding-bottom: 30rpx;
-		color: #FFFFFF;
-	}
-
-	.chz {
-		background: #191a1f;
-		border-radius: 20rpx;
-		margin: 0 30rpx;
-		color: #ffffff;
-		font-weight: bold;
-		padding: 20rpx 30rpx;
-
-		.yue {
-			font-size: 28rpx;
-		}
-
-		.yes {
-			color: $color-yellow;
-		}
-
-		.quc {
-			font-size: 26rpx;
-			font-weight: 500;
-		}
-
-		.choz {
-			width: 22rpx;
-			height: 14rpx;
-		}
-	}
-
-	.number {
-		flex-wrap: wrap;
-		padding: 70rpx;
-		padding-bottom: 0;
-
-		.item-num {
-			line-height: 1;
-			text-align: center;
-			font-weight: bold;
-			width: 260rpx;
-			border-radius: 20rpx;
-			margin-bottom: 70rpx;
-			padding: 30rpx;
-			background: linear-gradient(-74deg, rgba(206, 156, 109, 0.4), rgba(255, 236, 214, 0.4));
-
-			&.action {
-				background: linear-gradient(-74deg, #CE9C6D, #FFECD6);
-			}
-
-			.type {
-				font-size: 72rpx;
-			}
-
-			.percentage {
-				padding-top: 20rpx;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.money-list {
-		padding: 0 30rpx;
-		color: #FFF;
-		text-align: center;
-		align-items: stretch;
-		padding-bottom: 50rpx;
-
-		.list-ls {
-			width: 23%;
-			flex-direction: column;
-			align-items: stretch;
-			font-size: 35rpx;
-			font-weight: bold;
-
-			.image {
-				.img {
-					width: 100%;
-				}
-			}
-		}
-	}
-
-	.pay-title {
-		font-size: 26rpx;
-	}
-
-	.pay-money-box {
-		.pay-money {
-			flex-grow: 1;
-			font-size: 38rpx;
-			font-weight: bold;
-			color: $yellow;
-		}
-
-		.buttom-del {
-			background-color: $yellow;
-			border-radius: 6rpx;
-			color: #000000;
-			font-size: 26rpx;
-			padding: 14rpx 26rpx;
-			line-height: 1;
-		}
-	}
-
-	.push-buttom {
-		text-align: center;
-		line-height: 1;
-		color: #000000;
-		background-color: $yellow;
-		padding: 30rpx;
-		margin: 30rpx;
-		border-radius: 10rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.history-title {
-		font-size: $font-lg;
-
-		.action {
-			color: $yellow;
-		}
-	}
-
-	.history-list {
-		line-height: 1;
-		background-color: #1E1E1F;
-		border-radius: 10rpx;
-		padding: 30rpx;
-		margin: 30rpx;
-
-		.history-title-type {
-			font-size: 24rpx;
-
-			.history-item {
-				text-align: center;
-				width: 25%;
-
-				.dice-number {
-					width: 40rpx;
-					height: 40rpx;
-				}
-
-				&:nth-child(1) {
-					text-align: left;
-					width: 30%;
-				}
-
-				&:nth-child(2) {
-					width: 30%;
-				}
-
-				&:nth-child(3) {
-					width: 20%;
-				}
-
-				&:nth-child(4) {
-					text-align: right;
-					width: 20%;
-				}
-			}
-		}
-	}
-
-	.top-content {
-		padding: 30rpx;
-		color: #FFF;
-		background-color: #1E1E1F;
-		line-height: 1;
-
-		.top-one {
-			font-size: $font-lg;
-
-			.time {
-				padding-left: 10rpx;
-				color: $color-red;
-			}
-		}
-
-		.top-two {
-			font-size: 26rpx;
-			padding-top: 20rpx;
-
-			.old-title {
-				.dice {
-					width: 54rpx;
-					height: 54rpx;
-					margin-left: 10rpx;
-				}
-			}
-
-			.old-num {
-				color: $color-yellow;
-			}
-		}
-	}
-</style>

+ 0 - 359
pages/index/index - 副本.vue

@@ -1,359 +0,0 @@
-<template>
-	<view class="container">
-		<view class="top flex">
-			<view class="icon1 flex">
-				<image src="/static/image/img01.png" style="width: 139rpx;" mode="widthFix"></image>
-				<view class="myName">我的</view>
-			</view>
-			<view class="flex">
-				<image src="/static/image/img03.png" style="width: 39rpx;margin-right: 38rpx;" mode="widthFix"></image>
-				<image src="/static/image/img02.png" style="width: 39rpx;" mode="widthFix"></image>
-			</view>
-		</view>
-		<view class="swiper-box">
-			<u-swiper :list="swiperList" indicator indicatorMode="line" height="280rpx" circular></u-swiper>
-		</view>
-		<view class="flex noteBox">
-			<view class="flex_item noteTpl">
-				<image src="/static/image/img04.png" style="width: 42rpx;" mode="widthFix"></image>
-				<view class="clamp textTpl">上线活动的公告等等公告内容上线活动的公告等等公告内容等上线活动的公告等等公告内容等</view>
-			</view>
-			<view class="tip"></view>
-		</view>
-		<view class="flex navList">
-			<view class="navTpl" @click="openurl('/pages/index/recharge')">
-				<image src="/static/image/img06.png" style="width: 123rpx;" mode="widthFix"></image>
-				<view class="navName">充值</view>
-			</view>
-			<view class="navTpl" @click="openurl('/pages/index/personal')">
-				<image src="/static/image/img07.png" style="width: 123rpx;" mode="widthFix"></image>
-				<view class="navName">实名认证</view>
-			</view>
-			<view class="navTpl" @click="openurl('/pages/index/transaction')">
-				<image src="/static/image/img08.png" style="width: 123rpx;" mode="widthFix"></image>
-				<view class="navName">交易密码</view>
-			</view>
-			<view class="navTpl" @click="openurl('/pages/index/information')">
-				<image src="/static/image/img09.png" style="width: 123rpx;" mode="widthFix"></image>
-				<view class="navName">收款信息</view>
-			</view>
-			<view class="navTpl" @click="openurl('/pages/index/service')">
-				<image src="/static/image/img10.png" style="width: 123rpx;" mode="widthFix"></image>
-				<view class="navName">联系客服</view>
-			</view>
-		</view>
-		<view class="starBox flex">
-			<view class="starTpl flex_item">
-				<image src="/static/image/img12.png" style="width: 75rpx;" mode="widthFix"></image>
-				<view class="starText">
-					<view class="name">okx(欧易)</view>
-					<view class="num">7.21</view>
-				</view>
-			</view>
-			<view class="starTpl flex_item">
-				<image src="/static/image/img13.png" style="width: 75rpx;" mode="widthFix"></image>
-				<view class="starText">
-					<view class="name">STAR(星空)</view>
-					<view class="num">7.21</view>
-				</view>
-			</view>
-		</view>
-		<image src="/static/image/img11.png" style="width: 692rpx;padding-top: 31rpx;" mode="widthFix"></image>
-		<view class="titleBox">
-			<view class="titleTip">累计成交量</view>
-		</view>
-		<view class="flex totalBox">
-			<view class="totalTpl">
-				<view class="totalNum">10,910,000<text>USDT</text></view>
-				<view class="totalName">累计买入</view>
-			</view>
-			<view class="totalTpl">
-				<view class="totalNum">10,910,000<text>USDT</text></view>
-				<view class="totalName">累计卖出</view>
-			</view>
-		</view>
-		<view class="titleBox">
-			<view class="titleTip">平台优势</view>
-		</view>
-		<view class="advantageBox flex">
-			<view class="advantageTpl">
-				<image src="/static/image/img16.png" style="width:149rpx;" mode="widthFix"></image>
-				<view class="advantageName">简单</view>
-			</view>
-			<view class="advantageTpl">
-				<image src="/static/image/img15.png" style="width:149rpx;" mode="widthFix"></image>
-				<view class="advantageName">安全</view>
-			</view>
-			<view class="advantageTpl">
-				<image src="/static/image/img14.png" style="width:149rpx;" mode="widthFix"></image>
-				<view class="advantageName">省心</view>
-			</view>
-			<view class="advantageTpl">
-				<image src="/static/image/img17.png" style="width:149rpx;" mode="widthFix"></image>
-				<view class="advantageName">极速</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import {
-		getIndex
-	} from '@/api/index.js';
-	import {
-		getGameList,
-	} from "@/api/game.js";
-	import {
-		mapState,
-		mapActions,
-		mapMutations
-	} from "vuex";
-	export default {
-		data() {
-			return {
-				gameList: [],
-				active_user: '0',
-				swiperList:['/static/image/img05.png']
-			}
-		},
-		computed: {
-			...mapState({
-				langList: "langList",
-				lang: "lang",
-			}),
-			...mapState('user', ['userInfo']),
-			label() {
-				const label = this.langList.find((item) => {
-					console.log(this.lang, item.value);
-					return item.value == this.lang
-				}).label;
-				return label
-			}
-		},
-		onLoad(option) {
-			// #ifndef MP
-			if (option.spread) {
-				// 存储其他邀请人
-				uni.setStorageSync('spread', option.spread);
-			}
-			// #endif
-			// #ifdef MP
-			if (option.scene) {
-				// 存储小程序邀请人
-				uni.setStorage({
-					key: 'spread_code',
-					data: option.scene
-				});
-			}
-			// #endif
-		},
-		onShow() {
-			this.getGameList();
-			this.loadData();
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'login']),
-			...mapActions({
-				setLang: "setLang",
-			}),
-			openurl(url){
-				uni.navigateTo({
-					url: url,
-					fail: (err) => {
-						uni.showModal({
-							title: '错误',
-							content: err,
-							showCancel: false,
-						});
-					}
-				});
-			},
-			// 请求载入数据
-			async loadData() {
-				getIndex({})
-					.then(({
-						data
-					}) => {
-						this.active_user = data.active_user
-						console.log(data);
-					})
-					.catch(e => {});
-			},
-			selectLang(value) {
-				this.setLang(this.langList[value.detail.value].value);
-			},
-
-			getGameList() {
-				getGameList().then((res) => {
-					this.gameList = res.data.list;
-
-					if (this.gameList.length > 2) {
-						this.gameList = this.gameList.slice(0, 2)
-					}
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-	.container {
-		width: 100%;
-		background-color: #051137;
-		padding: 0rpx 30rpx;
-		padding-top: calc(60px + var(--status-bar-height));
-		padding-bottom: 50rpx;
-	}
-	.top {
-		font-weight: 500;
-		padding: 40rpx 30rpx 24rpx 30rpx;
-		line-height: 1;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		background: #051137;
-		z-index: 99;
-		.icon1 {
-			line-height: 0;
-			position: relative;
-			.myName{
-				position: absolute;
-				right: 22rpx;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #2884FF;
-			}
-		}
-	}
-	.noteBox{
-		padding: 46rpx 0rpx;
-		.noteTpl{
-			color: #fff;
-			width: 85%;
-			.textTpl{
-				width: calc(100% - 42rpx);
-				font-family: PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #FFFFFF;
-				padding-left: 30rpx;
-			}
-		}
-		.tip{
-			width: 12rpx;
-			height: 12rpx;
-			background: #F7453D;
-			border-radius: 100%;
-		}
-	}
-	.navList{
-		text-align: center;
-		padding:15rpx 0rpx;
-		.navTpl{
-			.navName{
-				padding-top: 23rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-	.starBox{
-		padding-top: 43rpx;
-		.starTpl{
-			width: 48%;
-			background: #1F2A4A;
-			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50,50,52,0.06);
-			border-radius: 20rpx;
-			padding: 20rpx 18rpx;
-			.starText{
-				padding-left: 25rpx;
-				.name{
-					font-family: PingFang SC;
-					font-weight: 500;
-					font-size: 22rpx;
-					color: #FFFFFF;
-					line-height: 24rpx;
-				}
-				.num{
-					padding-top: 15rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					font-size: 30rpx;
-					color: #FFA235;
-					line-height: 24rpx;
-				}
-			}
-		}
-	}
-	.titleBox{
-		text-align: center;
-		padding: 45rpx 0rpx;
-		.titleTip{
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			position: relative;
-			font-weight: bold;
-			font-size: 42rpx;
-			color: #FFFFFF;
-			line-height: 110rpx;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 3px solid #FFFFFF;
-				border-radius: 25rpx;
-			}
-		}
-	}
-	.totalBox{
-		padding-top: 30rpx;
-		.totalTpl{
-			width: 45%;
-			background: url('../../static/image/img18.png') no-repeat;
-			background-size: 100% 100%;
-			text-align: center;
-			padding: 45rpx 0rpx;
-			.totalNum{
-				font-family: FZCuHeiSongS-B-GB;
-				font-weight: 400;
-				font-size: 39rpx;
-				color: #66FFFF;
-				text{
-					font-family: PingFang SC;
-					font-weight: 500;
-					font-size: 22rpx;
-					color: #66FFFF;
-				}
-			}
-			.totalName{
-				padding-top: 20rpx;
-				font-family: Source Han Sans CN;
-				font-weight: bold;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-	.advantageBox{
-		padding-top: 50rpx;
-		.advantageTpl{
-			text-align: center;
-			.advantageName{
-				padding-top: 25rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-</style>

+ 0 - 272
pages/index/information.vue

@@ -1,272 +0,0 @@
-<template>
-	<view class="container">
-		<view class="recharge">
-			<!-- <view class="example-title flex_item">
-				<view class="titleTip"></view>
-				<view class="">充值地址</view>
-			</view> -->
-			<view class="infoBox">
-				<view class="tplName">链名称</view>
-				<view class="tplNum">USDT-TRC20</view>
-				<view class="tplAddr">收款地址<text>ca87ca68ca68c6a986c98a678c7a8</text></view>
-			</view>
-			<view class="code"><image :src="er_code"></image></view>
-			<view class="flex btnBox">
-				<view class="btn">保存相册</view>
-				<view class="btn">复制地址</view>
-			</view>
-		</view>
-		<!-- <view class="login_text">
-			<view class="login_input flex" style="padding-top: 45rpx;">
-				<view class="login_img">金额</view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="money" placeholder="请输入充值金额" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><text>打款凭证</text></view>
-				<view class="login_name" @click="scImg"><image :src="img"></image></view>
-			</view>
-			<view class="login_input flex" style="padding-top: 45rpx;border-bottom: none;">
-				<view class="login_img">备注</view>
-				<view class="login_name"><input class="uni-input" type="text" v-model="remark" placeholder="例如:备注用户账号" /></view>
-			</view>
-			<view class="submission"><button class="golden" type="golden" hover-class="none" @click="submission">确认提交</button></view>
-		</view> -->
-		<view class="login_text">
-			<view class="tip">
-				<view>
-					<text>
-						该地址仅支持 USDT-TRC20 收款请勿用于其他币种,否则资产将不可找回</br>
-						从易趣付之外地址转入的资金,需要在完成交易的120分钟后,才能将资产转账给易币付其他用户或提到钱包以外的地址 最小收款金额: 0.0001USDT小于最小金额的收款将不会上账且无法退回1次网络确认后可到账,1次网络确认后可转账。您的充值地址不会经常改变,可截图保存并重复充值。
-					</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script type="text/javascript">
-// import { show_cb,do_cb } from '@/api/recharge.js';
-// import { upload } from '@/api/real.js';
-export default {
-	data() {
-		return {
-			uid: '',
-			list:'',
-			account: '',
-			money: '',
-			address:'',
-			er_code:'',
-			remark:'',
-			img: '/static/image/img19.png'
-		};
-	},
-	onLoad() {
-		this.uid = uni.getStorageSync('uid');
-		this.loadData();
-	},
-	methods: {
-		//获取数据
-		loadData() {
-		  // show_cb({})
-		  //   .then(data => {
-		  //     this.list = data.data;
-			 //  this.address = data.data.address;
-			 //  this.er_code = data.data.er_code;
-		  //   })
-		  //   .catch(err => {
-		  //     console.log(err);
-		  //   });
-		},
-		//确认提交
-		submission() {
-			let obj = this;
-			uni.showLoading({
-				title: '充币中...',
-				mask: true
-			});
-			//确认充值调接口,成功跳转页面
-			do_cb({
-				uid: obj.uid,
-				img: obj.img,
-				address: obj.address,
-				money: obj.money,
-				bz: obj.remark,
-			})
-				.then(function(e) {
-					uni.showToast({
-						title: '请耐心等待系统审核通过',
-						duration: 1500,
-						mask: false,
-						icon: 'none'
-					});
-					uni.hideLoading();
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//上传图片
-		scImg() {
-			upload({
-				file:''
-			}).then((e) => {
-				console.log(e,55)
-				this.img = e[0].url;
-			});
-		},
-	}
-};
-</script>
-
-<style lang="scss">
-/* page {
-	min-height: 100%;
-	background: linear-gradient(-28deg, rgba(44, 45, 53, 1), rgba(59, 62, 74, 1));
-} */
-.container{
-	padding: 30rpx 30rpx;
-}
-.body_content {
-	width: 100%;
-	height: 100%;
-}
-.login_text {
-	width: 100%;
-	color: #fff !important;
-	font-size: 28rpx !important;
-	background-color: #1F2A4A;
-	margin: 25rpx 0rpx;
-	padding: 0rpx 25rpx;
-	padding-bottom: 15rpx;
-	border-radius: 15rpx;
-}
-.recharge {
-	text-align: center;
-	color: #85858e;
-	font-size: 30rpx;
-	background-color: #1F2A4A;
-	border-radius: 15rpx;
-}
-.example-title{
-	text-align: left !important;
-	padding: 25rpx 25rpx;
-	border-bottom: 2rpx solid #2F364E;
-	color: #0C5AFA;
-	.titleTip{
-		width: 5rpx;
-		height: 30rpx;
-		background: linear-gradient(90deg, #0C5AFA, #1356FF);
-		border-radius: 3rpx;
-		margin-right: 15rpx;
-	}
-}
-.infoBox{
-	text-align: left;
-	padding: 28rpx 51rpx;
-	.tplName{
-		font-family: PingFang SC;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #FFFFFF;
-		padding-top: 15rpx;
-	}
-	.tplNum{
-		margin: 30rpx 0rpx;
-		padding: 15rpx 30rpx;
-		border-radius: 10rpx;
-		border: 1px solid #1356FF;
-		font-family: PingFang SC;
-		font-size: 26rpx;
-		color: #1356FF;
-		display: inline-block;
-	}
-	.tplAddr{
-		color: #fff;
-		font-size: 32rpx;
-		text{
-			padding-left: 15rpx;
-			font-size: 26rpx;
-			color: #FFFFFF;
-		}
-	}
-}
-.login_input {
-	border-bottom: 1px solid #464755;
-	padding: 35rpx;
-}
-.uni-input {
-	width: 100%;
-	text-align: left !important;
-}
-.code {
-	width: 277rpx;
-	height: 277rpx;
-	margin: 25rpx auto;
-	margin-bottom: 35rpx;
-	background: #0C5AFA;
-}
-.code image {
-	width: 100%;
-	height: 100%;
-}
-.btnBox{
-	justify-content: center;
-	padding-bottom: 50rpx;
-	padding-top: 30rpx;
-	.btn{
-		margin-right: 50rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		font-size: 26rpx;
-		color: #0C5AFA;
-		border: 1rpx solid #0C5AFA;
-		padding: 15rpx 45rpx;
-		border-radius: 15rpx;
-	}
-}
-.submission {
-	padding: 30rpx 25rpx;
-	.golden{
-		background: #0C5AFA;
-		color: #fff;
-	}
-}
-.login_name {
-	width: 480rpx;
-	color: #ffffff;
-}
-.login_name image {
-	width: 100rpx;
-	height: 100rpx;
-}
-.tip {
-	padding: 29rpx 31rpx;
-	line-height: 55rpx;
-	font-size: 24rpx;
-}
-.select_img {
-	width: 28rpx;
-	height: 32rpx;
-}
-.select_img image {
-	width: 100%;
-	height: 100%;
-}
-.scann {
-	margin-bottom: 35rpx;
-	margin-top: 15rpx;
-}
-.scanning {
-	background-color: #6f6f78;
-	color: #ffffff;
-	padding: 10rpx 30rpx;
-	border-radius: 15rpx;
-	font-size: 28rpx;
-}
-.address_code {
-	padding: 25rpx 0rpx;
-	color: #ffffff;
-}
-.input-placeholder{
-	color: #fff !important;
-}
-</style>

+ 0 - 8
pages/index/money.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

+ 25 - 13
pages/index/order.vue

@@ -13,24 +13,32 @@
 			</view>
 		</view>
 		<view class="listItemBox">
-			<view class="listItem" v-for="item,index in list" :key="index">
+			<view class="listItem" v-for="item,index in list" :key="index" @click="navItem(item)">
 				<view class="itemInfo flex">
 					<view class="flex_item">
 						<image src="/static/image/img20.png" style="width: 55rpx;" mode="widthFix"></image>
-						<view class="name">李丹丹</view>
+						<view class="name">{{item.real_name}}</view>
+					</view>
+					<view class="" style="font-size: 24rpx;font-weight: bold;color: #0C5AFA;">
+						<text v-if="item.status==0">结束</text>
+						<text v-else-if="item.status==1">挂出</text>
+						<text v-else-if="item.status==2">完成</text>
+						<text v-else-if="item.status==3">待上传</text>
+						<text v-else-if="item.status==5">已上传</text>
+						
 					</view>
-					<view class="" style="font-size: 24rpx;font-weight: bold;color: #0C5AFA;">进行中</view>
 				</view>
 				<view class="itemTip flex">
 					<view class="tipBox">
-						<view class="tipText">数量:10USTD</view>
-						<view class="tipText">总价:¥500</view>
+						<view class="tipText">数量:{{re.num}}{{re.money_type}}</view>
+						<view class="tipText">总价:¥{{re.money}}</view>
 						<view class="tipText">2023-04-25 14:20:30</view>
 					</view>
 					<view class="" style="text-align: right;">
 						<image src="/static/image/img21.png" style="width: 40rpx;margin-bottom: 25rpx;" mode="widthFix">
 						</image>
-						<view class="tipBtn">查看凭证</view>
+						<view class="tipBtn" v-if="item.voucher">查看凭证</view>
+						<view class="tipBtn" @click.stop="navItem(item)" v-if="status==3">上传凭证</view>
 					</view>
 				</view>
 			</view>
@@ -61,7 +69,7 @@
 						name: '挂出',
 						status: 1
 					}, {
-						name: '待确认',
+						name: '待上传',
 						status: 3
 					}, {
 						name: '完成',
@@ -79,10 +87,7 @@
 					}, {
 						name: '完成',
 						status: 2
-					},{
-						name: '结束',
-						status: 0
-					},]
+					}]
 				],
 				page: 1,
 				limit: 10,
@@ -104,7 +109,7 @@
 					return;
 				}
 				obj.loadingType = "loading";
-
+				console.log(obj.status);
 				if (this.tabIndex == 0) {
 					sellMy({
 						page: obj.page,
@@ -119,7 +124,14 @@
 						limit: 10,
 						status:obj.status
 					}, obj.status).then(res => {
-						obj.dataList(res.data.list)
+						let ar = res.data.list.map((re)=>{
+							re.num = +re.mum;
+							re.price = +re.price;
+							re.money = +(re.mum*re.price).toFixed(8);
+							
+							return re
+						})
+						obj.dataList(ar)
 					});
 				}
 			},

+ 359 - 0
pages/index/orderDetail.vue

@@ -0,0 +1,359 @@
+<template>
+	<view class="container">
+		<view class="recharge">
+			<view class="example-title flex_item">
+				<view class="titleTip"></view>
+				<view class="">充值地址</view>
+			</view>
+			<view class="infoBox">
+				<view class="tplName">链名称</view>
+				<view class="tplNum">USDT-TRC20</view>
+				<view class="tplAddr">收款地址<text>{{dataMoney.address}}</text></view>
+			</view>
+			<view class="code">
+				<image :src="er_code" mode=""></image>
+				<!-- #ifdef H5 || APP-PLUS -->
+				<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="val" :size="size" :unit="unit"
+					:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
+					:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
+				<!-- #endif -->
+			</view>
+			<view class="flex btnBox">
+				<!-- #ifdef APP -->
+				<view class="btn margin-r-30" @click="domImage">保存相册</view>
+				<!-- #endif -->
+				<view class="btn" @click="copy">复制地址</view>
+			</view>
+		</view>
+		<view class="login_text">
+			<view class="login_input flex" style="padding-top: 45rpx;">
+				<view class="login_img">金额</view>
+				<view class="login_name"><input class="uni-input" type="text" v-model="money" placeholder="请输入充值金额" />
+				</view>
+			</view>
+			<view class="login_input flex">
+				<view class="login_img"><text>打款凭证</text></view>
+				<view class="login_name" @click="scImg">
+					<image :src="img"></image>
+				</view>
+			</view>
+			<view class="login_input flex" style="padding-top: 45rpx;border-bottom: none;">
+				<view class="login_img">备注</view>
+				<view class="login_name"><input class="uni-input" type="text" v-model="remark"
+						placeholder="例如:备注用户账号" /></view>
+			</view>
+			<view class="submission"><button class="golden" type="golden" hover-class="none"
+					@click="submission">确认提交</button></view>
+		</view>
+		<view class="login_text">
+			<view class="tip">
+				<view>
+					<text>
+						该地址仅支持 USDT-TRC20 收款请勿用于其他币种,否则资产将不可找回</br>
+						从易趣付之外地址转入的资金,需要在完成交易的120分钟后,才能将资产转账给易币付其他用户或提到钱包以外的地址 最小收款金额:
+						0.0001USDT小于最小金额的收款将不会上账且无法退回1次网络确认后可到账,1次网络确认后可转账。您的充值地址不会经常改变,可截图保存并重复充值。
+					</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script type="text/javascript">
+	// import { show_cb,do_cb } from '@/api/recharge.js';
+	// import { upload } from '@/api/real.js';
+	import {
+		qianBao
+	} from '@/api/wallet.js';
+	import {
+		copyText
+	} from '@/utils/rocessor.js';
+	export default {
+		data() {
+			return {
+				uid: '',
+				list: '',
+				account: '',
+				money: '',
+				address: '',
+				er_code: '',
+				remark: '',
+				img: '/static/image/img19.png',
+				dataMoney: {},
+				uid: '',
+				account: '',
+				money: '',
+				address: '',
+				remark: '',
+				img: '/static/image/img19.png',
+				val: "", // 要生成的二维码值
+				size: 200, // 二维码大小
+				unit: 'upx', // 单位
+				background: '#FFF', // 背景色
+				foreground: '#000', // 前景色
+				pdground: '#000', // 角标色
+				icon: '', // 二维码图标
+				iconsize: 40, // 二维码图标大小
+				lv: 3, // 二维码容错级别 , 一般不用设置,默认就行
+				onval: true, // val值变化时自动重新生成二维码
+				loadMake: true, // 组件加载完成后自动生成二维码
+				src: '', // 二维码生成后的图片地址或base64
+				codeShow: false,
+				cid: '1',
+				codeIcon: '', // 二维码图标
+			};
+		},
+		onLoad() {
+			this.uid = uni.getStorageSync('uid');
+			this.qianBao();
+		},
+		methods: {
+			//获取数据
+			qianBao() {
+				const that = this;
+				qianBao({}).then(
+					(res) => {
+						that.dataMoney = res.data.back.USDT.money
+						that.val = that.dataMoney.address;
+						console.log(that.dataMoney, 'dataMoney');
+					}
+				).catch(
+					(res) => {
+						console.log(res,'err');
+					}
+				)
+			},
+			// 下载图片
+			domImage() {
+				uni.downloadFile({
+					url: this.er_code,
+					success(re) {
+						console.log(re.tempFilePath, 're');
+						uni.showToast({
+							title: '下载成功'
+						});
+					}
+				})
+			},
+			// 复制地址
+			copy() {
+				copyText(this.dataMoney.address)
+			},
+			// 二维码生成
+			qrR(res) {
+				this.er_code = res;
+			},
+			//确认提交
+			submission() {
+				let obj = this;
+				uni.showLoading({
+					title: '充币中...',
+					mask: true
+				});
+				//确认充值调接口,成功跳转页面
+				do_cb({
+						uid: obj.uid,
+						img: obj.img,
+						address: obj.address,
+						money: obj.money,
+						bz: obj.remark,
+					})
+					.then(function(e) {
+						uni.showToast({
+							title: '请耐心等待系统审核通过',
+							duration: 1500,
+							mask: false,
+							icon: 'none'
+						});
+						uni.hideLoading();
+					})
+					.catch(function(e) {
+						console.log(e);
+					});
+			},
+			//上传图片
+			scImg() {
+				upload({
+					file: ''
+				}).then((e) => {
+					console.log(e, 55)
+					this.img = e[0].url;
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	/* page {
+	min-height: 100%;
+	background: linear-gradient(-28deg, rgba(44, 45, 53, 1), rgba(59, 62, 74, 1));
+} */
+	.body_content {
+		width: 100%;
+		height: 100%;
+	}
+
+	.login_text {
+		width: 100%;
+		color: #fff !important;
+		font-size: 28rpx !important;
+		background-color: #1F2A4A;
+		margin: 25rpx 0rpx;
+		padding: 0rpx 25rpx;
+		padding-bottom: 15rpx;
+	}
+
+	.recharge {
+		text-align: center;
+		color: #85858e;
+		font-size: 30rpx;
+		background-color: #1F2A4A;
+	}
+
+	.example-title {
+		text-align: left !important;
+		padding: 25rpx 25rpx;
+		border-bottom: 2rpx solid #2F364E;
+		color: #0C5AFA;
+
+		.titleTip {
+			width: 5rpx;
+			height: 30rpx;
+			background: linear-gradient(90deg, #0C5AFA, #1356FF);
+			border-radius: 3rpx;
+			margin-right: 15rpx;
+		}
+	}
+
+	.infoBox {
+		text-align: left;
+		padding: 28rpx 51rpx;
+
+		.tplName {
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 24rpx;
+		}
+
+		.tplNum {
+			margin: 30rpx 0rpx;
+			padding: 15rpx 30rpx;
+			border-radius: 10rpx;
+			border: 1px solid #1356FF;
+			font-family: PingFang SC;
+			font-size: 26rpx;
+			color: #1356FF;
+			display: inline-block;
+		}
+
+		.tplAddr {
+			color: #fff;
+			font-size: 32rpx;
+
+			text {
+				padding-left: 15rpx;
+				font-size: 26rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+
+	.login_input {
+		border-bottom: 1px solid #464755;
+		padding: 35rpx;
+	}
+
+	.uni-input {
+		width: 100%;
+		text-align: left !important;
+	}
+
+	.code {
+		width: 277rpx;
+		height: 277rpx;
+		margin: 25rpx auto;
+		margin-bottom: 35rpx;
+		background: #0C5AFA;
+	}
+
+	.code image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.btnBox {
+		justify-content: center;
+		padding-bottom: 50rpx;
+		padding-top: 30rpx;
+
+		.btn {
+			margin-right: 50rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 26rpx;
+			color: #0C5AFA;
+			border: 1rpx solid #0C5AFA;
+			padding: 15rpx 45rpx;
+			border-radius: 15rpx;
+		}
+	}
+
+	.submission {
+		padding: 30rpx 25rpx;
+
+		.golden {
+			background: #0C5AFA;
+			color: #fff;
+		}
+	}
+
+	.login_name {
+		width: 480rpx;
+		color: #ffffff;
+	}
+
+	.login_name image {
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.tip {
+		padding: 29rpx 31rpx;
+		line-height: 55rpx;
+		font-size: 24rpx;
+	}
+
+	.select_img {
+		width: 28rpx;
+		height: 32rpx;
+	}
+
+	.select_img image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.scann {
+		margin-bottom: 35rpx;
+		margin-top: 15rpx;
+	}
+
+	.scanning {
+		background-color: #6f6f78;
+		color: #ffffff;
+		padding: 10rpx 30rpx;
+		border-radius: 15rpx;
+		font-size: 28rpx;
+	}
+
+	.address_code {
+		padding: 25rpx 0rpx;
+		color: #ffffff;
+	}
+
+	.input-placeholder {
+		color: #fff !important;
+	}
+</style>

+ 2 - 2
pages/index/pledge.vue

@@ -164,12 +164,12 @@
 			// 挂出
 			submission() {
 				sellPush({
-						type: '',
+						type: 'USDT',
 						num: this.number,
 						price: this.price,
 						phone: '',
 						trade_psw: '',
-						sell_type: '',
+						sell_type: 'money',
 
 					}).then(({
 						data

+ 0 - 8
pages/index/service.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

+ 0 - 105
pages/introduce/game.vue

@@ -1,105 +0,0 @@
-<template>
-	<view class="background1">
-		<view class="background2">
-			<view class="title"> {{$t('game.a1')}} </view>
-			<view class="juli">
-				{{$t('game.a2')}}
-			</view>
-			<view class="neirong">
-				<view class="nr1">
-					{{$t('game.a3')}}
-				</view>
-				<view class="nr2">
-					{{$t('game.a4')}}
-				</view>
-			</view>
-			<view class="ls">
-				{{$t('game.a5')}}
-			</view>
-			<view class="liushui">
-				<view class="">
-					{{$t('game.a6')}}
-				</view>
-				
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a6"),
-			});
-		}
-	}
-</script>
-
-<style lang="scss">
-    .background1 {
-		position: relative;
-		height: calc(100vh - var(--status-bar-height));
-		background: url("../../static/img/youxi1.png");
-		background-size: 100% 100%;
-		background-position: 50% 50%;
-		background-repeat: no-repeat;
-	}
-
-	.background2 {
-		background:url("../../static/img/youxi2.png");
-		position: absolute;
-		background-size: 100% 100%;
-		width: 650rpx;
-		height: 960rpx;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -60%);
-	}
-	.title {
-		margin-top: 95rpx;
-		text-align: center;
-		font-size: 37rpx;
-		font-weight: bold;
-		color: #d7b271;
-	}
-	.juli {
-		margin-left: 60rpx;
-		margin-top: 70rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	.neirong {
-		width: 530rpx;
-		height: 100;
-		margin-left: 60rpx;
-		margin-top: 30rpx;
-	}
-	.nr1 .nr2{
-		height: 147rpx;
-		font-size: 28rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	
-	.ls {
-		margin-left: 60rpx;
-		margin-top: 70rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	
-	.liushui {
-		width: 530rpx;
-		height: 190rpx;
-		margin-left: 60rpx;
-		margin-top: 30rpx;
-	}
-</style>

+ 0 - 106
pages/introduce/introduce.vue

@@ -1,106 +0,0 @@
-<template>
-	<view class="background1">
-		<view class="background2">
-			<view class="wenben">
-				<view class="wenben1">
-					{{$t('introduce.a1')}}
-				</view>
-				<view class="wenben4">
-					{{$t('introduce.a4')}}
-				</view>
-				
-				<view class="xian"></view>
-				<view class="item">
-					<view class="text">
-						{{$t('introduce.a3')}}
-					</view>
-				</view>
-				<view class="wenben1 margin-t-30">
-					{{$t('introduce.a6')}}
-				</view>
-				<view class="wenben4">
-					{{$t('introduce.a2')}}
-				</view>
-				<view class="xian"></view>
-
-				<view class="item">
-					<view class="text">
-						{{$t('introduce.a5')}}
-					</view>
-
-				</view>
-			</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {};
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a4"),
-			});
-		}
-	};
-</script>
-
-<style lang="scss">
-	.background1 {
-		position: relative;
-		height: calc(100vh - var(--status-bar-height));
-		background: url("../../static/shouye/beijing1.png");
-		background-size: 100% 100%;
-		background-position: 50% 50%;
-		background-repeat: no-repeat;
-	}
-
-	.background2 {
-		background-image: url("../../static/shouye/beijing2.png");
-		position: absolute;
-		background-size: 100% 100%;
-		width: 650rpx;
-		height: 1000rpx;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -60%);
-	}
-
-	.wenben1 {
-		text-align: center;
-		margin-top: 87rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-		line-height: 36rpx;
-	}
-
-	.xian {
-		width: 200rpx;
-		height: 8rpx;
-		color: #000000;
-	}
-
-	.text {
-		font-size: 24rpx;
-		font-weight: bold;
-		color: #211808;
-		background-color: #FAEDD6;
-		text-align: left;
-		margin: 0 50rpx;
-		padding: 30rpx;
-		border-radius: 20rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.wenben4 {
-		text-align: center;
-		margin-top: 50rpx;
-		font-size: 37rpx;
-		font-weight: bold;
-		color: #D7BB80;
-	}
-</style>

+ 0 - 57
pages/introduce/pkedetail - 副本.vue

@@ -1,57 +0,0 @@
-<template>
-	<view class="content">
-		<image src="../../static/shouye/index_logo.png" mode="scaleToFill" class="index-logo"></image>
-		<view class="title">
-			{{$t('homepledge.PKR介绍')}}
-		</view>
-		<view class="description">
-			<rich-text :nodes="$t('homepledge.description')"></rich-text>
-		</view>
-		<taber tab='information'></taber>
-	</view>
-</template>
-
-<script>
-	import taber from "@/components/footer/footer.vue";
-	export default {
-		components: {
-			taber
-		},
-		data() {
-			return {};
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t('homepledge.PKR介绍'),
-			});
-		}
-	};
-</script>
-
-<style lang="scss">
-	.content {
-		width: 750rpx;
-		background-color: $page-color-base;
-		padding-top: var(--status-bar-height);
-		padding-bottom: 30rpx;
-	}
-
-	.title {
-		color: $base-color;
-		text-align: center;
-		font-size: 58rpx;
-	
-	}
-	.index-logo {
-		width: 297rpx;
-		height: 270rpx;
-		margin: 0 226rpx;
-	}
-	.description {
-		color: #FFFFFF;
-		font-size: $font-base;
-		padding: 30rpx;
-		line-height: 2rem;
-	
-	}
-</style>

+ 0 - 100
pages/introduce/pkedetail.vue

@@ -1,100 +0,0 @@
-<template>
-	<view class="background1">
-		<view class="background2">
-			<view class="title"> {{$t('homepledge.PKR介绍')}} </view>
-			<view class="neirong">
-				<view class="nr2">
-					<rich-text :nodes="$t('homepledge.description')"></rich-text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t('homepledge.PKR介绍'),
-			});
-		}
-	}
-</script>
-
-<style lang="scss">
-	.nr2 {
-		font-size: 24rpx;
-		font-weight: bold;
-		color: #211808;
-		background-color: #FAEDD6;
-		text-align: left;
-		padding: 30rpx;
-		border-radius: 20rpx;
-		margin-bottom: 20rpx;
-	}
-    .background1 {
-		position: relative;
-		height: calc(100vh - var(--status-bar-height));
-		background: url("../../static/img/youxi1.png");
-		background-size: 100% 100%;
-		background-position: 50% 50%;
-		background-repeat: no-repeat;
-	}
-
-	.background2 {
-		background:url("../../static/img/youxi2.png");
-		position: absolute;
-		background-size: 100% 100%;
-		width: 650rpx;
-		height: 960rpx;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -60%);
-	}
-	.title {
-		margin-top: 95rpx;
-		text-align: center;
-		font-size: 37rpx;
-		font-weight: bold;
-		color: #d7b271;
-	}
-	.juli {
-		margin-left: 60rpx;
-		margin-top: 70rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	.neirong {
-		width: 530rpx;
-		height: 100;
-		margin-left: 60rpx;
-		margin-top: 30rpx;
-	}
-	.nr1 .nr2{
-		height: 147rpx;
-		font-size: 28rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	
-	.ls {
-		margin-left: 60rpx;
-		margin-top: 70rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	
-	.liushui {
-		width: 530rpx;
-		height: 190rpx;
-		margin-left: 60rpx;
-		margin-top: 30rpx;
-	}
-</style>

+ 0 - 148
pages/introduce/promotion.vue

@@ -1,148 +0,0 @@
-<template>
-	<view class="background1">
-		<view class="background2">
-			<view class="title"> {{$t('promotion.a1')}} </view>
-			<view class="top">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg1.png" mode=""></image>
-					<view class="wen">{{$t('promotion.a2')}}</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a3')}}</view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg2.png" mode=""></image>
-					<view class="wen">V1</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a4')}} </view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg3.png" mode=""></image>
-					<view class="wen">V2</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a5')}}</view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg4.png" mode=""></image>
-					<view class="wen">V3</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a6')}} </view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg5.png" mode=""></image>
-					<view class="wen">V4</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a7')}} </view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg6.png" mode=""></image>
-					<view class="wen">V5</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a8')}}</view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg7.png" mode=""></image>
-					<view class="wen">V6</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a9')}}</view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg8.png" mode=""></image>
-					<view class="wen">V7</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a10')}} </view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg9.png" mode=""></image>
-					<view class="wen">V8</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a11')}}</view>
-			</view>
-			<view class="topt">
-				<view class="hy">
-					<image class="icon" src="../../static/icon/tg10.png" mode=""></image>
-					<view class="wen">{{$t('promotion.a12')}}</view>
-				</view>
-				<view class="wenben"> {{$t('promotion.a13')}} </view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {};
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a5"),
-			});
-		}
-	};
-</script>
-
-<style lang="scss">
-	.background1 {
-		position: relative;
-		width: 750rpx;
-		height: 2600rpx;
-		background: url("../../static/img/tuiguang2.png");
-		background-size: 100% 100%;
-		background-position: 50% 50%;
-		background-repeat: no-repeat;
-	}
-
-	.background2 {
-		background: url("../../static/img/tuiguang1.png");
-		position: absolute;
-		background-size: 100% 100%;
-		width: 650rpx;
-		height: 2250rpx;
-		top: 53%;
-		left: 50%;
-		transform: translate(-50%, -60%);
-	}
-	.topt {
-		margin-top: -50rpx;
-	}
-	.title {
-		margin-top: 95rpx;
-		margin-left: 253rpx;
-		font-size: 37rpx;
-		font-weight: bold;
-		color: #d7b271;
-	}
-	.hy {
-		display: flex;
-		justify-content: start;
-		margin-top: 70rpx;
-		.icon {
-			width: 66rpx;
-			height: 49rpx;
-			margin-left: 60rpx;
-		}
-		.wen {
-			padding-left: 20rpx;
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #201809;
-		}
-		
-	}
-	.wenben {
-		margin: 20rpx 20rpx 0 60rpx;
-		height: 100%;
-		font-size: 28rpx;
-		font-weight: bold;
-		color: #201809;
-	}
-	
-</style>

+ 0 - 349
pages/myPledge/myPledge.vue

@@ -1,349 +0,0 @@
-<template>
-	<view class="all">
-		<view class="top padding-v-30 padding-c-30">
-			<view class="zhiya padding-b-10"> {{ $t("myple.u1") }} </view>
-			<view class="zhiyashu">
-				<text class="shu">{{navList[tabCurrentIndex].sum|getMoneyStyle}}</text>
-				<text class="wen padding-l-10">USDT</text>
-			</view>
-		</view>
-		<view class="navbar flex">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item flex-center"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<view class="title-box flex">
-			<view class="title">
-				<text>{{ $t("myple.u4") }}</text>
-			</view>
-			<view class="title">
-				<text>{{ $t("myple.u5") }}</text>
-			</view>
-			<view class="title">
-				<text>{{ $t("myple.u6") }}</text>
-			</view>
-			<view class="title">
-				<text>{{ $t("myple.u7") }}</text>
-			</view>
-			<!-- <view class="title">
-				<text>{{ $t("myple.u8") }}</text>
-			</view> -->
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content padding-b-30" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="
-							tabItem.loaded === true &&
-							tabItem.orderList.length === 0
-						"></empty>
-					<!-- 订单列表 -->
-					<view>
-						<!-- <view class="order-item flex" > -->
-						<view class="order-item">
-							<view class="all-list" v-for="(item,ind) in navList[tabCurrentIndex].orderList" :key="ind">
-								<view class="list flex padding-v-20">
-									<view class="list-item">
-										<view class="item"> {{item.num}} </view>
-										<view class="item"> USDT </view>
-									</view>
-									<view class="list-item">
-										<view class="item"> {{item.income}} </view>
-										<view class="item"> PKR </view>
-									</view>
-									<view class="list-item">
-										<view class="item">
-											{{item.day}}天
-										</view>
-									</view>
-									<view class="list-item">
-										<view class="l-item">{{item.add_time[0]}} </view>
-										<view class="l-item">
-											{{item.add_time[1]}}
-										</view>
-									</view>
-									<!-- <view class="list-item">
-										<view class="l-item">{{item.send_time[0]}}</view>
-										<view class="l-item">
-											{{item.send_time[1]}}
-										</view>
-									</view> -->
-								</view>
-							</view>
-							<!-- <view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number * 1 }}</view>
-							</view> -->
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		getLock
-	} from "@/api/mypledge.js";
-	import empty from "@/components/empty";
-	import {
-		getTime
-	} from '@/utils/rocessor.js';
-	import {
-		getMoneyStyle
-	} from "@/utils/rocessor.js";
-	export default {
-		filters: {
-			getMoneyStyle,
-		},
-		components: {
-			empty,
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				height: "",
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 1,
-						text: this.$t('myple.u2'),
-						loadingType: "more",
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false,
-						sum:''
-					},
-					{
-						state: 2,
-						text: this.$t('myple.u3'),
-						loadingType: "more",
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10, //每次信息条数
-						loaded: false,
-						sum:''
-					},
-				],
-			};
-		},
-		onLoad(options) {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a1"),
-			});
-		},
-		onShow() {
-			this.loadData();
-		},
-		methods: {
-			getTime,
-			toBack() {
-				uni.switchTab({
-					url: "/pages/pledge/pledge",
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e,
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				const that = this;
-				//这里是将订单挂载到tab列表下
-				let index = that.tabCurrentIndex;
-				let navItem = that.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				getLock({
-						status: state,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						// 保存我的总金额
-						navItem.sum = data.sum;
-
-						let arr = data.list.map(e => {
-							e.add_time = that.getTime(e.add_time).split(" ")
-							e.send_time = that.getTime(e.send_time).split(" ")
-							e.income = Number(e.income);
-							e.num = Number(e.num);
-							return e;
-						});
-						navItem.orderList = navItem.orderList.concat(arr);
-						if (navItem.limit == data.length) {
-							navItem.page++;
-							//判断是否还有数据, 有改为 more, 没有改为noMore
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							//判断是否还有数据, 有改为 more, 没有改为noMore
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						that.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData("tabChange");
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-		},
-	};
-</script>
-
-<style lang="scss">
-	.all {
-		line-height: 1;
-	}
-
-	.top {
-		margin: 0 30rpx;
-		height: 138rpx;
-		background-color: #191a1f;
-		font-weight: bold;
-		color: #ffffff;
-		border-radius: 20rpx;
-
-		.zhiya {
-			font-size: $font-sm;
-			color: #757c8f;
-		}
-
-		.zhiyashu {
-			.shu {
-				font-size: $font-lg;
-			}
-
-			.wen {
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.swiper-box {
-		margin: 0 30rpx;
-	}
-
-	.navbar {
-		margin: 20rpx 30rpx 0 30rpx;
-		border-top-right-radius: 20rpx;
-		border-top-left-radius: 20rpx;
-		height: 88rpx;
-		padding: 0 5px;
-		background: #191a1f;
-		border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-
-		.nav-item {
-			flex: 1;
-			height: 100%;
-			font-size: 15px;
-			color: #999999;
-			position: relative;
-
-			&.current {
-				color: #fff;
-
-				&:after {
-					content: "";
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $color-yellow;
-				}
-			}
-		}
-	}
-
-	.tab-content {
-		.list-scroll-content {
-			background: #191a1f;
-			border-bottom-right-radius: 20rpx;
-			border-bottom-left-radius: 20rpx;
-			height: 100%;
-			overflow:hidden;
-		}
-	}
-
-	// 列表样式
-	.title-box {
-		padding: 20rpx 0;
-		background: #191a1f;
-		margin: 0 30rpx;
-		justify-content: space-around;
-		border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-
-		.title {
-			width: 20%;
-			font-size: 22rpx;
-			color: $font-color-light;
-			text-align: center;
-		}
-	}
-
-	.all-list {
-		.list {
-			border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-			justify-content: space-around;
-
-			.list-item {
-				color: #ffffff;
-				width: 20%;
-				text-align: center;
-				flex-shrink: 0;
-
-				.item {
-					font-size: 22rpx;
-					font-weight: bold;
-				}
-
-				.l-item {
-					font-size: 18rpx;
-				}
-
-			}
-		}
-
-	}
-</style>

+ 0 - 398
pages/myPledge/zyXingqing.vue

@@ -1,398 +0,0 @@
-<template>
-	<view class="all">
-		<view class="shang padding-v-30 padding-c-30 position-relative">
-			<image class="img" src="../../static/img/xq6.png" mode="scaleToFill"></image>
-			<view class="tz padding-b-30">{{base.name}}</view>
-			<view class="sy flex-start padding-b-10">
-				<view class="syl">{{$t('zy.m0')}}:{{base.day_get}}%</view>
-			</view>
-			<view class="sj flex margin-t-30 position-relative">
-				<view class="sj1">
-					<view class="sz">{{base.single_time_max*1}}</view>
-					<view class="wz">{{$t('zy.m1')}}</view>
-				</view>
-				<view class="sj1">
-					<view class="sz">{{base.single_time_max*1}}</view>
-					<view class="wz">{{$t('zy.m3')}}</view>
-				</view>
-				<view class="sj1">
-					<view class="sz">{{base.day}}</view>
-					<view class="wz">{{$t('zy.m2')}}</view>
-				</view>
-				<view class="sj1">
-					<view class="sz">{{base.single_time_min*1}}</view>
-					<view class="wz">{{$t('zy.m4')}}</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="sygc margin-t-20 padding-v-30 padding-c-30">
-			<view class="gc padding-b-30">{{$t('zy.m5')}}</view>
-			<view class="an flex padding-c-30">
-				<view class="an1"></view>
-				<view class="xian"></view>
-				<view class="an1"></view>
-				<view class="xian"></view>
-				<view class="an1"></view>
-			</view>
-			<view class="wenben padding-t-30 flex padding-c-30">
-				<view class="wb">
-					<view class="wen">{{$t('zy.m6')}}</view>
-					<view class="wen padding-t-10">{{$t('zy.m7')}}</view>
-				</view>
-				<view class="wb">
-					<view class="wen text-center">{{$t('zy.m8')}}</view>
-					<view class="wen padding-t-10 text-center">{{$t('zy.m9')}}</view>
-				</view>
-				<view class="wb">
-					<view class="wen text-right">{{$t('zy.m10')}}</view>
-					<view class="wen padding-t-10 text-right">{{$t('zy.m11')}}</view>
-				</view>
-			</view>
-			<view class="icon-box padding-t-30">
-				<view class="icon flex-start">
-					<image class="ic" src="../../static/img/xq1.png" mode=""></image>
-					<view class="jiaru">{{$t('zy.m12')}}</view>
-				</view>
-
-				<view class="icon flex-start">
-					<image class="ic" src="../../static/img/xq4.png" mode=""></image>
-					<view class="jiaru">{{$t('zy.m13')}}</view>
-				</view>
-
-				<view class="icon flex-start">
-					<image class="ic" src="../../static/img/xq3.png" mode=""></image>
-					<view class="jiaru">
-						{{$t('zy.m14')}}:{{base.single_time_max*1}}*{{base.day_get}}%*{{base.day}}
-					</view>
-				</view>
-
-				<view class="icon flex-start">
-					<image class="ic" src="../../static/img/xq2.png" mode=""></image>
-					<view class="jiaru">{{$t('zy.m15')}}:{{allMoney}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="yue flex margin-t-20">
-			<view class="flex">
-				<image class="qianbao" src="../../static/img/xq5.png" mode=""></image>
-				<view class="ye padding-l-20">{{$t('zy.m17')}}</view>
-			</view>
-			<view class="flex">
-				<view class="dangqian">{{$t('zy.m18')}}:</view>
-				<view class="dqs">{{userWallet}} USDT</view>
-			</view>
-		</view>
-		<view class="aaa"></view>
-
-		<view class="liji">
-			<view class="jr" @click="joinNumOpen">
-				<view class="jia">{{$t('zy.m19')}}</view>
-			</view>
-		</view>
-		<uni-popup type="bottom" ref="popup">
-			<inputPassword @commit='KeyInfo' @colse='colsePayPassword'></inputPassword>
-		</uni-popup>
-		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="input" :title="$t('zy.b1')" :value="num" :placeholder="$t('zy.b2')"
-				@confirm="joinNum" :confirmText="$t('zy.b3')" :cancelText="$t('zy.b4')"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		lockDetail,
-		lockJoin
-	} from "@/api/mypledge.js"
-	import {
-		gameWallet
-	} from "@/api/game.js";
-	import inputPassword from "@/components/input-password/input-password.vue";
-	export default {
-		components: {
-			inputPassword
-		},
-		data() {
-			return {
-				id: '',
-				base: {},
-				userWallet: '',
-				allMoney: '',
-				// 保存支付密码
-				password: '',
-				//购买的数量
-				num: '',
-			};
-		},
-		
-		onLoad(option) {
-			this.id = option.id;
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.b5"),
-			});
-			// 加载数据
-			this.lockDetail();
-			this.gameWallet();
-		},
-		methods: {
-			// 关闭支付弹窗
-			colsePayPassword() {
-				this.$refs.popup.close();
-			},
-			KeyInfo(val) {
-				this.password = val;
-				this.colsePayPassword();
-				this.joinLock();
-			},
-			// 打开输入弹窗
-			joinNumOpen() {
-				this.$refs.inputDialog.open();
-			},
-			// 输入的金额
-			joinNum(e) {
-				if (isNaN(Number(e))) {
-					uni.showToast({
-						title: this.$t("zy.b5"),
-						icon: "error"
-					})
-					return
-				}
-				this.num = e;
-				this.$refs.popup.open();
-				console.log(e, '233');
-			},
-			// 购买质押
-			joinLock() {
-				const that = this;
-				const data = {
-					id: that.id,
-					number: that.num,
-					trade_password: that.password
-				}
-				// 初始化数量
-				that.num = '';
-				lockJoin(data).then(
-					(res) => {
-						uni.showToast({
-							title: this.$t("zy.b6"),
-						})
-						that.gameWallet();
-					}
-				).then((err) => {
-					console.log(err);
-				})
-			},
-			gameWallet() {
-				gameWallet().then((res) => {
-
-					this.userWallet = +res.data.back.USDT.money.money
-				})
-			},
-			lockDetail() {
-				const that = this;
-				lockDetail({
-					id: that.id
-				}).then(
-					(res) => {
-						that.base = res.data.data;
-						that.allMoney = that.base.single_time_max * (that.base.day_get * 1) * that.base.day /
-							100;
-						that.allMoney = that.allMoney+' PKR';
-					}
-				).catch(
-					(res) => {
-						console.log(res);
-					}
-				)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #191a1f;
-		// background-color: #000000;
-	}
-
-	.all {
-		line-height: 1;
-		padding-bottom: 190rpx;
-	}
-
-	.shang {
-		font-weight: 800;
-		background-color: $page-color-base;
-
-		.tz {
-			font-size: 33rpx;
-			color: #FFFFFF;
-		}
-
-		.sy {
-			.syl {
-				background: #FEB041;
-				border-radius: 10rpx;
-				font-size: 21rpx;
-				color: #000000;
-				padding: 10rpx;
-			}
-		}
-
-		.sj {
-			font-weight: 800;
-			text-align: center;
-
-			.sj1 {
-				width: 25%;
-
-				.sz {
-					font-size: 40rpx;
-					color: #FFFFFF;
-				}
-
-				.wz {
-					margin-top: 20rpx;
-					font-size: 22rpx;
-					color: #999999;
-					padding-bottom: 20rpx;
-				}
-			}
-		}
-
-		.img {
-			position: absolute;
-			width: 325rpx;
-			height: 285rpx;
-			top: 0rpx;
-			right: 40rpx;
-		}
-	}
-
-	.sygc {
-		background-color: $page-color-base;
-
-		.gc {
-			font-size: 28rpx;
-			font-weight: 800;
-			color: #FFFFFF;
-		}
-
-		.an {
-			.an1 {
-				width: 24rpx;
-				height: 24rpx;
-				border: 4px solid #FEB041;
-				border-radius: 12rpx;
-			}
-
-			.xian {
-				flex-grow: 1;
-				height: 1rpx;
-				background: #fff;
-			}
-		}
-	}
-
-	.wenben {
-		background-color: $page-color-base;
-
-		.wb {
-			width: 33.3%;
-
-			.wen {
-				font-size: 22rpx;
-				font-weight: 500;
-				color: #999999;
-			}
-		}
-	}
-
-	.icon-box {
-		background-color: $page-color-base;
-
-		.icon:nth-child(2n-1) {
-			background: #161616;
-		}
-
-		.icon {
-			margin: 0 30rpx;
-			border-radius: 10rpx;
-			padding: 20rpx;
-
-			.ic {
-				width: 38rpx;
-				height: 36rpx;
-
-			}
-
-			.jiaru {
-				padding-left: 20rpx;
-				height: 23rpx;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.jine {
-		background-color: $page-color-base;
-		font-weight: 800;
-		padding: 30rpx;
-
-		.je {
-			font-size: 28rpx;
-			color: #999999;
-		}
-
-		.jes {
-			font-size: 74rpx;
-			color: #FEB041;
-		}
-	}
-
-
-
-	.yue {
-		background-color: $page-color-base;
-		width: 750rpx;
-		color: #FFFFFF;
-		font-size: 29rpx;
-		padding: 30rpx;
-
-		.qianbao {
-			width: 80rpx;
-			height: 64rpx;
-		}
-
-		.ye {}
-
-		.dangqian {}
-
-		.dqs {
-			color: #FEB041;
-		}
-	}
-
-	.liji {
-		padding: 40rpx 30rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: $page-color-base;
-		.jr {
-			background: linear-gradient(90deg, #feb041 0%, #feb041 100%);
-			border-radius: 10rpx;
-			padding: 30rpx;
-			text-align: center;
-		}
-
-		.jia {
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #040404;
-		}
-	}
-</style>

+ 0 - 456
pages/user/money/recharge.vue

@@ -1,456 +0,0 @@
-<template>
-	<view class="content">
-		<view class="main-jg"></view>
-		<view class="add-wrapper">
-			<view class="add-box">
-				<view class="add-log">$</view>
-				<input type="text" v-model="money" :placeholder="$t('recharge.请输入充值金额')" placeholder-class="place"
-					@keyup="clearNoNum()" />
-			</view>
-			<view class="jg" style="height: 1px; background-color: #E6E6E6;"></view>
-			<view class="add-tags">
-				<view class="tag" v-for="(item, index) in addTags" :key="item" @click="tagClick(index)"
-					:class="{ action: currentIndex === index && money == addTags[index] }">
-					<text>{{ item }}</text>
-					USDT
-				</view>
-			</view>
-		</view>
-		<view class="main-jg"></view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }"
-			@click="!payLoding ? confirm() : ''">{{$t('recharge.立即充值')}}</button>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-
-	import {
-		gamecharge,
-		gamechargePost
-	} from '@/api/game.js';
-
-	import {
-		mapState
-	} from 'vuex';
-	// import detectEthereumProvider from '@metamask/detect-provider'
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		data() {
-			return {
-				money: '', //充值金额
-				payLoding: false, //是否加载中
-				addTags: [300, 200, 150, 100, 50],
-				currentIndex: '',
-			};
-		},
-		computed: {
-			// #ifdef H5
-			...mapState(['weichatObj']),
-			// #endif
-			...mapState('user', ['userInfo'])
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t('user.a7')
-			});
-		},
-		methods: {
-			// 跳转
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			// 切换选中对象
-			tabRadio(e) {
-				console.log(e)
-				this.type = e;
-			},
-			// 提交
-			async confirm() {
-				let obj = this;
-				if (this.money == 0) {
-					return this.$api.msg(this.$t('recharge.请输入充值金额'));
-				}
-
-				obj.payLoding = true;
-				uni.showLoading({
-					title: 'loding...',
-					mask:true
-				});
-				try {
-					const res = await gamecharge({
-						token: "USDT",
-						num: this.money,
-					})
-					const txHash = await ethereum.request({
-						method: 'eth_sendTransaction',
-						params: [{
-							from: obj.userInfo.account, // The user's active address.
-							to: res.data.to,
-							value: 0,
-							data: res.data.data.data,
-						}]
-					})
-					const PKR_RECHARGE = "PKR_RECHARGE" + (new Date()).getTime()
-					const sign = await ethereum.request({
-						"method": "personal_sign",
-						"params": [
-							PKR_RECHARGE,
-							obj.userInfo.account
-						]
-					})
-					const req = await gamechargePost({
-						num: obj.money,
-						token: "USDT",
-						transactionHash: txHash,
-						msg: PKR_RECHARGE,
-						sign:sign
-					});
-					uni.showToast({
-						title:this.$t('userinfo.u24')
-					})
-					obj.payLoding = false;
-				} catch (e) {
-					obj.payLoding = false;
-					uni.showToast({
-						title:this.$t('recharge.申请失败'),
-						icon:'error'
-					})
-				}
-			},
-			//获取订单列表
-			loadData(source) {
-				console.log(source);
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				navItem.loadingType = 'loading';
-				setTimeout(() => {
-					let orderList = [];
-					orderList.forEach(item => {
-						navItem.orderList.push(item);
-					});
-					//loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
-					this.$set(navItem, 'loaded', true);
-					//判断是否还有数据, 有改为 more, 没有改为noMore
-					navItem.loadingType = 'more';
-				}, 600);
-			},
-			tagClick(index) {
-				this.currentIndex = index;
-				this.money = this.addTags[index];
-			},
-			clearNoNum() {
-				this.money = this.money.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
-				switch (this.money) {
-					case '300':
-						this.currentIndex = 0;
-						break;
-					case '200':
-						this.currentIndex = 1;
-						break;
-					case '150':
-						this.currentIndex = 2;
-						break;
-					case '100':
-						this.currentIndex = 3;
-						break;
-					case '50':
-						this.currentIndex = 4;
-						break;
-				}
-			},
-			btnClick() {
-				this.isSect = !this.isSect
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.add-btn {
-
-		&.modified {
-			color: $base-color;
-		}
-
-		&.up {
-
-			background: linear-gradient(-90deg, #FAC545, #FFE000);
-			color: #6B4216;
-		}
-
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 604rpx;
-		height: 90rpx;
-		margin: 0 auto;
-		margin-top: 30rpx;
-		font-size: $font-lg;
-		border-radius: 10rpx;
-
-	}
-
-	.row-box {
-		margin-top: 30rpx;
-		padding: 20rpx 30rpx;
-		background: #fff;
-
-		.title {
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-		}
-
-		.row {
-			display: flex;
-			align-items: center;
-			position: relative;
-			height: 80rpx;
-
-			.tit {
-				flex-shrink: 0;
-				width: 40rpx;
-				font-size: 30rpx;
-				color: $font-color-dark;
-			}
-
-			.input {
-				flex: 1;
-				font-size: 30rpx;
-				color: $font-color-dark;
-			}
-
-			.iconlocation {
-				font-size: 36rpx;
-				color: $font-color-light;
-			}
-
-			.buttom {
-				color: $font-color;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.list {
-		padding-left: 30rpx;
-		margin-top: 30rpx;
-		background-color: #ffffff;
-
-		.box {
-			display: flex;
-			align-items: center;
-			width: 100%;
-			height: 120rpx;
-			border-bottom: 1px solid $border-color-light;
-
-			.icon {
-				font-size: 48rpx;
-				padding-right: 20rpx;
-			}
-
-			.iconweixin1 {
-				color: #18bf16;
-			}
-
-			.iconzhifubao {
-				color: #08aaec;
-			}
-
-			.title-box {
-				flex-grow: 1;
-				text-align: left;
-
-				.title {
-					font-size: $font-base + 2rpx;
-					color: $font-color-base;
-				}
-
-				.node {
-					font-size: $font-sm;
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	/deep/ .uni-radio-input {
-		width: 45rpx;
-		height: 45rpx;
-	}
-
-	.active-bg {
-		background-color: $color-gray !important;
-	}
-
-	.now {
-		width: 100%;
-		height: 86rpx;
-		padding: 0 26rpx 0 47rpx;
-		display: flex;
-		justify-content: space-between;
-		line-height: 86rpx;
-		background-color: #fff;
-		// margin-bottom: 21rpx;
-
-		view {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-		}
-
-		.now-money {
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #FF4C4C;
-		}
-	}
-
-	.add-wrapper {
-		width: 750rpx;
-		height: 338rpx;
-		padding-left: 30rpx;
-		background: #ffffff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		// margin-bottom: 22rpx;
-		.add-box {
-			width: 100%;
-			height: 103rpx;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			padding: 0 39rpx 0 10rpx;
-			align-items: center;
-
-			.add-log {
-				font-size: 37rpx;
-				font-weight: bold;
-			}
-
-			input {
-				height: 30rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #000;
-				line-height: 40px;
-				text-align: right;
-				flex-grow: 1;
-
-				.place {
-					color: #bfbfbf;
-				}
-			}
-		}
-
-		.jg {
-			width: 100%;
-		}
-
-		.add-tags {
-			height: 234rpx;
-			padding-top: 47rpx;
-			padding-bottom: 17rpx;
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-
-			// justify-content: space-between;
-			.tag {
-				width: 210rpx;
-				height: 70rpx;
-				background-color: #f0f0f0;
-				border-radius: 4rpx;
-				margin: 0 30rpx 30rpx 0;
-				text-align: center;
-				line-height: 70rpx;
-				font-size: 22rpx;
-
-				text {
-					font-size: 32rpx;
-					font-weight: 500;
-				}
-			}
-
-			.action {
-				color: #6B4216;
-				background: linear-gradient(-90deg, #FAC545, #FFE000);
-			}
-		}
-	}
-
-	.btn-wrapper {
-		padding: 49rpx 32rpx 0 40rpx;
-		height: 183rpx;
-		display: flex;
-		justify-content: space-between;
-		background-color: #fff;
-
-		.iconweixin1 {
-			color: #18bf16;
-			font-size: 48rpx;
-			display: flex;
-
-			view {
-				// display: inline-block;
-				height: 48rpx;
-				text-align: 48rpx;
-				padding-left: 20rpx;
-				// padding-top: 10rpx;
-				color: #000000;
-				font-size: 30rpx;
-			}
-		}
-
-		.btn {
-			width: 36rpx;
-			height: 36rpx;
-			border: 4rpx #333 solid;
-			border-radius: 8rpx 8rpx;
-
-			image {
-				// display: none;
-				width: 100%;
-				height: 100%;
-			}
-
-			.action {
-				display: none;
-			}
-		}
-
-		.actiont {
-			border: none;
-		}
-	}
-
-	.main-jg {
-		width: 100%;
-		height: 21rpx;
-		background-color: #f8f6f6;
-	}
-</style>

+ 0 - 166
pages/user/money/recharge备份.vue

@@ -1,166 +0,0 @@
-<template>
-	<view class="all padding-c-30 padding-v-30">
-		<view class="top">
-			<view class="topO"> {{$t('userinfo.u4')}} </view>
-			<view class="topT flex-start padding-t-30">
-				<view class="tt">USDT-TRC20</view>
-			</view>
-			<view class="topS flex-start">
-				<view class="S">{{$t('userinfo.u1')}}</view>
-				<view class="SS clamp padding-c-10">{{ address }}</view>
-				<image class="SSS" src="/static/icon/cz.png" mode="" @click="copy(address)">
-				</image>
-			</view>
-			<!-- 根据地址生成二维码 -->
-			<view class="qr flex-center">
-				<uqrcode h5DownloadName='myqrcode' ref="qrcode" canvas-id="qrcode" :value="address" size="240" sizeUnit='rpx'>
-				</uqrcode>
-			</view>
-
-			<view class="last flex">
-				<view class="le" @click="savePic">
-					<view class="lef">{{$t('userinfo.u2')}}</view>
-				</view>
-				<view class="le" style="margin-left: 30rpx;">
-					<view class="lef" @click="copy(address)">{{$t('userinfo.u3')}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="buttom">
-			<view class="but">
-				{{$t('userinfo.u5')}}
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		qianBao
-	} from "@/api/wallet.js"
-	export default {
-		data() {
-			return {
-				address: '',
-				qr:''
-			};
-		},
-		mounted() {},
-		onReady() {},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a3"),
-			});
-			this.qianBao()
-		},
-		methods: {
-			// 二维码地址
-			async qianBao() {
-				const res = await qianBao()
-				this.address = res.data.back.USDT.money.address;
-			},
-			// 复制地址
-			copy(value) {
-				uni.setClipboardData({
-					data: value,
-					success: function() {
-						//调用方法成功
-						console.log("success");
-					},
-				});
-			},
-			savePic(Url) {
-				this.$refs.qrcode.save({});
-			},
-		},
-	};
-</script>
-
-<style lang="scss">
-	.all {
-		line-height: 1;
-		color: #ffffff;
-	}
-
-	.top {
-		padding: 40rpx 30rpx;
-		background: #191a1f;
-		border-radius: 20rpx;
-
-		.topO {
-			font-size: $font-lg;
-			font-weight: bold;
-		}
-
-		.topT {
-			.tt {
-				padding: 20rpx 24rpx;
-				border-radius: 10rpx;
-				border: 2px solid #ddba82;
-				font-size: 26rpx;
-				font-weight: bold;
-				color: #feb041;
-			}
-		}
-
-		.topS {
-			padding-top: 30rpx;
-
-			.S {
-				font-size: $font-lg;
-				font-weight: bold;
-				flex-shrink: 0;
-			}
-
-			.SS {
-				font-size: $font-sm;
-				flex-grow: 1;
-			}
-
-			.SSS {
-				flex-shrink: 0;
-				width: 29rpx;
-				height: 29rpx;
-			}
-		}
-	}
-
-	.qr {
-		margin: 0 auto;
-		margin-top: 34rpx;
-		width: 275rpx;
-		height: 275rpx;
-		background-color: #fff;
-	}
-
-	.last {
-		margin-top: 50rpx;
-		padding: 0 30rpx;
-
-		.le {
-			padding: 20rpx 0;
-			width: 250rpx;
-			border: 2px solid #DDBA82;
-			text-align: center;
-			border-radius: 10rpx;
-
-			.lef {
-				font-size: 26rpx;
-				font-weight: bold;
-				color: #FEB041;
-			}
-		}
-	}
-
-	.buttom {
-		background: #191a1f;
-		border-radius: 20rpx;
-		margin-top: 30rpx;
-		padding: 30rpx;
-		.but {
-			font-size: 26rpx;
-			font-weight: 500;
-			line-height: 45rpx;
-		}
-	}
-</style>

+ 0 - 318
pages/user/money/team.vue

@@ -1,318 +0,0 @@
-<template>
-	<view class="content">
-		<view class="type flex-start">
-			<view class="item" :class="{action:type=='USDT'}" @click="onchangeType('USDT')">
-				USDT
-			</view>
-			<view class="item" :class="{action:type=='PKR'}" @click="onchangeType('PKR')">
-				PKR
-			</view>
-		</view>
-		<view class="content-money flex">
-			<view class="money-box">
-				<view class="margin-b-20">{{$t('money.a2')}}</view>
-				<view class="money" v-if="type=='PKR'">{{userInfo.pkr}}</view>
-				<view class="money" v-if="type=='USDT'">{{userInfo.usdt}}</view>
-			</view>
-			<!-- 数据代办 -->
-			<view class="box">
-				<view class="moneybtn-box">
-					<view class="money-btn"></view>
-					<view class="money-btn" @click="navto('/pages/user/money/recharge')">{{$t('money.a3')}}</view>
-				</view>
-				<view class="moneybtn-box margin-t-10">
-					<view class="money-btn"></view>
-					<view class="money-btn" @click="navto('/pages/user/money/withdrawal')">{{$t('money.a4')}}</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">{{$t('money.a5')}}</view>
-				<view class="info-num">{{userInfo.sum_income|| '0'}}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">{{$t('money.a6')}}</view>
-				<view class="info-num">{{userInfo.sum_expend  || '0'}}</view>
-			</view>
-		</view>
-
-		<scroll-view :style="{height:height}" scroll-y="true" class="padding-b-20 padding-c-30 list-scroll-content"
-			@scrolltolower="loadData">
-			<!-- 订单列表 -->
-			<view class="list flex padding-v-30" v-for="(item, index) in list" :key="index">
-				<view>
-					<view class="tit padding-b-20">{{item.mark}}</view>
-					<view class="tim">{{item.add_time}}</view>
-				</view>
-				<view class="boxT">
-					<text v-if="item.pm==1">+</text>
-					<text v-if="item.pm==0">-</text>
-					<text class="mon">{{item.number*1}}</text>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		getMoneyLog
-	} from "@/api/wallet.js"
-	import {
-		gameWallet,
-	} from "@/api/game.js";
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		data() {
-			return {
-				userInfo: {
-					sum_expend:'',
-					sum_income:'',
-					pkr:'',
-					usdt:''
-				},
-				userWallet: '', //余额
-				height: '',
-				loaded: false,
-				list: [],
-				money: '',
-				page: 1,
-				limit: 10,
-				loadingType: 'more',
-				type:"USDT"
-			};
-		},
-		onLoad(options) {},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.list-scroll-content').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res[0].top);
-						console.log(resu.windowHeight);
-						_this.height = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		onShow() {
-			// this.getUserInfo();
-			this.loadData();
-			this.getUserWallet();
-		},
-		methods: {
-			onchangeType(type){
-				this.type = type;
-				this.page = 1;
-				this.loadingType = 'more';
-				this.loaded = false;
-				this.list = [];
-				this.loadData();
-			},
-			// 获取用户余额信息
-			getUserWallet() {
-				gameWallet().then((res) => {
-					this.userInfo.pkr = +res.data.back.PKR.money.money
-					this.userInfo.usdt = +res.data.back.USDT.money.money
-				})
-			},
-			// getUserInfo() {
-			// 	getUserInfo({}).then(({
-			// 		data
-			// 	}) => {
-			// 		this.userInfo = data
-					
-			// 	});
-			// },
-			toBack() {
-				uni.switchTab({
-					url: '/pages/index/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-
-			//获取收入支出信息
-			async loadData(source) {
-				let navItem = this;
-				if (navItem.loaded === true || navItem.loadingType === 'loading') {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-				getMoneyLog({
-						page: navItem.page,
-						limit: navItem.limit
-					},navItem.type)
-					.then(({
-						data
-					}) => {
-						navItem.userInfo.sum_expend = data.sum_expend;
-						navItem.userInfo.sum_expend = data.sum_expend;
-						navItem.list = navItem.list.concat(data.list);
-						navItem.page++;
-						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.list.length) {
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.content {
-		line-height: 1;
-	}
-
-	.content-money {
-		position: relative;
-		padding: 60rpx 30rpx;
-		height: 250rpx;
-		margin-top: -20rpx;
-		.box {
-			position: absolute;
-			right: 0;
-			top: 50rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			color: #ffffff;
-
-			.moneybtn-box {
-				padding: 14rpx 40rpx;
-				border: 2px solid #FFFFFF;
-				border-bottom-left-radius: 100rpx;
-				border-top-left-radius: 100rpx;
-				border-right: none;
-			}
-		}
-
-		.money-box {
-			position: relative;
-			z-index: 2;
-			color: #ffffff;
-			text-align: left;
-
-			.money {
-				font-weight: bold;
-				font-size: 72rpx;
-				color: #fdb242;
-			}
-		}
-	}
-
-	.info-box {
-		background: #1d1d22;
-		border-radius: 20rpx;
-		margin: 0 30rpx;
-		padding: 30rpx;
-
-		.info-item {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			line-height: 1;
-
-			.info-font {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				text-align: center;
-				color: #e2e2e2;
-			}
-
-			.info-num {
-				margin-top: 30rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ffffff;
-			}
-		}
-
-		.shu {
-			width: 2rpx;
-			height: 74rpx;
-			background: #ffffff;
-		}
-	}
-
-
-
-
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-
-	}
-
-	// border-bottom: 1px solid #ffffff;
-
-	.list {
-		border-bottom: 1px solid $font-color-light;
-		.tit {
-			font-size: $font-base;
-			font-weight: 500;
-			color: #FFFFFF;
-		}
-
-		.tim {
-			font-size: 22rpx;
-			font-weight: 400;
-			color: #999999;
-		}
-
-		.boxT {
-			font-weight: bold;
-			font-size: 30rpx;
-			color: #FDB242;
-		}
-	}
-	.type{
-		padding: 30rpx 30rpx 0 30rpx;
-		font-size: 38rpx;
-		color: #FFF;
-		.item{
-			padding: 20rpx 20rpx;
-			margin-right: 10rpx;
-			&.action{
-				color: #FDB242;
-				border-bottom: 1px solid #FDB242;
-			}
-		}
-	}
-</style>

+ 0 - 259
pages/user/money/withdrawal.vue

@@ -1,259 +0,0 @@
-<template>
-	<view class="all">
-		<view class="top">
-			<view class="topO">
-				{{$t('userinfo.u6')}}
-			</view>
-			<view class="topT flex-start padding-b-30">
-				<view class="TT">USDT</view>
-				<view class="TT noaction" @click="openPkr">PKR</view>
-			</view>
-			<view class="topO">
-				{{$t('userinfo.u7')}}
-			</view>
-			<view class="topF margin-b-30">
-				<input class="FF" type="text" :placeholder="$t('userinfo.u17')" v-model="address"
-					placeholder-class="placeholder-input" />
-			</view>
-			<view class="topO ">
-				{{$t('userinfo.u8')}} <text class="font-color-gray font-size-sm">({{$t('userinfo.u19')}}:{{userWallet}})</text>
-			</view>
-			<view class="topF flex margin-b-30">
-				<input class="FF" type="number" v-model="withdrawal" :placeholder="$t('userinfo.u18')"
-					placeholder-class="placeholder-input" />
-				<view class="btn" @click="withdrawal=userWallet">USDT {{$t('userinfo.u20')}}</view>
-			</view>
-			<view class="topO ">
-				{{$t('userinfo.u21')}} ({{num}}%)
-			</view>
-			<view class="topF flex">
-				<text v-if="type==1">{{charge}}</text>
-				<text v-else>{{num}}</text>
-			</view>
-		</view>
-		<view class="center margin-t-30">
-			<view class="tx">{{$t('userinfo.u9')}}</view>
-			<view class="buzhou margin-t-20">
-				<view class="">1.{{$t('userinfo.u10')}} </view>
-				<view class="">① {{$t('userinfo.u11')}}</view>
-				<view class="">② {{$t('userinfo.u12')}} </view>
-				<view class="">2.{{$t('userinfo.u13')}}</view>
-				<view class="">3.{{$t('userinfo.u14')}}</view>
-				<view class="">4.{{$t('userinfo.u15')}}</view>
-			</view>
-		</view>
-		<view class="last margin-t-30" @click="openPayPassword">
-			<view class="la" :class="{action:loding}">{{$t('userinfo.u16')}}</view>
-		</view>
-		<uni-popup type="bottom" ref="popup">
-			<inputPassword @commit='KeyInfo'></inputPassword>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		gameWallet
-	} from "@/api/game.js";
-	import {
-		extractCash
-	} from "@/api/wallet.js";
-	import inputPassword from "@/components/input-password/input-password.vue";
-	export default {
-		components: {
-			inputPassword
-		},
-		data() {
-			return {
-				address: '', //提现地址
-				withdrawal: '', //提现金额
-				userWallet: '',
-				loding: false,
-				password: '',
-				// 手续费信息
-				type: 0,
-				num: 0//手续费百分比
-			};
-		},
-		computed: {
-			charge() {
-				return Number( (this.withdrawal*this.num/100).toFixed(8))
-			}
-		},
-		onLoad() {
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.a8"),
-			});
-			this.gameWallet();
-		},
-		methods: {
-			openPkr(){
-				uni.showToast({
-					// title: '余额不足!',
-					title: this.$t("withdrawal.暂未开放"),
-					icon: 'error'
-				});
-			},
-			// 支付弹窗
-			openPayPassword() {
-				if (this.userWallet < this.withdrawal) {
-					uni.showToast({
-						// title: '余额不足!',
-						title: this.$t("userinfo.u22"),
-						icon: 'error'
-					});
-					return
-				};
-				this.$refs.popup.open();
-			},
-			// 关闭支付弹窗
-			colsePayPassword() {
-				this.$refs.popup.close();
-			},
-			// 密码输入完成
-			KeyInfo(val) {
-				this.password = val;
-				this.colsePayPassword();
-				this.submit();
-			},
-			// 获取用户信息
-			gameWallet() {
-				const that = this;
-				gameWallet().then((res) => {
-					that.userWallet = +res.data.back.USDT.money.money;
-					that.type = +res.data.back.USDT.cash_commission_count_type;
-					that.num = +res.data.back.USDT.cash_commission_ratio;
-				})
-			},
-			// 提交
-			submit() {
-				const that = this;
-				uni.showLoading({
-					title: this.$t("userinfo.u23"),
-					mask: true
-				});
-				that.loding = true;
-				extractCash({
-					money: that.withdrawal,
-					money_type: "USDT",
-					address: that.address,
-					trade_password: that.password,
-				}).then((res) => {
-					that.loding = false;
-					uni.hideLoading()
-					uni.showToast({
-						title: this.$t("userinfo.u24")
-					});
-					this.address = '';
-					this.withdrawal = ''; //提现金额
-					this.password = '';
-				}).catch((res) => {
-					uni.showToast({
-						title: this.$t("userinfo.u25"),
-						icon: 'error'
-					});
-					that.loding = false;
-					uni.hideLoading()
-				})
-
-
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.all {
-		color: #FFFFFF;
-		padding: 0 30rpx;
-		line-height: 1;
-		padding-bottom: 150rpx;
-	}
-
-	.placeholder-input {
-		color: $font-color-light;
-	}
-
-	.top {
-		background: #191A1F;
-		border-radius: 20rpx;
-		padding: 40rpx 30rpx;
-		
-		.topO {
-			font-size: $font-lg;
-			padding-bottom: 30rpx;
-		}
-
-		.topT {
-			.TT {
-				border: 2px solid #DDBA82;
-				border-radius: 10rpx;
-				font-size: 26rpx;
-				color: #FEB041;
-				padding: 20rpx 24rpx;
-				&.noaction{
-					margin-left: 20rpx;
-					border-color: #999999;
-					color: #999999;
-				}
-			}
-
-		}
-
-		.topF {
-			background-color: rgba(254, 176, 65, 0.09);
-			border-radius: 20rpx;
-			padding: 20rpx 30rpx;
-
-			.FF {
-				font-size: $font-base;
-				flex-grow: 1;
-			}
-
-			.btn {
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.center {
-		background: #191A1F;
-		border-radius: 20rpx;
-		font-weight: 500;
-		padding: 30rpx;
-
-		.tx {
-			font-size: 29rpx;
-			line-height: 30rpx;
-		}
-
-		.buzhou {
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 40rpx;
-		}
-	}
-
-
-	.last {
-		background: #feb041;
-		border-radius: 10rpx;
-		overflow: hidden;
-		position: fixed;
-		bottom: 30rpx;
-		left: 30rpx;
-		right:30rpx;
-		.la {
-			font-size: $font-lg;
-			font-weight: bold;
-			color: #040404;
-			text-align: center;
-			padding: 30rpx;
-
-			&.action {
-				color: #FFF;
-				background-color: $font-color-light;
-			}
-		}
-	}
-</style>

+ 0 - 129
pages/user/vip/details.vue

@@ -1,129 +0,0 @@
-<template>
-	<view class="">
-		<view class="list margin-t-20 margin-c-30" v-for="(item, ind) in list" :key="ind">
-			<view class="top flex">
-				<view class="nc clamp">{{item.nickname}}</view>
-				<image class="img margin-l-20" src="/static/shouye/huiyuan.png" mode=""></image>
-			</view>
-			<navigator :url="`/pages/user/vip/details?id=${item.uid}`">
-			<view class="center padding-v-30 flex" >
-				<view class="sj">{{item.time}}</view>
-				<view class="flex-start">
-					<view class="xq margin-r-10">{{$t('huiyuan.a5')}}</view>
-					<image class="ima" src="/static/icon/jt.png" mode="scaleToFill"></image>
-				</view>
-			</view>
-			</navigator>
-			<view class="last flex padding-t-30">
-				<view>
-					<text class="left">{{$t('huiyuan.a6')}}:</text>
-					<text class="leftT">{{item.join_usdt}}</text>
-				</view>
-				<view>
-					<text class="right">{{$t('huiyuan.a7')}}:</text>
-					<text class="rightT">{{item.childCount}}</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		spread_se
-	} from "@/api/user.js"
-	
-	export default {
-		data() {
-			return {
-				id: '',
-				page: 1,
-				limit: 10,
-				loadingType: 'more',
-				loaded: false,
-				list: [],
-			};
-		},
-		onLoad(option) {
-			console.log('载入');
-			this.id = option.id;
-			this.getList()
-			
-		},
-		onReachBottom() {
-			this.getList()
-		},
-		methods:{
-			// 获取列表
-			getList(){
-				let that = this
-				if (that.loadingType == 'loading' || that.loadingType == 'noMore') {
-					return
-				}
-				that.loadingType = "loading";
-				spread_se({
-					page: that.page,
-					limit: that.limit,
-				},that.id).then(({
-					data
-				}) => {
-					let list = data.list
-					that.list = that.list.concat(list)
-					if (list.length == that.limit) {
-						that.loadingType = 'more'
-					} else {
-						that.loadingType = 'noMore'
-					}
-					that.loaded = true
-				}).catch(e => {
-					console.log(e);
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.list {
-		background: #191A1F;
-		border-radius: 16rpx;
-		padding: 30rpx;
-
-		.top {
-			.nc {
-				font-size: $font-lg;
-				font-weight: bold;
-				color: #FFFFFF;
-				flex-grow: 1;
-			}
-
-			.img {
-				flex-shrink: 0;
-				width: 100rpx;
-				height: 32rpx;
-			}
-		}
-
-		.center {
-			border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-			.ima {
-				width: 13rpx;
-				height: 19rpx;
-			}
-		}
-		.center,.last{
-			font-weight: 500;
-			font-size: $font-base;
-			color: #999999;
-		}
-		.last {
-			.leftT {
-				color: #b98134;
-			}
-
-			.rightT {
-				color: #ffffff;
-			}
-		}
-	}
-</style>

+ 0 - 220
pages/user/vip/tabulation.vue

@@ -1,220 +0,0 @@
-<template>
-	<view class="all">
-		<view class="row flex">
-			<view class="rowItem">
-				<view class="shu">{{total || 0}}</view>
-				<view class="wenben">{{$t('huiyuan.a1')}}</view>
-			</view>
-			<view class="rowItem">
-				<view class="shu">{{group_num || 0}}</view>
-				<view class="wenben">{{$t('huiyuan.a2')}}</view>
-			</view>
-		
-		</view>
-		<view class="row flex margin-t-20">
-			<view class="rowItem">
-				<view class="shu">{{totalLevel || 0}}</view>
-				<view class="wenben">{{$t('huiyuan.a3')}}</view>
-			</view>
-			<view class="rowItem">
-				<view class="shu">{{valid_user || 0}}</view>
-				<view class="wenben">{{$t('huiyuan.a4')}}</view>
-			</view>
-		</view>
-
-		<view class="list margin-t-20 margin-c-30" v-for="(item, ind) in list" :key="ind">
-			<view class="top flex">
-				<view class="nc clamp">{{item.nickname}}</view>
-				<image class="img margin-l-20" src="/static/shouye/huiyuan.png" mode=""></image>
-			</view>
-			<navigator :url="`/pages/user/vip/details?id=${item.uid}`">
-			<view class="center padding-v-30 flex" >
-				<view class="sj">{{item.time}}</view>
-				<view class="flex-start">
-					<view class="xq margin-r-10">{{$t('huiyuan.a5')}}</view>
-					<image class="ima" src="/static/icon/jt.png" mode="scaleToFill"></image>
-				</view>
-			</view>
-			</navigator>
-			<view class="last flex padding-t-30">
-				<view>
-					<text class="left">{{$t('huiyuan.a6')}}:</text>
-					<text class="leftT">{{item.join_usdt}}</text>
-				</view>
-				<view>
-					<text class="right">{{$t('huiyuan.a7')}}:</text>
-					<text class="rightT">{{item.childCount}}</text>
-				</view>
-			</view>
-		</view>
-		<view class="bto">
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		spread,
-		getUserInfo
-	} from "@/api/user.js"
-	export default {
-		data() {
-			return {
-				page: 1,
-				limit: 10,
-				loadingType: 'more',
-				loaded: false,
-				list: [],
-				group_num: '', //团队人数
-				total: '', // 用户总数
-				totalLevel: '', // 账户总数
-				valid_user: '', // 有效账户
-			};
-		},
-		onLoad(option) {
-			this.spread()
-
-			uni.setNavigationBarTitle({
-				title: this.$t("tab.b1"),
-			});
-		},
-
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		onReachBottom() {
-			this.spread()
-		},
-		methods: {
-			// 会员记录
-			spread() {
-				let that = this
-				if (that.loadingType == 'loading' || that.loadingType == 'noMore') {
-					return
-				}
-				that.loadingType = "loading";
-				spread({
-					page: that.page,
-					limit: that.limit,
-					// id: that.userInfo.uid,
-// <<<<<<< HEAD
-				// }).then(res => {
-				// 	let data = res.data
-				// 	console.log('1111111', data);
-				// 	this.group_num = data.group_num
-				// 	this.total = data.total
-				// 	this.totalLevel = data.totalLevel
-				// 	this.valid_user = data.valid_user
-					
-				// 	this.list = res.data.list
-				// 	console.log('list', this.list);
-				// }).catch(e=>{
-// =======
-				}).then(({
-					data
-				}) => {
-					let list = data.list
-					that.list = that.list.concat(list)
-					that.group_num = data.group_num
-					that.total = data.total
-					that.totalLevel = data.totalLevel
-					that.valid_user = data.valid_user
-
-					if (list.length == that.limit) {
-						that.loadingType = 'more'
-					} else {
-						that.loadingType = 'noMore'
-					}
-					that.loaded = true
-				}).catch(e => {
-// >>>>>>> ec643268e144bb15fc39a442eec94ca3d04a70ac
-					console.log(e);
-				})
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.all {
-		width: 750rpx;
-		background-color: $page-color-base;
-		line-height: 1;
-	}
-
-	.row {
-		padding: 0 30rpx;
-
-		.rowItem {
-			background: #191A1F;
-			border-radius: 10rpx;
-			width: 48%;
-			text-align: center;
-			padding: 40rpx 0;
-
-			.wenben {
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #FFFFFF;
-			}
-
-			.shu {
-				font-size: 46rpx;
-				font-weight: bold;
-				color: #FEB041;
-			}
-		}
-	}
-
-	.list {
-		background: #191A1F;
-		border-radius: 16rpx;
-		padding: 30rpx;
-
-		.top {
-			.nc {
-				font-size: $font-lg;
-				font-weight: bold;
-				color: #FFFFFF;
-				flex-grow: 1;
-			}
-
-			.img {
-				flex-shrink: 0;
-				width: 100rpx;
-				height: 32rpx;
-			}
-		}
-
-		.center {
-			border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-
-			.ima {
-				width: 13rpx;
-				height: 19rpx;
-			}
-		}
-
-		.center,
-		.last {
-			font-weight: 500;
-			font-size: $font-base;
-			color: #999999;
-		}
-
-		.last {
-			.leftT {
-				color: #b98134;
-			}
-
-			.rightT {
-				color: #ffffff;
-			}
-		}
-	}
-</style>