diff --git a/api/saas.js b/api/saas.js index 5e2f93c..b400876 100644 --- a/api/saas.js +++ b/api/saas.js @@ -67,6 +67,7 @@ const getBankCardList = () => mGet(`/ztb-factory/get/factory-bank-card-list`, nu const deleteBankcard = (params) => mPost(`/ztb-factory/delete/factory-bank-card`, params, sconfig) const createSideOrder = (params) => mPost(`/ztb-factory/scrap-paper-receipt/create/scrap-paper-offsite-receipt-order`, params, sconfig) +const getSideOrderInfo = (params) => mPost(`/ztb-factory/scrap-paper-receipt/get/scrap-paper-offsite-receipt-order-detail`, params, sconfig) export { sconfig, @@ -125,5 +126,6 @@ export { bindBankCard, getBankCardList, deleteBankcard, - createSideOrder + createSideOrder, + getSideOrderInfo } \ No newline at end of file diff --git a/assets/image/icon_logo.png b/assets/image/icon_logo.png index 0d7ab4f..66db462 100644 Binary files a/assets/image/icon_logo.png and b/assets/image/icon_logo.png differ diff --git a/pages/agent/focus-list/index.js b/pages/agent/focus-list/index.js index 77527fc..9d0821e 100644 --- a/pages/agent/focus-list/index.js +++ b/pages/agent/focus-list/index.js @@ -56,6 +56,7 @@ Scene({ util.showBackToast('设置成功') }).catch(err => { wx.hideLoading() + util.showToast(err) }) } }) \ No newline at end of file diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index fecaa90..2c92b57 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -30,7 +30,7 @@ - + 企业管理 diff --git a/pages/home/user-info/index.js b/pages/home/user-info/index.js index a4c68b8..c2d1706 100644 --- a/pages/home/user-info/index.js +++ b/pages/home/user-info/index.js @@ -67,7 +67,7 @@ Scene({ app.globalData.token = null app.userInfo = null finalizeToken() - wx.redirectTo({ url: '/pages/login/index' }) + wx.reLaunch({ url: '/pages/login/index' }) event.emit('EventMessage', { what: 888, desc: 'Logout' }) }).catch(error => { }) diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 2bfb633..8534f67 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index b9f88e0..b2871e0 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -44,7 +44,7 @@ - + 厂内收货 @@ -61,7 +61,7 @@ - + 厂外收货 diff --git a/pages/process/outside-add/index.js b/pages/process/outside-add/index.js index 5424bd3..157b8b0 100644 --- a/pages/process/outside-add/index.js +++ b/pages/process/outside-add/index.js @@ -1,7 +1,7 @@ // pages/process/order-check/index.js import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' -import { createSideOrder, getFactoryOrderInfo, getPaperList} from "../../../api/saas" +import { createSideOrder, getSideOrderInfo, getPaperList} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -61,7 +61,7 @@ Scene({ } }) if(options.id){ - getFactoryOrderInfo(options.id).then(result => { + getSideOrderInfo({id: options.id}).then(result => { wx.hideLoading() this.setData({ form: result.data }) }).catch(err => {