Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 342050c3c3486dc52a8614bea4bdf8378f4df1f2

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/home/index.vue

 api/article/article.js

File was renamed from api/notice/notice.js
@@ -2,7 +2,7 @@

export const getPage = (params) => {
    return http.request({
        url: '/blade-notice/notice/page',
        url: '/blade-article/article/page',
        method: 'GET',
        params: {
            ...params

 pages.json

@@ -69,7 +69,7 @@

        //公告
        {
            "root": "subPackage/notice",
            "root": "subPackage/article",
            "pages": [{
                    "path": "list",
                    "style": {

 pages/home/index.vue

@@ -129,16 +129,16 @@
            </view>



            <view class="notic" v-if="roleType == 2">

                <view class="caption flex a-i-c j-c-s-b" @click="navigatorPage('/subPackage/notice/list')">

                <view class="caption flex a-i-c j-c-s-b" @click="navigatorPage('/subPackage/article/list')">

                    <view class="flex a-i-c">

                        <view class="line"></view>

                        <text class="f-32">通知公告</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>



				
                <view v-for="(item,index) in notice" :key="index">

                    <view class="notic-list" @click="navigatorPage('/subPackage/notice/detail',item.id)">

                    <view class="notic-list" @click="navigatorPage('/subPackage/article/detail')">

                        <view class="f-28 mb-30">

                            {{item.title}}

                        </view>

@@ -157,7 +157,7 @@
                        </view>

                    </view>

                </view>



				
            </view>

            <u-picker :title="roleTypeName" :closeOnClickOverlay="true" @close="selectBoxShow = false"

                :show="selectBoxShow" keyName="name" ref="uPicker" :columns="siteColumns" @confirm="confirmSite"

@@ -175,7 +175,7 @@


    import {

        getPage

    } from "@/api/notice/notice";

    } from "@/api/article/article";

    export default {

        data() {

            return {

@@ -576,9 +576,9 @@
                this.$u.func.globalNavigator(`/subPackage/bs/views/zhsb?houseCode=${this.curHouseCode}`, "navTo")

            },



            navigatorPage(path, id) {

            navigatorPage(path) {

                if (path) {

                    this.$u.func.globalNavigator(path + '?id=' + id, "navTo")

                    this.$u.func.globalNavigator(path, "navTo")

                }

            },



@@ -754,4 +754,4 @@
            border-radius: 16rpx 16rpx 16rpx 16rpx;

        }

    }

</style>
</style>


 subPackage/article/detail.vue

 subPackage/article/list.vue

File was renamed from subPackage/notice/list.vue
@@ -28,7 +28,7 @@
<script>
    import {
        getPage
    } from "@/api/notice/notice";
    } from "@/api/article/article.js";
    export default {
        data(){
            return {

 subPackage/label/form.vue

@@ -129,12 +129,11 @@
        methods: {
            setTitle(type) {
                if (type == 2) {
                    return "二手车交易"
                } else if (type == 3) {
                    return "二手手机维修"
                } else if (type == 3) {
                    return "二手车交易"
                }
            },


            confirmDate(e) {
                console.log(e);