diff --git a/api/api.js b/api/api.js index e69de29..701edeb 100644 --- a/api/api.js +++ b/api/api.js @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export const goodListApi = (data) => { + return request.get('/goods/goods/lists', data); +} + +export const goodClassListApi = (data) => { + return request.get('/goods/goodsclass/lists', data); +} \ No newline at end of file diff --git a/api/quotation.js b/api/quotation.js new file mode 100644 index 0000000..b471741 --- /dev/null +++ b/api/quotation.js @@ -0,0 +1,12 @@ +import request from '@/utils/request'; + +//报价单列表 +export const OpurchaseGoodsOfferListApi = (data) => { + return request.get('/operation/OpurchaseGoodsOffer/list', data); +} + + +//报价单提交 +export const OpurchaseGoodsOfferApi = (data) => { + return request.post('/operation/OpurchaseGoodsOffer/offer', data); +} \ No newline at end of file diff --git a/pageQuota/quotation/detail.vue b/pageQuota/quotation/detail.vue index 94410e5..26b46c9 100644 --- a/pageQuota/quotation/detail.vue +++ b/pageQuota/quotation/detail.vue @@ -1,45 +1,59 @@ \ No newline at end of file diff --git a/pageQuota/quotation/index1.vue b/pageQuota/quotation/index1.vue new file mode 100644 index 0000000..742448e --- /dev/null +++ b/pageQuota/quotation/index1.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 223258b..0ca5046 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -105,43 +105,43 @@ }) } - const userStore = useUserStore(); //使用pinia进行状态管理 - if (userStore.userInfo && userStore.userInfo.mobile) { - navToIndex(); - } else { - userStore.setToken(''); - userStore.setUserInfo({}); - } + const userStore = useUserStore(); //使用pinia进行状态管理 + if (userStore.userInfo && userStore.userInfo.mobile) { + navToIndex(); + } else { + userStore.setToken(''); + userStore.setUserInfo({}); + } - const showWeixin = ref(true); //是否显示微信登录 - const isAgree = ref(false); //是否同意协议 + const showWeixin = ref(true); //是否显示微信登录 + const isAgree = ref(false); //是否同意协议 - const weixinLogin = () => { - if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); - uni.showLoading({ - title: '登录中' - }) - uni.login({ - provider: 'weixin', - success: (res) => { - userLoginWeixinApi({ - code: res.code - }).then(res => { - uni.hideLoading(); - userStore.setToken(res.data.token); - userStore.setUserInfo(res.data); - if (!res.data.mobile) { //未绑定手机号 - return showBind.value = true; - } - navToIndex(); - }) - }, - fail: (err) => { - console.log(err); - uni.$u.toast('登录失败'); - } - }) - } + const weixinLogin = () => { + if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); + uni.showLoading({ + title: '登录中' + }) + uni.login({ + provider: 'weixin', + success: (res) => { + userLoginWeixinApi({ + code: res.code + }).then(res => { + uni.hideLoading(); + userStore.setToken(res.data.token); + userStore.setUserInfo(res.data); + if (!res.data.mobile) { //未绑定手机号 + return showBind.value = true; + } + navToIndex(); + }) + }, + fail: (err) => { + console.log(err); + uni.$u.toast('登录失败'); + } + }) + } const showOfficial = ref(false); const showBind = ref(false); //是否显示绑定手机号弹窗 @@ -158,136 +158,136 @@ } } - const loginForm = ref({ - phone: '15366662222', - code: '' - }) - const isPhone = () => { //检验手机号是否正确 - loginForm.value.phone = loginForm.value.phone.replace(/\s*/g, ""); //去除空格 - return !/^1[3456789]\d{9}$/.test(loginForm.value.phone); - } - const codeLogin = () => { - if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); - // 验证码登录 - if (isPhone()) return uni.$u.toast('请输入正确的手机号码'); - console.log('登录'); - userLoginApi({ - account: '17811111111', - password: '1111', - terminal: 3, - scene: 1 - }).then(res => { - console.log(res); - }) - } + const loginForm = ref({ + phone: '15366662222', + code: '' + }) + const isPhone = () => { //检验手机号是否正确 + loginForm.value.phone = loginForm.value.phone.replace(/\s*/g, ""); //去除空格 + return !/^1[3456789]\d{9}$/.test(loginForm.value.phone); + } + const codeLogin = () => { + if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); + // 验证码登录 + if (isPhone()) return uni.$u.toast('请输入正确的手机号码'); + console.log('登录'); + userLoginApi({ + account: '17811111111', + password: '1111', + terminal: 3, + scene: 1 + }).then(res => { + console.log(res); + }) + } - const tips = ref(''); - const seconds = ref(60); - const uCodeRef = ref(null); + const tips = ref(''); + const seconds = ref(60); + const uCodeRef = ref(null); - const codeChange = (text) => { - tips.value = text; - }; + const codeChange = (text) => { + tips.value = text; + }; - const getCode = () => { - if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); - if (uCodeRef.value.canGetCode) { - if (isPhone()) return uni.$u.toast('请输入正确的手机号码'); - // 模拟向后端请求验证码 - uni.showLoading({ - title: '正在获取验证码', - }); - setTimeout(() => { - uni.hideLoading(); - // 这里此提示会被start()方法中的提示覆盖 - uni.$u.toast('验证码已发送'); - // 通知验证码组件内部开始倒计时 - uCodeRef.value.start(); - }, 2000); - } else { - uni.$u.toast('倒计时结束后再发送'); - } - }; + const getCode = () => { + if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议'); + if (uCodeRef.value.canGetCode) { + if (isPhone()) return uni.$u.toast('请输入正确的手机号码'); + // 模拟向后端请求验证码 + uni.showLoading({ + title: '正在获取验证码', + }); + setTimeout(() => { + uni.hideLoading(); + // 这里此提示会被start()方法中的提示覆盖 + uni.$u.toast('验证码已发送'); + // 通知验证码组件内部开始倒计时 + uCodeRef.value.start(); + }, 2000); + } else { + uni.$u.toast('倒计时结束后再发送'); + } + }; - // 微信小程序无法拦截原生返回按钮，所以使用自定义导航拦截返回 - const navBack = () => { - if (showWeixin.value == false) { - showWeixin.value = true; - return true; - } else uni.navigateBack(); - } + // 微信小程序无法拦截原生返回按钮，所以使用自定义导航拦截返回 + const navBack = () => { + if (showWeixin.value == false) { + showWeixin.value = true; + return true; + } else uni.navigateBack(); + } \ No newline at end of file diff --git a/store/user.js b/store/user.js index 6cb5e27..da5ee59 100644 --- a/store/user.js +++ b/store/user.js @@ -24,7 +24,8 @@ const useUserStore = defineStore("user", () => { } // #ifdef H5 - // token.value = "6f85cbaee3341c3f2d7bb7080663ce68" + + token.value = "c13a559d04e18ddcc685eebb35c89c0f" // token.value = "95b24dd6d2dda836fe07854b08ba0944" userInfo.value = { avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png", @@ -34,7 +35,7 @@ const useUserStore = defineStore("user", () => { mobile: "19330904744", nickname: "用户1714964250", supplier: null, - token: "b92ad3d7bdc06fa849dfb2c3c8be824e" + token: "c13a559d04e18ddcc685eebb35c89c0f" } // #endif