提交

2 years ago · 0c1ea4f612
parent 1799ee4cf5
commit 0c1ea4f612
51 changed files with 219 additions and 168 deletions
--- a/components/shopro-auth-modal/shopro-auth-modal.vue
+++ b/components/shopro-auth-modal/shopro-auth-modal.vue
@ -974,7 +974,8 @@ export default {
 	.save-btn {
 		width: 690rpx;
 		line-height: 70rpx;
-		background: linear-gradient(90deg, #e9b461, #eecc89);
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, #e9b461, #eecc89);
 		border-radius: 35rpx;
 		font-size: 28rpx;
 		font-weight: 500;
--- a/components/shopro-goods-card/shopro-goods-card.vue
+++ b/components/shopro-goods-card/shopro-goods-card.vue
@ -181,7 +181,7 @@
 				cartGoodId = this.cartList.filter(item => item.goods_id === that.detail.id)[0].id;
 				uni.showModal({
 					title: '删除提示',
-					confirmColor: '#f0c785',
+					confirmColor: '#F45F77',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
 						res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' });
--- a/components/shopro-mini-card/shopro-mini-card.vue
+++ b/components/shopro-mini-card/shopro-mini-card.vue
@ -2,8 +2,8 @@
 	<view class="goods-box u-flex u-col-top" @tap="click">
 		<view class="goods__tag" v-show="tag"><image class="tag-img" :src="tag" mode="widthFix"></image></view>
 		<image class="goods_img"  lazy-load fade-show :src="image" mode="aspectFill"></u-image>
-		<view class="u-m-l-20">
-			<view class="goods-title u-ellipsis-2 u-m-b-10">{{ title }}</view>
+		<view class="u-m-l-20" style="flex:1;width: calc(100% - 180rpx);height:160rpx;display:flex;flex-direction: column;justify-content: space-around;">
+			<view class="goods-title u-ellipsis-2">{{ title }}</view>
 			<view v-if="subtitle" class="describe-text u-m-b-10 u-ellipsis-1">{{ subtitle }}</view>
 			<slot name="describe"></slot>
 			<slot name="cardBottom">
@ -91,22 +91,22 @@ export default {
 		}
 	}
 	.goods_img{
-		width: 180rpx;
-		height: 180rpx;
+		width: 160rpx;
+		height: 160rpx;
 		border-radius: 6rpx;
 	}
 	.goods-title {
 		font-size: 28rpx;
 		font-weight: 500;
 		color: rgba(51, 51, 51, 1);
-		width: 450rpx;
+		width: 100%;
 		line-height: 40rpx;
 	}

 	.describe-text {
 		font-size: 24rpx;
-		width: 450rpx;
-		color: #a8700d;
+		width: 100%;
+		color: #F45F77;
 	}

 	.price {
--- a/components/shopro-share/shopro-share.vue
+++ b/components/shopro-share/shopro-share.vue
@ -510,7 +510,8 @@ export default {
 		width: 300rpx;
 		height: 70rpx;
 		line-height: 70rpx;
-		background: linear-gradient(90deg, #e9b461, #eecc89);
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, #e9b461, #eecc89);
 		border-radius: 35rpx;
 		font-size: 28rpx;
 		font-weight: 500;
--- a/components/shopro-sku/shopro-sku.vue
+++ b/components/shopro-sku/shopro-sku.vue
@ -567,7 +567,8 @@
 		.save-btn {
 			width: 710rpx;
 			height: 70rpx;
-			background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+			background-color: #F45F77;
+			// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 			font-size: 28rpx;
 			font-weight: 500;
 			color: rgba(255, 255, 255, 1);
--- a/pages.json
+++ b/pages.json
@ -889,7 +889,7 @@
 	},
 	"tabBar": {
 		"color": "#333",
-		"selectedColor": "#a8700d",
+		"selectedColor": "#F45F77",
 		"backgroundColor": "#ffffff",
 		"borderStyle": "black",
 		"list": [{
--- a/pages/activity/groupon/my-groupon.vue
+++ b/pages/activity/groupon/my-groupon.vue
@ -178,7 +178,7 @@ export default {
 		}

 		.line-active {
-			background: rgba(230, 184, 115, 1);
+			background: #F45F77;
 		}
 	}
 }
@ -234,10 +234,10 @@ export default {
 		.invite-btn {
 			width: 210rpx;
 			line-height: 65rpx;
-			border: 1rpx solid #a8700d;
+			border: 1rpx solid #F45F77;
 			border-radius: 33rpx;
 			font-size: 26rpx;
-			color: #a8700d;
+			color: #F45F77;
 			padding: 0;
 			margin-right: 20rpx;
 			background: #fff;
--- a/pages/app/commission/goods.vue
+++ b/pages/app/commission/goods.vue
@ -138,7 +138,7 @@ page {
 			width: 400rpx;
 			font-size: 22rpx;
 			font-weight: 500;
-			color: #a8700d;
+			color: #F45F77;
 			margin-bottom: 10rpx;
 		}
 		.goods-price {
--- a/pages/app/coupon/list.vue
+++ b/pages/app/coupon/list.vue
@ -144,7 +144,7 @@ export default {
 	}

 	.line-active {
-		background: #e9b664;
+		background:#F45F77;
 	}
 }
 .nav-wrap {
--- a/pages/app/merchant/apply.vue
+++ b/pages/app/merchant/apply.vue
@ -3,7 +3,7 @@
 	<view class="apply-commission-wrap page_box">
 		<!-- 标题栏 -->
 		<view class="head-box">
-			<shopro-navbar back-icon-color="#fff" :background="{}"></shopro-navbar>
+			<shopro-navbar back-icon-color="#000000" :background="{}"></shopro-navbar>
 		</view>

 		<!-- 表单 -->
@ -474,9 +474,9 @@
 		background-color: #fff;

 		.head-box {
-			background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat;
+			// background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat;
 			background-size: 100% auto;
-			height: 370rpx;
+			// height: 370rpx;
 		}
 	}

--- a/pages/app/merchant/index.vue
+++ b/pages/app/merchant/index.vue
@ -576,7 +576,7 @@ export default {

 		.state {
 			font-size: 26rpx;
-			color: #a8700d;
+			color: #F45F77;
 		}
 	}
 	.goods-order {
--- a/pages/goods/comment/comment-list.vue
+++ b/pages/goods/comment/comment-list.vue
@ -117,7 +117,7 @@ export default {
 	.btn-active {
 		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);
-		color: #a8700d;
+		color: #F45F77;
 	}
 }
 .comment-list {
--- a/pages/goods/components/sh-coupon.vue
+++ b/pages/goods/components/sh-coupon.vue
@ -67,7 +67,7 @@ export default {
 		.category-dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #a8700d;
+			background: #F45F77;
 			margin-right: 10rpx;
 		}
 	}
--- a/pages/goods/components/sh-filter.vue
+++ b/pages/goods/components/sh-filter.vue
@ -152,7 +152,7 @@ export default {
 		}

 		.line-active {
-			background: rgba(213, 166, 90, 1);
+			background: #F45F77;
 		}

 		.p-box {
--- a/pages/goods/components/sh-groupon.vue
+++ b/pages/goods/components/sh-groupon.vue
@ -194,7 +194,7 @@ export default {

 		.num-color {
 			font-size: 24rpx;
-			color: #a8700d;
+			color: #F45F77;
 		}
 	}

--- a/pages/goods/components/sh-price-card.vue
+++ b/pages/goods/components/sh-price-card.vue
@ -204,7 +204,8 @@ export default {
 // 正常商品
 .normal-price-box {
 	padding: 20rpx;
-	background: url($IMG_URL+'/imgs/detail/detail_price_normal_bg.png') no-repeat;
+	background-color: #F45F77;
+	// background: url($IMG_URL+'/imgs/detail/detail_price_normal_bg.png') no-repeat;
 	background-size: 100% 100%;
 	.unit,
 	.notice {
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@ -544,7 +544,8 @@ export default {
 		}

 		.line-active {
-			background: rgba(168, 112, 13, 1);
+			// background: rgba(168, 112, 13, 1);
+			background: #F45F77;
 		}
 	}
 }
@ -636,7 +637,7 @@ export default {
 	}

 	.sub-title {
-		color: #a8700d;
+		color: #F45F77;
 		font-size: 24rpx;
 		font-weight: 500;
 		line-height: 42rpx;
@ -716,8 +717,9 @@ export default {
 		}

 		.pay-btn {
+			background-color: #F45F77;
 			box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-			background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+			// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 		}

 		.score-btn {
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@ -15,9 +15,9 @@

 		<view class="content_box">
 			<!-- 列表 -->
-			<u-checkbox-group @change="checkboxGroupChange" activeColor="#e9b461" v-if="!isEmpty">
+			<u-checkbox-group @change="checkboxGroupChange" activeColor="#F45F77" v-if="!isEmpty">
 				<view class="collect-list u-flex u-row-left u-col-center" v-for="(g, index) in cartList" :key="index">
-					<u-checkbox class="u-p-l-10" :name="g.goods_id" shape="circle" v-model="g.checked">
+					<u-checkbox :name="g.goods_id" shape="circle" v-model="g.checked">
 						<view style="height: 160rpx"></view>
 					</u-checkbox>
 					<view class="goods-wrap">
@ -59,10 +59,10 @@
 		<!-- 底部按钮 -->
 		<view class="foot_box " v-show="!isEmpty">
 			<view class="tools-box u-flex u-row-between">
-				<u-checkbox @change="onAllSel" activeColor="#e9b461" shape="circle" :value="allSelected">
+				<u-checkbox @change="onAllSel" activeColor="#F45F77" shape="circle" :value="allSelected">
 					全选（{{ totalCount.totalNum }}）</u-checkbox>
 				<view class="u-flex">
-					<view class="price font-OPPOSANS" v-show="!isTool">￥{{ totalCount.totalPrice.toFixed(2) }}</view>
+					<view class="price font-OPPOSANS" v-show="!isTool">合计：￥{{ totalCount.totalPrice.toFixed(2) }}</view>
 					<button class="u-reset-button pay-btn" :disabled="!isSel" v-show="!isTool" @tap="onPay">结算</button>
 					<button class="u-reset-button del-btn" v-show="isTool" @tap="goodsDelete">删除</button>
 				</view>
@ -102,7 +102,7 @@
 			onMin(g) {
 				uni.showModal({
 					title: '删除提示',
-					confirmColor: '#f0c785',
+					confirmColor: '#F45F77',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
 						res.confirm && this.changeCartList({ ids: [g.id], art: 'delete' });
@ -192,21 +192,22 @@
 		.tool-box {
 			height: 90rpx;
 			padding: 0 30rpx;
-			background: #f7f5f6;
+			background: #ffffff;

 			.count-box {
-				font-size: 26rpx;
-				color: #999;
+				font-size: 30rpx;
+				color: #333333;

 				.all-num {
-					color: #a8700d;
+					color: #F45F77;
 				}
 			}

 			.set-btn {
 				background: none;
-				font-size: 26rpx;
-				color: #a8700d;
+				font-size: 30rpx;
+				color: #333333;
+				font-weight:bold;
 			}
 		}
 	}
@ -221,20 +222,21 @@
 	// 购物车项
 	.collect-list {
 		background: #fff;
-		width: 750rpx;
-		margin-bottom: 20rpx;
-		padding: 20rpx 10rpx;
+		// width: 750rpx;
+		margin: 20rpx 24rpx;
+		padding: 40rpx 25rpx;
+		border-radius: 20rpx;

 		// 商品卡片包裹
 		.goods-wrap {
 			position: relative;
-
+			width:100%;
 			.order-sku {
 				font-size: 24rpx;
 				font-weight: 400;
 				color: rgba(153, 153, 153, 1);
-				width: 440rpx;
-				margin-bottom: 20rpx;
+				// width: 440rpx;
+				// margin-bottom: 20rpx;

 				.order-num {
 					margin-right: 10rpx;
@ -344,19 +346,21 @@
 		}

 		.price {
-			color: #ff0000;
+			color: #333333;
 			font-size: 500;
-			margin-right: 30rpx;
+			margin-right: 28rpx;
 		}

 		.pay-btn {
-			width: 200rpx;
-			line-height: 70rpx;
-			background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+			width: 186rpx;
+			line-height: 75rpx;
+			background: #F45F77;
+			// 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: 35rpx;
+			border-radius: 38rpx;
 			padding: 0;
-			color: rgba(#fff, 0.9);
+			color: rgba(#fff, 1);
+			font-size: 30rpx;
 		}

 		.del-btn {
--- a/pages/index/category/one-catgory.vue
+++ b/pages/index/category/one-catgory.vue
@ -169,7 +169,7 @@ export default {
 	}

 	.line-active {
-		background: #e6b873;
+		background: #F45F77;
 	}

 	.type-list {
--- a/pages/index/category/takeout-catgory.vue
+++ b/pages/index/category/takeout-catgory.vue
@ -13,7 +13,7 @@
 			</scroll-view>

 			<!-- 右侧商品列表 -->
-			<view class="right-wrap ">
+			<view class="right-wrap">
 				<scroll-view scroll-y class="right-box menu-scroll-view" @scrolltolower="loadMore"
 					v-if="tabbarList.length">
 					<view class="u-flex u-row-center" v-if="tabbarList[currentTab].image">
@ -28,7 +28,7 @@
 								<image class="goods-tag" v-if="item.is_hot && !item.activity"
 									:src="$IMG_URL + '/goods/goods_hot_tag.png'" mode=""></image>
 							</view>
-							<view class="goods-title u-p-x-20 u-m-b-10 u-ellipsis-1">
+							<view class="goods-title u-p-x-20  u-ellipsis-1" style="margin-bottom:20rpx;">
 								<view v-if="item.activity_type" class=" sm cu-tag radius title-tag u-m-r-10"
 									:style="{ backgroundColor: typeMap[item.activity_type].tagBg, color: '#fff' }">
 									{{ typeMap[item.activity_type].text }}
@ -46,12 +46,12 @@
 									<u-line-progress height="20" :show-percent="false" :percent="Number(item.percent)"
 										active-color="#F45F77"></u-line-progress>
 								</view>
-								<view class="googs-send-num u-m-l-20">已售{{ item.sales }}件</view>
+								<view class="googs-send-num u-m-l-20">已售{{ item.sales }}套</view>
 							</view>
-							<view class="u-flex u-row-between u-p-x-20">
+							<view class="u-flex u-row-between u-p-x-20" style="margin-top:24rpx;">
 								<view class="price-box u-flex font-OPPOSANS">
 									<view class="price">{{ item.price }}</view>
-									<view class="origin-price u-m-l-10">￥{{ item.original_price }}</view>
+									<view class="origin-price u-m-l-20">￥{{ item.original_price }}</view>
 								</view>
 								<view class="cart-box">
 									<!-- 单规格 -->
@ -89,8 +89,8 @@
 						tipText="暂无该商品，还有更多好货等着你噢~"></shopro-empty>

 					<!-- 加载更多 -->
-					<u-loadmore class="loadMoreContent" v-if="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower"
-						color="#ccc" />
+					<u-loadmore  v-if="goodsList.length" height="80rpx" :status="loadStatus" icon-type="flower"
+						color="#ccc"/>
 					<view class="hack-tabbar"></view>
 				</scroll-view>
 			</view>
@ -305,7 +305,7 @@
 				cartGoodId = this.cartList.filter(item => item.goods_id === goodsId)[0].id;
 				uni.showModal({
 					title: '删除提示',
-					confirmColor: '#f0c785',
+					confirmColor: '#F45F77',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
 						res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' });
@ -424,7 +424,7 @@
 				position: relative;
 				color: #F45F77;
 				font-size: rpx;
-				font-weight: bold;
+				// font-weight: bold;
 				background: #fff;
 			}

@ -443,7 +443,7 @@
 	.right-wrap {
 		background-color: #fff;
 		height: 100%;
-		width: 100%;
+		width: calc(100% - 180rpx);

 		.category-img {
 			width: 505rpx;
@ -462,13 +462,13 @@

 		.right-box {
 			height: 100%;
+			width: 100%;
 		}
 	}

 	.big-goods-card {
 		background-color: #fff;
 		border-radius: 20rpx;
-		width: calc(100% - 180rpx);
 		box-shadow: 0 0 8rpx 2rpx rgba(199, 199, 199, 0.3);
 		padding-bottom: 20rpx;

@ -496,7 +496,7 @@

 		.goods-title {
 			font-size: 30rpx;
-			font-weight: bold;
+			// font-weight: bold;
 			color: #333333;
 			line-height: 36rpx;
 			padding-top: 6rpx;
@ -602,7 +602,5 @@
 			}
 		}
 	}
-	.loadMoreContent .u-load-more-wrap{
-		width: calc(100% - 180rpx);
-	}
+
 </style>
--- a/pages/index/category/three-catgory.vue
+++ b/pages/index/category/three-catgory.vue
@ -127,7 +127,7 @@ export default {
 	}

 	.line-active {
-		background: #e6b873;
+		background: #F45F77;
 	}

 	.type-list {
--- a/pages/index/category/two-catgory.vue
+++ b/pages/index/category/two-catgory.vue
@ -140,7 +140,7 @@ export default {
 	.line-active {
 		width: 180rpx;
 		height: 64rpx;
-		background: #e6b873;
+		background: #F45F77;
 		border-radius: 0rpx 32rpx 32rpx 0rpx;
 		color: #fff;
 	}
--- a/pages/index/components/sh-category-tabs.vue
+++ b/pages/index/components/sh-category-tabs.vue
@ -329,7 +329,7 @@ export default {
 			color: #333333;
 		}
 		.title-active {
-			color: #a8700d;
+			color: #F45F77;
 		}
 		.tab-des {
 			font-size: 22rpx;
--- a/pages/index/components/sh-coupon.vue
+++ b/pages/index/components/sh-coupon.vue
@ -183,7 +183,7 @@ export default {
 			.notice {
 				font-size: 22rpx;
 				font-weight: 500;
-				color: #a8700d;
+				color: #F45F77;
 			}
 		}
 		.card-right {
@ -193,7 +193,7 @@ export default {
 				font-size: 24rpx;
 				font-weight: 500;
 				text-align: right;
-				color: #a8700d;
+				color: #F45F77;
 				writing-mode: vertical-lr; /*从左向右 从右向左是 writing-mode: vertical-rl;*/
 				writing-mode: tb-lr; /*IE浏览器的从左向右 从右向左是 writing-mode: tb-rl；*/
 			}
--- a/pages/index/components/sh-goods-card.vue
+++ b/pages/index/components/sh-goods-card.vue
@ -182,7 +182,7 @@
 				cartGoodId = this.cartList.filter(item => item.goods_id === that.detail.id)[0].id;
 				uni.showModal({
 					title: '删除提示',
-					confirmColor: '#f0c785',
+					confirmColor: '#F45F77',
 					content: `是否确认从购物车中删除此商品?`,
 					success: res => {
 						res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' });
@ -275,14 +275,15 @@
 		}

 		.card-right {
-			width: 430rpx;
+			// width: 430rpx;
+			width: calc(100% - 225rpx);
 			// height: 220rpx;
 		}

 		.goods-title {
 			font-size: 30rpx;
 			font-weight: 600;
-			width: 400rpx;
+			// width: 400rpx;
 			color: #222222;
 			padding-top: 17rpx;

@ -295,7 +296,7 @@

 		.subtitle-text {
 			font-size: 24rpx;
-			width: 400rpx;
+			// width: 400rpx;
 			font-weight: 500;
 			color: #999999;
 		}
--- a/pages/index/components/sh-grid.vue
+++ b/pages/index/components/sh-grid.vue
@ -39,21 +39,24 @@ export default {
 // 宫格
 .grid-wap {
 	background: #fff;
-	width: 750rpx;
+	/* width: 750rpx; */
 	padding: 30rpx 0 0;
+	border-radius: 20rpx;
+	margin: 0 24rpx;
+	margin-top: 20rpx;
 	.grid-item {
 		width: 25%;
 		margin-bottom: 40rpx;
 		.tool-img {
-			width: 44rpx;
-			height: 44rpx;
+			width: 50rpx;
+			height: 50rpx;
 		}
 		.item-title {
-			font-size: 26rpx;
+			font-size: 24rpx;
 			font-weight: 500;
-			color: rgba(153, 153, 153, 1);
+			color: #333333;
 			line-height: 24rpx;
-			padding-top: 20rpx;
+			padding-top: 17rpx;
 		}
 	}
 }
--- 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 class="hot-goods">
+		<view class="middleImg">
+			<image src="../../../static/images/middle1.png" mode="heightFix"></image>
+			<image src="../../../static/images/middle2.png" mode="heightFix"></image>
+		</view>
 		<view class="recommendTitle">
 			为你推荐
 		</view>
@ -39,7 +43,7 @@
 			</view>
 		</view>
 		<!-- m -->
-		<view class="big-card-wrap u-p-10" v-if="goodsType === 2">
+		<view class="big-card-wrap" v-if="goodsType === 2">
 			<block v-for="item in goodsList" :key="item.id">
 				<sh-goods-card
 					:detail="item"
@ -218,6 +222,8 @@ export default {
 // 为你推荐
 .hot-goods {
 	background: none;
+	padding:0 24rpx;
+	padding-bottom: 44rpx;
 	.refresh-btn {
 		margin-left: 50%;
 		transform: translateX(-50%);
@ -235,4 +241,13 @@ export default {
 		transition: all linear 0.5s;
 	}
 }
+.middleImg{
+	margin-top:30rpx;
+	display: flex;
+	justify-content: space-between;
+	image{
+		height:120rpx;
+		width:auto;
+	}
+}
 </style>
--- a/pages/index/components/sh-order-card.vue
+++ b/pages/index/components/sh-order-card.vue
@ -4,14 +4,14 @@
 		<view class="order-box u-flex">
 			<view class="order-item u-flex-col " @tap="jump('/pages/order/list', { type: order.type })" v-for="order in orderNav" :key="order.id">
 				<view class="u-flex-col item-box u-col-center">
-					<image class="order-img" :src="$IMG_URL + order.img" mode=""></image>
+					<image class="order-img" :src="order.img" mode=""></image>
 					<text class="item-title">{{ order.title }}</text>
 					<view class="badge" v-if="orderNum && orderNum[order.type]">{{ orderNum[order.type] }}</view>
 				</view>
 			</view>
 			<view class="order-item u-flex-col " @tap="jump('/pages/order/after-sale/list')">
 				<view class="u-flex-col item-box u-col-center">
-					<image class="order-img" :src="$IMG_URL + '/imgs/user/tab55.png'" mode=""></image>
+					<image class="order-img" :src="'/static/images/tab4.png'" mode=""></image>
 					<text class="item-title">退换货</text>
 				</view>
 			</view>
@ -20,7 +20,7 @@
 		<view class="order-item u-flex-col all-order " @tap="jump('/pages/order/list', { type: 'all' })">
 			<image class="cut-off--line" :src="$IMG_URL + '/imgs/user/cut_off_line.png'" mode=""></image>
 			<view class="u-flex-col item-box u-col-center">
-				<image class="order-img" :src="$IMG_URL + '/imgs/user/all_order.png'" mode="aspectFill"></image>
+				<image class="order-img" :src="'/static/images/tab5.png'" mode="aspectFill"></image>
 				<text class="item-title">全部订单</text>
 			</view>
 		</view>
@ -41,7 +41,7 @@ export default {
 				{
 					id: 1,
 					title: '待付款',
-					img: '/imgs/user/tab11.png',
+					img: '/static/images/tab1.png',
 					type: 'nopay'
 				},
 				// {
@ -53,13 +53,13 @@ export default {
 				{
 					id: 3,
 					title: '待收货',
-					img: '/imgs/user/tab33.png',
+					img: '/static/images/tab2.png',
 					type: 'noget'
 				},
 				{
 					id: 4,
 					title: '待评价',
-					img: '/imgs/user/tab44.png',
+					img: '/static/images/tab3.png',
 					type: 'nocomment'
 				}
 				// {
@ -111,8 +111,13 @@ export default {
 }
 // 订单卡片
 .sh-order-box {
-	height: 180rpx;
+	height: 170rpx;
 	background: #fff;
+	margin: 0 24rpx;
+	border-radius: 20rpx;
+	position: relative;
+	z-index: 99;
+	margin-top: -85rpx;
 	.order-box {
 		flex: 4;
 	}
@ -134,14 +139,14 @@ export default {
 			position: relative;
 		}
 		.order-img {
-			width: 46rpx;
-			height: 46rpx;
+			width: 60rpx;
+			height: 60rpx;
 		}

 		.item-title {
-			font-size: 26rpx;
+			font-size: 24rpx;
 			font-weight: 500;
-			color: rgba(153, 153, 153, 1);
+			color: #333333;
 			line-height: 24rpx;
 			margin-top: 20rpx;
 		}
--- a/pages/index/components/sh-wallet.vue
+++ b/pages/index/components/sh-wallet.vue
@ -1,6 +1,6 @@
 <template>
 	<!-- 钱包卡片 -->
-	<view class="sh-wallet-box u-flex u-m-b-10 u-p-r-20">
+	<view class="sh-wallet-box u-flex u-m-b-10">
 		<view class="u-flex wallet-left">
 			<view class="wallet-item u-flex-col u-col-center" @tap="jump('/pages/user/wallet/index')">
 				<text class="wallet-item__detail item-balance u-ellipsis-1">{{ userInfo.money || '0' }}</text>
@ -17,7 +17,7 @@
 		</view>
 		<view class="wallet-item u-flex-col wallet-right u-col-center" @tap="jump('/pages/user/wallet/index')">
 			<image class="cut-off--line" :src="$IMG_URL + '/imgs/user/cut_off_line.png'" mode=""></image>
-			<image class="wallet-img" :src="$IMG_URL + '/imgs/user/wallet.png'" mode="aspectFill"></image>
+			<image class="wallet-img" :src="'/static/images/tab1.png'" mode="aspectFill"></image>
 			<text class="wallet-item__title">我的钱包</text>
 		</view>
 	</view>
@ -51,8 +51,11 @@ export default {
 // 钱包卡片
 .sh-wallet-box {
 	background: #fff;
-	height: 180rpx;
+	height: 170rpx;
 	position: relative;
+	border-radius: 20rpx;
+	margin: 0 24rpx;
+	margin-top: 20rpx;
 	.wallet-left {
 		flex: 4;
 	}
@ -70,20 +73,20 @@ export default {
 	.wallet-item {
 		flex: 1;
 		.wallet-img {
-			width: 46rpx;
-			height: 46rpx;
+			width: 60rpx;
+			height: 60rpx;
 		}
 		.wallet-item__detail {
-			font-size: 28rpx;
+			font-size: 36rpx;
 			width: 180rpx;
 			text-align: center;
-			font-weight: 500;
-			color: rgba(168, 112, 13, 1);
+			font-weight: bold;
+			color: #21222B;
 		}
 		.wallet-item__title {
-			font-size: 26rpx;
+			font-size: 24rpx;
 			font-weight: 400;
-			color: rgba(153, 153, 153, 1);
+			color: #21222B;
 			margin-top: 20rpx;
 		}
 		.item-balance::after {
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@ -34,14 +34,14 @@
 		<!-- copyright -->
 		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="initShop.copyright">
 			<view class="copyright-text">{{ initShop.copyright[0] }}</view>
-			<view class="copyright-text">{{ initShop.copyright[1] }}</view>
+			<view class="copyright-text" style="margin-top:29rpx;">{{ initShop.copyright[1] }}</view>
 		</view>

 		<!-- #ifdef H5 -->
 		<view class="tabbar-hack" style="height: 120rpx; width:100%;"></view>
 		<!-- #endif -->
 		<!-- 关注弹窗 -->
-		<shopro-float-btn></shopro-float-btn>
+		<!-- <shopro-float-btn></shopro-float-btn> -->
 		<!-- 登录提示 -->
 		<shopro-auth-modal></shopro-auth-modal>
 		<!-- 分享组件 -->
@ -135,9 +135,9 @@ export default {
 <style lang="scss">
 .copyright-box {
 	.copyright-text {
-		font-size: 22rpx;
+		font-size: 24rpx;
 		font-weight: 500;
-		color: #c4c4c4;
+		color: #5D5F6B;
 	}
 }
 </style>
--- a/pages/index/user/userinfo-card.vue
+++ b/pages/index/user/userinfo-card.vue
@ -4,9 +4,9 @@
 			<view class="head-wrap"
 				:style="{ background: detail.image ? `url(${detail.image}) no-repeat center / 100% 100%` : detail.color }">
 				<!-- 标题栏 -->
-				<shopro-navbar backIconName="" backText="我的" :backTextStyle="{
+				<shopro-navbar backIconName="" backText="个人中心" :backTextStyle="{
 					color: '#fff',
-					fontSize: '40rpx',
+					fontSize: '34rpx',
 					fontWeight: '500'
 				}" :background="navBackground">
 					<view slot="right" class="u-flex u-row-center u-col-center u-m-r-20" v-if="userOtherData.is_store"
@ -42,10 +42,10 @@
 							<text class="tag-title">{{ userInfo.group.name }}</text>
 						</view>
 					</view>
-					<view class="u-flex" v-if="userInfo.nickname">
+					<!-- <view class="u-flex" v-if="userInfo.nickname">
 						<button class=" u-reset-button code-btn" @tap="onShare"><text
 								class="iconfont icon-qrcode"></text></button>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@ -213,7 +213,7 @@ export default {

 .sh-userinfo-box {
 	position: relative;
-	height: calc(var(--status-bar-height) + 300rpx);
+	height: calc(var(--status-bar-height) + 400rpx);

 	.head-wrap {
 		powidth: 100%;
@ -227,7 +227,7 @@ export default {
 			border-radius: 32rpx;
 			font-size: 26rpx;
 			font-weight: 500;
-			color: #a8700d;
+			color: #F45F77;
 		}
 	}

@ -255,8 +255,8 @@ export default {
 			}

 			.head-img {
-				width: 94rpx;
-				height: 94rpx;
+				width: 110rpx;
+				height: 110rpx;
 				border-radius: 50%;
 				background: #ccc;
 				margin-right: 25rpx;
--- a/pages/order/after-sale/list.vue
+++ b/pages/order/after-sale/list.vue
@ -210,7 +210,8 @@ export default {
 			background: #fff;
 		}
 		.line-active {
-			background: rgba(230, 184, 115, 1);
+			// background: rgba(230, 184, 115, 1);
+			background: #F45F77;
 		}
 	}
 }
--- a/pages/order/after-sale/refund.vue
+++ b/pages/order/after-sale/refund.vue
@ -321,7 +321,7 @@ export default {

 	.price {
 		font-size: 28rpx;
-		color: #a8700d;
+		color: #F45F77;
 	}
 }

--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@ -1329,11 +1329,12 @@ export default {
    .save-btn {
      width: 335rpx;
      line-height: 74rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(233, 180, 97, 1),
-        rgba(238, 204, 137, 1)
-      );
+      // background: linear-gradient(
+      //   90deg,
+      //   rgba(233, 180, 97, 1),
+      //   rgba(238, 204, 137, 1)
+      // );
+	  background-color: #F45F77;
      border-radius: 37rpx;
      font-size: 28rpx;
      font-weight: 400;
@ -1362,7 +1363,7 @@ export default {
    }

    .nav-title--active {
-      color: #a8700d;
+      color: #F45F77;
      font-size: 26rpx;
    }

@ -1413,7 +1414,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;

@ -1438,7 +1439,7 @@ export default {
    border-radius: 6rpx;
    padding: 0 16rpx;
    line-height: 38rpx;
-    color: #a8700d;
+    color: #F45F77;
    font-size: 22rpx;
  }

@ -1598,11 +1599,12 @@ export default {
  .sub-btn {
    width: 210rpx;
    line-height: 70rpx;
-    background: linear-gradient(
-      90deg,
-      rgba(233, 180, 97, 1),
-      rgba(238, 204, 137, 1)
-    );
+    // background: linear-gradient(
+    //   90deg,
+    //   rgba(233, 180, 97, 1),
+    //   rgba(238, 204, 137, 1)
+    // );
+	background-color: #F45F77;
    box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
    border-radius: 50rpx;
    font-size: 28rpx;
@ -1728,7 +1730,7 @@ export default {
    }

    .head-nav__title--active {
-      color: #a8700d;
+      color: #F45F77;
      font-size: 26rpx;
    }
  }
@ -1840,7 +1842,7 @@ export default {
          border-radius: 6rpx;
          padding: 0 16rpx;
          line-height: 38rpx;
-          color: #a8700d;
+          color: #F45F77;
          font-size: 22rpx;
          margin-right: 20rpx;
        }
@ -1958,11 +1960,12 @@ export default {
    .save-btn {
      width: 335rpx;
      line-height: 74rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(233, 180, 97, 1),
-        rgba(238, 204, 137, 1)
-      );
+      // background: linear-gradient(
+      //   90deg,
+      //   rgba(233, 180, 97, 1),
+      //   rgba(238, 204, 137, 1)
+      // );
+	  background-color: #F45F77;
      border-radius: 37rpx;
      font-size: 28rpx;
      font-weight: 400;
@ -1993,11 +1996,12 @@ export default {
    .save-btn {
      width: 690rpx;
      line-height: 80rpx;
-      background: linear-gradient(
-        90deg,
-        rgba(240, 199, 133, 1),
-        rgba(246, 214, 157, 1)
-      );
+      // background: linear-gradient(
+      //   90deg,
+      //   rgba(240, 199, 133, 1),
+      //   rgba(246, 214, 157, 1)
+      // );
+	  background-color: #F45F77;
      border-radius: 40rpx;
      font-size: 30rpx;

--- a/pages/order/express/store-address.vue
+++ b/pages/order/express/store-address.vue
@ -274,7 +274,8 @@ export default {
 		color: #fff;
 		width: 690rpx;
 		line-height: 80rpx;
-		background: linear-gradient(90deg, rgba(233, 181, 97, 1), rgba(238, 204, 138, 1));
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, rgba(233, 181, 97, 1), rgba(238, 204, 138, 1));
 		box-shadow: 1rpx 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
 		border-radius: 40rpx;
 		font-size: 28rpx;
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@ -265,7 +265,8 @@
 			}

 			.line-active {
-				background: rgba(230, 184, 115, 1);
+				// background: rgba(230, 184, 115, 1);
+				background: #F45F77;
 			}
 		}
 	}
@ -356,7 +357,7 @@

 			.state {
 				font-size: 26rpx;
-				color: #a8700d;
+				color: #F45F77;
 			}
 		}

--- a/pages/order/payment/method.vue
+++ b/pages/order/payment/method.vue
@ -247,7 +247,8 @@
 	.pay-btn {
 		width: 690rpx;
 		line-height: 80rpx;
-		background: linear-gradient(90deg, rgba(240, 199, 133, 1), rgba(246, 214, 157, 1));
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, rgba(240, 199, 133, 1), rgba(246, 214, 157, 1));
 		border-radius: 40rpx;
 		color: rgba(#fff, 0.9);
 		margin: 100rpx auto 0;
--- a/pages/public/faq.vue
+++ b/pages/public/faq.vue
@ -16,7 +16,7 @@ export default {
 	data() {
 		return {
 			headStyle: {
-				color: '#a8700d'
+				color: '#F45F77'
 			},
 			itemStyle: {
 				borderBottom: '1rpx solid #eee',
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@ -264,7 +264,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:#F45F77;
 }

 // 表单
@ -335,7 +336,8 @@ export default {
 	}
 	.save-btn {
 		line-height: 70rpx;
-		background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 		border: 1rpx solid rgba(238, 238, 238, 1);
 		border-radius: 40rpx;
 		color: rgba(#fff, 0.9);
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@ -111,7 +111,7 @@ export default {
 		border-radius: 6rpx;
 		padding: 0 16rpx;
 		line-height: 38rpx;
-		color: #a8700d;
+		color: #F45F77;
 		font-size: 22rpx;
 	}

@ -129,7 +129,7 @@ export default {
 		background: none;
 		position: absolute;
 		font-size: 26rpx;
-		color: #a8700d;
+		color: #F45F77;
 		top: 40rpx;
 		right: 40rpx;
 	}
@ -158,7 +158,8 @@ export default {
 	.add-btn {
 		line-height: 80rpx;
 		flex: 1;
-		background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 		border-radius: 40rpx;
 		color: rgba(#fff, 0.9);
 	}
--- a/pages/user/favorite.vue
+++ b/pages/user/favorite.vue
@ -12,12 +12,13 @@
 		</view>

 		<!-- 收藏列表 -->
-		<view class="content_box">
+		<view class="content_box" style="padding:0 24rpx;">
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
 				<u-checkbox-group @change="checkboxGroupChange" activeColor="#e9b461">
 					<view class="collect-list u-flex" v-for="f in favoriteList" :key="f.id">
 						<u-checkbox v-show="isEdit" :name="f.goods_id" shape="circle" v-model="f.checked"></u-checkbox>
 						<shopro-mini-card
+							style="width:100%;"
 							:image="f.goods.image"
 							:title="f.goods.title"
 							:price="f.goods.price"
@ -153,22 +154,23 @@ export default {
 		color: #999;

 		.all-num {
-			color: #a8700d;
+			color: #F45F77;
 		}
 	}

 	.set-btn {
 		background: none;
 		font-size: 26rpx;
-		color: #a8700d;
-		padding: 20rpx;
+		color: #F45F77;
+		// padding: 20rpx;
 	}
 }

 .collect-list {
 	padding: 30rpx 20rpx;
 	background: #fff;
-	width: 750rpx;
+	// width: 750rpx;
+	border-radius:20rpx;
 	margin-bottom: 20rpx;
 }

--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@ -353,7 +353,8 @@ export default {

 	.save-btn {
 		color: #fff;
-		background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+		background-color: #F45F77;
+		// background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
 		width: 100rpx;
 		border-radius: 30rpx;
 		height: 60rpx;
--- a/pages/user/view-log.vue
+++ b/pages/user/view-log.vue
@ -4,12 +4,13 @@
 		<view class="head_box u-flex u-row-right" v-show="!isEmpty">
 			<button class="edit-btn u-reset-button" @tap="onSet">{{ isEdit ? '完成' : '编辑' }}</button>
 		</view>
-		<view class="content_box">
+		<view class="content_box" style="padding:0 24rpx;">
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
 				<u-checkbox-group @change="checkboxGroupChange" activeColor="#e9b461">
 					<view class="collect-list u-flex u-flex-1" v-for="f in browseList" :key="f.id">
 						<u-checkbox v-if="isEdit" :name="f.goods_id" shape="circle" v-model="f.checked"></u-checkbox>
 						<shopro-mini-card
+							style="width:100%;"
 							:image="f.goods.image"
 							:title="f.goods.title"
 							:price="f.goods.price"
@ -139,24 +140,25 @@ export default {
 		color: #999;

 		.all-num {
-			color: #a8700d;
+			color: #F45F77;
 		}
 	}

 	.edit-btn {
 		background: none;
 		font-size: 26rpx;
-		color: #a8700d;
+		color: #F45F77;
 		margin: 0;
-		padding: 20rpx;
+		// padding: 20rpx;
 	}
 }

 .collect-list {
 	padding: 30rpx 20rpx;
 	background: #fff;
-	width: 750rpx;
+	// width: 750rpx;
 	margin-bottom: 20rpx;
+	border-radius: 20rpx;

 	.goods-radio {
 		transform: scale(0.7);
--- a/pages/user/wallet/score-balance.vue
+++ b/pages/user/wallet/score-balance.vue
@ -103,7 +103,7 @@ export default {
 			.all-num {
 				font-size: 50rpx;
 				font-weight: 500;
-				color: #a8700d;
+				color: #F45F77;
 				margin-bottom: 20rpx;
 			}
 			.all-title {
--- a/static/images/middle1.png
+++ b/static/images/middle1.png
--- a/static/images/middle2.png
+++ b/static/images/middle2.png
--- a/static/images/tab1.png
+++ b/static/images/tab1.png
--- a/static/images/tab2.png
+++ b/static/images/tab2.png
--- a/static/images/tab3.png
+++ b/static/images/tab3.png
--- a/static/images/tab4.png
+++ b/static/images/tab4.png
--- a/static/images/tab5.png
+++ b/static/images/tab5.png