Signed-off-by: liuboyan <632697560@qq.com>

1

pages.json

@@ -104,7 +104,8 @@
 			"path": "plantList",
 			"style": {
 				"navigationBarTitleText": "我的种植",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "entrustList",
@@ -132,7 +133,8 @@
 			"path": "couponList",
 			"style": {
 				"navigationBarTitleText": "我的优惠券",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "integralList",

pages/shop/index.vue

@@ -282,7 +282,6 @@
 
 				.goods-row {
 					width: calc(100% - 24px);
-					height: 104px;
 					float: left;
 					padding: 11px 11px 11px 7px;
 					box-sizing: border-box;
@@ -301,7 +300,6 @@
 
 					.goods-info {
 						width: calc(100% - 108px);
-						height: 84px;
 						box-sizing: border-box;
 						padding-left: 6px;
 						float: left;
@@ -334,7 +332,7 @@
 						}
 
 						.goods-number {
-							height: 16px;
+							// width: calc(100% + 25px);
 							font-family: PingFang SC;
 							line-height: 16px;
 

pagesGood/goodList.vue

@@ -5,8 +5,8 @@
 			 bgColor="#ffffff" @confirm="search" class="search-bar" />
 		</view>
 		<scroll-view class="goods-box" scroll-y="true" @scrolltolower="handleLoadMore()">
-			<view style="padding-top: 20px;background-color: #FFFFFF;" v-if="!goodsList.length">
-				<u-divider color="#909399" border-color="#909399">没有更多了</u-divider>
+			<view style="padding-top: 20px;background-color: transparent;" v-if="!goodsList.length">
+				<u-divider color="#909399" border-color="#909399" bg-color="transparent">没有更多了</u-divider>
 			</view>
 			<view class="goods-row" v-for="(item, index) in goodsList" :key="index" @click="goToGoodDetails(item)">
 				<image class="goods-img" :src="item.imgPath" mode="aspectFill"></image>
@@ -17,7 +17,8 @@
 					<view class="goods-number">
 						<text class="goods-icon">￥</text>
 						<text class="goods-spec">{{item.bizPrice}}{{item.productType != 4 ? '/' + item.unit : ''}}</text>
-						<text class="goods-sales" v-if="item.productType != 4">{{item.sellCount}}人付款</text>
+						<text class="goods-original">原价：{{item.originalPrice}}</text>
+						<!-- <text class="goods-sales" v-if="item.productType != 4">{{item.sellCount}}人付款</text> -->
 					</view>
 				</view>
 				<view class="goods-cart">
@@ -195,6 +196,7 @@
 					width: 84px;
 					height: 84px;
 					float: left;
+					border-radius: 5px;
 				}
 
 				.goods-info {
@@ -251,9 +253,16 @@
 						}
 
 						.goods-spec {
-							font-size: 15px;
+							font-size: 16px;
 							color: #52A63A;
-							margin-right: 15px;
+							margin-right: 5px;
+						}
+
+						.goods-original {
+							font-size: 12px;
+							color: #a67954;
+							margin-right: 10px;
+							text-decoration:line-through
 						}
 
 						.goods-sales {

pagesGood/shopDetails.vue

@@ -82,10 +82,10 @@
 				tabIndex: 0,
 				tabList: [{
 						name: '全部商品'
-					},
-					{
-						name: '分类查看'
 					}
+					// {
+					// 	name: '分类查看'
+					// }
 				],
 				goodSort: 1,
 				options1: [{

pagesMain/addressForm.vue

@@ -197,7 +197,15 @@
 			left: 15px;
 
 			.handle-custom {
-				background-color: #51A539;
+				background-color: #56a83a;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/addressList.vue

@@ -3,7 +3,7 @@
 		<view class="address-list">
 			<u-swipe-action v-for="(item, index) in addressList" :key="index" :index="index" @click="deleteAddress" :options="options">
 				<view class="address-row" @click="setAddress(item)">
-					<view class="address-first-name" :class="item.isDefault == 1 ? 'address-first-name-active' : ''">{{item.username ? item.username.slice(1,2) : ''}}</view>
+					<view class="address-first-name" :class="item.isDefault == 1 ? 'address-first-name-active' : ''">{{item.username ? item.username.slice(0,1) : ''}}</view>
 					<view class="address-info">
 						<view class="address-name-phone">
 							<text class="address-name">{{item.username}}</text>
@@ -149,7 +149,7 @@
 					width: 36px;
 					height: 36px;
 					float: left;
-					background: #656565;
+					background: #fe9900;
 					border-radius: 50%;
 					color: #FFFFFF;
 					font-size: 18px;
@@ -205,7 +205,7 @@
 							border-radius: 4px;
 							font-size: 12px;
 							color: #FFFFFF;
-							background: #656565;
+							background: #fe9900;
 							margin-right: 6px;
 						}
 
@@ -243,7 +243,15 @@
 			left: 15px;
 
 			.handle-custom {
-				background-color: #51A539;
+				background-color: #56a83a;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/couponList.vue

@@ -40,6 +40,7 @@
 		</view>
 		<view class="coupon-box" v-if="tabIndex == 2">
 			<view class="coupon-row" v-for="(site, index2) in couponList3" :key="index2">
+				<view class="coupon-mask"></view>
 				<view class="coupon-left">
 					<view class="coupon-left-price"><text style="font-size: 16px;">￥</text>{{site.discountAmount}}</view>
 					<view class="coupon-left-text">满减金额</view>
@@ -141,6 +142,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;
@@ -171,6 +177,14 @@
 			background: #FFFFFF;
 			box-shadow: 0px 0px 10px 0px rgba(103, 103, 103, 0.3);
 			overflow: hidden;
+			position: relative;
+
+			.coupon-mask {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				background-color: rgba(0, 0, 0, 0.3);
+			}
 
 			.coupon-left {
 				width: 107px;

pagesMain/entrustList.vue

@@ -196,7 +196,15 @@
 			padding: 20px 15px;
 
 			.handle-custom {
-				background-color: #52A63A;
+				background-color: #56a83a;
+				
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/orderList.vue

@@ -129,6 +129,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/plantList.vue

@@ -13,7 +13,7 @@
 					<text class="goods-spec">{{item.bizPrice}}</text>
 					<text class="goods-price">￥{{item.originalPrice}}</text>
 				</view>
-				<view class="goods-date">有效期：{{item.term}}</view>
+				<view class="goods-date">有效期：{{item.term}}天</view>
 			</view>
 			<view class="goods-cart">
 				<view class="more-button">