This commit is contained in:
1154079537 2024-06-13 18:08:15 +08:00
parent a9071886cc
commit c85cb68f7a
4 changed files with 490 additions and 433 deletions

View File

@ -2,4 +2,9 @@ import request from '@/utils/request';
export const shopListApi = (data) => { export const shopListApi = (data) => {
return request.get('/store/store/lists', data); return request.get('/store/store/lists', data);
}
// 店铺详情
export const shopDetailApi = (data) => {
return request.get('/store/store/detail', data);
} }

View File

@ -164,12 +164,14 @@
<script setup> <script setup>
import { import {
onLoad, onLoad,
onShow onShow,
onShareAppMessage,
onShareTimeline
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
import { import {
reactive, reactive,
ref, ref,
onMounted onMounted,
} from "vue" } from "vue"
import { import {
goodListApi, goodListApi,
@ -190,9 +192,18 @@
import { import {
getCurrentInstance getCurrentInstance
} from 'vue'; } from 'vue';
import {
shopDetailApi
} from "@/api/multipleShop.js";
import useUserStore from "@/store/user"; import useUserStore from "@/store/user";
const userStore = useUserStore(); const userStore = useUserStore();
const STORE_INFO = ref({
name: '',
id: '',
detailed_address: '',
image: ''
});
const test = () => { const test = () => {
uni.navigateTo({ uni.navigateTo({
@ -200,18 +211,28 @@
}) })
} }
//
onShareAppMessage(() => {
let shareInfo = {
title: STORE_INFO.value.name,
path: '/pages/index/index?id=' + STORE_INFO.value.id,
imageUrl: STORE_INFO.value.image,
success() {
uni.$u.toast('分享成功');
},
fail() {
uni.$u.toast('分享失败');
}
};
return shareInfo;
})
const navgo = (url) => { const navgo = (url) => {
uni.navigateTo({ uni.navigateTo({
url url
}) })
} }
//
let STORE_INFO = uni.getStorageSync('STORE_INFO');
if (STORE_INFO)
STORE_INFO = JSON.parse(STORE_INFO)
/*商品列表滚动隐藏头部导航 */ /*商品列表滚动隐藏头部导航 */
const instance = getCurrentInstance(); // const instance = getCurrentInstance(); //
const targetHeight = ref(0) const targetHeight = ref(0)
@ -261,7 +282,7 @@
cart_num: cart_num, cart_num: cart_num,
is_new: 0, // 01 is_new: 0, // 01
// goods_id: id, // goods_id: id,
store_id: where.value.store_id, store_id: STORE_INFO.value.id,
product_id: product_id product_id: product_id
}).then(res => { }).then(res => {
getCartList(); getCartList();
@ -289,10 +310,9 @@
name: '', name: '',
order: '', order: '',
store_name: '', store_name: '',
store_id: STORE_INFO.id || '' store_id: STORE_INFO.value.id || ''
}) })
// console.log(JSON.parse(uni.getStorageSync('STORE_INFO')))
const loading = ref(true); const loading = ref(true);
const goodList = ref([]); const goodList = ref([]);
const getGoodList = (loadmore = false) => { const getGoodList = (loadmore = false) => {
@ -329,13 +349,12 @@
const classMap = new Map(); const classMap = new Map();
const getgoodClassList = (pid = 0, three = 1) => { const getgoodClassList = (pid = 0, three = 1) => {
let page_no = classMap.get(pid) || 1; let page_no = classMap.get(pid) || 1;
// console.log(classMap.get(pid));
goodClassListApi({ goodClassListApi({
pid: pid, pid: pid,
page_no: page_no, page_no: page_no,
page_size: 30, page_size: 30,
level: three, level: three,
store_id: STORE_INFO.id || '' // id store_id: STORE_INFO.value.id || '' // id
}).then(res => { }).then(res => {
if (pid == 0) { // if (pid == 0) { //
if (!res.data?.lists?.length) return; if (!res.data?.lists?.length) return;
@ -443,7 +462,7 @@
productLogApi({ productLogApi({
product_id: item.product_id, product_id: item.product_id,
cate_id: item.cate_id, cate_id: item.cate_id,
store_id: STORE_INFO.id || '' store_id: STORE_INFO.value.id || ''
}); });
}; };
const changeGood = (data) => { // const changeGood = (data) => { //
@ -491,8 +510,22 @@
}) })
} }
onLoad((opt) => { onLoad(async (opt) => {
if (opt.id) where.value.store_id = opt.id; // id
if (opt.id) {
where.value.store_id = opt.id;
const info = await shopDetailApi({
store_id: opt.id
});
STORE_INFO.value = info.data;
uni.setStorageSync('STORE_INFO', JSON.stringify(info.data));
} else {
const info = uni.getStorageSync('STORE_INFO');
if (info)
STORE_INFO.value = JSON.parse(info);
}
getgoodClassList(0); getgoodClassList(0);
getGoodList(); getGoodList();
}) })

View File

@ -132,7 +132,6 @@
const showWeixin = ref(true); // const showWeixin = ref(true); //
const isAgree = ref(false); // const isAgree = ref(false); //
const tempUser = ref(null);
const weixinLogin = () => { const weixinLogin = () => {
if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议');
@ -149,7 +148,6 @@
userStore.setToken(res.data.token); userStore.setToken(res.data.token);
if (!res.data.mobile) { // if (!res.data.mobile) { //
// tempUser.value = res.data;
return showBind.value = true; return showBind.value = true;
} else { } else {
userStore.setUserInfo(res.data); userStore.setUserInfo(res.data);
@ -161,13 +159,23 @@
uni.reLaunch({ uni.reLaunch({
url: "/multipleShop/verificationOrder/index" url: "/multipleShop/verificationOrder/index"
}) })
} else { // } else {
uni.reLaunch({ // ,
url: "/multipleShop/index/index" let storeInfo = uni.getStorageSync('STORE_INFO');
}) if (storeInfo) {
storeInfo = JSON.parse(storeInfo);
//
uni.reLaunch({
url: "/pages/index/index?id=" + storeInfo.id
})
} else {
//
uni.reLaunch({
url: "/multipleShop/index/index"
})
}
} }
} }
// navToIndex();
}) })
}, },
fail: (err) => { fail: (err) => {
@ -177,7 +185,6 @@
}) })
} }
const showBind = ref(false); // const showBind = ref(false); //
const getPhoneNumber = (e) => { const getPhoneNumber = (e) => {
if (e.detail?.errMsg == 'getPhoneNumber:ok') { if (e.detail?.errMsg == 'getPhoneNumber:ok') {
@ -192,10 +199,21 @@
uni.reLaunch({ uni.reLaunch({
url: "/multipleShop/verificationOrder/index" url: "/multipleShop/verificationOrder/index"
}) })
} else { // } else {
uni.reLaunch({ // ,
url: "/multipleShop/index/index" let storeInfo = uni.getStorageSync('STORE_INFO');
}) if (storeInfo) {
storeInfo = JSON.parse(storeInfo);
//
uni.reLaunch({
url: "/pages/index/index?id=" + storeInfo.id
})
} else {
//
uni.reLaunch({
url: "/multipleShop/index/index"
})
}
} }
}) })
} else { } else {

View File

@ -141,449 +141,450 @@
</template> </template>
<script setup> <script setup>
import { import {
onLoad, onLoad,
onShow onShow
} from "@dcloudio/uni-app" } from "@dcloudio/uni-app"
import { import {
nextTick, nextTick,
ref ref
} from "vue" } from "vue"
import addressPopup from "@/components/addressPopup.vue"; import addressPopup from "@/components/addressPopup.vue";
import shopListPopupVue from "@/components/shopListPopup.vue"; import shopListPopupVue from "@/components/shopListPopup.vue";
import useCartStore from "@/store/cart.js"; import useCartStore from "@/store/cart.js";
import modal from "@/components/modal.vue"; import modal from "@/components/modal.vue";
import { import {
checkOrderApi checkOrderApi
} from "@/api/cart.js"; } from "@/api/cart.js";
import { import {
addressListsApi, addressListsApi,
merchantListApi merchantListApi
} from "@/api/user.js"; } from "@/api/user.js";
import { import {
createOrderApi createOrderApi
} from "@/api/order.js"; } from "@/api/order.js";
// //
let STORE_INFO = uni.getStorageSync('STORE_INFO'); let STORE_INFO = uni.getStorageSync('STORE_INFO');
if (STORE_INFO) if (STORE_INFO)
STORE_INFO = JSON.parse(STORE_INFO) STORE_INFO = JSON.parse(STORE_INFO)
const cartStore = useCartStore(); const cartStore = useCartStore();
const reservation_time = ref('') const reservation_time = ref('')
const formData = ref({ const formData = ref({
remark: "" remark: ""
})
const isAddress = ref(false);
const toastAddressShow = ref(false);
const onChoosePaytype = (e) => {
pay_type.value = 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 = () => {
if (addressList.length > 0) showAddress.value = true;
else uni.navigateTo({
url: '/pagesOrder/addressEdit/addressEdit'
}) })
}
// const isAddress = ref(false);
const addressList = ref([]); const toastAddressShow = ref(false);
const getAddressList = () => {
addressListsApi().then(res => { const onChoosePaytype = (e) => {
addressList.value = res.data.lists; pay_type.value = e;
addressList.value.forEach(item => { }
if (item.is_default) {
addressInfo.value = item; //
isAddress.value = true; 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 = () => {
if (addressList.length > 0) showAddress.value = true;
else uni.navigateTo({
url: '/pagesOrder/addressEdit/addressEdit'
}) })
if (!isAddress.value && addressList.value.length > 0) { }
addressInfo.value = addressList.value[0];
isAddress.value = true;
}
if (addressInfo.value.address_id) {
nextTick(() => {
addressRef.value.setCheck(addressInfo.value.address_id);
})
}
})
}
// //
const shopRef = ref(null); const addressList = ref([]);
const shopListShow = ref(false); const getAddressList = () => {
const merchantList = ref([]); addressListsApi().then(res => {
const myAddressInfo = ref({ addressList.value = res.data.lists;
long: "", addressList.value.forEach(item => {
lat: "" if (item.is_default) {
}) addressInfo.value = item;
const shopInfo = ref({ isAddress.value = true;
mer_id: ''
});
const getMerchantList = (mer_name = null) => {
merchantListApi({
...myAddressInfo.value,
mer_name: mer_name ? mer_name : ''
}).then(res => {
merchantList.value = res.data.lists;
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
.value.mer_id) {
shopInfo.value = merchantList.value[0];
shopInfo.value.recommend = 1;
nextTick(() => {
shopRef.value.setCheck(shopInfo.value.mer_id);
})
}
})
}
// getMerchantList();
//
const LoadAddress = () => {
uni.getLocation({
success: (res) => { },
fail: (err) => {
uni.$u.toast('定位失败, 请手动选择提货点!')
},
complete: (res) => {
myAddressInfo.value.long = res.longitude || "";
myAddressInfo.value.lat = res.latitude || "";
getMerchantList();
}
})
}
// LoadAddress();
const changeShop = (e) => {
shopInfo.value = e;
shopListShow.value = false;
}
const searchShop = (e) => {
getMerchantList(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 = () => {
toastAddressShow.value = false;
nextTick(() => {
showAddress.value = true;
})
}
//
const goPay = () => {
toastAddressShow.value = false;
isAddress.value = true;
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 = () => {
checkOrderApi({
cart_id: cartStore.cartList,
store_id: STORE_INFO.id || 0
}).then(res => {
cartList.value = res.data.cart_list;
orderInfo.value = res.data.order;
if (orderInfo.value.default_delivery == 0) {
orderInfo.value.shipping_type = 2
}
})
}
const pay_type = ref('');
const createOrder = () => {
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
createOrderApi({
cart_id: cartStore.cartList,
address_id: addressInfo.value.address_id,
pay_type: pay_type.value,
store_id: STORE_INFO.id || 0,
reservation_time: reservation_time.value,
shipping_type: orderInfo.value.shipping_type,
mark: formData.value.remark
}).then(res => {
console.log(res);
if (pay_type.value == 3) {
if (res.code == 1) {
uni.showToast({
title: res.msg,
icon: "none",
success() {
setTimeout(() => {
uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=2'
})
}, 1500)
}
})
} else {
uni.$u.toast(res.msg);
}
} else {
if (!res.data?.nonceStr) return uni.$u.toast('支付失败!');
uni.requestPayment({
provider: 'wxpay',
timeStamp: res.data.timeStamp,
nonceStr: res.data.nonceStr,
package: res.data.package,
signType: res.data.signType,
paySign: res.data.paySign,
success: (e) => {
if (e.errMsg == 'requestPayment:ok') {
uni.showModal({
title: '订单支付成功',
confirmText: '查看订单',
cancelText: '继续购买',
success: (e) => {
if (e.confirm) uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=2'
})
else uni.navigateBack();
}
})
} else uni.$u.toast('支付失败')
},
fail: (e) => {
uni.$u.toast('用户取消支付');
uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=1'
})
} }
}) })
} if (!isAddress.value && addressList.value.length > 0) {
}).catch(err => { addressInfo.value = addressList.value[0];
uni.$u.toast(err.msg || '网络错误') isAddress.value = true;
}
if (addressInfo.value.address_id) {
nextTick(() => {
addressRef.value.setCheck(addressInfo.value.address_id);
})
}
})
}
//
const shopRef = ref(null);
const shopListShow = ref(false);
const merchantList = ref([]);
const myAddressInfo = ref({
long: "",
lat: ""
}) })
} const shopInfo = ref({
mer_id: ''
});
const c_price = (price, index = 0) => { const getMerchantList = (mer_name = null) => {
price = price + ''; merchantListApi({
return price.split('.')[index] || (index ? '00' : '0'); ...myAddressInfo.value,
} mer_name: mer_name ? mer_name : ''
}).then(res => {
merchantList.value = res.data.lists;
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
.value.mer_id) {
shopInfo.value = merchantList.value[0];
shopInfo.value.recommend = 1;
nextTick(() => {
shopRef.value.setCheck(shopInfo.value.mer_id);
})
}
})
}
onLoad(options => { // getMerchantList();
checkOrder(); //
}) const LoadAddress = () => {
onShow(() => { uni.getLocation({
getAddressList(); success: (res) => {},
}) fail: (err) => {
uni.$u.toast('定位失败, 请手动选择提货点!')
},
complete: (res) => {
myAddressInfo.value.long = res.longitude || "";
myAddressInfo.value.lat = res.latitude || "";
getMerchantList();
}
})
}
// LoadAddress();
const changeShop = (e) => {
shopInfo.value = e;
shopListShow.value = false;
}
const searchShop = (e) => {
getMerchantList(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 = () => {
toastAddressShow.value = false;
nextTick(() => {
showAddress.value = true;
})
}
//
const goPay = () => {
toastAddressShow.value = false;
isAddress.value = true;
submitOrder();
}
//
const submitOrder = () => {
if (orderInfo.value.pay_price == 0) {
pay_type.value = 3;
return uni.$u.toast('当前支付金额为0暂不能使用微信支付')
}
if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
createOrder();
}
//
const cartList = ref([]);
const orderInfo = ref({});
const checkOrder = () => {
checkOrderApi({
cart_id: cartStore.cartList,
store_id: STORE_INFO.id || 0
}).then(res => {
cartList.value = res.data.cart_list;
orderInfo.value = res.data.order;
if (orderInfo.value.default_delivery == 0) {
orderInfo.value.shipping_type = 2
}
})
}
const pay_type = ref('');
const createOrder = () => {
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
createOrderApi({
cart_id: cartStore.cartList,
address_id: addressInfo.value.address_id,
pay_type: pay_type.value,
store_id: STORE_INFO.id || 0,
reservation_time: reservation_time.value,
shipping_type: orderInfo.value.shipping_type,
mark: formData.value.remark
}).then(res => {
console.log(res);
if (pay_type.value == 3) {
if (res.code == 1) {
uni.showToast({
title: res.msg,
icon: "none",
success() {
setTimeout(() => {
uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=2'
})
}, 1500)
}
})
} else {
uni.$u.toast(res.msg);
}
} else {
if (!res.data?.nonceStr) return uni.$u.toast('支付失败!');
uni.requestPayment({
provider: 'wxpay',
timeStamp: res.data.timeStamp,
nonceStr: res.data.nonceStr,
package: res.data.package,
signType: res.data.signType,
paySign: res.data.paySign,
success: (e) => {
if (e.errMsg == 'requestPayment:ok') {
uni.showModal({
title: '订单支付成功',
confirmText: '查看订单',
cancelText: '继续购买',
success: (e) => {
if (e.confirm) uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=2'
})
else uni.navigateBack();
}
})
} else uni.$u.toast('支付失败')
},
fail: (e) => {
uni.$u.toast('用户取消支付');
uni.redirectTo({
url: '/pagesOrder/order/order?back=-1&type=1'
})
}
})
}
}).catch(err => {
uni.$u.toast(err.msg || '网络错误')
})
}
const c_price = (price, index = 0) => {
price = price + '';
return price.split('.')[index] || (index ? '00' : '0');
}
onLoad(options => {
checkOrder();
})
onShow(() => {
getAddressList();
})
</script> </script>
<style lang="scss"> <style lang="scss">
.m-card { .m-card {
margin: 20rpx; margin: 20rpx;
border-radius: 14rpx;
background-color: #fff;
padding: 20rpx;
}
.row {
padding: 0;
overflow: hidden;
}
.m-address {
margin-bottom: 20rpx;
display: flex;
justify-content: space-between;
color: #999999;
.address-info {
width: 450rpx;
.top {
display: flex;
font-size: 28rpx;
.t-name {
color: #444;
margin: 0 10rpx;
}
}
.bottom {
font-size: 24rpx;
}
}
}
.m-good {
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
.image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
border-radius: 14rpx; border-radius: 14rpx;
overflow: hidden; background-color: #fff;
} padding: 20rpx;
.body-content {
width: 490rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
color: #989898;
.title {
display: flex;
justify-content: space-between;
font-size: 28rpx;
color: #444;
}
.tips {
display: flex;
justify-content: space-between;
font-size: 24rpx;
margin-top: 10rpx;
}
.time {
background-color: #F6F6F6;
padding: 5rpx 10rpx;
font-size: 26rpx;
color: #444;
border-radius: 10rpx;
}
}
}
.good-info {
margin-bottom: 20rpx;
.head-title {
margin-bottom: 18rpx;
color: #000;
font-weight: bold;
} }
.row { .row {
padding: 0;
overflow: hidden;
}
.m-address {
margin-bottom: 20rpx;
display: flex; display: flex;
align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 18rpx; color: #999999;
.red { .address-info {
color: #F55726; width: 450rpx;
}
.icon-text { .top {
display: flex; display: flex;
align-items: center; font-size: 28rpx;
}
.icon { .t-name {
image { color: #444;
width: 40rpx; margin: 0 10rpx;
height: 40rpx; }
}
.bottom {
font-size: 24rpx;
} }
} }
} }
.row-need { .m-good {
display: flex;
justify-content: flex-end;
color: #F55726;
}
text {
font-size: 22rpx;
}
}
.order-remark {
.head-title {
margin-bottom: 18rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20rpx;
.image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
border-radius: 14rpx;
overflow: hidden;
}
.body-content {
width: 490rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
color: #989898;
.title {
display: flex;
justify-content: space-between;
font-size: 28rpx;
color: #444;
}
.tips {
display: flex;
justify-content: space-between;
font-size: 24rpx;
margin-top: 10rpx;
}
.time {
background-color: #F6F6F6;
padding: 5rpx 10rpx;
font-size: 26rpx;
color: #444;
border-radius: 10rpx;
}
}
} }
}
.tips { .good-info {
font-size: 28rpx; margin-bottom: 20rpx;
color: #999;
display: flex;
justify-content: flex-end;
align-items: center;
flex: 1;
margin-right: 20rpx;
.all { .head-title {
color: #F55726; margin-bottom: 18rpx;
color: #000;
font-weight: bold;
}
.row {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 18rpx;
.red {
color: #F55726;
}
.icon-text {
display: flex;
align-items: center;
}
.icon {
image {
width: 40rpx;
height: 40rpx;
}
}
}
.row-need {
display: flex;
justify-content: flex-end;
color: #F55726;
}
text {
font-size: 22rpx;
}
} }
}
.item-center { .order-remark {
display: flex; .head-title {
align-items: center; margin-bottom: 18rpx;
position: relative; display: flex;
} justify-content: space-between;
}
}
.ship-type { .tips {
display: flex; font-size: 28rpx;
z-index: 9; color: #999;
background-color: #F6F6F6; display: flex;
border-radius: 30rpx; justify-content: flex-end;
align-items: center;
flex: 1;
margin-right: 20rpx;
.ship-type-item { .all {
width: 82rpx; color: #F55726;
height: 54rpx; }
line-height: 54rpx; }
text-align: center;
transition: background-color 0.3s ease; .item-center {
display: flex;
align-items: center;
position: relative;
}
.ship-type {
display: flex;
z-index: 9;
background-color: #F6F6F6;
border-radius: 30rpx; border-radius: 30rpx;
}
.actShipItem { .ship-type-item {
background-color: #27B52F; width: 82rpx;
color: white; height: 54rpx;
line-height: 54rpx;
text-align: center;
transition: background-color 0.3s ease;
border-radius: 30rpx;
}
.actShipItem {
background-color: #27B52F;
color: white;
}
} }
}
</style> </style>