Merge branch 'dev' into 'master'

uniapp【优化】: 优化订单列表下单方式和个人资料修改生日最小为1949-10-01

See merge request jianweie/coreshoppro!76
This commit is contained in:
花城
2024-11-10 10:37:49 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -294,8 +294,8 @@
orderType: PaymentTypeEnum.common,
tabList: [
{ name: '快递物流', type: OrderDistributionEnum.mailing, show: false, },
{ name: '同城配送', type: OrderDistributionEnum.homeDelivery, show: false, },
{ name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: false, }
{ name: '同城配送', type: OrderDistributionEnum.homeDelivery, show: false, },
{ name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: false, }
],
tabSelectType: null,
userDefaultShip: {},

View File

@@ -54,7 +54,7 @@
<view class="save-box" @click="handleSubmit">保存</view>
<uv-datetime-picker ref="datetimePicker" :minDate="-28800000" :maxDate="new Date().getTime()"
<uv-datetime-picker ref="datetimePicker" :minDate="-639100800000" :maxDate="new Date().getTime()"
v-model="state.birthdayTemporary" :formatter="formatter" mode="date"
@confirm="confirm"></uv-datetime-picker>
</view>