update

file/android/fxgl.txt

@@ -168,4 +168,12 @@ Android：b00def5475196e30bbd7ccb7f68fab01
 深金国际
 实盘
 com.muchinfo.sjgj_release_v1.0.0.apk
-http://134.175.108.44:8280/cfg?key=sjgj_ddgl
+http://134.175.108.44:8280/cfg?key=sjgj_ddgl
+
+
+三农互联
+模拟盘
+com.snhl.demo_v1.0.0.apk
+http://47.112.2.251:8280/cfg?key=snhl_mnp
+实盘
+com.snhl.release_v1.0.0.apk

src/packages/mobile/views/order/delivery/components/offline/list/Index.vue

@@ -30,10 +30,10 @@
                             <span>{{ $t('delivery.offline.deliveryamount') }}</span>
                             <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
                         </li>
-                        <li>
+                        <!-- <li>
                             <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
                             <span>{{ item.deliveryinfo }}</span>
-                        </li>
+                        </li> -->
                         <li>
                             <span>{{ $t('delivery.offline.applydate') }}</span>
                             <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>

src/packages/mobile/views/points/components/account/index.less

@@ -1,34 +0,0 @@
-.bankstatement-list {
-    padding: 10px;
-    padding-bottom: 0;
-
-    dl {
-        line-height: 1.8;
-        color: #999;
-        background-color: #fff;
-        border-radius: 8px;
-        padding: 10px;
-
-        dt,
-        dd {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        dt {
-            color: #333;
-        }
-
-        dd {
-            font-size: 12px;
-
-            .van-button {
-                width: 80px;
-                border-width: 1px;
-                margin-top: 10px;
-                margin-left: auto;
-            }
-        }
-    }
-}

src/packages/mobile/views/points/components/account/index.vue

@@ -1,49 +1,29 @@
 <!-- 积分信息- 我的积分 -->
 <template>
-    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
-        <div class="bankstatement-list" v-for="(item, index) in dataList" :key="index">
-            <dl>
-                <dd>
-                    <span>{{ $t('score.scoretypename') }}</span>
-                    <span>{{ handleNoneValue(item.scoretypename) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.oriscore') }}</span>
-                    <span>{{ handleNoneValue(item.oriscore) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.freezescore') }}</span>
-                    <span>{{ handleNoneValue(item.freezescore) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.todayincrease') }}</span>
-                    <span>{{ handleNoneValue(item.todayincrease) }}</span>
-                </dd>
-                 <dd>
-                    <span>{{ $t('score.todaydecrease') }}</span>
-                    <span>{{ handleNoneValue(item.todaydecrease) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.curscore') }}</span>
-                    <span>{{ handleNoneValue(item.curscore) }}</span>
-                </dd>
-            </dl>
-        </div>
+    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="onRefresh">
+        <template v-for="(item, index) in dataList" :key="index">
+            <CellGroup :title="item.scoretypename || $t('score.scoretypename')">
+                <Cell :title="$t('score.oriscore')" :value="item.oriscore" />
+                <Cell :title="$t('score.freezescore')" :value="item.freezescore" />
+                <Cell :title="$t('score.todayincrease')" :value="item.todayincrease" />
+                <Cell :title="$t('score.todaydecrease')" :value="item.todaydecrease" />
+                <Cell :title="$t('score.curscore')" :value="item.curscore" />
+            </CellGroup>
+        </template>
     </app-pull-refresh>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { CellGroup, Cell } from 'vant'
 import { useRequest } from '@/hooks/request'
 import { queryUserScore } from '@/services/api/user'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
-import { handleNoneValue } from '@/filters'
 
 const showModal = shallowRef(true)
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
-const refresh = shallowRef(false) // 是否刷新父组件数据
 
 const { loading, pageIndex, pageCount, run, dataList } = useRequest(queryUserScore)
 
@@ -52,8 +32,7 @@ const onRefresh = () => {
 }
 
 // 关闭弹窗
-const closed = (isRefresh = false) => {
-    refresh.value = isRefresh
+const closed = () => {
     showModal.value = false
 }
 
@@ -61,8 +40,4 @@ const closed = (isRefresh = false) => {
 defineExpose({
     closed,
 })
-</script>
-
-<style lang="less">
-@import './index.less';
-</style>
+</script>

src/packages/mobile/views/points/components/details/index.less

@@ -1,34 +0,0 @@
-.bankstatement-list {
-    padding: 10px;
-    padding-bottom: 0;
-
-    dl {
-        line-height: 1.8;
-        color: #999;
-        background-color: #fff;
-        border-radius: 8px;
-        padding: 10px;
-
-        dt,
-        dd {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        dt {
-            color: #333;
-        }
-
-        dd {
-            font-size: 12px;
-
-            .van-button {
-                width: 80px;
-                border-width: 1px;
-                margin-top: 10px;
-                margin-left: auto;
-            }
-        }
-    }
-}

src/packages/mobile/views/points/components/details/index.vue

@@ -1,35 +1,39 @@
 <!-- 积分信息-积分明细 -->
 <template>
-    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
-        <div class="bankstatement-list" v-for="(item, index) in dataList" :key="index">
-            <dl>
-                <dt>
-                    <span>
-                        {{ $t('score.detailid') }}
-                        {{ handleNoneValue(item.detailid) }}
-                    </span>
-                    <span>
-                        <b>{{ getValidTypeName(item.validtype) }}</b>
-                    </span>
-                </dt>
-                <dd>
-                    <span>{{ $t('score.scoretypename') }}</span>
-                    <span>{{ handleNoneValue(item.scoretypename) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.remainscore') }}</span>
-                    <span>{{ formatDecimal(item.remainscore) }}</span>
-                </dd>
-                <dd>
-                    <span>{{ $t('score.expiredate') }}</span>
-                    <span>{{ handleNoneValue(item.expiredate) }}</span>
-                </dd>
-                 <dd>
-                    <span>{{ $t('score.createdtime') }}</span>
-                    <span>{{ formatDate(item.createdtime) }}</span>
-                </dd>                
-            </dl>
+    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="onRefresh">
+        <div class="g-order-list">
+            <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-order-list__titlebar">
+                    <div class="left">
+                        <h4>{{ $t('score.detailid') }}：{{ item.detailid }}</h4>
+                    </div>
+                </div>
+                <div class="g-order-list__content">
+                    <ul>
+                        <li style="width: 100%;">
+                            <span>{{ $t('score.scoretypename') }}</span>
+                            <span>{{ handleNoneValue(item.scoretypename) }}</span>
+                        </li>
+                        <li style="width: 100%;">
+                            <span>有效期</span>
+                            <span>{{ getValidTypeName(item.validtype) }}</span>
+                        </li>
+                        <li style="width: 100%;">
+                            <span>{{ $t('score.remainscore') }}</span>
+                            <span>{{ formatDecimal(item.remainscore) }}</span>
+                        </li>
+                        <li style="width: 100%;">
+                            <span>{{ $t('score.expiredate') }}</span>
+                            <span>{{ handleNoneValue(item.expiredate) }}</span>
+                        </li>
+                        <li style="width: 100%;">
+                            <span>{{ $t('score.createdtime') }}</span>
+                            <span>{{ formatDate(item.createdtime) }}</span>
+                        </li>
+                    </ul>
+                </div>
+            </div>
         </div>
     </app-pull-refresh>
 </template>
@@ -45,7 +49,6 @@ import { getValidTypeName } from '@/constants/market'
 const showModal = shallowRef(true)
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
-const refresh = shallowRef(false) // 是否刷新父组件数据
 
 const { loading, pageIndex, pageCount, run, dataList } = useRequest(queryUserScoreDetail)
 
@@ -54,8 +57,7 @@ const onRefresh = () => {
 }
 
 // 关闭弹窗
-const closed = (isRefresh = false) => {
-    refresh.value = isRefresh
+const closed = () => {
     showModal.value = false
 }
 
@@ -63,8 +65,4 @@ const closed = (isRefresh = false) => {
 defineExpose({
     closed,
 })
-</script>
-
-<style lang="less">
-@import './index.less';
-</style>
+</script>