Commit 86814ceb authored by 何毅恒's avatar 何毅恒

c

parent 6b802fae
...@@ -198,4 +198,18 @@ export function safeOrigin(og_id) { ...@@ -198,4 +198,18 @@ export function safeOrigin(og_id) {
}, },
needMask: true needMask: true
}) })
}
/**
* @desc 判断是否可以货到付款
* @param { Number } shop_id 商家id
*/
export function isSupportCashOnDelivery(shop_id) {
return request({
url: 'wxxcx/getShopCashIsUse.htm',
method: 'post',
data: {
shop_id
},
})
} }
\ No newline at end of file
...@@ -108,12 +108,12 @@ ...@@ -108,12 +108,12 @@
</view> </view>
<view> <view>
<view class="mt-3">选择支付方式</view> <view class="mt-3">选择支付方式</view>
<view class="pay-item pt-3" @click="handlePayWay(form.goods_before_pay)"> <view class="pay-item py-3" @click="handlePayWay(form.goods_before_pay)">
<view>在线支付</view> <view>在线支付</view>
<view :class="!form.goods_before_pay ? 'select' : 'unselect'"></view> <view :class="!form.goods_before_pay ? 'select' : 'unselect'"></view>
</view> </view>
<view class="pay-item py-3" @click="handlePayWay(form.goods_before_pay)"> <view class="pay-item pb-3" @click="handlePayWay(form.goods_before_pay)" v-if="isSupportCOD==1">
<view>先货后</view> <view>货到付</view>
<view :class="form.goods_before_pay ? 'select' : 'unselect'"></view> <view :class="form.goods_before_pay ? 'select' : 'unselect'"></view>
</view> </view>
</view> </view>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
</script> </script>
<script> <script>
import { preConfirmOrderData, confirmOrder } from '@/apis/order.js' import { preConfirmOrderData, confirmOrder , isSupportCashOnDelivery } from '@/apis/order.js'
import { makePhoneCall } from '@/utils/common.js' import { makePhoneCall } from '@/utils/common.js'
import { baseUrl } from '@/config/index.js' import { baseUrl } from '@/config/index.js'
import Validator from '@/utils/validate.js' import Validator from '@/utils/validate.js'
...@@ -170,14 +170,15 @@ export default { ...@@ -170,14 +170,15 @@ export default {
form: { form: {
from: 6, // 来源:6专属小程序 from: 6, // 来源:6专属小程序
buy_type: 0, //购买类型:0默认加入购物车 1立即购买 buy_type: 0, //购买类型:0默认加入购物车 1立即购买
goods_before_pay: 0, // 是否为先货后款:0否 1是 goods_before_pay: 0, // 是否为货到付款:0否 1是
sku_ids: '', // SKUIDs,多个则使用逗号分隔(buy_type=1时必填) sku_ids: '', // SKUIDs,多个则使用逗号分隔(buy_type=1时必填)
shipping_type: 1, // 配送类型1格利冷运2第三方(自提) shipping_type: 1, // 配送类型1格利冷运2第三方(自提)
address_id: '', // 收货地址ID(shipping_type=1时必填) address_id: '', // 收货地址ID(shipping_type=1时必填)
cart_ids: '', // 选中的购物车IDs,多个则使用逗号分隔(buy_type=0时必填) cart_ids: '', // 选中的购物车IDs,多个则使用逗号分隔(buy_type=0时必填)
postscript: '', // 订单附言,由用户提交订单前填写 postscript: '', // 订单附言,由用户提交订单前填写
cart_numbers: '' // 购买数量s,多个则使用逗号分隔(buy_type=1时必填) cart_numbers: '' // 购买数量s,多个则使用逗号分隔(buy_type=1时必填)
} },
isSupportCOD:0, //判读是否支持货到付款(0不支持,1支持)
} }
}, },
...@@ -231,8 +232,10 @@ export default { ...@@ -231,8 +232,10 @@ export default {
try{ try{
const { status, data } = await preConfirmOrderData(params) const { status, data } = await preConfirmOrderData(params)
if(status) { if(status) {
this.orderDetail = data let shop_id= data.shop.shop_id;
this.form.address_id = data.address.address_id || '' this.supportCashOnDelivery(shop_id);
this.orderDetail = data;
this.form.address_id = data.address.address_id || '';
} else { } else {
uni.navigateBack() uni.navigateBack()
} }
...@@ -241,7 +244,14 @@ export default { ...@@ -241,7 +244,14 @@ export default {
//TODO handle the exception //TODO handle the exception
} }
}, },
// 获取判断商家是否支持货到付款
async supportCashOnDelivery(shop_id){
const {code,data} = await isSupportCashOnDelivery(shop_id);
this.isSupportCOD = data;
},
// 提交订单 // 提交订单
async handleConfirm() { async handleConfirm() {
try{ try{
...@@ -292,7 +302,7 @@ export default { ...@@ -292,7 +302,7 @@ export default {
} else if(this.form.goods_before_pay === 1) { } else if(this.form.goods_before_pay === 1) {
return this.$modal({ return this.$modal({
title: '提示', title: '提示',
content: '订单包含先货后款商品,需商户确认下单,是否继续下单?', content: '订单包含货到付款商品,需商户确认下单,是否继续下单?',
cb: () => { cb: () => {
this.confirm2Order(form, () => { this.confirm2Order(form, () => {
uni.redirectTo({ uni.redirectTo({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment