From 9033acc56dfe2cb0198c69684eb3c166ef7165f8 Mon Sep 17 00:00:00 2001 From: zhengw <247276359@qq.com> Date: Mon, 9 Mar 2026 14:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E5=8F=8A?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.json | 3 + miniprogram/app.ts | 2 + miniprogram/assets/icons/仓库信息.svg | 1 + miniprogram/pages/base/account/edit/edit.ts | 2 +- miniprogram/pages/base/account/edit/edit.wxml | 7 +- miniprogram/pages/base/customer/customer.ts | 12 ++ miniprogram/pages/base/customer/customer.wxml | 6 + .../pages/base/customer/edit/edit.json | 10 ++ miniprogram/pages/base/customer/edit/edit.ts | 123 ++++++++++++++ .../pages/base/customer/edit/edit.wxml | 38 +++++ .../pages/base/customer/edit/edit.wxss | 0 miniprogram/pages/base/depot/depot.json | 15 ++ miniprogram/pages/base/depot/depot.ts | 159 ++++++++++++++++++ miniprogram/pages/base/depot/depot.wxml | 47 ++++++ miniprogram/pages/base/depot/depot.wxss | 0 miniprogram/pages/base/depot/edit/edit.json | 9 + miniprogram/pages/base/depot/edit/edit.ts | 109 ++++++++++++ miniprogram/pages/base/depot/edit/edit.wxml | 19 +++ miniprogram/pages/base/depot/edit/edit.wxss | 0 miniprogram/pages/base/item/edit/edit.wxml | 7 +- .../pages/base/orderCategory/edit/edit.ts | 2 +- .../pages/base/orderCategory/edit/edit.wxml | 7 +- .../pages/base/orderStep/edit/edit.wxml | 4 +- .../pages/base/productType/edit/edit.wxml | 7 +- miniprogram/pages/base/supplier/supplier.ts | 12 ++ miniprogram/pages/base/supplier/supplier.wxml | 6 + .../ordersList/orderPayment/orderPayment.wxml | 5 +- miniprogram/utils/https.ts | 17 +- miniprogram/utils/menuConfig.ts | 1 + miniprogram/utils/util.ts | 13 +- 30 files changed, 611 insertions(+), 32 deletions(-) create mode 100644 miniprogram/assets/icons/仓库信息.svg create mode 100644 miniprogram/pages/base/customer/edit/edit.json create mode 100644 miniprogram/pages/base/customer/edit/edit.ts create mode 100644 miniprogram/pages/base/customer/edit/edit.wxml create mode 100644 miniprogram/pages/base/customer/edit/edit.wxss create mode 100644 miniprogram/pages/base/depot/depot.json create mode 100644 miniprogram/pages/base/depot/depot.ts create mode 100644 miniprogram/pages/base/depot/depot.wxml create mode 100644 miniprogram/pages/base/depot/depot.wxss create mode 100644 miniprogram/pages/base/depot/edit/edit.json create mode 100644 miniprogram/pages/base/depot/edit/edit.ts create mode 100644 miniprogram/pages/base/depot/edit/edit.wxml create mode 100644 miniprogram/pages/base/depot/edit/edit.wxss diff --git a/miniprogram/app.json b/miniprogram/app.json index 5d25c99..fb5e6c8 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -26,8 +26,11 @@ "pages/finance/giro/giro", "pages/finance/giroDetail/giroDetail", "pages/finance/flow/flow", + "pages/base/depot/depot", + "pages/base/depot/edit/edit", "pages/base/supplier/supplier", "pages/base/customer/customer", + "pages/base/customer/edit/edit", "pages/base/account/account", "pages/base/account/edit/edit", "pages/base/item/item", diff --git a/miniprogram/app.ts b/miniprogram/app.ts index 2b68a14..6f539fa 100644 --- a/miniprogram/app.ts +++ b/miniprogram/app.ts @@ -1,3 +1,4 @@ +import { loginStatus } from './utils/https'; import { updateVersion } from './utils/util'; // app.ts @@ -22,6 +23,7 @@ App< }, onShow() { updateVersion(); + loginStatus(); }, // Storage: Storage, // 将 Storage 挂载到 App 实例上 }); diff --git a/miniprogram/assets/icons/仓库信息.svg b/miniprogram/assets/icons/仓库信息.svg new file mode 100644 index 0000000..55184ef --- /dev/null +++ b/miniprogram/assets/icons/仓库信息.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/miniprogram/pages/base/account/edit/edit.ts b/miniprogram/pages/base/account/edit/edit.ts index 8317ca3..d11518e 100644 --- a/miniprogram/pages/base/account/edit/edit.ts +++ b/miniprogram/pages/base/account/edit/edit.ts @@ -63,7 +63,7 @@ Page({ }, ); } else { - toastError('类型名称必填'); + toastError('账户名称必填'); } }, diff --git a/miniprogram/pages/base/account/edit/edit.wxml b/miniprogram/pages/base/account/edit/edit.wxml index 090e1ee..71f6d1f 100644 --- a/miniprogram/pages/base/account/edit/edit.wxml +++ b/miniprogram/pages/base/account/edit/edit.wxml @@ -1,5 +1,4 @@ - + 账户名称 @@ -15,8 +14,8 @@ bind:change="onCheckboxChange" data-key="if_default" /> --> - + 备注 diff --git a/miniprogram/pages/base/customer/customer.ts b/miniprogram/pages/base/customer/customer.ts index 5ee63e5..b34060a 100644 --- a/miniprogram/pages/base/customer/customer.ts +++ b/miniprogram/pages/base/customer/customer.ts @@ -74,7 +74,19 @@ Page({ }); }); }, + onOrderEdit(e: any) { + const data = getDataSet(e); + const index = data.index; + wx.navigateTo({ + url: '/pages/base/customer/edit/edit', + success: (res) => { + res.eventChannel.emit('customerEdit', { + data: index == -1 ? { crm_type: 1 } : this.data.list[index], + }); + }, + }); + }, onOrderDel(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/base/customer/customer.wxml b/miniprogram/pages/base/customer/customer.wxml index 115bf74..39b8dd9 100644 --- a/miniprogram/pages/base/customer/customer.wxml +++ b/miniprogram/pages/base/customer/customer.wxml @@ -14,6 +14,10 @@ + + 新增经销商 + @@ -28,6 +32,8 @@ + 编辑 删除 diff --git a/miniprogram/pages/base/customer/edit/edit.json b/miniprogram/pages/base/customer/edit/edit.json new file mode 100644 index 0000000..62e0962 --- /dev/null +++ b/miniprogram/pages/base/customer/edit/edit.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "t-cell": "tdesign-miniprogram/cell/cell", + "t-textarea": "tdesign-miniprogram/textarea/textarea", + "t-input": "tdesign-miniprogram/input/input", + "t-radio": "tdesign-miniprogram/radio/radio", + "t-radio-group": "tdesign-miniprogram/radio-group/radio-group" + }, + "navigationBarTitleText": "" +} \ No newline at end of file diff --git a/miniprogram/pages/base/customer/edit/edit.ts b/miniprogram/pages/base/customer/edit/edit.ts new file mode 100644 index 0000000..854a416 --- /dev/null +++ b/miniprogram/pages/base/customer/edit/edit.ts @@ -0,0 +1,123 @@ +import { loginStatusPage, post } from '@/utils/https'; +import { + cloneLite, + getAuthInfo, + getDataSet, + sleep, + toastError, + toastSuccess, + toObject, +} from '@/utils/util'; + +const defaultParams = { comments: '', crm_name: '', crm_type: 1 }; + +Page({ + /** + * 页面的初始数据 + */ + data: { + params: cloneLite(defaultParams) as any, + mode: 'new' as 'new' | 'edit', + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + }, + onChange(e: any) { + const key = getDataSet(e).key; + const val = e.detail.value; + this.data.params[key] = val; + this.setData({ params: this.data.params }); + }, + onCheckboxChange(e: any) { + const key = getDataSet(e).key; + this.data.params[key] = e.detail.checked ? 1 : 2; + this.setData({ params: this.data.params }); + }, + onSave() { + // console.log(this.data.params); + if (this.data.params.crm_name) { + if (this.data.params.crm_phone && this.data.params.crm_phone.length != 11) { + toastError('手机号码需11位'); + return; + } + + post(this.data.mode == 'new' ? 'ErpCrm/add' : 'ErpCrm/edit', this.data.params).then(() => { + toastSuccess('保存成功'); + sleep(() => { + wx.navigateBack(); + }, 1000); + }); + } else { + toastError('项目名称必填'); + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(_options) { + const eventChannel: any = this.getOpenerEventChannel(); + eventChannel?.on('customerEdit', (e: any) => { + const data = toObject(e.data); + + Object.keys(data).forEach((key) => { + if (data[key] === null) { + data[key] = ''; + } + }); + + // console.log(data); + wx.setNavigationBarTitle({ + title: data.crm_id + ? `${data.crm_name} 修改` + : data.crm_type == 1 + ? '新增经销商' + : '新增供应商', + }); + this.setData({ params: data, mode: data.crm_id ? 'edit' : 'new' }); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + // onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/base/customer/edit/edit.wxml b/miniprogram/pages/base/customer/edit/edit.wxml new file mode 100644 index 0000000..5d9cc47 --- /dev/null +++ b/miniprogram/pages/base/customer/edit/edit.wxml @@ -0,0 +1,38 @@ + + + 名称 + + + 手机号码 + + + 地址 + + + 开户行 + + + 账号 + + + 纳税人识别号 + + + 税率(%) + + + 备注 + + + 保存 + + \ No newline at end of file diff --git a/miniprogram/pages/base/customer/edit/edit.wxss b/miniprogram/pages/base/customer/edit/edit.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/base/depot/depot.json b/miniprogram/pages/base/depot/depot.json new file mode 100644 index 0000000..5c58cf5 --- /dev/null +++ b/miniprogram/pages/base/depot/depot.json @@ -0,0 +1,15 @@ +{ + "usingComponents": { + "search-popup": "/pages/components/search-popup/search-popup", + "card-plugin": "/pages/components/card-plugin/card-plugin", + "card-item-plugin": "/pages/components/card-item-plugin/card-item-plugin", + "option-cell-plugin": "/pages/components/option-cell-plugin/option-cell-plugin", + "date-picker-plugin": "/pages/components/date-picker-plugin/date-picker-plugin", + "sort-plugin": "/pages/components/sort-plugin/sort-plugin", + "count-plugin": "/pages/components/count-plugin/count-plugin", + "total-bar-plugin": "/pages/components/total-bar-plugin/total-bar-plugin", + "pagination-plugin": "/pages/components/pagination-plugin/pagination-plugin", + "search-input": "/pages/components/search-input/search-input" + }, + "navigationBarTitleText": "仓库信息" +} \ No newline at end of file diff --git a/miniprogram/pages/base/depot/depot.ts b/miniprogram/pages/base/depot/depot.ts new file mode 100644 index 0000000..3d0624d --- /dev/null +++ b/miniprogram/pages/base/depot/depot.ts @@ -0,0 +1,159 @@ +import { loginStatusPage, post } from '@/utils/https'; +import { + cloneLite, + getAuthInfo, + getDataSet, + searchValueFormat, + showModal, + sleep, + toArray, + toastSuccess, + toNumber, +} from '@/utils/util'; + +const defaultParams = { curr_page: 1, page_count: 20 }; + +Page({ + /** + * 页面的初始数据 + */ + data: { + params: cloneLite(defaultParams) as any, + list: [] as any[], + count: 0, + sort: [{ label: '创建日期', value: 'create_date' }], + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + this.getList(); + }, + searchChange(e: any) { + const key = getDataSet(e).key; + const val = searchValueFormat(e.detail.value); + if (val) { + this.data.params[key] = val; + } else { + delete this.data.params[key]; + } + this.setData({ params: this.data.params }); + }, + searchOk() { + this.getList(1); + }, + searchReset() { + this.data.params = cloneLite(defaultParams); + this.getList(1); + }, + onSort(e: any) { + this.data.params.order = e.detail.value; + this.setData({ params: this.data.params }); + this.getList(1); + }, + paginationChange(e: any) { + this.getList(e.detail.curr_page); + }, + getList(curr: number = 1) { + this.data.params.curr_page = curr; + this.setData({ params: this.data.params }); + const temp = cloneLite(this.data.params); + + post('ErpDepot/list', temp).then((res: any) => { + const list = toArray(res.data?.list); + if (list.length == 0 && this.data.params.curr_page > 1) { + this.getList(this.data.params.curr_page - 1); + } + this.setData({ + count: toNumber(res.data?.count), + list: list, + }); + }); + }, + onOrderEdit(e: any) { + const data = getDataSet(e); + const index = data.index; + + wx.navigateTo({ + url: '/pages/base/depot/edit/edit', + success: (res) => { + res.eventChannel.emit('depotEdit', { + data: index == -1 ? {} : this.data.list[index], + }); + }, + }); + }, + onOrderState(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + showModal({ + content: `确认${item.state == 1 ? '禁用' : '启用'} ${item.depot_name}?`, + }).then(() => { + post('ErpDepot/setState', { depot_id: item.depot_id }).then(() => { + toastSuccess(`${item.state == 1 ? '禁用' : '启用'}成功`); + sleep(() => { + this.getList(); + }, 1000); + }); + }); + }, + onOrderDel(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + showModal({ content: `确认删除 ${item.depot_name}?` }).then(() => { + post('ErpDepot/del', { depot_id: item.depot_id }).then(() => { + toastSuccess('删除成功'); + sleep(() => { + this.getList(); + }, 1000); + }); + }); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(_options) {}, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/base/depot/depot.wxml b/miniprogram/pages/base/depot/depot.wxml new file mode 100644 index 0000000..e352aaf --- /dev/null +++ b/miniprogram/pages/base/depot/depot.wxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + 新增仓库 + + + + + + + + {{ item.depot_name }} + {{item.state == 1 ? '启用': '禁用'}} + + + + + + + + 编辑 + {{item.state == 1 ? '禁用' : '启用' }} + 删除 + + + + \ No newline at end of file diff --git a/miniprogram/pages/base/depot/depot.wxss b/miniprogram/pages/base/depot/depot.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/base/depot/edit/edit.json b/miniprogram/pages/base/depot/edit/edit.json new file mode 100644 index 0000000..5a17d78 --- /dev/null +++ b/miniprogram/pages/base/depot/edit/edit.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "t-cell": "tdesign-miniprogram/cell/cell", + "t-checkbox": "tdesign-miniprogram/checkbox/checkbox", + "t-textarea": "tdesign-miniprogram/textarea/textarea", + "t-input": "tdesign-miniprogram/input/input" + }, + "navigationBarTitleText": "" +} \ No newline at end of file diff --git a/miniprogram/pages/base/depot/edit/edit.ts b/miniprogram/pages/base/depot/edit/edit.ts new file mode 100644 index 0000000..c6c80d7 --- /dev/null +++ b/miniprogram/pages/base/depot/edit/edit.ts @@ -0,0 +1,109 @@ +import { loginStatusPage, post } from '@/utils/https'; +import { + cloneLite, + getAuthInfo, + getDataSet, + sleep, + toastError, + toastSuccess, + toObject, +} from '@/utils/util'; + +const defaultParams = { comments: '', depot_name: '' }; + +Page({ + /** + * 页面的初始数据 + */ + data: { + params: cloneLite(defaultParams) as any, + mode: 'new' as 'new' | 'edit', + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + }, + onChange(e: any) { + const key = getDataSet(e).key; + const val = e.detail.value; + this.data.params[key] = val; + this.setData({ params: this.data.params }); + }, + onCheckboxChange(e: any) { + const key = getDataSet(e).key; + this.data.params[key] = e.detail.checked ? 1 : 2; + this.setData({ params: this.data.params }); + }, + onSave() { + // console.log(this.data.params); + if (this.data.params.depot_name) { + post(this.data.mode == 'new' ? 'ErpDepot/add' : 'ErpDepot/edit', this.data.params).then( + () => { + toastSuccess('保存成功'); + sleep(() => { + wx.navigateBack(); + }, 1000); + }, + ); + } else { + toastError('仓库名称必填'); + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(_options) { + const eventChannel: any = this.getOpenerEventChannel(); + + eventChannel?.on('depotEdit', (e: any) => { + const data = toObject(e.data); + wx.setNavigationBarTitle({ + title: data.depot_id ? `${data.depot_name} 修改` : '新增仓库配置', + }); + this.setData({ params: data, mode: data.depot_id ? 'edit' : 'new' }); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/base/depot/edit/edit.wxml b/miniprogram/pages/base/depot/edit/edit.wxml new file mode 100644 index 0000000..a1e1fa6 --- /dev/null +++ b/miniprogram/pages/base/depot/edit/edit.wxml @@ -0,0 +1,19 @@ + + + 仓库名称 + + + + + + + + 备注 + + + 保存 + + \ No newline at end of file diff --git a/miniprogram/pages/base/depot/edit/edit.wxss b/miniprogram/pages/base/depot/edit/edit.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/base/item/edit/edit.wxml b/miniprogram/pages/base/item/edit/edit.wxml index 7d21b3b..f8a7743 100644 --- a/miniprogram/pages/base/item/edit/edit.wxml +++ b/miniprogram/pages/base/item/edit/edit.wxml @@ -1,5 +1,4 @@ - + 项目名称 @@ -14,8 +13,8 @@ - + 备注 diff --git a/miniprogram/pages/base/orderCategory/edit/edit.ts b/miniprogram/pages/base/orderCategory/edit/edit.ts index 013e1f6..461c05d 100644 --- a/miniprogram/pages/base/orderCategory/edit/edit.ts +++ b/miniprogram/pages/base/orderCategory/edit/edit.ts @@ -106,5 +106,5 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage() {}, + // onShareAppMessage() {}, }); diff --git a/miniprogram/pages/base/orderCategory/edit/edit.wxml b/miniprogram/pages/base/orderCategory/edit/edit.wxml index 2eef3b7..0850efc 100644 --- a/miniprogram/pages/base/orderCategory/edit/edit.wxml +++ b/miniprogram/pages/base/orderCategory/edit/edit.wxml @@ -1,5 +1,4 @@ - + 类型名称 @@ -10,8 +9,8 @@ bind:change="onCheckboxChange" data-key="if_default" /> --> - + 备注 diff --git a/miniprogram/pages/base/orderStep/edit/edit.wxml b/miniprogram/pages/base/orderStep/edit/edit.wxml index 5296bf7..712f824 100644 --- a/miniprogram/pages/base/orderStep/edit/edit.wxml +++ b/miniprogram/pages/base/orderStep/edit/edit.wxml @@ -10,8 +10,8 @@ bind:change="onCheckboxChange" data-key="if_default" /> - + 备注 diff --git a/miniprogram/pages/base/productType/edit/edit.wxml b/miniprogram/pages/base/productType/edit/edit.wxml index 261ebd3..dc68042 100644 --- a/miniprogram/pages/base/productType/edit/edit.wxml +++ b/miniprogram/pages/base/productType/edit/edit.wxml @@ -1,5 +1,4 @@ - + @@ -11,8 +10,8 @@ bind:change="onCheckboxChange" data-key="if_default" /> --> - + 备注 diff --git a/miniprogram/pages/base/supplier/supplier.ts b/miniprogram/pages/base/supplier/supplier.ts index fa3c2e2..7b48c2c 100644 --- a/miniprogram/pages/base/supplier/supplier.ts +++ b/miniprogram/pages/base/supplier/supplier.ts @@ -74,7 +74,19 @@ Page({ }); }); }, + onOrderEdit(e: any) { + const data = getDataSet(e); + const index = data.index; + wx.navigateTo({ + url: '/pages/base/customer/edit/edit', + success: (res) => { + res.eventChannel.emit('customerEdit', { + data: index == -1 ? { crm_type: 2 } : this.data.list[index], + }); + }, + }); + }, onOrderDel(e: any) { const data = getDataSet(e); const index = data.index; diff --git a/miniprogram/pages/base/supplier/supplier.wxml b/miniprogram/pages/base/supplier/supplier.wxml index 14e9b46..fa7bf75 100644 --- a/miniprogram/pages/base/supplier/supplier.wxml +++ b/miniprogram/pages/base/supplier/supplier.wxml @@ -14,6 +14,10 @@ + + 新增供应商 + @@ -28,6 +32,8 @@ + 编辑 删除 diff --git a/miniprogram/pages/orders/ordersList/orderPayment/orderPayment.wxml b/miniprogram/pages/orders/ordersList/orderPayment/orderPayment.wxml index 3296535..dd8e913 100644 --- a/miniprogram/pages/orders/ordersList/orderPayment/orderPayment.wxml +++ b/miniprogram/pages/orders/ordersList/orderPayment/orderPayment.wxml @@ -15,8 +15,9 @@ {{params.bill_date || ''}} - - 备注 + + 备注 diff --git a/miniprogram/utils/https.ts b/miniprogram/utils/https.ts index bc08970..18124b9 100644 --- a/miniprogram/utils/https.ts +++ b/miniprogram/utils/https.ts @@ -3,7 +3,15 @@ * YangXB 2021.11.24 * */ import { base, http } from './config'; -import { getStorage, goIndexPage, isArray, setStorage, toArray, toastError } from './util'; +import { + getCurrentPage, + getStorage, + goIndexPage, + isArray, + setStorage, + toArray, + toastError, +} from './util'; /** * 请求 */ @@ -50,10 +58,11 @@ const request = (url: string, options: any, config = { showLoading: true, showEr }); } if (request.data.err_code == 110000) { - const pages = getCurrentPages(); + const currentPage = getCurrentPage(); + console.log(currentPage); if ( !['pages/index/index', 'pages/processEntry/processEntry', 'pages/my/my'].includes( - pages[pages.length - 1].route, + currentPage.route, ) ) { goIndexPage(); @@ -182,7 +191,7 @@ export const loginStatusPage = (that: WechatMiniprogram.Page.Instance) }) .catch((err) => { that.setData({ isLogin: false, loading: false }); - reject(); + reject(err); console.log('调用登录状态请求失败', err); }); }); diff --git a/miniprogram/utils/menuConfig.ts b/miniprogram/utils/menuConfig.ts index c22a5b4..8312adc 100644 --- a/miniprogram/utils/menuConfig.ts +++ b/miniprogram/utils/menuConfig.ts @@ -112,6 +112,7 @@ export const menuConfig = [ icon: 'grid-view', iconColor: iconColor, children: [ + { title: '仓库信息', url: '/pages/base/depot/depot', auth: 'SF_ERP_DEPOT_VIEW' }, { title: '供应商', url: '/pages/base/supplier/supplier', auth: 'SF_ERP_SUPPLIER_VIEW' }, { title: '经销商', url: '/pages/base/customer/customer', auth: 'SF_ERP_CUSTOMER_VIEW' }, { title: '结算账户', url: '/pages/base/account/account', auth: 'SF_ERP_ACCOUNT_VIEW' }, diff --git a/miniprogram/utils/util.ts b/miniprogram/utils/util.ts index 6c29dcb..7bc44ca 100644 --- a/miniprogram/utils/util.ts +++ b/miniprogram/utils/util.ts @@ -54,10 +54,13 @@ export const isObject = (data: any) => { export const toObject = (data: any) => (isObject(data) ? data : {}); -export const reloadPage = () => { +export const getCurrentPage = () => { let pages = getCurrentPages(); //获取加载的页面 - let currentPage = pages[pages.length - 1]; //获取当前页面的对象 - let url = currentPage.route; //当前页面url + return pages[pages.length - 1]; +}; + +export const reloadPage = () => { + let url = getCurrentPage().route; //当前页面url // 关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面。 wx.redirectTo({ url: '/' + url }); }; @@ -326,9 +329,7 @@ export const removeStorage = (key: string) => { * 获取当前页面路由 */ export const getCurrentPageRoute = () => { - const pages = getCurrentPages(); // 获取页面栈 - const currentPage = pages[pages.length - 1]; // 获取当前页面对象 - return `/${currentPage.route}`; // 获取当前页面路径 + return `/${getCurrentPage().route}`; // 获取当前页面路径 }; /** 价格保留位数 */