Merge remote-tracking branch 'origin/master'

zengh

2021-07-02 2aab583a99f72e380e150af9eec7d8c49a7ee17b

Merge remote-tracking branch 'origin/master'

 App.vue

@@ -3,7 +3,7 @@
    export default {
        data() {
            return {
                login: '',
                login: '',//cc
            }
        },
        methods: {

 api/mock/home.js

@@ -114,12 +114,12 @@
                },
                {
                    name: '我要查',
                    img: '/static/images/home/s2.png',
                    img: '/static/images/home/search004.png',
                    url: ''
                },
                {
                    name: '我要报',
                    img: '/static/images/home/s3.png',
                    img: '/static/images/home/report001.png',
                    url: ''
                },
                {
@@ -129,12 +129,12 @@
                },
                {
                    name: '我要巡',
                    img: '/static/images/home/s5.png',
                    img: '/static/images/home/s6.png',
                    url: ''
                },
                {
                    name: '我要办',
                    img: '/static/images/home/s6.png',
                    img: '/static/images/home/handle001.png',
                    url: ''
                }
            ];

 pages/article/article.vue

@@ -37,6 +37,9 @@
                </view>
            </view>
        </view>
		
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>

@@ -60,7 +63,8 @@
                titleNum: 0,
                articleTabArr: ['全部', '视频', '社会', '经济', '热点'],
                articleTabNum: 0,
                navbarTopHeight: "10px"
                navbarTopHeight: "10px",
                tabbar:this.$store.state.tabbar
            }
        },
        mounted() {

 pages/business/business.vue

@@ -30,6 +30,9 @@
                </navigator>
            </view>
        </view>
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
		
    </view>
</template>

@@ -45,7 +48,8 @@
                    title: '设备提交',
                    imgSrc: '../../static/img/cancel.png',
                    goHref: '../equipment/equipment'
                }]
                }],
                tabbar:this.$store.state.tabbar
            }
        }
    }

 pages/home/home.vue

@@ -36,7 +36,7 @@
        </view>
        <!-- 头部 end -->
        
        <!-- 服务按钮 start -->
        <!-- 服务按钮 start 业务办理-->
        <view class="service-box">
            <u-grid :col="4" :border="false">
                <u-grid-item bg-color="transparent" v-for="(item, index) in serviceButton" :key="index">
@@ -111,6 +111,9 @@
            </view>
            <!-- 新闻模块 end -->
        </view>
		
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>

@@ -136,7 +139,8 @@
                noticeList: [],
                newsList: [{}, {}],
                navButton: [],
                serviceButton: []
                serviceButton: [],
                tabbar:this.$store.state.tabbar
            };
        },
        onLoad() {

 pages/index/index.vue

@@ -5,6 +5,7 @@
            <text class="title">{{title}}__{{userName}}1.4</text>
            <button type="default" @click="cc"></button>
        </view>
        <u-tabbar v-model="current" :list="list"></u-tabbar>
    </view>
</template>

@@ -12,7 +13,18 @@
    export default {
        data() {
            return {
                title: 'Hello'
                title: 'Hello',
                current:0,
                list:[
                    {
                        iconPath: "home",
                        selectedIconPath: "home-fill",
                        text: '首页',
                        count: 2,
                        isDot: true,
						
                    }
                ]
            }
        },
        onLoad() {

 pages/myself/myself.vue

@@ -36,6 +36,9 @@
        </view>
        <uniPopup :textmsg="textmsg" @cancel='operation(1)' @confirm='operation(2)' v-show="showTextmsg">
        </uniPopup>
		
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>

@@ -90,7 +93,8 @@
                        open: 'outIn',
                    },

                ]
                ],
                tabbar:this.$store.state.tabbar
            }
        },
        components: {

 static/images/home/handle.png

 static/images/home/handle001.png

 static/images/home/look.png

 static/images/home/more.png

 static/images/home/partrol.png

 static/images/home/report.png

 static/images/home/report001.png

 static/images/home/report002.png

 static/images/home/say.png

 static/images/home/search003.png

 static/images/home/search004.png

 static/images/home/search02.png

 static/images/home/searchs.png

 store/state.js

@@ -10,7 +10,35 @@
    puserID: '',
    puserIphone:'',
    avatar:"../../static/logo.png",
    UserData: {}
    UserData: {},
    tabbar:[{
            iconPath: "/static/tabbar/index01.png",
            selectedIconPath: "/static/tabbar/index02.png",
            text: '首页',
			
            pagePath: "/pages/home/home"
        },
        {
            iconPath: "/static/tabbar/article.png",
            selectedIconPath: "/static/tabbar/articleH.png",
            text: '资讯',
            pagePath: "/pages/article/article"
        },
        {
            iconPath: "/static/tabbar/workbench.png",
            selectedIconPath: "/static/tabbar/workbenchH.png",
            text: '工作台',
            count: 2,
            isDot: false,
            pagePath: "/pages/business/business"
        },
        {
            iconPath: "/static/tabbar/my.png",
            selectedIconPath: "/static/tabbar/my-blue.png",
            text: '我的',
            pagePath: "/pages/myself/myself"
        },
    ]
}

export default state