5.1.13

app.js

@@ -13,13 +13,13 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.0.0",
+    Version: "1.0.0.3",
     IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',
-    
     ProgramID: 166,
+    ProgramName:"秒过学习",
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",

app.json

@@ -1,5 +1,5 @@
 {
-  "pages": [
+  "pages": [    
     "pages/index/index",
     "pages/index/accredit",
     "pages/main/default",
@@ -15,6 +15,7 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/colorplan",
+    "pages/main/uploadinmage",
     "pages/main/setting"
   ],
   "window": {

pages/index/accredit.js

@@ -1,5 +1,5 @@
 import common from '../../utils/util';
-import server from '../../utils/main';
+import main from '../../utils/main';
 
 const app = getApp();
 var urlRedirectTo = "";
@@ -72,7 +72,7 @@ Page({
   login: function (param, param2) {
     var that = this;
     var url = "MiaoguoLogin";
-    server.postData(url, {
+    main.postData(url, {
       Code: param.Code,
       NickName: param2.nickName,
       AvatarUrl: param2.avatarUrl,
@@ -97,10 +97,22 @@ Page({
       app.globalData.userInfo.Province = data.Province;
       app.globalData.userInfo.Country = data.Country;
       
-      wx.navigateBack({
-        delta: 1
-      });
+      that.buildInitData();
+    });
+  },
+  buildInitData: function () {
+    //app.globalData.userInfo.UserID=4;
 
+    wx.showLoading({
+      title: '数据初始化',
+    });
+    main.getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      wx.hideLoading();
+      if (data) {
+        wx.navigateBack({
+          delta: 1
+        });
+      }
     });
   },
   onShareAppMessage: function () {

pages/main/add.js

@@ -149,7 +149,11 @@ Page({
           var item = that.data.Field[i][key];
           var str = "";
           if (item.Type == "image") {
-            str = "[图]" + item.Content + "[/图]";
+            if (item.Url){
+              str = "[图 url='"+item.Url+"']" + item.Content + "[/图]";
+            }
+            else
+              str = "[图]" + item.Content + "[/图]";
           }
           else if (item.Type == "line") {
             for (var j = 0; j < item.Content.length; j++) {
@@ -231,6 +235,18 @@ Page({
       UpdateType: "add2",
     });
   },
+  onBindError: function (e) {
+    for (var i = 1; i < this.data.Field.length; i++) {
+      for (var j = 0; j < this.data.Field[i].length; j++) {
+        if (this.data.Field[i][j].Type == "image") {
+          this.data.Field[i][j].Url = this.data.Field[i][j].Content;
+        }
+      }
+    }
+    this.setData({
+      Field: this.data.Field,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -39,7 +39,10 @@
           <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
           <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
 
-          <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+          <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' />
+          
+          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' binderror="onBindError" />
+          
           <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
         </block>
       </view>

pages/main/add.wxss

@@ -120,7 +120,9 @@
   width:100rpx;
   height:100rpx;
 }
-
+.panelItem .imageFree{
+  width:100rpx;
+}
 
 .panelItem .textReturn{
   width:100%;

pages/main/addItem.js

@@ -21,6 +21,7 @@ Page({
     wx.hideShareMenu();
     var id = options.id;
     var fieldid = options.fieldid;
+    field = "", tempCursor = 0, btnName = "", arrSoundMark = [];
 
     var that = this;
     that.setData({
@@ -94,7 +95,7 @@ Page({
       this.setData({
         LineSign: "[线]",
       });
-    }
+    } 
 
     if (!this.data.Focus){
       field=field+btnName;
@@ -201,6 +202,37 @@ Page({
     }
     wx.setStorageSync("CardList", list);
   },
+  uploadImage: function () {
+    wx.showLoading({
+      title: '请稍候',
+    });
+    var that=this;
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['compressed'],
+      sourceType: ['album', 'camera'],
+      success(res) {
+        // tempFilePath可以作为img标签的src属性显示图片
+        const tempFilePaths = res.tempFilePaths;
+        console.log(tempFilePaths[0]);
+
+        var url = common.Encrypt("MiaoguoUploadFile");
+        wx.uploadFile({
+          url: app.globalData.serverUrl + url,
+          filePath: tempFilePaths[0],
+          name: 'file',
+          success(res) {
+            wx.hideLoading();
+            var str = "[图 url='" + tempFilePaths[0] + "']" + "https://#####4#####/" +res.data+ "[/图]";
+            that.addSymbol({ currentTarget: { dataset: { id: str } } });
+          }
+        });
+      },
+      fail:function(){
+        wx.hideLoading();
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/addItem.wxml

@@ -16,7 +16,9 @@
       <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[/线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
-      <!-- <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' /> -->
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="uploadImage">
+        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
+      </view>
 
     </view>
     <view class='right FlexRow'>

pages/main/addItem.wxss

@@ -68,6 +68,11 @@
   height: 22rpx;
 }
 
+.universalpic_picture_gray_26x26{
+  width: 26rpx;
+  height: 26rpx;
+}
+
 .add {
   font-size: 42rpx;
   font-weight: 600;
@@ -158,6 +163,7 @@
 .input {
   margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
+  height:220rpx;
 }
 
 .panelBtn {

pages/main/detail.js

@@ -10,7 +10,8 @@ var innerAudioContext1;
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
 var TaskList = [];
-var iTimeout=0;
+var iTimeout = 0;
+var arrImage = [], arrImage2 = [];
 
 Page({
   data: {
@@ -18,7 +19,7 @@ Page({
     NumberReview: 0,
     NumberHistory: 30,
     IsShowNumberInfo: false,
-    TaskInfo:{},
+    TaskInfo: {},
     Color: {//配色1
       Name: "黑白",
       BackColor: "#ffffff",
@@ -45,7 +46,7 @@ Page({
 
     innerAudioContext1 = wx.createInnerAudioContext();
     this.audioCtx = wx.createAudioContext('myAudio');
-    
+
     this.getList();
 
     this.getColor();
@@ -90,11 +91,11 @@ Page({
       url += "end.mp3";
       that.getTaskTime();
     }
-    else if (isFinish == 2 || isFinish==3){
+    else if (isFinish == 2 || isFinish == 3) {
       url += "short3.mp3";
     }
     else {
-    url += "short2.mp3";
+      url += "short2.mp3";
     }
     if (isFinish >= 0) {
       innerAudioContext1.src = url;
@@ -181,7 +182,11 @@ Page({
     //处理列表
     TaskList = formatList(TaskList);
 
-
+    if (TaskList.length > 0) {
+      arrImage = TaskList[0].ContentNew.Images;
+      arrImage2 = TaskList[0].ContentNew.Images2;
+    }
+    
     that.setData({
       NumberNew: arrNew.length,
       NumberReview: that.data.NumberReview,
@@ -298,7 +303,10 @@ Page({
   },
   gotoPrev: function () {
     clearTimeout(iTimeout);
-
+    wx.showLoading({
+      title: '请稍候',
+      mask: true,
+    });
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       //console.log(card);
@@ -316,6 +324,7 @@ Page({
         url += "&LastTime=" + card.Card.LastTime;
 
       main.getData(url, function (data) {
+        wx.hideLoading();
         timeStart = new Date();
 
         card.Card.Number0 = card.Number0Old;
@@ -342,6 +351,9 @@ Page({
         if (listTaskFinished.length == 0)
           canUndo = 0;
 
+        arrImage = TaskList[0].ContentNew.Images;
+        arrImage2 = TaskList[0].ContentNew.Images2;
+
         that.setData({
           IsShowAnswer: [0, 0],
           TaskInfo: TaskList[0],
@@ -350,12 +362,12 @@ Page({
           NumberHistory: card.NumberHistory,
           CanUndo: canUndo,
         });
-      });
 
-      wx.showToast({
-        title: '回到上一张',
-        mask: true,
-        image:"../images/universalpic_undo_white_120x90.png",
+        wx.showToast({
+          title: '回到上一张',
+          mask: true,
+          image: "../images/universalpic_undo_white_120x90.png",
+        });
       });
     }
     that.setSoundFile(2);
@@ -444,13 +456,6 @@ Page({
       }
 
     }
-    else {
-      wx.showToast({
-        title: '今天不练',
-        mask: true,
-        image: "../images/universalpic_shelve_white_120x120.png",
-      });
-    }
 
     //修改学习任务个数
     var learningType = 0;
@@ -522,6 +527,9 @@ Page({
         });
         that.setSoundFile(1);
       } else {
+        arrImage = TaskList[0].ContentNew.Images;
+        arrImage2 = TaskList[0].ContentNew.Images2;
+
         //任务没有完成，下一张卡片
         that.setData({
           IsShowAnswer: [0, 0],
@@ -532,11 +540,16 @@ Page({
           CanUndo: 1,
         });
 
-        if (btnnumber == "1")
+        if (btnnumber == "1") {
           that.setSoundFile(3);
+          wx.showToast({
+            title: '今天不练',
+            mask: true,
+            image: "../images/universalpic_shelve_white_120x120.png",
+          });
+        }
         else
           that.setSoundFile(0);
-
       }
     });
 
@@ -599,7 +612,7 @@ Page({
     that.setData({
       TaskInfo: TaskList[0],
     });
-    iTimeout=setTimeout(function () {
+    iTimeout = setTimeout(function () {
       content[selectIndex].SoundImageName = "png";
       TaskList[0].ContentNew.Field[fieldid] = content;
       that.setData({
@@ -635,6 +648,26 @@ Page({
       IsShowNumberInfo: false,
     });
   },
+  showImage: function (e) {
+    var name = e.currentTarget.dataset.name;
+    wx.previewImage({
+      current: name,
+      urls: arrImage
+    });
+  },
+  onBindError: function (e) {
+    for (var i = 1; i < this.data.TaskInfo.ContentNew.Field.length; i++) {
+      for (var j = 0; j < this.data.TaskInfo.ContentNew.Field[i].length; j++) {
+        if (this.data.TaskInfo.ContentNew.Field[i][j].Type == "image") {
+          this.data.TaskInfo.ContentNew.Field[i][j].Url = this.data.TaskInfo.ContentNew.Field[i][j].Content;
+        }
+      }
+    }
+    arrImage = arrImage2;
+    this.setData({
+      TaskInfo: this.data.TaskInfo,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
@@ -642,5 +675,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-
 });

pages/main/detail.wxml

@@ -57,12 +57,15 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+        <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+
+        <image class="imageFree" mode='widthFix' wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+
   </block>
   </view>
 
   </view>
-  <view class="panelTag FlexRow" bindtouchstart="onShowAnswer" style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
+  <view class="panelTag FlexRow" bindtap="onShowAnswer" style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
     <view wx:if="{{!TaskInfo.ContentNew.Tags || TaskInfo.ContentNew.Tags.length==0}}"></view>
     <view class="panelTag1 FlexRow" wx:if="{{TaskInfo.ContentNew.Tags && TaskInfo.ContentNew.Tags.length>0}}">
       <view class='tagDot' style='background-color:{{Color.TagColor}};'></view>
@@ -78,7 +81,7 @@
 
   </view>
 
-  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtouchstart="onShowAnswer">
+  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtap="onShowAnswer">
     <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}">
       <view wx:if="{{itemParent==3}}" class="lineField" style='background-color:{{Color.FieldLineColor}};'></view>
       <view class="panelField21 panelItem FlexRow">
@@ -100,7 +103,9 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
 
         </block>
       </view>

pages/main/detail.wxss

@@ -199,6 +199,12 @@
   margin: 30rpx 0;
 }
 
+.panelItem .imageFree {
+  width: 650rpx;
+  margin: 30rpx 0;
+  border-radius: 20rpx;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }

pages/main/preview.js

@@ -3,6 +3,7 @@ import main from '../../utils/main';
 
 const app = getApp();
 var iTimeout = 0;
+var arrImage = [], arrImage2 = [];
 
 Page({
   data: {
@@ -20,8 +21,14 @@ Page({
       ShowType: options.type,
       MiaoguoCardID: id,
     });
-
+    console.log("MiaoguoCardID:"+id);
     this.audioCtx = wx.createAudioContext('myAudio');
+
+    if (options.type=="share"){
+      wx.setNavigationBarTitle({
+        title: "查看共享"
+      });
+    }
   },
   onShow: function () {
     var that = this;
@@ -67,6 +74,12 @@ Page({
     if (!card.FontSize)
       card.FontSize = 46;
 
+    arrImage = card.Images;
+    arrImage2 = card.Images2;
+
+    console.log("arrImage:"+arrImage);
+    console.log("arrImage2"+arrImage2);
+
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
@@ -129,7 +142,7 @@ Page({
   copyCard: function () {
     wx.showLoading({
       title: '处理中',
-    })
+    });
     var that = this;
     var url = "CollectMiaoguoCard?";
     url += "MiaoguoCardID=" + that.data.MiaoguoCardID;
@@ -276,6 +289,26 @@ Page({
       });
     }
   },
+  showImage:function(e){
+    var name = e.currentTarget.dataset.name;
+    wx.previewImage({
+      current: name,
+      urls: arrImage,
+    });
+  },
+  onBindError:function(e){
+    for(var i=1;i<this.data.Field.length;i++){
+      for(var j=0;j<this.data.Field[i].length;j++){
+        if (this.data.Field[i][j].Type=="image"){
+          this.data.Field[i][j].Url = this.data.Field[i][j].Content;
+        }
+      }
+    }
+    arrImage=arrImage2;
+    this.setData({
+      Field: this.data.Field,
+    });
+  },
   onShareAppMessage: function () {
     var that = this;
     this.setData({

pages/main/preview.json

@@ -2,5 +2,6 @@
   "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "预览",
-  "backgroundColor": "#E3E3E3"
+  "backgroundColor": "#E3E3E3",
+  "backgroundColorTop":"#ffffff"
 }

pages/main/preview.wxml

@@ -9,8 +9,7 @@
         <view class="text3" bindtap='practiceToday'>今天练</view>
       </view>
     </view>
-    <view class='lineFooter'></view>
-    <view style='height:120rpx'></view>
+    <view class="panelTop1"></view>
   </block>
   <view class="panelField1 FlexColumn" bindlongpress='editField' data-id="1">
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
@@ -21,18 +20,21 @@
 
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-            <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-        <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-      </block>
-      </text>
+              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+        </block>
+        </text>
 
-      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
-      </view>
+        <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+        </view>
 
-      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
+        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
 
-      <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+        
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+      
       </block>
     </view>
 
@@ -43,9 +45,7 @@
       <view class='tagDot'></view>
       <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
     </view>
-
     <view wx:if="{{true}}"></view>
-
   </view>
   <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" bindlongpress='editField' data-id="{{itemParent}}">
     <view wx:if="{{itemParent==3}}" class="lineField"></view>
@@ -57,20 +57,22 @@
         <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-          <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-            <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-        <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-      </block>
-      </text>
-
-      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
-      </view>
-
-      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
-
-      <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
-
+            <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
+              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+        </block>
+        </text>
+
+        <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+        </view>
+
+        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
+
+        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+        
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+      
       </block>
     </view>
   </view>
@@ -81,7 +83,7 @@
 
   <view class='panelSave FlexRow' wx:if="{{ShowType=='share'}}">
     <view class='btn3' bindtap="close">首页</view>
-    <view class='btn31 btn3' bindtap="copyCard" wx:if="{{!IsExistCard}}">存入我的题卡</view>
+    <view class='btn31 btn3' bindtap="copyCard" wx:if="{{!IsExistCard}}">另存为我的题卡</view>
   </view>
 
   <view class='panelSave FlexRow' wx:if="{{ShowType=='show'}}">

pages/main/preview.wxss

@@ -14,6 +14,13 @@
   position: fixed;
   top:0;
   z-index: 10;
+  border-bottom: 1rpx solid #d2d2d2;
+}
+
+.panelTop1{
+  width:100%;
+  height: 120rpx;
+  background-color: #fff;
 }
 
 .left {
@@ -101,6 +108,12 @@
   margin: 30rpx 0;
 }
 
+.panelItem .imageFree {
+  width: 650rpx;
+  margin: 30rpx 0;
+  border-radius: 20rpx;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }
@@ -158,7 +171,7 @@
 .panelField21 {
   width: 650rpx;
   font-size: 36rpx;
-  margin: 40rpx 30rpx 0 30rpx;
+  margin: 40rpx 0 0 0;
 }
 
 .lineField{

pages/main/searchCard.wxml

@@ -5,7 +5,6 @@
       <view>搜索题卡</view>
     </view>
   </view>
-  <view class='lineFooter'></view>
   <view class='panelBtn FlexRow'>
     <view class='text1 FlexRow' bindtap="getList" data-id="0">
       <view>全部题卡</view>

pages/main/searchCard1.wxss

@@ -25,7 +25,7 @@
 .universalpic_search_gray_30x30{
   width:30rpx;
   height:30rpx;
-  margin: 0 10rpx 0 30rpx;
+  margin: 0 20rpx 0 30rpx;
 }
 
 .input{

pages/main/searchCardList.js

@@ -10,15 +10,15 @@ Page({
     wx.hideShareMenu();
     var that = this;
 
-    var Search="",IsToday=0;
+    var Search = "", IsToday = 0;
 
     if (options.search) {
-      Search=options.search;
+      Search = options.search;
       wx.setNavigationBarTitle({
         title: options.search
       });
-    } 
-    else if (options.type==1) {
+    }
+    else if (options.type == 1) {
       IsToday = 1;
       wx.setNavigationBarTitle({
         title: "今日的任务"
@@ -28,61 +28,64 @@ Page({
     that.setData({
       Search: Search,
       IsToday: IsToday,
-      Count:options.Count,
+      Count: options.Count,
       Containnerheight: main.getWindowHeight(),
     });
   },
-  onPullDownRefresh:function(){
-    var that = this;
-    that.getList();
-    wx.stopPullDownRefresh();
-  },
-  onShow:function(){
+  onShow: function () {
     var that = this;
     that.getList();
   },
   getList: function () {
-    var list=wx.getStorageSync("CardList");
-    var len=20;
-    for(var i=0;i<list.length;i++){
-      var item=list[i];
+    var list = wx.getStorageSync("CardList");
+    var len = 20;
+    for (var i = 0; i < list.length; i++) {
+      var item = list[i];
       item.Content[1].ContentStr = replaceString(item.Content[1].Content);
       if (item.Content[1].ContentStr.length > len)
         item.Content[1].ContentStr = replaceString(item.Content[1].ContentStr.substr(0, len)) + "...";
-        
+
       item.Content[2].ContentStr = replaceString(item.Content[2].Content);
       if (item.Content[2].ContentStr.length > len)
         item.Content[2].ContentStr = replaceString(item.Content[2].ContentStr.substr(0, len)) + "...";
-      
+
       var imageUrl = getImage(item.Content[1].Content);
-      if (!imageUrl && item.Content[2].Content)
+      if (imageUrl.length == 0 && item.Content[2].Content)
         imageUrl = getImage(item.Content[2].Content);
-      if (!imageUrl && item.Content[3].Content)
+      if (imageUrl.length == 0 && item.Content[3].Content)
         imageUrl = getImage(item.Content[3].Content);
 
-      if (imageUrl)
-        item.ImageUrl=imageUrl;
+      if (imageUrl.length > 0)
+        item.ImageUrl = imageUrl;
     }
     this.setData({
-      List:list,
+      List: list,
     });
     wx.hideLoading();
 
-    function getImage(str){
-      var result="";
-      if (str.indexOf("[图]")>=0){
-        result = str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]"));
+    function getImage(str) {
+      var result = [];
+      if (str.indexOf("[图") >= 0) {
+        if (str.indexOf("[图]") >= 0)
+          result.push(str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]")));
+        else {
+          str = str.substr(str.indexOf("[图") + 2);
+          result.push(str.substring(str.indexOf("url='") + 7, str.indexOf("]")-1));
+          str = str.substring(str.indexOf("]") + 1, str.indexOf("[/图]"));
+          result.push(str);
+        }
       }
+      //console.log("images:"+result);
       return result;
     }
 
-    function replaceString(str){
+    function replaceString(str) {
       str = str.replace(/\[读]/g, "");
       str = str.replace(/\[\/读\]/g, "");
       str = str.replace(/\[图]/g, "");
       str = str.replace(/\[\/图\]/g, "");
 
-      var str2="";
+      var str2 = "";
       if (str.indexOf("[读") >= 0) {
         str2 = str.substr(str.indexOf("[读"));
         str2 = str2.substring(0, str2.indexOf("]") + 1);
@@ -93,6 +96,15 @@ Page({
         str2 = str2.substring(0, str2.indexOf("]") + 1);
       }
       str = str.replace(str2, "");
+
+      var str3 = "";
+      if (str.indexOf("[图") >= 0) {
+        str3 = str.substr(str.indexOf("[图"));
+        str3 = str3.substring(0, str3.indexOf("]") + 1);
+      }
+      str = str.replace(str3, "");
+
+
       str = str.replace(/\[线]/g, "");
       str = str.replace(/\[\/线\]/g, "");
       str = main.encryptUrl(str);
@@ -102,16 +114,31 @@ Page({
   onPreview: function (e) {
     var id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: './preview?type=show&id='+id,
+      url: './preview?type=show&id=' + id,
     })
   },
+  onBindError: function (e) {
+    var id = e.currentTarget.dataset.id;
+    for (var i = 0; i < this.data.List.length; i++) {
+      if (this.data.List[i].ImageUrl && this.data.List[i].ImageUrl.length>1) {
+        if (id == this.data.List[i].MiaoguoCardID){
+          this.data.List[i].ImageUrl[0] = this.data.List[i].ImageUrl[1];
+          //console.log("Image1:" + this.data.List[i].ImageUrl[0]);
+          //console.log("Image2:" + this.data.List[i].ImageUrl[1]);
+        }
+      }
+    }
+    this.setData({
+      List: this.data.List,
+    });
+  },
   gotoNextPage: function (e) {
     wx.showLoading({
       title: '请稍候',
     });
     var that = this;
     var id = e.currentTarget.dataset.id;
-    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID+"&IsToday="+that.data.IsToday + "&PageID=" + id;
+    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday + "&PageID=" + id;
     if (that.data.Search)
       url += "&Key=" + that.data.Search;
 
@@ -119,7 +146,7 @@ Page({
       if (data) {
 
         var list = wx.getStorageSync("CardList");
-        for(var i=0;i<data.List.length;i++){
+        for (var i = 0; i < data.List.length; i++) {
           list.push(data.List[i]);
         }
         wx.setStorageSync("CardList", list);
@@ -127,7 +154,7 @@ Page({
       }
     });
   },
-  addCard:function(){
+  addCard: function () {
     wx.redirectTo({
       url: './add?type=add&id=0',
     });

pages/main/searchCardList.json

@@ -1,5 +1,4 @@
 {
   "navigationBarTitleText": "全部题卡",
-  "backgroundColor": "#F0F0F0",
-  "enablePullDownRefresh": true
+  "backgroundColor": "#F0F0F0"
 }

pages/main/searchCardList.wxml

@@ -5,16 +5,15 @@
       <image class="universalpic_add_gray_30x30" src='../images/universalpic_add_gray_30x30.png' />
     </view>
   </view>
-  <view class='lineFooter'></view>
   <block wx:if="{{List.length>0}}">
-    <view style='width:100%;height:150rpx;'></view>
+    <view style='width:100%;height:150rpx;margin-top:0rpx;'></view>
     <block wx:for="{{List}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
       <view class="panelItem FlexRow" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
         <view class="panelItem1 FlexRow">
-          <image class="ImageCSS" src='{{item.ImageUrl}}' wx:if="{{item.ImageUrl}}" />
+          <image class="ImageCSS" mode="aspectFill" src='{{item.ImageUrl[0]}}' wx:if="{{item.ImageUrl[0]}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}" />
           <view class="panelItem11 FlexColumn">
             <view class='Text1'>{{item.Content[1].ContentStr}}</view>
             <view class='Text2'>{{item.Content[2].ContentStr}}</view>

pages/main/searchCardList.wxss

@@ -15,6 +15,7 @@
   position: fixed;
   top:0;
   z-index: 10;
+  border-bottom: 1rpx solid #d2d2d2;
 }
 
 .left{

pages/main/setting.js

@@ -4,13 +4,15 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
-var arrUserName = ["程杰", "程晟涵", "洪立人"];
-var arrUserID = [1, 2, 3];
+var arrUserName = ["程杰", "程晟涵", "洪立人", "唱意班主任"];
+var arrUserID = [1, 2, 3, 4];
 
 Page({
   data: {
     CardNumber: [],
     IsShowChange: false,
+    ProgramName: app.globalData.ProgramName,
+    Version:app.globalData.Version,
   },
   onLoad: function () {
     wx.hideShareMenu();

pages/main/setting.wxml

@@ -75,5 +75,7 @@
     <view class='lineFooter'></view>
   </block>
 
-  <view style='height:350rpx'></view>
+  <view style='height:100rpx'></view>
+  <text class='text1' bindtap='updateMember'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
+  <view style='height:100rpx;'></view>
 </view>

pages/main/setting.wxss

@@ -52,4 +52,11 @@
   width:16rpx;
   height:26rpx;
   margin-left: 30rpx;
+}
+
+
+.text1{
+  margin-top: 50rpx;
+  font-size:20rpx;
+  text-align: center;
 }

pages/main/uploadinmage.js

@@ -0,0 +1,39 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    wx.hideShareMenu();
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  upload:function(){
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+      success(res) {
+        // tempFilePath可以作为img标签的src属性显示图片
+        const tempFilePaths = res.tempFilePaths;
+        var url = common.Encrypt("MiaoguoUploadFile");
+        wx.uploadFile({
+          url: app.globalData.serverUrlLocalhost +url, // 仅为示例，非真实的接口地址
+          filePath: tempFilePaths[0],
+          name: 'file',
+          formData: {
+            filename: 'test'
+          },
+          success(res) {
+            
+          }
+        })
+      }
+    });
+  },
+});

pages/main/uploadinmage.json

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

pages/main/uploadinmage.wxml

@@ -0,0 +1,2 @@
+<!--pages/main/uploadinmage.wxml-->
+<button bindtap='upload'>上传图片</button>

pages/main/uploadinmage.wxss

@@ -0,0 +1 @@
+/* pages/main/uploadinmage.wxss */

project.config.json

@@ -37,7 +37,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
@@ -47,9 +47,9 @@
 					"scene": null
 				},
 				{
-					"id": -1,
-					"name": "帮助",
-					"pathName": "pages/main/searchWeb2",
+					"id": 1,
+					"name": "上传",
+					"pathName": "pages/main/uploadinmage",
 					"query": "",
 					"scene": null
 				}

utils/main.js

@@ -145,37 +145,6 @@ function payMoney(payType, money, callback) {
     }
   });
 }
-function downloadImage(scoreID) {
-  wx.showLoading({
-    title: '下载中_然后长按保存',
-  });
-
-  var that = this;
-  getData('MakeSchulteShare?ScoreID=' + scoreID, function (data) {
-
-    setTimeout(function () {
-      wx.downloadFile({
-        url: "https://schulte-1253256735.file.myqcloud.com/share" + scoreID + ".jpg",
-        success: function (res) {
-          wx.hideLoading();
-          wx.previewImage({
-            current: res.tempFilePath, // 当前显示图片的http链接
-            urls: [res.tempFilePath] // 需要预览的图片http链接列表
-          })
-        },
-        fail: function () {
-          wx.hideLoading();
-          getData('MakeSchulteShare?ScoreID=' + scoreID, function (data) { });
-          wx.showToast({
-            title: '请稍候再试！',
-            duration: 2000
-          });
-        }
-      });
-    }, 2000);
-
-  });
-}
 
 function getTimeFormat(duration) {
   //console.log("duration:" + duration);
@@ -309,6 +278,8 @@ function EncryptUrl(str) {
     str = str.replace(/baidu.com/g, "#####1#####");
     str = str.replace(/iciba.com/g, "#####2#####");
     str = str.replace(/kylx365.com/g, "#####3#####");
+    str = str.replace(/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
+
   }
 
   if (str.substr(0,1)=="\n")
@@ -326,6 +297,7 @@ function DecryptUrl(str) {
     str = str.replace(/#####1#####/g, "baidu.com");
     str = str.replace(/#####2#####/g, "iciba.com");
     str = str.replace(/#####3#####/g, "kylx365.com");
+    str = str.replace(/#####4#####/g, "miaguo-1253256735.file.myqcloud.com");
   }
   return str;
 }
@@ -333,6 +305,9 @@ function DecryptUrl(str) {
 function changeStringToView(field) {
   var result = {};
   result.Field = [[]];
+  result.Images = [];
+  result.Images2 = [];
+
   for (var j = 0; j < field.length; j++) {
     if (j == 0) {
       if (field[j].ContentType == 0 && field[j].Content && field[j].Content.length > 0) {
@@ -358,11 +333,24 @@ function changeStringToView(field) {
 
         var arr = str.split("\n");
         for (var k = 0; k < arr.length; k++) {
-          if (arr[k].indexOf("[图]") >= 0 && arr[k].indexOf("[/图]") > 0) {
+          if (arr[k].indexOf("[图") >= 0 && arr[k].indexOf("[/图]") > 0) {
             var obj = {};
             obj.Type = "image";
-            obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+            if (arr[k].indexOf("[图]") >= 0){
+              obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+              result.Images.push(obj.Content);
+              result.Images2.push(obj.Content);
+            }
+            else {
+              var temp = arr[k].substring(arr[k].indexOf("[图"), arr[k].indexOf("[/图]"));
+              obj.Url = temp.substring(temp.indexOf("url=") + 5, temp.indexOf("]") - 1);
+              temp=temp.substr(temp.indexOf("]")+1);
+              obj.Content=temp;
+              result.Images.push(obj.Url);
+              result.Images2.push(obj.Content);
+            }
             arrResult.push(obj);
+
           }
           else if (arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) {
             var obj;
@@ -2096,7 +2084,6 @@ module.exports = {
   postData: postData,
   shareGroup: shareGroup,
   payMoney: payMoney,
-  downloadImage: downloadImage,
   getLocalHost: getLocalHost,
   getTimeFormat: getTimeFormat,
   getWindowHeight: getWindowHeight,