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

@ -3,3 +3,8 @@ import request from '@/utils/request';
export const shopListApi = (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>
import {
onLoad,
onShow
onShow,
onShareAppMessage,
onShareTimeline
} from "@dcloudio/uni-app"
import {
reactive,
ref,
onMounted
onMounted,
} from "vue"
import {
goodListApi,
@ -190,9 +192,18 @@
import {
getCurrentInstance
} from 'vue';
import {
shopDetailApi
} from "@/api/multipleShop.js";
import useUserStore from "@/store/user";
const userStore = useUserStore();
const STORE_INFO = ref({
name: '',
id: '',
detailed_address: '',
image: ''
});
const test = () => {
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) => {
uni.navigateTo({
url
})
}
//
let STORE_INFO = uni.getStorageSync('STORE_INFO');
if (STORE_INFO)
STORE_INFO = JSON.parse(STORE_INFO)
/*商品列表滚动隐藏头部导航 */
const instance = getCurrentInstance(); //
const targetHeight = ref(0)
@ -261,7 +282,7 @@
cart_num: cart_num,
is_new: 0, // 01
// goods_id: id,
store_id: where.value.store_id,
store_id: STORE_INFO.value.id,
product_id: product_id
}).then(res => {
getCartList();
@ -289,10 +310,9 @@
name: '',
order: '',
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 goodList = ref([]);
const getGoodList = (loadmore = false) => {
@ -329,13 +349,12 @@
const classMap = new Map();
const getgoodClassList = (pid = 0, three = 1) => {
let page_no = classMap.get(pid) || 1;
// console.log(classMap.get(pid));
goodClassListApi({
pid: pid,
page_no: page_no,
page_size: 30,
level: three,
store_id: STORE_INFO.id || '' // id
store_id: STORE_INFO.value.id || '' // id
}).then(res => {
if (pid == 0) { //
if (!res.data?.lists?.length) return;
@ -443,7 +462,7 @@
productLogApi({
product_id: item.product_id,
cate_id: item.cate_id,
store_id: STORE_INFO.id || ''
store_id: STORE_INFO.value.id || ''
});
};
const changeGood = (data) => { //
@ -491,8 +510,22 @@
})
}
onLoad((opt) => {
if (opt.id) where.value.store_id = opt.id;
onLoad(async (opt) => {
// 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);
getGoodList();
})

View File

@ -132,7 +132,6 @@
const showWeixin = ref(true); //
const isAgree = ref(false); //
const tempUser = ref(null);
const weixinLogin = () => {
if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议');
@ -149,7 +148,6 @@
userStore.setToken(res.data.token);
if (!res.data.mobile) { //
// tempUser.value = res.data;
return showBind.value = true;
} else {
userStore.setUserInfo(res.data);
@ -161,13 +159,23 @@
uni.reLaunch({
url: "/multipleShop/verificationOrder/index"
})
} else { //
} else {
// ,
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) => {
@ -177,7 +185,6 @@
})
}
const showBind = ref(false); //
const getPhoneNumber = (e) => {
if (e.detail?.errMsg == 'getPhoneNumber:ok') {
@ -192,11 +199,22 @@
uni.reLaunch({
url: "/multipleShop/verificationOrder/index"
})
} else { //
} else {
// ,
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 {
console.log("用户拒绝授权");

View File

@ -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 getAddressList = () => {
})
}
})
}
}
//
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 @@ const getMerchantList = (mer_name = null) => {
})
}
})
}
}
// getMerchantList();
//
const LoadAddress = () => {
// getMerchantList();
//
const LoadAddress = () => {
uni.getLocation({
success: (res) => { },
success: (res) => {},
fail: (err) => {
uni.$u.toast('定位失败, 请手动选择提货点!')
},
@ -265,60 +265,61 @@ const LoadAddress = () => {
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 = () => {
if (orderInfo.value.pay_price == 0) {
pay_type.value = 3;
return uni.$u.toast('当前支付金额为0暂不能使用微信支付')
}
//
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 +330,11 @@ const checkOrder = () => {
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 +399,35 @@ const createOrder = () => {
}).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 +450,9 @@ onShow(() => {
font-size: 24rpx;
}
}
}
}
.m-good {
.m-good {
display: flex;
justify-content: space-between;
margin-bottom: 20rpx;
@ -493,9 +494,9 @@ onShow(() => {
border-radius: 10rpx;
}
}
}
}
.good-info {
.good-info {
margin-bottom: 20rpx;
.head-title {
@ -536,17 +537,17 @@ onShow(() => {
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 +559,15 @@ onShow(() => {
.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 +586,5 @@ onShow(() => {
background-color: #27B52F;
color: white;
}
}
}
</style>