update

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.26",
+  "version": "1.0.25",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

file/android/fxgl.txt

@@ -96,6 +96,9 @@ http://139.9.233.200:8280/cfg?key=gzcj_sp
 模拟盘
 cn.muchinfo.nhgj_demo_v1.0.0.apk
 http://106.14.41.113:8280/cfg?key=hndn_mnp
+实盘
+cn.muchinfo.nhgj_release_v1.0.0.apk
+http://139.196.99.20:8280/cfg?key=nhgj_sp
 
 
 铁合金掌上行

oem/nhgj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.nhgj",
   "appName": "国家级热带农产品数字化",
-  "version": "1.0.0",
-  "versionCode": "100000",
+  "version": "1.0.1",
+  "versionCode": "100001",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/zrwyt/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.zrwyt",
   "appName": "中融文遗通",
-  "version": "1.0.23",
-  "versionCode": "100023",
+  "version": "1.0.25",
+  "versionCode": "100025",
   "apiUrl": "http://192.168.31.134:8080/cfg?key=test_134",
   "tradeChannel": "ws",
   "modules": [

public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appId": "com.muchinfo.app",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.134:8080/cfg?key=test_134",
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "modules": [
     "register",
     "delivery"

src/packages/mobile/views/ballot/detail/components/delisting/index.vue

@@ -8,8 +8,8 @@
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="认购量">
                 <template #input>
-                    <Stepper v-model="formData.OrderQty" theme="round" :max="detail.presaleqty" button-size="22"
-                        :auto-fixed="false" integer />
+                    <Stepper v-model="formData.OrderQty" theme="round" :max="Math.min(detail.presaleqty, detail.maxbuyqty)"
+                        button-size="22" :auto-fixed="false" integer />
                 </template>
             </Field>
             <Field label="最大申购量">

src/packages/pc/views/market/trade/presell/ballot/detail/delisting/index.vue

@@ -1,12 +1,12 @@
 <!-- 交易市场-预售转让-预售中签-详情-我要认购 -->
 <template>
-    <app-drawer title="我要认购" v-model:show="show" :width="800" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="我要认购" v-model:show="show" :width="400" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--vertical" label-width="90px" :model="formData" :rules="formRules">
             <el-form-item label="发行价">
                 <span>{{ selectedRow.refprice }}</span>
             </el-form-item>
             <el-form-item prop="OrderQty" label="认购量">
-                <el-input-number placeholder="请输入" :min="0" :max="selectedRow.presaleqty" :precision="0"
+                <el-input-number placeholder="请输入" :min="0" :max="Math.min(selectedRow.presaleqty, selectedRow.maxbuyqty)" :precision="0"
                     v-model="formData.OrderQty" />
             </el-form-item>
             <el-form-item label="最大申购量">

src/packages/pc/views/market/trade/presell/bidding/detail/delisting/index.vue

@@ -1,9 +1,9 @@
 <!-- 交易市场-预售转让-竞拍预售-详情-出价 -->
 <template>
-    <app-drawer title="出价" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="出价" :width="400" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--vertical" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="起拍价">
-                <span>{{ selectedRow.refprice }}</span>
+                <span>{{ selectedRow.startprice }}</span>
             </el-form-item>
             <el-form-item prop="OrderPrice" label="认购价">
                 <el-input-number placeholder="请输入" :min="selectedRow.startprice" :precision="2"
@@ -28,9 +28,9 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, computed, PropType } from 'vue'
+import { shallowRef, computed, PropType, onMounted } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
-import { handleRequestBigNumber } from '@/filters'
+import { handleRequestBigNumber, parsePercent } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { useOrder } from '@/business/trade'
 import { useAccountStore } from '@/stores'
@@ -52,14 +52,12 @@ const formRef = shallowRef<FormInstance>()
 
 // 预售定金
 const deposit = computed(() => {
-    const { refprice, presaledepositalgorithm, presaledepositvalue } = props.selectedRow
-    const qty = formData.OrderQty ?? 0
-
+    const { presaledepositalgorithm, presaledepositvalue } = props.selectedRow
     switch (presaledepositalgorithm) {
         case 1:
-            return (presaledepositvalue * refprice * qty).toFixed(2)
+            return parsePercent(presaledepositvalue)
         case 2:
-            return (presaledepositvalue * qty).toFixed(2)
+            return presaledepositvalue.toFixed(2)
         default:
             return '0.0'
     }
@@ -112,4 +110,8 @@ const onSubmit = () => {
         }
     })
 }
+
+onMounted(() => {
+    formData.OrderPrice = props.selectedRow.startprice
+})
 </script>

src/packages/pc/views/market/trade/presell/bidding/detail/index.vue

@@ -47,7 +47,7 @@ const props = defineProps({
 })
 
 const detailProps = [
-    { prop: 'refprice', label: '起拍价：' },
+    { prop: 'startprice', label: '起拍价：' },
     { prop: 'sellname', label: '销售方：' },
     { prop: 'starttime', label: '开始时间：' },
     { prop: 'earnest', label: '预售定金：' },
@@ -58,11 +58,12 @@ const detailProps = [
 
 // 预售定金
 const earnest = computed(() => {
-    switch (props.selectedRow.presaledepositalgorithm) {
+    const { presaledepositalgorithm, presaledepositvalue } = props.selectedRow
+    switch (presaledepositalgorithm) {
         case 1:
-            return parsePercent(props.selectedRow.presaledepositvalue)
+            return parsePercent(presaledepositvalue)
         case 2:
-            return props.selectedRow.presaledepositvalue.toFixed(2)
+            return presaledepositvalue.toFixed(2)
         default:
             return '0.0'
     }

src/packages/sbyj/views/delivery/components/processing/components/pay/index.vue

@@ -3,14 +3,16 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view>
             <template #header>
-                <app-navbar title="交料付款" @back="closed" />
+                <app-navbar :title="`${tagName}付款`" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
-                    <Cell title="交料单号" :value="selectedRow.deliveryorderid" />
+                    <Cell :title="`${tagName}单号`" :value="selectedRow.deliveryorderid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="交料重量" :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
-                    <Cell title="实际交料重量" :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell :title="`${tagName}重量`"
+                        :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell :title="`实际${tagName}重量`"
+                        :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
                     <Cell title="总货款" :value="formatDecimal(selectedRow.deliverytotalamount)" />
                     <Cell title="已付货款" :value="formatDecimal(selectedRow.payedamount)" />
                     <Cell title="剩余货款" :value="formatDecimal(amount)" />
@@ -50,6 +52,7 @@ import { shallowRef, PropType, reactive, computed, onMounted, ref } from 'vue'
 import { CellGroup, Cell, Form, Field, Stepper, Button, FieldRule, FormInstance, Radio, RadioGroup } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDecimal, handleRequestBigNumber } from '@/filters'
+import { BuyOrSell } from '@/constants/order'
 import { getGoodsUnitName } from '@/constants/unit'
 import { deliveryClientOperator } from '@/services/api/trade'
 import AppModal from '@/components/base/modal/index.vue'
@@ -78,6 +81,9 @@ const formData = reactive<Proto.DeliveryClientOperatorReq>({
 // 剩余货款
 const amount = computed(() => props.selectedRow.deliverytotalamount - props.selectedRow.payedamount - formData.PayAmount)
 
+// 标签名称
+const tagName = computed(() => props.selectedRow.buyorsell === BuyOrSell.Buy ? '提料' : '交料')
+
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
     PayAmount: [{