1

pagesHome/group/group.vue

@@ -2,7 +2,12 @@
 	<mobile-frame>
 		<view class="main">
 			<view class="one">
-				<button size="mini" @tap="toDislog">查询条件</button>
+				<view class="one_1">
+					<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+				</view>
+				<view class="one_2">
+					<button size="mini" @tap="toDislog">筛选</button>
+				</view>
 			</view>
 			<view class="two">
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
@@ -61,8 +66,17 @@
 			<view class="dialog" v-if="dialog.show==true">
 				<view class="dialog_1" v-if="dialog.type=='1'">
 					<uni-forms ref="form" :modelValue="searchInfo" :rules="rules" label-width="auto">
-						<uni-forms-item label="商品名称" name="goods">
-							<uni-easyinput type="text" v-model="searchInfo.goods" placeholder="请输入商品名称" />
+						<uni-forms-item label="团长名称" name="leader">
+							<uni-easyinput type="text" v-model="searchInfo.leader" placeholder="请输入团长名称" />
+						</uni-forms-item>
+						<uni-forms-item label="人数限制" name="person_limit">
+							<uni-easyinput type="number" v-model="searchInfo.person_limit" placeholder="请输入人数限制" />
+						</uni-forms-item>
+						<uni-forms-item label="开始时间" name="start_time">
+							<uni-datetime-picker type="datetime" v-model="searchInfo.start_time" @change="startChange" />
+						</uni-forms-item>
+						<uni-forms-item label="结束时间" name="end_time">
+							<uni-datetime-picker type="datetime" v-model="searchInfo.end_time" @change="endChange" />
 						</uni-forms-item>
 					</uni-forms>
 					<view class="btn">
@@ -147,6 +161,16 @@
 					}
 				})
 			},
+			// 开始时间选择
+			startChange(e) {
+				const that = this;
+				that.$set(that.searchInfo, `start_time`, e);
+			},
+			// 结束时间选择
+			endChange(e) {
+				const that = this;
+				that.$set(that.searchInfo, `end_time`, e);
+			},
 			async search() {
 				const that = this;
 				let info = {
@@ -261,6 +285,14 @@
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
 			// 清空列表
 			clearPage() {
 				const that = this;
@@ -282,8 +314,22 @@
 		height: 100vh;
 
 		.one {
+			display: flex;
+			justify-content: center;
+			align-items: center;
 			padding: 2vw;
-			text-align: center;
+
+			.one_1 {
+				padding: 0 2vw;
+				width: 75vw;
+
+				input {
+					padding: 2vw;
+					background-color: var(--f1Color);
+					font-size: var(--font14Size);
+					border-radius: 5px;
+				}
+			}
 
 			button {
 				background-color: #23B67A;

pagesMy/dough/index.vue

@@ -7,7 +7,23 @@
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 							<view class="list-scroll-view">
 								<view class="one_1">
-									<button size="mini" @tap="toDislog">查询条件</button>
+									<view class="one_1_1">
+										<picker v-if="tabs.active=='0'" class="picker" mode="selector"
+											:range="ostatusList" @change="statusChange" range-key="label">
+											<view>{{status_name||'请选择状态'}}</view>
+										</picker>
+										<picker v-else-if="tabs.active=='-1'" class="picker" mode="selector"
+											:range="astatusList" @change="statusChange" range-key="label">
+											<view>{{status_name||'请选择状态'}}</view>
+										</picker>
+										<picker v-else-if="tabs.active=='1'" class="picker" mode="selector"
+											:range="gstatusList" @change="statusChange" range-key="label">
+											<view>{{status_name||'请选择状态'}}</view>
+										</picker>
+									</view>
+									<view class="one_1_2">
+										<button size="mini" @tap="toDislog">筛选</button>
+									</view>
 								</view>
 								<view class="one_2">
 									<view class="list" v-for="(item, index) in list" :key="index">
@@ -178,23 +194,9 @@
 			<view class="dialog" v-if="dialog.show==true">
 				<view class="dialog_1" v-if="dialog.type=='1'">
 					<uni-forms ref="form" :modelValue="searchInfo" :rules="rules" label-width="auto">
-						<uni-forms-item v-if="tabs.active!='-1'" label="商品名称查询" name="goods">
+						<uni-forms-item v-if="tabs.active!='-1'" label="商品名称" name="goods">
 							<uni-easyinput type="text" v-model="searchInfo.goods" placeholder="请输入商品名称" />
 						</uni-forms-item>
-						<uni-forms-item label="状态" name="status">
-							<picker v-if="tabs.active=='0'" class="picker" mode="selector" :range="ostatusList"
-								@change="statusChange" range-key="label">
-								<view>{{status_name||'请选择状态'}}</view>
-							</picker>
-							<picker v-else-if="tabs.active=='-1'" class="picker" mode="selector" :range="astatusList"
-								@change="statusChange" range-key="label">
-								<view>{{status_name||'请选择状态'}}</view>
-							</picker>
-							<picker v-else-if="tabs.active=='1'" class="picker" mode="selector" :range="gstatusList"
-								@change="statusChange" range-key="label">
-								<view>{{status_name||'请选择状态'}}</view>
-							</picker>
-						</uni-forms-item>
 					</uni-forms>
 					<view class="btn">
 						<button type="primary" @click="onSubmit" size="mini">确定</button>
@@ -374,6 +376,8 @@
 				if (data) {
 					that.$set(that.searchInfo, `status`, data.value);
 					that.$set(that, `status_name`, data.label);
+					that.clearPage();
+					that.search();
 				}
 			},
 			// 关闭弹框
@@ -815,9 +819,24 @@
 				height: 90vh;
 
 				.one_1 {
+					display: flex;
+					align-items: center;
+					justify-content: center;
 					padding: 2vw;
 					text-align: center;
 
+					.one_1_1 {
+						width: 75vw;
+						padding: 0 2vw;
+
+						.picker {
+							font-size: var(--font14Size);
+							border: 1px solid var(--f1Color);
+							border-radius: 5px;
+							padding: 2vw;
+						}
+					}
+
 					button {
 						background-color: #23B67A;
 						color: #ffffff;

pagesMy/order/service.vue

@@ -287,16 +287,27 @@
 				let status = that.status;
 				that.$refs[ref].validate().then(async params => {
 					// 判断是否团长提现完成 如果提现成功不能退款 过了规定日期
-					let arr = await that.$api(`/groupAfterSale/canRefund/${that.id}`, 'GET', {},'group');
-					if (arr.data == true) {
-						if (status == '3') {
-							that.Receip(params)
+					let arr;
+					if (that.status != '-3') arr = await that.$api(`/afterSale/canRefund/${that.id}`,
+						'GET');
+					else arr = await that.$api(`/groupAfterSale/canRefund/${that.id}`,
+						'GET', {}, 'group');
+					if (arr.errcode == '0') {
+						if (arr.data == true) {
+							if (status == '3') {
+								that.Receip(params)
+							} else {
+								that.orderCancel(params)
+							}
 						} else {
-							that.orderCancel(params)
+							uni.showToast({
+								title: '该商品时间超时不允许退款或退货',
+								icon: 'none'
+							})
 						}
 					} else {
 						uni.showToast({
-							title: '该商品时间超时不允许退款或退货',
+							title: arr.errmsg,
 							icon: 'none'
 						})
 					}