1.1.7

app.js

@@ -25,9 +25,9 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.5",
+    Version: "1.1.7",
     IsProduction: true,
-    ShareTitle: "可以用来记忆一切的工具",
+    ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
     ShareImage: '',
     ProgramID: 166,

pages/main/add.js

@@ -327,10 +327,14 @@ Page({
             arrResult.push(arr[i][j].ContentServer);
           }
           else {
-            that.uploadImage(arr[i][j].Content, function (data) {
-              //console.log("Target:"+data);
-              data = app.globalData.uploadImageUrl + data;
-              arrResult.push(data);
+            var source = arr[i][j].Content;
+            that.uploadImage(source, function (data) {
+              if (data){
+                data=JSON.parse(data);
+                var result=data.result;
+                result.Target = app.globalData.uploadImageUrl + result.Target;
+                arrResult.push(result);
+              }
             });
           }
           b = true;
@@ -352,6 +356,7 @@ Page({
       //console.log(arrResult.length);
       if (arrResult.length >= arrSource.length) {
         wx.hideLoading();
+        console.log("arrResult:" + JSON.stringify(arrResult));
 
         clearInterval(interval);
         var ari = 0;
@@ -359,7 +364,16 @@ Page({
           for (var j = 0; j < arr[i].length; j++) {
             if (arr[i][j].Type == "image" && arr[i][j].Content) {
               var tempUrl = arr[i][j].Content;
-              var serverUrl = arrResult[ari++];
+              var serverUrl = "";
+              for(var k=0;k<arrResult.length;k++){
+                if (tempUrl.indexOf(arrResult[k].Source)>=0){
+                  serverUrl = arrResult[k].Target;
+                  break;
+                }
+              }
+              console.log("serverUrl:" + serverUrl);
+              console.log("tempUrl:" + tempUrl);
+
               main.saveTempImage(serverUrl, tempUrl);
               arr[i][j].Content = serverUrl;
               arr[i][j].ContentServer = serverUrl;
@@ -375,7 +389,7 @@ Page({
   uploadImage: function (file, callback) {
 
 
-    var url = common.Encrypt("MiaoguoUploadFile");
+    var url = common.Encrypt("MiaoguoUploadFile2");
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
       filePath: file,

pages/main/add.wxml

@@ -3,7 +3,7 @@
     <view class="panelTopLeft FlexRow" catchtap="onSearch">
       <view class="add">+</view> 资料
     </view>
-    <view class='panelTopRight FlexRow' catchtap='onGotoList'>
+    <view class='panelTopRight FlexRow' catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
       <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
     </view>
   </view>

pages/main/detail.js

@@ -651,7 +651,7 @@ Page({
         }
         var speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
         var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
-
+        app.globalData.TaskToday.DayNumber=data.DayNumber;
         that.setData({
           TodayTime: duration,
           Speed1: speed1 + "张题卡",

pages/main/detail.wxml

@@ -53,6 +53,7 @@
     </view>
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
+    
     <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
     
     <view class='footer0'></view>

pages/main/detail.wxss

@@ -95,11 +95,14 @@
   flex-wrap: wrap;
   justify-content: flex-start;
   z-index: 5;
+  position: relative;
 }
 
 .panelField1 {
   width: 100%;
   justify-content: flex-start;
+  z-index: 5;
+  position: relative;
 }
 
 .panelField11 {
@@ -163,6 +166,7 @@
   width: 100%;
   justify-content: flex-start;
   z-index: 5; 
+  position: relative;
 }
 
 .panelField2 {

pages/main/preview.wxss

@@ -147,12 +147,15 @@
   font-weight: 400;
   flex-wrap: wrap;
   justify-content: flex-start;
-  z-index: 5;
+  z-index: 5; 
+  position: relative;
 }
 
 .panelField1 {
   width: 100%;
   justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
 }
 
 .panelField11 {
@@ -216,6 +219,7 @@
   width: 100%;
   justify-content: flex-start;
   z-index: 5; 
+  position: relative;
 }
 
 .panelField2 {

pages/main/setting.js

@@ -6,7 +6,7 @@ const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
 const arrClickType=["专属按钮","点击空白","两种方式"];
 var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","临时"];
-var arrUserID = [2, 11, 8, 9, 10, 12];
+var arrUserID = [2, 11, 8, 9, 10, 108];
 
 Page({
   data: {

pages/template/cardShow.wxml

@@ -1,6 +1,6 @@
 <template name="CardShow">
   <!-- 第一段 -->
-  <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
+  <view class="panelField1 FlexColumn" >
     <view class="editFieldNull"></view>
     <block wx:if="{{ShowType=='show'}}">
       <view class="LimitTime FlexColumn">