Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/address/address2.vue

@@ -54,7 +54,7 @@
 			<!-- 日历弹窗 -->
 			<u-popup v-model="show" mode="bottom" length="100%">
 				<view>
-					<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
+					<uni-calendar ref="calendar" :insert="false" @confirm="confirm" @close="close"  />
 				</view>
 			</u-popup>
 		</view>
@@ -266,6 +266,10 @@
 				this.show = true
 				this.$refs.calendar.open();
 			},
+			close() {
+				this.show = false
+				console.log('弹窗关闭');
+			},
 			// 学校
 			school() {
 				testCmd = "/api/WeChatPublic/GetStuSchoolClass";