From 143b52489dba78aae16d52894a3b97f58dac41a6 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 12 Apr 2021 21:36:31 +0800
Subject: [PATCH] no message
---
app.js | 1 +
components/notify/index.js | 60 -----------------------------
components/notify/index.json | 6 ---
components/notify/index.wxml | 7 ----
components/notify/index.wxss | 1 -
components/notify/notify.js | 42 --------------------
pages/home/index/index.wxml | 4 +-
pages/home/mobile/index.wxml | 4 +-
pages/index/index.js | 5 +--
pages/message/notification/index.js | 1 +
pages/process/index/index.wxml | 5 ++-
11 files changed, 12 insertions(+), 124 deletions(-)
delete mode 100644 components/notify/index.js
delete mode 100644 components/notify/index.json
delete mode 100644 components/notify/index.wxml
delete mode 100644 components/notify/index.wxss
delete mode 100644 components/notify/notify.js
diff --git a/app.js b/app.js
index 328a15b..473285d 100644
--- a/app.js
+++ b/app.js
@@ -5,6 +5,7 @@ App({
version: 152,
xAppId: '503258978847953926',
userInfo: null,
+ msgIdList: [],
//----------------------------------------------globalData--------------------------------------
globalData: {
token: null,
diff --git a/components/notify/index.js b/components/notify/index.js
deleted file mode 100644
index 50ea385..0000000
--- a/components/notify/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { VantComponent } from '../common/component';
-import { WHITE } from '../common/color';
-VantComponent({
- props: {
- message: String,
- background: String,
- type: {
- type: String,
- value: 'danger'
- },
- color: {
- type: String,
- value: WHITE
- },
- duration: {
- type: Number,
- value: 3000
- },
- zIndex: {
- type: Number,
- value: 110
- },
- safeAreaInsetTop: {
- type: Boolean,
- value: false
- }
- },
- data: {
- show: false,
- },
- created() {
- const { statusBarHeight } = wx.getSystemInfoSync();
- this.setData({ statusBarHeight });
- },
- methods: {
- show() {
- const { duration, onOpened } = this.data;
- clearTimeout(this.timer);
- this.setData({ show: true });
- wx.nextTick(onOpened);
- if (duration > 0 && duration !== Infinity) {
- this.timer = setTimeout(() => {
- this.hide();
- }, duration);
- }
- },
- hide() {
- const { onClose } = this.data;
- clearTimeout(this.timer);
- this.setData({ show: false });
- wx.nextTick(onClose);
- },
- onTap(event) {
- const { onClick } = this.data;
- if (onClick) {
- onClick(event.detail);
- }
- }
- }
-});
diff --git a/components/notify/index.json b/components/notify/index.json
deleted file mode 100644
index c14a65f..0000000
--- a/components/notify/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "component": true,
- "usingComponents": {
- "van-transition": "../transition/index"
- }
-}
diff --git a/components/notify/index.wxml b/components/notify/index.wxml
deleted file mode 100644
index 58232ef..0000000
--- a/components/notify/index.wxml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- {{ message }}
-
-
\ No newline at end of file
diff --git a/components/notify/index.wxss b/components/notify/index.wxss
deleted file mode 100644
index 3b4aba6..0000000
--- a/components/notify/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}
\ No newline at end of file
diff --git a/components/notify/notify.js b/components/notify/notify.js
deleted file mode 100644
index 767c6e2..0000000
--- a/components/notify/notify.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { WHITE } from '../common/color';
-const defaultOptions = {
- selector: '#van-notify',
- type: 'danger',
- message: '',
- background: '',
- duration: 3000,
- zIndex: 110,
- color: WHITE,
- safeAreaInsetTop: false,
- onClick: () => { },
- onOpened: () => { },
- onClose: () => { }
-};
-function parseOptions(message) {
- return typeof message === 'string' ? { message } : message;
-}
-function getContext() {
- const pages = getCurrentPages();
- return pages[pages.length - 1];
-}
-export default function Notify(options) {
- options = Object.assign(Object.assign({}, defaultOptions), parseOptions(options));
- const context = options.context || getContext();
- const notify = context.selectComponent(options.selector);
- delete options.context;
- delete options.selector;
- if (notify) {
- notify.setData(options);
- notify.show();
- return notify;
- }
- console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确');
-}
-Notify.clear = function (options) {
- options = Object.assign(Object.assign({}, defaultOptions), parseOptions(options));
- const context = options.context || getContext();
- const notify = context.selectComponent(options.selector);
- if (notify) {
- notify.hide();
- }
-};
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 43536e4..72a779a 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -88,12 +88,12 @@
修改手机号码
-
+
diff --git a/pages/home/mobile/index.wxml b/pages/home/mobile/index.wxml
index cc2553e..54279a4 100644
--- a/pages/home/mobile/index.wxml
+++ b/pages/home/mobile/index.wxml
@@ -23,4 +23,6 @@
提交
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 82bf947..c64d32e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -52,11 +52,8 @@ Scene({
}
},
fetchMessage: function(){
- getMessageList({productType: 'ZTB_FACTORY'}).then(result => {
+ getMessageList({ productType: 'ZTB_FACTORY', status: 0 }).then(result => {
if(result.data && result.data.records && result.data.records.length){
- // if(result.data.records[0].status == 1){
- // return
- // }
let pages = getCurrentPages() //当前页面栈
let nowPage = pages[pages.length - 1] //当前页面
if(nowPage.onNotice){
diff --git a/pages/message/notification/index.js b/pages/message/notification/index.js
index 065ea09..9be9b24 100644
--- a/pages/message/notification/index.js
+++ b/pages/message/notification/index.js
@@ -1,5 +1,6 @@
// pages/setting/notification.js
import { readMessage } from "../../../api/saas"
+const util = require('../../../utils/util')
const app = getApp()
Component({
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 6b4daef..f57d146 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -105,6 +105,10 @@
千鸟代付额度
+
+ 查看详情
+
+
@@ -125,7 +129,6 @@
-