update

src/business/common/index.ts

@@ -14,7 +14,10 @@ export async function checkToken() {
             Token: token,
         })
     } catch (err) {
-        eventBus.$emit('LogoutNotify')
+        // 临时解决方案，有可能出现网络问题导致超时后账号被登出
+        if (err !== '业务超时') {
+            eventBus.$emit('LogoutNotify')
+        }
         return Promise.reject(err)
     }
 }

src/filters/index.ts

@@ -115,7 +115,7 @@ export function handleNumberValue(value: number | string, suffix = '') {
  * @param value 
  * @param decimal 保留小数位
  */
-export function parsePercent(value: number, decimal = 2) {
+export function parsePercent(value = 0, decimal = 2) {
     const val = formatDecimal(value * 100, decimal, false)
     return handleNumberValue(val, '%')
 }

src/packages/mobile/assets/themes/global/global.less

@@ -93,6 +93,77 @@
     }
 }
 
+/* 订单列表 */
+.g-order-list {
+    padding: .2rem;
+    padding-bottom: 0;
+
+    &__box {
+        &:not(:first-child) {
+            margin-top: .2rem;
+        }
+
+        background-color: #fff;
+        border-radius: .16rem;
+        padding: .24rem;
+
+    }
+
+    &__titlebar {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: .2rem;
+
+        .left {
+            >span {
+                font-size: .24rem;
+                color: #999;
+            }
+        }
+
+        .right {
+            font-size: .24rem;
+            color: #999;
+        }
+    }
+
+    &__content {
+        font-size: .24rem;
+
+        ul {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+
+            li {
+                display: flex;
+                justify-content: space-between;
+                line-height: .4rem;
+                width: calc(~"50% - .24rem");
+
+                span {
+                    &:first-child {
+                        color: #999;
+                        padding-right: .24rem;
+                    }
+                }
+            }
+        }
+    }
+
+    &__btnbar {
+        display: flex;
+        justify-content: flex-end;
+        gap: .16rem;
+        margin-top: .2rem;
+
+        .van-button {
+            width: 1.6rem;
+            border-width: 1px;
+        }
+    }
+}
+
 .van {
     &-dialog {
         &__message {

src/packages/mobile/views/contract/details/index.less

@@ -2,6 +2,10 @@
     background-color: #fff;
 
     &__form {
+        .van-field__label {
+            width: 2.2rem;
+        }
+
         .form {
             &-qty {
                 width: 100%;

src/packages/mobile/views/contract/details/index.vue

@@ -10,7 +10,7 @@
                         <app-select v-model="selectedMonth" :options="deliveryMonths" />
                     </template>
                 </Field>
-                <Field label="到期日期" v-if="selectedMonth">
+                <Field label="合同转让截止日" v-if="selectedMonth">
                     <template #input>
                         <span>{{ formatDate(selectedMonth, 'YYYY-MM-DD') }}</span>
                     </template>
@@ -22,12 +22,12 @@
                 </Field>
                 <Field label="参考价格" v-if="tableList.length">
                     <template #input>
-                        <span>{{ tableList[0].tradeprice.toFixed(2) }}</span>
+                        <span>{{ tableList[0].tradeprice.toFixed(2) }}元/吨</span>
                     </template>
                 </Field>
-                <Field label="预付金" v-if="tableList.length">
+                <Field label="每吨预付金" v-if="tableList.length">
                     <template #input>
-                        <span>{{ (tableList[0].tradeprice * selectedRate).toFixed(2) }}</span>
+                        <span>{{ (tableList[0].tradeprice * selectedRate).toFixed(2) }}元</span>
                     </template>
                 </Field>
             </CellGroup>
@@ -84,8 +84,8 @@ const chartData = reactive<{ price: number[]; date: string[]; }>({
 })
 
 const columns: Model.TableColumn[] = [
-    { prop: 'transferprice', label: '转让价格' },
-    { prop: 'tradeqty', label: '数量' },
+    { prop: 'transferprice', label: '每吨转让金额(元)' },
+    { prop: 'tradeqty', label: '数量(吨)' },
     { prop: 'operate', label: '操作' },
 ]
 

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

@@ -94,7 +94,8 @@ const versionToNumber = (value: number | string) => {
 }
 
 onMounted(() => {
-  currentTab.value = tabList.findIndex((e) => e.name === route.name)
+  const { tabIndex } = getGlobalUrlParams()
+  currentTab.value = tabIndex > -1 ? tabIndex : tabList.findIndex((e) => e.name === route.name)
 
   const os = plus.getSystemInfo('os')
   const currentVersion = plus.getSystemInfo('version')

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

@@ -60,11 +60,11 @@
                 </li>
                 <li>
                   <span>{{ item.spotname }}招标价 </span>
-                  <span class="g-color--up">{{ item.spotprice }} 元/吨</span>
+                  <span class="g-color--up">{{ item.spotprice }}元/吨</span>
                 </li>
                 <li>
                   <span>采购量 </span>
-                  <span class="g-color--up">{{ item.spotqty }} 吨</span>
+                  <span class="g-color--up">{{ item.spotqty }}吨</span>
                 </li>
               </ul>
             </SwipeItem>

src/packages/mobile/views/market/list/components/spot/index.vue

@@ -15,8 +15,8 @@ const { dataList } = useRequest(querySpotgoodsPrice)
 
 const columns: Model.TableColumn[] = [
     { prop: 'wrstandardname', label: '名称' },
-    { prop: 'spotgoodsprice', label: '招标价' },
-    { prop: 'spotgoodsqty', label: '招标量' },
+    { prop: 'spotgoodsprice', label: '招标价(元)' },
+    { prop: 'spotgoodsqty', label: '招标量(吨)' },
     { prop: 'tradedate', label: '日期' },
 ]
 </script>

src/packages/mobile/views/market/spot/index.vue

@@ -11,10 +11,10 @@
         <template v-if="dataList.length">
             <app-list :columns="columns" :data-list="dataList" :showHeader="false" @click="onRowClick">
                 <template #spotprice="{ value }">
-                    <span class="text-red">{{ value }} 元/吨</span>
+                    <span class="text-red">{{ value }}元/吨</span>
                 </template>
                 <template #spotqty="{ value }">
-                    <span class="text-red">{{ value }} 吨</span>
+                    <span class="text-red">{{ value }}吨</span>
                 </template>
             </app-list>
         </template>

src/packages/mobile/views/mine/order/detail/purchasetrade/components/transfer/index.less

@@ -0,0 +1,17 @@
+.order-transfer {
+    &__form {
+        .van-stepper {
+            display: flex;
+            align-items: center;
+            width: 100%;
+
+            &__input {
+                flex: 1;
+            }
+        }
+
+        .van-field__label {
+            width: 2.2rem;
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+<template>
+    <app-popup class="order-transfer" title="合同转让" v-model:show="showModal" :refresh="refresh">
+        <Form class="order-transfer__form" ref="formRef" @submit="onSubmit">
+            <Field label="总预付款(含定金)">
+                <template #input>
+                    <span>{{ handleNumberValue(detail.payeddeposit.toFixed(2), '元') }}</span>
+                </template>
+            </Field>
+            <Field label="每吨预付金">
+                <template #input>
+                    <span>{{ handleNumberValue(detail.transferprice.toFixed(2), '元') }}</span>
+                </template>
+            </Field>
+            <Field name="TransferPrice" :rules="formRules.TransferPrice" label="每吨转让金额">
+                <template #input>
+                    <Stepper v-model="formData.TransferPrice" :default-value="detail.transferprice" theme="round"
+                        :decimal-length="2" :auto-fixed="false" button-size="22" />
+                </template>
+            </Field>
+            <Field label="转让数量">
+                <template #input>
+                    <span>{{ detail.tradeqty + getGoodsUnitName(detail.unitid) }}</span>
+                </template>
+            </Field>
+            <Field label="转让总金额">
+                <template #input>
+                    <span>{{ totalPrice }}元</span>
+                </template>
+            </Field>
+        </Form>
+        <template #footer>
+            <Button type="primary" block round @click="formRef?.submit">提交</Button>
+        </template>
+    </app-popup>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, PropType, computed } from 'vue'
+import { Form, Field, Stepper, Button, FieldRule, FormInstance } from 'vant'
+import { fullloading, dialog } from '@/utils/vant'
+import { handleNumberValue } from '@/filters'
+import { getGoodsUnitName } from '@/constants/unit'
+import { useSpotPresaleTransferListing } from '@/business/trade'
+import AppPopup from '@mobile/components/base/popup/index.vue'
+
+const props = defineProps({
+    detail: {
+        type: Object as PropType<Model.THJPurchaseTradeDetailRsp>,
+        required: true
+    },
+})
+
+const { listingSubmit, formData } = useSpotPresaleTransferListing()
+const formRef = shallowRef<FormInstance>()
+const refresh = shallowRef(false) // 是否刷新父组件数据
+const showModal = shallowRef(true)
+
+// 表单验证规则
+const formRules: { [key in keyof Proto.SpotPresaleTransferListingReq]?: FieldRule[] } = {
+    TransferPrice: [{
+        message: '请输入转让价格',
+        validator: () => {
+            return !!Number(formData.TransferPrice)
+        }
+    }],
+}
+
+// 转让总金额
+const totalPrice = computed(() => {
+    const amount = props.detail.tradeqty * (formData.TransferPrice ?? 0)
+    return amount.toFixed(2)
+})
+
+// 关闭弹窗
+const closed = (isRefresh = false) => {
+    refresh.value = isRefresh
+    showModal.value = false
+}
+
+// 提交摘牌
+const onSubmit = () => {
+    fullloading((hideLoading) => {
+        listingSubmit(props.detail.wrtradedetailid).then(() => {
+            hideLoading()
+            dialog('合同转让提交成功。').then(() => {
+                closed(true)
+            })
+        }).catch((err) => {
+            hideLoading(err, 'fail')
+        })
+    })
+}
+
+// 暴露组件属性给父组件调用
+defineExpose({
+    closed,
+})
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

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

@@ -6,19 +6,21 @@
         <div v-if="detail" class="order-detail__container g-form__container">
             <CellGroup title="采购信息">
                 <Cell title="商品" :value="detail.wrstandardname" />
-                <Cell title="参考价" :value="detail.tradeprice.toFixed(2)" />
-                <Cell title="数量" :value="detail.tradeqty" />
-                <Cell title="预付款(含定金)" :value="handleNumberValue(detail.payeddeposit.toFixed(2))" />
+                <Cell title="参考价" :value="detail.tradeprice.toFixed(2) + '元/' + getGoodsUnitName(detail.unitid)" />
+                <Cell title="数量" :value="detail.tradeqty + getGoodsUnitName(detail.unitid)" />
+                <Cell title="总预付款(含定金)" :value="handleNumberValue(detail.payeddeposit.toFixed(2), '元')" />
                 <Cell title="付款比例" :value="parsePercent(detail.depositrate)" />
-                <Cell title="预付金" :value="handleNumberValue(detail.transferprice.toFixed(2))" />
-                <Cell title="实际价" :value="handleNumberValue(detail.lastprice.toFixed(2))" />
-                <Cell title="尾款" :value="handleNumberValue(detail.remainamount.toFixed(2))" />
+                <Cell title="每吨预付金" :value="handleNumberValue(detail.transferprice.toFixed(2), '元')" />
+                <Cell title="交收结算价" :value="handleNumberValue(detail.lastprice.toFixed(2), '元')" />
+                <Cell title="尾款" :value="handleNumberValue(detail.remainamount.toFixed(2), '元')" />
+                <Cell title="尾款支付截止日" value="若河钢招标价晚于交收月10号，待公布后顺延2个自然日付款" />
                 <Cell title="状态" :value="detail.thjorderstatusdisplay" />
                 <Cell title="采购时间" :value="formatDate(detail.tradetime)" />
-                <Cell title="到期日期" :value="detail.enddate" />
+                <Cell title="合同转让截止日" :value="detail.enddate" />
             </CellGroup>
             <CellGroup title="交收信息">
                 <Cell title="交收方式" :value="detail.thjdeliverymodedisplay" />
+                <Cell title="交收月份" :value="detail.enddatemonth" />
                 <Cell title="联系人" :value="detail.contactname" v-if="detail.contactname" />
                 <Cell title="联系方式" :value="detail.contactinfo" v-if="detail.contactinfo" />
                 <Cell title="目的地地址" :value="detail.desaddress" v-if="detail.desaddress" />
@@ -43,17 +45,17 @@
             <div class="g-form__footer" v-if="detail">
                 <!-- 参数类型为 2 时只显示点价按钮 -->
                 <template v-if="type.toString() === '2'">
-                    <Button block round type="primary"
+                    <Button :class="spotgoods?.priceflag ? '' : 'van-button--disabled'" block round type="primary"
                         v-if="detail.buyuserid === detail.firstbuyuserid && detail.availabletime > 0 && detail.presalestatus === 2 && detail.orderstatus === 1"
                         @click="spotPricingSubmit">点价</Button>
                 </template>
                 <template v-else-if="type.toString() !== '3'">
-                    <Button block round type="primary"
+                    <Button :class="spotgoods?.priceflag ? '' : 'van-button--disabled'" block round type="primary"
                         v-if="detail.buyuserid === detail.firstbuyuserid && detail.availabletime > 0 && detail.presalestatus === 2 && detail.orderstatus === 1"
                         @click="spotPricingSubmit">点价</Button>
                     <Button block round type="primary"
                         v-if="detail.thjdeliverymode === 1 && detail.presalestatus === 2 && detail.orderstatus === 1"
-                        @click="showDialog">合同转让</Button>
+                        @click="openComponent('transfer')">合同转让</Button>
                     <Button block round type="primary" v-if="detail.orderstatus === 9"
                         @click="spotCancelSubmit">撤销转让</Button>
                     <Button block round type="primary" v-if="detail.orderstatus === 5"
@@ -64,86 +66,86 @@
                 </template>
             </div>
         </template>
-        <!-- 转让价格 -->
-        <Dialog class-name="order-detail__dialog" v-model:show="show" title="合同转让" show-cancel-button
-            @confirm="spotListingSubmit" @cancel="cancelDialog">
-            <Stepper v-model="formData.TransferPrice" placeholder="请输入转让价格" theme="round" :decimal-length="2"
-                default-value="" :auto-fixed="false" button-size="22" allow-empty />
-        </Dialog>
+        <!-- 转让金额 -->
+        <component ref="componentRef" v-bind="{ detail }" :is="componentMap.get(componentId)" @closed="closeComponent"
+            v-if="componentId" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { fullloading, dialog } from '@/utils/vant'
-import { CellGroup, Cell, Empty, Button, showFailToast, Dialog, Stepper } from 'vant'
+import { CellGroup, Cell, Empty, Button, showFailToast } from 'vant'
+import { useComponent } from '@/hooks/component'
 import { useNavigation } from '@/hooks/navigation'
+import { getGoodsUnitName } from '@/constants/unit'
 import { useRequest } from '@/hooks/request'
 import { querySpotgoodsPrice } from '@/services/api/market'
 import { formatDate, getUrl, handleNumberValue, parsePercent } from '@/filters'
-import { useSpotPresaleDeliveryConfirm, useSpotPresaleBreachOfContractApply, useSpotPresaleTransferCancel, useSpotPresaleTransferListing, useSpotPresalePlayment, useSpotPresalePointPrice } from "@/business/trade"
+import { useSpotPresaleDeliveryConfirm, useSpotPresaleBreachOfContractApply, useSpotPresaleTransferCancel, useSpotPresalePlayment, useSpotPresalePointPrice } from "@/business/trade"
 import plus from '@/utils/h5plus'
 
+const componentMap = new Map<string, unknown>([
+    ['transfer', defineAsyncComponent(() => import('./components/transfer/index.vue'))],
+])
+
 const { route, router } = useNavigation()
 const { item, type } = route.params
-/// 是否显示dialog
-const show = shallowRef(false)
 const detail = shallowRef<Model.THJPurchaseTradeDetailRsp>()
 
 if (item) {
     detail.value = JSON.parse(item.toString())
 }
 
+const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
+    router.back()
+})
+
 const { confirmSubmit } = useSpotPresaleDeliveryConfirm()
 const { applySubmit } = useSpotPresaleBreachOfContractApply()
 const { playmentSubmit } = useSpotPresalePlayment()
 const { transferCancelSubmit } = useSpotPresaleTransferCancel()
-const { listingSubmit, formData } = useSpotPresaleTransferListing()
 const { formSubmit } = useSpotPresalePointPrice(detail.value?.wrtradedetailid)
 
-const { runAsync: getSpotgoodsPrice } = useRequest(querySpotgoodsPrice, {
-    manual: true,
+const { data: spotgoods } = useRequest(querySpotgoodsPrice, {
     params: {
         wrstandardid: detail.value?.wrstandardid
     },
+    onSuccess: (res) => {
+        if (res.data.length) {
+            spotgoods.value = res.data[0]
+        }
+    }
 })
 
 // 确认点价
 const spotPricingSubmit = () => {
-    fullloading((hideLoading) => {
-        // 点价之前先获取当前价格
-        getSpotgoodsPrice().then((res) => {
-            if (res.data.length === 1) {
-                const item = res.data[0]
-                const message = `${item.wrstandardname}当前现货价为${item.spotgoodsprice}，是否点价？`
+    const { availabletime = 0, pointtimes = 0 } = detail.value ?? {}
+    const { priceflag, wrstandardname, spotgoodsprice = 0 } = spotgoods.value ?? {}
+
+    if (priceflag) {
+        let message = `${wrstandardname}当前现货价为${spotgoodsprice}，是否点价？\n`
+        message += `<span style="color:red;">剩余点价次数${availabletime}/${pointtimes}</span>`
 
-                dialog({
-                    message,
-                    allowHtml: true,
-                    showCancelButton: true
-                }).then(() => {
-                    fullloading((hideLoading) => {
-                        formSubmit().then(() => {
-                            hideLoading()
-                            dialog('点价提交成功。').then(() => {
-                                router.back()
-                            })
-                        }).catch((err) => {
-                            showFailToast(err)
-                        })
+        dialog({
+            message,
+            allowHtml: true,
+            showCancelButton: true
+        }).then(() => {
+            fullloading((hideLoading) => {
+                formSubmit().then(() => {
+                    hideLoading()
+                    dialog('点价提交成功。').then(() => {
+                        router.back()
                     })
+                }).catch((err) => {
+                    showFailToast(err)
                 })
-            } else {
-                dialog({
-                    message: '获取现货价格失败，请稍后重试'
-                })
-            }
-        }).catch((err) => {
-            showFailToast(err)
-        }).finally(() => {
-            hideLoading()
+            })
         })
-    }, '加载中...')
+    } else {
+        dialog('河钢招标价未公布或当前订单价格低于下单价格')
+    }
 }
 
 /// 确认交收
@@ -212,23 +214,6 @@ const spotPlaymentSubmit = () => {
     }
 }
 
-///合同转让申请
-const spotListingSubmit = () => {
-    const param = detail.value
-    if (param) {
-        fullloading((hideLoading) => {
-            listingSubmit(param.wrtradedetailid).then(() => {
-                hideLoading()
-                dialog('合同转让提交成功。').then(() => {
-                    router.back()
-                })
-            }).catch((err) => {
-                showFailToast(err)
-            })
-        })
-    }
-}
-
 /// 转让撤销申请
 const spotCancelSubmit = () => {
     dialog({
@@ -254,15 +239,6 @@ const openPDF = (file?: string) => {
         plus.openURL(getUrl(file).href)
     }
 }
-
-/// 是否显示Dialog
-const showDialog = () => {
-    show.value = !show.value
-}
-
-const cancelDialog = () => {
-    show.value = false
-}
 </script>
 
 <style lang="less">

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

@@ -6,15 +6,15 @@
         <div v-if="details" class="transfer-detail__container g-form__container">
             <CellGroup title="转让信息">
                 <Cell title="商品" :value="details.wrstandardname" />
-                <Cell title="参考价" :value="details.tradeprice.toFixed(2)" />
-                <Cell title="转让价格" :value="details.transferprice.toFixed(2)" />
-                <Cell title="数量" :value="details.transferqty" />
-                <Cell title="转让金额" :value="details.transferamount.toFixed(2)" />
-                <Cell title="预付款(含定金)" :value="handleNumberValue(details.payeddeposit.toFixed(2))" />
+                <Cell title="参考价" :value="details.tradeprice.toFixed(2) + '元/吨'" />
+                <Cell title="转让价格" :value="details.transferprice.toFixed(2) + '元'" />
+                <Cell title="数量" :value="details.transferqty + '吨'" />
+                <Cell title="转让金额" :value="details.transferamount.toFixed(2) + '元'" />
+                <Cell title="预付款(含定金)" :value="handleNumberValue(details.payeddeposit.toFixed(2), '元')" />
                 <Cell title="付款比例" :value="parsePercent(details.depositrate)" />
                 <Cell title="状态" :value="getTHJTransferStatusName(details.transferstatus)" />
                 <Cell title="转让时间" :value="formatDate(details.createtime)" />
-                <Cell title="到期日期" :value="details.enddate" />
+                <Cell title="合同转让截止日" :value="details.enddate" />
             </CellGroup>
             <CellGroup title="交收信息">
                 <Cell title="交收方式" :value="getTHJDeliveryModeName(details.thjdeliverymode)" />

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

@@ -9,9 +9,9 @@
                 <Cell title="仓库" :value="detail.warehousename" />
                 <Cell title="类型" :value="detail.wrtradetype === 1 ? '挂牌' : '摘牌'" />
                 <Cell title="方向" :value="getBuyOrSellName(detail.buyorsell)" />
-                <Cell title="委托价格" :value="detail.fixedprice.toFixed(2)" />
-                <Cell title="挂牌数量" :value="detail.orderqty" />
-                <Cell title="撤销数量" :value="detail.cancelqty" />
+                <Cell title="委托价格" :value="detail.fixedprice.toFixed(2) + '元'" />
+                <Cell title="挂牌数量" :value="detail.orderqty + '吨'" />
+                <Cell title="撤销数量" :value="detail.cancelqty + '吨'" />
                 <Cell title="委托时间" :value="formatDate(detail.ordertime)" />
                 <Cell title="状态" :value="getWRTradeOrderStatusName(detail.wrtradeorderstatus)" />
                 <Cell title="委托单号" :value="detail.wrtradeorderid" />

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

@@ -9,9 +9,9 @@
                 <Cell title="仓库" :value="detail.warehousename" />
                 <Cell title="类型" :value="detail.wrtradetype === 1 ? '挂牌' : '摘牌'" />
                 <Cell title="方向" :value="getBuyOrSellName(detail.buyorsell)" />
-                <Cell title="成交价格" :value="detail.tradeprice.toFixed(2)" />
-                <Cell title="成交数量" :value="detail.tradeqty" />
-                <Cell title="成交金额" :value="(detail.tradeprice * detail.tradeqty).toFixed(2)" />
+                <Cell title="成交价格" :value="detail.tradeprice.toFixed(2) + '元'" />
+                <Cell title="成交数量" :value="detail.tradeqty + '吨'" />
+                <Cell title="成交金额" :value="(detail.tradeprice * detail.tradeqty).toFixed(2) + '元'" />
                 <Cell title="成交时间" :value="formatDate(detail.tradetime)" />
                 <Cell title="对手方" :value="detail.matchusername" />
                 <Cell title="成交单号" :value="detail.wrtradedetailid" :is-link="!!detail.contractaddr"

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

@@ -22,19 +22,19 @@
                         <table cellspacing="0" cellpadding="0">
                             <tr>
                                 <th>定金</th>
-                                <td>{{ handleNumberValue(item.payeddeposit) }}</td>
+                                <td>{{ handleNumberValue(item.payeddeposit, '元') }}</td>
                                 <th>参考价</th>
-                                <td>{{ handleNumberValue(item.tradeprice) }}</td>
+                                <td>{{ handleNumberValue(item.tradeprice, '元/' + getGoodsUnitName(item.unitid)) }}</td>
                                 <th>到期日</th>
                                 <td>{{ item.enddate }}</td>
                             </tr>
                             <tr>
                                 <th>购买价</th>
-                                <td>{{ handleNumberValue(item.transferprice) }}</td>
+                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
                                 <th>实际价</th>
-                                <td>{{ handleNumberValue(item.lastprice) }}</td>
+                                <td>{{ handleNumberValue(item.lastprice, '元') }}</td>
                                 <th>尾款</th>
-                                <td>{{ handleNumberValue(item.remainamount) }}</td>
+                                <td>{{ handleNumberValue(item.remainamount, '元') }}</td>
                             </tr>
                         </table>
                     </div>

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

@@ -25,7 +25,7 @@
                             </tr>
                             <tr>
                                 <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice) }}</td>
+                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
                                 <th>数量</th>
                                 <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
                             </tr>

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

@@ -20,11 +20,11 @@
                         <table cellspacing="0" cellpadding="0">
                             <tr>
                                 <th>挂牌数量</th>
-                                <td>{{ item.orderqty }}</td>
+                                <td>{{ item.orderqty }}吨</td>
                                 <th>挂牌价格</th>
-                                <td>{{ item.fixedprice }}</td>
+                                <td>{{ item.fixedprice }}元</td>
                                 <th>成交数量</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}吨</td>
                             </tr>
                             <tr>
                                 <th>仓库</th>

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

@@ -21,11 +21,11 @@
                         <table cellspacing="0" cellpadding="0">
                             <tr>
                                 <th>挂牌数量</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}吨</td>
                                 <th>成交价格</th>
-                                <td>{{ item.tradeprice }}</td>
+                                <td>{{ item.tradeprice }}元</td>
                                 <th>金额</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}元</td>
                             </tr>
                             <tr>
                                 <th>仓库</th>

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

@@ -1,48 +1,56 @@
 <!-- 我的订单-采购订单 -->
 <template>
-    <app-view class="order-list-purchase">
-        <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading" v-model:error="error"
-            v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
-                        <div class="left">
-                            <span>{{ item.wrstandardname }}</span>
-                            <span>{{ item.enddatemonth }}</span>
-                            <span>{{ parsePercent(item.depositrate) }}</span>
-                            <span>{{ item.tradeqty }}{{ getGoodsUnitName(item.unitid) }}</span>
-                        </div>
-                        <div class="right">
-                            <span>{{ item.thjorderstatusdisplay }}</span>
-                        </div>
+    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="run">
+        <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>
+                            {{ item.wrstandardname }}
+                            {{ item.enddatemonth }} /
+                            {{ parsePercent(item.depositrate) }} /
+                            {{ item.tradeqty }}{{ getGoodsUnitName(item.unitid) }}
+                        </h4>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>预付款</th>
-                                <td>{{ handleNumberValue(item.payeddeposit) }}</td>
-                                <th>参考价</th>
-                                <td>{{ handleNumberValue(item.tradeprice) }}</td>
-                                <th>到期日</th>
-                                <td>{{ item.enddate }}</td>
-                            </tr>
-                            <tr>
-                                <th>购买价</th>
-                                <td>{{ handleNumberValue(item.transferprice) }}</td>
-                                <th>实际价</th>
-                                <td>{{ handleNumberValue(item.lastprice) }}</td>
-                                <th>尾款</th>
-                                <td>{{ handleNumberValue(item.remainamount) }}</td>
-                            </tr>
-                        </table>
+                    <div class="right">
+                        <span>{{ item.thjorderstatusdisplay }}</span>
                     </div>
-                    <div class="section-item__btnbar">
-                        <Button size="small" @click="onClick(item)" round>详情</Button>
-                    </div>
-                </li>
-            </ul>
-        </app-pull-refresh>
-    </app-view>
+                </div>
+                <div class="g-order-list__content">
+                    <ul>
+                        <li>
+                            <span>预付款</span>
+                            <span>{{ handleNumberValue(item.payeddeposit) }}元</span>
+                        </li>
+                        <li>
+                            <span>参考价</span>
+                            <span>{{ handleNumberValue(item.tradeprice) }}元/{{ getGoodsUnitName(item.unitid) }}</span>
+                        </li>
+                        <li>
+                            <span>到期日</span>
+                            <span>{{ item.enddate }}</span>
+                        </li>
+                        <li>
+                            <span>购买价</span>
+                            <span>{{ handleNumberValue(item.transferprice) }}元/{{ getGoodsUnitName(item.unitid) }}</span>
+                        </li>
+                        <li>
+                            <span>实际价</span>
+                            <span>{{ handleNumberValue(item.lastprice) }}</span>
+                        </li>
+                        <li>
+                            <span>尾款</span>
+                            <span>{{ handleNumberValue(item.remainamount) }}</span>
+                        </li>
+                    </ul>
+                </div>
+                <div class="g-order-list__btnbar">
+                    <Button size="small" @click="onClick(item)" round>详情</Button>
+                </div>
+            </div>
+        </div>
+    </app-pull-refresh>
 </template>
 
 <script lang="ts" setup>

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

@@ -23,15 +23,15 @@
                             </tr>
                             <tr>
                                 <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice) }}</td>
+                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
                                 <th>数量</th>
                                 <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
                             </tr>
                             <tr>
                                 <th>转让金额</th>
-                                <td>{{ handleNumberValue(item.transferamount) }}</td>
+                                <td>{{ handleNumberValue(item.transferamount, '元') }}</td>
                                 <th>预付款</th>
-                                <td>{{ handleNumberValue(item.tradeprice) }}</td>
+                                <td>{{ handleNumberValue(item.tradeprice, '元') }}</td>
                             </tr>
                             <tr>
                                 <th>成交时间</th>

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

@@ -23,7 +23,7 @@
                             </tr>
                             <tr>
                                 <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice) }}</td>
+                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
                                 <th>数量</th>
                                 <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
                             </tr>

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

@@ -17,11 +17,11 @@
                         <table cellspacing="0" cellpadding="0">
                             <tr>
                                 <th>挂牌数量</th>
-                                <td>{{ item.orderqty }}</td>
+                                <td>{{ item.orderqty }}吨</td>
                                 <th>挂牌价格</th>
-                                <td>{{ item.fixedprice }}</td>
+                                <td>{{ item.fixedprice }}元</td>
                                 <th>成交数量</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}吨</td>
                             </tr>
                             <tr>
                                 <th>仓库</th>

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

@@ -18,11 +18,11 @@
                         <table cellspacing="0" cellpadding="0">
                             <tr>
                                 <th>挂牌数量</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}吨</td>
                                 <th>成交价格</th>
-                                <td>{{ item.tradeprice }}</td>
+                                <td>{{ item.tradeprice }}元</td>
                                 <th>金额</th>
-                                <td>{{ item.tradeqty }}</td>
+                                <td>{{ item.tradeqty }}元</td>
                             </tr>
                             <tr>
                                 <th>仓库</th>

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

@@ -40,7 +40,7 @@
         }
 
         .van-field__label {
-            width: 2rem;
+            width: 2.2rem;
         }
     }
 
@@ -66,4 +66,12 @@
             padding: .28rem 0;
         }
     }
+
+    .van-dialog {
+        &__footer {
+            .van-button {
+                font-size: .24rem;
+            }
+        }
+    }
 }

src/packages/mobile/views/purchase/detail/index.vue

@@ -18,12 +18,12 @@
                             :optionProps="{ label: 'endmonth', value: 'presaleapplyid' }" @confirm="onMonthChange" />
                     </template>
                 </Field>
-                <Field label="到期日期" v-if="selectedDate?.presaleapplyid">
+                <Field label="合同转让截止日" v-if="selectedDate?.presaleapplyid">
                     <template #input>
                         <span>{{ selectedDate.enddate }}</span>
                     </template>
                 </Field>
-                <Field name="DepositID" label="支付方式" :rules="formRules.DepositID" is-link
+                <Field name="DepositID" label="预付比例" :rules="formRules.DepositID" is-link
                     v-if="selectedDate?.presaleapplyid">
                     <template #input>
                         <app-select :options="presaleApplyDeposits" @confirm="onDepositChange" />
@@ -36,7 +36,7 @@
                 </Field>
                 <Field label="剩余数量" v-if="selectedDate">
                     <template #input>
-                        <span>{{ maxQty.toString() + getGoodsUnitName(goodsinfo.unitid) }}</span>
+                        <span>{{ maxQty.toString() + ' ' + getGoodsUnitName(goodsinfo.unitid) }}</span>
                     </template>
                 </Field>
                 <Field v-model="formData.Qty" name="Qty" type="digit" label="采购数量" :rules="formRules.Qty">
@@ -48,7 +48,7 @@
                         </div>
                     </template>
                 </Field>
-                <Field label="预付款(含定金)" name="PreAmount" :rules="formRules.PreAmount" v-if="selectedDate">
+                <Field label="总预付款(含定金)" name="PreAmount" :rules="formRules.PreAmount" v-if="selectedDate">
                     <template #input>
                         <span style="color:#999">{{ `${totalAmount.toFixed(2)}(≤${accountStore.avaiableMoney.toFixed(2)}元)`
                         }}</span>
@@ -87,7 +87,7 @@
         </div>
         <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ formData }" @updated="updateForm"
             @closed="closeComponent" v-if="componentId" />
-        <Dialog v-model:show="showDialog" theme="round-button" confirmButtonText="我已知晓并确认下单" @confirm="onSubmit">
+        <Dialog v-model:show="showDialog" theme="round-button" confirmButtonText="我已知晓、接受平台各项规则，并确认下单" @confirm="onSubmit">
             <template #title>
                 <div style="position: relative;">
                     <span>《采购合同》</span>
@@ -219,7 +219,7 @@ const formRules: { [key in keyof Proto.SpotPresaleDestingOrderReq | 'AddressInfo
         }
     }],
     PresaleApplyID: [{
-        message: '请选择到期日期',
+        message: '请选择合同转让截止日',
         validator: () => {
             return !!formData.value.PresaleApplyID
         }

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

@@ -7,7 +7,11 @@
                 <template v-if="selectedRow.wrfactortypeid">
                     <Field label="商品" v-model="selectedRow.wrstandardname" readonly />
                     <Field label="仓库" v-model="selectedRow.warehousename" readonly />
-                    <Field label="可用量" v-model="selectedRow.enableqty" readonly />
+                    <Field label="可用量">
+                        <template #input>
+                            <span>{{ selectedRow.enableqty }}吨</span>
+                        </template>
+                    </Field>
                 </template>
                 <Field name="FixedPrice" :rules="formRules.FixedPrice" label="价格">
                     <template #input>
@@ -23,7 +27,7 @@
                 </Field>
                 <Field label="货款金额">
                     <template #input>
-                        <span>{{ amount }}</span>
+                        <span>{{ amount }}元</span>
                     </template>
                 </Field>
             </CellGroup>

src/packages/mobile/views/supply-demand/add/components/buy/warehouse-receipt.vue

@@ -20,7 +20,7 @@
                                     </li>
                                     <li>
                                         <span>可用：</span>
-                                        <span>{{ item.enableqty }}</span>
+                                        <span>{{ item.enableqty }}吨</span>
                                     </li>
                                 </ul>
                             </Radio>

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

@@ -37,12 +37,12 @@
                 </Field>
                 <Field label="货款金额">
                     <template #input>
-                        <span>{{ amount }}</span>
+                        <span>{{ amount }}元</span>
                     </template>
                 </Field>
                 <Field label="可用资金">
                     <template #input>
-                        <span>{{ accountStore.avaiableMoney.toFixed(2) }}</span>
+                        <span>{{ accountStore.avaiableMoney.toFixed(2) }}元</span>
                     </template>
                 </Field>
             </CellGroup>

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

@@ -9,12 +9,12 @@
             </Field>
             <Field label="挂牌价格">
                 <template #input>
-                    <span>{{ quoteDetail.fixedprice }}</span>
+                    <span>{{ quoteDetail.fixedprice }}元</span>
                 </template>
             </Field>
             <Field label="剩余数量">
                 <template #input>
-                    <span>{{ quoteDetail.orderqty }}</span>
+                    <span>{{ quoteDetail.orderqty }}吨</span>
                 </template>
             </Field>
             <!-- <Field name="WRFactorTypeId" :rules="formRules.WRFactorTypeId" label="现货仓单" is-link
@@ -26,7 +26,7 @@
             </Field> -->
             <Field label="可用数量" v-if="buyorsell === BuyOrSell.Sell">
                 <template #input>
-                    <span>{{ selectedRow?.enableqty ?? 0 }}</span>
+                    <span>{{ selectedRow?.enableqty ?? 0 }}吨</span>
                 </template>
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="摘牌数量">
@@ -36,12 +36,12 @@
             </Field>
             <Field label="货款金额">
                 <template #input>
-                    <span>{{ amount }}</span>
+                    <span>{{ amount }}元</span>
                 </template>
             </Field>
             <Field label="可用资金" v-if="buyorsell === BuyOrSell.Buy">
                 <template #input>
-                    <span>{{ accountStore.avaiableMoney.toFixed(2) }}</span>
+                    <span>{{ accountStore.avaiableMoney.toFixed(2) }}元</span>
                 </template>
             </Field>
         </Form>

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

@@ -17,7 +17,7 @@
             </Field> -->
             <Field label="可用数量" v-if="buyorsell === BuyOrSell.Sell">
                 <template #input>
-                    <span>{{ selectedRow?.enableqty ?? 0 }}</span>
+                    <span>{{ selectedRow?.enableqty ?? 0 }}吨</span>
                 </template>
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌数量">
@@ -27,12 +27,12 @@
             </Field>
             <Field label="货款金额">
                 <template #input>
-                    <span>{{ amount }}</span>
+                    <span>{{ amount }}元</span>
                 </template>
             </Field>
             <Field label="可用资金" v-if="buyorsell === BuyOrSell.Buy">
                 <template #input>
-                    <span>{{ accountStore.avaiableMoney.toFixed(2) }}</span>
+                    <span>{{ accountStore.avaiableMoney.toFixed(2) }}元</span>
                 </template>
             </Field>
         </Form>

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

@@ -19,11 +19,11 @@
                     <tr>
                         <td>
                             <span>卖价:</span>
-                            <span>{{ quoteItem.sellprice }}</span>
+                            <span>{{ quoteItem.sellprice }}元</span>
                         </td>
                         <td>
                             <span>卖量:</span>
-                            <span>{{ quoteItem.sellqty }}</span>
+                            <span>{{ quoteItem.sellqty }}吨</span>
                         </td>
                         <td rowspan="3" style="vertical-align:top">
                             <div class="goods-price">
@@ -35,11 +35,11 @@
                     <tr>
                         <td>
                             <span>买价:</span>
-                            <span>{{ quoteItem.buyprice }}</span>
+                            <span>{{ quoteItem.buyprice }}元</span>
                         </td>
                         <td>
                             <span>买量:</span>
-                            <span>{{ quoteItem.buyqty }}</span>
+                            <span>{{ quoteItem.buyqty }}吨</span>
                         </td>
                     </tr>
                     <tr>
@@ -117,8 +117,8 @@ const { dataList: sellList, getOrderQuoteList: getOrderSellList } = useOrderQuot
 
 const columns: Model.TableColumn[] = [
     { prop: 'username', label: '挂牌方' },
-    { prop: 'orderqty', label: '数量' },
-    { prop: 'fixedprice', label: '价格' },
+    { prop: 'orderqty', label: '数量(吨)' },
+    { prop: 'fixedprice', label: '价格(元)' },
     { prop: 'operate', label: '操作' },
 ]
 

src/packages/mobile/views/user/login/index.less

@@ -48,6 +48,7 @@
             align-items: center;
             flex-wrap: wrap;
             font-size: .24rem;
+            line-height: .4rem;
 
             .van-checkbox {
                 margin-right: .12rem;

src/packages/mobile/views/user/login/index.vue

@@ -19,7 +19,7 @@
     </Form>
     <div class="login-footer">
       <div class="login-footer__trem">
-        <Checkbox shape="square" icon-size=".32rem" v-model="checked">我已阅读并同意</Checkbox>
+        <Checkbox shape="square" icon-size=".36rem" v-model="checked">我已阅读并同意</Checkbox>
         <span @click="routerTo('rules-zcxy')" style="color:#E92020">《用户注册协议》</span>
         <span>、</span>
         <span @click="routerTo('rules-yhkhfxgzs')" style="color:#E92020">《用户开户风险告知书》</span>

src/services/http/index.ts

@@ -34,7 +34,7 @@ export default new (class {
             },
             (err) => {
                 console.error(err)
-                return Promise.reject('出现错误，请稍后再试')
+                return Promise.reject('发生错误，请稍后再试')
             }
         )
 
@@ -59,7 +59,7 @@ export default new (class {
                         }
                     }
                 }
-                return Promise.reject('出现错误，请稍后再试')
+                return Promise.reject('发生错误，请稍后再试')
             }
         )
     }

src/stores/modules/futures.ts

@@ -280,7 +280,7 @@ export const useFuturesStore = defineStore(() => {
                 })
             }
         })
-    }, 200)
+    }, 100)
 
     // 接收行情推送通知
     const quotePushNotify = eventBus.$on('QuotePushNotify', (res) => {

src/types/model/market.d.ts

@@ -31,6 +31,7 @@ declare namespace Model {
     /** 查询行情-现货列表 响应 */
     interface SpotgoodsPriceRsp {
         prespotgoodsprice: number; // 上日价格
+        priceflag: number; // 点价标识(1:为可点价-本月招标价已发布，否则为0)
         spotgoodsprice: number; // 当前价格
         spotgoodsqty: number; // 招标量
         tradedate: string; // 交易日(yyyyMMdd)

src/types/model/order.d.ts

@@ -293,6 +293,7 @@ declare namespace Model {
         pointflag: boolean; // 是否已点价
         pointincome: number; // 点价总收益
         pointprice: number; // 已点价格
+        pointtimes: number; // 点价总次数
         /// 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
         presaleapplyid: string
         presalestatus: number; // 预留状态 1：未开始 2：进行中 3：已结束 4：已关闭 5：处理中 6:：处理失败 7：已完成

src/utils/websocket/index.ts

@@ -134,6 +134,11 @@ export class MTP2WebSocket<T extends Package40 | Package50>{
      * 重置实例
      */
     private reset() {
+        // 中止所有请求结果
+        for (const [key, task] of this.asyncTaskMap.entries()) {
+            clearTimeout(task.timeoutId)
+            this.asyncTimeout(key)
+        }
         this.ws = undefined;
         this.onReady = undefined;
         this.connState = 'Unconnected';