From 83fa9a3c57b21d64b3a7facb858ca9bf058cc6b7 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 28 Jan 2021 18:05:45 +0800 Subject: [PATCH] no message --- app.json | 1 + pages/home/customer/index.js | 66 +++++++++++++++++++++++++++++++ pages/home/customer/index.json | 3 ++ pages/home/customer/index.wxml | 4 ++ pages/home/customer/index.wxss | 1 + pages/home/index/index.js | 6 +-- pages/home/index/index.wxml | 12 +++--- pages/index/index.js | 2 +- pages/message/index/index.js | 8 ++-- pages/message/index/index.wxml | 11 ------ pages/process/order-info/index.js | 2 +- 11 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 pages/home/customer/index.js create mode 100644 pages/home/customer/index.json create mode 100644 pages/home/customer/index.wxml create mode 100644 pages/home/customer/index.wxss diff --git a/app.json b/app.json index 83dd1d8..9c80688 100644 --- a/app.json +++ b/app.json @@ -4,6 +4,7 @@ "pages/index/index", "pages/home/mobile/index", "pages/home/employee/index", + "pages/home/customer/index", "pages/home/authory/index", "pages/process/order-list/index", "pages/process/order-price/index", diff --git a/pages/home/customer/index.js b/pages/home/customer/index.js new file mode 100644 index 0000000..e44b653 --- /dev/null +++ b/pages/home/customer/index.js @@ -0,0 +1,66 @@ +// pages/home/customer/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/home/customer/index.json b/pages/home/customer/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/home/customer/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/home/customer/index.wxml b/pages/home/customer/index.wxml new file mode 100644 index 0000000..d2ddce1 --- /dev/null +++ b/pages/home/customer/index.wxml @@ -0,0 +1,4 @@ + + + 客户列表 + diff --git a/pages/home/customer/index.wxss b/pages/home/customer/index.wxss new file mode 100644 index 0000000..cc34e01 --- /dev/null +++ b/pages/home/customer/index.wxss @@ -0,0 +1 @@ +/* pages/home/customer/index.wxss */ \ No newline at end of file diff --git a/pages/home/index/index.js b/pages/home/index/index.js index cb56404..ca55b6b 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -1,6 +1,7 @@ // pages/stock/index.js import Dialog from '../../../components/dialog/dialog' import { finalizeToken } from "../../../api/user" +import { getBaseInfo } from "../../../api/saas" const util = require('../../../utils/util') const event = require('../../../utils/event') const storage = require('../../../utils/storage') @@ -39,14 +40,13 @@ Component({ onEvent: function (message) { if (message.what == 82) { // 认证成功 - } else if (message.what == 888) { - this.setData({creditInfo: { availableCreditLine: 0, creditLine: 0, usedCreditLine: 0.00 }}) } }, setUserInfo: function(){ if(!app.userInfo){ return } + var nickname = '' if(app.userInfo.isAuth) { nickname = app.userInfo.realName.substring(0, 14) @@ -74,7 +74,7 @@ Component({ wx.navigateTo({ url: '/pages/mall/order-list/index' }) }, loginOut: function () { - Dialog.confirm({ title: '温馨提示', message: '确定退出云印通账号？' }).then(() => { + Dialog.confirm({ title: '温馨提示', message: '确定退出纸通宝账号？' }).then(() => { storage.remove('Authorization') app.globalData.token = null app.userInfo = null diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index 7d8d2dd..3972af8 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -51,16 +51,16 @@ - + - - 我的企业 + + 员工管理 - + - - 申请企业入驻 + + 客户管理 diff --git a/pages/index/index.js b/pages/index/index.js index 1acca33..eefaeab 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -28,7 +28,7 @@ Page({ /************************************** 生命周期函数--监听页面初次渲染完成 ********************************************/ onShow: function () { var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - if (pageView && this.data.inited) { + if (pageView) { pageView.onRestart() } }, diff --git a/pages/message/index/index.js b/pages/message/index/index.js index 0e7460f..15be3eb 100644 --- a/pages/message/index/index.js +++ b/pages/message/index/index.js @@ -12,7 +12,7 @@ Component({ * 页面的初始数据 */ data: { - height: app.globalData.safeFragmentHeight - 190, + height: app.globalData.safeFragmentHeight - 100, CustomBar: app.globalData.CustomBar, userInfo: null, firstShow: false, @@ -39,9 +39,9 @@ Component({ if (this.data.firstShow) { return } - this.setData({ height: app.globalData.safeFragmentHeight - 190, CustomBar: app.globalData.CustomBar, userInfo: app.accountInfo }) - this.fetchCategoryList() - this.fetchOrderList() + this.setData({ height: app.globalData.safeFragmentHeight - 100, CustomBar: app.globalData.CustomBar }) + // this.fetchCategoryList() + // this.fetchOrderList() this.data.firstShow = true }, onEvent: function (message) { diff --git a/pages/message/index/index.wxml b/pages/message/index/index.wxml index 272b538..d1076ed 100644 --- a/pages/message/index/index.wxml +++ b/pages/message/index/index.wxml @@ -4,17 +4,6 @@ 消息 - - - - - - - - - - - diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js index 4900056..5eb4556 100644 --- a/pages/process/order-info/index.js +++ b/pages/process/order-info/index.js @@ -1,6 +1,6 @@ // pages/process/order-check/index.js import Dialog from '../../../components/dialog/dialog' -import { cancelOrder, getFactoryOrderInfo, checkingOrder} from "../../../api/saas" +import { repeatOrder, getFactoryOrderInfo, checkingOrder} from "../../../api/saas" const event = require('../../../utils/event') const math = require('../../../utils/math') const util = require('../../../utils/util')