diff --git a/App.vue b/App.vue index 2fe5f81..ea3fe5c 100644 --- a/App.vue +++ b/App.vue @@ -2,6 +2,8 @@ export default { globalData: { timer: null, // 定时器变量 + themeColor: "#00b666", + themeBackgroundColor: "#00b66621", }, onShow: function (options) { let that = this; @@ -33,8 +35,14 @@ export default { this.G.checkToken(); } if (!that.globalData.timer) { - that.globalData.timer = setInterval(() => { + if (uni.getStorageSync("apply-token")) { that.checkNum(); + } + that.globalData.timer = setInterval(() => { + console.log("inner++++++++++++++++++++ +++++++++++++++++++++++++++"); + if (uni.getStorageSync("apply-token")) { + that.checkNum(); + } }, 1 * 30 * 1000); } }, @@ -46,7 +54,6 @@ export default { that.G.Get( that.api.bind_getWaitNum + "/" + 1, { - type: 2, }, (res) => { console.log("获取待处理数量:", res); diff --git a/api/user.js b/api/user.js index 9192c02..9602cf9 100644 --- a/api/user.js +++ b/api/user.js @@ -2,7 +2,8 @@ let userInfo = {// 用户信息模块 user_changeName: "/user/updateUserName",// 修改用户名 user_changeLoginPwd: "/yishoudan/updatePasswordByPwd",// 修改登录密码 user_changeForgetPwd: "/yishoudan/updatePassword",// 忘记密码页修改登录密码 - user_changeAvatar: "/user/changeUserImgsrc",// 修改头像 + user_changeAvatar: "/user/changeUserImgsrc",// 修改头像(传文件) + user_changeAvatarWithUrl: "/user/changeUserImgsrcWithUrl",// 修改头像(传路径) user_dataValue: "/statistics/home",// 获取各种数据参数 user_tobeSupplier: "/business/coop/add",// 提交申请发单号信息 user_getTobeSupplierInfo: "/yishoudan/agency/get",// 获取发单号信息 diff --git a/components/list/apply.vue b/components/list/apply.vue index ef89537..dc56c1f 100644 --- a/components/list/apply.vue +++ b/components/list/apply.vue @@ -27,7 +27,7 @@ {{ item.userName }}{{ item.setTitle }} - {{ item.storeJobName + "@" + item.upAgencyName }} + {{ item.storeJobName + "@" + (item.upFullName || item.upAgencyName) }} {{ item.time }} diff --git a/components/list/job.vue b/components/list/job.vue index f727d31..a148f56 100644 --- a/components/list/job.vue +++ b/components/list/job.vue @@ -10,9 +10,11 @@ 'padding-top': pt + 'rpx', }" > + - @@ -114,7 +116,7 @@ - {{ item.agencyName || "-" }} + {{ item.fullName || item.agencyName || "-" }} @@ -151,8 +153,11 @@ - diff --git a/root/detail/job.vue b/root/detail/job.vue index c19b2b4..4711b40 100644 --- a/root/detail/job.vue +++ b/root/detail/job.vue @@ -1,5 +1,5 @@