Merge pull request #350 from CchenWX/master

#2 #57 第二次实验代码
hzuapps · Nov 17, 2017 · 25b19e5 · 25b19e5
2 parents 9ab0ef9 + ac37d92
commit 25b19e5
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 1 deletion.
diff --git a/1514080901207/app.json b/1514080901207/app.json
@@ -1,12 +1,39 @@
 {
   "pages":[
+    "pages/article/article",
     "pages/index/index",
     "pages/logs/logs"
   ],
+
   "window":{
     "backgroundTextStyle":"light",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "惠州学院校友圈",
     "navigationBarTextStyle":"black"
-  }
+  },
+"tabBar": {
+  "selectedColor": "#dddddd",
+  "color": "#3cc51f",
+  "backgroundColor": "#ffffff",
+  "list": [
+    {
+      "text": "登录",
+      "pagePath": "pages/index/index",
+      "iconPath": "/pages/images/icon_footer.png",
+      "selectedIconPath": "/pages/images/icon_footer.png"
+    },
+    {
+      "text": "主页",
+      "pagePath": "pages/article/article",
+      "iconPath": "/pages/images/icon_footer.png",
+      "selectedIconPath": "/pages/images/icon_footer.png"
+    },
+    {
+      "text": "日志",
+      "pagePath": "pages/logs/logs",
+      "iconPath": "/pages/images/icon_footer.png",
+      "selectedIconPath": "/pages/images/icon_footer.png"
+    }
+  ]
 }
+}
diff --git a/1514080901207/pages/article/article.js b/1514080901207/pages/article/article.js
@@ -0,0 +1 @@
+Page({});
diff --git a/1514080901207/pages/article/article.json b/1514080901207/pages/article/article.json
@@ -0,0 +1 @@
+{}
diff --git a/1514080901207/pages/article/article.wxml b/1514080901207/pages/article/article.wxml
@@ -0,0 +1,36 @@
+<view class="page">
+    <view class="page__hd">
+        <view class="page__title">Article</view>
+        <view class="page__desc">文章</view>
+    </view>
+    <view class="page__bd">
+        <view class="weui-article">
+            <view class="weui-article__h1">大标题</view>
+            <view class="weui-article__section">
+                <view class="weui-article__title">章标题</view>
+                <view class="weui-article__section">
+                    <view class="weui-article__h3">1.1 节标题</view>
+                    <view class="weui-article__p">
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.
+                    </view>
+                    <view class="weui-article__p">
+                        <image class="weui-article__img" src="../images/1.jpg" mode="aspectFit" style="height: 180px" />
+                        <image class="weui-article__img" src="../images/1.jpg" mode="aspectFit" style="height: 180px" />
+                    </view>
+                </view>
+                <view class="weui-article__section">
+                    <view class="weui-article__h3">1.2 节标题</view>
+                    <view class="weui-article__p">
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                    </view>
+                </view>
+            </view>
+        </view>`
+    </view>
+</view>
diff --git a/1514080901207/pages/article/article.wxss b/1514080901207/pages/article/article.wxss
@@ -0,0 +1,6 @@
+page{
+    background-color: #FFFFFF;
+}
+image{
+    margin: 4px 0;
+}
diff --git a/1514080901207/pages/images/1.jpg b/1514080901207/pages/images/1.jpg
diff --git a/1514080901207/pages/images/base64.js b/1514080901207/pages/images/base64.js
diff --git a/1514080901207/pages/images/icon_footer.png b/1514080901207/pages/images/icon_footer.png
diff --git a/1514080901207/pages/images/icon_footer_link.png b/1514080901207/pages/images/icon_footer_link.png
diff --git a/1514080901207/pages/images/icon_intro.png b/1514080901207/pages/images/icon_intro.png
diff --git a/1514080901207/pages/images/icon_nav_feedback.png b/1514080901207/pages/images/icon_nav_feedback.png
diff --git a/1514080901207/pages/images/icon_nav_form.png b/1514080901207/pages/images/icon_nav_form.png
diff --git a/1514080901207/pages/images/icon_nav_nav.png b/1514080901207/pages/images/icon_nav_nav.png
diff --git a/1514080901207/pages/images/icon_nav_search.png b/1514080901207/pages/images/icon_nav_search.png
diff --git a/1514080901207/pages/images/icon_nav_special.png b/1514080901207/pages/images/icon_nav_special.png
diff --git a/1514080901207/pages/images/icon_nav_widget.png b/1514080901207/pages/images/icon_nav_widget.png
diff --git a/1514080901207/pages/images/icon_nav_z-index.png b/1514080901207/pages/images/icon_nav_z-index.png
diff --git a/1514080901207/pages/images/icon_tabbar.png b/1514080901207/pages/images/icon_tabbar.png
diff --git a/1514080901207/pages/images/logo.png b/1514080901207/pages/images/logo.png
diff --git a/1514080901207/pages/images/pic_160.png b/1514080901207/pages/images/pic_160.png
diff --git a/1514080901207/pages/images/pic_article.png b/1514080901207/pages/images/pic_article.png
diff --git a/1514080901207/pages/images/vcode.jpg b/1514080901207/pages/images/vcode.jpg