chengjie 3 vuotta sitten
vanhempi
commit
b7affd65e4
8 muutettua tiedostoa jossa 27 lisäystä ja 20 poistoa
  1. 1 1
      app.js
  2. 0 13
      app.json
  3. 10 1
      pages/main/default.js
  4. 1 0
      pages/main/detail.wxss
  5. 1 0
      pages/main/preview.wxss
  6. 2 1
      pages/template/cardShow.wxml
  7. 1 0
      pages_test/test/item.wxss
  8. 11 4
      utils/main.js

+ 1 - 1
app.js

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

+ 0 - 13
app.json

@@ -68,7 +68,6 @@
68 68
     "navigationBarTitleText": "秒过",
69 69
     "navigationBarTextStyle": "black",
70 70
     "backgroundColor": "#ffffff",
71
-    "resizable": false,
72 71
     "enablePullDownRefresh": false
73 72
   },
74 73
   "subPackages": [
@@ -121,17 +120,5 @@
121 120
   "requiredBackgroundModes": [
122 121
     "audio"
123 122
   ],
124
-  "navigateToMiniProgramAppIdList": [
125
-    "wx84b3feac6069eec3",
126
-    "wxa5441bbf344692ba",
127
-    "wx46a7b4c420e6d38f",
128
-    "wx1fef080f74481cbd",
129
-    "wx331e8dd070f01d0e",
130
-    "wx313a8f2c0741efe1",
131
-    "wxb54a6d5aff836ee3",
132
-    "wxa5e33c61fe37dd01",
133
-    "wxaa1a8b48d9853872",
134
-    "wx80059777521b897c"
135
-  ],
136 123
   "sitemapLocation": "sitemap.json"
137 124
 }

+ 10 - 1
pages/main/default.js

@@ -20,6 +20,7 @@ Page({
20 20
     IsShowRemind: false,
21 21
     IsShowHelp: false,
22 22
     IsShowUserFamily: 0,
23
+    ChildUserID:false,
23 24
   },
24 25
   onPullDownRefresh: function () {
25 26
     wx.redirectTo({
@@ -30,6 +31,7 @@ Page({
30 31
   onLoad: function (options) {
31 32
     var that = this;
32 33
     that.setData({
34
+      ChildUserID:false,
33 35
       Containnerheight: main.getWindowHeight(),
34 36
     });
35 37
 
@@ -439,13 +441,20 @@ Page({
439 441
     main.getData(url, function (data) {
440 442
       if (data) {
441 443
         if (data.length > 0) {
444
+
442 445
           that.setData({
443 446
             IsShowUserFamily: 1,
444 447
             UserFamilyNickName: common.getStringMaxLength(app.globalData.userInfo.NickName, 12),
445 448
             UserFamilyAvatar: app.globalData.userInfo.AvatarUrl,
446 449
             UserFamily: data,
447
-            ChildUserID: app.globalData.userInfo.ChildUserID,
448 450
           });
451
+
452
+          if (app.globalData.userInfo.ChildUserID){
453
+            that.setData({
454
+              ChildUserID: app.globalData.userInfo.ChildUserID,
455
+            });
456
+          }
457
+          
449 458
           app.globalData.FamilyUsers = data;
450 459
         }
451 460
       }

+ 1 - 0
pages/main/detail.wxss

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

+ 1 - 0
pages/main/preview.wxss

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

+ 2 - 1
pages/template/cardShow.wxml

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

+ 1 - 0
pages_test/test/item.wxss

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

+ 11 - 4
utils/main.js

@@ -70,10 +70,16 @@ function getLocalHost(callback) {
70 70
 }
71 71
 
72 72
 function getBaiduToken() {
73
-  getData('GetBaiduToken', function (data) {
74
-    if (data) {
75
-      app.globalData.BaiduToken = data;
76
-      //console.log(app.globalData.BaiduToken);
73
+  var that = this
74
+  //调用登录接口
75
+  wx.login({
76
+    success: function (res0) {
77
+      getData('GetBaiduToken20220922?ProgramID='+app.globalData.ProgramID+'&Code='+res0.code, function (data) {
78
+        if (data) {
79
+          app.globalData.BaiduToken = data;
80
+          //console.log(app.globalData.BaiduToken);
81
+        }
82
+      });
77 83
     }
78 84
   });
79 85
 }
@@ -859,6 +865,7 @@ function GetHanziUnitWords(unitsID, testType, callback) {
859 865
       } else { //若是词语
860 866
         for (var k = 0; k < words.length; k++) {
861 867
           var taskInfo = words[k];
868
+          taskInfo.TagWidth=136;
862 869
           taskInfo.ContentNew = changeStringToView(taskInfo.Content);
863 870
           TaskList.push(taskInfo);
864 871
         }