diff --git a/api/cart.js b/api/cart.js index d025b43..e707284 100644 --- a/api/cart.js +++ b/api/cart.js @@ -1,33 +1,33 @@ import request from '@/utils/request'; //添加购物车数量 -export const cartCreateApi = (data)=>{ - return request.post('/order/cart/create', data); +export const cartCreateApi = (data) => { + return request.post('/order/cart/create', data); } //购物车-调整数量 -export const cartChangeApi = (data)=>{ - return request.post('/order/cart/change', data); +export const cartChangeApi = (data) => { + return request.post('/order/cart/change', data); } //购物车-清空 -export const cartDeleteApi = (data)=>{ - return request.post('/order/cart/delete', data); +export const cartDeleteApi = (data) => { + return request.post('/order/cart/delete', data); } //购物车-零售列表 -export const cartListApi = (data)=>{ - return request.get('/order/cart/list', data, { - noAuth: true - }); +export const cartListApi = (data) => { + return request.get('/order/cart/list', data, { + noAuth: true + }); } //购物车-常买记录 -export const frequentlyPurchaseApi = (data)=>{ - return request.get('/order/RetailOrder/frequently_purchase', data); +export const frequentlyPurchaseApi = (data) => { + return request.get('/order/order/frequently_purchase', data); } //购物车-零售购物车预检 -export const checkOrderApi = (data)=>{ - return request.post('/order/RetailOrder/checkOrder', data); -} +export const checkOrderApi = (data) => { + return request.post('/order/RetailOrder/checkOrder', data); +} \ No newline at end of file diff --git a/api/good.js b/api/good.js index 84f653b..a61c66a 100644 --- a/api/good.js +++ b/api/good.js @@ -1,9 +1,9 @@ import request from '@/utils/request'; -export const goodListApi = (data)=>{ - return request.get('/goods/goods/lists', data); +export const goodListApi = (data) => { + return request.get('/product/product/lists', data); } -export const goodClassListApi = (data)=>{ - return request.get('/goods/goodsclass/lists', data); +export const goodClassListApi = (data) => { + return request.get('/cate/cate/lists', data); } \ No newline at end of file diff --git a/api/multipleShop.js b/api/multipleShop.js new file mode 100644 index 0000000..7a4a0d3 --- /dev/null +++ b/api/multipleShop.js @@ -0,0 +1,5 @@ +import request from '@/utils/request'; + +export const shopListApi = (data) => { + return request.get('/store/store/lists', data); +} \ No newline at end of file diff --git a/components/goodPopup.vue b/components/goodPopup.vue index 160e6fb..55c428e 100644 --- a/components/goodPopup.vue +++ b/components/goodPopup.vue @@ -1,152 +1,152 @@ \ No newline at end of file diff --git a/config/app.js b/config/app.js index 840fb8a..58b2350 100644 --- a/config/app.js +++ b/config/app.js @@ -3,8 +3,9 @@ import store from "@/store/user.js" // 环境 // let env = "dev" // let env = "test" -let env = "prod" +// let env = "prod" // let env = "local" +let env = "liu"; switch (env) { case 'prod': @@ -13,8 +14,11 @@ switch (env) { case 'test': BASE_URL = 'https://ceshi-erp.lihaink.cn'; break; + case 'liu': + BASE_URL = 'http://192.168.1.201:8545'; + break; default: - BASE_URL = 'http://192.168.1.22:8546'; + BASE_URL = 'https://test-multi-store.lihaink.cn'; } let HTTP_REQUEST_URL diff --git a/multipleShop/images/circle_bg.png b/multipleShop/images/circle_bg.png new file mode 100644 index 0000000..1b19efd Binary files /dev/null and b/multipleShop/images/circle_bg.png differ diff --git a/multipleShop/images/location.webp b/multipleShop/images/location.webp new file mode 100644 index 0000000..0f6e146 Binary files /dev/null and b/multipleShop/images/location.webp differ diff --git a/multipleShop/images/location_small.webp b/multipleShop/images/location_small.webp new file mode 100644 index 0000000..d69b6c6 Binary files /dev/null and b/multipleShop/images/location_small.webp differ diff --git a/multipleShop/images/phone.webp b/multipleShop/images/phone.webp new file mode 100644 index 0000000..0a3479e Binary files /dev/null and b/multipleShop/images/phone.webp differ diff --git a/multipleShop/images/scan.png b/multipleShop/images/scan.png new file mode 100644 index 0000000..f5f4836 Binary files /dev/null and b/multipleShop/images/scan.png differ diff --git a/multipleShop/images/time.png b/multipleShop/images/time.png new file mode 100644 index 0000000..327d875 Binary files /dev/null and b/multipleShop/images/time.png differ diff --git a/multipleShop/images/time.webp b/multipleShop/images/time.webp new file mode 100644 index 0000000..914682a Binary files /dev/null and b/multipleShop/images/time.webp differ diff --git a/multipleShop/index/index.vue b/multipleShop/index/index.vue new file mode 100644 index 0000000..7b059db --- /dev/null +++ b/multipleShop/index/index.vue @@ -0,0 +1,214 @@ + + + + \ No newline at end of file diff --git a/multipleShop/orderVerification/index.vue b/multipleShop/orderVerification/index.vue new file mode 100644 index 0000000..d7d69c6 --- /dev/null +++ b/multipleShop/orderVerification/index.vue @@ -0,0 +1,226 @@ + + + + \ No newline at end of file diff --git a/multipleShop/verificationOrder/detail.vue b/multipleShop/verificationOrder/detail.vue new file mode 100644 index 0000000..158293e --- /dev/null +++ b/multipleShop/verificationOrder/detail.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/multipleShop/verificationOrder/index.vue b/multipleShop/verificationOrder/index.vue new file mode 100644 index 0000000..e4939e3 --- /dev/null +++ b/multipleShop/verificationOrder/index.vue @@ -0,0 +1,191 @@ + + + + \ No newline at end of file diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index b8a6273..084bb82 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,5 +1,5 @@ { - "name": "purchase-let", + "name": "purchase_let", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package-lock.json b/package-lock.json index a22d4b0..959fbf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "purchase-let", + "name": "purchase_let", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/pages.json b/pages.json index 1787b7b..dcd2c8b 100644 --- a/pages.json +++ b/pages.json @@ -22,6 +22,18 @@ } } }, + { + "path": "pages/index/test", + "style": { + "navigationBarTitleText": "购物", + "disableScroll": true, + "enablePullDownRefresh": false, + "app-plus": { + // 将回弹属性关掉 + "bounce": "none" + } + } + }, { "path": "pages/login/login", "style": { @@ -56,6 +68,34 @@ ], "subPackages": [{ + "root": "multipleShop", + "pages": [{ + "path": "index/index", + "style": { + "navigationBarTitleText": "选择门店", + "enablePullDownRefresh": false + } + + }, { + "path": "verificationOrder/index", + "style": { + "navigationBarTitleText": "核销订单", + "enablePullDownRefresh": false + } + }, { + "path": "verificationOrder/detail", + "style": { + "navigationBarTitleText": "核销订单详情", + "enablePullDownRefresh": false + } + }, { + "path": "orderVerification/index", + "style": { + "navigationBarTitleText": "订单核销", + "enablePullDownRefresh": false + } + }] + }, { "root": "pagesOrder", "pages": [{ "path": "order/order", diff --git a/pages/index/index.vue b/pages/index/index.vue index 9979a56..676697a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,894 +1,898 @@ \ No newline at end of file diff --git a/pages/index/test.vue b/pages/index/test.vue new file mode 100644 index 0000000..2c4d29f --- /dev/null +++ b/pages/index/test.vue @@ -0,0 +1,127 @@ + + + + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index a8410d3..a69bb94 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -95,9 +95,9 @@ const showOfficial = ref(false); const navToIndex = () => { - if (userStore.userInfo && userStore.token) uni.reLaunch({ - url: '/pages/index/index' - }) + if (userStore.userInfo && userStore.token) uni.reLaunch({ + url: '/pages/index/index' + }) // if (!userStore.userInfo.supplier) uni.reLaunch({ // url: '/pages/index/index' // })