调整一些组件样式

components/MsgBox/MsgBox.vue

@@ -6,10 +6,12 @@
 			:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
 			:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
 			:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
-			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel"
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" :showSlot="item.showSlot"
 			:showHeader="item.showHeader" :headerTxt="item.headerTxt"
 		
-			@cancelPop="cancelClick(item,index)" />
+			@cancelPop="cancelClick(item,index)" >
+			<slot />
+			</MessagePopup>
 	</view>
 </template>
 
@@ -48,10 +50,10 @@
 				this.closePop(item);
 			},
 			closePop: function(item) {
-				debugger;
+				
 				if (item) {
 					this.Msgboxs.find((v, i) => {
-						debugger;
+						
 						if (item.key && v.key) {
 							if (item.key === v.key) {
 								this.Msgboxs.splice(i, 1);
@@ -79,7 +81,7 @@
 					showPop: true, //是否显示弹窗
 					popType: 'custom',
 					bgColor: '#383934bd',
-					borderColor: '#BBE600',
+					borderColor: '#BBE6004d',
 					textColor: '#ffffffde',
 					buttonBgColor: '#BBE600',
 					buttonTextColor: '#232323DE',
@@ -116,7 +118,7 @@
 				}
 
 				if (!json.borderColor) {
-					json.borderColor = '#BBE600';
+					json.borderColor = '#BBE6004d';
 					json.buttonBgColor = '#BBE600';
 				}
 				json.showPop = true;
@@ -137,21 +139,37 @@
 					error: {
 						icoUrl: '/static/images/common/uploadErr.png',
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434"
+						buttonBgColor: "#E03434",
+						bgColor:'#38393466',
+						buttonTextColor:'#FFFFFFde'
 					},
 					succ: {
 						icoUrl: '/static/images/common/success.png',
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
 					},
 					warn: {
 						icoUrl: '/static/images/common/warning.png',
-						borderColor: "#FFC84E",
+						borderColor: "#FFC84E4d",
 						buttonBgColor: "#FFC84E",
+						bgColor:'#38393466'
 					},
 					info:{						
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
+					},
+					prompt:{
+						
+						
+						borderColor: "#aed6004d",
+						buttonBgColor: "#aed600",
+						bgColor:'#38393466',
+						buttonTextColor:'#232323de',
+						showSlot:true,
+						showCancel:true,
+						buttonCancelText:'取消'
 					}
 				}
 
@@ -171,7 +189,13 @@
 					borderColor: cfg[type].borderColor,
 					buttonBgColor: cfg[type].buttonBgColor,
 					buttonText: btnTxt ? btnTxt : '确定',
-					okCallback: okCallback ? okCallback : this.closePop
+					okCallback: okCallback ? okCallback : this.closePop,
+					buttonTextColor:cfg[type].buttonTextColor,
+					bgColor:cfg[type].bgColor,
+					showSlot:cfg[type].showSlot,
+					showCancel:cfg[type].showCancel,
+					buttonCancelText:cfg[type].buttonCancelText
+					
 				};
 				return this.showPop(options);
 

components/global-loading/global-loading.vue

@@ -141,9 +141,8 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		transform: translateZ(0);
-		/* 启用GPU加速 */
-		margin-top: -150rpx;
+		transform: translateZ(0);		
+		margin-top: 0rpx;
 	}
 
 	/* 刻度容器 */