diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue new file mode 100644 index 0000000..40fabdc --- /dev/null +++ b/packageC/rumorWebView/rumorWebView.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue new file mode 100644 index 0000000..40fabdc --- /dev/null +++ b/packageC/rumorWebView/rumorWebView.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/pages.json b/pages.json index 32ca911..980d2ab 100644 --- a/pages.json +++ b/pages.json @@ -24,7 +24,9 @@ "style" : { "navigationBarTitleText": "侵权举报", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } }, { @@ -32,15 +34,18 @@ "style" : { "navigationBarTitleText": "谣言查证", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white", + "disableScroll":true } } ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "新疆网络举报", - "navigationBarBackgroundColor": "#4390f7", - "backgroundColor": "#4390f7" + "navigationBarBackgroundColor": "#4390f7" + // "backgroundColor": "#4390f7" }, "tabBar": { "color": "#424242", @@ -78,14 +83,6 @@ "root": "packageA",//分包名 "pages": [ { - "path" : "pages/messageDetail/messageDetail", - "style" : - { - "navigationBarTitleText": "网信信息详情", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/search/search", "style" : { @@ -165,46 +162,80 @@ "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } - },{ - "path" : "recordDetail/recordDetail", - "style" : - { - "navigationBarTitleText": "详细信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, + }, + { + "path" : "recordDetail/recordDetail", + "style" : { - "path" : "center/center", - "style" : - { - "navigationBarTitleText": "举报中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, - { - "path" : "report/report", - "style" : - { - "navigationBarTitleText": "发布举报", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } + "navigationBarTitleText": "详细信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } - ,{ - "path" : "messageList/messageList", - "style" : + }, + { + "path" : "center/center", + "style" : + { + "navigationBarTitleText": "举报中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "report/report", + "style" : { - "navigationBarTitleText": "网信信息列表", - "enablePullDownRefresh": true, + "navigationBarTitleText": "发布举报", + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } + }, + { + "path" : "messageList/messageList", + "style" : + { + "navigationBarTitleText": "网信信息列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "messageDetail/messageDetail", + "style" : + { + "navigationBarTitleText": "网信信息详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#eef2fe" + } + }, + { + "path" : "supervisor/supervisor", + "style" : + { + "navigationBarTitleText": "申请流程", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + } + ] + }, + { + "root": "packageC",//分包名 + "pages": [ + { + "path" : "rumorWebView/rumorWebView", + "style" : + { + "navigationBarTitleText": "11", + "enablePullDownRefresh": false + } } ] - }] + } + ] } diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue new file mode 100644 index 0000000..40fabdc --- /dev/null +++ b/packageC/rumorWebView/rumorWebView.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/pages.json b/pages.json index 32ca911..980d2ab 100644 --- a/pages.json +++ b/pages.json @@ -24,7 +24,9 @@ "style" : { "navigationBarTitleText": "侵权举报", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } }, { @@ -32,15 +34,18 @@ "style" : { "navigationBarTitleText": "谣言查证", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white", + "disableScroll":true } } ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "新疆网络举报", - "navigationBarBackgroundColor": "#4390f7", - "backgroundColor": "#4390f7" + "navigationBarBackgroundColor": "#4390f7" + // "backgroundColor": "#4390f7" }, "tabBar": { "color": "#424242", @@ -78,14 +83,6 @@ "root": "packageA",//分包名 "pages": [ { - "path" : "pages/messageDetail/messageDetail", - "style" : - { - "navigationBarTitleText": "网信信息详情", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/search/search", "style" : { @@ -165,46 +162,80 @@ "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } - },{ - "path" : "recordDetail/recordDetail", - "style" : - { - "navigationBarTitleText": "详细信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, + }, + { + "path" : "recordDetail/recordDetail", + "style" : { - "path" : "center/center", - "style" : - { - "navigationBarTitleText": "举报中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, - { - "path" : "report/report", - "style" : - { - "navigationBarTitleText": "发布举报", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } + "navigationBarTitleText": "详细信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } - ,{ - "path" : "messageList/messageList", - "style" : + }, + { + "path" : "center/center", + "style" : + { + "navigationBarTitleText": "举报中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "report/report", + "style" : { - "navigationBarTitleText": "网信信息列表", - "enablePullDownRefresh": true, + "navigationBarTitleText": "发布举报", + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } + }, + { + "path" : "messageList/messageList", + "style" : + { + "navigationBarTitleText": "网信信息列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "messageDetail/messageDetail", + "style" : + { + "navigationBarTitleText": "网信信息详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#eef2fe" + } + }, + { + "path" : "supervisor/supervisor", + "style" : + { + "navigationBarTitleText": "申请流程", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + } + ] + }, + { + "root": "packageC",//分包名 + "pages": [ + { + "path" : "rumorWebView/rumorWebView", + "style" : + { + "navigationBarTitleText": "11", + "enablePullDownRefresh": false + } } ] - }] + } + ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index 4b08bc9..355f531 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,7 +3,7 @@ - + @@ -137,7 +137,7 @@ url: '/packageB/center/center' }) } - else if(val === 'rule' || val === 'status') { // 法律法规、工作动态 + else if(val === 'rules' || val === 'status') { // 法律法规、工作动态 let tabIndex = 0; if(val === 'status') { tabIndex = 1; @@ -147,9 +147,9 @@ wx.navigateTo({ url: `/packageB/messageList/messageList?tabIndex=${tabIndex}` }) - } else if(val === 'search') { // 成为监督员 + } else if(val === 'jdy') { // 成为监督员 wx.navigateTo({ - url: `/packageA/pages/search/search` + url: `/packageB/supervisor/supervisor` }) } } diff --git a/common/utils.js b/common/utils.js index 126f531..76faf0d 100644 --- a/common/utils.js +++ b/common/utils.js @@ -247,3 +247,69 @@ return Math.floor(Math.random() * (m - n + 1) + n); } +// #ifdef APP-NVUE +const dom = uni.requireNativePlugin("dom") +// #endif + +export function getElSize(name, ins) { + return new Promise((res, rej) => { + // #ifndef APP-NVUE + const el = uni.createSelectorQuery().in(ins).select('#' + name); + el.fields({ + size: true, + rect: true + }, (data) => { + if (data) { + res(data); + } else { + rej({}) + } + }).exec(); + // #endif + // #ifdef APP-NVUE + let _el = ins.$refs[name][0] + if (!_el) { + _el = ins.$refs[name] + } + dom.getComponentRect(_el, (data) => { + if (data.result) { + res(data.size) + } else { + rej({}) + } + }) + // #endif + }) +} + +export function getTouchPoint(e) { + if (!e) { + return { + x: 0, + y: 0, + sX: 0, + sY: 0 + } + } + if (e.touches && e.touches[0]) { + return { + x: e.touches[0].pageX, + y: e.touches[0].pageY, + sX: e.touches[0].screenX, + sY: e.touches[0].screenY + } + } else if (e.changedTouches && e.changedTouches[0]) { + return { + x: e.changedTouches[0].pageX, + y: e.changedTouches[0].pageY, + sX: e.changedTouches[0].screenX, + sY: e.changedTouches[0].screenY + } + } else { + return { + x: e.clientX, + y: e.clientY + } + } +} + diff --git a/components/card.vue b/components/card.vue new file mode 100644 index 0000000..7f9c8aa --- /dev/null +++ b/components/card.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/components/index/eventList.vue b/components/index/eventList.vue deleted file mode 100644 index 729a3c5..0000000 --- a/components/index/eventList.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packageA/pages/messageDetail/messageDetail.vue b/packageA/pages/messageDetail/messageDetail.vue deleted file mode 100644 index 2baf8c4..0000000 --- a/packageA/pages/messageDetail/messageDetail.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - diff --git a/packageA/pages/search/search.vue b/packageA/pages/search/search.vue index cc60526..3d55f0c 100644 --- a/packageA/pages/search/search.vue +++ b/packageA/pages/search/search.vue @@ -19,7 +19,7 @@ - + @@ -45,11 +45,11 @@ + + \ No newline at end of file diff --git a/packageB/components/record.vue b/packageB/components/record.vue index 6086ba5..95f1aa9 100644 --- a/packageB/components/record.vue +++ b/packageB/components/record.vue @@ -3,7 +3,10 @@ {{item.code}} - {{item.time}} + + + {{item.time}} + {{item.status}} @@ -57,7 +60,7 @@ justify-content: space-between; background: #fff; border-radius: 16rpx; - box-shadow: 4px 5px 7px #ccc; + box-shadow: 2rpx 2rpx 8rpx rgba(0, 0, 0, 0.2); margin-top: 32rpx; padding: 40rpx 32rpx; &:first-child { @@ -72,8 +75,10 @@ color: #000; } .time { + display: flex; + align-items: center; margin-top: 20rpx; - color: #333; + color: #a0a1a4; } } .right { diff --git a/packageB/messageDetail/messageDetail.vue b/packageB/messageDetail/messageDetail.vue new file mode 100644 index 0000000..5f3b72a --- /dev/null +++ b/packageB/messageDetail/messageDetail.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/packageB/messageList/messageList.vue b/packageB/messageList/messageList.vue index 58a4a51..4651053 100644 --- a/packageB/messageList/messageList.vue +++ b/packageB/messageList/messageList.vue @@ -30,8 +30,12 @@ @@ -49,7 +53,7 @@ + + diff --git a/packageC/rumorWebView/rumorWebView.vue b/packageC/rumorWebView/rumorWebView.vue new file mode 100644 index 0000000..40fabdc --- /dev/null +++ b/packageC/rumorWebView/rumorWebView.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/pages.json b/pages.json index 32ca911..980d2ab 100644 --- a/pages.json +++ b/pages.json @@ -24,7 +24,9 @@ "style" : { "navigationBarTitleText": "侵权举报", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } }, { @@ -32,15 +34,18 @@ "style" : { "navigationBarTitleText": "谣言查证", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white", + "disableScroll":true } } ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "新疆网络举报", - "navigationBarBackgroundColor": "#4390f7", - "backgroundColor": "#4390f7" + "navigationBarBackgroundColor": "#4390f7" + // "backgroundColor": "#4390f7" }, "tabBar": { "color": "#424242", @@ -78,14 +83,6 @@ "root": "packageA",//分包名 "pages": [ { - "path" : "pages/messageDetail/messageDetail", - "style" : - { - "navigationBarTitleText": "网信信息详情", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/search/search", "style" : { @@ -165,46 +162,80 @@ "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } - },{ - "path" : "recordDetail/recordDetail", - "style" : - { - "navigationBarTitleText": "详细信息", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, + }, + { + "path" : "recordDetail/recordDetail", + "style" : { - "path" : "center/center", - "style" : - { - "navigationBarTitleText": "举报中心", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } - }, - { - "path" : "report/report", - "style" : - { - "navigationBarTitleText": "发布举报", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4390f7", - "navigationBarTextStyle": "white" - } + "navigationBarTitleText": "详细信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" } - ,{ - "path" : "messageList/messageList", - "style" : + }, + { + "path" : "center/center", + "style" : + { + "navigationBarTitleText": "举报中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "report/report", + "style" : { - "navigationBarTitleText": "网信信息列表", - "enablePullDownRefresh": true, + "navigationBarTitleText": "发布举报", + "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#4390f7", "navigationBarTextStyle": "white" } + }, + { + "path" : "messageList/messageList", + "style" : + { + "navigationBarTitleText": "网信信息列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + }, + { + "path" : "messageDetail/messageDetail", + "style" : + { + "navigationBarTitleText": "网信信息详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#eef2fe" + } + }, + { + "path" : "supervisor/supervisor", + "style" : + { + "navigationBarTitleText": "申请流程", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#4390f7", + "navigationBarTextStyle": "white" + } + } + ] + }, + { + "root": "packageC",//分包名 + "pages": [ + { + "path" : "rumorWebView/rumorWebView", + "style" : + { + "navigationBarTitleText": "11", + "enablePullDownRefresh": false + } } ] - }] + } + ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index 4b08bc9..355f531 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,7 +3,7 @@ - + @@ -137,7 +137,7 @@ url: '/packageB/center/center' }) } - else if(val === 'rule' || val === 'status') { // 法律法规、工作动态 + else if(val === 'rules' || val === 'status') { // 法律法规、工作动态 let tabIndex = 0; if(val === 'status') { tabIndex = 1; @@ -147,9 +147,9 @@ wx.navigateTo({ url: `/packageB/messageList/messageList?tabIndex=${tabIndex}` }) - } else if(val === 'search') { // 成为监督员 + } else if(val === 'jdy') { // 成为监督员 wx.navigateTo({ - url: `/packageA/pages/search/search` + url: `/packageB/supervisor/supervisor` }) } } diff --git a/pages/rumor/rumor.vue b/pages/rumor/rumor.vue index 2d3e3af..f894b33 100644 --- a/pages/rumor/rumor.vue +++ b/pages/rumor/rumor.vue @@ -1,22 +1,198 @@ -