Merge pull request #349 from panweil/master

#3 #23  可滚动界面的代码

1514080901123/app.json

@@ -10,7 +10,60 @@
     "pages/gongshi/333/F2L",
     "pages/gongshi/333/OLL",
     "pages/gongshi/333/PLL",
-    "pages/jiaocheng/jiaocheng"
+    "pages/jilu/jiaocheng",
+    "pages/jilu/WR",
+    "pages/zixun/huizong",
+    "pages/jilu/NR",
+    "pages/jiaocheng/index",
+    "pages/jiaocheng/url/3url",
+    "pages/match/match",
+    "pages/top10/top10",
+    "pages/top10/333",
+    "pages/jiaocheng/url/2url",
+    "pages/jiaocheng/url/4url",
+    "pages/jiaocheng/url/5url",
+    "pages/jiaocheng/url/3BFurl",
+    "pages/jiaocheng/url/CFOPurl",
+    "pages/jiaocheng/url/YAUurl",
+    "pages/jiaocheng/url/CFOP/CROSS",
+    "pages/jiaocheng/url/CFOP/F2L",
+    "pages/jiaocheng/url/CFOP/OLL",
+    "pages/jiaocheng/url/CFOP/jieshao",
+    "pages/top10/444",
+    "pages/top10/555",
+    "pages/top10/666",
+    "pages/top10/777",
+    "pages/top10/222",
+    "pages/top10/3BF",
+    "pages/top10/3FM",
+    "pages/top10/3OH",
+    "pages/top10/3WF",
+    "pages/top10/MEGA",
+    "pages/top10/PY",
+    "pages/top10/CLK",
+    "pages/top10/SK",
+    "pages/top10/SQ1",
+    "pages/top10/4BF",
+    "pages/top10/5BF",
+    "pages/top10/MBF",
+    "pages/timer/timer",
+    "pages/tongji/tongji",
+    "pages/tongji/collect/alltop",
+    "pages/tongji/collect/2-5",
+    "pages/tongji/collect/gedi",
+    "pages/tongji/collect/medal",
+    "pages/tongji/collect/damanguan",
+    "pages/tongji/collect/jilushu",
+    "pages/tongji/collect/matchjilu",
+    "pages/tongji/collect/jilutime",
+    "pages/tongji/collect/matchnum",
+    "pages/tongji/collect/peoplenum",
+    "pages/tongji/collect/singlenum",
+    "pages/tongji/collect/saishicishu",
+    "pages/tongji/collect/personnum",
+    "pages/tongji/collect/yearnum",
+    "pages/rubikbrand/brand",
+    "pages/rubikbrand/rubik/qiyi"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -26,8 +79,8 @@
     "position": "button",
     "list": [
       {
-        "pagePath": "pages/recond/WR",
-        "text": "纪录",
+        "pagePath": "pages/zixun/huizong",
+        "text": "资讯",
         "iconPath": "pages/example/images/WR/2a.png",
         "selectedIconPath": "pages/example/images/WR/2.png"
       },

1514080901123/pages/gongshi/333/333.js

@@ -0,0 +1,66 @@
+// pages/gongshi/333/333.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

1514080901123/pages/gongshi/333/333.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "三速公式"
+}

1514080901123/pages/gongshi/333/333.wxml

@@ -0,0 +1,43 @@
+<!--pages/gongshi/333/333.wxml-->
+<view class="page__hd">
+        <view class="page__title">三速公式</view>
+    </view>
+<scroll-view class="page" scroll-y="true" style="">
+    <view class="page__bd">
+        <view class="weui-panel weui-panel_access">
+            <view class="weui-panel__bd">
+             <navigator url="./F2L" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+                    <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
+                        <image class="weui-media-box__thumb" src="/pages/example/images/333gongshi/image_F2L_001.png" ></image>
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">F2L</view>
+                        <view class="weui-media-box__desc">同时完成两层</view>
+                    </view>
+              </navigator>
+             <navigator url="./OLL" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+                    <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
+                        <image class="weui-media-box__thumb" src="/pages/example/images/333gongshi/image_OLL_001.png" ></image>
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">OLL</view>
+                        <view class="weui-media-box__desc">调整顶面色向</view>
+                    </view>
+              </navigator>
+             <navigator url="./PLL" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+                    <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
+                        <image class="weui-media-box__thumb" src="/pages/example/images/333gongshi/image_PLL_001.png" ></image>
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">PLL</view>
+                        <view class="weui-media-box__desc">调整顶面位置</view>
+                    </view>
+              </navigator>
+
+
+
+            </view>
+        </view>
+
+      </view>
+</scroll-view>

1514080901123/pages/gongshi/333/333.wxss

@@ -0,0 +1 @@
+/* pages/gongshi/333/333.wxss */