diff --git a/components/shopro-goods-card/shopro-goods-card.vue b/components/shopro-goods-card/shopro-goods-card.vue
index 878487d..a9df3ca 100644
--- a/components/shopro-goods-card/shopro-goods-card.vue
+++ b/components/shopro-goods-card/shopro-goods-card.vue
@@ -31,7 +31,8 @@
 						<view class="" v-if="!detail.is_sku">
 							<button class="u-reset-button cart-btn u-flex u-col-center u-row-center"
 								v-if="!isCart(detail.id)" @tap.stop="addCart(detail.sku_price[0])">
-								<view class="u-iconfont uicon-shopping-cart-fill" style="color: #fff;"></view>
+								<text style="font-size:30rpx;color:#ffffff">+</text>
+								<!-- <view class="u-iconfont uicon-shopping-cart-fill" style="color: #fff;"></view> -->
 							</button>
 							<view class="num-step" @tap.stop v-else>
 								<u-number-box :value="checkCart[detail.id].num" :min="0" :step="1" :long-press="false"
@@ -287,8 +288,8 @@
 		.title {
 			width: 330rpx;
 			vertical-align: center;
-			font-size: 28rpx;
-			font-weight: bold;
+			font-size: 30rpx;
+			// font-weight: bold;
 			line-height: 40rpx;
 			color: #333333;
 			padding-top: 6rpx;
@@ -307,6 +308,8 @@
 		}
 
 		.price-box {
+			display: flex;
+			align-items: center;
 			.price {
 				font-size: 30rpx;
 				color: #ff3000;
@@ -323,6 +326,7 @@
 				font-weight: 400;
 				text-decoration: line-through;
 				color: #c4c4c4;
+				margin-left:10rpx;
 			}
 
 			.sales-box {
@@ -341,7 +345,8 @@
 				height: 54rpx;
 				border-radius: 50%;
 				padding: 0;
-				background: linear-gradient(90deg, #17C161, #eecc89);
+				// background: linear-gradient(90deg, #17C161, #eecc89);
+				background: #17C161;
 			}
 		}
 	}
diff --git a/env.js b/env.js
index 20e85bf..3149715 100644
--- a/env.js
+++ b/env.js
@@ -1,12 +1,12 @@
 
 
-export const BASE_URL = 'https://jf.tgjiaofuji.com'
+export const BASE_URL = 'https://shetuan.njrzwl.cn'
 
 // 接口路径
 export const API_URL = `${BASE_URL}/addons/shopro/`
 
 // 全局网络图片地址变量，css背景图片地址变量在uni.scss中定义
-export const IMG_URL = 'https://jf.tgjiaofuji.com'
+export const IMG_URL = 'https://shetuan.njrzwl.cn'
 
 //高德地图开发者Web服务key,逆坐标解析必须
 // export const MAP_KEY = '3c01d0f0e3a43db3208c27ac0d0e8686'
diff --git a/manifest.json b/manifest.json
index a7001d7..2c85af2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -163,7 +163,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx7240e854df6e67f7",
+        "appid" : "wx651082f690c13ab8",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages/app/score/list.vue b/pages/app/score/list.vue
index 7742af8..af62332 100644
--- a/pages/app/score/list.vue
+++ b/pages/app/score/list.vue
@@ -1,6 +1,18 @@
 <!-- 积分商品列表 -->
 <template>
 	<view class="score-wrap">
+		<view class="scoreInfo">
+			<image src="../../../static/images/score.png" mode="heightFix"></image>
+			<view class="scoreNum">
+				<view style="font-weight: bold;font-size:30rpx;margin-bottom:20rpx;">可用积分</view>
+				<view class="">{{ userInfo.score || '0' }}</view>
+			</view>
+			<view class="scoreInfo">
+				<view style="padding-left:0;">积分明细</view>
+				<view class="">|</view>
+				<view class="">兑换记录</view>
+			</view>
+		</view>
 		<view class="goods-wrap u-p-20 u-flex u-flex-wrap">
 			<view class="goods-item u-m-b-20" v-for="leftGoods in scoreList" :key="leftGoods.id">
 				<shopro-goods-card
@@ -14,7 +26,7 @@
 								<image class="bean-img u-m-r-10" :src="$IMG_URL + '/imgs/score/score.png'" mode=""></image>
 								{{ leftGoods.price }}
 							</view>
-							<view class="sales-box u-m-10">已兑换{{ leftGoods.sales }}件</view>
+							<!-- <view class="sales-box u-m-10">已兑换{{ leftGoods.sales }}件</view> -->
 						</view>
 					</template>
 				</shopro-goods-card>
@@ -34,6 +46,7 @@
 </template>
 
 <script>
+	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 export default {
 	components: {},
 	data() {
@@ -55,7 +68,9 @@ export default {
 			}
 		});
 	},
-	computed: {},
+	computed: {
+		...mapGetters(['userInfo']),
+	},
 	methods: {
 		//积分商品列表
 		getScoreShopsList() {
@@ -102,4 +117,32 @@ export default {
 		}
 	}
 }
+.scoreInfo{
+	height:366rpx;
+	position: relative;
+	color:#333333;
+	font-size:26rpx;
+	background-color: #ffffff;
+	&>image{
+		position:absolute;
+		right:0;bottom:0;
+		height:300rpx;
+		width:auto;
+	}
+	.scoreNum{
+		position:absolute;
+		top:20rpx;
+		left:20rpx;
+	}
+	.scoreInfo{
+		display: flex;
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		height: auto;
+		&>view{
+			padding:20rpx;
+		}
+	}
+}
 </style>
diff --git a/pages/index/category/one-catgory.vue b/pages/index/category/one-catgory.vue
index d37c0fd..3128010 100644
--- a/pages/index/category/one-catgory.vue
+++ b/pages/index/category/one-catgory.vue
@@ -164,23 +164,23 @@ export default {
 
 	.list-active {
 		background: #fff;
-		color: #333333 !important;
-		font-weight: bold !important;
+		color: #222222 !important;
+		// font-weight: bold !important;
 	}
 
 	.line-active {
-		background: #e6b873;
+		// background: #e6b873;
 	}
 
 	.type-list {
-		height: 84upx;
+		height: 120upx;
 		position: relative;
 		width: 200rpx;
 		padding-left: 16rpx;
-		line-height: 84rpx;
+		line-height: 120rpx;
 		font-size: 28upx;
 		font-weight: 400;
-		color: rgba(102, 102, 102, 1);
+		color: #666666;
 
 		.line {
 			width: 10upx;
diff --git a/pages/index/components/sh-goods-card.vue b/pages/index/components/sh-goods-card.vue
index 86c3015..f89552e 100644
--- a/pages/index/components/sh-goods-card.vue
+++ b/pages/index/components/sh-goods-card.vue
@@ -317,13 +317,15 @@
 				height: 54rpx;
 				border-radius: 50%;
 				padding: 0;
-				background: linear-gradient(90deg, #17C161, #eecc89);
+				// background: linear-gradient(90deg, #17C161, #eecc89);
+				background-color: #17C161;
 			}
 
 			.buy-btn {
 				width: 120rpx;
 				line-height: 50rpx;
-				background: linear-gradient(90deg, #17C161, #eecc89);
+				// background: linear-gradient(90deg, #17C161, #eecc89);
+				background-color: #17C161;
 				border-radius: 25rpx;
 				font-size: 24rpx;
 				font-weight: 500;
diff --git a/pages/index/components/sh-grid-swiper.vue b/pages/index/components/sh-grid-swiper.vue
index 89b01f9..29e1303 100644
--- a/pages/index/components/sh-grid-swiper.vue
+++ b/pages/index/components/sh-grid-swiper.vue
@@ -30,7 +30,11 @@
 				<text :class="categoryCurrent === index ? 'category-dot-active' : 'category-dot'" v-for="(dot, index) in newList.length" :key="index"></text>
 			</view>
 		</view>
+		<view style="width:100%;">
+			<image src="/static/images/30.png" mode="widthFix" style="width:100%;height:auto"></image>
 		</view>
+		</view>
+		
 	</view>
 </template>
 
diff --git a/pages/index/components/sh-hot-goods.vue b/pages/index/components/sh-hot-goods.vue
index f323be6..8bbe6d0 100644
--- a/pages/index/components/sh-hot-goods.vue
+++ b/pages/index/components/sh-hot-goods.vue
@@ -1,6 +1,10 @@
 <template>
 	<!-- 为你推荐 -->
 	<view class="hot-goods u-m-b-10 u-p-x-16">
+		<view style="display:flex;justify-content: space-between;align-items: center;margin-left:-16rpx;padding: 37rpx 0;">
+			<text style="color: #2E2E2E;font-size:34rpx;font-weight: bold;border-left:12rpx solid #17C161;padding-left:34rpx;">精选热卖</text>
+			<text style="font-size: 24rpx;color: #999999;">查看更多>></text>
+		</view>
 		<view class="u-waterfall" v-if="goodsType === 1">
 			<view id="u-left-column" class="u-column">
 				<view class="goods-item u-m-b-16 u-flex u-row-center u-col-center" v-for="leftGoods in leftList" :key="leftGoods.id">
diff --git a/pages/index/components/sh-seckill.vue b/pages/index/components/sh-seckill.vue
index f168a0a..4933ae2 100644
--- a/pages/index/components/sh-seckill.vue
+++ b/pages/index/components/sh-seckill.vue
@@ -5,7 +5,7 @@
 		<view class="title-box u-flex u-row-between u-p-y-20  seckill-title">
 			<view class="u-flex u-col-center">
 				<view class="title-text u-m-r-20 u-ellipsis-1">{{ detail.name }}</view>
-				<u-count-down
+				<!-- <u-count-down
 					class="count-down-demo"
 					:timestamp="timestamp"
 					separator-color="#ffbbbb "
@@ -14,21 +14,21 @@
 					color="#fff"
 					@end="seckillEnd"
 					autoplay
-				></u-count-down>
+				></u-count-down> -->
 			</view>
 			<view class="more-box u-flex" @tap="$Router.push('/pages/activity/seckill/list')">
-				<text class="more-text u-m-r-10">更多抢购</text>
-				<text class="iconfont icon-youjiantou-tianchong more-icon"></text>
+				<text class="more-text u-m-r-10">更多>></text>
+				<!-- <text class="iconfont icon-youjiantou-tianchong more-icon"></text> -->
 			</view>
 		</view>
 		<!-- 活动商品 -->
 		<!-- m -->
 		<scroll-view v-if="seckillType === 1" class="scroll-box" scroll-x scroll-anchoring>
 			<view class="goods-box u-flex">
-				<view class="min-goods u-m-r-14" v-for="mgoods in goodsList" :key="mgoods.id" @tap="jump('/pages/goods/detail', { id: mgoods.id })">
+				<view class="min-goods" v-for="mgoods in goodsList" :key="mgoods.id" @tap="jump('/pages/goods/detail', { id: mgoods.id })">
 					<view class="img-box"><image class="img" :src="mgoods.image" mode=""></image></view>
-					<view class="mgoods-card-bottom u-p-20">
-						<view class="goods-title  u-m-b-10 u-ellipsis-1">{{ mgoods.title }}</view>
+					<view class="mgoods-card-bottom">
+						<!-- <view class="goods-title  u-m-b-10 u-ellipsis-1">{{ mgoods.title }}</view> -->
 						<view class="price-box font-OPPOSANS">
 							<view class="price u-m-b-10">{{ mgoods.price }}</view>
 							<view class="original-price">￥{{ mgoods.original_price }}</view>
@@ -149,7 +149,8 @@ export default {
 
 <style lang="scss" scoped>
 .seckill-card {
-	background: linear-gradient(#ffebec 20%, #fff 30%, #fff 100%);
+	background: linear-gradient(0deg, #FFDDDD, #FFFFFF, #FFFFFF);
+	// background: linear-gradient(#ffebec 20%, #fff 30%, #fff 100%);
 }
 
 .seckill-title {
@@ -159,57 +160,65 @@ export default {
 }
 .activity-wrap {
 	background-color: #fff;
-	min-height: 300rpx;
+	min-height: 291rpx;
+	margin: 0 24rpx;
+    border-radius: 20rpx;
+	margin-top:22rpx;
 	.title-box {
 		.title-text {
-			font-size: 32rpx;
+			font-size: 30rpx;
 			font-weight: bold;
-			color: #333333;
+			color: #2E2E2E;
 		}
 		.more-box {
 			.more-text {
-				font-size: 22rpx;
+				font-size: 24rpx;
 				font-weight: 500;
-				color: #333333;
+				color: #2E2E2E;
 			}
 			.more-icon {
 				font-size: 24rpx;
-				color: #333333;
+				color: #2E2E2E;
 			}
 		}
 	}
 
 	.scroll-box,
 	.goods-box {
-		height: 380rpx;
+		// height: 380rpx;
 		width: 100%;
+		// height: 200rpx;
+		height: 220rpx;
 	}
 }
 
 // 小商品卡片
 .min-goods {
-	width: 220rpx;
-	height: 380rpx;
-	background: #fff7f7;
-	box-shadow: 0px 7rpx 7rpx 0px rgba(255, 80, 94, 0.32);
-	border-radius: 10rpx;
+	// width: 220rpx;
+	width: 160rpx;
+	margin: 0 24rpx;
+	// height: 380rpx;
+	// background: #fff7f7;
+	// box-shadow: 0px 7rpx 7rpx 0px rgba(255, 80, 94, 0.32);
+	// border-radius: 10rpx;
 	.img-box {
-		width: 220rpx;
-		height: 220rpx;
+		// width: 100rpx;
+		// height: 100rpx;
 		overflow: hidden;
 		position: relative;
 		border-radius: 10rpx 10rpx 0 0;
 		.img {
-			width: 220rpx;
-			height: 220rpx;
+			width: 122rpx;
+			height: 123rpx;
 			background-color: #ccc;
 		}
 	}
 	.mgoods-card-bottom {
-		height: 160rpx;
-		background: url($IMG_URL+'/imgs/tag/seckill_goods_bg.png') no-repeat;
+		// height: 160rpx;
+		// background: url($IMG_URL+'/imgs/tag/seckill_goods_bg.png') no-repeat;
 		background-position: bottom center;
 		background-size: 100% 100%;
+		text-align: center;
 	}
 	.goods-title {
 		font-size: 26rpx;
@@ -221,17 +230,17 @@ export default {
 		.price {
 			font-size: 30rpx;
 			font-weight: 500;
-			color: #ff0000;
+			color: #FE1B26;
 			&::before {
 				content: '￥';
-				font-size: 24rpx;
+				font-size: 26rpx;
 			}
 		}
 		.original-price {
 			font-size: 20rpx;
 			font-weight: 500;
 			text-decoration: line-through;
-			color: #c4c4c4;
+			color: #999999;
 		}
 	}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fdf567a..09182ed 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,6 +23,10 @@
 				:distance="storeInfo.distance_text"
 				:list="headSwiperList"
 			></home-head>
+			<view style="margin:30rpx 24rpx 20rpx 24rpx;" class="notice">
+				<u-notice-bar  :volume-icon="true" mode="vertical" :more-icon="true" :list="list"></u-notice-bar>
+			</view>
+			
 			<!-- 自定义模块 -->
 			<view class="template-box">
 				<block v-for="(item, index) in homeTemplate" :key="item.id">
@@ -156,7 +160,8 @@ export default {
 			isConnected: true, //是否有网
 			showPrivacy: false, //协议
 			scrollTop: 0,
-			spm: ""
+			spm: "",
+			list:['快来领新人福利啦~']
 		};
 	},
 	computed: {
@@ -278,4 +283,10 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.notice{
+	/deep/.u-notice-bar{
+		border-radius:10rpx;
+	}
+}
+</style>
diff --git a/pages/index/index/home-head.vue b/pages/index/index/home-head.vue
index b898e23..914e7c8 100644
--- a/pages/index/index/home-head.vue
+++ b/pages/index/index/home-head.vue
@@ -1,36 +1,42 @@
 <template>
 	<!-- 首页标题栏，轮播图整合插件 -->
 	<view class="banner-swiper-wrap u-m-b-10">
+		<image src="/static/images/bg.png" mode="widthFix" style="width:100%;height:auto"></image>
 		<!-- 标题栏 -->
 		<view class="u-navbar u-navbar-fixed" :style="[navbarStyle]">
 			<view class="nav-bg" :style="[navBg]"></view>
 			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
-			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
-				<view class="u-back-wrap" @tap="
-					  jump('/pages/order/express/store-address2', {
-						lat: locationInfo.latitude,
-						lng: locationInfo.longitude,
-						storeId: storeInfo ? storeInfo.id : 0,
-					  })
-					">
-					<view class="u-icon-wrap u-back-text u-line-1" :style="[navTitleStyle, navTitleColor]">
-						<u-icon name="map-fill" size="40" :color="navTitleColor.color"></u-icon>{{ navTitle || '' }} <text>{{distance}}</text>
+				<view class="home_title" :style="[navTitleStyle, navTitleColor]">首页</view>
+				<view class="u-navbar-inner">
+					<view class="u-back-wrap" @tap="
+						  jump('/pages/order/express/store-address2', {
+							lat: locationInfo.latitude,
+							lng: locationInfo.longitude,
+							storeId: storeInfo ? storeInfo.id : 0,
+						  })
+						">
+						<view class="u-back-text u-line-1" :style="[navTitleStyle, navTitleColor]">
+							<view style="display: flex;align-items: center;">
+								<u-icon name="map-fill" size="33" :color="navTitleColor.color"></u-icon>
+								<view style="font-size: 36rpx;margin-left:16rpx;">{{ navTitle || '' }}</view>
+							</view>
+							<view style="font-size: 26rpx;margin-top:18rpx;margin-left: 50rpx;">{{distance}}</view>
+						</view>
+					</view>
+					<view
+						hover-class="hover-search"
+						class="search-box u-flex u-row-center u-col-center u-m-r-30"
+						@tap="$Router.push('/pages/public/search')"
+					>
+						<view class="u-iconfont uicon-search" :style="[navTitleColor]"></view>
 					</view>
 				</view>
-				<view
-					hover-class="hover-search"
-					class="search-box u-flex u-row-center u-col-center u-m-r-30"
-					@tap="$Router.push('/pages/public/search')"
-				>
-					<view class="u-iconfont uicon-search" :style="[navTitleColor]"></view>
-				</view>
-			</view>
 		</view>
 		<!-- 轮播组件 -->
 		<swiper
 			class="screen-swiper square-dot"
 			@change="onChange"
-			style="height: 520rpx"
+			style="height: 320rpx"
 			:indicator-dots="true"
 			:circular="true"
 			:autoplay="true"
@@ -135,8 +141,8 @@ export default {
 			let style = {};
 			style.height = this.navbarHeight + 'px';
 			// #ifdef MP
-			let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
-			style.marginRight = rightButtonWidth + 'px';
+			// let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+			// style.marginRight = rightButtonWidth + 'px';
 			// #endif
 			return style;
 		},
@@ -217,7 +223,7 @@ export default {
 }
 // 轮播
 .banner-swiper-wrap {
-	height: 520rpx;
+	// height: 520rpx;
 	position: relative;
 	z-index: 100;
 	.search-box {
@@ -264,6 +270,7 @@ export default {
 	align-items: center;
 	position: relative;
 	z-index: 990;
+	margin-top: 38rpx;
 }
 
 .u-back-wrap {
@@ -271,10 +278,31 @@ export default {
 	align-items: center;
 	flex: 1;
 	flex-grow: 0;
-	padding: 14rpx 14rpx 14rpx 24rpx;
+	// padding: 14rpx 14rpx 14rpx 24rpx;
+	padding:0 14rpx;
 	text{
 		margin-left: 20rpx;
 		font-size: 20rpx;
 	}
 }
+.home_title{
+	font-size: 36rpx;
+	font-family: Alibaba PuHuiTi;
+	font-weight: 400;
+	color: #FFFFFF;
+	text-align: center;
+	margin-top: 14rpx;
+	position: relative;
+	z-index: 9999999;
+}
+.screen-swiper{
+	background: #E3E5E7;
+	border-radius: 20rpx;
+	overflow: hidden;
+	margin: 0 24rpx;
+	/* position: relative; */
+	/* top: -20px; */
+	margin-top: -240rpx;
+	min-height: 0;
+}
 </style>
diff --git a/pages/index/list.vue b/pages/index/list.vue
index 5c1523f..216fb95 100644
--- a/pages/index/list.vue
+++ b/pages/index/list.vue
@@ -23,15 +23,16 @@
 					<view class="goods-order" v-for="goods in order.item" :key="goods.id">
 						<view class="order-content">
 							<shopro-mini-card :title="goods.goods_title" :image="goods.goods_image">
-								<template #describe>
+								<!-- <template #describe>
 									<view class="order-sku u-ellipsis-1">
 										<text class="order-num">数量:{{ goods.goods_num || 0 }};</text>
 										{{ goods.goods_sku_text ? goods.goods_sku_text : '' }}
 									</view>
-								</template>
+								</template> -->
 								<template #cardBottom>
-									<view class="order-price-box u-flex ">
+									<view class="order-price-box u-flex " style="justify-content: space-between;">
 										<text class="order-price font-OPPOSANS">￥{{ goods.goods_price || 0 }}</text>
+										<text>x{{goods.goods_num}}</text>
 										<button class="u-reset-button status-btn"
 											v-if="goods.status_name">{{ goods.status_name }}</button>
 									</view>
@@ -45,7 +46,7 @@
 							<text class="all-unit">￥</text>
 							{{ order.discount_fee }} ，运费：
 							<text class="all-unit">￥</text>
-							{{ order.dispatch_amount }} ，{{ order.status <= 0 ? '需付款' : '实付款' }}：
+							{{ order.dispatch_amount }} ，{{ order.status <= 0 ? '合计金额' : '实付款' }}：
 							<view class="all-money font-OPPOSANS">{{ order.total_fee }}</view>
 						</view>
 
@@ -55,7 +56,7 @@
 								<button v-if="orderBtn === 'cancel'" @tap.stop="onCancel(order.id, orderIndex)"
 									class="u-reset-button obtn1">取消订单</button>
 								<button v-if="orderBtn === 'pay'" @tap.stop="onPay(order.id)"
-									class="u-reset-button obtn2">立即支付</button>
+									class="u-reset-button obtn2">去支付</button>
 								<button v-if="orderBtn === 'groupon'"
 									@tap.stop="jump('/pages/activity/groupon/detail', { id: order.ext_arr.groupon_id })"
 									class="u-reset-button obtn2">
@@ -82,8 +83,12 @@
 </template>
 
 <script>
+	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
 	export default {
 		components: {},
+		computed: {
+			...mapGetters(['isLogin']),
+		},
 		data() {
 			return {
 				isEmpty: false,
@@ -94,19 +99,19 @@
 				orderList: [],
 				orderState: [{
 						id: 0,
-						title: '全部',
+						title: '全部订单',
 						type: 'all'
 					},
 					{
 						id: 1,
-						title: '待付款',
+						title: '待支付',
 						type: 'nopay'
 					},
-					{
-						id: 2,
-						title: '待发货',
-						type: 'nosend'
-					},
+					// {
+					// 	id: 2,
+					// 	title: '待发货',
+					// 	type: 'nosend'
+					// },
 					{
 						id: 3,
 						title: '待收货',
@@ -114,7 +119,7 @@
 					},
 					{
 						id: 4,
-						title: '待评价',
+						title: '已完成',
 						type: 'nocomment'
 					}
 				]
@@ -127,7 +132,12 @@
 			this.orderList = [];
 			this.currentPage = 1;
 			this.lastPage = 1;
-			this.getOrderList();
+			if(this.isLogin){
+				this.getOrderList();
+			}else{
+				this.isEmpty = true
+			}
+			
 		},
 		methods: {
 			jump(path, parmas) {
@@ -162,6 +172,8 @@
 						that.lastPage = res.data.last_page;
 						that.loadStatus = that.currentPage < res.data.last_page ? 'loadmore' : 'nomore';
 					}
+				}).catch((res)=>{
+					
 				});
 			},
 
@@ -265,20 +277,22 @@
 			}
 
 			.line-active {
-				background: rgba(230, 184, 115, 1);
+				// background: rgba(230, 184, 115, 1);
+				background-color: #17C161;
 			}
 		}
 	}
 
 	.order-list {
 		background: #fff;
-		margin: 20rpx 0;
-
+		margin: 20rpx 24rpx;
+		border-radius: 20rpx;
 		.order-bottom {
 			padding-bottom: 20rpx;
 
 			.btn-box {
 				justify-content: flex-end;
+				margin-top: 29rpx;
 			}
 
 			.all-msg {
@@ -296,10 +310,10 @@
 					font-size: 26rpx;
 					color: #333;
 					font-weight: 500;
-
+					color:#FE1B26;
 					&::before {
 						content: '￥';
-						font-size: 20rpx;
+						font-size: 18rpx;
 					}
 				}
 			}
@@ -320,7 +334,8 @@
 			.obtn2 {
 				width: 160rpx;
 				line-height: 60rpx;
-				background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+				background: #17C161;
+				// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 				box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 				border-radius: 30rpx;
 				margin-right: 20rpx;
@@ -347,7 +362,7 @@
 		.order-head {
 			padding: 0 25rpx;
 			height: 77rpx;
-			border-bottom: 1rpx solid #dfdfdf;
+			// border-bottom: 1rpx solid #dfdfdf;
 
 			.no {
 				font-size: 26rpx;
@@ -356,12 +371,12 @@
 
 			.state {
 				font-size: 26rpx;
-				color: #a8700d;
+				color: #17C161;
 			}
 		}
 
 		.goods-order {
-			border-bottom: 1px solid rgba(223, 223, 223, 0.5);
+			// border-bottom: 1px solid rgba(223, 223, 223, 0.5);
 			padding: 20rpx 20rpx 0;
 			margin-bottom: 20rpx;
 
@@ -384,11 +399,11 @@
 				.order-price-box {
 					.status-btn {
 						height: 32rpx;
-						border: 1rpx solid rgba(207, 169, 114, 1);
+						border: 1rpx solid #17C161;
 						border-radius: 15rpx;
 						font-size: 20rpx;
 						font-weight: 400;
-						color: rgba(168, 112, 13, 1);
+						color: #17C161;
 						padding: 0 10rpx;
 						margin-left: 20rpx;
 						background: rgba(233, 183, 102, 0.16);
@@ -398,7 +413,7 @@
 						font-size: 26rpx;
 
 						font-weight: 600;
-						color: rgba(51, 51, 51, 1);
+						color:#FE1B26;
 					}
 				}
 			}
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index b022d45..b20f63c 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1678,7 +1678,7 @@ export default {
 
 .add-address-box {
   min-height: 100rpx;
-  background: url($IMG_URL + "/imgs/order/order_address_line.png") no-repeat;
+  // background: url($IMG_URL + "/imgs/order/order_address_line.png") no-repeat;
   background-size: 100% auto;
   background-position: bottom center;
 
@@ -1841,7 +1841,7 @@ export default {
   z-index: 998;
   bottom: 0;
   padding-bottom: calc(env(safe-area-inset-bottom) / 2);
-  padding: 0 30rpx;
+  padding: 0 0 0 30rpx;
 
   .btn-hover {
     color: #fff;
@@ -1862,16 +1862,18 @@ export default {
 
   .sub-btn {
     width: 210rpx;
-    line-height: 70rpx;
-    background: linear-gradient(
-      90deg,
-      rgba(233, 180, 97, 1),
-      rgba(238, 204, 137, 1)
-    );
-    box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-    border-radius: 50rpx;
-    font-size: 28rpx;
+    // line-height: 70rpx;
+    // background: linear-gradient(
+    //   90deg,
+    //   rgba(233, 180, 97, 1),
+    //   rgba(238, 204, 137, 1)
+    // );
+	background: #17C161;
+    // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
+    border-radius: 0px;
+    font-size: 30rpx;
     color: #fff;
+	height:100%;
   }
 }
 
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 5c1523f..fdde648 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -23,15 +23,16 @@
 					<view class="goods-order" v-for="goods in order.item" :key="goods.id">
 						<view class="order-content">
 							<shopro-mini-card :title="goods.goods_title" :image="goods.goods_image">
-								<template #describe>
+								<!-- <template #describe>
 									<view class="order-sku u-ellipsis-1">
 										<text class="order-num">数量:{{ goods.goods_num || 0 }};</text>
 										{{ goods.goods_sku_text ? goods.goods_sku_text : '' }}
 									</view>
-								</template>
+								</template> -->
 								<template #cardBottom>
-									<view class="order-price-box u-flex ">
+									<view class="order-price-box u-flex " style="justify-content: space-between;">
 										<text class="order-price font-OPPOSANS">￥{{ goods.goods_price || 0 }}</text>
+										<text>x{{goods.goods_num}}</text>
 										<button class="u-reset-button status-btn"
 											v-if="goods.status_name">{{ goods.status_name }}</button>
 									</view>
@@ -45,7 +46,7 @@
 							<text class="all-unit">￥</text>
 							{{ order.discount_fee }} ，运费：
 							<text class="all-unit">￥</text>
-							{{ order.dispatch_amount }} ，{{ order.status <= 0 ? '需付款' : '实付款' }}：
+							{{ order.dispatch_amount }} ，{{ order.status <= 0 ? '合计金额' : '实付款' }}：
 							<view class="all-money font-OPPOSANS">{{ order.total_fee }}</view>
 						</view>
 
@@ -55,7 +56,7 @@
 								<button v-if="orderBtn === 'cancel'" @tap.stop="onCancel(order.id, orderIndex)"
 									class="u-reset-button obtn1">取消订单</button>
 								<button v-if="orderBtn === 'pay'" @tap.stop="onPay(order.id)"
-									class="u-reset-button obtn2">立即支付</button>
+									class="u-reset-button obtn2">去支付</button>
 								<button v-if="orderBtn === 'groupon'"
 									@tap.stop="jump('/pages/activity/groupon/detail', { id: order.ext_arr.groupon_id })"
 									class="u-reset-button obtn2">
@@ -94,19 +95,19 @@
 				orderList: [],
 				orderState: [{
 						id: 0,
-						title: '全部',
+						title: '全部订单',
 						type: 'all'
 					},
 					{
 						id: 1,
-						title: '待付款',
+						title: '待支付',
 						type: 'nopay'
 					},
-					{
-						id: 2,
-						title: '待发货',
-						type: 'nosend'
-					},
+					// {
+					// 	id: 2,
+					// 	title: '待发货',
+					// 	type: 'nosend'
+					// },
 					{
 						id: 3,
 						title: '待收货',
@@ -114,7 +115,7 @@
 					},
 					{
 						id: 4,
-						title: '待评价',
+						title: '已完成',
 						type: 'nocomment'
 					}
 				]
@@ -265,20 +266,22 @@
 			}
 
 			.line-active {
-				background: rgba(230, 184, 115, 1);
+				// background: rgba(230, 184, 115, 1);
+				background-color: #17C161;
 			}
 		}
 	}
 
 	.order-list {
 		background: #fff;
-		margin: 20rpx 0;
-
+		margin: 20rpx 24rpx;
+		border-radius: 20rpx;
 		.order-bottom {
 			padding-bottom: 20rpx;
 
 			.btn-box {
 				justify-content: flex-end;
+				margin-top: 29rpx;
 			}
 
 			.all-msg {
@@ -296,10 +299,10 @@
 					font-size: 26rpx;
 					color: #333;
 					font-weight: 500;
-
+					color:#FE1B26;
 					&::before {
 						content: '￥';
-						font-size: 20rpx;
+						font-size: 18rpx;
 					}
 				}
 			}
@@ -320,7 +323,8 @@
 			.obtn2 {
 				width: 160rpx;
 				line-height: 60rpx;
-				background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+				background: #17C161;
+				// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 				box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 				border-radius: 30rpx;
 				margin-right: 20rpx;
@@ -347,7 +351,7 @@
 		.order-head {
 			padding: 0 25rpx;
 			height: 77rpx;
-			border-bottom: 1rpx solid #dfdfdf;
+			// border-bottom: 1rpx solid #dfdfdf;
 
 			.no {
 				font-size: 26rpx;
@@ -356,12 +360,12 @@
 
 			.state {
 				font-size: 26rpx;
-				color: #a8700d;
+				color: #17C161;
 			}
 		}
 
 		.goods-order {
-			border-bottom: 1px solid rgba(223, 223, 223, 0.5);
+			// border-bottom: 1px solid rgba(223, 223, 223, 0.5);
 			padding: 20rpx 20rpx 0;
 			margin-bottom: 20rpx;
 
@@ -384,11 +388,11 @@
 				.order-price-box {
 					.status-btn {
 						height: 32rpx;
-						border: 1rpx solid rgba(207, 169, 114, 1);
+						border: 1rpx solid #17C161;
 						border-radius: 15rpx;
 						font-size: 20rpx;
 						font-weight: 400;
-						color: rgba(168, 112, 13, 1);
+						color: #17C161;
 						padding: 0 10rpx;
 						margin-left: 20rpx;
 						background: rgba(233, 183, 102, 0.16);
@@ -398,7 +402,7 @@
 						font-size: 26rpx;
 
 						font-weight: 600;
-						color: rgba(51, 51, 51, 1);
+						color:#FE1B26;
 					}
 				}
 			}
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index 4839d24..d8ab094 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -267,7 +267,8 @@ export default {
 	font-size: 28rpx;
 	font-weight: 500;
 	background-color: #fff;
-	color: rgba(167, 111, 13, 1);
+	// color: rgba(167, 111, 13, 1);
+	color:#17C161;
 }
 
 // 表单
diff --git a/static/images/30.png b/static/images/30.png
new file mode 100644
index 0000000..6447ee8
Binary files /dev/null and b/static/images/30.png differ
diff --git a/static/images/bg.png b/static/images/bg.png
new file mode 100644
index 0000000..8209d30
Binary files /dev/null and b/static/images/bg.png differ
diff --git a/static/images/score.png b/static/images/score.png
new file mode 100644
index 0000000..6d2dd2c
Binary files /dev/null and b/static/images/score.png differ
diff --git a/uni.scss b/uni.scss
index 775082c..d9db1cb 100644
--- a/uni.scss
+++ b/uni.scss
@@ -4,4 +4,4 @@
  * uView自定义的css类名和scss变量，均以"u-"开头，不会造成冲突，请放心使用 
  */
 @import 'uview-ui/theme.scss';
-$IMG_URL: 'https://jf.tgjiaofuji.com'; //css中背景图片变量。js图片变量在env.js
+$IMG_URL: 'https://shetuan.njrzwl.cn'; //css中背景图片变量。js图片变量在env.js