1.首页我要办图标更换,新闻上拉修改
2.资讯导航条修改
3.工作台导航条修改
4.我的整体背景修改,图标更换
6 files modified
7 files added
169 ■■■■■ changed files
api/mock/home.js 2 ●●● patch | view | raw | blame | history
pages.json 13 ●●●● patch | view | raw | blame | history
pages/article/article.vue 118 ●●●● patch | view | raw | blame | history
pages/business/business.vue 2 ●●● patch | view | raw | blame | history
pages/home/home.vue 12 ●●●●● patch | view | raw | blame | history
pages/myself/myself.vue 22 ●●●● patch | view | raw | blame | history
static/images/home/handle002.png patch | view | raw | blame | history
static/myself/clock.png patch | view | raw | blame | history
static/myself/clock01.png patch | view | raw | blame | history
static/myself/logout002.png patch | view | raw | blame | history
static/myself/privacy01.png patch | view | raw | blame | history
static/myself/system02.png patch | view | raw | blame | history
static/myself/us003.png patch | view | raw | blame | history
api/mock/home.js
@@ -134,7 +134,7 @@
                },
                {
                    name: '我要办',
                    img: '/static/images/home/handle001.png',
                    img: '/static/images/home/handle002.png',
                    url: '../handle/handle'
                }
            ];
pages.json
@@ -27,7 +27,8 @@
            "name": "myself",
            "style": {
                "navigationBarTitleText": "",
                "navigationBarBackgroundColor": "#25262E"
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
            }
        },
        {
@@ -66,9 +67,8 @@
            "path": "pages/business/business",
            "style": {
                "navigationBarTitleText": "工作台",
                "app-plus":{
                    "titleNView":false
                }
                "navigationBarBackgroundColor":"#0BB9C8",
                "navigationBarTextStyle":"white"
            }
        },
        {
@@ -193,9 +193,8 @@
            "path": "pages/article/article",
            "style": {
                "navigationBarTitleText": "资讯",
                "app-plus":{
                    "titleNView":false
                }
                "navigationBarBackgroundColor":"#0BB9C8",
                "navigationBarTextStyle":"white"
            }
        },
        {
pages/article/article.vue
@@ -1,10 +1,10 @@
<template>
    <view class="advisory-big ">
        <!-- 自定义顶部导航栏 -->
        <view class="uni-nav-bar-info" :style="{marginTop:navbarTopHeight}">
        <!-- <view class="uni-nav-bar-info" :style="{marginTop:navbarTopHeight}">
            <view class="title" @click="goTabDetail(index)" v-for="(item,index) in titleList"
                :style="titleNum==index? 'color:#000000':'color:#808080'">{{item}}</view>
        </view>
        </view> -->
        <view class="article-tab">
            <view :class="{'article-tab-title':true,'cccc':index == articleTabNum}" @click="goArticleTab(index)" v-for="(item,index) in articleTabArr"
@@ -36,6 +36,7 @@
                    <image :src="i.url"></image>
                </view>
            </view>
            <u-loadmore :status="status" />
        </view>
        
        <!-- 底部导航条 -->
@@ -55,6 +56,7 @@
                pathUrl: "http://s16s652780.51mypc.cn/api",
                page: 1,
                pagesize: 10,
                status: 'loadmore',
                // loadStatus:'loading',  //加载样式:more-加载前样式,loading-加载中样式,nomore-没有数据样式
                isLoadMore: false, //是否加载中
                isFlash: false, //是否刷新
@@ -70,28 +72,18 @@
        mounted() {
            // this.getArtcilePageList();
        },
        //上拉加载更多
        // onReachBottom() { //上拉触底函数
        //     console.log("上拉了")
        //     if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
        //         // this.isLoadMore=true
        //         this.page += 1
        //         this.getArtcilePageList(2)
        //     }
        // },
        // //下拉刷新
        // onPullDownRefresh() {
        //     // console.log("下拉了!....");
        //     if (!this.isFlash) { //此处判断,上锁,防止重复请求
        //         // this.isFlash=true;
        //         this.page = 1;
        //         this.getArtcilePageList(1);
        //         uni.stopPullDownRefresh();
        //     }
        // },
        onLoad() {
            this.getArtcilePageList(1);
            this.getArtcilePageList();
            uni.stopPullDownRefresh();
        },
        //上拉加载更多
        onReachBottom() {
            //
            if (this.status=='nomore') return;
            this.page = ++this.page;
            setTimeout(() => {
                this.getArtcilePageList();
            }, 2000);
        },
        methods: {
            goArticleTab(index) {
@@ -102,18 +94,6 @@
            },
            //去跳转详情页面
            goDetail(e) {
                //内容传值容易报错,所以直传id,然后调用接口去查询
                // let detail = {
                //     title: e.title,
                //     content: e.content,
                //     id: e.id,
                //     createTime: e.createTime,
                //     sourceName: e.sourceName,
                //     imgUrl: e.url,
                //     videoUrl:e.videoUrl
                // };
                let detail = {
                    id: e.id
                };
@@ -127,7 +107,7 @@
            getArtcilePageList(tab) {
                var that = this;
                uni.request({
                    url: that.pathUrl + '/article/article/page',
                    url: this.$store.state.piAPI + '/article/article/page',
                    method: 'GET',
                    data: {
                        current: this.page,
@@ -136,28 +116,21 @@
                    success: (res) => {
                        if (res.data.code == 200) {
                            if (res.data.data.records) {
                                if (tab == 1) {
                                //如果总数小于pageSize,不做其他操作
                                if (res.data.data.total < this.pagesize) {
                                    that.data = res.data.data.records;
                                } else {
                                    //如果总数小于pageSize,不做其他操作
                                    if (res.data.data.total < this.pagesize) {
                                        that.data = res.data.data.records;
                                    if (res.data.data.records.length < this.pagesize) {
                                        //如果数量小于分页数量,则为最后一页
                                        this.status = 'nomore'
                                    } else {
                                        if (res.data.data.records.length < this.pagesize) {
                                            //如果数量小于分页数量,则为最后一页
                                            // this.isLoadMore=true;
                                            // this.loadStatus='nomore';
                                        } else {
                                            // this.isLoadMore=false
                                        }
                                        res.data.data.records.forEach((item) => {
                                            that.data.push(item);
                                        })
                                        //否则继续加载更多数据
                                        this.status = 'loading';
                                    }
                                    res.data.data.records.forEach((item) => {
                                        that.data.push(item);
                                    })
                                }
                            } else {
                                // this.isLoadMore=true;
                                // this.loadStatus='nomore';
                            }
                            uni.stopPullDownRefresh();
                        }
@@ -168,10 +141,19 @@
    }
</script>
<style>
    page{
        width: 100%;
        height: 100%;
        background-color: #f7f7f7;
    }
</style>
<style lang="scss" scoped>
    .advisory-big {
        width: 100%;
        height: 70%;
        height: 100%;
        background-color: #f7f7f7;
        .uni-nav-bar-info {
            display: flex;
@@ -187,43 +169,51 @@
        .article-tab {
            // background-color: #007AFF;
            background-color: #fff;
            width: 100%;
            height: 2rem;
            height: 2.5rem;
            border-bottom: 2px solid #D7D7D7;
            z-index: 999;
            position: fixed;
            .article-tab-title {
                // text-align: center;
                width: 14%;
                float: left;
                margin-left: 1rem;
                margin-top: 0.5rem;
                // border-bottom: 4px solid #000000;
            }
            image {
                margin-top: 0.35rem;
                width: 1.5rem;
                height: 1.5rem;
            }
        }
        
        .article-content{
            margin-top: 1rem;
            margin-top: 3.5rem;
            width: 100%;
            // background-color: #00FF00;
            
            .advisory-model {
                width: 100%;
                width: 94%;
                margin: 0 auto;
                height: 6rem;
                // background-color: #00FF00;
                background-color: #FFF;
                border-radius: 8px;
                margin-top: 0.5rem;
            
            
                .advisory-left {
                    width: 61%;
                    width: 64%;
                    height: 80%;
                    float: left;
                    position: relative;
                    // background-color: #00FFFF;
                    position: relative;
                    left: 4%;
                    left: 3%;
                    top: 10%;
            
            
@@ -276,9 +266,9 @@
            
                .advisory-right {
                    // background-color: #222222;
                    width: 32%;
                    width: 33%;
                    height: 80%;
                    left: 63%;
                    left: 65%;
                    position: relative;
                    top: 10%;
            
@@ -306,7 +296,7 @@
        width: 30px;
        display: block;
        height: 3.5px;
        background-color: #000;
        background-color: #0BB9C8;
    }
    
    
@@ -324,7 +314,7 @@
        display: flex;
        flex-direction: row;
        position: relative;
        top: 0.35rem;
        top: 2.85rem;
        
        .search-ico-wapper{
            background-color: #F1F1F1;
pages/business/business.vue
@@ -58,7 +58,7 @@
<style lang="scss" scoped>
    .view-business{
        width: 100%;
        margin-top: 2rem;
        margin-top: 1rem;
    }
    
    .view-business-nav{
pages/home/home.vue
@@ -172,16 +172,9 @@
            this.getArtcilePageList();
        },
        onReachBottom() {
            // 后续将改为与后端联动
            if (this.page >= 3) return;
            this.status = 'loading';
            if (this.status == 'nomore') return;
            this.page = ++this.page;
            setTimeout(() => {
                this.list += 10;
                if (this.page >= 3) this.status = 'nomore';
                else this.status = 'loading';
                // this.newsList.push(...[{}, {}]);
                this.getArtcilePageList();
            }, 2000);
        },
@@ -237,9 +230,6 @@
                                        that.newsList.push(item);
                                    })
                                }
                            } else {
                                // this.isLoadMore=true;
                                // this.loadStatus='nomore';
                            }
                            uni.stopPullDownRefresh();
                        }
pages/myself/myself.vue
@@ -20,7 +20,7 @@
        <view class="bomBut">
            <view class="attendance-btn" @click="goToAttendance()">
                <view class="attendance-info">
                    <image src="../../static/myself/attendance.png" class="attendance-image"/>
                    <image src="../../static/myself/clock01.png" class="attendance-image"/>
                    <view class="attendance-title">考勤打卡</view>
                </view>
            </view>
@@ -74,22 +74,22 @@
                    // },
                    {
                        title: '关于我们',
                        imgSrc: '../../static/myself/us01.png',
                        imgSrc: '../../static/myself/us003.png',
                        open: 'aboutUs'
                    },
                    {
                        title: '隐私政策',
                        imgSrc: '../../static/myself/privacy.png',
                        imgSrc: '../../static/myself/privacy01.png',
                        open: 'genxin'
                    },
                    {
                        title: '设置',
                        imgSrc: '../../static/myself/system01.png',
                        imgSrc: '../../static/myself/system02.png',
                        open: 'shezhi'
                    },
                    {
                        title: '登出',
                        imgSrc: '../../static/myself/logout.png',
                        imgSrc: '../../static/myself/logout002.png',
                        open: 'outIn',
                    },
@@ -275,7 +275,7 @@
    page{
        width: 100%;
        height: 100%;
        background-color: #F4F5FC;
        background-color: #F7F7F7;
    }
</style>
<style lang="scss" scoped>
@@ -295,7 +295,7 @@
            width: 100%;
            height: 12rem;
            border-radius: 0px 0px 12px 12px;
            background-image: linear-gradient(to bottom, #25262E, #2F303B);
            background-image: linear-gradient(to bottom, #0BB9C8, #0BB9C8);
            color: #fff;
            flex-direction: column;
@@ -318,7 +318,7 @@
                    
                    .user-id{
                        font-size: 0.6rem;
                        color: #97979F;
                        color: #fff;
                        margin-top: 0.3rem;
                    }
                }
@@ -340,8 +340,8 @@
                width: 88%;
                margin: 0 auto;
                height: 2.4rem;
                background-image: linear-gradient(to right, #40404C, #595A62);
                box-shadow:0 0 0.1px 0.1px #595A62;
                background-image: linear-gradient(to right, #1D949F, #0BB9C8);
                box-shadow:0 0 0.1px 0.1px #0BB9C8;
                // border: 1px solid #00ff00;
                
                .dept-info{
@@ -350,7 +350,7 @@
                    line-height: 1.8rem;
                    margin-left: 0.6rem;
                    margin-top: 0.3rem;
                    background-image: linear-gradient(to right,#5C5C65,#5C5C65);
                    background-image: linear-gradient(to right,#078893, #0CB5C4);
                    
                    .dept-name {
                        margin-left: 0.3rem;
static/images/home/handle002.png
static/myself/clock.png
static/myself/clock01.png
static/myself/logout002.png
static/myself/privacy01.png
static/myself/system02.png
static/myself/us003.png