diff --git a/components/listView/index.js b/components/listView/index.js index 23b2149..42e3cad 100644 --- a/components/listView/index.js +++ b/components/listView/index.js @@ -66,7 +66,6 @@ Component({ }else{ heightStyle = `height:${this.properties.height*2}rpx` } - console.log(heightStyle); this.setData({ heightStyle:heightStyle }) diff --git a/components/listView/index.wxml b/components/listView/index.wxml index 7cd68ff..c195cb0 100644 --- a/components/listView/index.wxml +++ b/components/listView/index.wxml @@ -1,9 +1,8 @@ + refresher-triggered="{{refresherTriggered}}" style="{{heightStyle}}" enhanced + bindscroll="scrolling" class="scroll-view" id="scrollView" show-scrollbar="{{false}}"> - diff --git a/components/listView/index.wxss b/components/listView/index.wxss index b83fa71..bdfaa16 100644 --- a/components/listView/index.wxss +++ b/components/listView/index.wxss @@ -21,4 +21,8 @@ width:100%;height:1rpx; background-color: rgba(136, 136, 136, 0.25); z-index: -1; +} + +.scroll-view-top-margin{ + height:1rpx; } \ No newline at end of file diff --git a/components/modalView/index.wxml b/components/modalView/index.wxml index 86d41c2..20117e9 100644 --- a/components/modalView/index.wxml +++ b/components/modalView/index.wxml @@ -13,7 +13,7 @@ - {{content}} diff --git a/components/modalView/index.wxss b/components/modalView/index.wxss index df4db95..d8ba908 100644 --- a/components/modalView/index.wxss +++ b/components/modalView/index.wxss @@ -56,7 +56,7 @@ border: 1.2px solid rgba(85, 85, 85, 0.3); border-radius: 18rpx; margin:30rpx 0; - padding:24rpx 20rpx; + padding:22rpx 20rpx; font-size: 34rpx; width:100%; box-sizing: border-box; diff --git a/package-lock.json b/package-lock.json index 9c7da53..2406d0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,23 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "@beefast-wxmp/list-view": "^0.0.1", + "@beefast-wxmp/modal-view": "^0.1.7", "@tencentcloud/donut-push": "^8.4.1" } }, + "node_modules/@beefast-wxmp/list-view": { + "version": "0.0.1", + "resolved": "https://packages.aliyun.com/6486fc420ce788fc1c0798b3/npm/repo-glpby/@beefast-wxmp/list-view/-/@beefast-wxmp/list-view-0.0.1.tgz", + "integrity": "sha512-XoTaXRqy8EuuHECGS2zFzAeDKoGDtC56VdahnVYTAcDLNo3fceQuXI2KhOSvjnn4Jbkt1UDch7IEuF9Eekf9eg==", + "license": "ISC" + }, + "node_modules/@beefast-wxmp/modal-view": { + "version": "0.1.7", + "resolved": "https://packages.aliyun.com/6486fc420ce788fc1c0798b3/npm/repo-glpby/@beefast-wxmp/modal-view/-/@beefast-wxmp/modal-view-0.1.7.tgz", + "integrity": "sha512-lw7gdhxSfCdNW7sD9FuFgaFUih8+yf8TSJ2gX7ZUnnMEK6RIL6QxAEEj6LUJ+SHE6QuBegPb4ucrfAFVAd8s8A==", + "license": "ISC" + }, "node_modules/@tencentcloud/donut-push": { "version": "8.4.1", "resolved": "https://registry.npmmirror.com/@tencentcloud/donut-push/-/donut-push-8.4.1.tgz", @@ -19,6 +33,16 @@ } }, "dependencies": { + "@beefast-wxmp/list-view": { + "version": "0.0.1", + "resolved": "https://packages.aliyun.com/6486fc420ce788fc1c0798b3/npm/repo-glpby/@beefast-wxmp/list-view/-/@beefast-wxmp/list-view-0.0.1.tgz", + "integrity": "sha512-XoTaXRqy8EuuHECGS2zFzAeDKoGDtC56VdahnVYTAcDLNo3fceQuXI2KhOSvjnn4Jbkt1UDch7IEuF9Eekf9eg==" + }, + "@beefast-wxmp/modal-view": { + "version": "0.1.7", + "resolved": "https://packages.aliyun.com/6486fc420ce788fc1c0798b3/npm/repo-glpby/@beefast-wxmp/modal-view/-/@beefast-wxmp/modal-view-0.1.7.tgz", + "integrity": "sha512-lw7gdhxSfCdNW7sD9FuFgaFUih8+yf8TSJ2gX7ZUnnMEK6RIL6QxAEEj6LUJ+SHE6QuBegPb4ucrfAFVAd8s8A==" + }, "@tencentcloud/donut-push": { "version": "8.4.1", "resolved": "https://registry.npmmirror.com/@tencentcloud/donut-push/-/donut-push-8.4.1.tgz", diff --git a/package.json b/package.json index a95f7e9..e15c829 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "author": "", "license": "ISC", "dependencies": { + "@beefast-wxmp/list-view": "^0.0.1", + "@beefast-wxmp/modal-view": "^0.1.7", "@tencentcloud/donut-push": "^8.4.1" } } diff --git a/pages/index/index.json b/pages/index/index.json index ef8827c..963cce3 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,8 +1,8 @@ { "usingComponents": { - "list-view":"/components/listView", + "list-view":"/miniprogram_npm/@beefast-wxmp/list-view", "swipe-button":"/components/swipeButton", - "modal-view":"/components/modalView", + "modal-view":"/miniprogram_npm/@beefast-wxmp/modal-view", "background-notice":"/components/background-notice", "mark-up":"./mark-up" }, diff --git a/pages/index/mark-up/index.json b/pages/index/mark-up/index.json index 0bef832..f14e6c6 100644 --- a/pages/index/mark-up/index.json +++ b/pages/index/mark-up/index.json @@ -1,7 +1,7 @@ { "component": true, "usingComponents": { - "modal-view":"/components/modalView", + "modal-view":"/miniprogram_npm/@beefast-wxmp/modal-view", "number-box":"/components/number-box", "img-uploader":"/components/img-uploader" }, diff --git a/pages/index/mark-up/index.wxss b/pages/index/mark-up/index.wxss index 93418d9..f29792f 100644 --- a/pages/index/mark-up/index.wxss +++ b/pages/index/mark-up/index.wxss @@ -11,7 +11,7 @@ height:128rpx; font-size: 30rpx; width: 100%; - padding:24rpx; + padding:20rpx 20rpx; box-sizing:border-box; } .mark-up-view .img-uploader{ diff --git a/pages/order-detail/index.json b/pages/order-detail/index.json index 5566d32..18127ee 100644 --- a/pages/order-detail/index.json +++ b/pages/order-detail/index.json @@ -1,7 +1,7 @@ { "usingComponents": { "swipe-button":"/components/swipeButton", - "modal-view":"/components/modalView", + "modal-view":"/miniprogram_npm/@beefast-wxmp/modal-view", "mark-up":"../index/mark-up" }, "navigationBarTitleText": "订单详情" diff --git a/pages/user/bank/index/index.json b/pages/user/bank/index/index.json index cf58a31..ddc175e 100644 --- a/pages/user/bank/index/index.json +++ b/pages/user/bank/index/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "modal-view":"/components/modalView" + "modal-view":"/miniprogram_npm/@beefast-wxmp/modal-view" }, "navigationBarTitleText": "银行卡管理" } \ No newline at end of file diff --git a/pages/user/income/index.json b/pages/user/income/index.json index 78f6de8..0f1ba39 100644 --- a/pages/user/income/index.json +++ b/pages/user/income/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "list-view":"/components/listView" + "list-view":"/miniprogram_npm/@beefast-wxmp/list-view" }, "navigationBarTitleText": "交易明细" } \ No newline at end of file diff --git a/pages/withdraw/list/index.json b/pages/withdraw/list/index.json index eaa6df3..1239d1f 100644 --- a/pages/withdraw/list/index.json +++ b/pages/withdraw/list/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "list-view":"/components/listView" + "list-view":"/miniprogram_npm/@beefast-wxmp/list-view" }, "navigationBarTitleText": "提现记录" } \ No newline at end of file