2.3.26

app.js

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

app.json

@@ -68,7 +68,6 @@
     "navigationBarTitleText": "秒过",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#ffffff",
-    "resizable": false,
     "enablePullDownRefresh": false
   },
   "subPackages": [
@@ -121,17 +120,5 @@
   "requiredBackgroundModes": [
     "audio"
   ],
-  "navigateToMiniProgramAppIdList": [
-    "wx84b3feac6069eec3",
-    "wxa5441bbf344692ba",
-    "wx46a7b4c420e6d38f",
-    "wx1fef080f74481cbd",
-    "wx331e8dd070f01d0e",
-    "wx313a8f2c0741efe1",
-    "wxb54a6d5aff836ee3",
-    "wxa5e33c61fe37dd01",
-    "wxaa1a8b48d9853872",
-    "wx80059777521b897c"
-  ],
   "sitemapLocation": "sitemap.json"
 }

pages/main/default.js

@@ -20,6 +20,7 @@ Page({
     IsShowRemind: false,
     IsShowHelp: false,
     IsShowUserFamily: 0,
+    ChildUserID:false,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -30,6 +31,7 @@ Page({
   onLoad: function (options) {
     var that = this;
     that.setData({
+      ChildUserID:false,
       Containnerheight: main.getWindowHeight(),
     });
 
@@ -439,13 +441,20 @@ Page({
     main.getData(url, function (data) {
       if (data) {
         if (data.length > 0) {
+
           that.setData({
             IsShowUserFamily: 1,
             UserFamilyNickName: common.getStringMaxLength(app.globalData.userInfo.NickName, 12),
             UserFamilyAvatar: app.globalData.userInfo.AvatarUrl,
             UserFamily: data,
-            ChildUserID: app.globalData.userInfo.ChildUserID,
           });
+
+          if (app.globalData.userInfo.ChildUserID){
+            that.setData({
+              ChildUserID: app.globalData.userInfo.ChildUserID,
+            });
+          }
+          
           app.globalData.FamilyUsers = data;
         }
       }

pages/main/detail.wxss

@@ -208,6 +208,7 @@ page{
   justify-content: flex-start;
   z-index: 5; 
   position: relative;
+  min-height:200rpx;
 }
 
 .panelField2 {

pages/main/preview.wxss

@@ -218,6 +218,7 @@
   justify-content: flex-start;
   z-index: 5; 
   position: relative;
+  min-height:200rpx;
 }
 
 .panelField2 {

pages/template/cardShow.wxml

@@ -81,7 +81,8 @@
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-
+          <text class="textNormal" wx:if="{{item.Type=='bigword'}}" style='font-size: 108rpx;'>{{item.Content}}</text>
+      
           <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
             <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
               <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />

pages_test/test/item.wxss

@@ -183,6 +183,7 @@ page{
   width: 710rpx;
   margin-bottom: 20rpx;
   border-radius: 20rpx;
+  min-height:200rpx;
 }
 
 .panelField21 {

utils/main.js

@@ -70,10 +70,16 @@ function getLocalHost(callback) {
 }
 
 function getBaiduToken() {
-  getData('GetBaiduToken', function (data) {
-    if (data) {
-      app.globalData.BaiduToken = data;
-      //console.log(app.globalData.BaiduToken);
+  var that = this
+  //调用登录接口
+  wx.login({
+    success: function (res0) {
+      getData('GetBaiduToken20220922?ProgramID='+app.globalData.ProgramID+'&Code='+res0.code, function (data) {
+        if (data) {
+          app.globalData.BaiduToken = data;
+          //console.log(app.globalData.BaiduToken);
+        }
+      });
     }
   });
 }
@@ -859,6 +865,7 @@ function GetHanziUnitWords(unitsID, testType, callback) {
       } else { //若是词语
         for (var k = 0; k < words.length; k++) {
           var taskInfo = words[k];
+          taskInfo.TagWidth=136;
           taskInfo.ContentNew = changeStringToView(taskInfo.Content);
           TaskList.push(taskInfo);
         }