U: 迭代中

.gitignore

@@ -57,8 +57,8 @@ typings/
 .env
 
 # 微信开发工具项目配置
-/project.config.json
-project.config.json
+# /project.config.json
+# project.config.json
 
 # MarkEditor 配置文件
 .Archive
@@ -69,3 +69,6 @@ sync_changes.log
 sync_hook.script
 **/.Archive
 .md_configs.data
+
+# Mac file
+.DS_Store

app.js

@@ -16,6 +16,13 @@ wx.cloud.init({
     env: 'dv-963c46',
 })
 
+wx.customModal = function(args) {
+  wx.showModal({
+    confirmColor: '#FFE200',
+    ...args,
+  })
+}
+
 App({
 
     globalData: {

app.json

@@ -13,9 +13,9 @@
   ],
   "window": {
     "backgroundTextStyle": "dark",
-    "navigationBarBackgroundColor": "#496069",
-    "navigationBarTitleText": "HONYE",
-    "navigationBarTextStyle": "white",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "iMark",
+    "navigationBarTextStyle": "black",
     "backgroundColor": "#f7f7f7"
   },
   "tabBar": {
@@ -27,20 +27,20 @@
       {
         "pagePath": "pages/tabs/discovery/discovery",
         "text": "发现",
-        "iconPath": "assets/images/tab_discover_unchecked.png",
-        "selectedIconPath": "assets/images/tab_discover_checked.png"
+        "iconPath": "assets/images/tabbar/tabbar_discovery.png",
+        "selectedIconPath": "assets/images/tabbar/tabbar_discovery_selected.png"
       },
       {
         "pagePath": "pages/tabs/movies/movies",
-        "text": "我的电影",
-        "iconPath": "assets/images/tab_movies_unchecked.png",
-        "selectedIconPath": "assets/images/tab_movies_checked.png"
+        "text": "清单",
+        "iconPath": "assets/images/tabbar/tabbar_list.png",
+        "selectedIconPath": "assets/images/tabbar/tabbar_list_selected.png"
       },
       {
         "pagePath": "pages/tabs/index/index",
-        "text": "账号",
-        "iconPath": "assets/images/tab_usercenter_unchecked.png",
-        "selectedIconPath": "assets/images/tab_usercenter_checked.png"
+        "text": "我的",
+        "iconPath": "assets/images/tabbar/tabbar_mine.png",
+        "selectedIconPath": "assets/images/tabbar/tabbar_mine_selected.png"
       }
     ]
   },
@@ -73,5 +73,6 @@
         "pages/userinfo/userinfo"
       ]
     }
-  ]
+  ],
+  "sitemapLocation": "sitemap.json"
 }

cloudfunctions/favArticle/index.js

@@ -1,9 +1,11 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 

cloudfunctions/favCard/index.js

@@ -1,9 +1,12 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
+
 
 const db = cloud.database()
 

cloudfunctions/getArticleDetails/index.js

@@ -1,9 +1,11 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 

cloudfunctions/getCards/index.js

@@ -1,9 +1,11 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 

cloudfunctions/getFavArticles/index.js

@@ -1,9 +1,11 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 const _= db.command

cloudfunctions/getFavCards/index.js

@@ -1,9 +1,11 @@
 // 云函数入口文件
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 const _ = db.command

cloudfunctions/initdb/index.js

@@ -1,8 +1,10 @@
 const cloud = require('wx-server-sdk')
 
-cloud.init({
-    env: 'dv-963c46'
-})
+cloud.init(
+  // {
+  //   env: 'dv-963c46'
+  // }
+)
 
 const db = cloud.database()
 

components/btn-fav/FavButton.js

@@ -18,11 +18,13 @@ Component({
     },
     iconNormal: {
       type: String,
-      value: '/assets/images/daily_card_like_unchecked.png'
+      // value: '/assets/images/daily_card_like_unchecked.png'
+      value: '/assets/images/icon-unlike.png'
     },
     iconChecked: {
       type: String,
-      value: '/assets/images/daily_card_like_checked.png'
+      // value: '/assets/images/daily_card_like_checked.png'
+      value: '/assets/images/icon-liked.png'
     },
   },
 

components/pre-image/PreImage.js

@@ -1,5 +1,6 @@
 // components/pre-image/PreImage.js
 Component({
+  externalClasses: 'extra-class',
   /**
    * 组件的属性列表
    */

pages/common/casts/casts.wxss

@@ -6,41 +6,44 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: 156rpx;
+  width: 210rpx;
   overflow: hidden;
 }
 .casts-item .item-container>.avatar,
 .casts-item .item-container .item-all {
   width: 100%;
-  height: 218.4rpx;
+  height: 280rpx;
+  border-radius: 8rpx;
 }
 .casts-item .item-container>view.item-casts-name {
   display: flex;
   flex-direction: column;
   width: 100%;
   overflow: hidden;
-  font-size: .8em;
+  font-size: 22rpx;
+  color: #999;
 }
 .casts-item .item-container>view.item-casts-name text {
   width: 100%;
   text-align: center;
 }
 .casts-item .item-container>view.item-casts-name text:last-child {
   color: #7C858A;
-  font-size: .9em;
+  font-size: 18rpx;
 }
 
 .item-all {
-  background-color: #F2F1F7;
-  width: 156rpx;
-  height: 218.4rpx;
+  background: #F2F1F7;
+  width: 210rpx;
+  height: 280rpx;
+  border-radius: 8rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   font-size: .8em;
   line-height: 1.8em;
-  color: #7C858A;
+  color: #999;
 }
 .item-all> text:last-child {
   border-top: .5px solid #ccc;

pages/common/cell/cell.wxss

@@ -4,27 +4,24 @@
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  padding: 30rpx;
-  color: #496069;
-  border-bottom: 0.5px solid #ddd;
+  padding: 28rpx 30rpx;
+  color: #333;
+  font-size: 28rpx;
   background-color: #fff;
   box-sizing: border-box;
 }
-.row-cell:last-child {
-  border:none;
-}
 .row-cell .row-left,
 .row-cell .row-right {
   display: flex;
   flex-direction: row;
   align-items: center;
 }
 .row-cell .row-icon {
-  width: 1.5em;
-  height: 1.5em;
-  margin-right: 1em;
+  width: 1.3em;
+  height: 1.3em;
+  margin-right: 0.5em;
 }
 .row-right .row-subtitle {
-  color: #aaa;
+  color: #999;
   margin-right: 0.5em;
 }

pages/common/circle/circle.wxml

@@ -5,7 +5,7 @@
         wx:if="{{imgUrl}}" 
         class="icon-img" 
         src="{{imgUrl}}"
-        mode="aspectFit" />
+        mode="widthFix" />
       <text class="circle-date">{{date}}</text>
     </view>
     <text class="title">{{title}}</text>
@@ -14,7 +14,7 @@
 
 <template name="commingItem">
   <view class='item-article'>
-    <comp-preImg src='{{image}}' mode='widthFix' height='450rpx' />
+    <comp-preImg extra-class='img-big' src='{{image}}' mode='widthFix' height='450rpx' />
     <view class='com-desc'>
       <text class='com-title'>{{title}}</text>
       <view class='count-like'>

pages/common/circle/circle.wxss

@@ -1,18 +1,18 @@
 .icon-img {
-  width: 50%;
-  height: 35%;
+  width: 100%;
+  /* height: 35%; */
   border-width: 2px;
   border-color: #f00;
 }
 .title {
-  font-size: 0.8rem;
+  font-size: 26rpx;
 }
 .circle-border {
-  width: 120rpx;
-  height: 120rpx;
+  width: 88rpx;
+  height: 88rpx;
   border: 2rpx solid #496069;
   border-radius: 50%;
-  margin: 20rpx;
+  margin: 20rpx 20rpx 10rpx;
   display: flex;
   justify-content: center;
   align-items: center;

pages/common/dropmenu/dropmenu.wxss

@@ -1,7 +1,7 @@
 
 .dropdown-menu-backdrop {
     position: fixed;
-    top: 3em;
+    top: calc(74rpx + 3em);
     left: 0;
     z-index: 11;
     width: 100%;

pages/common/movie/movieRow.wxml

@@ -3,15 +3,15 @@
 
 <template name="item-movie_row">
   <view class="item-movie_row padding-surround btn-bg">
-    <image class="item-img" src="{{images.large}}" mode='widthFix'></image>
+    <image class="item-img" src="{{images.large || img}}" mode='widthFix' lazy-load='{{true}}' />
     <view class="item-info">
-      <text>{{title}}</text>
-      <text class='subtext'>{{pubdates[0]}}</text>
-      <text class='subtext'>{{durations[0]}} - {{genres}}</text>
+      <text>{{title || name}}</text>
+      <text class='subtext'>{{pubdates[0] || realTime}}</text>
+      <text class='subtext'>{{durations[0]}} - {{genres || movieType}}</text>
       <view>
-        <view wx:if='{{rating.average>0}}'>
-          <template is='rating' data='{{rating:rating.average,max:10}}'></template>
-          <text class='subtext'>{{rating.average}}分(豆瓣)</text>
+        <view wx:if='{{rating.average>0 || rating>0}}'>
+          <template is='rating' data='{{rating:rating.average || rating,max:10}}'></template>
+          <text class='subtext'>{{rating.average || rating}}分(豆瓣)</text>
         </view>
         <text wx:else class='subtext'>暂无评分(豆瓣)</text>
       </view>
@@ -22,7 +22,7 @@
 <template name='item-movie_grid'>
   <view class='item-movie_grid btn-opacity'>
     <view class='item-img'>
-      <image src='{{images.large}}' />
+      <image src='{{images.large}}' lazy-load='{{true}}' />
     </view>
     <view class='item-title single-line'>{{title}}</view>
   </view>