merge

App.vue

@@ -1,5 +1,5 @@
 <script>
-	import plv from './pages3/polyv-sdk/index';
+	import plv from './pages3/static/polyv-sdk/index';
 	export default {
 		onLaunch: function(option) {
 			let inviteCode = option.inviteCode

manifest.json

@@ -80,7 +80,7 @@
             "urlCheck" : false,
             "postcss" : true,
             "minified" : true,
-            "es6" : false
+            "es6" : true
         },
         "usingComponents" : true,
         "permission" : {

pages.json

@@ -664,12 +664,7 @@
 					},
 					"mp-weixin": {
 						"usingComponents": {
-						    "player": "/pages3/polyv-sdk/components/player/player",
-						    "chatroom": "/pages3/polyv-sdk/components/chatroom/chatroom",
-						    "sign-in": "/pages3/polyv-sdk/components/sign-in/sign",
-						    "question": "/pages3/polyv-sdk/components/question/question",
-						    "answer-card": "/pages3/polyv-sdk/components/answer-card/answer-card",
-						    "bulletin": "/pages3/polyv-sdk/components/bulletin/bulletin"
+						    "player": "/pages3/static/polyv-sdk/components/player/player"
 						  }
 					}
 				}
@@ -679,7 +674,7 @@
 	"preloadRule": {
 		"pages/index/index": {
 			"network": "all",
-			"packages": ["pages2","pages3"]
+			"packages": []
 		}
 	},
 	"globalStyle": {
@@ -688,7 +683,7 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"usingComponents": {
-			"verify-mpsdk": "/wxcomponents/verify_mpsdk/index/index"
+			
 		}
 	},
 	"tabBar": {

pages/login/login.vue

@@ -67,7 +67,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -77,7 +77,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				account: [
@@ -85,7 +85,7 @@ export default {
 						required: true, 
 						message: '请输入手机号/学员身份证', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -93,7 +93,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -101,7 +101,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages/wd/index.vue

@@ -85,6 +85,12 @@
 						<view>我的资料</view>
 					</view>
 				</navigator>
+				<navigator  hover-class="none" url="/pages3/polyv/polyv" class="menu_box">
+					<view class="box_left">
+						<image src="/static/icon/my_icon9.png" class="my_icon"></image>
+						<view>我的直播</view>
+					</view>
+				</navigator>
 				<view class="logout" @click="logout">退出</view>
 			</view>
 		</view>

pages2/register/forget.vue

@@ -41,7 +41,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -51,7 +51,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -59,7 +59,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwdAgain: [
@@ -67,7 +67,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -75,7 +75,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages2/register/register.vue

@@ -46,7 +46,7 @@ export default {
 						required: true, 
 						message: '请输入手机号', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					},
 					{
 						validator: (rule, value, callback) => {
@@ -56,7 +56,7 @@ export default {
 						},
 						message: '手机号码格式不正确',
 						// 触发器可以同时用blur和change
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				pwd: [
@@ -64,7 +64,7 @@ export default {
 						required: true, 
 						message: '请输入密码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 				code: [
@@ -72,7 +72,7 @@ export default {
 						required: true, 
 						message: '请输入验证码', 
 						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['change','blur'],
+						trigger: ['change'],
 					}
 				],
 			},

pages2/wd/info.vue

@@ -46,7 +46,7 @@
 							</pick-regions>
 						<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>
-					<view class="item">
+					<view class="item" @click="showPhoneModal = true">
 						<view>手机号码</view>
 						<view>{{ form.telphone }}<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>
@@ -70,6 +70,30 @@
 			<u-input v-model="idCard" placeholder="请输入身份证" />
 		</view>
 	</u-modal>
+	
+	<u-popup v-model="showPhoneModal" mode="bottom" class="modal" border-radius="32">
+		<view class="modal__content">
+			<view class="top">
+				<view class="top__line"></view>
+				<view class="top__text">更换手机号码</view>
+			</view>
+			<view class="form">
+				<u-form :model="telForm" ref="telForm">
+					<view class="input-wrap">
+						<u-form-item><u-input placeholder="手机号码" v-model="telForm.tel" /></u-form-item>
+						<u-form-item>
+							<u-input placeholder="验证码" v-model="telForm.code" />
+							<view  slot="right" @click="getCode" class="getcode">获取验证码</view>
+						</u-form-item>
+					</view>
+					<view class="btns">
+						<view class="cancel" @click="showPhoneModal = false;">取消</view>
+						<view class="submit">确认更换</view>
+					</view>
+				</u-form>
+			</view>
+		</view>
+	</u-popup>
 	<u-navbar   title="我的资料" :border-bottom="false" background="{ background: '#ffffff',opacity:0.4; }" title-color="#ffffff" back-icon-color="#ffffff">
 		
 	</u-navbar>
@@ -81,10 +105,15 @@
 export default {
 	data() {
 		return {
+			showPhoneModal:false,
 			form:{
 				avatar:'',
 				userBirth:new Date()
 			},
+			telForm:{
+				tel:'',
+				code:'',
+			},
 			array_sex: ['男', '女'],
 			n_show:false,
 			defaultRegionCode: '440112',
@@ -297,7 +326,7 @@ export default {
 	
 </style>
 
-<style scope>
+<style scope lang="scss">
 	.slot-content{
 		margin: 30rpx;
 		color: #606266;
@@ -357,4 +386,83 @@ export default {
 		margin: 0 auto;
 		margin-top: 50rpx;
 	}
+	
+	.modal {
+		&__content {
+			position:relative;
+			width: 750rpx;
+			height: 1208rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 0px 16rpx 4rpx #919CB2;
+			border-radius: 32rpx 32rpx 0rpx 0rpx ;
+			overflow: hidden;
+			
+			.top {
+				border-bottom: 1rpx solid #eee;
+				&__line {
+					position: absolute;
+					top: 10rpx;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 80rpx;
+					height: 8rpx;
+					background-color: #999;
+					border-radius: 4rpx;
+				}
+				
+				&__text {
+					height: 77rpx;
+					text-align: center;
+					line-height: 90rpx;
+					font-size: 24rpx;
+					color: #999;
+					position: relative;
+				}
+			}
+			
+			.form {
+				margin: 24rpx auto 0;
+				width: 686rpx;
+				height: 360rpx;
+				background: #FFFFFF;
+				border-radius: 24rpx 24rpx 24rpx 24rpx;
+				
+				.input-wrap {
+					padding:20rpx 80rpx;
+					
+					.getcode {
+						color:#007AFF;
+						font-size: 30rpx;
+					}
+				}
+				
+				.btns {
+					display: flex;
+					justify-content: space-between;
+					margin-top:160rpx;
+					.cancel {
+						text-align: center;
+						line-height: 80rpx;
+						color:#007AFF;
+						width: 200rpx;
+						height: 80rpx;
+						font-size: 30rpx;
+						background: #F5F5F5;
+						border-radius: 40rpx 40rpx 40rpx 40rpx;
+					}
+					
+					.submit {
+						text-align: center;
+						line-height: 80rpx;
+						color:#fff;
+						font-size: 30rpx;
+						width: 438rpx;
+						height: 80rpx;
+						background: #007AFF;
+						border-radius: 40rpx 40rpx 40rpx 40rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

pages3/polyv/polyv.vue

@@ -8,8 +8,8 @@
 </template>
 
 <script>
-import plv from '../polyv-sdk/index';
-export default {
+import plv from '../static/polyv-sdk/index';
+export default { 
 	data() {
 		return {
 			videoOption:{