Merge pull request '更新' (#12) from master into dev

app.json

@@ -3,13 +3,15 @@
     "pages/index/index",
     "pages/logs/logs",
     "pages/commemorate/commemorate",
-    "pages/recommend/recommend"
+    "pages/recommend/recommend",
+    "pages/wc/wc"
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#ddd",
     "navigationBarTitleText": "银幕之旅",
-    "navigationBarTextStyle": "black"
+    "navigationBarTextStyle": "black",
+    "enablePullDownRefresh": true
   },
   "tabBar": {
     "selectedColor": "#CD5C5C",

app.wxss

@@ -6,5 +6,6 @@
   align-items: center;
   justify-content: space-between;
   padding: 200rpx 0;
+  /**满屏幕是750rpx**/
   box-sizing: border-box;
 } 

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <!--index.wxml-->
-<text>当季热🔥</text>
+<text>当季热映🔥</text>
 <view class="menu">
   <view class="item">
     <image src="/static/tabbar/movie.png"></image>

pages/recommend/recommend.js

@@ -6,6 +6,8 @@ Page({
    */
   data: {
 
+
+    
   },
 
   /**

pages/recommend/recommend.wxml

@@ -1,39 +1,34 @@
-<text>可能喜欢(๑•̀ㅂ•́)و✧</text>
+<view>可能喜欢(๑•̀ㅂ•́)و✧</view>
-<view class="menu">
+<view class="zhu">
-  <view class="item">
+<view class="zhiyin">
-    <image src="/static/tabbar/movie.png"></image>
+  <navigator url="/pages/wc/wc">
-    <text>阿斌</text>
+     <image src="/static/tabbar/home.png"></image>
-  </view>
+  </navigator>
-  <view class="item">
+</view>
-    <image src="/static/tabbar/movie.png"></image>
+<view class="zhiyin">
-    <text>阿斌</text>
+  <navigator url="/pages/wc/wc">
-  </view>
+     <image src="/static/tabbar/home.png"></image>
-  <view class="item">
+  </navigator>
-    <image src="/static/tabbar/movie.png"></image>
+</view>
-    <text>阿斌</text>
+<view class="zhiyin">
-  </view>
+  <navigator url="/pages/wc/wc">
-  <view class="item">
+     <image src="/static/tabbar/home.png"></image>
-    <image src="/static/tabbar/movie.png"></image>
+  </navigator>
-    <text>阿斌</text>
+</view>
-  </view>
+
-  <view class="item">
+<view class="meme">
-    <image src="/static/tabbar/movie.png"></image>
+  <navigator url="/pages/wc/wc">
-    <text>阿斌</text>
+     <image src="/static/tabbar/commemorate.png"></image>
-  </view>
+  </navigator>
-  <view class="item">
+</view>
-    <image src="/static/tabbar/movie.png"></image>
+<view class="meme">
-    <text>阿斌</text>
+  <navigator url="/pages/wc/wc">
-  </view>
+     <image src="/static/tabbar/commemorate.png"></image>
-  <view class="item">
+  </navigator>
-    <image src="/static/tabbar/movie.png"></image>
+</view>
-    <text>阿斌</text>
+<view class="meme">
-  </view>
+  <navigator url="/pages/wc/wc">
-  <view class="item">
+     <image src="/static/tabbar/commemorate.png"></image>
-    <image src="/static/tabbar/movie.png"></image>
+  </navigator>
-    <text>阿斌</text>
+</view>
-  </view>
-  <view class="item">
-    <image src="/static/tabbar/movie.png"></image>
-    <text>阿斌</text>
-  </view>
 </view>

pages/recommend/recommend.wxss

@@ -1 +1,29 @@
 /* pages/recommend/recommend.wxss */
+image{
+  width: 500rpx;
+  height:500rpx;
+}
+.zhiyin{
+  height: 500rpx;
+  border: 1rpx solid #ddd;
+/**flex布局**/
+ display:flex;
+/**主轴方向布局，行排列row或者列排列column**/
+ flex-direction: row;
+/**控制孩子布局，flex-start,center,space-around,space-between**/
+ justify-content: space-around;
+/**副轴方向布局**/
+ align-items: center;
+}
+.meme{
+  height: 500rpx;
+  border: 1rpx solid #ddd;
+/**flex布局**/
+ display:flex;
+/**主轴方向布局，行排列row或者列排列column**/
+ flex-direction: row;
+/**控制孩子布局，flex-start,center,space-around,space-between**/
+ justify-content: space-around;
+/**副轴方向布局**/
+ align-items: center;
+}

pages/wc/wc.js

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

pages/wc/wc.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/wc/wc.wxml

@@ -0,0 +1,3 @@
+<!--pages/wc/wc.wxml-->
+<text>pages/wc/wc.wxml</text>
+<view>dshdhsi</view>

pages/wc/wc.wxss

@@ -0,0 +1 @@
+/* pages/wc/wc.wxss */

project.config.json

@@ -38,7 +38,7 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "Journey_to_the_Screen",
+  "projectname": "%E9%93%B6%E5%B9%95%E4%B9%8B%E6%97%85",
   "setting": {
     "compileHotReLoad": true
   }