【fix】优化代码

views/account/balance/index.vue

@@ -9,7 +9,7 @@
 import Header from '@/components/Header/index.vue'
 import { useScroll } from "@/hooks/useScroll";
 import { useJump } from "@/hooks/useJump";
-import { useMainStore } from "@/store/store";
+import { useMainStore } from "@/store/modules/useMainStore";
 import { storeToRefs } from "pinia";
 import { usePaging } from "@/hooks/usePaging";
 import { pageUserBill } from "@/api/account/balance";
@@ -34,7 +34,7 @@ onLoad(() => {
   otherParams.value.category = 'now_money'
 })
 
-onShow(()=>{
+onShow(() => {
   refreshPage()
 })
 </script>

views/account/integral/index.vue

@@ -16,7 +16,7 @@ import { pageIntegralBill } from "@/api/account/integral";
 import { usePaging } from "@/hooks/usePaging";
 import moment from "moment";
 import Empty from '@/components/Empty/index.vue'
-import { useMainStore } from "@/store/store";
+import { useMainStore } from "@/store/modules/useMainStore";
 import { storeToRefs } from "pinia";
 
 const {scrollTop} = useScroll();
@@ -24,7 +24,7 @@ onPageScroll(() => {
 })
 
 const mainStore = useMainStore()
-const {user} = storeToRefs(mainStore);
+const {user, integralName} = storeToRefs(mainStore);
 
 const filterTabs = [
   {label: '全部', value: 99},
@@ -63,14 +63,14 @@ onLoad(() => {
     <Header
         :scroll-top="scrollTop"
         system-bar-area-bg="#fff"
-        header-area-bg="#fff"> 我的积分
+        header-area-bg="#fff"> 我的{{ integralName }}
     </Header>
     <view class="integral">
       <!-- 积分展示 -->
       <view
           class="num-card"
           :style="{backgroundImage:`url(${accountIntegralBg})`}">
-        <view class="title">当前积分</view>
+        <view class="title">当前{{ integralName }}</view>
         <view class="num"> {{ user.integral || '0.00' }}</view>
       </view>
       <!-- tabs -->

views/account/recharge/index.vue

@@ -170,7 +170,7 @@ onLoad(async (options) => {
 
       <view class="ver-card">
         <view class="title">支付方式</view>
-        <u-radio-group
+        <uv-radio-group
             activeColor="#EE6D46"
             v-model="rechargeForm.type"
             placement="column"
@@ -189,16 +189,26 @@ onLoad(async (options) => {
                   <text class="text">{{ item.label }}</text>
                 </view>
               </view>
-              <u-radio
+              <uv-radio
                   :customStyle="{marginBottom: '8px'}"
                   label=" "
                   :name="item.value"
               />
             </view>
           </template>
-        </u-radio-group>
+        </uv-radio-group>
       </view>
 
+
+      <view class="tips-content">
+        <view class="title">充值说明</view>
+        <view
+            class="content"
+            v-html="rechargeConfig.content"></view>
+      </view>
+
+      <view style="width: 100%;height: 140rpx"></view>
+
       <view
           class="btn-row row animation-button"
           :class="{disabled:rechargeForm.amount<=0}"
@@ -331,6 +341,20 @@ onLoad(async (options) => {
     }
   }
 
+  .tips-content {
+    width: 100%;
+    color: #999999;
+
+    .title {
+      font-size: 28rpx;
+    }
+
+    .content {
+      padding: 16rpx 0;
+      font-size: 24rpx;
+    }
+  }
+
   .row {
     margin-top: 24rpx;
   }

views/account/signIn/index.vue

@@ -14,7 +14,7 @@ import { accountSignInBg, accountSignOk, accountSignStar, accountSignSuccessBg }
 import { onMounted, ref } from "vue";
 import { getIntegralRule, getSignInInfo, signIn } from "@/api/account/signIn";
 import { useInterface } from "@/hooks/useInterface";
-import { useMainStore } from "@/store/store";
+import { useMainStore } from "@/store/modules/useMainStore";
 import { storeToRefs } from "pinia";
 import Popup from "@/components/Popup.vue";
 import moment from "moment";
@@ -24,7 +24,7 @@ onPageScroll(() => {
 })
 
 const mainStore = useMainStore()
-const {user} = storeToRefs(mainStore);
+const {user, integralName} = storeToRefs(mainStore);
 const {toast} = useInterface()
 
 // 签到信息
@@ -115,7 +115,7 @@ onMounted(() => {
         <!-- 积分显示 -->
         <view class="header-row flex flex-ai__end">
           {{ user.integral || '0.00' }}
-          <text class="sub">积分</text>
+          <text class="sub">{{ integralName }}</text>
         </view>
         <!-- 签到显示 -->
         <view class="sign-btn-row">
@@ -141,7 +141,8 @@ onMounted(() => {
                   class="item flex flex-column flex-ai__center flex-jc__center "
                   :class="{none:!date.isSign}">
                 <view class="item-box flex flex-column flex-ai__center flex-jc__center">
-                  <text>+{{ date.integral }}</text>
+                  <text v-if="date.integral!==null">+{{ date.integral }}</text>
+                  <text v-else>&emsp;</text>
                   <image :src="date.isSign?accountSignOk:accountSignStar" />
                 </view>
                 {{ moment(date.createTime).format("MM-DD") }}
@@ -166,7 +167,7 @@ onMounted(() => {
 
               <view class="row-info flex flex-ai__center flex-jc__sb">
                 <view class="left">
-                  <view class="name">{{ task.typeName }}</view>
+                  <view class="name">{{ task.typeName }}{{ task.attribute1 ? `${ task.attribute1 }天` : '' }}</view>
                   <view class="sub flex flex-ai__center">
 
                   </view>
@@ -193,7 +194,7 @@ onMounted(() => {
         <view
             class="count-row flex">
           <view class="count">{{ successIntegral }}</view>
-          积分
+          {{ integralName }}
         </view>
         <view class="info">
           签到成功，恭喜您获得

views/account/withdraw/index.vue

@@ -15,7 +15,7 @@ import Popup from "@/components/Popup.vue";
 import { getWithDrawMethodList, updateWithDrawMethod, withDrawNow } from "@/api/account/integral";
 import { onLoad } from "@dcloudio/uni-app";
 import { useRouter } from "@/hooks/useRouter";
-import { useMainStore } from "@/store/store";
+import { useMainStore } from "@/store/modules/useMainStore";
 import { storeToRefs } from "pinia";
 import { aliIcon, balanceIcon } from "@/utils/images";
 import { cloneDeep } from "loadsh";
@@ -155,13 +155,13 @@ onLoad(async (options) => {
           </text>
         </view>
         <view class="row">
-          可提现金额{{ maxMoney }}元
+          可提现金额{{ maxMoney.toFixed(2) }}元
         </view>
       </view>
 
       <view class="ver-card">
         <view class="title">提现至</view>
-        <u-radio-group
+        <uv-radio-group
             activeColor="#EE6D46"
             v-model="methodCurrent"
             placement="column"
@@ -186,14 +186,14 @@ onLoad(async (options) => {
                   更新账户
                 </text>
               </view>
-              <u-radio
+              <uv-radio
                   :customStyle="{marginBottom: '8px'}"
                   label=" "
                   :name="item.id"
               />
             </view>
           </template>
-        </u-radio-group>
+        </uv-radio-group>
       </view>
 
       <view