V1.3.2更新

README.md

@@ -12,10 +12,31 @@ ThorUI组件库，uni-app代码片段分享
 [http://www.donarui.com/](http://www.donarui.com/)
 
 
+# ThorUI QQ交流群：745733024
+![](https://thorui.cn/img/V132/1.jpg)
+
+
 本项目已同步更新到[微信小程序(原生小程序代码)](https://github.com/dingyong0214/ThorUI)，后续会更新到支付宝小程序，百度小程序，头条小程序等
 
 ## 更新日志
 
+# V1.3.2
+
+1.修复H5端发行报错的问题。
+
+2.扩展基础组件(保留了之前版本):alert、tips、button、toast。
+
+3.新增表单验证功能，只需配置相应验证即可。
+
+4.新增返回顶部组件,nvue返回顶部看首页[nvue商品列表]。
+
+5.优化部分页面，修复已知bug。
+
+# 功能截图 
+|  ![](https://thorui.cn/img/V132/4.jpg) |![](https://thorui.cn/img/V132/2.jpg)  |  ![](https://thorui.cn/img/V132/3.jpg) |
+| ------------ | ------------ | ------------ |
+|   |    |   |
+
 # V1.3.0
 1.新增倒计时组件:时分秒倒计时，支持设置大小，颜色等。
 

components/utils/formValidation.js

@@ -205,7 +205,8 @@ const form = {
 		return /^[a-zA-Z]*$/.test(value)
 	},
 	_isEnAndNo: function(value) {
-		return /[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/.test(value);
+		//8~20位数字和字母组合 按需修改
+		return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/.test(value);
 	},
 	_isSpecial: function(value) {
 		//是否包含特殊字符
@@ -244,8 +245,6 @@ const form = {
 		}
 	},
 	_minLength: function(value, min) {
-		console.log(value)
-		console.log(min)
 		return value.length >= Number(min)
 	},
 	_maxLength: function(value, max) {

manifest.json

@@ -2,7 +2,7 @@
     "name" : "ThorUI",
     "appid" : "__UNI__9B4FAA5",
     "description" : "",
-    "versionName" : "1.3.1",
+    "versionName" : "1.3.2",
     "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/extend-view/formValidation/formValidation.vue

@@ -112,12 +112,12 @@
 					msg: ["请输入身份证号码", "请输入正确的身份证号码"]
 				}, {
 					name: "pwd",
-					rule: ["required", "isEnAndNo", "minLength:6"],
-					msg: ["请输入密码", "密码必须包含英文和数字", "密码必须6个或以上字符"]
+					rule: ["required", "isEnAndNo"],
+					msg: ["请输入密码", "密码为8~20位数字和字母组合"]
 				}, {
 					name: "pwd2",
-					rule: ["required", "isEnAndNo", "isSame:pwd"],
-					msg: ["请输入确认密码", "确认密码必须包含英文和数字", "两次输入的密码不一致"]
+					rule: ["required", "isSame:pwd"],
+					msg: ["请输入确认密码", "两次输入的密码不一致"]
 				}, {
 					name: "range",
 					rule: ["required", "range:[3,20]"],
@@ -156,7 +156,6 @@
 
 	.tui-line-cell {
 		width: 100%;
-		;
 		box-sizing: border-box;
 		display: flex;
 		align-items: center;

pages/log/log.vue

@@ -88,9 +88,9 @@
 						"4.已知问题修复以及优化。"
 					]
 				}, {
-					version: "1.3.1",
-					date: "2019-07-19",
-					log: ["1.修复H5端发行报错的问题。", "2.扩展基础组件(保留了之前版本):alert、tips、button、toast。", "3.新增表单验证功能，只需配置相应验证即可。", "4.优化部分页面，修复已知bug。"]
+					version: "1.3.2",
+					date: "2019-07-22",
+					log: ["1.修复H5端发行报错的问题。", "2.扩展基础组件(保留了之前版本):alert、tips、button、toast。", "3.新增表单验证功能，只需配置相应验证即可。", "4.新增返回顶部组件,nvue返回顶部看首页[nvue商品列表]。", "5.优化部分页面，修复已知bug。"]
 				}].reverse()
 			}
 		},

pages/productNvue/productNvue.nvue

@@ -12,14 +12,14 @@
 			</div>
 		</div>
 		<waterfall @loadmore="loadMore" loadmoreoffset="10" class="tui-product-list" column-count="2" column-gap="10"
-		 right-gap="30" left-gap="30" ref="waterfall">
-			<refresh class="tui-refresh" @refresh="onrefresh" @pullingdown="onpullingdown" :display="refreshing ? 'show' : 'hide'">
+		 right-gap="30" left-gap="30" ref="waterfall" @scroll="recylerScroll">
+			<refresh class="tui-refresh" ref="goTop" @refresh="onrefresh" @pullingdown="onpullingdown" :display="refreshing ? 'show' : 'hide'">
 				<loading-indicator class="loading"></loading-indicator>
 				<text :class="[iosRefresh?'ios-arrow':'']" v-if="isIos">{{arrow}}</text>
 				<text class="tui-refresh-text">{{refreshText}}</text>
 			</refresh>
 			<cell v-for="(item,index) in productList" :key="index">
-				<div class="tui-product" :class="[index===0 || index===1?'tui-mtop':'']" @click="detail(index)">
+				<div class="tui-product" :class="[index===0 || index===1?'tui-mtop':'']" @click="detail(index)" :ref="'listItem'+index">
 					<div class="image-div">
 						<image v-if="renderImage" class="tui-product-image" :src="'../../static/images/product/'+item.img+'.jpg'" resize="cover"></image>
 						<div class="none" v-if="index===0"><text class="none-tip">点击售罄返回</text></div>
@@ -40,10 +40,14 @@
 				<text class="loadmore-text" :class="[isIos?'tui-gray':'tui-white']">{{loadingText}}</text>
 			</header>
 		</waterfall>
+		<div ref="fixed" class="fixedItem" @click="scrollToTop" v-if="topShow">
+			<text class="fixedText">top</text>
+		</div>
 	</div>
 </template>
 
 <script>
+	const dom = weex.requireModule('dom')
 	export default {
 		data() {
 			return {
@@ -57,6 +61,7 @@
 				renderImage: false,
 				loadingText: "加载更多...",
 				pageIndex: 1,
+				topShow: false,
 				productList: [{
 						img: 1,
 						name: "利物浦官方 独家出品纪念版沙发",
@@ -221,7 +226,7 @@
 					this.productList = this.loadData || [];
 					this.$refs.waterfall.resetLoadmore()
 					setTimeout(() => {
-					   this.refreshing = false;
+						this.refreshing = false;
 					}, 0)
 				} else {
 					this.productList = this.productList.concat(this.loadData)
@@ -279,6 +284,20 @@
 				uni.navigateTo({
 					url: '../extend-view/news-search/news-search'
 				})
+			},
+			recylerScroll: function(e) {
+				console.log(e.contentOffset.y )
+				if (e.contentOffset.y < -200) {
+					this.topShow = true
+				} else {
+					this.topShow = false
+				}
+			},
+			scrollToTop: function() {
+				const el = this.$refs.goTop
+				dom.scrollToElement(el, {
+					offset: -126
+				})
 			}
 		}
 	}
@@ -373,7 +392,7 @@
 		background-color: #FFFFFF;
 		border-width: 1px;
 		border-style: solid;
-		border-color:#eaeef1;
+		border-color: #eaeef1;
 	}
 
 	.tui-mtop {
@@ -499,14 +518,16 @@
 		font-size: 26px;
 		text-align: center;
 		color: #999999;
-		
+
 		padding-left: 6px;
 		padding-right: 6px;
 	}
-	.tui-gray{
+
+	.tui-gray {
 		background-color: #fafafa;
 	}
-	.tui-white{
+
+	.tui-white {
 		background-color: #ffffff;
 	}
 
@@ -540,4 +561,22 @@
 		padding-right: 20px;
 		margin-left: -75px;
 	}
+
+	.fixedItem {
+		position: fixed;
+		width: 78px;
+		height: 78px;
+		background-color: #00cc99;
+		right: 32px;
+		bottom: 32px;
+		border-radius: 39px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.fixedText {
+		font-size: 32px;
+		color: white;
+		line-height: 32px;
+	}
 </style>

store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		version: "1.3.1",
+		version: "1.3.2",
 		isLogin: uni.getStorageSync("thorui_mobile") ? true : false,
 		mobile: uni.getStorageSync("thorui_mobile") || "echo.",
 		memberId: uni.getStorageSync("memberId") || 0,