diff --git a/http/apiManager.js b/http/apiManager.js index 1b6c526..c5e8c7a 100644 --- a/http/apiManager.js +++ b/http/apiManager.js @@ -621,4 +621,4 @@ export function $uploadImg(data) { /* 获取上传form信息 */ export function $NewOssFilesForm(data) { return http.req("/api/ossFiles/form", data, "POST") -} \ No newline at end of file +} diff --git a/http/http.js b/http/http.js index f1a7564..9d21bed 100644 --- a/http/http.js +++ b/http/http.js @@ -70,9 +70,9 @@ function commonsProcess(showLoading, httpReqCallback){ // 提示信息 isShowErrorToast = true - infoBox.showErrorToast('请登录').then(() => { - go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH) - }) + // infoBox.showErrorToast('请登录').then(() => { + // go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH) + // }) return Promise.reject(bodyData) // 跳转到catch函数 } // http响应码不正确 diff --git a/http/yskApi/http.js b/http/yskApi/http.js index 2aca0ef..1539cc3 100644 --- a/http/yskApi/http.js +++ b/http/yskApi/http.js @@ -20,13 +20,9 @@ let baseUrl = 'https://admintestpapi.sxczgkj.cn' const loadingShowTime = 200 -function getHeader(){ +function getHeader( type ){ const headerObject={} headerObject["Authorization"] = storageManage.token() - headerObject["Content-Type"] = 'application/json' - headerObject["loginname"] = 'admin' - headerObject["token"] = 'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyVHlwZSI6Ik1HIiwiZXhwIjoxNjkwMTgwNzE2LCJ1c2VySWQiOiIyNDQiLCJpYXQiOjE2ODg3MDk0ODcsImxvZ2luTmFtZSI6ImFkbWluIn0.lqxxvv2-FcecQngMBorz4MpkB3mIJQDG-IUULQyV-KQ' - headerObject["userId"] = '244' return headerObject } diff --git a/http/yskApi/shop.js b/http/yskApi/shop.js new file mode 100644 index 0000000..454adf4 --- /dev/null +++ b/http/yskApi/shop.js @@ -0,0 +1,76 @@ +import http from './http.js' +const request=http.request + + +/** + * 获取店铺列表 + * @returns + */ +export function getShopList(params) { + return request({ + url: `/api/tbShopInfo`, + method: 'get', + params: { + + } + }) +} + +/** + * 获取店铺数据 + * @returns + */ +export function getShopInfo(params) { + return request({ + url: `/api/tbShopInfo/${params}`, + method: 'get', + params: { + + } + }) +} + +/** + * 更改店铺信息 + * @returns + */ +export function editShopInfo(data) { + return request({ + url: `/api/tbShopInfo`, + method: 'put', + data:{ + // shopId: uni.getStorageSync('shopId'), + ...data + } + }) +} + + +/** + * 获取店铺图片 + * @returns + */ +export function getShopExtend(params) { + return request({ + url: `/tbShopExtend`, + method: 'get', + params:{ + shopId: uni.getStorageSync('shopId'), + } + }) +} + +/** + * 获取店铺图片 + * @returns + */ +export function editShopExtend(data) { + return request({ + url: `/tbShopExtend`, + method: 'put', + data:{ + shopId: uni.getStorageSync('shopId'), + ...data + } + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 399c425..71a3777 100644 --- a/pages.json +++ b/pages.json @@ -99,6 +99,28 @@ "navigationStyle": "custom" } }, + { + "pageId": "PAGES_SHOP_SETUP", + "path": "pages/shopSetUp/index", + "style": { + "navigationBarTitleText": "设置中心" + } + }, + { + "pageId": "PAGES_SHOP_QRCODE", + "path": "pages/shopSetUp/shopQRcode", + "style": { + "navigationBarTitleText": "" + } + }, + { + "pageId": "PAGES_SHOP_LIST", + "path": "pages/shopSetUp/shopList", + "style": { + "navigationBarTitleText": "选择门店" + } + }, + { "pageId": "PAGES_USER_SETUP", "path": "pages/userSetUp/userSetUp", diff --git a/pages/index/index.vue b/pages/index/index.vue index 563c10e..540c33e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -52,6 +52,11 @@ icon: '/static/indexImg/icon-cashier.svg', pageUrl: 'PAGES_QUICK_PAY', }, + { + title: '设置中心', + icon: '/static/indexImg/icon-cashier.svg', + pageUrl: 'PAGES_SHOP_SETUP', + }, { title: '商品管理', icon: '/static/indexImg/icon-product-control.svg', diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue new file mode 100644 index 0000000..6533cb0 --- /dev/null +++ b/pages/shopSetUp/index.vue @@ -0,0 +1,567 @@ + + + + + diff --git a/pages/shopSetUp/shopList.vue b/pages/shopSetUp/shopList.vue new file mode 100644 index 0000000..b7ac304 --- /dev/null +++ b/pages/shopSetUp/shopList.vue @@ -0,0 +1,161 @@ + + + + diff --git a/pages/shopSetUp/shopQRcode.vue b/pages/shopSetUp/shopQRcode.vue new file mode 100644 index 0000000..e2cc5a1 --- /dev/null +++ b/pages/shopSetUp/shopQRcode.vue @@ -0,0 +1,142 @@ + + + +