diff --git a/api/address.js b/api/address.js index 7cd7b05..7c46129 100644 --- a/api/address.js +++ b/api/address.js @@ -33,4 +33,8 @@ export const setPayPassword = (data) => { export const getFundList = (data) => { return request.get('/user/user/fundList', data); +} + +export const getUserSingList = (data) => { + return request.get('/user/user/userSing', data); } \ No newline at end of file diff --git a/api/asset.js b/api/asset.js new file mode 100644 index 0000000..761c258 --- /dev/null +++ b/api/asset.js @@ -0,0 +1,11 @@ +import request from '@/utils/request'; + + +export const getUserProductStorageLists = (data) => { + return request.get('/user_product_storage/UserProductStorage/lists', data); +} + + +export const reservationUserProductStorage = (data) => { + return request.post('/user_product_storage/UserProductStorage/reservation', data); +} \ No newline at end of file diff --git a/api/user.js b/api/user.js index 98fcf50..bd5b2fc 100644 --- a/api/user.js +++ b/api/user.js @@ -153,4 +153,8 @@ export const uploadImg = (data) => { export const getVipInfoByPhone = (data) => { return request.get('/user/user/other_user_info', data); +} + +export const checkInventoryApi = (data) => { + return request.post('/order/order/checkInventory', data); } \ No newline at end of file diff --git a/components/goodPopup.vue b/components/goodPopup.vue index e3fedb6..3b8aff1 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -37,13 +37,13 @@ 购买重量* - + 购买数量* - + @@ -115,7 +115,8 @@ datas.value.cart_num = ''; return; } - emit('change', datas.value); + datas.value.types = true + emit('change', datas.value, ); } const subtotal = computed(() => { @@ -124,11 +125,6 @@ return Number(num * sell * 100 / 100).toFixed(2) }) - - - - - defineExpose({ setData, // founcsFn diff --git a/config/app.js b/config/app.js index 3500d16..f1f7802 100644 --- a/config/app.js +++ b/config/app.js @@ -17,7 +17,7 @@ switch (env) { WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; case 'local': - BASE_URL = 'http://192.168.1.201:8545'; + BASE_URL = 'http://192.168.1.22:8545'; WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: diff --git a/multipleShop/index/index.vue b/multipleShop/index/index.vue index 5637c50..97f3843 100644 --- a/multipleShop/index/index.vue +++ b/multipleShop/index/index.vue @@ -15,8 +15,8 @@ {{item.name}} - 可自提 - 可配送 + 次日可提 + 当日可提 { - // 获取定位 + onLoad((opt) => { + event = opt.event + if (opt.cart_id) queryParams.cart_id = opt.cart_id; getLocation(); }); // 门店选择 const onChooseShop = (item) => { + let { + id, + name, + phone, + detailed_address + } = item + uni.$emit(event, JSON.stringify({ + id, + name, + phone, + detailed_address + })) + uni.navigateBack() return - currShop.value = item.id; - uni.setStorageSync('STORE_INFO', JSON.stringify(item)); - // 如果选择了新店铺,删除之前的分享信息 - uni.removeStorageSync('SHARE_INFO'); - setTimeout(() => { - uni.reLaunch({ - url: '/pages/index/index?id=' + item.id, - fail(err) { - console.log(err); - } - }) - }, 300) + // currShop.value = item.id; + // uni.setStorageSync('STORE_INFO', JSON.stringify(item)); + // uni.removeStorageSync('SHARE_INFO'); + // setTimeout(() => { + // uni.reLaunch({ + // url: '/pages/index/index?id=' + item.id, + // fail(err) { + // console.log(err); + // } + // }) + // }, 300) } // 触底刷新 @@ -162,8 +176,9 @@ const getLocation = () => { let location = uni.getStorageSync('location'); if (location) { - queryParams.longitude = location.lat - queryParams.latitude = location.long + location = JSON.parse(location); + queryParams.longitude = location.long + queryParams.latitude = location.lat // 加载店铺列表 getShopList(); } else { @@ -172,16 +187,19 @@ success(res) { queryParams.latitude = res.latitude; queryParams.longitude = res.longitude; - // 加载店铺列表 getShopList(); - // 避免下次再获取 - uni.setStorageSync('location', { + uni.setStorageSync('location', JSON.stringify({ lat: queryParams.latitude, long: queryParams.longitude - }) + }, )) + }, + fail() { + console.log("获取定位失败") + getShopList(); } + }) } } @@ -259,7 +277,7 @@ margin-bottom: 16rpx; text { - width: 90rpx; + width: 120rpx; height: 42rpx; line-height: 42rpx; text-align: center; diff --git a/pageQuota/Gifts/index.vue b/pageQuota/Gifts/index.vue new file mode 100644 index 0000000..dbc874f --- /dev/null +++ b/pageQuota/Gifts/index.vue @@ -0,0 +1,288 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/asset/index.vue b/pageQuota/asset/index.vue new file mode 100644 index 0000000..dbc874f --- /dev/null +++ b/pageQuota/asset/index.vue @@ -0,0 +1,288 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/balanceDetail/index.vue b/pageQuota/balanceDetail/index.vue index 4efc17d..d94418a 100644 --- a/pageQuota/balanceDetail/index.vue +++ b/pageQuota/balanceDetail/index.vue @@ -17,7 +17,7 @@ - + {{item.title}} @@ -60,10 +60,11 @@ onPullDownRefresh } from "@dcloudio/uni-app" import { - getFundList + getFundList, + getUserSingList } from "@/api/address.js" - const navLists = ['', '采购款明细', '余额明细', '礼品券明细', '返还金明细'] + const navLists = ['', '采购款明细', '余额明细', '礼品券明细', '返还金明细', '冻结券明细'] const tabsLst = reactive([{ name: '全部' }, @@ -84,11 +85,25 @@ const lists = ref([]) let type = ref('') const getLists = async (isPullDown = false) => { - let res = await getFundList({ - type: type.value, - mark: mark.value || '' - }) - lists.value = res.data.lists + if (type.value == 3 || type.value == 5) { + let res = await getUserSingList({ + type: type.value == 3 ? 1 : 0, + page_no: 1, + page_size: 999, + mark: mark.value || '' + }) + lists.value = res.data.lists + console.log(lists.value) + + } else { + + let res = await getFundList({ + type: type.value, + mark: mark.value || '' + }) + lists.value = res.data.lists + } + if (isPullDown) uni.stopPullDownRefresh() } diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue index e4ccde1..66f3f2c 100644 --- a/pageQuota/vipUser/index.vue +++ b/pageQuota/vipUser/index.vue @@ -7,22 +7,26 @@ + + + + + + + + - - + + - @@ -32,13 +36,14 @@ - - @@ -53,7 +58,7 @@ suffixIcon='arrow-down'> - + + - 完成并收款 + {{Role==1?'完成并收款':"完成" }} - + 行业会员追加经营资金 - + - - + 当前已开通： @@ -197,10 +202,17 @@ - {{ item.real_name }} + + + {{ item.real_name }} + + + 查看号码 + + {{ item.price }} {{ item.create_time }} - {{ item.label_name }} + {{ item.ship_name }} 已开通 @@ -216,6 +228,40 @@ + + + + + + 当前已开通： + + 位{{ Role == 1 ? '行业会员' : '商户' }} + + + + + + + + 商户 + 查看号码 + 开通时间 + 状态 + + + + + {{ item.nickname }} + {{ item.mobile }} + {{ item.create_time }} + + 已开通 + + + + + + @@ -264,7 +310,16 @@ + @close="showPop1 = false" @open="showPop1 = true" keyName='title' confirmColor='#33B83A'> + + + + + {{popPhone}} + + +