mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: mkm:main
Branches Tags
mkm:main
mkm:feature-task
mkm:dev
mkm:master
mkm:jia
mkm:preview
mkm:1.0
mkm:init
...
pull from: mkm:dev
Branches Tags
mkm:feature-task
mkm:main
mkm:dev
mkm:master
mkm:jia
mkm:preview
mkm:1.0
mkm:init

3 Commits
main ... dev

Author SHA1 Message Date
zmj
802e6f1f86 对公账户 2023-12-28 23:38:18 +08:00
zmj
8df64e5616 首页任务通知 2023-12-25 00:20:29 +08:00
chenbo
c992731a78 add 任务执行人 2023-12-21 14:03:00 +08:00
6 changed files with 414 additions and 370 deletions
Show Stats Expand all files Collapse all files

3
api/notice.js
View File

@ -5,3 +5,6 @@ import oahttp from "@/utils/oahttp.js";
*/ */
export const noticeList = (data) => oahttp.get('/article/lists', data) export const noticeList = (data) => oahttp.get('/article/lists', data)
export const noticeDetail = (data) => oahttp.get('/article/detail', data) export const noticeDetail = (data) => oahttp.get('/article/detail', data)
// 任务通知
export const taskStartNoticeApi = (data) => oahttp.get('/task/taskStartNotice', data)

18
components/task/taskItem.vue
View File

@ -95,6 +95,16 @@
<text>任务金额 :</text> <text>任务金额 :</text>
<text> {{ datas.money + "元" || "0.00" }} </text> <text> {{ datas.money + "元" || "0.00" }} </text>
</view> </view>
<view class="">
<text>执行人 :</text>
<text v-if="datas.director_uid != 0"> {{ datas.directorInfo.nickname}} </text>
<text v-if="datas.director_uid == 0"> 指定人员 </text>
</view>
<!-- <view class="">
<text>任务进度 :</text>
<u-line-progress :percentage="30" :activeColor="taskProgressColor(30)"></u-line-progress>
</view> -->
</view> </view>
</view> </view>
</view> </view>
@ -168,6 +178,14 @@
}, },
methods: { methods: {
taskProgressColor(value) {
if (value < 100) return "#FF7C32"
else {
return '#1BA035'
}
},
navTo(url) { navTo(url) {
if (url) { if (url) {
uni.showLoading({ uni.showLoading({

10
config/app.js
View File

@ -2,8 +2,8 @@ let httpApiThree;
let httpApi; // 总域名 let httpApi; // 总域名
let httpApiTwo; // 物流系统域名 let httpApiTwo; // 物流系统域名
const env = 'dev'; // 开发 // const env = 'dev'; // 开发
// const env = 'prod'; // 生产 const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 // const env = 'prew'; // 预上线
// const env = 'local'; // 本地 // const env = 'local'; // 本地
@ -19,9 +19,9 @@ switch (env) {
httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
break; break;
case 'local': case 'local':
httpApi = 'http://192.168.1.20:8000' //预上线 httpApi = 'http://127.0.0.1:8000' //预上线
httpApiThree = 'http://192.168.1.20:8000' //预上线 httpApiThree = 'http://127.0.0.1:8000' //预上线
httpApiTwo = 'http://192.168.1.20:8000' //预上线 httpApiTwo = 'http://127.0.0.1:8000' //预上线
break; break;
default: default:
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试

708
manifest.json
View File

@ -1,356 +1,356 @@
{ {
"name" : "里海社区", "name": "里海社区",
// "appid" : "__UNI__3A527D1", // "appid" : "__UNI__3A527D1",
"appid" : "__UNI__B5B1EDD", "appid": "__UNI__B5B1EDD",
"description" : "", "description": "",
"versionName" : "1.2.7", "versionName": "1.2.8",
"versionCode" : 127, "versionCode": 128,
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"compatible" : { "compatible": {
"ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
}, },
// "statusbar": { // "statusbar": {
// "immersed": false // "immersed": false
// }, // },
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : false, "alwaysShowBeforeRender": false,
"waiting" : true, "waiting": true,
"autoclose" : false, "autoclose": false,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"Payment" : {}, "Payment": {},
"Barcode" : {}, "Barcode": {},
"Camera" : {}, "Camera": {},
"Maps" : {}, "Maps": {},
"VideoPlayer" : {}, "VideoPlayer": {},
"Geolocation" : {} "Geolocation": {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] "abiFilters": ["armeabi-v7a", "arm64-v8a"]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"dSYMs" : false "dSYMs": false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"payment" : { "payment": {
"weixin" : { "weixin": {
"__platform__" : [ "ios", "android" ], "__platform__": ["ios", "android"],
// "appid" : "wx4789d9f1b50390ba", // "appid" : "wx4789d9f1b50390ba",
"appid" : "wx9d68c92b550ddd1e", // 商城 "appid": "wx9d68c92b550ddd1e", // 商城
"UniversalLinks" : "https://worker-task.lihaink.cn/" "UniversalLinks": "https://worker-task.lihaink.cn/"
} }
}, },
"ad" : {}, "ad": {},
"maps" : { "maps": {
"amap" : { "amap": {
// "appkey_ios" : "0799f37420c0784f1e6cba230a68bdb1", // "appkey_ios" : "0799f37420c0784f1e6cba230a68bdb1",
// "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1", // "appkey_android" : "0799f37420c0784f1e6cba230a68bdb1",
"appkey_ios" : "82af93ec51139c712c4118d84ba684ee", "appkey_ios": "82af93ec51139c712c4118d84ba684ee",
"appkey_android" : "0799f37420c0784f1e6cba230a68bdb1" "appkey_android": "0799f37420c0784f1e6cba230a68bdb1"
} }
}, },
// "appkey_ios" : "4f8f55618010007147aab96fc72bb408", // "appkey_ios" : "4f8f55618010007147aab96fc72bb408",
// "appkey_android" : "4f8f55618010007147aab96fc72bb408" // "appkey_android" : "4f8f55618010007147aab96fc72bb408"
"geolocation" : { "geolocation": {
"amap" : { "amap": {
"__platform__" : [ "ios", "android" ], "__platform__": ["ios", "android"],
"appkey_ios" : "82af93ec51139c712c4118d84ba684ee", "appkey_ios": "82af93ec51139c712c4118d84ba684ee",
"appkey_android" : "0799f37420c0784f1e6cba230a68bdb1" "appkey_android": "0799f37420c0784f1e6cba230a68bdb1"
} }
} }
}, },
"apple" : { "apple": {
"urlschemewhitelist" : [ "iosamap" ] "urlschemewhitelist": ["iosamap"]
}, },
"splashscreen" : { "splashscreen": {
"useOriginalMsgbox" : false, "useOriginalMsgbox": false,
"androidStyle" : "common" "androidStyle": "common"
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi": "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi": "unpackage/res/icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore": "unpackage/res/icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "unpackage/res/icons/76x76.png", "app": "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x": "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification": "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings": "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x": "unpackage/res/icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x": "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x": "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x": "unpackage/res/icons/120x120.png"
} }
} }
} }
}, },
"nativePlugins" : { "nativePlugins": {
"JG-JCore" : { "JG-JCore": {
"JPUSH_APPKEY_ANDROID" : "5ced5ec5fa7bb86302944f0f", "JPUSH_APPKEY_ANDROID": "5ced5ec5fa7bb86302944f0f",
"JPUSH_APPKEY_IOS" : "5ced5ec5fa7bb86302944f0f", "JPUSH_APPKEY_IOS": "5ced5ec5fa7bb86302944f0f",
"JPUSH_CHANNEL_ANDROID" : "", "JPUSH_CHANNEL_ANDROID": "",
"JPUSH_CHANNEL_IOS" : "", "JPUSH_CHANNEL_IOS": "",
"__plugin_info__" : { "__plugin_info__": {
"name" : "极光推送 JCore 官方 SDK", "name": "极光推送 JCore 官方 SDK",
"description" : "极光推送 JCore 官方 SDK HBuilder 插件版本", "description": "极光推送 JCore 官方 SDK HBuilder 插件版本",
"platforms" : "Android,iOS", "platforms": "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4028", "url": "https://ext.dcloud.net.cn/plugin?id=4028",
"android_package_name" : "uni.UNIB5B1EDD", "android_package_name": "uni.UNIB5B1EDD",
"ios_bundle_id" : "uni.UNIB5B1EDD", "ios_bundle_id": "uni.UNIB5B1EDD",
"isCloud" : true, "isCloud": true,
"bought" : 1, "bought": 1,
"pid" : "4028", "pid": "4028",
"parameters" : { "parameters": {
"JPUSH_APPKEY_ANDROID" : { "JPUSH_APPKEY_ANDROID": {
"des" : "[Android]极光portal配置应用信息时分配的AppKey", "des": "[Android]极光portal配置应用信息时分配的AppKey",
"key" : "JPUSH_APPKEY", "key": "JPUSH_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_APPKEY_IOS" : { "JPUSH_APPKEY_IOS": {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey", "des": "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY", "key": "JCore:APP_KEY",
"value" : "" "value": ""
}, },
"JPUSH_CHANNEL_ANDROID" : { "JPUSH_CHANNEL_ANDROID": {
"des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", "des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JPUSH_CHANNEL", "key": "JPUSH_CHANNEL",
"value" : "" "value": ""
}, },
"JPUSH_CHANNEL_IOS" : { "JPUSH_CHANNEL_IOS": {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", "des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JCore:CHANNEL", "key": "JCore:CHANNEL",
"value" : "" "value": ""
} }
} }
} }
}, },
"JG-JPush" : { "JG-JPush": {
"JPUSH_ADVERTISINGID_IOS" : "", "JPUSH_ADVERTISINGID_IOS": "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "", "JPUSH_DEFAULTINITJPUSH_IOS": "",
"JPUSH_GOOGLE_API_KEY" : "", "JPUSH_GOOGLE_API_KEY": "",
"JPUSH_GOOGLE_APP_ID" : "", "JPUSH_GOOGLE_APP_ID": "",
"JPUSH_GOOGLE_PROJECT_ID" : "", "JPUSH_GOOGLE_PROJECT_ID": "",
"JPUSH_GOOGLE_PROJECT_NUMBER" : "", "JPUSH_GOOGLE_PROJECT_NUMBER": "",
"JPUSH_GOOGLE_STORAGE_BUCKET" : "", "JPUSH_GOOGLE_STORAGE_BUCKET": "",
"JPUSH_HONOR_APPID" : "", "JPUSH_HONOR_APPID": "",
"JPUSH_HUAWEI_APPID" : "", "JPUSH_HUAWEI_APPID": "",
"JPUSH_ISPRODUCTION_IOS" : "", "JPUSH_ISPRODUCTION_IOS": "",
"JPUSH_MEIZU_APPID" : "", "JPUSH_MEIZU_APPID": "",
"JPUSH_MEIZU_APPKEY" : "", "JPUSH_MEIZU_APPKEY": "",
"JPUSH_OPPO_APPID" : "", "JPUSH_OPPO_APPID": "",
"JPUSH_OPPO_APPKEY" : "", "JPUSH_OPPO_APPKEY": "",
"JPUSH_OPPO_APPSECRET" : "", "JPUSH_OPPO_APPSECRET": "",
"JPUSH_VIVO_APPID" : "", "JPUSH_VIVO_APPID": "",
"JPUSH_VIVO_APPKEY" : "", "JPUSH_VIVO_APPKEY": "",
"JPUSH_XIAOMI_APPID" : "", "JPUSH_XIAOMI_APPID": "",
"JPUSH_XIAOMI_APPKEY" : "", "JPUSH_XIAOMI_APPKEY": "",
"__plugin_info__" : { "__plugin_info__": {
"name" : "极光推送 JPush 官方 SDK", "name": "极光推送 JPush 官方 SDK",
"description" : "极光推送JPush官方SDK HBuilder插件版本", "description": "极光推送JPush官方SDK HBuilder插件版本",
"platforms" : "Android,iOS", "platforms": "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=4035", "url": "https://ext.dcloud.net.cn/plugin?id=4035",
"android_package_name" : "uni.UNIB5B1EDD", "android_package_name": "uni.UNIB5B1EDD",
"ios_bundle_id" : "uni.UNIB5B1EDD", "ios_bundle_id": "uni.UNIB5B1EDD",
"isCloud" : true, "isCloud": true,
"bought" : 1, "bought": 1,
"pid" : "4035", "pid": "4035",
"parameters" : { "parameters": {
"JPUSH_ADVERTISINGID_IOS" : { "JPUSH_ADVERTISINGID_IOS": {
"des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", "des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
"key" : "JPush:ADVERTISINGID", "key": "JPush:ADVERTISINGID",
"value" : "" "value": ""
}, },
"JPUSH_DEFAULTINITJPUSH_IOS" : { "JPUSH_DEFAULTINITJPUSH_IOS": {
"des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", "des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
"key" : "JPush:DEFAULTINITJPUSH", "key": "JPush:DEFAULTINITJPUSH",
"value" : "" "value": ""
}, },
"JPUSH_GOOGLE_API_KEY" : { "JPUSH_GOOGLE_API_KEY": {
"des" : "厂商google api_key,示例:g-12346578", "des": "厂商google api_key,示例:g-12346578",
"key" : "google_api_key", "key": "google_api_key",
"value" : "" "value": ""
}, },
"JPUSH_GOOGLE_APP_ID" : { "JPUSH_GOOGLE_APP_ID": {
"des" : "厂商google mobilesdk_app_id,示例：g-12346578", "des": "厂商google mobilesdk_app_id,示例：g-12346578",
"key" : "google_app_id", "key": "google_app_id",
"value" : "" "value": ""
}, },
"JPUSH_GOOGLE_PROJECT_ID" : { "JPUSH_GOOGLE_PROJECT_ID": {
"des" : "厂商google project_id ,示例：g-12346578", "des": "厂商google project_id ,示例：g-12346578",
"key" : "project_id", "key": "project_id",
"value" : "" "value": ""
}, },
"JPUSH_GOOGLE_PROJECT_NUMBER" : { "JPUSH_GOOGLE_PROJECT_NUMBER": {
"des" : "厂商google project_number,示例：g-12346578", "des": "厂商google project_number,示例：g-12346578",
"key" : "gcm_defaultSenderId", "key": "gcm_defaultSenderId",
"value" : "" "value": ""
}, },
"JPUSH_GOOGLE_STORAGE_BUCKET" : { "JPUSH_GOOGLE_STORAGE_BUCKET": {
"des" : "厂商google storage_bucket,示例：g-12346578", "des": "厂商google storage_bucket,示例：g-12346578",
"key" : "google_storage_bucket", "key": "google_storage_bucket",
"value" : "" "value": ""
}, },
"JPUSH_HONOR_APPID" : { "JPUSH_HONOR_APPID": {
"des" : "厂商HONOR-appId,示例：12346578", "des": "厂商HONOR-appId,示例：12346578",
"key" : "com.hihonor.push.app_id", "key": "com.hihonor.push.app_id",
"value" : "" "value": ""
}, },
"JPUSH_HUAWEI_APPID" : { "JPUSH_HUAWEI_APPID": {
"des" : "厂商HUAWEI-appId,示例：appid=12346578", "des": "厂商HUAWEI-appId,示例：appid=12346578",
"key" : "com.huawei.hms.client.appid", "key": "com.huawei.hms.client.appid",
"value" : "" "value": ""
}, },
"JPUSH_ISPRODUCTION_IOS" : { "JPUSH_ISPRODUCTION_IOS": {
"des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", "des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
"key" : "JPush:ISPRODUCTION", "key": "JPush:ISPRODUCTION",
"value" : "" "value": ""
}, },
"JPUSH_MEIZU_APPID" : { "JPUSH_MEIZU_APPID": {
"des" : "厂商MEIZU-appId,示例：MZ-12345678", "des": "厂商MEIZU-appId,示例：MZ-12345678",
"key" : "MEIZU_APPID", "key": "MEIZU_APPID",
"value" : "" "value": ""
}, },
"JPUSH_MEIZU_APPKEY" : { "JPUSH_MEIZU_APPKEY": {
"des" : "厂商MEIZU-appKey,示例：MZ-12345678", "des": "厂商MEIZU-appKey,示例：MZ-12345678",
"key" : "MEIZU_APPKEY", "key": "MEIZU_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPID" : { "JPUSH_OPPO_APPID": {
"des" : "厂商OPPO-appId,示例：OP-12345678", "des": "厂商OPPO-appId,示例：OP-12345678",
"key" : "OPPO_APPID", "key": "OPPO_APPID",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPKEY" : { "JPUSH_OPPO_APPKEY": {
"des" : "厂商OPPO-appkey,示例：OP-12345678", "des": "厂商OPPO-appkey,示例：OP-12345678",
"key" : "OPPO_APPKEY", "key": "OPPO_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPSECRET" : { "JPUSH_OPPO_APPSECRET": {
"des" : "厂商OPPO-appSecret,示例：OP-12345678", "des": "厂商OPPO-appSecret,示例：OP-12345678",
"key" : "OPPO_APPSECRET", "key": "OPPO_APPSECRET",
"value" : "" "value": ""
}, },
"JPUSH_VIVO_APPID" : { "JPUSH_VIVO_APPID": {
"des" : "厂商VIVO-appId,示例：12345678", "des": "厂商VIVO-appId,示例：12345678",
"key" : "com.vivo.push.app_id", "key": "com.vivo.push.app_id",
"value" : "" "value": ""
}, },
"JPUSH_VIVO_APPKEY" : { "JPUSH_VIVO_APPKEY": {
"des" : "厂商VIVO-appkey,示例：12345678", "des": "厂商VIVO-appkey,示例：12345678",
"key" : "com.vivo.push.api_key", "key": "com.vivo.push.api_key",
"value" : "" "value": ""
}, },
"JPUSH_XIAOMI_APPID" : { "JPUSH_XIAOMI_APPID": {
"des" : "厂商XIAOMI-appId,示例：MI-12345678", "des": "厂商XIAOMI-appId,示例：MI-12345678",
"key" : "XIAOMI_APPID", "key": "XIAOMI_APPID",
"value" : "" "value": ""
}, },
"JPUSH_XIAOMI_APPKEY" : { "JPUSH_XIAOMI_APPKEY": {
"des" : "厂商XIAOMI-appKey,示例：MI-12345678", "des": "厂商XIAOMI-appKey,示例：MI-12345678",
"key" : "XIAOMI_APPKEY", "key": "XIAOMI_APPKEY",
"value" : "" "value": ""
} }
} }
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
"h5" : { "h5": {
"devServer" : { "devServer": {
"proxy" : { "proxy": {
"baseUrlTest/adminapi" : { "baseUrlTest/adminapi": {
"target" : "https://worker-task.lihaink.cn", "target": "https://worker-task.lihaink.cn",
"changeOrigin" : true, "changeOrigin": true,
"pathRewrite" : { "pathRewrite": {
"^/baseUrlTest/adminapi" : "/adminapi" "^/baseUrlTest/adminapi": "/adminapi"
} }
}, },
"baseUrlTest/api" : { "baseUrlTest/api": {
"target" : "https://worker-task.lihaink.cn", "target": "https://worker-task.lihaink.cn",
"changeOrigin" : true, "changeOrigin": true,
"pathRewrite" : { "pathRewrite": {
"^/baseUrlTest/api" : "/api" "^/baseUrlTest/api": "/api"
} }
} }
} }
}, },
"sdkConfigs" : { "sdkConfigs": {
"maps" : { "maps": {
"amap" : { "amap": {
"key" : "275cd3601b1b2d6414f6c988e7911664", "key": "275cd3601b1b2d6414f6c988e7911664",
"securityJsCode" : "d2d7c56801819e8bdf71b8a71846f235", "securityJsCode": "d2d7c56801819e8bdf71b8a71846f235",
"serviceHost" : "" "serviceHost": ""
} }
} }
} }
}, },
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "wx6e14cb98394e36bc", "appid": "wx6e14cb98394e36bc",
"setting" : { "setting": {
"urlCheck" : false "urlCheck": false
}, },
"usingComponents" : true "usingComponents": true
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false "enable": false
}, },
"vueVersion" : "2" "vueVersion": "2"
} }

29
pages/oaHome/oaHome.vue
View File

@ -76,8 +76,14 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 任务通知 -->
<view class="" style="width: 694.74rpx;margin: 0 auto;" v-if="taskNotice">
<u-notice-bar :text="taskNotice" mode="closable" scrollable url="/pages/bar/bar"></u-notice-bar>
</view>
<!-- 片区经理聊天 --> <!-- 片区经理聊天 -->
<view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;"> <view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 10rpx;">
<view class="chat-l"> <view class="chat-l">
<u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx" <u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx"
height="91rpx"></u--image> height="91rpx"></u--image>
@ -188,7 +194,8 @@
oaHomeData oaHomeData
} from "@/static/server/server.js"; } from "@/static/server/server.js";
import { import {
noticeList noticeList,
taskStartNoticeApi
} from "@/api/notice.js"; } from "@/api/notice.js";
import { import {
getAreaManagerApi getAreaManagerApi
@ -219,7 +226,7 @@
}, },
data() { data() {
return { return {
taskNotice: '',
brange: 0, brange: 0,
options: { options: {
data: '', data: '',
@ -270,6 +277,7 @@
}; };
}, },
async onLoad() { async onLoad() {
this.getTaskNotice()
// console.log('asdashg') // console.log('asdashg')
if (uni.getStorageSync('USER_INFO')) { if (uni.getStorageSync('USER_INFO')) {
let userData = JSON.parse(uni.getStorageSync('USER_INFO')) let userData = JSON.parse(uni.getStorageSync('USER_INFO'))
@ -277,11 +285,12 @@
this.initUserInfo(userData); this.initUserInfo(userData);
// console.log(545) // console.log(545)
} }
console.log(7787878)
await this.$onLaunched; await this.$onLaunched;
this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
this.options.data = bj; this.options.data = bj;
//#ifdef APP-PLUS //#ifdef APP-PLUS
let that = this; let that = this;
jpushModule.addNotificationListener(function(result) { jpushModule.addNotificationListener(function(result) {
@ -330,7 +339,6 @@
let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
this.getOrderList(); this.getOrderList();
console.log("show")
getAreaManagerApi({ getAreaManagerApi({
user_id user_id
}).then(res => { }).then(res => {
@ -414,6 +422,14 @@
} }
}, },
methods: { methods: {
// 任务通知
async getTaskNotice() {
let res = await taskStartNoticeApi()
this.taskNotice = res.data?.template?.title ?
`您的${res.data.template.title}任务即将于${res.data.template.cron_time}日开始` : ""
},
// 通知 // 通知
noticeFn() { noticeFn() {
jpushModule.addNotificationListener(res => { jpushModule.addNotificationListener(res => {
@ -600,6 +616,9 @@
await this.getOrderList(); await this.getOrderList();
await this.$store.dispatch('initConfig'); await this.$store.dispatch('initConfig');
await this.getApproveList(); await this.getApproveList();
await this.getTaskNotice();
// this.getIndexList() // this.getIndexList()
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, },

12
subpkg/merchantDetails/merchantDetails.vue
View File

@ -87,14 +87,18 @@
</view> </view>
<view class="body"> <view class="body">
<view class="b_item"> <view class="b_item">
<view>开户银行名称:</view> <view>对公账号:</view>
<view>{{extend.bank_code}}</view>
</view>
<view class="b_item">
<view>开户行名称:</view>
<view>{{extend.bank_username}}</view> <view>{{extend.bank_username}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>银行卡号:</view> <view>开户行地址:</view>
<view>{{extend.bank_opening}}</view> <view>{{extend.bank_opening}}</view>
</view> </view>
<view class="b_item"> <!-- <view class="b_item">
<view>银行卡正面:</view> <view>银行卡正面:</view>
</view> </view>
<image @click="priview(extend.bank_front)" :src="extend.bank_front"></image> <image @click="priview(extend.bank_front)" :src="extend.bank_front"></image>
@ -109,7 +113,7 @@
<view class="b_item"> <view class="b_item">
<view>身份证反面:</view> <view>身份证反面:</view>
</view> </view>
<image @click="priview(extend.cardno_back)" :src="extend.cardno_back"></image> <image @click="priview(extend.cardno_back)" :src="extend.cardno_back"></image> -->
</view> </view>
</view> </view>
</view> </view>