Merge branch 'master' of http://git.jhcs888.com/zpj/zh-new-promotion

pages/index/index.vue

@@ -63,8 +63,11 @@
 						<view class="fc-F2D4A9 fs-28 text-align-center mb-32 wow animate__animated animate__bounceInRight">重庆丽星君顿酒店</view>
 						<view class="fc-F2D4A9 fs-36 text-align-center mb-16 wow animate__animated animate__bounceInLeft">会议时间</view>
 						<view class="fc-F2D4A9 fs-28 text-align-center mb-32 wow animate__animated animate__bounceInRight">10月20日早 上08:30</view>
-						<view class="fc-F2D4A9 fs-36 text-align-center mb-16 wow animate__animated animate__bounceInLeft">联系方式</view>
-						<view class="fc-F2D4A9 fs-28 text-align-center mb-32 wow animate__animated animate__bounceInRight">023-67177907</view>
+						<view class="fc-F2D4A9 fs-36 text-align-center mb-16 wow animate__animated animate__bounceInLeft" @click="playPhone()">联系方式(点击拨打)</view>
+						<view class="fc-F2D4A9 fs-28 text-align-center mb-32 wow animate__animated animate__bounceInRight" @click="playPhone()">
+							<uni-icons style="margin-right: 10rpx;" type="phone-filled" color="#f2d4a9" size="14"></uni-icons>
+							023-67177907
+						</view>
 					</view>
 					<image class="up-icon wow animate__animated animate__bounceInUp" src="@/static/img/c-up-icon.png" mode="scaleToFill"></image>
 				</view>
@@ -124,13 +127,35 @@
 			}
 		},
 		onshow() {
+			console.log('onshow');
+			console.log(uni.getStorageSync('userName'));
+			
+			setTimeout(()=>{
+				console.log('onshow延迟100');
+				console.log(uni.getStorageSync('userName'));
+			},100)
+			
 			this.userName = uni.getStorageSync('userName');
 			this.$wow.init();
 		},
 		mounted() {
+			console.log('mounted');
+			console.log(uni.getStorageSync('userName'));
+			
+			setTimeout(()=>{
+				console.log('mounted延迟100');
+				console.log(uni.getStorageSync('userName'));
+			},100)
+			
 			this.userName = uni.getStorageSync('userName');
 		},
 		methods: {
+			playPhone() {
+				uni.makePhoneCall({
+					phoneNumber: '023-67177907'
+				});
+			},
+			
 			swiperChange(e){
 				if(e.detail.current!=this.index){
 					this.index = e.detail.current;