update

public/config/appconfig.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
-  "versionCode": "100003",
+  "version": "1.0.4",
+  "versionCode": "100004",
   "apiUrl": "http://218.17.158.45:16021/cfg?key=test_thj"
 }

src/components/base/modal/index.ts

@@ -16,6 +16,7 @@ export function useModal(isShow: boolean, delay: number) {
 
     // 动画切换
     const transition = (isShow: boolean, callback?: () => void) => {
+        if (isShow) visible.value = true
         window.setTimeout(() => {
             transitionClass.value = isShow ? 'is-show' : 'is-hide';
             // 阻止鼠标事件，防止动画过程中触发事件

src/packages/mobile/views/goods/details/components/address/index.vue

@@ -0,0 +1,9 @@
+<template>
+    <app-modal class="app-trade" direction="right" height="100%">
+        <app-navbar title="自提信息" />
+    </app-modal>
+</template>
+
+<script lang="ts" setup>
+import AppModal from '@/components/base/modal/index.vue'
+</script>

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

@@ -18,12 +18,14 @@
                     </template>
                 </Field>
                 <app-select v-model="formData.DepositID" name="DepositID" label="支付方式" :rules="formRules.DepositID"
-                    :options="presaleApplyDeposits" />
+                    :options="presaleApplyDeposits" v-if="presaleApplyId" />
                 <Field v-model="formData.Qty" name="Qty" type="digit" label="采购数量" placeholder="必填"
                     :rules="formRules.Qty" />
+                <Field label="收货信息" placeholder="请输入" @click="showAddress = true" is-link />
             </CellGroup>
         </Form>
         <Button type="primary" @click="formRef?.submit" round block>采购下单</Button>
+        <app-address v-model:show="showAddress" />
     </app-view>
 </template>
 
@@ -35,11 +37,13 @@ import { useNavigation } from '@/hooks/navigation'
 import { useWrstandardDetails } from '@/business/goods'
 import { usePurchaseOrderDesting } from '@/business/trade'
 import AppSelect from '@mobile/components/base/select/index.vue'
+import AppAddress from './components/address/index.vue'
 import Long from 'long'
 
 const { getQueryStringToNumber } = useNavigation()
 const wrstandardid = getQueryStringToNumber('wrstandardid')
 const formRef = shallowRef<FormInstance>()
+const showAddress = shallowRef(false)
 
 const { details, getWrstandardDetails } = useWrstandardDetails(wrstandardid)
 const { formData, formSubmit } = usePurchaseOrderDesting()
@@ -77,9 +81,9 @@ const presaleApplyId = shallowRef('')
 // 预售申请列表
 const presaleApplyDeposits = computed(() => {
     const deposits = details.value.presaleapplydeposits ?? []
-    return deposits.map(({ depositrate, discountamount }) => ({
-        label: `${depositrate},${discountamount}`,
-        value: discountamount
+    return deposits.filter((e) => e.presaleapplyid === presaleApplyId.value).map(({ depositrate, presaleapplyid }) => ({
+        label: `${depositrate * 100}%`,
+        value: presaleapplyid
     }))
 })
 

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

@@ -59,7 +59,7 @@ const tabList: Tabbar[] = [
 ]
 
 const onChange = (index: number) => {
-  if (![1, 2].includes(index)) {
+  if (![2].includes(index)) {
     componentId.value = tabList[index].name
   }
 }

src/types/model/goods.d.ts

@@ -117,8 +117,10 @@ declare namespace Model {
             wrstandardname: string; // 现货商品名称
         };
         presaleapplydeposits: {
+            depositid: number; // 自增ID autoid
             depositrate: number; // 定金比例
             discountamount: number; // 优惠金额(每吨)
+            presaleapplyid: string; // 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
         }[];
         spotGoodspricelogs: {
             spotgoodsprice: number; // 现货价格