diff --git a/pages.json b/pages.json
index 92a72a8..e8a705a 100644
--- a/pages.json
+++ b/pages.json
@@ -296,7 +296,7 @@
 		// }
 		{
 			"pagePath": "pages/home/cloudCard",
-			"text": "云选菜窖",
+			"text": "选菜窖",
 			"iconPath": "static/bomicon/bom_notCloudCard.png",
 			"selectedIconPath": "static/bomicon/bom_cloudCard.png"
 		},
diff --git a/pages/cloud/detail_cloudCard.vue b/pages/cloud/detail_cloudCard.vue
index b89e5ce..e8ceed4 100644
--- a/pages/cloud/detail_cloudCard.vue
+++ b/pages/cloud/detail_cloudCard.vue
@@ -54,7 +54,7 @@
 								</view>
 
 
-								<text style="color: #AEAEAE;font-size: 12px;margin-top: 5px;">{{item.remark}}</text>
+								<text style="color: #AEAEAE;font-size: 12px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
 
 								<view
 									style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;align-items: center;">
diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue
index 29eec3e..f62a985 100644
--- a/pages/cloud/optionalCard.vue
+++ b/pages/cloud/optionalCard.vue
@@ -24,7 +24,7 @@
 							<view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view>
 							<view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view>
 							<text
-								style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">自选云菜窖</text>
+								style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">自选组合</text>
 						</view>
 
 						<view style="display: flex;flex-direction: row;align-items: center;margin-right: 10px;">
@@ -52,14 +52,14 @@
 
 								<view style="display: flex;flex-direction: row;align-items: center;">
 									<text
-										style="flex: 1;margin-right: 10px;color: #000;font-size: 16px;">{{item.name}}</text>
+										style="flex: 1;margin-right: 10px;color: #000;font-size: 14px;">{{item.name}}</text>
 									<uni-number-box ref="box" :showTextView="true" background="#fff"
 										v-model="item.goodsNumber" @change="numberChange($event,item)"></uni-number-box>
 
 								</view>
 
 
-								<text style="color: #AEAEAE;font-size: 14px;margin-top: 5px;">{{item.remark}}</text>
+								<text style="color: #AEAEAE;font-size: 14px;margin-top: 5px;line-height: 20px;">{{item.remark}}</text>
 
 								<view
 									style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;">
diff --git a/pages/home/cloudCard.vue b/pages/home/cloudCard.vue
index 1b3c9a6..66ea046 100644
--- a/pages/home/cloudCard.vue
+++ b/pages/home/cloudCard.vue
@@ -16,7 +16,7 @@
 		 -->
 
 
-		<z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true">
+		<z-paging ref="paging" v-model="data" :pagingStyle='styleObject' @query="queryList" :refresher-enabled="true" >
 
 			<view style="display: flex;flex-direction: row;justify-content: space-between;
 			margin:5px 20px 0px 20px;padding-bottom: 10px; border-bottom: 2px #EFEFEF solid;">
@@ -24,13 +24,13 @@
 					<view style="background: #FF9900; border-radius: 50%;width: 12px;height: 12px;"></view>
 					<view style="background: #FFCC7F; border-radius: 50%;width: 12px;height: 12px;"></view>
 					<text
-						style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">家庭云菜窖</text>
+						style="margin-left: 8px;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;">精选蔬菜组合</text>
 				</view>
 
-				<view style="border: 1px #FF9900 solid;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;border-radius: 15px; 
+			<!-- 	<view style="border: 1px #FF9900 solid;font-size: 16px;color: #FF9900;font-weight: 600;font-family: sans-serif;border-radius: 15px; 
 				padding:5px 15px;" @click="optionalClick()">
 					+ 自选菜窖
-				</view>
+				</view> -->
 
 			</view>
 
@@ -43,18 +43,23 @@
 
 					<view style="display: flex;flex-direction: row;width: 100%; ">
 						<text style="flex: 1;margin-right: 10px;color: #000;font-size: 16px;">{{item.name}}</text>
-						<image src="@/static/right_icon.png" style="width: 15px;height: 15px;"></image>
+						
+						<view style="display: flex;flex-direction: row;align-items: center;">
+							<text style="color: #FCA45C; font-size: 12px;margin-right: 5px;">订窖</text>
+								<image src="@/static/right_icon.png" style="width: 15px;height: 15px;"></image>
+						</view>
+					
 					</view>
 
 					<view style="display: flex;flex-direction: row;align-items: center; margin-right: 10px;margin-top: 5px; width: 100%; ">
 
 						<image :src='item.iconUrl' style="width: 70px;height: 70px;" mode="aspectFit"></image>
 
-						<view style="display: flex;flex-direction: column;margin-left: 20px;flex: 1; width: 100%;">
+						<view style="display: flex;flex-direction: column;margin-left: 20px;flex: 1; width: 100%; margin-top: 5px;">
 
-							<text style="color: #999;font-size: 14px;width: 100%;">{{item.remarks}}</text>
+							<text style="color: #999;font-size: 13px;width: 100%;line-height: 20px;">{{item.remarks}}</text>
 
-							<view style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 5px;">
+							<view style="display: flex;flex-direction: row;justify-content:space-between;margin-top: 10px;">
 
 								<view style="display: flex;flex-direction: row;">
 									<text
@@ -62,7 +67,7 @@
 										margin-right: 10px;padding: 0px 8px;"
 										v-show="item.isRecommend=='1'">推荐</text>
 									<text
-										style="border: 1px #EE752F solid; border-radius: 10px;  color: #EE752F;font-size: 14px;;padding: 0px 8px;">{{item.count}}</text>
+										style="border: 1px #EE752F solid; border-radius: 10px;  color: #EE752F;font-size: 12px;;padding: 0px 8px;">{{item.count}}</text>
 								</view>
 
 
@@ -70,14 +75,48 @@
 
 							</view>
 
+<view v-if="item.giftBagGoods.length>0">
+							<view style="height: 10px;"></view>
+						
+							<view v-for="(child,pos) in item.giftBagGoods" :key="pos"
+								style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
+								<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
+								</image>
+								<view
+									style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
+									{{child.name}}
+								</view>
+								<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
+									{{child.count}}
+								</view>
+								<view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
+									{{child.spec}}
+								</view>
+							</view>
 						</view>
 
-					</view>
 
+						</view>
+						
+						
+					</view>
 
 				</view>
 
 			</view>
+			
+			
+			<view slot="loadingMoreNoMore">
+				<view style="display: flex;flex-direction: column;justify-content: center; align-items: center; margin-top: 20px; border-top: 2px #efefef solid;
+				padding-top: 20px; margin-left:20px;margin-right: 20px;;">
+					<text style="color: #888888; font-size: 13px;">您也可以自由选菜，自建惠享云菜窖。</text>
+					
+						<text style="color: #fff; font-size: 16px; font-weight: 600; font-family: sans-serif; background: #FCA45C; border-radius: 8px; padding: 10px 15px; margin-top: 15px;;" @click="optionalClick()">自建云菜窖</text>
+				</view>
+				<view style="height: 20px;"></view>
+			</view>
+			
+			
 		</z-paging>
 
 		<!-- </view> -->
@@ -97,6 +136,7 @@
 					'border-top-right-radius': '25px',
 					'background': '#fff',
 					'padding-top': '10px',
+					
 				},
 				page: {
 					startHeight: 0,
@@ -165,7 +205,7 @@
 	.top {
 		width: 100vw;
 		/* height: 126.66vw; */
-		height: 85vw;
+		height: 75vw;
 		/* 加载背景图 */
 		background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png);
 		/* background-image: url(../../static/clound_bj1.png); */
diff --git a/pages/home/pickUpCard.vue b/pages/home/pickUpCard.vue
index 8c9bfe6..c51207a 100644
--- a/pages/home/pickUpCard.vue
+++ b/pages/home/pickUpCard.vue
@@ -156,7 +156,7 @@
 									<view style="height: 10px;"></view>
 
 									<view v-for="(child,pos) in item.list" :key="pos"
-										style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
+										style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
 										<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
 										</image>
 										<view
@@ -166,7 +166,7 @@
 										<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
 											{{child.content}}
 										</view>
-										<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
+										<view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
 											{{child.remarks}}
 										</view>
 									</view>
@@ -232,7 +232,7 @@
 									<view style="height: 10px;"></view>
 
 									<view v-for="(child,pos) in item.list" :key="pos"
-										style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
+										style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;box-sizing: border-box;">
 										<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;">
 										</image>
 										<view
@@ -242,7 +242,7 @@
 										<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
 											{{child.content}}
 										</view>
-										<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
+										<view style="font-size: 11px;color: #E99D42;min-width: 60px;text-align: right;padding-left: 5px;">
 											{{child.remarks}}
 										</view>
 									</view>
@@ -421,6 +421,7 @@
 	}
 
 	.item {
+		border-radius: 8px;
 		width: calc(100% - 5px);
 		background-color: rgba(255, 248, 248, 1);
 		color: rgba(16, 16, 16, 1);
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4d46875..c40a8b7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -102,7 +102,7 @@
 													}).catch(e => {
 														uni.showModal({
 															title: '提示',
-															content: '绑卡时发生错误',
+															content: e.msg,
 															showCancel: false,
 															success: function(res) {
 																uni.switchTab({
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index 2f05eb6..9a8d098 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -164,7 +164,7 @@
 	};
 </script>
 <style lang="scss">
-	$box-height: 26px;
+	$box-height: 20px;
 	$bg: #f5f5f5;
 	$br: 2px;
 	$color: #333;
@@ -184,7 +184,6 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		padding: 0 8px;
 		background-color: $bg;
 		/* #ifdef H5 */
 		cursor: pointer;
@@ -192,9 +191,8 @@
 	}
 
 	.uni-numbox__value {
-		margin: 0 2px;
 		background-color: $bg;
-		width: 40px;
+		width: 30px;
 		height: $box-height;
 		line-height: $box-height;
 		text-align: center;