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

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">
@@ -1093,7 +1093,7 @@
 	.teacher {
 		display: flex;
 		justify-content: space-between;
-		align-items: center;
+	/* 	align-items: center; */
 		margin-bottom: 50rpx;
 	}
 
@@ -1115,13 +1115,13 @@
 	}
 
 	.teacher5 {
-		color: #999;
-		font-size: 20rpx;
-		overflow: hidden;
+		/* color: #999;
+		font-size: 20rpx; */
+		/* overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
 		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical
+		-webkit-box-orient: vertical */
 	}
 
 	.introduce-box {

pages/order-submit/order-submit2.vue

@@ -3,26 +3,38 @@
 		<!-- @click="chosenAddress(ds.address.id)" -->
 		<view class="add-box" >
 			<!-- <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 v-if="address.province && address.province != ''" class="add-info" >
 				<!-- <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">
+				<view class="name-top">
+					<view class="mask-lit22"
+						:style="{ 'background-color': mc }">{{Thename.substr(0,1)}}
+					</view>
+					<view class="switch-box1" @click="mask()">
+						<view class="switch-box2">{{Thename}}</view>
+						<view class="switch-box3" >点击切换学员</view>
+					</view>
+				</view>
+				
+				</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 +304,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>
@@ -436,9 +448,12 @@
 				}
 				this.requestJJSWAdmin(testCmd, postMsg,
 					(res) => {
-						this.namelist = res.data.Data
-						this.Thename = res.data.Data[0].StuName
-						this.JJSWStuId = res.data.Data[0].StuId
+						if(res.data.Data.length>0) {
+							this.namelist = res.data.Data
+							this.Thename = res.data.Data[0].StuName
+							this.JJSWStuId = res.data.Data[0].StuId
+						}
+						
 					}
 				);
 			},
@@ -492,6 +507,13 @@
 					});
 					return;
 				}
+				if(that.JJSWStuId==''||that.Thename=='') {
+					this.$refs.uToast.show({
+						title: '请添加学员！',
+						type: 'warning'
+					});
+					return;
+				}
 				if (!this.submitOrder) {
 					this.submitOrder = true;
 					uni.requestSubscribeMessage({
@@ -499,7 +521,8 @@
 						complete(res) {
 							that.submitOrder = false;
 							let form = {};
-							form.Consignee = that.adressInfo.Consignee;
+							// form.Consignee = that.adressInfo.Consignee;
+							form.Consignee = that.Thename;
 							form.Mobile = that.adressInfo.Mobile;
 							form.Province = that.adressInfo.Province;
 							form.City = that.adressInfo.City;
@@ -805,6 +828,29 @@
 </script>
 
 <style>
+	.mask-lit22{
+		width: 50rpx;
+		    height: 50rpx;
+		    display: flex;
+		    justify-content: center;
+		    align-items: center;
+		    font-size: 30rpx;
+			border-radius: 50%;
+			text-align: center;
+			    line-height: 40rpx;
+			    color: #FFF;
+				margin-right: 20rpx;
+	}
+	.switch-box2{
+		font-size: 25rpx;
+	}
+	.switch-box3{
+		font-size: 18rpx;
+		    color: #999;
+	}
+	.name-top{
+		display: flex;
+	}
 	.mask-lit {
 		display: flex;
 		justify-content: space-between;