fix:冲突解决

pages_classify/components/orderList/listItem.vue

@@ -29,7 +29,7 @@
                 <view class="item-btns">
                     <view class="btn-s" @click="onClick(1)">查看</view>
                     <view class="btn-m" @click="onClick(2)"><img src="/static/serverImg/list/mess.png" alt=""
-                            style="width: 28rpx;height: 28rpx;margin-right: 8rpx;">沟通</view>
+                            style="width: 28rpx;height: 28rpx;margin-right: 8rpx;margin-top: 6rpx;">沟通</view>
                 </view>
             </view>
         </view>
@@ -143,34 +143,32 @@ function onClick(type) {
                 .btn-s {
                     font-size: 26rpx;
                     font-weight: 400;
-                    letter-spacing: 0rpx;
                     line-height: 39rpx;
                     color: rgba(51, 102, 255, 1);
                     text-align: center;
-
+                    padding: 16rpx 0;
                     width: 156.03rpx;
-                    height: 67rpx;
                     border-radius: 8rpx;
                     background: rgba(0, 0, 0, 0);
                     display: flex;
-                    align-items: center;
                     justify-content: center;
                     border: 0rpx solid rgba(51, 102, 255, 1);
                 }
 
                 .btn-m {
                     width: 188.03rpx;
-                    height: 67rpx;
-                    opacity: 1;
                     border-radius: 8rpx;
+                    font-size: 26rpx;
                     background: rgba(51, 102, 255, 1);
 
                     text-align: left;
                     margin-left: 24rpx;
                     display: flex;
-                    align-items: center;
                     justify-content: center;
                     color: rgba(255, 255, 255, 1);
+                    padding: 16rpx 0;
+
+                    width: 188.03rpx;
                 }
             }
         }