预售专区

1 year ago · 6d936e67da
parent 66b4d2baca
commit 6d936e67da
14 changed files with 383 additions and 187 deletions
--- a/api/goods/index.js
+++ b/api/goods/index.js
@ -17,6 +17,18 @@ const api = {
 export const browseHistory = (param, option) => {
  return request.get(api.browseHistory, param, option)
 }
+// 取消预约
+export const canlpresale = (data) => {
+	return request.get('goods/canlpresale', data)
+}
+// 预约列表
+export const presaleList = (data) => {
+	return request.get('goods/presaleList', data)
+}
+// 立即预约
+export const presale = (data) => {
+	return request.get('goods/presale', data)
+}
 // 商品浏览记录
 export const serveList = (param, option) => {
  return request.get(api.serveList, param, option)
--- a/pages.json
+++ b/pages.json
@ -870,7 +870,6 @@
 				{
 					"path": "presaleRule",
 					"style": {
-						"navigationBarTitleText": "预售规则",
 						"enablePullDownRefresh": false
 					}
 				},
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@ -11,7 +11,8 @@
 			<scroll-view scroll-x class="b">
 				<view class="item" v-for="(item,index) in couList" :key="i">
 					<image src="@/static/news/newPeople-bg2.png"></image>
-					<view class="p">¥<text>{{item.discount}}</text></view>
+					<view class="p" v-if="item.coupon_type==10">¥<text>{{item.reduce_price}}</text></view>
+					<view class="p" v-if="item.coupon_type==20">¥<text>{{item.discount}}</text>折</view>
 					<view class="l">满{{item.min_price}}可用</view>
 					<view class="btn" v-if="!item.is_receive" @click="getUseCoupons(item)">立即领取</view>
 					<view class="btn" v-else>已领取</view>
@ -131,9 +132,9 @@
 					app.getListgoodData()
 				}
 			},
-			goDetail(orderId) {
+			goDetail(goods_id) {
 				uni.navigateTo({
-					url: '/pages/goods/detail?orderId=' + orderId
+					url: '/pages/goods/detail?goodsId=' + goods_id
 				})
 			},
 		}
--- a/pages/activity/presale.vue
+++ b/pages/activity/presale.vue
@ -16,21 +16,23 @@
 			</view>
 			<view class="list" :isLoading="isLoading">
 				<view class="item" v-for="(item,index) in goodList" :key="index">
-					<image class="pic" :src="item.goods_image"></image>
+					<image class="pic" :src="item.image" mode="center"></image>
 					<view class="info">
 						<view class="t">{{item.goods_name}}</view>
 						<view class="d">
-							<u-count-down :timestamp="timestamp" format="HH:mm:ss"></u-count-down><text>后失效</text>
+							<u-count-down :timestamp="timestamp"></u-count-down><text>后失效</text>
 						</view>
 						<view class="p">
 							<image src="/static/news/newPresale-2.png"></image>
 							<view class="s">预约价¥{{item.goods_price_min}}</view>
-							<view class="n" @click="goPre(i)">去预约</view>
+							<view class="n" @click="goPre(item)">去预约</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<u-empty text="暂无信息" v-if="menuList.length == 0 || goodList.length==0" mode="list" style="margin-top: 160rpx;">
+		</u-empty>
 	</view>
 </template>

@ -40,12 +42,12 @@
 	export default {
 		data() {
 			return {
-				timestamp: 24 * 3600 * 1000,
+				timestamp: '',
 				current: 0,
 				isLoading: true,
 				goodList: [],
 				menuList: [],
-				info:''
+				info: ''
 			}
 		},
 		/**
@ -55,9 +57,14 @@
 			this.getListCharts()
 		},
 		methods: {
-			openPage(){
+			goPre(item) {
 				uni.navigateTo({
-				url:'/pages/activity/presaleRule'
+					url: '/pages/goods/detail?goodsId=' + item.goods_id + '&isPre=' + true+'&pre_id='+this.info.id
+				})
+			},
+			openPage() {
+				uni.navigateTo({
+					url: '/pages/activity/presaleRule?type=5'
 				})
 			},
 			getListgoodData(categoryId) {
@ -76,6 +83,17 @@
 				app.current = index;
 				app.getListgoodData(app.menuList[index].category_id)
 			},
+			beginTime(end) {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = now.getMonth() + 1;
+				const day = now.getDate();
+				const hour = now.getHours();
+				const minute = now.getMinutes();
+				const second = now.getSeconds();
+				let start= year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+				return (Date.parse(end.replace(/-/g, '/'))-Date.parse(start.replace(/-/g, '/')))
+			},
 			// 分类
 			getListCharts() {
 				let app = this
@ -85,7 +103,8 @@
 				}
 				Api.presaleCateList(pamars)
 					.then(result => {
-						app.info=result.data.info
+						app.timestamp = this.beginTime(result.data.info.p_time);
+						app.info = result.data.info
 						app.menuList = result.data.category;
 						app.getListgoodData(result.data.category[0].category_id)
 					})
--- a/pages/activity/presaleRule.vue
+++ b/pages/activity/presaleRule.vue
@ -1,33 +1,62 @@
 <template>
 	<view class="presale">
-		<view class="title">预售规则：</view>
-		<view class="p">1、选择心仪的商品，邀请好友一起砍价，每次砍价金额以页面显示为准，参与好友越多商品到手价越低。</view>
-		<view class="p">2、砍价商品会设置可砍金额，在规定时间内砍到可砍金额后即可按对应金额优惠下单。选择下单购买后该笔砍价订单不再支持继续砍价。</view>
-		<view class="p">3、发起砍价后，需要在指定时间内完成砍价 (以页面显示为准)，未完成最终砍价可按已砍金额进行下单购买，砍价进行中也可按已砍金额进行下单购买</view>
-		<view class="p">4、砍价结束后，需要在指定时间内完成下单 (以页面显示为准)，未在指定时间内完成下单所造成的砍价优惠无法使用，平台不再额外补发。</view>
-		<view class="p">5、每个新用户 (注册24小时内的用户) 可帮好友完成一次砍价，如出现用户ID不同，但存在下列情形的: 包括但不限于微信账户、收货人姓名、详细地址、联系方式、支付信息、IP地址、设备号等信息的任意一项或数项相同或重叠的，均将被认定为同一用户。 同一设备仅支持一个账号登录进行该活动。</view>
-		<view class="p">
-		6、如小当严选发现用户存在弄虚作假、作弊、套现、洗钱、赌博等违规行为 (包括并不仅限于恶意刷单、非正常手段砍成，使用非法工具分享、下载、安装、注册、登录多个账号及其他不正当手段) 侵害小当严选利益的，小当严选有权对用户进行异常标记，小当严选将取消用户的活动资格并有权不发放奖励、撤销剩余奖励、收回用户可领取的奖励，追讨已发放的奖励，并保留追究该用户责任的权利。
-		</view>
+		<view class="p"  v-html="content"></view>
 	</view>
 </template>

 <script>
+	import img from "@/static/rank/top.png"
+	import * as Api from '@/api/activity'
+	export default {
+		data() {
+			return {
+				background: {
+					background: 'url(' + img + ') center top no-repeat',
+					backgroundSize: '100% auto',
+				},
+				content: '',
+				type: 4
+			}
+		},
+		onLoad(op) {
+			uni.setNavigationBarTitle({
+				title: op.type == 5 ? '预售规则' : '排行榜规则'
+			})
+			this.type = op.type
+			this.getCarouselList(op.type)
+		},
+		onShow() {},
+		methods: {
+			// 获取预售规则
+			getCarouselList(type) {
+				const app = this;
+				Api.getImage({
+						type: type
+					})
+					.then(result => {
+						this.content = result.data.content[0]
+					})
+					.finally(() => app.isLoading = false)
+			},
+		}
+	}
 </script>

 <style lang="scss" scoped>
-	.presale{
+	.presale {
 		height: 100vh;
 		background-color: #fff;
 		padding: 0 40rpx;
 		overflow-y: auto;
-		.title{
+
+		.title {
 			padding: 40rpx 0;
 			font-size: 32rpx;
 			font-weight: 500;
 			color: #000000;
 		}
-		.p{
+
+		.p {
 			font-size: 26rpx;
 			line-height: 46rpx;
 			color: #212121;
--- a/pages/activity/ranking.vue
+++ b/pages/activity/ranking.vue
@ -1,6 +1,7 @@
 <template>
 	<view class="newGoods" :style="{backgroundImage:'url('+backgroundImg+')'}"
 		style="background-size: 100% 100%;padding-bottom: 20rpx;">
+		<view class="rule" @click="openPage()">规则</view>
 		<view>
 			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
 				:background="background"></u-navbar>
@ -99,6 +100,11 @@
 			this.getListCharts()
 		},
 		methods: {
+			openPage() {
+				uni.navigateTo({
+					url: '/pages/activity/presaleRule?type=6'
+				})
+			},
 			// 获取背景图
 			getCarouselList(category_id) {
 				const app = this;
@ -163,12 +169,12 @@
 			},
 			goDetail(orderId) {
 				uni.navigateTo({
-					url: '/pages/goods/detail?orderId='+orderId
+					url: '/pages/goods/detail?orderId=' + orderId
 				})
 			},
-			goDetailMore(categoryId,name) {
+			goDetailMore(categoryId, name) {
 				uni.navigateTo({
-					url: '/pages/activity/charts?categoryId='+categoryId+'&name='+name
+					url: '/pages/activity/charts?categoryId=' + categoryId + '&name=' + name
 				})
 			},
 		}
@ -472,4 +478,19 @@

 		}
 	}
+
+	.rule {
+		width: 100rpx;
+		height: 60rpx;
+		position: absolute;
+		right: 0;
+		top: 100rpx;
+		z-index: 999;
+		background-color: #FFFFFF;
+		color: #0E0E0E;
+		text-align: center;
+		line-height: 60rpx;
+		border-radius: 50rpx 0 0 50rpx;
+		font-size: 30rpx;
+	}
 </style>
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@ -61,7 +61,7 @@
 					{{goods.goods_name}}
 				</view>
 				<view class="goodsOpera">
-					<view class="goodsNum" @click="copyNum" >
+					<view class="goodsNum" @click="copyNum">
 						<text>{{goods.skuList[0].goods_sku_id}}</text>
 						<image src="/static/detail/copy.png" mode=""></image>
 					</view>
@ -171,7 +171,7 @@
 				<view class="buyNow" v-if="!isPre" @click="buyNow">
 					立即购买
 				</view>
-				<view class="buyNow" v-if="isPre">
+				<view class="buyNow" @click="onReservation" v-if="isPre">
 					立即预约
 				</view>
 			</view>
@ -185,8 +185,8 @@
 				<view class="preTitle">
 					预约成功
 				</view>
-				<view class="iKnow">
-					我知道了
+				<view class="iKnow" @click="onKonw">
+					查看预约记录
 				</view>
 			</view>
 			<view class="setMs" v-if="setPrice">
@ -232,7 +232,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="shareWechat">
+			<view class="shareWechat" v-if="goodShow">
 				<view class="shareGoods">
 					<image src="/static/detail/tv.png" mode="" class="shareImg"></image>
 				</view>
@ -290,24 +290,28 @@
 		data() {
 			return {
 				skuMode: 1,
+				goodShow:false,
 				showSkuPopup: false,
 				allPicture: '',
 				keyword: '',
 				diaShow: false,
 				searchValue: '',
 				isPre: false,
+				pre_id: '',
 				setPrice: false,
 				openDialog: false,
 				goodsId: '',
 				goods: {},
 				suggestGoodsList: [],
 				userInfo: {},
-				addressList:[],
-				addressInfo:{},
+				addressList: [],
+				addressInfo: {},
 			}
 		},
 		onLoad(options) {
 			this.isPre = options.isPre
+			this.pre_id = options.pre_id;
+			this.goodsId=options.goodsId;
 			this.getGoodsDetail(options.goodsId)
 		},
 		onShow() {
@ -317,8 +321,28 @@

 		},
 		methods: {
+			// 预约成功去列表
+			onKonw(){
+				uni.navigateTo({
+					url:'/pages/news/park/recordHistory'
+				})
+			},
+			async onReservation() {
+				let {
+					status,
+					message,
+					data
+				} = await GoodsApi.presale({
+					goods_id: this.goodsId,
+					pre_id: this.pre_id
+				});
+				if (status == 200) {
+					this.openDialog=true
+					this.diaShow=true
+				}
+			},
 			// 选择商品规格
-			getAddressList(){
+			getAddressList() {
 				const that = this
 				return new Promise((resolve, reject) => {
 					address.list().then(res => {
@ -1097,7 +1121,7 @@
 			}

 			.iKnow {
-				width: 412rpx;
+				width: 312rpx;
 				height: 72rpx;
 				background: #F55349;
 				border-radius: 8rpx 8rpx 8rpx 8rpx;
--- a/pages/news/park/recordHistory.vue
+++ b/pages/news/park/recordHistory.vue
@ -1,59 +1,124 @@
 <template>
 	<view class="record">
-		<view class="item" v-for="o in 10" :key="o">
+		<view class="item" v-for="(item,index) in presaList" :key="index">
 			<view class="hd">
-				<image src="@/static/home/phone.jpg"></image>
+				<image :src="item.image"></image>
 				<view class="info">
-					<view class="a">iphone13 绿色 128GBiphone13 绿色 128GBiphone13 绿色 128GBiphone13 绿色 128GB</view>
-					<view class="b"><text>倒计时</text><u-count-down :timestamp="timestamp" format="HH:mm:ss"></u-count-down></view>
-					<view class="c">预约价:￥<text>3599</text></view>
+					<view class="a">{{item.goods_name}}</view>
+					<view class="b"><text>倒计时</text>
+						<u-count-down :timestamp="item.p_time"></u-count-down>
+					</view>
+					<view class="c">预约价:￥<text>{{item.goods_price_min}}</text></view>
 				</view>
 				<view class="status">已预约</view>
 			</view>
 			<view class="bd">
-				<view class="btn">取消</view>
-				<view class="btn btn-01">详情</view>
+				<view class="btn" @click="onCancel(item)">取消预约</view>
+				<!-- <view class="btn btn-01">详情</view> -->
 			</view>
 		</view>
+		<u-empty text="暂无记录" v-if="presaList.length == 0" mode="list" style="margin-top: 160rpx;"></u-empty>
 	</view>
 </template>

 <script>
+	import * as GoodsApi from '@/api/goods'
 	export default {
 		data() {
 			return {
-				timestamp: 24*3600*1000,
+				presaList: [],
+				isLoading: false,
 			};
+		},
+		onLoad() {
+			this.getPresaleList();
+		},
+		methods: {
+			beginTime(end) {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = now.getMonth() + 1;
+				const day = now.getDate();
+				const hour = now.getHours();
+				const minute = now.getMinutes();
+				const second = now.getSeconds();
+				let start= year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+				return (Date.parse(end.replace(/-/g, '/'))-Date.parse(start.replace(/-/g, '/')))
+			},
+		onCancel(item) {
+			let app = this
+			uni.showModal({
+				title: "温馨提示",
+				content: "是否取消该订单？",
+				confirmColor: "#F21A1C",
+				complete(res) {
+					if (res.confirm) {
+						GoodsApi.canlpresale({
+								id: item.id
+							})
+							.then(result => {
+								if (result.status == 200) {
+									uni.showToast({
+										title:'取消成功',
+										icon:'none'
+									})
+									app.getPresaleList()
+								}
+							})
+							.finally(() => app.isLoading = false)
+					}
 				}
+			})
+		},
+		async getPresaleList() {
+			let app = this
+			let {
+				status,
+				message,
+				data
+			} = await GoodsApi.presaleList();
+			if (status == 200 && data.length>0) {
+				data.forEach(function(item) {
+					item.p_time = app.beginTime(item.p_time)
+				});
+				app.presaList =data
+			}
+		},
+	},
 	}
 </script>

 <style lang="scss" scoped>
-.record{
+	.record {
 		padding: 0 16rpx 20rpx;
 		overflow: hidden;
-	.item{
+
+		.item {
 			width: 100%;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			background-color: #fff;
 			margin-top: 20rpx;
-		.hd{
+
+			.hd {
 				display: flex;
 				align-items: flex-start;
 				overflow: hidden;
 				padding: 15rpx 0;
 				overflow: hidden;
 				border-bottom: 1px solid #F2F2F2;
-			image{
+
+				image {
 					width: 190rpx;
 					height: 190rpx;
 					margin-right: 20rpx;
 				}
-			.info{
+
+				.info {
 					flex: 1;
 					max-width: 320rpx;
-				.a{
+
+					.a {
 						white-space: nowrap;
 						font-size: 32rpx;
 						font-weight: 400;
@ -62,31 +127,38 @@
 						overflow: hidden;
 						margin-top: 30rpx;
 					}
-				.b{
+
+					.b {
 						display: flex;
 						align-items: center;
 						margin-top: 10rpx;
-					text{
+
+						text {
 							color: #949494;
 							margin-right: 20rpx;
 						}
+
 						font-size: 28rpx;
 						font-weight: 400;
 						color: #FF0E0E;
 					}
-				.c{
+
+					.c {
 						margin-top: 10rpx;
-					text{
+
+						text {
 							font-size: 36rpx;
 							font-weight: 600;
 							color: #F21A1C;
 						}
+
 						font-size: 28rpx;
 						font-weight: 400;
 						color: #FF0E0E;
 					}
 				}
-			.status{
+
+				.status {
 					flex: 1;
 					text-align: right;
 					font-size: 32rpx;
@ -94,13 +166,15 @@
 					color: #529C30;
 				}
 			}
-		.bd{
+
+			.bd {
 				padding: 30rpx 0;
 				overflow: hidden;
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
-			.btn{
+
+				.btn {
 					width: 158rpx;
 					line-height: 62rpx;
 					background: #FFFFFF;
@ -111,7 +185,8 @@
 					font-weight: 400;
 					color: #3D3D3D;
 					margin-left: 20rpx;
-				&-01{
+
+					&-01 {
 						background: #F19592;
 						border-color: #F19592;
 						color: #fff;
@ -119,5 +194,5 @@
 				}
 			}
 		}
-}
+	}
 </style>
--- a/pages/news/recycling/detail.vue
+++ b/pages/news/recycling/detail.vue
@ -2,7 +2,7 @@
 	<view class="recycling">
 		<view class="recycling-swiper">
 			<!-- <u-swiper :list="list" mode="number" height="750" indicator-pos="bottomRight"></u-swiper> -->
-			<image :src="info.server_image" style="width: 100%; height: 750rpx;"></image>
+			<image :src="info.recovery_image" style="width: 100%; height: 750rpx;"></image>
 		</view>
 		<view class="recycling-hd">
 			<view class="a">
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@ -22,12 +22,12 @@
 			</block>
 			<!-- 已完成 -->
 			<block v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
-				<image class="image" src="/static/order/status/received.png" mode="aspectFit"></image>
+				<image class="car" src="/static/order/status/received.png" mode="aspectFit"></image>
 			</block>
 			<!-- 已取消/待取消 -->
 			<block
 				v-if="order.order_status == OrderStatusEnum.CANCELLED.value || order.order_status == OrderStatusEnum.APPLY_CANCEL.value">
-				<image class="image" src="/static/order/status/close.png" mode="aspectFit"></image>
+				<image class="car" src="/static/order/status/close.png" mode="aspectFit"></image>
 			</block>
 			<view class="sendInfo">
 				<view class="shopInfo">
@ -267,7 +267,7 @@
 			</view>
 			<view v-else style="color: #fff;">-</view>
 			<view class="fooRight">
-				<view class="buyAgain" @click="handleTargetGoods(goods.goods_id)"
+				<view class="buyAgain" @click="handleTargetGoods(order.goods[0].goods_id)"
 					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value">
 					再次购买
 				</view>
@ -291,8 +291,8 @@
 					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					催发货
 				</view>
-				<view class="buyAgain"
-					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+				<view class="buyAgain" @click="onCancel(order.order_id)"
+					v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					取消订单
 				</view>
 				<!-- <view class="buyAgain"
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@ -88,7 +88,7 @@
 							<view class="n"
 								v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 								@click="onCdDia(item.goods_id)">催发货</view>
-								<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+								<view class="n" v-if="item.order_status == OrderStatusEnum.NORMAL.value && item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 									@click="onCancel(item.order_id)">
 									取消订单
 								</view>
--- a/pages/order/refund/refundDetail.vue
+++ b/pages/order/refund/refundDetail.vue
@ -97,6 +97,7 @@
 				refundApi.detail(orderRefundId)
 					.then(result => {
 						app.refundDetails = result.data.detail
+						console.log(app.refundDetails)
 					})
 			},
 		}
--- a/pages/order/refund/refundDetail1.vue
+++ b/pages/order/refund/refundDetail1.vue
@ -21,26 +21,26 @@
 				<view class="r"><text>●</text>未与商家协商一致请勿平邮或到付。</view>
 				<view class="r"><text>●</text>我是退货说明。</view>
 			</view>
-			<view class="c">
+			<view class="c" @click="getRevoke()">
 				<view class="btn">撤销申请</view>
 			</view>
 		</view>
 		<view class="refund-fd">
 			<view class="l">
 				<view class="a">退款原因</view>
-				<view class="b">不喜欢，效果不好</view>
+				<view class="b">{{refundDetails.refuse_desc}}</view>
 			</view>
 			<view class="l">
 				<view class="a">退款金额</view>
-				<view class="b">¥3323</view>
+				<view class="b">¥{{refundDetails.refund_money}}</view>
 			</view>
 			<view class="l">
 				<view class="a">退款时间</view>
-				<view class="b">2023-12-12 18:30</view>
+				<view class="b">{{refundDetails.create_time}}</view>
 			</view>
 			<view class="l">
 				<view class="a">退款编号</view>
-				<view class="b">3880404038400808408</view>
+				<view class="b">{{refundDetails.create_time}}</view>
 			</view>
 		</view>
 	</view>
@ -52,22 +52,41 @@
 	export default {
 		data() {
 			return {
-				timestamp: 24 * 3600 * 1000,
+				timestamp: 72 * 3600 * 1000,
 				background: {
 					background: 'url(' + img + ') center -44px no-repeat',
 					backgroundSize: '100%',
-				}
+				},
+				refundDetails: ''
 			}
 		},
 		onLoad(op) {
 			this.getRefundDetails(op.orderRefundId)
 		},
 		methods: {
+			// 撤销
+			getRevoke() {
+				let app = this
+				uni.showToast({
+					title: '请联系客服人员',
+					icon: 'none'
+				})
+				return
+				refundApi.detail(orderRefundId)
+					.then(result => {
+						if (result.status == 200) {
+							uni.reLaunch({
+								url: "/pages/refund/index"
+							})
+						}
+					})
+			},
 			getRefundDetails(orderRefundId) {
-				const app=this
+				let app = this
 				refundApi.detail(orderRefundId)
 					.then(result => {
 						app.refundDetails = result.data.detail
+						console.log(app.refundDetails)
 					})
 			},
 		}
--- a/pages/user/vip/goods.vue
+++ b/pages/user/vip/goods.vue
@ -11,7 +11,7 @@
 		<scroll-view scroll-x class="goods-menu">
 			<view class="item" @click="tabItem1(item,index)" v-for="(item,index) in categoryList" :key="index"
 				:class="tabIndex1==item?'item-on':''">
-				<image :src="item.image.external_url"></image>
+				<image v-if="item.image" :src="item.image.external_url"></image>
 				<view class="p">{{item.name}}</view>
 			</view>
 		</scroll-view>
@ -22,10 +22,10 @@
 			</scroll-view>
 			<view class="b">
 				<view class="t">
-					<view class="item" @click="tabFilter(0)" :class="filterIndex==0?'item-on':''">价格</view>
-					<view class="item" @click="tabFilter(1)" :class="filterIndex==1?'item-on':''">折扣</view>
-					<view class="item" @click="tabFilter(2)" :class="filterIndex==2?'item-on':''">销量</view>
-					<view class="item" @click="tabFilter(3)" :class="filterIndex==3?'item-on':''">综合</view>
+					<view class="item" @click="tabFilter(0,1)" :class="filterIndex==0?'item-on':''">价格</view>
+					<view class="item" @click="tabFilter(1,3)" :class="filterIndex==1?'item-on':''">折扣</view>
+					<view class="item" @click="tabFilter(2,5)" :class="filterIndex==2?'item-on':''">销量</view>
+					<view class="item" @click="tabFilter(3,7)" :class="filterIndex==3?'item-on':''">综合</view>
 				</view>
 				<scroll-view scroll-y class="l">
 					<view class="item" v-for="(item,index) in list" :key="index" @click="goodsDetail(item.goods_id)"
@ -130,30 +130,26 @@
 				app.list = [];
 				this.getBrandList(item.children[0].category_id)
 			},
-			tabFilter(index) {
+			tabFilter(index, stuts) {
 				this.filterIndex = index;
-				this.orderSort = ''
 				if (index == 0) {
-					this.orderSort = 1
-					this.orderSort = this.orderSort == 1 ? 2 : 1
+					this.orderSort = stuts == 1 ? 2 : 1
 				}
 				if (index == 1) {
-					this.orderSort = 3
-					this.orderSort = this.orderSort == 1 ? 4 : 3
+					this.orderSort = stuts == 3 ? 4 : 3
 				}
-				if (index == 3) {
-					this.orderSort = 5
-					this.orderSort = this.orderSort == 1 ? 6 : 5
+				if (index == 2) {
+					this.orderSort = stuts == 5 ? 6 : 5
 				}
-				if (index == 4) {
-					this.orderSort = 7;
-					this.orderSort = this.orderSort == 1 ? 8 : 7
+				if (index == 3) {
+					this.orderSort = stuts == 7 ? 8 : 7
 				}
-				this.getBrandList(app.categoryChildren[0].category_id)
+				console.log(this.orderSort)
+				this.getBrandList(this.categoryChildren[0].category_id)
 			},
 			goodsDetail(orderId) {
 				uni.navigateTo({
-					url: '/pages/goods/detail?orderId='+orderId
+					url: '/pages/goods/detail?orderId=' + orderId
 				})
 			},
 		}