提交910

App.vue

@@ -3,8 +3,17 @@
 </style>
 
 <script>
+	
+	
+	
+	
+	
+	
 	export default {
-		onLaunch: function() {
+	
+		onLaunch: function(e) {
+	
+
 			console.log('App Launch')
 		},
 		onShow: function() {
@@ -17,18 +26,32 @@
 </script>
 
 <style lang="scss">
+
+	/* #ifdef H5 */
+	    uni-page-head {
+	        display: none;
+	    }
 	.uni-btn-icon{
 			display: none;
 		}
-	/* #ifdef H5 */
+	/* #endif */
+	
+    /* #ifdef APP-PLUS */
 	 uni-page-head {
 	    display: none ;
 	}
+.uni-btn-icon{
+			display: none;
+		}
 	/* #endif */
+	
+	
+	
+	
 uni-tabbar {
         .uni-tabbar { // tab背景
 		    padding-top:28rpx;
-		     padding-bottom: 50rpx !important;
+		     padding-bottom: 30rpx !important;
             background-image: linear-gradient(to top, #FAF8F8, #FFFFFF)!important; // tab背景图片或者渐变色，背景色和背景图片最多选择一个进行设置
             .uni-tabbar-border { // tabBar上边框
                 background-color: #F7F4F4!important; // tabBar上边框的颜色

components/balance/balance.vue

@@ -8,7 +8,7 @@
 				 <view class="index-p1">
 				 	<span class="category-sigh">{{currencySymbol}}  </span><span>{{currentBalance}}</span> 
 				 </view>	 
-				     <view class="index-a1" @click="sendMegToIndex">
+				     <view class="index-a1" @click="sendMegToIndex" v-if="showRechange">
 						 Recharge
 						 </view>
 				 </view>
@@ -19,7 +19,29 @@
 	const COMPONENT_NAME = 'balance'
 	export default {
 		name: COMPONENT_NAME,
-	    props:["currencySymbol","currentBalance"],
+	
+	    // props:["currencySymbol","currentBalance"],
+		
+		props: {
+			currencySymbol: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			currentBalance: {
+				type: String,
+				default () {
+					return  ''
+				}
+			},
+			showRechange: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			},
+		},
 		data() {
 			return {
 		

components/cont/cont.vue

@@ -127,12 +127,12 @@
 	}
 	.p2{
 		font-size: 28rpx;
-		color: #303133FF;
+		color: #303133;
 		margin-left: 20rpx;
 	}
 	.p1{
 		font-size: 28rpx;
-		color: #606266FF;
+		color: #606266;
 	}
 	.colseKefu{
 		position: absolute;
@@ -153,7 +153,7 @@
 	.title{
 			text-transform: capitalize;
 			font-size: 28rpx;
-			color: #954DE3FF;
+			color: #954DE3;
 			text-align: center;
 		}
 .title p{
@@ -195,7 +195,7 @@
 			transform: translateX(-50%);
 			width: 100%;
 			height: 2rpx;
-			background-color: #EDEFF2FF;
+			background-color: #EDEFF2;
 		}
 	.my-cont{
 		width: 180rpx;

components/gamecont/gamecont.vue

@@ -34,7 +34,7 @@
 			</view>
 			<view class="num_con">
 		
-				<view class="num2" :class="item.lotteryResult==5?'bg_jb2':''">
+				<view class="num2" :class="item.lotteryResult==0?'bg_jb1':''">
 					0
 				</view>
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==1?item.lotteryColor:'')},{color:(item.lotteryResult==1?white:'')}]" >
@@ -49,7 +49,7 @@
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==4?item.lotteryColor:'')},{color:(item.lotteryResult==4?white:'')}]">
 					4
 				</view>
-				<view class="num2" :class="item.lotteryResult==5?'bg_jb1':''">
+				<view class="num2" :class="item.lotteryResult==5?'bg_jb2':''">
 					5
 				</view>
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==6?item.lotteryColor:'')},{color:(item.lotteryResult==6?white:'')}]">
@@ -134,10 +134,10 @@
 		align-items: center;
 	}
 	.miss{
-		width: 180rpx;
+	/* 	width: 180rpx;
-		overflow-x: scroll;
+		overflow-x: scroll; */
 		color: #606266;
-		font-size: 28rpx;
+		font-size: 24rpx;
 		text-transform: capitalize;
 	}
 	.contone_item2{
@@ -153,7 +153,7 @@
 
 }
 .conttwo{
-	padding: 0 36rpx;
+	padding: 0 10rpx;
 }
 .contone_item{
 	line-height: 72rpx;
@@ -181,11 +181,11 @@
 	margin: 0 auto;
 }
 	.green{
-			background-color: #00B977FF !important;
+			background-color: #00B977 !important;
 			color: #fff !important;
 		}
 		.red{
-				background-color: #F25B5BFF !important;
+				background-color: #F25B5B !important;
 				color: #fff !important;
 			}
 			.bg_jb1{

components/gamecont2/gamecont2.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="gamecont2">
 	<view class="flex cont2_head">
-		<view class="head_item item">
+		<view class="head_item item one">
 			period
 		</view>
 		<view class="head_item item">
@@ -28,6 +28,7 @@
 		</view>
 		<view class="body_item item">
 			<image :src="'/static/color/bg_er@3x'+item+'.png'" mode="" v-for="(item,index) in gameRecordCont[index].lotteryColor" :key="index"></image>
+		
 		</view>
 		</view>
 
@@ -56,7 +57,6 @@
 		
 		},
 		mounted() {
-		      
 		},
 
 		methods: {
@@ -66,11 +66,10 @@
 </script>
 
 
-<style>
+<style scoped lang="scss">
-	 .one{
-		 overflow-x: scroll;
-		 overflow-y: hidden;
 
+	 .one{
+		 width: 500rpx !important;
 	 }
 	.flex2{
 		display: flex;
@@ -108,6 +107,29 @@
 		color: #303133;
 	}
 
+     /* #ifdef H5  */
+    .item{
+    	text-transform: capitalize;
+    	font-size: 28rpx;
+    	text-align: center;
+    	width: 234rpx;
+    	line-height: 72rpx;
+    }
+     /*  #endif   */
+      /* #ifdef APP-PLUS  */
+	  
+	  .one{
+	  		 width: 400rpx !important;
+	  }
+	  .gamecont2{
+		  padding-top: 0 !important;
+	  }
+	  .cont2_head{
+	  	padding: 0 !important;
+	  }
+	  .bodycon{
+	  	height: 72rpx !important;
+	  }
     .item{
     	text-transform: capitalize;
     	font-size: 28rpx;
@@ -115,6 +137,8 @@
     	width: 234rpx;
     	line-height: 72rpx;
     }
+     /*  #endif  */
+
 	.body_item image{
 		width: 32rpx;
 		height: 32rpx;

components/gamecont3/gamecont3.vue

@@ -12,7 +12,7 @@
 			{{item.status}}
 			</view>
 			<view class="body_item mar_let" :class="item.status=='success'?'green':'red'">
-				{{item.bettingAmount}}
+				<text v-if="item.status=='Fail'">-</text>{{item.bettingAmount}}
 			</view>
 					</view>
 			<view class="body_item jiantou">
@@ -52,8 +52,17 @@
 						<view class="name">
 							delivery
 						</view>
+						<view class="num" style="color: #F49D7A;">
+							{{item.realAmount}}
+						</view>
+					</view>
+					<view class="perd_item flex">
+						<view class="name">
+							result
+						</view>
 						<view class="num">
-							{{item.bettingNumber}}
+							<text style="color: #46A8F5;"> {{ item.lotteryValue }} </text>{{k}}<text style="text-transform:lowercase;" :style="{color:item.lotteryColor}"> {{item.lotteryColor}} </text>
+							
 						</view>
 					</view>
 					<view class="perd_item flex">
@@ -69,14 +78,15 @@
 							select
 						</view>
 						<view class="num">
-							<image :src="'static/color/ico_apple_'+item.lotteryColor+'@3x.png'" mode=""></image>
+							<!-- <image :src="'static/color/ico_apple_'+item.lotteryColor+'@3x.png'" mode=""></image> -->
+							{{item.bettingValue}}
 						</view>
 					</view>
 					<view class="perd_item flex">
 						<view class="name">
 							status
 						</view>
-						<view class="num">
+						<view class="num" :class="item.status=='Fail'?'red':'green'">
 							{{item.status}}
 						</view>
 					</view>
@@ -84,8 +94,11 @@
 						<view class="name">
 							Amount
 						</view>
-						<view class="num">
+						<view class="num" :class="item.status=='Fail'?'red':'green'" v-if="item.status=='Fail'">
-							{{item.bettingAmount}}
+						<text v-if="item.status=='Fail'" >-</text>{{item.realAmount}}
+						</view>
+						<view class="num" :class="item.status=='Fail'?'red':'green'" v-else>
+						{{item.profitAmount}}
 						</view>
 					</view>
 					<view class="perd_item flex">
@@ -117,6 +130,7 @@
 		props:["myGameRecord"],
 		data() {
 			return {
+				k:' ',
 		 //    cont3data:[
 			// 	{			
 			// 		id:1,
@@ -203,6 +217,12 @@
 
 
 <style>
+		.green{
+			color: green;
+		}
+	.red{
+		color: red;
+	}
 .num image{
 	width: 32rpx;
 	height: 32rpx;
@@ -211,12 +231,14 @@
 		margin-bottom: 24rpx;
 	}
 	.perd_item .name{
+	
 		text-transform: capitalize;
 		color: #303133;
 		font-size: 28rpx;
 	}
 	.perd_item .num{
 		color: #303133;
+		text-transform: uppercase;	
 		font-size: 28rpx;
 	}
 	.periodd{
@@ -227,18 +249,21 @@
 	}
 	.list_con{
 		padding: 0 60rpx;
+		border: none;
 	}
 
 	.list{
 		max-height: 0rpx;
 		overflow: hidden;
 		transition: .5s all;
+		border: none;
 		padding: 0;
 		background-color: #F5F7FA;
 	}
 	.body_con_zon.on .list{
 		padding: 48rpx 0;
-		max-height: 700rpx;
+		max-height: 800rpx;
+		border: none;
 	}
 	.red{
 		color: #F25B5B !important;
@@ -249,6 +274,7 @@
 	.bodycon{
 		height: 72rpx;
 		padding: 0 36rpx;
+		border: none;
 	}
 	.mar_let{
 		margin-left: 30rpx;

components/navigation/navigation.vue

@@ -33,7 +33,6 @@
 		methods: {
 		back(){
 
-				console.log('back')
 				// #ifdef H5
 					history.back()
 				// #endif
@@ -46,11 +45,20 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+
+    .item{
+    	text-transform: capitalize;
+    	font-size: 28rpx;
+    	text-align: center;
+    	width: 234rpx;
+    	line-height: 72rpx;
+    }
+   
   
 .nav-head{
-	line-height: 108rpx;
+	line-height: 170rpx;
-	background-color: #34026BFF;
+	background-color: #34026B;
 	text-align: center;
 	font-size: 36rpx;
 	color: #fff;
@@ -62,6 +70,8 @@
 	flex-direction: row-reverse;
 	align-items: center;
 }
+	
+	
 	.back{
 		width: 42rpx;
 		height: 42rpx;
@@ -69,5 +79,33 @@
 		left:36rpx;
         top: 50%;
 		transform: translateY(-50%) rotate(-180deg) ;
+	
+	}
+
+	/* #ifdef APP-PLUS  */
+	.nav-head{
+		line-height: 170rpx;
+		background-color: #34026B;
+		text-align: center;
+		font-size: 36rpx;
+		color: #fff;
+		position: relative;
+		text-transform: capitalize;
+		padding: 0 36rpx;
+		padding-top: 50rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: row-reverse;
+		align-items: center;
+	}
+	.back{
+		width: 42rpx;
+		height: 42rpx;
+		position: absolute;
+		left:36rpx;
+	    top: 60%;
+		transform: translateY(-50%) rotate(-180deg) ;
+	
 	}
+	  /*  #endif   */
 </style>

components/switch/switch.vue

@@ -1,10 +1,10 @@
 <template>
 		<view class="index-header">
 			<view class="item" :class="switNum==1?'active':''" @click="goColor()">
-				Real Dish
+				Real Account
 			</view>
 			<view class="item" :class="switNum==2?'active':''" @click="goMoniColor()">
-				Virtual Disk
+				Demo Account
 			</view>
 			</view>
 </template>
@@ -15,8 +15,12 @@
 	    props:{
 			switNum: {
 				type: Number,
+				default () {
+					return  0
 				}
 			},
+			
+		},
 		data() {
 			return {
 		switNum:1,

components/tabBar/tabBar.vue

@@ -0,0 +1,202 @@
+<template>
+		<view class="index-header ">
+			<view class="con">
+				<view class="tabbar_item" @click="goToPage(1)">
+					<view class="uni-tabbar_bd">
+						<view class="uni-tabbar_icon">
+						<image :src="'/static/tabbar/'+(selectActive==1?'meun_icon_home_sel@3x':'meun_icon_home_nor@3x')+'.png'" mode="aspectFit" class="img1"></image>
+						</view>
+						<view class="uni-tabbar_label"  :class="['text', selectActive==1?'active':'']">
+							Home
+						</view>
+					</view>
+				</view>
+			<view class="tabbar_item" @click="goToPage(2)">
+				<view class="uni-tabbar_bd">
+					<view class="uni-tabbar_icon">
+					<image :src="'/static/tabbar/'+(selectActive==2?'meun_icon_search_sel@3x':'meun_icon_search_nor@3x')+'.png'" mode="aspectFit" class="img1"></image>
+					</view>
+					<view class="uni-tabbar_label"  :class="['text', selectActive==2?'active':'']">
+						Search
+					</view>
+				</view>
+			</view>
+			<view class="tabbar_item" @click="goToPage(3)" v-if="status=='open'">
+				<view class="uni-tabbar_bd">
+					<view class="uni-tabbar_icon">
+					<image :src="'/static/tabbar/'+(selectActive==3?'meun_icon_game_sel@2x':'meun_icon_game_nor@2x')+'.png'" mode="aspectFit" class="img1"></image>
+					</view>
+					<view class="uni-tabbar_label"  :class="['text', selectActive==3?'active':'']">
+						Game
+					</view>
+				</view>
+			</view>
+			<view class="tabbar_item" @click="goToPage(4)">
+				<view class="uni-tabbar_bd">
+					<view class="uni-tabbar_icon">
+					<image :src="'/static/tabbar/'+(selectActive==4?'meun_icon_promotion_sel@2x':'meun_icon_promotion_nor@2x')+'.png'" mode="aspectFit" class="img1"></image>
+					</view>
+					<view class="uni-tabbar_label"  :class="['text', selectActive==4?'active':'']">
+						Promotion
+					</view>
+				</view>
+			</view>
+			<view class="tabbar_item" @click="goToPage(5)">
+				<view class="uni-tabbar_bd">
+					<view class="uni-tabbar_icon">
+					<image :src="'/static/tabbar/'+(selectActive==5?'meun_icon_my_sel@2x':'meun_icon_my_nor@2x')+'.png'" mode="aspectFit" class="img1"></image>
+					</view>
+					<view class="uni-tabbar_label"  :class="['text', selectActive==5?'active':'']">
+						My
+					</view>
+				</view>
+			</view>
+			</view>
+			</view>
+</template>
+<script>
+	import api from '@/utils/api'
+	import utils from '@/utils'
+	import md5 from 'js-md5'
+	import store from '@/store'
+	const COMPONENT_NAME = 'tabBar'
+	export default {
+		name: COMPONENT_NAME,
+	
+	  
+		
+		props: {
+		selectActive: {
+			type: Number,
+			default () {
+				return 1
+			}
+		},
+		},
+		data() {
+			return {
+				status:''
+			}
+		},
+		computed: {
+		
+		},
+		mounted() {
+	this.openGame()
+		},
+		methods: {
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+					this.status=d.data.gameMenuStatus
+					
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
+		goToPage(num) {
+				if(num == 1) {
+					this.selectActive = 1
+					uni.switchTab({
+						url: '/pages/menu/goods/index'
+					})
+				} else if (num == 2) {
+					this.selectActive = 2
+				    uni.switchTab({
+				    	url:'/pages/menu/search/index'
+				    })
+				} else if (num == 3) {
+					this.selectActive = 3
+					uni.switchTab({
+						url: '/pages/menu/color/index'
+					})
+				}else if (num == 4) {
+					this.selectActive = 4
+					uni.switchTab({
+						url: '/pages/menu/promotion/index'
+					})
+				}else if (num == 5) {
+					this.selectActive = 5
+					uni.switchTab({
+						url: '/pages/menu/My/index'
+					})
+				}
+				
+			}
+
+	},
+	}
+</script>
+
+
+<style scoped lang="scss">
+	.active{
+		color: rgb(52, 2, 107) !important;
+	}
+	.uni-tabbar_label {
+		color: rgb(153, 153, 153);
+		    font-size: 10px;
+		    line-height: normal;
+		    margin-top: 3px;
+			position: relative;
+			    text-align: center;
+    font-size: 20rpx !important;
+}
+	.uni-tabbar_icon{
+		width: 24px !important;
+		    height: 24px !important;
+			position: relative;
+			    display: inline-block;
+			    margin-top: 5px;
+	}
+	.uni-tabbar_icon image {
+	    width: 100%;
+	    height: 100%;
+	}
+	.uni-tabbar_bd{
+		height: 100rpx;
+		position: relative;
+		    -webkit-flex-direction: column;
+		    flex-direction: column;
+		    cursor: pointer;
+	}
+.con{
+	width: 100%;
+	background-color: rgb(247, 247, 250);
+	    position: fixed;
+	   bottom: 0;
+	padding-top: 28rpx;
+	    padding-bottom: 30rpx ;
+	    background-image: -webkit-linear-gradient(bottom, #FAF8F8, #FFFFFF) !important;
+	    background-image: linear-gradient(to top, #FAF8F8, #FFFFFF) !important;
+		border-top: 2rpx solid #F7F4F4;
+		display: flex;
+		    z-index: 998;
+		    box-sizing: border-box;
+}
+.tabbar_item{
+	display: -webkit-box;
+	width: 150rpx;
+	height: 100rpx;
+	    display: -webkit-flex;
+	    display: flex;
+	    -webkit-box-pack: center;
+	    -webkit-justify-content: center;
+	    justify-content: center;
+	    -webkit-box-align: center;
+	    -webkit-align-items: center;
+	    align-items: center;
+	    -webkit-box-orient: vertical;
+	    -webkit-box-direction: normal;
+		webkit-flex-direction: column;
+		    flex-direction: column;
+		    -webkit-box-flex: 1;
+		    -webkit-flex: 1;
+		    flex: 1;
+		    font-size: 0;
+		    text-align: center;
+		    -webkit-tap-highlight-color: rgba(0,0,0,0);
+}	
+	
+</style>

main.js

@@ -4,15 +4,16 @@ import axios from './utils/axios.js'
 import store from './store'
 import uView from "uview-ui";
 import VueClipboards from 'vue-clipboard2'
-
 Vue.config.productionTip = false
-
+// 自定义底部导航栏
+import tabBar from 'components/tabBar/tabBar.vue'
  
 Vue.use(uView);
 Vue.use(VueClipboards);
 Vue.prototype.$axios = axios
 Vue.prototype.$store = store
 Vue.config.productionTip = false
+Vue.component('tab-bar', tabBar)
 // Vue.prototype.$showDialog = true
 App.mpType = 'app'
 

manifest.json

@@ -1,12 +1,16 @@
 {
-    "name" : "first",
+    "name" : "Win Gold",
     "appid" : "__UNI__7E21D6D",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        // 静止弹出h5+runtime
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -45,6 +49,38 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },
@@ -79,7 +115,7 @@
             "proxy" : {
                 "/start" : {
                     "ws" : false,
-                    "target" : "https://apitest.luck-work.com",
+                    "target" : "https://api.wingold6.com",
                     // "target":"https://webtest.luck-work.com/",
                     // "target" : "https://api.in-earn.co.ke",
                     "changeOrigin" : true,
@@ -88,9 +124,13 @@
                         "^/start" : ""
                     }
                 }
-            }
+            },
+            "port" : ""
         },
         "title" : "color",
-        "domain" : "webtest.luck-work.com"
+        "domain" : "api.wingold6.com"
     }
 }
+// 静止弹出h5+runtime
+/* 模块配置 */
+

pages.json

@@ -7,47 +7,86 @@
 		{
 			"path": "pages/login/index",
 			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/redenvelopes",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/menu/re/list/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/menu/re/add/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/menu/address/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/menu/order/index",
+			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/about/RiskDisclosureAGREEMENT",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/about/privacyPolicy",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/search/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/goods/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/goods/goodsDetail/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
-		"path": "pages/menu/bankCard/addAddress/index",
+			"path": "pages/menu/address/addAddress/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/bankCard/addBankCard/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/bankCard/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -55,38 +94,43 @@
 		{
 			"path": "pages/register/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/color/index",
 			"style": {
-			
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/colorMoni/index",
 			"style": {
-			
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/promotion/applyRecord/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/promotion/bounsRecord/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/withdrawl/transactions/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/recharge/rechargeRule",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -94,17 +138,20 @@
 		{
 			"path": "pages/menu/withdrawl/transactions/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/withdrawl/withdrawlRecord/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/recharge/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -112,6 +159,7 @@
 		{
 			"path": "pages/menu/recharge/record/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -120,43 +168,45 @@
 		{
 			"path": "pages/menu/rule/arules/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/aplan/index",
-		"style": {
+			"style": {}
-		}
 		},
 
 
 		{
 			"path": "pages/menu/withdrawl/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/menu/promotion/promotionRecord/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/recharge/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/My/index",
 			"style": {
-			
 			}
 		},
 
 		{
 			"path": "pages/menu/promotion/index",
 			"style": {
-				
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -166,7 +216,7 @@
 		{
 			"path": "pages/menu/index/index",
 			"style": {
-				
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -175,20 +225,21 @@
 		{
 			"path": "pages/login/resetPassword/index",
 			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/rule/index",
 			"style": {
-				
+				"navigationStyle": "custom"
 			}
 		},
 
 		{
 			"path": "pages/menu/rule/inviteRule/index",
 			"style": {
-				
+				"navigationStyle": "custom"
 			}
 		}
 
@@ -198,12 +249,16 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarBackgroundColor": "#34026B"
+		"navigationBarBackgroundColor": "#34026B",
+		"style": {
+			"app-plus": {
+				"titleNView": false
+			} 
+		}
 	},
 	"tabBar": {
 		"selectedColor": "#34026B",
-		"list":[
+		"list": [{
-			{
 				"text": "Home",
 				"pagePath": "pages/menu/goods/index",
 				"iconPath": "./static/tabbar/[email protected]",
@@ -216,10 +271,10 @@
 				"selectedIconPath": "./static/tabbar/[email protected]"
 			},
 			{
-			"text":"Game",
+				"text": "Order",
-			"pagePath":"pages/menu/color/index",
+				"pagePath":"pages/menu/order/index",
-			"iconPath":"./static/tabbar/meun_icon_game_nor@2x.png",
+				"iconPath": "./static/tabbar/dorder.png",
-			"selectedIconPath":"./static/tabbar/meun_icon_game_sel@2x.png"
+				"selectedIconPath": "./static/tabbar/dorderS.png"
 			},
 
 			{

pages/login/index.css

@@ -23,9 +23,8 @@
 .input-item input{
 	line-height: 96rpx;
 	width: 500rpx;
-	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 172rpx;
@@ -36,7 +35,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -58,11 +57,11 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 	margin-left: 20rpx;
 }
 .rePass{
-	color: #606266FF;
+	color: #606266;
 	font-size: 28rpx;
 	float: right;
 }

pages/login/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<navigation>
+		<navigation :showBack="false">
 			<image :src="logoUrl" mode="aspectFit" class="logo" slot="logo"></image>
 			Login
 		</navigation>
@@ -59,11 +59,15 @@
 		},
 
 		onLoad() {
+			  const ticket= uni.getStorageSync('logInfo').data;
+			  if(ticket!=''&&ticket!=undefined&&ticket!=null){
+				   uni.reLaunch({
+				   	url:'../menu/goods/index'
+				   })
+			  }
+			// console.log(uni.getSystemInfoSync().platform)
 			this.siteInfoData = uni.getStorageSync('siteInfo')
 			this.countryCode = uni.getStorageSync('countryCode')
-
-			console.log(this.siteInfoData, 9999)
-			console.log(this.countryCode, 99999)
 			const siteInfo = api.siteInfo()
 			siteInfo.then(d => {
 					let that = this
@@ -71,7 +75,6 @@
 						key: 'siteInfo',
 						data: d.data,
 						success: function() {
-							console.log('success')
 							that.logoUrl = d.data.siteDomain + d.data.siteLogo
 							that.siteName = d.data.siteName
 							that.areacode = d.data.areaCode
@@ -87,8 +90,7 @@
 			this.siteName = this.siteInfoData.siteName
 			// const ticket = this.$store.state.ticket
 
-	         const ticket= uni.getStorageSync('logInfo').data;
+	       
-	         console.log(ticket,7777777777777777777)
 	 // if(ticket !=  ''){
 		// 		uni.navigateTo({
 		// 			url: '../menu/index/index'
@@ -164,6 +166,15 @@
 				var that = this;
 				if (res.errCode == "SUCCESS") {
 					
+					// #ifdef H5
+						
+						var url = uni.getStorageSync('url');
+							
+						if(url){
+							location.href=url
+						}
+					  	
+					// #endif
 					uni.setStorage({
 						key: 'logInfo',
 						data: res,
@@ -185,7 +196,7 @@
 					})
 					setTimeout(function() {
 						uni.reLaunch({
-							url: '../menu/color/index'
+							url: '../menu/goods/index'
 						})
 					}, 1500)
 					console.log(uni.getStorageSync('logInfo').data, 66666666666666666666)

pages/login/resetPassword/index.css

@@ -31,9 +31,8 @@
 .input-item input{
 	line-height: 96rpx;
 	width: 500rpx;
-	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 172rpx;
@@ -45,10 +44,10 @@
 .otp{
 	width: 80rpx;
 	line-height: 40rpx;
-	border: 2rpx solid #954DE3FF;
+	border: 2rpx solid #954DE3;
 	border-radius: 8rpx;
 	text-align: center;
-	color:#954DE3FF ;
+	color:#954DE3 ;
 }
 .input_pcod{
     padding-left: 20rpx;
@@ -57,7 +56,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -79,11 +78,11 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 	margin-left: 20rpx;
 }
 .rePass{
-	color: #606266FF;
+	color: #606266;
 	font-size: 28rpx;
 	float: right;
 }

pages/login/resetPassword/index.vue

@@ -10,7 +10,7 @@
 					<span class="quhao">+{{areacode}}</span>
 				</view>
 				<input type="text" value="" placeholder="mobile number"
-					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform: capitalize;" v-model="mobile"
+					placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="mobile"
 					@input="btnControl" />
 			</view>
 			<view class="input-item flex">
@@ -20,7 +20,7 @@
 					</view>
 				</view>
 				<input class="input_pcod" value="" placeholder="Picture Code"
-					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform: capitalize;" v-model="picCode" />
+					placeholder-style="color: #BFC2CC;font-size:14px;" v-model="picCode" />
 				<view class="login-sigh3 flex">
 					<image :src="imgcodeUrl" mode="scaleToFill" class="img1"></image>
 					<image src="../../../static/login/[email protected]" mode="" class="img2" @click="getPicCode()">
@@ -52,15 +52,16 @@
 					</view>
 				</view>
 				<input type="password" value="" placeholder="new password"
-					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform: capitalize;"
+					placeholder-style="color: #BFC2CCFF;font-size:14px;"
 					v-model="newPassword" />
 			</view>
 			<button class="login-btn" @click="resetPassword()" :class="btnNum==1?'on':''"
 				:disabled="btnNum==1?false:true">
-				Continue
+				Confirm
 			</button>
 
 		</view>
+		<tab-bar :selectActive="5"></tab-bar>
 	</view>
 </template>
 
@@ -149,10 +150,11 @@
 					post.then(res => { 
 							var that = this;
 							uni.showToast({
-								title: res.errMsg,
+								title: 'Successfully',
 								icon: 'none',
 								duration: 2500
 							})
+							this.getPicCode();
 						})
 						.catch(e => {
 							uni.showToast({
@@ -160,6 +162,7 @@
 								icon: 'none',
 								duration: 2500
 							})
+							this.getPicCode();
 						})
 				} else {
 					this.$u.toast('Send after the countdown');
@@ -167,8 +170,8 @@
 
 			},
 			getPicCode() {
-				this.imgcodeUrl = "/start/api/home/imgCode?uuid=" + this.$u.guid(20);
+				
-				console.log(this.imgcodeUrl)
+				this.imgcodeUrl = "https://apitest.luck-work.com/api/home/imgCode?uuid=" + this.$u.guid(20);
 			},
 
 			resetPassword() {

pages/menu/My/index.css

@@ -1,7 +1,7 @@
 
 .content{
 		padding-bottom: 254rpx;
-		background-color: #F5F7FAFF !important;
+		background-color: #F5F7FA !important;
 			position: relative;
 }
 .flex{
@@ -57,7 +57,7 @@ margin-left: 24rpx;
 .my-ap{
 	width: 118rpx;
 	line-height: 44rpx;
-	background-color: #491C7AFF;
+	background-color: #491C7A;
 	border-radius: 16rpx;
 	text-align: center;
 	margin-left: 26rpx;
@@ -93,7 +93,7 @@ margin-left: 24rpx;
 	width: 100%;
 	line-height: 108rpx;
 	border-bottom: 2rpx solid #F5F7FA;
-	color: #303133FF;
+	color: #303133;
 	font-size: 30rpx;
 	text-transform: capitalize;
 	position: relative;
@@ -136,7 +136,7 @@ margin-left: 24rpx;
 }
 .my-body-out{
 	text-align: center;
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 	background-color: #fff;
 	text-transform: capitalize;
@@ -190,5 +190,5 @@ margin-left: 24rpx;
 		margin: 0 auto;
 	}
 	.pupler{
-		color: #954DE3FF;
+		color: #954DE3;
 	}

pages/menu/My/index.vue

@@ -21,8 +21,8 @@
 						Mobile: +{{areaCode}} {{MyInfo.mobile}}
 					</view>
 					<view class="my-bal flex">
-						<view>Available Balance: {{currentBalance}}</view>
+						<view>Available Balance: {{currencySymbol}}{{currentBalance}}</view>
-						<!-- <view class="my-ap">
+						<!-- 	<view class="my-ap" @click="goAplan()">
 						A+ Plan
 					</view> -->
 					</view>
@@ -31,9 +31,9 @@
 					<view class="my-btn1" @click="goRecharge()">
 						recharge
 					</view>
-					<view class="my-btn2" @click="go(3)">
+					<!-- 	<view class="my-btn2" @click="go(3)">
 						Change Nick Name
-					</view>
+					</view> -->
 				</view>
 			</view>
 
@@ -55,6 +55,9 @@
 						<view class="text" @click="goTransactions()">
 							Transactions
 						</view>
+						<view class="text" @click="gorEDenvelope()">
+							Red Envelope
+						</view>
 					</view>
 				</view>
 
@@ -124,8 +127,7 @@
 				fujiNum2: -1,
 				// 动态显示mask
 				mCode: -1,
-					list: [
+				list: [{
-								{
 						name: 'male',
 						value: 1,
 						disabled: false
@@ -142,8 +144,7 @@
 				currentBalance: '',
 				areaCode: '',
 				androidUrl: '',
-				myAList: [
+				myAList: [{
-					{
 						id: '1',
 						text: 'Bank card'
 					},
@@ -168,6 +169,7 @@
 		},
 
 		onLoad() {
+			this.openGame()
 			this.areaCode = uni.getStorageSync('siteInfo').areaCode;
 			this.androidUrl = uni.getStorageSync('siteInfo').androidUrl;
 			this.currentBalance = uni.getStorageSync('currentBalance');
@@ -177,7 +179,6 @@
 			})
 			post.then(res => {
 					this.MyInfo = res.data;
-					console.log(this.MyInfo, 9990);
 					uni.setStorage({
 						key: 'MyInfo',
 						data: res.data,
@@ -185,7 +186,6 @@
 							console.log('success')
 						}
 					});
-					console.log(res.data)
 				})
 				.catch(e => {
 					uni.showToast({
@@ -196,6 +196,36 @@
 				})
 		},
 		methods: {
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+						// uni.setStorage({
+						// 	key: 'Gamestatus',
+						// 	data: d.data.gameMenuStatus,
+						// });
+
+						if (d.data.gameMenuStatus == 'close') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Order',
+								pagePath: '/pages/menu/order/index',
+								iconPath: '/static/tabbar/dorder.png',
+								selectedIconPath: '/static/tabbar/dorderS.png'
+							})
+						} else if (d.data.gameMenuStatus == 'open') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Game',
+								pagePath: "/pages/menu/color/index",
+								iconPath: "/static/tabbar/[email protected]",
+								selectedIconPath: "/static/tabbar/[email protected]"
+							})
+						}
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
 			goPrivacy() {
 				uni.navigateTo({
 					url: '../about/privacyPolicy'
@@ -226,8 +256,13 @@
 			// 前往不同页面
 			go(i) {
 				if (i == 3) {
-					this.transferCode = 1
+					console.log(12313)
-					this.mCode=1
+					uni.reLaunch({
+						url: '/pages/menu/order/index',
+						fail: (err) => {
+							console.log(err, 22222)
+						}
+					})
 				}
 				if (i == 0) {
 					this.transferCode = 2
@@ -240,7 +275,7 @@
 				}
 				if (i == 2) {
 					uni.navigateTo({
-						url: '../bankCard/addAddress/index'
+						url: '../address/index'
 					})
 				}
 				if (i == 1) {
@@ -249,7 +284,6 @@
 					})
 				}
 				if (i == 5) {
-					console.log(this.androidUrl)
 					// #ifdef H5
 					window.location.href = this.androidUrl;
 					// #endif
@@ -259,6 +293,11 @@
 
 				}
 			},
+			gorEDenvelope() {
+				uni.navigateTo({
+					url: '../re/list/index'
+				})
+			},
 			changeName() {
 				uni.showLoading({
 					title: "loading"
@@ -302,7 +341,11 @@
 					})
 
 			},
-			
+			goAplan() {
+				uni.navigateTo({
+					url: '../aplan/index'
+				})
+			},
 			goRecharge() {
 				uni.navigateTo({
 					url: '../recharge/index'
@@ -330,7 +373,7 @@
 						})
 						if (res.success == true) {
 							uni.showToast({
-								title: 'Log out successfully',
+								title: 'Exit successful',
 								icon: 'success',
 								duration: 1500
 							})

pages/menu/about/RiskDisclosureAGREEMENT.vue

@@ -3,17 +3,8 @@
 	   <navigation>
 		  Risk Disclosure AGREEMENT
 	   </navigation>
-	   <view class="arcon">
+	   <view class="arcon" v-html="cont">
 	   	
-
-	   <view class="record_body">
-	A+ Plan is an lnternet online wealth manage ment product launched by NGNClub.NGNC lub users can transfer idle funds in NGNClu b account to A+ Plan to obtain daily income of 0.5% to 1%. For example, if you deposit 10,000 today, you will receive tomorrow 50 to100 income. The funds of A+ Plan can be tr ansferred in and out at any time without affe cting your use. You can choose to transfer t he account funds in to obtain income when you are not playing, such as when you are s leeping and resting
-	
-	   </view>
-	   <view class="record_body">
-	   	Transfer-in amount: minimum 1000 naira<br>
-	   	Income settlement time: After midnight the n ext day
-	   </view>
 	   	   </view>
 	</view>
 	
@@ -26,18 +17,32 @@
 	export default{
 		data(){
 			return{
-			
+			cont:''
 				}
 			},
 		
 		onLoad() {
 			
-			
+		this.getText();
 		
 	
 		},
 		methods:{
-		
+		getText(){
+			const post = api.article({
+						"mark":'agreement_betting_risk',
+					})
+					post.then(res => {
+					     this.cont=res.data.content;
+						})
+						.catch(e => {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 2500
+							})
+						})
+		}
 				
 		},
 	}
@@ -49,7 +54,7 @@
 		padding-top: 70rpx;
 	}
 .record_body{
-	color: #303133FF;
+	color: #303133;
 	line-height: 48rpx;
 	font-size: 28rpx;
 text-transform: capitalize;

pages/menu/about/privacyPolicy.vue

@@ -3,18 +3,11 @@
 	   <navigation>
 		  Privacy Policy
 	   </navigation>
-	   <view class="arcon">
+	   <view class="arcon"  v-html="cont">
 	   	
 
-	   <view class="record_body">
-	A+ Plan is an lnternet online wealth manage ment product launched by NGNClub.NGNC lub users can transfer idle funds in NGNClu b account to A+ Plan to obtain daily income of 0.5% to 1%. For example, if you deposit 10,000 today, you will receive tomorrow 50 to100 income. The funds of A+ Plan can be tr ansferred in and out at any time without affe cting your use. You can choose to transfer t he account funds in to obtain income when you are not playing, such as when you are s leeping and resting
 	 
 	   	   </view>
-	   <view class="record_body">
-	   	Transfer-in amount: minimum 1000 naira<br>
-	   	Income settlement time: After midnight the n ext day
-	   </view>
-	   	   </view>
 	</view>
 	
 </template>
@@ -26,18 +19,32 @@
 	export default{
 		data(){
 			return{
-			
+			cont:''
 				}
 			},
 		
 		onLoad() {
-			
+			this.getText()
 			
 		
 	
 		},
 		methods:{
-		
+		getText(){
+			const post = api.article({
+						"mark":'agreement_betting_privacy_policy',
+					})
+					post.then(res => {
+					     this.cont=res.data.content;
+						})
+						.catch(e => {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 2500
+							})
+						})
+		}
 				
 		},
 	}
@@ -49,7 +56,7 @@
 		padding-top: 70rpx;
 	}
 .record_body{
-	color: #303133FF;
+	color: #303133;
 	line-height: 48rpx;
 	font-size: 28rpx;
 text-transform: capitalize;

pages/menu/bankCard/addAddress/index.css → pages/menu/address/addAddress/index.css

@@ -25,7 +25,7 @@
 	width: 500rpx;
 	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 172rpx;
@@ -36,7 +36,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -58,11 +58,11 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 	margin-left: 20rpx;
 }
 .rePass{
-	color: #606266FF;
+	color: #606266;
 	font-size: 28rpx;
 	float: right;
 }

pages/menu/bankCard/addAddress/index.vue → pages/menu/address/addAddress/index.vue

@@ -1,12 +1,17 @@
 <template>
 	<view class="">
-		<navigation>
+	<navigation v-if="form.id==null">
 		Add Address
+	</navigation>
+	<navigation v-if="form.id!=null">
+		Modify Address
 	</navigation>
 		<view class="login-body">
 			<u-form :model="form" ref="uForm" :rules="rules">
 					<u-form-item  prop="name">
-						<u-input v-model="form.name" :placeholder="'Full Name'" @input="btnControl()"/>
+						<u-input v-model="form.name" :placeholder="'Full Name'" 
+		
+						/>
 					</u-form-item>
 					<u-form-item  prop="mobile">
 						<u-input v-model="form.mobile" :placeholder="'Mobile Number'"/>
@@ -24,8 +29,8 @@
 						<u-input v-model="form.areaInfo" :placeholder="'Detail Address'"/>
 					</u-form-item>
 				</u-form>
-		<button @click="submit" class="login-btn"  :class="btncol==1?'on':''" :disabled="btncol==1?false:true">
+		<button @click="submit" class="login-btn on">
-			Continue
+			Confirm
 		</button>
 		</view>
 	</view>
@@ -62,28 +67,29 @@
 										// 可以单个或者同时写两个触发验证方式 
 										trigger: ['blur'],
 									},
+								
 								],
-								code: [
+								mobile: [
 									{
 									    required: true,
 										// min: 5, 
-										message: 'Please enter IFSC Code', 
+										message: 'Please enter mobile number', 
 										trigger: 'blur'
 									}
 								],
-								baName: [
+								zip: [
 									{
 									    required: true,
 										// min: 5, 
-										message: 'Please enter Bank Name', 
+										message: 'Please enter Pincode', 
 										trigger: 'blur'
 									}
 								],
-								accout: [
+								province: [
 									{
 									    required: true,
 										// min: 5, 
-										message: 'Please enter Bank Accout', 
+										message: 'Please enter State', 
 										trigger: 'blur'
 									}
 								],
@@ -102,27 +108,19 @@
 										trigger: 'blur'
 									}
 								],
-								mobile: [
-									{
-										required:true,
-										// min: 5, 
-										message: 'Please enter Mobile Number', 
-										trigger: 'blur'
-									}
-								],
-								email: [
-									{
-										// min: 5, 
-										message: 'Please enter email', 
-										trigger: 'blur'
-									}
-								],
 							}
 			}
 		},
 
-		onLoad() {
+		onLoad(item) {
+			
+		
+	       if(JSON.stringify(item) != "{}"){
+	       		var data=item.card.replace(/""/g,"");
+	       		this.form=JSON.parse(data)	
+	       		}
 				this.form.ticket= uni.getStorageSync('logInfo').data;
+				console.log(this.form.ticket,666666)
 		},
 		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
 			onReady() {
@@ -136,9 +134,52 @@
 				}
 			},
 
-			
 		submit() {
-			
+					this.$refs.uForm.validate(valid => {
+						if (valid) {
+							uni.showLoading({})
+							const post = api.addressSave(this.form)
+									post.then(res => {
+										if(res.errCode=='SUCCESS'){
+										if(this.form.id!=null){
+											uni.showToast({
+												title: 'Successfully',
+												icon: 'success',
+												duration: 2500
+											})
+										}else{
+										uni.showToast({
+											title: 'Successfully',
+											icon: 'success',
+											duration: 2500
+										})	
+										}
+									 setTimeout(()=>{
+										 uni.navigateTo({
+										 	url:'../index'
+										 })
+									 },2000)
+								}else{
+										uni.hideLoading()
+									uni.showToast({
+										title: 'Fail',
+										icon: 'none',
+									duration: 2500,
+									})
+								}
+										})
+										.catch(e => {
+											uni.hideLoading()
+											uni.showToast({
+												title: 'Fail',
+												icon: 'none',
+												duration: 2500
+											})
+										})
+						} else {
+							console.log('验证失败');
+						}
+					});
 				}
 		
 }

pages/menu/address/index.css

@@ -0,0 +1,73 @@
+.record_body{
+	padding: 0 36rpx;
+}
+.flex{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.record_item{
+	min-height: 200rpx;
+	border-bottom: 2rpx solid #F5F7FA;
+	word-break: break-word;
+} 
+.numcon .img1{
+	width: 40rpx;
+	height: 40rpx;
+}
+.num{
+	width: 550rpx;
+	margin-left: 20rpx;
+	text-transform: capitalize;
+}
+.rec{
+	color: #303133;
+	font-size: 32rpx;
+}
+.cpay{
+	color: #909399;
+	font-size: 28rpx;
+}
+.time{
+	width: 48rpx;
+	line-height: 48rpx;
+	text-align: center;
+	border-radius: 50%;
+	background-color: #BFC2CC;
+	color: #fff;
+	font-size: 28rpx;
+}
+
+.select_con{
+	width: 750rpx;
+	height: 446rpx;
+	background-color: #fff;
+	border-radius: 40rpx 40rpx 0 0;
+	position: fixed;
+    bottom: 0;
+	left: 0;
+	z-index: 999;
+    padding-top: 48rpx;
+}
+	.select{
+		text-align: center;
+		color: #303133;
+		font-size: 36rpx;
+	}
+	
+	.ed_con{
+		margin-top: 48rpx;
+		padding: 0 36rpx;
+	}
+	.ed{
+		line-height: 96rpx;
+	}
+	.img{
+		width: 48rpx;
+		height: 48rpx;
+		vertical-align: text-bottom;
+			}
+			.text{
+				font-size: 32rpx;
+				margin-left: 24rpx;
+			}

pages/menu/address/index.vue

@@ -0,0 +1,185 @@
+<template>
+	<view class="">
+		<navigation>
+			 Address
+			<view class="bread" slot="bread">
+				<image src="../../../static/bankCard/[email protected]" mode="aspectFit"
+					@click="goAddAddress()"></image>
+			</view>
+		</navigation>
+
+		<!-- v-for="item,index in record_list" :key="item.id" -->
+		<view class="record_body">
+			<view class="record_item flex" v-for="item,index in record_list" :key="index">
+				<view class="numcon flex">
+					<image src="../../../static/bankCard/dizhi.png" mode="aspectFit" class="img1">
+					</image>
+					<view class="num">
+						<view class="flex">
+						<view class="rec">
+							{{item.name}}
+						</view>
+						<view class="">
+							+{{areacode}} {{item.mobile}}
+						</view>
+						</view>
+						<view class="cpay">
+							{{item.areaInfo}}
+						</view>
+					</view>
+				</view>
+				<view class="time" @click="keepId(item,item.id)">
+					i
+				</view>
+			</view>
+
+			<u-mask :z-index="10" :show="show" @click="show = false"></u-mask>
+			
+			<!-- 涓嬫媺閫夋嫨 -->
+			<view class="select_con" v-show="show">
+                <view class="select">
+                	Select
+                </view>
+				
+				<view class="ed_con" >
+					<view class="ed">
+						<image src="/static/bankCard/[email protected]" mode="aspectFill" class="img"></image>  
+						<text class="text" @click="goAddCard2(card)">Edit</text>
+					</view>
+					<view class="ed">
+						<image src="/static/bankCard/[email protected]" mode="aspectFill" class="img"></image>
+						<text class="text" @click="deleCard()">Delete</text>
+					</view>
+				</view>
+			 </view>
+
+           <u-modal cancel-text="cancel" confirm-color="#954DE3"   confirm-text="confirm" :show-title="false"  :show-cancel-button="true"   v-model="show2" :content="content" @confirm="confirm"></u-modal>
+		</view>
+
+		<tab-bar :selectActive="5"></tab-bar>
+
+	</view>
+
+</template>
+
+<script>
+	import cont from "@/components/navigation/navigation.vue"
+	import Vue from 'vue';
+	import api from '@/utils/api'
+	export default {
+		data() {
+			return {
+				show2: false,
+				content: 'Are you sure to delete',
+				record_list: [],
+				show: false,
+				// 拿银行卡item
+				card:null,
+				cardId:'',
+				areacode: '',
+			}
+		},
+		onLoad() {
+			this.areacode = uni.getStorageSync('siteInfo').areaCode
+this.init();
+
+		},
+		methods: {
+			init(){
+			const post = api.addressList({ 
+						"ticket": uni.getStorageSync('logInfo').data,
+					})
+					post.then(res => {
+					  this.record_list=res.data
+					  for(var i=0;i<res.data.length;i++){
+					  					
+											
+											// #ifdef H5
+										res.data[i].name=res.data[i].name.replaceAll('%20',' ')
+										res.data[i].areaInfo=res.data[i].areaInfo.replaceAll('%20',' ')
+										
+												  // #endif
+												  // #ifdef APP-PLUS
+												res.data[i].name=res.data[i].name.replace(new RegExp('%20',"gm"),' ')
+												res.data[i].areaInfo=res.data[i].areaInfo.replace(new RegExp('%20',"gm"),' ')
+												  // #endif
+					  }
+						})
+						.catch(e => {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 2500
+							})
+						})	
+			},
+			// 拿卡id
+			keepId(i,c){
+				this.show=true;
+				this.card=i;
+				this.cardId=c;
+			},
+			deleCard(){
+				this.show2=true;
+			},
+			confirm(){
+				const post = api.delAddress({
+							"ticket": uni.getStorageSync('logInfo').data,
+							"addressId":this.cardId
+						})
+						uni.showLoading({})
+						post.then(res => {
+						  if(res.errCode=='SUCCESS'){
+							  uni.showToast({
+							  		title: 'Succeeded',
+							  		icon: 'success',
+							  		duration: 2500
+							  	})
+								this.show=false;
+								this.init();
+						  }else{
+							  uni.showToast({
+							  		title: 'Failed',
+							  		icon: 'none',
+							  		duration: 2500
+							  	})
+						  }
+							})
+							.catch(e => {
+								uni.showToast({
+									title: e,
+									icon: 'none',
+									duration: 2500
+								})
+							})
+			},
+			goAddAddress() {
+        uni.navigateTo({
+        	url:'addAddress/index',
+        })
+			},
+			
+			// 给edit专用
+			goAddCard2(i) {
+				var data=JSON.stringify(i)
+			uni.navigateTo({
+				url:'addAddress/index?card='+data,
+			})
+				},
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import './index.css';
+
+	.bread image {
+		width: 28rpx;
+		height: 28rpx;
+		position: absolute;
+		right: 36rpx;
+		top: 60%;
+		transform: translateY(-50%);
+	}
+</style>

pages/menu/aplan/index.css

@@ -3,7 +3,7 @@
 
 .pro-head{
 	padding: 0 68rpx;
-	background-color: #34026BFF;
+	background-color: #34026B;
 	padding-bottom: 36rpx;
 }
 .pro-body-p1{
@@ -32,7 +32,7 @@
    right: 36rpx;
 }
 .ab{
-	color: #FFFFFFFF;
+	color: #FFFFFF;
 	font-size: 28rpx;
 	text-align: center;
 	margin-top: 36rpx;
@@ -64,20 +64,20 @@
 	line-height: 72rpx;
 	text-align: center;
 	border-radius: 16rpx;
-	border: 2rpx #954DE3FF solid;
+	border: 2rpx #954DE3 solid;
 	color: #fff;
 	margin-top: 24rpx;
 	font-size: 28rpx;
 }
 .mon_btn:hover{
-	background-color: #954DE3FF;
+	background-color: #954DE3;
 }
 .ap_body{
 	padding: 0 36rpx;
 }
 .fde{
 	padding: 24rpx 0;
-	color: #909399FF;
+	color: #909399;
 	font-size: 32rpx;
 }
 .record_item{
@@ -102,11 +102,11 @@
 
 }
 .time_mon{
-	color: #00B977FF;
+	color: #00B977;
 	font-size: 32rpx;
 }
 .mon2{
-	color: #909399FF;
+	color: #909399;
 	font-size: 28rpx;
 }
 .content{

pages/menu/bankCard/addBankCard/index.css

@@ -25,7 +25,7 @@
 	width: 500rpx;
 	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 172rpx;
@@ -36,7 +36,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -58,11 +58,11 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 	margin-left: 20rpx;
 }
 .rePass{
-	color: #606266FF;
+	color: #606266;
 	font-size: 28rpx;
 	float: right;
 }

pages/menu/bankCard/addBankCard/index.vue

@@ -1,8 +1,11 @@
 <template>
 	<view class="">
-		<navigation>
+		<navigation v-if="form.id==null">
 			Add Bank Card
 		</navigation>
+		<navigation v-if="form.id!=null">
+			Modify Bank Card
+		</navigation>
 		<view class="login-body">
 			<u-form :model="form" ref="uForm" :rules="rules">
 				<u-form-item prop="acctName">
@@ -15,7 +18,7 @@
 					<u-input v-model="form.bankName" :placeholder="'Bank Name'" />
 				</u-form-item>
 				<u-form-item prop="acctId">
-						<u-input v-model="form.acctId" :placeholder="'Bank Accout'"/>
+					<u-input v-model="form.acctId" :placeholder="'Bank Account'" />
 				</u-form-item>
 				<u-form-item prop="certId">
 					<u-input v-model="form.certId" :placeholder="'State/Territory'" />
@@ -24,14 +27,16 @@
 					<u-input v-model="form.city" :placeholder="'City'" />
 				</u-form-item>
 				<u-form-item prop="mobile">
+					+{{areaCode}}
 					<u-input v-model="form.mobile" :placeholder="'Mobile Number'" />
 				</u-form-item>
 				<u-form-item prop="email">
 					<u-input v-model="form.email" :placeholder="'Email'" />
 				</u-form-item>
 			</u-form>
-		<button @click="submit" class="login-btn"  :class="btncol==1?'on':''" :disabled="btncol==1?false:true">
+			<!-- :class="btncol==1?'on':''" :disabled="btncol==1?false:true" -->
-			Continue
+			<button @click="submit" class="login-btn on">
+				Confirm
 			</button>
 		</view>
 	</view>
@@ -48,87 +53,115 @@
 			return {
 				// 判断按钮是否选中
 				btncol: 0,
-				
+				areaCode: '',
+				// 判断跳转到提现
+				wit:'',
 				form: {
+					id: null,
 					acctName: '',
 					bankCode: '',
-								baName:'',
 					acctId: '',
-								state:'',
 					city: '',
 					mobile: '',
 					email: '',
 					ticket: '',
 				},
 				rules: {
-								name: [
+					acctName: [{
-									{ 
 							required: true,
 							message: 'Please enter your name',
 							// 可以单个或者同时写两个触发验证方式 
-										trigger: ['blur'],
+							trigger: ['change', 'blur'],
 						},
+
 					],
-								code: [
+					bankCode: [{
-									{
 						required: true,
 						// min: 5, 
 						message: 'Please enter IFSC Code',
 						trigger: 'blur'
-									}
+					}],
-								],
+					bankName: [{
-								baName: [
-									{
 						required: true,
 						// min: 5, 
 						message: 'Please enter Bank Name',
 						trigger: 'blur'
-									}
+					}],
-								],
+					acctId: [{
-								accout: [
-									{
 							required: true,
 							// min: 5, 
-										message: 'Please enter Bank Accout', 
+							message: 'Please enter Bank Account',
 							trigger: 'blur'
-									}
+						},
+						// {
+						// 			min: 12,
+						// 			max: 12,
+						// 			message: 'Please enter twelve digits',
+						// 			trigger: ['change','blur'],
+						// 		},
 					],
-								state: [
+					certId: [{
-									{
 						required: true,
 						// min: 5, 
 						message: 'Please enter State/Territory',
 						trigger: 'blur'
-									}
+					}],
-								],
+					city: [{
-								city: [
+						required: true,
-									{
 						// min: 5, 
 						message: 'Please enter city',
 						trigger: 'blur'
-									}
+					}],
-								],
+					mobile: [{
-								mobile: [
-									{
 							required: true,
 							// min: 5, 
 							message: 'Please enter Mobile Number',
 							trigger: 'blur'
-									}
+						},
+						// {
+						// 			min: 9,
+						// 			max: 9,
+						// 			message: 'Please enter nine digits',
+						// 			trigger: ['change','blur'],
+						// 		},
+
 					],
-								email: [
+					email: [{
-									{
+							required: true,
 							// min: 5, 
 							message: 'Please enter email',
 							trigger: 'blur'
+						},
+						{
+							// 自定义验证函数，见上说明
+							validator: (rule, value, callback) => {
+								// 上面有说，返回true表示校验通过，返回false表示不通过
+								// this.$u.test.mobile()就是返回true或者false的
+								return this.$u.test.email(value);
+							},
+							message: 'Mailbox format error',
+							// 触发器可以同时用blur和change
+							trigger: ['change', 'blur'],
 						}
 					],
 				}
 			}
 		},
 
-		onLoad() {
+		onLoad(item) {
+			this.areaCode = uni.getStorageSync('siteInfo').areaCode
+			this.form.ticket = uni.getStorageSync('logInfo').data;
+			if (JSON.stringify(item) != '{}') {	
+				if(item.wid=='widthdrawl'){
+					this.wit=item.wid;
+				}else{	
+					var data = item.card.replace(/""/g, "");
+					this.form = JSON.parse(data)
 					this.form.ticket = uni.getStorageSync('logInfo').data;
+					
+				}
+			
+			}
 		},
 		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
 		onReady() {
@@ -146,20 +179,52 @@
 			submit() {
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-								const post = api.bankcardList(this.form)
+						uni.showLoading({})
+						const post = api.bindBank(this.form)
 						post.then(res => {
-										  console.log(res,333333)
+								if (res.errCode == 'SUCCESS') {
+									if (this.form.id != null) {
 										uni.showToast({
-										  	title: 'Added successfully',
+											title: 'Successfully',
 											icon: 'success',
 											duration: 2500
 										})
+									} else {
+										uni.showToast({
+											title: 'Successfully',
+											icon: 'success',
+											duration: 2500
+										})
+									}
+									if(this.wit=='widthdrawl'){
+										setTimeout(() => {
+											uni.navigateTo({
+												url: '../../withdrawl/index'
+											})
+										}, 2000)
+									}else{
+										setTimeout(() => {
+											uni.navigateTo({
+												url: '../index'
+											})
+										}, 2000)
+									}
+								
+								} else {
+									uni.hideLoading()
+									uni.showToast({
+										title: 'Fail',
+										icon: 'none',
+										duration: 2500,
+									})
+								}
 							})
 							.catch(e => {				
+								uni.hideLoading()
 							uni.showToast({
-													title: e,
+								title: 'Fail',
 								icon: 'none',
-													duration: 2500
+								duration: 2500,
 							})
 							})
 					} else {
@@ -171,9 +236,6 @@
 		}
 
 	}
-
-		
-	
 </script>
 
 <style>

pages/menu/bankCard/index.vue

@@ -23,7 +23,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="time" @click="show=true">
+				<view class="time" @click="keepId(item,item.id)">
 					i
 				</view>
 			</view>
@@ -39,19 +39,20 @@
 				<view class="ed_con" >
 					<view class="ed">
 						<image src="/static/bankCard/[email protected]" mode="aspectFill" class="img"></image>  
-						<text class="text">Edit</text>
+						<text class="text" @click="goAddCard2(card)">Edit</text>
 					</view>
 					<view class="ed">
 						<image src="/static/bankCard/[email protected]" mode="aspectFill" class="img"></image>
-						<text class="text">Delete</text>
+						<text class="text" @click="deleCard()">Delete</text>
 					</view>
 				</view>
 			 </view>
 
+           <u-modal cancel-text="cancel" confirm-color="#954DE3"   confirm-text="confirm" :show-title="false"  :show-cancel-button="true"   v-model="show2" :content="content" @confirm="confirm"></u-modal>
 		</view>
 
 
-
+		<tab-bar :selectActive="5"></tab-bar>
 	</view>
 
 </template>
@@ -63,15 +64,38 @@
 	export default {
 		data() {
 			return {
+				show2: false,
+				content: 'Are you sure to delete',
 				record_list: [],
-				show: true
+				show: false,
+				// ÄÃÒøÐп¨item
+				card:null,
+				cardId:'',
 			}
 		},
 		onLoad() {
+this.init();
+
+		},
+		methods: {
+			init(){
 			const post = api.bankcardList({
 						"ticket": uni.getStorageSync('logInfo').data,
 					})
 					post.then(res => {
+					   for(var i=0;i<res.data.length;i++){
+					// #ifdef H5
+					res.data[i].acctId=res.data[i].acctId.replaceAll('%20',' ')
+					res.data[i].acctName=res.data[i].acctName.replaceAll('%20',' ')
+						  // #endif
+						  // #ifdef APP-PLUS  
+						  res.data[i].acctId=res.data[i].acctId.replace(new RegExp('%20',"gm"),' ')
+					     
+					      res.data[i].bankName=res.data[i].acctName.replace(new RegExp('%20',"gm"),' ')
+						  // #endif
+												 
+					   }
+	
 					  this.record_list=res.data
 						})
 						.catch(e => {
@@ -81,15 +105,64 @@
 								duration: 2500
 							})
 						})	
+			},
+			// Äÿ¨id
+			keepId(i,c){
+				this.show=true;
+				this.card=i;
+				this.cardId=c;
 				
 			},
-		methods: {
+			deleCard(){
+				this.show2=true;
+			},
+			confirm(){
+				const post = api.delBankCard({
+							"ticket": uni.getStorageSync('logInfo').data,
+							"cardId":this.cardId
+						})
+						uni.showLoading({})
+						post.then(res => {
+						  if(res.errCode=='SUCCESS'){
+							  uni.showToast({
+							  		title: 'Succeeded',
+							  		icon: 'success',
+							  		duration: 2500
+							  	})
+								this.show=false;
+								this.init();
+						  }else{
+							  uni.showToast({
+							  		title: 'Failed',
+							  		icon: 'none',
+							  		duration: 2500
+							  	})
+						  }
+							})
+							.catch(e => {
+								uni.showToast({
+									title: e,
+									icon: 'none',
+									duration: 2500
+								})
+							})
+			},
 			goAddCard() {
         uni.navigateTo({
         	url:'addBankCard/index',
         })
 			},
 			
+			// ¸øeditרÓÃ
+			goAddCard2(i) {
+				console.log(i,22222)
+				var data=JSON.stringify(i)
+				console.log(data,22222)
+			uni.navigateTo({
+				url:'addBankCard/index?card='+data,
+			})
+				},
+			
 		}
 	}
 </script>
@@ -102,7 +175,7 @@
 		height: 28rpx;
 		position: absolute;
 		right: 36rpx;
-		top: 50%;
+		top: 60%;
 		transform: translateY(-50%);
 	}
 </style>

pages/menu/color/index.css

@@ -15,12 +15,12 @@
 	}
 	.p2{
 		font-size: 28rpx;
-		color: #303133FF;
+		color: #303133;
 		margin-left: 20rpx;
 	}
 	.p1{
 		font-size: 28rpx;
-		color: #606266FF;
+		color: #606266;
 	}
 	.colseKefu{
 		position: absolute;
@@ -38,7 +38,7 @@
 	.title{
 			text-transform: capitalize;
 			font-size: 28rpx;
-			color: #954DE3FF;
+			color: #954DE3;
 			text-align: center;
 		}
 .title p{
@@ -80,7 +80,7 @@
 			transform: translateX(-50%);
 			width: 100%;
 			height: 2rpx;
-			background-color: #EDEFF2FF;
+			background-color: #EDEFF2;
 		}
 	.my-cont{
 		width: 180rpx;
@@ -373,14 +373,14 @@ margin-bottom: 16rpx;
 		.xiazhu .title{
 			font-size: 36rpx;
 			text-align: center;
-			color: #303133FF;
+			color: #303133;
 			text-transform: capitalize;
 		}
 				.contract{
 					margin-top: 80rpx;
 				}
 		.xname{
-			color: #606266FF;
+			color: #606266;
 			font-size: 28rpx;
 		}
 		.contract .numcon{
@@ -388,19 +388,20 @@ margin-bottom: 16rpx;
 		}
 		.contract .numcon .num{
 			padding: 16rpx 24rpx;
-			border: 2rpx solid #EDEFF2FF;
+			border: 2rpx solid #EDEFF2;
-			color: #303133FF;
+			color: #303133;
 			font-size: 28rpx;
 			text-align: center;
+			color: #303133;
 		}
 		.active{
-			border-color: #954DE3FF !important;
+			border-color: #954DE3 !important;
 		}
 		.bujin,.TotalMoney,.agree,.btn_con{
 			margin-top: 60rpx;
 		}
 		.agree{
-			color: #606266FF;
+			color: #606266;
 			font-size: 28rpx;
 		   text-transform: capitalize;
 		   display: flex;
@@ -412,7 +413,7 @@ margin-bottom: 16rpx;
 			margin-right: 10rpx;
 		}
 			.agree .s2{
-				color: #954DE3FF;
+				color: #954DE3;
 			}
 			.agree .s1{
 				margin-right:10rpx ;
@@ -420,9 +421,9 @@ margin-bottom: 16rpx;
 			.btn_con .btn{
 				line-height: 108rpx;
 				text-align: center;
-				color: #303133FF;
+				color: #303133;
 				font-size: 32rpx;
-				background-color: #F5F7FAFF;
+				background-color: #F5F7FA;
 				text-transform: capitalize;
 			}
 			.btn_con .btn1{
@@ -430,8 +431,8 @@ margin-bottom: 16rpx;
 			}
 			.btn_con .btn2{
 				width: 510rpx;
-				background-color: #954DE3FF;
+				background-color: #954DE3;
-				opacity: .5;
+				opacity: 1;
 				color: #fff;
 			}
 			
@@ -508,7 +509,7 @@ margin-bottom: 16rpx;
 			}
 			
 			.gaactive{
-				color: #954DE3FF !important;
+				color: #954DE3 !important;
 			}
 			.gaactive::before{
 					width: 80rpx;
@@ -520,9 +521,12 @@ margin-bottom: 16rpx;
 			}
 			.ico{
 				width: 210rpx;
-				height: 80rpx;
+				line-height: 80rpx;
-				border: 2rpx solid #EDEFF2;
+				text-align: center;
-				border-radius: 16rpx;
+				border-radius: 8rpx;
+				color: #fff;
+				box-shadow: 0 10rpx 10rpx  #C1C1C1;
+				font-size: 32rpx;
 				position: relative;
 			}
 			.ico image{
@@ -662,14 +666,21 @@ margin-bottom: 16rpx;
 			}
 			
 			.gaactive{
-				color: #954DE3FF !important;
+				color: #954DE3 !important;
 			}
 			.gaactive::before{
 					width: 80rpx;
 			}
 			
-			
+			.greenbg{
-			
+				background-color: #4CAF50;
+			}
+			.purple{
+				background-color:#9C27B0;
+			}
+			.redbg{
+				background-color: #F44336;
+			}
 			
 			
 			
@@ -715,13 +726,7 @@ margin-bottom: 16rpx;
 			.icon-con{
 				justify-content: space-between;
 			}
-			.ico{
+	
-				width: 210rpx;
-				height: 80rpx;
-				border: 2rpx solid #EDEFF2;
-				border-radius: 16rpx;
-				position: relative;
-			}
 			.ico image{
 				width: 40rpx;
 				height: 40rpx;
@@ -842,12 +847,84 @@ margin-bottom: 16rpx;
 				text-align: center;
 			}
 			.ok{
-				color: #954DE3FF;
+				color: #954DE3;
 				line-height: 108rpx;
-				border-top: 2rpx solid #F7F9FCFF;
+				border-top: 2rpx solid #F7F9FC;
 				font-size: 32rpx;
 			}
 	.color_icon{
 		width: 36rpx;
 		height: 36rpx;
 	}
+	.logout-div-bg {
+		width: 100%;
+		height: 100%;
+		background: #000000;
+		opacity: 0.4;
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		z-index: 1999;
+	}
+	.task-div {
+		height: 772rpx;
+		width: 600rpx;
+		opacity: 1;
+		border-radius: 24rpx;
+		z-index: 999999;
+		position: fixed;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		margin: auto;
+	}
+	.upgrade-bg {
+		width: 600rpx;
+		height: 500rpx;
+		z-index: 1998;
+	}
+	
+	.upgrade-div {
+		width: 600rpx;
+		height: 720rpx;
+		background: #FFFFFF;
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx;
+		border-radius: 24rpx;
+	}
+	
+	.upgrade-desc {
+		width: 504rpx;
+		height: 176rpx;
+		font-size: 28rpx;
+		font-family: SF Pro;
+		font-weight: 400;
+		color: #303133;
+		opacity: 1;
+		position: absolute;
+		bottom: 168rpx;
+		left: 50rpx;
+	}
+	.task-div .task-start {
+		width: 500rpx;
+		height: 88rpx;
+		background: linear-gradient(360deg, #084EBD 0%, #1E7BE7 100%);
+		opacity: 1;
+		border-radius: 12rpx;
+		position: absolute;
+		bottom: 50rpx;
+		left: 50rpx;
+		line-height: 88rpx;
+		text-align: center;
+		display: block;
+		font-size: 28rpx;
+		font-family: SF Pro;
+		font-weight: 400;
+		color: #FFFFFF;
+		opacity: 1;
+	}
+	.gray{
+		background-color: #E0E0E0 !important;
+	}

pages/menu/color/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<navigation :showBack="showBack">color</navigation>
+		<navigation :showBack="showBack">{{siteName}}</navigation>
 		<swit :switNum="1" />
 		<balance @send="getSonValue" :currencySymbol="currencySymbol" :currentBalance="currentBalance">
 			<view class="rules-btn" slot="rules" @click="goRule()">rules</view>
@@ -8,7 +8,7 @@
 		<view class="bg_white">
 			<view class="gNum flex">
 				<view class="ga" v-for="(item,index) in colorList" :key="item.id" :class="index==ganum?'gaactive':''"
-					@click="gaClick(index,item.name)">
+					@click="gaClick(index,item.name,item),myLottertRecord()">
 					{{item.name}}
 				</view>
 			</view>
@@ -30,15 +30,15 @@
 							{{nextBttingValue.period}}
 						</view>
 						<view class="count">
-							<u-count-down :timestamp="nextBttingValue.remain" :show-days="false" :show-hours="false"
+							<u-count-down :timestamp="nextBttingValue.remain" :show-days="false" :show-hours="false">
-								></u-count-down>
+							</u-count-down>
 						</view>
 					</view>
 				</view>
 				<view v-show="canBuy">
 					<view class="flex icon-con">
-						<view class="ico" @click="xiazhu(item.color)" v-for="item,index in gameColor" :key="item.id">
+						<view class="ico" @click="xiazhu(item.color)" v-for="item,index in gameColor" :key="item.id" :class="{'greenbg': item.id === 1, 'purple': item.id === 2, redbg: item.id === 3}">
-							<image :src="'../../../static/color/ico_apple_'+item.color+'@3x.png'" mode=""></image>
+							{{item.color2}}
 						</view>
 					</view>
 					<view class="multiple">
@@ -58,8 +58,9 @@
 				</view>
 				<view class="canBuy" v-show="!canBuy">
 					<view class="flex icon-con">
-						<view class="ico" v-for="item,index in gameColor" :key="item.id">
+						<view class="ico gray" v-for="item,index in gameColor" :key="item.id">
-							<image :src="'../../../static/color/ash_'+item.color+'@3x.png'" mode=""></image>
+							<!-- <image :src="'../../../static/color/ash_'+item.color+'@3x.png'" mode=""></image> -->
+						  {{item.color2}}
 						</view>
 					</view>
 					<view class="multiple">
@@ -103,7 +104,8 @@
 					{{item.text}}
 				</view>
 			</view>
-			<gamecont v-if="gameNavNum==0" :gameRecordCont="gameRecordCont" :missingFrequency="missingFrequency"></gamecont>
+			<gamecont v-if="gameNavNum==0" :gameRecordCont="gameRecordCont" :missingFrequency="missingFrequency">
+			</gamecont>
 			<gamecont2 :gameRecordCont="gameRecordCont" v-if="gameNavNum==1"></gamecont2>
 			<gamecont3 :myGameRecord="myGameRecord" v-if="gameNavNum==2"></gamecont3>
 		</view>
@@ -278,8 +280,8 @@
 				<view class="btn1 btn" @click="xiazhuCode=false">
 					cancel
 				</view>
-				<view class="btn2 btn" @click="toLotter" :class="bettingNumber!=0?'on':''">
+				<view class="btn2 btn" @click="toLotter">
-					comfierm
+					Confirm
 				</view>
 			</view>
 		</view>
@@ -316,10 +318,12 @@
 					</view>
 
 
-					<scroll-view class="item" style="height:380rpx" scroll-y="true" show-scrollbar="true" scroll-with-animation="true" scroll-top="0" >
+					<scroll-view class="item" style="height:380rpx" scroll-y="true" show-scrollbar="true"
+						scroll-with-animation="true" scroll-top="0">
 						<view class="body_item" @click="gotoWeb(getLink(item))" v-for="(item,index) in whatAppList"
 							:key="item">
-							<image src="../../../static/color/[email protected]" mode="aspectFit" class="img2"></image>
+							<image src="../../../static/color/[email protected]" mode="aspectFit" class="img2">
+							</image>
 							<view class="p2">
 								{{getName(item)}}
 							</view>
@@ -335,12 +339,21 @@
 
 				</view>
 
-		<image src="../../../static/color/pop_icon_close.png" mode="aspectFit" class="colseKefu" @click="keCode=0"></image>
+				<image src="../../../static/color/pop_icon_close.png" mode="aspectFit" class="colseKefu"
+					@click="keCode=0"></image>
 			</view>
 		</view>
 
 
-		
+		<view v-if="upgrade" class="logout-div-bg">
+		</view>
+		<view class="task-div" v-if="upgrade">
+			<image class="upgrade-bg" src="../../../static/bankCard/upgrade.png"></image>
+			<view class="upgrade-div">
+				<textarea class="upgrade-desc" disable v-html="upgradeInfo.info" />
+				<span class="task-start" @click="toUpgrade()">Upgrade</span>
+			</view>
+		</view>
 
 
 	</view>
@@ -363,6 +376,11 @@
 		},
 		data() {
 			return {
+				siteName: '',
+				// 传过去rules的值
+				ruleDescription: '',
+
+
 				// 显示back或不显示
 				showBack: false,
 
@@ -371,7 +389,6 @@
 				teList: [],
 				whatAppList: [],
 				serviceTime: '',
-				
 				touzhuMoney: 0,
 				currencySymbol: '',
 				currentBalance: '',
@@ -381,7 +398,7 @@
 				xia_body: [1, 2, 3],
 				follow_xiazhu_conOn: 0,
 				bettingPrice: '',
-				bettingNumber: 0,
+				bettingNumber: 1,
 				show: false,
 				showWhite: true,
 				myName: '',
@@ -410,22 +427,27 @@
 				totalPage: 1,
 				gameNav: [],
 				gNum: 'G2',
+				
 				gameColor: [{
 						id: 1,
-						color: 'GREEN'
+						color: 'GREEN',
+						color2: 'Join Green'
 					},
 					{
 						id: 2,
-						color: 'VIOLET'
+						color: 'VIOLET',
+						color2: 'Join Violet'
 					},
 					{
 						id: 3,
-						color: 'RED'
+						color: 'RED',
+						color2: 'Join Red'
 					},
 				],
+	
 				gameColorNumber1: [{
 						num: 0,
-						cla: 'bg_jb2'
+						cla: 'bg_jb1'
 					},
 					{
 						num: 1,
@@ -446,7 +468,7 @@
 				],
 				gameColorNumber2: [{
 						num: 5,
-						cla: 'bg_jb1'
+						cla: 'bg_jb2'
 					},
 					{
 						num: 6,
@@ -462,12 +484,12 @@
 					},
 					{
 						num: 9,
-						cla: 'bg_red'
+						cla: 'bg_green'
 					},
 				],
 				bettingValue: '',
 				nextBttingValue: [],
-				numindex: -1,
+				numindex: 0,
 				ganumArr: [],
 				gg: 3,
 				lotteryData: {},
@@ -487,13 +509,82 @@
 				totalPage2: '',
 				lotteryNum: [],
 
-				missingFrequency:{}
+				missingFrequency: {},
-				
+				upgrade: false,
+				close_mask: true,
+				upgradeInfo: {},
+				logoUrl: '',
 			}
 		},
 
 		onLoad() {
 			
+			const siteInfo = api.siteInfo()
+			siteInfo.then(d => {
+				this.logoUrl = d.data.siteDomain + d.data.siteLogo
+			})
+	
+
+			this.siteName = uni.getStorageSync('siteInfo').siteName;
+
+			this.currencySymbol = uni.getStorageSync('siteInfo').currencySymbol;
+			const post = api.withdrawConfig({
+				"ticket": uni.getStorageSync('logInfo').data,
+			})
+			post.then(res => {
+					if (res.data != undefined) {
+						this.currentBalance = res.data.currentBalance;
+						this.currentBalance = parseFloat(this.currentBalance).toFixed(2)
+						uni.setStorage({
+							key: 'currentBalance',
+							data: this.currentBalance,
+							success: function() {
+								console.log('success')
+							}
+						});
+					}
+
+				})
+				.catch(e => {
+					console.log(e)
+				})
+
+
+
+			const post2 = api.userInfo({
+				"ticket": uni.getStorageSync('logInfo').data,
+			})
+			post2.then(res => {
+					uni.setStorage({
+						key: 'MyInfo',
+						data: res.data,
+						success: function() {
+							console.log('success')
+						}
+					});
+					console.log(res.data)
+				})
+				.catch(e => {
+					uni.showToast({
+						title: e,
+						icon: 'none',
+						duration: 2500
+					})
+				})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 			this.initializationMissingFrequency();
 			// 客服
 			this.serviceTime = uni.getStorageSync('siteInfo').serviceTime;
@@ -530,6 +621,10 @@
 
 		},
 		methods: {
+			toUpgrade() {
+				plus.runtime.openURL(this.upgradeInfo.appUrl)
+			},
+		
 			initializationMissingFrequency() {
 				for (var i = 0; i < 10; i++) {
 					this.missingFrequency[i.toString()] = {
@@ -586,9 +681,10 @@
 					"ticket": uni.getStorageSync('logInfo').data,
 				})
 				post.then(res => {
-						
 						this.betting_amount = res.data.betting_amount.split(',');
+						this.bettingPrice = this.betting_amount[0];
 						this.betting_rule = res.data.tips;
+						this.tmoney();
 					})
 					.catch(e => {
 						console.log(e)
@@ -603,6 +699,7 @@
 						this.colorData = this.colorList[0];
 						this.gameNav2[1].text = this.colorData.name + " record"
 						this.gameNav2[2].text = 'My ' + this.colorData.name + " record"
+						this.ruleDescription = this.colorList[0].description;
 						this.gNum = this.colorList[0].name
 						this.setlotteryData();
 						this.gg = this.colorData.id
@@ -646,8 +743,7 @@
 
 				}
 				this.timeChange(this.lotteryData[this.gNum].remain);
-			}
+			},
-			,
 			setlotteryData() {
 				for (let i = 0; i < this.colorList.length; i++) {
 					this.nextBtting(this.colorList[i].name)
@@ -660,13 +756,14 @@
 			xiazhu(val) {
 				this.xiazhuCode = true;
 				this.bettingValue = val;
-				this.numindex = -1;
+				this.numindex = 0;
-				this.list[0].checked = false;
+				this.list[0].checked = true;
 			},
 			folLisNumFn(i) {
 				this.folLisNum = i;
 			},
 			numColor(i, j) {
+				console.log(i, j, 5555555)
 				this.numindex = i;
 				this.bettingPrice = j;
 				this.touzhuMoney = j;
@@ -690,6 +787,9 @@
 			},
 
 			toLotter() {
+				uni.showLoading({
+					title: 'loading'
+				})
 				if (this.bettingPrice == 0) {
 					uni.showToast({
 						title: 'Please select bet amount',
@@ -724,9 +824,6 @@
 					"bettingNumber": this.bettingNumber,
 				})
 				post.then(res => {
-					uni.showLoading({
-						title:'loading'
-					})
 						if (res.success == true) {
 							// this.xiaSul = 1;
 							uni.showToast({
@@ -734,12 +831,14 @@
 								icon: 'success',
 								duration: 1500
 							})
+							this.xiazhuCode = false
 							//更新余额
 							const post = api.withdrawConfig({
 								"ticket": uni.getStorageSync('logInfo').data,
 							})
 							post.then(res => {
 								if (res.data) {
+									res.data.currentBalance = parseFloat(res.data.currentBalance).toFixed(2)
 									this.currentBalance = res.data.currentBalance;
 									uni.setStorage({
 										key: 'currentBalance',
@@ -749,7 +848,7 @@
 										}
 									});
 								}
-							
+								uni.hideLoading()
 							})
 
 						} else {
@@ -779,13 +878,28 @@
 						if (res.data == '' || res.data.content == null) {
 							return
 						}
+						// console.log(res.data.content,5555555555888)
+						if (res.data.content != '' || res.data.content != undefined) {
 							this.myGameRecord = res.data.content;
-						this.totalPage = res.data.totalElements;
 							for (var i = 0; i < this.myGameRecord.length; i++) {
 								// this.myGameRecord[i].period = this.myGameRecord[i].period.substring(2, 13);
 								this.myGameRecord[i].addTime = index.formatyymmddhhmmss(this.myGameRecord[i]
 									.addTime);
+
+								this.myGameRecord[i].bettingFee = parseFloat(this.myGameRecord[i].bettingFee).toFixed(
+									2)
+								this.myGameRecord[i].bettingPrice = parseFloat(this.myGameRecord[i].bettingPrice)
+									.toFixed(2)
+								this.myGameRecord[i].bettingAmount = parseFloat(this.myGameRecord[i].bettingAmount)
+									.toFixed(2)
+								this.myGameRecord[i].realAmount = parseFloat(this.myGameRecord[i].realAmount).toFixed(
+									2)
 							}
+						} else {
+							this.myGameRecord = '';
+						}
+
+
 
 					})
 					.catch(e => {
@@ -808,9 +922,12 @@
 						this.totalPage = res.data.totalElements;
 						this.totalPage2 = res.data.totalPages;
 						for (var i = 0; i < this.gameRecordCont.length; i++) {
-							// this.gameRecordCont[i].period = this.gameRecordCont[i].period.substring(2, 13);
+							// this.gameRecordCont[i].period = this.gameRecordCont[i].period.substring(0, 2)+'...'+this.gameRecordCont[i].period.substring(10, 17);
+
 							this.gameRecordCont[i].lotteryColor = this.gameRecordCont[i].lotteryColor.split(',');
-								if(!this.gameRecordCont[i].lotteryResult){
+
+							if (!this.gameRecordCont[i].lotteryResult && this.gameRecordCont[i].lotteryColor !=
+								undefined) {
 								this.gameRecordCont[i].lotteryResult = 0
 							}
 
@@ -822,7 +939,8 @@
 								break;
 							}
 
-							this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency=this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency+1;
+							this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency = this
+								.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency + 1;
 							if (!this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].isOpen) {
 								this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].missing = i
 								this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].isOpen = true
@@ -839,7 +957,7 @@
 
 
 
-			gaClick(i, j) {
+			gaClick(i, j, item) {
 				this.ganum = i
 				this.gNum = j;
 				this.colorData = this.colorList[i];
@@ -850,11 +968,12 @@
 				this.gg = this.colorList[i].id
 				this.getLottertRecord();
 				this.timeChange(this.lotteryData[j].remain)
+				this.ruleDescription = item.description;
 
 			},
 			goRule() {
 				uni.navigateTo({
-					url: '../rule/index'
+					url: '../rule/index?des=' + this.ruleDescription
 				})
 			},
 			showMas() {

pages/menu/colorMoni/index.css

@@ -15,12 +15,12 @@
 	}
 	.p2{
 		font-size: 28rpx;
-		color: #303133FF;
+		color: #303133;
 		margin-left: 20rpx;
 	}
 	.p1{
 		font-size: 28rpx;
-		color: #606266FF;
+		color: #606266;
 	}
 	.colseKefu{
 		position: absolute;
@@ -38,7 +38,7 @@
 	.title{
 			text-transform: capitalize;
 			font-size: 28rpx;
-			color: #954DE3FF;
+			color: #954DE3;
 			text-align: center;
 		}
 .title p{
@@ -80,7 +80,7 @@
 			transform: translateX(-50%);
 			width: 100%;
 			height: 2rpx;
-			background-color: #EDEFF2FF;
+			background-color: #EDEFF2;
 		}
 	.my-cont{
 		width: 180rpx;
@@ -373,14 +373,14 @@ margin-bottom: 16rpx;
 		.xiazhu .title{
 			font-size: 36rpx;
 			text-align: center;
-			color: #303133FF;
+			color: #303133;
 			text-transform: capitalize;
 		}
 				.contract{
 					margin-top: 80rpx;
 				}
 		.xname{
-			color: #606266FF;
+			color: #606266;
 			font-size: 28rpx;
 		}
 		.contract .numcon{
@@ -388,19 +388,19 @@ margin-bottom: 16rpx;
 		}
 		.contract .numcon .num{
 			padding: 16rpx 24rpx;
-			border: 2rpx solid #EDEFF2FF;
+			border: 2rpx solid #EDEFF2;
-			color: #303133FF;
+			color: #303133;
 			font-size: 28rpx;
 			text-align: center;
 		}
 		.active{
-			border-color: #954DE3FF !important;
+			border-color: #954DE3 !important;
 		}
 		.bujin,.TotalMoney,.agree,.btn_con{
 			margin-top: 60rpx;
 		}
 		.agree{
-			color: #606266FF;
+			color: #606266;
 			font-size: 28rpx;
 		   text-transform: capitalize;
 		   display: flex;
@@ -412,7 +412,7 @@ margin-bottom: 16rpx;
 			margin-right: 10rpx;
 		}
 			.agree .s2{
-				color: #954DE3FF;
+				color: #954DE3;
 			}
 			.agree .s1{
 				margin-right:10rpx ;
@@ -420,9 +420,9 @@ margin-bottom: 16rpx;
 			.btn_con .btn{
 				line-height: 108rpx;
 				text-align: center;
-				color: #303133FF;
+				color: #303133;
 				font-size: 32rpx;
-				background-color: #F5F7FAFF;
+				background-color: #F5F7FA;
 				text-transform: capitalize;
 			}
 			.btn_con .btn1{
@@ -430,7 +430,7 @@ margin-bottom: 16rpx;
 			}
 			.btn_con .btn2{
 				width: 510rpx;
-				background-color: #954DE3FF;
+				background-color: #954DE3;
 				opacity: .5;
 				color: #fff;
 			}
@@ -508,7 +508,7 @@ margin-bottom: 16rpx;
 			}
 			
 			.gaactive{
-				color: #954DE3FF !important;
+				color: #954DE3 !important;
 			}
 			.gaactive::before{
 					width: 80rpx;
@@ -518,13 +518,7 @@ margin-bottom: 16rpx;
 			.icon-con{
 				justify-content: space-between;
 			}
-			.ico{
+	
-				width: 210rpx;
-				height: 80rpx;
-				border: 2rpx solid #EDEFF2;
-				border-radius: 16rpx;
-				position: relative;
-			}
 			.ico image{
 				width: 40rpx;
 				height: 40rpx;
@@ -558,7 +552,15 @@ margin-bottom: 16rpx;
 			.bg_jb2{
 			 background-image: linear-gradient(-30deg,#954DE3  50% , #00B977 50% );
 			}
-			
+			.greenbg{
+				background-color: #4CAF50;
+			}
+			.purple{
+				background-color:#9C27B0;
+			}
+			.redbg{
+				background-color: #F44336;
+			}
 			.donna{
 				background-color: #34026B;
 				border-radius: 16rpx;
@@ -662,7 +664,7 @@ margin-bottom: 16rpx;
 			}
 			
 			.gaactive{
-				color: #954DE3FF !important;
+				color: #954DE3 !important;
 			}
 			.gaactive::before{
 					width: 80rpx;
@@ -717,9 +719,12 @@ margin-bottom: 16rpx;
 			}
 		.ico{
 				width: 210rpx;
-				height: 80rpx;
+				line-height: 80rpx;
-				border: 2rpx solid #EDEFF2;
+				text-align: center;
-				border-radius: 16rpx;
+				border-radius: 8rpx;
+				color: #fff;
+				box-shadow: 0 10rpx 10rpx  #C1C1C1;
+				font-size: 32rpx;
 				position: relative;
 			}
 			.ico image{
@@ -842,12 +847,15 @@ margin-bottom: 16rpx;
 				text-align: center;
 			}
 			.ok{
-				color: #954DE3FF;
+				color: #954DE3;
 				line-height: 108rpx;
-				border-top: 2rpx solid #F7F9FCFF;
+				border-top: 2rpx solid #F7F9FC;
 				font-size: 32rpx;
 			}
 	.color_icon{
 		width: 36rpx;
 		height: 36rpx;
 	}
+	.gray{
+		background-color: #E0E0E0 !important;
+	}

pages/menu/colorMoni/index.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="content">
-		<navigation :showBack="showBack">color</navigation>
+		<navigation :showBack="showBack">{{siteName}}</navigation>
 		<swit :switNum="2"/>
-		<balance @send="getSonValue" :currencySymbol="currencySymbol" :currentBalance="currentBalance">
+		<balance @send="getSonValue" :showRechange="false"  :currencySymbol="currencySymbol" :currentBalance="currentBalance">
 			<view class="rules-btn" slot="rules" @click="goRule()">rules</view>
 		</balance>
 		<view class="bg_white">
 			<view class="gNum flex">
 				<view class="ga" v-for="(item,index) in colorList" :key="item.id" :class="index==ganum?'gaactive':''"
-					@click="gaClick(index,item.name)">
+					@click="gaClick(index,item.name,item),myLottertRecord()">
 					{{item.name}}
 				</view>
 			</view>
@@ -37,8 +37,8 @@
 				</view>
 				<view v-show="canBuy">
 				<view class="flex icon-con">
-						<view class="ico" @click="xiazhu(item.color)" v-for="item,index in gameColor" :key="item.id">
+					<view class="ico" @click="xiazhu(item.color)" v-for="item,index in gameColor" :key="item.id" :class="{'greenbg': item.id === 1, 'purple': item.id === 2, redbg: item.id === 3}">
-							<image :src="'../../../static/color/ico_apple_'+item.color+'@3x.png'" mode=""></image>
+						{{item.color2}}
 					</view>
 				</view>
 					<view class="multiple">
@@ -58,8 +58,9 @@
 				</view>
 				<view class="canBuy" v-show="!canBuy">
 					<view class="flex icon-con">
-						<view class="ico" v-for="item,index in gameColor" :key="item.id">
+				<view class="ico gray" v-for="item,index in gameColor" :key="item.id">
-							<image :src="'../../../static/color/ash_'+item.color+'@3x.png'" mode=""></image>
+					<!-- <image :src="'../../../static/color/ash_'+item.color+'@3x.png'" mode=""></image> -->
+				  {{item.color2}}
 				</view>
 					</view>
 					<view class="multiple">
@@ -340,7 +341,7 @@
 				</view>
 		
 		
-		
+		<tab-bar :selectActive="3"></tab-bar>
 		
 		
 	</view>
@@ -363,6 +364,11 @@
 		        },
 		data() {
 			return {
+				siteName:'',
+				// 传过去rules的值
+				ruleDescription:'',
+				
+				
 				// 显示back或不显示
 				showBack:false,
 				
@@ -381,7 +387,7 @@
 				xia_body: [1, 2, 3],
 				follow_xiazhu_conOn: 0,
 				bettingPrice: '',
-				bettingNumber: 0,
+				bettingNumber: 1,
 				show: false,
 				showWhite: true,
 				myName: '',
@@ -412,20 +418,23 @@
 				gNum: 'G2',
 			gameColor: [{
 						id: 1,
-						color: 'GREEN'
+						color: 'GREEN',
+						color2: 'Join Green'
 					},
 					{
 						id: 2,
-						color: 'VIOLET'
+						color: 'VIOLET',
+						color2: 'Join Violet'
 					},
 					{
 						id: 3,
-						color: 'RED'
+						color: 'RED',
+						color2: 'Join Red'
 					},
 				],
 				gameColorNumber1: [{
 						num: 0,
-						cla: 'bg_jb2'
+						cla: 'bg_jb1'
 					},
 					{
 						num: 1,
@@ -446,7 +455,7 @@
 				],
 				gameColorNumber2: [{
 						num: 5,
-						cla: 'bg_jb1'
+						cla: 'bg_jb2'
 					},
 					{
 						num: 6,
@@ -462,7 +471,7 @@
 					},
 					{
 						num: 9,
-						cla: 'bg_red'
+						cla: 'bg_green'
 					},
 				],
 				bettingValue: '',
@@ -493,7 +502,7 @@
 		},
 
 		onLoad() {
-			
+			this.siteName=uni.getStorageSync('siteInfo').siteName;
 			this.initializationMissingFrequency();
 			// 客服
 			this.serviceTime = uni.getStorageSync('siteInfo').serviceTime;
@@ -509,7 +518,6 @@
 			
 			
              this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
-			 this.currentBalance=uni.getStorageSync('currentBalance');
 			this.myName = uni.getStorageSync('MyInfo').nickname;
 			this.myImgUrl = uni.getStorageSync('MyInfo').headImgPath;
 			
@@ -586,9 +594,12 @@
 					"ticket": uni.getStorageSync('logInfo').data,
 				})
 				post.then(res => {				
-						
 						this.betting_amount = res.data.betting_amount.split(',');
 						this.betting_rule = res.data.tips;
+						this.bettingPrice=this.betting_amount[0];
+						this.tmoney();
+						this.currentBalance=parseFloat(res.data.balance).toFixed(2)
+						
 					})
 					.catch(e => {
 						console.log(e)
@@ -603,6 +614,7 @@
 						this.colorData = this.colorList[0];
 						this.gameNav2[1].text = this.colorData.name + " record"
 						this.gameNav2[2].text = 'My ' + this.colorData.name + " record"
+						this.ruleDescription=this.colorList[0].description;
 						this.gNum = this.colorList[0].name
 						this.setlotteryData();
 						this.gg=this.colorData.id
@@ -660,8 +672,8 @@
 			xiazhu(val) {
 				this.xiazhuCode = true;
 				this.bettingValue = val;
-				this.numindex = -1;
+		this.numindex = 0;
-				this.list[0].checked = false;
+		this.list[0].checked = true;
 			},
 			folLisNumFn(i) {
 				this.folLisNum = i;
@@ -690,6 +702,9 @@
 			},
 
 			toLotter() {
+				uni.showLoading({
+					title:'loading'
+				})
 				if (this.bettingPrice == 0) {
 					uni.showToast({
 						title: 'Please select bet amount',
@@ -724,9 +739,7 @@
 					"bettingNumber": this.bettingNumber,
 				})
 				post.then(res => {
-					uni.showLoading({
+				
-						title:'loading'
-					})
 						if (res.success == true) {
 							// this.xiaSul = 1;
 							uni.showToast({
@@ -734,23 +747,8 @@
 								icon: 'success',
 								duration: 1500
 							})
-							//更新余额
+							this.xiazhuCode=false
-							const post = api.withdrawConfig({
+							this.getBettingConfig();
-								"ticket": uni.getStorageSync('logInfo').data,
-							})
-							post.then(res => {
-								if(res.data){
-									this.currentBalance=res.data.currentBalance;
-									uni.setStorage({
-										key: 'currentBalance',
-										data: this.currentBalance,
-										success: function() {
-											console.log('success')
-										}
-									});
-								}
-							
-								})
 
 						} else {
 							uni.showToast({
@@ -759,6 +757,7 @@
 								duration: 1500
 							})
 						}
+						uni.hideLoading()
 					})
 					.catch(e => {
 						console.log(e)
@@ -768,6 +767,7 @@
 
 
 			myLottertRecord() {
+		
 				const post = api.myLotteryRecordsM({
 					"ticket": uni.getStorageSync('logInfo').data,
 					"classId": this.gg,
@@ -775,16 +775,22 @@
 					"pageSize": this.pageSize,
 				})
 				post.then(res => {
-
-						if (res.data == '' || res.data.content == null) {
-							return
-						}
 						this.myGameRecord = res.data.content;
 						this.totalPage = res.data.totalElements;
+					if(res.data.content!=''||res.data.content!=undefined){
+						this.myGameRecord = res.data.content;
 						for (var i = 0; i < this.myGameRecord.length; i++) {
 							// this.myGameRecord[i].period = this.myGameRecord[i].period.substring(2, 13);
 							this.myGameRecord[i].addTime = index.formatyymmddhhmmss(this.myGameRecord[i]
 								.addTime);
+								
+								 this.myGameRecord[i].bettingFee = parseFloat(this.myGameRecord[i].bettingFee).toFixed(2)
+						    this.myGameRecord[i].bettingPrice = parseFloat(this.myGameRecord[i].bettingPrice).toFixed(2)
+							this.myGameRecord[i].bettingAmount = parseFloat(this.myGameRecord[i].bettingAmount).toFixed(2)
+							this.myGameRecord[i].realAmount = parseFloat(this.myGameRecord[i].realAmount).toFixed(2)
+						}
+					}else{
+						 this.myGameRecord='';
 					}
 
 					})
@@ -839,7 +845,7 @@
 
 
 
-			gaClick(i, j) {
+			gaClick(i, j,item) {
 				this.ganum = i
 				this.gNum = j;
 				this.colorData = this.colorList[i];
@@ -850,11 +856,11 @@
 				this.gg=this.colorList[i].id
 				this.getLottertRecord();
 				this.timeChange(this.lotteryData[j].remain)
-
+				this.ruleDescription=item.description;
 			},
 			goRule() {
 				uni.navigateTo({
-					url: '../rule/index'
+					url: '../rule/index?des='+this.ruleDescription
 				})
 			},
 			showMas() {

pages/menu/goods/goodsDetail/index.vue

@@ -24,6 +24,7 @@
 			 <text class="text text2">{{item.goodsPropertyValue}}</text>
 		</view>
 	</view>
+	<tab-bar></tab-bar>
 	</view>
 </template>
 
@@ -48,14 +49,15 @@
 		 })
          .then(res =>{
 			 if(res.success){
+				 res.data.goodsPrice=parseFloat(res.data.goodsPrice).toFixed(2)
 				 this.goods_Detail=res.data;
 				 this.list=res.data.goodsImgMainUrl.split(',');
 				for(var i=0;i<this.list.length;i++){
 					 this.list[i]='https://apitest.luck-work.com'+this.list[i]
+					 
 				}
 				this.table=JSON.parse(this.goods_Detail.goodsProperty)
-				console.log(this.goods_Detail.goodsProperty,4444444)
+	
-				console.log(this.table,5555555)
 				 }
       
          }).catch(err =>{

pages/menu/goods/index.css

@@ -10,7 +10,7 @@
 		flex-wrap: wrap;
 }
 .good_item{
-	width: 320rpx;
+	width: 330rpx;
 	background-color: #fff;
 	border-radius: 20rpx;
 	margin-bottom: 36rpx;
@@ -19,12 +19,13 @@
 	width: 100%;
 }
 .text{
-	padding: 24rpx;
+	padding: 0 24rpx;
 	font-size: 26rpx;
 	color: #303133;
-	height: 200rpx;
+	    display: -webkit-box;
-	overflow-x: hidden;
+	    -webkit-box-orient: vertical;
-	overflow-y: scroll;
+	    -webkit-line-clamp: 3;
+	    overflow: hidden;
 }
 .price{
 	padding: 18rpx 24rpx 36rpx 24rpx;
@@ -32,3 +33,32 @@
 	color: #954DE3;
 	text-align: left;
 }
+.top_item{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 36rpx;
+	line-height: 108rpx;
+	background-color: #954DE3;
+}
+.one{
+	display: flex;
+	align-items: center;
+}
+.dimg{
+	width: 36rpx;
+	height: 36rpx;
+}
+.white{
+	width: 76rpx;
+	height: 76rpx;
+}
+.white image{
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+.dtext{
+	color: #fff;
+	margin-left: 16rpx;
+}

pages/menu/goods/index.vue

@@ -3,6 +3,19 @@
 		<navigation :showBack="false">
 			Home
 		</navigation>
+		  <!-- #ifdef H5 -->
+		<view class="top_item" @click="goDown()">
+			<view class="one">
+				<view class="white">
+					<image :src="logoUrl" mode="aspectFit"></image>
+				</view>
+				<view class="dtext">
+					Open With An App
+				</view>
+			</view>
+			<image src="../../../static/home/[email protected]" mode="aspectFit" class="dimg"></image>
+		</view>
+		<!--  #endif -->
 	<u-swiper :list="list" height="1000" mode="none"></u-swiper>
 	
 	<view class="goods_list_con">
@@ -12,7 +25,7 @@
 				{{item.goodsName}}
 			</view>
 			<view class="price">
-				₹ {{item.goodsPrice}}
+				{{currencySymbol}} {{item.goodsPrice}}
 			</view>
 		</view>
 	</view>
@@ -28,15 +41,50 @@
 	export default {
 		data() {
 			return {
+				logoUrl:'',
+				androidUrl: '',
 				// banner
 				list: [],
 				// 商品
 				goods_list:[],
 				ticket:'',
+				currencySymbol:'',
+				currentBalance:'',
 			}
 		},
 
 		onLoad() {
+			
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
+			const post = api.withdrawConfig({
+				"ticket": uni.getStorageSync('logInfo').data,
+			})
+			post.then(res => {
+				if(res.data!=undefined){
+					this.currentBalance=res.data.currentBalance;
+					uni.setStorage({
+						key: 'currentBalance',
+						data: this.currentBalance,
+						success: function() {
+							console.log('success')
+						}
+					});
+				}
+			
+				})
+				.catch(e => {
+					console.log(e)
+				})
+				
+			
+			
+			
+			// #ifdef APP-PLUS
+			this.appVersion();
+			// #endif
+			this.openGame();
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
+			this.androidUrl = uni.getStorageSync('siteInfo').androidUrl;
 	        this.ticket= uni.getStorageSync('logInfo').data;
 			this.init();
 		},
@@ -45,6 +93,77 @@
 			
 			},
 		methods: {
+			// 校驗版本號
+			appVersion() {
+				
+				   plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => { 
+				    console.log('当前版本号' + wgtinfo.versionCode)
+				    console.log('服务器版本号：'+ res.data.versionId)
+				    console.log((wgtinfo.versionCode < res.data.versionId))
+				    var param = {
+				    'appId':  'android',
+				     'versionCode': wgtinfo.versionName,
+				    }
+				    console.log(param,"版本号版本号版本号")
+				    const post = api.appVersion(param)
+				    post.then(d => {
+				    		console.log('zzzzzzzzzzzzzz')
+				    		console.log(d)
+				    		this.upgradeInfo = d.data
+				    			
+				    		if (d.data.isUpgrade != undefined && d.data.isUpgrade) {
+				    			this.upgrade = true
+				    			this.close_mask = false
+				    		} else {
+				    			this.upgrade = false
+				    			//this.isFirstLogin()
+				    		}
+				    	})
+				    	.catch((e) => {
+				    		console.log(e)
+				    	})
+				   });
+				
+			},
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+						// uni.setStorage({
+						// 	key: 'Gamestatus',
+						// 	data: d.data.gameMenuStatus,
+						// });
+					
+						if (d.data.gameMenuStatus == 'close') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Order',
+								pagePath:'/pages/menu/order/index',
+								iconPath: '/static/tabbar/dorder.png',
+								selectedIconPath: '/static/tabbar/dorderS.png'
+							})
+						}else if (d.data.gameMenuStatus == 'open'){
+						uni.setTabBarItem({
+							index: 2,
+							text: 'Game',
+							pagePath: "/pages/menu/color/index",
+							iconPath: "/static/tabbar/[email protected]",
+							selectedIconPath: "/static/tabbar/[email protected]"
+						})
+						}
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
+			goDown(){
+				// #ifdef H5
+				window.location.href = this.androidUrl;
+				// #endif
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(this.androidUrl);
+				// #endif
+			},
+		
 			goGoodsDetail(i){
 				uni.navigateTo({
 					url:'goodsDetail/index?id='+i
@@ -65,9 +184,30 @@
 				const post2 = api.goodsList({})
 				.then(res =>{
 					this.goods_list=res.data;
+				   for(var i=0;i<this.goods_list.length;i++){
+					this.goods_list[i].goodsPrice=parseFloat(this.goods_list[i].goodsPrice).toFixed(2)
+				   }
 				}).catch(err =>{
 					console.log(err)
 				})
+				
+				// 获取logo
+				const siteInfo = api.siteInfo()
+				siteInfo.then(d => {
+						let that = this
+						uni.setStorage({
+							key: 'siteInfo',
+							data: d.data,
+							success: function() {
+								console.log('success')
+								that.logoUrl = d.data.siteDomain + d.data.siteLogo
+							}
+						});
+				
+					})
+					.catch((e) => {
+						console.log(e)
+					})
 			},
 			},
 	

pages/menu/index/index.css

@@ -10,7 +10,7 @@
 }
 .index-body-p1{
 	 padding-top: 48rpx;
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .index-body-img{

pages/menu/order/index.vue

@@ -0,0 +1,108 @@
+<template>
+	<view class="">
+    <navigation :showBack="false">
+    Orders
+	<image src="../../../static/color/[email protected]" mode="aspectFit" class="back" @click="back()"></image>
+    </navigation>
+		<view class="">
+			<u-tabs :bold="false" active-color="#fff"  inactive-color="rgba(135,109,164)" bg-color="#300261" height="108" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
+		<tab-bar :selectActive="5"></tab-bar>
+	</view>
+
+</template>
+
+<script>
+	import Vue from 'vue';
+		import balance from "@/components/balance/balance.vue"
+		import api from '@/utils/api'
+	export default {
+		data() {
+			return {
+				list: [{
+								name: 'All'
+							}, {
+								name: 'Undeliver'
+							}, {
+								name: 'Unreceive',
+							},
+							{
+								name: 'Success',
+							},
+							],
+							current: 0
+			}
+		},
+		onLoad() {
+          this.openGame()
+		
+		},
+		methods: {
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+						// uni.setStorage({
+						// 	key: 'Gamestatus',
+						// 	data: d.data.gameMenuStatus,
+						// });
+					
+						if (d.data.gameMenuStatus == 'close') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Order',
+								pagePath:'/pages/menu/order/index',
+								iconPath: '/static/tabbar/dorder.png',
+								selectedIconPath: '/static/tabbar/dorderS.png'
+							})
+						}else if (d.data.gameMenuStatus == 'open'){
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Game',
+								pagePath: "/pages/menu/color/index",
+								iconPath: "./static/tabbar/[email protected]",
+								selectedIconPath: "./static/tabbar/[email protected]"
+							})
+						}
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
+		change(index) {
+						this.current = index;
+					},
+					back(){
+						uni.switchTab({
+							url:'/pages/menu/My/index'
+						})
+					},
+		}
+	}
+</script>
+
+<style>
+	/deep/ .u-tab-bar{
+		background-color: #954DE3 !important;
+	}
+	/* #ifdef APP-PLUS  */
+		.back{
+			width: 42rpx;
+			height: 42rpx;
+			position: absolute;
+			left:36rpx;
+		    top: 60%;
+			transform: translateY(-50%) rotate(-180deg) ;
+		
+		}
+		  /*  #endif   */
+	.back{
+			width: 42rpx;
+			height: 42rpx;
+			position: absolute;
+			left:36rpx;
+	        top: 50%;
+			transform: translateY(-50%) rotate(-180deg) ;
+		
+		}
+
+</style>

pages/menu/promotion/applyRecord/index.css

@@ -92,20 +92,20 @@ align-items: center;
 	font-size: 28rpx;
 }
 .Nop1{
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .Nop2{
-	color: #909399FF;
+	color: #909399;
 	font-size: 28rpx;
 }
 .money{
-	color: #00B977FF;
+	color: #00B977;
 	font-size: 32rpx;
 	text-align: right;
 }
 .nickname{
 	text-align: right;
-	color: #909399FF;
+	color: #909399;
 	font-size: 28rpx;
 }

pages/menu/promotion/bounsRecord/index.css

@@ -92,20 +92,20 @@ align-items: center;
 	font-size: 28rpx;
 }
 .Nop1{
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .Nop2{
-	color: #909399FF;
+	color: #909399;
 	font-size: 28rpx;
 }
 .money{
-	color: #00B977FF;
+	color: #00B977;
 	font-size: 32rpx;
 	text-align: right;
 }
 .nickname{
 	text-align: right;
-	color: #909399FF;
+	color: #909399;
 	font-size: 28rpx;
 }

pages/menu/promotion/index.css

@@ -4,12 +4,13 @@
 .pro-head{
 	text-align: center;
 	color: #fff;
-	line-height: 108rpx;
+	line-height: 158rpx;
 	font-size: 36rpx;
 	text-transform: capitalize;
 	background-color: #34026B;
 	position: relative;
 	padding: 0 36rpx;
+	padding-top: 20rpx;
 }
 .pro-hea-rig{
 position: absolute;
@@ -38,7 +39,7 @@ align-items: center;
 	    justify-content: center;
 	    align-items: center;
 	font-size: 44rpx;
-	color: #303133FF;
+	color: #303133;
 	text-align: center;
 	padding: 60rpx 0;
 	text-transform: capitalize;
@@ -72,22 +73,22 @@ font-family: 'din';
 	padding-bottom: 80rpx;
 }
 .lea-item .p1{
-	color: #909399FF;
+	color: #909399;
 	line-height: 96rpx;
 	font-size: 32rpx;
 }
 .lea-item .p2{
-	color: #909399FF;
+	color: #909399;
 	margin-top: 36rpx;
 	font-size: 28rpx;
 }
 .lea-item .p3{
-	color: #303133FF;
+	color: #303133;
 	margin-top: 20rpx;
 	font-size: 36rpx;
 }
 .lea-item .p1.on{
-	color: #34026BFF;
+	color: #34026B;
 	border-bottom: 4rpx solid #34026B;
 }
 .pro-body-code{
@@ -103,6 +104,7 @@ font-family: 'din';
 	font-size: 32rpx;
 	margin-top: 16rpx;
 	color: rgba(255,255,255,1);
+	word-wrap:break-word;
 }
 	
 .code-item1:nth-child(2){
@@ -114,7 +116,7 @@ font-family: 'din';
 	color: #fff;
 	border-radius: 16rpx;
 	margin-top: 36rpx;
-	background-color: #954DE3FF;
+	background-color: #954DE3;
 }
 
 .invite-more{
@@ -164,7 +166,7 @@ z-index: 9999;
 	padding: 48rpx 48rpx 0 48rpx;
 }
 .appl_Ba .title{
-	color: #303133FF;
+	color: #303133;
 	font-size: 36rpx;
 	text-align: center;
 
@@ -177,11 +179,11 @@ z-index: 9999;
 }
 .appl_Ba .input input{
 	height: 100%;
-	border-bottom: 2rpx solid #EDEFF2FF;
+	border-bottom: 2rpx solid #EDEFF2;
 }
 .appl_Ba .all{
 	line-height: 96rpx;
-	background-color: #34026BFF;
+	background-color: #34026B;
 	border-radius: 16rpx;
 	text-align: center;
 	color: #fff;
@@ -189,7 +191,7 @@ z-index: 9999;
 }
 .appl_Ba .btn_con{
 	margin-top: 48rpx;
-	border-top: 2rpx solid #F7F9FCFF;
+	border-top: 2rpx solid #F7F9FC;
     display: flex;
 	justify-content: space-between;
 	text-transform: capitalize;
@@ -202,8 +204,8 @@ z-index: 9999;
 	line-height: 108rpx;
 }
 .appl_Ba .btn_con .btn1:nth-child(1){
-	border-right: 2rpx solid #F7F9FCFF;
+	border-right: 2rpx solid #F7F9FC;
 }
 .puple{
-	color: #954DE3FF !important;
+	color: #954DE3 !important;
 }

pages/menu/promotion/index.vue

@@ -129,13 +129,13 @@
 			}
 		},
 		onLoad() {
+			this.openGame();
 			const post = api.inviteCode({
 				"ticket": uni.getStorageSync('logInfo').data,
 			})
 			post.then(res => {
 					this.inviteRule = res.data;
 					this.copyText = this.inviteRule.qrcodeUrl;
-					console.log(res.data, 9999);
 				})
 				.catch(e => {
 					uni.showToast({
@@ -147,6 +147,36 @@
 
 		},
 		methods: {
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+						// uni.setStorage({
+						// 	key: 'Gamestatus',
+						// 	data: d.data.gameMenuStatus,
+						// });
+					
+						if (d.data.gameMenuStatus == 'close') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Order',
+								pagePath:'/pages/menu/order/index',
+								iconPath: '/static/tabbar/dorder.png',
+								selectedIconPath: '/static/tabbar/dorderS.png'
+							})
+						}else if (d.data.gameMenuStatus == 'open'){
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Game',
+								pagePath: "/pages/menu/color/index",
+								iconPath: "/static/tabbar/[email protected]",
+								selectedIconPath: "/static/tabbar/[email protected]"
+							})
+						}
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
 			goInviteRule() {
 				uni.navigateTo({
 					url: '../rule/inviteRule/index'
@@ -203,12 +233,25 @@
 			},
 			copyTextMethod() {
 
+			// #ifdef H5
 			    this.$copyText(this.copyText).then(res => {
 			     uni.showToast({
-						title: 'Copy succeeded',
+			      title: 'Copy Success',
 			      icon: 'success'
 			     })
 			    })
+			    // #endif
+			    // #ifdef APP-PLUS
+			    uni.setClipboardData({
+			     data: this.copyText,
+			     success() {
+					 uni.showToast({
+					  title: 'Copy Success',
+					  icon: 'success'
+					 })
+			     }
+			    })
+			    // #endif
 			},
 			leaIdChange(index) {
 				this.leaId = index;
@@ -217,6 +260,19 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	/* #ifdef APP-PLUS */
+		.pro-head{
+			padding-top: 30rpx;
+		}
+	.pro-hea-rig{
+	position: absolute;
+	right: 36rpx;
+	top: 60%;
+	transform: translateY(-50%);
+	display: flex;
+	align-items: center;
+	}
+		/* #endif */
 	@import url("./index.css");
 </style>

pages/menu/promotion/promotionRecord/index.css

@@ -93,7 +93,7 @@ align-items: center;
 	font-size: 28rpx;
 }
 .time{
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .recordTou{

pages/menu/re/add/index.css

@@ -0,0 +1,28 @@
+.big{
+	position: relative;
+}
+.login-body{
+	padding: 36rpx 36rpx;
+}
+.login-body .big .text{
+	color: #BFC2CC;
+	font-size: 24rpx;
+	position: absolute;
+	top: 16rpx;
+}
+.login-btn{
+	margin-top: 60rpx;
+	background-color: #34026B;
+	color: #fff;
+	font-size: 28rpx;
+	line-height: 96rpx;
+	border-radius: 20rpx;
+}
+.u-form-item{
+	height: 110rpx !important;
+
+}
+
+/deep/ .u-input__right-icon{
+	display: none !important;
+}

pages/menu/re/add/index.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="goods_con">
+		<navigation>
+			ADD Red Envelope
+		</navigation>
+		<view class="login-body">
+			<u-form :model="form" ref="uForm" :rules="rules">
+				<view class="big">
+					<view class="text">
+						Fixed Money
+					</view>
+					<u-form-item prop="amount">
+
+						<u-input v-model="form.amount" :placeholder="''" />
+					</u-form-item>
+				</view>
+				<view class="big">
+
+
+					<view class="text">
+						Enter Your Login Password
+					</view>
+					<u-form-item prop="password">
+
+						<u-input type="password" v-model="form.password" :placeholder="''" />
+					</u-form-item>
+				</view>
+			</u-form>
+			<button @click="submit" class="login-btn">
+				Confirm
+			</button>
+		</view>
+		<tab-bar></tab-bar>
+	</view>
+</template>
+
+<script>
+	import api from '@/utils/api'
+	import utils from '@/utils'
+	import md5 from 'js-md5'
+	import store from '@/store'
+	export default {
+		data() {
+			return {
+				form: {
+					password: '',
+					amount: '',
+					ticket: '',
+				},
+				rules: {
+					amount: [{
+							amount: true,
+							message: 'Please enter your amount',
+							// 可以单个或者同时写两个触发验证方式 
+							trigger: ['blur'],
+						},
+
+					],
+					password: [{
+						required: true,
+						// min: 5, 
+						message: 'Please enter password',
+						trigger: 'blur'
+					}],
+				}
+			}
+		},
+
+		onLoad(i) {
+			this.form.ticket = uni.getStorageSync('logInfo').data
+		},
+
+		onReady() {
+
+		},
+		methods: {
+			submit() {
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({})
+						const post = api.launchRedEnvelop(this.form)
+						post.then(res => {
+							if(res.errCode=='SUCCESS'){
+								uni.showToast({
+									title: 'Successfully',
+									icon: 'success',
+									duration: 2500
+								})
+								setTimeout(()=>{
+									uni.navigateTo({
+										url:'../list/index'
+									})
+								},1500)
+							}
+						}).catch((e)=>{
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 2500
+							})
+						})
+
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
+		},
+
+	}
+</script>
+
+<style>
+	@import './index.css';
+</style>

pages/menu/re/list/index.css

@@ -0,0 +1,117 @@
+
+
+.flex{
+	display: flex;
+	justify-content: space-between;
+    align-items: flex-start;
+}
+	.bread image {
+		width: 28rpx;
+		height: 28rpx;
+		position: absolute;
+		right: 36rpx;
+		top: 60%;
+		transform: translateY(-50%);
+	}
+.record_item{
+	height: 144rpx;
+	margin-top: 30rpx;
+}
+.numcon .img1{
+	width: 40rpx;
+	height: 40rpx;
+	vertical-align: middle;
+	margin-right: 20rpx;
+}
+.num{
+	margin-left: 20rpx;
+}
+.rec{
+	color: #303133;
+	font-size: 32rpx;
+}
+
+.time{
+	color: #909399;
+	font-size: 28rpx;
+	margin-top: 16rpx;
+}
+
+.status{
+	font-size: 28rpx;
+}
+.red{
+	color: #F25B5B !important;
+}
+.green{
+	color:#00B977 !important;
+}
+.noRes{
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%,-50%);
+}
+.noRes .imgcon{
+	width: 72rpx;
+	height: 72rpx;
+	margin: 0 auto;
+}
+.noRes .imgcon image{
+	width: 100%;
+	height: 100%;
+}
+.noRes .res{
+	text-align: center;
+	color: #BFC2CC;
+	font-size: 28rpx;
+	margin-top: 24rpx;
+}
+page{
+	height: 100% !important;
+}
+.content{
+	padding-bottom: 200rpx;
+	background-color: #F5F7FA;
+}
+.record_body{
+	height: 100%;
+	background-color: #F5F7FA;
+}
+.item{
+	 margin-bottom: 20rpx;
+	background-color: #fff;
+	padding: 36rpx;
+}
+.link{
+	color: #909399;
+	font-size: 28rpx;
+	margin-top: 16rpx;
+	    word-break: break-all;
+}
+.copy{
+	text-align: center;
+	width: 88rpx;
+	line-height: 40rpx;
+	border: 3rpx solid #954DE3;
+	border-radius: 8rpx;
+	color: #954DE3;
+	font-size: 24rpx;
+}
+.top{
+	border-bottom: 2rpx solid #EDEFF2;
+	padding-bottom: 20rpx;
+}
+.no{
+	display: none;
+}
+.bottom{
+	text-align: center;
+	color: #303133;
+	line-height: 52rpx;
+	border-radius: 25rpx;
+	margin-top: 15rpx;
+}
+.bg{
+	background-color: #F5F7FA;
+}

pages/menu/re/list/index.vue

@@ -0,0 +1,200 @@
+<template>
+	<view class="content">
+	   <navigation>
+		  Red Envelope
+	<view class="bread" slot="bread">
+		<image src="../../../../static/bankCard/[email protected]" mode="aspectFit"
+			@click="goAdd()"></image>
+	</view>
+	   </navigation>
+    <view class="record_body" >
+       <view class="item" v-for="item,index in record_list" :key:="index">
+		   <view class="top">
+       	 <view class="flex">
+       	 	<view class="money">
+       	 	{{currencySymbol}}	{{item.amount}}
+       	 	</view>
+			<view class="status" :class="item.status=='unreceive'?'green':'red'">
+				{{item.status}}
+			</view>
+       	 </view>
+		 <view class="time">
+		 {{item.addTime}}
+		 </view>
+		 <view class="flex">
+		 	<view class="link">
+		 		https://apitest.luck-work.com/#/pages/redenvelopes?code={{item.no}}
+		 	<!-- https://localhost:8080/#/pages/redenvelopes?code={{item.no}} -->
+			</view>
+		 			<view class="copy" @click="copyTextMethod(item)">
+		 			Copy
+		 			</view>
+					   </view>
+		 </view>
+		 <view class="bottom flex" :class="item.status=='unreceive'?'no':''">
+		 	<view class="time">
+		 		{{item.operatorName}}
+		 	</view>
+			<view class="time">
+			 {{item.addTime}}
+			</view>
+		 </view>
+		 <view class="bottom bg"  :class="item.status!='unreceive'?'no':''" @click="showModel(item)">
+		 Cancel
+		 </view>
+		 
+       </view>
+	   <u-modal v-model="show" confirm-color="#954DE3"  @confirm="cancel()" confirm-text='confirm' cancel-text="cancel" :show-cancel-button="true" :show-title="false" :content="content"></u-modal>
+	 </view>
+	 <tab-bar :selectActive="5"></tab-bar>
+	</view>
+	
+</template>
+
+<script>
+	import api from '@/utils/api'
+	import utils from '@/utils'
+	import cont from "@/components/navigation/navigation.vue"
+	import index from '@/utils/index.js'
+	export default{
+		data(){
+			return{
+				content:'Are you sure to cancel',
+				show:false,
+			pageNumber:1,
+			pageSize:10,
+			record_list:[],
+			totalPage:0,
+			currencySymbol:'',
+			copyText:'',
+			lingshi:{},
+				}
+			},
+		
+		onLoad() {
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
+			
+			
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
+			this.getRechardRecord()
+},
+		onReachBottom() {
+	this.pageSize += 8;
+	if(this.pageSize>this.totalPage){
+		return;
+	}
+			this.getRechardRecord();
+			},
+		
+		methods:{
+			showModel(i){
+				this.show=true;
+				this.lingshi=i
+			},
+			cancel(){
+				const post2 = api.cancelRedEnvelop({
+					"ticket": uni.getStorageSync('logInfo').data,
+					"code":this.lingshi.no,
+				})
+				post2.then(res => {
+						uni.showToast({
+							title: 'Successfully',
+							icon: 'success',
+							duration: 2500
+						})
+						  window.location.reload()
+					})
+					.catch(e => {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 2500
+						})
+						// #ifdef APP-PLUS
+						setTimeout(()=>{
+						uni.navigateTo({
+								url:"/pages/menu/re/list/index"
+							})
+						},2000)
+					
+						// #endif
+						// #ifdef H5
+						setTimeout(()=>{
+							window.location.reload();
+						},2000)
+						// #endif
+					
+					
+					})
+			},
+			copyTextMethod(i) {
+			   
+		// https://apitest.luck-work.com
+			// #ifdef H5
+				this.copyText="https:localhost:8080/#/pages/redenvelopes?code="+i.no;
+			    this.$copyText(this.copyText).then(res => {
+			     uni.showToast({
+			      title: 'Copy Success',
+			      icon: 'success'
+			     })
+			    })
+			    // #endif
+			    // #ifdef APP-PLUS
+				this.copyText="https://apitest.luck-work.com/#/pages/redenvelopes?code="+i.no;
+			    uni.setClipboardData({
+			     data: this.copyText,
+			     success() {
+					 uni.showToast({
+					  title: 'Copy Success',
+					  icon: 'success'
+					 })
+			     }
+			    })
+			    // #endif
+			},
+			goAdd(){
+				 uni.navigateTo({
+				 	url:'../add/index'
+				 })
+			},
+			getRechardRecord(){
+				
+				const post2 = api.redEnvelopList({
+					"ticket": uni.getStorageSync('logInfo').data,
+					"pageNumber":this.pageNumber,
+					"pageSize":this.pageSize,
+				})
+				post2.then(res => {
+					if(res.data.content!=undefined){
+					this.record_list=res.data.content;
+					for(var i=0;i<this.record_list.length;i++){
+						this.record_list[i].addTime=index.formatyymmddhhmmss(this.record_list[i].addTime);
+						this.record_list[i].amount=this.record_list[i].amount.toFixed(2);
+					}	
+					this.totalPage=res.data.totalElements;
+					}
+
+		
+					})
+					.catch(e => {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 2500
+						})
+					})
+				
+				
+				},
+			},
+			onReachBottom(){
+				this.pageSize+=10;
+				this.getRechardRecord()
+			}
+				
+	}
+</script>
+
+<style>
+@import './index.css';
+</style>

pages/menu/recharge/index.css

@@ -6,7 +6,7 @@
 	height: 24rpx;
 	position: absolute;
 	right: 36rpx;
-	top: 50%;
+	top: 60%;
 	transform: translateY(-50%);
 }
 .rech-body{
@@ -17,7 +17,7 @@ display: flex;
     font-size: 22px;
     justify-content: center;
     align-items: center;
-    color: #303133FF;
+    color: #303133;
     text-align: center;
     padding: 30px 0;
     text-transform: capitalize;
@@ -43,7 +43,7 @@ display: flex;
 	width: 500rpx;
 	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 110rpx;
@@ -54,7 +54,7 @@ display: flex;
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -76,7 +76,7 @@ display: flex;
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .flex{
     display: flex;
@@ -105,7 +105,7 @@ display: flex;
 	margin-bottom: 24rpx;
 }
 .mount:hover{
-	border-color: #34026BFF;
+	border-color: #34026B;
 }
 .rech-capy{
 	display: flex;
@@ -116,7 +116,7 @@ display: flex;
 }
 .payment{
 	font-size: 28rpx;
-	color: #909399;
+	color: #333;
 	text-transform: capitalize;
 }
 

pages/menu/recharge/index.vue

@@ -19,24 +19,6 @@
 					placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="tranAmt" />
 			</view>
 
-			<view class="rech-input-con">
-		<!-- 		<view class="input-item flex">
-					<input type="text" value="" placeholder="Name"
-						placeholder-style="color: #BFC2CCFF;font-size:14px;" />
-				</view> -->
-				<view class="input-item flex" v-show="pd==0">
-					<view class="login-sigh flex">
-						<span class="quhao">+{{areacode}}</span>
-					</view>
-					<input type="text" value="" placeholder="mobile number"
-						placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="mobile" />
-				</view>
-			<!-- 	<view class="input-item flex">
-					<input type="text" value="" placeholder="email"
-						placeholder-style="color: #BFC2CCFF;font-size:14px;" />
-				</view> -->
-			</view>
-
 
 		</view>
 
@@ -53,7 +35,7 @@
 			<view class="paymentType">
 				<u-radio-group  @change="radioGroupChange" class="payTypenName">
 					<u-radio @change="radioChange(item)"  v-for="(item, index) in paymentType" :key="index"
-						:name="item.typeName" :disabled="item.disabled" active-color="#954DE3FF">
+						  active-color="#954DE3FF">
 						{{item.typeName}}
 					</u-radio>
 				</u-radio-group>
@@ -128,7 +110,7 @@
 				rechangeInfo: [],
 				recharge_amount: [],
 				paymentType: [],
-				payType: '',
+				payType: 'pay.online.paxs',
 				currencySymbol:'',
 				currentBalance:'',
 				userId:'',
@@ -139,12 +121,34 @@
 		},
 
 		onLoad() {
+	    this.ba();
 			this.copyText=uni.getStorageSync('loginMobile');
             this.mobile=uni.getStorageSync('loginMobile');
 			this.currentBalance=uni.getStorageSync('currentBalance');
 			this.areacode = uni.getStorageSync('siteInfo').areaCode;
             this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
 			this.userId=uni.getStorageSync('MyInfo').userId;
+			const post3 = api.withdrawConfig({
+				"ticket": uni.getStorageSync('logInfo').data,
+			})
+			post3.then(res => {
+				if(res.data){
+					this.currentBalance=res.data.currentBalance;
+					this.currentBalance=parseFloat(this.currentBalance).toFixed(2)
+					uni.setStorage({
+						key: 'currentBalance',
+						data: this.currentBalance,
+						success: function() {
+							console.log('success')
+						}
+					});
+				}
+			
+				})
+			
+			
+			
+			
 			const post = api.rechargeConfig({
 				"ticket": uni.getStorageSync('logInfo').data,
 			})
@@ -173,7 +177,6 @@
 			})
 			post2.then(res => {
 			this.paymentType = res.data;
-			console.log(res.data);
 				})
 				.catch(e => {
 					uni.showToast({
@@ -191,6 +194,23 @@
 					url:'record/index'
 				})
 			},
+			ba(){
+				//更新余额
+				const post3 = api.withdrawConfig({
+					"ticket": uni.getStorageSync('logInfo').data,
+				})
+				post3.then(res=>{
+					
+				res.data.currentBalance= parseFloat(res.data.currentBalance).toFixed(2)
+					uni.setStorage({
+						key: 'currentBalance',
+						data: res.data.balance,
+						success: function() {
+							console.log('success')
+						}
+					});
+				})
+			},
 			goRerule(){
 				uni.navigateTo({
 					url:'./rechargeRule'
@@ -216,23 +236,8 @@
 					})
 					return;
 				}
-				if(this.mobile==''){
+	
-					uni.showToast({
+
-						title: 'Please input mobile phone number',
-						 icon: 'none',
-						duration: 1500
-					})
-					return;
-				}
-				var a= /^[0-9]{4,14}$/;
-				if(!a.test(this.mobile)){
-				uni.showToast({
-					title: 'Wrong format of mobile phone number',
-					 icon: 'none',
-					duration: 1500
-				})
-				return;
-				}
 				if(this.tranAmt==''){
 					uni.showToast({
 						title: 'Please input recharge amount',
@@ -241,48 +246,39 @@
 					})
 					return;
 				}
-				if(this.tranAmt<100){
+				if(this.tranAmt<0){
 					uni.showToast({
-						title: 'Recharge amount cannot be less than 100',
+						title: 'Recharge amount cannot be less than 0',
 						 icon: 'none',
 						duration: 1500
 					})
 					return;
 				}
-				
 				const post2 = api.recharge({
 					"ticket": uni.getStorageSync('logInfo').data,
 					"payType":this.payType,
 					"tranAmt":this.tranAmt,
-					"mobile":this.mobile,
 				})
 				post2.then(res => {
-			if(res.success==true){
+			if(res.success==true&&res.data.msg){
 							uni.showToast({
 								title: 'Recharge success',
 								 icon: 'success',
 								duration: 1500
 							})
-                               //更新余额
+							// #ifdef H5
-                               const post = api.withdrawConfig({
+							window.location.href = res.data.msg;
-                               	"ticket": uni.getStorageSync('logInfo').data,
+							// #endif
-                               })
+							// #ifdef APP-PLUS
-                               post.then(res => {
+							plus.runtime.openURL(res.data.msg);
-                               	if(res.data){
+							// #endif
-                               		this.currentBalance=res.data.currentBalance;
+                    
-                               		uni.setStorage({
+							
-                               			key: 'currentBalance',
+							
-                               			data: this.currentBalance,
-                               			success: function() {
-                               				console.log('success')
-                               			}
-                               		});
-                               	}
 							
-                               	})
 						}else{
 							uni.showToast({
-								title: 'Payment failed',
+								title: res.errMsg,
 								 icon: 'none',
 								duration: 1500
 							})
@@ -298,7 +294,7 @@
 					},
 			
 			radioChange(e) {
-				if(e.payType=='pay.offline'){
+				if(e.payType=='pay.offline.paxs'){
 					this.pd=1;
 					this.payType=e.payType
 				}else{
@@ -310,11 +306,11 @@
 			},
 			// 选中任一radio时，由radio-group触发
 			radioGroupChange(e) {
-				console.log(this.payType,8888888888888)
 			
 			},
 			getMonVal(m) {
 				this.tranAmt = m
+				console.log(this.tranAmt,222)
 			}
 
 	},

pages/menu/recharge/rechargeRule.vue

@@ -53,7 +53,7 @@
 		padding-top: 70rpx;
 	}
 .record_body{
-	color: #303133FF;
+	color: #303133;
 	line-height: 48rpx;
 	font-size: 28rpx;
 text-transform: capitalize;

pages/menu/recharge/record/index.css

@@ -9,14 +9,17 @@
 .flex{
 	display: flex;
 	justify-content: space-between;
-	align-items: center;
+
 }
 .record_item{
 	height: 144rpx;
+	margin-top: 30rpx;
 }
 .numcon .img1{
 	width: 40rpx;
 	height: 40rpx;
+	vertical-align: middle;
+	margin-right: 20rpx;
 }
 .num{
 	margin-left: 20rpx;
@@ -26,15 +29,27 @@
 	font-size: 32rpx;
 }
 .cpay{
-	color: #954DE3;
+	text-align: right;
+	color: #909399;
 	font-size: 28rpx;
 }
 .time{
 	color: #909399;
 	font-size: 28rpx;
+	text-align: left;
 }
 
-
+.status{
+	margin-bottom: 18rpx;
+	text-align: right;
+	font-size: 28rpx;
+}
+.red{
+	color: #F25B5B !important;
+}
+.green{
+	color:#00B977 !important;
+}
 .noRes{
 	position: absolute;
 	left: 50%;

pages/menu/recharge/record/index.vue

@@ -2,23 +2,38 @@
 	<view class="content">
 	   <navigation>
 		   Recharge Record
+	   <!--  -->
 	   </navigation>
     <view class="record_body" :class="totalPage>0?'auto':''">
-  	<view class="record_item flex" v-for="(item,index) in record_list" :key="item.orderNo">
+  	<view class="record_item flex" v-for="(item,index) in record_list" :key="index">
-    		<view class="numcon flex">
+    		<view class="numcon">
-    			<image src="../../../../static/login/[email protected]" mode="aspectFit" class="img1"></image>
+    			
-    		    <view class="num">
+    		    <view class="">
     		    	<view class="rec">
-    		    		{{item.tranAmt}} Wait
+						<view class="">
-    		    	</view>
+						<!-- <image src="../../../../static/login/[email protected]" mode="aspectFit" class="img1"></image> -->
-					<view class="cpay">
+    		    		{{currencySymbol}}{{item.tranAmt}}
-						CPAY
-					</view>
 							</view>
+						<view class="time">
+							{{item.orderNo}}
 						</view>
 						<view class="time">
 					    {{item.addTime}}
 						</view>
+    		    	</view>
+		
+    		    </view>
+			</view>
+			<!--  -->
+			<view class="status_con">
+				<view class="status" :class="item.orderStatus=='pay_unpaid'?'red':'green'">
+					<text v-if="item.orderStatus=='pay_unpaid'">Unpaid</text>
+					<text v-if="item.orderStatus=='pay_success'">Paid</text>
+				</view>
+				<view class="cpay">
+						{{item.payTypeName}}
+				</view>
+			</view>
     	</view>
 		<view class="noRes" v-show="totalPage<0">
 			<view class="imgcon"> 
@@ -29,7 +44,7 @@
 		    </view>
 		</view>
     </view>
-	 
+	 <tab-bar :selectActive="5"></tab-bar>
 	</view>
 	
 </template>
@@ -43,13 +58,15 @@
 		data(){
 			return{
 			pageNumber:1,
-			pageSize:8,
+			pageSize:10,
 			record_list:[],
 			totalPage:0,
+			currencySymbol:'',
 				}
 			},
 		
 		onLoad() {
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
 			this.getRechardRecord()
 },
 		onReachBottom() {
@@ -63,21 +80,20 @@
 		methods:{
 			getRechardRecord(){
 				
-				
-				
 				const post2 = api.rechargeList({
 					"ticket": uni.getStorageSync('logInfo').data,
 					"pageNumber":this.pageNumber,
 					"pageSize":this.pageSize,
 				})
 				post2.then(res => {
-					if(res.data.content){
+					if(res.data.content!=undefined){
 					this.record_list=res.data.content;
-					for(var i=0;i<this.record_list[i].addTime;i++){
+					for(var i=0;i<this.record_list.length;i++){
 						this.record_list[i].addTime=index.formatyymmddhhmmss(this.record_list[i].addTime);
+						this.record_list[i].tranAmt=this.record_list[i].tranAmt.toFixed(2);
 					}	
 					this.totalPage=res.data.totalElements;
-
+                     console.log(this.record_list,3333333333)
 					}
 
 		
@@ -93,6 +109,10 @@
 				
 				},
 			},
+			onReachBottom(){
+				this.pageSize+=10;
+				this.getRechardRecord()
+			}
 				
 	}
 </script>

pages/menu/rule/arules/index.vue

@@ -49,7 +49,7 @@
 		padding-top: 70rpx;
 	}
 .record_body{
-	color: #303133FF;
+	color: #303133;
 	line-height: 48rpx;
 	font-size: 28rpx;
 text-transform: capitalize;

pages/menu/rule/index.css

@@ -22,7 +22,7 @@
 	padding-top: 48rpx;
 }
 .ru-body-p1{
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .ru-table{
@@ -32,7 +32,7 @@
 }
 .ru-body-p1{
 	font-size: 32rpx;
-	color: #303133FF;
+	color: #303133;
 	text-transform: capitalize;
 }
 .ru-table{
@@ -47,7 +47,7 @@ border-bottom: 2rpx solid #EDEFF2;
 
 }
 .ru-table tbody{
-	color: #909399FF;
+	color: #909399;
 }
 .ru-table tr .t1{
 	width: 200rpx;
@@ -57,7 +57,7 @@ border-bottom: 2rpx solid #EDEFF2;
 	width: 476rpx;
 }
 .ru-cont{
-	color: #303133FF;
+	color: #303133;
 	font-size: 28rpx;
 	line-height: 54rpx;
 	padding: 48rpx 0;

pages/menu/rule/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 	<navigation>Rules</navigation>
-	<view class="p1" v-html="betting_rule">
+	<view class="p1" v-html="dse">
 		
 	</view>
 	
@@ -19,17 +19,16 @@
 		data() {
 			return {
 		betting_rule:'',
+		dse:null,
 			}
 		},
-		onLoad(){
+		onLoad(des){
-			
+			this.dse=des.des
-			
 			const post2 = api.bettingConfig({
 					"ticket": uni.getStorageSync('logInfo').data,
 				})
 				post2.then(res => {
 		this.betting_rule=res.data.tips;
-			
 					})
 					.catch(e => {
 						uni.showToast({

pages/menu/rule/inviteRule/index.css

@@ -4,13 +4,14 @@
 	background-color: #34026B;
 	position: relative;
 	padding: 0 36rpx;
+	padding-top: 20rpx;
 }
 .ru-imgcon{
 	width: 44rpx;
 	height: 44rpx;
 	position: absolute;
 	left: 36rpx;
-	top: 50%;
+	top: 60%;
 	transform: translateY(-50%);
 }
 .ru-imgcon image{
@@ -22,7 +23,7 @@
 	padding-top: 48rpx;
 }
 .ru-body-p1{
-	color: #303133FF;
+	color: #303133;
 	font-size: 32rpx;
 }
 .ru-table{
@@ -47,7 +48,7 @@ border-bottom: 2rpx solid #EDEFF2;
 
 }
 .ru-table tbody{
-	color: #909399FF;
+	color: #909399;
 }
 .ru-table tr .t1{
 	width: 200rpx;
@@ -57,7 +58,7 @@ border-bottom: 2rpx solid #EDEFF2;
 	width: 476rpx;
 }
 .ru-cont{
-	color: #303133FF;
+	color: #303133;
 	font-size: 28rpx;
 	line-height: 54rpx;
 	padding: 48rpx 0;

pages/menu/search/index.css

@@ -14,7 +14,105 @@
 	left: 20rpx;
 	top: 50%;
 	transform: translateY(-50%);
+	z-index: 10;
+	
 }
  /deep/ .item_input{
 	padding-left: 76rpx !important;
 }
+
+.goods_list_con{
+	width: 100%;
+	background-color: #F5F7FA;
+	    padding:36rpx 36rpx 140rpx 36rpx;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+}
+.good_item{
+	width: 320rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	margin-bottom: 36rpx;
+}
+.good_item image{
+	width: 100%;
+}
+.text{
+	padding: 24rpx;
+	font-size: 26rpx;
+	color: #303133;
+
+}
+.price{
+	padding: 18rpx 24rpx 36rpx 24rpx;
+	font-size: 28rpx;
+	color: #954DE3;
+	text-align: left;
+}
+
+
+.goods_con{
+	background-color: #F5F7FA;
+}
+
+.goods_list_con{
+	width: 100%;
+	    padding:36rpx 36rpx 140rpx 36rpx;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+}
+.good_item{
+	width: 330rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	margin-bottom: 36rpx;
+}
+.good_item image{
+	width: 100%;
+}
+.text{
+	padding: 0 24rpx;
+	font-size: 26rpx;
+	color: #303133;
+	    display: -webkit-box;
+	    -webkit-box-orient: vertical;
+	    -webkit-line-clamp: 3;
+	    overflow: hidden;
+}
+.price{
+	padding: 18rpx 24rpx 36rpx 24rpx;
+	font-size: 28rpx;
+	color: #954DE3;
+	text-align: left;
+}
+.top_item{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 36rpx;
+	line-height: 108rpx;
+	background-color: #954DE3;
+}
+.one{
+	display: flex;
+	align-items: center;
+}
+.dimg{
+	width: 36rpx;
+	height: 36rpx;
+}
+.white{
+	width: 76rpx;
+	height: 76rpx;
+}
+.white image{
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+.dtext{
+	color: #fff;
+	margin-left: 16rpx;
+}

pages/menu/search/index.vue

@@ -6,9 +6,24 @@
       <view class="sea_con">
       		<u-form-item  :border-bottom="false" class="sea_item">
 				<image  src="../../../static/home/[email protected]" mode="aspectFit" class="img" ></image>
-				<u-input :placeholder="'Search'"  :border="false" :height="80" class="item_input"/></u-form-item>
+				<u-input v-model="name" :placeholder="'Search'"  :border="false" :height="80" class="item_input" @input="search()"/></u-form-item>
       </view>
 
+	<view class="goods_list_con">
+		<view class="good_item" v-for="item,index in goods_list" :key="item.index" @click="goGoodsDetail(item.id)">
+			<image :src="'https://apitest.luck-work.com'+item.goodsImgThumbUrl" mode="aspectFit"></image>
+			<view class="text">
+				{{item.goodsName}}
+			</view>
+			<view class="price">
+				{{currencySymbol}} {{item.goodsPrice}}
+			</view>
+		</view>
+	</view>
+
+
+	
+	
 	</view>
 </template>
 
@@ -20,19 +35,90 @@
 	export default {
 		data() {
 			return {
-			
+			name:"",
+			goods_list:[],
+			currencySymbol:'',
 			}
 		},
 
 		onLoad() {
 		
+			this.openGame()
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
+    
+	   const post2 = api.goodsList({})
+	   .then(res =>{
+	   	this.goods_list=res.data;
+	      for(var i=0;i<this.goods_list.length;i++){
+	   	this.goods_list[i].goodsPrice=parseFloat(this.goods_list[i].goodsPrice).toFixed(2)
+	      }
+	   }).catch(err =>{
+	   	console.log(err)
+	   }) 
 		},
 		
 			onReady() {
 			
 			},
 		methods: {
+			openGame() {
+				const post = api.info()
+				post.then(d => {
+						// uni.setStorage({
+						// 	key: 'Gamestatus',
+						// 	data: d.data.gameMenuStatus,
+						// });
 					
+						if (d.data.gameMenuStatus == 'close') {
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Order',
+								pagePath:'/pages/menu/order/index',
+								iconPath: '/static/tabbar/dorder.png',
+								selectedIconPath: '/static/tabbar/dorderS.png'
+							})
+						}else if (d.data.gameMenuStatus == 'open'){
+							uni.setTabBarItem({
+								index: 2,
+								text: 'Game',
+								pagePath: "/pages/menu/color/index",
+								iconPath: "/static/tabbar/[email protected]",
+								selectedIconPath: "/static/tabbar/[email protected]"
+							})
+						}
+					})
+					.catch((e) => {
+						console.log(e)
+					})
+			},
+	
+			goGoodsDetail(i){
+				uni.navigateTo({
+					url:'../goods/goodsDetail/index?id='+i
+				})
+			},
+		   search(){
+				   const post = api.goodsList({
+				   	"name": this.name,
+				   })
+				   post.then(res => {
+				   	var that = this;
+				   	if (res.errCode == "SUCCESS") {
+				   	this.goods_list=res.data;
+					for(var i=0;i<this.goods_list.length;i++){
+					this.goods_list[i].goodsPrice=parseFloat(this.goods_list[i].goodsPrice).toFixed(2)
+					    }
+				   	} 
+				   	})
+				   	.catch(e => {
+				   	uni.showToast({
+				   		title: e,
+				   		icon: 'none',
+				   		duration: 2500
+				   	})
+				   	})
+			   
+		   }
 			},
 	
 		}

pages/menu/withdrawl/index.css

@@ -15,13 +15,12 @@
 }
 .pro-body-p1{
  font-size: 22px;
-     color: #303133FF;
+     color: #303133;
      text-align: center;
      padding: 30px 0;
      display: flex;
      justify-content: center;
      align-items: center;
-     text-transform: capitalize;
 }
 .category-sigh{
     font-size: 18px;
@@ -42,9 +41,8 @@
 .input-item input{
 	line-height: 96rpx;
 	width: 500rpx;
-	text-transform: capitalize;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 110rpx;
@@ -55,7 +53,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -77,7 +75,7 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .flex{
     display: flex;
@@ -106,7 +104,7 @@
 	margin-bottom: 24rpx;
 }
 .mount:hover{
-	border-color: #34026BFF;
+	border-color: #34026B;
 }
 .rech-capy{
 	margin-top: 25rpx;
@@ -114,7 +112,6 @@
 .payment{
 	font-size: 28rpx;
 	color: #909399;
-	text-transform: capitalize;
 	margin-bottom: 24rpx;
 }
 .capy{
@@ -136,7 +133,6 @@
 	font-size: 28rpx;
 	font-weight: 400;
 	color: #FFFFFF;
-	text-transform: capitalize;
 	text-align: center;
 	opacity: .5;
 }
@@ -169,7 +165,6 @@ bottom: 0;
 z-index: 9999;
 }
 .more-a{
-	text-transform: capitalize;
 	font-size: 32rpx;
 	color: #303133;
 	text-align: center;
@@ -224,6 +219,7 @@ z-index: 9999;
 	align-items: center;
 	padding: 0 24rpx;
 	margin-top: 70rpx;
+	position: relative;
 }
 .img1{
 	width: 40rpx;
@@ -237,8 +233,10 @@ z-index: 9999;
 .text2{
 	color: #909399;
 	font-size: 28rpx;
-	margin-left: 16rpx;
+	position: absolute;
-	margin-left: 120rpx;
+	top: 50%;
+	right: 50rpx;
+	transform: translateY(-50%);
 }
 .img2{
 	width: 28rpx;

pages/menu/withdrawl/index.vue

@@ -4,12 +4,12 @@
 			withdrawal
 			<view class="bread" slot="bread">
 				<image src="../../../static/promo/[email protected]" mode="aspectFit"
-					@click="invMore=true,msShow=true"></image>
+					@click="goWithRecord()"></image>
 			</view>
 		</navigation>
 		<view class="rech-body">
 			<view class="pro-body-p1">Balance:<span data-v-642729fd=""
-					class="category-sigh">{{currentBalance}}</span><span class="s1"></span></view>
+					class="category-sigh">{{currencySymbol}}{{currentBalance}}</span><span class="s1"></span></view>
 			<view>
 				<u-modal v-model="show" width="80%" :show-title="false" confirm-text="Confirm"
 					confirm-color="#954DE3FF">
@@ -19,9 +19,7 @@
 
 			<view class="input-item flex">
 				<view class="login-sigh login-sigh2  flex">
-					<view class="imgcon">
+				{{currencySymbol}}
-						<image src="../../../static/promo/[email protected]" mode="aspectFit"></image>
-					</view>
 				</view>
 				<input value="" placeholder="enter withdrawal amount"
 					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform:capital" v-model="tranAmt"
@@ -29,10 +27,10 @@
 			</view>
 			<view class="p_con">
 				<view class="fee">
-					FEE:{{this.fee}}, TO ACCOUNT {{this.trueMoney}}
+					FEE: {{currencySymbol}}{{this.fee}}, TO ACCOUNT: {{currencySymbol}}{{this.trueMoney}}
 				</view>
 				<view class="minnum">
-					MINIMUM WITHDRAWAL AMOUNT: {{withdrawConfig.withdraw_limit_min}}
+					MINIMUM WITHDRAWAL AMOUNT: {{currencySymbol}}{{withdrawConfig.withdraw_limit_min}}
 				</view>
 			</view>
 			  <view class="rech-capy">
@@ -52,11 +50,11 @@
 				</view>
 			
 			</view> -->
-      <view class="xiala_con" :class="fujiNum==1?'activeErji':''" >
+      <view class="xiala_con" :class="fujiNum==1?'activeErji':''" v-if="BankValue">
       	<view class="fuji " @click="fuji()">
       		<image src="../../../static/login/[email protected]" mode="aspectFit" class="img1"></image>
 			<text class="text1">
-				My Card：3480****6675  
+				{{nameOne}}：{{cardOne}}  
 			</text>
 			<text class="text2">
 				Select
@@ -64,11 +62,10 @@
 			</text>
       	</view>
 		<view class="erji">
-			<view class="item item-active">
+			<view class="item" v-for="item,index in itemList" :key="index" :class="index==itemActive?'item-active':''" @click="toCardOne(item.id,item.acctName,item.acctId,index)">
-				My Card：3480****6675  
+			<text v-if="index==0?true:false">My Card：</text>
-			</view>
+			<text v-if="index!=0?true:false">Card{{index+1}}：</text>
-			<view class="item">
+				{{item.acctId}}
-				Card 2:9200****4028
 			</view>
 			<view class="item" @click="goAddBankCard()" >
 				Add Bank Card
@@ -76,9 +73,9 @@
 		</view>
       </view>
        
-	   <view class="longey_item" @click="goAddBankCard()">
+	   <view class="longey_item" @click="goAddBankCard()" v-if="BankValue==false">
 		   <image src="../../../static/bankCard/[email protected]" mode="aspectFit" class="img1"></image>
-	   <text class="text1">Add Bank Card</text>	
+	   <text class="text1" @click="goAddBankCard()" >Add Bank Card</text>	
 	   </view>
 	   
 	   <view class="input-item flex">
@@ -127,6 +124,7 @@
 		</view>
 		<view class="msg-box-bg" v-show="invMore">
 		</view>
+		<tab-bar :selectActive="5"></tab-bar>
 	</view>
 </template>
 
@@ -138,35 +136,82 @@
 	export default {
 		data() {
 			return {
+				// 银行卡主键id 提现用
+				cid:-1,
+				// 判断是否有银行卡列表返回
+				BankValue:false,
+				// 判断选择卡的数字
+				itemActive:0,
+				// 第一张卡
+				cardOne:'',
+				// 第一张卡的名字
+				nameOne:'',
+				currencySymbol:'',
 				fujiNum:-1,
 				i:0,
 				// 银行卡信息列表
 		
-				
+				itemList:[],
 				currentBalance: '',
-				currencySymbol: '',
 				withdrawConfig: [],
 				show: false,
 				content: '',
 				password: '',
 				tranAmt: '',
 				mobile: '',
-				fee: '',
+				fee: 0.00,
-				trueMoney: '',
+				trueMoney: 0.00,
 				btncol: 0,
 				invMore: false,
 			}
 		},
 
 		onLoad() {
+			this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
 			this.currentBalance = uni.getStorageSync('currentBalance');
 			this.mobile = uni.getStorageSync('loginMobile');
             this.init();
+			this.calulate()
 		},
 		methods: {
+			ba(){
+				//更新余额
+				const post3 = api.withdrawConfig({
+					"ticket": uni.getStorageSync('logInfo').data,
+				})
+				post3.then(res=>{
+				
+				res.data.currentBalance= parseFloat(res.data.currentBalance).toFixed(2)
+				this.currentBalance=res.data.currentBalance;
+					uni.setStorage({
+						key: 'currentBalance',
+						data: res.data.balance,
+						success: function() {
+							console.log('success')
+						}
+					});
+				})
+			},
+			goWithRecord(){
+				uni.navigateTo({
+					url:'withdrawlRecord/index'
+				})
+			},
+			// 赋值给第一张卡
+			toCardOne(a,b,i,d){
+				this.itemActive=i;
+				this.cardOne=i;
+				this.nameOne=b;
+				this.cid=d;
+			},
+			goGoodsDetail(i){
+				uni.navigateTo({
+					url:'goodsDetail/index?id='+i
+				})
+			},
 			goAddBankCard(){
 				uni.navigateTo({
-					url:'../bankCard/addAddress/index'
+					url:'../bankCard/addBankCard/index?wid='+'widthdrawl'
 				})
 			},
 			// 判断下拉函数
@@ -184,9 +229,8 @@
 				})
 				post2.then(res => {
 						this.withdrawConfig = res.data;
+						this.withdrawConfig.withdraw_limit_min=parseFloat(this.withdrawConfig.withdraw_limit_min).toFixed(2)
 						this.content = this.withdrawConfig.tips;
-						console.log(res.data, 8880);
-						console.log(this.withdrawConfig, 9990);
 						this.show = true;
 				
 					})
@@ -202,7 +246,29 @@
 							"ticket": uni.getStorageSync('logInfo').data,
 						})
 						post.then(res => {
-						  // this.itemList=res.data
+							if(res.data.length!=0){
+							    for(var i=0;i<res.data.length;i++){
+									// #ifdef H5
+								res.data[i].acctId=res.data[i].acctId.replaceAll('%20',' ')
+								res.data[i].acctName=res.data[i].acctName.replaceAll('%20',' ')
+									  // #endif
+									  // #ifdef APP-PLUS
+									res.data[i].acctId=res.data[i].acctId.replace(new RegExp('%20',"gm"),' ')
+									res.data[i].acctName=res.data[i].acctName.replace(new RegExp('%20',"gm"),' ')
+									  // #endif
+							 
+							    }
+								this.BankValue=true;
+								this.cardOne=res.data[0].acctId
+								this.nameOne=res.data[0].acctName
+								this.cid=res.data[0].id;
+							    this.itemList=res.data;
+								 
+								
+							}else{
+								this.BankValue=false;
+							}
+						
 							})
 							.catch(e => {
 								uni.showToast({
@@ -231,6 +297,7 @@
 				this.fee = this.tranAmt * 0.1;
 				this.fee = parseFloat(this.fee).toFixed(2)
 				this.trueMoney = this.tranAmt - this.fee;
+				this.trueMoney= parseFloat(this.trueMoney).toFixed(2)
 				this.btncol = 1;
 				if (this.tranAmt == '') {
 					this.btncol = 0;
@@ -240,58 +307,6 @@
 				this.show = true;
 			},
 			widthDrawl() {
-				// if(this.mobile==''){
-				// 	uni.showToast({
-				// 		title: 'Please input mobile phone number',
-				// 		 icon: 'none',
-				// 		duration: 1500
-				// 	})
-				// 	return;
-				// }
-				// var a= /^[0-9]{4,14}$/;
-				// if(!a.test(this.mobile)){
-				// uni.showToast({
-				// 	title: 'Wrong format of mobile phone number',
-				// 	 icon: 'none',
-				// 	duration: 1500
-				// })
-				// return;
-				// }
-				// 	if (this.password == '') {
-				// 		uni.showToast({
-				// 			title: 'password is empty',
-				// 			icon: 'none',
-				// 			duration: 1500
-				// 		})
-				// 		return;
-				// 	}
-				// var a= /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{5,19}$/;
-				// if(!a.test(this.password)){
-				// 	uni.showToast({
-				// 		title: 'Incorrect password format,a password requires a combination of numbers and letters',
-				// 		icon: 'none',
-				// 		duration: 1500
-				// 	})
-				// 	return;
-				// }
-
-				// if(this.tranAmt<withdrawConfig.withdraw_min_amt){
-				//  uni.showToast({
-				//  	title: 'The withdrawal amount cannot be less than the minimum withdrawal amount',
-				//  	icon: 'none',
-				//  	duration: 1500
-				//  })
-				//  return;
-				// }
-
-				// if(this.tranAmt<withdrawConfig.withdraw_max_amt){
-				// 				   uni.showToast({
-				// 				   	title: 'The withdrawal amount cannot be greater than the maximum withdrawal amount',
-				// 				   	icon: 'none',
-				// 				   	duration: 1500
-				// 				   })
-				// 				   return;
-				// }
 				uni.showLoading({
 					title: 'loading'
 				});
@@ -309,7 +324,8 @@
 
 				const post2 = api.withdraw({
 					"ticket": uni.getStorageSync('logInfo').data,
-					// 'password': md5(this.password),
+					'password': md5(this.password),
+					'cardId':this.cid,
 					"tranAmt": this.tranAmt,
 				})
 				post2.then(res => {
@@ -319,15 +335,13 @@
 								icon: 'none',
 								duration: 1500
 							})
-
+                              this.ba();
 							const post = api.withdrawServiceCharge({
 								"ticket": uni.getStorageSync('logInfo').data,
 								// 'password': md5(this.password),
 								"tranAmt": this.tranAmt,
-								"ticket": uni.getStorageSync('logInfo').data,
 							})
 							post.then(res => {
-									console.log(res.data, '45464654646446');
 
 								})
 								.catch(e => {

pages/menu/withdrawl/transactions/index.vue

@@ -2,25 +2,26 @@
 	<view class="content">
 	   <navigation>
 		   transactions
-	    <view class="bread" slot="bread">
+	<!--    <view class="bread" slot="bread">
 	    	<image src="../../../../static/promo/[email protected]" mode="" @click="invMore=true"></image>
-	    </view>
+	    </view> -->
 	   </navigation>
 	   <view class="record_body">
+		   <!--  -->
 	   	<view class="record_item flex" v-for="item,index in record_list" :key="item.id">
 	   		<view class="numcon flex">
-	   			<image src="../../../../static/promo/[email protected]" mode="aspectFit" class="img1"></image>
+	   			<!-- <image src="../../../../static/promo/[email protected]" mode="aspectFit" class="img1"></image> -->
 	   		    <view class="num" >
 	   		    	<view class="rec">
-	   		    		Join period
+	   		    		{{item.witTypeName}}
 	   		    	</view>
 	   				<view class="cpay">
 	   					{{item.addTime}}
 	   				</view>
 	   		    </view>
 	   		</view>
-	   		<view class="time">
+	   		<view class="time" :class="item.type=='out'?'red':'green'">
-	   			-{{item.tranAmt}}
+	   		<text v-if="item.type=='out'">-</text><text v-if="item.type=='in'">+</text>{{currencySymbol}}<span>{{k}}</span>{{item.tranAmt}}
 	   		</view>
 	   	</view>
 	   </view>
@@ -46,6 +47,7 @@
 	   	</view>
 	     <view class="msg-box-bg"  v-show="invMore">
 	</view>
+			<tab-bar :selectActive="5"></tab-bar>
 		</view>
 </template>
 
@@ -57,16 +59,17 @@
 	export default{
 		data(){
 			return{
+				k:' ',
 			pageNumber:1,
 			pageSize:20,
 			record_list:[],
 			invMore:false,
+			currencySymbol:'',
 				}
 			},
 		
 	onLoad() {
-		
+		this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
-		
 		const post = api.billList({
 				"ticket": uni.getStorageSync('logInfo').data,
 				"pageNumber":this.pageNumber,
@@ -77,6 +80,7 @@
 					this.record_list=res.data.content;
 									for(var i=0;i<this.record_list.length;i++){
 										this.record_list[i].addTime=index.formatyymmddhhmmss(this.record_list[i].addTime);
+									    this.record_list[i].tranAmt=parseFloat(this.record_list[i].tranAmt).toFixed(2);
 									}
 				}
 
@@ -184,7 +188,6 @@
 	height: 40rpx;
 }
 .num{
-	margin-left: 20rpx;
 	text-transform: capitalize;
 }
 .rec{
@@ -196,7 +199,12 @@
 	font-size: 28rpx;
 }
 .time{
-	color: #F25B5B;
 	font-size: 28rpx;
 }
+.red{
+	color: #F25B5B;
+}
+.green{
+	color:green;
+}
 </style>

pages/menu/withdrawl/withdrawlRecord/index.vue

@@ -1,26 +1,36 @@
 <template>
 	<view class="content">
 	   <navigation>
-		   withdrawal
+		   withdrawal Record
-	    <view class="bread" slot="bread">
+	 <!--   <view class="bread" slot="bread">
 	    	<image src="../../../../static/promo/[email protected]" mode="" @click="invMore=true"></image>
-	    </view>
+	    </view> -->
 	   </navigation>
+	   <!-- -->
 	   <view class="record_body">
 	   	<view class="record_item flex"  v-for="(item,index) in record_list" :key="item.id">
 	   		<view class="numcon flex">
-	   			<image src="../../../../static/promo/[email protected]" mode="aspectFit" class="img1"></image>
 	   		    <view class="num">
 	   		    	<view class="rec">
-	   		    		{{item.tranAmt}} Wait
+	   		    		{{currencySymbol}}{{item.tranAmt}}
+						
+	   		    	</view>
+	   				<view class="cpay">
+	   					{{item.acctName}}
 	   				</view>
-	   				<view class="cpay" @click="goBalance">
+					<view class="cpay">
-	   					Back to balance
+						{{item.createTime}}
 					</view>
 	   		    </view>
 	   		</view>
+			
 	   		<view class="time">
-	   		   	{{item.createTime}}
+			<view class="wait">
+			    Wait
+			</view>
+	   		   <view>
+	   		      {{item.orderNo}}
+	   		   </view>
 	   		</view>
 	   	</view>
 	   </view>
@@ -45,6 +55,7 @@
 	      	</view>
 	        <view class="msg-box-bg"  v-show="invMore">
 	   </view>
+	   <tab-bar :selectActive="5"></tab-bar>
 	</view>
 	
 </template>
@@ -65,6 +76,7 @@
 			},
 		
 	onLoad() {
+		this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol;
 		const post = api.withdrawList({
 				"ticket": uni.getStorageSync('logInfo').data,
 				"pageNumber":this.pageNumber,
@@ -75,6 +87,7 @@
 					this.record_list=res.data.content;
 					for(var i=0;i<this.record_list.length;i++){
 				this.record_list[i].createTime=index.formatyymmddhhmmss(this.record_list[i].createTime);
+				this.record_list[i].tranAmt=parseFloat(this.record_list[i].tranAmt).toFixed(2)
 						}
 				}
 		
@@ -123,6 +136,11 @@ goBalance(){
 </script>
 
 <style>
+	.wait{
+		color: #303133;
+		margin-bottom: 20rpx;
+		text-align: right;
+	}
 	.invite-more{
 		width: 750rpx;
 	height: 480rpx;
@@ -175,14 +193,13 @@ goBalance(){
 }
 .record_item{
 	height: 144rpx;
+	margin-bottom: 30rpx;
 }
 .numcon .img1{
 	width: 40rpx;
 	height: 40rpx;
 }
-.num{
+
-	margin-left: 20rpx;
-}
 .rec{
 	color: #303133;
 	font-size: 32rpx;

pages/redenvelopes.vue

@@ -0,0 +1,138 @@
+<template>
+	<view class="content">
+	   <navigation :showBack="false">
+		  Red Envelopes
+		  <image src="../static/color/[email protected]" mode="aspectFit" class="back" @click="back()"></image>
+		
+	   </navigation>
+	   <view class="money">
+	   	{{bo.currencySymbol}}{{k}}{{bo.amount}}
+	   </view>
+	   <view class="btn" @click="receive()">
+	   	Continue
+	   </view>
+   </view>
+</template>
+
+<script>
+	import api from '@/utils/api'
+	import utils from '@/utils'
+	import cont from "@/components/navigation/navigation.vue"
+	import index from '@/utils/index.js'
+	export default{
+		data(){
+			return{
+		code:'',
+		k:' ',
+		ticket:'',
+		bo:{},
+				}
+			},
+		
+		onLoad(i) {	
+	    this.ticket=uni.getStorageSync('logInfo').data;
+		this.code=i.code
+		this.getRedInfo();
+},
+	
+		
+		methods:{
+			back(){
+				uni.switchTab({
+					url:'/pages/menu/My/index'
+				})
+			},
+			receive(){
+				const post2 = api.receiveRedEnvelop({
+					"ticket": uni.getStorageSync('logInfo').data,
+					"code":this.code,
+				})
+				post2.then(res => {
+					
+					uni.showToast({
+						title: 'Successfully',
+						icon: 'success',
+						duration: 2500
+					})		
+				
+				
+					})
+					.catch(e => {
+					uni.showToast({
+						title: e,
+						icon: 'none',
+						duration: 2500
+					})
+					})
+			},
+		 getRedInfo(){
+		
+			 const post2 = api.redEnvelop({
+			 	"ticket": uni.getStorageSync('logInfo').data,
+			 	"code":this.code,
+			 })
+			 post2.then(res => {
+				 this.bo=res.data;
+			 	})
+			 	.catch(e => {
+			 	
+			 	})
+		 }
+		
+			},
+		
+				
+	}
+</script>
+
+<style lang="scss" scoped>
+page{
+	height: 100%;
+}
+	/* #ifdef APP-PLUS  */
+	.back{
+		width: 42rpx;
+		height: 42rpx;
+		position: absolute;
+		left:36rpx;
+	    top: 60%;
+		transform: translateY(-50%) rotate(-180deg) ;
+	
+	}
+	  /*  #endif   */
+.back{
+		width: 42rpx;
+		height: 42rpx;
+		position: absolute;
+		left:36rpx;
+        top: 50%;
+		transform: translateY(-50%) rotate(-180deg) ;
+	
+	}
+.content{
+	width: 100%;
+	height: 100%;
+	background: url('../static/bankCard/redBJ.png')no-repeat;
+	background-position: center center;
+	background-size: cover;
+	position: relative;
+}
+.money{
+	font-size: 100rpx;
+	color: #fff;
+	text-align: center;
+	margin-top: 60rpx;
+}
+.btn{
+	width: 678rpx;
+	line-height: 96rpx;
+	text-align: center;
+	color: 28rpx;
+	background-color: #EED19E;
+	border-radius: 24rpx;
+	position: absolute;
+	bottom: 360rpx;
+	left: 50%;
+	transform: translateX(-50%);
+}
+</style>

pages/register/index.css

@@ -21,7 +21,7 @@
 	line-height: 96rpx;
 	width: 500rpx;
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 }
 .login-sigh{
 	width: 172rpx;
@@ -32,7 +32,7 @@
 	content: '';
 	width: 4rpx;
 	height: 26rpx;
-	background-color: #BFC2CCFF;
+	background-color: #BFC2CC;
 	position: absolute;
 	right: 16rpx;
 	top: 50%;
@@ -67,11 +67,11 @@
 }
 .login-sigh .quhao{
 	font-size: 28rpx;
-	color: #303133FF;
+	color: #303133;
 	margin-left: 20rpx;
 }
 .rePass{
-	color: #606266FF;
+	color: #606266;
 	font-size: 28rpx;
 	float: right;
 }
@@ -123,10 +123,10 @@
 .otp{
 	width: 80rpx;
 	line-height: 40rpx;
-	border: 2rpx solid #954DE3FF;
+	border: 2rpx solid #954DE3;
 	border-radius: 8rpx;
 	text-align: center;
-	color:#954DE3FF ;
+	color:#954DE3 ;
 }
 .input_pcod{
 	padding-left: 20rpx;

pages/register/index.vue

@@ -13,38 +13,6 @@
 					placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="mobile"
 					@input="btnControl"  />
 			</view>
-			<view class="input-item flex">
-				<view class="login-sigh login-sigh2  flex">
-					<view class="imgcon">
-						<image src="../../static/login/[email protected]" mode=""></image>
-					</view>
-				</view>
-				<input class="input_pcod" value="" placeholder="Picture Code"
-					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform: capitalize;" v-model="picCode" />
-				<view class="login-sigh3 flex">
-					<image :src="imgcodeUrl" mode="scaleToFill" class="img1"></image>
-					<image src="../../static/login/[email protected]" mode="" class="img2" @click="getPicCode()">
-					</image>
-				</view>
-
-			</view>
-			<view class="input-item flex">
-				<view class="login-sigh login-sigh2  flex">
-					<view class="imgcon">
-						<image src="../../static/login/[email protected]" mode=""></image>
-					</view>
-				</view>
-				<input value="" placeholder="Verification code"
-					placeholder-style="color: #BFC2CCFF;font-size:14px;text-transform: capitalize;"
-					v-model="infoCode" />
-				<view class="wrap">
-					<u-toast ref="uToast"></u-toast>
-					<u-verification-code :seconds="seconds" ref="uCode" @change="codeChange"
-						start-text="OTP" change-text="xs" end-text="OTP"></u-verification-code>
-					<u-button  @tap="getCode" style="color: #954DE3FF; border-radius: 4px;font-size: 15px;width: 20px; height: 24px;line-height: 40px;">{{tips}}</u-button>
-		    
-				</view>
-			</view>
 			<view class="input-item flex">
 				<view class="login-sigh login-sigh2  flex">
 					<view class="imgcon">
@@ -114,7 +82,8 @@
 			}
 		},
 
-		onLoad() {
+		onLoad(invite) {
+			this.inviteCode=invite.inviteCode
 			this.getPicCode();
 			this.areacode = uni.getStorageSync('siteInfo').areaCode;
 		},

uni.scss

@@ -74,8 +74,14 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:36rpx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:30rpx;
-
+uni-app.inapp uni-page-head{
+	display: none;
+}
 
 input{
 	height: 50px;
 }
+
+	    uni-page-head {
+	        display: none;
+	    }

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/eb346f90-00d6-11ec-976e-dfd868741ab5
+https://service.dcloud.net.cn/build/download/2e81c670-1169-11ec-8f72-fb2a1f12c767

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=C:/Users/Administrator/Desktop/zwf88z
+andrCertfile=D:/zwf88z
 andrCertAlias=zwf88z
 andrCertPass=zYkNtsJvQswSIoDx0UnmWw==

unpackage/cache/wgt/__UNI__7E21D6D/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/index","pages/register/index","pages/menu/color/index","pages/menu/promotion/applyRecord/index","pages/menu/promotion/bounsRecord/index","pages/menu/withdrawl/transactions/index","pages/menu/recharge/rechargeRule","pages/menu/withdrawl/transactions/index","pages/menu/withdrawl/withdrawlRecord/index","pages/menu/recharge/index","pages/menu/recharge/record/index","pages/menu/rule/arules/index","pages/menu/aplan/index","pages/menu/withdrawl/index","pages/menu/promotion/promotionRecord/index","pages/menu/recharge/index","pages/menu/My/index","pages/menu/promotion/index","pages/menu/index/index","pages/login/resetPassword/index","pages/menu/rule/index","pages/menu/rule/inviteRule/index"],"window":{"navigationBarTextStyle":"white","navigationBarBackgroundColor":"#34026B"},"tabBar":{"selectedColor":"#34026B","list":[{"text":"Game","pagePath":"pages/menu/color/index","iconPath":"./static/tabbar/meun_icon_game_nor@2x.png","selectedIconPath":"./static/tabbar/meun_icon_game_sel@2x.png"},{"text":"Promotion","pagePath":"pages/menu/promotion/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"My","pagePath":"pages/menu/My/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"first","compilerVersion":"3.1.13","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/login/index","pages/redenvelopes","pages/menu/re/list/index","pages/menu/re/add/index","pages/menu/address/index","pages/menu/order/index","pages/menu/about/RiskDisclosureAGREEMENT","pages/menu/about/privacyPolicy","pages/menu/search/index","pages/menu/goods/index","pages/menu/goods/goodsDetail/index","pages/menu/address/addAddress/index","pages/menu/bankCard/addBankCard/index","pages/menu/bankCard/index","pages/register/index","pages/menu/color/index","pages/menu/colorMoni/index","pages/menu/promotion/applyRecord/index","pages/menu/promotion/bounsRecord/index","pages/menu/withdrawl/transactions/index","pages/menu/recharge/rechargeRule","pages/menu/withdrawl/transactions/index","pages/menu/withdrawl/withdrawlRecord/index","pages/menu/recharge/index","pages/menu/recharge/record/index","pages/menu/rule/arules/index","pages/menu/aplan/index","pages/menu/withdrawl/index","pages/menu/promotion/promotionRecord/index","pages/menu/recharge/index","pages/menu/My/index","pages/menu/promotion/index","pages/menu/index/index","pages/login/resetPassword/index","pages/menu/rule/index","pages/menu/rule/inviteRule/index"],"window":{"navigationBarTextStyle":"white","navigationBarBackgroundColor":"#34026B","style":{"app-plus":{"titleNView":false}}},"tabBar":{"selectedColor":"#34026B","list":[{"text":"Home","pagePath":"pages/menu/goods/index","iconPath":"./static/tabbar/meun_icon_home_nor@3x.png","selectedIconPath":"./static/tabbar/meun_icon_[email protected]g"},{"text":"Search","pagePath":"pages/menu/search/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/meun_icon_search_sel@3x.png"},{"text":"Order","pagePath":"pages/menu/order/index","iconPath":"./static/tabbar/dorder.png","selectedIconPath":"./static/tabbar/dorderS.png"},{"text":"Promotion","pagePath":"pages/menu/promotion/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"My","pagePath":"pages/menu/My/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"Win Gold","compilerVersion":"3.1.18","entryPagePath":"pages/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{}},{"path":"/pages/register/index","meta":{},"window":{}},{"path":"/pages/menu/color/index","meta":{"isQuit":true,"isTabBar":true},"window":{}},{"path":"/pages/menu/promotion/applyRecord/index","meta":{},"window":{}},{"path":"/pages/menu/promotion/bounsRecord/index","meta":{},"window":{}},{"path":"/pages/menu/withdrawl/transactions/index","meta":{},"window":{}},{"path":"/pages/menu/recharge/rechargeRule","meta":{},"window":{}},{"path":"/pages/menu/withdrawl/withdrawlRecord/index","meta":{},"window":{}},{"path":"/pages/menu/recharge/index","meta":{},"window":{}},{"path":"/pages/menu/recharge/record/index","meta":{},"window":{}},{"path":"/pages/menu/rule/arules/index","meta":{},"window":{}},{"path":"/pages/menu/aplan/index","meta":{},"window":{}},{"path":"/pages/menu/withdrawl/index","meta":{},"window":{}},{"path":"/pages/menu/promotion/promotionRecord/index","meta":{},"window":{}},{"path":"/pages/menu/My/index","meta":{"isQuit":true,"isTabBar":true},"window":{}},{"path":"/pages/menu/promotion/index","meta":{"isQuit":true,"isTabBar":true},"window":{}},{"path":"/pages/menu/index/index","meta":{},"window":{}},{"path":"/pages/login/resetPassword/index","meta":{},"window":{}},{"path":"/pages/menu/rule/index","meta":{},"window":{}},{"path":"/pages/menu/rule/inviteRule/index","meta":{},"window":{}}];
+var __uniRoutes = [{"path":"/pages/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/redenvelopes","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/re/list/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/re/add/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/order/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/about/RiskDisclosureAGREEMENT","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/about/privacyPolicy","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/search/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/goods/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/goods/goodsDetail/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/address/addAddress/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/bankCard/addBankCard/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/bankCard/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/register/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/color/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/colorMoni/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/promotion/applyRecord/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/promotion/bounsRecord/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/withdrawl/transactions/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/recharge/rechargeRule","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/withdrawl/withdrawlRecord/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/recharge/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/recharge/record/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/rule/arules/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/aplan/index","meta":{},"window":{}},{"path":"/pages/menu/withdrawl/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/promotion/promotionRecord/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/My/index","meta":{"isQuit":true,"isTabBar":true},"window":{}},{"path":"/pages/menu/promotion/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/index/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/login/resetPassword/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/rule/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/menu/rule/inviteRule/index","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/cache/wgt/__UNI__7E21D6D/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__7E21D6D","name":"first","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#34026B"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI7E21D6D","password":"zYkNtsJvQswSIoDx0UnmWw==","aliasname":"zwf88z","keystore":"google-keystore","custompermissions":true},"apple":{"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":["portrait-primary"],"icons":{"ios":{"prerendered":"false","iphone":{"app@2x":"","app@3x":"","spotlight@2x":"","spotlight@3x":"","settings@2x":"","settings@3x":"","notification@2x":"","notification@3x":""},"appstore":"","ipad":{"app":"","app@2x":"","proapp@2x":"","spotlight":"","spotlight@2x":"","settings":"","settings@2x":"","notification":"","notification@2x":""}},"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"}},"splashscreen":{}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.1.13","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"selectedColor":"#34026B","list":[{"text":"Game","pagePath":"pages/menu/color/index","iconPath":"./static/tabbar/meun_icon_game_nor@2x.png","selectedIconPath":"./static/tabbar/meun_icon_game_sel@2x.png"},{"text":"Promotion","pagePath":"pages/menu/promotion/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"My","pagePath":"pages/menu/My/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html","adid":"127964190008"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__7E21D6D","name":"Win Gold","version":{"name":"1.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#34026B"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","proapp@2x":"unpackage/res/icons/167x167.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png"},"prerendered":"false"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI7E21D6D","password":"zYkNtsJvQswSIoDx0UnmWw==","aliasname":"zwf88z","keystore":"google-keystore","custompermissions":true},"apple":{"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":["portrait-primary"],"splashscreen":{}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.1.18","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"selectedColor":"#34026B","list":[{"text":"Home","pagePath":"pages/menu/goods/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"Search","pagePath":"pages/menu/search/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"Order","pagePath":"pages/menu/order/index","iconPath":"./static/tabbar/dorder.png","selectedIconPath":"./static/tabbar/dorderS.png"},{"text":"Promotion","pagePath":"pages/menu/promotion/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"},{"text":"My","pagePath":"pages/menu/My/index","iconPath":"./static/tabbar/[email protected]","selectedIconPath":"./static/tabbar/[email protected]"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html","adid":"127964190008"}}