update(uni-ui): 更新uni-ui

Wangyaqi · Wangyaqi · commit 0ba181233c40 · 2019-12-30T12:31:01.000+08:00
diff --git a/components/uni-goods-nav/uni-goods-nav.vue b/components/uni-goods-nav/uni-goods-nav.vue
@@ -3,7 +3,7 @@
 		<!-- 底部占位 -->
 		<view class="uni-tab__seat" />
 		<view class="uni-tab__cart-box flex">
-			<view class="flex uni-tab__cart-sub-box">
+			<view class="flex uni-tab__cart-sub-left">
 				<view v-for="(item,index) in options" :key="index" class="flex uni-tab__cart-button-left uni-tab__shop-cart" @click="onClick(index,item)">
 					<view class="uni-tab__icon">
 						<image class="image" :src="item.icon" mode="widthFix" />
@@ -14,7 +14,7 @@
 					</view>
 				</view>
 			</view>
-			<view :class="{'uni-tab__right':fill}" class="flex uni-tab__cart-sub-box ">
+			<view :class="{'uni-tab__right':fill}" class="flex uni-tab__cart-sub-right ">
 				<view v-for="(item,index) in buttonGroup" :key="index" :style="{backgroundColor:item.backgroundColor,color:item.color}" class="flex uni-tab__cart-button-right" @click="buttonClick(index,item)"><text class="uni-tab__cart-button-right-text">{{ item.text }}</text></view>
 				<!-- <view class="flex uni-tab__cart-button-right uni-tab__color-y ">立即购买</view> -->
 			</view>
@@ -54,12 +54,12 @@
 				default () {
 					return [{
 							text: '加入购物车',
-							backgroundColor: '#ff0000',
+							backgroundColor: '#ffa200',
 							color: '#fff'
 						},
 						{
 							text: '立即购买',
-							backgroundColor: '#ffa200',
+							backgroundColor: '#ff0000',
 							color: '#fff'
 						}
 					]
@@ -74,7 +74,8 @@
 			onClick(index, item) {
 				this.$emit('click', {
 					index,
-					content: item
+					content: item,
+
 				})
 			},
 			buttonClick(index, item) {
@@ -108,12 +109,16 @@
 
 	.uni-tab__cart-box {
 		flex: 1;
-		height: 100rpx;
+		height: 50px;
 		background-color: #fff;
 		z-index: 900;
 	}
 
-	.uni-tab__cart-sub-box {
+	.uni-tab__cart-sub-left {
+		padding: 0 5px;
+	}
+
+	.uni-tab__cart-sub-right {
 		flex: 1;
 	}
 
@@ -128,27 +133,29 @@
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		flex: 1;
+		/* flex: 1;
+ */
 		position: relative;
 		justify-content: center;
 		align-items: center;
 		flex-direction: column;
+		margin: 0 10px;
 	}
 
 	.uni-tab__icon {
-		width: 20px;
-		height: 20px;
+		width: 18px;
+		height: 18px;
 	}
 
 	.image {
-		width: 20px;
-		height: 20px;
+		width: 18px;
+		height: 18px;
 	}
 
 	.uni-tab__text {
 		margin-top: 3px;
 		font-size: 24rpx;
-		color: #666;
+		color: #646566;
 	}
 
 	.uni-tab__cart-button-right {
@@ -176,8 +183,8 @@
 		flex-direction: column;
 		/* #endif */
 		position: absolute;
-		right: 12px;
-		top: 4px;
+		right: -2px;
+		top: 2px;
 		justify-content: center;
 		align-items: center;
 		/* width: 0;
diff --git a/components/uni-list/uni-refresh.wxs b/components/uni-list/uni-refresh.wxs
@@ -9,7 +9,7 @@ var pullDown = {
 function ready(newValue, oldValue, ownerInstance, instance) {
     var state = instance.getState()
     state.canPullDown = newValue;
-    console.log(newValue);
+    // console.log(newValue);
 }
 
 function touchStart(e, instance) {
@@ -20,7 +20,7 @@ function touchStart(e, instance) {
         return
     }
 
-    console.log("touchStart");
+    // console.log("touchStart");
 
     state.height = 0;
     state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
diff --git a/components/uni-load-more/uni-load-more.vue b/components/uni-load-more/uni-load-more.vue
@@ -89,7 +89,6 @@
 		// #ifndef APP-NVUE
 		computed: {
 			iconSnowWidth() {
-				console.log((Math.floor(this.iconSize / 24) || 1) * 2);
 				return (Math.floor(this.iconSize / 24) || 1) * 2
 			}
 		},
diff --git a/components/uni-rate/uni-rate.vue b/components/uni-rate/uni-rate.vue
@@ -109,7 +109,7 @@
 						});
 					}
 				}
-				console.log("starList[4]: " + starList[4].activeWitch);
+				// console.log("starList[4]: " + starList[4].activeWitch);
 				return starList;
 			}
 		},
diff --git a/pages/extUI/goods-nav/goods-nav.nvue b/pages/extUI/goods-nav/goods-nav.nvue
@@ -40,12 +40,12 @@
 				}],
 				buttonGroup: [{
 						text: '加入购物车',
-						backgroundColor: '#ff0000',
+						backgroundColor: '#ffa200 ',
 						color: '#fff'
 					},
 					{
 						text: '立即购买',
-						backgroundColor: '#ffa200',
+						backgroundColor: '#ff0000',
 						color: '#fff'
 					}
 				]

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ var pullDown = {`
`9`	`9`	`function ready(newValue, oldValue, ownerInstance, instance) {`
`10`	`10`	`var state = instance.getState()`
`11`	`11`	`state.canPullDown = newValue;`
`12`		`- console.log(newValue);`
	`12`	`+ // console.log(newValue);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`function touchStart(e, instance) {`
`@@ -20,7 +20,7 @@ function touchStart(e, instance) {`
`20`	`20`	`return`
`21`	`21`	`}`
`22`	`22`
`23`		`- console.log("touchStart");`
	`23`	`+ // console.log("touchStart");`
`24`	`24`
`25`	`25`	`state.height = 0;`
`26`	`26`	`state.touchStartY = e.touches[0].pageY \|\| e.changedTouches[0].pageY;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@`
`89`	`89`	`// #ifndef APP-NVUE`
`90`	`90`	`computed: {`
`91`	`91`	`iconSnowWidth() {`
`92`		`- console.log((Math.floor(this.iconSize / 24) \|\| 1) * 2);`
`93`	`92`	`return (Math.floor(this.iconSize / 24) \|\| 1) * 2`
`94`	`93`	`}`
`95`	`94`	`},`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`});`
`110`	`110`	`}`
`111`	`111`	`}`
`112`		`- console.log("starList[4]: " + starList[4].activeWitch);`
	`112`	`+ // console.log("starList[4]: " + starList[4].activeWitch);`
`113`	`113`	`return starList;`
`114`	`114`	`}`
`115`	`115`	`},`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@`
`40`	`40`	`}],`
`41`	`41`	`buttonGroup: [{`
`42`	`42`	`text: '加入购物车',`
`43`		`- backgroundColor: '#ff0000',`
	`43`	`+ backgroundColor: '#ffa200 ',`
`44`	`44`	`color: '#fff'`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`text: '立即购买',`
`48`		`- backgroundColor: '#ffa200',`
	`48`	`+ backgroundColor: '#ff0000',`
`49`	`49`	`color: '#fff'`
`50`	`50`	`}`
`51`	`51`	`]`