增加登陆页,注册页,找回密码页,首页,tabBar页面,修改部分uview代码

App.vue

@@ -19,18 +19,22 @@ export default {
 
 <style lang="scss">
 /*每个页面公共css */
+@import "uview-ui/index.scss";
 
-/*  #ifdef  H5  */
-body {
-	max-width: 828rpx; //最大宽度自己可以调整
-	margin: auto !important;
+/deep/body {
+	// max-width: 828rpx; //最大宽度自己可以调整
+	// margin: auto !important;
+	background: url(./static/public/BG.png) no-repeat fixed;
+	background-size: cover;
+	height: auto;
+	margin: 0;
 }
 
-/*  #endif  */
-@import "uview-ui/index.scss";
+
+
 
 page {
-	margin-top: 50rpx
+	color: #fff;
 }
 
 button::after {

components/navigation/navigation.vue

@@ -1,94 +1,93 @@
 <template>
 	<view class="nav-head">
-		<slot name="address"></slot>
+		<image src="../../static/public/back.png" mode="aspectFit" class="back" @tap="back()" v-if="showBack"></image>
+		<slot name="left"></slot>
 		<slot></slot>
-		<slot name="bread"></slot>
-		<slot name="logo"></slot>
-		<image src="../../static/tongyonh/Vector.png" mode="aspectFit" class="back" @tap="back()" v-if="showBack"></image>
+		<slot name="middle"></slot>
+		<slot name="right"></slot>
 	</view>
 </template>
 
 <script>
-	const COMPONENT_NAME = 'navigation'
-	export default {
-		name: COMPONENT_NAME,
-	    props:{
-			showBack: {
-				type: Boolean,
-				default () {
-					return true
-				}
-			},
-			bgnum: {
-				type: Boolean,
-				default () {
-					return false
-				}
-			},
+const COMPONENT_NAME = 'navigation'
+export default {
+	name: COMPONENT_NAME,
+	props: {
+		showBack: {
+			type: Boolean,
+			default() {
+				return true
+			}
 		},
-		data() {
-			return {
-		
+		bgnum: {
+			type: Boolean,
+			default() {
+				return false
 			}
 		},
-		computed: {
+	},
+	data() {
+		return {
 
-		},
-		mounted() {
+		}
+	},
+	computed: {
 
-		},
-		methods: {
-		back(){
+	},
+	mounted() {
 
-				// #ifdef H5
-					history.back()
-				// #endif
+	},
+	methods: {
+		back() {
 
-				// #ifdef APP-PLUS	
-				uni.navigateBack()
-				// #endif
-				}	
+			// #ifdef H5
+			history.back()
+			// #endif
+
+			// #ifdef APP-PLUS	
+			uni.navigateBack()
+			// #endif
+		}
 	},
-	}
+}
 </script>
 
 <style scoped lang="scss">
+.item {
+	font-size: 28rpx;
+	text-align: center;
+	width: 234rpx;
+	line-height: 60rpx;
+}
 
-    .item{
-    	font-size: 28rpx;
-    	text-align: center;
-    	width: 234rpx;
-    	line-height: 60rpx;
-    }
-   
-	.nav-head{
-		height: 40rpx;
-		// background-color: #fafafa;
-		// background-color: #fff;
-		text-align: center;
-		font-weight: 700;
-		font-size: 36rpx;
-		color: #000;
-		padding: 40rpx 16rpx;
-		// margin-top: 50rpx;
-		display: flex;
-		justify-content: center;
-		flex-direction: row-reverse;
-		align-items: center;
-		margin-top: 80rpx;
-		position: relative;
-		top: 0rpx;
-		width: 100%;
-		z-index: 8;
+.nav-head {
+	overflow: hidden;
+	position: relative;
+	top: 0rpx;
+	height: 112rpx;
+	// background-color: #fafafa;
+	// background-color: #fff;
+	text-align: center;
+	font-weight: 700;
+	font-size: 36rpx;
+	color: #fff;
+	// padding: 40rpx 16rpx;
+	margin-top: 88rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	z-index: 8;
+	border-bottom: 4rpx solid #323045;
 
-	}
-	.back{
-		width: 30rpx;
-		height: 30rpx;
-		position: absolute;
-		left:36rpx;
-	    top: 50%;
-		transform: translateY(-50%);
-	}
+}
 
+.back {
+	width: 80rpx;
+	height: 80rpx;
+	position: absolute;
+	left: 36rpx;
+	top: 50%;
+	transform: translateY(-50%);
+}
 </style>

components/tabBar/tabBar.vue

@@ -1,195 +1,215 @@
 <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/tongyonh/'+(selectActive==1?'Uniona':'Union')+'.png'" mode="aspectFit" class="img1"></image>
-						</view>
-						<view class="uni-tabbar_label"  :class="['text', selectActive==1?'active':'']">
-						{{i18n.Wallet}}
-						</view>
+	<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 ? 'ic_home_pr' : 'ic_home_de'}.png`"
+							mode="aspectFit" class="img1"></image>
+					</view>
+					<view class="uni-tabbar_label" :class="['text', selectActive == 1 ? 'active' : '']">
+						{{ i18n.Home }}
 					</view>
 				</view>
-			<view class="tabbar_item" @click="goToPage(2)" v-if="showNft">
+			</view>
+			<view class="tabbar_item" @click="goToPage(2)">
 				<view class="uni-tabbar_bd">
 					<view class="uni-tabbar_icon">
-					<image :src="'/static/tongyonh/'+(selectActive==2?'nft_icon2':'nft_icon')+'.png'" mode="aspectFit" class="img1"></image>
+						<image :src="`/static/tabBar/${selectActive == 1 ? 'ic_charity_pr' : 'ic_charity_de'}.png`"
+							mode="aspectFit" class="img1"></image>
 					</view>
-					<view class="uni-tabbar_label"  :class="['text', selectActive==2?'active':'']">
-							{{i18n.NFT}}
+					<view class="uni-tabbar_label" :class="['text', selectActive == 2 ? 'active' : '']">
+						{{ i18n.Markets }}
 					</view>
 				</view>
 			</view>
 			<view class="tabbar_item" @click="goToPage(3)">
 				<view class="uni-tabbar_bd">
 					<view class="uni-tabbar_icon">
-					<image :src="'/static/tongyonh/'+(selectActive==3?'market_icona':'market_icon')+'.png'" mode="aspectFit" class="img1"></image>
+						<image :src="`/static/tabBar/${selectActive == 1 ? 'ic_chart_pr' : 'ic_chart_de'}.png`"
+							mode="aspectFit" class="img1"></image>
 					</view>
-					<view class="uni-tabbar_label"  :class="['text', selectActive==3?'active':'']">
-						{{i18n.Market}}
+					<view class="uni-tabbar_label" :class="['text', selectActive == 3 ? 'active' : '']">
+						{{ i18n.Charity }}
 					</view>
 				</view>
 			</view>
-			<!-- <view class="tabbar_item" @click="goToPage(4)">
+			<view class="tabbar_item" @click="goToPage(4)">
 				<view class="uni-tabbar_bd">
 					<view class="uni-tabbar_icon">
-					<image :src="'/static/tongyonh/'+(selectActive==4?'Discover_icona':'Discover_icon')+'.png'" mode="aspectFit" class="img1"></image>
+						<image :src="`/static/tabBar/${selectActive == 1 ? 'ic_home_pr' : 'ic_home_de'}.png`"
+							mode="aspectFit" class="img1"></image>
 					</view>
-					<view class="uni-tabbar_label"  :class="['text', selectActive==4?'active':'']">
-							{{i18n.Discover}}
+					<view class="uni-tabbar_label" :class="['text', selectActive == 4 ? 'active' : '']">
+						{{ i18n.Subscription }}
 					</view>
 				</view>
-			</view> -->
+			</view>
 			<view class="tabbar_item" @click="goToPage(5)">
 				<view class="uni-tabbar_bd">
 					<view class="uni-tabbar_icon">
-					<image :src="'/static/tongyonh/'+(selectActive==5?'Profile_icon':'Profile_icona')+'.png'" mode="aspectFit" class="img1"></image>
+						<image :src="`/static/tabBar/${selectActive == 1 ? 'ic_me_pr' : 'ic_me_de'}.png`"
+							mode="aspectFit" class="img1"></image>
 					</view>
-					<view class="uni-tabbar_label"  :class="['text', selectActive==5?'active':'']">
-						{{i18n.Profile}}
+					<view class="uni-tabbar_label" :class="['text', selectActive == 5 ? 'active' : '']">
+						{{ i18n.Me }}
 					</view>
 				</view>
 			</view>
-			</view>
-			</view>
+		</view>
+	</view>
 </template>
 <script>
 
-	const COMPONENT_NAME = 'tabBar'
-	export default {
-		name: COMPONENT_NAME,
+const COMPONENT_NAME = 'tabBar'
+export default {
+	name: COMPONENT_NAME,
 
 
 
-		props: {
+	props: {
 		selectActive: {
 			type: Number,
-			default () {
+			default() {
 				return 1
 			}
 		},
-		},
-		data() {
-			return {
-				showNft:null,
-				status:'',
-				address:'',
-			}
-		},
-		computed: {
+	},
+	data() {
+		return {
+			status: '',
+			address: '',
+		}
+	},
+	computed: {
 
-		},
-		mounted() {
-			this.showNft=uni.getStorageSync('showNft')
-			console.log(this.showNft,78787878787878787878787878787878)
-		},
-		methods: {
+	},
+	mounted() {
+	},
+	methods: {
 
 		goToPage(num) {
-				if(num == 1) {
-					uni.reLaunch({
-						url: '/pages/menu/wallet/index'
-					})
-					
-				} else if (num == 2) {
-				uni.reLaunch({
-					url: '/pages/menu/collection/index'
-				})
-				} else if (num == 3) {
-					uni.reLaunch({
-						url: '/pages/menu/market/index'
-					})
-				}else if (num == 4) {
-					uni.reLaunch({
-						url: '/pages/menu/discover/index'
-					})
-				}else if (num == 5) {
-					uni.reLaunch({
-						url: '/pages/menu/profile/index'
-					})
-				}
+			let url = '/pages/index/index';
+			switch (+num) {
+				case 1:
+					url = '/pages/index/index';
+					break;
+				case 2:
+					url = '/pages/markets/index';
+					break;
+				case 3:
+					url = '/pages/charity/index';
+					break;
+				case 4:
+					url = '/pages/subscription/index';
+					break;
+				case 5:
+					url = '/pages/me/index';
+					break;
 
+				default:
+					break;
 			}
+			uni.reLaunch({
+				url: '/pages/menu/profile/index'
+			})
+
+		}
 
 	},
 	computed: {
 		i18n() {
-			return this.$t('index')
+			return this.$t('tabBar')
 		},
 	}
-	}
+}
 </script>
 
 
 <style scoped lang="scss">
-	.active{
-		color: #5B53FF !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;
+.active {
+	color: $mainColor  !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{
+
+.uni-tabbar_label {
+	color: #A1A0A8;
+	font-size: 10px;
+	line-height: normal;
+	margin-top: 3px;
+	position: relative;
+	text-align: center;
+	font-size: 24rpx !important;
+
+}
+
+.uni-tabbar_icon {
+	width: 48rpx !important;
+	height: 48rpx !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;
-	   left: 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;
+	height: 166rpx;
+	background-color: #323045;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	padding-top: 22rpx;
+	display: flex;
+	z-index: 998;
+	box-sizing: border-box;
+
+	&::after {
+		display: block;
+		position: absolute;
+		content: '';
+		background: #fff;
+		width: 268rpx;
+		height: 10rpx;
+		border-radius: 10rpx;
+		top: 140rpx;
+		left: 242rpx;
+	}
 }
-.tabbar_item{
+
+.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);
+	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

@@ -12,10 +12,10 @@ import ZH from './utils/language/zh.js'
 
 
 // 自定义底部导航栏
-// import tabBar from 'components/tabBar/tabBar.vue'
-// Vue.component('tab-bar', tabBar)
+import tabBar from 'components/tabBar/tabBar.vue'
+Vue.component('tab-bar', tabBar)
 
-Vue.use(uView)
+Vue.use(uView);
 uni.$u.config.unit = 'rpx'
 
 Vue.use(VueI18n);

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "massfitnes",
+    "name" : "samehome",
     "appid" : "__UNI__2B017B1",
     "description" : "",
     "versionName" : "1.0.0",

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "massfitnes",
+  "name": "samehome",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -93,6 +93,11 @@
         "mime-types": "^2.1.12"
       }
     },
+    "js-md5": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
@@ -111,6 +116,11 @@
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
+    "uview-ui": {
+      "version": "2.0.33",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.33.tgz",
+      "integrity": "sha512-M3NsLFAY0z95NGMnTCDUR/TvJb6a/UYZzi1km5Gi6TkBCaoHdbmtQymkc1C4eszeoQOrpEIhit/2V47UglzHRw=="
+    },
     "vue-i18n": {
       "version": "9.2.2",
       "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.2.2.tgz",

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "massfitnes",
+  "name": "samehome",
   "version": "1.0.0",
   "description": "",
   "main": "main.js",
@@ -11,6 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.27.2",
+    "js-md5": "^0.7.3",
+    "uview-ui": "^2.0.33",
     "vue-i18n": "^9.2.2"
   }
 }

pages.json

@@ -1,14 +1,36 @@
 {
 	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+
+
+		
 		{
 			"path": "pages/login/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/login/forget",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -19,8 +41,8 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#15141F",
+		"backgroundColor": "#15141F",
 		"style": {
 			"app-plus": {
 				"titleNView": false

pages/index/index.vue

@@ -1,51 +1,252 @@
 <template>
-	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+	<view class="main">
+		<view class="nav-head">
+			<view class="title">{{ i18n.HOME }}</view>
+			<u-button class="button" color="#323045">{{ i18n.customerService }}</u-button>
 		</view>
+
+		<u-swiper class="swiper" :list="swiperList" previousMargin="48rpx" nextMargin="80rpx" circular :autoplay="true"
+			radius="32rpx" bgColor="rgba(0,0,0,0)" height="360rpx"></u-swiper>
+		<view class="message">
+			<u-icon class="icon" name="../../static/home/ic_proclamation.png" size="60rpx" width="60rpx"></u-icon>
+			<view class="text">{{ i18n.homeMessage }}</view>
+		</view>
+		<view class="btnDiv">
+			<view class="item">
+				<u--image class="img" :showLoading="true" src="../../static/home/img_recharge.png" width="144rpx"
+					height="144rpx" @click="click"></u--image>
+				<view class="text">{{ i18n.Recharge }}</view>
+			</view>
+			<view class="item">
+				<u--image class="img" :showLoading="true" src="../../static/home/img_Mine.png" width="144rpx"
+					height="144rpx" @click="click"></u--image>
+				<view class="text">{{ i18n.Mine }}</view>
+			</view>
+			<view class="item">
+				<u--image class="img" :showLoading="true" src="../../static/home/img_Subcription.png" width="144rpx"
+					height="144rpx" @click="click"></u--image>
+				<view class="text">{{ i18n.Subcription }}</view>
+			</view>
+		</view>
+		<view class="steps">
+			<view class="content">
+				<view class="title">{{ i18n.TodaySteps }}</view>
+				<u-button class="button" color="#00E8A2">{{ i18n.ReceiveEarnings }}</u-button>
+			</view>
+		</view>
+		<view v-for="(item, index) in videoList" :key="index">
+			<video class="video" :id="`video-${index}`" :enable-progress-gesture="false" :src="item.url"
+				:poster="item.poster" :title="item.title" controls @play="stopOtherVideoPlay" :key="index" ></video>
+		</view>
+		<tab-bar :selectActive="1"></tab-bar>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				title: 'Hello'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
+let videoPlayerObj = {};
+export default {
+	name: 'home',
+	data() {
+		return {
+			swiperList: [
+				'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+				'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+				'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+			],
+			videoList: [
+				{
+					url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+					title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+					poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				},
+				{
+					url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+					title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+					poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				},
+				{
+					url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+					title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+					poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				},
+				{
+					url: 'https://cdn.uviewui.com/uview/resources/video.mp4',
+					title: '昨夜星辰昨夜风，画楼西畔桂堂东',
+					poster: 'https://cdn.uviewui.com/uview/swiper/swiper1.png'
+				},
+			],
+		}
+	},
+	onLoad() {
 
+	},
+	onShow() {
+		// 生成播放器队列对象
+		this.videoList.forEach((item, index) => {
+			const VideoPlayer = uni.createVideoContext(`video-${index}`, this)
+			videoPlayerObj[`video-${index}`] = VideoPlayer
+		});
+	},
+	onHide() {
+		this.stopAllVideoPlay()
+	},
+	computed: {
+		i18n() {
+			return this.$t('home')
 		}
+	},
+	methods: {
+		/**
+		 *  在播放视频是暂停其他视频
+		 * @param {*} e 
+		 */
+		stopOtherVideoPlay(e) {
+			const keyArr = Object.keys(videoPlayerObj)
+			keyArr.forEach(item => {
+				if (item !== e.target.id) {
+					videoPlayerObj[item].pause()
+				}
+			});
+		},
+		/**
+		 *  在跳转其他页面时是暂停全部视频
+		 * @param {*} e 
+		 */
+		stopAllVideoPlay() {
+			const keyArr = Object.keys(videoPlayerObj)
+			keyArr.forEach(item => {
+				videoPlayerObj[item].pause()
+			});
+		},
 	}
+}
 </script>
 
 <style lang="scss">
-	.content {
+.main {
+	.nav-head {
+		overflow: hidden;
+		position: relative;
+		top: 0rpx;
+		height: 112rpx;
+		// text-align: center;
+		font-weight: 700;
+		font-size: 36rpx;
+		color: #fff;
+		margin-top: 88rpx;
 		display: flex;
-		flex-direction: column;
+		// justify-content: space-between;
 		align-items: center;
-		justify-content: center;
+		width: 100%;
+		z-index: 8;
+		border-bottom: 4rpx solid #323045;
+
+		.title {
+			margin-left: 48rpx;
+		}
+
+		.button {
+			width: 286rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			border-radius: 90rpx;
+			font-size: 28rpx;
+			color: #F2FE8D !important;
+			padding: 0;
+			margin-right: 24rpx;
+		}
 	}
 
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
+	.swiper {
+		margin-top: 32rpx;
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.message {
+		margin: 24rpx 24rpx 32rpx;
+		height: 96rpx;
+		background: #211F32;
+		border-radius: 16rpx;
+
+		.icon {
+			display: inline-block;
+			vertical-align: top;
+			margin: 18rpx 20rpx;
+		}
+
+		.text {
+			display: inline-block;
+			margin-top: 18rpx;
+			height: 68rpx;
+			width: 574rpx;
+			font-size: 24rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-wrap: break-word;
+			white-space: normal !important;
+			//显示4行
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
 	}
 
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
+	.btnDiv {
+		margin: 32rpx 48rpx;
+
+		.item {
+			display: inline-block;
+			width: 218rpx;
+			text-align: center;
+
+			.img {
+				margin: 0 36rpx 16rpx;
+			}
+		}
 	}
+
+	.steps {
+		margin: 0 32rpx;
+		width: 686rpx;
+		height: 472rpx;
+		background-color: #211F32;
+		background-image: url(../../static/home/img_People.png);
+		background-repeat: no-repeat;
+		background-size: contain;
+		border-radius: 16px;
+
+		.content {
+			margin-left: 246rpx;
+			height: 100%;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			flex-direction: column;
+
+			.title {
+				font-size: 48rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+			}
+
+			.button {
+				width: 386rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				border-radius: 40rpx;
+				font-size: 24rpx;
+				color: #15141F !important;
+				padding: 0;
+				margin-right: 24rpx;
+			}
+		}
+	}
+
+	.video {
+		margin: 32rpx 32rpx 0;
+		width: 686rpx;
+		height: 360rpx;
+		border-radius: 32rpx;
+	}
+
+}
 </style>

pages/login/forget.vue

@@ -0,0 +1,161 @@
+<template>
+    <view class="main">
+        <navigation>{{ i18n.ForgotPassword }}</navigation>
+        <view class="body">
+            <u--form class="form" :model="userInfo" :rules="rules" ref="form1" errorType="toast">
+                <!-- 邮箱 -->
+                <u-form-item class="input-item" prop="email" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.email ? '../../static/login/email_pr.png' : '../../static/login/email_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.email" color="#fff" fontSize="32rpx" border="none"
+                        :placeholder="i18n.emailInputText">
+                    </u-input>
+                </u-form-item>
+                <!-- 验证码 -->
+                <u-form-item class="input-item vCode" prop="verificationCode" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.verificationCode ? '../../static/login/code_pr.png' : '../../static/login/code_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.verificationCode" color="#fff" fontSize="32rpx"
+                        border="none" :placeholder="i18n.registerWelcomeText" maxlength="6">
+                    </u-input>
+                    <u-button class="getVCodeBtn" color="#323045">Get code</u-button>
+                </u-form-item>
+                <!-- 密码 -->
+                <u-form-item class="input-item" prop="password" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.password ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.password" color="#fff" fontSize="32rpx" border="none"
+                        :placeholder="i18n.passwordText">
+                    </u-input>
+                </u-form-item>
+                <!-- 重复密码 -->
+                <u-form-item class="input-item" prop="confirmPassword" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.confirmPassword ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.confirmPassword" color="#fff" fontSize="32rpx"
+                        border="none" :placeholder="i18n.confirmPasswordText">
+                    </u-input>
+                </u-form-item>
+
+            </u--form>
+            <u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag">{{ i18n.Save }}
+            </u-button>
+        </view>
+
+
+    </view>
+</template>
+
+<script>
+import UButton from '../../uview-ui/components/u-button/u-button.vue'
+export default {
+    name: "ForgotPassword",
+    data() {
+        return {
+            userInfo: {
+                name: "",
+                password: "",
+            },
+            rules: {
+                email: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.emailInputMessage"),
+                    trigger: ["blur", "change"],
+                },
+                verificationCode: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.verificationCodeMessage"),
+                    trigger: ["blur", "change"]
+                },
+                password: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.passwordInputMessage"),
+                    trigger: ["blur", "change"]
+                },
+            },
+            agreeFlag: false,
+        };
+    },
+    computed: {
+        i18n() {
+            return this.$t("login");
+        },
+    },
+    onLoad() {
+        // console.log(this.$t('login.emailInputMessage'));
+    },
+    onShow() { },
+    methods: {},
+    components: { UButton }
+}
+</script>
+
+<style lang="scss">
+.main {
+
+    .body {
+        padding: 0 64rpx;
+        overflow: hidden;
+
+        .form {
+            font-size: 32rpx;
+            margin-top: 48rpx;
+
+            .input-item {
+                height: 112rpx;
+                line-height: 112rpx;
+                background: #211F32;
+                margin-bottom: 48rpx;
+                border-radius: 32rpx;
+
+                .icon {
+                    margin: 0 24rpx;
+                }
+
+                /deep/.u-form-item__body {
+                    padding: 0;
+                }
+
+                .input {
+                    height: 112rpx;
+                }
+            }
+
+            .vCode {
+
+                .getVCodeBtn {
+                    // position: absolute;
+                    width: 154rpx;
+                    height: 56rpx;
+                    right: 28rpx;
+                    // top: 14px;
+                    border-radius: 8px;
+                    line-height: 56rpx;
+                    font-size: 24rpx;
+                    color: #00E8A2 !important;
+                    padding: 0;
+                }
+            }
+        }
+
+        .button {
+            margin-top: 64rpx;
+            height: 112rpx;
+            line-height: 112rpx;
+            border-radius: 32rpx;
+            font-size: 32rpx;
+            color: #15141F !important;
+        }
+
+
+    }
+
+}
+</style>

pages/login/index.vue

@@ -1,13 +1,28 @@
 <template>
     <view class="main">
-        111
         <view class="welcomeText">{{ i18n.welcomeText }}</view>
         <view class="signInText">{{ i18n.signInText }}</view>
-        <u-form labelPosition="left" :model="model1" :rules="rules" ref="form1">
-            <u-form-item prop="userInfo.name" borderBottom ref="item1">
-                <u-input v-model="model1.userInfo.name"></u-input>
+        <u--form class="form" :model="userInfo" :rules="rules" ref="form1" errorType="toast">
+            <u-form-item class="input-item" prop="email" ref="item1">
+                <u-icon class="icon"
+                    :name="userInfo.email ? '../../static/login/email_pr.png' : '../../static/login/email_de.png'"
+                    size="48rpx" width="48rpx"></u-icon>
+                <u-input class="input" v-model="userInfo.email" color="#fff" fontSize="32rpx" border="none"
+                    :placeholder="i18n.emailInputText">
+                </u-input>
             </u-form-item>
-        </u-form>
+            <u-form-item class="input-item" prop="password" ref="item1">
+                <u-icon class="icon"
+                    :name="userInfo.password ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+                    size="48rpx" width="48rpx"></u-icon>
+                <u-input class="input" v-model="userInfo.password" color="#fff" fontSize="32rpx" border="none"
+                    :placeholder="i18n.passwordInputText">
+                </u-input>
+            </u-form-item>
+        </u--form>
+        <navigator class="forget" url="./forget">{{ i18n.forgotText }}</navigator>
+        <u-button class="button" color="#00E8A2">{{ i18n.Login }}</u-button>
+        <view class="signUp">{{ i18n.notAccountText }}<navigator class="navigator" url="./register">{{ i18n.SignUp }}</navigator></view>
 
     </view>
 </template>
@@ -17,7 +32,24 @@ export default {
     name: 'login',
     data() {
         return {
-
+            userInfo: {
+                name: '',
+                password: '',
+            },
+            rules: {
+                email: {
+                    type: 'string',
+                    required: true,
+                    message: this.$t('login.emailInputMessage'),
+                    trigger: ['blur', 'change'],
+                },
+                password: {
+                    type: 'string',
+                    required: true,
+                    message: this.$t('login.passwordInputMessage'),
+                    trigger: ['blur', 'change']
+                },
+            },
         }
     },
     computed: {
@@ -26,7 +58,7 @@ export default {
         },
     },
     onLoad() {
-        console.log(this.i18n);
+        // console.log(this.$t('login.emailInputMessage'));
     },
     onShow() { },
     methods: {
@@ -37,4 +69,78 @@ export default {
 </script>
 
 <style lang="scss">
+.main {
+    padding: 0 64rpx;
+    overflow: hidden;
+
+    .welcomeText {
+        margin-top: 240rpx;
+        font-size: 48rpx;
+        font-weight: 800;
+        text-align: center;
+    }
+
+    .signInText {
+        font-size: 32rpx;
+        text-align: center;
+        color: #A2A0A8;
+    }
+
+    .form {
+        font-size: 32rpx;
+        margin-top: 48rpx;
+
+        .input-item {
+            height: 112rpx;
+            line-height: 112rpx;
+            background: #211F32;
+            margin-bottom: 48rpx;
+            border-radius: 32rpx;
+
+            &:nth-child(2) {
+                margin-bottom: 38rpx;
+            }
+
+            .icon {
+                margin: 0 24rpx;
+            }
+
+            /deep/.u-form-item__body {
+                padding: 0;
+            }
+
+            .input {
+                height: 112rpx;
+            }
+        }
+    }
+
+    .forget {
+        font-size: 32rpx;
+        text-align: right;
+        color: #00E8A2;
+        cursor: pointer;
+    }
+
+    .button {
+        margin-top: 64rpx;
+        height: 112rpx;
+        line-height: 112rpx;
+        border-radius: 32rpx;
+        font-size: 32rpx;
+        color:#15141F !important;
+    }
+
+    .signUp {
+        margin: 48rpx 0;
+        text-align: center;
+        font-size: 32rpx;
+
+        navigator {
+            display: inline;
+            color: #00E8A2;
+            padding: 0 10rpx;
+        }
+    }
+}
 </style>

pages/login/register.vue

@@ -0,0 +1,237 @@
+<template>
+    <view class="main">
+        <navigation>{{ i18n.SignUp }}</navigation>
+        <view class="body">
+            <view class="welcomeText">{{ i18n.registerWelcomeText }}</view>
+            <view class="signInText">{{ i18n.registerCreate }}</view>
+            <u--form class="form" :model="userInfo" :rules="rules" ref="form1" errorType="toast">
+                <!-- 邮箱 -->
+                <u-form-item class="input-item" prop="email" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.email ? '../../static/login/email_pr.png' : '../../static/login/email_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.email" color="#fff" fontSize="32rpx" border="none"
+                        :placeholder="i18n.emailInputText">
+                    </u-input>
+                </u-form-item>
+                <!-- 验证码 -->
+                <u-form-item class="input-item vCode" prop="verificationCode" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.verificationCode ? '../../static/login/code_pr.png' : '../../static/login/code_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.verificationCode" color="#fff" fontSize="32rpx"
+                        border="none" :placeholder="i18n.registerWelcomeText" maxlength="6">
+                    </u-input>
+                    <u-button class="getVCodeBtn" color="#323045">Get code</u-button>
+                </u-form-item>
+                <!-- 密码 -->
+                <u-form-item class="input-item" prop="password" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.password ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.password" color="#fff" fontSize="32rpx" border="none"
+                        :placeholder="i18n.passwordText">
+                    </u-input>
+                </u-form-item>
+                <!-- 重复密码 -->
+                <u-form-item class="input-item" prop="confirmPassword" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.confirmPassword ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.confirmPassword" color="#fff" fontSize="32rpx"
+                        border="none" :placeholder="i18n.confirmPasswordText">
+                    </u-input>
+                </u-form-item>
+                <!-- 取款密码 -->
+                <u-form-item class="input-item" prop="withdrawalPassword" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.withdrawalPassword ? '../../static/login/WithdrawalPassword_pr.png' : '../../static/login/WithdrawalPassword_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.withdrawalPassword" color="#fff" fontSize="32rpx"
+                        border="none" :placeholder="i18n.withdrawalPasswordText">
+                    </u-input>
+                </u-form-item>
+                <!-- 邀请码 -->
+                <u-form-item class="input-item" prop="InvitationCode" ref="item1">
+                    <u-icon class="icon"
+                        :name="userInfo.InvitationCode ? '../../static/login/Invitation_pr.png' : '../../static/login/Invitation_de.png'"
+                        size="48rpx" width="48rpx"></u-icon>
+                    <u-input class="input" v-model="userInfo.InvitationCode" color="#fff" fontSize="32rpx" border="none"
+                        :placeholder="i18n.InvitationCodeText">
+                    </u-input>
+                </u-form-item>
+            </u--form>
+            <view class="agree">
+                <u-icon class="check" @click="agreeFlag = !agreeFlag"
+                    :name="agreeFlag ? '../../static/login/Checkbox_pr.png' : '../../static/login/Checkbox_de.png'"
+                    size="48rpx" width="48rpx"></u-icon>
+                <view class="text">{{ i18n.agreeText }}<span>{{ i18n.Terms }}</span>{{ i18n.and }}<span>{{
+                        i18n.Conditions
+                }}</span></view>
+            </view>
+            <u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag">{{ i18n.SignUp }}
+            </u-button>
+            <view class="signUp">{{ i18n.haveAccount }}<navigator class="navigator" url="./index">{{ i18n.Login }}
+                </navigator>
+            </view>
+        </view>
+
+
+    </view>
+</template>
+
+<script>
+import UButton from '../../uview-ui/components/u-button/u-button.vue'
+export default {
+    name: "register",
+    data() {
+        return {
+            userInfo: {
+                name: "",
+                password: "",
+            },
+            rules: {
+                email: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.emailInputMessage"),
+                    trigger: ["blur", "change"],
+                },
+                verificationCode: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.verificationCodeMessage"),
+                    trigger: ["blur", "change"]
+                },
+                password: {
+                    type: "string",
+                    required: true,
+                    message: this.$t("login.passwordInputMessage"),
+                    trigger: ["blur", "change"]
+                },
+            },
+            agreeFlag: false,
+        };
+    },
+    computed: {
+        i18n() {
+            return this.$t("login");
+        },
+    },
+    onLoad() {
+        // console.log(this.$t('login.emailInputMessage'));
+    },
+    onShow() { },
+    methods: {},
+    components: { UButton }
+}
+</script>
+
+<style lang="scss">
+.main {
+
+    .body {
+        padding: 0 64rpx;
+        overflow: hidden;
+
+        .welcomeText {
+            margin-top: 48rpx;
+            font-size: 48rpx;
+            font-weight: 800;
+            text-align: center;
+        }
+
+        .signInText {
+            font-size: 32rpx;
+            text-align: center;
+            color: #A2A0A8;
+        }
+
+        .form {
+            font-size: 32rpx;
+            margin-top: 48rpx;
+
+            .input-item {
+                height: 112rpx;
+                line-height: 112rpx;
+                background: #211F32;
+                margin-bottom: 48rpx;
+                border-radius: 32rpx;
+
+                .icon {
+                    margin: 0 24rpx;
+                }
+
+                /deep/.u-form-item__body {
+                    padding: 0;
+                }
+
+                .input {
+                    height: 112rpx;
+                }
+            }
+
+            .vCode {
+
+                .getVCodeBtn {
+                    // position: absolute;
+                    width: 154rpx;
+                    height: 56rpx;
+                    right: 28rpx;
+                    // top: 14px;
+                    border-radius: 8px;
+                    line-height: 56rpx;
+                    font-size: 24rpx;
+                    color: #00E8A2 !important;
+                    padding: 0;
+                }
+            }
+        }
+
+        .agree {
+            font-size: 28rpx;
+
+            .check {
+                display: inline-block;
+                vertical-align: top;
+                margin-right: 32rpx;
+            }
+
+            .text {
+                display: inline-block;
+                width: 542rpx;
+            }
+
+            span {
+                cursor: pointer;
+                color: #00E8A2;
+                padding: 0 10rpx;
+
+            }
+        }
+
+        .button {
+            margin-top: 64rpx;
+            height: 112rpx;
+            line-height: 112rpx;
+            border-radius: 32rpx;
+            font-size: 32rpx;
+            color: #15141F !important;
+        }
+
+        .signUp {
+            margin: 48rpx 0;
+            text-align: center;
+            font-size: 32rpx;
+
+            .navigator {
+                display: inline;
+                color: #00E8A2;
+                padding: 0 10rpx;
+            }
+
+        }
+    }
+
+}
+</style>

readme.md

@@ -0,0 +1,13 @@
+
+从git下拉带代码后
+项目中的 \node_modules\uview-ui\components\u-form\u-form.vue 第17行要添加下面这行代码
+this.errorType === 'toast' ?uni.$u.toast(errors[0].message):
+
+添加后是这样的:
+if (uni.$u.test.array(errors)) {
+	errorsRes.push(...errors);
+	childErrors.push(...errors);
+}
+this.errorType === 'toast' ?uni.$u.toast(errors[0].message):
+child.message =
+	childErrors[0]?.message ?? null;

uni.scss

@@ -17,10 +17,11 @@
 
 /* 颜色变量 */
 
-$u-type-warning: #F2FE8D;
-$u-type-success: #00E8A2;
-$u-type-error: #F4506A;
-$u-type-info: #A1A0A8;
+
+$assistYellow: #F2FE8D;
+$mainColor: #00E8A2;
+$assistRed: #F4506A;
+$assistGrey: #A1A0A8;
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;

utils/api.js

@@ -1,28 +1,81 @@
 import Vue from 'vue';
 import qs from 'qs'
 const api = {
-	//获取NFT项目列表
-	getNftProjectList: (params) => Vue.prototype.$axios.get('/api/nft/getNftProjectList?' + qs.stringify(params)),
-	//添加NFT收藏品
-	addNftCollection: (params) => Vue.prototype.$axios.post('/api/nft/addNftCollection', qs.stringify(params)),
-	getNftCollectionList: (params) => Vue.prototype.$axios.get('/api/nft/getNftCollectionList?' + qs.stringify(
-		params)),
-	getContractInfoList: (params) => Vue.prototype.$axios.get('/api/contract/getContractInfoList?' + qs.stringify(params)),
-	//获取汇率
-	getCoinRate: (params) => Vue.prototype.$axios.get('/api/coinRate/getCoinRate?' + qs.stringify(params)),
-	getChainDataList: (params) => Vue.prototype.$axios.get('/api/chainData/getChainDataList?' + qs.stringify(params)),
-	getCoinTickerList: (params) => Vue.prototype.$axios.get('/api/coinTicker/getCoinTickerList'),
-	getBalance: (params) => Vue.prototype.$axios.get('/api/balance/getBalance?' + qs.stringify(params)),
-	versionUpgrade: (params) => Vue.prototype.$axios.get('/api/home/versionUpgrade?' + qs.stringify(params)),
-	checkIp: () => Vue.prototype.$axios.get('/x/resource/ip'),
-	getConfig: (params) => Vue.prototype.$axios.get('/api/home/getConfig?'+ qs.stringify(params)),
-	//--------------------------------- free ---------------------------------
-	getSearchContract: (params) => Vue.prototype.$axios.get('/api/contract/getSearchContract?' + qs.stringify(params)),
-  
-	getAuAdList: (params) => Vue.prototype.$axios.get('/api/home/getAuAdList?'+ qs.stringify(params)),
-	// 令牌token接口
-	addTokenInfo: (params) => Vue.prototype.$axios.post('/api/token/addTokenInfo', qs.stringify(params)),
-}
+  //---------------------------------account---------------------------------
+  siteInfo: () => Vue.prototype.$axios.get('/api/home/siteInfo'),
+  register: (params) => Vue.prototype.$axios.post('/api/home/register',params),
+  login: (params) => Vue.prototype.$axios.post('/api/user/login',params),
+  loginOut: (params) => Vue.prototype.$axios.post('/api/user/loginOut',params),
+  forgotPassword: (params) => Vue.prototype.$axios.post('/api/user/forgotPassword',params),
+  updatePassword: (params) => Vue.prototype.$axios.post('/api/user/updatePassword',params),
+  userInfo: (params) => Vue.prototype.$axios.post('/api/user/userInfo',params),
+  updateNickname: (params) => Vue.prototype.$axios.post('/api/user/updateNickname',params),
+  updateGender: (params) => Vue.prototype.$axios.post('/api/user/updateGender',params),
+ 
+
+  //--------------------------------- free ---------------------------------
+  imgCode: () => Vue.prototype.$axios.get('/api/home/imgCode'),
+  sendSmsCode: (params) => Vue.prototype.$axios.post('/api/home/sendSmsCode',params),
+  article: (params) => Vue.prototype.$axios.post('/api/index/article',params),
+appVersion: (params) => Vue.prototype.$axios.post('/api/index/appVersion',params),
+
+info: () => Vue.prototype.$axios.post('/api/index/info'),
+  //--------------------------------- bet ---------------------------------
+   lotteryClassList: (params) => Vue.prototype.$axios.post('/api/lottery/lotteryClassList',params),
+   nextLotteryPeriod: (params) => Vue.prototype.$axios.post('/api/lottery/nextLotteryPeriod',params),
+   bettingConfig: (params) => Vue.prototype.$axios.post('/api/lottery/bettingConfig',params),
+   betting: (params) => Vue.prototype.$axios.post('/api/lottery/betting',params),
+   lotteryRecords: (params) => Vue.prototype.$axios.post('/api/lottery/lotteryRecords',params),
+   myLotteryRecords: (params) => Vue.prototype.$axios.post('/api/lottery/myLotteryRecords',params),
+
+
+  //--------------------------------- me ---------------------------------
+     getPayType: (params) => Vue.prototype.$axios.post('/api/recharge/getPayType',params),
+  rechargeConfig: (params) => Vue.prototype.$axios.post('/api/recharge/rechargeConfig',params),
+  recharge: (params) => Vue.prototype.$axios.post('/api/recharge/recharge',params),
+  rechargeList: (params) => Vue.prototype.$axios.post('/api/recharge/rechargeList',params),
+  toPay: (params) => Vue.prototype.$axios.post('/api/recharge/toPay',params),
+  withdrawConfig: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawConfig',params),
+  withdrawServiceCharge: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawServiceCharge',params),
+  withdraw: (params) => Vue.prototype.$axios.post('/api/withdraw/withdraw',params),
+  withdrawList: (params) => Vue.prototype.$axios.post('/api/withdraw/withdrawList',params),
+  billList: (params) => Vue.prototype.$axios.post('/api/summary/billList',params),
+   
+   //--------------------------------- invite ---------------------------------
+   inviteCode: (params) => Vue.prototype.$axios.post('/api/user/inviteCode',params),
+   bonusOut: (params) => Vue.prototype.$axios.post('/api/summary/bonusOut',params),
+   bonusOutRecords: (params) => Vue.prototype.$axios.post('/api/summary/bonusOutRecords',params),
+  promotionRecords: (params) => Vue.prototype.$axios.post('/api/summary/promotionRecords',params),
+  bonusRecords: (params) => Vue.prototype.$axios.post('/api/summary/bonusRecords',params),
+  bonusSummary: (params) => Vue.prototype.$axios.post('/api/summary/bonusSummary',params),
+  //--------------------------------- bankCard ---------------------------------
+  bankcardList: (params) => Vue.prototype.$axios.post('/api/user/bankcardList',params),
+   bindBank: (params) => Vue.prototype.$axios.post('/api/user/bindBank',params),
+   delBankCard: (params) => Vue.prototype.$axios.post('/api/user/delBankCard',params),
+   
+   //--------------------------------- address ---------------------------------
+   addressList: (params) => Vue.prototype.$axios.post('/api/user/addressList',params),
+   addressSave: (params) => Vue.prototype.$axios.post('/api/user/addressSave',params),
+    delAddress: (params) => Vue.prototype.$axios.post('/api/user/delAddress',params),
+   //--------------------------------- goods ---------------------------------
+  banner: () => Vue.prototype.$axios.get('/api/home/banner'),
+  goodsList: (params) => Vue.prototype.$axios.post('/api/index/goodsList',params),
+  goodsDetail: (params) => Vue.prototype.$axios.post('/api/index/goods',params),
+   
+   //--------------------------------- moni ---------------------------------
+   // lotteryClassListM: (params) => Vue.prototype.$axios.post('/api/demo/lotteryClassListDemo',params),
+   nextLotteryPeriodM: (params) => Vue.prototype.$axios.post('/api/demo/nextLotteryPeriodDemo',params),
+   bettingConfigM: (params) => Vue.prototype.$axios.post('/api/demo/bettingConfigDemo',params),
+   bettingM: (params) => Vue.prototype.$axios.post('/api/demo/bettingDemo',params),
+   lotteryRecordsM: (params) => Vue.prototype.$axios.post('/api/demo/lotteryRecordsDemo',params),
+   myLotteryRecordsM: (params) => Vue.prototype.$axios.post('/api/demo/myLotteryRecordsDemo',params),
+   //--------------------------------- hongbao ---------------------------------
+   launchRedEnvelop: (params) => Vue.prototype.$axios.post('/api/user/launchRedEnvelop',params),
+   redEnvelopList: (params) => Vue.prototype.$axios.post('/api/user/redEnvelopList',params),
+   cancelRedEnvelop: (params) => Vue.prototype.$axios.post('/api/user/cancelRedEnvelop',params),
+   redEnvelop: (params) => Vue.prototype.$axios.post('/api/user/redEnvelop',params),
+   receiveRedEnvelop: (params) => Vue.prototype.$axios.post('/api/user/receiveRedEnvelop',params),
+ }
 
 
 export default api

utils/axios.js

@@ -1,107 +1,202 @@
 import Vue from 'vue'
 import axios from 'axios'
+import qs from 'qs'
+import md5 from 'js-md5';
+import constant from './constant.js';
 
 let baseURL = '';
+let key = '';
+// #ifdef H5
+baseURL = constant.H5
+key = constant.H5_KEY
+// #endif
+// #ifdef APP-PLUS
+baseURL = constant.APP
+key = constant.APP_KEY
+// #endif
 const service = axios.create({
-	withCredentials: false, //表示跨域请求时是否需要使用凭证
+	withCredentials: true,
 	crossDomain: true,
-	// baseURL,
+	baseURL,
 	timeout: 160000
 })
 
-// request请求拦截器,在请求之前做一些处理
+// request拦截器,在请求之前做一些处理
 service.interceptors.request.use(
 	config => {
-		
-		console.log(config,777777777777)
-		let isWallet= uni.getStorageSync('isWallet');
-		if(!isWallet){
+		// console.log('showDialog' + Vue.prototype.$showDialog)
+		if (Vue.prototype.$showDialog) {
 			uni.showLoading({
 				title: 'loading',
 				mask: true
 			})
 		}
+		const ticket = uni.getStorageSync('ticket')
+		let dataStr = [];
+		if (config.method == 'get') {
+			if (config.url.split('?').length > 1) {
+				dataStr = config.url.split('?')[1].split('&');
+			}
 
-		console.log('============================')
-		// if (config.urlType=='eth') {
-		// 	config.url = config.url
-
-		// } else {
+		}
+		if (config.method == 'post') {
+			dataStr = qs.stringify(config.data).split('&');
+			// dataStr = JSON.stringify(config.data);
+			// dataStr = config.data;
 
-		// 	config.url = baseURL.serverUrl + config.url
-		// }
+			// dataStr = config.data.name;
 
-		if (config.url.indexOf('/x/resource/ip')>-1 ){
+		}
+		config.data = {};
+		dataStr.forEach(function (e) {
+			console.log(e, 666666)
+			config.data[e.split('=')[0]] = e.split('=')[1];
+		});
+		// console.log(ticket)
+		if (ticket != '') {
+			config.data['ticket'] = ticket
+		}
+		var keys = [];
+		let sign = '';
+		for (var k in config.data)
+			keys.push(k);
+		keys.sort(function (a, b) {
+			return a < b ? -1 : 1;
+		})
+		// console.log("keys===========");
+		keys.forEach(function (e) {
+			if (config.data[e] || config.data[e] == '') {
+				sign += e + '=' + config.data[e] + '&'
+			}
 
-			config.baseURL = baseURL.checkIp
-		}else{
-			config.baseURL = baseURL.serverUrl
+		});
+
+		// console.log("签名参数===========");
+		// console.log(config.url);
+		// console.log(sign + key);
+		sign = md5(sign + key);
+		// console.log("提交参数===========");
+		// console.log(qs.stringify(config.data));
+		if (config.method == 'post') {
+			// console.log(config.data,666666)
+			config.data['sign'] = sign
+			config.data = qs.stringify(config.data)
+			// config.data = config.data.replace(/(\w+)\s*, \s*(\w+)/, "$2 $1");
+			// if(config.url == ){
+
+			// #ifdef H5
+			if (config.url == '/api/index/goodsList') {
+				config.data = config.data.replaceAll('20', "");
+				config.data = config.data.replaceAll('26', "");
+				config.data = config.data.replaceAll('2F', "/");
+				config.data = config.data.replaceAll('28', "");
+				config.data = config.data.replaceAll('29', "");
+				// config.data = config.data.replaceAll('%C2%AE', "&reg;");	
+			}
+			// #endif
+			// #ifdef APP-PLUS
+			if (config.url == '/api/index/goodsList') {
+				config.data = config.data.replace(new RegExp('20', "gm"), "");
+				config.data = config.data.replace(new RegExp('26', "gm"), "");
+				config.data = config.data.replace(new RegExp('2F', "gm"), "/");
+				config.data = config.data.replace(new RegExp('28', "gm"), "");
+				config.data = config.data.replace(new RegExp('29', "gm"), "");
+				// config.data = config.data.replaceAll('%C2%AE', "&reg;");	
+			}
+			// #endif
 
-		}
-		config.sslVerify=false
 
-		config.url = config.url
+			// config.data = config.data.replaceAll('2528',"(");
+			// config.data = config.data.replaceAll('2529',")");
+			// config.data = config.data.replaceAll('252',"%2F");
 
-		//  if (token) {
-		//      // config.headers['Authori-zation'] = token
-		//      config.headers['Authorization'] = token
-		//  }
-		//  console.log(config)
-		// if (store.state.token) {
-		//     // 给请求头添加user-token
-		//     config.headers["user-token"] = store.state.token;
-		// }
+			// }
 
+		}
+		if (config.method == 'get') {
+			if (ticket != '') {
+				config.url = config.url + '&ticket=' + ticket + '&sign=' + sign
+			} else {
+				config.url = config.url + '?sign=' + sign
+			}
+		}
+		// console.log(config)
 		return config;
 	},
 	error => {
-		console.log(error); // for debug
+		// console.log(error); // for debug
 		return Promise.reject(error);
 	}
 );
 
-// 配置成功后的响应拦截器
+//配置成功后的拦截器
 service.interceptors.response.use(res => {
+	console.log('过期了吗')
 	uni.hideLoading()
-	console.log(res)
-	if (res.status == 200) {
+	// console.log(res)
+	// console.log(res.data)
+	// console.log(res.data.data[0].nameAlias)
+	if (res.data.success || res.data.errCode === 'USER.0017') {
+		// console.log(res.data.success)
 		return res.data
 	} else {
-		return Promise.reject(res.msg);
+		uni.showToast({
+			title: res.data.errMsg,
+			icon: 'none',
+			duration: 1500
+		})
+		if (res.data.errCode === 'USER.0010') {
+
+			uni.removeStorage({
+				key: 'logInfo',
+				success: function (res) {
+					uni.reLaunch({ url: '/pages/login/index' })
+				},
+				fail: (err) => {
+				}
+			});
+
+
+			// #ifdef H5
+			var url = location.href;
+			if (url.indexOf('pages') > -1) {
+				uni.setStorage({
+					key: 'url',
+					data: url,
+					success: function () {
+						console.log('success')
+					}
+				});
+			} else {
+				uni.removeStorageSync('url')
+			}
+			// #endif
+
+
+		}
+		uni.$emit('refreshQrCode')
+		return Promise.reject(res.data.errMsg);
 	}
 }, error => {
-	// if (error.response.status) {
-	// 	switch (error.response.status) {
-	// 		case 401:
-	// 			break;
-	// 		default:
-	// 			break;
-	// 	}
-	// }
 	return Promise.reject(error)
 })
 
-// 在main.js中放入这段自定义适配器的代码，就可以实现uniapp的app和小程序开发中能使用axios进行跨域网络请求，并支持携带cookie
 
-axios.defaults.adapter = function(config) { //自己定义个适配器，用来适配uniapp的语法
+axios.defaults.adapter = function (config) { //自己定义个适配器，用来适配uniapp的语法
 	return new Promise((resolve, reject) => {
-
-		console.log(config, '我请求的',config)
+		// console.log(config)
 		var settle = require('axios/lib/core/settle');
 		var buildURL = require('axios/lib/helpers/buildURL');
-
 		uni.request({
 			method: config.method.toUpperCase(),
-			url: config.baseURL + '/' + buildURL(config.url, config.params, config
-				.paramsSerializer),
-
+			url: config.baseURL + buildURL(config.url, config.params, config.paramsSerializer),
 			header: config.headers,
 			data: config.data,
 			dataType: config.dataType,
 			responseType: config.responseType,
 			sslVerify: config.sslVerify,
 			complete: function complete(response) {
-				//console.log("执行完成：",config.baseURL+'/' + buildURL(config.url, config.params, config.paramsSerializer),response.data)
+				//console.log("执行完成：",config.baseURL + buildURL(config.url, config.params, config.paramsSerializer),response.data)
 				response = {
 					data: response.data,
 					status: response.statusCode,
@@ -113,7 +208,6 @@ axios.defaults.adapter = function(config) { //自己定义个适配器，用来
 				settle(resolve, reject, response);
 			},
 			fail: res => {
-				uni.hideLoading()
 				uni.showToast({
 					title: res,
 					icon: 'none',
@@ -123,5 +217,4 @@ axios.defaults.adapter = function(config) { //自己定义个适配器，用来
 		})
 	})
 }
-
 export default service

utils/constant.js

@@ -0,0 +1,14 @@
+const H5 = '/start';
+const H5_KEY = 'key=PBcGdWvA7dUintx7WNOR11cOdCrEpasM';
+
+const APP = 'https://api.wingold6.com';    //正式 
+// const APP = 'https://apitest.luck-work.com';  //测试 
+const APP_KEY = 'key=PBcGdWvA7dUintx7WNOR11cOdCrEpasM';
+const showDialog = true
+export default {  
+    H5,
+    H5_KEY,
+    APP,
+    APP_KEY,
+    showDialog,
+}

utils/index.js

@@ -0,0 +1,100 @@
+var utils = {
+	checkEmail: function(email) {
+		return RegExp(
+				/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/)
+			.test(email);
+	},
+	checkMobile: function(mobile) {
+		return RegExp(/^1[34578]\d{9}$/).test(mobile);
+	},
+	caculateTime: function(timeZome, time) {
+		return time + (timeZome * 1000 * 60 * 60);
+	},
+	formatyymmdd: function(time) {
+		var date = new Date(time)
+		console.log(date,5555655)
+		var localTime = date.getTime();
+		var localOffset = date.getTimezoneOffset() * 60000 //获得当地时间偏移的毫秒数
+		var utc = localTime + localOffset //utc即GMT时间
+		var offset = 8; //东8区
+		var beijing = utc + (3600000 * offset);
+		date = new Date(beijing);
+		var Y = date.getFullYear()
+		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+		var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+		var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+		var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+		var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+		console.log( M + '/' + D + '/' + Y,5454545454);
+		return M + '/' + D + '/' + Y;
+		
+	},
+	formatyymmdd2: function(time) {
+		var date = new Date(time)
+		var localTime = date.getTime();
+		var localOffset = date.getTimezoneOffset() * 60000 ; //获得当地时间偏移的毫秒数
+		var utc = localTime + localOffset; //utc即GMT时间
+		var offset = 8; //东8区
+		var beijing = utc + (3600000 * offset);
+		date = new Date(beijing);
+		var Y = date.getFullYear()
+		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+		var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+		var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+		var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+		var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+		return Y + M + D;
+	},
+	formatyymmddhhmmss: function(time) {
+		var date = new Date(time)
+		var localTime = date.getTime()
+		var localOffset = date.getTimezoneOffset() * 60000  //获得当地时间偏移的毫秒数
+		var utc = localTime + localOffset; //utc即GMT时间
+		var offset = 8 //东8区
+		var beijing = utc + (3600000 * offset);
+		date = new Date(beijing)
+		var Y = date.getFullYear()
+		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+		var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+		var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+		var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+		var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+		// return Y + '-' + M + '-' + D + ' ' + h + ':' + m + ':' + s;
+		return Y + '-' + M + '-' + D + ' ' + h + ':' + m + ':' + s;
+	},
+	formathhmm: function(time) {
+		var date = new Date(time)
+		var localTime = date.getTime();
+		var localOffset = date.getTimezoneOffset() * 60000 ; //获得当地时间偏移的毫秒数
+		var utc = localTime + localOffset; //utc即GMT时间
+		var offset = 8; //东8区
+		var beijing = utc + (3600000 * offset);
+		date = new Date(beijing);
+		var Y = date.getFullYear()
+		var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+		var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+		var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+		var m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+		var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+		return h + ':' + m;
+	},
+	//客户端时间转换为北京时间
+	getBeijingtime: function() {
+		//获得当前运行环境时间
+		let d = new Date();
+		let currentDate = new Date();
+		let tmpHours = currentDate.getHours();
+		//算得时区
+		let time_zone = -d.getTimezoneOffset() / 60;
+		if (time_zone < 0) {
+			time_zone = Math.abs(time_zone) + 8;
+			currentDate.setHours(tmpHours + time_zone);
+		} else {
+			time_zone -= 8;
+			currentDate.setHours(tmpHours - time_zone);
+		}
+		return currentDate;
+	},
+}
+
+export default utils

utils/language/en.js

@@ -1,16 +1,66 @@
 // en.js
 export default {
+	// tab bar 相关
+	tabBar:{
+		Home:'Home',
+		Markets:'Markets',
+		Charity:'Charity',
+		Subscription:'Subscription',
+		Me:'Me',
+	},
+	// 登陆相关页面
 	login: {
-		welcomeText:'Hi, Welcome Back!',
-		signInText:'Sign in to your account.',
-		emailInputText:'Enter email address',
-		passwordInputText:'Password',
-		forgotText:'Forgot Password?',
-		loginText:'Login',
-		notAccountText:'Don’t have account?',
-		signUpText:'Sign Up',
+		// 公共字段
+		Login: 'Login',
+		SignUp: 'Sign Up',
+		ForgotPassword: 'Forgot password',
+		// login
+		welcomeText: 'Hi, Welcome Back!',
+		signInText: 'Sign in to your account.',
+		emailInputText: 'Enter email address',
+		emailInputMessage: 'Please enter your email address',
+		passwordInputText: 'Password',
+		passwordInputMessage: 'Please enter your password',
+		forgotText: 'Forgot Password?',
+		notAccountText: 'Don’t have account?',
 		agreeToBackup: 'Please check the prompt to agree to backup',
 		checkTheTermsOfService: 'Please review and agree to the terms of service',
 
+		// register
+		registerWelcomeText: "Getting Started",
+		registerCreate: "Create an account to continue!",
+		verificationCodeText: 'Verification Code',
+		verificationCodeMessage: 'Please enter verification code',
+		passwordText: 'Create The Login Password',
+		passwordMessage: 'Please enter your password',
+		confirmPasswordText: 'Confirm Login Password',
+		confirmPasswordMessage: 'Please confirm login password',
+		withdrawalPasswordText: 'Create The Withdrawal Password',
+		withdrawalPasswordMessage: 'Please enter the withdrawal password',
+		InvitationCodeText: 'Invitation code',
+		InvitationCodeMessage: 'Please enter the invitation code',
+		agreeText: 'By creating an account, you agree to our ',
+		Terms: 'Terms',
+		and: 'and',
+		Conditions: 'Conditions',
+		haveAccount: 'Already have an account?',
+
+		// forget
+		Save: 'Save',
+	},
+
+	// 首页相关页面
+	home: {
+		// 公共字段
+		HOME: 'HOME',
+		// 首页
+		customerService: 'Customer Service',
+		homeMessage: `Please contact customer service on the top-left corner for identity verification on your first...
+		Please contact customer service on the top-left corner for identity verification on your first...Please contact customer service on the top-left corner for identity verification on your first...`,
+		Recharge: 'Recharge',
+		Mine: 'Mine',
+		Subcription: 'Subcription',
+		TodaySteps:"Today's steps",
+		ReceiveEarnings:"Receive yesterday's earnings",
 	}
 }

utils/language/zh.js

@@ -1,16 +1,38 @@
 // zh.js
 export default {
     login: {
-        welcomeText:'Hi, Welcome Back!',
-		signInText:'Sign in to your account.',
-		emailInputText:'Enter email address',
-		passwordInputText:'Password',
-		forgotText:'Forgot Password?',
-		loginText:'Login',
+		// 公共字段
+		Login:'Login',
+		SignUp:'Sign Up',
+		//login
+        welcomeText:'你好,欢迎回来!',
+		signInText:'请登录您的账户.',
+		emailInputText:'请输入邮箱',
+		emailInputMessage:'邮箱密码不能为空',
+		passwordInputText:'请输入密码',
+		passwordInputMessage:'密码不能为空',
+		forgotText:'忘记密码?',
 		notAccountText:'Don’t have account?',
-		signUpText:'Sign Up',
         agreeToBackup: '请勾选同意备份的提示',
         checkTheTermsOfService: '请查看并同意服务条款',
 
+		// register
+		registerWelcomeText: "Getting Started",
+		registerCreate: "Create an account to continue!",
+		verificationCodeText: 'Verification Code',
+		verificationCodeMessage: 'Please enter verification code',
+		passwordText: 'Create The Login Password',
+		passwordMessage: 'Please enter your password',
+		confirmPasswordText: 'Confirm Login Password',
+		confirmPasswordMessage: 'Please confirm login password',
+		withdrawalPasswordText: 'Create The Withdrawal Password',
+		withdrawalPasswordMessage: 'Please enter the withdrawal password',
+		InvitationCodeText: 'Invitation code',
+		InvitationCodeMessage: 'Please enter the invitation code',
+		aggreeText :'By creating an account, you aggree to our ',
+		Terms:'Terms',
+		and:'and',
+		Conditions:'Conditions',
+
     }
 }

uview-ui/README.md

@@ -1,73 +1,56 @@
 <p align="center">
     <img alt="logo" src="https://uviewui.com/common/logo.png" width="120" height="120" style="margin-bottom: 10px;">
 </p>
-<h3 align="center" style="margin: 30px 0 30px;font-weight: bold;font-size:40px;">uView</h3>
+<h3 align="center" style="margin: 30px 0 30px;font-weight: bold;font-size:40px;">uView 2.0</h3>
 <h3 align="center">多平台快速开发的UI框架</h3>
 
+[![stars](https://img.shields.io/github/stars/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0)
+[![forks](https://img.shields.io/github/forks/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0)
+[![issues](https://img.shields.io/github/issues/umicro/uView2.0?style=flat-square&logo=GitHub)](https://github.com/umicro/uView2.0/issues)
+[![Website](https://img.shields.io/badge/uView-up-blue?style=flat-square)](https://uviewui.com)
+[![release](https://img.shields.io/github/v/release/umicro/uView2.0?style=flat-square)](https://gitee.com/umicro/uView2.0/releases)
+[![license](https://img.shields.io/github/license/umicro/uView2.0?style=flat-square)](https://en.wikipedia.org/wiki/MIT_License)
+
 ## 说明
 
-uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
+uView UI，是[uni-app](https://uniapp.dcloud.io/)全面兼容nvue的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
 
-## 特性
+## [官方文档：https://uviewui.com](https://uviewui.com)
 
-- 兼容安卓，iOS，微信小程序，H5，QQ小程序，百度小程序，支付宝小程序，头条小程序
-- 60+精选组件，功能丰富，多端兼容，让您快速集成，开箱即用
-- 众多贴心的JS利器，让您飞镖在手，召之即来，百步穿杨
-- 众多的常用页面和布局，让您专注逻辑，事半功倍
-- 详尽的文档支持，现代化的演示效果
-- 按需引入，精简打包体积
 
+## 预览
 
-## 安装
+您可以通过**微信**扫码，查看最佳的演示效果。
+<br>
+<br>
+<img src="https://uviewui.com/common/weixin_mini_qrcode.png" width="220" height="220" >
 
-```bash
-# npm方式安装，插件市场导入无需执行此命令
-npm i uview-ui
-```
 
-## 快速上手
+## 链接
 
-1. `main.js`引入uView库
-```js
-// main.js
-import uView from 'uview-ui';
-Vue.use(uView);
-```
+- [官方文档](https://www.uviewui.com/)
+- [更新日志](https://www.uviewui.com/components/changelog.html)
+- [升级指南](https://www.uviewui.com/components/changeGuide.html)
+- [关于我们](https://www.uviewui.com/cooperation/about.html)
 
-2. `App.vue`引入基础样式(注意style标签需声明scss属性支持)
-```css
-/* App.vue */
-<style lang="scss">
-@import "uview-ui/index.scss";
-</style>
-```
+## 交流反馈
 
-3. `uni.scss`引入全局scss变量文件
-```css
-/* uni.scss */
-@import "uview-ui/theme.scss";
-```
+欢迎加入我们的QQ群交流反馈：[点此跳转](https://www.uviewui.com/components/addQQGroup.html)
 
-4. `pages.json`配置easycom规则(按需引入)
-
-```js
-// pages.json
-{
-	"easycom": {
-		// npm安装的方式不需要前面的"@/"，下载安装的方式需要"@/"
-		// npm安装方式
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-		// 下载安装方式
-		// "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	},
-	// 此为本身已有的内容
-	"pages": [
-		// ......
-	]
-}
-```
+## 关于PR
+
+> 我们非常乐意接受各位的优质PR，但在此之前我希望您了解uView2.0是一个需要兼容多个平台的（小程序、h5、ios app、android app）包括nvue页面、vue页面。
+> 所以希望在您修复bug并提交之前尽可能的去这些平台测试一下兼容性。最好能携带测试截图以方便审核。非常感谢！
+
+## 安装
+
+#### **uni-app插件市场链接** —— [https://ext.dcloud.net.cn/plugin?id=1593](https://ext.dcloud.net.cn/plugin?id=1593)
 
-请通过[快速上手](https://www.uviewui.com/components/quickstart.html)了解更详细的内容 
+请通过[官网安装文档](https://www.uviewui.com/components/install.html)了解更详细的内容
+
+## 快速上手
+
+请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
 
 ## 使用方法
 配置easycom规则后，自动按需引入，无需`import`组件，直接引用即可。
@@ -78,27 +61,6 @@ Vue.use(uView);
 </template>
 ```
 
-请通过[快速上手](https://www.uviewui.com/components/quickstart.html)了解更详细的内容 
-
-## 链接
-
-- [官方文档](https://www.uviewui.com/)
-- [更新日志](https://www.www.uviewui.com/components/changelog.html)
-- [升级指南](https://www.uviewui.com/components/changelog.html)
-- [关于我们](https://www.uviewui.com/cooperation/about.html)
-
-## 预览
-
-您可以通过**微信**扫码，查看最佳的演示效果。
-<br>
-<br>
-<img src="https://uviewui.com/common/weixin_mini_qrcode.png" width="220" height="220" >
-
-## 捐赠uView的研发
-
-uView文档和源码全部开源免费，如果您认为uView帮到了您的开发工作，您可以捐赠uView的研发工作，捐赠无门槛，哪怕是一杯可乐也好(相信这比打赏主播更有意义)。
-
-<img src="https://uviewui.com/common/alipay.png" width="220" ><img style="margin-left: 100px;" src="https://uviewui.com/common/wechat.png" width="220" >
-
 ## 版权信息
 uView遵循[MIT](https://en.wikipedia.org/wiki/MIT_License)开源协议，意味着您无需支付任何费用，也无需授权，即可将uView应用到您的产品中。
+

uview-ui/changelog.md

@@ -1,3 +1,21 @@
+## 2.0.33（2022-06-17）
+# uView2.0重磅发布，利剑出鞘，一统江湖
+
+1. 修复`loadmore`组件`lineColor`类型错误问题
+2. 修复`u-parse`组件`imgtap`、`linktap`不生效问题
+## 2.0.32（2022-06-16）
+# uView2.0重磅发布，利剑出鞘，一统江湖
+1. `u-loadmore`新增自定义颜色、虚/实线
+2. 修复`u-swiper-action`组件部分平台不能上下滑动的问题
+3. 修复`u-list`回弹问题
+4. 修复`notice-bar`组件动画在低端安卓机可能会抖动的问题
+5. `u-loading-page`添加控制图标大小的属性`iconSize`
+6. 修复`u-tooltip`组件`color`参数不生效的问题
+7. 修复`u--input`组件使用`blur`事件输出为`undefined`的bug
+8. `u-code-input`组件新增键盘弹起时，是否自动上推页面参数`adjustPosition`
+9. 修复`image`组件`load`事件无回调对象问题
+10. 修复`button`组件`loadingSize`设置无效问题
+10. 其他修复
 ## 2.0.31（2022-04-19）
 # uView2.0重磅发布，利剑出鞘，一统江湖
 

uview-ui/components/u--input/u--input.vue

@@ -36,7 +36,7 @@
 		:customStyle="customStyle"
 		:formatter="formatter"
 		@focus="$emit('focus')"
-		@blur="$emit('blur')"
+		@blur="e => $emit('blur', e)"
 		@keyboardheightchange="$emit('keyboardheightchange')"
 		@change="e => $emit('change', e)"
 		@input="e => $emit('input', e)"

uview-ui/components/u-button/u-button.vue

@@ -28,7 +28,7 @@
         <template v-if="loading">
             <u-loading-icon
                 :mode="loadingMode"
-                :size="textSize * 1.15"
+                :size="loadingSize * 1.15"
                 :color="loadingColor"
             ></u-loading-icon>
             <text
@@ -75,7 +75,7 @@
         <template v-if="loading">
             <u-loading-icon
                 :mode="loadingMode"
-                :size="textSize * 1.15"
+                :size="loadingSize * 1.15"
                 :color="loadingColor"
             ></u-loading-icon>
             <text

uview-ui/components/u-code-input/props.js

@@ -1,5 +1,10 @@
 export default {
     props: {
+		// 键盘弹起时，是否自动上推页面
+		adjustPosition: {
+			type: Boolean,
+            default: uni.$u.props.codeInput.adjustPosition
+		},
         // 最大输入长度
         maxlength: {
             type: [String, Number],

uview-ui/components/u-code-input/u-code-input.vue

@@ -33,6 +33,7 @@
 			:focus="focus"
 			:value="inputValue"
 			:maxlength="maxlength"
+			:adjustPosition="adjustPosition"
 			class="u-code-input__input"
 			@input="inputHandler"
 			:style="{

uview-ui/components/u-form/u-form.vue

@@ -169,6 +169,7 @@
 											errorsRes.push(...errors);
 											childErrors.push(...errors);
 										}
+										this.errorType === 'toast' ?uni.$u.toast(errors[0].message):
 										child.message =
 											childErrors[0]?.message ?? null;
 									}

uview-ui/components/u-image/u-image.vue

@@ -161,10 +161,10 @@
 				this.$emit('error', err)
 			},
 			// 图片加载完成，标记loading结束
-			onLoadHandler() {
+			onLoadHandler(event) {
 				this.loading = false
 				this.isError = false
-				this.$emit('load')
+				this.$emit('load', event)
 				this.removeBgColor()
 				// 如果不需要动画效果，就不执行下方代码，同时移除加载时的背景颜色
 				// 否则无需fade效果时，png图片依然能看到下方的背景色

uview-ui/components/u-line/props.js

@@ -24,7 +24,7 @@ export default {
             type: [String, Number],
             default: uni.$u.props.line.margin
         },
-        // 是否虚线，true-实线，false-虚线
+        // 是否虚线，true-虚线，false-实线
         dashed: {
             type: Boolean,
             default: uni.$u.props.line.dashed

uview-ui/components/u-list/u-list.vue

@@ -29,9 +29,7 @@
 		@scrolltolower="scrolltolower"
 		@scrolltoupper="scrolltoupper"
 	>
-		<view :style="{
-			paddingTop: `${offset}px`
-		}">
+		<view>
 			<slot />
 		</view>
 	</scroll-view>

uview-ui/components/u-loading-page/props.js

@@ -35,6 +35,11 @@ export default {
             type: [String, Number],
             default: uni.$u.props.loadingPage.fontSize
         },
+		// 图标大小
+		iconSize: {
+		    type: [String, Number],
+		    default: uni.$u.props.loadingPage.fontSize
+		},
         // 加载中图标的颜色，只能rgb或者十六进制颜色值
         loadingColor: {
             type: String,

uview-ui/components/u-loading-page/u-loading-page.vue

@@ -19,11 +19,15 @@
                         :src="image"
                         class="u-loading-page__warpper__loading-icon__img"
                         mode="widthFit"
+						:style="{
+							width: $u.addUnit(iconSize),
+						    height: $u.addUnit(iconSize)
+						}"
                     ></image>
                     <u-loading-icon
                         v-else
                         :mode="loadingMode"
-                        size="28"
+                        :size="$u.addUnit(iconSize)"
                         :color="loadingColor"
                     ></u-loading-icon>
                 </view>
@@ -55,6 +59,7 @@ import props from "./props.js";
  * @property {String}			bgColor			背景色 （默认 '#ffffff' ）
  * @property {String}			color			文字颜色 （默认 '#C8C8C8' ）
  * @property {String | Number}	fontSize		文字大小 （默认 19 ）
+ * @property {String | Number}	iconSize		图标大小 （默认 28 ）
  * @property {String}			loadingColor	加载中图标的颜色，只能rgb或者十六进制颜色值 （默认 '#C8C8C8' ）
  * @property {Object}			customStyle		自定义样式
  * @example <u-loading mode="circle"></u-loading>

uview-ui/components/u-loadmore/props.js

@@ -19,13 +19,17 @@ export default {
         fontSize: {
             type: [String, Number],
             default: uni.$u.props.loadmore.fontSize
+        },
+		    // 图标大小
+        iconSize: {
+            type: [String, Number],
+            default: uni.$u.props.loadmore.iconSize
         },
         // 字体颜色
         color: {
             type: String,
             default: uni.$u.props.loadmore.color
         },
-
         // 加载中状态的图标，spinner-花朵状图标，circle-圆圈状，semicircle-半圆
         loadingIcon: {
             type: String,
@@ -75,6 +79,16 @@ export default {
         line: {
             type: Boolean,
             default: uni.$u.props.loadmore.line
+        },
+        // 线条颜色
+        lineColor: {
+            type: String,
+            default: uni.$u.props.loadmore.lineColor
+        },
+        // 是否虚线，true-虚线，false-实线
+        dashed: {
+            type: Boolean,
+            default: uni.$u.props.loadmore.dashed
         }
     }
 }

uview-ui/components/u-loadmore/u-loadmore.vue

@@ -13,8 +13,9 @@
 	>
 		<u-line
 		    length="140rpx"
-		    color="#E6E8EB"
+		    :color="lineColor"
 		    :hairline="false"
+			:dashed="dashed"
 			v-if="line"
 		></u-line>
 		<!-- 加载中和没有更多的状态才显示两边的横线 -->
@@ -28,7 +29,7 @@
 			>
 				<u-loading-icon
 				    :color="iconColor"
-				    size="17"
+				    :size="iconSize"
 				    :mode="loadingIcon"
 				></u-loading-icon>
 			</view>
@@ -42,8 +43,9 @@
 		</view>
 		<u-line
 		    length="140rpx"
-		    color="#E6E8EB"
+		    :color="lineColor"
 			:hairline="false"
+			:dashed="dashed"
 			v-if="line"
 		></u-line>
 	</view>
@@ -60,6 +62,7 @@
 	 * @property {String}			bgColor			组件背景颜色，在页面是非白色时会用到（默认 'transparent' ）
 	 * @property {Boolean}			icon			加载中时是否显示图标（默认 true ）
 	 * @property {String | Number}	fontSize		字体大小（默认 14 ）
+	 * @property {String | Number}	iconSize		图标大小（默认 17 ）
 	 * @property {String}			color			字体颜色（默认 '#606266' ）
 	 * @property {String}			loadingIcon		加载图标（默认 'circle' ）
 	 * @property {String}			loadmoreText	加载前的提示语（默认 '加载更多' ）
@@ -67,10 +70,12 @@
 	 * @property {String}			nomoreText		没有更多的提示语（默认 '没有更多了' ）
 	 * @property {Boolean}			isDot			到上一个相邻元素的距离 （默认 false ）
 	 * @property {String}			iconColor		加载中图标的颜色 （默认 '#b7b7b7' ）
+	 * @property {String}			lineColor		线条颜色（默认 #E6E8EB ）
 	 * @property {String | Number}	marginTop		上边距 （默认 10 ）
 	 * @property {String | Number}	marginBottom	下边距 （默认 10 ）
 	 * @property {String | Number}	height			高度，单位px （默认 'auto' ）
 	 * @property {Boolean}			line			是否显示左边分割线  （默认 false ）
+	 * @property {Boolean}			dashed		// 是否虚线，true-虚线，false-实线  （默认 false ）
 	 * @event {Function} loadmore status为loadmore时，点击组件会发出此事件
 	 * @example <u-loadmore :status="status" icon-type="iconType" load-text="loadText" />
 	 */

uview-ui/components/u-parse/node/node.vue

@@ -201,7 +201,7 @@ export default {
       // #ifdef H5 || APP-PLUS
       node.attrs.src = node.attrs.src || node.attrs['data-src']
       // #endif
-      this.root.$emit('imgtap', node.attrs)
+      this.root.$emit('imgTap', node.attrs)
       // 自动预览图片
       if (this.root.previewImg)
         uni.previewImage({
@@ -262,7 +262,7 @@ export default {
     linkTap(e) {
       var attrs = e.currentTarget ? this.childs[e.currentTarget.dataset.i].attrs : e,
         href = attrs.href
-      this.root.$emit('linktap', attrs)
+      this.root.$emit('linkTap', attrs)
       if (href) {
         // 跳转锚点
         if (href[0] == '#')

uview-ui/components/u-picker/props.js

@@ -50,11 +50,6 @@ export default {
             type: String,
             default: uni.$u.props.picker.confirmColor
         },
-        // 选择器只有一列时，默认选中项的索引，从0开始
-        singleIndex: {
-            type: [String, Number],
-            default: uni.$u.props.picker.singleIndex
-        },
         // 每列中可见选项的数量
         visibleItemCount: {
             type: [String, Number],

uview-ui/components/u-picker/u-picker.vue

@@ -66,7 +66,6 @@
  * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
  * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
  * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
- * @property {Array}			singleIndex			选择器只有一列时，默认选中项的索引，从0开始（默认 0 ）
  * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
  * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）
  * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
@@ -161,7 +160,7 @@ export default {
 			this.setIndexs(value)
 
 			this.$emit('change', {
-				// #ifndef MP-WEIXIN
+				// #ifndef MP-WEIXIN || MP-LARK
 				// 微信小程序不能传递this，会因为循环引用而报错
 				picker: this,
 				// #endif

uview-ui/components/u-row-notice/u-row-notice.vue

@@ -19,11 +19,17 @@
 			class="u-notice__content"
 			ref="u-notice__content"
 		>
-			<text
+			<view
 				ref="u-notice__content__text"
 				class="u-notice__content__text"
-				:style="[textStyle]"
-			>{{text}}</text>
+				:style="[animationStyle]"
+			>
+				<text
+					v-for="(item, index) in innerText"
+					:key="index"
+					:style="[textStyle]"
+				>{{item}}</text>
+			</view>
 		</view>
 		<view
 			class="u-notice__right-icon"
@@ -118,11 +124,28 @@
 			textStyle() {
 				let style = {}
 				style.color = this.color
+				style.fontSize = uni.$u.addUnit(this.fontSize)
+				return style
+			},
+			animationStyle() {
+				let style = {}
 				style.animationDuration = this.animationDuration
 				style.animationPlayState = this.animationPlayState
-				style.fontSize = uni.$u.addUnit(this.fontSize)
 				return style
 			},
+			// 内部对用户传入的数据进一步分割，放到多个text标签循环，否则如果用户传入的字符串很长（100个字符以上）
+			// 放在一个text标签中进行滚动，在低端安卓机上，动画可能会出现抖动现象，需要分割到多个text中可解决此问题
+			innerText() {
+				let result = [],
+					// 每组text标签的字符长度
+					len = 20
+				const textArr = this.text.split('')
+				for (let i = 0; i < textArr.length; i += len) {
+					// 对拆分的后的text进行slice分割，得到的为数组再进行join拼接为字符串
+					result.push(textArr.slice(i, i + len).join(''))
+				}
+				return result
+			}
 		},
 		mounted() {
 			// #ifdef APP-PLUS
@@ -289,6 +312,7 @@
 				white-space: nowrap;
 				animation: u-loop-animation 10s linear infinite both;
 				/* #endif */
+				@include flex(row);
 			}
 		}
 

uview-ui/components/u-swipe-action-item/u-swipe-action-item.vue

@@ -148,7 +148,7 @@
 		position: relative;
 		overflow: hidden;
 		/* #ifndef APP-NVUE || MP-WEIXIN */
-		touch-action: none;
+		touch-action: pan-y;
 		/* #endif */
 
 		&__content {

uview-ui/components/u-tooltip/u-tooltip.vue

@@ -17,6 +17,7 @@
 				:selectable="false"
 				@longpress.stop="longpressHandler"
 				:style="{
+					color: color,
 					backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
 				}"
 			>{{ text }}</text>
@@ -312,7 +313,6 @@
 			/* #endif */
 
 			&__text {
-				color: $u-content-color;
 				font-size: 14px;
 			}
 

uview-ui/libs/config/config.js

@@ -1,5 +1,5 @@
-// 此版本发布于2022-04-19
-const version = '2.0.31'
+// 此版本发布于2022-06-17
+const version = '2.0.33'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {

uview-ui/libs/config/props/codeInput.js

@@ -10,6 +10,7 @@
 export default {
     // codeInput 组件
     codeInput: {
+		adjustPosition: true,
         maxlength: 6,
         dot: false,
         mode: 'box',

uview-ui/libs/config/props/loadingPage.js

@@ -17,6 +17,7 @@ export default {
         bgColor: '#ffffff',
         color: '#C8C8C8',
         fontSize: 19,
+        iconSize: 28,
         loadingColor: '#C8C8C8'
     }
 }

uview-ui/libs/config/props/loadmore.js

@@ -14,6 +14,7 @@ export default {
         bgColor: 'transparent',
         icon: true,
         fontSize: 14,
+		iconSize: 17,
         color: '#606266',
         loadingIcon: 'spinner',
         loadmoreText: '加载更多',
@@ -24,6 +25,8 @@ export default {
         marginTop: 10,
         marginBottom: 10,
         height: 'auto',
-        line: false
+        line: false,
+		lineColor: '#E6E8EB',
+		dashed: false,
     }
 }