conflit: fix

components/popup/index.acss

 .dm-popup-content {
   position: fixed;
 }
+
 .dm-popup-mask {
   display: none;
   position: fixed;
@@ -12,56 +13,73 @@
   opacity: 0;
   pointer-events: none;
 }
+
 .dm-popup-left {
   transform: translateX(-100%);
   left: 0;
   top: 0;
   bottom: 0;
 }
+
 .dm-popup-right {
   transform: translateX(100%);
   right: 0;
   top: 0;
   bottom: 0;
 }
+
 .dm-popup-top {
   top: 0;
   width: 100vw;
   transform: translateY(-100%);
 }
+
 .dm-popup-bottom {
   bottom: 0;
   width: 100vw;
   transform: translateY(100%);
 }
+
 .dm-popup-show .dm-popup-content {
   transform: none;
 }
+
 .dm-popup-show .dm-popup-mask {
   display: block;
   opacity: 1;
   pointer-events: auto;
 }
+
 .dm-popup.animation .dm-popup-content {
   transition: all 0.15s linear;
 }
+
 .dm-popup.animation .dm-popup-mask {
   transition: all 0.15s linear;
 }
+
 /* 弹框的样式定义不同的类名 */
-.fillet{
+
+.fillet {
   background: #fff;
   border-radius: 16rpx 16rpx 0 0;
 }
-.close-icon{
-    height:64rpx;
+
+.close-icon {
+  font-size: 64rpx;
   text-align: center;
 }
-.close-icon .iconfont{
-  color:#291B263D;
+
+.close-icon > .iconfont {
+  color: #291B263D;
+  font-size: 64rpx;
 }
-.title{
+
+.popup-title {
+  font-family: PingFangSC-Regular;
   text-align: center;
   font-size: 24rpx;
-    color:rgba(25, 31, 37, 1);
+  opacity: 0.56;
+  color: #191F25;
 }
+

components/popup/index.axml

@@ -15,7 +15,7 @@
       <view a:if="{{position == 'bottom'}}" class="close-icon">
           <text onTap="onMaskTap" class="iconfont iconicon_slide"></text>
       </view>
-      <view class="title" a:if="{{title}}">{{title}}</view>
+      <view class="popup-title" a:if="{{title}}">{{title}}</view>
       <slot/>
   </view>
 </view>
\ No newline at end of file