更新vpush推送组件

Author: nlanxs

app.js

@@ -9,27 +9,27 @@
  */
 
 const ald = require('./utils/ald-stat.js');
-var vPush = require('./utils/vpush/_vpush.js');
+var vPush = require('./utils/vpush-pro-sdk/vpush.pro.js');
 
 App({
-    vPush,
-  onLaunch: function () {
+  vPush: new vPush('wxd9a0fcfcb2877cc0'),
+  onLaunch: function() {
     //调用API从本地缓存中获取数据
     var logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
     wx.setStorageSync('logs', logs)
   },
-  
-  getUserInfo:function(cb){
+
+  getUserInfo: function(cb) {
     var that = this
-    if(this.globalData.userInfo){
+    if (this.globalData.userInfo) {
       typeof cb == "function" && cb(this.globalData.userInfo)
-    }else{
+    } else {
       //调用登录接口
       wx.login({
-        success: function () {
+        success: function() {
           wx.getUserInfo({
-            success: function (res) {
+            success: function(res) {
               that.globalData.userInfo = res.userInfo
               typeof cb == "function" && cb(that.globalData.userInfo)
             }
@@ -38,11 +38,11 @@ App({
       })
     }
   },
-  globalData:{
-    userInfo:null,
-    openid:'',
-    isGetUserInfo:false,
-    isGetOpenid:false
+  globalData: {
+    userInfo: null,
+    openid: '',
+    isGetUserInfo: false,
+    isGetOpenid: false
 
   }
 })

app.wxss

@@ -99,7 +99,7 @@
 .common-list .list-item.has-img image.cover-100 {
   border-radius:3px;
   width:100%;
-  height:175px;
+  height:30vh;
 }
 
 .common-list .list-item.has-img .content-title {
@@ -110,7 +110,7 @@
 
 .common-list .list-item.has-img .content-title-100 {
 width:100%;
-margin-top:185px;
+/*margin-top:185px;*/
 margin-bottom:5px;
 }
 

images/next_page.svg

@@ -63,34 +63,36 @@
       </view>
     </view>
 
-    <!-- 上一篇 -->
+    <!--
     <view wx:if="{{display}}" class="pagination">
       <view wx:if="{{detail.previous_post_id}}" class="nav-previous">
         <navigator url="../detail/detail?id={{detail.previous_post_id}}" open-type="redirect" hover-class="relatedNavigator" style="position:fixed;right:26rpx;bottom:340rpx;background:rgba(255,255,255,.95);width:50rpx;height:50rpx;padding:15rpx;box-shadow:0rpx 2rpx 6rpx rgba(0,0,0,.2);border-radius:50%;z-index:999">
           <image src="../../images/source-commit-end-local.svg" style="height:50rpx;width:50rpx;"></image>
         </navigator>
       </view>
     </view>
-    <!-- 下一篇  -->
+
     <view wx:if="{{display}}" class="pagination">
       <view wx:if="{{detail.next_post_id}}" class="nav-next">
         <navigator url="../detail/detail?id={{detail.next_post_id}}" open-type="redirect" hover-class="relatedNavigator" style="position:fixed;right:26rpx;bottom:230rpx;background:rgba(255,255,255,.95);width:50rpx;height:50rpx;padding:15rpx;box-shadow:0rpx 2rpx 6rpx rgba(0,0,0,.2);border-radius:50%;z-index:999">
           <image src="../../images/source-commit-start-next-local.svg" style="height:50rpx;width:50rpx;"></image>
         </navigator>
       </view>
     </view>
-    <!--<view class="relatedPost" style="display:{{display}}">
-            <view class="relatedTitle">
-                相关文章
-            </view>
-            <view class="entry-gap-like"></view>
-            <view class="relatedText">
-                <block wx:key="id" wx:for="{{postList}}">
-                    <navigator url="../detail/detail?id={{item.id}}" open-type="redirect" hover-class="relatedNavigator"><image src="../../images/circle-empty.png" style='width:16rpx;height:16rpx;margin:0 14rpx 1rpx 0;'></image>{{item.title.rendered}}</navigator>
+    <view class="relatedPost" style="display:{{display}}">
+      <view class="relatedTitle">
+        相关文章
+      </view>
+      <view class="entry-gap-like"></view>
+      <view class="relatedText">
+        <block wx:key="id" wx:for="{{postList}}">
+          <navigator url="../detail/detail?id={{item.id}}" open-type="redirect" hover-class="relatedNavigator">
+            <image src="../../images/circle-empty.png" style='width:16rpx;height:16rpx;margin:0 14rpx 1rpx 0;'></image>{{item.title.rendered}}</navigator>
 
-                </block>
-            </view>
-        </view>-->
+        </block>
+      </view>
+    </view>
+  -->
 
     <view class="likePost" style="display:{{displayLikenone}}">
       <view catchtap="clickLike" id="likebottom" class="likebtt">
@@ -212,7 +214,6 @@
                       <button class="share-button share-button touch-active" open-type="share">
                       </button>
                     </view>
-
                   </view>
                   <view style="width:40%;text-align:center;line-height:50rpx;">
                     <view>

images/previous_page.svg

@@ -1,7 +1,6 @@
 {
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "vpush-view": "/utils/vpush/view",
-    "vpush-nav": "/utils/vpush/navigation"
+    "vpush-view": "/utils/vpush-pro-sdk/components/view"
   }
 }

images/source-commit-end-local.svg

@@ -15,10 +15,20 @@
 <import src="../../templates/login-popup.wxml" />
 
 <view class="readlog-container">
-  <view class="userinfo">
-    <image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
-    <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-  </view>
+  <block wx:if="{{userInfo == null || userInfo == ''}}">
+    <button class="login-btn login-button" open-type="getUserInfo" bindgetuserinfo="agreeGetUser">
+      <view class="userinfo">
+        <image class="userinfo-avatar" src="../../images/gravatar.png" background-size="cover"></image>
+        <text class="userinfo-nickname">请点击登陆</text>
+      </view>
+    </button>
+  </block>
+  <block wx:else>
+    <view class="userinfo">
+      <image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
+      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
+    </view>
+  </block>
 
   <template is="login-popup" data="{{show: isLoginPopup, userInfo: userInfo}}"></template>
 

images/source-commit-start-next-local.svg

@@ -138,3 +138,10 @@
   /* font-weight: bold; */
   color: #495056;
 }
+
+.login-button {
+  background: #2f89fc;
+  width: 100%;
+  border-radius: 0;
+  border: #2f89fc;
+}