Merge remote-tracking branch 'origin/admin_dev' into admin_dev

pages/customer/components/AccountCard.vue

@@ -2,8 +2,26 @@
     <view class="col-lg-4 col-md-6">
         <view class="card">
             <view class="card-header d-flex align-items-center justify-content-between border-0 pb-2 p-3">
-                <text v-if="!isDel" class="badge bg-success-subtle text-success">正常</text>
-                <text v-if="isDel" class="badge bg-danger-subtle text-danger">已删除</text>
+                <uni-tooltip v-if="account.del == 1" placement="top">
+                    <view class="cwg-close d-flex align-items-center">
+                        <cwg-icon name="cwg-close" :size="14" :color="'#fff'" />
+                    </view>
+                    <template #content>
+                        <text>{{ t("Tips.item1")
+                        }}<text style="color: red">{{ account.markDelTime }}</text>{{ t("Tips.item2") }}</text>
+                    </template>
+                </uni-tooltip>
+                <template v-if="account.del != 1">
+                    <view v-if="!isDel" class="badge bg-success-subtle text-success d-flex align-items-center" >
+                        <!-- <cwg-icon name="crm-check" :size="13" :color="'#22B07E'" /> -->
+                        <text v-t="'Blockchain.enabled'" />
+                    </view>
+                    <text v-if="isDel" class="badge bg-danger-subtle text-danger">已删除</text>
+                </template>
+
+
+
+
                 <view class="clearfix">
                     <view class="btn-group">
                         <cwg-dropdown ref="dropdownRef" @open="onOpen" @close="onClose" :menu-list="customMenuList"
@@ -70,9 +88,11 @@
                         <view class="d-flex flex-wrap gap-2" v-if="isReal">
                             <button v-for="btn in actionButtons" :key="btn.key" type="submit" value="Submit"
                                 class="btn btn-dark btn-sm waves-effect waves-light"
-                                :class="{ 'disabled': btn.disabled, 'btn-outline-dark1': btn.key !== 'deposit'}" @click="handleAction(btn.action)">
+                                :class="{ 'disabled': btn.disabled, 'btn-outline-dark1': btn.key !== 'deposit' }"
+                                @click="handleAction(btn.action)">
                                 <view class="d-flex align-items-center justify-content-center gap-1">
-                                    <cwg-icon :name="btn.icon" :size="14" :color="btn.key === 'deposit' ? '#fff' : ''" />
+                                    <cwg-icon :name="btn.icon" :size="14"
+                                        :color="btn.key === 'deposit' ? '#fff' : ''" />
                                     {{ t(btn.label) }}
                                 </view>
                             </button>
@@ -289,7 +309,15 @@ onBeforeUnmount(() => {
 
 <style scoped lang="scss">
 @import '@/uni.scss';
-
+.cwg-close{
+    width: px2rpx(20);
+    height: px2rpx(20);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background-color: #F56C6C;
+}
 .btn.disabled {
     opacity: 0.5;
     cursor: not-allowed;

uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue

@@ -94,6 +94,7 @@ export default {
 	background-color: rgba(var(--bs-body-bg-rgb), 1) !important;
 	border-radius: 8px;
 	color: var(--bs-emphasis-color);
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 	font-size: 12px;
 	text-align: left;
 	line-height: 20px;