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

1

pages.json

@@ -6,7 +6,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/index/login",
@@ -18,21 +18,21 @@
 			"path": "pages/shop/index",
 			"style": {
 				"navigationBarTitleText": "商城",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/user/index",
 			"style": {
 				"navigationBarTitleText": "个人",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}
 	],
@@ -47,7 +47,8 @@
 			"path": "goodList",
 			"style": {
 				"navigationBarTitleText": "商品列表",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "shopDetails",
@@ -68,13 +69,13 @@
 			"path": "evaluateList",
 			"style": {
 				"navigationBarTitleText": "评价列表",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "videoList",
 			"style": {
 				"navigationBarTitleText": "直播大厅",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "liveDetail",
@@ -103,13 +104,13 @@
 			"path": "plantList",
 			"style": {
 				"navigationBarTitleText": "我的种植",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "entrustList",
 			"style": {
 				"navigationBarTitleText": "委托列表",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "entrustForm",
@@ -120,7 +121,7 @@
 			"path": "addressList",
 			"style": {
 				"navigationBarTitleText": "我的地址",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "addressForm",
@@ -131,20 +132,20 @@
 			"path": "couponList",
 			"style": {
 				"navigationBarTitleText": "我的优惠券",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "integralList",
 			"style": {
 				"navigationBarTitleText": "我的积分",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "orderList",
 			"style": {
 				"navigationBarTitleText": "订单中心",
 				"backgroundColor": "#f7f7f7",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "orderDetail",
@@ -165,7 +166,7 @@
 			"path": "messageList",
 			"style": {
 				"navigationBarTitleText": "留言列表",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "messageForm",

pages/cart/cart.vue

@@ -9,7 +9,7 @@
 				<view class="shop-info">
 					<view class="iconfont" :class="item.allCheck ? 'iconqueding' : 'iconfeigouxuan'" @click="checkShop(item)"></view>
 					<view class="shop-info-right" @click="goToShop(item)">
-					    <view class="iconfont iconshangjia"></view>
+						<view class="iconfont iconshangjia"></view>
 						<view class="shop-name">{{item.supplierName}}</view>
 						<view class="iconfont iconfangxiang"></view>
 					</view>
@@ -40,7 +40,7 @@
 						<text class="shop-price">￥{{getShopCheckPrice(item)}}</text>
 					</view>
 					<u-button type="success" size="medium" shape="circle" :ripple="true" @click="toPay(item)" :disabled="!getShopCheckGoods(item)"
-					 class="handle-button">结算（{{getShopCheckGoods(item)}}）</u-button>
+					 class="handle-button">结算({{getShopCheckGoods(item)}})</u-button>
 				</view>
 			</view>
 		</view>
@@ -273,7 +273,7 @@
 
 		.iconqueding,
 		.iconfeigouxuan {
-			color: #52A63A;
+			color: #56a83a;
 			font-size: 36px;
 			margin-left: 5px;
 		}
@@ -282,7 +282,7 @@
 			width: 100%;
 			height: 120px;
 			float: left;
-			background-color: #52A63A;
+			background-color: #56a83a;
 			border-radius: 0 0 40px 40px;
 
 			.swiper-text {
@@ -318,10 +318,12 @@
 					display: flex;
 					align-items: center;
 					border-bottom: 1px solid #EEEEEE;
-                    .shop-info-right {
+
+					.shop-info-right {
 						display: flex;
 						align-items: center;
 					}
+
 					.shop-name {
 						font-size: 15px;
 						font-family: PingFang SC;
@@ -414,7 +416,7 @@
 									flex: 1;
 									font-size: 18px;
 									font-family: PingFang SC;
-									color: #52A63A;
+									color: #56a83a;
 									line-height: 20px;
 								}
 
@@ -437,19 +439,19 @@
 
 				.shop-handle-box {
 					width: 100%;
-					height: 50px;
+					height: 54px;
 					float: left;
 					box-sizing: border-box;
 					padding: 0 16px;
 
 					.shop-handle-text {
-						width: calc(100% - 130px);
-						height: 50px;
+						width: calc(100% - 110px);
+						height: 54px;
 						float: left;
 						white-space: nowrap;
 						font-size: 15px;
 						font-family: PingFang SC;
-						line-height: 50px;
+						line-height: 54px;
 						text-align: right;
 
 						.shop-text {
@@ -458,19 +460,29 @@
 						}
 
 						.shop-price {
-							color: #52A63A;
+							color: #56a83a;
 						}
 					}
 
 					.handle-button {
-						width: 110px;
+						width: 96x;
+						height: 40px;
 						display: block;
 						float: right;
-						// background-color: #52A63A;
 						margin-top: 7px;
-						margin-right: 15px;
 						padding: 0;
 						text-align: center;
+
+						/deep/button {
+							background-color: #56a83a;
+							color: #FFFFFF;
+							height: 40px;
+							width: 96px;
+							line-height: 40px;
+						}
+						/deep/.u-btn--success--disabled{
+							background-color: #74bd60!important;
+						}
 					}
 				}
 			}
@@ -485,7 +497,7 @@
 			background: #FFFFFF;
 			box-sizing: border-box;
 			border-top: 1px solid #EEEEEE;
-			padding: 0 15px 0 15px;
+			padding: 0 15px 0 4px;
 
 			.iconfont {
 				height: 52px;
@@ -505,16 +517,21 @@
 
 			.cart-handle-delete {
 				display: block;
-				width: 80px;
 				height: 32px;
 				line-height: 32px;
 				padding: 0;
-				margin: 10px 15px 0 0;
+				margin: 10px 0 0 0;
 				float: right;
-				border-color: #52A63A !important;
+				border-color: #56a83a !important;
 				background-color: #FFFFFF !important;
-				color: #52A63A !important;
-				;
+				color: #56a83a !important;
+
+				/deep/button {
+					border-color: #56a83a !important;
+					background-color: #FFFFFF !important;
+					color: #56a83a !important;
+					padding: 0 24px;
+				}
 			}
 		}
 	}

pages/index/index.vue

@@ -217,7 +217,7 @@
 
 		.swiper {
 			height: 175px;
-			background-color: #6CA63A;
+			background-color: #56a83a;
 			position: relative;
 			z-index: -1;
 		}
@@ -273,7 +273,7 @@
 
 		.index-title {
 			width: calc(100% - 24px);
-			border-left: 1px solid #6CA63A;
+			border-left: 1px solid #56a83a;
 			padding: 2px 0 2px 5px;
 			margin: 15px 12px 10px 12px;
 
@@ -283,7 +283,7 @@
 				line-height: 20px;
 				font-size: 15px;
 				font-family: PingFang SC;
-				color: #6CA63A;
+				color: #56a83a;
 			}
 
 			.title-tip {
@@ -332,12 +332,12 @@
 
 					.sale-icon {
 						font-size: 12px;
-						color: #6CA63A;
+						color: #56a83a;
 					}
 
 					.sale-price {
 						font-size: 18px;
-						color: #6CA63A;
+						color: #56a83a;
 						margin-right: 5px;
 					}
 
@@ -400,13 +400,13 @@
 
 						.sale-icon {
 							font-size: 12px;
-							color: #6CA63A;
+							color: #56a83a;
 							margin-left: -2px;
 						}
 
 						.sale-price {
 							font-size: 22px;
-							color: #6CA63A;
+							color: #56a83a;
 							margin-right: 6px;
 						}
 
@@ -452,7 +452,7 @@
 					.circular {
 						width: 16px;
 						height: 16px;
-						background-color: #6BA539;
+						background-color: #56a83a;
 						border-radius: 50%;
 						margin-left: 6px;
 						text-align: right;

pages/index/login.vue

@@ -228,7 +228,7 @@
 				border-radius: 20px;
 				font-size: 15px;
 				font-family: PingFang SC;
-				color: #52A63A;
+				color: #56a83a;
 				line-height: 36px;
 				text-align: center;
 			}

pages/shop/index.vue

@@ -296,6 +296,7 @@
 						width: 84px;
 						height: 84px;
 						float: left;
+						border-radius: 5px;
 					}
 
 					.goods-info {

pagesGood/goodDetails.vue

@@ -29,8 +29,9 @@
 		<view class="good-data" v-if="goodData.productType != 2 && goodData.productType != 4">
 			<text class="good-select">商品规格</text>
 			<text class="good-unit">{{number}}&nbsp;{{goodData.unit ? goodData.unit : ''}}</text>
-<!-- 			<text class="iconfont iconfangxiang"></text>
- -->		</view>
+			<!-- 			<text class="iconfont iconfangxiang"></text>
+ -->
+		</view>
 		<view class="tab-box">
 			<view class="tab-col" :class="tabIndex == 1 ? 'tab-col-active' :''" @click="tabIndex = 1">产品介绍</view>
 			<view class="tab-col" :class="tabIndex == 2 ? 'tab-col-active' :''" v-if="goodData.productType != 2 && goodData.productType != 4 "
@@ -312,7 +313,14 @@
 		},
 	}
 </script>
-
+<style lang="less">
+	.swiper {
+		/deep/.uni-swiper-dot-active {
+			width: 16px !important;
+			border-radius: 8px;
+		}
+	}
+</style>
 <style lang="less" scoped>
 	.container {
 		background-color: #f7f7f7;
@@ -646,7 +654,7 @@
 						padding: 0 3px;
 						font-size: 14px;
 						font-family: PingFang SC;
-						color: #6CA63A;
+						color: #56a83a;
 						line-height: 16px;
 						margin-bottom: 10px
 					}

pagesGood/goodList.vue

@@ -146,6 +146,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;
@@ -171,13 +176,14 @@
 		.goods-box {
 			width: 100%;
 			height: calc(100% - 58px) !important;
-			padding: 6px 0 0px 0;
+			padding: 6px 0 10px 0;
 			box-sizing: border-box;
 			overflow-y: auto;
 
 			.goods-row {
 				width: calc(100% - 24px);
 				height: 104px;
+				float: left;
 				padding: 11px 11px 11px 7px;
 				box-sizing: border-box;
 				margin: 4px 0 12px 12px;

pagesGood/shopDetails.vue

@@ -448,7 +448,7 @@
 
 						.sale-icon {
 							font-size: 12px;
-							color: #6CA63A;
+							color: #56a83a;
 							margin-left: -2px;
 						}
 

pagesMain/orderItem.vue

@@ -24,20 +24,20 @@
 		</view>
 		<view class="pay-info">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
 		<view class="handle-box" v-if="tabIndex > 1">
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</u-button>
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</u-button>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</view>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</view>
 			<!-- <u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
 			 v-if="tabIndex != 1 && tabIndex != 2" @click.stop="handleOrder(3)">申请售后</u-button> -->
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</u-button>
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</u-button>
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</u-button>
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</u-button>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</view>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</view>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</view>
+			<view size="medium" class="handle-button"
+			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</view>
 		</view>
 		<u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -265,7 +265,8 @@
 		}
 	}
 </script>
-
+<style>
+</style>
 <style lang="less" scoped>
 	.order-row {
 		width: 100%;
@@ -409,15 +410,19 @@
 			text-align: right;
 
 			.handle-button {
+				height: 30px;
+				width: 75px;
 				color: #333333 !important;
-				border-color: #BFBFBF !important;
+				border: 1px solid #BFBFBF !important;
 				background-color: #FFFFFF !important;
-				padding: 0;
+				padding: 0 10px;
 				margin-left: 8px;
 				margin-bottom: 10px;
-				height: 30px;
-				line-height: 30px;
+				line-height: 28px;
+				text-align: center;
+				box-sizing: border-box;
 				display: inline-block;
+				border-radius: 15px;
 			}
 		}
 	}