|
|
|
@ -159,13 +159,13 @@ |
|
|
|
<view> |
|
|
|
<view style="line-height:70rpx;">手机尾号</view> |
|
|
|
<view class="check-input"> |
|
|
|
<input type="text" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位"> |
|
|
|
<input type="number" v-model="addFormData.phoneNumber" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写预留手机尾号4位"> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-if="isKuaidi"> |
|
|
|
<view style="line-height:70rpx;">取件码</view> |
|
|
|
<view class="check-input" v-for="(item,index) in addFormData.codeList" :key="index" style="border: none;display: flex;"> |
|
|
|
<input type="text" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码"> |
|
|
|
<input type="number" v-model="item.code" style="width: 100%;height: 100%;padding: 0 20rpx;border: 1px solid #eee;border-radius:10rpx;" placeholder="建议填写取件码"> |
|
|
|
<view @tap="delCode(index)" v-if="addFormData.codeList.length>1" style="width: 90rpx;height: 70rpx;line-height: 70rpx;text-align: center;"> |
|
|
|
<uni-icons type="trash" size="18"></uni-icons> |
|
|
|
</view> |
|
|
|
@ -206,11 +206,13 @@ |
|
|
|
<view class="content-title"> |
|
|
|
订单备注 |
|
|
|
</view> |
|
|
|
<view style="height: 200rpx;background: rgba(247, 248, 248, 0.6);border-radius: 40rpx;padding: 20rpx;margin-top: 20rpx;flex: 1;"> |
|
|
|
<textarea v-model="addFormData.remark" maxlength="50" cols="30" rows="10" placeholder="请填写备注" style="height: 160rpx;width: 100%;"></textarea> |
|
|
|
<view class="remark-preview" @tap="openRemarkPopup"> |
|
|
|
<text v-if="addFormData.remark">{{addFormData.remark}}</text> |
|
|
|
<text v-else class="remark-placeholder">请填写备注</text> |
|
|
|
<uni-icons type="right" size="14" color="#999"></uni-icons> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;border-top: 1px solid #eee;margin-top: 10px;" @tap="openCouponPopup"> |
|
|
|
<!-- <view style="display: flex;height: 80rpx;line-height: 80rpx;font-weight: 700; align-items:center;padding: 0 4%;border-top: 1px solid #eee;margin-top: 10px;" @tap="openCouponPopup"> |
|
|
|
<view style="flex: 1;"> |
|
|
|
优惠券 |
|
|
|
</view> |
|
|
|
@ -224,7 +226,7 @@ |
|
|
|
无可用券 |
|
|
|
</view> |
|
|
|
<uni-icons type="right" size="14" color="#999" style="margin-left:10rpx;"></uni-icons> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
<view style="height: 80rpx;line-height: 80rpx;display: flex;padding: 0 4%;"> |
|
|
|
<view style="flex: 1;font-weight: 700;"> |
|
|
|
{{isKuaidi?'代取配送费':'跑腿费'}} |
|
|
|
@ -328,6 +330,21 @@ |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
|
|
|
|
<uni-popup ref="remarkPopup" type="center" background-color="transparent"> |
|
|
|
<view class="commission-popup"> |
|
|
|
<view class="commission-popup-title">填写订单备注</view> |
|
|
|
<view class="commission-popup-desc">最多输入 50 个字</view> |
|
|
|
<view class="remark-popup-input"> |
|
|
|
<textarea v-model="remarkInputValue" maxlength="50" auto-height |
|
|
|
placeholder="请填写备注" cursor-spacing="120" /> |
|
|
|
</view> |
|
|
|
<view class="commission-popup-actions"> |
|
|
|
<view class="commission-popup-cancel" @tap="$refs.remarkPopup.close()">取消</view> |
|
|
|
<view class="commission-popup-confirm" @tap="confirmRemark">确定</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
|
|
|
|
<uni-popup ref="warnPopup" background-color="#fff"> |
|
|
|
<view style="width:600rpx;height:740rpx;"> |
|
|
|
<img v-if="warnPopup === 'shdz'" @tap="$refs.warnPopup.close()" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4996043b3987401794b974d359429b8e.png" alt="填写收货地址" style="width:100%;height:100%;" /> |
|
|
|
@ -386,6 +403,7 @@ |
|
|
|
assignedWorker:null, |
|
|
|
customCommission:'0.1', |
|
|
|
commissionInputValue: '', |
|
|
|
remarkInputValue: '', |
|
|
|
shopArea: [], |
|
|
|
kuaidiAreaList: [], |
|
|
|
shopAreaLoaded: false, |
|
|
|
@ -460,7 +478,7 @@ |
|
|
|
onShow() { |
|
|
|
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() |
|
|
|
this.initAddress() |
|
|
|
this.fetchCoupons() |
|
|
|
/* this.fetchCoupons() */ |
|
|
|
const now = new Date(); |
|
|
|
const startTime = new Date(now); |
|
|
|
const endTime = new Date(now); |
|
|
|
@ -523,10 +541,19 @@ |
|
|
|
} |
|
|
|
this.customCommission = this.formatCommissionValue(this.commissionInputValue); |
|
|
|
this.$refs.commissionPopup.close(); |
|
|
|
this.fetchCoupons(); |
|
|
|
/* this.fetchCoupons(); */ |
|
|
|
}, |
|
|
|
openRemarkPopup() { |
|
|
|
this.remarkInputValue = this.addFormData.remark || ''; |
|
|
|
this.$refs.remarkPopup.open('center'); |
|
|
|
}, |
|
|
|
confirmRemark() { |
|
|
|
this.addFormData.remark = (this.remarkInputValue || '').slice(0, 50); |
|
|
|
uni.hideKeyboard(); |
|
|
|
this.$refs.remarkPopup.close(); |
|
|
|
}, |
|
|
|
openCouponPopup() { |
|
|
|
this.fetchCoupons(); |
|
|
|
/* this.fetchCoupons(); */ |
|
|
|
this.$refs.couponPopup.open('bottom'); |
|
|
|
}, |
|
|
|
fetchCoupons() { |
|
|
|
@ -1240,6 +1267,53 @@ |
|
|
|
box-shadow: 0 12rpx 26rpx rgba(11, 155, 115, 0.12); |
|
|
|
} |
|
|
|
|
|
|
|
.remark-preview { |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
justify-content: space-between; |
|
|
|
flex: 1; |
|
|
|
min-height: 120rpx; |
|
|
|
margin-top: 20rpx; |
|
|
|
padding: 20rpx; |
|
|
|
border-radius: 24rpx; |
|
|
|
background: rgba(247, 248, 248, 0.6); |
|
|
|
box-sizing: border-box; |
|
|
|
color: #333; |
|
|
|
font-size: 26rpx; |
|
|
|
line-height: 38rpx; |
|
|
|
|
|
|
|
text { |
|
|
|
flex: 1; |
|
|
|
margin-right: 12rpx; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
display: -webkit-box; |
|
|
|
-webkit-line-clamp: 2; |
|
|
|
-webkit-box-orient: vertical; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.remark-placeholder { |
|
|
|
color: #999; |
|
|
|
} |
|
|
|
|
|
|
|
.remark-popup-input { |
|
|
|
min-height: 180rpx; |
|
|
|
margin-top: 34rpx; |
|
|
|
padding: 22rpx 26rpx; |
|
|
|
border-radius: 24rpx; |
|
|
|
background: #f6faf8; |
|
|
|
border: 1rpx solid #e5efeb; |
|
|
|
box-sizing: border-box; |
|
|
|
|
|
|
|
textarea { |
|
|
|
width: 100%; |
|
|
|
min-height: 136rpx; |
|
|
|
font-size: 30rpx; |
|
|
|
line-height: 42rpx; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.check-input { |
|
|
|
height: 70rpx; |
|
|
|
width: 100%; |
|
|
|
|
wangfukang
1 month ago