Merge pull request hzuapps#374 from ZHIHAOC/master

hzuapps#3 hzuapps#29 第3次实验代码

1514080901105/pages/logs/logs.js

@@ -1,15 +1,223 @@
-//logs.js
-const util = require('../../utils/util.js')
-
 Page({
   data: {
-    logs: []
+    list: [
+      {
+        id: 'form',
+        name: '北京',
+        open: false,
+        pages: ['button', 'list', 'input', 'slider', 'uploader']
+      },
+      {
+        id: 'widget',
+        name: '河北',
+        open: false,
+        pages: ['article', 'badge', 'flex', 'footer', 'gallery', 'grid', 'icons', 'loadmore', 'panel', 'preview', 'progress']
+      },
+      {
+        id: 'feedback',
+        name: '山东',
+        open: false,
+        pages: ['actionsheet', 'dialog', 'msg', 'picker', 'toast']
+      },
+      {
+        id: 'nav',
+        name: '辽宁',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'search',
+        name: '黑龙江',
+        open: false,
+        pages: ['searchbar']
+      },
+      {
+        id: 'aa',
+        name: '吉林',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ab',
+        name: '甘肃',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ac',
+        name: '青海',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ad',
+        name: '河南',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ae',
+        name: '江苏',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'af',
+        name: '湖北',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ag',
+        name: '湖南',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ah',
+        name: '江西',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ai',
+        name: '浙江',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'aj',
+        name: '广东',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ak',
+        name: '云南',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'al',
+        name: '福建',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'am',
+        name: '台湾',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'an',
+        name: '海南',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ao',
+        name: '山西',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ap',
+        name: '四川',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'aq',
+        name: '陕西',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ar',
+        name: '贵州',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'as',
+        name: '安徽',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'at',
+        name: '重庆',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'au',
+        name: '上海',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'av',
+        name: '天津',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'aw',
+        name: '广西壮族自治区',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ax',
+        name: '内蒙古',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ay',
+        name: '西藏',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'az',
+        name: '新疆维吾尔族自治区',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'ba',
+        name: '宁夏回族自治区',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'bb',
+        name: '澳门',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+      {
+        id: 'bc',
+        name: '香港',
+        open: false,
+        pages: ['navbar', 'tabbar']
+      },
+    ]
   },
-  onLoad: function () {
+  kindToggle: function (e) {
+    var id = e.currentTarget.id, list = this.data.list;
+    for (var i = 0, len = list.length; i < len; ++i) {
+      if (list[i].id == id) {
+        list[i].open = !list[i].open
+      } else {
+        list[i].open = false
+      }
+    }
     this.setData({
-      logs: (wx.getStorageSync('logs') || []).map(log => {
-        return util.formatTime(new Date(log))
-      })
-    })
+      list: list
+    });
   }
-})
+});

1514080901105/pages/logs/logs.json

@@ -1,3 +1,44 @@
 {
-  "navigationBarTitleText": "查看启动日志"
+  "pages": [
+    "example/index",
+    "example/button/button",
+    "example/list/list",
+    "example/input/input",
+    "example/slider/slider",
+    "example/uploader/uploader",
+    "example/article/article",
+    "example/badge/badge",
+    "example/flex/flex",
+    "example/footer/footer",
+    "example/gallery/gallery",
+    "example/grid/grid",
+    "example/icons/icons",
+    "example/loadmore/loadmore",
+    "example/panel/panel",
+    "example/preview/preview",
+    "example/progress/progress",
+    "example/actionsheet/actionsheet",
+    "example/dialog/dialog",
+    "example/msg/msg",
+    "example/msg/msg_success",
+    "example/msg/msg_fail",
+    "example/picker/picker",
+    "example/toast/toast",
+    "example/navbar/navbar",
+    "example/tabbar/tabbar",
+    "example/searchbar/searchbar"
+  ],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "WeUI for 小程序",
+    "navigationBarBackgroundColor": "#f8f8f8",
+    "backgroundColor": "#f8f8f8"
+  },
+  "networkTimeout": {
+    "request": 10000,
+    "connectSocket": 10000,
+    "uploadFile": 10000,
+    "downloadFile": 10000
+  },
+  "debug": true
 }

1514080901105/pages/logs/logs.wxml

@@ -1,6 +1,28 @@
-<!--logs.wxml-->
-<view class="container log-list">
-  <block wx:for="{{logs}}" wx:for-item="log">
-    <text class="log-item">{{index + 1}}. {{log}}</text>
-  </block>
-</view>
+<view class="page">
+    <view class="page_hd">中国view</view>
+    <view class="page__bd page__bd_spacing">
+        <view class="kind-list">
+            <block wx:for="{{list}}" wx:key="id">
+                <view class="kind-list__item">
+                    <view id="{{item.id}}" class="weui-flex kind-list__item-hd {{item.open ? 'kind-list__item-hd_show' : ''}}" bindtap="kindToggle">
+                        <view class="weui-flex__item">{{item.name}}</view>
+                        <image class="kind-list__img" src="images/icon_nav_{{item.id}}.png"></image>
+                    </view>
+                    <view class="kind-list__item-bd {{item.open ? 'kind-list__item-bd_show' : ''}}">
+                        <view class="weui-cells {{item.open ? 'weui-cells_show' : ''}}">
+                            <block wx:for="{{item.pages}}" wx:for-item="page" wx:key="*this">
+                                <navigator url="{{page}}/{{page}}" class="weui-cell weui-cell_access">
+                                    <view class="weui-cell__bd">{{page}}</view>
+                                    <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+                                </navigator>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+    </view>
+    <view class="page__ft">
+        <image src="images/icon_footer.png" style="width: 84px; height: 19px;"></image>
+    </view>
+</view>

1514080901105/pages/logs/logs.wxss

@@ -1,8 +1,14 @@
-.log-list {
-  display: flex;
-  flex-direction: column;
-  padding: 40rpx;
-}
-.log-item {
-  margin: 10rpx;
+/*!
+ * WeUI v1.1.1 (https://github.com/weui/weui-wxss)
+ * Copyright 2017 Tencent, Inc.
+ * Licensed under the MIT license
+ */
+ .page_hd{
+  padding: 80rpx;
+  padding-bottom: 40rpx;
+  font-size: 40rpx;
+  background-color: lightblue;
+  color: #ffffff;
 }
+
+.weui-flex{-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cells{margin-top:0;opacity:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-transition:.3s;transition:.3s}.weui-cells:after,.weui-cells:before{display:none}.weui-cells_show{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}.weui-cell:before{right:15px}.kind-list__item{margin:10px 0;background-color:#fff;border-radius:2px;overflow:hidden}.kind-list__item:first-child{margin-top:0}.kind-list__img{width:30px;height:30px}.kind-list__item-hd{padding:20px;-webkit-transition:opacity .3s;transition:opacity .3s}.kind-list__item-hd_show{opacity:.4}.kind-list__item-bd{height:0;overflow:hidden}.kind-list__item-bd_show{height:auto}