Merge branch 'master' of gitlab.davyin.net:will.chen/miniapps-nature

 
 App({
-  url: 'https://stg.natureresearch.cn',
+  url: 'https://www.natureresearch.cn',
   onLaunch: function () {
 
     this.getUserInfo()
@@ -25,7 +25,7 @@ App({
                 typeof cb == "function" && cb(that.globalData.userInfo);
                 //插入修改会员表返回openid
                 wx.request({
-                  url: 'https://stg.natureresearch.cn/mpapi/1.0.0/user/login',
+                  url: 'https://www.natureresearch.cn/mpapi/1.0.0/user/login',
                   method: 'POST',
                   header: {
                     'content-type': 'application/json',

@@ -10,7 +10,7 @@
     </view> -->
   </view>
   <view class="video">
-    <video src="https://stg.natureresearch.cn/sites/default/files/videos/NatureResearch.mp4"
+    <video src="https://www.natureresearch.cn/sites/default/files/videos/NatureResearch.mp4"
       binderror="videoErrorCallback" poster="http://xcx.yiscio.com/app/shipin.png" controls></video>
   </view>
   <view class="content1">

@@ -19,8 +19,8 @@
        <text class="{{total==0?'hide':'display'}}">{{total}}</text>
     </navigator>
     <navigator bindtap='a9'>
-      <view class="{{total1==0?'wenzi1':'wenzi'}}">参加的活动</view>
-      <text class="{{total1==0?'hide':'display'}}">{{total1}}</text>
+      <view class="{{(total1==0 || total1==null)?'wenzi1':'wenzi'}}">参加的活动</view>
+      <text class="{{(total1==0 || total1==null)?'hide':'display'}}">{{total1}}</text>
     </navigator>
     <view class="cl"></view>
   </view>