小改动

config/api.js

@@ -4,9 +4,9 @@
 //const API_BASE = 'http://192.168.1.145/newApi'
 // const API_BASE = 'http://192.168.1.109/newApi'
 // const API_BASE = 'http://192.168.1.117:8089'
-//const API_BASE = 'http://192.168.1.145/newApi'
-const API_BASE = 'http://192.168.1.117:8089'
 // const API_BASE = 'http://192.168.1.145/newApi'
+// const API_BASE = 'http://192.168.1.117:8089'
+const API_BASE = 'http://192.168.1.145/newApi'
 
 module.exports = {
 	//  微信授权登录

manifest.json

@@ -103,7 +103,6 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        /* 小程序特有相关 */
         "appid" : "wx58efaca110d45796",
         "setting" : {
             "urlCheck" : true,

pagesEnroll/enrolledForm.vue

@@ -22,6 +22,9 @@
 			<u-form-item label="会员卡" prop="cardName" required right-icon="arrow-right" @click.native="selectCard">
 				<text>{{form.cardName}}</text>
 			</u-form-item>
+			<u-form-item label="优惠券" prop="content" required>
+				<text>{{form.content}}</text>
+			</u-form-item>
 		<!-- 	<u-form-item label="有效期" prop="time" required right-icon="arrow-right" @click.native="timeShow = true" v-if="payTypeCode == 1">
 				<text>{{form.time}}</text>
 			</u-form-item> -->
@@ -137,6 +140,9 @@
 					// 会员卡
 					cardId: '',
 					cardName: '',
+					// 优惠券
+					discountCouponId: '',
+					content: '',
 					// 学生照片
 					imageFileId: '',
 					// 接收人
@@ -311,6 +317,12 @@
 							url: res.data.imageFileUrl
 						}]
 					}
+					if(res.data.couponList.length) {
+						this.form.discountCouponId = res.data.couponList[0].id
+						this.form.content = res.data.couponList[0].content
+					} else {
+							this.form.content = '无可用优惠券'
+					}
 					this.form.orderNo = res.data.orderNo
 				}).catch(error => {
 					this.$refs.uTips.show({

pagesMain/customerInfo.vue

@@ -4,17 +4,17 @@
 			<u-form-item label="学员姓名" prop="studentName">
 				<u-input v-model="form.studentName" placeholder=" " disabled />
 			</u-form-item>
-			<u-form-item label="学生照片" prop="imageFileId" label-position="top">
+			<u-form-item v-if="navbarTitle == '客户信息'" label="学生照片" prop="imageFileId" label-position="top">
 				<u-upload max-count="1" :deletable="false" :file-list="form.fileList" index="1"></u-upload>
 			</u-form-item>
 			<u-form-item label="学员性别" prop="sex" placeholder=" " disabled>
-				<!-- <text>{{form.sex}}</text> -->
-				<u-input v-model="form.sex" placeholder=" " disabled />
+				<text>{{ form.sex == '0' ? '男' : '女' }}</text>
+				<!-- <u-input v-model="form.sex" placeholder=" " disabled /> -->
 			</u-form-item>
 			<u-form-item label="学员年龄" prop="age">
 				<u-input v-model="form.age" placeholder=" " disabled />
 			</u-form-item>
-			<u-form-item label="学生生日" prop="birthday">
+			<u-form-item v-if="navbarTitle == '客户信息'" label="学生生日" prop="birthday">
 				<u-input v-model="form.birthday" placeholder=" " disabled />
 			</u-form-item>
 			<u-form-item label="家长姓名" prop="parentsName">
@@ -79,10 +79,12 @@
 			uni.setNavigationBarTitle({
 				title: options.title
 			})
+			this.navbarTitle = options.title
 			this.getCustomerInfo()
 		},
 		data() {
 			return {
+				navbarTitle: '',
 				id: '',
 				form: {
 					// 学生姓名