diff --git a/api/quotation.js b/api/quotation.js index b471741..6ace778 100644 --- a/api/quotation.js +++ b/api/quotation.js @@ -5,8 +5,13 @@ export const OpurchaseGoodsOfferListApi = (data) => { return request.get('/operation/OpurchaseGoodsOffer/list', data); } - //报价单提交 export const OpurchaseGoodsOfferApi = (data) => { return request.post('/operation/OpurchaseGoodsOffer/offer', data); +} + + +//报价单提交 +export const aboutUsApi = (data) => { + return request.post('/operation/OpurchaseGoodsOffer/offer', data); } \ No newline at end of file diff --git a/components/goodPopup.vue b/components/goodPopup.vue index 01bbadc..ea8cc98 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -1,141 +1,148 @@ \ No newline at end of file diff --git a/pageQuota/aboutUs/index.vue b/pageQuota/aboutUs/index.vue new file mode 100644 index 0000000..c8cf247 --- /dev/null +++ b/pageQuota/aboutUs/index.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/feedBack/detail.vue b/pageQuota/feedBack/detail.vue new file mode 100644 index 0000000..aa3f70a --- /dev/null +++ b/pageQuota/feedBack/detail.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/feedBack/index.vue b/pageQuota/feedBack/index.vue new file mode 100644 index 0000000..befe596 --- /dev/null +++ b/pageQuota/feedBack/index.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/feedBack/list.vue b/pageQuota/feedBack/list.vue new file mode 100644 index 0000000..55a195a --- /dev/null +++ b/pageQuota/feedBack/list.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/pageQuota/quotation/detail.vue b/pageQuota/quotation/detail.vue deleted file mode 100644 index 26b46c9..0000000 --- a/pageQuota/quotation/detail.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pageQuota/quotation/index.vue b/pageQuota/quotation/index.vue index 34ad1eb..5e91e66 100644 --- a/pageQuota/quotation/index.vue +++ b/pageQuota/quotation/index.vue @@ -69,8 +69,9 @@ - + + @@ -138,6 +139,12 @@ OpurchaseGoodsOfferListApi } from "@/api/quotation.js" + const test2 = () => { + console.log("点解") + uni.navigateTo({ + url: '/pages/index/index' + }) + } // 状态图片url const successPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png') const errPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png') diff --git a/pageQuota/quotation/index1.vue b/pageQuota/quotation/index1.vue deleted file mode 100644 index 742448e..0000000 --- a/pageQuota/quotation/index1.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages.json b/pages.json index 6cdb8e9..05fd934 100644 --- a/pages.json +++ b/pages.json @@ -47,72 +47,91 @@ } }, { - "path" : "pages/code/code", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false - } + "path": "pages/code/code", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } } - ], - "subPackages": [{ - "root": "pagesOrder", - "pages": [{ - "path": "order/order", - "style": { - "navigationBarTitleText": "我的订单", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { - "path": "detail/detail", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { - "path": "addressList/addressList", - "style": { - "navigationBarTitleText": "地址管理", - "enablePullDownRefresh": false - } - }, - { - "path": "addressEdit/addressEdit", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { - "path": "settle/settle", - "style": { - "navigationBarTitleText": "确认订单", - "enablePullDownRefresh": false - } - } - ] - }, - { - "root": "pageQuota", - "pages": [{ - "path": "quotation/index", - "style": { - "navigationBarTitleText": "报价单", - "enablePullDownRefresh": false - } - }, - { - "path": "quotation/detail", - "style": { - "navigationBarTitleText": "报价明细", - "enablePullDownRefresh": false - } - } - + ], + "subPackages": [{ + "root": "pagesOrder", + "pages": [{ + "path": "order/order", + "style": { + "navigationBarTitleText": "我的订单", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "detail/detail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path": "addressList/addressList", + "style": { + "navigationBarTitleText": "地址管理", + "enablePullDownRefresh": false + } + }, + { + "path": "addressEdit/addressEdit", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path": "settle/settle", + "style": { + "navigationBarTitleText": "确认订单", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pageQuota", + "pages": [{ + "path": "quotation/index", + "style": { + "navigationBarTitleText": "报价单", + "enablePullDownRefresh": false + } + }, + { + "path": "aboutUs/index", + "style": { + "navigationBarTitleText": "关于我们", + "enablePullDownRefresh": false + } + }, + { + "path": "feedBack/index", + "style": { + "navigationBarTitleText": "意见反馈", + "enablePullDownRefresh": false + } + }, + { + "path": "feedBack/list", + "style": { + "navigationBarTitleText": "反馈记录", + "enablePullDownRefresh": false + } + }, + { + "path": "feedBack/detail", + "style": { + "navigationBarTitleText": "反馈详情", + "enablePullDownRefresh": false + } + } ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index b85eed6..7e0eb0d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,7 @@ @@ -173,6 +173,18 @@ getCurrentInstance } from 'vue'; + + + const test = () => { + uni.navigateTo({ + url: '/pageQuota/quotation/index' + }) + } + + + + + /*商品列表滚动隐藏头部导航 */ const instance = getCurrentInstance(); // 获取组件实例 const targetHeight = ref(0) @@ -185,11 +197,6 @@ } /*商品列表滚动隐藏头部导航结束 */ - const test = () => { - uni.navigateTo({ - url: '/pageQuota/quotation/index' - }) - } const cartStore = useCartStore(); const show = ref(0); diff --git a/pages/my/my.vue b/pages/my/my.vue index 7a18eb0..de511a2 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -1,211 +1,222 @@ \ No newline at end of file diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue index 271b546..1027a05 100644 --- a/pagesOrder/settle/settle.vue +++ b/pagesOrder/settle/settle.vue @@ -112,14 +112,14 @@ - 提交订单 + 预付款提交 - + @@ -160,7 +160,7 @@ // 选择地址 - const addressRef = ref(null); + const addressRef = ref(null); const showAddress = ref(false); const addressInfo = ref({}); const changeAddress = (e) => { @@ -174,32 +174,32 @@ url: '/pagesOrder/addressEdit/addressEdit' }) } - - // 地址相关 - const addressList = ref([]); - const getAddressList = () => { - addressListsApi().then(res => { - addressList.value = res.data.lists; - addressList.value.forEach(item => { - if (item.is_default) { - addressInfo.value = item; - isAddress.value = true; - } - }) - 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 addressList = ref([]); + const getAddressList = () => { + addressListsApi().then(res => { + addressList.value = res.data.lists; + addressList.value.forEach(item => { + if (item.is_default) { + addressInfo.value = item; + isAddress.value = true; + } + }) + 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 shopRef = ref(null); const shopListShow = ref(false); const merchantList = ref([]); const myAddressInfo = ref({ @@ -218,9 +218,9 @@ if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo .value.mer_id) { shopInfo.value = merchantList.value[0]; - nextTick(()=>{ - shopRef.value.setCheck(shopInfo.value.mer_id); - }) + nextTick(() => { + shopRef.value.setCheck(shopInfo.value.mer_id); + }) } }) } @@ -264,10 +264,10 @@ // 提交订单 const submitOrder = () => { - if (!shopInfo.value.mer_id) { - uni.$u.toast('请先选择提货点'); - return shopListShow.value = true; - } + if (!shopInfo.value.mer_id) { + uni.$u.toast('请先选择提货点'); + return shopListShow.value = true; + } if (!isAddress.value) return toastAddressShow.value = true; createOrder(); } diff --git a/store/user.js b/store/user.js index da5ee59..8182f7a 100644 --- a/store/user.js +++ b/store/user.js @@ -25,7 +25,7 @@ const useUserStore = defineStore("user", () => { // #ifdef H5 - token.value = "c13a559d04e18ddcc685eebb35c89c0f" + token.value = "1d5c66dda1a45860d7df55ad6ae59998" // token.value = "95b24dd6d2dda836fe07854b08ba0944" userInfo.value = { avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png", @@ -35,7 +35,7 @@ const useUserStore = defineStore("user", () => { mobile: "19330904744", nickname: "用户1714964250", supplier: null, - token: "c13a559d04e18ddcc685eebb35c89c0f" + token: "1d5c66dda1a45860d7df55ad6ae59998" } // #endif