Merge branch 'dev' into lbg-dev

pages/myReserve/myReserve.vue

@@ -21,7 +21,9 @@
 					</view>
 				</view>
 			</view>
-			<view v-else>暂无数据</view>
+			<view v-else>
+				<noContent text="暂无数据"></noContent>
+			</view>
 			<view style="text-align: center;margin-top: 20px;" v-if="isDate">
 				<button size="mini" @click="more()">+查看更多</button>
 			</view>
@@ -31,7 +33,9 @@
 
 <script>
 	import aes from "@/common/aes.js";
+	import noContent from "@/components/ui-noContent/ui-noContent.vue";
 	export default {
+		components:{noContent},
 		data() {
 			return {
 				dataList: null,

sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue

@@ -193,8 +193,7 @@
 				let promise = new Promise(function(resolve, reject) {
 					let state = []
 					that.dynamicLists.map((item, index) => {
-						that.$refs.form[index].validate().then(res => {
-							
+						that.$refs.form[index].validate().then(res => {							
 							
 							let idreg =
 								/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
@@ -204,7 +203,8 @@
 							} else {
 								state[index] = '1'
 								that.dynamicLists[index].idCardState=false
-							}						
+							}					
+								
 							
 						}).catch(err => {
 							state[index] = '0'