diff --git a/1514080901129/app.json b/1514080901129/app.json
index 78960294..f6acc033 100644
--- a/1514080901129/app.json
+++ b/1514080901129/app.json
@@ -1,12 +1,39 @@
 {
-  "pages":[
+  "pages": [
     "pages/index/index",
+    "pages/logs/index",
+    "pages/gongshi/F2L",
+    "pages/gongshi/OLL",
+    "pages/gongshi/PLL",
     "pages/logs/logs"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
+  "window": {
+    "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#abcd",
     "navigationBarTitleText": "三阶cube公式",
-    "navigationBarTextStyle":"black"
+    "navigationBarTextStyle": "black"
+  },
+  "tabBar": {
+    "color": "#aaaaaa",
+    "selectedColor": "#00ff00",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "pages/images/cube-1a.png",
+        "text": "公式"
+      },
+      {
+        "pagePath": "pages/logs/index",
+        "iconPath": "pages/images/cube-2a.png",
+        "text": "功能"
+      },
+      {
+        "pagePath": "pages/logs/logs",
+        "iconPath": "pages/images/cube-3a.png",
+        "text": "我的"
+      }
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/F2L.js b/1514080901129/pages/gongshi/F2L.js
new file mode 100644
index 00000000..5fb10743
--- /dev/null
+++ b/1514080901129/pages/gongshi/F2L.js
@@ -0,0 +1,259 @@
+// pages/gongshi/F2L.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    session: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    // 设置窗口大小
+    wx.getSystemInfo({
+      success: (res) => {
+        that.setData({
+          windowHeight: res.windowHeight - 5,
+          windowWidth: res.windowWidth
+        })
+        //console.dir(that.data.windowHeight)
+      }
+    })
+    that.setData({
+      sessions: [{
+        name: "F2L1",
+        icon: "/pages/images/image_F2L_001.bmp",
+        msg: "(RU'R'U)y'(R'U2RU'U')(R'UR)"
+      }, {
+        name: "F2L2",
+        icon: "/pages/images/image_F2L_002.bmp",
+        msg: "(U R U' R' U') y'(R' U R)"
+      }, {
+        name: "F2L3",
+        icon: "/pages/images/image_F2L_003.bmp",
+        msg: "(R'F'RU)(RU'R'F)"
+      }, {
+        name: "F2L4",
+        icon: "/pages/images/image_F2L_004.bmp",
+        msg: "(R U R' U')(RU2 R' U')(R U R')"
+      }, {
+        name: "F2L5",
+        icon: "/pages/images/image_F2L_005.bmp",
+        msg: "(RF)U(RU'R'F')(U'R')"
+      }, {
+        name: "F2L6",
+        icon: "/pages/images/image_F2L_006.bmp",
+        msg: "y'(R' U' R U)(R' U' R)"
+      }, {
+        name: "F2L7",
+        icon: "/pages/images/image_F2L_007.bmp",
+        msg: "(R U' R' U)(R U' R')"
+      }, {
+        name: "F2L8",
+        icon: "/pages/images/image_F2L_008.bmp",
+        msg: "(RU'R'U)(RU'U'R'U)(RU'R')"
+      }, {
+        name: "F2L9",
+        icon: "/pages/images/image_F2L_009.bmp",
+        msg: "(RU)F(RUR'U')F'R'"
+      }, {
+        name: "F2L10",
+        icon: "/pages/images/image_F2L_010.bmp",
+        msg: "y' (R' U R U')(R' U R)"
+      }, {
+        name: "F2L11",
+        icon: "/pages/images/image_F2L_011.bmp",
+        msg: "(R U R' U' )(R U R') "
+      }, {
+        name: "F2L12",
+        icon: "/pages/images/image_F2L_012.bmp",
+        msg: "(R U R' )2 (R U R')"
+      }, {
+        name: "F2L13",
+        icon: "/pages/images/image_F2L_013.bmp",
+        msg: "(R U' R' U) y' (R' U2 R)"
+      }, {
+        name: "F2L14",
+        icon: "/pages/images/image_F2L_014.bmp",
+        msg: "y'(R' U2)(R U R' U')R"
+      }, {
+        name: "F2L15",
+        icon: "/pages/images/image_F2L_015.bmp",
+        msg: "y'U'(R'U2)(RU'R'UR)"
+      }, {
+        name: "F2L16",
+        icon: "/pages/images/image_F2L_016.bmp",
+        msg: "y'(R'URU'U')(R'U'R)"
+      }, {
+        name: "F2L17",
+        icon: "/pages/images/image_F2L_017.bmp",
+        msg: "FU(RU'R'F')(RU'R')"
+      }, {
+        name: "F2L18",
+        icon: "/pages/images/image_F2L_018.bmp",
+        msg: "U(RU'R'U')(RU'R'U)(RU'R')"
+      }, {
+        name: "F2L19",
+        icon: "/pages/images/image_F2L_019.bmp",
+        msg: "(RU'R'U2)(RUR')"
+      }, {
+        name: "F2L20",
+        icon: "/pages/images/image_F2L_020.bmp",
+        msg: "U(R U'U')(R' U R U' )R' "
+      }, {
+        name: "F2L21",
+        icon: "/pages/images/image_F2L_021.bmp",
+        msg: "(R U'U')(R' U' R U)R'"
+      }, {
+        name: "F2L22",
+        icon: "/pages/images/image_F2L_022.bmp",
+        msg: "U'(R U')(R' U2)(R U' R')"
+      }, {
+        name: "F2L23",
+        icon: "/pages/images/image_F2L_023.bmp",
+        msg: "U' (R U R') y' (UR' U' R)"
+      }, {
+        name: "F2L24",
+        icon: "/pages/images/image_F2L_024.bmp",
+        msg: "y'U(R'U'RU')(R'U'R)"
+      }, {
+        name: "F2L25",
+        icon: "/pages/images/image_F2L_025.bmp",
+        msg: "y' (R' U' R)"
+      }, {
+        name: "F2L26",
+        icon: "/pages/images/image_F2L_026.bmp",
+        msg: "y'U(R'U'RU')(R'U'R)"
+      }, {
+        name: "F2L27",
+        icon: "/pages/images/image_F2L_027.bmp",
+        msg: "y' (R U'U')R'2 U' R2 U' R'"
+      }, {
+        name: "F2L28",
+        icon: "/pages/images/image_F2L_028.bmp",
+        msg: "(lU)(rU'r'U')l'"
+      }, {
+        name: "F2L29",
+        icon: "/pages/images/image_F2L_029.bmp",
+        msg: "U' (R U'U')(R' U2)(R U' R')"
+      }, {
+        name: "F2L30",
+        icon: "/pages/images/image_F2L_030.bmp",
+        msg: "U'(RUR'U')(RU'U'R')"
+      }, {
+        name: "F2L31",
+        icon: "/pages/images/image_F2L_031.bmp",
+        msg: "U R U' R'"
+      }, {
+        name: "F2L32",
+        icon: "/pages/images/image_F2L_032.bmp",
+        msg: "U' (R U'U' R' U)(R U R')"
+      }, {
+        name: "F2L33",
+        icon: "/pages/images/image_F2L_033.bmp",
+        msg: "y'U (R' U' R) d' (R U R')"
+      }, {
+        name: "F2L34",
+        icon: "/pages/images/image_F2L_034.bmp",
+        msg: "y'U'(R'UR)"
+      }, {
+        name: "F2L35",
+        icon: "/pages/images/image_F2L_035.bmp",
+        msg: "y'U(R'U'RU'U')(R'UR)"
+      }, {
+        name: "F2L36",
+        icon: "/pages/images/image_F2L_036.bmp",
+        msg: "y'U (R' U2)(R U'U')(R' U R)"
+      }, {
+        name: "F2L37",
+        icon: "/pages/images/image_F2L_037.bmp",
+        msg: "(R U' R' U2)y'( R' U' R)"
+      }, {
+        name: "F2L38",
+        icon: "/pages/images/image_F2L_038.bmp",
+        msg: "(RU'R'U)(RU'R'U2)(RU'R')"
+      }, {
+        name: "F2L39",
+        icon: "/pages/images/image_F2L_039.bmp",
+        msg: "U'(RUR'U)(RUR')"
+      }, {
+        name: "F2L40",
+        icon: "/pages/images/image_F2L_040.bmp",
+        msg: "(R U R')"
+      }, {
+        name: "F2L41",
+        icon: "/pages/images/image_F2L_041.bmp",
+        msg: "U' (R U' R' U)(R U R')"
+      }]
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  onEnd: function (e) {
+    console.dir(e)
+    var that = this;
+    that.setData({
+      //isLower: true,
+      sessions: that.data.sessions.concat([{
+
+      }])
+    })
+
+  },
+
+  onScroll: function () {
+    console.dir("onScroll");
+  }
+})
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/F2L.json b/1514080901129/pages/gongshi/F2L.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/1514080901129/pages/gongshi/F2L.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/F2L.wxml b/1514080901129/pages/gongshi/F2L.wxml
new file mode 100644
index 00000000..cd05045e
--- /dev/null
+++ b/1514080901129/pages/gongshi/F2L.wxml
@@ -0,0 +1,30 @@
+<!--pages/gongshi/F2L .wxml-->
+<scroll-view class="page" scroll-y="true" style="height:{{windowHeight}}px;" bindscrolltolower="onEnd" bindscroll="onScroll">
+    <view class="page__hd">
+        <view class="page__title"></view>
+        <view class="page__desc"></view>
+    </view>
+    <view class="page__bd">
+        <view class="weui-panel weui-panel_access">
+            <view class="weui-panel__hd"></view>
+            <view class="weui-panel__bd">
+                <navigator url="" wx:for="{{sessions}}" wx:key="name" 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="{{item.icon}}" />
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">({{index+1}}) {{item.name}}</view>
+                        <view class="weui-media-box__desc">{{item.msg}}</view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+        <view class="weui-loadmore" wx:if="{{isLower}}">
+            <view class="weui-loading"></view>
+            <view class="weui-loadmore__tips">正在加载</view>
+        </view>
+        <view class="weui-loadmore weui-loadmore_line" wx:if="{{isEnd}}">
+            <view class="weui-loadmore__tips weui-loadmore__tips_in-line">暂无数据</view>
+        </view>
+    </view>
+</scroll-view>
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/F2L.wxss b/1514080901129/pages/gongshi/F2L.wxss
new file mode 100644
index 00000000..e9690022
--- /dev/null
+++ b/1514080901129/pages/gongshi/F2L.wxss
@@ -0,0 +1 @@
+/* pages/gongshi/F2L.wxss */
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/OLL.js b/1514080901129/pages/gongshi/OLL.js
new file mode 100644
index 00000000..2c23ca7a
--- /dev/null
+++ b/1514080901129/pages/gongshi/OLL.js
@@ -0,0 +1,323 @@
+// pages/gongshi/OLL.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    session: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    // 设置窗口大小
+    wx.getSystemInfo({
+      success: (res) => {
+        that.setData({
+          windowHeight: res.windowHeight - 5,
+          windowWidth: res.windowWidth
+        })
+        //console.dir(that.data.windowHeight)
+      }
+    })
+    that.setData({
+      sessions: [{
+        name: "OLL1",
+        icon: "/pages/images/image_OLL_001.bmp",
+        msg: "(R U'U') (R2' F R F') U2 (R' F R F') "
+      }, {
+        name: "OLL2",
+        icon: "/pages/images/image_OLL_002.bmp",
+        msg: "(F R U R' U' F') (f R U R' U' f') "
+      }, {
+        name: "OLL3",
+        icon: "/pages/images/image_OLL_003.bmp",
+        msg: "f(R U R' U')f' U' F(R U R' U')F' "
+      }, {
+        name: "OLL4",
+        icon: "/pages/images/image_OLL_004.bmp",
+        msg: "f(R U R' U')f’UF(R U R' U')F'"
+      }, {
+        name: "OLL5",
+        icon: "/pages/images/image_OLL_005.bmp",
+        msg: "(r' U2) (R U R'U) r "
+      }, {
+        name: "OLL6",
+        icon: "/pages/images/image_OLL_006.bmp",
+        msg: "(r U'U') (R' U' R U' r') "
+      }, {
+        name: "OLL7",
+        icon: "/pages/images/image_OLL_007.bmp",
+        msg: "r U R' U R U'U' r' "
+      }, {
+        name: "OLL8",
+        icon: "/pages/images/image_OLL_008.bmp",
+        msg: "r' U' R U' R' U2 r "
+      }, {
+        name: "OLL9",
+        icon: "/pages/images/image_OLL_009.bmp",
+        msg: "(RUR’U’)(R’F)(R2UR’U’)F’ "
+      }, {
+        name: "OLL10",
+        icon: "/pages/images/image_OLL_010.bmp",
+        msg: "(R U R'U)(R'F R F') (RU'U'R')"
+      }, {
+        name: "OLL11",
+        icon: "/pages/images/image_OLL_011.bmp",
+        msg: "r'(R2 U R' U)(R U'U' R' U) M’"
+      }, {
+        name: "OLL12",
+        icon: "/pages/images/image_OLL_012.bmp",
+        msg: "M’(R’U’RU’)(R’U2RU’)M"
+      }, {
+        name: "OLL13",
+        icon: "/pages/images/image_OLL_013.bmp",
+        msg: "f (R U) (R2 U’) (R’ U R U’) f’"
+      }, {
+        name: "OLL14",
+        icon: "/pages/images/image_OLL_014.bmp",
+        msg: "R' F R U R' F' R (F U' F') "
+      }, {
+        name: "OLL15",
+        icon: "/pages/images/image_OLL_015.bmp",
+        msg: "(r' U' r) (R' U' R U) (r' U r) "
+      }, {
+        name: "OLL16",
+        icon: "/pages/images/image_OLL_016.bmp",
+        msg: "(r U r’)(R U R’ U’)(r U’ r’)"
+      }, {
+        name: "OLL17",
+        icon: "/pages/images/image_OLL_017.bmp",
+        msg: "(l U’ l’) f  (R2BR’UR’U’f’) "
+      }, {
+        name: "OLL18",
+        icon: "/pages/images/image_OLL_018.bmp",
+        msg: "(r UR’U)(R’ U’U’ r’)(r’ U’RU’)(R’ U2 r)"
+      }, {
+        name: "OLL19",
+        icon: "/pages/images/image_OLL_019.bmp",
+        msg: "(r’ RU)(RUR’U’ r)(R’2FRF’)"
+      }, {
+        name: "OLL20",
+        icon: "/pages/images/image_OLL_020.bmp",
+        msg: "(r UR’U’)M’2U(RU’R’U’)M’"
+      }, {
+        name: "OLL21",
+        icon: "/pages/images/image_OLL_021.bmp",
+        msg: "(R U'U') (R' U' R U R' U') (R U' R') "
+      }, {
+        name: "OLL22",
+        icon: "/pages/images/image_OLL_022.bmp",
+        msg: "R U'U' (R'2 U') (R2 U') R'2 U' U'R"
+      }, {
+        name: "OLL23",
+        icon: "/pages/images/image_OLL_023.bmp",
+        msg: "(R2 D’) (R' U’2) (R’ D) (R U’2 R) "
+      }, {
+        name: "OLL24",
+        icon: "/pages/images/image_OLL_024.bmp",
+        msg: "(r U R’ U’)(r’ F R F’)"
+      }, {
+        name: "OLL25",
+        icon: "/pages/images/image_OLL_025.bmp",
+        msg: "F'(r U R' U') (r' F R) "
+      }, {
+        name: "OLL26",
+        icon: "/pages/images/image_OLL_026.bmp",
+        msg: "(R U'U')( R' U' R U' R' )"
+      }, {
+        name: "OLL27",
+        icon: "/pages/images/image_OLL_027.bmp",
+        msg: "(RUR’U)(RU’U’R’)"
+      }, {
+        name: "OLL28",
+        icon: "/pages/images/image_OLL_028.bmp",
+        msg: "(r U R' U') (r' R U) (R U' R')"
+      }, {
+        name: "OLL29",
+        icon: "/pages/images/image_OLL_029.bmp",
+        msg: "(RUR’U’)(RU’R’F’U’F)(RUR’)"
+      }, {
+        name: "OLL30",
+        icon: "/pages/images/image_OLL_030.bmp",
+        msg: "f(RU)(R2U’R’U)(R2U’R’)f’"
+      }, {
+        name: "OLL31",
+        icon: "/pages/images/image_OLL_031.bmp",
+        msg: "(r' F' U F) (r U' r' U' r)"
+      }, {
+        name: "OLL32",
+        icon: "/pages/images/image_OLL_032.bmp",
+        msg: "(R U)(B' U')(R' U R B R')"
+      }, {
+        name: "OLL33",
+        icon: "/pages/images/image_OLL_033.bmp",
+        msg: "(R U R' U') (R' F R F')"
+      }, {
+        name: "OLL34",
+        icon: "/pages/images/image_OLL_034.bmp",
+        msg: "(RUR2U’)(R’F)(RURU’F’)"
+      }, {
+        name: "OLL35",
+        icon: "/pages/images/image_OLL_035.bmp",
+        msg: "(R UU)(R2' F R F')(R UUR')"
+      }, {
+        name: "OLL36",
+        icon: "/pages/images/image_OLL_036.bmp",
+        msg: "(R’U’RU’)(R’URU)(lU’R’U)"
+      }, {
+        name: "OLL37",
+        icon: "/pages/images/image_OLL_037.bmp",
+        msg: "F (R U' R'U'R U) (R' F')"
+      }, {
+        name: "OLL38",
+        icon: "/pages/images/image_OLL_038.bmp",
+        msg: "(R U R'U) (RU'R'U') (R'F R F')"
+      }, {
+        name: "OLL39",
+        icon: "/pages/images/image_OLL_039.bmp",
+        msg: "(RUR’F’U’F)U(RU2R’)"
+      }, {
+        name: "OLL40",
+        icon: "/pages/images/image_OLL_040.bmp",
+        msg: "(R' F R U R'U') (F' U R)"
+      }, {
+        name: "OLL41",
+        icon: "/pages/images/image_OLL_041.bmp",
+        msg: "(RUR’U)(RU’U’R’)F(RUR’U’)F’"
+      }, {
+        name: "OLL42",
+        icon: "/pages/images/image_OLL_042.bmp",
+        msg: "(R'U’ RU')(R’U2R)F(RUR’U’)F’"
+      }, {
+        name: "OLL43",
+        icon: "/pages/images/image_OLL_043.bmp",
+        msg: "(B' U') (R' U R B)"
+      }, {
+        name: "OLL44",
+        icon: "/pages/images/image_OLL_044.bmp",
+        msg: "f (R U R' U')f'"
+      }, {
+        name: "OLL45",
+        icon: "/pages/images/image_OLL_045.bmp",
+        msg: "F (R U R' U') F'"
+      }, {
+        name: "OLL46",
+        icon: "/pages/images/image_OLL_046.bmp",
+        msg: "(R' U') R' F R F' (U R)"
+      }, {
+        name: "OLL47",
+        icon: "/pages/images/image_OLL_047.bmp",
+        msg: "b’(U’R’UR)2b"
+      }, {
+        name: "OLL48",
+        icon: "/pages/images/image_OLL_048.bmp",
+        msg: "F (R U R' U')2 F'"
+      }, {
+        name: "OLL49",
+        icon: "/pages/images/image_OLL_049.bmp",
+        msg: "R B'(R2 F)(R2 B) R2 F' R"
+      }, {
+        name: "OLL50",
+        icon: "/pages/images/image_OLL_050.bmp",
+        msg: "(r’U)(r2U’r2U’)(r2Ur’)"
+      }, {
+        name: "OLL51",
+        icon: "/pages/images/image_OLL_051.bmp",
+        msg: "f (R U R' U')2 f'"
+      }, {
+        name: "OLL52",
+        icon: "/pages/images/image_OLL_052.bmp",
+        msg: "(R’F’U’FU’)(RUR’UR)"
+      }, {
+        name: "OLL53",
+        icon: "/pages/images/image_OLL_053.bmp",
+        msg: "(r' U2) (R U R'U') (R U R'U) r"
+      }, {
+        name: "OLL54",
+        icon: "/pages/images/image_OLL_054.bmp",
+        msg: "(rU'U') (R' U' R U R' U') (R U' r')"
+      }, {
+        name: "OLL55",
+        icon: "/pages/images/image_OLL_055.bmp",
+        msg: "(rU’U’R’U’)(r’R2UR’U’)(rU’r’)"
+      }, {
+        name: "OLL56",
+        icon: "/pages/images/image_OLL_056.bmp",
+        msg: "(rUr’)(URU’R’)2(r U’r’)"
+      }, {
+        name: "OLL57",
+        icon: "/pages/images/image_OLL_057.bmp",
+        msg: "(R U R' U' )M'( U R U' r')"
+      }]
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  onEnd: function (e) {
+    console.dir(e)
+    var that = this;
+    that.setData({
+      //isLower: true,
+      sessions: that.data.sessions.concat([{
+
+      }])
+    })
+
+  },
+
+  onScroll: function () {
+    console.dir("onScroll");
+  }
+})
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/OLL.json b/1514080901129/pages/gongshi/OLL.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/1514080901129/pages/gongshi/OLL.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/OLL.wxml b/1514080901129/pages/gongshi/OLL.wxml
new file mode 100644
index 00000000..ed1d4232
--- /dev/null
+++ b/1514080901129/pages/gongshi/OLL.wxml
@@ -0,0 +1,30 @@
+<!--pages/gongshi/OLL .wxml-->
+<scroll-view class="page" scroll-y="true" style="height:{{windowHeight}}px;" bindscrolltolower="onEnd" bindscroll="onScroll">
+    <view class="page__hd">
+        <view class="page__title"></view>
+        <view class="page__desc"></view>
+    </view>
+    <view class="page__bd">
+        <view class="weui-panel weui-panel_access">
+            <view class="weui-panel__hd"></view>
+            <view class="weui-panel__bd">
+                <navigator url="" wx:for="{{sessions}}" wx:key="name" 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="{{item.icon}}" />
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">({{index+1}}) {{item.name}}</view>
+                        <view class="weui-media-box__desc">{{item.msg}}</view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+        <view class="weui-loadmore" wx:if="{{isLower}}">
+            <view class="weui-loading"></view>
+            <view class="weui-loadmore__tips">正在加载</view>
+        </view>
+        <view class="weui-loadmore weui-loadmore_line" wx:if="{{isEnd}}">
+            <view class="weui-loadmore__tips weui-loadmore__tips_in-line">暂无数据</view>
+        </view>
+    </view>
+</scroll-view>
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/OLL.wxss b/1514080901129/pages/gongshi/OLL.wxss
new file mode 100644
index 00000000..509d169e
--- /dev/null
+++ b/1514080901129/pages/gongshi/OLL.wxss
@@ -0,0 +1 @@
+/* pages/gongshi/OLL.wxss */
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/PLL.js b/1514080901129/pages/gongshi/PLL.js
new file mode 100644
index 00000000..205f7f55
--- /dev/null
+++ b/1514080901129/pages/gongshi/PLL.js
@@ -0,0 +1,179 @@
+// pages/gongshi/PLL.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    session: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    // 设置窗口大小
+    wx.getSystemInfo({
+      success: (res) => {
+        that.setData({
+          windowHeight: res.windowHeight - 5,
+          windowWidth: res.windowWidth
+        })
+        //console.dir(that.data.windowHeight)
+      }
+    })
+    that.setData({
+      sessions: [{
+        name: "PLL1",
+        icon: "/pages/images/image_PLL_001.bmp",
+        msg: "(R U' R)(U R)2(U' R' U' R2)"
+      }, {
+        name: "PLL2",
+        icon: "/pages/images/image_PLL_002.bmp",
+        msg: "(R2 U)(R U)(R' U')2(R' U R')"
+      }, {
+        name: "PLL3",
+        icon: "/pages/images/image_PLL_003.bmp",
+        msg: "M'2UM'2U2M'2UM'2"
+      }, {
+        name: "PLL4",
+        icon: "/pages/images/image_PLL_004.bmp",
+        msg: "M'U(M'2U)2M'U2M'2U'"
+      }, {
+        name: "PLL5",
+        icon: "/pages/images/image_PLL_005.bmp",
+        msg: "x' R2 D2(R' U' R)D2(R' U R')"
+      }, {
+        name: "PLL6",
+        icon: "/pages/images/image_PLL_006.bmp",
+        msg: "x'(RU'R)D2(R'UR)D2R'2"
+      }, {
+        name: "PLL7",
+        icon: "/pages/images/image_PLL_007.bmp",
+        msg: "x'(R U' R' D)(R U R'D') (R U R'D) (R U'R'D')"
+      }, {
+        name: "PLL8",
+        icon: "/pages/images/image_PLL_008.bmp",
+        msg: "(R U R' U')(R' F)(R2 U' R' U')(R U R' F')"
+      }, {
+        name: "PLL9",
+        icon: "/pages/images/image_PLL_009.bmp",
+        msg: "(R'U'F')(RUR'U')(R'F)(R2U'R'U')(RUR'UR)"
+      }, {
+        name: "PLL10",
+        icon: "/pages/images/image_PLL_010.bmp",
+        msg: "(R' U R' d')(R'F'R2U')(R'UR'FRF)"
+      }, {
+        name: "PLL11",
+        icon: "/pages/images/image_PLL_011.bmp",
+        msg: "F(R U'R' U')(R U R' F')(R U R' U')(R' F R F')"
+      }, {
+        name: "PLL12",
+        icon: "/pages/images/image_PLL_012.bmp",
+        msg: "z(U' R D')(R2 U R' U' )(R2 U) (DR')"
+      }, {
+        name: "PLL13",
+        icon: "/pages/images/image_PLL_013.bmp",
+        msg: "(R U R'F')(R U R'U')(R'F )(R2 U'R'U')"
+      }, {
+        name: "PLL14",
+        icon: "/pages/images/image_PLL_014.bmp",
+        msg: "(R' U2)(R U'U')(R' F R U R' U')(R'F' R2 U')"
+      }, {
+        name: "PLL15",
+        icon: "/pages/images/image_PLL_015.bmp",
+        msg: "(R U'R'U')(RURD)(R'U'RD')(R'U2R'U')"
+      }, {
+        name: "PLL16",
+        icon: "/pages/images/image_PLL_016.bmp",
+        msg: "(R2' u' R U' R)(U R' u)(R2 f R' f')"
+      }, {
+        name: "PLL17",
+        icon: "/pages/images/image_PLL_017.bmp",
+        msg: "(R U R')y'(R2' u' R U')(R' U R' u R2)"
+      }, {
+        name: "PLL18",
+        icon: "/pages/images/image_PLL_018.bmp",
+        msg: "(R2 u)(R' U R' U')(R u') (R2' F' U F)"
+      }, {
+        name: "PLL19",
+        icon: "/pages/images/image_PLL_019.bmp",
+        msg: "(R' d' F)(R2 u)(R' U)(R U' R u' R2)"
+      }, {
+        name: "PLL20",
+        icon: "/pages/images/image_PLL_020.bmp",
+        msg: "(R'URU')(R'F'U')(FRUR'F)(R'F'RU'R)"
+      }, {
+        name: "PLL21",
+        icon: "/pages/images/image_PLL_021.bmp",
+        msg: "(RUR'U)(RUR'F')(RUR'U')(R'F)(R2U'R'U2)(RU'R')"
+      }]
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  onEnd: function (e) {
+    console.dir(e)
+    var that = this;
+    that.setData({
+      //isLower: true,
+      sessions: that.data.sessions.concat([{
+
+      }])
+    })
+
+  },
+
+  onScroll: function () {
+    console.dir("onScroll");
+  }
+})
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/PLL.json b/1514080901129/pages/gongshi/PLL.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/1514080901129/pages/gongshi/PLL.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/PLL.wxml b/1514080901129/pages/gongshi/PLL.wxml
new file mode 100644
index 00000000..2f540f1a
--- /dev/null
+++ b/1514080901129/pages/gongshi/PLL.wxml
@@ -0,0 +1,30 @@
+<!--pages/gongshi/PLL .wxml-->
+<scroll-view class="page" scroll-y="true" style="height:{{windowHeight}}px;" bindscrolltolower="onEnd" bindscroll="onScroll">
+    <view class="page__hd">
+        <view class="page__title"></view>
+        <view class="page__desc"></view>
+    </view>
+    <view class="page__bd">
+        <view class="weui-panel weui-panel_access">
+            <view class="weui-panel__hd"></view>
+            <view class="weui-panel__bd">
+                <navigator url="" wx:for="{{sessions}}" wx:key="name" 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="{{item.icon}}" />
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                        <view class="weui-media-box__title">({{index+1}}) {{item.name}}</view>
+                        <view class="weui-media-box__desc">{{item.msg}}</view>
+                    </view>
+                </navigator>
+            </view>
+        </view>
+        <view class="weui-loadmore" wx:if="{{isLower}}">
+            <view class="weui-loading"></view>
+            <view class="weui-loadmore__tips">正在加载</view>
+        </view>
+        <view class="weui-loadmore weui-loadmore_line" wx:if="{{isEnd}}">
+            <view class="weui-loadmore__tips weui-loadmore__tips_in-line">暂无数据</view>
+        </view>
+    </view>
+</scroll-view>
\ No newline at end of file
diff --git a/1514080901129/pages/gongshi/PLL.wxss b/1514080901129/pages/gongshi/PLL.wxss
new file mode 100644
index 00000000..6906c296
--- /dev/null
+++ b/1514080901129/pages/gongshi/PLL.wxss
@@ -0,0 +1 @@
+/* pages/gongshi/PLL.wxss */
\ No newline at end of file
diff --git a/1514080901129/pages/images/cube-1a.png b/1514080901129/pages/images/cube-1a.png
new file mode 100644
index 00000000..f75f52fe
Binary files /dev/null and b/1514080901129/pages/images/cube-1a.png differ
diff --git a/1514080901129/pages/images/cube-2a.png b/1514080901129/pages/images/cube-2a.png
new file mode 100644
index 00000000..87e6aef8
Binary files /dev/null and b/1514080901129/pages/images/cube-2a.png differ
diff --git a/1514080901129/pages/images/cube-3a.png b/1514080901129/pages/images/cube-3a.png
new file mode 100644
index 00000000..88902d10
Binary files /dev/null and b/1514080901129/pages/images/cube-3a.png differ
diff --git a/1514080901129/pages/images/image_F2L_001.bmp b/1514080901129/pages/images/image_F2L_001.bmp
new file mode 100644
index 00000000..7cf63093
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_001.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_002.bmp b/1514080901129/pages/images/image_F2L_002.bmp
new file mode 100644
index 00000000..63e841ef
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_002.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_003.bmp b/1514080901129/pages/images/image_F2L_003.bmp
new file mode 100644
index 00000000..8c564878
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_003.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_004.bmp b/1514080901129/pages/images/image_F2L_004.bmp
new file mode 100644
index 00000000..583628d0
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_004.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_005.bmp b/1514080901129/pages/images/image_F2L_005.bmp
new file mode 100644
index 00000000..e5c0583a
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_005.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_006.bmp b/1514080901129/pages/images/image_F2L_006.bmp
new file mode 100644
index 00000000..fc72d905
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_006.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_007.bmp b/1514080901129/pages/images/image_F2L_007.bmp
new file mode 100644
index 00000000..8ed62c5d
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_007.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_008.bmp b/1514080901129/pages/images/image_F2L_008.bmp
new file mode 100644
index 00000000..c3ae7217
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_008.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_009.bmp b/1514080901129/pages/images/image_F2L_009.bmp
new file mode 100644
index 00000000..52e943c9
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_009.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_010.bmp b/1514080901129/pages/images/image_F2L_010.bmp
new file mode 100644
index 00000000..b46e64f8
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_010.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_011.bmp b/1514080901129/pages/images/image_F2L_011.bmp
new file mode 100644
index 00000000..e5ad1d34
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_011.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_012.bmp b/1514080901129/pages/images/image_F2L_012.bmp
new file mode 100644
index 00000000..310d16e0
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_012.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_013.bmp b/1514080901129/pages/images/image_F2L_013.bmp
new file mode 100644
index 00000000..a639bb1a
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_013.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_014.bmp b/1514080901129/pages/images/image_F2L_014.bmp
new file mode 100644
index 00000000..fec936bf
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_014.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_015.bmp b/1514080901129/pages/images/image_F2L_015.bmp
new file mode 100644
index 00000000..03eeea71
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_015.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_016.bmp b/1514080901129/pages/images/image_F2L_016.bmp
new file mode 100644
index 00000000..aea97157
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_016.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_017.bmp b/1514080901129/pages/images/image_F2L_017.bmp
new file mode 100644
index 00000000..8fed3c87
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_017.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_018.bmp b/1514080901129/pages/images/image_F2L_018.bmp
new file mode 100644
index 00000000..12c89b38
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_018.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_019.bmp b/1514080901129/pages/images/image_F2L_019.bmp
new file mode 100644
index 00000000..40b97526
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_019.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_020.bmp b/1514080901129/pages/images/image_F2L_020.bmp
new file mode 100644
index 00000000..53a99d5a
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_020.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_021.bmp b/1514080901129/pages/images/image_F2L_021.bmp
new file mode 100644
index 00000000..1c459c2a
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_021.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_022.bmp b/1514080901129/pages/images/image_F2L_022.bmp
new file mode 100644
index 00000000..4a9c76a0
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_022.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_023.bmp b/1514080901129/pages/images/image_F2L_023.bmp
new file mode 100644
index 00000000..888c3eec
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_023.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_024.bmp b/1514080901129/pages/images/image_F2L_024.bmp
new file mode 100644
index 00000000..9966a1ec
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_024.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_025.bmp b/1514080901129/pages/images/image_F2L_025.bmp
new file mode 100644
index 00000000..a9c14c11
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_025.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_026.bmp b/1514080901129/pages/images/image_F2L_026.bmp
new file mode 100644
index 00000000..cea1e6c0
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_026.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_027.bmp b/1514080901129/pages/images/image_F2L_027.bmp
new file mode 100644
index 00000000..82b15a9c
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_027.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_028.bmp b/1514080901129/pages/images/image_F2L_028.bmp
new file mode 100644
index 00000000..e2b22e29
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_028.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_029.bmp b/1514080901129/pages/images/image_F2L_029.bmp
new file mode 100644
index 00000000..4e00fc01
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_029.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_030.bmp b/1514080901129/pages/images/image_F2L_030.bmp
new file mode 100644
index 00000000..d054680e
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_030.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_031.bmp b/1514080901129/pages/images/image_F2L_031.bmp
new file mode 100644
index 00000000..40bc1667
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_031.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_032.bmp b/1514080901129/pages/images/image_F2L_032.bmp
new file mode 100644
index 00000000..8cb8588d
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_032.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_033.bmp b/1514080901129/pages/images/image_F2L_033.bmp
new file mode 100644
index 00000000..b8d0dc97
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_033.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_034.bmp b/1514080901129/pages/images/image_F2L_034.bmp
new file mode 100644
index 00000000..ea56f10c
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_034.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_035.bmp b/1514080901129/pages/images/image_F2L_035.bmp
new file mode 100644
index 00000000..9c0c2e78
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_035.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_036.bmp b/1514080901129/pages/images/image_F2L_036.bmp
new file mode 100644
index 00000000..149f68d0
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_036.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_037.bmp b/1514080901129/pages/images/image_F2L_037.bmp
new file mode 100644
index 00000000..0af71110
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_037.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_038.bmp b/1514080901129/pages/images/image_F2L_038.bmp
new file mode 100644
index 00000000..428a2c33
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_038.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_039.bmp b/1514080901129/pages/images/image_F2L_039.bmp
new file mode 100644
index 00000000..19c8d11a
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_039.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_040.bmp b/1514080901129/pages/images/image_F2L_040.bmp
new file mode 100644
index 00000000..05799621
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_040.bmp differ
diff --git a/1514080901129/pages/images/image_F2L_041.bmp b/1514080901129/pages/images/image_F2L_041.bmp
new file mode 100644
index 00000000..5161f2ae
Binary files /dev/null and b/1514080901129/pages/images/image_F2L_041.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_001.bmp b/1514080901129/pages/images/image_OLL_001.bmp
new file mode 100644
index 00000000..5631161b
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_001.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_002.bmp b/1514080901129/pages/images/image_OLL_002.bmp
new file mode 100644
index 00000000..0b4c902b
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_002.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_003.bmp b/1514080901129/pages/images/image_OLL_003.bmp
new file mode 100644
index 00000000..9679e2b8
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_003.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_004.bmp b/1514080901129/pages/images/image_OLL_004.bmp
new file mode 100644
index 00000000..97c36fa1
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_004.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_005.bmp b/1514080901129/pages/images/image_OLL_005.bmp
new file mode 100644
index 00000000..4e1f8d76
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_005.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_006.bmp b/1514080901129/pages/images/image_OLL_006.bmp
new file mode 100644
index 00000000..b725d3b9
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_006.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_007.bmp b/1514080901129/pages/images/image_OLL_007.bmp
new file mode 100644
index 00000000..f2e73c70
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_007.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_008.bmp b/1514080901129/pages/images/image_OLL_008.bmp
new file mode 100644
index 00000000..d892ede7
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_008.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_009.bmp b/1514080901129/pages/images/image_OLL_009.bmp
new file mode 100644
index 00000000..f0fd31ad
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_009.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_010.bmp b/1514080901129/pages/images/image_OLL_010.bmp
new file mode 100644
index 00000000..ac0abe5e
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_010.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_011.bmp b/1514080901129/pages/images/image_OLL_011.bmp
new file mode 100644
index 00000000..861ed783
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_011.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_012.bmp b/1514080901129/pages/images/image_OLL_012.bmp
new file mode 100644
index 00000000..b7208848
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_012.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_013.bmp b/1514080901129/pages/images/image_OLL_013.bmp
new file mode 100644
index 00000000..b129b6c4
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_013.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_014.bmp b/1514080901129/pages/images/image_OLL_014.bmp
new file mode 100644
index 00000000..d3bed5b5
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_014.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_015.bmp b/1514080901129/pages/images/image_OLL_015.bmp
new file mode 100644
index 00000000..8cfdb19c
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_015.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_016.bmp b/1514080901129/pages/images/image_OLL_016.bmp
new file mode 100644
index 00000000..805f4fff
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_016.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_017.bmp b/1514080901129/pages/images/image_OLL_017.bmp
new file mode 100644
index 00000000..aeb49f1f
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_017.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_018.bmp b/1514080901129/pages/images/image_OLL_018.bmp
new file mode 100644
index 00000000..3aceea40
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_018.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_019.bmp b/1514080901129/pages/images/image_OLL_019.bmp
new file mode 100644
index 00000000..a53bd6ef
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_019.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_020.bmp b/1514080901129/pages/images/image_OLL_020.bmp
new file mode 100644
index 00000000..5f8103df
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_020.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_021.bmp b/1514080901129/pages/images/image_OLL_021.bmp
new file mode 100644
index 00000000..33cf536e
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_021.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_022.bmp b/1514080901129/pages/images/image_OLL_022.bmp
new file mode 100644
index 00000000..01aa99cc
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_022.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_023.bmp b/1514080901129/pages/images/image_OLL_023.bmp
new file mode 100644
index 00000000..4e294669
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_023.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_024.bmp b/1514080901129/pages/images/image_OLL_024.bmp
new file mode 100644
index 00000000..ada6cc57
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_024.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_025.bmp b/1514080901129/pages/images/image_OLL_025.bmp
new file mode 100644
index 00000000..8836c503
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_025.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_026.bmp b/1514080901129/pages/images/image_OLL_026.bmp
new file mode 100644
index 00000000..1f148dfc
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_026.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_027.bmp b/1514080901129/pages/images/image_OLL_027.bmp
new file mode 100644
index 00000000..0d53954f
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_027.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_028.bmp b/1514080901129/pages/images/image_OLL_028.bmp
new file mode 100644
index 00000000..f6569100
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_028.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_029.bmp b/1514080901129/pages/images/image_OLL_029.bmp
new file mode 100644
index 00000000..757387e7
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_029.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_030.bmp b/1514080901129/pages/images/image_OLL_030.bmp
new file mode 100644
index 00000000..00bc6cf7
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_030.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_031.bmp b/1514080901129/pages/images/image_OLL_031.bmp
new file mode 100644
index 00000000..7832f6c4
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_031.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_032.bmp b/1514080901129/pages/images/image_OLL_032.bmp
new file mode 100644
index 00000000..8805d9c5
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_032.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_033.bmp b/1514080901129/pages/images/image_OLL_033.bmp
new file mode 100644
index 00000000..5c123b5c
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_033.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_034.bmp b/1514080901129/pages/images/image_OLL_034.bmp
new file mode 100644
index 00000000..282390bb
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_034.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_035.bmp b/1514080901129/pages/images/image_OLL_035.bmp
new file mode 100644
index 00000000..617d71fb
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_035.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_036.bmp b/1514080901129/pages/images/image_OLL_036.bmp
new file mode 100644
index 00000000..bfa67627
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_036.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_037.bmp b/1514080901129/pages/images/image_OLL_037.bmp
new file mode 100644
index 00000000..1db5bb55
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_037.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_038.bmp b/1514080901129/pages/images/image_OLL_038.bmp
new file mode 100644
index 00000000..d2d5ddf8
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_038.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_039.bmp b/1514080901129/pages/images/image_OLL_039.bmp
new file mode 100644
index 00000000..06e24691
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_039.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_040.bmp b/1514080901129/pages/images/image_OLL_040.bmp
new file mode 100644
index 00000000..d7a0528c
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_040.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_041.bmp b/1514080901129/pages/images/image_OLL_041.bmp
new file mode 100644
index 00000000..448c2cf1
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_041.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_042.bmp b/1514080901129/pages/images/image_OLL_042.bmp
new file mode 100644
index 00000000..a64eeea1
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_042.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_043.bmp b/1514080901129/pages/images/image_OLL_043.bmp
new file mode 100644
index 00000000..8c4f5e96
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_043.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_044.bmp b/1514080901129/pages/images/image_OLL_044.bmp
new file mode 100644
index 00000000..365d24bd
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_044.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_045.bmp b/1514080901129/pages/images/image_OLL_045.bmp
new file mode 100644
index 00000000..f018e1ae
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_045.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_046.bmp b/1514080901129/pages/images/image_OLL_046.bmp
new file mode 100644
index 00000000..db4786b8
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_046.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_047.bmp b/1514080901129/pages/images/image_OLL_047.bmp
new file mode 100644
index 00000000..2def49c9
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_047.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_048.bmp b/1514080901129/pages/images/image_OLL_048.bmp
new file mode 100644
index 00000000..cbdecfa7
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_048.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_049.bmp b/1514080901129/pages/images/image_OLL_049.bmp
new file mode 100644
index 00000000..4ef059c5
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_049.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_050.bmp b/1514080901129/pages/images/image_OLL_050.bmp
new file mode 100644
index 00000000..36712c26
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_050.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_051.bmp b/1514080901129/pages/images/image_OLL_051.bmp
new file mode 100644
index 00000000..27887778
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_051.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_052.bmp b/1514080901129/pages/images/image_OLL_052.bmp
new file mode 100644
index 00000000..41e04072
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_052.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_053.bmp b/1514080901129/pages/images/image_OLL_053.bmp
new file mode 100644
index 00000000..9d943a13
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_053.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_054.bmp b/1514080901129/pages/images/image_OLL_054.bmp
new file mode 100644
index 00000000..f041947d
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_054.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_055.bmp b/1514080901129/pages/images/image_OLL_055.bmp
new file mode 100644
index 00000000..dcd869ff
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_055.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_056.bmp b/1514080901129/pages/images/image_OLL_056.bmp
new file mode 100644
index 00000000..f95e46a7
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_056.bmp differ
diff --git a/1514080901129/pages/images/image_OLL_057.bmp b/1514080901129/pages/images/image_OLL_057.bmp
new file mode 100644
index 00000000..8fcaa4e9
Binary files /dev/null and b/1514080901129/pages/images/image_OLL_057.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_001.bmp b/1514080901129/pages/images/image_PLL_001.bmp
new file mode 100644
index 00000000..9885650b
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_001.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_002.bmp b/1514080901129/pages/images/image_PLL_002.bmp
new file mode 100644
index 00000000..69cf183c
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_002.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_003.bmp b/1514080901129/pages/images/image_PLL_003.bmp
new file mode 100644
index 00000000..3a227a68
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_003.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_004.bmp b/1514080901129/pages/images/image_PLL_004.bmp
new file mode 100644
index 00000000..2e399425
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_004.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_005.bmp b/1514080901129/pages/images/image_PLL_005.bmp
new file mode 100644
index 00000000..46356d86
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_005.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_006.bmp b/1514080901129/pages/images/image_PLL_006.bmp
new file mode 100644
index 00000000..13593322
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_006.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_007.bmp b/1514080901129/pages/images/image_PLL_007.bmp
new file mode 100644
index 00000000..192cc088
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_007.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_008.bmp b/1514080901129/pages/images/image_PLL_008.bmp
new file mode 100644
index 00000000..6a133c74
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_008.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_009.bmp b/1514080901129/pages/images/image_PLL_009.bmp
new file mode 100644
index 00000000..837dd1cc
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_009.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_010.bmp b/1514080901129/pages/images/image_PLL_010.bmp
new file mode 100644
index 00000000..bef9ce84
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_010.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_011.bmp b/1514080901129/pages/images/image_PLL_011.bmp
new file mode 100644
index 00000000..32782e0e
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_011.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_012.bmp b/1514080901129/pages/images/image_PLL_012.bmp
new file mode 100644
index 00000000..3cc71d85
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_012.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_013.bmp b/1514080901129/pages/images/image_PLL_013.bmp
new file mode 100644
index 00000000..3331c6c5
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_013.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_014.bmp b/1514080901129/pages/images/image_PLL_014.bmp
new file mode 100644
index 00000000..73cd3a0f
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_014.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_015.bmp b/1514080901129/pages/images/image_PLL_015.bmp
new file mode 100644
index 00000000..45fdd33a
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_015.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_016.bmp b/1514080901129/pages/images/image_PLL_016.bmp
new file mode 100644
index 00000000..56e01f63
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_016.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_017.bmp b/1514080901129/pages/images/image_PLL_017.bmp
new file mode 100644
index 00000000..1fb721a6
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_017.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_018.bmp b/1514080901129/pages/images/image_PLL_018.bmp
new file mode 100644
index 00000000..0b855db0
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_018.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_019.bmp b/1514080901129/pages/images/image_PLL_019.bmp
new file mode 100644
index 00000000..406f3897
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_019.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_020.bmp b/1514080901129/pages/images/image_PLL_020.bmp
new file mode 100644
index 00000000..1c4b414c
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_020.bmp differ
diff --git a/1514080901129/pages/images/image_PLL_021.bmp b/1514080901129/pages/images/image_PLL_021.bmp
new file mode 100644
index 00000000..4bfbbf5b
Binary files /dev/null and b/1514080901129/pages/images/image_PLL_021.bmp differ
diff --git a/1514080901129/pages/index/index.wxml b/1514080901129/pages/index/index.wxml
index 0ae591e4..5a466c79 100644
--- a/1514080901129/pages/index/index.wxml
+++ b/1514080901129/pages/index/index.wxml
@@ -1,25 +1,15 @@
 <view class="page">
     <view class="page__hd">
         <view class="page__title">formula</view>
-        <view class="page__desc">魔方高级公式库</view>
+        <view class="page__desc">三阶公式</view>
     </view>
     <view class="page__bd page__bd_spacing">
-        <button class="weui-btn" type="primary">F2L</button>
-        <button class="weui-btn" type="primary">OLL</button>
-        <button class="weui-btn" type="primary">PLL</button>
-    
-
-        <view class="page__bd page__bd_spacing">
-            <button class="weui-btn" type="default" >ZBF2L</button>
-             <button class="weui-btn" type="default" disabled="true" plain="true">
-            </button>
-            <button class="weui-btn" type="default" >ZBLL</button>
-            <button class="weui-btn" type="default" disabled="true" plain="true">
-            </button>
-
-          
-            
-           
-        </view>
+        <navigator url="/pages/gongshi/F2L"><button class="weui-btn" type="primary">F2L </button></navigator>
+        <navigator url="/pages/gongshi/OLL"> <button class="weui-btn" type="default">OLL</button></navigator>
+        <navigator url="/pages/gongshi/PLL"> <button class="weui-btn" type="warn">PLL</button></navigator>
+<view class="button-sp-area">
+            <button class="weui-btn" type="default" plain="true"></button>
+            <button class="weui-btn" type="default" plain="true"></button>
+ </view>
     </view>
 </view>
\ No newline at end of file