update

src/packages/mobile/router/index.ts

@@ -47,11 +47,6 @@ const routes: Array<RouteRecordRaw> = [
             component: () => import('../views/purchase/list/index.vue'),
           },
           {
-            path: 'supply-demand',
-            name: 'home-supply-demand',
-            component: () => import('../views/supply-demand/list/index.vue'),
-          },
-          {
             path: 'mine',
             name: 'home-mine',
             component: () => import('../views/mine/main/index.vue'),
@@ -189,6 +184,11 @@ const routes: Array<RouteRecordRaw> = [
     component: Page,
     children: [
       {
+        path: '',
+        name: 'supply-demand-list',
+        component: () => import('../views/supply-demand/list/index.vue'),
+      },
+      {
         path: "add",
         name: "SupplyDemandAdd",
         component: () => import("../views/supply-demand/add/index.vue"),

src/packages/mobile/views/credit/signin/index.vue

@@ -92,7 +92,7 @@
                             <img src="@mobile/assets/icons/goods.png" />
                         </div>
                         <div class="title-content">
-                            <span>供求下单每次</span>
+                            <span>现货下单每次</span>
                             <span>积分+{{ getScoreConfig(6) }}</span>
                         </div>
                     </div>

src/packages/mobile/views/home/index.vue

@@ -44,12 +44,6 @@ const tabList: Tabbar[] = [
     activeIcon: 'icon-purchase-active',
   },
   {
-    name: 'home-supply-demand',
-    label: '供求',
-    icon: 'icon-supply-demand',
-    activeIcon: 'icon-supply-demand-active',
-  },
-  {
     name: 'home-mine',
     label: '我的',
     icon: 'icon-mine',

src/packages/mobile/views/home/main/index.less

@@ -16,7 +16,6 @@
                 img {
                     width: 100%;
                     height: 100%;
-                    object-fit: cover;
                 }
             }
         }

src/packages/mobile/views/home/main/index.vue

@@ -33,9 +33,9 @@
             <img src="@mobile/assets/icons/wdrw.svg" />
             <span>我的任务</span>
           </li>
-          <li @click="routerTo('contract')">
+          <li @click="routerTo('supply-demand-list')">
             <img src="@mobile/assets/icons/htzr.svg" />
-            <span>合同转让</span>
+            <span>现货转让</span>
           </li>
           <li @click="routerTo('rules-ccwl')">
             <img src="@mobile/assets/icons/ccwl.svg" />
@@ -97,7 +97,7 @@
           </Swipe>
         </section>
       </app-block>
-      <app-block class="home-main__banner home-main__banner--body" v-if="false">
+      <app-block class="home-main__banner home-main__banner--body" v-if="bodyBanners.length">
         <Swipe :autoplay="5000" indicator-color="white" lazy-render>
           <SwipeItem v-for="(item, index) in bodyBanners" :key="index">
             <img :src="getFileUrl(item.imagepath)" />

src/packages/mobile/views/mine/main/index.less

@@ -41,10 +41,17 @@
 
                 &__info {
                     flex: 1;
-                    display: flex;
-                    flex-direction: column;
 
-                    >span {
+                    .top {
+                        font-size: .24rem;
+                        color: #A1B1C5;
+
+                        .van-icon {
+                            margin-left: .04rem;
+                        }
+                    }
+
+                    .bottom {
                         line-height: .4rem;
                         font-size: .3rem;
                         font-weight: bold;

src/packages/mobile/views/mine/main/index.vue

@@ -11,10 +11,12 @@
               <img class="g-image--avatar" :src="userAvatar" />
             </div>
             <div class="profile-user__info">
-              <div>
-                <Tag :type="authStatus ? 'success' : 'primary'">{{ getAuthStatusName(authStatus) }}</Tag>
+              <div class="top" v-if="accountInfo?.accountname">
+                <span>{{ accountInfo.accountname }}</span>
+                <Icon name="checked" color="var(--van-tag-success-color)" v-if="authStatus" />
+                <Icon name="warning" color="var(--van-tag-warning-color)" v-else />
               </div>
-              <span>{{ loginStore.loginId }}</span>
+              <div class="bottom">{{ loginStore.loginId }}</div>
             </div>
           </div>
           <div class="profile-account">
@@ -122,7 +124,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, onActivated, computed } from 'vue'
-import { Cell, CellGroup, Button, Tag, showFailToast } from 'vant'
+import { Cell, CellGroup, Button, showFailToast, Icon } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { getFileUrl } from '@/filters'
 import { useNavigation } from '@/hooks/navigation'
@@ -131,7 +133,7 @@ import { localData } from '@/stores/storage'
 import AppIconfont from '@mobile/components/base/iconfont/index.vue'
 import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
-import { AuthStatus, getAuthStatusName } from '@/constants/account'
+import { AuthStatus } from '@/constants/account'
 import eventBus from '@/services/bus'
 import AppRegisterCode from '@mobile/components/modules/register-code/index.vue'
 

src/packages/mobile/views/mine/order/detail/purchasetrade/index.vue

@@ -14,7 +14,7 @@
                 <Cell title="交收结算价"
                     :value="handleNumberValue(detail.lastprice.toFixed(2), '元/' + getGoodsUnitName(detail.unitid))" />
                 <Cell title="尾款" :value="handleNumberValue(detail.remainamount.toFixed(2), '元')" />
-                <Cell title="尾款支付截止日" label="若河钢招标价晚于交收月10号，待公布后顺延2个自然日付款" />
+                <Cell title="尾款支付截止日" label="河钢招标价公布后2个工作日内付款" />
                 <Cell title="状态" :value="detail.thjorderstatusdisplay" />
                 <Cell title="采购时间" :value="formatDate(detail.tradetime)" />
                 <Cell title="合同转让截止日" :value="detail.enddate" />
@@ -37,6 +37,7 @@
             <CellGroup title="点价信息" v-if="detail.buyuserid === detail.firstbuyuserid">
                 <Cell title="今日点价收益" :value="detail.todaypointincome + '元'" />
                 <Cell title="点价总收益" :value="detail.pointincome + '元'" />
+                <Cell title="剩余点价次数" :value="detail.availabletime" />
             </CellGroup>
         </div>
         <div v-else>
@@ -122,7 +123,7 @@ const spotPricingSubmit = () => {
     if (pointflag) {
         dialog('采购当日不能点价或当日已点价，请明天再试。')
     } else if (priceflag) {
-        let message = `今日差价${diffprice}(昨结${ystspotgoodsprice}，今开${todayspotgoodsprice})，是否点价？\n`
+        let message = `今日差价${diffprice}元/吨(昨结${ystspotgoodsprice}，今开${todayspotgoodsprice})，是否点价？\n`
         message += `<span style="color:red;">剩余点价次数${availabletime}/${pointtimes}</span>`
 
         dialog({
@@ -142,7 +143,7 @@ const spotPricingSubmit = () => {
             })
         })
     } else {
-        dialog('当日价格未公布或当日差价小于等于0。')
+        dialog('当日价格未公布或当日差价小于等于0元')
     }
 }
 

src/packages/mobile/views/mine/order/his/wrorder/index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view class="hiswrorder-order" flex>
         <template #header>
-            <app-navbar title="供求委托-历史" />
+            <app-navbar title="现货委托-历史" />
         </template>
         <Cell title="委托日期" :value="date" @click="show = true" is-link></Cell>
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"

src/packages/mobile/views/mine/order/his/wrtrade/index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view class="hiswrtrade" flex>
         <template #header>
-            <app-navbar title="供求成交-历史" />
+            <app-navbar title="现货成交-历史" />
         </template>
         <Cell title="成交日期" :value="date" @click="show = true" is-link></Cell>
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"

src/packages/mobile/views/mine/order/list/index.vue

@@ -21,10 +21,10 @@
             <Tab title="转让成交">
                 <transfer-buy v-if="activeTab === 2" />
             </Tab>
-            <Tab title="供求委托">
+            <Tab title="现货委托">
                 <wr-order v-if="activeTab === 3" />
             </Tab>
-            <Tab title="供求成交">
+            <Tab title="现货成交">
                 <wr-trade v-if="activeTab === 4" />
             </Tab>
         </Tabs>

src/packages/mobile/views/mine/wareorder/components/listing/index.vue

@@ -2,7 +2,7 @@
     <app-modal class="wareorder-listing" direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="供求挂牌" @back="closed" />
+                <app-navbar title="现货挂牌" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>

src/packages/mobile/views/product/detail/index.less

@@ -10,7 +10,6 @@
             img {
                 width: 100%;
                 height: 100%;
-                object-fit: cover;
             }
         }
     }

src/packages/mobile/views/supply-demand/add/index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view class="supply-demand-add">
         <template #header>
-            <app-navbar title="供求下单" />
+            <app-navbar title="现货下单" />
         </template>
         <Tabs>
             <Tab title="我要卖">

src/packages/mobile/views/supply-demand/detail/index.less

@@ -17,7 +17,6 @@
                     img {
                         width: 100%;
                         height: 100%;
-                        object-fit: cover;
                     }
                 }
             }

src/packages/mobile/views/supply-demand/detail/index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view class="supply-demand-details g-form">
         <template #header>
-            <app-navbar title="供求详情" />
+            <app-navbar title="现货详情" />
         </template>
         <div v-if="quoteItem" class="supply-demand-details__content">
             <Swipe class="banner" :autoplay="5000" indicator-color="white" lazy-render>

src/packages/mobile/views/supply-demand/list/index.vue

@@ -1,7 +1,7 @@
 <template>
   <app-view class="supply-demand">
     <template #header>
-      <app-navbar class="supply-demand__header" title="供求" :show-back-button="false">
+      <app-navbar class="supply-demand__header" title="现货转让">
         <template #right>
           <Icon name="add" size=".4rem" @click="$router.push({ name: 'SupplyDemandAdd' })" />
         </template>