From 58f21be6f3ce70a334fd5791dab5d75199fedbc1 Mon Sep 17 00:00:00 2001 From: lxz Date: Tue, 2 Jan 2024 13:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E9=94=80=E7=AC=AC=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 38 +- api/newTask.js | 6 + config/app.js | 25 +- manifest.json | 2 +- pages.json | 36 +- pages/oaHome/oaHome.vue | 221 +- pages/oaLogin/oaEnroll.vue | 76 +- pages/oaLogin/oaLogin.vue | 6 +- pages/oaMy/oaMy.vue | 167 +- pages/otherSetting/otherSetting.vue | 324 +- uni_modules/qiun-data-charts/changelog.md | 320 + .../qiun-data-charts/qiun-data-charts.vue | 1618 ++++ .../components/qiun-error/qiun-error.vue | 46 + .../components/qiun-loading/loading1.vue | 162 + .../components/qiun-loading/loading2.vue | 170 + .../components/qiun-loading/loading3.vue | 173 + .../components/qiun-loading/loading4.vue | 222 + .../components/qiun-loading/loading5.vue | 229 + .../components/qiun-loading/qiun-loading.vue | 36 + .../js_sdk/u-charts/config-echarts.js | 422 + .../js_sdk/u-charts/config-ucharts.js | 606 ++ .../js_sdk/u-charts/readme.md | 5 + .../js_sdk/u-charts/u-charts.js | 7706 +++++++++++++++++ .../js_sdk/u-charts/u-charts.min.js | 18 + uni_modules/qiun-data-charts/license.md | 201 + uni_modules/qiun-data-charts/package.json | 80 + uni_modules/qiun-data-charts/readme.md | 84 + .../static/app-plus/echarts.min.js | 23 + .../qiun-data-charts/static/h5/echarts.min.js | 23 + 29 files changed, 12685 insertions(+), 360 deletions(-) create mode 100644 api/newTask.js create mode 100644 uni_modules/qiun-data-charts/changelog.md create mode 100644 uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue create mode 100644 uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue create mode 100644 uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js create mode 100644 uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js create mode 100644 uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md create mode 100644 uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js create mode 100644 uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js create mode 100644 uni_modules/qiun-data-charts/license.md create mode 100644 uni_modules/qiun-data-charts/package.json create mode 100644 uni_modules/qiun-data-charts/readme.md create mode 100644 uni_modules/qiun-data-charts/static/app-plus/echarts.min.js create mode 100644 uni_modules/qiun-data-charts/static/h5/echarts.min.js diff --git a/App.vue b/App.vue index 16e969c..bb27128 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,7 @@ // #endif import { loginShopAccount, - loginParseToken, + loginParseToken, userInfo } from "@/api/oaUser.js" export default { @@ -34,10 +34,10 @@ uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); try { - let res = await loginParseToken({ - // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc" - token: info.referrerInfo?.extraData?.token - }) + let res = await loginParseToken({ + // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc" + token: info.referrerInfo?.extraData?.token + }) // let res = await loginShopAccount({ // shop_token: info.referrerInfo?.extraData?.token // }); @@ -66,28 +66,28 @@ // #ifdef APP-PLUS plus.navigator.closeSplashscreen(); // 关闭渲染启动图 // #endif - this.$isResolve() + this.$isResolve() } }) else { - this.$store.dispatch('initConfig'); - this.$isResolve() + this.$store.dispatch('initConfig'); + this.$isResolve() // #ifdef APP-PLUS plus.navigator.closeSplashscreen(); // 关闭渲染启动图 // #endif } } catch (e) { - this.$isResolve() + this.$isResolve() // #ifdef APP-PLUS - uni.reLaunch({ - url: '/pages/oaLogin/oaLogin', - success() { - // #ifdef APP-PLUS - plus.navigator.closeSplashscreen(); // 关闭渲染启动图 - // #endif - this.$isResolve() - } - }) + uni.reLaunch({ + url: '/pages/oaLogin/oaLogin', + success() { + // #ifdef APP-PLUS + plus.navigator.closeSplashscreen(); // 关闭渲染启动图 + // #endif + this.$isResolve() + } + }) // #endif } }, @@ -101,7 +101,7 @@ if (res.notificationEventType == 'notificationOpened') return audioContext.play() uni.vibrateLong(); - console.log("app的监听") + // console.log("app的监听") }) // #endif console.log('App Show') diff --git a/api/newTask.js b/api/newTask.js new file mode 100644 index 0000000..2864f64 --- /dev/null +++ b/api/newTask.js @@ -0,0 +1,6 @@ +import oahttp from "@/utils/oahttp.js"; + +/** + * 公告列表 + */ +export const getTradeTaskInfo = (data) => oahttp.get('/user/getTradeTaskInfo', data) \ No newline at end of file diff --git a/config/app.js b/config/app.js index 1367451..fbdda37 100644 --- a/config/app.js +++ b/config/app.js @@ -2,16 +2,16 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -const env = 'dev'; // 开发 -// const env = 'prod'; // 生产 +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 // const env = 'local'; // 本地 switch (env) { case 'prod': - httpApi = 'https://worker-task.lihaink.cn' //正式 - httpApiTwo = 'https://logistics.lihaink.cn' //正式环境 - httpApiThree = 'https://worker-task.lihaink.cn' //正式 + httpApi = 'https://new-worker.lihaink.cn/' //正式 + httpApiTwo = 'https://new-worker.lihaink.cn/' //正式环境 + httpApiThree = 'https://new-worker.lihaink.cn/' //正式 break; case 'prew': httpApi = 'https://preview-worker-task.lihaink.cn' //预上线 @@ -19,14 +19,17 @@ switch (env) { httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; case 'local': - httpApi = 'http://192.168.1.21:8083' //预上线 - httpApiThree = 'http://192.168.1.21:8083' //预上线 - httpApiTwo = 'http://192.168.1.21:8083' //预上线 + httpApi = 'http://192.168.1.22:8083' //预上线 + httpApiThree = 'http://192.168.1.22:8083' //预上线 + httpApiTwo = 'http://192.168.1.22:8083' //预上线 break; default: - httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 - httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 - httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 + // httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 + // httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 + // httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 + httpApi = 'https://ceshi-new-wokr.lihaink.cn/' //测试 + httpApiThree = 'https://ceshi-new-wokr.lihaink.cn/' //测试 + httpApiTwo = 'https://ceshi-new-wokr.lihaink.cn/' //测试环境 //测试环境 } diff --git a/manifest.json b/manifest.json index 7af43db..0cb812e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "里海社区", // "appid" : "__UNI__3A527D1", - "appid": "__UNI__B5B1EDD", + "appid": "__UNI__A495155", "description": "", "versionName": "1.3.0", "versionCode": 130, diff --git a/pages.json b/pages.json index 3ec183b..e130a55 100644 --- a/pages.json +++ b/pages.json @@ -962,30 +962,30 @@ "iconPath": "static/tabs-icon/home.png", "selectedIconPath": "static/tabs-icon/home-a.png" }, - { - "pagePath": "pages/oaExamine/oaExamine", - "text": "审批", - "iconPath": "static/tabs-icon/Task.png", - "selectedIconPath": "static/tabs-icon/Task-a.png" - }, - { - "pagePath": "pages/oaTask/oaTask", - "text": "任务", - "iconPath": "static/tabs-icon/approval.png", - "selectedIconPath": "static/tabs-icon/approval-a.png" - }, + // { + // "pagePath": "pages/oaExamine/oaExamine", + // "text": "审批", + // "iconPath": "static/tabs-icon/Task.png", + // "selectedIconPath": "static/tabs-icon/Task-a.png" + // }, + // { + // "pagePath": "pages/oaTask/oaTask", + // "text": "任务", + // "iconPath": "static/tabs-icon/approval.png", + // "selectedIconPath": "static/tabs-icon/approval-a.png" + // }, // { // "pagePath": "pages/oaManager/oaManager", // "text": "片区经理", // "iconPath": "static/tabs-icon/manager.png", // "selectedIconPath": "static/tabs-icon/manager-a.png" // }, - { - "pagePath": "pages/business/business", - "text": "商机", - "iconPath": "static/tabs-icon/manager.png", - "selectedIconPath": "static/tabs-icon/manager-a.png" - }, + // { + // "pagePath": "pages/business/business", + // "text": "商机", + // "iconPath": "static/tabs-icon/manager.png", + // "selectedIconPath": "static/tabs-icon/manager-a.png" + // }, { "pagePath": "pages/oaMy/oaMy", "text": "我的", diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index eb56a98..1f4eaa0 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -41,14 +41,17 @@ 工作证: {{ myOaInfo.nickname }} - 身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }} + 身份: {{ myOaInfo.user_role_name }} + + + - + - + - - - 工作管理 - + + + + + + + + 押金 + {{myOaInfo.deposit}} + + + + 管理户数 + + {{myOaInfo.user_information_count ||0}} + 户 + + + - + + + + + + + + + - + - + + -->