weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分享

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/multipleShop.js
View File

@ -3,3 +3,8 @@ 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);
}

65
pages/index/index.vue
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, // 是否直接购买0否1是 is_new: 0, // 是否直接购买0否1是
// 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();
}) })

30
pages/login/login.vue
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 {
// 授权成功 是否是通过分享进来的,如果是缓存有门店信息
let storeInfo = uni.getStorageSync('STORE_INFO');
if (storeInfo) {
storeInfo = JSON.parse(storeInfo);
// 直接选择门店
uni.reLaunch({
url: "/pages/index/index?id=" + storeInfo.id
})
} else {
// 直接选择门店
uni.reLaunch({ uni.reLaunch({
url: "/multipleShop/index/index" 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,11 +199,22 @@
uni.reLaunch({ uni.reLaunch({
url: "/multipleShop/verificationOrder/index" 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({ uni.reLaunch({
url: "/multipleShop/index/index" url: "/multipleShop/index/index"
}) })
} }
}
}) })
} else { } else {
console.log("用户拒绝授权"); console.log("用户拒绝授权");

223
pagesOrder/settle/settle.vue
View File

@ -141,67 +141,67 @@
</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 isAddress = ref(false);
const toastAddressShow = ref(false); const toastAddressShow = ref(false);
const onChoosePaytype = (e) => { const onChoosePaytype = (e) => {
pay_type.value = e; pay_type.value = e;
} }
// 选择地址 // 选择地址
const addressRef = ref(null); const addressRef = ref(null);
const showAddress = ref(false); const showAddress = ref(false);
const addressInfo = ref({}); const addressInfo = ref({});
const changeAddress = (e) => { const changeAddress = (e) => {
addressInfo.value = e; addressInfo.value = e;
showAddress.value = false; showAddress.value = false;
isAddress.value = true; isAddress.value = true;
} }
const openAddress = () => { const openAddress = () => {
if (addressList.length > 0) showAddress.value = true; if (addressList.length > 0) showAddress.value = true;
else uni.navigateTo({ else uni.navigateTo({
url: '/pagesOrder/addressEdit/addressEdit' url: '/pagesOrder/addressEdit/addressEdit'
}) })
} }
// 地址相关 // 地址相关
const addressList = ref([]); const addressList = ref([]);
const getAddressList = () => { const getAddressList = () => {
addressListsApi().then(res => { addressListsApi().then(res => {
addressList.value = res.data.lists; addressList.value = res.data.lists;
addressList.value.forEach(item => { addressList.value.forEach(item => {
@ -220,21 +220,21 @@ const getAddressList = () => {
}) })
} }
}) })
} }
// 提货点相关 // 提货点相关
const shopRef = ref(null); const shopRef = ref(null);
const shopListShow = ref(false); const shopListShow = ref(false);
const merchantList = ref([]); const merchantList = ref([]);
const myAddressInfo = ref({ const myAddressInfo = ref({
long: "", long: "",
lat: "" lat: ""
}) })
const shopInfo = ref({ const shopInfo = ref({
mer_id: '' mer_id: ''
}); });
const getMerchantList = (mer_name = null) => { const getMerchantList = (mer_name = null) => {
merchantListApi({ merchantListApi({
...myAddressInfo.value, ...myAddressInfo.value,
mer_name: mer_name ? mer_name : '' mer_name: mer_name ? mer_name : ''
@ -249,13 +249,13 @@ const getMerchantList = (mer_name = null) => {
}) })
} }
}) })
} }
// getMerchantList(); // getMerchantList();
// 定位 // 定位
const LoadAddress = () => { const LoadAddress = () => {
uni.getLocation({ uni.getLocation({
success: (res) => { }, success: (res) => {},
fail: (err) => { fail: (err) => {
uni.$u.toast('定位失败, 请手动选择提货点!') uni.$u.toast('定位失败, 请手动选择提货点!')
}, },
@ -265,60 +265,61 @@ const LoadAddress = () => {
getMerchantList(); getMerchantList();
} }
}) })
} }
// LoadAddress(); // LoadAddress();
const changeShop = (e) => { const changeShop = (e) => {
shopInfo.value = e; shopInfo.value = e;
shopListShow.value = false; shopListShow.value = false;
} }
const searchShop = (e) => { const searchShop = (e) => {
getMerchantList(e) getMerchantList(e)
} }
// 拨打电话 // 拨打电话
// const callShow = ref(false) // const callShow = ref(false)
// const phone = ref(''); // const phone = ref('');
// const callphone = (e) => { // const callphone = (e) => {
// callShow.value = true; // callShow.value = true;
// phone.value = e; // phone.value = e;
// } // }
const onCall = (e) => { const onCall = (e) => {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: e, phoneNumber: e,
success() { success() {
callShow.value = false callShow.value = false
} }
}) })
} }
// 选择地址 // 选择地址
const addAddress = () => { const addAddress = () => {
toastAddressShow.value = false; toastAddressShow.value = false;
nextTick(() => { nextTick(() => {
showAddress.value = true; showAddress.value = true;
}) })
} }
// 继续支付 // 继续支付
const goPay = () => { const goPay = () => {
toastAddressShow.value = false; toastAddressShow.value = false;
isAddress.value = true; isAddress.value = true;
submitOrder(); 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; if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
createOrder(); createOrder();
} }
// 订单相关 // 订单相关
const cartList = ref([]); const cartList = ref([]);
const orderInfo = ref({}); const orderInfo = ref({});
const checkOrder = () => { const checkOrder = () => {
checkOrderApi({ checkOrderApi({
cart_id: cartStore.cartList, cart_id: cartStore.cartList,
store_id: STORE_INFO.id || 0 store_id: STORE_INFO.id || 0
@ -329,11 +330,11 @@ const checkOrder = () => {
orderInfo.value.shipping_type = 2 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('请选择支付方式'); if (!pay_type.value) return uni.$u.toast('请选择支付方式');
createOrderApi({ createOrderApi({
@ -398,35 +399,35 @@ const createOrder = () => {
}).catch(err => { }).catch(err => {
uni.$u.toast(err.msg || '网络错误') uni.$u.toast(err.msg || '网络错误')
}) })
} }
const c_price = (price, index = 0) => { const c_price = (price, index = 0) => {
price = price + ''; price = price + '';
return price.split('.')[index] || (index ? '00' : '0'); return price.split('.')[index] || (index ? '00' : '0');
} }
onLoad(options => { onLoad(options => {
checkOrder(); checkOrder();
}) })
onShow(() => { onShow(() => {
getAddressList(); getAddressList();
}) })
</script> </script>
<style lang="scss"> <style lang="scss">
.m-card { .m-card {
margin: 20rpx; margin: 20rpx;
border-radius: 14rpx; border-radius: 14rpx;
background-color: #fff; background-color: #fff;
padding: 20rpx; padding: 20rpx;
} }
.row { .row {
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
} }
.m-address { .m-address {
margin-bottom: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -449,9 +450,9 @@ onShow(() => {
font-size: 24rpx; font-size: 24rpx;
} }
} }
} }
.m-good { .m-good {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20rpx; margin-bottom: 20rpx;
@ -493,9 +494,9 @@ onShow(() => {
border-radius: 10rpx; border-radius: 10rpx;
} }
} }
} }
.good-info { .good-info {
margin-bottom: 20rpx; margin-bottom: 20rpx;
.head-title { .head-title {
@ -536,17 +537,17 @@ onShow(() => {
text { text {
font-size: 22rpx; font-size: 22rpx;
} }
} }
.order-remark { .order-remark {
.head-title { .head-title {
margin-bottom: 18rpx; margin-bottom: 18rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
} }
.tips { .tips {
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
display: flex; display: flex;
@ -558,15 +559,15 @@ onShow(() => {
.all { .all {
color: #F55726; color: #F55726;
} }
} }
.item-center { .item-center {
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
} }
.ship-type { .ship-type {
display: flex; display: flex;
z-index: 9; z-index: 9;
background-color: #F6F6F6; background-color: #F6F6F6;
@ -585,5 +586,5 @@ onShow(() => {
background-color: #27B52F; background-color: #27B52F;
color: white; color: white;
} }
} }
</style> </style>