zzp 2 years ago
parent
commit
42d279fa22
100 changed files with 818 additions and 582 deletions
  1. 15 2
      config/api.js
  2. 16 7
      pages/index/index.vue
  3. 5 5
      pages/member/index.vue
  4. 26 24
      pages/user/index.vue
  5. 3 2
      pagesMain/contractInfo.vue
  6. 54 3
      pagesMain/couponList.vue
  7. 1 0
      pagesMain/openMember.vue
  8. 104 83
      pagesMain/subscribeInfo.vue
  9. 19 4
      pagesMain/subscribeList.vue
  10. 1 1
      pagesMember/evaluateForm.vue
  11. 8 8
      pagesMember/leaveForm.vue
  12. 0 1
      pagesMember/venueDetail.vue
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/member/index.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/contractInfo.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/couponList.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/evaluateList.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/memberCardList.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/openMember.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/orderList.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResult.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResultNo.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/shareInfo.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/studentList.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeInfo.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeList.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/classDetail.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/courseForm.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/evaluateForm.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/leaveForm.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/myClassDetail.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelForm.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelSuccess.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueDetail.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueMore.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-calendar/u-calendar.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-empty/u-empty.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line-progress/u-line-progress.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-modal/u-modal.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs-swiper/u-tabs-swiper.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-top-tips/u-top-tips.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
  69. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  70. 83 70
      unpackage/dist/dev/mp-weixin/common/vendor.js
  71. 24 15
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  72. 7 7
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  73. 9 9
      unpackage/dist/dev/mp-weixin/pages/member/index.js
  74. 0 0
      unpackage/dist/dev/mp-weixin/pages/member/index.wxml
  75. 32 30
      unpackage/dist/dev/mp-weixin/pages/user/index.js
  76. 22 21
      unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.js
  77. 87 14
      unpackage/dist/dev/mp-weixin/pagesMain/couponList.js
  78. 4 0
      unpackage/dist/dev/mp-weixin/pagesMain/couponList.json
  79. 0 0
      unpackage/dist/dev/mp-weixin/pagesMain/couponList.wxml
  80. 5 5
      unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.js
  81. 17 17
      unpackage/dist/dev/mp-weixin/pagesMain/memberCardList.js
  82. 26 25
      unpackage/dist/dev/mp-weixin/pagesMain/openMember.js
  83. 7 7
      unpackage/dist/dev/mp-weixin/pagesMain/orderList.js
  84. 18 18
      unpackage/dist/dev/mp-weixin/pagesMain/payResult.js
  85. 18 18
      unpackage/dist/dev/mp-weixin/pagesMain/payResultNo.js
  86. 2 2
      unpackage/dist/dev/mp-weixin/pagesMain/shareInfo.js
  87. 4 4
      unpackage/dist/dev/mp-weixin/pagesMain/studentList.js
  88. 115 107
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeInfo.js
  89. 0 0
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeInfo.wxml
  90. 38 25
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.js
  91. 0 1
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.json
  92. 0 0
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.wxml
  93. 7 7
      unpackage/dist/dev/mp-weixin/pagesMember/classDetail.js
  94. 6 6
      unpackage/dist/dev/mp-weixin/pagesMember/courseForm.js
  95. 6 6
      unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.js
  96. 1 1
      unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.wxml
  97. 12 12
      unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.js
  98. 0 0
      unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.wxml
  99. 6 6
      unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.js
  100. 8 8
      unpackage/dist/dev/mp-weixin/pagesMember/subscribelForm.js

+ 15 - 2
config/api.js

@@ -72,11 +72,18 @@ module.exports = {
 	getCouponList: API_BASE + '/v2/student/myCenter/getCouponList',
 	//  获取分享有礼二维码
 	getShareUrl: API_BASE + '/v2/student/myCenter/share',
+	//  获取二维码信息
+	getQrcodeInfo: API_BASE + '/v2/sale/center/bindShareId',
 	//  获取我的评价列表
 	getEvaluateList: API_BASE + '/v2/student/myCenter/getClassEvaluateList',
 	//  获取我的预约体验列表
-	getSubscribeList: API_BASE + '/v2/student/myCenter/getSubscribeClassEvaluateList',
-	
+	getSubscribeList: API_BASE + '/v2/admin/subscribe/getSubscribeClassEvaluateList',
+	// 查询场馆下 班级列表
+	getClassListByVenueId: API_BASE + '/course/getClassListByVenueId',
+	//  查询教练列表
+	getCoachList: API_BASE + '/common/coach/getCoachList',
+	//  保存预约信息
+	updateAppointment: API_BASE + '/v2/admin/subscribe/updateAppointment',
 	
 	//  获取可购买会员卡列表
 	getMemberCardList: API_BASE + '/v2/student/myCenter/getCardTypeList',
@@ -88,6 +95,12 @@ module.exports = {
 	getParentInfo: API_BASE + '/v2/student/contract/getUserInfo',
 	//  获取可用优惠券列表
 	getUsableCouponList: API_BASE + '/v2/student/myCenter/getOwnCouponList',
+	//  获取当前用户绑定的学员
+	getUserStudent: API_BASE + '/v2/admin/student/getUserStudent',
+	//  根据学员获取二维码
+	studentQRcode: API_BASE + '/v2/sale/center/studentQRcode',
+	//  根据学员获取剩余课时
+	getGiveLessons: API_BASE + '/v2/admin/leave/getGiveLessons',
 	//  获取可购买会员卡学员列表
 	getAllStudentList: API_BASE + '/v2/student/myCenter/selectAllStudent',
 	//  获取合同模板

+ 16 - 7
pages/index/index.vue

@@ -92,14 +92,23 @@
 		},
 		onLoad(options) {
 			if (options.shareParams) {
-				console.log(options.shareParams)
-				wx.setStorage({//存储到本地
-				  key:"shareParams",
-				  data:options.shareParams
-				})
+				// 分享获取参数
+				 const shareParams = decodeURIComponent(options.shareParams)
+				 const shareId = shareParams.split(':')[0]
+				 NET.request(API.getQrcodeInfo, {shareId}, 'POST').then(res => {
+					if(res.status == 50000) {
+						this.$refs.uTips.show({
+							title: res.message,
+							type: 'warning',
+						})
+					}
+				 })
+				// console.log(options.shareParams)
+				// wx.setStorage({//存储到本地
+				//   key:"shareParams",
+				//   data:options.shareParams
+				// })
 			}
-			//console.log(wx.getStorageSync('shareParams'))
-			
 			// setTimeout(()=>{
 			// 	let videoContext = uni.createVideoContext('video1')
 			// 	videoContext.play()

+ 5 - 5
pages/member/index.vue

@@ -26,8 +26,10 @@
 						<view class="class-content" slot="foot" style="padding-bottom: 10px;text-align: right;">
 							<u-button type="default" shape="circle" :ripple="true" :custom-style="handleDefaultCustomStyle" size="mini"
 							 :hair-line="false" plain @click.stop="goToLeave(site)" v-if="index1 != 2">请假</u-button>
-							<u-button type="warning" shape="circle" :ripple="true" :custom-style="handleCustomStyle" size="mini" @click.stop="goToEvaluate(site)"
-							 v-if="site.isEvaluate == 0 && index1 == 2">评价</u-button>
+							 <template v-else>
+								 <u-button type="warning" shape="circle" :ripple="true" :custom-style="handleCustomStyle" size="mini" @click.stop="goToEvaluate(site)" v-if="site.isEvaluate == 0">评价
+								  </u-button>
+							 </template>
 						</view>
 					</u-card>
 					<u-divider v-if="item.isOver" bg-color="transparent">没有更多了</u-divider>
@@ -75,11 +77,9 @@
 				swiperCurrent: 0,
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.getTableList(1)
 			this.getTableList(2)
-		},
-		onShow() {
 			this.tabList[this.current].isOver = false
 			this.tabList[this.current].pageIndex = 1
 			this.tabList[this.current].tableList = []

+ 26 - 24
pages/user/index.vue

@@ -104,7 +104,7 @@
 					},
 					{
 						label: '预约体验',
-						path: 'subscribeInfo',
+						path: 'subscribeList',
 						icon: API.getServerImg + 'yuyue.png'
 					},
 					// {
@@ -184,29 +184,31 @@
 							// })
 						},
 					})
-				} else if(site.path == 'subscribelForm') {
-					uni.navigateTo({
-						url: '/pagesMember/' + site.path
-					});
-				// 	 try {
-				// 			uni.scanCode({
-				// 				onlyFromCamera: true,
-				// 				success: function (res) {
-				// 					console.log(res)
-				// 				},
-				// 				fail: function (res) {
-				// 					this.$refs.uTips.show({
-				// 						title: "调用摄像头失败",
-				// 						type: 'warning',
-				// 					})
-				// 				},
-				// 			});
-				// 		} catch {
-				// 			this.$refs.uTips.show({
-				// 				title: "调用摄像头失败",
-				// 				type: 'warning',
-				// 			})
-				// 		}
+				} else if(site.path == 'subscribeList') {
+					// uni.navigateTo({
+					// 	url: '/pagesMain/' + site.path
+					// });
+					 try {
+							uni.scanCode({
+								onlyFromCamera: true,
+								success: function (res) {
+									uni.navigateTo({
+										url: res.path
+									})
+								},
+								fail: function (res) {
+									this.$refs.uTips.show({
+										title: "调用摄像头失败",
+										type: 'warning',
+									})
+								},
+							});
+						} catch {
+							this.$refs.uTips.show({
+								title: "调用摄像头失败",
+								type: 'warning',
+							})
+						}
 				} else if(site.path == 'logout'){
 					uni.removeStorageSync('token')
 					uni.navigateTo({

+ 3 - 2
pagesMain/contractInfo.vue

@@ -63,6 +63,7 @@
 				studentId: options.studentId,
 			}
 			this.realPayAmount = options.realPayAmount
+			console.log(this.realPayAmount);
 			this.getContractInfo(options.parentName, options.sex)
 			context = uni.createCanvasContext('canvas')
 			context.setLineWidth(3)
@@ -173,14 +174,14 @@
 							success: (uploadFileRes) => {
 								that.signUrl = JSON.parse(uploadFileRes.data).data.id
 								NET.request(API.submitContractForm, {
-									contractId: that.contractInfo.id,
+									contractIds: that.contractInfo.map(item => { return item.id }),
 									fileId: that.signUrl,
 								}, 'POST').then(res => {
 									/*uni.redirectTo({
 										url: '/pagesMain/payResultNo?id=' + res.data.oderNo
 									});*/
 									//this.goToPayResult(res.data.oderNo)
-									that.toPay(res.data.id)
+									that.toPay(res.data.map(item => { return item.id }))
 								}).catch(error => {
 									that.$refs.uTips.show({
 										title: error.message,

+ 54 - 3
pagesMain/couponList.vue

@@ -27,15 +27,23 @@
 				 </template>
 					<template v-else>
 						<view class="content-info">
+							<u-form ref="form" label-width="80">
+								<u-form-item label="学员" right-icon="arrow-right" required @click.native="studentShow = true">
+									<u-input v-model="studentName" placeholder="请选择学员" disabled  @click="studentShow = true" />
+								</u-form-item>
+							<!-- <u-input v-model="studentName" placeholder="请选择归属场馆" disabled @click="studentShow = true" /> -->
+							</u-form>
+
 							<view class="share-img">
-								<u-image width="60vw" height="60vw" :src="shareUrl" ></u-image>
-								<view class="share-class">共5节课</view>
+								<u-image width="60vw" height="60vw" :src="qrcodeUrl" ></u-image>
+								<view class="share-class">共{{ classes }}节课</view>
 							</view>
 						</view>
 					</template>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<u-picker mode="selector" v-model="studentShow" :range="studentList" range-key="childName" @confirm="handleStudentClick"></u-picker>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
 </template>
@@ -80,15 +88,59 @@
 				}],
 				current: 0,
 				swiperCurrent: 0,
+				//  学生id
+				studentId: '',
+				// 学生姓名
+				studentName: '',
+				studentShow: '',
+				studentList: [],
+				// 二维码
+				qrcodeUrl: '',
+				// 课时
+				classes: 0
 			}
 		},
 		onLoad() {
 			this.getTableList(0)
 			this.getTableList(1)
 			this.getTableList(2)
+			this.getCouponList()
 		},
 		onReady() {},
 		methods: {
+			//  获取可用优惠券列表
+			getCouponList() {
+				NET.request(API.getUserStudent, {
+					userId: uni.getStorageSync('userData').userId }, 'POST').then( res => {
+						if(res.status == 10000) {
+							this.studentList = res.data
+							if(this.studentList.length) {
+								this.handleStudentClick(0)
+							}
+						}
+					})
+			},
+			//  选择学生
+			handleStudentClick(args) {
+				this.studentId = this.studentList[args].studentId
+				this.studentName = this.studentList[args].childName
+				this.getInfo()
+			},
+			//  根据学员获取二维码和剩余课时
+			getInfo() {
+				NET.request(API.studentQRcode, { studentId: this.studentId },'POST').then(res => {
+					if(res.status == 10000) {
+						this.qrcodeUrl = res.data
+					} 
+				})
+				NET.request(API.getGiveLessons, { studentId: this.studentId },'POST').then(res => {
+					console.log(res);
+					if(res.status == 10000) {
+						console.log(res.data);
+						this.classes = res.data.length
+					} 
+				})
+			},
 			//  tab页面切换
 			tabsChange(index) {
 				this.swiperCurrent = index;
@@ -104,7 +156,6 @@
 				this.$refs.uTabs.setFinishCurrent(current);
 				this.swiperCurrent = current;
 				this.current = current;
-				console.log(this.current);
 			},
 			//  下拉刷新
 			onRefresh() {

+ 1 - 0
pagesMain/openMember.vue

@@ -164,6 +164,7 @@
 				price += item
 			})
 			this.realPayAmount = price
+			this.memberInfo.realPayAmount = price
 			// this.getMemberInfo(1)
 			// if (options.venueId) {
 			// 	this.venueEdit = false

+ 104 - 83
pagesMain/subscribeInfo.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="content">
 		<u-form :model="subscribelForm" ref="subscribelForm" label-width="140">
-			<u-form-item label="学生姓名" prop="studentName" required>
-				<u-input v-model="subscribelForm.studentName" placeholder="请输入学生姓名" />
+			<u-form-item label="学生姓名" prop="studentName">
+				<u-input v-model="subscribelForm.studentName" disabled />
 			</u-form-item>
 			<!-- <u-form-item label="家长姓名" prop="fatherName" required>
 				<u-input v-model="subscribelForm.fatherName" placeholder="请输入家长姓名" />
 			</u-form-item> -->
-			<u-form-item label="学生性别" prop="sex" required>
-				<u-input v-model="subscribelForm.sex" placeholder="请选择学生性别" :select-open="sexShow" type="select" @click="sexShow = true" />
+			<u-form-item label="学生性别" prop="sex">
+				<u-input v-model="subscribelForm.sex" disabled />
 			</u-form-item>
-			<u-form-item label="学生年龄" prop="age" required>
-				<u-input v-model="subscribelForm.age" placeholder="请输入学生年龄" type="number" />
+			<u-form-item label="学生年龄" prop="age">
+				<u-input v-model="subscribelForm.age" disabled />
 			</u-form-item>
-			<u-form-item label="学生班级" prop="grade" required>
-				<u-input v-model="subscribelForm.grade" placeholder="请输入学生班级" />
+			<u-form-item label="学生班级" prop="name">
+				<u-input v-model="subscribelForm.name" placeholder="请输入学生班级" type="select" @click="handleClassInfoShow" />
 			</u-form-item>
 			<!-- <u-form-item label="学生生日" prop="birthday" required>
 				<u-input v-model="subscribelForm.birthday" placeholder="请选择学生生日" :select-open="birthdayShow" type="select" @click="birthdayShow = true" />
@@ -22,15 +22,17 @@
 	<!-- 		<u-form-item label="手机号码" prop="phone" required>
 				<u-input v-model="subscribelForm.phone" type="number" placeholder="请输入手机号码" />
 			</u-form-item> -->
-			<u-form-item label="体验日期" placeholder="请选择体验日期" prop="experience">
+	<!-- 		<u-form-item label="体验日期" placeholder="请选择体验日期" prop="experience">
 				<u-input v-model="subscribelForm.experience" :select-open="experienceShow" type="select" @click="experienceShow = true" />
-				</u-form-item>
-			<u-form-item label="上课教练" placeholder="请选择上课教练" prop="coach">
-					<u-input v-model="subscribelForm.coach" type="select" @click="coachShow = true" />
+				</u-form-item> -->
+			<u-form-item label="上课教练" placeholder="请选择上课教练" prop="coachName">
+				<u-input v-model="subscribelForm.coachName" type="select" @click="handleCoachListShow" />
 			</u-form-item>
 		</u-form>
 		<!-- 性别 -->
-		<u-action-sheet :list="sexList" v-model="sexShow" @click="setSex"></u-action-sheet>
+		<!-- <u-action-sheet :list="sexList" v-model="sexShow" @click="setSex"></u-action-sheet> -->
+		<!-- 班级 -->
+		<u-action-sheet :list="classList" v-model="classShow" @click="HandleChooseClassClick"></u-action-sheet>
 		<!-- 教练 -->
 		<u-action-sheet :list="coachList" v-model="coachShow" @click="HandleChooseCoachClick"></u-action-sheet>
 		<!-- 学生生日 -->
@@ -39,7 +41,7 @@
 		<u-calendar v-model="experienceShow" mode="date" :active-bg-color="mainColor" btn-type="error" availableText="有课"
 		 :available="availableList" @change="setExperience" max-date="2300-12-31"></u-calendar>
 		<view class="handle-fix-box">
-			<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="submitForm()">保存</u-button>
+			<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="submitForm">保存</u-button>
 		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
@@ -60,54 +62,19 @@
 		},
 		data() {
 			return {
+				// 场馆id
+				venueId: null,
 				subscribelForm: {
+					studentId: '',
 					studentName: '',
 					sex: '',
 					age: '',
-					grade: '',
-					experience: '',
+					classId: '',
+					name: '',
 					coachId: '',
-					coach: ''
-				},
-				rules: {
-					studentName: [{
-						required: true,
-						message: '请输入学生姓名',
-						trigger: 'change'
-					}],
-					fatherName: [{
-						required: true,
-						message: '请输入家长姓名',
-						trigger: 'change'
-					}],
-					sex: [{
-						required: true,
-						message: '请选择学生性别',
-						trigger: 'change'
-					}],
-					age: [{
-						required: true,
-						message: '请输入学生年龄',
-						trigger: 'change'
-					}],
-					birthday: [{
-						required: true,
-						message: '请选择学生生日',
-						trigger: 'change'
-					}],
-					phone: [{
-							required: true,
-							message: '请输入手机号码',
-							trigger: 'change'
-						},
-						{
-							pattern: /^1[0-9]{10}$/g,
-							transform(value) {
-								return String(value);
-							},
-							message: '请输入正确格式的手机号码'
-						},
-					],
+					coachName: '',
+					// 预约id
+					subscribeId: ''
 				},
 				sexShow: false,
 				sexList: [{
@@ -128,25 +95,67 @@
 				},
 				experienceShow: false,
 				availableList: [],
+				classShow: false,
+				classList: [],
 				coachShow: false, 
-				coachList: [{
-					  id: 1,
-						text: '大代礼'
-					},
-					{
-						id: 2,
-						text: '冀朝明'
-					}
-				],
+				coachList: [],
 			}
 		},
 		onLoad(options) {
-			// this.subscribelForm.phone = uni.getStorageSync('userData').phone
+			const item = JSON.parse(decodeURIComponent(options.item));
+			this.venueId = options.venueId
+			this.subscribelForm = { ...item, id: item.classId, sex:item.sex == 1 ? '男' : '女' }
+			console.log(this.subscribelForm);
 		},
 		onReady() {
 			this.$refs.subscribelForm.setRules(this.rules);
 		},
 		methods: {
+			//  显示班级列表
+			handleClassInfoShow() {
+				this.classShow = true
+				this.getClassFromVenue(this.venueId)
+			},
+			//  获取班级列表
+			getClassFromVenue(id) {
+				NET.request(API.getClassListByVenueId, {id}, 'POST').then(res => {
+					if(res.status === 10000) {
+						this.classList = res.data.map( item => { return { id: item.id, text: item.name } })
+						this.subscribelForm.coachId = ''
+						this.subscribelForm.coachName = ''
+					} else {
+						this.$refs.uTips.show({
+							title: res.message,
+							type: 'error',
+						})
+					}
+				})
+			},
+			//  选择班级
+			HandleChooseClassClick(index) {
+				this.subscribelForm.classId = this.classList[index].id
+				this.subscribelForm.name = this.classList[index].text
+			},
+			//  显示教练列表
+			handleCoachListShow() {
+				this.coachShow = true
+				//  教练列表
+				NET.request(API.getCoachList, {venueId: this.venueId, classId: this.subscribelForm.id }, 'POST').then(res=> {
+					if(res.status == 10000) {
+						this.coachList = res.data.map( item => { return { id: item.coachId, text: item.nickname }})
+					} else {
+						this.$refs.uTips.show({
+							title: res.message,
+							type: 'error',
+						})
+					}
+				})
+			},
+			//  选择教练
+			HandleChooseCoachClick(index) {
+				this.subscribelForm.coachId = this.coachList[index].id
+				this.subscribelForm.coachName = this.coachList[index].text
+			},
 			//  设置性别
 			setSex(index) {
 				this.subscribelForm.sex = this.sexList[index].text
@@ -168,26 +177,38 @@
 					})
 				}
 			},
-			//  选择教练
-			HandleChooseCoachClick(index) {
-				this.subscribelForm.coachId = this.coachList[index].id
-				this.subscribelForm.coach = this.coachList[index].text
-				console.log(this.subscribelForm)
-			},
 			//  提交表单
 			submitForm() {
+				if(!this.subscribelForm.coachId) {
+					this.$refs.uTips.show({
+						title: '请选择教练',
+						type: 'warning',
+					})
+					return
+				}
 				this.$refs.subscribelForm.validate(valid => {
 					if (valid) {
-						NET.request(API.submitStudentForm, this.subscribelForm, 'POST').then(res => {
-							this.$refs.uTips.show({
-								title: '新增成功',
-								type: 'success',
-							})
-							setTimeout(() => {
-								uni.redirectTo({
-									url: '/pagesMember/subscribelSuccess'
-								});
-							}, 1000)
+						const data = {
+							id: parseInt(this.subscribelForm.subscribeId),
+							classId: parseInt(this.subscribelForm.classId),
+							studentId: parseInt(this.subscribelForm.studentId),
+							coachId: parseInt(this.subscribelForm.coachId)
+						}
+						NET.request(API.updateAppointment, data, 'POST').then(res => {
+							if(res.status == 10000) {
+								this.$refs.uTips.show({
+									title: '保存成功',
+									type: 'success',
+								})
+								setTimeout(() => {
+									uni.navigateBack()
+								}, 1000)
+							} else {
+								this.$refs.uTips.show({
+									title: res.message,
+									type: 'warning',
+								})
+							}
 						}).catch(error => {
 							this.$refs.uTips.show({
 								title: error.message,

+ 19 - 4
pagesMain/subscribeList.vue

@@ -4,7 +4,7 @@
 		 :refresher-triggered="triggered" :refresher-threshold="100" refresher-background="white" @refresherrefresh="onRefresh"
 		 @refresherrestore="onRestore">
 			<u-card :head-border-bottom="false" padding="0px" margin="10px" borderRadius="40" v-for="(item, index) in tableList"
-			 :key="index" class="class-card">
+			 :key="index" class="class-card" @click="handleJumpClick(item)">
 				<view class="class-content" slot="head" style="padding-top: 10px;">
 					<view class="student-name">{{item.studentName}}</view>
 					<view class="class-name">{{item.name}}</view>
@@ -19,10 +19,10 @@
 						{{item.address}}
 					</view>
 				</view>
-				<view class="class-foot" slot="foot">
+		<!-- 		<view class="class-foot" slot="foot">
 					<u-button type="default" shape="circle" :ripple="true" :custom-style="handleDefaultCustomStyle" size="mini"
 					 :hair-line="false" plain>已预约</u-button>
-				</view>
+				</view> -->
 			</u-card>
 			<u-divider v-if="isOver" bg-color="transparent">没有更多了</u-divider>
 		</scroll-view>
@@ -48,13 +48,26 @@
 				isOver: false,
 				pageIndex: 1,
 				tableList: [],
+				venueId: null
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			console.log(options);
+			// 二维码中场馆id
+			this.venueId = options.venueId || 34
+		},
+		onShow() {
+			this.tableList = []
 			this.getTableList()
 		},
 		onReady() {},
 		methods: {
+			// 跳转详情
+			handleJumpClick(item) {
+				uni.navigateTo({
+					url: '/pagesMain/subscribeInfo?item=' + encodeURIComponent(JSON.stringify(item)) + '&venueId=' + this.venueId
+				})
+			},
 			//  下拉刷新
 			onRefresh() {
 				this.triggered = true
@@ -77,7 +90,9 @@
 			},
 			//  获取列表数据
 			getTableList() {
+				//  id:场馆id
 				NET.request(API.getSubscribeList, {
+					id: this.venueId,
 					page: this.pageIndex,
 					size: 10,
 				}, 'POST').then(res => {

+ 1 - 1
pagesMember/evaluateForm.vue

@@ -5,7 +5,7 @@
 				<u-rate :count="5" v-model="form.level" :active-color="mainColor"></u-rate>
 			</u-form-item>
 			<u-form-item label="评价内容" prop="estimateContent" required>
-				<u-input v-model="form.estimateContent" placeholder="请输入评价内容" type="textarea" auto-height :height="100" />
+				<u-input v-model="form.estimateContent" placeholder="请输入评价内容" />
 			</u-form-item>
 		</u-form>
 		<view class="handle-fix-box">

+ 8 - 8
pagesMember/leaveForm.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="content">
 		<u-form :model="form" ref="form" label-width="140">
-			<u-form-item label="请假类型" prop="leaveType" required>
-				<u-input v-model="form.leaveType" placeholder="请选择请假类型" :select-open="leaveTypeShow" type="select" @click="leaveTypeShow = true" />
+			<u-form-item label="请假类型" prop="type" required>
+				<u-input v-model="form.type" placeholder="请选择请假类型" :select-open="leaveTypeShow" type="select" @click="leaveTypeShow = true" />
 			</u-form-item>
 			<u-form-item label="请假时间" prop="leaveTime" required>
 				<u-input v-model="form.leaveTime" placeholder="请选择请假时间" :select-open="leaveTimeShow" type="select" @click="leaveTimeShow = true" />
 			</u-form-item>
-			<u-form-item label="上传证明" v-if="form.leaveType === '病假'" prop="leavePic" required>
+			<u-form-item label="上传证明" v-if="form.type === '病假'" prop="leavePic" required>
 				<u-upload :action="action" :header="header" :file-list="fileList" max-count="1" :multiple="false" :show-progress="false" @on-success="handlePicSuccess"></u-upload>
 			</u-form-item>
-			<u-form-item v-if="form.leaveType === '事假'" label="请假理由" prop="leaveReason" required>
+			<u-form-item label="请假理由" prop="leaveReason" required>
 				<u-input v-model="form.leaveReason" placeholder="请输入请假理由" type="text" />
 			</u-form-item>
 		</u-form>
@@ -46,7 +46,7 @@
 				classId: '',
 				studentId: '',
 				form: {
-					leaveType: '病假',
+					type: '病假',
 					leaveTime: '',
 					leavePic: '',
 					leaveReason: '',
@@ -113,7 +113,7 @@
 		methods: {
 			//  选择请假类型
 			handleGetType(args) {
-				this.form.leaveType = this.selectorObj[args[0]]['cateName']
+				this.form.type = this.selectorObj[args[0]]['cateName']
 				this.form.leaveTime = ''
 				this.form.leavePic = ''
 				this.form.leaveReason = ''
@@ -143,7 +143,7 @@
 				// 当天是否可请假
 				if (this.availableList.filter(site => site == date).length) {
 					// 是否为病假
-					if(this.form.leaveType === '病假') {
+					if(this.form.type === '病假') {
 						// 病假需提前3天请
 						if(this.dateFormatTimeStamp(date) > nextThreeDayTimeStamp) {
 							this.form.leaveTime = date
@@ -177,7 +177,7 @@
 						NET.request(API.submitLevelForm, {
 							classId: this.classId,
 							studentId: this.studentId,
-							...{ ...this.form, leaveType:  this.form.leaveType == '事假' ?  1 : 2  }
+							...{ ...this.form, type:  this.form.type == '事假' ?  1 : 2  }
 						}, 'POST').then(res => {
 							this.$refs.uTips.show({
 								title: '请假成功',

+ 0 - 1
pagesMember/venueDetail.vue

@@ -247,7 +247,6 @@
 			},
 			//  跳转开通支付
 			handlePayClick() {
-				console.log(this.checkedCardList);
 				// uni.navigateTo({
 				// 	url: '/pagesMain/openMember?memberCardType=' + site.type + '&typeValue=' + site.typeValue
 				// });

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/member/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/contractInfo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/couponList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/evaluateList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/memberCardList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/openMember.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/orderList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResult.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResultNo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/shareInfo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/studentList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeInfo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/classDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/courseForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/evaluateForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/leaveForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/myClassDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelSuccess.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueMore.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-calendar/u-calendar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-empty/u-empty.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line-progress/u-line-progress.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-modal/u-modal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs-swiper/u-tabs-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-top-tips/u-top-tips.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -77,5 +77,6 @@
       "desc": "获取当前区域定位以选取附近场馆"
     }
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

+ 83 - 70
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -11026,18 +11026,47 @@ function getParent(name, keys) {
 
 /***/ }),
 
-/***/ 331:
+/***/ 34:
+/*!*****************************************************************!*\
+  !*** F:/小程序客户端/spark-student/uview-ui/libs/function/$parent.js ***!
+  \*****************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = $parent; // 获取父组件的参数,因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中,可以准确获取到父组件,但是在H5中,需要多次this.$parent.$parent.xxx
+// 这里默认值等于undefined有它的含义,因为最顶层元素(组件)的$parent就是undefined,意味着不传name
+// 值(默认为undefined),就是查找最顶层的$parent
+function $parent() {var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+  var parent = this.$parent;
+  // 通过while历遍,这里主要是为了H5需要多层解析的问题
+  while (parent) {
+    // 父组件
+    if (parent.$options && parent.$options.name !== name) {
+      // 如果组件的name不相等,继续上一级寻找
+      parent = parent.$parent;
+    } else {
+      return parent;
+    }
+  }
+  return false;
+}
+
+/***/ }),
+
+/***/ 341:
 /*!**********************************************************!*\
   !*** ./node_modules/@babel/runtime/regenerator/index.js ***!
   \**********************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(/*! regenerator-runtime */ 332);
+module.exports = __webpack_require__(/*! regenerator-runtime */ 342);
 
 /***/ }),
 
-/***/ 332:
+/***/ 342:
 /*!************************************************************!*\
   !*** ./node_modules/regenerator-runtime/runtime-module.js ***!
   \************************************************************/
@@ -11068,7 +11097,7 @@ var oldRuntime = hadRuntime && g.regeneratorRuntime;
 // Force reevalutation of runtime.js.
 g.regeneratorRuntime = undefined;
 
-module.exports = __webpack_require__(/*! ./runtime */ 333);
+module.exports = __webpack_require__(/*! ./runtime */ 343);
 
 if (hadRuntime) {
   // Restore the original runtime.
@@ -11085,7 +11114,7 @@ if (hadRuntime) {
 
 /***/ }),
 
-/***/ 333:
+/***/ 343:
 /*!*****************************************************!*\
   !*** ./node_modules/regenerator-runtime/runtime.js ***!
   \*****************************************************/
@@ -11815,35 +11844,6 @@ if (hadRuntime) {
 );
 
 
-/***/ }),
-
-/***/ 34:
-/*!*****************************************************************!*\
-  !*** F:/小程序客户端/spark-student/uview-ui/libs/function/$parent.js ***!
-  \*****************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = $parent; // 获取父组件的参数,因为支付宝小程序不支持provide/inject的写法
-// this.$parent在非H5中,可以准确获取到父组件,但是在H5中,需要多次this.$parent.$parent.xxx
-// 这里默认值等于undefined有它的含义,因为最顶层元素(组件)的$parent就是undefined,意味着不传name
-// 值(默认为undefined),就是查找最顶层的$parent
-function $parent() {var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-  var parent = this.$parent;
-  // 通过while历遍,这里主要是为了H5需要多层解析的问题
-  while (parent) {
-    // 父组件
-    if (parent.$options && parent.$options.name !== name) {
-      // 如果组件的name不相等,继续上一级寻找
-      parent = parent.$parent;
-    } else {
-      return parent;
-    }
-  }
-  return false;
-}
-
 /***/ }),
 
 /***/ 35:
@@ -11948,7 +11948,31 @@ throttle;exports.default = _default;
 
 /***/ }),
 
-/***/ 376:
+/***/ 38:
+/*!**************************************************************!*\
+  !*** F:/小程序客户端/spark-student/uview-ui/libs/config/config.js ***!
+  \**************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; // 此版本发布于2020-09-22
+var version = '1.7.3';var _default =
+
+{
+  v: version,
+  version: version,
+  // 主题名称
+  type: [
+  'primary',
+  'success',
+  'info',
+  'error',
+  'warning'] };exports.default = _default;
+
+/***/ }),
+
+/***/ 386:
 /*!*************************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/util/emitter.js ***!
   \*************************************************************/
@@ -12008,30 +12032,6 @@ function _broadcast(componentName, eventName, params) {
 
 /***/ }),
 
-/***/ 38:
-/*!**************************************************************!*\
-  !*** F:/小程序客户端/spark-student/uview-ui/libs/config/config.js ***!
-  \**************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; // 此版本发布于2020-09-22
-var version = '1.7.3';var _default =
-
-{
-  v: version,
-  version: version,
-  // 主题名称
-  type: [
-  'primary',
-  'success',
-  'info',
-  'error',
-  'warning'] };exports.default = _default;
-
-/***/ }),
-
 /***/ 39:
 /*!**************************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/config/zIndex.js ***!
@@ -12526,7 +12526,7 @@ function resolveLocaleChain(locale) {
 
 /***/ }),
 
-/***/ 412:
+/***/ 422:
 /*!*********************************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/util/async-validator.js ***!
   \*********************************************************************/
@@ -13889,11 +13889,11 @@ Schema.warning = warning;
 Schema.messages = messages;var _default =
 
 Schema;exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/node-libs-browser/mock/process.js */ 413)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/node-libs-browser/mock/process.js */ 423)))
 
 /***/ }),
 
-/***/ 413:
+/***/ 423:
 /*!********************************************************!*\
   !*** ./node_modules/node-libs-browser/mock/process.js ***!
   \********************************************************/
@@ -13924,7 +13924,7 @@ exports.binding = function (name) {
     var path;
     exports.cwd = function () { return cwd };
     exports.chdir = function (dir) {
-        if (!path) path = __webpack_require__(/*! path */ 414);
+        if (!path) path = __webpack_require__(/*! path */ 424);
         cwd = path.resolve(dir, cwd);
     };
 })();
@@ -13938,7 +13938,7 @@ exports.features = {};
 
 /***/ }),
 
-/***/ 414:
+/***/ 424:
 /*!***********************************************!*\
   !*** ./node_modules/path-browserify/index.js ***!
   \***********************************************/
@@ -14248,11 +14248,11 @@ var substr = 'ab'.substr(-1) === 'b'
     }
 ;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 413)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 423)))
 
 /***/ }),
 
-/***/ 429:
+/***/ 439:
 /*!**************************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/util/province.js ***!
   \**************************************************************/
@@ -14264,7 +14264,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ }),
 
-/***/ 430:
+/***/ 440:
 /*!**********************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/util/city.js ***!
   \**********************************************************/
@@ -14276,7 +14276,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ }),
 
-/***/ 431:
+/***/ 441:
 /*!**********************************************************!*\
   !*** F:/小程序客户端/spark-student/uview-ui/libs/util/area.js ***!
   \**********************************************************/
@@ -14434,11 +14434,18 @@ module.exports = {
   getCouponList: API_BASE + '/v2/student/myCenter/getCouponList',
   //  获取分享有礼二维码
   getShareUrl: API_BASE + '/v2/student/myCenter/share',
+  //  获取二维码信息
+  getQrcodeInfo: API_BASE + '/v2/sale/center/bindShareId',
   //  获取我的评价列表
   getEvaluateList: API_BASE + '/v2/student/myCenter/getClassEvaluateList',
   //  获取我的预约体验列表
-  getSubscribeList: API_BASE + '/v2/student/myCenter/getSubscribeClassEvaluateList',
-
+  getSubscribeList: API_BASE + '/v2/admin/subscribe/getSubscribeClassEvaluateList',
+  // 查询场馆下 班级列表
+  getClassListByVenueId: API_BASE + '/course/getClassListByVenueId',
+  //  查询教练列表
+  getCoachList: API_BASE + '/common/coach/getCoachList',
+  //  保存预约信息
+  updateAppointment: API_BASE + '/v2/admin/subscribe/updateAppointment',
 
   //  获取可购买会员卡列表
   getMemberCardList: API_BASE + '/v2/student/myCenter/getCardTypeList',
@@ -14450,6 +14457,12 @@ module.exports = {
   getParentInfo: API_BASE + '/v2/student/contract/getUserInfo',
   //  获取可用优惠券列表
   getUsableCouponList: API_BASE + '/v2/student/myCenter/getOwnCouponList',
+  //  获取当前用户绑定的学员
+  getUserStudent: API_BASE + '/v2/admin/student/getUserStudent',
+  //  根据学员获取二维码
+  studentQRcode: API_BASE + '/v2/sale/center/studentQRcode',
+  //  根据学员获取剩余课时
+  getGiveLessons: API_BASE + '/v2/admin/leave/getGiveLessons',
   //  获取可购买会员卡学员列表
   getAllStudentList: API_BASE + '/v2/student/myCenter/selectAllStudent',
   //  获取合同模板

+ 24 - 15
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -96,28 +96,28 @@ var components
 try {
   components = {
     uNavbar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-navbar/u-navbar */ "uview-ui/components/u-navbar/u-navbar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 270))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-navbar/u-navbar */ "uview-ui/components/u-navbar/u-navbar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 280))
     },
     uSwiper: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-swiper/u-swiper */ "uview-ui/components/u-swiper/u-swiper").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 277))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-swiper/u-swiper */ "uview-ui/components/u-swiper/u-swiper").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 287))
     },
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uSection: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-section/u-section */ "uview-ui/components/u-section/u-section").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-section/u-section.vue */ 291))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-section/u-section */ "uview-ui/components/u-section/u-section").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-section/u-section.vue */ 301))
     },
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {
@@ -273,14 +273,23 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
   },
   onLoad: function onLoad(options) {var _this = this;
     if (options.shareParams) {
-      console.log(options.shareParams);
-      wx.setStorage({ //存储到本地
-        key: "shareParams",
-        data: options.shareParams });
-
+      // 分享获取参数
+      var shareParams = decodeURIComponent(options.shareParams);
+      var shareId = shareParams.split(':')[0];
+      NET.request(API.getQrcodeInfo, { shareId: shareId }, 'POST').then(function (res) {
+        if (res.status == 50000) {
+          _this.$refs.uTips.show({
+            title: res.message,
+            type: 'warning' });
+
+        }
+      });
+      // console.log(options.shareParams)
+      // wx.setStorage({//存储到本地
+      //   key:"shareParams",
+      //   data:options.shareParams
+      // })
     }
-    //console.log(wx.getStorageSync('shareParams'))
-
     // setTimeout(()=>{
     // 	let videoContext = uni.createVideoContext('video1')
     // 	videoContext.play()

+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -96,25 +96,25 @@ var components
 try {
   components = {
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uCellGroup: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-cell-group/u-cell-group */ "uview-ui/components/u-cell-group/u-cell-group").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-cell-group/u-cell-group.vue */ 357))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-cell-group/u-cell-group */ "uview-ui/components/u-cell-group/u-cell-group").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-cell-group/u-cell-group.vue */ 367))
     },
     uCellItem: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-cell-item/u-cell-item */ "uview-ui/components/u-cell-item/u-cell-item").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-cell-item/u-cell-item.vue */ 364))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-cell-item/u-cell-item */ "uview-ui/components/u-cell-item/u-cell-item").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-cell-item/u-cell-item.vue */ 374))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 371))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 9 - 9
unpackage/dist/dev/mp-weixin/pages/member/index.js

@@ -98,22 +98,22 @@ var components
 try {
   components = {
     uTabsSwiper: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs-swiper/u-tabs-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs-swiper/u-tabs-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue */ 326))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs-swiper/u-tabs-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs-swiper/u-tabs-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue */ 336))
     },
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uDivider: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 336))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 346))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {
@@ -208,6 +208,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 
 
 
@@ -247,11 +249,9 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       swiperCurrent: 0 };
 
   },
-  onLoad: function onLoad() {
+  onShow: function onShow() {
     this.getTableList(1);
     this.getTableList(2);
-  },
-  onShow: function onShow() {
     this.tabList[this.current].isOver = false;
     this.tabList[this.current].pageIndex = 1;
     this.tabList[this.current].tableList = [];

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/member/index.wxml


+ 32 - 30
unpackage/dist/dev/mp-weixin/pages/user/index.js

@@ -96,22 +96,22 @@ var components
 try {
   components = {
     uAvatar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-avatar/u-avatar */ "uview-ui/components/u-avatar/u-avatar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-avatar/u-avatar.vue */ 343))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-avatar/u-avatar */ "uview-ui/components/u-avatar/u-avatar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-avatar/u-avatar.vue */ 353))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uModal: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 350))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 360))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {
@@ -286,7 +286,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
 
       {
         label: '预约体验',
-        path: 'subscribeInfo',
+        path: 'subscribeList',
         icon: API.getServerImg + 'yuyue.png' },
 
       // {
@@ -366,29 +366,31 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
             // })
           } });
 
-      } else if (site.path == 'subscribelForm') {
-        uni.navigateTo({
-          url: '/pagesMember/' + site.path });
-
-        // 	 try {
-        // 			uni.scanCode({
-        // 				onlyFromCamera: true,
-        // 				success: function (res) {
-        // 					console.log(res)
-        // 				},
-        // 				fail: function (res) {
-        // 					this.$refs.uTips.show({
-        // 						title: "调用摄像头失败",
-        // 						type: 'warning',
-        // 					})
-        // 				},
-        // 			});
-        // 		} catch {
-        // 			this.$refs.uTips.show({
-        // 				title: "调用摄像头失败",
-        // 				type: 'warning',
-        // 			})
-        // 		}
+      } else if (site.path == 'subscribeList') {
+        // uni.navigateTo({
+        // 	url: '/pagesMain/' + site.path
+        // });
+        try {
+          uni.scanCode({
+            onlyFromCamera: true,
+            success: function success(res) {
+              uni.navigateTo({
+                url: res.path });
+
+            },
+            fail: function fail(res) {
+              this.$refs.uTips.show({
+                title: "调用摄像头失败",
+                type: 'warning' });
+
+            } });
+
+        } catch (_unused) {
+          this.$refs.uTips.show({
+            title: "调用摄像头失败",
+            type: 'warning' });
+
+        }
       } else if (site.path == 'logout') {
         uni.removeStorageSync('token');
         uni.navigateTo({

File diff suppressed because it is too large
+ 22 - 21
unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.js


+ 87 - 14
unpackage/dist/dev/mp-weixin/pagesMain/couponList.js

@@ -98,19 +98,31 @@ var components
 try {
   components = {
     uTabsSwiper: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs-swiper/u-tabs-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs-swiper/u-tabs-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue */ 326))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs-swiper/u-tabs-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs-swiper/u-tabs-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue */ 336))
     },
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uDivider: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 336))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 346))
+    },
+    uForm: function() {
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 410))
+    },
+    uFormItem: function() {
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 417))
+    },
+    uInput: function() {
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
+    },
+    uPicker: function() {
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 434))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {
@@ -134,6 +146,15 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function($event) {
+      _vm.studentShow = true
+    }
+
+    _vm.e1 = function($event) {
+      _vm.studentShow = true
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -167,7 +188,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
 
 
 
@@ -248,16 +277,60 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
         tableList: [] }],
 
       current: 0,
-      swiperCurrent: 0 };
+      swiperCurrent: 0,
+      //  学生id
+      studentId: '',
+      // 学生姓名
+      studentName: '',
+      studentShow: '',
+      studentList: [],
+      // 二维码
+      qrcodeUrl: '',
+      // 课时
+      classes: 0 };
 
   },
   onLoad: function onLoad() {
     this.getTableList(0);
     this.getTableList(1);
     this.getTableList(2);
+    this.getCouponList();
   },
   onReady: function onReady() {},
   methods: {
+    //  获取可用优惠券列表
+    getCouponList: function getCouponList() {var _this = this;
+      NET.request(API.getUserStudent, {
+        userId: uni.getStorageSync('userData').userId }, 'POST').then(function (res) {
+        if (res.status == 10000) {
+          _this.studentList = res.data;
+          if (_this.studentList.length) {
+            _this.handleStudentClick(0);
+          }
+        }
+      });
+    },
+    //  选择学生
+    handleStudentClick: function handleStudentClick(args) {
+      this.studentId = this.studentList[args].studentId;
+      this.studentName = this.studentList[args].childName;
+      this.getInfo();
+    },
+    //  根据学员获取二维码和剩余课时
+    getInfo: function getInfo() {var _this2 = this;
+      NET.request(API.studentQRcode, { studentId: this.studentId }, 'POST').then(function (res) {
+        if (res.status == 10000) {
+          _this2.qrcodeUrl = res.data;
+        }
+      });
+      NET.request(API.getGiveLessons, { studentId: this.studentId }, 'POST').then(function (res) {
+        console.log(res);
+        if (res.status == 10000) {
+          console.log(res.data);
+          _this2.classes = res.data.length;
+        }
+      });
+    },
     //  tab页面切换
     tabsChange: function tabsChange(index) {
       this.swiperCurrent = index;
@@ -273,7 +346,6 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       this.$refs.uTabs.setFinishCurrent(current);
       this.swiperCurrent = current;
       this.current = current;
-      console.log(this.current);
     },
     //  下拉刷新
     onRefresh: function onRefresh() {
@@ -298,23 +370,24 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       }
     },
     //  获取列表数据
-    getTableList: function getTableList(index, refresh) {var _this = this;
+    getTableList: function getTableList(index, refresh) {var _this3 = this;
       NET.request(API.getCouponList, {
         status: index,
         page: this.tabList[index].pageIndex,
         size: 10 },
       'POST').then(function (res) {
-        _this.triggered = false;
-        _this.tabList[index].tableList = _this.tabList[index].tableList.concat(res.data.row);
-        _this.tabList[index].isOver = res.data.row.length != 10;
+        _this3.triggered = false;
+        _this3.tabList[index].tableList = _this3.tabList[index].tableList.concat(res.data.row);
+        _this3.tabList[index].isOver = res.data.row.length != 10;
       }).catch(function (error) {
-        _this.triggered = false;
-        _this.$refs.uTips.show({
+        _this3.triggered = false;
+        _this3.$refs.uTips.show({
           title: error.message,
           type: 'warning' });
 
       });
     } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

+ 4 - 0
unpackage/dist/dev/mp-weixin/pagesMain/couponList.json

@@ -5,6 +5,10 @@
     "u-card": "/uview-ui/components/u-card/u-card",
     "u-image": "/uview-ui/components/u-image/u-image",
     "u-divider": "/uview-ui/components/u-divider/u-divider",
+    "u-form": "/uview-ui/components/u-form/u-form",
+    "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
+    "u-input": "/uview-ui/components/u-input/u-input",
+    "u-picker": "/uview-ui/components/u-picker/u-picker",
     "u-top-tips": "/uview-ui/components/u-top-tips/u-top-tips"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesMain/couponList.wxml


+ 5 - 5
unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.js

@@ -98,19 +98,19 @@ var components
 try {
   components = {
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uRate: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 448))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 458))
     },
     uDivider: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 336))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 346))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/pagesMain/memberCardList.js


File diff suppressed because it is too large
+ 26 - 25
unpackage/dist/dev/mp-weixin/pagesMain/openMember.js


+ 7 - 7
unpackage/dist/dev/mp-weixin/pagesMain/orderList.js

@@ -98,25 +98,25 @@ var components
 try {
   components = {
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uDivider: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 336))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 346))
     },
     uModal: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 350))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 360))
     },
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pagesMain/payResult.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pagesMain/payResultNo.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/pagesMain/shareInfo.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 4 - 4
unpackage/dist/dev/mp-weixin/pagesMain/studentList.js

@@ -98,16 +98,16 @@ var components
 try {
   components = {
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uDivider: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 336))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-divider/u-divider */ "uview-ui/components/u-divider/u-divider").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-divider/u-divider.vue */ 346))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

File diff suppressed because it is too large
+ 115 - 107
unpackage/dist/dev/mp-weixin/pagesMain/subscribeInfo.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesMain/subscribeInfo.wxml


File diff suppressed because it is too large
+ 38 - 25
unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.js


+ 0 - 1
unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.json

@@ -3,7 +3,6 @@
   "usingComponents": {
     "u-card": "/uview-ui/components/u-card/u-card",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-button": "/uview-ui/components/u-button/u-button",
     "u-divider": "/uview-ui/components/u-divider/u-divider",
     "u-top-tips": "/uview-ui/components/u-top-tips/u-top-tips"
   }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.wxml


+ 7 - 7
unpackage/dist/dev/mp-weixin/pagesMember/classDetail.js

@@ -127,25 +127,25 @@ var components
 try {
   components = {
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uImage: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 284))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-image/u-image */ "uview-ui/components/u-image/u-image").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-image/u-image.vue */ 294))
     },
     uReadMore: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-read-more/u-read-more */ "uview-ui/components/u-read-more/u-read-more").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-read-more/u-read-more.vue */ 393))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-read-more/u-read-more */ "uview-ui/components/u-read-more/u-read-more").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-read-more/u-read-more.vue */ 403))
     },
     uPopup: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 386))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 396))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 6 - 6
unpackage/dist/dev/mp-weixin/pagesMember/courseForm.js

@@ -98,22 +98,22 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 400))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 410))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 407))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 417))
     },
     uRate: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 448))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 458))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 371))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 6 - 6
unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.js

@@ -98,22 +98,22 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 400))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 410))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 407))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 417))
     },
     uRate: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 448))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 458))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 371))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.wxml

@@ -1 +1 @@
-<view class="content data-v-6e1fae7c"><u-form vue-id="55d6a20a-1" model="{{form}}" label-width="140" data-ref="form" class="data-v-6e1fae7c vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><u-form-item vue-id="{{('55d6a20a-2')+','+('55d6a20a-1')}}" label="评价星级" prop="level" required="{{true}}" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}"><u-rate bind:input="__e" vue-id="{{('55d6a20a-3')+','+('55d6a20a-2')}}" count="{{5}}" active-color="{{mainColor}}" value="{{form.level}}" data-event-opts="{{[['^input',[['__set_model',['$0','level','$event',[]],['form']]]]]}}" class="data-v-6e1fae7c" bind:__l="__l"></u-rate></u-form-item><u-form-item vue-id="{{('55d6a20a-4')+','+('55d6a20a-1')}}" label="评价内容" prop="estimateContent" required="{{true}}" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}"><u-input bind:input="__e" vue-id="{{('55d6a20a-5')+','+('55d6a20a-4')}}" placeholder="请输入评价内容" type="textarea" auto-height="{{true}}" height="{{100}}" value="{{form.estimateContent}}" data-event-opts="{{[['^input',[['__set_model',['$0','estimateContent','$event',[]],['form']]]]]}}" class="data-v-6e1fae7c" bind:__l="__l"></u-input></u-form-item></u-form><view class="handle-fix-box data-v-6e1fae7c"><u-button vue-id="55d6a20a-6" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['submitForm']]]]}}" bind:click="__e" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}">提交</u-button></view><u-top-tips vue-id="55d6a20a-7" data-ref="uTips" class="data-v-6e1fae7c vue-ref" bind:__l="__l"></u-top-tips></view>
+<view class="content data-v-6e1fae7c"><u-form vue-id="55d6a20a-1" model="{{form}}" label-width="140" data-ref="form" class="data-v-6e1fae7c vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><u-form-item vue-id="{{('55d6a20a-2')+','+('55d6a20a-1')}}" label="评价星级" prop="level" required="{{true}}" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}"><u-rate bind:input="__e" vue-id="{{('55d6a20a-3')+','+('55d6a20a-2')}}" count="{{5}}" active-color="{{mainColor}}" value="{{form.level}}" data-event-opts="{{[['^input',[['__set_model',['$0','level','$event',[]],['form']]]]]}}" class="data-v-6e1fae7c" bind:__l="__l"></u-rate></u-form-item><u-form-item vue-id="{{('55d6a20a-4')+','+('55d6a20a-1')}}" label="评价内容" prop="estimateContent" required="{{true}}" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}"><u-input bind:input="__e" vue-id="{{('55d6a20a-5')+','+('55d6a20a-4')}}" placeholder="请输入评价内容" value="{{form.estimateContent}}" data-event-opts="{{[['^input',[['__set_model',['$0','estimateContent','$event',[]],['form']]]]]}}" class="data-v-6e1fae7c" bind:__l="__l"></u-input></u-form-item></u-form><view class="handle-fix-box data-v-6e1fae7c"><u-button vue-id="55d6a20a-6" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['submitForm']]]]}}" bind:click="__e" class="data-v-6e1fae7c" bind:__l="__l" vue-slots="{{['default']}}">提交</u-button></view><u-top-tips vue-id="55d6a20a-7" data-ref="uTips" class="data-v-6e1fae7c vue-ref" bind:__l="__l"></u-top-tips></view>

+ 12 - 12
unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.js

@@ -98,28 +98,28 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 400))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 410))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 407))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 417))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 371))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
     },
     uUpload: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 441))
+      return Promise.all(/*! import() | uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-upload/u-upload.vue */ 451))
     },
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 424))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 434))
     },
     uCalendar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 434))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 444))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {
@@ -233,7 +233,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       classId: '',
       studentId: '',
       form: {
-        leaveType: '病假',
+        type: '病假',
         leaveTime: '',
         leavePic: '',
         leaveReason: '' },
@@ -300,7 +300,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
   methods: {
     //  选择请假类型
     handleGetType: function handleGetType(args) {var _this2 = this;
-      this.form.leaveType = this.selectorObj[args[0]]['cateName'];
+      this.form.type = this.selectorObj[args[0]]['cateName'];
       this.form.leaveTime = '';
       this.form.leavePic = '';
       this.form.leaveReason = '';
@@ -330,7 +330,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
       // 当天是否可请假
       if (this.availableList.filter(function (site) {return site == date;}).length) {
         // 是否为病假
-        if (this.form.leaveType === '病假') {
+        if (this.form.type === '病假') {
           // 病假需提前3天请
           if (this.dateFormatTimeStamp(date) > nextThreeDayTimeStamp) {
             this.form.leaveTime = date;
@@ -364,7 +364,7 @@ var API = __webpack_require__(/*! @/config/api */ 47);var _default =
           NET.request(API.submitLevelForm, _objectSpread({
             classId: _this3.classId,
             studentId: _this3.studentId }, _objectSpread(_objectSpread({},
-          _this3.form), {}, { leaveType: _this3.form.leaveType == '事假' ? 1 : 2 })),
+          _this3.form), {}, { type: _this3.form.type == '事假' ? 1 : 2 })),
           'POST').then(function (res) {
             _this3.$refs.uTips.show({
               title: '请假成功',

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.wxml


+ 6 - 6
unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.js

@@ -98,22 +98,22 @@ var components
 try {
   components = {
     uCard: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 298))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-card/u-card */ "uview-ui/components/u-card/u-card").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-card/u-card.vue */ 308))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 305))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 315))
     },
     uRate: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 448))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-rate/u-rate */ "uview-ui/components/u-rate/u-rate").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-rate/u-rate.vue */ 458))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uCalendar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 434))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 444))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

+ 8 - 8
unpackage/dist/dev/mp-weixin/pagesMember/subscribelForm.js

@@ -98,28 +98,28 @@ var components
 try {
   components = {
     uForm: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 400))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-form/u-form */ "uview-ui/components/u-form/u-form").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form/u-form.vue */ 410))
     },
     uFormItem: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 407))
+      return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 417))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 371))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 381))
     },
     uActionSheet: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-action-sheet/u-action-sheet */ "uview-ui/components/u-action-sheet/u-action-sheet").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-action-sheet/u-action-sheet.vue */ 417))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-action-sheet/u-action-sheet */ "uview-ui/components/u-action-sheet/u-action-sheet").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-action-sheet/u-action-sheet.vue */ 427))
     },
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 424))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 434))
     },
     uCalendar: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 434))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-calendar/u-calendar */ "uview-ui/components/u-calendar/u-calendar").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-calendar/u-calendar.vue */ 444))
     },
     uButton: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 312))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-button/u-button */ "uview-ui/components/u-button/u-button").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-button/u-button.vue */ 322))
     },
     uTopTips: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 319))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-top-tips/u-top-tips */ "uview-ui/components/u-top-tips/u-top-tips").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-top-tips/u-top-tips.vue */ 329))
     }
   }
 } catch (e) {

Some files were not shown because too many files changed in this diff