fix: 解决冲突

App.vue

@@ -63,7 +63,7 @@ export default {
   onHide: function () {},
   methods: {
     initFn(data) {
-      uni.hideLoading(); // 关闭 Loading
+      // uni.hideLoading(); // 关闭 Loading
       // uni.showModal({
       //   title: '查看initFn',
       //   content: data || '未传入参数 initFn',

pages/index/cleanPlan.vue

@@ -73,7 +73,9 @@
     <u-popup v-model="successShow" mode="center" :round="30">
       <view class="success-box">
         <view class="box-content">
-          <view class="logo"></view>
+          <view class="logo">
+            <image   style="width: 100%; height: 100%; " src="/static/images/msg-success.png" alt="" /></image>
+          </view>
           <view class="content-title">刷卡成功</view>
           <view class="btn-box">
             <view class="btn-cancel" @click="successShow = false">暂不</view>
@@ -86,7 +88,9 @@
     <u-popup v-model="errorShow" mode="center" :round="30">
       <view class="error-box">
         <view class="box-content">
-          <view class="logo"></view>
+          <view class="logo">
+            <image   style="width: 100%; height: 100%; " src="/static/images/msg-error.png" alt="" /></image>
+          </view>
           <view class="content-title">刷卡失败</view>
           <view class="btn-box">
             <view class="btn-cancel" @click="errorShow = false">暂不</view>
@@ -378,15 +382,14 @@ export default {
     background: linear-gradient(to bottom, #a7dafc, white 60%, white);
     border-radius: 30rpx;
     // border:1px solid red;
-    position: relative;
-    .logo {
-      position: absolute;
-      top: -50rpx;
-      left: 50%;
-      transform: translateX(-50%);
-      width: 200rpx;
-      height: 200rpx;
-      background-color: red;
+    position:relative;
+    .logo{
+      position:absolute;
+      top:-50rpx;
+      left:50%;
+      transform:translateX(-50%);
+      width:200rpx;
+      height:200rpx;
     }
     .content-title {
       position: absolute;
@@ -435,18 +438,18 @@ export default {
   .box-content {
     height: 450rpx;
     background-color: #ffffff;
-    background: linear-gradient(to bottom, #a7dafc, white 60%, white);
-    border-radius: 30rpx;
+    background: linear-gradient(to bottom, #FFEDDF, white 60%, white);
+    border-radius:30rpx;
     // border:1px solid red;
-    position: relative;
-    .logo {
-      position: absolute;
-      top: -50rpx;
-      left: 50%;
-      transform: translateX(-50%);
-      width: 200rpx;
-      height: 200rpx;
-      background-color: red;
+    position:relative;
+    .logo{
+      position:absolute;
+      top:-50rpx;
+      left:50%;
+      transform:translateX(-50%);
+      width:200rpx;
+      height:200rpx;
+      // background-color:red;
     }
     .content-title {
       position: absolute;
@@ -473,16 +476,16 @@ export default {
         font-size: 30rpx;
         color: #32353b;
       }
-      .btn-success {
-        width: 200rpx;
-        height: 70rpx;
-        background-color: #4278f4;
-        border-radius: 50rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 30rpx;
-        color: white;
+      .btn-success{
+        width:200rpx;
+        height:70rpx;
+        background-color:#F76590;
+        border-radius:50rpx;
+        display:flex;
+        align-items:center;
+        justify-content:center;
+        font-size:30rpx;
+        color:white;
       }
     }
   }