Compare commits
	
		
			2 Commits
		
	
	
		
			22550e1f17
			...
			4b39643e68
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4b39643e68 | |||
| 95316b05f9 | 
@ -8,13 +8,14 @@
 | 
			
		||||
					<!-- background: (index == 2) ?  'red' : '' -->
 | 
			
		||||
					<view :class="(tabBarShow === index) ? 'action' :'no'">{{item.name}}</view>
 | 
			
		||||
				</view>
 | 
			
		||||
				<view v-if="item.index==2" style="position: absolute;bottom: 0rpx;text-align: center;">
 | 
			
		||||
				<view v-if="item.index==2" style="position: absolute;bottom: -6rpx;text-align: center;">
 | 
			
		||||
					<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"
 | 
			
		||||
						style="border-radius: 50%;width: 90rpx;height: 90rpx"></image>
 | 
			
		||||
						style="border-radius: 50%;width: 102rpx;height: 102rpx"></image>
 | 
			
		||||
					<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"
 | 
			
		||||
						style="border-radius: 50%;width: 90rpx;height: 90rpx;"></image>
 | 
			
		||||
						style="border-radius: 50%;width: 102rpx;height: 102rpx;"></image>
 | 
			
		||||
					<!-- background: (index == 2) ?  'red' : '' -->
 | 
			
		||||
					<view :class="(tabBarShow === index) ? 'action' :'no'" style="height: 64rpx;line-height: 64rpx;">{{item.name}}</view>
 | 
			
		||||
					<view :class="(tabBarShow === index) ? 'action' :'no'" style="height: 64rpx;line-height: 64rpx;">
 | 
			
		||||
						{{item.name}}</view>
 | 
			
		||||
				</view>
 | 
			
		||||
			</view>
 | 
			
		||||
			<view style="height: 100rpx;position: fixed;bottom: 0;width: 100%;background-color: #ffffff;"></view>
 | 
			
		||||
@ -244,8 +245,8 @@
 | 
			
		||||
		width: 100%;
 | 
			
		||||
		height: 100rpx;
 | 
			
		||||
		padding-bottom: 0;
 | 
			
		||||
	background: url('/static/bottom_tab.png') no-repeat;
 | 
			
		||||
	background-size: 100%;
 | 
			
		||||
		background: url('/static/bottom_tab.png') no-repeat;
 | 
			
		||||
		background-size: 100%;
 | 
			
		||||
		box-sizing: border-box;
 | 
			
		||||
 | 
			
		||||
		.list {
 | 
			
		||||
@ -256,7 +257,8 @@
 | 
			
		||||
			width: 200rpx;
 | 
			
		||||
			height: 130rpx;
 | 
			
		||||
			position: relative;
 | 
			
		||||
    z-index: 1000;
 | 
			
		||||
			z-index: 1000;
 | 
			
		||||
 | 
			
		||||
			image {
 | 
			
		||||
				width: 44rpx;
 | 
			
		||||
				height: 44rpx;
 | 
			
		||||
@ -300,9 +302,10 @@
 | 
			
		||||
			align-items: center;
 | 
			
		||||
			justify-content: center;
 | 
			
		||||
			width: 200rpx;
 | 
			
		||||
			height: 130rpx;
 | 
			
		||||
			height: 125rpx;
 | 
			
		||||
			position: relative;
 | 
			
		||||
    z-index: 1000;
 | 
			
		||||
			z-index: 1000;
 | 
			
		||||
 | 
			
		||||
			image {
 | 
			
		||||
				width: 44rpx;
 | 
			
		||||
				height: 44rpx;
 | 
			
		||||
 | 
			
		||||
@ -168,7 +168,7 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
			<view class="footer" style="display: flex;align-items: center;;justify-content: space-between;gap: 30rpx;">
 | 
			
		||||
				<view v-if="detail.status != -1 && detail.status != -3 && detail.status != 0 && detail.status != 1&& detail.status != 5" @click="overlayShow()" style="width: 220rpx;height: 90rpx;">
 | 
			
		||||
				<view v-if="(detail.status == 1 ||detail.status == 2 || detail.status == 3 || detail.status == 4) && detail.auth_status==1" @click="overlayShow()" style="width: 220rpx;height: 90rpx;">
 | 
			
		||||
					<image src="@/static/detail/fenxiangsys.png" style="width: 100%;height: 100%;"  mode="widthFix">
 | 
			
		||||
					</image>
 | 
			
		||||
				</view>
 | 
			
		||||
@ -1345,7 +1345,7 @@ export default {
 | 
			
		||||
			width: 288rpx;
 | 
			
		||||
			height: 36rpx;
 | 
			
		||||
			font-family: PingFang SC Bold, PingFang SC Bold;
 | 
			
		||||
			font-weight: 400;
 | 
			
		||||
			font-weight: 600;
 | 
			
		||||
			font-size: 36rpx;
 | 
			
		||||
			color: #202020;
 | 
			
		||||
			line-height: 36rpx;
 | 
			
		||||
 | 
			
		||||
@ -50,11 +50,11 @@
 | 
			
		||||
 | 
			
		||||
					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 | 
			
		||||
						<span>订单编号</span>
 | 
			
		||||
						<span style="color: #000000;">{{detailAny.order_no}}</span>
 | 
			
		||||
						<span style="color: #323232;">{{detailAny.order_no}}</span>
 | 
			
		||||
					</view>
 | 
			
		||||
					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 | 
			
		||||
						<span>报名人昵称</span>
 | 
			
		||||
						<span style="color: #000000;">{{ detailAny.user.nickname }}</span>
 | 
			
		||||
						<span style="color: #323232;">{{ detailAny.user.nickname }}</span>
 | 
			
		||||
					</view>
 | 
			
		||||
					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 | 
			
		||||
						<span>核销/报名人数</span>
 | 
			
		||||
 | 
			
		||||
@ -97,17 +97,16 @@
 | 
			
		||||
 | 
			
		||||
			<!-- v-if="detailAny.feel == 0" -->
 | 
			
		||||
			<view class="footer flex align-items flex-column" style="justify-content: space-between;">
 | 
			
		||||
 | 
			
		||||
				<view @click="service(detailAny.id)" class="footer-right flex justify-center align-items"
 | 
			
		||||
					v-if="detailAny.detail.feel == 0 && detailAny.status == 9">
 | 
			
		||||
					v-if="detailAny.detail.feel == 0 && (detailAny.status == 9 || detailAny.status == 2 || detailAny.status == 3) && (detail.status==4|| detail.status==5)">
 | 
			
		||||
					<text> 申请售后 </text>
 | 
			
		||||
				</view>
 | 
			
		||||
				<view @click="paidcancel(detailAny.id)" class="footer-right flex justify-center align-items"
 | 
			
		||||
					v-if="detailAny.detail.feel == 0 && detailAny.status == 2">
 | 
			
		||||
					v-if="detailAny.detail.feel == 0 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)">
 | 
			
		||||
					<text> 取消订单 </text>
 | 
			
		||||
				</view>
 | 
			
		||||
				<view @click="cancelOrder(detailAny.id)" class="footer-right flex justify-center align-items"
 | 
			
		||||
					v-if="detailAny.detail.feel == 1 && detailAny.status == 2">
 | 
			
		||||
					v-if="detailAny.detail.feel == 1 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)">
 | 
			
		||||
					<text> 取消订单 </text>
 | 
			
		||||
				</view>
 | 
			
		||||
			</view>
 | 
			
		||||
 | 
			
		||||
@ -124,7 +124,7 @@ export default {
 | 
			
		||||
.input {
 | 
			
		||||
	border-radius: 18rpx 18rpx 18rpx 18rpx;
 | 
			
		||||
	border: 1rpx solid #707070;
 | 
			
		||||
	height: 80rpx;
 | 
			
		||||
	height: 90rpx;
 | 
			
		||||
	padding-left: 10rpx;
 | 
			
		||||
	color: #999999;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -119,8 +119,8 @@
 | 
			
		||||
						<view class="row-right">
 | 
			
		||||
							<u-upload @afterRead="uploadQun" :maxCount="1">
 | 
			
		||||
								<view style="display: flex;justify-content: flex-end;align-items: center;">
 | 
			
		||||
									<view v-if="qunQrcode == ''" style="color: #9C9C9C;font-size: 26rpx;">未上传</view>
 | 
			
		||||
									<view v-if="qunQrcode != ''" style="color: #FF4810;font-size: 26rpx;">已上传</view>
 | 
			
		||||
									<view v-if="qunQrcode == ''" style="color: #9C9C9C;font-size: 28rpx;">未上传</view>
 | 
			
		||||
									<view v-if="qunQrcode != ''" style="color: #FF4810;font-size: 28rpx;">已上传</view>
 | 
			
		||||
									<u-icon name="arrow-right" color="#323232"></u-icon>
 | 
			
		||||
								</view>
 | 
			
		||||
							</u-upload>
 | 
			
		||||
@ -278,7 +278,7 @@
 | 
			
		||||
					<img src="https://naweigetetest2.hschool.com.cn/dyqc/hdfenlei.png" alt="" />
 | 
			
		||||
					<view class="flex flex-column w-100 bqlist">
 | 
			
		||||
						<scroll-view scroll-y="true" class="flex align-items allbqs">
 | 
			
		||||
							<view class="titles_fl">已选择</view>
 | 
			
		||||
							<view class="titles_fl" v-if="list.length>0">已选择</view>
 | 
			
		||||
							<view class="flex align-items allmybqs">
 | 
			
		||||
								<view class="flex align-items bqpiece" v-for="(item_bq, index) in list" :key="index"
 | 
			
		||||
									@click="removebq(index)">
 | 
			
		||||
@ -353,7 +353,7 @@
 | 
			
		||||
				<view style="padding: 0rpx 30rpx;">
 | 
			
		||||
					<view style="padding: 30rpx 0rpx;border: 2px solid #EEEEEE;border-radius: 20rpx;">
 | 
			
		||||
						<view>
 | 
			
		||||
							<input focus="priceShow" :cursor-spacing="300" type="digit" placeholder="请输入" v-model="price"
 | 
			
		||||
							<input :focus="priceShow" :cursor-spacing="300" type="digit" placeholder="请输入" v-model="price"
 | 
			
		||||
								style="text-align: center;" />
 | 
			
		||||
						</view>
 | 
			
		||||
					</view>
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@
 | 
			
		||||
				<view class="serch_top" slot="left">
 | 
			
		||||
					<view class="serch_top1">
 | 
			
		||||
						<u-search class="u-search" v-model="keywords" placeholder="搜索您要找的内容" :showAction="false"
 | 
			
		||||
							search-icon="/static/index/search.png" @change="search()">
 | 
			
		||||
							search-icon="/static/index/search.png" @change="search()" bgColor="#F8f8f8">
 | 
			
		||||
						</u-search>
 | 
			
		||||
						<span class="searchBtn" @click.stop="search()">搜索</span>
 | 
			
		||||
					</view>
 | 
			
		||||
@ -197,13 +197,6 @@
 | 
			
		||||
			dateWeeks(e) {
 | 
			
		||||
				return dateWeek(e);
 | 
			
		||||
			},
 | 
			
		||||
			//底部翻页
 | 
			
		||||
			onReachBottom() {
 | 
			
		||||
				if (this.hotList.length < this.count) {
 | 
			
		||||
					this.page++;
 | 
			
		||||
					this.getHotList();
 | 
			
		||||
				}
 | 
			
		||||
			},
 | 
			
		||||
			// 重置列表
 | 
			
		||||
			resetLists() {
 | 
			
		||||
				this.page = 1;
 | 
			
		||||
 | 
			
		||||
@ -567,12 +567,12 @@ export default {
 | 
			
		||||
		//   }
 | 
			
		||||
		// },
 | 
			
		||||
		//底部翻页
 | 
			
		||||
		onReachBottom() {
 | 
			
		||||
			if (this.hotList.length < this.count) {
 | 
			
		||||
				this.page++;
 | 
			
		||||
				this.getHotList();
 | 
			
		||||
			}
 | 
			
		||||
		},
 | 
			
		||||
		// onReachBottom() {
 | 
			
		||||
		// 	if (this.hotList.length < this.count) {
 | 
			
		||||
		// 		this.page++;
 | 
			
		||||
		// 		this.getHotList();
 | 
			
		||||
		// 	}
 | 
			
		||||
		// },
 | 
			
		||||
		// 重置列表
 | 
			
		||||
		resetLists() {
 | 
			
		||||
			this.page = 1;
 | 
			
		||||
@ -595,6 +595,7 @@ export default {
 | 
			
		||||
			} else {
 | 
			
		||||
				this.tjShow = false;
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			this.resetLists();
 | 
			
		||||
			this.getHotList();
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
@ -332,14 +332,14 @@
 | 
			
		||||
			}
 | 
			
		||||
			.text_lab{
 | 
			
		||||
				color: #3D3D3D;
 | 
			
		||||
				font-weight: 400;
 | 
			
		||||
				font-weight: 600;
 | 
			
		||||
				font-family: PingFang SC, PingFang SC;
 | 
			
		||||
				font-size: 28rpx;
 | 
			
		||||
				font-size: 32rpx;
 | 
			
		||||
			}
 | 
			
		||||
		
 | 
			
		||||
			.line-row {
 | 
			
		||||
				margin: 40rpx 0rpx;
 | 
			
		||||
				height: 1rpx;
 | 
			
		||||
				height: 1px;
 | 
			
		||||
				width: 100%;
 | 
			
		||||
				background: #EEEEEE;
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
@ -774,18 +774,22 @@
 | 
			
		||||
					} else {
 | 
			
		||||
						this.showPopup = false
 | 
			
		||||
						uni.showToast({
 | 
			
		||||
							title: '登陆失败',
 | 
			
		||||
							icon: 'error',
 | 
			
		||||
							title: '登陆状态失效...',
 | 
			
		||||
							icon: 'none',
 | 
			
		||||
							duration: 2000
 | 
			
		||||
						})
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
				}).catch(error => {
 | 
			
		||||
					console.log('error', error);
 | 
			
		||||
					this.showPopup = false
 | 
			
		||||
					this.showPopup = false;
 | 
			
		||||
					uni.clearStorageSync()
 | 
			
		||||
					uni.reLaunch({
 | 
			
		||||
						url: '/pages/my/index'
 | 
			
		||||
					})
 | 
			
		||||
					uni.showToast({
 | 
			
		||||
						title: '登陆失败',
 | 
			
		||||
						icon: 'error',
 | 
			
		||||
						title: '登陆状态失效...',
 | 
			
		||||
						icon: 'none',
 | 
			
		||||
						duration: 2000
 | 
			
		||||
					})
 | 
			
		||||
				})
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user