From 14c69fe80e4fa6c73dfdf4ed51973396305d27d4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 18:58:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss b/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss
index e845167..9ab41c7 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss
@@ -114,8 +114,6 @@
.index .index-c .guanggao .guanggao-image image.data-v-dcbcfe34 {
width: 100%;
height: 100%;
-<<<<<<< HEAD
-=======
z-index: 999;
}
.index .index-c .guanggao .guanggao-image .sharebtn.data-v-dcbcfe34 {
@@ -130,7 +128,6 @@
width: 100%;
height: 100%;
z-index: 1000;
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
}
.index .index-c .statistics.data-v-dcbcfe34 {
width: 100%;
@@ -291,8 +288,6 @@
width: 22rpx;
height: 22rpx;
}
-<<<<<<< HEAD
-=======
.setup-sub.data-v-dcbcfe34 {
width: 100%;
height: 88rpx;
@@ -309,5 +304,4 @@
.redtxt.data-v-dcbcfe34 {
color: #FF0000 !important;
}
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
--
Gitblit v1.9.3