update

src/business/trade/index.ts

@@ -328,6 +328,8 @@ export function useHdWROrder() {
         FirstRatio: 0.0,
         CanBargain: 0,
         CanPart: 1,
+        FixedPrice: 1,
+        OrderQty:1,
         UserID: loginStore.userId,
         AccountID: accountStore.accountId,
         OperatorID: loginStore.loginId,

src/packages/mobile/views/order/position/components/spot/list/Index.vue

@@ -27,9 +27,7 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small"
-                        @click="$router.push({ name: 'spot-detail', query: { wrfactortypeid: item.wrfactortypeid } })"
-                        round>详情</Button>
+                    <Button size="small" @click="showComponent('listing', item)" round>挂牌</Button>
                     <Button size="small" @click="showComponent('pickup', item)" round>提货</Button>
                 </div>
             </div>

src/packages/mobile/views/order/position/components/spot/listing/Index.vue

@@ -16,8 +16,8 @@
                 <CellGroup title="挂牌信息" inset>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌数量">
                         <template #input>
-                            <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :auto-fixed="false"
-                                integer />
+                            <Stepper v-model="formData.OrderQty" theme="round" button-size="22"
+                                :default-value="selectedRow.enableqty" :auto-fixed="false" integer />
                         </template>
                     </Field>
                     <Field name="FixedPrice" :rules="formRules.FixedPrice" label="挂牌价格">
@@ -79,6 +79,13 @@ const formRules: { [key in keyof Proto.HdWROrderReq]?: FieldRule[] } = {
 }
 
 const onSubmit = () => {
+    const { wrstandardid, subnum, deliverygoodsid, ladingbillid = '0', wrfactortypeid = '0' } = props.selectedRow ?? {}
+    formData.WRStandardID = wrstandardid
+    formData.DeliveryGoodsID = deliverygoodsid
+    formData.LadingBillId = ladingbillid
+    formData.WRFactorTypeId = wrfactortypeid
+    formData.SubNum = subnum
+
     fullloading((hideLoading) => {
         listingSubmit().then(() => {
             hideLoading('挂牌成功', 'success')

src/packages/mobile/views/spot/list/Index.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
+import { shallowRef, onActivated } from 'vue'
 import { Tag, Icon } from 'vant'
 import { getFileUrl } from '@/filters'
 import { useRequest } from '@/hooks/request'
@@ -72,6 +72,10 @@ const getFirstImage = (url: string) => {
     const images = url.split(',').map((path) => getFileUrl(path))
     return images[0] ?? ''
 }
+
+onActivated(() => {
+    pullRefreshRef.value?.refresh()
+})
 </script>
 
 <style lang="less">

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

@@ -1,22 +1,24 @@
 <template>
   <app-statusbar class="login">
     <app-navback class="login-navback" />
-    <div class="login-logo"></div>
+    <div class="login-logo">
+      <img src="@mobile/assets/images/login-logo.png" />
+    </div>
     <Form class="login-form" @submit="formSubmit">
-      <CellGroup>
-        <Field v-model="formData.userName" name="account" label="用户名" size="large" placeholder="请输入用户名"
+      <CellGroup inset>
+        <Field v-model="formData.userName" name="account" label="用户名" label-align="top" size="large" placeholder="请输入用户名"
           :rules="[{ required: true, message: '请输入用户名' }]" />
-        <Field v-model="formData.password" name="password" type="password" label="密码" size="large" placeholder="请输入密码"
-          :rules="[{ required: true, message: '请输入密码' }]" autocomplete="off" />
+        <Field v-model="formData.password" name="password" type="password" label="密码" label-align="top" size="large"
+          placeholder="请输入密码" :rules="[{ required: true, message: '请输入密码' }]" autocomplete="off" />
       </CellGroup>
-      <div class="button-link">
-        <span @click="navigationTo('user-register')">用户注册</span>
-        <span @click="navigationTo('user-forget')">忘记密码</span>
-      </div>
       <div class="button-submit">
-        <Button native-type="submit" round block>登录</Button>
+        <Button type="primary" native-type="submit" round block>登录</Button>
       </div>
     </Form>
+    <div class="login-link">
+      <span @click="navigationTo('user-register')">用户注册</span>
+      <span @click="navigationTo('user-forget')">忘记密码</span>
+    </div>
     <div class="login-footer">
       <div class="login-footer__trem">
         <Checkbox shape="square" icon-size=".32rem" v-model="checked">我已阅读并同意</Checkbox>

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

@@ -1,8 +1,7 @@
 .login {
     display: flex;
     flex-direction: column;
-    background: url('@mobile/assets/images/login-bg.jpg') no-repeat center top;
-    background-size: 100% 100%;
+    background: linear-gradient(35deg, #a5d9f4, #fff 65%, #f8e7e7);
 
     &-navback {
         >.van-icon {
@@ -11,18 +10,36 @@
     }
 
     &-logo {
-        height: 2.08rem;
-        background: url('@mobile/assets/images/login-logo.png') no-repeat center top;
-        background-size: 60%;
-        margin: 1.6rem 0 .5rem 0;
+        text-align: center;
+        padding: 1rem 0;
+
+        img {
+            height: 1.2rem;
+        }
     }
 
     &-form {
-        padding: .36rem .48rem;
+        background-color: #fff;
+        border-radius: .32rem;
+        padding: .32rem;
+        margin: 0 .36rem;
+
+        .van-cell {
+            &::after {
+                display: none;
+            }
+
+            &-group--inset {
+                margin: 0;
+            }
+        }
 
-        .van-cell-group {
-            border-radius: 8px;
-            overflow: hidden;
+        .van-field {
+            &__control {
+                background-color: #f3f8fa;
+                border-radius: .1rem;
+                padding: .12rem .2rem;
+            }
         }
 
         .button {
@@ -35,9 +52,24 @@
                     color: #333;
                 }
             }
+
+            &-submit {
+                --van-button-primary-background: #00577c;
+                //--van-button-primary-background: linear-gradient(to right, #dc364a, #1973e1);
+                padding: .24rem;
+                padding-top: .48rem;
+            }
         }
     }
 
+    &-link {
+        display: flex;
+        justify-content: space-between;
+        font-size: .26rem;
+        padding: .28rem .48rem;
+        margin: 0 .48rem;
+    }
+
     &-footer {
         padding: .36rem;
         margin-top: auto;