diff --git a/api/activity.js b/api/activity.js
new file mode 100644
index 0000000..319099c
--- /dev/null
+++ b/api/activity.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// api地址
+const api = {
+	data: 'sharp.home/data',
+	list: 'sharp.goods/list',
+	getImage: 'goods/getCommonConfig',
+	getImage: 'goods/getCommonConfig',
+	getImage: 'goods/getCommonConfig',
+	chartsGoodsJing: 'goods/chartsGoodsJing',
+	chartsGoodsList: "goods/chartsGoodsList",
+	brandList: 'goods/brandList',
+	charts: "goods/charts"
+}
+// 新品
+export const brandList = (data) => {
+	return request.get(api.brandList, data)
+}
+// 预售专区
+export const list = () => {
+	return request.get(api.list, {}, {
+		load: false
+	})
+}
+// 秒杀活动首页
+export const data = () => {
+	return request.get(api.data, {}, {
+		load: false
+	})
+}
+// 轮播
+export const getImage = (data) => {
+	return request.get(api.getImage, data)
+}
+// 排行精选
+export const chartsGoodsJing = (data) => {
+	return request.get(api.chartsGoodsJing, data)
+}
+// 排行精选商品
+export const chartsGoodsList = (data) => {
+	return request.get(api.chartsGoodsList, data)
+}
+// 排行类
+export const charts = (data) => {
+	return request.get(api.charts, data)
+}
diff --git a/api/order.js b/api/order.js
index 1113f06..98f78eb 100644
--- a/api/order.js
+++ b/api/order.js
@@ -9,9 +9,14 @@ const api = {
   cancel: 'order/cancel',
   extractQrcode: 'order/extractQrcode',
   receipt: 'order/receipt',
-  pay: 'order/pay'
+  pay: 'order/pay',
+  del:'order/del',
+  orderfast:'order/orderfast'
+}
+// 催单
+export function orderfast(param, option) {
+  return request.get(api.orderfast, param, option)
 }
-
 // 当前用户待处理的订单数量
 export function todoCounts(param, option) {
   return request.get(api.todoCounts, param, option)
@@ -46,3 +51,11 @@ export function receipt(orderId, data) {
 export function extractQrcode(orderId, param) {
   return request.get(api.extractQrcode, { orderId, ...param })
 }
+// 核销二维码
+export function del(orderId, param) {
+  return request.get(api.del, { orderId, ...param })
+}
+// // 删除订单
+// export function delete(orderId, param) {
+//   return request.get(api.delete, { orderId, ...param })
+// }
\ No newline at end of file
diff --git a/api/order/comment.js b/api/order/comment.js
index f0d57b8..7960a66 100644
--- a/api/order/comment.js
+++ b/api/order/comment.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // api地址
 const api = {
   list: 'order.comment/list',
-  submit: 'order.comment/submit'
+  submit: 'order.comment/submit',
 }
 
 // 待评价订单商品列表
diff --git a/api/user/vip.js b/api/user/vip.js
new file mode 100644
index 0000000..ff6171a
--- /dev/null
+++ b/api/user/vip.js
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+// api地址
+const api = {
+	brandList: 'goods/brandList',
+	category: 'category/list',
+	getImage: 'goods/getCommonConfig',
+}
+
+// 大牌
+export const brandList = (data) => {
+	return request.get(api.brandList, data)
+}
+// 分类
+export const category = (data) => {
+	return request.get(api.category, data)
+}
+// 轮播
+export const getImage = (data) => {
+	return request.get(api.getImage, data)
+}
diff --git a/pages.json b/pages.json
index 32615b1..68da053 100644
--- a/pages.json
+++ b/pages.json
@@ -786,6 +786,34 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "charts",
+					"style": {
+						"navigationBarTitleText": "排行榜列表",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "ranking",
+					"style": {
+						"navigationBarTitleText": "排行榜",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "newGoods",
+					"style": {
+						"navigationBarTitleText": "新品首发",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "seckill",
+					"style": {
+						"navigationBarTitleText": "限时抢购",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "presaleRule",
 					"style": {
@@ -819,7 +847,7 @@
 				}
 
 			]
-		}, 
+		},
 		{
 			"root": "pages/news1/",
 			"pages": [{
@@ -902,5 +930,6 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {}
-	}
-}
\ No newline at end of file
+	},
+	"sitemapLoaction": "sitemap.json"
+}
diff --git a/pages/activity/charts.vue b/pages/activity/charts.vue
index 47f41ec..fd3dcda 100644
--- a/pages/activity/charts.vue
+++ b/pages/activity/charts.vue
@@ -1,43 +1,44 @@
 <template>
 	<view class="newGoods">
 		<view>
-			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff" :background="background"></u-navbar>
+			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
+				:background="background"></u-navbar>
 		</view>
-		<view class="main">
+		<view class="main" :style="{backgroundImage:'url('+backgroundImg+')'}"
+			style="background-size: 100% 100%;padding-bottom: 20rpx;">
 			<view class="head">
 				<view class="ranking">
 					-好物排行榜-
 				</view>
 				<view class="headTitle">
-					手机热销榜
+					{{name}}热销榜
 				</view>
 				<view class="ques">
 					根据商品销量等级排序|每日更新
 				</view>
 			</view>
 			<view class="hb">
-				<view class="goodsList" v-for="(item,index) in 3" :key="index">
+				<view class="goodsList" v-for="(item,index) in jingList" :key="index">
 					<view class="goodsDetail">
-						<image src="../../static/rank/topOne.png" mode="" class="topOne"></image>
+						<image src="../../static/rank/topOne.png" mode="" v-if="index==0" class="topOne"></image>
 						<view class="goodsInfo">
-							<image src="/static/newGoods/goods.png" mode="" class="goodsImg"></image>
+							<image :src="item.goods_image" mode="" class="goodsImg"></image>
 							<view class="goodsName">
 								<view class="name">
-									Apple iphone 15(A3092)
-									支持移动联通电信5G双卡双待手机
+									{{item.goods_name}}
 								</view>
 								<view class="hot">
 									<text class="hotTitle">HOT</text>
-									<text class="zs">综合热卖指数9.8</text>
+									<text class="zs">综合热卖指数{{item.remaizhishu}}</text>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view class="opera">
 						<view class="price">
-							￥<text>2399</text>
+							￥<text>{{item.goods_price_min}}</text>
 						</view>
-						<view class="look">
+						<view class="look" @click="goDetail(item.goods_id)">
 							去看看
 							<image src="/static/rank/right.png" mode="" class="right"></image>
 						</view>
@@ -50,6 +51,7 @@
 
 <script>
 	import img from "@/static/rank/top.png"
+	import * as Api from '@/api/activity'
 	export default {
 		data() {
 			return {
@@ -58,25 +60,50 @@
 					backgroundSize: '100% auto',
 				},
 				chosed: 0,
-				menuList: [{
-						name: '精选',
-						value: 0
-					}, {
-						name: '手机通讯',
-						value: 1
-					}, {
-						name: '电脑',
-						value: 2
-					}, {
-						name: '家用电器',
-						value: 3
-					}, {
-						name: '美妆',
-						value: 4
-					},
-
-				]
+				backgroundImg: '',
+				jingList: [],
+				categoryId: '',
+				name:''
 			}
+		},
+		onLoad(op) {
+			console.log(op)
+			this.categoryId = op.categoryId;
+			this.name=op.name
+		},
+		onShow() {
+			this.getCarouselList()
+		},
+		methods: {
+			// 获取背景图
+			getCarouselList(category_id) {
+				const app = this;
+				Api.getImage({
+						type: 3
+					})
+					.then(result => {
+						app.backgroundImg = result.data.imgurl;
+						app.getListJingData(this.categoryId)
+					})
+					.finally(() => app.isLoading = false)
+			},
+			getListJingData(categoryId) {
+				let app = this;
+				let pamars = {
+					store_id: 10001,
+					categoryId: categoryId,
+				}
+				Api.chartsGoodsList(pamars)
+					.then(result => {
+						app.jingList = result.data.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			goDetail(orderId) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?orderId=' + orderId
+				})
+			},
 		}
 	}
 </script>
@@ -104,7 +131,6 @@
 		.head {
 			width: 100%;
 			height: 360rpx;
-			background-image: url('../../static/rank/head.png');
 			background-size: 100% 100%;
 		}
 	}
@@ -140,7 +166,6 @@
 		width: 430rpx;
 		height: 112rpx;
 		padding-top: 18rpx;
-		background-image: url('../../static/rank/timeRank.png');
 		background-size: 100% 100%;
 		text-align: center;
 		font-size: 36rpx;
@@ -179,6 +204,7 @@
 			background: #FCE5C6;
 			border-radius: 18rpx 18rpx 18rpx 18rpx;
 			margin-bottom: 42rpx;
+
 			.goodsDetail {
 				width: 700rpx;
 				height: 336rpx;
@@ -187,24 +213,28 @@
 				border-radius: 18rpx 18rpx 18rpx 18rpx;
 				opacity: 1;
 				position: relative;
-				.topOne{
-					width:73rpx;
+
+				.topOne {
+					width: 73rpx;
 					height: 100rpx;
 					position: absolute;
 					left: 36rpx;
 					top: -8rpx;
 				}
+
 				.goodsInfo {
 					display: flex;
-					.goodsImg{
+
+					.goodsImg {
 						width: 224rpx;
 						height: 224rpx;
 						border-radius: 0rpx 0rpx 0rpx 0rpx;
 						opacity: 1;
 						margin-right: 16rpx;
 					}
-					.goodsName{
-						.name{
+
+					.goodsName {
+						.name {
 							width: 396rpx;
 							height: 132rpx;
 							font-size: 32rpx;
@@ -213,14 +243,16 @@
 							color: #0E0E0E;
 							line-height: 38rpx;
 						}
-						.hot{
+
+						.hot {
 							width: 336rpx;
 							height: 60rpx;
 							background: linear-gradient(90deg, #FCE5C6 0%, #FFFFFF 100%);
 							border-radius: 70rpx 70rpx 70rpx 70rpx;
 							opacity: 1;
 							margin-top: 16rpx;
-							.hotTitle{
+
+							.hotTitle {
 								margin-right: 8rpx;
 								width: 68rpx;
 								height: 42rpx;
@@ -230,10 +262,11 @@
 								line-height: 60rpx;
 								margin-left: 8rpx;
 								background: -webkit-linear-gradient(180deg, #FFA621 0%, #F34A40 100%);
-								-webkit-text-fill-color:transparent;
-								-webkit-background-clip:text; 
+								-webkit-text-fill-color: transparent;
+								-webkit-background-clip: text;
 							}
-							.zs{
+
+							.zs {
 								height: 44rpx;
 								font-size: 32rpx;
 								font-family: PingFang SC, PingFang SC;
@@ -245,19 +278,23 @@
 					}
 				}
 			}
-			.opera{
+
+			.opera {
 				display: flex;
 				justify-content: space-between;
 				width: 100%;
 				align-items: center;
 				height: 104rpx;
-				.price{
+
+				.price {
+					margin-left: 20rpx;
 					font-size: 32rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #301F14;
 					line-height: 44rpx;
-					text{
+
+					text {
 						font-size: 48rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 600;
@@ -265,7 +302,8 @@
 						line-height: 68rpx;
 					}
 				}
-				.look{
+
+				.look {
 					width: 202rpx;
 					height: 60rpx;
 					background: linear-gradient(180deg, #FF7E6A 0%, #FB322A 100%);
@@ -274,14 +312,15 @@
 					margin-right: 22rpx;
 					text-align: center;
 					line-height: 60rpx;
-					.right{
+
+					.right {
 						width: 20rpx;
 						height: 18rpx;
-						margin-left:26rpx;
+						margin-left: 26rpx;
 					}
 				}
 			}
-			
+
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue
index 6e7b64b..46f97ee 100644
--- a/pages/activity/newGoods.vue
+++ b/pages/activity/newGoods.vue
@@ -1,30 +1,14 @@
 <template>
 	<view class="newGoods">
 		<!-- <image src="/static/newGoods/newBack.png" mode="" class="bgImg"></image> -->
-		<view >
-			<u-navbar title="新品首发" back-icon-color="#fff" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
+		<view>
+			<u-navbar title="新品首发" back-icon-color="#fff" :border-bottom="false" title-color="#333"
+				:background="background"></u-navbar>
 		</view>
-		<view class="firGoods">
-			<view class="topLine">
-				<view class="left">
-					<view class="goodsName">
-						nava 5z
-					</view>
-					<view class="goodsDesc">
-						影棚级人像
-					</view>
-					<view class="newTip">
-						新品驿站
-					</view>
-				</view>
-				<view class="right">
-					<!-- <image src="/static/newGoods/bg.png" mode="" class="bg"></image> -->
-						<image src="/static/newGoods/goods.png" mode="" class="goodsImg"></image>		
-				</view>
-			</view>
+		<view class="firGoods" :style="{backgroundImage:'url('+backgroundImg+')'}" style="background-size: 100% 100%;">
 		</view>
 		<view class="goodsList">
-			<view class="goodsItem" v-for="(item,index) in 5" :key="index">
+			<view class="goodsItem" v-for="(item,index) in list" :key="index">
 				<view class="hotSell">
 					现货热卖
 				</view>
@@ -33,31 +17,28 @@
 						<view class="goodsDetail">
 							<view class="infoLeft">
 								<view class="gName">
-									Neo9 Pro
+									{{item.goods_name}}
 								</view>
 								<view class="gd">
-									天机9300续航芯，自研电竞芯19Q1
-								</view>
-								<view class="gp">
-									低价官网100
+									{{item.selling_point}}
 								</view>
 							</view>
 							<view class="infoRight">
-								<image src="/static/newGoods/goods.png" mode="" class="infoImg"></image>
+								<image :src="item.goods_image" mode="" class="infoImg"></image>
 							</view>
 						</view>
 						<view class="price">
 							<view class="lowPrice">
-								￥2399起
+								￥{{item.goods_price_min}}起
 							</view>
-							<view class="buyNow">
+							<view class="buyNow" @click="goDetails(item)">
 								立即购买
 							</view>
 						</view>
 					</view>
 				</view>
-				
-				
+
+
 			</view>
 		</view>
 	</view>
@@ -65,23 +46,76 @@
 
 <script>
 	import img from "@/static/member/head.png"
-	export default{
-		data(){
-			return{
+	import * as Api from '@/api/activity'
+	import {
+		getEmptyPaginateObj,
+		getMoreListData
+	} from '@/core/app'
+	export default {
+		data() {
+			return {
 				background: {
-					background: 'url('+	img+') center top no-repeat',
-					backgroundSize: '100% auto',
+					background: 'url(' + img + ') center top no-repeat',
+					backgroundSize: '100%',
+
 				},
+				backgroundImg: '',
+				list:[]
 			}
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+			this.getCarouselList()
+			this.getBrandList()
+		},
+
+		methods: {
+			// 获取新牌商品
+			getBrandList() {
+				const app = this;
+				let pamars = {
+					store_id: 10001,
+					page: 1,
+					is_brand: 0,
+					is_new: 1,
+					categoryId: 0,
+					order: ''
+				}
+				Api.brandList(pamars)
+					.then(result => {
+						app.list = result.data.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			goDetails(goodsId) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + goodsId
+				})
+			},
+			// 获取背景图
+			getCarouselList() {
+				const app = this;
+				Api.getImage({
+						type: 1
+					})
+					.then(result => {
+						app.backgroundImg = result.data.imgurl
+					})
+					.finally(() => app.isLoading = false)
+			},
 		}
+
 	}
 </script>
 
 <style lang="scss" scoped>
-	.newGoods{
+	.newGoods {
 		width: 100%;
-		position:relative;
-		.bgImg{
+		position: relative;
+
+		.bgImg {
 			width: 100%;
 			height: 100%;
 			position: absolute;
@@ -90,19 +124,23 @@
 			z-index: -10;
 		}
 	}
-	.firGoods{
+
+	.firGoods {
 		width: 100%;
 		height: 548rpx;
 		background-image: url('/static/newGoods/top.png');
 		background-size: 100% 100%;
 		padding-left: 30rpx;
 		padding-top: 44rpx;
-		.topLine{
+
+		.topLine {
 			display: flex;
 			justify-content: center;
-			.left{
+
+			.left {
 				margin-top: 132rpx;
-				.goodsName{
+
+				.goodsName {
 					height: 58rpx;
 					font-size: 42rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -110,7 +148,8 @@
 					color: #242424;
 					line-height: 58rpx;
 				}
-				.goodsDesc{
+
+				.goodsDesc {
 					width: 280rpx;
 					height: 78rpx;
 					font-size: 56rpx;
@@ -119,7 +158,8 @@
 					color: #242424;
 					line-height: 78rpx;
 				}
-				.newTip{
+
+				.newTip {
 					width: 156rpx;
 					height: 56rpx;
 					background: #DA1646;
@@ -133,22 +173,25 @@
 					line-height: 56rpx;
 				}
 			}
-			.right{
+
+			.right {
 				background-image: url('../../static/newGoods/bg.png');
 				background-repeat: no-repeat;
-				background-size:422rpx 102rpx ;
+				background-size: 422rpx 102rpx;
 				position: relative;
 				background-position: left bottom;
 				height: 500rpx;
-				.goodsImg{
+
+				.goodsImg {
 					width: 414rpx;
 					height: 414rpx;
-					box-shadow: 0rpx 12rpx 29rpx 0rpx rgba(0,0,0,0.25);
+					box-shadow: 0rpx 12rpx 29rpx 0rpx rgba(0, 0, 0, 0.25);
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
 					opacity: 1;
 					z-index: 99;
 				}
-				.bg{
+
+				.bg {
 					width: 422rpx;
 					height: 102rpx;
 					position: absolute;
@@ -158,18 +201,20 @@
 			}
 		}
 	}
-	.goodsList{
+
+	.goodsList {
 		width: 100%;
 		padding: 26rpx 0 30rpx 26rpx;
 		background-image: url('/static/newGoods/bot.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-		.goodsItem{
+
+		.goodsItem {
 			margin-bottom: 32rpx;
 		}
 
 
-		.item{
+		.item {
 			width: 700rpx;
 			height: 334rpx;
 			background: #FDE7D5;
@@ -177,7 +222,8 @@
 			opacity: 1;
 			padding: 8rpx 10rpx 10rpx;
 		}
-		.hotSell{
+
+		.hotSell {
 			width: 226rpx;
 			height: 82rpx;
 			background: linear-gradient(180deg, #FDE7D5 0%, #FFDCC3 100%);
@@ -192,21 +238,29 @@
 			top: 8rpx;
 			border-radius: 20rpx 20rpx 0 0;
 		}
-		.goodsInfo{
+
+		.goodsInfo {
 			width: 680rpx;
 			height: 316rpx;
 			background: #FFFFFF;
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
 			opacity: 1;
 			padding-left: 28rpx;
-			.goodsDetail{
+
+			.goodsDetail {
 				display: flex;
 				justify-content: space-between;
 				width: 100%;
 				position: relative;
-				.infoLeft{
-					.gName{
-						// width: 180rpx;
+
+				.infoLeft {
+					.gName {
+						margin-bottom: 15rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						 -webkit-line-clamp: 2;
+						max-width: 350rpx;
 						height: 56rpx;
 						font-size: 40rpx;
 						font-family: PingFang SC, PingFang SC;
@@ -215,8 +269,13 @@
 						line-height: 56rpx;
 						margin-top: 32rpx;
 					}
-					.gd{
-						width: 362rpx;
+
+					.gd {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						 -webkit-line-clamp: 2;
+						max-width: 350rpx;
 						height: 88rpx;
 						font-size: 32rpx;
 						font-family: PingFang SC, PingFang SC;
@@ -224,7 +283,8 @@
 						color: #9F9F9F;
 						line-height: 38rpx;
 					}
-					.gp{
+
+					.gp {
 						height: 44rpx;
 						font-size: 32rpx;
 						font-family: PingFang SC, PingFang SC;
@@ -233,26 +293,31 @@
 						line-height: 38rpx;
 					}
 				}
-				.infoRight{
+
+				.infoRight {
 					width: 290rpx;
 					height: 290rpx;
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
 					opacity: 1;
 					margin-left: 14rpx;
-					.infoImg{
+
+					.infoImg {
 						width: 290rpx;
 						height: 290rpx;
 					}
+
 					position: absolute;
 					top: -68rpx;
 					right: 0;
 				}
 			}
-			.price{
+
+			.price {
 				display: flex;
 				justify-content: flex-end;
 				margin-top: 14rpx;
-				.lowPrice{
+
+				.lowPrice {
 					height: 50rpx;
 					font-size: 36rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -261,7 +326,8 @@
 					line-height: 50rpx;
 					margin-right: 30rpx;
 				}
-				.buyNow{
+
+				.buyNow {
 					width: 174rpx;
 					height: 58rpx;
 					background: linear-gradient(180deg, #FC522C 0%, #FA2929 100%);
@@ -278,4 +344,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index 3755c6a..a12bfc0 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -17,19 +17,20 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="newpeople-bd">
+		<view class="newpeople-bd" :isLoading="isLoading">
 			<view class="a">
-				<u-tabs :list="list" bg-color="#fafafa" inactive-color="#3C3C3C" active-color="#FF3C43" :is-scroll="true" font-size="30" v-model="current" @change="change"></u-tabs>
+				<u-tabs :list="menuList" bg-color="#fafafa" inactive-color="#3C3C3C" active-color="#FF3C43"
+					:is-scroll="true" font-size="30" v-model="current" @change="onChosed"></u-tabs>
 			</view>
 			<view scroll-x class="b">
-				<view class="item" v-for="i in 10" :key="i" @click="tabFilter(0)">
-					<image src="@/static/home/phone.jpg"></image>
+				<view class="item" v-for="(item,index) in goodList" :key="i" @click="goDetail(item.goods_id)">
+					<image :src="item.goods_image"></image>
 					<view class="title">
-						<text>自营</text>iphone13 绿色 128GB
+						<text>自营</text>{{item.goods_name}}
 					</view>
 					<view class="price">
-						<view class="n">￥<text>7595</text>到手价</view>
-						<view class="o">￥7595</view>
+						<view class="n">￥<text>{{item.goods_price_min}}</text>到手价</view>
+						<view class="o">￥{{item.goods_price_min}}</view>
 					</view>
 					<view class="desc">
 						200+条评论 99%好评率
@@ -45,132 +46,185 @@
 
 <script>
 	import img from "@/static/news/newPeople-bg.png"
+	import * as Api from '@/api/activity'
 	export default {
 		data() {
 			return {
 				current: 1,
+				isLoading: true,
 				background: {
-					background: 'url('+	img+') center top no-repeat',
+					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100%',
-					
+
 				},
-				list: [{
-					name: '精选好物'
-				}, {
-					name: '吹风机'
-				}, {
-					name: '空调'
-				}, {
-					name: '手机'
-				}, {
-					name: '洗衣机'
-				}, {
-					name: '冰箱'
-				}, {
-					name: '彩电'
-				}],
+				goodList:[],
+				menuList:[],
 			}
 		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow(options) {
+			this.getListCharts()
+		},
 		methods: {
-			
+			getListgoodData(categoryId) {
+				let app = this;
+				let pamars = {
+					store_id: 10001,
+					categoryId: categoryId,
+				}
+				Api.chartsGoodsList(pamars)
+					.then(result => {
+						app.goodList = result.data.data;
+						console.log(app.goodList)
+					})
+					.finally(() => app.isLoading = false)
+			},
+			onChosed(index) {
+				let app = this;
+				app.current = index;
+				app.getListgoodData(index!=0?app.menuList[index].category_id:'')
+			},
+			// 分类
+			getListCharts() {
+				let app = this
+				app.menuList = []
+				let pamars = {
+					store_id: 10001
+				}
+				Api.charts(pamars)
+					.then(result => {
+						let obj = {
+							name: '精选好物'
+						}
+						result.data.unshift(obj)
+						app.menuList = result.data;
+						app.getListgoodData()
+					})
+					.finally(() => app.isLoading = false)
+			},
+			goDetail(orderId) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?orderId='+orderId
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.newpeople{
-	background: url(@/static/news/newPeople-bg.png) center top no-repeat;
-	background-size: 100% auto;
-	overflow: hidden;
-	&-hd{
-		height: 200rpx;
-	}
-	&-gift{
-		width: 100%;
-		border-radius: 10rpx 10rpx 0 0;
-		background-color: #fff;
+	.newpeople {
+		background: url(@/static/news/newPeople-bg.png) center top no-repeat;
+		background-size: 100% auto;
 		overflow: hidden;
-		.a{
-			width: 100%;
-			image{
-				width: 380rpx;
-				height: 58rpx;
-				margin-left: 60rpx;
-				margin-top: 20rpx;
-			}
+	
+	&-hd {
+			height: 200rpx;
 		}
-		.b{
-			padding: 20rpx;
+
+		&-gift {
+			width: 100%;
+			border-radius: 10rpx 10rpx 0 0;
+			background-color: #fff;
 			overflow: hidden;
-			white-space: nowrap;
-			.item{
-				width: 210rpx;
-				height: 266rpx;
-				position: relative;
-				margin-left: 30rpx;
-				display: inline-block;
-				text-align: center;
-				&:first-child{
-					margin-left: 0;
-				}
-				image{
-					width: 100%;
-					height: 100%;
+
+			.a {
+				width: 100%;
+
+				image {
+					width: 380rpx;
+					height: 58rpx;
+					margin-left: 60rpx;
+					margin-top: 20rpx;
 				}
-				.p{
-					width: 100%;
-					font-size: 42rpx;
-					color: #FF343B;
-					height: 80rpx;
-					position: absolute;
-					left: 0;
-					top: 50rpx;
-					z-index: 2;
-					text{
-						font-size: 52rpx;
+			}
+
+			.b {
+				padding: 20rpx;
+				overflow: hidden;
+				white-space: nowrap;
+
+				.item {
+					width: 210rpx;
+					height: 266rpx;
+					position: relative;
+					margin-left: 30rpx;
+					display: inline-block;
+					text-align: center;
+
+					&:first-child {
+						margin-left: 0;
 					}
-				}
-				.l{
-					width: 100%;
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #8C4D00;
-					height: 50rpx;
-					position: absolute;
-					left: 0;
-					top: 120rpx;
-					z-index: 2;
-					text{
-						font-size: 52rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
 					}
-				}
-				.btn{
-					width: 100%;
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #8C4D00;
-					height: 50rpx;
-					position: absolute;
-					left: 0;
-					bottom: 2rpx;
-					z-index: 2;
-					text{
-						font-size: 52rpx;
+
+					.p {
+						width: 100%;
+						font-size: 42rpx;
+						color: #FF343B;
+						height: 80rpx;
+						position: absolute;
+						left: 0;
+						top: 50rpx;
+						z-index: 2;
+
+						text {
+							font-size: 52rpx;
+						}
+					}
+
+					.l {
+						width: 100%;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #8C4D00;
+						height: 50rpx;
+						position: absolute;
+						left: 0;
+						top: 120rpx;
+						z-index: 2;
+
+						text {
+							font-size: 52rpx;
+						}
+					}
+
+					.btn {
+						width: 100%;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #8C4D00;
+						height: 50rpx;
+						position: absolute;
+						left: 0;
+						bottom: 2rpx;
+						z-index: 2;
+
+						text {
+							font-size: 52rpx;
+						}
 					}
 				}
 			}
 		}
-	}
-	&-bd{
-		padding: 0 20rpx;
-		overflow: hidden;
-		.a{
-			padding: 10rpx 0;
-			overflow: hidden;
-		}
-		.b{
+
+		&-bd {
+			padding: 0 20rpx;
 			overflow: hidden;
-			.item{
+
+			.a {
+				padding: 10rpx 0;
+				overflow: hidden;
+			}
+
+			.b {
+				overflow: hidden;
+
+				.item {
 					width: 340rpx;
 					height: 436rpx;
 					background: #FFFFFF;
@@ -182,16 +236,19 @@
 					float: left;
 					margin-left: 30rpx;
 					margin-bottom: 30rpx;
-					&:nth-child(2n+1){
+
+					&:nth-child(2n+1) {
 						margin-left: 0;
 					}
-					image{
+
+					image {
 						width: 275rpx;
 						height: 275rpx;
 						display: block;
 						margin: 0 auto;
 					}
-					.title{
+
+					.title {
 						padding: 10rpx 0;
 						line-height: 40rpx;
 						font-size: 24rpx;
@@ -201,7 +258,8 @@
 						text-overflow: ellipsis;
 						white-space: nowrap;
 						overflow: hidden;
-						text{
+
+						text {
 							background-color: #F34A40;
 							font-size: 24rpx;
 							padding: 0 10rpx;
@@ -215,27 +273,32 @@
 							display: inline-block;
 						}
 					}
-					.price{
+
+					.price {
 						display: flex;
 						align-items: center;
 						white-space: nowrap;
-						.n{
+
+						.n {
 							display: flex;
 							align-items: baseline;
 							font-size: 11px;
 							font-weight: 500;
 							color: #F21A1C;
-							text{
+
+							text {
 								font-size: 29rpx;
 							}
 						}
-						.o{
+
+						.o {
 							font-size: 12px;
 							color: #949494;
 							text-decoration: line-through;
 						}
 					}
-					.desc{
+
+					.desc {
 						font-size: 10px;
 						font-weight: 400;
 						color: #949494;
@@ -243,20 +306,22 @@
 						margin-top: 10rpx;
 					}
 				}
-			
+
+			}
 		}
-	}
-	&-fd{
-		width: 132rpx;
-		height: 166rpx;
-		position: fixed;
-		right: 10rpx;
-		bottom: 10%;
-		z-index: 99;
-		image{
-			width: 100%;
-			height: 100%;
+
+		&-fd {
+			width: 132rpx;
+			height: 166rpx;
+			position: fixed;
+			right: 10rpx;
+			bottom: 10%;
+			z-index: 99;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/activity/presale.vue b/pages/activity/presale.vue
index 7122f4e..91e7bed 100644
--- a/pages/activity/presale.vue
+++ b/pages/activity/presale.vue
@@ -1,195 +1,262 @@
-<template>
-	<view class="presale">
+<template>
+	<view class="presale">
 		<view class="presale-hd">
 			<view class="rule" @click="openPage()"></view>
-		</view>
+		</view>
 		<view class="presale-bd">
 			<view class="tab">
-			  <u-tabs :list="list" :is-scroll="true" :show-bar="false" active-color="#FFFFFF" bg-color="rgba(255,255,255,0)" inactive-color="rgba(255,255,255,0.62)" v-model="current"></u-tabs>
+				<u-tabs :list="menuList" :is-scroll="true" :show-bar="false" active-color="#FFFFFF"
+					bg-color="rgba(255,255,255,0)" inactive-color="rgba(255,255,255,0.62)" v-model="current"
+					@change='onChosed'></u-tabs>
 			</view>
 			<view class="title">
 				<image src="/static/news/newPresale-1.png"></image>
 				正在进行中
 				<image src="/static/news/newPresale-1.png"></image>
 			</view>
-			<view class="list">
-				<view class="item" v-for="i in 10" :key="i">
-					<image class="pic" src="/static/home/phone.jpg"></image>
+			<view class="list" :isLoading="isLoading">
+				<view class="item" v-for="(item,index) in goodList" :key="index">
+					<image class="pic" :src="item.goods_image"></image>
 					<view class="info">
-						<view class="t">一加Ace 2pro超值砍价手机全网通双卡双待</view>
-						<view class="d"><u-count-down :timestamp="timestamp" format="HH:mm:ss"></u-count-down><text>后失效</text></view>
+						<view class="t">{{item.goods_name}}</view>
+						<view class="d">
+							<u-count-down :timestamp="timestamp" format="HH:mm:ss"></u-count-down><text>后失效</text>
+						</view>
 						<view class="p">
 							<image src="/static/news/newPresale-2.png"></image>
-							<view class="s">预约价¥4189</view>
+							<view class="s">预约价¥{{item.goods_price_min}}</view>
 							<view class="n" @click="goPre(i)">去预约</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import img from "@/static/news/newPeople-bg.png"
-	export default {
-		data() {
+		</view>
+	</view>
+</template>
+
+<script>
+	import img from "@/static/news/newPeople-bg.png"
+	import * as Api from '@/api/activity'
+	export default {
+		data() {
 			return {
-				timestamp: 24*3600*1000,
-				current: 0,
-				list: [{
-					name: '精选好物'
-				}, {
-					name: '吹风机'
-				}, {
-					name: '空调'
-				}, {
-					name: '手机'
-				}, {
-					name: '洗衣机'
-				}, {
-					name: '冰箱'
-				}, {
-					name: '彩电'
-				}],
-			}
-		},
-		methods: {
-			openPage() {
+				timestamp: 24 * 3600 * 1000,
+				current: 0,
+				isLoading: true,
+				goodList: [],
+				menuList: [],
+				list: [{
+					name: '精选好物'
+				}, {
+					name: '吹风机'
+				}, {
+					name: '空调'
+				}, {
+					name: '手机'
+				}, {
+					name: '洗衣机'
+				}, {
+					name: '冰箱'
+				}, {
+					name: '彩电'
+				}],
+			}
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow(options) {
+			this.getListCharts()
+		},
+		methods: {
+			getListgoodData(categoryId) {
+				let app = this;
+				let pamars = {
+					store_id: 10001,
+					categoryId: categoryId,
+				}
+				Api.chartsGoodsList(pamars)
+					.then(result => {
+						app.goodList = result.data.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			onChosed(index) {
+				let app = this;
+				app.current = index;
+				app.getListgoodData(index != 0 ? app.menuList[index].category_id : '')
+			},
+			// 分类
+			getListCharts() {
+				let app = this
+				app.menuList = []
+				let pamars = {
+					store_id: 10001
+				}
+				Api.charts(pamars)
+					.then(result => {
+						let obj = {
+							name: '精选好物'
+						}
+						result.data.unshift(obj)
+						app.menuList = result.data;
+						app.getListgoodData('')
+					})
+					.finally(() => app.isLoading = false)
+			},
+			goDetail(orderId) {
 				uni.navigateTo({
-					url: "/pages/activity/presaleRule"
+					url: '/pages/goods/detail?orderId=' + orderId
 				})
 			},
-			goPre(i){
+			goDetailMore(categoryId, name) {
 				uni.navigateTo({
-					url: "/pages/goods/detail?isPre=true"
+					url: '/pages/activity/charts?categoryId=' + categoryId + '&name=' + name
 				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.presale{
-	background: #ff7b79 url(@/static/news/newPresale-bg.jpg) center top no-repeat;
-	background-size: 100% auto;
-	overflow: hidden;
-	min-height: 100vh;
-	&-hd{
-		position: relative;
-		height: 380rpx;
-		.rule{
-			width: 100rpx;
-			height: 60rpx;
-			position: absolute;
-			right: 0;
-			top: 74rpx;
-			z-index: 2;
-		}
-	}
-	&-bd{
-		width: 678rpx;
-		margin: 0 auto;
-		padding-bottom: 30rpx;
-		margin-top: 20rpx;
-		.title{
-			width: 100%;
-			border-radius: 12rpx 12rpx 0 0;
-			height: 78rpx;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			border: 2px solid #fff;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			image{
-				width: 32rpx;
-				height: 13rpx;
-				margin: 0 20rpx;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.presale {
+		background: #ff7b79 url(@/static/news/newPresale-bg.jpg) center top no-repeat;
+		background-size: 100% auto;
+		overflow: hidden;
+		min-height: 100vh;
+
+		&-hd {
+			position: relative;
+			height: 380rpx;
+
+			.rule {
+				width: 100rpx;
+				height: 60rpx;
+				position: absolute;
+				right: 0;
+				top: 74rpx;
+				z-index: 2;
 			}
 		}
-		.list{
-			background-color: #fff;
-			border-radius:  0 0 12rpx 12rpx;
-			overflow: hidden;
-			.item{
-				padding: 45rpx 45rpx;
-				overflow: hidden;
-				border-top: 1px solid #F1F1F1;
-				&:first-child{
-					border-top-color: #fff;
-				}
+
+		&-bd {
+			width: 678rpx;
+			margin: 0 auto;
+			padding-bottom: 30rpx;
+			margin-top: 20rpx;
+
+			.title {
+				width: 100%;
+				border-radius: 12rpx 12rpx 0 0;
+				height: 78rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				border: 2px solid #fff;
 				display: flex;
-				image{
-					width: 220rpx;
-					height: 220rpx;
-					margin-right: 10rpx;
+				align-items: center;
+				justify-content: center;
+
+				image {
+					width: 32rpx;
+					height: 13rpx;
+					margin: 0 20rpx;
 				}
-				.info{
-					flex: 1;
-					max-width: 400rpx;
-					.t{
-						height: 80rpx;
-						line-height: 40rpx;
-						font-size: 32rpx;
-						font-weight: 500;
-						color: #626262; 
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
+			}
+
+			.list {
+				background-color: #fff;
+				border-radius: 0 0 12rpx 12rpx;
+				overflow: hidden;
+
+				.item {
+					padding: 45rpx 45rpx;
+					overflow: hidden;
+					border-top: 1px solid #F1F1F1;
+
+					&:first-child {
+						border-top-color: #fff;
 					}
-					.d{
-						display: flex;
-						align-items: center;
-						height: 60rpx;
-						font-size: 32rpx;
-						font-weight: 500;
-						color: #F94021;
-						text{
-							color: #9E9E9E;
-							margin-left: 10rpx;
-						}
+
+					display: flex;
+
+					image {
+						width: 220rpx;
+						height: 220rpx;
+						margin-right: 10rpx;
 					}
-					.p{
-						width: 396rpx;
-						height: 88rpx;
-						position: relative;
-						image{
-							width: 396rpx;
-							height: 88rpx;
+
+					.info {
+						flex: 1;
+						max-width: 400rpx;
+
+						.t {
+							height: 80rpx;
+							line-height: 40rpx;
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #626262;
+							word-break: break-all;
+							text-overflow: ellipsis;
+							overflow: hidden;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
 						}
-						.s{
-							width: 240rpx;
-							line-height: 88rpx;
-							position: absolute;
-							text-align: center;
-							left: 0;
-							top: 0;
-							z-index: 2;
-							font-size: 32rpx;
-							font-weight: 500;
-							color: #FF584D;
+
+						.d {
+							display: flex;
+							align-items: center;
+							height: 60rpx;
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #F94021;
+
+							text {
+								color: #9E9E9E;
+								margin-left: 10rpx;
+							}
 						}
-						.n{
-							width: 150rpx;
-							line-height: 88rpx;
-							text-align: center;
-							position: absolute;
-							right: 0;
-							top: 0;
-							z-index: 2;
-							font-size: 32rpx;
-							font-weight: 500;
-							color: #FFFFFF;
+
+						.p {
+							width: 396rpx;
+							height: 88rpx;
+							position: relative;
+
+							image {
+								width: 396rpx;
+								height: 88rpx;
+							}
+
+							.s {
+								width: 240rpx;
+								line-height: 88rpx;
+								position: absolute;
+								text-align: center;
+								left: 0;
+								top: 0;
+								z-index: 2;
+								font-size: 32rpx;
+								font-weight: 500;
+								color: #FF584D;
+							}
+
+							.n {
+								width: 150rpx;
+								line-height: 88rpx;
+								text-align: center;
+								position: absolute;
+								right: 0;
+								top: 0;
+								z-index: 2;
+								font-size: 32rpx;
+								font-weight: 500;
+								color: #FFFFFF;
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/activity/ranking.vue b/pages/activity/ranking.vue
index 4138f45..87239c7 100644
--- a/pages/activity/ranking.vue
+++ b/pages/activity/ranking.vue
@@ -1,7 +1,9 @@
 <template>
-	<view class="newGoods">
-		<view >
-			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff" :background="background"></u-navbar>
+	<view class="newGoods" :style="{backgroundImage:'url('+backgroundImg+')'}"
+		style="background-size: 100% 100%;padding-bottom: 20rpx;">
+		<view>
+			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
+				:background="background"></u-navbar>
 		</view>
 		<image src="/static/rank/rangkImg.png" mode="" class="bgImg"></image>
 		<view class="headTitle">
@@ -12,35 +14,62 @@
 		</view>
 		<view class="menuList">
 			<scroll-view scroll-x="true" class="list">
-				<view class="menuItem" v-for="(item,index) in menuList" :key="index">
+				<view class="menuItem" v-for="(item,index) in menuList" :key="index" @click="onChosed(item,index)">
 					<view class="menuName">
 						{{item.name}}
 					</view>
-					<view class="line" v-if="chosed==item.value">
-						
-					</view>
+					<view class="line" v-if="chosed==index"></view>
 				</view>
 			</scroll-view>
 		</view>
-		<view class="rankList" v-for="(s,k) in 4" :key="k">
-			<view class="firLine" @click="goDetail">
-				<view class="hotTitle">手机热销榜</view>
+		<view class="rankList" v-for="(item,index) in jingList" :key="index" v-if="chosed==0">
+			<view class="firLine" @click="goDetailMore(item.category_id,item.name)">
+				<view class="hotTitle">{{item.name}}热销榜</view>
 				<view class="opera">
 					<text>更多上榜好物</text>
 					<image src="../../static/order/left.png" mode="" class="more"></image>
 				</view>
 			</view>
 			<view class="goodsList">
-				<view class="goodsItem" v-for="(item,index) in 3" :key="index">
+				<view class="goodsItem" v-for="(item_1,index) in item.goods_list" :key="index" v-if="index < 3">
 					<image src="/static/rank/topOne.png" mode="" class="topOne" v-if="index==0"></image>
 					<image src="/static/rank/topTwo.png" mode="" class="topOne" v-if="index==1"></image>
 					<image src="/static/rank/topThree.png" mode="" class="topOne" v-if="index==2"></image>
-					<image src="/static/newGoods/goods.png" mode="" class="goodsImg"></image>
+					<image :src="item_1.goods_image" mode="" class="goodsImg"></image>
 					<view class="goodsName">
-						Neo9 Pro...
+						{{item_1.goods_name}}
 					</view>
 					<view class="goodsPrice">
-						￥2399
+						￥ {{item_1.goods_price_min}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品 -->
+		<view class="rankList" v-if="chosed>0" style="padding: 0;height: 440rpx;">
+			<view class="goodsList1" v-for="(item,index) in goodList" :key="index">
+				<view class="goodsDetail1">
+					<image src="../../static/rank/topOne.png" mode="" class="topOne1"></image>
+					<view class="goodsInfo1">
+						<image :src="item.goods_image" mode="" class="goodsImg1"></image>
+						<view class="goodsName1">
+							<view class="name1">
+								{{item.goods_name}}
+							</view>
+							<view class="hot1">
+								<text class="hotTitle1">HOT</text>
+								<text class="zs1">综合热卖指数{{item.remaizhishu}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="opera1">
+					<view class="price1">
+						￥<text>{{item.goods_price_min}}</text>
+					</view>
+					<view class="look1" @click="goDetail(item.goods_id)">
+						去看看
+						<image src="/static/rank/right.png" mode="" class="right1"></image>
 					</view>
 				</view>
 			</view>
@@ -50,39 +79,96 @@
 
 <script>
 	import img from "@/static/rank/rank1.png"
+	import * as Api from '@/api/activity'
 	export default {
 		data() {
 			return {
 				background: {
-					background: 'url('+	img+') center top no-repeat',
+					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
-				chosed:0,
-				menuList:[
-					{
-						name:'精选',
-						value:0
-					},{
-						name:'手机通讯',
-						value:1
-					},{
-						name:'电脑',
-						value:2
-					},{
-						name:'家用电器',
-						value:3
-					},{
-						name:'美妆',
-						value:4
-					},
-					
-				]
+				chosed: 0,
+				menuList: [],
+				backgroundImg: '',
+				jingList: [],
+				goodList: [],
 			}
 		},
-		methods:{
-			goDetail(){
+		onShow() {
+			this.getCarouselList()
+			this.getListCharts()
+		},
+		methods: {
+			// 获取背景图
+			getCarouselList(category_id) {
+				const app = this;
+				Api.getImage({
+						type: 3
+					})
+					.then(result => {
+						app.backgroundImg = result.data.imgurl;
+						if (app.chosed == 0) {
+							app.getListJingData()
+						} else {
+							app.getListgoodData(category_id)
+						}
+					})
+					.finally(() => app.isLoading = false)
+			},
+			getListJingData() {
+				let app = this;
+				let pamars = {
+					store_id: 10001,
+				}
+				Api.chartsGoodsJing(pamars)
+					.then(result => {
+						app.jingList = result.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			getListgoodData(categoryId) {
+				let app = this;
+				let pamars = {
+					store_id: 10001,
+					categoryId: categoryId,
+				}
+				Api.chartsGoodsList(pamars)
+					.then(result => {
+						app.goodList = result.data.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			onChosed(item, index) {
+				let app = this;
+				app.chosed = index;
+				app.getCarouselList(item.category_id)
+			},
+			// 分类
+			getListCharts() {
+				let app = this
+				app.menuList = []
+				let pamars = {
+					store_id: 10001
+				}
+				Api.charts(pamars)
+					.then(result => {
+						let obj = {
+							name: '精品'
+						}
+						result.data.unshift(obj)
+						app.menuList = result.data;
+						app.getListJingData()
+					})
+					.finally(() => app.isLoading = false)
+			},
+			goDetail(orderId) {
 				uni.navigateTo({
-					url:'/pages/activity/charts'
+					url: '/pages/goods/detail?orderId='+orderId
+				})
+			},
+			goDetailMore(categoryId,name) {
+				uni.navigateTo({
+					url: '/pages/activity/charts?categoryId='+categoryId+'&name='+name
 				})
 			},
 		}
@@ -93,7 +179,8 @@
 	.newGoods {
 		width: 100%;
 		position: relative;
-		min-height:100vh ;
+		min-height: 100vh;
+
 		.bgImg {
 			width: 100%;
 			height: 100%;
@@ -103,6 +190,7 @@
 			z-index: -10;
 		}
 	}
+
 	.headTitle {
 		width: 100%;
 		text-align: center;
@@ -130,17 +218,21 @@
 		right: 0;
 		margin: auto;
 	}
-	.menuList{
+
+	.menuList {
 		margin-top: 34rpx;
 		width: 100%;
 		padding-left: 50rpx;
-		.list{
+
+		.list {
 			white-space: nowrap;
 		}
-		.menuItem{
+
+		.menuItem {
 			display: inline-block;
 			margin-right: 62rpx;
-			.menuName{
+
+			.menuName {
 
 				height: 50rpx;
 				font-size: 36rpx;
@@ -149,7 +241,8 @@
 				color: #FFFFFF;
 				line-height: 50rpx;
 			}
-			.line{
+
+			.line {
 				width: 70rpx;
 				height: 10rpx;
 				background: #FFE4C3;
@@ -159,18 +252,21 @@
 			}
 		}
 	}
-	.rankList{
+
+	.rankList {
 		width: 702rpx;
 		height: 456rpx;
 		background: #FFFFFF;
 		border-radius: 18rpx 18rpx 18rpx 18rpx;
 		opacity: 1;
-		margin: 28rpx 0 0 22rpx;
+		margin: 28rpx 0 0 24rpx;
 		padding: 32rpx;
-		.firLine{
+
+		.firLine {
 			display: flex;
 			justify-content: space-between;
-			.hotTitle{
+
+			.hotTitle {
 				height: 50rpx;
 				font-size: 36rpx;
 				font-family: PingFang SC, PingFang SC;
@@ -178,10 +274,12 @@
 				color: #0E0E0E;
 				line-height: 50rpx;
 			}
-			.opera{
+
+			.opera {
 				display: flex;
 				align-items: center;
-				text{
+
+				text {
 					height: 44rpx;
 					font-size: 32rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -190,31 +288,37 @@
 					line-height: 44rpx;
 					margin-right: 18rpx;
 				}
-				.more{
+
+				.more {
 					width: 20rpx;
 					height: 20rpx;
 				}
 			}
 		}
-		.goodsList{
+
+		.goodsList {
 			display: flex;
 			margin-top: 86rpx;
 			margin-left: 18rpx;
 			justify-content: space-around;
-			.goodsItem{
+
+			.goodsItem {
 				position: relative;
-				.topOne{
+
+				.topOne {
 					width: 48rpx;
 					height: 66rpx;
 					position: absolute;
-					top:-38rpx;
+					top: -38rpx;
 					left: -28rpx;
 				}
-				.goodsImg{
+
+				.goodsImg {
 					width: 160rpx;
 					height: 160rpx;
 				}
-				.goodsName{
+
+				.goodsName {
 					width: 150rpx;
 					height: 40rpx;
 					font-size: 28rpx;
@@ -223,8 +327,12 @@
 					color: #3F3F3F;
 					line-height: 40rpx;
 					margin: 8rpx 0 4rpx 0;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
 				}
-				.goodsPrice{
+
+				.goodsPrice {
 					height: 50rpx;
 					font-size: 36rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -234,5 +342,134 @@
 				}
 			}
 		}
+
+		.goodsList1 {
+			width: 700rpx;
+			height: 440rpx;
+			background: #FCE5C6;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			margin-bottom: 42rpx;
+
+			.goodsDetail1 {
+				width: 700rpx;
+				height: 336rpx;
+				padding: 54rpx 0 0 52rpx;
+				background: #FFFFFF;
+				border-radius: 18rpx 18rpx 18rpx 18rpx;
+				opacity: 1;
+				position: relative;
+
+				.topOne1 {
+					width: 73rpx;
+					height: 100rpx;
+					position: absolute;
+					left: 36rpx;
+					top: -8rpx;
+				}
+
+				.goodsInfo1 {
+					display: flex;
+
+					.goodsImg1 {
+						width: 224rpx;
+						height: 224rpx;
+						border-radius: 0rpx 0rpx 0rpx 0rpx;
+						opacity: 1;
+						margin-right: 16rpx;
+					}
+
+					.goodsName1 {
+						.name1 {
+							width: 396rpx;
+							height: 132rpx;
+							font-size: 32rpx;
+							font-family: PingFang SC, PingFang SC;
+							font-weight: 400;
+							color: #0E0E0E;
+							line-height: 38rpx;
+							word-break: break-all;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							overflow: hidden;
+						}
+
+						.hot1 {
+							width: 336rpx;
+							height: 60rpx;
+							background: linear-gradient(90deg, #FCE5C6 0%, #FFFFFF 100%);
+							border-radius: 70rpx 70rpx 70rpx 70rpx;
+							opacity: 1;
+							margin-top: 16rpx;
+
+							.hotTitle1 {
+								margin-right: 8rpx;
+								width: 68rpx;
+								height: 42rpx;
+								font-size: 32rpx;
+								font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+								font-weight: 600;
+								line-height: 60rpx;
+								margin-left: 8rpx;
+								background: -webkit-linear-gradient(180deg, #FFA621 0%, #F34A40 100%);
+								-webkit-text-fill-color: transparent;
+								-webkit-background-clip: text;
+							}
+
+							.zs1 {
+								height: 44rpx;
+								font-size: 32rpx;
+								font-family: PingFang SC, PingFang SC;
+								font-weight: 400;
+								color: #9F6516;
+								line-height: 60rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.opera1 {
+				display: flex;
+				justify-content: space-between;
+				width: 100%;
+				align-items: center;
+				height: 104rpx;
+
+				.price1 {
+					font-size: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #301F14;
+					line-height: 44rpx;
+
+					text {
+						font-size: 48rpx;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 600;
+						color: #301F14;
+						line-height: 68rpx;
+					}
+				}
+
+				.look1 {
+					width: 202rpx;
+					height: 60rpx;
+					background: linear-gradient(180deg, #FF7E6A 0%, #FB322A 100%);
+					border-radius: 70rpx 70rpx 70rpx 70rpx;
+					opacity: 1;
+					margin-right: 22rpx;
+					text-align: center;
+					line-height: 60rpx;
+
+					.right1 {
+						width: 20rpx;
+						height: 18rpx;
+						margin-left: 26rpx;
+					}
+				}
+			}
+
+		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue
index 79bda85..bbd7b27 100644
--- a/pages/activity/seckill.vue
+++ b/pages/activity/seckill.vue
@@ -1,61 +1,57 @@
 <template>
 	<view class="seckill">
-		<view >
-			<u-navbar title="限时秒杀" back-icon-color="#fff" :border-bottom="false" title-color="#fff" :background="background"></u-navbar>
+		<view>
+			<u-navbar title="限时秒杀" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
+				:background="background"></u-navbar>
 		</view>
-		<view class="title">
+		<view class="title" :style="{backgroundImage:'url('+backgroundImg+')'}" style="background-size: 100% 100%;">
 			<image src="/static/seckill/topHeader.png" mode="" class="bgImg"></image>
 			<view class="limitTitle">
 				<image src="/static/seckill/limit.png" mode="" class="img"></image>
 			</view>
-			<view class="time">
-				<view class="timeItem" v-for="(item,index) in 4" :key="index">
+			<view class="time" v-if="tabbar.length">
+				<view class="timeItem" v-for="(item,index) in tabbar" :key="index">
 					<view class="num">
-						10:00
+						{{item.active_time}}
 					</view>
 					<view class="desc">
-						疯抢中
+						{{item.sharp_modular_text}}
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 		<view class="main">
-			<view class="over">
+			<view class="over" v-if="tabbar.length">
 				<view class="info">
-					距秒杀结束还剩
-				</view>
-				<view class="hou com">
-					08
-				</view>:
-				<view class="min com">
-					50
-				</view>:
-				<view class="sec com">
-					12
+					距秒杀<text
+						class="m-r-10">{{ tabbar[curTabIndex].status == ActiveStatusEnum.STATE_BEGIN.value ? '距结束' : '距开始' }}</text>还剩
+					<count-down style='display: inline-block;' :date="tabbar[curTabIndex].count_down_time"
+						separator="colon" theme="custom" />
 				</view>
 			</view>
 			<view class="goodsList">
-				<view class="goodItem" v-for="(item,index) in 3" :key="index" @click="goodsDetail(item)">
+				<view class="goodItem" v-for="(item,index) in goodsList" :key="index"
+					@click="handleTargetGoods(item.sharp_goods_id)">
 					<view class="itemImg">
-						<image src="/static/newGoods/goods.png" mode="" class="goodsImg"></image>
+						<image :src="item.goods_image" mode="" class="goodsImg"></image>
 					</view>
 					<view class="goodsInfo">
 						<view class="name">
-							Apple iphone 15(A3092)
+							{{item.goods_name}}
 						</view>
 						<view class="sellNum">
-							爆卖76件
+							爆卖{{item.sales_actual}}件
 						</view>
 						<view class="info">
 							<view class="price">
-								¥1849
+								¥{{item.original_price}}
 							</view>
 							<view class="delPrice">
 								<view class="delText">
-									直降32元
+									直降{{item.original_price-item.seckill_price_min}}元
 								</view>
-								
+
 							</view>
 							<view class="update">
 								即将调整
@@ -64,12 +60,12 @@
 						<view class="line">
 							<image src="/static/seckill/line.png" mode=""></image>
 						</view>
-						<view class="btn">
+						<view class="btn" v-if="tabbar.length">
 							<view class="killPrice">
-								秒杀价￥1149
+								秒杀价￥{{item.original_price}}
 							</view>
 							<view class="buyNow">
-								立即抢
+								{{ tabbar[curTabIndex].status == ActiveStatusEnum.STATE_BEGIN.value ? '马上抢' : '查看商品' }}
 							</view>
 						</view>
 					</view>
@@ -80,36 +76,223 @@
 </template>
 
 <script>
-	import img from "@/static/seckill/topHeader.png"
-	export default{
-		data(){
-			return{
+	import img from "@/static/rank/rank1.png"
+	import WxofficialMixin from '@/core/mixins/wxofficial'
+	import CountDown from '@/components/countdown'
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
+	import {
+		hex2rgba
+	} from '@/utils/color'
+	import {
+		getEmptyPaginateObj,
+		getMoreListData
+	} from '@/core/app'
+	import {
+		ActiveStatusEnum
+	} from '@/common/enum/sharp'
+	import * as Api from '@/api/activity'
+
+	const pageSize = 15
+
+	export default {
+		components: {
+			CountDown
+		},
+		mixins: [MescrollMixin, WxofficialMixin],
+		data() {
+			return {
+				// 是否正在加载中
+				isLoading: true,
+				// 当前tab索引
+				curTabIndex: 0,
+				// 上拉加载配置
+				upOption: {
+					// 首次自动执行
+					auto: false,
+					// 每页数据的数量; 默认10
+					page: {
+						size: pageSize
+					},
+					// 数量要大于3条才显示无更多数据
+					noMoreSize: 3,
+				},
+				// 枚举类
+				ActiveStatusEnum,
+				// 秒杀活动场次
+				tabbar: [],
+				// 秒杀商品列表
+				goodsList: [],
 				background: {
 					background: 'url('+	img+') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
+				backgroundImg:''
 			}
 		},
-		methods:{
-			goodsDetail(item){
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+			this.getCarouselList()
+			// 加载页面数据
+			this.onRefreshPage()
+			// 设置微信公众号链接分享卡片内容
+			this.setWxofficialShareData()
+		},
+
+		methods: {
+			// 获取背景图
+			getCarouselList() {
+				const app = this;
+				Api.getImage({
+						type: 2
+					})
+					.then(result => {
+						app.backgroundImg = result.data.imgurl
+					})
+					.finally(() => app.isLoading = false)
+			},
+			// 加载页面数据
+			onRefreshPage() {
+				const app = this
+				return new Promise((resolve, reject) => {
+					Api.data()
+						.then(result => {
+							app.tabbar = result.data.tabbar;
+							app.goodsList = result.data.goodsList.data
+							app.curTabIndex = 0
+							if (!app.goodsList.data.length) {
+								app.mescroll.showEmpty()
+							}
+							resolve()
+						})
+						.catch(reject)
+				})
+			},
+
+			/**
+			 * 获取商品列表
+			 * @param {Number} pageNo 页码
+			 */
+			getListData(pageNo = 1) {
+				const app = this
+				const activeTimeId = app.getCurTabbarId()
+				return new Promise((resolve, reject) => {
+					Api.list(activeTimeId, {
+							page: pageNo
+						}, {
+							load: false
+						})
+						.then(result => {
+							// 合并新数据
+							const newList = result.data.list
+							app.goodsList = getMoreListData(newList, app.goodsList, pageNo)
+							resolve(newList)
+						})
+						.catch(reject)
+				})
+			},
+
+			// 下拉刷新的回调
+			downCallback() {
+				this.onRefreshPage()
+					.finally(() => this.mescroll.endSuccess())
+			},
+
+			/**
+			 * 上拉加载的回调
+			 * 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
+			 * @param {Object} page
+			 */
+			upCallback(page) {
+				const app = this
+				// 设置列表数据
+				app.getListData(page.num)
+					.then(list => {
+						const curPageLen = list.data.length
+						const totalSize = list.data.total
+						app.mescroll.endBySize(curPageLen, totalSize)
+					})
+					.catch(() => app.mescroll.endErr())
+			},
+
+			// 点击切换标签(会场场次)
+			handleTab(index) {
+				const app = this
+				app.curTabIndex = index
+				// 刷新列表数据
+				app.goodsList = getEmptyPaginateObj()
+				app.mescroll.resetUpScroll()
+			},
+
+			// 获取当前选择的会场
+			getCurTabbar() {
+				return this.tabbar[this.curTabIndex]
+			},
+
+			// 获取当前会场场次ID
+			getCurTabbarId() {
+				const curTabbar = this.getCurTabbar()
+				return curTabbar ? curTabbar.active_time_id : 0
+			},
+
+			// 跳转到秒杀商品详情
+			handleTargetGoods(sharpGoodsId) {
 				uni.navigateTo({
-					url:'/pages/goods/detail'
+					url: '/pages/goods/detail?goodsId=' + sharpGoodsId
 				})
 			},
-		}
+
+			// 设置微信公众号链接分享卡片内容
+			setWxofficialShareData() {
+				this.updateShareCardData({
+					title: '整点秒杀会场'
+				})
+			},
+
+		},
+
+		/**
+		 * 分享当前页面
+		 */
+		onShareAppMessage() {
+			// 构建页面参数
+			const params = this.$getShareUrlParams()
+			return {
+				title: '整点秒杀会场',
+				path: `/pages/sharp/index?${params}`
+			}
+		},
+
+		/**
+		 * 分享到朋友圈
+		 * 本接口为 Beta 版本，暂只在 Android 平台支持，详见分享到朋友圈 (Beta)
+		 * https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share-timeline.html
+		 */
+		onShareTimeline() {
+			// 构建页面参数
+			const params = this.$getShareUrlParams()
+			return {
+				title: '整点秒杀会场',
+				path: `/pages/sharp/index?${params}`
+			}
+		},
+
 	}
 </script>
 
 <style lang="scss" scoped>
-	.seckill{
+	.seckill {
 		width: 100%;
 		height: 100%;
 	}
-	.title{
+
+	.title {
 		width: 100%;
 		height: 180rpx;
 		position: relative;
-		.bgImg{
+
+		.bgImg {
 			width: 100%;
 			height: 100%;
 			position: absolute;
@@ -117,25 +300,29 @@
 			left: 0;
 			z-index: -1;
 		}
-		.limitTitle{
+
+		.limitTitle {
 			display: flex;
 			justify-content: center;
 			z-index: 20;
-			.img{
+
+			.img {
 				margin-top: 20rpx;
 				width: 302rpx;
 				height: 82rpx;
 				z-index: 20;
 			}
 		}
-		.time{
+
+		.time {
 			display: flex;
 			align-items: center;
 			width: 100%;
 			justify-content: space-around;
 			z-index: 30;
-			.timeItem{
-				.num{
+
+			.timeItem {
+				.num {
 					width: 102rpx;
 					font-size: 28rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -145,8 +332,9 @@
 					text-shadow: 0px 0px 11px #FB3A22;
 					text-align: center;
 				}
-				.desc{
-					width: 102rpx;
+
+				.desc {
+					width: 150rpx;
 					height: 36rpx;
 					background: #FFFFFF;
 					border-radius: 62rpx 62rpx 62rpx 62rpx;
@@ -161,14 +349,16 @@
 			}
 		}
 	}
-	.main{
+
+	.main {
 		width: 100%;
 		height: 100%;
 		background: #F4F6FA;
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 		opacity: 1;
-		padding-top:34rpx ;	
-		.over{
+		padding-top: 34rpx;
+
+		.over {
 			width: 100%;
 			display: flex;
 			justify-content: center;
@@ -177,11 +367,13 @@
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
 			color: #3C3C3C;
-			.info{
+
+			.info {
 				line-height: 40rpx;
 				margin-right: 18rpx;
 			}
-			.com{
+
+			.com {
 				width: 54rpx;
 				height: 48rpx;
 				background: #252525;
@@ -194,20 +386,25 @@
 				line-height: 48rpx;
 				text-align: center;
 			}
-			.hou{
+
+			.hou {
 				margin-right: 4rpx;
 			}
-			.min{
+
+			.min {
 				margin: 0 4rpx;
 			}
-			.sec{
+
+			.sec {
 				margin-left: 4rpx;
 			}
 		}
 	}
-	.goodsList{
+
+	.goodsList {
 		margin-top: 22rpx;
-		.goodItem{
+
+		.goodItem {
 			margin-left: 34rpx;
 			width: 686rpx;
 			height: 342rpx;
@@ -217,26 +414,34 @@
 			display: flex;
 			padding: 48rpx 32rpx 36rpx 6rpx;
 			margin-bottom: 26rpx;
-			.itemImg{
+
+			.itemImg {
 				width: 258rpx;
 				height: 258rpx;
 				border-radius: 0rpx 0rpx 0rpx 0rpx;
 				opacity: 1;
-				.goodsImg{
+
+				.goodsImg {
 					width: 100%;
 					height: 100%;
 				}
 			}
-			.goodsInfo{
-				.name{
+
+			.goodsInfo {
+				.name {
 					height: 44rpx;
 					font-size: 32rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #0E0E0E;
 					line-height: 44rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					max-width: 350rpx;
 				}
-				.sellNum{
+
+				.sellNum {
 					height: 44rpx;
 					font-size: 32rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -245,9 +450,11 @@
 					line-height: 44rpx;
 					margin-bottom: 8rpx;
 				}
-				.info{
+
+				.info {
 					display: flex;
-					.price{
+
+					.price {
 						height: 40rpx;
 						font-size: 28rpx;
 						font-family: PingFang SC, PingFang SC;
@@ -255,7 +462,8 @@
 						color: #979797;
 						line-height: 40rpx;
 					}
-					.delPrice{
+
+					.delPrice {
 						width: 132rpx;
 						height: 48rpx;
 						font-size: 20rpx;
@@ -265,14 +473,16 @@
 						line-height: 23rpx;
 						background-image: url('../../static/seckill/bottom.png');
 						background-size: 100% 100%;
-						margin:0 12rpx 0 14rpx;
-						.delText{
+						margin: 0 12rpx 0 14rpx;
+
+						.delText {
 							width: 132rpx;
 							text-align: center;
 							margin-top: 4rpx;
 						}
 					}
-					.update{
+
+					.update {
 						width: 112rpx;
 						height: 40rpx;
 						font-size: 28rpx;
@@ -282,16 +492,19 @@
 						line-height: 40rpx;
 					}
 				}
-				.line{
+
+				.line {
 					width: 302rpx;
 					height: 30rpx;
-					margin-left:22rpx;
-					image{
+					margin-left: 22rpx;
+
+					image {
 						width: 100%;
 						height: 100%;
 					}
 				}
-				.btn{
+
+				.btn {
 					margin-top: 14rpx;
 					width: 390rpx;
 					height: 70rpx;
@@ -303,14 +516,16 @@
 					justify-content: space-between;
 					background-image: url('../../static/seckill/btnBg.png');
 					background-size: 100% 100%;
-					.killPrice{
+
+					.killPrice {
 						font-size: 24rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 500;
 						color: #FF423D;
 						margin-left: 26rpx;
 					}
-					.buyNow{
+
+					.buyNow {
 						width: 84rpx;
 						font-size: 28rpx;
 						font-family: PingFang SC, PingFang SC;
@@ -322,4 +537,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 57b3977..6e512a1 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -1,48 +1,51 @@
 <template>
-  <view class="container" :style="appThemeStyle">
-    <!-- 页面顶部 -->
-    <view v-if="list.length" class="head-info">
-      <view class="cart-total">
-        <text>共</text>
-        <text class="active">{{ total }}</text>
-        <text>件商品</text>
-      </view>
-      <view class="cart-edit" @click="handleToggleMode()">
-        <view v-if="mode == 'normal'" class="normal">
-          <text class="icon iconfont icon-bianji"></text>
-          <text>编辑</text>
-        </view>
-        <view v-if="mode == 'edit'" class="edit">
-          <text>完成</text>
-        </view>
-      </view>
-    </view>
-    <!-- 购物车商品列表 -->
-    <view v-if="list.length" class="cart-list">
-      <view class="cart-item" v-for="(item, index) in list" :key="index">
-        <view class="item-radio" @click="handleCheckItem(item.id)">
-          <u-checkbox :modelValue="inArray(item.id, checkedIds)" shape="circle" :activeColor="appTheme.mainBg" />
-        </view>
-        <view class="goods-image" @click="onTargetGoods(item.goods_id)">
-          <image class="image" :src="item.goods.goods_image" mode="scaleToFill"></image>
-        </view>
-        <view class="item-content">
-          <view class="goods-title" @click="onTargetGoods(item.goods_id)">
-            <text class="twoline-hide">{{ item.goods.goods_name }}</text>
-          </view>
-          <view class="goods-props clearfix">
-            <view class="goods-props-item" v-for="(props, idx) in item.goods.skuInfo.goods_props" :key="idx">
-              <text>{{ props.value.name }}</text>
-            </view>
-          </view>
-          <view class="item-foot">
-            <view class="goods-price">
-              <text class="unit">￥</text>
-              <text class="value">{{ item.goods.skuInfo.goods_price }}</text>
-            </view>
-            <view class="stepper">
-             <!-- <u-number-box :min="1" :modelValue="item.goods_num" :step="1" @change="onChangeStepper($event, item)" /> -->
-			 <view class="del">
+	<view class="container" :style="appThemeStyle">
+		<!-- 页面顶部 -->
+		<view v-if="list.length" class="head-info">
+			<view class="cart-total">
+				<text>共</text>
+				<text class="active">{{ total }}</text>
+				<text>件商品</text>
+			</view>
+			<view class="cart-edit" @click="handleToggleMode()">
+				<view v-if="mode == 'normal'" class="normal">
+					<text class="icon iconfont icon-bianji"></text>
+					<text>编辑</text>
+				</view>
+				<view v-if="mode == 'edit'" class="edit">
+					<text>完成</text>
+				</view>
+			</view>
+		</view>
+		<!-- 购物车商品列表 -->
+		<view v-if="list.length" class="cart-list">
+			<view class="cart-item" v-for="(item, index) in list" :key="index">
+				<view class="item-radio" @click="handleCheckItem(item.id)">
+					<u-checkbox :modelValue="inArray(item.id, checkedIds)" shape="circle"
+						:activeColor="appTheme.mainBg" />
+				</view>
+				<view class="goods-image" @click="onTargetGoods(item.goods_id)">
+					<image class="image" :src="item.goods.goods_image" mode="scaleToFill"></image>
+				</view>
+				<view class="item-content">
+					<view class="goods-title" @click="onTargetGoods(item.goods_id)">
+						<text class="twoline-hide">{{ item.goods.goods_name }}</text>
+					</view>
+					<view class="goods-props clearfix">
+						<view class="goods-props-item" v-for="(props, idx) in item.goods.skuInfo.goods_props"
+							:key="idx">
+							<text>{{ props.value.name }}</text>
+						</view>
+					</view>
+					<view class="item-foot">
+						<view class="goods-price">
+							<text class="unit">￥</text>
+							<text class="value">{{ item.goods.skuInfo.goods_price }}</text>
+						</view>
+						<view class="stepper">
+							<u-number-box :min="1" class='countNumber' :modelValue="item.goods_num" :step="1"
+								@change="onChangeStepper($event, item)" />
+							<!-- <view class="del">
 			 	-
 			 </view>
 			 <view class="allNum">
@@ -50,388 +53,416 @@
 			 </view>
 			 <view class="add">
 			 	+
-			 </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 购物车数据为空 -->
-    <empty v-if="!list.length" :isLoading="isLoading" :custom-style="{ padding: '180rpx 50rpx' }" tips="您的购物车是空的, 快去逛逛吧">
-      <template v-slot:slot>
-        <view class="empty-ipt" @click="onTargetIndex()">
-          <text>去逛逛</text>
-        </view>
-      </template>
-    </empty>
-
-    <!-- 商品推荐 -->
-    <recommended />
-
-    <!-- 底部操作栏 -->
-    <view v-if="list.length" class="footer-fixed">
-      <view class="all-radio">
-        <u-checkbox :modelValue="checkedIds.length > 0 && checkedIds.length === list.length" shape="circle" :activeColor="appTheme.mainBg"
-          @change="handleCheckAll()">全选</u-checkbox>
-      </view>
-      <view class="total-info">
-        <text>合计：</text>
-        <view class="goods-price">
-          <text class="unit">￥</text>
-          <text class="value">{{ totalPrice }}</text>
-        </view>
-      </view>
-      <view class="cart-action">
-        <view class="btn-wrapper">
-          <!-- dev:下面的disabled条件使用checkedIds.join方式判断 -->
-          <!-- dev:通常情况下vue项目使用checkedIds.length更合理, 但是length属性在微信小程序中不起作用 -->
-          <view v-if="mode == 'normal'" class="btn-item btn-main" :class="{ disabled: checkedIds.join() == '' }" @click="handleOrder()">
-            <text>去结算 {{ checkedIds.length > 0 ? `(${total})` : '' }}</text>
-          </view>
-          <view v-if="mode == 'edit'" class="btn-item btn-main" :class="{ disabled: !checkedIds.length }" @click="handleDelete()">
-            <text>删除</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+			 </view> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 购物车数据为空 -->
+		<empty v-if="!list.length" :isLoading="isLoading" :custom-style="{ padding: '180rpx 50rpx' }"
+			tips="您的购物车是空的, 快去逛逛吧">
+			<template v-slot:slot>
+				<view class="empty-ipt" @click="onTargetIndex()">
+					<text>去逛逛</text>
+				</view>
+			</template>
+		</empty>
+
+		<!-- 商品推荐 -->
+		<recommended />
+
+		<!-- 底部操作栏 -->
+		<view v-if="list.length" class="footer-fixed">
+			<view class="all-radio">
+				<u-checkbox :modelValue="checkedIds.length > 0 && checkedIds.length === list.length" shape="circle"
+					:activeColor="appTheme.mainBg" @change="handleCheckAll()">全选</u-checkbox>
+			</view>
+			<view class="total-info">
+				<text>合计：</text>
+				<view class="goods-price">
+					<text class="unit">￥</text>
+					<text class="value">{{ totalPrice }}</text>
+				</view>
+			</view>
+			<view class="cart-action">
+				<view class="btn-wrapper">
+					<!-- dev:下面的disabled条件使用checkedIds.join方式判断 -->
+					<!-- dev:通常情况下vue项目使用checkedIds.length更合理, 但是length属性在微信小程序中不起作用 -->
+					<view v-if="mode == 'normal'" class="btn-item btn-main"
+						:class="{ disabled: checkedIds.join() == '' }" @click="handleOrder()">
+						<text>去结算 {{ checkedIds.length > 0 ? `(${total})` : '' }}</text>
+					</view>
+					<view v-if="mode == 'edit'" class="btn-item btn-main" :class="{ disabled: !checkedIds.length }"
+						@click="handleDelete()">
+						<text>删除</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import Empty from '@/components/empty'
-  import Recommended from '@/components/recommended'
-  import { inArray, arrayIntersect, debounce } from '@/utils/util'
-  import { checkLogin, setCartTotalNum, setCartTabBadge } from '@/core/app'
-  import * as CartApi from '@/api/cart'
-
-  const CartIdsIndex = 'CartIds'
-
-  export default {
-    components: {
-      Empty,
-      Recommended
-    },
-    data() {
-      return {
-        inArray,
-        // 正在加载
-        isLoading: true,
-        // 当前模式: normal正常 edit编辑
-        mode: 'normal',
-        // 购物车商品列表
-        list: [],
-        // 购物车商品总数量
-        total: null,
-        // 选中的商品ID记录
-        checkedIds: [],
-        // 选中的商品总金额
-        totalPrice: '0.00'
-      }
-    },
-    watch: {
-      // 监听选中的商品
-      checkedIds: {
-        handler(val) {
-          // 计算合计金额
-          this.onCalcTotalPrice()
-          // 记录到缓存中
-          uni.setStorageSync(CartIdsIndex, val)
-        },
-        deep: true,
-        immediate: false
-      },
-      // 监听购物车商品总数量
-      total(val) {
-        // 缓存并设置角标
-        setCartTotalNum(val)
-        setCartTabBadge()
-      }
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow(options) {
-      // 获取缓存中的选中记录
-      this.checkedIds = uni.getStorageSync(CartIdsIndex)
-      // 获取购物车商品列表
-      checkLogin() ? this.getCartList() : this.isLoading = false
-    },
-
-    methods: {
-
-      // 计算合计金额 (根据选中的商品)
-      onCalcTotalPrice() {
-        const app = this
-        // 选中的商品记录
-        const checkedList = app.list.filter(item => inArray(item.id, app.checkedIds))
-        // 计算总金额
-        let tempPrice = 0;
-        checkedList.forEach(item => {
-          // 商品单价, 为了方便计算先转换单位为分 (整数)
-          const unitPrice = item.goods.skuInfo.goods_price * 100
-          tempPrice += unitPrice * item.goods_num
-        })
-        app.totalPrice = (tempPrice / 100).toFixed(2)
-      },
-
-      // 获取购物车商品列表
-      getCartList() {
-        const app = this
-        app.isLoading = true
-        CartApi.list()
-          .then(result => {
-            app.list = result.data.list
-            app.total = result.data.cartTotal
-            // 清除checkedIds中无效的ID
-            app.onClearInvalidId()
-          })
-          .finally(() => app.isLoading = false)
-      },
-
-      // 清除checkedIds中无效的ID
-      onClearInvalidId() {
-        const app = this
-        const listIds = app.list.map(item => item.id)
-        app.checkedIds = arrayIntersect(listIds, app.checkedIds)
-      },
-
-      // 切换当前模式
-      handleToggleMode() {
-        this.mode = this.mode == 'normal' ? 'edit' : 'normal'
-      },
-
-      // 监听步进器更改事件
-      onChangeStepper({ value }, item) {
-        // 这里是组织首次启动时的执行
-        if (item.goods_num == value) return
-        // 记录一个节流函数句柄
-        if (!item.debounceHandle) {
-          item.oldValue = item.goods_num
-          item.debounceHandle = debounce(this.onUpdateCartNum, 500)
-        }
-        // 更新商品数量
-        item.goods_num = value
-        // 提交更新购物车数量 (节流)
-        item.debounceHandle(item, item.oldValue, value)
-      },
-
-      // 提交更新购物车数量
-      onUpdateCartNum(item, oldValue, newValue) {
-        const app = this
-        CartApi.update(item.goods_id, item.goods_sku_id, newValue)
-          .then(result => {
-            // 更新商品数量
-            app.total = result.data.cartTotal
-            // 重新计算合计金额
-            app.onCalcTotalPrice()
-            // 清除节流函数句柄
-            item.debounceHandle = null
-          })
-          .catch(err => {
-            // 还原商品数量
-            item.goods_num = oldValue
-            setTimeout(() => app.$toast(err.errMsg), 10)
-          })
-      },
-
-      // 跳转到商品详情页
-      onTargetGoods(goodsId) {
-        this.$navTo('pages/goods/detail', { goodsId })
-      },
-
-      // 点击去逛逛按钮, 跳转到首页
-      onTargetIndex() {
-        this.$navTo('pages/index/index')
-      },
-
-      // 选中商品
-      handleCheckItem(cartId) {
-        const { checkedIds } = this
-        const index = checkedIds.findIndex(id => id === cartId)
-        index < 0 ? checkedIds.push(cartId) : checkedIds.splice(index, 1)
-      },
-
-      // 全选事件
-      handleCheckAll() {
-        const { checkedIds, list } = this
-        this.checkedIds = checkedIds.length === list.length ? [] : list.map(item => item.id)
-      },
-
-      // 结算选中的商品
-      handleOrder() {
-        const app = this
-        if (app.checkedIds.length) {
-          const cartIds = app.checkedIds.join()
-          app.$navTo('pages/checkout/index', { mode: 'cart', cartIds })
-        }
-      },
-
-      // 删除选中的商品弹窗事件
-      handleDelete() {
-        const app = this
-        if (!app.checkedIds.length) {
-          return false
-        }
-        uni.showModal({
-          title: '友情提示',
-          content: '您确定要删除该商品吗？',
-          showCancel: true,
-          success({ confirm }) {
-            // 确认删除
-            confirm && app.onClearCart()
-          }
-        })
-      },
-
-      // 确认删除商品
-      onClearCart() {
-        const app = this
-        CartApi.clear(app.checkedIds)
-          .then(result => {
-            app.getCartList()
-            app.handleToggleMode()
-          })
-      }
-
-    }
-  }
+	import Empty from '@/components/empty'
+	import Recommended from '@/components/recommended'
+	import {
+		inArray,
+		arrayIntersect,
+		debounce
+	} from '@/utils/util'
+	import {
+		checkLogin,
+		setCartTotalNum,
+		setCartTabBadge
+	} from '@/core/app'
+	import * as CartApi from '@/api/cart'
+
+	const CartIdsIndex = 'CartIds'
+
+	export default {
+		components: {
+			Empty,
+			Recommended
+		},
+		data() {
+			return {
+				inArray,
+				// 正在加载
+				isLoading: true,
+				// 当前模式: normal正常 edit编辑
+				mode: 'normal',
+				// 购物车商品列表
+				list: [],
+				// 购物车商品总数量
+				total: null,
+				// 选中的商品ID记录
+				checkedIds: [],
+				// 选中的商品总金额
+				totalPrice: '0.00'
+			}
+		},
+		watch: {
+			// 监听选中的商品
+			checkedIds: {
+				handler(val) {
+					// 计算合计金额
+					this.onCalcTotalPrice()
+					// 记录到缓存中
+					uni.setStorageSync(CartIdsIndex, val)
+				},
+				deep: true,
+				immediate: false
+			},
+			// 监听购物车商品总数量
+			total(val) {
+				// 缓存并设置角标
+				setCartTotalNum(val)
+				setCartTabBadge()
+			}
+		},
+
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow(options) {
+			// 获取缓存中的选中记录
+			this.checkedIds = uni.getStorageSync(CartIdsIndex)
+			// 获取购物车商品列表
+			checkLogin() ? this.getCartList() : this.isLoading = false
+		},
+
+		methods: {
+
+			// 计算合计金额 (根据选中的商品)
+			onCalcTotalPrice() {
+				const app = this
+				// 选中的商品记录
+				const checkedList = app.list.filter(item => inArray(item.id, app.checkedIds))
+				// 计算总金额
+				let tempPrice = 0;
+				checkedList.forEach(item => {
+					// 商品单价, 为了方便计算先转换单位为分 (整数)
+					const unitPrice = item.goods.skuInfo.goods_price * 100
+					tempPrice += unitPrice * item.goods_num
+				})
+				app.totalPrice = (tempPrice / 100).toFixed(2)
+			},
+
+			// 获取购物车商品列表
+			getCartList() {
+				const app = this
+				app.isLoading = true
+				CartApi.list()
+					.then(result => {
+						app.list = result.data.list
+						app.total = result.data.cartTotal
+						// 清除checkedIds中无效的ID
+						app.onClearInvalidId()
+					})
+					.finally(() => app.isLoading = false)
+			},
+
+			// 清除checkedIds中无效的ID
+			onClearInvalidId() {
+				const app = this
+				const listIds = app.list.map(item => item.id)
+				app.checkedIds = arrayIntersect(listIds, app.checkedIds)
+			},
+
+			// 切换当前模式
+			handleToggleMode() {
+				this.mode = this.mode == 'normal' ? 'edit' : 'normal'
+			},
+
+			// 监听步进器更改事件
+			onChangeStepper({
+				value
+			}, item) {
+				// 这里是组织首次启动时的执行
+				if (item.goods_num == value) return
+				// 记录一个节流函数句柄
+				if (!item.debounceHandle) {
+					item.oldValue = item.goods_num
+					item.debounceHandle = debounce(this.onUpdateCartNum, 500)
+				}
+				// 更新商品数量
+				item.goods_num = value
+				// 提交更新购物车数量 (节流)
+				item.debounceHandle(item, item.oldValue, value)
+			},
+
+			// 提交更新购物车数量
+			onUpdateCartNum(item, oldValue, newValue) {
+				const app = this
+				CartApi.update(item.goods_id, item.goods_sku_id, newValue)
+					.then(result => {
+						// 更新商品数量
+						app.total = result.data.cartTotal
+						// 重新计算合计金额
+						app.onCalcTotalPrice()
+						// 清除节流函数句柄
+						item.debounceHandle = null
+					})
+					.catch(err => {
+						// 还原商品数量
+						item.goods_num = oldValue
+						setTimeout(() => app.$toast(err.errMsg), 10)
+					})
+			},
+
+			// 跳转到商品详情页
+			onTargetGoods(goodsId) {
+				this.$navTo('pages/goods/detail', {
+					goodsId
+				})
+			},
+
+			// 点击去逛逛按钮, 跳转到首页
+			onTargetIndex() {
+				this.$navTo('pages/index/index')
+			},
+
+			// 选中商品
+			handleCheckItem(cartId) {
+				const {
+					checkedIds
+				} = this
+				const index = checkedIds.findIndex(id => id === cartId)
+				index < 0 ? checkedIds.push(cartId) : checkedIds.splice(index, 1)
+			},
+
+			// 全选事件
+			handleCheckAll() {
+				const {
+					checkedIds,
+					list
+				} = this
+				this.checkedIds = checkedIds.length === list.length ? [] : list.map(item => item.id)
+			},
+
+			// 结算选中的商品
+			handleOrder() {
+				const app = this
+				if (app.checkedIds.length) {
+					const cartIds = app.checkedIds.join()
+					app.$navTo('pages/checkout/index', {
+						mode: 'cart',
+						cartIds
+					})
+				}
+			},
+
+			// 删除选中的商品弹窗事件
+			handleDelete() {
+				const app = this
+				if (!app.checkedIds.length) {
+					return false
+				}
+				uni.showModal({
+					title: '友情提示',
+					content: '您确定要删除该商品吗？',
+					showCancel: true,
+					success({
+						confirm
+					}) {
+						// 确认删除
+						confirm && app.onClearCart()
+					}
+				})
+			},
+
+			// 确认删除商品
+			onClearCart() {
+				const app = this
+				CartApi.clear(app.checkedIds)
+					.then(result => {
+						app.getCartList()
+						app.handleToggleMode()
+					})
+			}
+
+		}
+	}
 </script>
 
 <style>
-  page {
-    background: #f5f5f5;
-  }
+	page {
+		background: #f5f5f5;
+	}
 </style>
 <style lang="scss" scoped>
-  .container {
-    padding-bottom: 120rpx;
-  }
-
-  // 页面顶部
-  .head-info {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 4rpx 30rpx;
-    // background-color: #fff;
-    height: 80rpx;
-
-    .cart-total {
-      font-size: 28rpx;
-      color: #333;
-
-      .active {
-        color: $main-bg;
-        margin: 0 2rpx;
-      }
-    }
-
-    .cart-edit {
-      padding-left: 20rpx;
-
-      .icon {
-        margin-right: 12rpx;
-      }
-
-      .edit {
-        color: $main-bg;
-      }
-    }
-
-  }
-
-  // 购物车列表
-  .cart-list {
-    padding: 0 16rpx 0 16rpx;
-  }
-
-  .cart-item {
-    background: #fff;
-    border-radius: 12rpx;
-    display: flex;
-    align-items: center;
-    padding: 30rpx 16rpx;
-    margin-bottom: 24rpx;
-
-    .item-radio {
-      width: 56rpx;
-      height: 80rpx;
-      margin-right: 10rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-
-    .goods-image {
-      width: 200rpx;
-      height: 200rpx;
-
-      .image {
-        display: block;
-        width: 100%;
-        height: 100%;
-        border-radius: 8rpx;
-      }
-    }
-
-    .item-content {
-      flex: 1;
-      padding-left: 24rpx;
-
-      .goods-title {
-        font-size: 28rpx;
-        max-height: 76rpx;
-      }
-
-      .goods-props {
-        margin-top: 14rpx;
-        height: 40rpx;
-        color: #ababab;
-        font-size: 24rpx;
-        overflow: hidden;
-
-        .goods-props-item {
-          display: inline-block;
-          margin-right: 14rpx;
-          padding: 4rpx 16rpx;
-          border-radius: 12rpx;
-          background-color: #F5F5F5;
-          width: auto;
-        }
-      }
-
-      .item-foot {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 20rpx;
-
-        .goods-price {
-          vertical-align: bottom;
-          color: $main-bg;
-
-          .unit {
-            font-size: 24rpx;
-          }
-
-          .value {
-            font-size: 32rpx;
-          }
-        }
-      }
-
-    }
-  }
-	.stepper{
+	.container {
+		padding-bottom: 120rpx;
+	}
+
+	// 页面顶部
+	.head-info {
 		display: flex;
-		width: 154rpx;
+		justify-content: space-between;
+		align-items: center;
+		padding: 4rpx 30rpx;
+		// background-color: #fff;
+		height: 80rpx;
+
+		.cart-total {
+			font-size: 28rpx;
+			color: #333;
+
+			.active {
+				color: $main-bg;
+				margin: 0 2rpx;
+			}
+		}
+
+		.cart-edit {
+			padding-left: 20rpx;
+
+			.icon {
+				margin-right: 12rpx;
+			}
+
+			.edit {
+				color: $main-bg;
+			}
+		}
+
+	}
+
+	// 购物车列表
+	.cart-list {
+		padding: 0 16rpx 0 16rpx;
+	}
+
+	.cart-item {
+		background: #fff;
+		border-radius: 12rpx;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 16rpx;
+		margin-bottom: 24rpx;
+
+		.item-radio {
+			width: 56rpx;
+			height: 80rpx;
+			margin-right: 10rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+		}
+
+		.goods-image {
+			width: 200rpx;
+			height: 200rpx;
+
+			.image {
+				display: block;
+				width: 100%;
+				height: 100%;
+				border-radius: 8rpx;
+			}
+		}
+
+		.item-content {
+			flex: 1;
+			padding-left: 24rpx;
+
+			.goods-title {
+				font-size: 28rpx;
+				max-height: 76rpx;
+			}
+
+			.goods-props {
+				margin-top: 14rpx;
+				height: 40rpx;
+				color: #ababab;
+				font-size: 24rpx;
+				overflow: hidden;
+
+				.goods-props-item {
+					display: inline-block;
+					margin-right: 14rpx;
+					padding: 4rpx 16rpx;
+					border-radius: 12rpx;
+					background-color: #F5F5F5;
+					width: auto;
+				}
+			}
+
+			.item-foot {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.goods-price {
+					vertical-align: bottom;
+					color: $main-bg;
+
+					.unit {
+						font-size: 24rpx;
+					}
+
+					.value {
+						font-size: 32rpx;
+					}
+				}
+			}
+
+		}
+	}
+
+	.stepper {
+		display: flex;
+		// width: 154rpx;
 		height: 56rpx;
 		background: #FFFFFF;
 		border-radius: 76rpx 76rpx 76rpx 76rpx;
 		opacity: 1;
-		border: 2rpx solid #E6E6E6;
-		.del{
+		// border: 2rpx solid #E6E6E6;
+
+		.del {
 			width: 50rpx;
 			height: 56rpx;
 			color: #C2C2C2;
@@ -440,15 +471,17 @@
 			line-height: 56rpx;
 			border-right: 2rpx solid #E6E6E6;
 		}
-		.allNum{
-			width:54rpx;
+
+		.allNum {
+			width: 54rpx;
 			height: 56rpx;
 			opacity: 1;
 			text-align: center;
 			line-height: 56rpx;
 		}
-		.add{
-			width:50rpx;
+
+		.add {
+			width: 50rpx;
 			height: 56rpx;
 			color: #C2C2C2;
 			opacity: 1;
@@ -456,100 +489,106 @@
 			line-height: 56rpx;
 			border-left: 2rpx solid #E6E6E6;
 		}
+
+		.countNumber {
+			width: 170rpx;
+			background: none;
+		}
+	}
+
+	// 空数据按钮
+	.empty-ipt {
+		margin: 0 auto;
+		width: 250rpx;
+		height: 70rpx;
+		font-size: 32rpx;
+		text-align: center;
+		color: #fff;
+		border-radius: 50rpx;
+		background: linear-gradient(to right, $main-bg, $main-bg2);
+		color: $main-text;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	// 底部操作栏
+	.footer-fixed {
+		display: flex;
+		align-items: center;
+		height: 96rpx;
+		background: #fff;
+		padding: 0 30rpx;
+		position: fixed;
+		bottom: var(--window-bottom);
+		left: 0;
+		right: 0;
+		z-index: 11;
+
+		.all-radio {
+			width: 140rpx;
+			display: flex;
+			align-items: center;
+
+			.radio {
+				margin-bottom: -4rpx;
+				transform: scale(0.76)
+			}
+		}
+
+		.total-info {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			padding-right: 30rpx;
+
+			.goods-price {
+				vertical-align: bottom;
+				color: $main-bg;
+
+				.unit {
+					font-size: 24rpx;
+				}
+
+				.value {
+					font-size: 32rpx;
+				}
+			}
+		}
+
+		.cart-action {
+			width: 200rpx;
+
+			.btn-wrapper {
+				height: 100%;
+				display: flex;
+				align-items: center;
+			}
+
+			.btn-item {
+				flex: 1;
+				font-size: 28rpx;
+				height: 72rpx;
+				color: #fff;
+				border-radius: 50rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			// 去结算按钮
+			.btn-main {
+				background: linear-gradient(to right, $main-bg, $main-bg2);
+				color: $main-text;
+
+				// 禁用按钮
+				&.disabled {
+					opacity: 0.6;
+				}
+			}
+
+		}
+
 	}
-  // 空数据按钮
-  .empty-ipt {
-    margin: 0 auto;
-    width: 250rpx;
-    height: 70rpx;
-    font-size: 32rpx;
-    text-align: center;
-    color: #fff;
-    border-radius: 50rpx;
-    background: linear-gradient(to right, $main-bg, $main-bg2);
-    color: $main-text;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  // 底部操作栏
-  .footer-fixed {
-    display: flex;
-    align-items: center;
-    height: 96rpx;
-    background: #fff;
-    padding: 0 30rpx;
-    position: fixed;
-    bottom: var(--window-bottom);
-    left: 0;
-    right: 0;
-    z-index: 11;
-
-    .all-radio {
-      width: 140rpx;
-      display: flex;
-      align-items: center;
-
-      .radio {
-        margin-bottom: -4rpx;
-        transform: scale(0.76)
-      }
-    }
-
-    .total-info {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      padding-right: 30rpx;
-
-      .goods-price {
-        vertical-align: bottom;
-        color: $main-bg;
-
-        .unit {
-          font-size: 24rpx;
-        }
-
-        .value {
-          font-size: 32rpx;
-        }
-      }
-    }
-
-    .cart-action {
-      width: 200rpx;
-
-      .btn-wrapper {
-        height: 100%;
-        display: flex;
-        align-items: center;
-      }
-
-      .btn-item {
-        flex: 1;
-        font-size: 28rpx;
-        height: 72rpx;
-        color: #fff;
-        border-radius: 50rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-
-      // 去结算按钮
-      .btn-main {
-        background: linear-gradient(to right, $main-bg, $main-bg2);
-        color: $main-text;
-
-        // 禁用按钮
-        &.disabled {
-          opacity: 0.6;
-        }
-      }
-
-    }
-
-  }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b0083de..a0b3cb1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -171,8 +171,8 @@
 						<view class="newImage" @click="goNews">
 							<image src="../../static/home/newImg.png" mode=""></image>
 						</view>
-						<view class="newRight" @click="goNewGoods">
-							<view class="newFirt">
+						<view class="newRight" >
+							<view class="newFirt" @click="goNewGoods">
 								<view class="starting">
 									新品首发
 								</view>
diff --git a/pages/invoice/edit.vue b/pages/invoice/edit.vue
index 2998ca7..6e5c3e7 100644
--- a/pages/invoice/edit.vue
+++ b/pages/invoice/edit.vue
@@ -6,7 +6,7 @@
 			</view>
 			<view class="b">
 				<view class="l">产品名称iPhone13</view>
-				<view class="r">订单编号：23122-33890099<text>复制</text></view>
+				<view class="r">订单编号：23122-33890099<text @click="handleCopy()">复制</text></view>
 			</view>
 		</view>
 		<view class="invoice-info">
@@ -48,7 +48,7 @@
 					</view>
 				</view>
 			</view>
-		</view>	
+		</view>
 		<view class="invoice-company" v-if="tabIndex == 2">
 			<view class="a">选填内容（开户银行、银行账号等）
 				<text :class="toggleIndex?'on':''" @click="toggleItem()">{{toggleIndex?"收起":"展开"}}</text>
@@ -79,11 +79,12 @@
 					</view>
 				</view>
 			</view>
-		</view>	
+		</view>
 		<view class="invoice-fd">
 			申请发票
 		</view>
-		<u-modal v-model="show" :content="content" :show-cancel-button="true" :show-title="false" confirm-color="#F55349"></u-modal>
+		<u-modal v-model="show" :content="content" :show-cancel-button="true" :show-title="false"
+			confirm-color="#F55349"></u-modal>
 	</view>
 </template>
 
@@ -95,29 +96,54 @@
 				show: true,
 				toggleIndex: true,
 				index: -1,
-				array: ['增值税电子普通发票','普通发票'],
+				array: ['增值税电子普通发票', '普通发票'],
 				index1: -1,
-				array1: ['南京苏农科技有限公司','南京途牛科技有限公司'],
-				tabIndex: 2
+				array1: ['南京苏农科技有限公司', '南京途牛科技有限公司'],
+				tabIndex: 2,
+				pamres: {
+					orderId: '',
+					invoiceType: '',
+					invoiceUnit:1
+				},
 			};
 		},
+		onLoad(op) {
+			this.pamres.orderId = op.orderId
+		},
 		methods: {
+			// 复制指定内容
+			handleCopy(value) {
+				const app = this
+				uni.setClipboardData({
+					data: value,
+					success: () => app.$toast('复制成功'),
+					fail: ({
+						errMsg
+					}) => app.$toast('复制失败 ' + errMsg)
+				})
+			},
+			// 提交信息
+			handleInvoice() {
+				const app = this
+			},
 			onClose() {},
-			tabItem(i){
+			tabItem(i) {
 				this.tabIndex = i;
 			},
-			toggleItem(i){
+			toggleItem(i) {
 				this.toggleIndex = !this.toggleIndex;
+				this.pamres.invoiceUnit = this.toggleIndex
 			},
-			toDetail(i){
+			toDetail(i) {
 				uni.navigateTo({
 					url: "/pages/invoice/edit"
 				})
 			},
-			bindPickerChange(e){
-				this.index = e.detail.value
+			bindPickerChange(e) {
+				this.index = e.detail.value;
+				this.pamres.invoiceType = e.detail.value
 			},
-			bindPickerChange1(e){
+			bindPickerChange1(e) {
 				this.index1 = e.detail.value
 			}
 		}
@@ -125,229 +151,244 @@
 </script>
 
 <style lang="scss" scoped>
-.invoice{
-	&-goods{
-		padding: 0 20rpx 0 40rpx;
-		overflow: hidden;
-		background-color: #fff;
-		padding: 30rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		.a{
-			width: 145rpx;
-			height: 135rpx;
-			margin-right: 20rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-		}
-		.b{
-			flex: 1;
+	.invoice {
+		&-goods {
+			padding: 0 20rpx 0 40rpx;
 			overflow: hidden;
-			.l{
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				font-size: 32rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #262626;
-				overflow: hidden;
-			}
-			.r{
-				font-size: 30rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #838383;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-top: 20rpx;
-				text{
-					display: block;
-					width: 104rpx;
-					line-height: 60rpx;
-					background: #FFFFFF;
-					border-radius: 4rpx;
-					text-align: center;
-					border: 1px solid #CACACA;
-					font-size: 28rpx;
-					color: #555;
-				}
-			}
-		}
-	}
-	&-info{
-		margin-top: 20rpx;
-		background-color: #fff;
-		overflow: hidden;
-		.a{
+			background-color: #fff;
+			padding: 30rpx;
+			box-sizing: border-box;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			padding: 20rpx 30rpx 20rpx 60rpx;
-			box-sizing: border-box;
-			border-bottom: 1px solid #F3F3F3;
-			font-size: 32rpx;
-			font-weight: 500;
-			color: #262626;
-			text{
-				color: #006AFF;
-				padding-right: 40rpx;
-				position: relative;
-				&::after{
-					content: "";
-					width: 16rpx;
-					height: 16rpx;
-					border-top: 1px solid #006AFF;
-					border-left: 1px solid #006AFF;
-					position: absolute;
-					right: 0;
-					top: 14rpx;
-					z-index: 1;
-					transform: rotate(135deg);
+
+			.a {
+				width: 145rpx;
+				height: 135rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 10rpx;
+				}
+			}
+
+			.b {
+				flex: 1;
+				overflow: hidden;
+
+				.l {
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #262626;
+					overflow: hidden;
+				}
+
+				.r {
+					font-size: 30rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #838383;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 20rpx;
+
+					text {
+						display: block;
+						width: 104rpx;
+						line-height: 60rpx;
+						background: #FFFFFF;
+						border-radius: 4rpx;
+						text-align: center;
+						border: 1px solid #CACACA;
+						font-size: 28rpx;
+						color: #555;
+					}
 				}
 			}
 		}
-		.b{
-			padding: 0 30rpx 0 45rpx;
-			box-sizing: border-box;
+
+		&-info {
+			margin-top: 20rpx;
+			background-color: #fff;
 			overflow: hidden;
-			.item{
-				padding: 30rpx 0;
+
+			.a {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
+				padding: 20rpx 30rpx 20rpx 60rpx;
 				box-sizing: border-box;
-				border-top: 1px solid #F3F3F3;
+				border-bottom: 1px solid #F3F3F3;
 				font-size: 32rpx;
 				font-weight: 500;
-				color: #262626;	
-				overflow: hidden;
-				&:first-child{
-					border-top-color: #fff;
-				}
-				.l{
-					width: 180rpx;
-					font-size: 32rpx;
-					font-weight: 400;
-					color: #656565;
+				color: #262626;
+
+				text {
+					color: #006AFF;
+					padding-right: 40rpx;
+					position: relative;
+
+					&::after {
+						content: "";
+						width: 16rpx;
+						height: 16rpx;
+						border-top: 1px solid #006AFF;
+						border-left: 1px solid #006AFF;
+						position: absolute;
+						right: 0;
+						top: 14rpx;
+						z-index: 1;
+						transform: rotate(135deg);
+					}
 				}
-				.r{
-					flex: 1;
+			}
+
+			.b {
+				padding: 0 30rpx 0 45rpx;
+				box-sizing: border-box;
+				overflow: hidden;
+
+				.item {
+					padding: 30rpx 0;
 					display: flex;
 					align-items: center;
+					justify-content: space-between;
+					box-sizing: border-box;
+					border-top: 1px solid #F3F3F3;
 					font-size: 32rpx;
-					font-weight: 400;
+					font-weight: 500;
 					color: #262626;
-					.li{
-						width: 150rpx;
-						height: 78rpx;
-						background: #F3F3F3;
-						border-radius: 8rpx;
-						text-align: center;
-						line-height: 78rpx;
+					overflow: hidden;
+
+					&:first-child {
+						border-top-color: #fff;
+					}
+
+					.l {
+						width: 180rpx;
 						font-size: 32rpx;
 						font-weight: 400;
-						color: #262626;
-						margin-right: 12rpx;
-						&-on{
-							background: #FDF4F4;
-							background: url(/static/invoice/select-active.png) center top no-repeat;
-							background-size: contain;
-						}
-					}
-					input {
-						flex: 1;
+						color: #656565;
 					}
-					picker{
+
+					.r {
 						flex: 1;
-						.tt{
-							width: 180rpx;
-							position: relative;
-							color: #4894FF;
-							text-align: right;
-							&::after{
-								content: "";
-								width: 16rpx;
-								height: 16rpx;
-								border-top: 1px solid #4894FF;
-								border-left: 1px solid #4894FF;
-								position: absolute;
-								right: -50rpx;
-								top: 14rpx;
-								z-index: 1;
-								transform: rotate(135deg);
+						display: flex;
+						align-items: center;
+						font-size: 32rpx;
+						font-weight: 400;
+						color: #262626;
+
+						.li {
+							width: 150rpx;
+							height: 78rpx;
+							background: #F3F3F3;
+							border-radius: 8rpx;
+							text-align: center;
+							line-height: 78rpx;
+							font-size: 32rpx;
+							font-weight: 400;
+							color: #262626;
+							margin-right: 12rpx;
+
+							&-on {
+								background: #FDF4F4;
+								background: url(/static/invoice/select-active.png) center top no-repeat;
+								background-size: contain;
 							}
 						}
-						.lx{
-							width: 100%;
-							position: relative;
-							&::after{
-								content: "";
-								width: 16rpx;
-								height: 16rpx;
-								border-top: 1px solid #B8B8B8;
-								border-left: 1px solid #B8B8B8;
-								position: absolute;
-								right: 20rpx;
-								top: 14rpx;
-								z-index: 1;
-								transform: rotate(135deg);
+
+						input {
+							flex: 1;
+						}
+
+						picker {
+							flex: 1;
+
+							.tt {
+								width: 180rpx;
+								position: relative;
+								color: #4894FF;
+								text-align: right;
+
+								&::after {
+									content: "";
+									width: 16rpx;
+									height: 16rpx;
+									border-top: 1px solid #4894FF;
+									border-left: 1px solid #4894FF;
+									position: absolute;
+									right: -50rpx;
+									top: 14rpx;
+									z-index: 1;
+									transform: rotate(135deg);
+								}
+							}
+
+							.lx {
+								width: 100%;
+								position: relative;
+
+								&::after {
+									content: "";
+									width: 16rpx;
+									height: 16rpx;
+									border-top: 1px solid #B8B8B8;
+									border-left: 1px solid #B8B8B8;
+									position: absolute;
+									right: 20rpx;
+									top: 14rpx;
+									z-index: 1;
+									transform: rotate(135deg);
+								}
 							}
 						}
 					}
 				}
+
 			}
-			
 		}
-	}
-	&-fd{
-		width: 664rpx;
-		height: 104rpx;
-		background: #F55349;
-		border-radius: 8rpx;
-		text-align: center;
-		margin: 0 auto;
-		margin-top: 60rpx;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #FFFFFF;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	&-company{
-		overflow: hidden;
-		.a{
-			padding: 35rpx 50rpx;
+
+		&-fd {
+			width: 664rpx;
+			height: 104rpx;
+			background: #F55349;
+			border-radius: 8rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 60rpx;
 			font-size: 32rpx;
-			font-weight: 400;
+			font-weight: 500;
+			color: #FFFFFF;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			color: #262626;
-			text{
-				width: 70rpx;
-				color: #888888;
-				margin-right: 30rpx;
-				position: relative;
-				&::after{
-					content: "";
-					width: 16rpx;
-					height: 16rpx;
-					border-top: 1px solid #888888;
-					border-left: 1px solid #888888;
-					position: absolute;
-					right: -30rpx;
-					top: 10rpx;
-					z-index: 1;
-					transform: rotate(225deg);
-				}
-				&.on{
-					&::after{
+			justify-content: center;
+		}
+
+		&-company {
+			overflow: hidden;
+
+			.a {
+				padding: 35rpx 50rpx;
+				font-size: 32rpx;
+				font-weight: 400;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #262626;
+
+				text {
+					width: 70rpx;
+					color: #888888;
+					margin-right: 30rpx;
+					position: relative;
+
+					&::after {
 						content: "";
 						width: 16rpx;
 						height: 16rpx;
@@ -355,52 +396,72 @@
 						border-left: 1px solid #888888;
 						position: absolute;
 						right: -30rpx;
-						top: 20rpx;
+						top: 10rpx;
 						z-index: 1;
-						transform: rotate(45deg);
+						transform: rotate(225deg);
+					}
+
+					&.on {
+						&::after {
+							content: "";
+							width: 16rpx;
+							height: 16rpx;
+							border-top: 1px solid #888888;
+							border-left: 1px solid #888888;
+							position: absolute;
+							right: -30rpx;
+							top: 20rpx;
+							z-index: 1;
+							transform: rotate(45deg);
+						}
 					}
 				}
 			}
-		}
-		.b{
-			padding: 0 30rpx 0 45rpx;
-			box-sizing: border-box;
-			background-color: #fff;
-			overflow: hidden;
-			.item{
-				padding: 30rpx 0;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+
+			.b {
+				padding: 0 30rpx 0 45rpx;
 				box-sizing: border-box;
-				border-top: 1px solid #F3F3F3;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #262626;	
+				background-color: #fff;
 				overflow: hidden;
-				&:first-child{
-					border-top-color: #fff;
-				}
-				.l{
-					width: 180rpx;
-					font-size: 32rpx;
-					font-weight: 400;
-					color: #656565;
-				}
-				.r{
-					flex: 1;
+
+				.item {
+					padding: 30rpx 0;
 					display: flex;
 					align-items: center;
+					justify-content: space-between;
+					box-sizing: border-box;
+					border-top: 1px solid #F3F3F3;
 					font-size: 32rpx;
-					font-weight: 400;
+					font-weight: 500;
 					color: #262626;
-					input {
+					overflow: hidden;
+
+					&:first-child {
+						border-top-color: #fff;
+					}
+
+					.l {
+						width: 180rpx;
+						font-size: 32rpx;
+						font-weight: 400;
+						color: #656565;
+					}
+
+					.r {
 						flex: 1;
+						display: flex;
+						align-items: center;
+						font-size: 32rpx;
+						font-weight: 400;
+						color: #262626;
+
+						input {
+							flex: 1;
+						}
 					}
 				}
+
 			}
-			
 		}
 	}
-}
 </style>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index db3d406..33244be 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,30 +1,52 @@
 <template>
 	<view class="detail">
-		<view >
-			<u-navbar title="订单详情" back-icon-color="#fff" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
+		<view>
+			<u-navbar title="订单详情" back-icon-color="#fff" :border-bottom="false" title-color="#333"
+				:background="background"></u-navbar>
 		</view>
 		<view class="send">
-			<image src="/static/order/car.png" mode="" class="car"></image>
+			<!-- 进行中的订单 -->
+			<block v-if="order.order_status == OrderStatusEnum.NORMAL.value">
+				<!-- 待支付 -->
+				<block v-if="order.pay_status == PayStatusEnum.PENDING.value">
+					<image class="car" src="/static/order/status/wait_pay.png" mode="aspectFit"></image>
+				</block>
+				<!-- 待发货 -->
+				<block v-else-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+					<image class="car" src="/static/order/status/wait_deliver.png" mode="aspectFit"></image>
+				</block>
+				<!-- 待收货 -->
+				<block v-else-if="order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
+					<image class="car" src="/static/order/status/wait_receipt.png" mode="aspectFit"></image>
+				</block>
+			</block>
+			<!-- 已完成 -->
+			<block v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
+				<image class="image" 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>
+			</block>
 			<view class="sendInfo">
 				<view class="shopInfo">
-					<text v-if="sendType">商家已接单，正在安排出库</text>
-					<text v-if="!sendType">商家已发货，正在通知快递取件</text>
+					<text>{{order.state_text}}</text>
 				</view>
 				<view class="sendTime">
-					2023-12-19 16:10:58
+					{{order.create_time}}
 				</view>
 			</view>
-			<image src="/static/order/left.png" mode="" class="sendIcon"></image>
 		</view>
-		<view class="consignee">
+		<view class="consignee" v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
 			<view class="conLeft">
 				<view class="thr">
 					<view class="peo">提货人</view>
-					<view class="name">AGGI</view>
+					<view class="name">{{ order.extract_shop.linkman }}</view>
 				</view>
 				<view class="thr">
 					<view class="peo">手机号</view>
-					<view class="name">1868888888</view>
+					<view class="name">{{ order.extract_shop.phone }}</view>
 				</view>
 				<view class="thr">
 					<view class="peo">预计到店时间</view>
@@ -36,79 +58,80 @@
 					核销码
 				</view>
 				<view class="codeNum">
-					<image src="/static/user/code.png" mode=""></image>
+					<image :src="qrcodeImage" @click="clickImg" mode=""></image>
 				</view>
 				<view class="openCode">
 					点击放大核销码
 				</view>
 			</view>
 		</view>
-		<view class="sendHome">
+		<view class="sendHome"
+			v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
 			<view class="fline">
 				<view class="leftInfo">
 					<image src="/static/order/am.png" mode="" class="am"></image>
 					<view class="gp">
-						<text>张三</text>
-						18655555555
+						<text>{{ order.address.name }}</text>
+						{{ order.address.phone }}
 					</view>
 				</view>
-				
-				<view class="up">
+				<view class="up" @click="onAdress(order.goods_id)"
+					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					修改
 				</view>
 			</view>
 			<view class="sl">
-				浙江省金华市金东区人民西路31号新苑小区25幢
+				<text v-for="(region, idx) in order.address.region" :key="idx">{{ region }}</text>
+				{{order.address.detail}}
 			</view>
 			<view class="fline">
 				<view class="leftInfo">
 					<image src="/static/order/cd.png" mode="" class="am"></image>
 					<view class="gp">
 						<text>收货方式：</text>
-						送货上门
+						{{order.delivery_type==10?'快递配送':'门店自提'}}
 					</view>
 				</view>
-				
-				<view class="up">
+				<view class="up" @click="onCdDia(order.goods_id)"
+					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					我要催单
 				</view>
 			</view>
 		</view>
 		<view class="goodsDetail">
 			<view class="goodsType">
-				<image src="/static/order/bag.png" mode="" class="bag"></image>
-				<text>大白兔家电</text>
-				<image src="/static/order/left.png" mode="" class="leftIcon"></image>
+				<image v-if="order.storeInfo" :src="order.storeInfo.image_url" mode="" class="bag"></image>
+				<text v-if="order.storeInfo">{{order.storeInfo.store_name}}</text>
 			</view>
-			<view class="goods">
+			<view class="goods" v-for="(goods, idx) in order.goods" :key="idx"
+				@click="handleTargetGoods(goods.goods_id)">
 				<view class="goodsImg">
-					<image src="/static/home/goodsDemo.png" mode=""></image>
+					<image :src="goods.goods_image" mode="aspectFill"></image>
 				</view>
 				<view class="goodsInfo">
-					<view class="goodsName">
-						iphone13 绿色 128GB
-					</view>
+					<view class="goodsName">{{ goods.goods_name }}</view>
 					<view class="goodsPrice">
-						￥ <text>7599</text>
+						<text>￥{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
 					</view>
 				</view>
-				<view class="goodsNum">
-					x1
-				</view>
-			</view>
-			<view class="serve">
-				<view class="serveTitle">
-					服务
-				</view>
-				<view class="chose">
-					选择增值服务
-					<image src="../../static/order/left.png" mode=""></image>
+				<view class="">
+					<view class="goodsNum">
+						x{{ goods.total_num }}
+					</view>
+					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_id,goods,order)"
+						v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
+						退款
+					</view>
+					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_id,goods,order)"
+						v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
+						换货
+					</view>
 				</view>
 			</view>
-			<view class="line">
-
+			<view class="line" v-if="order.pay_status == PayStatusEnum.PENDING.value">
 			</view>
-			<view class="cancel">
+			<view class="cancel" @click="onCancel(order.order_id)"
+				v-if="order.pay_status == PayStatusEnum.PENDING.value">
 				取消订单
 			</view>
 		</view>
@@ -119,18 +142,18 @@
 					订单编号:
 				</view>
 				<view class="price">
-					2393990490490
+					{{ order.order_no }}
 				</view>
-				<view class="copy">
+				<view class="copy" @click="handleCopy(order.order_no)">
 					复制
 				</view>
 			</view>
-			<view class="orderTitle">
+			<view class="orderTitle" v-if="order.pay_status == PayStatusEnum.SUCCESS.value">
 				<view class="total">
 					支付方式：
 				</view>
 				<view class="price">
-					微信支付
+					{{order.pay_method}}
 				</view>
 			</view>
 			<view class="orderTitle">
@@ -144,12 +167,12 @@
 					查看
 				</view>
 			</view>
-			<view class="orderTitle">
-				<view class="total">
+			<view class="orderTitle" v-if="order.delivery.length>0">
+				<view class="total" v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">
 					物流公司：
 				</view>
 				<view class="price">
-					到店自提
+					{{order.delivery[0].express ? order.delivery[0].express.express_name : '--' }}
 				</view>
 			</view>
 			<view class="orderTitle">
@@ -157,15 +180,15 @@
 					下单时间：
 				</view>
 				<view class="price">
-					2023-12-20 13:09:20
+					{{ order.create_time }}
 				</view>
 			</view>
-			<view class="orderTitle">
+			<view class="orderTitle" v-if="order.pay_status == PayStatusEnum.SUCCESS.value">
 				<view class="total">
 					支付时间：
 				</view>
 				<view class="price">
-					2023-12-20 13:09:20
+					{{order.pay_time}}
 				</view>
 			</view>
 			<view class="orderTitle">
@@ -173,11 +196,10 @@
 					期待配送时间：
 				</view>
 				<view class="price">
-					2023-12-20 13:09:20
+					{{order.receipt_time}}
 				</view>
 			</view>
 			<view class="line">
-
 			</view>
 			<view class="amount">
 				<view class="share">
@@ -185,21 +207,21 @@
 					分享
 				</view>
 				<view class="sp">
-					
+
 				</view>
-				<view class="callShop">
+				<view class="callShop" @click="callStore(order.storeInfo.phone)">
 					<image src="/static/order/share.png" mode=""></image>
 					联系商家
 				</view>
 			</view>
 		</view>
-		<view class="pickedUp">
+		<view class="pickedUp" v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
 			<view class="orderTitle">
 				<view class="total">
 					提货状态:
 				</view>
 				<view class="price">
-					已提货
+					{{order.ziti_status==0?'没提':'已提货'}}
 				</view>
 			</view>
 			<view class="orderTitle">
@@ -207,32 +229,77 @@
 					提货日期：
 				</view>
 				<view class="price">
-					2023-12-21
+					{{order.ziti_time}}
 				</view>
 			</view>
 			<view class="orderTitle">
 				<view class="total">
 					提货照片：
 				</view>
-				<view class="price">
-					<image src="/static/home/goodsDemo.png" mode="" class="goodsImag"></image>
-					<image src="/static/home/goodsDemo.png" mode="" class="goodsImag"></image>
+				<view class="price" v-if="order.ziti_image.length">
+					<image v-for="(img, idx) in order.ziti_image" :key="idx" :src="img" mode="" class="goodsImag">
+					</image>
+				</view>
+			</view>
+		</view>
+		<view v-if="menushow" class="menuarea">
+			<view class="menulist">
+				<view class="" @click="onInvoicing(order.order_id)"
+					v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
+					申请开票
+				</view>
+				<view class="" @click="onDelete(order.order_id)"
+					v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
+					删除订单
+				</view>
+				<view class="" v-if="order.pay_status == PayStatusEnum.PENDING.value" @click="onCancel(order.order_id)">
+					取消订单
 				</view>
 			</view>
+			<view class="trangle"></view>
 		</view>
 		<view class="footer">
-			<view class="meetPrice">
+			<view class="meetPrice" @click="changeMenu"
+				v-if="order.order_status == OrderStatusEnum.COMPLETED.value || order.pay_status == PayStatusEnum.PENDING.value">
 				更多
 			</view>
+			<view v-else style="color: #fff;">-</view>
 			<view class="fooRight">
-				<view class="buyAgain">
+				<view class="buyAgain" @click="handleTargetGoods(goods.goods_id)"
+					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value">
 					再次购买
 				</view>
-				<view class="btn">
-					提交订单
+				<view class="buyAgain" @click="onPay(order.order_id)"
+					v-if="order.pay_status == PayStatusEnum.PENDING.value">
+					继续付款
 				</view>
+				<view class="buyAgain" @click="onExtractQRCode(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value
+					&& order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+					核销码
+				</view>
+				<view class="buyAgain" @click="handleTargetExpress(order.order_id)"
+					v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
+					查看物流
+				</view>
+				<view class="buyAgain" @click="onReceipt(order.order_id)"
+					v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
+					确认收货
+				</view>
+				<view class="buyAgain" @click="onCdDia(order.order_id)"
+					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>
+				<!-- <view class="buyAgain"
+					v-if="order.order_status == OrderStatusEnum.COMPLETED.value && order.is_comment == 0"
+					@click="handleTargetComment(order.order_id)">
+					评价
+				</view> -->
 			</view>
-			
+
 		</view>
 		<!-- 催单弹框 -->
 		<view class="dia" v-if="cdDia">
@@ -244,12 +311,12 @@
 				<view class="cdInfo">
 					商家已收到您的催单提醒，您精心挑选的商品正在配送中，属于正常配送时效内，请您耐心等待，谢谢！
 				</view>
-				<view class="iKnow">
+				<view class="iKnow" @click="meKone()">
 					我知道了
 				</view>
 			</view>
 		</view>
-		<view class="bigCode">
+		<view class="bigCode" v-if="showQRCodePopup" style="display: none;">
 			<view class="cm">
 				<view class="cm_text">
 					核销码
@@ -258,7 +325,7 @@
 					<image src="" mode="" class="codeImg"></image>
 				</view>
 				<view class="cline">
-					<u-line  border-style="dashed" color="#D0D0D0" />
+					<u-line border-style="dashed" color="#D0D0D0" />
 				</view>
 				<view class="sm">
 					可前往门店扫码完成操作
@@ -270,35 +337,323 @@
 
 <script>
 	import img from "@/static/home/top.png"
+	import {
+		OrderTypeEnum,
+		DeliveryStatusEnum,
+		DeliveryTypeEnum,
+		OrderStatusEnum,
+		PayStatusEnum,
+		ReceiptStatusEnum
+	} from '@/common/enum/order'
+	import {
+		DeliveryMethodEnum
+	} from '@/common/enum/order/delivery'
+	import * as OrderApi from '@/api/order'
 	export default {
 		data() {
 			return {
 				background: {
-					background: 'url('+	img+') center top no-repeat',
+					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
-				buyType: false,
-				sendType:false,
-				cdDia:false,
+				// 枚举类
+				OrderTypeEnum,
+				DeliveryStatusEnum,
+				DeliveryTypeEnum,
+				OrderStatusEnum,
+				PayStatusEnum,
+				ReceiptStatusEnum,
+				DeliveryMethodEnum,
+				// 当前订单ID
+				orderId: null,
+				// 加载中
+				isLoading: true,
+				// 当前订单详情
+				order: {},
+				// 当前设置
+				setting: {},
+				// 核销二维码弹窗
+				showQRCodePopup: false,
+				// 核销二维码图片url (通过后端获取)
+				qrcodeImage: '',
+				// 控制onShow事件是否刷新订单信息
+				canReset: false,
+				cdDia: false,
+				menushow: false,
 			}
 		},
-		methods:{
-			openCode(){
-				// 打开核销码
-				
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad({
+			orderId
+		}) {
+			// 当前订单ID
+			this.orderId = orderId
+			// 获取当前订单信息
+			this.getOrderDetail()
+			// 注册全局事件订阅: 是否刷新当前订单数据
+			uni.$on('syncRefresh', (val, isCur) => {
+				if (!isCur) {
+					this.canReset = val
+				}
+			})
+		},
+
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow() {
+			this.canReset && this.getOrderDetail()
+			this.canReset = false
+		},
+
+		methods: {
+			// 联系商家
+			callStore(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
 			},
-		}
+			changeMenu() {
+				this.menushow = !this.menushow
+			},
+			meKone() {
+				this.cdDia = false
+			},
+			onCdDia(orderId) {
+				const app = this
+				OrderApi.orderfast(orderId)
+					.then(result => {
+						if (result.status == 200) {
+							this.cdDia = true
+						}
+
+					})
+
+			},
+			clickImg() {
+				uni.previewImage({
+					urls: [this.qrcodeImage], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+					current: '', // 当前显示图片的http链接，默认是第一个
+					success: function(res) {},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			},
+			// 获取当前订单信息
+			getOrderDetail(canReset = false) {
+				const app = this
+				app.isLoading = true
+				OrderApi.detail(app.orderId)
+					.then(result => {
+						app.order = result.data.order
+						app.setting = result.data.setting
+						app.isLoading = false
+					})
+				// 相应全局事件订阅: 刷新上级页面数据
+				canReset && uni.$emit('syncRefresh', true, true)
+			},
+
+			// 复制指定内容
+			handleCopy(value) {
+				const app = this
+				uni.setClipboardData({
+					data: value,
+					success: () => app.$toast('复制成功'),
+					fail: ({
+						errMsg
+					}) => app.$toast('复制失败 ' + errMsg)
+				})
+			},
+
+			// 跳转到门店详情页
+			handleTargetExtract(shopId) {
+				this.$navTo('pages/shop/detail', {
+					shopId
+				})
+			},
+
+			// 跳转到物流跟踪页面
+			handleTargetExpress() {
+				this.$navTo('pages/order/express/index', {
+					orderId: this.orderId
+				})
+			},
+
+			// 跳转到商品详情页面
+			handleTargetGoods(goodsId) {
+				this.$navTo('pages/goods/detail', {
+					goodsId
+				})
+			},
+
+			// 跳转到申请售后页面
+			handleApplyRefund(orderGoodsId) {
+				this.$navTo('pages/refund/apply', {
+					orderGoodsId
+				})
+			},
+			// 修改地址
+			onAdress(orderId) {
+				this.$navTo('pages/address/index', {
+					orderId
+				})
+			},
+			// 点击去开票
+			onInvoicing(orderId) {
+				this.$navTo('pages/invoice/edit', {
+					orderId
+				})
+			},
+			// 取消订单
+			onCancel(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '确认要取消该订单吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.cancel(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$toast(result.message)
+									setTimeout(() => {
+										// 刷新当前订单数据
+										app.getOrderDetail(true)
+									}, 1500)
+								})
+						}
+					}
+				});
+			},
+			// 删除订单
+			onDelete(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑，确认要删除该订单吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.del(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$toast(result.message)
+									uni.$emit('syncRefresh');
+									uni.navigateBack(1)
+								})
+						}
+					}
+				});
+			},
+			// 确认收货
+			onReceipt(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '确认收到商品了吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.receipt(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$success(result.message)
+									setTimeout(() => {
+										// 刷新当前订单数据
+										app.getOrderDetail(true)
+									}, 1500)
+								})
+						}
+					}
+				});
+			},
+
+			// 获取核销二维码
+			onExtractQRCode(orderId) {
+				const app = this
+				OrderApi.extractQrcode(orderId, {
+						channel: app.platform
+					})
+					.then(result => {
+						app.qrcodeImage = result.data.qrcode
+						app.showQRCodePopup = true
+					})
+			},
+			// 点击去退款
+			onRefund(orderId, order, item) {
+				uni.navigateTo({
+					url: '/pages/order/refund/refund?orderId=' + orderId + '&order=' + JSON.stringify(order) +
+						"&deliveryStatus=" + item.delivery_status + '&receiptStatus=' + item.receipt_status
+				})
+			},
+			// 点击去支付
+			onPay(orderId) {
+				this.$navTo('pages/checkout/cashier/index', {
+					orderId
+				})
+			},
+
+			// 跳转到订单评价页
+			handleTargetComment(orderId) {
+				this.$navTo('pages/order/comment/index', {
+					orderId
+				})
+			},
+
+		},
+
 	}
 </script>
 
 <style lang="scss" scoped>
 	.detail {
 		width: 750rpx;
-		padding-bottom: 120rpx;
+		padding-bottom: 150rpx;
 		background-image: url('../../static/home/homeback.png');
 		background-size: 100% 100%;
 	}
 
+	.menuarea {
+		width: 100%;
+		height: 100%;
+	}
+
+	.menulist {
+		background-color: #FFF;
+		border: 1rpx solid #F4F4F4;
+		width: 150rpx;
+		min-height: 50rpx;
+		position: fixed;
+		left: 28rpx;
+		bottom: 90rpx;
+		border-radius: 14rpx;
+		text-align: center;
+		padding: 10rpx 0;
+		z-index: 99999;
+	}
+
+	.menulist view {
+		width: 100%;
+		height: 50rpx;
+		color: #333;
+		font-size: 24rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		line-height: 50rpx;
+
+	}
+
+	.trangle {
+		width: 0px;
+		height: 0px;
+		position: absolute;
+		border: 10rpx solid #FFF;
+		border-top-color: #FFF;
+		border-bottom-color: transparent;
+		border-left-color: transparent;
+		border-right-color: transparent;
+		left: 16rpx;
+		bottom: 60rpx;
+	}
 
 	.leftText {
 		font-size: 24rpx;
@@ -381,7 +736,8 @@
 			margin: 40rpx 0 0 150rpx;
 		}
 	}
-	.sendHome{
+
+	.sendHome {
 		width: 694rpx;
 		height: 218rpx;
 		background: #FFFFFF;
@@ -389,26 +745,46 @@
 		opacity: 1;
 		margin: 14rpx 0 0 26rpx;
 		padding: 18rpx 16rpx 16rpx 34rpx;
-		.fline{
+
+		.fline {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
-			.leftInfo{
+
+			.leftInfo {
 				display: flex;
 			}
-			.am{
-				width:40rpx;
+
+			.up {
+				width: 114rpx;
+				height: 50rpx;
+				background: #FFFFFF;
+				border-radius: 88rpx 88rpx 88rpx 88rpx;
+				opacity: 1;
+				border: 1rpx solid #D9D9D9;
+				text-align: center;
+				line-height: 50rpx;
+				font-size: 20rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #676767;
+			}
+
+			.am {
+				width: 40rpx;
 				height: 40rpx;
 				margin-right: 24rpx;
 			}
-			.gp{
+
+			.gp {
 				height: 28rpx;
 				font-size: 20rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #838383;
 				line-height: 28rpx;
-				text{
+
+				text {
 					height: 40rpx;
 					font-size: 28rpx;
 					font-family: PingFang SC, PingFang SC;
@@ -418,22 +794,9 @@
 					margin-right: 8rpx;
 				}
 			}
-			.up{
-				width: 114rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 88rpx 88rpx 88rpx 88rpx;
-				opacity: 1;
-				border: 1rpx solid #D9D9D9;
-				text-align: center;
-				line-height: 50rpx;
-				font-size: 20rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #676767;
-			}
 		}
-		.sl{
+
+		.sl {
 			width: 474rpx;
 			height: 68rpx;
 			font-size: 24rpx;
@@ -445,6 +808,7 @@
 			margin-left: 60rpx;
 		}
 	}
+
 	.consignee {
 		width: 694rpx;
 		height: 200rpx;
@@ -487,6 +851,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+
 			.code {
 				height: 34rpx;
 				font-size: 24rpx;
@@ -496,13 +861,15 @@
 
 			.codeNum {
 				width: 80rpx;
-				height:78rpx;
-				image{
+				height: 78rpx;
+
+				image {
 					width: 100%;
 					height: 100%;
 				}
 			}
-			.openCode{
+
+			.openCode {
 				height: 28rpx;
 				font-size: 20rpx;
 				font-weight: 400;
@@ -515,7 +882,6 @@
 
 	.goodsDetail {
 		width: 694rpx;
-		height: 400rpx;
 		background: #FFFFFF;
 		border-radius: 10rpx 10rpx 10rpx 10rpx;
 		opacity: 1;
@@ -564,13 +930,17 @@
 				margin-left: 20rpx;
 
 				.goodsName {
-					height: 40rpx;
 					font-size: 28rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #1E1E1E;
 					line-height: 40rpx;
 					margin-bottom: 4rpx;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					width: 420rpx;
 				}
 
 				.goodsPrice {
@@ -632,6 +1002,21 @@
 			margin: 32rpx 0 20rpx 0;
 		}
 
+		.up {
+			width: 114rpx;
+			height: 50rpx;
+			background: #FFFFFF;
+			border-radius: 88rpx 88rpx 88rpx 88rpx;
+			opacity: 1;
+			border: 1rpx solid #D9D9D9;
+			text-align: center;
+			line-height: 50rpx;
+			font-size: 20rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #676767;
+		}
+
 		.cancel {
 			height: 34rpx;
 			font-size: 24rpx;
@@ -645,7 +1030,6 @@
 
 	.orderTips {
 		width: 694rpx;
-		height: 522rpx;
 		background: #FFFFFF;
 		border-radius: 10rpx 10rpx 10rpx 10rpx;
 		opacity: 1;
@@ -699,35 +1083,41 @@
 			justify-content: space-around;
 			align-items: center;
 			margin-top: 20rpx;
-			margin-bottom: 30rpx;
-			.share{
-				image{
+
+			.share {
+				image {
 					width: 26rpx;
 					height: 26rpx;
 					margin-right: 14rpx;
 				}
+
 				height: 34rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
+				font-family: PingFang SC,
+				PingFang SC;
 				font-weight: 400;
 				color: #1E1E1E;
 				line-height: 34rpx;
 			}
-			.sp{
+
+			.sp {
 				width: 0rpx;
 				height: 38rpx;
 				opacity: 1;
 				border: 2rpx solid #ECECEC;
 			}
-			.callShop{
-				image{
+
+			.callShop {
+				image {
 					width: 26rpx;
 					height: 26rpx;
 					margin-right: 14rpx;
 				}
+
 				height: 34rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
+				font-family: PingFang SC,
+				PingFang SC;
 				font-weight: 400;
 				color: #1E1E1E;
 				line-height: 34rpx;
@@ -741,7 +1131,8 @@
 		opacity: 1;
 		border: 2rpx solid #F1F1F1;
 	}
-	.pickedUp{
+
+	.pickedUp {
 		width: 694rpx;
 		height: 310rpx;
 		background: #FFFFFF;
@@ -749,6 +1140,7 @@
 		opacity: 1;
 		margin: 14rpx 0 0 26rpx;
 		padding: 32rpx 50rpx 0 42rpx;
+
 		.orderTitle {
 			position: relative;
 			margin-bottom: 24rpx;
@@ -758,27 +1150,28 @@
 			font-weight: 400;
 			color: #2D2D2D;
 			line-height: 34rpx;
-		
+
 			.total {
 				font-size: 24rpx;
 				color: #7E7E7E;
 				margin-right: 10rpx;
 			}
-		
+
 			.price {
 				.couponNum {
 					font-size: 28rpx;
 					color: #F42B17;
 				}
-		
+
 				font-size: 28rpx;
-		
+
 				image {
 					width: 18rpx;
 					height: 18rpx;
 					margin-left: 18rpx;
 				}
-				.goodsImag{
+
+				.goodsImag {
 					width: 144rpx;
 					height: 132rpx;
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
@@ -786,7 +1179,7 @@
 					margin-right: 26rpx;
 				}
 			}
-		
+
 			.copy {
 				height: 34rpx;
 				font-size: 24rpx;
@@ -799,6 +1192,7 @@
 			}
 		}
 	}
+
 	.footer {
 		width: 100%;
 		height: 120rpx;
@@ -831,11 +1225,13 @@
 				color: #F42B17;
 			}
 		}
-		.fooRight{
+
+		.fooRight {
 			display: flex;
 			align-items: center;
 		}
-		.buyAgain{
+
+		.buyAgain {
 			width: 146rpx;
 			height: 68rpx;
 			background: #FFFFFF;
@@ -847,9 +1243,10 @@
 			font-size: 24rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
-			color: #828282;
+			color: #333;
 			margin-right: 14rpx;
 		}
+
 		.btn {
 			width: 214rpx;
 			height: 74rpx;
@@ -865,7 +1262,8 @@
 			margin-right: 20rpx;
 		}
 	}
-	.dia{
+
+	.dia {
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -876,21 +1274,24 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		.diaMain{
+
+		.diaMain {
 			width: 560rpx;
 			height: 432rpx;
 			background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
 			border-radius: 12rpx 12rpx 12rpx 12rpx;
 			opacity: 1;
 			position: relative;
-			.ld{
+
+			.ld {
 				width: 100rpx;
 				height: 100rpx;
 				position: absolute;
 				top: -50rpx;
 				left: 230rpx;
 			}
-			.cdTitle{
+
+			.cdTitle {
 				width: 128rpx;
 				height: 44rpx;
 				font-size: 32rpx;
@@ -898,9 +1299,10 @@
 				font-weight: 500;
 				color: #000000;
 				line-height: 44rpx;
-				margin: 80rpx 0  0 216rpx;
+				margin: 80rpx 0 0 216rpx;
 			}
-			.cdInfo{
+
+			.cdInfo {
 				width: 498rpx;
 				height: 120rpx;
 				font-size: 28rpx;
@@ -911,7 +1313,8 @@
 				margin-left: 48rpx;
 				margin-top: 28rpx;
 			}
-			.iKnow{
+
+			.iKnow {
 				width: 412rpx;
 				height: 72rpx;
 				background: #F55349;
@@ -927,24 +1330,27 @@
 			}
 		}
 	}
-	.bigCode{
+
+	.bigCode {
 		position: fixed;
 		top: 0;
 		left: 0;
 		width: 100%;
 		height: 100%;
-		background: rgba(65,65,65,0.46);
+		background: rgba(65, 65, 65, 0.46);
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		.cm{
+
+		.cm {
 			width: 560rpx;
 			height: 714rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx 16rpx 16rpx 16rpx;
 			opacity: 1;
 			padding-top: 44rpx;
-			.cm_text{
+
+			.cm_text {
 				width: 100%;
 				height: 42rpx;
 				font-size: 30rpx;
@@ -953,20 +1359,23 @@
 				line-height: 42rpx;
 				text-align: center;
 			}
-			.txm{
-				.codeImg{
+
+			.txm {
+				.codeImg {
 					width: 394rpx;
 					height: 458rpx;
 					border-radius: 0rpx 0rpx 0rpx 0rpx;
 					opacity: 1;
 				}
-				
+
 			}
-			.cline{
+
+			.cline {
 				padding: 0 34rpx;
 				margin: 46rpx 0 30rpx 0;
 			}
-			.sm{
+
+			.sm {
 				width: 100%;
 				height: 34rpx;
 				font-size: 24rpx;
@@ -976,7 +1385,22 @@
 				line-height: 28rpx;
 				text-align: center;
 			}
-			
+
 		}
 	}
-</style>
\ No newline at end of file
+
+	.up2 {
+		width: 114rpx;
+		height: 50rpx;
+		background: #FFFFFF;
+		border-radius: 88rpx 88rpx 88rpx 88rpx;
+		opacity: 1;
+		border: 1rpx solid #D9D9D9;
+		text-align: center;
+		line-height: 50rpx;
+		font-size: 20rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #676767;
+	}
+</style>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index fef0fde..1d8c03d 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1,364 +1,585 @@
 <template>
-  <view class="order" :style="appThemeStyle">
-    <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption"
-      @up="upCallback">
-	  <view class="search">
-		  <view class="box">
-			  <image src="/static/news/icon-search.png"></image>
-			  <input type="search" placeholder="搜索订单" />
-		  </view>
-	  </view>
-      <!-- tab栏 -->
-      <u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="false" height="120" font-size="32" :current="curTab" bar-width="0" active-color="#111111" :duration="0.2" @change="onChangeTab" />
-      <!-- 订单列表 -->
-      <view class="order-list">
-		<view class="item">
-			<view class="hd">
-				<view class="a">
-					<image class="icon" src="/static/news/icon-mall.jpg"></image>
-					大白兔家电
+	<view class="order" :style="appThemeStyle">
+		<mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }"
+			@down="downCallback" :up="upOption" @up="upCallback">
+			<view class="search">
+				<view class="box">
+					<image src="/static/news/icon-search.png"></image>
+					<input type="search" @confirm="confirm" v-model='keyWords' placeholder="搜索订单" />
 				</view>
-				<view class="b">卖家已发货</view>
 			</view>
-			<view class="bd" @click="goOrderDetail()">
-				<view class="pic">
-					<image src="/static/home/phone.jpg"></image>
-				</view>
-				<view class="info">
-					<view class="a">iphone13 绿色 128GB</view>
-					<view class="b">￥<text>7599</text></view>
+			<!-- tab栏 -->
+			<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="false" height="120" font-size="32" :current="curTab"
+				bar-width="0" active-color="#111111" :duration="0.2" @change="onChangeTab" />
+			<!-- 订单列表 -->
+			<view class="order-list">
+				<view class="item" v-for="(item,index) in list">
+					<view class="hd">
+						<view class="a">
+							<image class="icon" :src="item.storeInfo.image_url"></image>
+							{{item.storeInfo.store_name}}
+						</view>
+						<view class="b">{{item.state_text}}</view>
+					</view>
+					<view class="bd" @click="goOrderDetail(item.order_id)" v-for="(goods, idx) in item.goods"
+						:key="idx">
+						<view class="pic">
+							<image :src="goods.goods_image"></image>
+						</view>
+						<view class="info">
+							<view class="a">{{ goods.goods_name }}</view>
+							<view class="b">
+								￥<text>{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
+							</view>
+						</view>
+						<view class="num">
+							x{{ goods.total_num }}
+						</view>
+					</view>
+					<view class="fd">
+
+						共{{ item.total_num }}件商品，实付款￥<text>{{ item.pay_price }}</text>
+					</view>
+					<view v-if="item.menushow" class="menuarea">
+						<view class="mask" @click="changeMenu(index)">
+						</view>
+						<view class="menulist">
+							<view class="" v-if="item.order_status == OrderStatusEnum.COMPLETED.value"
+								@click="onInvoicing(item.order_id)">
+								申请开票
+							</view>
+							<!-- 		<view class=""
+								v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value"
+								@click="onRefund(item.order_id)">
+								申请退款
+							</view>
+							<view class=""
+								v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.RECEIVED.value"
+								@click="onSales(item.order_id)">
+								申请售后
+							</view> -->
+							<view class="" @click="onDelete(item.order_id)"
+								v-if="item.order_status == OrderStatusEnum.COMPLETED.value">
+								删除订单
+							</view>
+							<view class="" v-if="item.pay_status == PayStatusEnum.PENDING.value"
+								@click="onCancel(item.order_id)">
+								取消订单
+							</view>
+						</view>
+						<view class="trangle"></view>
+					</view>
+					<view class="btn">
+						<view class="a" @click="changeMenu(index)"
+							v-if="item.order_status == OrderStatusEnum.COMPLETED.value || item.pay_status == PayStatusEnum.PENDING.value">
+							更多</view>
+						<view class="b">
+							<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value
+                 && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+								@click="onExtractQRCode(item.order_id)">核销码
+							</view>
+							<view class="n" v-if="item.pay_status == PayStatusEnum.PENDING.value"
+								@click="onPay(item.order_id)">去支付</view>
+							<view class="n" v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
+								@click="onLogistics(item.order_id)">查看物流
+							</view>
+							<view class="n n-1"
+								v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value"
+								@click="onReceipt(item.order_id)">确认收货</view>
+							<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"
+									@click="onCancel(item.order_id)">
+									取消订单
+								</view>
+							<!-- 		<view class="n"
+										v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
+										@click="onAdress(order.goods_id)">修改地址</view> -->
+							<!-- <view class="n n-1"
+								v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.is_comment == 0"
+								@click="handleTargetComment(item.order_id)">评价</view> -->
+						</view>
+					</view>
 				</view>
-				<view class="num">
-					x1
+			</view>
+		</mescroll-body>
+		<u-modal v-model="deleteShow" :show-cancel-button="true" :closable='false' @on-cancel="handleCancel"
+			@on-ok="handleOk" title="确认删除订单？" confirm-color="#F55349">
+			<view class="slot-content order-modal">
+				<view class="content">删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑</view>
+				<view class="desc" @click="toggleImage()">
+					<image v-if="isToggle" src="/static/invoice/select.png"></image>
+					<image v-else src="/static/invoice/select-on.png"></image>删除后将拼单信息设置为匿名
 				</view>
 			</view>
-			<view class="fd">
-				实付款￥<text>7599</text>
+		</u-modal>
+		<!-- 核销二维码弹窗 -->
+		<u-popup v-model="showQRCodePopup" mode="center" border-radius="26" :closeable="true">
+			<view class="qrcode-popup">
+				<view class="title">自提核销二维码</view>
+				<view class="pop-content">
+					<image v-if="qrcodeImage" class="image" :src="qrcodeImage"></image>
+				</view>
 			</view>
-			<view class="btn">
-				<view class="a">更多</view>
-				<view class="b">
-					<view class="n">延长收货</view>
-					<view class="n">查看物流</view>
-					<view class="n n-1">确认收货</view>
+		</u-popup>
+		<!-- 催单弹框 -->
+		<view class="dia" v-if="cdDia">
+			<view class="diaMain">
+				<image src="/static/order/ld.png" mode="" class="ld"></image>
+				<view class="cdTitle">
+					催单成功
+				</view>
+				<view class="cdInfo">
+					商家已收到您的催单提醒，您精心挑选的商品正在配送中，属于正常配送时效内，请您耐心等待，谢谢！
+				</view>
+				<view class="iKnow" @click="meKone()">
+					我知道了
 				</view>
 			</view>
 		</view>
-    </view> 
-    </mescroll-body>
-	<u-modal v-model="show" :show-cancel-button="true" title="确认删除订单？" confirm-color="#F55349">
-		<view class="slot-content order-modal">
-			<view class="content">删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑</view>
-			<view class="desc" @click="toggleImage()"><image v-if="isToggle" src="/static/invoice/select.png"></image><image v-else src="/static/invoice/select-on.png"></image>删除后将拼单信息设置为匿名</view>
-		</view>
-	</u-modal>
-  </view>
+	</view>
 </template>
 
 <script>
-  import {
-    DeliveryStatusEnum,
-    DeliveryTypeEnum,
-    OrderStatusEnum,
-    PayStatusEnum,
-    ReceiptStatusEnum
-  } from '@/common/enum/order'
-  import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
-  import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
-  import * as OrderApi from '@/api/order'
-
-  // 每页记录数量
-  const pageSize = 15
-
-  // tab栏数据
-  const tabs = [{
-    name: `待付款`,
-    value: 'payment'
-  }, {
-    name: `待发货`,
-    value: 'delivery'
-  }, {
-    name: `待收货`,
-    value: 'received'
-  }, {
-    name: `已完成`,
-    value: 'received'
-  },
-  // {
-  //   name: `待评价`,
-  //   value: 'comment'
-  // },
-  ]
-
-  export default {
-    mixins: [MescrollMixin],
-    data() {
-      return {
-		  isToggle: false,
-		  show: true,
-        // 枚举类
-        DeliveryStatusEnum,
-        DeliveryTypeEnum,
-        OrderStatusEnum,
-        PayStatusEnum,
-        ReceiptStatusEnum,
-
-        // 当前页面参数
-        options: { dataType: 'all' },
-        // tab栏数据
-        tabs,
-        // 当前标签索引
-        curTab: 0,
-        // 订单列表数据
-        list: getEmptyPaginateObj(),
-
-        // 上拉加载配置
-        upOption: {
-          // 首次自动执行
-          auto: true,
-          // 每页数据的数量; 默认10
-          page: { size: pageSize },
-          // 数量要大于4条才显示无更多数据
-          noMoreSize: 4,
-          // 空布局
-          empty: {
-            tip: '亲，暂无订单记录'
-          }
-        },
-        // 控制onShow事件是否刷新订单列表
-        canReset: false,
-        // 核销二维码弹窗
-        showQRCodePopup: false,
-        // 核销二维码图片url (通过后端获取)
-        qrcodeImage: '',
-      }
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-      // 初始化当前选中的标签
-      this.initCurTab(options)
-      // 注册全局事件订阅: 是否刷新订单列表
-      uni.$on('syncRefresh', canReset => {
-        this.canReset = canReset
-      })
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-      this.canReset && this.onRefreshList()
-      this.canReset = false
-    },
-
-    /**
-     * 生命周期函数--监听页面的卸载
-     */
-    onUnload() {
-      // 卸载全局事件订阅
-      uni.$off('syncRefresh')
-    },
-
-    methods: {
-		goOrderDetail(){
-			uni.navigateTo({
-				url:'/pages/order/detail',
+	import {
+		DeliveryStatusEnum,
+		DeliveryTypeEnum,
+		OrderStatusEnum,
+		PayStatusEnum,
+		ReceiptStatusEnum
+	} from '@/common/enum/order'
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
+	import {
+		getEmptyPaginateObj,
+		getMoreListData
+	} from '@/core/app'
+	import * as OrderApi from '@/api/order'
+
+	// 每页记录数量
+	const pageSize = 15
+
+	// tab栏数据
+	const tabs = [{
+		name: `待付款`,
+		value: 'payment'
+	}, {
+		name: `待发货`,
+		value: 'delivery'
+	}, {
+		name: `待收货`,
+		value: 'received'
+	}, {
+		name: `已完成`,
+		value: 'received'
+	}, ]
+
+	export default {
+		mixins: [MescrollMixin],
+		data() {
+			return {
+				cdDia: false,
+				isToggle: false,
+				deleteShow: false,
+				orderId: '',
+				// 枚举类
+				DeliveryStatusEnum,
+				DeliveryTypeEnum,
+				OrderStatusEnum,
+				PayStatusEnum,
+				ReceiptStatusEnum,
+
+				// 当前页面参数
+				options: {
+					dataType: 'all'
+				},
+				// tab栏数据
+				tabs,
+				// 当前标签索引
+				curTab: 0,
+				// 订单列表数据
+				list: [],
+				keyWords: '',
+				// 上拉加载配置
+				upOption: {
+					// 首次自动执行
+					auto: true,
+					// 每页数据的数量; 默认10
+					page: {
+						size: pageSize
+					},
+					// 数量要大于4条才显示无更多数据
+					noMoreSize: 4,
+					// 空布局
+					empty: {
+						tip: '亲，暂无订单记录'
+					}
+				},
+				// 控制onShow事件是否刷新订单列表
+				canReset: false,
+				// 核销二维码弹窗
+				showQRCodePopup: false,
+				// 核销二维码图片url (通过后端获取)
+				qrcodeImage: '',
+			}
+		},
+
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+			// 初始化当前选中的标签
+			this.initCurTab(options)
+			// 注册全局事件订阅: 是否刷新订单列表
+			uni.$on('syncRefresh', canReset => {
+				this.canReset = canReset
 			})
 		},
-		toggleImage() {
-			this.isToggle = !this.isToggle
+
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow() {
+			this.canReset && this.onRefreshList()
+			this.canReset = false
+		},
+
+		/**
+		 * 生命周期函数--监听页面的卸载
+		 */
+		onUnload() {
+			// 卸载全局事件订阅
+			uni.$off('syncRefresh')
+		},
+
+		methods: {
+			confirm() {
+				// 刷新订单列表
+				app.onRefreshList()
+			},
+			changeMenu(index) {
+				this.list[index].menushow = !this.list[index].menushow
+			},
+			toggleImage() {
+				this.isToggle = !this.isToggle
+			},
+			// 初始化当前选中的标签
+			initCurTab(options) {
+				const app = this
+				if (options.dataType) {
+					const index = app.tabs.findIndex(item => item.value == options.dataType)
+					app.curTab = index > -1 ? index : 0
+				}
+			},
+
+			/**
+			 * 上拉加载的回调 (页面初始化时也会执行一次)
+			 * 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
+			 * @param {Object} page
+			 */
+			upCallback(page) {
+				const app = this
+				// 设置列表数据
+				app.getOrderList(page.num)
+					.then(list => {
+						const curPageLen = list.data.length
+						const totalSize = list.data.total
+						app.mescroll.endBySize(curPageLen, totalSize)
+					})
+					.catch(() => app.mescroll.endErr())
+			},
+
+			// 获取订单列表
+			getOrderList(pageNo = 1) {
+				const app = this
+				return new Promise((resolve, reject) => {
+					OrderApi.list({
+							dataType: app.getTabValue(),
+							page: pageNo,
+							keyword: app.keyWords
+						}, {
+							load: false
+						})
+						.then(result => {
+							// 合并新数据
+							const newList = app.initList(result.data.list)
+							app.list = getMoreListData(newList, app.list, pageNo)
+							resolve(newList)
+						})
+				})
+			},
+
+			// 初始化订单列表数据
+			initList(newList) {
+				newList.data.forEach(item => {
+					item.menushow = false;
+					item.total_num = 0
+					item.goods.forEach(goods => {
+						item.total_num += goods.total_num
+					})
+				})
+				return newList
+			},
+
+			// 获取当前标签项的值
+			getTabValue() {
+				return this.tabs[this.curTab].value
+			},
+
+			// 切换标签项
+			onChangeTab(index) {
+				const app = this
+				// 设置当前选中的标签
+				app.curTab = index
+				// 刷新订单列表
+				app.getOrderList()
+			},
+
+			// 刷新订单列表
+			onRefreshList() {
+				this.list = getEmptyPaginateObj()
+				setTimeout(() => {
+					this.mescroll.resetUpScroll()
+				}, 120)
+			},
+			// 取消订单
+			onCancel(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '确认要取消该订单吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.cancel(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$toast(result.message)
+									// 刷新订单列表
+									app.onRefreshList()
+								})
+						}
+					}
+				});
+			},
+			handleCancel() {
+				app.deleteShow = false
+			},
+			onDelete(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑，确认要删除该订单吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.del(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$toast(result.message)
+									// 刷新订单列表
+									app.onRefreshList()
+								})
+						}
+					}
+				});
+			},
+			// 删除订单
+			onDelete(orderId) {
+				const app = this
+				app.deleteShow = true
+				app.orderId = orderId
+			},
+
+			// 确认收货
+			onReceipt(orderId) {
+				const app = this
+				uni.showModal({
+					title: '友情提示',
+					content: '确认收到商品了吗？',
+					success(o) {
+						if (o.confirm) {
+							OrderApi.receipt(orderId)
+								.then(result => {
+									// 显示成功信息
+									app.$success(result.message)
+									// 刷新订单列表
+									app.onRefreshList()
+								})
+						}
+					}
+				});
+			},
+
+			// 获取核销二维码
+			onExtractQRCode(orderId) {
+				const app = this
+				OrderApi.extractQrcode(orderId, {
+						channel: app.platform
+					})
+					.then(result => {
+						app.qrcodeImage = result.data.qrcode
+						app.showQRCodePopup = true
+					})
+			},
+			// 跳转到订单评价页
+			handleTargetComment(orderId) {
+				this.$navTo('pages/order/comment/index', {
+					orderId
+				})
+			},
+			// 点击去开票
+			onInvoicing(orderId) {
+				this.$navTo('pages/invoice/edit', {
+					orderId
+				})
+			},
+			// 点击去退款
+			onRefund(orderId) {
+				this.$navTo('pages/order/refund/refund', {
+					orderId
+				})
+			},
+			// 申请售后
+			onSales(orderId) {
+				this.$navTo('pages/order/refund/index', {
+					orderId
+				})
+			},
+			// 点击去物流
+			onLogistics(orderId) {
+				this.$navTo('pages/order/express/index', {
+					orderId
+				})
+			},
+			// 点击去支付
+			onPay(orderId) {
+				this.$navTo('pages/checkout/cashier/index', {
+					orderId
+				})
+			},
+			// 跳转到订单详情页
+			goOrderDetail(orderId) {
+				this.$navTo('pages/order/detail', {
+					orderId
+				})
+			},
+			onCdDia(orderId) {
+				const app = this
+				OrderApi.orderfast(orderId)
+					.then(result => {
+						if (result.status == 200) {
+							this.cdDia = true
+						}
+
+					})
+
+			},
+			// 跳转到订单评价页
+			handleTargetComment(orderId) {
+				this.$navTo('pages/order/comment/index', {
+					orderId
+				})
+			}
+
 		},
-      // 初始化当前选中的标签
-      initCurTab(options) {
-        const app = this
-        if (options.dataType) {
-          const index = app.tabs.findIndex(item => item.value == options.dataType)
-          app.curTab = index > -1 ? index : 0
-        }
-      },
-
-      /**
-       * 上拉加载的回调 (页面初始化时也会执行一次)
-       * 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
-       * @param {Object} page
-       */
-      upCallback(page) {
-        const app = this
-        // 设置列表数据
-        app.getOrderList(page.num)
-          .then(list => {
-            const curPageLen = list.data.length
-            const totalSize = list.data.total
-            app.mescroll.endBySize(curPageLen, totalSize)
-          })
-          .catch(() => app.mescroll.endErr())
-      },
-
-      // 获取订单列表
-      getOrderList(pageNo = 1) {
-        const app = this
-        return new Promise((resolve, reject) => {
-          OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
-            .then(result => {
-              // 合并新数据
-              const newList = app.initList(result.data.list)
-              app.list.data = getMoreListData(newList, app.list, pageNo)
-              resolve(newList)
-            })
-        })
-      },
-
-      // 初始化订单列表数据
-      initList(newList) {
-        newList.data.forEach(item => {
-          item.total_num = 0
-          item.goods.forEach(goods => {
-            item.total_num += goods.total_num
-          })
-        })
-        return newList
-      },
-
-      // 获取当前标签项的值
-      getTabValue() {
-        return this.tabs[this.curTab].value
-      },
-
-      // 切换标签项
-      onChangeTab(index) {
-        const app = this
-        // 设置当前选中的标签
-        app.curTab = index
-        // 刷新订单列表
-        app.onRefreshList()
-      },
-
-      // 刷新订单列表
-      onRefreshList() {
-        this.list = getEmptyPaginateObj()
-        setTimeout(() => {
-          this.mescroll.resetUpScroll()
-        }, 120)
-      },
-
-      // 取消订单
-      onCancel(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认要取消该订单吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.cancel(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$toast(result.message)
-                  // 刷新订单列表
-                  app.onRefreshList()
-                })
-            }
-          }
-        });
-      },
-
-      // 确认收货
-      onReceipt(orderId) {
-        const app = this
-        uni.showModal({
-          title: '友情提示',
-          content: '确认收到商品了吗？',
-          success(o) {
-            if (o.confirm) {
-              OrderApi.receipt(orderId)
-                .then(result => {
-                  // 显示成功信息
-                  app.$success(result.message)
-                  // 刷新订单列表
-                  app.onRefreshList()
-                })
-            }
-          }
-        });
-      },
-
-      // 获取核销二维码
-      onExtractQRCode(orderId) {
-        const app = this
-        OrderApi.extractQrcode(orderId, { channel: app.platform })
-          .then(result => {
-            app.qrcodeImage = result.data.qrcode
-            app.showQRCodePopup = true
-          })
-      },
-
-      // 点击去支付
-      onPay(orderId) {
-        this.$navTo('pages/checkout/cashier/index', { orderId })
-      },
-
-      // 跳转到订单详情页
-      handleTargetDetail(orderId) {
-        this.$navTo('pages/order/detail', { orderId })
-      },
-
-      // 跳转到订单评价页
-      handleTargetComment(orderId) {
-        this.$navTo('pages/order/comment/index', { orderId })
-      }
-
-    },
-
-  }
+
+	}
 </script>
 
 <style lang="scss" scoped>
-	.order{
-		.search{
+	.order {
+		.search {
 			width: 750rpx;
 			height: 98rpx;
 			background: #FFFFFF;
 			padding: 20rpx 26rpx 20rpx 48rpx;
 			box-sizing: border-box;
-			.box{
+
+			.box {
 				padding: 15rpx 25rpx;
 				box-sizing: border-box;
 				display: flex;
 				align-items: center;
 				background: #F3F3F3;
 				border-radius: 60rpx;
-				image{
+
+				image {
 					width: 28rpx;
 					height: 28rpx;
 					margin-right: 22rpx;
 				}
-				input{
+
+				input {
 					flex: 1;
 					font-size: 28rpx;
 					line-height: 30rpx;
 				}
 			}
 		}
-		&-list{
+
+		&-list {
 			padding: 0 30rpx 30rpx;
 			overflow: hidden;
-			.item{
+
+			.item {
 				background: #FFFFFF;
 				padding: 0 25rpx;
 				border-radius: 10rpx;
 				margin-top: 30rpx;
-				&:first-child{
+				position: relative;
+
+				&:first-child {
 					margin-top: 0;
 				}
-				.hd{
+
+				.menuarea {
+					width: 100%;
+					height: 100%;
+				}
+
+				.menulist {
+					background-color: #FFF;
+					border: 1rpx solid #F4F4F4;
+					width: 150rpx;
+					min-height: 50rpx;
+					position: absolute;
+					left: 0rpx;
+					bottom: 80rpx;
+					border-radius: 14rpx;
+					text-align: center;
+					padding: 10rpx 0;
+				}
+
+				.menulist view {
+					width: 100%;
+					height: 50rpx;
+					color: #333;
+					font-size: 24rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					line-height: 50rpx;
+
+				}
+
+				.trangle {
+					width: 0px;
+					height: 0px;
+					position: absolute;
+					border: 10rpx solid #FFF;
+					border-top-color: #FFF;
+					border-bottom-color: transparent;
+					border-left-color: transparent;
+					border-right-color: transparent;
+					left: 16rpx;
+					bottom: 60rpx;
+				}
+
+				.hd {
 					padding: 24rpx 0;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					overflow: hidden;
-					.a{
+
+					.a {
 						display: flex;
 						align-items: center;
 						font-size: 32rpx;
@@ -366,12 +587,15 @@
 						color: #333333;
 						padding-right: 30rpx;
 						position: relative;
-						image{
+						word-break: break-all;
+
+						image {
 							width: 40rpx;
 							height: 40rpx;
 							margin-right: 24rpx;
 						}
-						&::after{
+
+						&::after {
 							content: "";
 							width: 16rpx;
 							height: 16rpx;
@@ -384,81 +608,100 @@
 							transform: rotate(135deg);
 						}
 					}
-					.b{
+
+					.b {
 						font-size: 24rpx;
 						font-weight: 400;
 						color: #F21A1C;
 					}
 				}
-				.bd{
+
+				.bd {
 					display: flex;
 					align-items: flex-start;
 					overflow: hidden;
-					.pic{
+					margin-bottom: 30rpx;
+
+					.pic {
 						width: 145rpx;
 						height: 135rpx;
 						margin-right: 20rpx;
-						image{
+
+						image {
 							width: 100%;
 							height: 100%;
 							border-radius: 10rpx;
 						}
 					}
-					.info{
+
+					.info {
 						flex: 1;
 						overflow: hidden;
-						.a{
+
+						.a {
 							text-align: left;
 							font-size: 28rpx;
 							font-weight: 400;
 							color: #1E1E1E;
-							height: 90rpx;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							-webkit-box-orient: vertical;
+							overflow: hidden;
 						}
-						.b{
-							text{
+
+						.b {
+							text {
 								font-size: 36rpx;
 								font-weight: 600;
 							}
+
 							font-size: 24rpx;
 							color: #F21A1C;
 						}
 					}
-					.num{
+
+					.num {
 						margin-left: 20rpx;
 						font-size: 28rpx;
 						font-weight: 500;
 						color: #1E1E1E;
 					}
 				}
-				.fd{
+
+				.fd {
 					display: flex;
 					align-items: baseline;
 					justify-content: flex-end;
 					font-size: 24rpx;
 					font-weight: 500;
 					color: #1E1E1E;
-					text{
+
+					text {
 						font-size: 36rpx;
 					}
 				}
-				.btn{
+
+				.btn {
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					padding: 30rpx 0;
 					overflow: hidden;
-					.a{
+
+					.a {
 						font-size: 28rpx;
 						font-weight: 400;
 						color: #A59E9E;
 					}
-					.b{
+
+					.b {
 						flex: 1;
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
 						overflow: hidden;
-						.n{
+
+						.n {
 							width: 148rpx;
 							line-height: 56rpx;
 							background: #FFFFFF;
@@ -470,26 +713,30 @@
 							font-size: 24rpx;
 							font-weight: 400;
 							color: #1E1E1E;
-							&-1{
+
+							&-1 {
 								border-color: #F21A1C;
 								color: #F21A1C;
 							}
 						}
 					}
 				}
-				
+
 			}
 		}
-		&-modal{
+
+		&-modal {
 			padding: 50rpx;
 			position: relative;
-			.content{
+
+			.content {
 				font-size: 28rpx;
 				font-weight: 400;
 				line-height: 50rpx;
 				color: #4C4C4C;
 			}
-			.desc{
+
+			.desc {
 				display: flex;
 				align-items: center;
 				font-size: 24rpx;
@@ -497,7 +744,8 @@
 				color: #9F9F9F;
 				justify-content: center;
 				margin-top: 20rpx;
-				image{
+
+				image {
 					width: 28rpx;
 					height: 28rpx;
 					margin-right: 20rpx;
@@ -505,4 +753,72 @@
 			}
 		}
 	}
+
+	.dia {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.7);
+		z-index: 99;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.diaMain {
+			width: 560rpx;
+			height: 432rpx;
+			background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			opacity: 1;
+			position: relative;
+
+			.ld {
+				width: 100rpx;
+				height: 100rpx;
+				position: absolute;
+				top: -50rpx;
+				left: 230rpx;
+			}
+
+			.cdTitle {
+				width: 128rpx;
+				height: 44rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+				line-height: 44rpx;
+				margin: 80rpx 0 0 216rpx;
+			}
+
+			.cdInfo {
+				width: 498rpx;
+				height: 120rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #727272;
+				line-height: 33rpx;
+				margin-left: 48rpx;
+				margin-top: 28rpx;
+			}
+
+			.iKnow {
+				width: 412rpx;
+				height: 72rpx;
+				background: #F55349;
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+				opacity: 1;
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+				line-height: 72rpx;
+				margin: 36rpx 0 0 74rpx;
+				text-align: center;
+			}
+		}
+	}
 </style>
diff --git a/pages/order/index2.vue b/pages/order/index2.vue
new file mode 100644
index 0000000..cfa6b64
--- /dev/null
+++ b/pages/order/index2.vue
@@ -0,0 +1,523 @@
+<template>
+  <view class="container" :style="appThemeStyle">
+    <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption"
+      @up="upCallback">
+      <!-- tab栏 -->
+      <u-tabs :list="tabs" :is-scroll="false" :current="curTab" :active-color="appTheme.mainBg" :duration="0.2" @change="onChangeTab" />
+      <!-- 订单列表 -->
+      <view class="order-list">
+        <view class="order-item" v-for="(item, index) in list.data" :key="index">
+          <view class="item-top">
+            <view class="item-top-left">
+              <text class="order-time">{{ item.create_time }}</text>
+            </view>
+            <view class="item-top-right">
+              <text class="state-text" :style="{{(item.pay_status == PayStatusEnum.PENDING.value?'color:#05C669':'color:#FF2F2F')}}">{{ item.state_text }}</text>
+            </view>
+          </view>
+          <!-- 商品列表 -->
+          <view class="goods-list" @click="handleTargetDetail(item.order_id)">
+            <view class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
+              <!-- 商品图片 -->
+              <view class="goods-image">
+                <image class="image" :src="goods.goods_image" mode="scaleToFill"></image>
+              </view>
+              <!-- 商品信息 -->
+              <view class="goods-content">
+                <view class="goods-title"><text class="twoline-hide">{{ goods.goods_name }}</text></view>
+                <view class="goods-props clearfix">
+                  <view class="goods-props-item" v-for="(props, idx) in goods.goods_props" :key="idx">
+                    <text>{{ props.value.name }}</text>
+                  </view>
+                </view>
+              </view>
+              <!-- 交易信息 -->
+              <view class="goods-trade">
+                <view class="goods-price">
+                  <text class="unit">￥</text>
+                  <text class="value">{{ goods.is_user_grade ? goods.grade_goods_price : goods.goods_price }}</text>
+                </view>
+                <view class="goods-num">
+                  <text>×{{ goods.total_num }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 订单合计 -->
+          <view class="order-total">
+            <text>共{{ item.total_num }}件商品，总金额</text>
+            <text class="unit">￥</text>
+            <text class="money">{{ item.pay_price }}</text>
+          </view>
+          <!-- 订单操作 -->
+          <view v-if="item.order_status != OrderStatusEnum.CANCELLED.value" class="order-handle">
+            <view class="btn-group clearfix">
+              <!-- 未支付取消订单 -->
+              <block v-if="item.pay_status == PayStatusEnum.PENDING.value">
+                <view class="btn-item" @click="onCancel(item.order_id)">取消</view>
+              </block>
+              <!-- 已支付进行中的订单 -->
+              <block v-if="item.order_status != OrderStatusEnum.APPLY_CANCEL.value">
+                <block v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+                  <view class="btn-item" @click="onCancel(item.order_id)">申请取消</view>
+                </block>
+                <!-- 订单核销码 -->
+                <block v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value
+                 && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+                  <view class="btn-item active" @click="onExtractQRCode(item.order_id)">
+                    <text class="iconfont icon-qr-extract"></text>
+                    <text class="m-l-10">核销码</text>
+                  </view>
+                </block>
+              </block>
+              <!-- 已申请取消 -->
+              <view v-else class="f-28 col-8">取消申请中</view>
+              <!-- 未支付的订单 -->
+              <block v-if="item.pay_status == PayStatusEnum.PENDING.value">
+                <view class="btn-item active" @click="onPay(item.order_id)">去支付</view>
+              </block>
+              <!-- 确认收货 -->
+              <block v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value">
+                <view class="btn-item active"  @click="onReceipt(item.order_id)">确认收货</view>
+              </block>
+              <!-- 订单评价 -->
+              <block v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.is_comment == 0">
+                <view class="btn-item" @click="handleTargetComment(item.order_id)">评价</view>
+              </block>
+            </view>
+          </view>
+        </view>
+      </view>
+    </mescroll-body>
+    <!-- 核销二维码弹窗 -->
+    <u-popup v-model="showQRCodePopup" mode="center" border-radius="26" :closeable="true">
+      <view class="qrcode-popup">
+        <view class="title">自提核销二维码</view>
+        <view class="pop-content">
+          <image v-if="qrcodeImage" class="image" :src="qrcodeImage"></image>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+  import {
+    DeliveryStatusEnum,
+    DeliveryTypeEnum,
+    OrderStatusEnum,
+    PayStatusEnum,
+    ReceiptStatusEnum
+  } from '@/common/enum/order'
+  import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
+  import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
+  import * as OrderApi from '@/api/order'
+
+  // 每页记录数量
+  const pageSize = 15
+
+  // tab栏数据
+  const tabs = [{
+    name: `全部`,
+    value: 'all'
+  }, {
+    name: `待支付`,
+    value: 'payment'
+  }, {
+    name: `待发货`,
+    value: 'delivery'
+  }, {
+    name: `待收货`,
+    value: 'received'
+  }, {
+    name: `待评价`,
+    value: 'comment'
+  }]
+
+  export default {
+    mixins: [MescrollMixin],
+    data() {
+      return {
+        // 枚举类
+        DeliveryStatusEnum,
+        DeliveryTypeEnum,
+        OrderStatusEnum,
+        PayStatusEnum,
+        ReceiptStatusEnum,
+
+        // 当前页面参数
+        options: { dataType: 'all' },
+        // tab栏数据
+        tabs,
+        // 当前标签索引
+        curTab: 0,
+        // 订单列表数据
+        list: getEmptyPaginateObj(),
+
+        // 上拉加载配置
+        upOption: {
+          // 首次自动执行
+          auto: true,
+          // 每页数据的数量; 默认10
+          page: { size: pageSize },
+          // 数量要大于4条才显示无更多数据
+          noMoreSize: 4,
+          // 空布局
+          empty: {
+            tip: '亲，暂无订单记录'
+          }
+        },
+        // 控制onShow事件是否刷新订单列表
+        canReset: false,
+        // 核销二维码弹窗
+        showQRCodePopup: false,
+        // 核销二维码图片url (通过后端获取)
+        qrcodeImage: '',
+      }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      // 初始化当前选中的标签
+      this.initCurTab(options)
+      // 注册全局事件订阅: 是否刷新订单列表
+      uni.$on('syncRefresh', canReset => {
+        this.canReset = canReset
+      })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+      this.canReset && this.onRefreshList()
+      this.canReset = false
+    },
+
+    /**
+     * 生命周期函数--监听页面的卸载
+     */
+    onUnload() {
+      // 卸载全局事件订阅
+      uni.$off('syncRefresh')
+    },
+
+    methods: {
+
+      // 初始化当前选中的标签
+      initCurTab(options) {
+        const app = this
+        if (options.dataType) {
+          const index = app.tabs.findIndex(item => item.value == options.dataType)
+          app.curTab = index > -1 ? index : 0
+        }
+      },
+
+      /**
+       * 上拉加载的回调 (页面初始化时也会执行一次)
+       * 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
+       * @param {Object} page
+       */
+      upCallback(page) {
+        const app = this
+        // 设置列表数据
+        app.getOrderList(page.num)
+          .then(list => {
+            const curPageLen = list.data.length
+            const totalSize = list.data.total
+            app.mescroll.endBySize(curPageLen, totalSize)
+          })
+          .catch(() => app.mescroll.endErr())
+      },
+
+      // 获取订单列表
+      getOrderList(pageNo = 1) {
+        const app = this
+        return new Promise((resolve, reject) => {
+          OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
+            .then(result => {
+              // 合并新数据
+              const newList = app.initList(result.data.list)
+              app.list.data = getMoreListData(newList, app.list, pageNo)
+              resolve(newList)
+            })
+        })
+      },
+
+      // 初始化订单列表数据
+      initList(newList) {
+        newList.data.forEach(item => {
+          item.total_num = 0
+          item.goods.forEach(goods => {
+            item.total_num += goods.total_num
+          })
+        })
+        return newList
+      },
+
+      // 获取当前标签项的值
+      getTabValue() {
+        return this.tabs[this.curTab].value
+      },
+
+      // 切换标签项
+      onChangeTab(index) {
+        const app = this
+        // 设置当前选中的标签
+        app.curTab = index
+        // 刷新订单列表
+        app.onRefreshList()
+      },
+
+      // 刷新订单列表
+      onRefreshList() {
+        this.list = getEmptyPaginateObj()
+        setTimeout(() => {
+          this.mescroll.resetUpScroll()
+        }, 120)
+      },
+
+      // 取消订单
+      onCancel(orderId) {
+        const app = this
+        uni.showModal({
+          title: '友情提示',
+          content: '确认要取消该订单吗？',
+          success(o) {
+            if (o.confirm) {
+              OrderApi.cancel(orderId)
+                .then(result => {
+                  // 显示成功信息
+                  app.$toast(result.message)
+                  // 刷新订单列表
+                  app.onRefreshList()
+                })
+            }
+          }
+        });
+      },
+
+      // 确认收货
+      onReceipt(orderId) {
+        const app = this
+        uni.showModal({
+          title: '友情提示',
+          content: '确认收到商品了吗？',
+          success(o) {
+            if (o.confirm) {
+              OrderApi.receipt(orderId)
+                .then(result => {
+                  // 显示成功信息
+                  app.$success(result.message)
+                  // 刷新订单列表
+                  app.onRefreshList()
+                })
+            }
+          }
+        });
+      },
+
+      // 获取核销二维码
+      onExtractQRCode(orderId) {
+        const app = this
+        OrderApi.extractQrcode(orderId, { channel: app.platform })
+          .then(result => {
+            app.qrcodeImage = result.data.qrcode
+            app.showQRCodePopup = true
+          })
+      },
+
+      // 点击去支付
+      onPay(orderId) {
+        this.$navTo('pages/checkout/cashier/index', { orderId })
+      },
+
+      // 跳转到订单详情页
+      handleTargetDetail(orderId) {
+        this.$navTo('pages/order/detail', { orderId })
+      },
+
+      // 跳转到订单评价页
+      handleTargetComment(orderId) {
+        this.$navTo('pages/order/comment/index', { orderId })
+      }
+
+    },
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  // 项目内容
+  .order-item {
+    margin: 20rpx auto 20rpx auto;
+    padding: 30rpx 30rpx;
+    width: 94%;
+    box-shadow: 0 1rpx 5rpx 0px rgba(0, 0, 0, 0.05);
+    border-radius: 16rpx;
+    background: #fff;
+  }
+
+  // 项目顶部
+  .item-top {
+    display: flex;
+    justify-content: space-between;
+    font-size: 26rpx;
+    margin-bottom: 40rpx;
+
+    .order-time {
+      color: #777;
+    }
+
+    .state-text {
+      color: $main-bg;
+    }
+  }
+
+  // 商品列表
+  .goods-list {
+
+    // 商品项
+    .goods-item {
+      display: flex;
+      margin-bottom: 40rpx;
+
+      // 商品图片
+      .goods-image {
+        width: 180rpx;
+        height: 180rpx;
+
+        .image {
+          display: block;
+          width: 100%;
+          height: 100%;
+          border-radius: 8rpx;
+        }
+      }
+
+      // 商品内容
+      .goods-content {
+        flex: 1;
+        padding-left: 16rpx;
+        padding-top: 16rpx;
+
+        .goods-title {
+          font-size: 26rpx;
+          max-height: 76rpx;
+        }
+
+        .goods-props {
+          margin-top: 14rpx;
+          height: 40rpx;
+          color: #ababab;
+          font-size: 24rpx;
+          overflow: hidden;
+
+          .goods-props-item {
+            display: inline-block;
+            margin-right: 14rpx;
+            padding: 4rpx 16rpx;
+            border-radius: 12rpx;
+            background-color: #F5F5F5;
+            width: auto;
+          }
+        }
+
+
+      }
+
+      // 交易信息
+      .goods-trade {
+        padding-top: 16rpx;
+        width: 150rpx;
+        text-align: right;
+        color: $uni-text-color-grey;
+        font-size: 26rpx;
+
+        .goods-price {
+          vertical-align: bottom;
+          margin-bottom: 16rpx;
+
+          .unit {
+            margin-right: -2rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
+
+    }
+
+  }
+
+  // 订单合计
+  .order-total {
+    font-size: 26rpx;
+    vertical-align: bottom;
+    text-align: right;
+    height: 40rpx;
+    margin-bottom: 30rpx;
+
+    .unit {
+      margin-left: 8rpx;
+      margin-right: -2rpx;
+      font-size: 26rpx;
+    }
+
+    .money {
+      font-size: 28rpx;
+    }
+  }
+
+  // 订单操作
+  .order-handle {
+    .btn-group {
+
+      .btn-item {
+        border-radius: 10rpx;
+        padding: 8rpx 20rpx;
+        margin-left: 15rpx;
+        font-size: 26rpx;
+        float: right;
+        color: #383838;
+        border: 1rpx solid #a8a8a8;
+
+        &:last-child {
+          margin-left: 0;
+        }
+
+        &.active {
+          color: $main-bg;
+          border: 1rpx solid $main-bg;
+        }
+      }
+
+    }
+
+  }
+
+  // 弹出层 - 核销二维码
+  .qrcode-popup {
+    padding: 36rpx 30rpx;
+
+    .title {
+      font-size: 30rpx;
+      margin-bottom: 26rpx;
+      font-weight: bold;
+      text-align: center;
+    }
+
+    .pop-content {
+      min-height: 260rpx;
+      padding: 0 10rpx;
+
+      .image {
+        display: block;
+        width: 510rpx;
+        height: 510rpx;
+      }
+
+    }
+  }
+</style>
diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue
index 3b62728..6260f1c 100644
--- a/pages/order/refund/refund.vue
+++ b/pages/order/refund/refund.vue
@@ -2,50 +2,57 @@
 	<view class="invoice">
 		<view class="invoice-goods">
 			<view class="a">
-				<image src="/static/home/phone.jpg"></image>
+				<image :src="order.goods_image"></image>
 			</view>
 			<view class="b">
-				<view class="l">产品名称iPhone13</view>
-				<view class="r">【配置套餐】<text>x1</text></view>
+				<view class="l">{{order.goods_name}}</view>
+				<view class="r">【配置套餐】<text>x{{ order.total_num }}</text></view>
 			</view>
 		</view>
 		<view class="invoice-info">
 			<view class="b">
 				<view class="item">
-					<view class="l">申请类型：</view>
+					<view class="l">申请类型</view>
 					<view class="r">
-						我要退款（无需退货）
+						{{((deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (receiptStatus == ReceiptStatusEnum.RECEIVED.value))?'我要退款（需退货)':'我要退款（无需退货)'}}
+
 					</view>
 				</view>
 				<view class="item">
 					<view class="l">收货状态：</view>
 					<view class="r">
-						<picker :value="index" :range="array" @change="bindPickerChange">
-							<view class="lx" :class="index1==-1?'lx-on':''">{{index==-1?'请选择':array[index]}}</view>
+						<picker :range="array" @change="bindPickerChange">
+							<view class="lx" :class="logisticsIndex==-1?'lx-on':''">
+								{{logisticsIndex==-1?'请选择':array[logisticsIndex]}}
+							</view>
 						</picker>
 					</view>
 				</view>
 				<view class="item">
 					<view class="l">申请原因：</view>
 					<view class="r">
-						<picker :value="index1" :range="array1" @change="bindPickerChange1">
-							<view class="lx" :class="index1==-1?'lx-on':''">{{index1==-1?'点击选择申请原因':array[index1]}}</view>
+						<picker :range="array1" @change="bindPickerChange1">
+							<view class="lx" :class="applyIndex==-1?'lx-on':''">
+								{{applyIndex==-1?'点击选择申请原因':array1[applyIndex]}}
+							</view>
 						</picker>
 					</view>
 				</view>
-				
+
 			</view>
-		</view>	
+		</view>
 		<view class="invoice-money">
 			<view class="a">申请金额</view>
 			<view class="b">
 				<view class="l">￥
 					<view class="money" v-if="toggleIndex">{{value}}</view>
-					<input type="number" :focus="true" v-model="value" v-else placeholder-class="box" placeholder="请输入金额" />
+					<input type="number" :focus="true" @blur="onValue" v-model="value" v-else placeholder-class="box"
+						placeholder="请输入金额" />
 				</view>
 				<view class="r" @click="toggleItem()">
 					<image src="@/static/news/icon-edit.png"></image>
-					修改金额</view>
+					修改金额
+				</view>
 			</view>
 		</view>
 		<view class="invoice-remark">
@@ -54,10 +61,13 @@
 				<view class="r">您还可以输入{{value?(200-value.length):200}}字</view>
 			</view>
 			<view class="b">
-				<u-input v-model="value" maxlength="200" type="textarea" :height="height" placeholder="请您详细填写申请说明"  />
+				<u-input v-model="contentNotes" maxlength="200" type="textarea" :height="height"
+					placeholder="请您详细填写申请说明" />
 			</view>
-			<view class="c">
-				<u-upload :action="action" width="160" height="160" :file-list="fileList" :custom-btn="true" max-count="5">
+			<view class="c"
+				v-if="(deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (receiptStatus == ReceiptStatusEnum.RECEIVED.value)">
+				<u-upload :action="action" width="160" height="160" :file-list="fileList" :custom-btn="true"
+					max-count="5">
 					<template v-slot:addBtn>
 						<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
 							<image src="/static/news/icon-upload.png"></image>
@@ -69,7 +79,7 @@
 			</view>
 		</view>
 		<view class="invoice-phone">
-			联系电话<input type="number" placeholder=""/>
+			联系电话<input type="number" placeholder="" v-model="phone" />
 		</view>
 		<view class="invoice-fd" @click="toDetail()">
 			提交申请
@@ -78,358 +88,504 @@
 </template>
 
 <script>
+	import * as refundApi from '@/api/refund'
+	import * as OrderApi from '@/api/order'
+	import {
+		OrderTypeEnum,
+		DeliveryStatusEnum,
+		DeliveryTypeEnum,
+		OrderStatusEnum,
+		PayStatusEnum,
+		ReceiptStatusEnum
+	} from '@/common/enum/order'
+	import {
+		DeliveryMethodEnum
+	} from '@/common/enum/order/delivery'
 	export default {
 		data() {
 			return {
+				// 枚举类
+				OrderTypeEnum,
+				DeliveryStatusEnum,
+				DeliveryTypeEnum,
+				OrderStatusEnum,
+				PayStatusEnum,
+				ReceiptStatusEnum,
+				DeliveryMethodEnum,
+				order: '',
+				orderId: '',
 				height: 150,
-				fileList: [
-					{
-						url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
-					}
-				],
+				fileList: [{
+					url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
+				}],
 				value: "1235",
 				content: "确认您的发票信息无误后再提交",
-				show: true,
 				toggleIndex: true,
-				index: -1,
-				array: ['已收到货','未收到货'],
-				index1: -1,
-				array1: ['不喜欢、效果不好','不想要了',"外观、型号、参数与描述不符",'货物与描述不符','商品有划痕或破损','配件、部件、屏幕问题','质量问题','收到商品少件（含少配件）','商品破损或污渍','商家发错货'],
-				tabIndex: 2
+				logisticsIndex: -1,
+				array: ['已收到货', '未收到货'],
+				applyIndex: -1,
+				array1: ['不喜欢、效果不好', '不想要了', "外观、型号、参数与描述不符", '货物与描述不符', '商品有划痕或破损', '配件、部件、屏幕问题', '质量问题', '收到商品少件（含少配件）',
+					'商品破损或污渍', '商家发错货'
+				],
+				receiveState: '',
+				applyState: '',
+				contentNotes: '',
+				deliveryStatus: '',
+				receiptStatus: '',
+				phone: ''
 			};
 		},
+		onLoad(op) {
+			this.deliveryStatus = op.deliveryStatus;
+			this.receiptStatus = op.receiptStatus;
+			this.orderId = op.orderId
+			this.order = JSON.parse(op.order);
+			this.value = this.order.is_user_grade ? this.order.grade_goods_price : this.order.goods_price;
+		},
 		methods: {
-			onClose() {},
-			tabItem(i){
-				this.tabIndex = i;
-			},
-			toggleItem(i){
-				this.toggleIndex = !this.toggleIndex;
+			onValue(e) {
+				if ((Number(e.detail.value) > Number(this.value)) == false) {
+					this.value = this.order.is_user_grade ? this.order.grade_goods_price : this.order.goods_price
+					uni.showToast({
+						title: '输入金额不能大于付款金额',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				} else {
+					this.value = e.detail.value
+				}
 			},
-			toDetail(i){
+			// 获取当前订单信息
+			toDetail(canReset = false) {
+				const app = this
 				uni.navigateTo({
 					url: "/pages/order/refund/refundDetail"
 				})
+				if (app.logisticsIndex == -1) {
+					uni.showToast({
+						title: '请选择收货状态',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				if (app.applyIndex == -1) {
+					uni.showToast({
+						title: '请选择申请理由',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				if (!app.contentNotes) {
+					uni.showToast({
+						title: '请输入申请说明',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				app.isLoading = true;
+				let obj = {
+					type: (app.deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (app.receiptStatus ==
+						ReceiptStatusEnum.RECEIVED.value) ? 20 : 10,
+					content: app.contentNotes,
+					images: [],
+					phone: app.phone,
+					receiveState: app.receiveState,
+					applyState: app.applyState,
+				}
+				console.log(obj)
+				refundApi.apply(app.orderId, obj)
+					.then(result => {
+						console.log(result)
+						if (result.status == 200) {
+							uni.navigateTo({
+								url: "/pages/order/refund/refundDetail"
+							})
+						} else {
+							uni.showToast({
+								title: '申请失败',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+
+					})
+				// 相应全局事件订阅: 刷新上级页面数据
+				canReset && uni.$emit('syncRefresh', true, true)
 			},
-			bindPickerChange(e){
-				this.index = e.detail.value
+
+			onClose() {},
+			toggleItem(i) {
+				this.toggleIndex = !this.toggleIndex;
 			},
-			bindPickerChange1(e){
-				this.index1 = e.detail.value
+			bindPickerChange(e) {
+				this.receiveState = this.array[e.detail.value]
+				this.logisticsIndex = e.detail.value
+			},
+			bindPickerChange1(e) {
+				this.applyIndex = e.detail.value;
+				this.applyState = this.array1[e.detail.value]
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.invoice{
-	&-goods{
-		padding: 0 20rpx 0 40rpx;
-		overflow: hidden;
-		background-color: #fff;
-		padding: 30rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		.a{
-			width: 145rpx;
-			height: 135rpx;
-			margin-right: 20rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-			}
-		}
-		.b{
-			flex: 1;
+	.invoice {
+		&-goods {
+			padding: 0 20rpx 0 40rpx;
 			overflow: hidden;
-			.l{
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				font-size: 32rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #262626;
-				overflow: hidden;
-			}
-			.r{
-				font-size: 30rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #838383;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-top: 20rpx;
-				text{
-					display: block;
-					font-size: 28rpx;
-					color: #555;
-				}
-			}
-		}
-	}
-	&-info{
-		margin-top: 20rpx;
-		background-color: #fff;
-		overflow: hidden;
-		.a{
+			background-color: #fff;
+			padding: 30rpx;
+			box-sizing: border-box;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			padding: 20rpx 30rpx 20rpx 60rpx;
-			box-sizing: border-box;
-			border-bottom: 1px solid #F3F3F3;
-			font-size: 32rpx;
-			font-weight: 500;
-			color: #262626;
-			text{
-				color: #006AFF;
-				padding-right: 40rpx;
-				position: relative;
-				&::after{
-					content: "";
-					width: 16rpx;
-					height: 16rpx;
-					border-top: 1px solid #006AFF;
-					border-left: 1px solid #006AFF;
-					position: absolute;
-					right: 0;
-					top: 14rpx;
-					z-index: 1;
-					transform: rotate(135deg);
+
+			.a {
+				width: 145rpx;
+				height: 135rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 10rpx;
+				}
+			}
+
+			.b {
+				flex: 1;
+				overflow: hidden;
+
+				.l {
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					font-size: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #262626;
+					overflow: hidden;
+				}
+
+				.r {
+					font-size: 30rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #838383;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 20rpx;
+
+					text {
+						display: block;
+						font-size: 28rpx;
+						color: #555;
+					}
 				}
 			}
 		}
-		.b{
-			padding: 0 30rpx 0 45rpx;
-			box-sizing: border-box;
+
+		&-info {
+			margin-top: 20rpx;
+			background-color: #fff;
 			overflow: hidden;
-			.item{
-				padding: 30rpx 0;
+
+			.a {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
+				padding: 20rpx 30rpx 20rpx 60rpx;
 				box-sizing: border-box;
-				border-top: 1px solid #F3F3F3;
+				border-bottom: 1px solid #F3F3F3;
 				font-size: 32rpx;
 				font-weight: 500;
-				color: #262626;	
-				overflow: hidden;
-				&:first-child{
-					border-top-color: #fff;
-				}
-				.l{
-					width: 180rpx;
-					font-size: 32rpx;
-					font-weight: 400;
-					color: #656565;
+				color: #262626;
+
+				text {
+					color: #006AFF;
+					padding-right: 40rpx;
+					position: relative;
+
+					&::after {
+						content: "";
+						width: 16rpx;
+						height: 16rpx;
+						border-top: 1px solid #006AFF;
+						border-left: 1px solid #006AFF;
+						position: absolute;
+						right: 0;
+						top: 14rpx;
+						z-index: 1;
+						transform: rotate(135deg);
+					}
 				}
-				.r{
-					flex: 1;
+			}
+
+			.b {
+				padding: 0 30rpx 0 45rpx;
+				box-sizing: border-box;
+				overflow: hidden;
+
+				.item {
+					padding: 30rpx 0;
 					display: flex;
 					align-items: center;
+					justify-content: space-between;
+					box-sizing: border-box;
+					border-top: 1px solid #F3F3F3;
 					font-size: 32rpx;
-					font-weight: 400;
+					font-weight: 500;
 					color: #262626;
-					.li{
-						width: 150rpx;
-						height: 78rpx;
-						background: #F3F3F3;
-						border-radius: 8rpx;
-						text-align: center;
-						line-height: 78rpx;
+					overflow: hidden;
+
+					&:first-child {
+						border-top-color: #fff;
+					}
+
+					.l {
+						width: 180rpx;
 						font-size: 32rpx;
 						font-weight: 400;
-						color: #262626;
-						margin-right: 12rpx;
-						&-on{
-							background: #FDF4F4;
-							background: url(/static/invoice/select-active.png) center top no-repeat;
-							background-size: contain;
-						}
+						color: #656565;
 					}
-					input {
-						flex: 1;
-					}
-					picker{
+
+					.r {
 						flex: 1;
-						.tt{
-							width: 180rpx;
-							position: relative;
-							color: #4894FF;
-							text-align: right;
-							&::after{
-								content: "";
-								width: 16rpx;
-								height: 16rpx;
-								border-top: 1px solid #4894FF;
-								border-left: 1px solid #4894FF;
-								position: absolute;
-								right: -50rpx;
-								top: 14rpx;
-								z-index: 1;
-								transform: rotate(135deg);
+						display: flex;
+						align-items: center;
+						font-size: 32rpx;
+						font-weight: 400;
+						color: #262626;
+
+						.li {
+							width: 150rpx;
+							height: 78rpx;
+							background: #F3F3F3;
+							border-radius: 8rpx;
+							text-align: center;
+							line-height: 78rpx;
+							font-size: 32rpx;
+							font-weight: 400;
+							color: #262626;
+							margin-right: 12rpx;
+
+							&-on {
+								background: #FDF4F4;
+								background: url(/static/invoice/select-active.png) center top no-repeat;
+								background-size: contain;
 							}
 						}
-						.lx{
-							width: 100%;
-							position: relative;
-							&-on{
-								color: #B8B8B8;
+
+						input {
+							flex: 1;
+						}
+
+						picker {
+							flex: 1;
+
+							.tt {
+								width: 180rpx;
+								position: relative;
+								color: #4894FF;
+								text-align: right;
+
+								&::after {
+									content: "";
+									width: 16rpx;
+									height: 16rpx;
+									border-top: 1px solid #4894FF;
+									border-left: 1px solid #4894FF;
+									position: absolute;
+									right: -50rpx;
+									top: 14rpx;
+									z-index: 1;
+									transform: rotate(135deg);
+								}
 							}
-							&::after{
-								content: "";
-								width: 16rpx;
-								height: 16rpx;
-								border-top: 1px solid #B8B8B8;
-								border-left: 1px solid #B8B8B8;
-								position: absolute;
-								right: 20rpx;
-								top: 14rpx;
-								z-index: 1;
-								transform: rotate(135deg);
+
+							.lx {
+								width: 100%;
+								position: relative;
+
+								&-on {
+									color: #B8B8B8;
+								}
+
+								&::after {
+									content: "";
+									width: 16rpx;
+									height: 16rpx;
+									border-top: 1px solid #B8B8B8;
+									border-left: 1px solid #B8B8B8;
+									position: absolute;
+									right: 20rpx;
+									top: 14rpx;
+									z-index: 1;
+									transform: rotate(135deg);
+								}
 							}
 						}
 					}
 				}
+
 			}
-			
 		}
-	}
-	&-fd{
-		width: 664rpx;
-		height: 104rpx;
-		background: #F55349;
-		border-radius: 8rpx;
-		text-align: center;
-		margin: 0 auto;
-		margin-top: 60rpx;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #FFFFFF;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	&-money{
-		width: 100%;
-		background: #FFFFFF;
-		margin-top: 20rpx;
-		padding: 26rpx 26rpx 26rpx 48rpx;
-		box-sizing: border-box;
-		overflow: hidden;
-		.a{
-			padding-bottom: 10rpx;
+
+		&-fd {
+			width: 664rpx;
+			height: 104rpx;
+			background: #F55349;
+			border-radius: 8rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 60rpx;
 			font-size: 32rpx;
-			font-weight: 400;
-			color: #838383;
-		}
-		.b{
+			font-weight: 500;
+			color: #FFFFFF;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
-			.l{
-				font-size: 40rpx;
-				font-weight: 600;
-				color: #262626;
-				display: flex;
-				align-items: baseline;
-				input,.money{
-					width: 400rpx;
-					font-size: 52rpx;
-					color: #212121;
-					margin-left: 15rpx;
-				}
-				.box{
-					font-size: 26rpx;
-					color: #B8B8B8;
-					font-weight: normal;
-				}
-			}
-			.r{
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #C2C2C2;
-				display: flex;
-				align-items: center;
-				image{
-					width: 36rpx;
-					height: 36rpx;
-					margin-right: 10rpx;
-				}
-			}
+			justify-content: center;
 		}
-	}
-	&-remark{
-		width: 100%;
-		background: #FFFFFF;
-		overflow: hidden;
-		margin-top: 20rpx;
-		padding: 26rpx 26rpx 26rpx 48rpx;
-		box-sizing: border-box;
-		.a{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 15rpx 0;
-			.l{
+
+		&-money {
+			width: 100%;
+			background: #FFFFFF;
+			margin-top: 20rpx;
+			padding: 26rpx 26rpx 26rpx 48rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+
+			.a {
+				padding-bottom: 10rpx;
 				font-size: 32rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #838383;
-				text{
+			}
+
+			.b {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.l {
+					font-size: 40rpx;
+					font-weight: 600;
+					color: #262626;
+					display: flex;
+					align-items: baseline;
+
+					input,
+					.money {
+						width: 400rpx;
+						font-size: 52rpx;
+						color: #212121;
+						margin-left: 15rpx;
+					}
+
+					.box {
+						font-size: 26rpx;
+						color: #B8B8B8;
+						font-weight: normal;
+					}
+				}
+
+				.r {
 					font-size: 28rpx;
 					font-weight: 400;
-					color: #F55349;
+					color: #C2C2C2;
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 36rpx;
+						height: 36rpx;
+						margin-right: 10rpx;
+					}
 				}
 			}
-			.r{
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #A8A8A8;
-			}
 		}
-		.c{
-			padding-bottom: 20rpx;
+
+		&-remark {
+			width: 100%;
+			background: #FFFFFF;
 			overflow: hidden;
-			.slot-btn{
-				width: 80px;
-				height: 80px;
-				background: #FFFFFF;
-				border-radius: 10rpx;
-				border: 1px solid #C0C0C0;
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #D1D1D1;
-				image{
-					width: 50rpx;
-					height: 50rpx;
-					margin-top: 20rpx;
+			margin-top: 20rpx;
+			padding: 26rpx 26rpx 26rpx 48rpx;
+			box-sizing: border-box;
+
+			.a {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 15rpx 0;
+
+				.l {
+					font-size: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					color: #838383;
+
+					text {
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #F55349;
+					}
+				}
+
+				.r {
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #A8A8A8;
+				}
+			}
+
+			.c {
+				padding-bottom: 20rpx;
+				overflow: hidden;
+
+				.slot-btn {
+					width: 80px;
+					height: 80px;
+					background: #FFFFFF;
+					border-radius: 10rpx;
+					border: 1px solid #C0C0C0;
+					text-align: center;
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #D1D1D1;
+
+					image {
+						width: 50rpx;
+						height: 50rpx;
+						margin-top: 20rpx;
+					}
 				}
 			}
 		}
-	}
-	&-phone{
-		overflow: hidden;
-		background-color: #fff;
-		padding: 30rpx 26rpx 30rpx 48rpx;
-		box-sizing: border-box;
-		margin-top: 20rpx;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #838383;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		input {
-			flex: 1;
-			margin-left: 20rpx;
+
+		&-phone {
+			overflow: hidden;
+			background-color: #fff;
+			padding: 30rpx 26rpx 30rpx 48rpx;
+			box-sizing: border-box;
+			margin-top: 20rpx;
 			font-size: 32rpx;
-			color: #212121;
+			font-weight: 500;
+			color: #838383;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			input {
+				flex: 1;
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				color: #212121;
+			}
 		}
 	}
-}
 </style>
diff --git a/pages/order/refund/refundDetail.vue b/pages/order/refund/refundDetail.vue
index ae87d30..6bea987 100644
--- a/pages/order/refund/refundDetail.vue
+++ b/pages/order/refund/refundDetail.vue
@@ -75,7 +75,8 @@
 </template>
 
 <script>
-	import img from "@/static/news/refund-bg.png"
+	import img from "@/static/news/refund-bg.png"
+	import * as refundApi from '@/api/refund'
 	export default {
 		data() {
 			return {
diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue
index c6773b2..dd7fbbe 100644
--- a/pages/user/vip/goods.vue
+++ b/pages/user/vip/goods.vue
@@ -6,25 +6,19 @@
 			</view>
 		</u-navbar>
 		<view class="goods-hd">
-			<u-swiper :list="list" mode="none" height="400"></u-swiper>
+			<u-swiper :list="swiperList" mode="none" height="400"></u-swiper>
 		</view>
 		<scroll-view scroll-x class="goods-menu">
-			<view class="item" @click="tabItem1(i)" v-for="i in 10" :key="i" :class="tabIndex1==i?'item-on':''">
-				<image src="@/static/home/phone.jpg"></image>
-				<view class="p">手机</view>
+			<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>
+				<view class="p">{{item.name}}</view>
 			</view>
 		</scroll-view>
 		<view class="goods-bd">
 			<scroll-view scroll-y class="a">
-				<view class="item" @click="tabItem(0)" :class="tabIndex==0?'item-on':''">全部商品</view>
-				<view class="item" @click="tabItem(1)" :class="tabIndex==1?'item-on':''">TCL</view>
-				<view class="item" @click="tabItem(2)" :class="tabIndex==2?'item-on':''">创维</view>
-				<view class="item" @click="tabItem(3)" :class="tabIndex==3?'item-on':''">海尔</view>
-				<view class="item" @click="tabItem(4)" :class="tabIndex==4?'item-on':''">长虹</view>
-				<view class="item" @click="tabItem(5)" :class="tabIndex==5?'item-on':''">小米</view>
-				<view class="item" @click="tabItem(6)" :class="tabIndex==6?'item-on':''">东芝</view>
-				<view class="item" @click="tabItem(7)" :class="tabIndex==7?'item-on':''">华为</view>
-				<view class="item" @click="tabItem(8)" :class="tabIndex==8?'item-on':''">雷鸟</view>
+				<view class="item" v-for="(item,index) in categoryChildren" :key="index" @click="tabItem(index,item)"
+					:class="tabIndex==index?'item-on':''">{{item.name}}</view>
 			</scroll-view>
 			<view class="b">
 				<view class="t">
@@ -34,54 +28,28 @@
 					<view class="item" @click="tabFilter(3)" :class="filterIndex==3?'item-on':''">综合</view>
 				</view>
 				<scroll-view scroll-y class="l">
-					<view class="item" v-for="i in 10" :key="i" @click="tabFilter(0)">
-						<image src="@/static/home/phone.jpg"></image>
+					<view class="item" v-for="(item,index) in list" :key="index" @click="goodsDetail(item.goods_id)"
+						:isLoading="isLoading">
+						<image :src="item.goods_image"></image>
 						<view class="title">
-							<text>自营</text>iphone13 绿色 128GB
+							<text>自营</text>{{item.goods_name}}
 						</view>
 						<view class="price">
-							<view class="n">￥<text>7595</text>到手价</view>
-							<view class="o">￥7595</view>
+							<view class="n">￥<text>{{item.goods_price_min}}</text>到手价</view>
+							<view class="o">￥{{item.line_price_min}}</view>
 						</view>
 						<view class="desc">
-							200+条评论 99%好评率
+							{{item.goods_sales}}+条评论 {{item.remaizhishu}}%好评率
 						</view>
 					</view>
 				</scroll-view>
 			</view>
 		</view>
-		<!--  -->
-		<u-popup v-model="isShow" width="548rpx" mode="center" :custom-style="backgroundBg">
-			<view class="goods-share">
-				<view class="l">
-					<view class="a">
-						<image src="https://cdn.uviewui.com/uview/swiper/1.jpg"></image>
-					</view>
-					<view class="b">
-						<view class="item" v-for="i in 2" :key="i" @click="goodsDetail(i)">
-							<image src="@/static/home/phone.jpg"></image>
-							<view class="title">
-								<text>自营</text>iphone13 绿色 128GB
-							</view>
-							<view class="price">
-								<view class="n">￥<text>7595</text></view>
-							</view>
-							<view class="desc">
-								200+条评论 99%好评率
-							</view>
-						</view>
-					</view>
-					<view class="c">
-						<image src="https://cdn.uviewui.com/uview/swiper/1.jpg"></image>
-					</view>
-				</view>
-				<view class="btn">保存到相册</view>
-			</view>
-		</u-popup>
 	</view>
 </template>
 
 <script>
+	import * as Api from '@/api/user/vip'
 	export default {
 		data() {
 			return {
@@ -89,39 +57,103 @@
 					"background": "transparent",
 					"overflow": "auto"
 				},
-				isShow: true,
+				// 正在加载
+				isLoading: true,
 				tabIndex1: 1,
 				tabIndex: 0,
 				filterIndex: 0,
 				keyword: "",
-				list: [{
-						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-						title: '昨夜星辰昨夜风，画楼西畔桂堂东'
-					},
-					{
-						image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-						title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-					{
-						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-						title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-					}
-				],
+				categoryList: [],
+				category_id: 10001,
+				categoryChildren: [],
+				list: [],
+				swiperList: [],
+				orderSort: 1
 			}
 		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow(options) {
+			this.getCarouselList()
+			this.getCategoryList()
+		},
 		methods: {
-			tabItem(index){
+			// 获取背景图
+			getCarouselList() {
+				const app = this;
+				Api.getImage({
+						type: 4
+					})
+					.then(result => {
+						app.swiperList = result.data.imgurl;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			// 获取分类
+			getCategoryList() {
+				const app = this;
+				Api.category()
+					.then(result => {
+						app.categoryList = result.data.list;
+						app.categoryChildren = result.data.list[0].children;
+						this.getBrandList(result.data.list[0].children.category_id)
+					})
+					.finally(() => app.isLoading = false)
+			},
+			// 获取大牌商品
+			getBrandList(categoryId) {
+				const app = this;
+				let pamars = {
+					store_id: 10001,
+					page: 1,
+					is_brand: 1,
+					is_new: 0,
+					categoryId: categoryId,
+					order: app.orderSort
+				}
+				Api.brandList(pamars)
+					.then(result => {
+						app.list = result.data.data;
+					})
+					.finally(() => app.isLoading = false)
+			},
+			tabItem(index, item) {
 				this.tabIndex = index;
+				this.getBrandList(item.category_id)
 			},
-			tabItem1(index){
+			tabItem1(item, index) {
 				this.tabIndex1 = index;
+				let app = this;
+				app.categoryChildren = [];
+				app.categoryChildren = item.children;
+				app.list = [];
+				this.getBrandList(item.children[0].category_id)
 			},
-			tabFilter(index){
+			tabFilter(index) {
 				this.filterIndex = index;
+				this.orderSort = ''
+				if (index == 0) {
+					this.orderSort = 1
+					this.orderSort = this.orderSort == 1 ? 2 : 1
+				}
+				if (index == 1) {
+					this.orderSort = 3
+					this.orderSort = this.orderSort == 1 ? 4 : 3
+				}
+				if (index == 3) {
+					this.orderSort = 5
+					this.orderSort = this.orderSort == 1 ? 6 : 5
+				}
+				if (index == 4) {
+					this.orderSort = 7;
+					this.orderSort = this.orderSort == 1 ? 8 : 7
+				}
+				this.getBrandList(app.categoryChildren[0].category_id)
 			},
-			goodsDetail(i){
+			goodsDetail(orderId) {
 				uni.navigateTo({
-					url:'/pages/goods/detail'
+					url: '/pages/goods/detail?orderId='+orderId
 				})
 			},
 		}
@@ -129,302 +161,349 @@
 </script>
 
 <style lang="scss" scoped>
-.goods{
-	.slot-wrap{
-		width: 400rpx;
-		margin-left: 60rpx;
-	}
-	&-hd{
-		width: 100%;
-		height: 400rpx;
-		image{
-			width: 100%;
-			height: 100%;
+	.goods {
+		.slot-wrap {
+			width: 400rpx;
+			margin-left: 60rpx;
 		}
-	}
-	&-menu{
-		height: 180rpx;
-		white-space: nowrap;
-		margin-top: 30rpx;
-		padding: 0 20rpx;
-		.item{
-			width: 150rpx;
-			height: 180rpx;
-			background: #FFFFFF;
-			display: inline-block;
-			padding: 16rpx;
-			box-sizing: border-box;
-			border: 1px solid #FFFFFF;
-			text-align: center;
-			margin-left: 12rpx;
-			border-radius: 8rpx;
-			image{
-				width: 112rpx;
-				height: 112rpx;
-			}
-			.p{
-				white-space: nowrap;
-				overflow: hidden;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3F3F3F;
-			}
-			&-on{
-				border: 1px solid #F21A1C;
+
+		&-hd {
+			width: 100%;
+			height: 400rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-	}
-	&-bd{
-		padding: 30rpx 0 0;
-		display: flex;
-		height: calc(100vh - 700rpx);
-		box-sizing: border-box;
-		overflow: hidden;
-		.a{
-			width: 150rpx;
-			height: 100%;
-			.item{
-				padding: 20rpx 35rpx;
-				border-left: 3px solid #FFFFFF;
-				line-height: 50rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3F3F3F;
+
+		&-menu {
+			height: 180rpx;
+			white-space: nowrap;
+			margin-top: 30rpx;
+			padding: 0 20rpx;
+
+			.item {
+				width: 150rpx;
+				height: 180rpx;
+				background: #FFFFFF;
+				display: inline-block;
+				padding: 16rpx;
 				box-sizing: border-box;
-				&-on{
-					background-color: #FFFFFF;
-					border-left-color: #F34A40;
+				border: 1px solid #FFFFFF;
+				text-align: center;
+				margin-left: 12rpx;
+				border-radius: 8rpx;
+
+				image {
+					width: 112rpx;
+					height: 112rpx;
+				}
+
+				.p {
+					white-space: nowrap;
+					overflow: hidden;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #3F3F3F;
+				}
+
+				&-on {
+					border: 1px solid #F21A1C;
 				}
 			}
 		}
-		.b{
-			width: 600rpx;
-			height: 100%;
-			background-color: #FFFFFF;
-			.t{
-				display: flex;
-				align-items: center;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3F3F3F;
-				line-height: 100rpx;
-				.item{
-					flex: 1;
+
+		&-bd {
+			padding: 30rpx 0 0;
+			display: flex;
+			height: calc(100vh - 700rpx);
+			box-sizing: border-box;
+			overflow: hidden;
+
+			.a {
+				width: 150rpx;
+				height: 100%;
+
+				.item {
+					padding: 20rpx 35rpx;
+					border-left: 3px solid #FFFFFF;
+					line-height: 50rpx;
 					text-align: center;
-					&-on{
-						color: #F34A40;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #3F3F3F;
+					box-sizing: border-box;
+
+					&-on {
+						background-color: #FFFFFF;
+						border-left-color: #F34A40;
 					}
 				}
 			}
-			.l{
-				height: calc(100% - 120rpx);
-				box-sizing: border-box;
-				overflow: hidden;
-				.item{
-					width: 270rpx;
-					height: 389rpx;
-					background: #FFFFFF;
-					border-radius: 7rpx;
-					opacity: 1;
-					border: 1px solid #ECECEC;
-					padding: 10rpx 15rpx;
-					box-sizing: border-box;
-					float: left;
-					margin-left: 20rpx;
-					margin-bottom: 20rpx;
-					image{
-						width: 230rpx;
-						height: 230rpx;
-						display: block;
-						margin: 0 auto;
+
+			.b {
+				width: 600rpx;
+				height: 100%;
+				background-color: #FFFFFF;
+
+				.t {
+					display: flex;
+					align-items: center;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #3F3F3F;
+					line-height: 100rpx;
+
+					.item-on {
+						color: #F21A1C;
 					}
-					.title{
-						padding: 10rpx 0;
-						line-height: 40rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #1E1E1E;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						overflow: hidden;
-						text{
-							background-color: #F34A40;
-							font-size: 20rpx;
-							padding: 0 10rpx;
-							height: 40rpx;
+
+					.item {
+						flex: 1;
+						text-align: center;
+
+						&-on {
+							color: #F34A40;
+						}
+					}
+				}
+
+				.l {
+					height: calc(100% - 120rpx);
+					box-sizing: border-box;
+					overflow: hidden;
+
+					.item {
+						width: 270rpx;
+						height: 389rpx;
+						background: #FFFFFF;
+						border-radius: 7rpx;
+						opacity: 1;
+						border: 1px solid #ECECEC;
+						padding: 10rpx 15rpx;
+						box-sizing: border-box;
+						float: left;
+						margin-left: 20rpx;
+						margin-bottom: 20rpx;
+
+						image {
+							width: 230rpx;
+							height: 230rpx;
+							display: block;
+							margin: 0 auto;
+						}
+
+						.title {
+							padding: 10rpx 0;
 							line-height: 40rpx;
-							text-align: center;
-							border-radius: 4rpx;
+							font-size: 20rpx;
+							font-family: PingFang SC, PingFang SC;
 							font-weight: 400;
-							color: #FFFFFF;
-							margin-right: 5rpx;
-							display: inline-block;
+							color: #1E1E1E;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+
+							text {
+								background-color: #F34A40;
+								font-size: 20rpx;
+								padding: 0 10rpx;
+								height: 40rpx;
+								line-height: 40rpx;
+								text-align: center;
+								border-radius: 4rpx;
+								font-weight: 400;
+								color: #FFFFFF;
+								margin-right: 5rpx;
+								display: inline-block;
+							}
 						}
-					}
-					.price{
-						display: flex;
-						align-items: center;
-						white-space: nowrap;
-						.n{
+
+						.price {
 							display: flex;
-							align-items: baseline;
-							font-size: 11px;
-							font-weight: 500;
-							color: #F21A1C;
-							text{
-								font-size: 29rpx;
+							align-items: center;
+							white-space: nowrap;
+
+							.n {
+								display: flex;
+								align-items: baseline;
+								font-size: 11px;
+								font-weight: 500;
+								color: #F21A1C;
+
+								text {
+									font-size: 29rpx;
+								}
+							}
+
+							.o {
+								font-size: 12px;
+								color: #949494;
+								text-decoration: line-through;
 							}
 						}
-						.o{
-							font-size: 12px;
+
+						.desc {
+							font-size: 10px;
+							font-weight: 400;
 							color: #949494;
-							text-decoration: line-through;
+							white-space: nowrap;
+							margin-top: 10rpx;
 						}
 					}
-					.desc{
-						font-size: 10px;
-						font-weight: 400;
-						color: #949494;
-						white-space: nowrap;
-						margin-top: 10rpx;
-					}
 				}
 			}
 		}
-	}
-	&-share{
-		width: 548rpx;
-		height: 810rpx;
-		overflow: hidden;
-		.l{
+
+		&-share {
 			width: 548rpx;
-			background: #FFFFFF;
-			margin: 0 auto;
+			height: 810rpx;
 			overflow: hidden;
-			position: relative;
-			.a{
-				width: 490rpx;
-				height: 243rpx;
+
+			.l {
+				width: 548rpx;
+				background: #FFFFFF;
 				margin: 0 auto;
-				padding-top: 24rpx;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.b{
-				padding: 20rpx 20rpx;
 				overflow: hidden;
-				.item{
-					width: 220rpx;
-					height: 369rpx;
-					background: #FFFFFF;
-					border-radius: 7rpx;
-					opacity: 1;
-					border: 1px solid #ECECEC;
-					padding: 10rpx 0;
-					box-sizing: border-box;
-					float: left;
-					margin-left: 20rpx;
-					margin-bottom: 10rpx;
-					image{
-						width: 180rpx;
-						height: 180rpx;
-						display: block;
-						margin: 0 auto;
+				position: relative;
+
+				.a {
+					width: 490rpx;
+					height: 243rpx;
+					margin: 0 auto;
+					padding-top: 24rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
 					}
-					.title{
+				}
+
+				.b {
+					padding: 20rpx 20rpx;
+					overflow: hidden;
+
+					.item {
+						width: 220rpx;
+						height: 369rpx;
+						background: #FFFFFF;
+						border-radius: 7rpx;
+						opacity: 1;
+						border: 1px solid #ECECEC;
 						padding: 10rpx 0;
-						line-height: 40rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #1E1E1E;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						overflow: hidden;
-						text{
-							background-color: #F34A40;
-							font-size: 20rpx;
-							padding: 0 10rpx;
-							height: 40rpx;
+						box-sizing: border-box;
+						float: left;
+						margin-left: 20rpx;
+						margin-bottom: 10rpx;
+
+						image {
+							width: 180rpx;
+							height: 180rpx;
+							display: block;
+							margin: 0 auto;
+						}
+
+						.title {
+							padding: 10rpx 0;
 							line-height: 40rpx;
-							text-align: center;
-							border-radius: 4rpx;
+							font-size: 20rpx;
+							font-family: PingFang SC, PingFang SC;
 							font-weight: 400;
-							color: #FFFFFF;
-							margin-right: 5rpx;
-							display: inline-block;
+							color: #1E1E1E;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+
+							text {
+								background-color: #F34A40;
+								font-size: 20rpx;
+								padding: 0 10rpx;
+								height: 40rpx;
+								line-height: 40rpx;
+								text-align: center;
+								border-radius: 4rpx;
+								font-weight: 400;
+								color: #FFFFFF;
+								margin-right: 5rpx;
+								display: inline-block;
+							}
 						}
-					}
-					.price{
-						display: flex;
-						align-items: center;
-						white-space: nowrap;
-						padding: 0 5rpx;
-						.n{
+
+						.price {
 							display: flex;
-							align-items: baseline;
-							font-size: 11px;
-							font-weight: 500;
-							color: #F21A1C;
-							text{
-								font-size: 29rpx;
+							align-items: center;
+							white-space: nowrap;
+							padding: 0 5rpx;
+
+							.n {
+								display: flex;
+								align-items: baseline;
+								font-size: 11px;
+								font-weight: 500;
+								color: #F21A1C;
+
+								text {
+									font-size: 29rpx;
+								}
+							}
+
+							.o {
+								font-size: 12px;
+								color: #949494;
+								text-decoration: line-through;
 							}
 						}
-						.o{
-							font-size: 12px;
+
+						.desc {
+							padding: 0 5rpx;
+							font-size: 10px;
+							font-weight: 400;
 							color: #949494;
-							text-decoration: line-through;
+							white-space: nowrap;
+							margin-top: 10rpx;
+							overflow: hidden;
 						}
 					}
-					.desc{
-						padding: 0 5rpx;
-						font-size: 10px;
-						font-weight: 400;
-						color: #949494;
-						white-space: nowrap;
-						margin-top: 10rpx;overflow: hidden;
+
+				}
+
+				.c {
+					background-color: #F1F1F1;
+					height: 150rpx;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+
+					image {
+						width: 140rpx;
+						height: 122rpx;
+						margin-right: 30rpx;
 					}
 				}
-			
 			}
-			.c{
-				background-color: #F1F1F1;
-				height: 150rpx;
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-				image{
-					width: 140rpx;
-					height: 122rpx;
-					margin-right: 30rpx;
-				}
+
+			.btn {
+				width: 640rpx;
+				line-height: 80rpx;
+				text-align: center;
+				background: #F34A40;
+				position: fixed;
+				left: 50%;
+				margin-left: -320rpx;
+				top: 50%;
+				z-index: 2;
+				border-radius: 8rpx;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+				margin-top: 450rpx;
 			}
 		}
-		.btn{
-			width: 640rpx;
-			line-height: 80rpx;
-			text-align: center;
-			background: #F34A40;
-			position: fixed;
-			left: 50%;
-			margin-left: -320rpx;
-			top: 50%;
-			z-index: 2;
-			border-radius: 8rpx;
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #FFFFFF;
-			margin-top: 450rpx;
-		}
 	}
-}
 </style>
 <style>
-.goods .uni-scroll-view .uni-scroll-view{
-	overflow: auto!important;
-}
-</style>
\ No newline at end of file
+	.goods .uni-scroll-view .uni-scroll-view {
+		overflow: auto !important;
+	}
+</style>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..8a72c2a
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,28 @@
+{
+    "appid": "wxdcf7d5820d7530cd",
+    "compileType": "miniprogram",
+    "libVersion": "3.3.3",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "minified": true,
+        "enhance": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [],
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        }
+    },
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "auto",
+        "tabSize": 4
+    }
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..4d57805
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "yanzong_qianduan",
+    "setting": {
+        "compileHotReLoad": true
+    }
+}
\ No newline at end of file