ljc vor 3 Wochen
Ursprung
Commit
50c6a2d827

+ 14 - 2
pages/common/notice.vue

@@ -7,7 +7,7 @@
                     :placeholder="t('Custom.PaymentHistory.StatusPlaceholder')" />
             </view>
             <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields"
-                :queryParams="search" :api="listApi" @go-pages="goPages" :isPages="true">
+                :queryParams="search" :api="listApi" @go-pages="goPages" :isPages="true" :immediate="true">
                 <template #status="{ row }">
                     <text class="status-tag" :class="getStatusColor(row.read)">{{readOptions.find(item => item.value === row.read)?.text}}</text>
                 </template>
@@ -21,7 +21,12 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 const { t, locale } = useI18n();
 import { newsApi } from '@/service/news';
+import {
+  onShow,
+  onHide
+} from '@dcloudio/uni-app'
 import useRouter from "@/hooks/useRouter";
+
 const router = useRouter();
 const search = ref({
     read: null,
@@ -41,6 +46,12 @@ watch(locale, () => {
 watch(search, (newVal) => {
     tableRef.value?.reload()
 }, { immediate: true, deep: true })
+
+onShow(()=>{
+  // console.log('show')
+  // console.log(tableRef.value)
+  tableRef.value?.reload()
+})
 // 表格列配置(支持插槽和格式化)
 const columns = computed(() => [
     {
@@ -104,6 +115,7 @@ const getStatusColor = (value) => {
   return classMap[value] || ''
 }
 const goPages = (e) => {
+  // tableRef.value?.refreshTable()
     router.push({
         path: '/pages/analytics/detail',
         query: {
@@ -111,7 +123,7 @@ const goPages = (e) => {
             type: 7
         }
     })
-    tableRef.value?.reload()
+
 }
 const listApi = ref(null)
 listApi.value = newsApi.newsNoticeList

+ 4 - 4
pages/customer/payment-history.vue

@@ -15,7 +15,7 @@
                 </template>
                 <template #status="{ row }">
                     <view class="status-box">
-                        <view v-if="row.type == 1">
+                        <template v-if="row.type == 1">
                             <text v-if="
                                 row.status == 1 &&
                                 row.callbackStatus == 0 &&
@@ -51,9 +51,9 @@
                                 row.expireTime != null &&
                                 time > row.expireTime
                             " class="status-tag status-expired" v-t="'State.expireTime'"></text>
-                        </view>
+                        </template>
 
-                        <view v-if="row.type == 2">
+                        <template v-if="row.type == 2">
                             <text v-if="
                                 row.status == 1 &&
                                 row.callbackStatus == 0 &&
@@ -79,7 +79,7 @@
                                 row.status == 3 ||
                                 row.executionStatus == 3
                             " class="status-tag status-failed" v-t="'State.Refused'"></text>
-                        </view>
+                        </template>
 
                         <text v-if="row.status == 5" class="status-tag status-cancelled" v-t="'State.Cancelled'"></text>
 

+ 12 - 7
pages/login/index.vue

@@ -102,9 +102,9 @@
                 </navigator>
               </view>
               <view class="cwg-button">
-                <u-button type="primary" class="" @click="submit">
+                <button type="primary" class="" @click="submit">
                   {{ t('signin.login') }}
-                </u-button>
+                </button>
               </view>
               <view @click="activeTab = 2" class="account-tip">
                 {{ t('signin.words') }}
@@ -833,6 +833,11 @@ const handleChatIconClick = () => {
   box-shadow: 0 px2rpx(8) px2rpx(20) rgba(0, 0, 0, 0.15);
   will-change: transform;
 }
+@media screen and (max-width: 991px) {
+  .chat-icon {
+    right: px2rpx(-25);
+  }
+}
 
 .chat-icon:hover {
   transform: scale(1.1);
@@ -1040,14 +1045,14 @@ const handleChatIconClick = () => {
     .account {
       background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
       position: relative;
-      height: calc(100vh - 120px);
+      height: calc(100vh - 60px);
       display: flex;
       flex-direction: column;
       //justify-content: center;
       padding: 0 10%;
 
       .company {
-        padding: px2rpx(20) 0 px2rpx(40) 0;
+        padding: px2rpx(20) 0 px2rpx(30) 0;
         position: relative;
         align-items: center !important;
       }
@@ -1192,7 +1197,7 @@ button {
 
 .regiset-btn {
   margin: px2rpx(20) 0;
-  border-radius: px2rpx(20);
+  border-radius: px2rpx(8);
 }
 
 .account-tip {
@@ -1346,7 +1351,7 @@ button {
   color: #fff;
   text-align: center;
   line-height: 3rem;
-  border-radius: 0 25px 25px 0;
+  border-radius: 0 px2rpx(8) px2rpx(8) 0;
   cursor: pointer;
   font-size: 14px;
   flex-shrink: 0;
@@ -1378,7 +1383,7 @@ button {
   width: 100%;
   height: px2rpx(40);
   line-height: px2rpx(40);
-  border-radius: px2rpx(20);
+  border-radius: px2rpx(8);
   background-color: var(--color-error);
   color: #fff;
   font-weight: bold;

+ 1 - 1
pages/mine/components/BankInfoTab.vue

@@ -957,7 +957,7 @@
       height: px2rpx(40);
       background: var(--bs-secondary);
       color: #fff;
-      border-radius: px2rpx(10);
+      border-radius: px2rpx(8);
       padding: 0 px2rpx(20);
       display: flex;
       align-items: center;

+ 7 - 3
pages/mine/components/CardAuthDialog.vue

@@ -31,7 +31,7 @@
                             </view>
                             <view class="get-code-btn">
                                 <view class="cwg-button">
-                                    <u-button type="primary" block @click="handleGetCode">{{ getCodeString }}</u-button>
+                                    <button class="btn-gray" block @click="handleGetCode">{{ getCodeString }}</button>
                                 </view>
                             </view>
                         </view>
@@ -288,8 +288,8 @@ defineExpose({
 
     .dialog-footer {
         display: flex;
-        gap: px2rpx(12);
-        justify-content: space-around;
+        gap: px2rpx(20);
+        justify-content: center;
         padding: px2rpx(16);
         border-top: 1px solid #f3f4f6;
 
@@ -520,6 +520,10 @@ defineExpose({
         border-radius: px2rpx(8);
         height: px2rpx(46) !important;
     }
+  .btn-gray{
+    background-color: #102047;
+    color: #fff;
+  }
 }
 
 /* 移动端优化 */

+ 2 - 2
static/scss/global/global.scss

@@ -1512,7 +1512,7 @@ uni-content.collapsed {
     padding: 4rpx 12rpx;
     border-radius: 4rpx;
     font-size: var(--font-size-24);
-    font-weight: 500;
+    //font-weight: 500;
     line-height: 1.5;
     white-space: nowrap;
     transition: all var(--default-transition-duration) var(--default-transition-timing-function);
@@ -1560,7 +1560,7 @@ uni-content.collapsed {
 .status-failed {
     background-color: #FEF2F2;
     color: #EF4444;
-  border-color: #FECACA;
+    border-color: #FECACA;
 }
 
 // 取消 / 已取消

+ 2 - 2
uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue

@@ -479,7 +479,7 @@
 			flex-direction: row;
 			align-items: center;
 			text-align: left;
-			font-size: 14px;
+			font-size: 16px;
 			color: var(--bs-emphasis-color);
 			height: 36px;
 			padding: 0 12px 0 0;
@@ -503,7 +503,7 @@
 			// align-items: center;
 			/* #endif */
 			position: relative;
-			font-size: 14px;
+			font-size: 16px;
 			flex: 1;
 			/* #ifndef APP-NVUE */
 			box-sizing: border-box;