add
This commit is contained in:
parent
35fc21e14e
commit
f66abb2002
|
|
@ -37,3 +37,5 @@ components.d.ts
|
|||
.env.development
|
||||
.env.production
|
||||
/unpackage/
|
||||
|
||||
helper.json
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
let BASE_URL
|
||||
import store from "@/store/user.js"
|
||||
// 环境
|
||||
// let env = "dev"
|
||||
let env = "prod"
|
||||
let env = "dev"
|
||||
// let env = "prod"
|
||||
// let env = "liu";
|
||||
|
||||
switch (env) {
|
||||
|
|
|
|||
|
|
@ -1,73 +1,73 @@
|
|||
<template>
|
||||
<view class="">
|
||||
<view class="m-card m-address">
|
||||
<view class="address-info" @click="showAddress = true" v-if='orderInfo.shipping_type==1'>
|
||||
<view class="address-info" @click="showAddress = true" v-if='orderInfo.shipping_type == 1'>
|
||||
<view class="top">
|
||||
<up-icon name="account"></up-icon>
|
||||
<view class="t-name">{{addressInfo.real_name}}</view>
|
||||
<view>{{addressInfo.phone}}</view>
|
||||
<view class="t-name">{{ addressInfo.real_name }}</view>
|
||||
<view>{{ addressInfo.phone }}</view>
|
||||
</view>
|
||||
<view class="bottom u-line-2">
|
||||
{{addressInfo.detail}}
|
||||
{{ addressInfo.detail }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-info" v-else>
|
||||
<view class="top">
|
||||
{{STORE_INFO.name}}
|
||||
{{ STORE_INFO.name }}
|
||||
</view>
|
||||
<view class="bottom u-line-2">
|
||||
{{STORE_INFO.detailed_address}}
|
||||
{{ STORE_INFO.detailed_address }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="address-btn item-center">
|
||||
<view class='ship-type' style="">
|
||||
<view class="ship-type-item" :class='{actShipItem:orderInfo.shipping_type==2 }'
|
||||
@click='orderInfo.shipping_type=2'>
|
||||
<view class="ship-type-item" :class='{ actShipItem: orderInfo.shipping_type == 2 }'
|
||||
@click='orderInfo.shipping_type = 2'>
|
||||
自提
|
||||
</view>
|
||||
<view class="ship-type-item" @click='orderInfo.shipping_type=1'
|
||||
:class='{actShipItem:orderInfo.shipping_type==1 }' v-if='orderInfo.default_delivery==1'>
|
||||
<view class="ship-type-item" @click='orderInfo.shipping_type = 1'
|
||||
:class='{ actShipItem: orderInfo.shipping_type == 1 }' v-if='orderInfo.default_delivery == 1'>
|
||||
配送
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="m-card m-good" v-for="(item,index) in cartList" :key="index">
|
||||
<view class="m-card m-good" v-for="(item, index) in cartList" :key="index">
|
||||
<view class="image">
|
||||
<up-image width="160rpx" height="160rpx" :src="item.imgs"></up-image>
|
||||
</view>
|
||||
<view class="body-content">
|
||||
<view>
|
||||
<view class="title">
|
||||
<view>{{item.name}}</view>
|
||||
<view>¥{{item.price}}</view>
|
||||
<view>{{ item.name }}</view>
|
||||
<view>¥{{ item.price }}</view>
|
||||
</view>
|
||||
<view class="tips">
|
||||
<view>{{item.unit_name}}</view>
|
||||
<view>x{{item.cart_num}}</view>
|
||||
<view>{{ item.unit_name }}</view>
|
||||
<view>x{{ item.cart_num }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="time">
|
||||
{{orderInfo.delivery_msg}}
|
||||
{{ orderInfo.delivery_msg }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="m-card good-info">
|
||||
<view class="head-title">价格明细</view>
|
||||
<view class="row">
|
||||
<view>商品总价 <text>共计{{cartList.length}}款商品</text></view>
|
||||
<view>商品总价 <text>共计{{ cartList.length }}款商品</text></view>
|
||||
<view>
|
||||
<text>¥</text>{{c_price(orderInfo.total_price, 0)}}<text>.{{c_price(orderInfo.total_price, 1)}}</text>
|
||||
<text>¥</text>{{ c_price(orderInfo.total_price, 0) }}<text>.{{ c_price(orderInfo.total_price, 1) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>运费</view>
|
||||
<view><text>¥</text>0<text>.00</text></view>
|
||||
</view>
|
||||
<view class="row" v-if="orderInfo.activities==1" style="color: red;">
|
||||
<view>活动折扣 <text>{{orderInfo.activity}}</text></view>
|
||||
<view class="row" v-if="orderInfo.activities == 1" style="color: red;">
|
||||
<view>活动折扣 <text>{{ orderInfo.activity }}</text></view>
|
||||
<view>
|
||||
-¥<text>{{orderInfo.activity_price}}</text>
|
||||
-¥<text>{{ orderInfo.activity_price }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -119,8 +119,8 @@
|
|||
<text style="color: #000;">合计: </text>
|
||||
<text>￥</text>
|
||||
<block v-if="orderInfo.total_price">
|
||||
<text style="font-size: 32rpx;font-weight: bold;">{{c_price(orderInfo.pay_price, 0)}}</text>
|
||||
<text>.{{c_price(orderInfo.pay_price, 1)}}</text>
|
||||
<text style="font-size: 32rpx;font-weight: bold;">{{ c_price(orderInfo.pay_price, 0) }}</text>
|
||||
<text>.{{ c_price(orderInfo.pay_price, 1) }}</text>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -129,9 +129,9 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<addressPopup ref="addressRef" :show="showAddress" :list="addressList" @close="showAddress=false"
|
||||
<addressPopup ref="addressRef" :show="showAddress" :list="addressList" @close="showAddress = false"
|
||||
@change="changeAddress" />
|
||||
<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList" @close="shopListShow=false"
|
||||
<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList" @close="shopListShow = false"
|
||||
@change="changeShop" @search="searchShop" />
|
||||
<modal title="尚未设置收货地址" content="您还没有添加收货地址，请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
|
||||
@close="addAddress" @change="goPay" />
|
||||
|
|
@ -141,67 +141,67 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
import {
|
||||
onLoad,
|
||||
onShow
|
||||
} from "@dcloudio/uni-app"
|
||||
import {
|
||||
} from "@dcloudio/uni-app"
|
||||
import {
|
||||
nextTick,
|
||||
ref
|
||||
} from "vue"
|
||||
import addressPopup from "@/components/addressPopup.vue";
|
||||
import shopListPopupVue from "@/components/shopListPopup.vue";
|
||||
import useCartStore from "@/store/cart.js";
|
||||
import modal from "@/components/modal.vue";
|
||||
import {
|
||||
} from "vue"
|
||||
import addressPopup from "@/components/addressPopup.vue";
|
||||
import shopListPopupVue from "@/components/shopListPopup.vue";
|
||||
import useCartStore from "@/store/cart.js";
|
||||
import modal from "@/components/modal.vue";
|
||||
import {
|
||||
checkOrderApi
|
||||
} from "@/api/cart.js";
|
||||
import {
|
||||
} from "@/api/cart.js";
|
||||
import {
|
||||
addressListsApi,
|
||||
merchantListApi
|
||||
} from "@/api/user.js";
|
||||
import {
|
||||
} from "@/api/user.js";
|
||||
import {
|
||||
createOrderApi
|
||||
} from "@/api/order.js";
|
||||
} from "@/api/order.js";
|
||||
|
||||
// 用户选择的门店信息
|
||||
let STORE_INFO = uni.getStorageSync('STORE_INFO');
|
||||
if (STORE_INFO)
|
||||
// 用户选择的门店信息
|
||||
let STORE_INFO = uni.getStorageSync('STORE_INFO');
|
||||
if (STORE_INFO)
|
||||
STORE_INFO = JSON.parse(STORE_INFO)
|
||||
|
||||
const cartStore = useCartStore();
|
||||
const reservation_time = ref('')
|
||||
const cartStore = useCartStore();
|
||||
const reservation_time = ref('')
|
||||
|
||||
const formData = ref({
|
||||
const formData = ref({
|
||||
remark: ""
|
||||
})
|
||||
})
|
||||
|
||||
const isAddress = ref(false);
|
||||
const toastAddressShow = ref(false);
|
||||
const isAddress = ref(false);
|
||||
const toastAddressShow = ref(false);
|
||||
|
||||
const onChoosePaytype = (e) => {
|
||||
const onChoosePaytype = (e) => {
|
||||
pay_type.value = e;
|
||||
}
|
||||
}
|
||||
|
||||
// 选择地址
|
||||
const addressRef = ref(null);
|
||||
const showAddress = ref(false);
|
||||
const addressInfo = ref({});
|
||||
const changeAddress = (e) => {
|
||||
// 选择地址
|
||||
const addressRef = ref(null);
|
||||
const showAddress = ref(false);
|
||||
const addressInfo = ref({});
|
||||
const changeAddress = (e) => {
|
||||
addressInfo.value = e;
|
||||
showAddress.value = false;
|
||||
isAddress.value = true;
|
||||
}
|
||||
const openAddress = () => {
|
||||
}
|
||||
const openAddress = () => {
|
||||
if (addressList.length > 0) showAddress.value = true;
|
||||
else uni.navigateTo({
|
||||
url: '/pagesOrder/addressEdit/addressEdit'
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 地址相关
|
||||
const addressList = ref([]);
|
||||
const getAddressList = () => {
|
||||
// 地址相关
|
||||
const addressList = ref([]);
|
||||
const getAddressList = () => {
|
||||
addressListsApi().then(res => {
|
||||
addressList.value = res.data.lists;
|
||||
addressList.value.forEach(item => {
|
||||
|
|
@ -220,21 +220,21 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 提货点相关
|
||||
const shopRef = ref(null);
|
||||
const shopListShow = ref(false);
|
||||
const merchantList = ref([]);
|
||||
const myAddressInfo = ref({
|
||||
// 提货点相关
|
||||
const shopRef = ref(null);
|
||||
const shopListShow = ref(false);
|
||||
const merchantList = ref([]);
|
||||
const myAddressInfo = ref({
|
||||
long: "",
|
||||
lat: ""
|
||||
})
|
||||
const shopInfo = ref({
|
||||
})
|
||||
const shopInfo = ref({
|
||||
mer_id: ''
|
||||
});
|
||||
});
|
||||
|
||||
const getMerchantList = (mer_name = null) => {
|
||||
const getMerchantList = (mer_name = null) => {
|
||||
merchantListApi({
|
||||
...myAddressInfo.value,
|
||||
mer_name: mer_name ? mer_name : ''
|
||||
|
|
@ -249,13 +249,13 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// getMerchantList();
|
||||
// 定位
|
||||
const LoadAddress = () => {
|
||||
// getMerchantList();
|
||||
// 定位
|
||||
const LoadAddress = () => {
|
||||
uni.getLocation({
|
||||
success: (res) => {},
|
||||
success: (res) => { },
|
||||
fail: (err) => {
|
||||
uni.$u.toast('定位失败, 请手动选择提货点!')
|
||||
},
|
||||
|
|
@ -265,60 +265,60 @@
|
|||
getMerchantList();
|
||||
}
|
||||
})
|
||||
}
|
||||
// LoadAddress();
|
||||
}
|
||||
// LoadAddress();
|
||||
|
||||
const changeShop = (e) => {
|
||||
const changeShop = (e) => {
|
||||
shopInfo.value = e;
|
||||
shopListShow.value = false;
|
||||
}
|
||||
const searchShop = (e) => {
|
||||
}
|
||||
const searchShop = (e) => {
|
||||
getMerchantList(e)
|
||||
}
|
||||
}
|
||||
|
||||
// 拨打电话
|
||||
// const callShow = ref(false)
|
||||
// const phone = ref('');
|
||||
// const callphone = (e) => {
|
||||
// callShow.value = true;
|
||||
// phone.value = e;
|
||||
// }
|
||||
const onCall = (e) => {
|
||||
// 拨打电话
|
||||
// const callShow = ref(false)
|
||||
// const phone = ref('');
|
||||
// const callphone = (e) => {
|
||||
// callShow.value = true;
|
||||
// phone.value = e;
|
||||
// }
|
||||
const onCall = (e) => {
|
||||
uni.makePhoneCall({
|
||||
phoneNumber: e,
|
||||
success() {
|
||||
callShow.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 选择地址
|
||||
const addAddress = () => {
|
||||
// 选择地址
|
||||
const addAddress = () => {
|
||||
toastAddressShow.value = false;
|
||||
nextTick(() => {
|
||||
showAddress.value = true;
|
||||
})
|
||||
}
|
||||
// 继续支付
|
||||
const goPay = () => {
|
||||
}
|
||||
// 继续支付
|
||||
const goPay = () => {
|
||||
toastAddressShow.value = false;
|
||||
isAddress.value = true;
|
||||
submitOrder();
|
||||
}
|
||||
}
|
||||
|
||||
// 提交订单
|
||||
const submitOrder = () => {
|
||||
// 提交订单
|
||||
const submitOrder = () => {
|
||||
// if (!shopInfo.value.mer_id) {
|
||||
// uni.$u.toast('请先选择提货点');
|
||||
// return shopListShow.value = true;
|
||||
// }
|
||||
if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
|
||||
createOrder();
|
||||
}
|
||||
// 订单相关
|
||||
const cartList = ref([]);
|
||||
const orderInfo = ref({});
|
||||
const checkOrder = () => {
|
||||
}
|
||||
// 订单相关
|
||||
const cartList = ref([]);
|
||||
const orderInfo = ref({});
|
||||
const checkOrder = () => {
|
||||
checkOrderApi({
|
||||
cart_id: cartStore.cartList,
|
||||
store_id: STORE_INFO.id || 0
|
||||
|
|
@ -329,11 +329,11 @@
|
|||
orderInfo.value.shipping_type = 2
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const pay_type = ref('');
|
||||
const pay_type = ref('');
|
||||
|
||||
const createOrder = () => {
|
||||
const createOrder = () => {
|
||||
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
|
||||
|
||||
createOrderApi({
|
||||
|
|
@ -398,35 +398,35 @@
|
|||
}).catch(err => {
|
||||
uni.$u.toast(err.msg || '网络错误')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const c_price = (price, index = 0) => {
|
||||
const c_price = (price, index = 0) => {
|
||||
price = price + '';
|
||||
return price.split('.')[index] || (index ? '00' : '0');
|
||||
}
|
||||
}
|
||||
|
||||
onLoad(options => {
|
||||
onLoad(options => {
|
||||
checkOrder();
|
||||
})
|
||||
onShow(() => {
|
||||
})
|
||||
onShow(() => {
|
||||
getAddressList();
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.m-card {
|
||||
.m-card {
|
||||
margin: 20rpx;
|
||||
border-radius: 14rpx;
|
||||
background-color: #fff;
|
||||
padding: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.row {
|
||||
.row {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.m-address {
|
||||
.m-address {
|
||||
margin-bottom: 20rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
|
@ -449,9 +449,9 @@
|
|||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.m-good {
|
||||
.m-good {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20rpx;
|
||||
|
|
@ -493,9 +493,9 @@
|
|||
border-radius: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.good-info {
|
||||
.good-info {
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.head-title {
|
||||
|
|
@ -536,17 +536,17 @@
|
|||
text {
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.order-remark {
|
||||
.order-remark {
|
||||
.head-title {
|
||||
margin-bottom: 18rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tips {
|
||||
.tips {
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
display: flex;
|
||||
|
|
@ -558,15 +558,15 @@
|
|||
.all {
|
||||
color: #F55726;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.item-center {
|
||||
.item-center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.ship-type {
|
||||
.ship-type {
|
||||
display: flex;
|
||||
z-index: 9;
|
||||
background-color: #F6F6F6;
|
||||
|
|
@ -585,5 +585,5 @@
|
|||
background-color: #27B52F;
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue