上传修改密码钱包地址

components/base/m-navbar.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="navbar bx">
-		<div class="leftClick" 
+		<view class="leftClick" 
 		v-if="leftClick"
 		@click="leftClick();$play()">
-			<uni-icons color="#000" type="left" size="30rpx"></uni-icons>
-		</div>
-		<div>{{ title }}</div>
+			<!-- <uni-icons color="#000" type="left" size="30rpx"></uni-icons> -->
+			
+			<image src="/static/navbar.png"></image>
+			
+		</view>
+		<view>{{ title }}</view>
 	</view>
 </template>
 
@@ -31,7 +34,6 @@
 	height: 90rpx;
 	// background: linear-gradient(to right, #4899a6, #6fc6ad);
 	background: #fff;
-	border-bottom: 1px solid #ccc;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -47,6 +49,10 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		image{
+			width: 60rpx;
+			height: 60rpx;
+		}
 	}
 }
 .navbar-b{

locale/en.js

@@ -254,7 +254,10 @@ export default {
 			"oldPasswordToast": "The old password cannot be empty",
 			"newPasswordToast": "The new password cannot be empty",
 			"confirmNewPasswordToast": "Confirm that the password cannot be empty",
-			"notPasswordToast": "The passwords do not match"
+			"notPasswordToast": "The passwords do not match",
+			"wallet_placeholder" : "Please enter wallet",
+			"Payment_placeholder" : "Please enter payment",
+			"Network" : "Network",
 		},
 		"review": {
 			"title": "PLEASE SELECT",

main.js

@@ -16,6 +16,9 @@ Vue.prototype.request = request
 
 import store from './store/index.js'
 
+import sTabbar from '@/components/base/tabBar.vue'
+
+Vue.component("sTabbar", sTabbar)
 
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)

pages/center/center.vue

@@ -234,14 +234,12 @@
 <script>
 	import changeLanguage from '@/components/changeLanguage/changeLanguage.vue'
 	import serviceList from '@/components/serviceList/serviceList.vue'
-	import sTabbar from '@/components/base/tabBar.vue'
 
 	export default {
 		name: "center",
 		components: {
 			changeLanguage,
 			serviceList,
-			sTabbar
 		},
 		data() {
 			return {
@@ -254,7 +252,7 @@
 					{
 						image : '/static/center/2.png',
 						title: 'wallet',
-						path : '',
+						path : '/modifyUser/modifyUser?type=2',
 					},
 					{
 						image : '/static/center/3.png',

pages/instructions/instructions.vue

@@ -1,7 +1,7 @@
 <!-- 说明页面(四合一) -->
 <template>
 	<view class="instructions bx">
-		<navbar :leftClick="leftClick" :title="title"></navbar>
+		<navbar :leftClick="leftClick"></navbar>
 		
 		<view class="content">
 			<view v-if="$route.query.index == 4" v-html="$t('page.instructions.agreement')"></view>
@@ -53,7 +53,7 @@
 		},
 		methods: {
 			leftClick() {
-				let url = this.$route.query.index == 4 ? '/pages/register/register' : "/pages/home/home"
+				let url = this.$route.query.index == 4 ? '/pages/register/register' : "/pages/center/center"
 				uni.navigateTo({
 					url
 				})

pages/modifyUser/modifyUser.vue

@@ -1,33 +1,71 @@
 <!-- 修改用户信息(二合一) -->
 <template>
 	<view class="modify-user">
-		<navbar :leftClick="leftClick" :title="$t(`page.modifyUser.${titles[$route.query.type]}`)"></navbar>
+		<navbar :leftClick="leftClick"></navbar>
+		
+		<view class="edit-user content" v-if="$route.query.type == 2">
+			<view class="edit-list">
+				<view class="edit-item">
+					<view class="title">{{ $t('page.modifyUser.Network') }}</view>
+					<input type="text" 
+					disabled
+					value="USDT-TRC20"/>
+				</view>
+				
+				<view class="edit-item">
+					<view class="title">{{ $t('page.center.wallet') }}</view>
+					<input type="text" 
+					:placeholder="$t('page.modifyUser.wallet_placeholder')" 
+					v-model="form.newPassword"/>
+				</view>
+				
+				<view class="edit-item">
+					<view class="title">{{ $t('page.center.Payment') }}</view>
+					<input type="text" 
+					:placeholder="$t('page.modifyUser.Payment_placeholder')" 
+					v-model="form.confirmNewPassword"/>
+				</view>
+			</view>
+		</view>
+		
 		
 		<!-- 修改pin -->
-		<view class="edit-user content">
+		<view class="edit-user content" v-else>
 			<view class="edit-list">
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.oldPassword') }}</view>
-					<input type="text" :placeholder="$t('page.modifyUser.oldPasswordPlaceholder')" v-model="form.oldPassword"/>
+					<input type="text" v-model="form.oldPassword"/>
 				</view>
 				
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.newPassword') }}</view>
-					<input type="text" :placeholder="$t('page.modifyUser.newPasswordPlaceholder')" v-model="form.newPassword"/>
+					<input type="text" v-model="form.newPassword"/>
 				</view>
 				
-				<view class="edit-item">
+				<!-- <view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.confirmNewPassword') }}</view>
 					<input type="text" :placeholder="$t('page.modifyUser.newPassword')" v-model="form.confirmNewPassword"/>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		
+		<!-- <view class="box">
+			<view class="edit-item">
+				<view class="title">{{ $t('page.modifyUser.oldPassword') }}</view>
+				<input type="text" :placeholder="$t('page.modifyUser.oldPasswordPlaceholder')" v-model="form.oldPassword"/>
+			</view>
+			
+			<view class="edit-item">
+				<view class="title">{{ $t('page.modifyUser.newPassword') }}</view>
+				<input type="text" :placeholder="$t('page.modifyUser.newPasswordPlaceholder')" v-model="form.newPassword"/>
+			</view>
+		</view> -->
+		
 		<!-- 提交按钮 -->
 		<view class="confirm content" @click="submit">{{ $t('page.modifyUser.confirm') }}</view>
 		
 		<!-- 提示信息 -->
-		<view class="tips content">{{ $t(`page.modifyUser.${tips[$route.query.type]}`) }}</view>
+		<!-- <view class="tips content">{{ $t(`page.modifyUser.${tips[$route.query.type]}`) }}</view> -->
 	</view>
 </template>
 
@@ -115,20 +153,20 @@
 			padding-top: 20rpx;
 			
 			.edit-list{
-				border: 1px solid #ccc;
 				
 				.edit-item{
 					box-sizing: border-box;
 					padding: 15rpx;
-					border-bottom: 1px solid #ccc;
+					display: flex;
+					align-items: center;
 					
-					&:last-child{
-						border: none;
-					}
+					border-bottom: 1px solid #33333377;
 					
 					.title{
 						color: $uni-text-color;
 						font-size: 28rpx;
+						margin-top: 10rpx;
+						min-width: 25%;
 					}
 					
 					input{
@@ -149,8 +187,8 @@
 			background: $uni-bg-color-app;
 			margin: 30rpx auto;
 			border-radius: 20rpx;
-			height: 80rpx;
-			font-size: 40rpx;
+			height: 100rpx;
+			font-size: 35rpx;
 			font-weight: bold;
 			color: $uni-text-color-inverse;
 		}

pages/runningWater/runningWater.vue

@@ -1,7 +1,16 @@
 <!-- 流水页面 -->
 <template>
 	<view class="running-water bx">
-		<navbar :leftClick="leftClick" :title="$t('page.runningWater.title')"></navbar>
+		
+		<view class="type">
+			<view 
+			:class="{select : index == select}" 
+			:key="index"
+			@click="selectType(index)"
+			v-for="(item, index) in type">
+				<text>{{ item.name }}</text>
+			</view>
+		</view>
 		
 		<u-list @scrolltolower="scrolltolower" height="calc(100vh - 90rpx)">
 			<!-- 流水列表 -->
@@ -17,11 +26,14 @@
 				</view>
 			</view>
 		</u-list>
+		
+		<sTabbar/>
 	</view>
 </template>
 
 <script>
-	import navbar from '@/components/base/m-navbar.vue'
+	import index from '../../uni_modules/uview-ui'
+import navbar from '@/components/base/m-navbar.vue'
 
 	export default {
 		components: {
@@ -33,7 +45,19 @@
 					pageNo: 1,
 					pageSize: 10
 				},
-				runningWaterList: []
+				runningWaterList: [],
+				select : 0,
+				type : [
+					{
+						name : 'All'
+					},
+					{
+						name : 'Income'
+					},
+					{
+						name : 'Expenditure'
+					},
+				]
 			}
 		},
 		onShow() {
@@ -46,6 +70,10 @@
 					url: '/pages/center/center'
 				})
 			},
+			
+			selectType(index){
+				this.select = index
+			},
 
 			//获取流水
 			getRunningWater() {
@@ -69,10 +97,38 @@
 	.running-water {
 		width: 750rpx;
 		min-height: 100vh;
-		// background-color: black;
+		background-color: #f7f7f7;
 		margin: 0 auto;
 		background-size: 100%;
 		background-repeat: no-repeat;
+		padding-top: 90rpx;
+		
+		.type{
+			display: flex;
+			background-color: #fff;
+			position: fixed;
+			width: 100%;
+			top: 0;
+			left: 0;
+			height: 90rpx;
+			justify-content: center;
+			align-items: center;
+			color: #989898;
+			font-size: 28rpx;
+			&>view{
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+			.select{
+				color: #000;
+				text{
+					padding-bottom: 10rpx;
+					border-bottom: 3px solid #000;
+				}
+			}
+		}
 
 		.content {
 			width: 96%;