Merge branch 'new51' into dev

src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue

@@ -113,6 +113,9 @@
 							_this.cardList[0].mark = _this.choosePath;
 							this.curCardChoose = _this.cardList[0];
 						}
+						else {
+							util.showNone("无数据");
+						}
 						util.hideLoad();
 					}
 					else {
@@ -262,7 +265,7 @@
 		position: absolute;
 		top: 0%;
 		left: 0;
-		z-index: 1024;
+		z-index: 2048;
 		overflow: hidden;
 	}
 	

src/subpackage/retail/pages/confirm_goods/confirm_goods.vue

@@ -304,6 +304,7 @@
 		padding-bottom: calc( 0rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
 		padding-bottom: calc( 0rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
 		// border: 1px solid red;
+		z-index: 1;
 		
 		.final-cart-list {
 			display: flex;