angelo
/
web-base-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bd-dev' of gitee.com:cabbage_qd/web-base-h5 into bd-region-select

This commit is contained in:
woody 2025-07-23 16:30:05 +08:00
parent 8a9bd2e7cb 1f1e5037a3
commit 5ce4f3de27
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pages/other/index.vue
View File

@ -75,7 +75,7 @@
> >
<u-input v-model="form.pkGradeVal" disabled border="none" /> <u-input v-model="form.pkGradeVal" disabled border="none" />
</u-form-item> </u-form-item>
<u-form-item <!-- <u-form-item
:label="'发货方式'" :label="'发货方式'"
required required
borderBottom borderBottom
@ -90,8 +90,8 @@
/> />
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item> -->
<u-form-item <!-- <u-form-item
:label="'运输方式'" :label="'运输方式'"
:required="isDeliveryWay" :required="isDeliveryWay"
borderBottom borderBottom
@ -106,20 +106,8 @@
/> />
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item> -->
<u-form-item
v-if="howSure"
required
:label="'创客空间'"
borderBottom
@click="ishowSure = true"
prop="makerSpaceMemberLabel"
>
<view class="disFlex justBwn">
<u-input v-model="form.makerSpaceMemberLabel" border="none" />
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item <u-form-item
:label="'仓库'" :label="'仓库'"
v-if="userInfo.pkSettleCountry != 1" v-if="userInfo.pkSettleCountry != 1"
@ -152,7 +140,7 @@
</span> </span>
</view> </view>
<view v-if="isDeliveryWay"> <view v-if="isDeliveryWay">
<u-form-item :label="'收货人'" borderBottom prop="recName"> <u-form-item :label="'收货人'" borderBottom required prop="recName">
<u-input <u-input
v-model.trim="form.recName" v-model.trim="form.recName"
border="none" border="none"
@ -163,6 +151,7 @@
<u-form-item <u-form-item
:label="'收货电话'" :label="'收货电话'"
borderBottom borderBottom
required
prop="recPhone" prop="recPhone"
v-if="pkCountry == 1" v-if="pkCountry == 1"
> >
@ -174,7 +163,13 @@
:placeholder="'请输入收货电话'" :placeholder="'请输入收货电话'"
/> />
</u-form-item> </u-form-item>
<u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-else> <u-form-item
:label="'收货电话'"
borderBottom
required
prop="recPhone"
v-else
>
<u-input <u-input
v-model.trim="form.recPhone" v-model.trim="form.recPhone"
border="none" border="none"
@ -185,6 +180,7 @@
<u-form-item <u-form-item
:label="'收货地址'" :label="'收货地址'"
borderBottom borderBottom
required
prop="diqu" prop="diqu"
@click="getDiqu" @click="getDiqu"
> >
@ -197,7 +193,12 @@
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item :label="'详细地址'" borderBottom prop="recAddress"> <u-form-item
:label="'详细地址'"
required
borderBottom
prop="recAddress"
>
<u-input <u-input
v-model.trim="form.recAddress" v-model.trim="form.recAddress"
border="none" border="none"

37
pages/regiest/index.vue
View File

@ -175,7 +175,7 @@
> >
<u-input v-model="form.idCard" border="none" /> <u-input v-model="form.idCard" border="none" />
</u-form-item> </u-form-item>
<u-form-item <!-- <u-form-item
:label="'发货方式'" :label="'发货方式'"
required required
borderBottom borderBottom
@ -206,20 +206,8 @@
/> />
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item> -->
<u-form-item
v-if="howSure"
:label="'创客空间'"
borderBottom
required
@click="ishowSure = true"
prop="makerSpaceMemberLabel"
>
<view class="disFlex justBwn">
<u-input v-model="form.makerSpaceMemberLabel" border="none" />
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<!-- <u-form-item <!-- <u-form-item
:label="'仓库'" :label="'仓库'"
v-if="pkCountry != 1" v-if="pkCountry != 1"
@ -256,7 +244,7 @@
</span> </span>
</view> </view>
<view v-if="isDeliveryWay"> <view v-if="isDeliveryWay">
<u-form-item :label="'收货人'" borderBottom prop="recName"> <u-form-item :label="'收货人'" required borderBottom prop="recName">
<u-input <u-input
v-model.trim="form.recName" v-model.trim="form.recName"
border="none" border="none"
@ -266,6 +254,7 @@
</u-form-item> </u-form-item>
<u-form-item <u-form-item
:label="'收货电话'" :label="'收货电话'"
required
borderBottom borderBottom
prop="recPhone" prop="recPhone"
v-if="pkCountry == 1" v-if="pkCountry == 1"
@ -278,7 +267,13 @@
:placeholder="'请输入收货电话'" :placeholder="'请输入收货电话'"
/> />
</u-form-item> </u-form-item>
<u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-else> <u-form-item
:label="'收货电话'"
required
borderBottom
prop="recPhone"
v-else
>
<u-input <u-input
v-model.trim="form.recPhone" v-model.trim="form.recPhone"
border="none" border="none"
@ -289,6 +284,7 @@
<u-form-item <u-form-item
:label="'收货地址'" :label="'收货地址'"
borderBottom borderBottom
required
prop="diqu" prop="diqu"
@click="getDiqu" @click="getDiqu"
> >
@ -301,7 +297,12 @@
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item :label="'详细地址'" borderBottom prop="recAddress"> <u-form-item
:label="'详细地址'"
required
borderBottom
prop="recAddress"
>
<u-input <u-input
v-model.trim="form.recAddress" v-model.trim="form.recAddress"
border="none" border="none"