diff --git a/app.js b/app.js index 4ce1751..4d26e1f 100644 --- a/app.js +++ b/app.js @@ -10,6 +10,6 @@ App({ this.globalData = { ...this.globalData, api, } }, globalData: { - userInfo: null + primaryColor: '#52c41a' } }) diff --git a/app.json b/app.json index 9d92030..17ee7db 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,26 @@ { "pages": [ - "pages/index/index" + "pages/rechargeRecord/index", + "pages/my/index", + "pages/home/index", + "pages/login/index", + "pages/recharge/index", + "pages/index/index", + "pages/meterList/index", + "pages/questions/index" ], + "tabBar": { + "list": [ + { + "pagePath": "pages/home/index", + "text": "首页" + }, + { + "pagePath": "pages/my/index", + "text": "我的" + } + ] + }, "window": { "navigationBarTextStyle": "black", "navigationBarTitleText": "Weixin", @@ -10,8 +29,13 @@ "componentFramework": "glass-easel", "sitemapLocation": "sitemap.json", "lazyCodeLoading": "requiredComponents", - "usingComponents": { - "van-button": "@vant/weapp/button/index", - "van-loading": "@vant/weapp/loading/index" - } -} + "renderer": "skyline", + "rendererOptions": { + "skyline": { + "defaultContentBox": true, + "defaultDisplayBlock": true + } + }, + "disableScroll": true, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/app.wxss b/app.wxss index 06c6fc9..057677d 100644 --- a/app.wxss +++ b/app.wxss @@ -1,10 +1,18 @@ /**app.wxss**/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; +.wrapper { + padding: 0 24rpx; box-sizing: border-box; -} +} + +.border { + border: 1rpx solid #f0f0f0; +} + +.radius12 { + border-radius: 12rpx; +} + +page { + font-size: 36rpx; + background-color: #f0f0f0; +} \ No newline at end of file diff --git a/assets/images/down.png b/assets/images/down.png new file mode 100644 index 0000000..a82024d Binary files /dev/null and b/assets/images/down.png differ diff --git a/assets/images/left.png b/assets/images/left.png new file mode 100644 index 0000000..cbac092 Binary files /dev/null and b/assets/images/left.png differ diff --git a/assets/images/right.png b/assets/images/right.png new file mode 100644 index 0000000..ccf7426 Binary files /dev/null and b/assets/images/right.png differ diff --git a/components/cell/index.js b/components/cell/index.js new file mode 100644 index 0000000..b1c2b24 --- /dev/null +++ b/components/cell/index.js @@ -0,0 +1,29 @@ +// components/cell/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + title: String, + rightArrow: { type: Boolean, value: true }, + borderBottom: Boolean, + openType: String, + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + click() { + this.triggerEvent("click") + } + } +}) \ No newline at end of file diff --git a/miniprogram_npm/@vant/weapp/divider/index.json b/components/cell/index.json similarity index 95% rename from miniprogram_npm/@vant/weapp/divider/index.json rename to components/cell/index.json index a89ef4d..e8cfaaf 100644 --- a/miniprogram_npm/@vant/weapp/divider/index.json +++ b/components/cell/index.json @@ -1,4 +1,4 @@ { "component": true, "usingComponents": {} -} +} \ No newline at end of file diff --git a/components/cell/index.wxml b/components/cell/index.wxml new file mode 100644 index 0000000..4b9a36e --- /dev/null +++ b/components/cell/index.wxml @@ -0,0 +1,28 @@ + + + + +