Merge remote-tracking branch 'origin/master'

src/projects/pension/views/Master/Live/Pay.vue

@@ -37,11 +37,11 @@
 				<form class="mui-input-group margin10">
 					<div class="mui-input-row mui-radio">
 						<label>微信支付</label>
-						<input name="radio1" type="radio" checked value="1" v-model="paytypeindex" >
+						<input name="radio1" type="radio"  value="1" v-model="paytypeindex" >
 					</div>
 					<div class="mui-input-row mui-radio">
 						<label>支付宝支付</label>
-						<input name="radio1" type="radio" value="2" v-model="paytypeindex">
+						<input name="radio1" type="radio"  value="2" v-model="paytypeindex">
 					</div>
 				</form>
 			<div class="vongi-qingjiadt vongi-editme">
@@ -62,6 +62,7 @@
 					</div>
 				</div>
 			</div>
+	<img id="qrcode">
 	<loading :visible="isLoading"></loading>
 
 </div>
@@ -100,7 +101,7 @@
 			return {
 				pageTitle: '收银台',
 				paytypeindex:"1",
-				paycode:null,
+				paycode:'',
 				paytype:"微信支付",
 				qrCodeImg:"",
 				isLoading: false,
@@ -174,7 +175,7 @@
 								'请使用支付宝扫码', btnArray, function(e) {
 									if (e.index == 1) {
 										_this.$router.push({
-											name: 'StudentOpenClass',
+											name: 'MasterLiveInfo',
 										})
 									}
 

src/projects/pension/views/Master/Mine/Center.vue

@@ -45,11 +45,13 @@
 							<img src="~$project/assets/img/change.png" width="18" /> 切换为长者模式
 						</a>
 					</li>
-					<!-- <li class="mui-table-view-cell">
+				</ul>
+				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+					<li class="mui-table-view-cell">
 						<router-link :to="{name:'MasterMineFeedback'}" class="mui-navigate-right">
 							<img src="~$project/assets/img/set.png" width="18" /> 问题反馈
 						</router-link>
-					</li> -->
+					</li>
 					<li class="mui-table-view-cell">
 						<a href="tel:4008899619" class="">
 							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线