Merge branch 'pr/856'

Author: 18148764734

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

@@ -318,7 +318,7 @@
 
 	.uni-navbar--fixed {
 		position: fixed;
-		z-index: 998;
+		z-index: 99;
 		/* #ifdef H5 */
 		left: var(--window-left);
 		right: var(--window-right);

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -18,7 +18,7 @@
 			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
 				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
 			</view>
 		</view>
@@ -310,4 +310,4 @@
 	.uni-popup__info {
 		color: #909399;
 	}
-</style>
+</style>