diff --git a/manifest.json b/manifest.json index aed232e..5af34a9 100644 --- a/manifest.json +++ b/manifest.json @@ -56,6 +56,176 @@ } } } + }, + "nativePlugins" : { + "JG-JPush" : { + "JPUSH_ADVERTISINGID_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_GOOGLE_API_KEY" : "", + "JPUSH_GOOGLE_APP_ID" : "", + "JPUSH_GOOGLE_PROJECT_ID" : "", + "JPUSH_GOOGLE_PROJECT_NUMBER" : "", + "JPUSH_GOOGLE_STORAGE_BUCKET" : "", + "JPUSH_HONOR_APPID" : "", + "JPUSH_HUAWEI_APPID" : "", + "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_MEIZU_APPID" : "", + "JPUSH_MEIZU_APPKEY" : "", + "JPUSH_OPPO_APPID" : "", + "JPUSH_OPPO_APPKEY" : "", + "JPUSH_OPPO_APPSECRET" : "", + "JPUSH_VIVO_APPID" : "", + "JPUSH_VIVO_APPKEY" : "", + "JPUSH_XIAOMI_APPID" : "", + "JPUSH_XIAOMI_APPKEY" : "", + "__plugin_info__" : { + "name" : "极光推送 JPush 官方 SDK", + "description" : "极光推送JPush官方SDK HBuilder插件版本", + "platforms" : "Android,iOS", + "url" : "https://ext.dcloud.net.cn/plugin?id=4035", + "android_package_name" : "com.eam.uniapp", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 1, + "pid" : "4035", + "parameters" : { + "JPUSH_ADVERTISINGID_IOS" : { + "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", + "key" : "JPush:ADVERTISINGID", + "value" : "" + }, + "JPUSH_DEFAULTINITJPUSH_IOS" : { + "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", + "key" : "JPush:DEFAULTINITJPUSH", + "value" : "" + }, + "JPUSH_GOOGLE_API_KEY" : { + "des" : "厂商google api_key,示例:g-12346578", + "key" : "google_api_key", + "value" : "" + }, + "JPUSH_GOOGLE_APP_ID" : { + "des" : "厂商google mobilesdk_app_id,示例：g-12346578", + "key" : "google_app_id", + "value" : "" + }, + "JPUSH_GOOGLE_PROJECT_ID" : { + "des" : "厂商google project_id ,示例：g-12346578", + "key" : "project_id", + "value" : "" + }, + "JPUSH_GOOGLE_PROJECT_NUMBER" : { + "des" : "厂商google project_number,示例：g-12346578", + "key" : "gcm_defaultSenderId", + "value" : "" + }, + "JPUSH_GOOGLE_STORAGE_BUCKET" : { + "des" : "厂商google storage_bucket,示例：g-12346578", + "key" : "google_storage_bucket", + "value" : "" + }, + "JPUSH_HONOR_APPID" : { + "des" : "厂商HONOR-appId,示例：12346578", + "key" : "com.hihonor.push.app_id", + "value" : "" + }, + "JPUSH_HUAWEI_APPID" : { + "des" : "厂商HUAWEI-appId,示例：appid=12346578", + "key" : "com.huawei.hms.client.appid", + "value" : "" + }, + "JPUSH_ISPRODUCTION_IOS" : { + "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", + "key" : "JPush:ISPRODUCTION", + "value" : "" + }, + "JPUSH_MEIZU_APPID" : { + "des" : "厂商MEIZU-appId,示例：MZ-12345678", + "key" : "MEIZU_APPID", + "value" : "" + }, + "JPUSH_MEIZU_APPKEY" : { + "des" : "厂商MEIZU-appKey,示例：MZ-12345678", + "key" : "MEIZU_APPKEY", + "value" : "" + }, + "JPUSH_OPPO_APPID" : { + "des" : "厂商OPPO-appId,示例：OP-12345678", + "key" : "OPPO_APPID", + "value" : "" + }, + "JPUSH_OPPO_APPKEY" : { + "des" : "厂商OPPO-appkey,示例：OP-12345678", + "key" : "OPPO_APPKEY", + "value" : "" + }, + "JPUSH_OPPO_APPSECRET" : { + "des" : "厂商OPPO-appSecret,示例：OP-12345678", + "key" : "OPPO_APPSECRET", + "value" : "" + }, + "JPUSH_VIVO_APPID" : { + "des" : "厂商VIVO-appId,示例：12345678", + "key" : "com.vivo.push.app_id", + "value" : "" + }, + "JPUSH_VIVO_APPKEY" : { + "des" : "厂商VIVO-appkey,示例：12345678", + "key" : "com.vivo.push.api_key", + "value" : "" + }, + "JPUSH_XIAOMI_APPID" : { + "des" : "厂商XIAOMI-appId,示例：MI-12345678", + "key" : "XIAOMI_APPID", + "value" : "" + }, + "JPUSH_XIAOMI_APPKEY" : { + "des" : "厂商XIAOMI-appKey,示例：MI-12345678", + "key" : "XIAOMI_APPKEY", + "value" : "" + } + } + } + }, + "JG-JCore" : { + "JPUSH_APPKEY_ANDROID" : "8cf133b5a225d7e8fa2a64f3", + "JPUSH_APPKEY_IOS" : "8cf133b5a225d7e8fa2a64f3", + "JPUSH_CHANNEL_ANDROID" : "", + "JPUSH_CHANNEL_IOS" : "", + "__plugin_info__" : { + "name" : "极光推送 JCore 官方 SDK", + "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本", + "platforms" : "Android,iOS", + "url" : "https://ext.dcloud.net.cn/plugin?id=4028", + "android_package_name" : "com.eam.uniapp", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 1, + "pid" : "4028", + "parameters" : { + "JPUSH_APPKEY_ANDROID" : { + "des" : "[Android]极光portal配置应用信息时分配的AppKey", + "key" : "JPUSH_APPKEY", + "value" : "" + }, + "JPUSH_APPKEY_IOS" : { + "des" : "[iOS]极光portal配置应用信息时分配的AppKey", + "key" : "JCore:APP_KEY", + "value" : "" + }, + "JPUSH_CHANNEL_ANDROID" : { + "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JPUSH_CHANNEL", + "value" : "" + }, + "JPUSH_CHANNEL_IOS" : { + "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JCore:CHANNEL", + "value" : "" + } + } + } + } } }, "quickapp" : {}, diff --git a/pages/sparePartsApplication/index.vue b/pages/sparePartsApplication/index.vue index 0ad49cc..93d0e68 100644 --- a/pages/sparePartsApplication/index.vue +++ b/pages/sparePartsApplication/index.vue @@ -119,6 +119,9 @@ this.getList() }, + onReachBottom() { + this.getList() + } } diff --git a/pages/sparePartsApplicationApprove/index.vue b/pages/sparePartsApplicationApprove/index.vue index 903456e..dcc2b1e 100644 --- a/pages/sparePartsApplicationApprove/index.vue +++ b/pages/sparePartsApplicationApprove/index.vue @@ -133,6 +133,9 @@ this.getList() }, + onReachBottom() { + this.getList() + } } diff --git a/pages/sparePartsServiceWorkOrderList/addForm.vue b/pages/sparePartsServiceWorkOrderList/addForm.vue index 119c317..17d8dcd 100644 --- a/pages/sparePartsServiceWorkOrderList/addForm.vue +++ b/pages/sparePartsServiceWorkOrderList/addForm.vue @@ -190,6 +190,10 @@ }, getLocation(){ locationApi.getLocation(this.form.locationNumber).then(res=>{ + if(!res.data){ + this.$modal.showToast('找不到该库位') + return; + } this.form.areaNumber = res.data.areaNumber; this.isInAccount = res.data.isInAccount this.itemNumber = res.data.itemNumber diff --git a/store/modules/user.js b/store/modules/user.js index 097fcee..4c5ba09 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -23,8 +23,6 @@ const user = { permissions: storage.get(constant.permissions), role:storage.get(constant.role), post:storage.get(constant.post), - // post:storage.get(constant.posts) && storage.get(constant.posts).filter(item => item.code == 'worker' || item.code == - // 'engineer')[0].code, classType:storage.get(constant.classType), }, diff --git a/utils/constant.js b/utils/constant.js index 7707f83..a328027 100644 --- a/utils/constant.js +++ b/utils/constant.js @@ -5,7 +5,7 @@ const constant = { permissions: 'vuex_permissions', role: 'vuex_role', classType: 'vuex_classType', - posts: 'vuex_posts', + post: 'vuex_post', } export default constant diff --git a/utils/storage.js b/utils/storage.js index 70ee541..8013217 100644 --- a/utils/storage.js +++ b/utils/storage.js @@ -4,7 +4,7 @@ import constant from './constant' let storageKey = 'storage_data' // 存储节点变量名 -let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.role, constant.classType,constant.posts] +let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.role, constant.classType,constant.post] // 存储的数据 let storageData = uni.getStorageSync(storageKey) || {}