From 16ef990815128b483f87f9bc0516f8135b3bd0a9 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Fri, 10 Apr 2020 20:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/_common/color.js | 59 ++++++++++ components/_common/data-hook.js | 17 +++ components/_common/extra-props.js | 9 ++ components/_common/is-iphonex.js | 12 ++ components/_common/jan-component.js | 24 ++++ components/_common/mixin-component.js | 21 ++++ components/_common/open-type.js | 49 ++++++++ components/_common/scroll-view.js | 36 ++++++ components/_common/type-of.js | 4 + components/_common/utils.wxs | 16 +++ components/refresh-view/index.js | 56 --------- components/refresh-view/index.json | 4 - components/refresh-view/index.wxml | 9 -- components/refresh-view/index.wxs | 158 -------------------------- components/refresh-view/index.wxss | 68 ----------- components/refresher/.DS_Store | Bin 0 -> 6148 bytes components/refresher/index.js | 116 +++++++++++++++++++ components/refresher/index.json | 5 + components/refresher/index.wxml | 10 ++ components/refresher/index.wxss | 33 ++++++ pages/mall/index/index.json | 2 +- pages/mall/search-list/index.json | 2 +- pages/mall/shops/index.json | 2 +- pages/mall/shops/index.wxml | 13 +-- pages/message/index.json | 2 +- pages/refresh/refresh.js | 33 ++++++ pages/refresh/refresh.json | 5 + pages/refresh/refresh.wxml | 6 + pages/refresh/refresh.wxss | 10 ++ 29 files changed, 473 insertions(+), 308 deletions(-) create mode 100644 components/_common/color.js create mode 100644 components/_common/data-hook.js create mode 100644 components/_common/extra-props.js create mode 100644 components/_common/is-iphonex.js create mode 100644 components/_common/jan-component.js create mode 100644 components/_common/mixin-component.js create mode 100644 components/_common/open-type.js create mode 100644 components/_common/scroll-view.js create mode 100644 components/_common/type-of.js create mode 100644 components/_common/utils.wxs delete mode 100644 components/refresh-view/index.js delete mode 100644 components/refresh-view/index.json delete mode 100644 components/refresh-view/index.wxml delete mode 100644 components/refresh-view/index.wxs delete mode 100644 components/refresh-view/index.wxss create mode 100644 components/refresher/.DS_Store create mode 100644 components/refresher/index.js create mode 100644 components/refresher/index.json create mode 100644 components/refresher/index.wxml create mode 100644 components/refresher/index.wxss create mode 100644 pages/refresh/refresh.js create mode 100644 pages/refresh/refresh.json create mode 100644 pages/refresh/refresh.wxml create mode 100644 pages/refresh/refresh.wxss diff --git a/components/_common/color.js b/components/_common/color.js new file mode 100644 index 0000000..e17ec41 --- /dev/null +++ b/components/_common/color.js @@ -0,0 +1,59 @@ +const hex2Rgb = function(color) { + let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/ + color = color.toLowerCase() + if (color.length == 9) color = color.slice(0, 7) + if (reg.test(color)) { + if (color.length === 4) { + let colorNew = "#" + for (let i = 1; i < 4; i += 1) { + colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1)) + } + color = colorNew + } + let colorChange = [] + for (let i = 1; i < 7; i += 2) { + colorChange.push(parseInt("0x" + color.slice(i, i + 2))) + } + return colorChange + } else { + if (color.includes("rgb")) { + color = color + .replace(/(rgba|rgb)/, "") + .replace("(", "") + .replace(")", "") + + if (color.includes(",")) { + return color + .split(",") + .map(item => item * 1) + .slice(0, 3) + } else { + return [0, 0, 0] + } + } else { + return [0, 0, 0] + } + } +} + +const isTextDeepColor = function(backgroundRgbArr = [255, 255, 255]) { + if ( + !( + backgroundRgbArr instanceof Array && + backgroundRgbArr.length === 3 && + backgroundRgbArr.every(item => item >= 0 && item <= 255) + ) + ) + return false + + const grayLevel = + backgroundRgbArr[0] * 0.299 + + backgroundRgbArr[1] * 0.587 + + backgroundRgbArr[2] * 0.114 + return grayLevel >= 192 +} + +module.exports = { + hex2Rgb, + isTextDeepColor +} diff --git a/components/_common/data-hook.js b/components/_common/data-hook.js new file mode 100644 index 0000000..5a86143 --- /dev/null +++ b/components/_common/data-hook.js @@ -0,0 +1,17 @@ +const dataHook = function(dataList = [], hook) { + if ( + !dataList instanceof Array || + !dataList.length || + !dataList.every(item => typeof item == "string") + ) + return {} + if (!hook instanceof Function) hook = () => void 0 + let obj = { + observers: {} + }, + key = dataList.join(",") + obj["observers"][key] = hook + return obj +} + +module.exports = dataHook diff --git a/components/_common/extra-props.js b/components/_common/extra-props.js new file mode 100644 index 0000000..9c39809 --- /dev/null +++ b/components/_common/extra-props.js @@ -0,0 +1,9 @@ +const extraProps = function(props, extra) { + if (typeof extra !== "object") return props + for (let key in props) { + if (extra[key]) props[key] = extra[key] + } + return props +} + +module.exports = extraProps diff --git a/components/_common/is-iphonex.js b/components/_common/is-iphonex.js new file mode 100644 index 0000000..0aa4ca5 --- /dev/null +++ b/components/_common/is-iphonex.js @@ -0,0 +1,12 @@ +function isIphoneX() { + var systemInfo = wx.getSystemInfoSync() + return !!( + systemInfo && + systemInfo.model && + systemInfo.model.indexOf("iPhone X") > -1 + ) +} + +module.exports = { + isIphoneX: isIphoneX +} diff --git a/components/_common/jan-component.js b/components/_common/jan-component.js new file mode 100644 index 0000000..62e2b15 --- /dev/null +++ b/components/_common/jan-component.js @@ -0,0 +1,24 @@ +const mixinComponent = require("./mixin-component") + +const janComponent = function(options = {}) { + options = mixinComponent( + { + options: { + addGlobalClass: true + }, + externalClasses: ["custom-class", "customClass"], + properties: { + customClass: String + }, + data: { + _class: "", + _style: "" + }, + methods: {} + }, + options + ) + return options +} + +module.exports = janComponent diff --git a/components/_common/mixin-component.js b/components/_common/mixin-component.js new file mode 100644 index 0000000..3683701 --- /dev/null +++ b/components/_common/mixin-component.js @@ -0,0 +1,21 @@ +const typeOf = require("./type-of") + +const mixinComponent = function(origin = {}, next = {}) { + if (typeOf(origin) !== "object") origin = {} + if (typeOf(next) !== "object") next = {} + + for (let key in next) { + if (typeOf(next[key]) === "object") { + if (typeOf(origin[key]) === "object") { + origin[key] = mixinComponent(origin[key], next[key]) + } else { + origin[key] = next[key] + } + } else { + if (typeOf(origin[key]) == "undefined") origin[key] = next[key] + } + } + return origin +} + +module.exports = mixinComponent diff --git a/components/_common/open-type.js b/components/_common/open-type.js new file mode 100644 index 0000000..f643eb0 --- /dev/null +++ b/components/_common/open-type.js @@ -0,0 +1,49 @@ +const mapOpenType = function() { + return { + properties: { + openType: { + type: String, + value: "" + }, + id: String, + lang: { + type: String, + value: "en" + }, + businessId: Number, + sessionFrom: String, + sendMessageTitle: String, + sendMessagePath: String, + sendMessageImg: String, + showMessageCard: Boolean, + appParameter: String, + ariaLabel: String + }, + methods: { + $emit(type, e) { + this.triggerEvent(type, e) + }, + + bindGetUserInfo(event) { + this.$emit("getuserinfo", event.detail) + }, + bindContact(event) { + this.$emit("contact", event.detail) + }, + bindGetPhoneNumber(event) { + this.$emit("getphonenumber", event.detail) + }, + bindError(event) { + this.$emit("error", event.detail) + }, + bindLaunchApp(event) { + this.$emit("launchapp", event.detail) + }, + bindOpenSetting(event) { + this.$emit("opensetting", event.detail) + } + } + } +} + +module.exports = mapOpenType diff --git a/components/_common/scroll-view.js b/components/_common/scroll-view.js new file mode 100644 index 0000000..2cfa679 --- /dev/null +++ b/components/_common/scroll-view.js @@ -0,0 +1,36 @@ +const mapScrollView = function() { + return { + properties: { + scrollX: Boolean, + scrollY: { + type: Boolean, + value: true + }, + upperThreshold: { + type: Number, + value: 50 + }, + owerThreshold: { + type: Number, + value: 50 + }, + scrollTop: Number, + scrollLeft: Number, + scrollIntoView: String, + scrollWithAnimation: Boolean, + enableBackToTop: { + type: Boolean, + value: true + }, + enableFlex: Boolean, + scrollAnchoring: Boolean + }, + methods: { + $emit(type, e) { + this.triggerEvent(type, e) + } + } + } +} + +module.exports = mapScrollView diff --git a/components/_common/type-of.js b/components/_common/type-of.js new file mode 100644 index 0000000..6e1cf2a --- /dev/null +++ b/components/_common/type-of.js @@ -0,0 +1,4 @@ +const typeOf = obj => + /\[object (.+?)\]/g.exec(Object.prototype.toString.call(obj))[1].toLowerCase() + +module.exports = typeOf diff --git a/components/_common/utils.wxs b/components/_common/utils.wxs new file mode 100644 index 0000000..8d3b280 --- /dev/null +++ b/components/_common/utils.wxs @@ -0,0 +1,16 @@ +function addUnit(value) { + if (value == null) { + return "" + } + + if (typeof value === "string" && value.indexOf("var") > -1) { + return value + } + + if (value >= 0) return value + "px" + return value +} + +module.exports = { + addUnit: addUnit +} diff --git a/components/refresh-view/index.js b/components/refresh-view/index.js deleted file mode 100644 index 4c0f0b9..0000000 --- a/components/refresh-view/index.js +++ /dev/null @@ -1,56 +0,0 @@ -// 使用的时候，用本组件包裹可以触发下拉刷新的内容。enablePullDownRefresh需要设置为false。 -Component({ - properties: { - refreshed: { // 必选，通知本组件收起 - type: Boolean, - value: false, - }, - refreshing: { // 可选，通知本组件直接进入refreshing状态 - type: Boolean, - value: false, - }, - distMax: { // 可选，可以下拉的最大高度，回弹的高度为最大高度的75% - type: Number, - value: 45, - }, - color: { // 可选，圆弧颜色 - type: String, - value: "#000", - }, - backgroundColor: { // 可选，背景颜色 - type: String, - value: "#fff", - }, - type: { - type: Number, - value: 0 - } - }, - data: { - reachTop: false, - }, - methods: { - initObserver() { - this.observer = this.createIntersectionObserver() - this.observer.relativeToViewport().observe(".intersection-dot", (res) => { - if (res.intersectionRatio > 0) { - this.setData({ reachTop: true, }) - } else { - this.setData({ reachTop: false,}) - } - }) - }, - clearObserver() { - if (this.observer) { - this.observer.disconnect() - this.observer = null - } - }, - }, - ready() { - this.initObserver() - }, - detached() { - this.clearObserver() - }, -}) diff --git a/components/refresh-view/index.json b/components/refresh-view/index.json deleted file mode 100644 index a89ef4d..0000000 --- a/components/refresh-view/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} diff --git a/components/refresh-view/index.wxml b/components/refresh-view/index.wxml deleted file mode 100644 index eda6570..0000000 --- a/components/refresh-view/index.wxml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/components/refresh-view/index.wxs b/components/refresh-view/index.wxs deleted file mode 100644 index 224f3a8..0000000 --- a/components/refresh-view/index.wxs +++ /dev/null @@ -1,158 +0,0 @@ -// 文档：https://developers.weixin.qq.com/miniprogram/dev/framework/view/interactive-animation.html - -/* eslint-disable */ -function calcResistance(distExtra, distMax) { - return Math.min(1, distExtra / distMax / 1.2) * Math.min(distMax, distExtra) -} - -function touchStart(e, ins) { - var dataset = e.instance.getDataset() - var state = e.instance.getState() - state.distMax = dataset.distMax - state.type = dataset.type - state.distThreshold = state.distMax * 0.75 - state.reachTop = dataset.reachTop - state.status = state.status || "pending" // pending、pulling、releasing、refreshing - - if (state.status === "pending" && state.reachTop) { - state.startPulling = true - state.pullStartX = e.touches[0].clientX - state.pullStartY = e.touches[0].clientY - state.distance = 0 - - state.component = state.component || ins.selectComponent(".refresh-wrap") - state.component.removeClass("transition") - state.component.removeClass("animation") - state.component.removeClass("fadeout") - state.component.setStyle({ - top: (state.distance * 2 - 20) + "rpx", - opacity: 0, - transform: "rotate(0)", - "-webkit-transform": "rotate(0)" - }) - } -} - -function touchMove(e, ins) { - var state = e.instance.getState() - if (!state.startPulling || state.status === "refreshing") { - return true - } - state.pullMoveX = e.touches[0].clientX - state.pullMoveY = e.touches[0].clientY - if (state.status === "pending") { - state.status = "pulling" - } - var distExtraX = state.pullMoveX - state.pullStartX - var distExtraY = state.pullMoveY - state.pullStartY - if (distExtraY > 0 && Math.abs(distExtraY) >= Math.abs(distExtraX)) { - state.distance = calcResistance(distExtraY, state.distMax) - state.component.setStyle({ - top: setop(state.distance, state.type), - opacity: Math.min(1, state.distance / state.distThreshold), - transform: "rotate(" + (245 * state.distance / state.distMax) + "deg)", - "-webkit-transform": "rotate(" + (245 * state.distance / state.distMax) + "deg)" - }) - - if (state.status === "pulling" && state.distance > state.distThreshold) { - state.status = "releasing" - } - if (state.status === "releasing" && state.distance < state.distThreshold) { - state.status = "pulling" - } - return false - } - return true -} - -function touchEnd(e, ins) { - var state = e.instance.getState() - - if (!state.startPulling || state.status === "refreshing") { - return - } - state.startPulling = false - if (state.status === "releasing" && state.distance > state.distThreshold) { - state.status = "refreshing" - state.distance = state.distThreshold - - state.component.addClass("animation") - state.component.setStyle({ - top: setop(state.distance, state.type), - opacity: Math.min(1, state.distance / state.distThreshold), - }) - - ins.triggerEvent("refresh") - } else { - reset(state) - } -} - -function reset(state) { - state.status = "pending" - state.startPulling = false - state.distance = 0 - state.component.addClass("transition") - state.component.setStyle({ - top: setop(state.distance, state.type), - opacity: 0, - transform: "rotate(0)", - "-webkit-transform": "rotate(0)" - }) -} - -function onRefreshed(newValue, oldValue, ins, itemIns) { - if (newValue) { - var state = itemIns.getState() - state.status = "pending" - state.startPulling = false - - var component = state.component || ins.selectComponent(".refresh-wrap") - component.removeClass("animation") - component.addClass("fadeout") - component.setStyle({ - top: (state.distance * 2 - (state.type? 12 : 30)) + "rpx", - opacity: 0, - transform: "scale(0)", - "-webkit-transform": "rotate(0)" - }) - } -} - -function setop(distance, type){ - var top = (distance * 2 + (type == 0 ? 120 : -30)) + "rpx" - return top -} - -function onRefreshing(newValue, oldValue, ins, itemIns) { - if (newValue) { - var dataset = itemIns.getDataset() - var state = itemIns.getState() - state.distMax = state.distMax || dataset.distMax - state.distThreshold = state.distThreshold || state.distMax * 0.75 - - state.status = "refreshing" - state.distance = state.distThreshold - state.startPulling = false - state.component = state.component || ins.selectComponent(".refresh-wrap") - - state.component.removeClass("transition") - state.component.removeClass("fadeout") - state.component.addClass("animation") - state.component.setStyle({ - top: setop(state.distance, state.type), - opacity: 1, - transition: "none", - }) - // ins.triggerEvent("refresh") - } -} - -module.exports = { - touchStart: touchStart, - touchMove: touchMove, - touchEnd: touchEnd, - onRefreshed: onRefreshed, - onRefreshing: onRefreshing, -} -/* eslint-enable */ diff --git a/components/refresh-view/index.wxss b/components/refresh-view/index.wxss deleted file mode 100644 index 8a665b4..0000000 --- a/components/refresh-view/index.wxss +++ /dev/null @@ -1,68 +0,0 @@ -@keyframes rolling { - 0% { - transform: rotate(135deg); - } - 100% { - transform: rotate(495deg); - } -} -@keyframes fadeout { - 0% { - opacity: 1; - transform: rotate(135deg) scale(1); - } - 100% { - opacity: 0; - transform: rotate(135deg) scale(0); - } -} -.refresh-wrap { - position: fixed; - width: 42px; - height: 42px; - left: 50%; - margin-left: -21px; - top: 50px; - z-index: 88; - background-color: #fff; - border-radius: 50%; - box-shadow: 0 0 6px 1px #ccc; - opacity: 0; - display: flex; - align-items: center; - justify-content: center; -} -.refresh-wrap.transition { - transition: top 0.3s ease-in-out, opacity 0.3s ease-in-out, transform 0.3s ease-in-out; -} -.refresh-wrap.animation { - transition: top 0.3s ease-in-out, opacity 0.3s ease-in-out; - animation: rolling 0.6s linear infinite; -} -.refresh-wrap.fadeout { - animation: fadeout 0.3s ease-in-out; -} -.refresh-wrap .refresh { - box-sizing: border-box; - width: 24px; - height: 24px; - border-radius: 50%; - border: 3px solid #000; - border-top-color: transparent !important; -} -.refresh-wrap.fadeout .refresh { - opacity: 0; -} -.wrap { - width: 100%; - height: 100%; - position: relative; -} -.wrap .intersection-dot { - position: absolute; - width: 10px; - height: 10px; - left: 0; - top: 0; - visibility: hidden; -} diff --git a/components/refresher/.DS_Store b/components/refresher/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2b2486ad6847d47ed29fe46748518ae048f2e0dd GIT binary patch literal 6148 zcmeHKyH3O~5S)c8B4|=l`U{ZwgXnY=)cgQCjsg@e#R)-~KZhCbg2)jeXwV7mO7^Vx zVLKzm_5!fw)8+zb0W@qvlQJVR&$^BxctNx}#|zH!fZbI;+|EpNh$ij5!9BLv;0~Ym zzwU=MeeLU>&~~yPj{#eK^N(|$xzZ#0U+3(c+i%u6M2>S$$v`rY3?u`G#Q^VYNptF$ zeKL>?Bm*A|=zJ(_!Y*)htVajCS^^ODjIKgmwS;m?U>7(#(nB#%C3>nwiD8~jdx^L% zaCG!^SQH-?E58>nR#)fzrG~>g$Ly1VWMIm`u@76_|Cjt_W{do3N{*6&WZ<7MV2joD zYRQj^yY8>qoH*6BcjZ!GoCyxLQbdH==r~8X^#&v0%h literal 0 HcmV?d00001 diff --git a/components/refresher/index.js b/components/refresher/index.js new file mode 100644 index 0000000..7daf27c --- /dev/null +++ b/components/refresher/index.js @@ -0,0 +1,116 @@ +/** + * 组件：refresher + * 版本：v0.0.1 + * 维护人：Meeken + */ +const janComponent = require("../_common/jan-component") +const mixinComponent = require("../_common/mixin-component") +const mapScrollView = require("../_common/scroll-view") + +/* 使用 janComponent 初始化组件配置 */ + +let options = janComponent({ + options: { + multipleSlots: true // 在组件定义时的选项中启用多slot支持 + }, + + properties: { + refresherTextStyle: { + type: String, + value: "black" + }, + refresherBackground: { + type: String, + value: "inherit" + }, + triggered: { + type: Boolean, + value: false + }, + threshold: { + type: Number, + value: 50 + }, + restoredText: { + type: String, + value: "下拉刷新" + }, + pullingText: { + type: String, + value: "松开刷新" + }, + refreshingText: { + type: String, + value: "正在刷新" + }, + useSlotStyle: Boolean + }, + + data: { + _state: "下拉刷新", + _stateCode: 0, + _process: 0 + } +}) + +options = mixinComponent(options, mapScrollView()) + +options = mixinComponent(options, { + methods: { + on2Upper(e) { + this.$emit("scrolltoupper", e) + }, + + on2Lower(e) { + this.$emit("scrolltolower", e) + }, + + onScroll(e) { + this.$emit("scroll", e) + }, + + onPulling(e) { + const dy = e.detail.dy, + threshold = this.properties.threshold + this.setData({ + _process: dy / threshold, + _stateCode: 1, + _state: dy < threshold ? + this.properties.restoredText : + this.properties.pullingText + }) + this.$emit("pulling", e) + }, + + onRefreshed(e) { + this.setData({ + _state: this.properties.refreshingText, + _stateCode: 2, + _process: 1 + }) + this.$emit("refresh", e) + }, + + onRestored(e) { + this.setData({ + _state: "", + _stateCode: 0, + _process: 0 + }) + this.$emit("restore", e) + }, + + onAbort(e) { + this.setData({ + _state: "", + _stateCode: 0, + _process: 0 + }) + this.$emit("abort", e) + } + }, + + attached() {} +}) + +Component(options) \ No newline at end of file diff --git a/components/refresher/index.json b/components/refresher/index.json new file mode 100644 index 0000000..ac34bd7 --- /dev/null +++ b/components/refresher/index.json @@ -0,0 +1,5 @@ +{ + "component": true, + "usingComponents": { + } +} diff --git a/components/refresher/index.wxml b/components/refresher/index.wxml new file mode 100644 index 0000000..3630670 --- /dev/null +++ b/components/refresher/index.wxml @@ -0,0 +1,10 @@ + + + + + + {{ _state }} + + + + \ No newline at end of file diff --git a/components/refresher/index.wxss b/components/refresher/index.wxss new file mode 100644 index 0000000..81a089f --- /dev/null +++ b/components/refresher/index.wxss @@ -0,0 +1,33 @@ +.jan-refresh--node { + width: 100%; + height: 50px; + background-color: var(--bg-color); + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.jan-refresher--safety-block { + width: 2rpx; + height: 2rpx; + bottom: -2rpx; + position: absolute; +} + +.jan-refresher--icon.refreshing { + transition: all 0.3s; + animation: rotate 0.5s linear infinite; +} + +@keyframes rotate { + 0% { + transform: rotate(0); + } + 50% { + transform: rotate(180deg); + } + 100% { + transform: rotate(360deg); + } +} diff --git a/pages/mall/index/index.json b/pages/mall/index/index.json index 1e25143..d21bbf0 100644 --- a/pages/mall/index/index.json +++ b/pages/mall/index/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "refresh-view": "/components/refresh-view/index", + "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tab": "/components/tab/index", "wux-divider": "/components/divider/index" diff --git a/pages/mall/search-list/index.json b/pages/mall/search-list/index.json index e8c48e8..3e2954b 100644 --- a/pages/mall/search-list/index.json +++ b/pages/mall/search-list/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "refresh-view": "/components/refresh-view/index", + "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tab": "/components/tab/index", "wux-image": "/components/image/index" diff --git a/pages/mall/shops/index.json b/pages/mall/shops/index.json index d3ed8b0..bf85060 100644 --- a/pages/mall/shops/index.json +++ b/pages/mall/shops/index.json @@ -5,7 +5,7 @@ "wux-skeleton-paragraph": "/components/skeleton-paragraph/index", "wux-row": "/components/row/index", "wux-col": "/components/col/index", - "refresh-view": "/components/refresh-view/index", + "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tab": "/components/tab/index", "wux-image": "/components/image/index", diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml index 6d58f3e..4195cbd 100644 --- a/pages/mall/shops/index.wxml +++ b/pages/mall/shops/index.wxml @@ -3,12 +3,6 @@ 原纸商城 - - - @@ -79,6 +73,7 @@ 暂无数据 + @@ -86,7 +81,8 @@ - + + @@ -153,5 +149,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/message/index.json b/pages/message/index.json index 6922df7..5c41559 100644 --- a/pages/message/index.json +++ b/pages/message/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "refresh-view": "/components/refresh-view/index", + "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index" } } \ No newline at end of file diff --git a/pages/refresh/refresh.js b/pages/refresh/refresh.js new file mode 100644 index 0000000..4e2d90f --- /dev/null +++ b/pages/refresh/refresh.js @@ -0,0 +1,33 @@ +// refresh.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + refresherState: false + }, + + onRefresh(e) { + this.setData({ + refresherState: true + }) + setTimeout(() => { + this.setData({ + refresherState: false + }) + }, 3000) + }, + + onLoad() { + setTimeout(() => { + this.setData({ + refresherState: true + }) + }, 3000) + }, + + onPulling(e) { + console.log(e) + } +}) \ No newline at end of file diff --git a/pages/refresh/refresh.json b/pages/refresh/refresh.json new file mode 100644 index 0000000..5eeb0b0 --- /dev/null +++ b/pages/refresh/refresh.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "refresh-view": "/components/refresher/index" + } +} \ No newline at end of file diff --git a/pages/refresh/refresh.wxml b/pages/refresh/refresh.wxml new file mode 100644 index 0000000..94789d7 --- /dev/null +++ b/pages/refresh/refresh.wxml @@ -0,0 +1,6 @@ + + + + + 师德师风 + \ No newline at end of file diff --git a/pages/refresh/refresh.wxss b/pages/refresh/refresh.wxss new file mode 100644 index 0000000..34c1fb2 --- /dev/null +++ b/pages/refresh/refresh.wxss @@ -0,0 +1,10 @@ +.test-block { + width: 100vw; + height: 500px; + background: pink; +} +/* +.yoo { + width: 100vw; + height: 400px; +} */