fixed: nvue button background, popup close icons display etc.

vhvy · Jan 30, 2021 · bf49613 · bf49613
1 parent 9c9ab01
commit bf49613
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/components/uni-popup-dialog/uni-popup-dialog.vue b/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -257,7 +257,8 @@
 		color: #909399;
 	}
 
-	.uni-popup-dialog__close {
+	.uni-popup-dialog__close {
+		display: block;
 		cursor: pointer;
 		position: absolute;
 		top: 9px;

diff --git a/components/uni-swipe-action-item/index.wxs b/components/uni-swipe-action-item/index.wxs
@@ -280,7 +280,7 @@ function isPC() {
 	return flag;
 }
 
-let movable = false
+var movable = false
 
 function mousedown(e, ins) {
 	if (!isPC()) return

diff --git a/pages/nvue/popup/popup.nvue b/pages/nvue/popup/popup.nvue
@@ -9,10 +9,10 @@
 		</view>
 		<uni-section title="自定义弹出层(dialog + message) 示例" type="line"></uni-section>
 		<view class="example-body message">
-			<button class="button popup__success" @click="toggleMessage('success')"><text class="button-text">成功</text></button>
-			<button class="button popup__error" @click="toggleMessage('error')"><text class="button-text">错误</text></button>
-			<button class="button popup__warn" @click="toggleMessage('warn')"><text class="button-text">警告</text></button>
-			<button class="button popup__info" @click="toggleMessage('info')"><text class="button-text">信息</text></button>
+			<view class="button popup__success" @click="toggleMessage('success')"><text class="button-text">成功</text></view>
+			<view class="button popup__error" @click="toggleMessage('error')"><text class="button-text">错误</text></view>
+			<view class="button popup__warn" @click="toggleMessage('warn')"><text class="button-text">警告</text></view>
+			<view class="button popup__info" @click="toggleMessage('info')"><text class="button-text">信息</text></view>
 		</view>
 		<uni-section title="提交信息 (input + 延迟关闭)" type="line"></uni-section>
 		<view class="example-body dialog">
@@ -209,7 +209,8 @@
 		justify-content: center;
 		flex: 1;
 		height: 40px;
-		margin: 0 15px;
+		margin: 0 15px;
+		border-radius: 5px;
 	}
 
 	.button-text {
@@ -246,7 +247,7 @@
 
 	.popup__success {
 		color: #fff;
-		background-color: $uni-color-success;
+		background-color: #09BB07;
 	}
 
 	.popup__warn {

diff --git a/pages/vue/popup/popup.vue b/pages/vue/popup/popup.vue
@@ -9,10 +9,10 @@
 		</view>
 		<uni-section title="自定义弹出层(dialog + message) 示例" type="line"></uni-section>
 		<view class="example-body message">
-			<button class="button popup__success" @click="toggleMessage('success')"><text class="button-text">成功</text></button>
-			<button class="button popup__error" @click="toggleMessage('error')"><text class="button-text">错误</text></button>
-			<button class="button popup__warn" @click="toggleMessage('warn')"><text class="button-text">警告</text></button>
-			<button class="button popup__info" @click="toggleMessage('info')"><text class="button-text">信息</text></button>
+			<view class="button popup__success" @click="toggleMessage('success')"><text class="button-text">成功</text></view>
+			<view class="button popup__error" @click="toggleMessage('error')"><text class="button-text">错误</text></view>
+			<view class="button popup__warn" @click="toggleMessage('warn')"><text class="button-text">警告</text></view>
+			<view class="button popup__info" @click="toggleMessage('info')"><text class="button-text">信息</text></view>
 		</view>
 		<uni-section title="提交信息 (input + 延迟关闭)" type="line"></uni-section>
 		<view class="example-body dialog">
@@ -209,7 +209,8 @@
 		justify-content: center;
 		flex: 1;
 		height: 40px;
-		margin: 0 15px;
+		margin: 0 15px;
+		border-radius: 5px;
 	}
 
 	.button-text {
@@ -246,7 +247,7 @@
 
 	.popup__success {
 		color: #fff;
-		background-color: $uni-color-success;
+		background-color: #09BB07;
 	}
 
 	.popup__warn {