From d132ca8c1888c4818de3e03b034270aac7448f46 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 25 Feb 2022 15:42:28 +0800
Subject: [PATCH] 任务调整
---
pages/home/home.vue | 22 ++
pages.json | 6
pages/business/business.vue | 260 ------------------------------------
store/apiConfig.js | 4
pages/grabOrders/grabOrdersMain/business.vue | 88 ++++-------
5 files changed, 60 insertions(+), 320 deletions(-)
diff --git a/pages.json b/pages.json
index ebe2627..8536089 100644
--- a/pages.json
+++ b/pages.json
@@ -106,9 +106,9 @@
{
"path": "pages/business/business",
"style": {
- "navigationBarTitleText": "工作台",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
+ "navigationBarTitleText": "行业圈",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
diff --git a/pages/business/business.vue b/pages/business/business.vue
index dfddfba..3b48f0a 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -1,42 +1,6 @@
<template>
<view class="container">
- <view class="head">
- <u-navbar :is-fixed="false" :border-bottom="false" :is-back="true" back-icon-name="arrow-leftward"
- back-icon-color="#fff" back-icon-size="35" :background="{ background: '#103289' }" title="工作台"
- title-color="#fff"></u-navbar>
- <view class="head-bg"></view>
- <!-- 我的订阅 start -->
- <view class="card sub">
- <view class="title">常用工具</view>
- <view class="list">
- <u-grid :col="4" :border="false">
- <u-grid-item bg-color="transparent" v-for="(item, index) in dataOne" :key="index">
- <navigator hover-class="none" class="nav-item" @click="goOnePage(item.url,index)">
- <image :src="item.img" mode="widthFix" class="nav-item-img"></image>
- <view class="nav-item-name">{{item.title}}</view>
- </navigator>
- </u-grid-item>
- </u-grid>
- </view>
- </view>
- <!-- 我的订阅 end -->
-
- <view class="card wrap">
- <view class="title">保安管理</view>
- <view class="list">
- <u-grid :col="4" :border="false">
- <u-grid-item bg-color="transparent" v-for="(item, index) in dataTwo" :key="index">
- <navigator hover-class="none" url="" class="nav-item" @click="goTwoPage(item.url,index)">
- <image :src="item.img" mode="widthFix" class="nav-item-img"></image>
- <view class="nav-item-name">{{item.title}}</view>
- </navigator>
- </u-grid-item>
- </u-grid>
- </view>
- </view>
-
- </view>
- <u-toast ref="uToast" />
+ <u-empty text="功能研发中" mode="favor" margin-top="400"></u-empty>
<!-- 底部导航条 -->
<u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
</view>
@@ -47,238 +11,20 @@
data() {
return {
tabbar: this.$store.state.tabbar,
- dataOne: [{
- title: '治安巡查',
- img: '../../static/workbench/task1.png',
- url: ''
- }, {
- title: '治安义务宣传',
- img: '../../static/workbench/task2.png',
- url: '/pages/patrol/patrol'
- }, {
- title: '治安防范培训',
- img: '../../static/workbench/task3.png',
- url: '/pages/reported/reported'
- }, {
- title: '保安管理',
- img: '../../static/workbench/task8.png',
- url: ''
- }],
- dataTwo: [{
- title: '电子证件',
- img: '../../static/workbench/task9.png',
- url: ''
- },{
- title: '模拟考试',
- img: '../../static/workbench/task5.png',
- url: '/pages/voting/voteManage'
- }
- // ,{
- // title:'模拟考试',
- // img:'../../static/workbench/exam.png',
- // url:'/pages/exam/startexam'
- // }
- ]
};
},
onLoad() {
},
mounted() {
- if (this.$store.state.UserData.stype != "1") {
- this.$refs.uToast.show({
- title: '功能暂未开放',
- type: 'warning',
- });
- }
+
},
methods: {
- //页面跳转
- goOnePage(url, index) {
- if (this.$store.state.UserData.stype != "1") {
- this.$refs.uToast.show({
- title: '功能暂未开放',
- type: 'warning',
- });
- return;
- } else if (index == "0" || index == "3" || index == "4") {
- this.$refs.uToast.show({
- title: '功能研发中',
- type: 'warning',
- });
- return;
- } else if (index == 5) {
- this.getUser();
- } else {
- uni.navigateTo({
- url: url
- })
- }
- },
- //获取用户信息
- getUser() {
- var that = this;
- debugger
- uni.request({
- url: that.$store.state.BaopiAPI + '/blade-user/detail',
- method: 'GET',
- data: {
- cardid: that.$store.state.UserData.cardid,
- isDeleted:0,
- status : 1,
- },
- success: (res) => {
- if(res.statusCode == "200"){
- var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
- uni.navigateTo({
- url: '../voting/information?url=' + urls
- });
- }else{
- this.$refs.uToast.show({
- title: '暂无证件信息',
- type: 'warning',
- });
- }
- }
- });
- },
- goTwoPage(url, index) {
- if (this.$store.state.UserData.stype != "1") {
- this.$refs.uToast.show({
- title: '功能暂未开放',
- type: 'warning',
- });
- return;
- } else if (index == "2") {
- this.$refs.uToast.show({
- title: '功能研发中',
- type: 'warning',
- });
- return;
- } else {
- uni.navigateTo({
- url: url
- })
- }
- },
+
}
};
</script>
<style lang="scss">
- .container {
- background-color: #f7f7f7;
- min-height: 100vh;
- overflow: hidden;
- }
- .head {
- position: relative;
- top: 0;
- left: 0;
- z-index: 1;
- }
-
- .head-bg {
- position: absolute;
- left: 0px;
- top: 0px;
- z-index: -1;
- width: 750rpx;
- height: 270rpx;
- background: #103289;
- }
-
- .card {
- margin: 30rpx;
- background: #ffffff;
- border-radius: 20rpx;
- margin-top: 36rpx;
- }
-
- .sub {
- .title {
- padding-top: 36rpx;
- display: flex;
- justify-content: center;
- align-items: center;
-
- font-size: 30rpx;
- font-family: Source Han Sans CN;
- font-weight: 500;
- color: #000000;
-
- &::before {
- content: '';
- display: block;
- width: 135rpx;
- height: 1rpx;
- background: #e4e7ed;
- margin: 0 17rpx;
- }
-
- &::after {
- content: '';
- display: block;
- width: 135rpx;
- height: 1rpx;
- background: #e4e7ed;
- margin: 0 17rpx;
- }
- }
- }
-
- .list {
- display: flex;
- flex-wrap: wrap;
- padding: 0 0 30rpx;
-
- .nav-item {
- width: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: center;
- font-size: 30rpx;
- font-family: Source Han Sans CN;
- font-weight: 400;
- color: #131313;
- line-height: 48rpx;
-
- &-img {
- width: 64rpx;
- height: 64rpx;
- margin-bottom: 20rpx;
- }
-
- &-name {
- font-size: 26rpx;
- font-family: PingFang SC;
- font-weight: 400;
- color: #585b61;
- opacity: 0.77;
- }
- }
- }
-
- .wrap {
- .title {
- padding: 36rpx 16rpx;
- display: flex;
- align-items: center;
- font-size: 32rpx;
- font-family: Source Han Sans CN;
- font-weight: 500;
- color: #000000;
-
- &::before {
- content: "";
- display: block;
- width: 5rpx;
- height: 36rpx;
- margin-right: 10rpx;
- background: #103289;
- }
- }
- }
</style>
diff --git a/pages/grabOrders/grabOrdersMain/business.vue b/pages/grabOrders/grabOrdersMain/business.vue
index 548c07b..e262402 100644
--- a/pages/grabOrders/grabOrdersMain/business.vue
+++ b/pages/grabOrders/grabOrdersMain/business.vue
@@ -9,7 +9,7 @@
<view class="card sub">
<view class="title">常用工具</view>
<view class="list">
- <u-grid :col="4" :border="false">
+ <u-grid :col="3" :border="false">
<u-grid-item bg-color="transparent" v-for="(item, index) in dataOne" :key="index">
<navigator hover-class="none" class="nav-item" @click="goOnePage(item.url,index)">
<image :src="item.img" mode="widthFix" class="nav-item-img"></image>
@@ -21,7 +21,7 @@
</view>
<!-- 我的订阅 end -->
- <view class="card wrap">
+ <view class="card wrap" v-if="bashow">
<view class="title">保安管理</view>
<view class="list">
<u-grid :col="4" :border="false">
@@ -47,38 +47,39 @@
data() {
return {
tabbar: this.$store.state.tabbar,
+ bashow:false,
dataOne: [{
title: '治安巡查',
img: '/static/workbench/task1.png',
- url: ''
+ url: '../grabOrdersZAXC/grabOrders'
}, {
title: '治安义务宣传',
img: '/static/workbench/task2.png',
- url: '/pages/patrol/patrol'
+ url: '../grabOrdersZAYWXC/grabOrders'
}, {
title: '治安防范培训',
img: '/static/workbench/task3.png',
- url: '/pages/reported/reported'
+ url: '../grabOrdersZAFFPX/grabOrders'
}, {
title: '保安管理',
img: '/static/workbench/task8.png',
url: ''
}],
dataTwo: [{
- title: '电子证件',
- img: '/static/workbench/task9.png',
- url: ''
- },{
- title: '模拟考试',
- img: '/static/workbench/task5.png',
- url: '/pages/voting/voteManage'
- }
- // ,{
- // title:'模拟考试',
- // img:'../../static/workbench/exam.png',
- // url:'/pages/exam/startexam'
- // }
- ]
+ title: '电子证件',
+ img: '/static/workbench/task9.png',
+ url: ''
+ }, {
+ title: '模拟考试',
+ img: '/static/workbench/task5.png',
+ url: ''
+ }
+ // ,{
+ // title:'模拟考试',
+ // img:'../../static/workbench/exam.png',
+ // url:'/pages/exam/startexam'
+ // }
+ ]
};
},
onLoad() {
@@ -95,45 +96,32 @@
methods: {
//页面跳转
goOnePage(url, index) {
- if (this.$store.state.UserData.stype != "1") {
- this.$refs.uToast.show({
- title: '功能暂未开放',
- type: 'warning',
- });
- return;
- } else if (index == "0" || index == "3" || index == "4") {
- this.$refs.uToast.show({
- title: '功能研发中',
- type: 'warning',
- });
- return;
- } else if (index == 5) {
- this.getUser();
- } else {
- uni.navigateTo({
- url: url
- })
+ if(index == "3"){
+ this.bashow = !this.bashow;
}
+ uni.navigateTo({
+ url: url
+ })
},
//获取用户信息
getUser() {
var that = this;
- debugger
uni.request({
url: that.$store.state.BaopiAPI + '/blade-user/detail',
method: 'GET',
data: {
cardid: that.$store.state.UserData.cardid,
- isDeleted:0,
- status : 1,
+ isDeleted: 0,
+ status: 1,
},
success: (res) => {
- if(res.statusCode == "200"){
- var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
+ if (res.statusCode == "200") {
+ var urls = "http://223.82.109.183:2080/securityInfo.html?securityNumber=" + res
+ .data.data.securitynumber;
uni.navigateTo({
- url: '../voting/information?url=' + urls
+ url: '../../voting/information?url=' + urls
});
- }else{
+ } else {
this.$refs.uToast.show({
title: '暂无证件信息',
type: 'warning',
@@ -143,22 +131,14 @@
});
},
goTwoPage(url, index) {
- if (this.$store.state.UserData.stype != "1") {
- this.$refs.uToast.show({
- title: '功能暂未开放',
- type: 'warning',
- });
- return;
- } else if (index == "2") {
+ if (index == "1") {
this.$refs.uToast.show({
title: '功能研发中',
type: 'warning',
});
return;
} else {
- uni.navigateTo({
- url: url
- })
+ this.getUser();
}
},
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 943a46f..03b6fa6 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -83,7 +83,7 @@
</view> -->
<view class="notice-class">
<u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal"
- type="none" :list="gdlist"></u-notice-bar>
+ type="none" :list="gdlist" @click="wxtsGo"></u-notice-bar>
</view>
<!-- 公告 end -->
@@ -149,7 +149,7 @@
serviceButton: [],
tabbar: this.$store.state.tabbar,
gdlist: [
- '国家发改委：防止和避免“放松防控”和“过度防控”'
+ '南昌一波重磅“官宣”！来了！'
]
};
},
@@ -190,6 +190,16 @@
}, 2000);
},
methods: {
+ //温馨提示跳转页面
+ wxtsGo(){
+ //去跳转
+ let detail = {
+ id: "991"
+ };
+ uni.navigateTo({
+ url: '../article/article_detail?detailData=' + JSON.stringify(detail)
+ });
+ },
//点击更多跳转资讯页
goArticle() {
uni.switchTab({
@@ -201,6 +211,7 @@
let detail = {
id: e.id
};
+ debugger
if (e.articleType.indexOf("ksp") != -1) {
//去跳转
uni.navigateTo({
@@ -250,10 +261,13 @@
method: 'GET',
data: {
serid: that.$store.state.UserData.user_id,
- jurisdiction: that.$store.state.UserData.jurisdiction
+ jurisdiction: that.$store.state.UserData.jurisdiction,
+ workjurisdiction: that.$store.state.UserData.workjurisdiction,
},
success: (res) => {
- this.cout = res.data.data
+ var data = res.data.data;
+ var num = Number(data.px) + Number(data.xcha) + Number(data.xchuan);
+ this.cout = num;
}
});
},
diff --git a/store/apiConfig.js b/store/apiConfig.js
index 5fa0df5..96441af 100644
--- a/store/apiConfig.js
+++ b/store/apiConfig.js
@@ -1,9 +1,9 @@
-let i = 1; //1是服务器
+let i = 0; //1是服务器
if (i) {
var api = 'http://223.82.109.183:2082/api/';
var wsapi = 'ws://223.82.109.183:2082/wss/websocket';
} else {
- var api = 'http://192.168.0.198/';
+ var api = 'http://192.168.0.108:83/';
var wsapi = 'ws://192.168.0.108:9034/websocket';
}
--
Gitblit v1.9.3