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

pages/address/address2.vue

@@ -9,7 +9,7 @@
 					placeholder="请输入学员姓名" maxlength="5" />
 			</view>
 			<view class="box-bg">
-				<view>性别:{{}}</view>
+				<view>性别</view>
 				<view class="xingbie">
 					<text v-for="(item, i) in goodsist" :key="i" @click="gende(item,i)"
 						:class="[index==i?'gender':'gender2'] ">{{item.name}}</text>
@@ -40,16 +40,12 @@
 					<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
 				</view>
 			</view>
-			<!-- <view class="box-bg" @click="community()">
+			<view class="box-bg" @click="community()">
 				<input maxlength="0" class="uni-input inputM" readonly="readonly"
 					style='margin-left: 10px;margin-top: 5px;' v-model="rules.School_Id" placeholder="报名校区" />
 				<view>
 					<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
 				</view>
-			</view> -->
-			<view class="box-bg">
-				<input class="uni-input inputM" readonly="readonly"
-					style='margin-left: 10px;margin-top: 5px;' v-model="rules.School_Id" placeholder="报名校区" />
 			</view>
 			<view class="box-bg">
 				<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;'
@@ -110,7 +106,7 @@
 				<view class="list" :class="[actuve2==i?'list2':'']" v-for="(item, i) in campus" :key="i"
 					@click="masklist2(item,i)">
 					<view>
-						{{item.StuName}}
+						{{item.SName}}
 					</view>
 					<view v-if="actuve2==i">
 						<u-icon name="success" size="20"></u-icon>
@@ -186,18 +182,18 @@
 					BaseCondition: that.rules.BaseCondition, //	就读学校	是	[string]		查看
 					DemandPoint: that.rules.DemandPoint, //	班级	是	[string]		查看
 					ConsultingResults: that.rules.ConsultingResults, //	如何知道进阶思维	是	[string]		查看
-					// School_Id: that.School_Id, //	校区	是	[string]	
-					School_Id: that.rules.School_Id, //	校区	是	[string]	
+					School_Id: that.School_Id, //	校区	是	[string]	
+					// School_Id: that.rules.School_Id, //	校区	是	[string]	
 					Group_Id: "100001"
 				};
 				that.requestJJSWAdmin(testCmd, postMsg,
 					(res) => {
 						if (res.data.Code == 1) {
-							uni.showToast({
-								title: '提交成功',
-								icon: 'exception',
-								duration: 2000
-							});
+							// uni.showToast({
+							// 	title: '提交成功',
+							// 	icon: 'exception',
+							// 	duration: 2000
+							// });
 							uni.navigateBack({
 								delta: 1
 							});
@@ -252,7 +248,6 @@
 				} else {
 					this.registered()
 				}
-
 			},
 			confirm(e) {
 				console.log(e);
@@ -300,17 +295,17 @@
 				this.show3 = false
 			},
 			community() {
-				testCmd = "/api/WeChatPublic/GetStuList";
+				testCmd = "/api/WeChatPublic/GetSchoolList";
 				postMsg = {
-					UnionId: "oV5Rm1J_MpkEVvE0VPEicwCDG1Zo"
+					Group_Id: ""
 				};
 				this.initlist()
 				this.show4 = true
 			},
 			masklist2(item, i) {
 				this.actuve2 = i
-				this.rules.School_Id = item.StuName
-				this.School_Id = item.StuId
+				this.rules.School_Id = item.SName
+				this.School_Id = item.SId
 				this.show4 = false
 			},
 		},

pages/order-submit/order-submit2.vue

@@ -510,13 +510,13 @@
 				// that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
 				// that.JJSWStuId = '10724';
 				// that.Thename="HK";
-				if (that.adressInfo.Consignee == '') {
-					this.$refs.uToast.show({
-						title: '请选择收货信息！',
-						type: 'warning'
-					});
-					return;
-				}
+				// if (that.adressInfo.Consignee == '') {
+				// 	this.$refs.uToast.show({
+				// 		title: '请选择收货信息！',
+				// 		type: 'warning'
+				// 	});
+				// 	return;
+				// }
 				if (that.JJSWStuId == '' || that.Thename == '') {
 					this.$refs.uToast.show({
 						title: '请添加学员！',