学员修改

pages/goods/goods.vue

@@ -167,16 +167,16 @@
 						<text class="introduce2">老师介绍</text>
 					</view>
 					<view class="teacher">
-						<image src="@/static/images/icon/icon-share.png" style="width:20px;height:30px;"
+						<image :src="g.edu_data.TeacherIcon" mode="aspectFill" style="width:30px;height:30px;"
 							class="share-icon" />
 						<view class="teacher2">
 							<view class="teacher3">
-								<view class="teacher4">张鑫生</view>
-								<view class="teacher5">高级高级高级高级高级高级高级高级高级</view>
+								<view class="teacher4"  v-if='g.edu_data.TeacherName'>{{g.edu_data.TeacherName}}</view>
+								<view class="teacher5"><rich-text :nodes="g.edu_data.TeacherInfo"></rich-text></view>
 							</view>
-							<view class="teacher4">
+						<!-- 	<view class="teacher4">
 								<u-icon name="arrow" :size="32" color="#111"></u-icon>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
@@ -186,7 +186,7 @@
 						<text class="introduce" :style="{ 'background-color': mc }"></text>
 						<text class="introduce2">详情介绍</text>
 					</view>
-					<view>富文本</view>
+					<rich-text :nodes="detailContent"></rich-text>
 				</view>
 				<!-- top3 -->
 				<view iew v-if="current==2">

pages/order-submit/order-submit2.vue

@@ -5,24 +5,25 @@
 			<!-- <view v-if="address.province && address.province != ''" class="add-info"> -->
 			<view v-if="address.province && address.province != ''" class="add-info" style="margin-top: 39px;">
 				<!-- <view class="address">{{ address.province + address.city + address.district }}</view> -->
-				<view class="area" @click="mask()">{{Thename}}</view>
+				<view v-if="namelist&&namelist.length>0" class="area" @click="mask()">{{Thename}}</view>
+				<view v-if="namelist.length<0" class="area"@click="chosenAddress()">请添加学员</view>
 				<view class="address">
 					<!-- 切换学员 -->
 					<!-- <text style="margin-right: 10px;">{{ address.name }}</text>
 					<text>{{ address.mobile }}</text -->
 				</view>
 			</view>
-			<view v-else class="add-info">
+			<!-- <view v-else class="add-info">
 				<span style="position: relative;top: 16rpx;">请选择</span>
-			</view>
+			</view> -->
 			<view class="arrow" @click="chosenAddress()">
 				<u-icon name="arrow" size="32" color="#444"></u-icon>
 			</view>
 		</view>
 		
 		<view class="pay">
-			<view>支付方式22</view>
-			<view style="text-align: right;">在线支付222</view>
+			<view>支付方式</view>
+			<view style="text-align: right;">在线支付</view>
 		</view>
 		<!-- <view class="discountbox" style="padding: 15px 0;margin-bottom: 12px;" v-if="ds.total_price >0">
 			<view class="filed" style="justify-content: space-between;">
@@ -292,7 +293,7 @@
 								<text :class="[actuve==i?'mask-lit3':'mask-lit33']">{{item.StuName}}</text>
 							</view>
 							<view v-if="actuve==i">
-								<u-icon name="arrow" size="40"></u-icon>
+								<u-icon name="success" size="40"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -491,6 +492,13 @@
 					});
 					return;
 				}
+				if(that.JJSWStuId=='') {
+					this.$refs.uToast.show({
+						title: '请添加学员！',
+						type: 'warning'
+					});
+					return;
+				}
 				if (!this.submitOrder) {
 					this.submitOrder = true;
 					uni.requestSubscribeMessage({