From 342050c3c3486dc52a8614bea4bdf8378f4df1f2 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 09:46:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/article/list.vue | 2 +-
pages/home/index.vue | 16 ++++++++--------
pages.json | 2 +-
api/article/article.js | 2 +-
subPackage/label/form.vue | 5 ++---
subPackage/article/detail.vue | 0
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/api/notice/notice.js b/api/article/article.js
similarity index 78%
rename from api/notice/notice.js
rename to api/article/article.js
index 2c78494..6b612c7 100644
--- a/api/notice/notice.js
+++ b/api/article/article.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
diff --git a/pages.json b/pages.json
index ebb8481..fea8ded 100644
--- a/pages.json
+++ b/pages.json
@@ -69,7 +69,7 @@
//公告
{
- "root": "subPackage/notice",
+ "root": "subPackage/article",
"pages": [{
"path": "list",
"style": {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e776443..91651ef 100644
--- a/pages/home/index.vue
+++ b/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>
diff --git a/subPackage/notice/detail.vue b/subPackage/article/detail.vue
similarity index 100%
rename from subPackage/notice/detail.vue
rename to subPackage/article/detail.vue
diff --git a/subPackage/notice/list.vue b/subPackage/article/list.vue
similarity index 96%
rename from subPackage/notice/list.vue
rename to subPackage/article/list.vue
index 67f2cbb..ca2473a 100644
--- a/subPackage/notice/list.vue
+++ b/subPackage/article/list.vue
@@ -28,7 +28,7 @@
<script>
import {
getPage
- } from "@/api/notice/notice";
+ } from "@/api/article/article.js";
export default {
data(){
return {
diff --git a/subPackage/label/form.vue b/subPackage/label/form.vue
index 7df12db..3189aed 100644
--- a/subPackage/label/form.vue
+++ b/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);
--
Gitblit v1.9.3