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

config/api.js

@@ -7,7 +7,8 @@
 
 // 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 = 'https://starfire.jihengcc.cn/newApi'
+// const API_BASE = 'http://192.168.1.145/newApi'
 
 module.exports = {
 	//  微信授权登录

pages/report/index.vue

@@ -39,7 +39,7 @@
 				
 			</view>
 			<view class="content-last">
-				<view class="last-info" @click.native="goUrl('/pagesMain/threadList')">
+				<view class="last-info">
 					<view class="imageBox"><u-image width="80rpx" height="60rpx" :src="noVip"></u-image></view>
 					<view class="info-num" style="text-align: center;">{{ info.noVip }}</view>
 					<view class="info-text text-c">线索</view>

pagesEnroll/venueDetail.vue

@@ -9,6 +9,9 @@
 		<u-section title="场馆简介" :right="false" :show-line="false" font-size="32" class="title-box"></u-section>
 		<view class="venue-text">{{venueInfo.desc}}</view>
 		<u-section title="班级信息" :right="false" :show-line="false" font-size="32" class="title-box"></u-section>
+		<view class="filter-box">
+			<u-search placeholder="请输入班级名" v-model="filterText" @search="setFilterText" @custom="setFilterText"></u-search>
+		</view>
 		<view class="class-box">
 			<u-card :head-border-bottom="false" :foot-border-top="false" padding="0" margin="10px" v-for="(item, index) in venueInfo.classListResList"
 			 :key="index" class="class-card" @click="goToClassDetail(item)">
@@ -55,6 +58,7 @@
 		},
 		data() {
 			return {
+				filterText: '',
 				venueId: '',
 				venueInfo: {
 					url: '',
@@ -90,6 +94,19 @@
 					})
 				})
 			},
+			setFilterText() {
+				if(this.filterText) {
+					let arr = []
+					this.venueInfo.classListResList.forEach(item => {
+						if(item.name.indexOf(this.filterText) >= 0) {
+							arr.push(item)
+						}
+					})
+					this.venueInfo.classListResList = arr
+				} else {
+					this.initialize()
+				}
+			},
 			//  跳转班级详情
 			goToClassDetail(item) {
 				uni.navigateTo({
@@ -106,7 +123,15 @@
 	.content {
 		width: 100%;
 		float: left;
-
+		
+		.filter-box {
+			width: 100vw;
+			height: 48px;
+			padding: 10px 15px;
+			background-color: #FFFFFF;
+			float: left;
+		}
+		
 		.title-box {
 			width: 100vw;
 			padding: 10px 15px 5px 15px;

pagesMain/businessList.vue

@@ -27,8 +27,8 @@
 						</view>
 						<view slot="foot" style="text-align: right;">
 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleSaleShowClick(site)">分配</u-button>
-							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleUpdateClick(site)">修改</u-button>
-							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini" @click="handleJumpSubscribeClick">预约体验</u-button>
+<!-- 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleUpdateClick(site)">修改</u-button>
+							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini" @click="handleJumpSubscribeClick">预约体验</u-button> -->
 						</view>
 					</u-card>
 					<u-divider v-if="item.isOver" bg-color="transparent" :style="{paddingTop : item.tableList.length == 0 ? '10px' : ''}">没有更多了</u-divider>