Merge branch 'v3' of http://git.jihengcc.cn/starfire/spark-sale into v3

pagesEnroll/enrolledForm.vue

@@ -60,7 +60,8 @@
 			<u-form-item label="手机号码" prop="phone">
 				<u-input v-model="form.phone" placeholder=" " disabled />
 			</u-form-item>
-			<u-form-item label="报名场馆" prop="venueName" required right-icon="arrow-right" @click.native="venueShow = true">
+			<!--<u-form-item label="报名场馆" prop="venueName" required right-icon="arrow-right" @click.native="venueShow = true">-->
+			<u-form-item label="报名场馆" prop="venueName" required right-icon="arrow-right">
 				<text>{{form.venueName}}</text>
 			</u-form-item>
 			<u-form-item label="报名班级" prop="className" required right-icon="arrow-right" @click.native="selectClass">

pagesMain/giftApply.vue

@@ -25,7 +25,7 @@
 								<view class="info-phone">{{ getStatus(site.approvalStatus) }}</view>
 							</view>
 						</view>
-						<view slot="foot" style="text-align: right;" v-if="site.giftType == 0 && site.approvalStatus == 2" >
+						<view slot="foot" style="text-align: right;" v-if="site.giftType == 0 && site.approvalStatus == 3" >
 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleGiveClick(site.id,site.venueId)">赠送</u-button>
 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini" @click="handleNoGiveClick(site.id)">不送</u-button>
 						</view>
@@ -134,6 +134,8 @@
 						case 1:
 							return '审批通过'
 						case 2:
+							return '驳回'
+						case 3:
 							return '提交'
 					}
 				}
@@ -241,7 +243,7 @@
 						this.giftShow = false
 					})
 				}
-			},
+			}, 
 			// 不送
 			handleNoGiveClick(id) {
 				NET.request(API.giveGiftRefuse, {