修改bug

config/api.js

@@ -139,5 +139,7 @@ module.exports = {
 	giveGiftRefuse:  API_BASE + '/v2/sale/center/giveGiftRefuse',
 	// 修改头像
 	customerHeadSet:  API_BASE + '/v2/sale/customer/customerHeadSet',
+	// 获取支付方式
+	getPayTypeList:  API_BASE + '/v2/sale/customer/getPayTypeList',
 	
 }

pagesEnroll/enrolledForm.vue

@@ -220,8 +220,8 @@
 				talkerShow: false,
 				talkerList: [],
 				payTypeShow: false,
-				// payTypeList: [],
-				payTypeList: [
+				payTypeList: [],
+				/*payTypeList: [
 					{
 						name: '小程序支付',
 						checked: false,
@@ -241,8 +241,18 @@
 						name: '刷卡',
 						checked: false,
 						id: 4
+					},
+					{
+						name: '中体首款码',
+						checked: false,
+						id: 5
+					},
+					{
+						name: '学校收费',
+						checked: false,
+						id: 6
 					}
-				]
+				]*/
 			}
 		},
 		onShow() {
@@ -250,6 +260,19 @@
 				this.form.classId = uni.getStorageSync("defaultClass").classId
 				this.form.className = uni.getStorageSync("defaultClass").className
 			}
+			NET.request(API.getPayTypeList, {
+			}, 'POST').then(res => {
+				res.data.forEach(function(item, index) {
+					item.checked=false
+				})
+				this.payTypeList=res.data
+				console.log(this.payTypeList)
+			}).catch(error => {
+				this.$refs.uTips.show({
+					title: "无效",
+					type: 'warning',
+				})
+			})
 			this.form.talkerId = uni.getStorageSync('userData').userId
 			this.form.talkerName = uni.getStorageSync('userData').nickName
 		},

pagesMain/businessList.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-	<!-- 	<view class="filter-box">
+		<view class="filter-box">
 			<u-search placeholder="请输入关键字" v-model="filterText" @search="setFilterText" @custom="setFilterText"></u-search>
-		</view> -->
+		</view>
 		<u-dropdown>
 			<u-dropdown-item v-model="applySaleFlag" :title="applyTitle" :options="applyOptions" @change="handleDropDownClick"></u-dropdown-item>
 		</u-dropdown>

pagesMain/giftApply.vue

@@ -25,9 +25,9 @@
 								<view class="info-phone">{{ getStatus(site.approvalStatus) }}</view>
 							</view>
 						</view>
-						<view slot="foot" style="text-align: right;" v-if="site.giftType == 0 && site.approvalStatus == 3" >
+						<view slot="foot" style="text-align: right;" v-if="site.giftType == 0 && (site.approvalStatus == 3||site.approvalStatus == 2)" >
 							<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>
+							<u-button v-if="false" type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini" @click="handleNoGiveClick(site.id)">不送</u-button>
 						</view>
 					</u-card>
 					<u-divider v-if="item.isOver" bg-color="transparent" :style="{paddingTop : item.tableList.length == 0 ? '10px' : ''}">没有更多了</u-divider>
@@ -51,6 +51,7 @@
 					<view style="width:100;display:flex;justify-content: flex-end;">
 						<u-button type="warning"  :ripple="true" size="mini" :custom-style="{ backgroundColor: mainColor }"  @click="handleGiftAddClick">添加</u-button>
 					</view>
+					<u-input v-model="remark" placeholder="请输入备注" type="textarea" style='margin-top:10rpx'/>
 				</u-form>
 			</view>
 			<view class="button-box">
@@ -74,6 +75,7 @@
 	export default {
 		data() {
 			return {
+				remark: '',
 				listId: 0,
 				venueId: 0,
 				// filterText: '',
@@ -99,13 +101,13 @@
 					pageIndex: 1,
 					filterText: '',
 					tableList: [],
-				}, {
+				}/*, {
 					name: '不赠送',
 					isOver: false,
 					pageIndex: 1,
 					filterText: '',
 					tableList: [],
-				}],
+				}*/],
 				current: 0,
 				swiperCurrent: 0,
 				giftIndex: 0,
@@ -146,7 +148,7 @@
 				this.tabList = Object.assign([], this.$options.data().tabList)
 				this.getTableList(0)
 				this.getTableList(1)
-				this.getTableList(2)
+				//this.getTableList(2)
 			},
 			handleGiveClick(id,venueId) {
 				this.giftShow = true
@@ -222,12 +224,14 @@
 				if(flag) {
 					const id = this.listId
 					const venueId = this.venueId
+					const remark = this.remark
+					
 					const giftIds = this.formInfo.filter(item => item.signTwoId != '').map( item => {
 						return item.signTwoId
 					})
 
 					NET.request(API.giveGiftStudent, {
-						id, venueId, giftIds
+						id, venueId, giftIds,remark
 					}, 'POST').then(res => {
 						if(res.status == 10000) {
 							this.$refs.uTips.show({