diff --git a/config/app.js b/config/app.js
index 1367451..ad5c76b 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' //预上线
@@ -24,9 +24,9 @@ switch (env) {
httpApiTwo = 'http://192.168.1.21: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-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..c5d9afc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
{
"name": "里海社区",
// "appid" : "__UNI__3A527D1",
- "appid": "__UNI__B5B1EDD",
+ "appid": "__UNI__A495155",
"description": "",
- "versionName": "1.3.0",
- "versionCode": 130,
+ "versionName": "1.3.1",
+ "versionCode": 131,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
diff --git a/pages.json b/pages.json
index 3ec183b..1226132 100644
--- a/pages.json
+++ b/pages.json
@@ -962,30 +962,8 @@
"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/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/oaMy/oaMy",
"text": "我的",
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index eb56a98..150917a 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,183 +1,162 @@
-
-
-
-
\ No newline at end of file
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index 34b878b..9fb4879 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -9,7 +9,7 @@
- 欢迎进入里海供销平台！
+ 欢迎进入里海工作平台！
@@ -22,17 +22,7 @@
type="tel" placeholder="输入账号" />
-
-
- 还没有账号? 点击注册
-
+
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 98f3d52..3d073f7 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -2,20 +2,21 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
@@ -34,22 +35,21 @@
姓名:{{ oaUserInfo.nickname }}
- （{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}）
+
-
- 电话:
- {{oaUserInfo.account}}
-
-
- 公司:
- {{oaUserInfo.company.company_name}}
-
-
- 公司类型:
- {{oaUserInfo.company.company_type_name}}
-
+
+ 电话:
+ {{oaUserInfo.account}}
+
+
+
+ 类型:
+
+ {{oaUserInfo.user_role_name}}
+
+
@@ -100,7 +100,7 @@
import {
myOaData
} from '@/static/server/server.js'
- import bj from "@/static/animation/home.json"
+ import bj from "@/static/animation/home.json"
// import tabbar from '../components/tabbar'
export default {
components: {
@@ -108,20 +108,20 @@
},
data() {
return {
- options: {
- data: '',
- },
- uniMP: false,
+ options: {
+ data: '',
+ },
+ uniMP: false,
// myOaData: [],
src: 'https://cdn.uviewui.com/uview/album/1.jpg',
modelShow: false
}
},
- onLoad() {
- this.options.data = bj;
- },
+ onLoad() {
+ this.options.data = bj;
+ },
onShow() {
- if(uni.getStorageSync('uniMP'))this.uniMP = true;
+ if (uni.getStorageSync('uniMP')) this.uniMP = true;
this.getOaUserInfo();
},
onHide() {
@@ -141,30 +141,30 @@
}
};
},
- myOaData(){
- const route = 'pages/oaMy/oaMy';
- let arr = [];
- this.$store.state.config?.config?.menu?.forEach((item)=>{
- if(item.paths.includes(route)){
- arr=item.children;
- }
- })
- return arr;
- }
+ myOaData() {
+ const route = 'pages/oaMy/oaMy';
+ let arr = [];
+ this.$store.state.config?.config?.menu?.forEach((item) => {
+ if (item.paths.includes(route)) {
+ arr = item.children;
+ }
+ })
+ return arr;
+ }
+ },
+ watch: {
+ modelShow: function(n, o) {
+
+ }
},
- watch:{
- modelShow: function(n,o){
-
- }
- },
methods: {
...mapActions(['getWxLogin']),
- leftClick(e) {
- uni.sendHostEvent('closeApp', e, (ret) => {
- //发送消息成功回调
- console.log('关闭应用'+JSON.stringify(ret));
- });
- },
+ leftClick(e) {
+ uni.sendHostEvent('closeApp', e, (ret) => {
+ //发送消息成功回调
+ console.log('关闭应用' + JSON.stringify(ret));
+ });
+ },
login() {
uni.reLaunch({
url: '/pages/oaLogin/oaLogin'
@@ -189,25 +189,25 @@
async getOaUserInfo() {
const res = await userInfo();
this.$store.commit('setUserInfo', res.data);
- uni.stopPullDownRefresh()
+ uni.stopPullDownRefresh()
},
- navTo (url) {
- if(url){
- uni.showLoading({
- title: '加载中',
- mask: true
- });
- uni.navigateTo({
- url: url,
- success() {
- uni.hideLoading()
- },
- fail (e) {
- uni.hideLoading()
- console.log(e);
- },
- })
- }else Toast('暂未开放')
+ navTo(url) {
+ if (url) {
+ uni.showLoading({
+ title: '加载中',
+ mask: true
+ });
+ uni.navigateTo({
+ url: url,
+ success() {
+ uni.hideLoading()
+ },
+ fail(e) {
+ uni.hideLoading()
+ console.log(e);
+ },
+ })
+ } else Toast('暂未开放')
},
alterMyInfo() {
uni.navigateTo({
@@ -223,7 +223,8 @@
\ No newline at end of file
diff --git a/static/newWork/index/GLHS.png b/static/newWork/index/GLHS.png
new file mode 100644
index 0000000..6e0f6dc
Binary files /dev/null and b/static/newWork/index/GLHS.png differ
diff --git a/static/newWork/index/SYBG.png b/static/newWork/index/SYBG.png
new file mode 100644
index 0000000..6364a5f
Binary files /dev/null and b/static/newWork/index/SYBG.png differ
diff --git a/static/newWork/index/YJ.png b/static/newWork/index/YJ.png
new file mode 100644
index 0000000..5dd9126
Binary files /dev/null and b/static/newWork/index/YJ.png differ
diff --git a/static/newWork/index/empty.png b/static/newWork/index/empty.png
new file mode 100644
index 0000000..2dcbaa1
Binary files /dev/null and b/static/newWork/index/empty.png differ
diff --git a/static/newWork/tabbar/index.png b/static/newWork/tabbar/index.png
new file mode 100644
index 0000000..598ff6e
Binary files /dev/null and b/static/newWork/tabbar/index.png differ
diff --git a/static/newWork/tabbar/mine.png b/static/newWork/tabbar/mine.png
new file mode 100644
index 0000000..80ca6cd
Binary files /dev/null and b/static/newWork/tabbar/mine.png differ