2017-04-21

app.json

@@ -12,25 +12,24 @@
         "pages/channel/image/add/add",
         "pages/channel/video/add/add",
         "pages/channel/view/view",
-        "pages/channel/user/application/application",
         "pages/channel/user/followers/followers",
-        "pages/channel/user/following_users/following_users",
+        "pages/channel/invitation/invitation",
         "pages/test/video"
     ],
     "tabBar": {
-        "color": "#7A7E83",
+        "color": "#ccc",
         "selectedColor": "#fff",
         "borderStyle": "black",
-        "backgroundColor": "#000",
+        "backgroundColor": "#50B7E3",
         "list": [{
         "pagePath": "pages/person/index/index",
-        "iconPath": "pages/images/geren.png",
-        "selectedIconPath":"pages/images/geren.png",
-        "text": "制作"
+        "iconPath": "pages/images/mijian2.png",
+        "selectedIconPath":"pages/images/mijian1.png",
+        "text": "密件"
         }, {
         "pagePath": "pages/channel/index/index",
-        "iconPath": "pages/images/qun.png",
-        "selectedIconPath":"pages/images/qun.png",
+        "iconPath": "pages/images/mipin2.png",
+        "selectedIconPath":"pages/images/mipin1.png",
         "text": "密频"
         }]
     },

pages/channel/image/add/add.js

@@ -50,6 +50,7 @@ Page({
   "textarea":false,
   "expire":false,
   "imageAble":false,
+  "sizeType":['original'],
   "upload_busy":false
   },
   onLoad: function () {
@@ -58,7 +59,14 @@ Page({
       console.log(userInfo);
     });
     const ctx = wx.createCanvasContext('myCanvas')
-    this.chooseImage();
+    var self=this;
+    var res = wx.getSystemInfoSync();
+    if(res.system.indexOf('iOS')!==-1){
+      self.setData({
+          'sizeType':['compressed']
+      });
+    }
+    self.chooseImage();
   },
   onShow: function () {
     console.log('onShow');
@@ -72,7 +80,7 @@ Page({
     }
     wx.chooseImage({
       count: 1,
-      sizeType: ['compressed'],
+      sizeType: self.data.sizeType,
       sourceType: ['album','camera'],
       success: function(res) {
         //  showMsg('提示信息','chooseImage successful,temp path is'+res.tempFilePaths[0]);
@@ -168,6 +176,7 @@ Page({
     }else{
       data.type=2
     }
+    data.expire_in=1440;
     self.setData({
         'busy1':true
     })
@@ -236,7 +245,7 @@ Page({
       if(res.system.indexOf('Android')!==-1){
         if(width>height){
           this.setData({
-            'imageSrc':this.data.imageSrc+'/rotate/90',
+            'imageSrc':this.data.imageSrc,
           })
         }
       }

pages/channel/index/index.js

@@ -72,6 +72,8 @@ Page({
     userInfo: {},
     loading:false,
     loading_more:false,
+    loading_show:false,
+    users_count:0,
     next_data:true,
     busy:false,
     posts:[]
@@ -83,14 +85,10 @@ Page({
     }
     self.setData({
         loading:true,
+        posts:[],
         busy:true
     });
-    var url;
-    if(self.data.next_page_url==null){
-      url=config.service.apiUrl+'timeline';
-    }else{
-      url=self.data.next_page_url
-    }
+    var url=config.service.apiUrl+'timeline';
     qcloud.request({
         // 要请求的地址
         url: url,
@@ -136,6 +134,88 @@ Page({
         }
     });
   },
+  user_list(){
+    var self=this;
+    var url=config.service.apiUrl+'followers';
+    qcloud.request({
+        // 要请求的地址
+        url: url,
+        success(result) {
+            if(result.data.success==true){
+                self.setData({
+                    users_count:result.data.followers.total
+                })
+            }
+            console.log('request success', result);
+        },
+
+        fail(error) {
+            console.log('request fail', error);
+        },
+
+        complete() {
+            console.log('request complete');
+        }
+    });
+  },
+  refresh(){
+      var self = this;
+    if(self.data.busy){
+      return;
+    }
+    self.setData({
+        loading:true,
+        posts:[],
+        busy:true
+    });
+    // wx.showNavigationBarLoading();
+    var url=config.service.apiUrl+'timeline';
+    qcloud.request({
+        // 要请求的地址
+        url: url,
+        success(result) {
+            if(result.data.success==true){
+                for (var i=0;i<result.data.posts.data.length;i++){
+                  var datestr=Date.parse((result.data.posts.data[i]['created_at']).toString().replace(/-/g,   "/"));
+                  if(datestr){
+                    result.data.posts.data[i]['created_at']=new Date(datestr).format("hh:mm");
+                  }else{
+                    result.data.posts.data[i]['created_at']= '--:--'
+                  }
+                }
+                self.setData({
+                    posts:result.data.posts.data
+                })
+            }
+            if(result.data.posts.next_page_url!==null){
+                self.setData({
+                    next_data:true,
+                    next_page_url:result.data.posts.next_page_url
+                })
+            }else{
+                self.setData({
+                    next_data:false,
+                    next_page_url:null
+                })
+            }
+            console.log('request success', result);
+        },
+
+        fail(error) {
+            console.log('request fail', error);
+        },
+
+        complete() {
+            self.setData({
+                loading:false,
+                busy:false
+            });
+            // wx.hideNavigationBarLoading();
+            wx.stopPullDownRefresh();
+            console.log('request complete');
+        }
+    });
+  },
   load_more(){
       var self = this;
       var request_url=self.data.next_page_url;
@@ -196,29 +276,91 @@ Page({
           }
     });
   },
+  formSubmit:function(e){
+    var self = this;
+    if(self.data.busy1){
+      return;
+    }
+    var data={};
+    data.image_url="http://upload-1251348966.image.myqcloud.com/upload/2017-04-21/b1ba2fd7b035f7db742bf76e2af7be96.png?imageMogr2/auto-orient/strip/thumbnail/1000x1000/quality/80/format/jpg";
+    if(e.detail.formId!='the formId is a mock one'){
+      data.form_id=e.detail.formId;
+    }
+    data.can_read_times=-1
+    data.type==1
+    data.expire_in=-1;
+    self.setData({
+        'busy1':true
+    })
+    qcloud.request({
+            // 要请求的地址
+            url: config.service.messageAddUrl,
+            method:"POST",
+            data: data,
+            success(result) {
+              console.log(result);
+              if(result.data.success==true){
+                wx.navigateTo({
+                    url: '/pages/channel/invitation/invitation?hash_key='+result.data.id
+                 })
+              }else{
+                showMsg("提示信息","新建邀请失败，"+result.data.message);
+              }
+            },
+
+            fail(error) {
+                console.log('request fail', error);
+                showMsg("提示信息","新建邀请失败");
+            },
+
+            complete() {
+                self.setData({
+                      'busy1':false
+                  })
+                console.log('request complete');
+            }
+      });
+  },
   onReachBottom: function() {
     var self = this;
     self.load_more();
   },
-  onShareAppMessage: function () {
-    return {
-      title: '密频',
-      path: 'pages/channel/index/index',
-      success: function(res) {
-        showSuccess('分享成功');
-        console.log(res);
-        // 分享成功
-      },
-      fail: function(res) {
-        // 分享失败
-        console.log(res);
-      },
-      complete:function(res){
-        console.log(res);
-      }
-    }
+  onPullDownRefresh: function() {
+    var self = this;
+    self.refresh();
   },
-  onLoad:function(options){
+  onLoad:function(e){
+      console.log(e);
+      if(e.hash_key){
+        this.setData({
+            hash_key:e.hash_key
+        })
+        var self=this;
+        qcloud.request({
+            // 要请求的地址
+            url: config.service.apiUrl+'messages/'+self.data.hash_key,
+            success(result) {
+              console.log(result);
+              if(result.data.success==true){
+                  if(result.data.is_mine==false){
+                      var ncikname=result.data.message_data.user.nickname;
+                      showMsg("提示信息","您成功关注了"+ncikname+'的密频');
+                  }
+              }
+                  
+            },
+
+            fail(error) {
+                console.log('request fail', error);
+            },
+
+            complete() {
+                console.log('request complete');
+            }
+      });
+      }else{
+          console.log('123')
+      }
     // 页面初始化 options为页面跳转所带来的参数
   },
   onReady:function(){
@@ -239,6 +381,7 @@ Page({
     var self=this;
     app.getUserInfo(function(userInfo){
       self.post_list();
+      self.user_list();
     });
   },
   onHide:function(){

pages/channel/index/index.json

@@ -1 +1,4 @@
-{}
+{
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
+}

pages/channel/index/index.wxml

@@ -1,22 +1,26 @@
 <!--pages/channel/index/index.wxml-->
 <view class="page">
   <view class="page__bd">
+   <view class="section" style="width:100%;margin:0 auto;text-align:center;margin-top:20px;">
+        <view style="color:#fff;display:inline-block;width:100%;padding:0px 40px;box-sizing:border-box;">
+        <view style="float:left;line-height:27px;">我的密友有{{users_count}}人</view>
+        <form report-submit="{{true}}" bindsubmit="formSubmit">
+        <button class="button" style="float:right;border-radius:30px;line-height:25px;" formType="submit" >邀请</button>
+        </form>
+        <navigator class="button" style="float:right;margin-right:20px;border-radius:30px;line-height:25px;" url="/pages/channel/user/followers/followers">管理</navigator>
+        </view>
+    </view>
     <view class="section">
-        <view class="article">
-            <text>密频是你的私有频道，加入你的密频的朋友可以看到你在密频中发的内容，凡是看过你的密件的朋友你可以批准他是否加入你的密频。</text>
+        <view class="article" style="padding-top:20px;">
+            <text>密频是你的私有频道，只有你的密友可以看到你的密频内容。凡是看过你的密件的的好友都会成为你的密友，你可以管理你的密友，也可以邀请朋友成为密友。</text>
         </view>
     </view>
     <view class="section" style="display:inline-block;width:100%;">
         <view class="button-wrapper" style="margin-left:40px;float:left;width:38%;">
-            <navigator class="button" url="/pages/channel/image/add/add" >制作图片密件</navigator>
+            <navigator class="button" url="/pages/channel/image/add/add" >发图片</navigator>
         </view>
          <view class="button-wrapper" style="margin-right:40px;float:right;width:38%;">
-            <navigator class="button" url="/pages/channel/video/add/add">制作视频密件</navigator>
-        </view>
-    </view>
-    <view class="section" style="display:inline-block;width:100%;margin:0 auto;">
-        <view  style="width:38%;margin:0 auto;">
-            <navigator class="button" url="/pages/channel/user/application/application" >关注管理</navigator>
+            <navigator class="button" url="/pages/channel/video/add/add">发视频</navigator>
         </view>
     </view>
     <view class="section" style="display:inline-block;width:100%;margin-bottom:0;margin-top:20px;">
@@ -28,7 +32,7 @@
         <view style="width:100%;display:inline-block;padding:50px 40px;box-sizing:border-box;padding-top:10px;padding-bottom:0px;">
             <view class="item" wx:for="{{posts}}" wx:key="id">
                 <navigator url="/pages/channel/view/view?hash_key={{item.hash_key}}" open-type="navigate" >
-                    <image src="{{item.user.headimgurl}}" mode="widthFix"></image>
+                    <image src="{{item.user.headimgurl ? item.user.headimgurl : '/pages/images/default.png'}}" mode="widthFix"></image>
                 </navigator>
                 <view class="u_name" style="color:#fff;text-align:center;font-size:12px;margin-top:5px;">{{item.user.nickname}}</view>
                 <view class="date_time" style="color:#fff;text-align:center;font-size:12px;margin-top:5px;">{{item.created_at}}</view>

pages/channel/invitation/invitation.js

@@ -0,0 +1,114 @@
+// pages/channel/invitation/invitation.js
+// 引入 QCloud 小程序增强 SDK
+var qcloud = require('../../../vendor/qcloud-weapp-client-sdk/index');
+
+// 引入配置
+var config = require('../../../config');
+
+// 显示繁忙提示
+var showBusy = text => wx.showToast({
+    title: text,
+    icon: 'loading',
+    duration: 10000
+});
+
+// 显示成功提示
+var showSuccess = text => {
+    wx.hideToast();
+    wx.showToast({
+        title: text,
+        icon: 'success'
+    });
+};
+
+// 显示失败提示
+var showModel = (title, content) => {
+    wx.hideToast();
+
+    wx.showModal({
+        title,
+        content: JSON.stringify(content),
+        showCancel: false
+    });
+};
+
+function   formatDate(now)   {     
+    var   year=now.getFullYear();     
+    var   month=now.getMonth()+1;  
+    if(month<10){
+        month='0'+month.toString();
+    }   
+    var   date=now.getDate();
+    if(date<10){
+        date='0'+date.toString();
+    }    
+    var   hour=now.getHours(); 
+    if(hour<10){
+        hour='0'+hour.toString();
+    }        
+    var   minute=now.getMinutes();
+    if(minute<10){
+        minute='0'+minute.toString();
+    }      
+    var   second=now.getSeconds();     
+    return   month+"-"+date+" "+hour+":"+minute;     
+}
+
+
+//获取应用实例
+var app = getApp()
+Page({
+  data: {
+    "hash_key":"",
+    "imageSrc":"",
+    "height":"",
+    "share_txt":"",
+    "share":false,
+    "is_qun":false,
+    "expire_time":"",
+    "text":""
+  },
+  onLoad: function (e) {
+    console.log('onLoad');
+    app.getUserInfo(function(userInfo){
+      console.log(userInfo);
+    });
+    this.setData({
+        hash_key:e.hash_key
+    })
+    var self=this
+    try {
+        var res = wx.getSystemInfoSync();
+        self.setData({
+            height:(res.windowWidth)*0.8
+        });
+    } catch (e) {
+    // Do something when catch error
+    }
+  },
+  onShow: function () {
+    console.log('onShow');
+  },
+  edit:function(){
+    wx.switchTab({
+        url: '/pages/person/index/index'
+    })
+  },
+  share:function(){
+    this.setData({
+        share:true
+    })
+    var self=this
+    setTimeout(function(){
+        self.setData({
+            share:false
+        })
+    }, 500);
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '密件-邀请您成为我的密友',
+      path: 'pages/channel/index/index?hash_key='+this.data.hash_key
+    }
+  }
+})

pages/channel/invitation/invitation.json

@@ -0,0 +1 @@
+{}

pages/channel/invitation/invitation.wxml

@@ -0,0 +1,18 @@
+<!--pages/channel/invitation/invitation.wxml-->
+<view class="page" style="background-color:#fff;">
+  <view class="page__hd page_head"  style="padding:0; height:{{height}}px;">
+    <view style="width:100%;display:inline-block;text-align:center;color:#4d3a34;font-size:1.5em;margin-top:8%;"  wx:if="{{expire_time}}">快看！本密件将于{{expire_time}}销毁</view>
+  </view>
+  <view class="page__bd" style="padding:50px;padding-left:0px;padding-right:0px;padding-bottom:0px">
+    <view class="page___title" style="margin-bottom:20px;padding:0 30px;text-align:left;color:#000">将本页分享给你要邀请的好友，即可邀请他成为密友</view>
+  </view>
+  <view class="page__bd" style="padding:10px 50px 20px 50px;text-align:center;color:#fff;">
+    <button class="mini-btn" type="primary" bindtap="share" size="mini" hover-class="none" style="width:120px;clear:both;float:none;display:block;font-size:14px;padding-top:1px;padding-bottom:1px;" >发送</button>
+  </view>
+  <view class="share" hidden="{{!share}}">
+    <view style="position: absolute;display:inline-block;top:5%;right:20%;color:#fff;" wx:if="{{is_qun}}">点击右上角，发到群中吧</view>
+    <view style="position: absolute;display:inline-block;top:5%;right:20%;color:#fff;" wx:if="{{!is_qun}}">点击右上角，发给你的朋友吧</view>
+  </view>
+
+</view>
+

pages/channel/user/application/application.js

@@ -1,163 +0,0 @@
-// pages/channel/user/application/application.js
-// 引入 QCloud 小程序增强 SDK
-var qcloud = require('../../../../vendor/qcloud-weapp-client-sdk/index');
-
-// 引入配置
-var config = require('../../../../config');
-
-// 显示繁忙提示
-var showBusy = text => wx.showToast({
-    title: text,
-    icon: 'loading',
-    duration: 10000
-});
-
-// 显示成功提示
-var showSuccess = text => {
-    wx.hideToast();
-    wx.showToast({
-        title: text,
-        icon: 'success'
-    });
-};
-
-// 显示失败提示
-var showModel = (title, content) => {
-    wx.hideToast();
-
-    wx.showModal({
-        title,
-        content: JSON.stringify(content),
-        showCancel: false
-    });
-};
-
-var showMsg = (title, content) => {
-    wx.hideToast();
-
-    wx.showModal({
-        title,
-        content: content,
-        showCancel: false
-    });
-};
-//获取应用实例
-var busy=false;
-var app = getApp()
-Page({
-  data: {
-    userInfo: {},
-    loading:true,
-    users:[],
-    busy:false,
-    loading_show:false,
-    users:[]
-  },
-  user_list(){
-    var self = this;
-    if(self.data.busy){
-      return;
-    }
-    self.setData({
-        loading:true,
-        busy:true
-    })
-    qcloud.request({
-        // 要请求的地址
-        url: config.service.apiUrl+'friend_requests',
-
-        success(result) {
-            if(result.data.success==true){
-                self.setData({
-                    users:result.data.followers.data
-                })
-            }
-            console.log('request success', result);
-        },
-
-        fail(error) {
-            console.log('request fail', error);
-        },
-
-        complete() {
-            self.setData({
-                loading:false,
-                busy:false
-            })
-            busy=false;
-            console.log('request complete');
-        }
-    });
-  },
-  onLoad: function () {
-    console.log('onLoad');
-  },
-  agree:function(e){
-    console.log(e);
-    var follower_id=e.target.dataset.followerId;
-    var self=this;
-    if(busy||!follower_id){
-        return;
-    }
-    if(wx.showLoading) {
-        wx.showLoading({
-            title: '操作中...',
-            mask:true
-        })
-    }else{
-        self.setData({
-            loading_show:true,
-        })
-    }
-    var data={};
-    data.follower_id=follower_id;
-    data.accept=1;
-    qcloud.request({
-        // 要请求的地址
-        url: config.service.apiUrl+'friend_requests',
-        method:"PUT",
-        data: data,
-        success(result) {
-            if(wx.hideLoading) {
-                    wx.hideLoading();
-            }else{
-                self.setData({
-                    loading_show:false,
-                })
-            }
-            if(result.data.success==true){
-                showSuccess('操作成功');
-            }else{
-                showMsg("提示信息","操作失败");
-            }
-            self.user_list();
-            console.log('request success', result);
-        },
-
-        fail(error) {
-            if(wx.hideLoading) {
-                    wx.hideLoading();
-            }else{
-                self.setData({
-                    loading_show:false,
-                })
-            }
-            console.log('request fail', error);
-        },
-
-        complete() {
-            console.log('request complete');
-        }
-     });
-  },
-  onShow:function(){
-      if(busy){
-        return;
-      }
-      busy=true;
-      var self=this;
-      app.getUserInfo(function(userInfo){
-        self.user_list();
-      });
-  }
-})

pages/channel/user/application/application.json

@@ -1,3 +0,0 @@
-{
-    "enablePullDownRefresh": true
-}

pages/channel/user/application/application.wxml

@@ -1,30 +0,0 @@
-<!--pages/channel/user/application/application.wxml-->
-<loading hidden="{{!loading_show}}">操作中...</loading>
-<view class="page" style="background-color: #fff;">
-    <view class="weui-navbar">
-
-        <navigator  url="/pages/channel/user/application/application" open-type="redirect" class="weui-navbar__item weui-bar__item_on">申请</navigator>
-        <navigator url="/pages/channel/user/followers/followers" open-type="redirect" class="weui-navbar__item">关注我</navigator>
-        <navigator url="/pages/channel/user/following_users/following_users" open-type="redirect" class="weui-navbar__item">我关注</navigator>
-    </view>
-    <view class="weui-panel weui-panel_access">
-        <view class="weui-loadmore" wx:if="{{loading}}">
-            <view class="weui-loading"></view>
-            <text class="weui-loadmore__tips">正在加载</text>
-        </view>
-        <view class="weui-panel__bd" wx:if="{{users.length!==0&&!loading}}">
-            <view class="weui-media-box weui-media-box_appmsg" wx:for="{{users}}" wx:key="follower_id">
-                <view class="weui-media-box__hd">
-                    <image class="weui-media-box__thumb" src="{{item.follower.headimgurl ? item.follower.headimgurl : '/pages/images/default.png'}}"></image>
-                </view>
-                <view class="weui-media-box__bd">{{item.follower.nickname}}</view>
-                <view class="weui-media-box__bt">
-                    <button type="primary" hover-class="none" bindtap="agree" data-follower-id="{{item.follower_id}}">同意</button>
-                </view>
-            </view>
-        </view>
-        <view class="weui-loadmore weui-loadmore_line" wx:if="{{users.length==0&&!loading}}">
-            <text class="weui-loadmore__tips">暂无数据</text>
-        </view>
-    </view>
-</view>

pages/channel/user/application/application.wxss

@@ -1,204 +0,0 @@
-/* pages/channel/user/application/application.wxss */
-.weui-panel {
-    background-color: #FFFFFF;
-    margin-top: 10px;
-    position: relative;
-    overflow: hidden;
-}
-.weui-panel:first-child {
-    margin-top: 0;
-}
-/*.weui-panel:before {
-    content: " ";
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    height: 1px;
-    border-top: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-}*/
-.weui-panel:after {
-    content: " ";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 1px;
-    border-bottom: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 100%;
-    transform-origin: 0 100%;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-}
-.weui-panel__hd {
-    padding: 14px 15px 10px;
-    color: #999999;
-    font-size: 13px;
-    position: relative;
-}
-.weui-panel__hd:after {
-    content: " ";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 1px;
-    border-bottom: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 100%;
-    transform-origin: 0 100%;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    left: 15px;
-}
-.weui-media-box {
-    padding: 15px;
-    position: relative;
-    color: #000000;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-media-box_appmsg {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-    align-items: center;
-}
-.weui-media-box_appmsg .weui-media-box__hd {
-    margin-right: .8em;
-    width: 60px;
-    height: 60px;
-    line-height: 60px;
-    text-align: center;
-    float:left;
-}
-.weui-media-box_appmsg .weui-media-box__bd {
-    -webkit-box-flex: 1;
-    -webkit-flex: 1;
-    flex: 1;
-    min-width: 0;
-}
-.weui-media-box_appmsg .weui-media-box__thumb {
-    width: 100%;
-    max-height: 100%;
-    vertical-align: top;
-}
-.weui-media-box:before {
-    content: " ";
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    height: 1px;
-    border-top: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    left: 15px;
-}
-.weui-media-box:first-child:before {
-    display: none;
-}
-.weui-loadmore {
-    width: 65%;
-    margin: 1.5em auto;
-    line-height: 1.6em;
-    font-size: 14px;
-    text-align: center;
-}
-.weui-loading {
-    width: 20px;
-    height: 20px;
-    display: inline-block;
-    vertical-align: middle;
-    -webkit-animation: weuiLoading 1s steps(12, end) infinite;
-    animation: weuiLoading 1s steps(12, end) infinite;
-    background: transparent url(http://www.ibanling.com/h5/gate/images/loading.svg) no-repeat;
-    background-size: 100%;
-}
-.weui-loadmore__tips {
-    display: inline-block;
-    vertical-align: middle;
-}
-@-webkit-keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-
-@keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-.weui-loadmore_line {
-    border-top: 1px solid #E5E5E5;
-    margin-top: 2.4em;
-}
-.weui-loadmore_line .weui-loadmore__tips {
-    position: relative;
-    top: -0.9em;
-    padding: 0 .55em;
-    background-color: #FFFFFF;
-    color: #999999;
-}
-.weui-media-box__bt{
-    width:80px;
-    position:absolute;
-    right:15px;
-}
-.weui-media-box__bt button{
-  display:block;
-  color:#fff;
-  width:80px;
-  /*height: 37px;*/
-  background-color: #50B7E3;
-  border:0px solid #50B7E3;
-  font-size: 14px;
-  border-radius:30px;
-  padding-top:1px;
-  padding-bottom:1px;
-}
-
-.weui-navbar {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    /*position: absolute;*/
-    z-index: 500;
-    /*top: 0;*/
-    width: 100%;
-    background-color: #FAFAFA;
-}
-.weui-navbar__item {
-    position: relative;
-    display: block;
-    -webkit-box-flex: 1;
-    -webkit-flex: 1;
-    flex: 1;
-    padding: 13px 0;
-    text-align: center;
-    font-size: 15px;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-navbar__item.weui-bar__item_on {
-    background-color: #50B7E3;
-    color: #fff;
-}

pages/channel/user/followers/followers.js

@@ -95,6 +95,8 @@ Page({
                 busy:false
             })
             busy=false;
+            
+            wx.hideNavigationBarLoading();
             console.log('request complete');
         }
     });
@@ -225,6 +227,7 @@ Page({
       busy=true;
       var self=this;
       app.getUserInfo(function(userInfo){
+        wx.showNavigationBarLoading();
         self.user_list();
       });
   }

pages/channel/user/followers/followers.json

@@ -1,3 +1,4 @@
 {
-    "enablePullDownRefresh": true
+    "navigationBarTitleText": "关注我",
+    "enablePullDownRefresh": false
 }

pages/channel/user/followers/followers.wxml

@@ -1,11 +1,6 @@
 <!--pages/channel/user/followers/followers.wxml-->
 <loading hidden="{{!loading_show}}">操作中...</loading>
 <view class="page" style="background-color: #fff;">
-    <view class="weui-navbar">
-        <navigator  url="/pages/channel/user/application/application" open-type="redirect" class="weui-navbar__item">申请</navigator>
-        <navigator url="/pages/channel/user/followers/followers" open-type="redirect" class="weui-navbar__item weui-bar__item_on">关注我</navigator>
-        <navigator url="/pages/channel/user/following_users/following_users" open-type="redirect" class="weui-navbar__item">我关注</navigator>
-    </view>
     <view class="weui-panel weui-panel_access">
         <view class="weui-loadmore" wx:if="{{loading}}">
             <view class="weui-loading"></view>

pages/channel/user/following_users/following_users.js

@@ -1,231 +0,0 @@
-// pages/channel/user/following_users/following_users.js
-var qcloud = require('../../../../vendor/qcloud-weapp-client-sdk/index');
-
-// 引入配置
-var config = require('../../../../config');
-
-// 显示繁忙提示
-var showBusy = text => wx.showToast({
-    title: text,
-    icon: 'loading',
-    duration: 10000
-});
-
-// 显示成功提示
-var showSuccess = text => {
-    wx.hideToast();
-    wx.showToast({
-        title: text,
-        icon: 'success'
-    });
-};
-
-// 显示失败提示
-var showModel = (title, content) => {
-    wx.hideToast();
-
-    wx.showModal({
-        title,
-        content: JSON.stringify(content),
-        showCancel: false
-    });
-};
-
-var showMsg = (title, content) => {
-    wx.hideToast();
-
-    wx.showModal({
-        title,
-        content: content,
-        showCancel: false
-    });
-};
-//获取应用实例
-var busy=false;
-var app = getApp()
-Page({
-  data: {
-    userInfo: {},
-    loading:true,
-    users:[],
-    busy:false,
-    loading_show:false,
-    users:[]
-  },
-  user_list(){
-    var self = this;
-    if(self.data.busy){
-      return;
-    }
-    self.setData({
-        loading:true,
-        busy:true
-    });
-    var url=config.service.apiUrl+'following_users';
-    qcloud.request({
-        // 要请求的地址
-        url: url,
-        success(result) {
-            if(result.data.success==true){
-                self.setData({
-                    users:result.data.following_users.data
-                })
-            }
-            if(result.data.following_users.next_page_url!==null){
-                self.setData({
-                    next_data:true,
-                    next_page_url:result.data.following_users.next_page_url
-                })
-            }else{
-                self.setData({
-                    next_data:false,
-                    next_page_url:null
-                })
-            }
-            console.log('request success', result);
-        },
-
-        fail(error) {
-            console.log('request fail', error);
-        },
-
-        complete() {
-            self.setData({
-                loading:false,
-                busy:false
-            })
-            busy=false;
-            console.log('request complete');
-        }
-    });
-  },
-  load_more(){
-      var self = this;
-      var request_url=self.data.next_page_url;
-      if(!request_url){
-          return;
-      }
-      if(self.data.busy){
-        return;
-      }
-      self.setData({
-        loading:true,
-        busy:true
-      });
-        qcloud.request({
-            // 要请求的地址
-            url: request_url,
-            success(result) {
-                if(result.data.success==true){
-                    var item=self.data.users;
-                    var obj=result.data.following_users.data;
-                    for (var i=0;i<obj.length;i++){
-                        item.push(obj[i]);
-                    }
-                    self.setData({
-                        users:item
-                    });
-                    if(result.data.following_users.next_page_url!==null){
-                        self.setData({
-                            next_data:true,
-                            next_page_url:result.data.following_users.next_page_url
-                        })
-                    }else{
-                        self.setData({
-                            next_data:false,
-                            next_page_url:null
-                        })
-                    }
-                }
-                console.log('request success', result);
-            },
-
-            fail(error) {
-                console.log('request fail', error);
-            },
-
-            complete() {
-                self.setData({
-                    loading:false,
-                    busy:false
-                })
-                console.log('request complete');
-            }
-    });
-  },
-  onReachBottom: function() {
-    var self = this;
-    self.load_more();
-  },
-  del:function(e){
-    console.log(e);
-    var follower_id=e.target.dataset.followerId;
-    var self=this;
-    if(busy||!follower_id){
-        return;
-    }
-    if(wx.showLoading) {
-        wx.showLoading({
-            title: '操作中...',
-            mask:true
-        })
-    }else{
-        self.setData({
-            loading_show:true,
-        })
-    }
-    var data={};
-    data.follower_id=follower_id;
-    qcloud.request({
-        // 要请求的地址
-        url: config.service.apiUrl+'following_users',
-        method:"DELETE",
-        data: data,
-        success(result) {
-            if(wx.hideLoading) {
-                    wx.hideLoading();
-            }else{
-                self.setData({
-                    loading_show:false,
-                })
-            }
-            if(result.data.success==true){
-                showSuccess('操作成功');
-            }else{
-                showMsg("提示信息","操作失败");
-            }
-            self.user_list();
-            console.log('request success', result);
-        },
-
-        fail(error) {
-            if(wx.hideLoading) {
-                    wx.hideLoading();
-            }else{
-                self.setData({
-                    loading_show:false,
-                })
-            }
-            console.log('request fail', error);
-        },
-
-        complete() {
-            console.log('request complete');
-        }
-     });
-  },
-  onLoad: function () {
-    console.log('onLoad');
-  },
-  
-  onShow:function(){
-      if(busy){
-        return;
-      }
-      busy=true;
-      var self=this;
-      app.getUserInfo(function(userInfo){
-        self.user_list();
-      });
-  }
-})

pages/channel/user/following_users/following_users.json

@@ -1,3 +0,0 @@
-{
-    "enablePullDownRefresh": true
-}

pages/channel/user/following_users/following_users.wxml

@@ -1,32 +0,0 @@
-<!--pages/channel/user/following_users/following_users.wxml-->
-<loading hidden="{{!loading_show}}">操作中...</loading>
-<view class="page" style="background-color: #fff;">
-    <view class="weui-navbar">
-        <navigator  url="/pages/channel/user/application/application" open-type="redirect" class="weui-navbar__item">申请</navigator>
-        <navigator url="/pages/channel/user/followers/followers" open-type="redirect" class="weui-navbar__item">关注我</navigator>
-        <navigator url="/pages/channel/user/following_users/following_users" open-type="redirect" class="weui-navbar__item weui-bar__item_on">我关注</navigator>
-    </view>
-    <view class="weui-panel weui-panel_access">
-        <view class="weui-loadmore" wx:if="{{loading}}">
-            <view class="weui-loading"></view>
-            <text class="weui-loadmore__tips">正在加载</text>
-        </view>
-        <view class="weui-panel__bd" wx:if="{{users.length!==0&&!loading}}">
-            <view class="weui-media-box weui-media-box_appmsg" wx:for="{{users}}" wx:key="follower_id">
-                <view class="weui-media-box__hd">
-                    <image class="weui-media-box__thumb" src="{{item.following_user.headimgurl ? item.following_user.headimgurl : '/pages/images/default.png'}}"></image>
-                </view>
-                <view class="weui-media-box__bd">{{item.following_user.nickname}}</view>
-                <view class="weui-media-box__bt">
-                    <button type="primary" hover-class="none" bindtap="del" data-follower-id="{{item.follower_id}}">删除</button>
-                </view>
-            </view>
-        </view>
-        <view class="weui-loadmore weui-loadmore_line" wx:if="{{!next_data&&!loading&&users.length!==0}}">
-            <text class="weui-loadmore__tips">数据已经全部加载完了</text>
-        </view>
-        <view class="weui-loadmore weui-loadmore_line" wx:if="{{users.length==0&&!loading}}">
-            <text class="weui-loadmore__tips">暂无数据</text>
-        </view>
-    </view>
-</view>

pages/channel/user/following_users/following_users.wxss

@@ -1,204 +0,0 @@
-/* pages/channel/user/following_users/following_users.wxss */
-.weui-panel {
-    background-color: #FFFFFF;
-    margin-top: 10px;
-    position: relative;
-    overflow: hidden;
-}
-.weui-panel:first-child {
-    margin-top: 0;
-}
-/*.weui-panel:before {
-    content: " ";
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    height: 1px;
-    border-top: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-}*/
-.weui-panel:after {
-    content: " ";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 1px;
-    border-bottom: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 100%;
-    transform-origin: 0 100%;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-}
-.weui-panel__hd {
-    padding: 14px 15px 10px;
-    color: #999999;
-    font-size: 13px;
-    position: relative;
-}
-.weui-panel__hd:after {
-    content: " ";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 1px;
-    border-bottom: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 100%;
-    transform-origin: 0 100%;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    left: 15px;
-}
-.weui-media-box {
-    padding: 15px;
-    position: relative;
-    color: #000000;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-media-box_appmsg {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-    align-items: center;
-}
-.weui-media-box_appmsg .weui-media-box__hd {
-    margin-right: .8em;
-    width: 60px;
-    height: 60px;
-    line-height: 60px;
-    text-align: center;
-    float:left;
-}
-.weui-media-box_appmsg .weui-media-box__bd {
-    -webkit-box-flex: 1;
-    -webkit-flex: 1;
-    flex: 1;
-    min-width: 0;
-}
-.weui-media-box_appmsg .weui-media-box__thumb {
-    width: 100%;
-    max-height: 100%;
-    vertical-align: top;
-}
-.weui-media-box:before {
-    content: " ";
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    height: 1px;
-    border-top: 1px solid #E5E5E5;
-    color: #E5E5E5;
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    left: 15px;
-}
-.weui-media-box:first-child:before {
-    display: none;
-}
-.weui-loadmore {
-    width: 65%;
-    margin: 1.5em auto;
-    line-height: 1.6em;
-    font-size: 14px;
-    text-align: center;
-}
-.weui-loading {
-    width: 20px;
-    height: 20px;
-    display: inline-block;
-    vertical-align: middle;
-    -webkit-animation: weuiLoading 1s steps(12, end) infinite;
-    animation: weuiLoading 1s steps(12, end) infinite;
-    background: transparent url(http://www.ibanling.com/h5/gate/images/loading.svg) no-repeat;
-    background-size: 100%;
-}
-.weui-loadmore__tips {
-    display: inline-block;
-    vertical-align: middle;
-}
-@-webkit-keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-
-@keyframes weuiLoading {
-  0% {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-
-  100% {
-    transform: rotate3d(0, 0, 1, 360deg);
-  }
-}
-.weui-loadmore_line {
-    border-top: 1px solid #E5E5E5;
-    margin-top: 2.4em;
-}
-.weui-loadmore_line .weui-loadmore__tips {
-    position: relative;
-    top: -0.9em;
-    padding: 0 .55em;
-    background-color: #FFFFFF;
-    color: #999999;
-}
-.weui-media-box__bt{
-    width:80px;
-    position:absolute;
-    right:15px;
-}
-.weui-media-box__bt button{
-  display:block;
-  color:#fff;
-  width:80px;
-  /*height: 37px;*/
-  background-color: #50B7E3;
-  border:0px solid #50B7E3;
-  font-size: 14px;
-  border-radius:30px;
-  padding-top:1px;
-  padding-bottom:1px;
-}
-
-.weui-navbar {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: flex;
-    /*position: absolute;*/
-    z-index: 500;
-    /*top: 0;*/
-    width: 100%;
-    background-color: #FAFAFA;
-}
-.weui-navbar__item {
-    position: relative;
-    display: block;
-    -webkit-box-flex: 1;
-    -webkit-flex: 1;
-    flex: 1;
-    padding: 13px 0;
-    text-align: center;
-    font-size: 15px;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-.weui-navbar__item.weui-bar__item_on {
-    background-color: #50B7E3;
-    color: #fff;
-}

pages/channel/video/add/add.js

@@ -70,8 +70,8 @@ Page({
       success: function(res) {
         console.log('chooseVideo success, temp path is', res.tempFilePath)
         console.log(res);
-        if(res.size>20*1024*1000){
-          showMsg('提示信息','视频大小不能大于20M');
+        if(res.size>50*1024*1000){
+          showMsg('提示信息','视频大小不能大于50M');
           return;
         }
         var videoSrc = res.tempFilePath;
@@ -137,7 +137,8 @@ Page({
     if(e.detail.formId!='the formId is a mock one'){
       data.form_id=e.detail.formId;
     }
-    data.type=3
+    data.type=3;
+    data.expire_in=1440;
     self.setData({
         'busy1':true
     })

pages/common/footer.wxml

@@ -2,8 +2,16 @@
   <view class="page__hd">
     <view class="bottom_title">北京斑羚在线网络科技有限公司 </view>
     <view class="bottom_title" data-mobile="010-85795663" bindtap="call"> 010-85795663</view>
-     <!--<view class="bottom_title">
-      <contact-button type="default-light" size="20" session-from="weapp"></contact-button>
-     </view>-->
+     <view class="bottom_title"  wx:if="{{canIUse}}" >
+     <button open-type="contact" style="background-color: #50B7E3;border:0px solid #AAAAAA;font-size: 14px;padding-bottom:1px;padding-top:1px;color:#50B7E3;height:14px;padding:0;line-height:14px;background: transparent">意见反馈</button>
+     </view>
+     <view class="bottom_title"  wx:else >
+     <contact-button 
+  type="default-light" 
+  size="20"
+  session-from="weapp"
+>
+</contact-button>
+     </view>
   </view>
 </template>

pages/person/image/add/add.js

@@ -49,6 +49,7 @@ Page({
   "busy1":false,
   "busy2":false,
   "textarea":false,
+  "sizeType":['original'],
   "expire":false,
   "imageAble":false,
   "upload_busy":false
@@ -59,21 +60,30 @@ Page({
       console.log(userInfo);
     });
     const ctx = wx.createCanvasContext('myCanvas')
-    this.chooseImage();
+    var self=this;
+    var res = wx.getSystemInfoSync();
+    if(res.system.indexOf('iOS')!==-1){
+      self.setData({
+          'sizeType':['compressed']
+      });
+    }
+    self.chooseImage();
   },
   onShow: function () {
     console.log('onShow');
     // this.chooseImage();
   },
   chooseImage: function() {
+
     var self = this;
+    console.log(self.data.sizeType);
     if(self.data.upload_busy||self.data.textarea){
       console.log(self.data.textarea)
       return;
     }
     wx.chooseImage({
       count: 1,
-      sizeType: ['compressed'],
+      sizeType: self.data.sizeType,
       sourceType: ['album','camera'],
       success: function(res) {
         //  showMsg('提示信息','chooseImage successful,temp path is'+res.tempFilePaths[0]);
@@ -292,7 +302,7 @@ Page({
       if(res.system.indexOf('Android')!==-1){
         if(width>height){
           this.setData({
-            'imageSrc':this.data.imageSrc+'/rotate/90',
+            'imageSrc':this.data.imageSrc,
           })
         }
       }

pages/person/image/send/send.js

@@ -42,6 +42,7 @@ var showMsg = (title, content) => {
 };
 //获取应用实例
 var app = getApp()
+var busy=false;
 Page({
   data: {
       hash_key:"",
@@ -77,103 +78,106 @@ Page({
   },
   onLoad: function (e) {
     console.log('onLoad');
-    app.getUserInfo(function(userInfo){
-      console.log(userInfo);
-    });
+    if(busy){
+      return;
+    }
     this.setData({
-        hash_key:e.hash_key
+        hash_key:e.hash_key,
+        num:5
     })
-    this.setData({
-        num:5,
-    });
+    busy=true;
     var animation = wx.createAnimation({
       duration: 100,
         timingFunction: 'ease',
     })
     this.animation = animation
-    var self=this
-    qcloud.request({
-            // 要请求的地址
-            url: config.service.apiUrl+'messages/'+self.data.hash_key,
-            success(result) {
-              console.log(result);
-              if(result.statusCode==200){
-                if(result.data.success==true){
-                    if(result.data.message_data.dead==0){
-                        if(result.data.is_mine==true){
+    var self=this;
+    app.getUserInfo(function(userInfo){
+      console.log(userInfo);
+        qcloud.request({
+                // 要请求的地址
+                url: config.service.apiUrl+'messages/'+self.data.hash_key,
+                success(result) {
+                console.log(result);
+                if(result.statusCode==200){
+                    if(result.data.success==true){
+                        if(result.data.message_data.dead==0){
+                            if(result.data.is_mine==true){
+                                self.setData({
+                                        is_mine:true
+                                });
+                            }else{
+                                self.setData({
+                                        is_mine:false
+                                });
+                            }
                             self.setData({
-                                    is_mine:true
+                                    start:true,
+                                    text:result.data.message_data.text,
+                                    imageSrc:result.data.message_data.image_url,
+                                    nicker_name:result.data.message_data.user.nickname
                             });
+                            if(result.data.message_data.type==2){
+                                self.setData({
+                                        loading:true
+                                });
+                            }
+                            if(result.data.message_data.image_url==""&&result.data.is_mine==false){
+                                self.Interval();
+                            }
                         }else{
-                            self.setData({
-                                    is_mine:false
-                            });
-                        }
-                        self.setData({
-                                start:true,
-                                text:result.data.message_data.text,
-                                imageSrc:result.data.message_data.image_url,
-                                nicker_name:result.data.message_data.user.nickname
-                        });
-                        if(result.data.message_data.type==2){
-                            self.setData({
-                                    loading:true
-                            });
-                        }
-                        if(result.data.message_data.image_url==""&&result.data.is_mine==false){
-                            self.Interval();
-                        }
-                    }else{
-                        if(result.data.message_data.is_qun==1){
-                            wx.hideToast();
-                            wx.showModal({
-                                title:'提示信息',
-                                content: '你来晚了，本密件已经被销毁',
-                                showCancel: false,
-                                success: function(res) {
-                                    if (res.confirm) {
-                                        wx.switchTab({
-                                            url: '/pages/person/index/index'
-                                        })
+                            if(result.data.message_data.is_qun==1){
+                                wx.hideToast();
+                                wx.showModal({
+                                    title:'提示信息',
+                                    content: '你来晚了，本密件已经被销毁',
+                                    showCancel: false,
+                                    success: function(res) {
+                                        if (res.confirm) {
+                                            wx.switchTab({
+                                                url: '/pages/person/index/index'
+                                            })
+                                        }
                                     }
-                                }
-                            });
-                        }else{
-                            wx.switchTab({
-                                url: '/pages/person/index/index'
-                            })
-                        }
-                    }
-                }else{
-                    wx.hideToast();
-                    wx.showModal({
-                        title:'提示信息',
-                        content: result.data.message,
-                        showCancel: false,
-                        success: function(res) {
-                            if (res.confirm) {
+                                });
+                            }else{
                                 wx.switchTab({
                                     url: '/pages/person/index/index'
                                 })
                             }
                         }
-                    });
+                    }else{
+                        wx.hideToast();
+                        wx.showModal({
+                            title:'提示信息',
+                            content: result.data.message,
+                            showCancel: false,
+                            success: function(res) {
+                                if (res.confirm) {
+                                    wx.switchTab({
+                                        url: '/pages/person/index/index'
+                                    })
+                                }
+                            }
+                        });
+                    }
+                }else{
+                    wx.switchTab({
+                        url: '/pages/person/index/index'
+                    })
                 }
-              }else{
-                 wx.switchTab({
-                    url: '/pages/person/index/index'
-                 })
-              }
-            },
+                },
 
-            fail(error) {
-                console.log('request fail', error);
-            },
+                fail(error) {
+                    console.log('request fail', error);
+                },
 
-            complete() {
-                console.log('request complete');
-            }
-      });
+                complete() {
+                    busy=false;
+                    console.log('request complete');
+                }
+        });
+    });
   },
   onShow: function () {
     console.log('onShow');

pages/person/index/index.js

@@ -36,6 +36,9 @@ var app = getApp()
 Page({
   data: {
     "item":[],
+    "item1": {
+      "canIUse": wx.canIUse('button.open-type.contact')
+    },
     "hidden":true,
     "active":false
   },

pages/person/index/index.wxml

@@ -24,7 +24,7 @@
         </view>
     </view>
   </view>
-  <template is="foot" />
+  <template is="foot" data="{{...item1}}" />
   <view class="active" hidden="{{hidden}}">
     <view  style="display:inline-block;width:100%;vertical-align: middle;">
         <image src="{{item[0]}}" style="width:100%;" mode="widthFix" bindtap="hidden" ></image>

pages/person/video/add/add.js

@@ -71,8 +71,8 @@ Page({
       success: function(res) {
         console.log('chooseVideo success, temp path is', res.tempFilePath)
         console.log(res);
-        if(res.size>20*1024*1000){
-          showMsg('提示信息','视频大小不能大于20M');
+        if(res.size>50*1024*1000){
+          showMsg('提示信息','视频大小不能大于50M');
           return;
         }
         var videoSrc = res.tempFilePath;

pages/person/video/send/send.js

@@ -31,6 +31,7 @@ var showModel = (title, content) => {
     });
 };
 //获取应用实例
+var busy=false;
 var app = getApp()
 Page({
   data: {
@@ -58,7 +59,7 @@ Page({
                 if(self.data.num == 0){
                     clearInterval(self.data.intervarID);
                     setTimeout(function(){
-                        wx.redirectTo({
+                        wx.switchTab({
                             url: '/pages/index/index'
                         })
                     }, 1000);
@@ -67,84 +68,89 @@ Page({
   },
   onLoad: function (e) {
     console.log('onLoad');
+    if(busy){
+      return;
+    }
+    busy=true;
     this.setData({
         hash_key:e.hash_key
     })
+    var self=this;
     app.getUserInfo(function(userInfo){
       console.log(userInfo);
-    });
-    var self=this;
-    qcloud.request({
-            // 要请求的地址
-            url: config.service.apiUrl+'messages/'+self.data.hash_key,
-            success(result) {
-              console.log(result);
-              if(result.statusCode==200){
-                if(result.data.success==true){
-                    if(result.data.message_data.dead==0){
-                        if(result.data.is_mine==true){
+        qcloud.request({
+                // 要请求的地址
+                url: config.service.apiUrl+'messages/'+self.data.hash_key,
+                success(result) {
+                console.log(result);
+                if(result.statusCode==200){
+                    if(result.data.success==true){
+                        if(result.data.message_data.dead==0){
+                            if(result.data.is_mine==true){
+                                self.setData({
+                                        is_mine:true
+                                });
+                            }else{
+                                self.setData({
+                                        is_mine:false
+                                });
+                            }
                             self.setData({
-                                    is_mine:true
-                            });
+                                    start:true,
+                                    videoSrc:result.data.message_data.image_url                             });
                         }else{
-                            self.setData({
-                                    is_mine:false
-                            });
-                        }
-                        self.setData({
-                                start:true,
-                                videoSrc:result.data.message_data.image_url                             });
-                    }else{
-                        if(result.data.message_data.is_qun==1){
-                            wx.hideToast();
-                            wx.showModal({
-                                title:'提示信息',
-                                content: '你来晚了，本密件已经被销毁',
-                                showCancel: false,
-                                success: function(res) {
-                                    if (res.confirm) {
-                                        wx.switchTab({
-                                            url: '/pages/person/index/index'
-                                        })
+                            if(result.data.message_data.is_qun==1){
+                                wx.hideToast();
+                                wx.showModal({
+                                    title:'提示信息',
+                                    content: '你来晚了，本密件已经被销毁',
+                                    showCancel: false,
+                                    success: function(res) {
+                                        if (res.confirm) {
+                                            wx.switchTab({
+                                                url: '/pages/person/index/index'
+                                            })
+                                        }
                                     }
-                                }
-                            });
-                        }else{
-                            wx.switchTab({
-                                url: '/pages/person/index/index'
-                            })
-                        }
-                    }
-                }else{
-                    wx.hideToast();
-                    wx.showModal({
-                        title:'提示信息',
-                        content: result.data.message,
-                        showCancel: false,
-                        success: function(res) {
-                            if (res.confirm) {
+                                });
+                            }else{
                                 wx.switchTab({
                                     url: '/pages/person/index/index'
                                 })
                             }
                         }
-                    });
+                    }else{
+                        wx.hideToast();
+                        wx.showModal({
+                            title:'提示信息',
+                            content: result.data.message,
+                            showCancel: false,
+                            success: function(res) {
+                                if (res.confirm) {
+                                    wx.switchTab({
+                                        url: '/pages/person/index/index'
+                                    })
+                                }
+                            }
+                        });
+                    }
+                }else{
+                    wx.switchTab({
+                        url: '/pages/person/index/index'
+                    })
                 }
-              }else{
-                 wx.switchTab({
-                    url: '/pages/person/index/index'
-                 })
-              }
-            },
+                },
 
-            fail(error) {
-                console.log('request fail', error);
-            },
+                fail(error) {
+                    console.log('request fail', error);
+                },
 
-            complete() {
-                console.log('request complete');
-            }
-      });
+                complete() {
+                    busy=false;
+                    console.log('request complete');
+                }
+        });
+    });
   },
   onShow: function () {
     console.log('onShow');

pages/person/video/view/view.js

@@ -90,7 +90,7 @@ Page({
               console.log(result);
               if(result.data.success==true){
                   if(result.data.message_data.type!==3){
-                      wx.redirectTo({
+                      wx.switchTab({
                             url: '/pages/perosn/image/view/view?hash_key='+self.data.hash_key
                       })
                   }