2.2.3

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.2.0",
+    Version: "2.3.0",
     //IsProduction: true,
     IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    
     "pages/index/index",
     "pages/main/health",
     "pages/main/folderEdit",

pages/index/test.js

@@ -0,0 +1,54 @@
+Page({
+  data: {
+   navbarInitTop: 0, //导航栏初始化距顶部的距离
+   isFixedTop: false, //是否固定顶部
+  },
+  
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+  
+  },
+  
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+   var that = this;
+  
+   if (that.data.navbarInitTop == 0) {
+  
+    //获取节点距离顶部的距离
+    wx.createSelectorQuery().select('#navbar').boundingClientRect(function(rect) {
+     if (rect && rect.top > 0) {
+      var navbarInitTop = parseInt(rect.top);
+      that.setData({
+       navbarInitTop: navbarInitTop
+      });
+     }
+    }).exec();
+  
+   }
+  },
+  
+  /**
+   * 监听页面滑动事件
+   */
+  onPageScroll: function(e) {
+   var that = this;
+   var scrollTop = parseInt(e.scrollTop); //滚动条距离顶部高度
+  
+   //判断'滚动条'滚动的距离 和 '元素在初始时'距顶部的距离进行判断
+   var isSatisfy = scrollTop >= that.data.navbarInitTop ? true : false;
+   //为了防止不停的setData, 这儿做了一个等式判断。 只有处于吸顶的临界值才会不相等
+   if (that.data.isFixedTop === isSatisfy) {
+    return false;
+   }
+  
+   that.setData({
+    isFixedTop: isSatisfy
+   });
+  }
+ })
+ 

pages/index/test.json

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

pages/index/test.wxml

@@ -0,0 +1,16 @@
+<view style="width: 90%; height: 300rpx; background: #f0f0f0; margin: 30rpx auto;"></view>
+<view class="navbar-wrap">
+ <view class="column {{isFixedTop?'fixed':''}}" id="navbar">
+  <view class="block active">新品推荐</view>
+  <view class="block">限时优惠</view>
+  <view class="block">火爆热搜</view>
+  <view class="block">猜你喜欢</view>
+ </view>
+ <!-- 用于吸顶后 占位用的 -->
+ <view class="column" wx:if="{{isFixedTop}}"></view>
+</view>
+ 
+ 
+<block wx:for="{{20}}" wx:key="list">
+ <view style="width: 100%; height: 120rpx; background: #f0f0f0; margin: 20rpx auto;"></view>
+</block>

pages/index/test.wxss

@@ -0,0 +1,30 @@
+view, text {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+ }
+  
+ .navbar-wrap {
+  width: 100%;
+ }
+  
+ .navbar-wrap .column {
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  background: #fff;
+  
+  top: 0;
+  left: 0;
+  z-index: 100;
+ }
+  
+ .navbar-wrap .column.fixed {
+  position: fixed;
+
+  border-bottom: solid 1px #1e1e1e;
+ }
+  

pages/main/addInfomationDetail.js

@@ -209,6 +209,7 @@ Page({
             } else if (item.Type == "sound") {
               str = "[读]" + item.Content + "[/读]";
               if (item.Tag == "发音") {
+                item.SoundMark = main.GetSoundError(item.SoundMark);
                 var strTemp = item.Content.substr(0, 1);
                 if (this.data.ShowSoundMark == "1")
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";

pages/main/detail.js

@@ -1294,6 +1294,24 @@ Page({
     url += "&FolderType=" + foldertype;
     url += "&ID=" + TaskList[0].MiaoguoCardID;
     main.getData(url, function (data) {
+
+      //归档后要修改上方的数字
+      if (that.data.TaskInfo.IsNew){
+        that.setData({
+          NumberNew:--that.data.NumberNew,
+        });
+      }
+      else if (that.data.TaskInfo.IsHistory){
+        that.setData({
+          NumberHistory:--that.data.NumberHistory,
+        });
+      }      
+      else if (that.data.TaskInfo.IsReview){
+        that.setData({
+          NumberReview:--that.data.NumberReview,
+        });
+      }
+      
       TaskList.splice(0, 1);
       if (TaskList.length > 0) {
         that.setData({
@@ -1317,12 +1335,11 @@ Page({
             image: "../images/universalpic_cupboard_white_120x120.png",
           });
         }
-
+        
         that.setSoundFile(3);
       } else {
         that.setFinallyResult();
       }
-
     });
   },
   saveIsFolderPractice: function (e) {

pages/other/newuser.js

@@ -43,6 +43,13 @@ Page({
       }
       
     });
+
+    if (wx.setNavigationBarColor) {
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: "#ffffff",
+      })
+    }
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;

pages_agent/marketing/shareuser.wxss

@@ -31,10 +31,13 @@
 
 .panel .panel1{
   margin-top: 60rpx;
+  width:670rpx;
+  height:526rpx;
+  flex-wrap: wrap;
 }
 
 .panel .img{
-  width:196rpx;
+  width:300rpx;
   height:248rpx;
   margin: 0 10rpx;
 }

utils/constant.js

@@ -21,6 +21,9 @@ module.exports = {
     },{
       Word: "游说",
       Sound: "(yóu)(shuì)",
+    },{
+      Word: "lan=en&text=Mr&",
+      Sound: "lan=en&text=Mister&",
     },
   ],
   arrMenuText: [{