1.0.0.23

pages/main/add.js

@@ -111,6 +111,14 @@ Page({
       });
     }
     else {
+      var list = app.globalData.CardList;
+      for (var i = 0; i < list.length; i++) {
+        if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+          list[i].Content[0].Content=that.data.Tags;
+          break;
+        }
+      }
+      app.globalData.CardList = list;
       wx.navigateTo({
         url: './preview?type=preview&id=' + this.data.MiaoguoCardID,
       });
@@ -337,7 +345,24 @@ Page({
       Field: this.data.Field,
     });
   },
-  
+  deleteItem: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.id;
+
+    wx.showModal({
+      title: '提醒',
+      content: '记号“'+that.data.Tags[index]+'”要删除吗？',
+      success(res) {
+        if (res.confirm) {
+          that.data.Tags.splice(index, 1);
+          that.setData({
+            Tags: that.data.Tags,
+          });
+        }
+      }
+    });
+    
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -1,22 +1,12 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <!-- <block wx:if="{{Tags && Tags.length>0}}">
-    <view class="panelTag FlexRow">
-      <view class="panelItem1">记号</view>
-      <view class="panelItem2 FlexRow">
-        <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-  </block> -->
-
-  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+  <view class="panelTimePlan FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
     <view class="panelItem1">
       练习时间
     </view>
     <view class="panelItem2 FlexRow">
-      <view class="panelItem31" hidden="{{IsTodayStudy}}">智能安排</view>
-      <view class="panelItem311 panelItem31" hidden="{{!IsTodayStudy}}">今日必练</view>
-      <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+      <view class="panelTimePlan1" hidden="{{IsTodayStudy}}">智能安排</view>
+      <view class="panelTimePlan1" hidden="{{!IsTodayStudy}}">今日必练</view>
+      <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
     </view>
   </view>
   <view class='lineFooter'></view>
@@ -25,7 +15,7 @@
   </view>
   <block wx:for="{{[1,2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent">
     <view class="lineWidthAll FlexRow" wx:if="{{indexParent>0}}">
-      <view class="lineWidth640"></view>
+      <view class="lineWidth750"></view>
     </view>
     <view class="panelItem FlexRow" bindtap='gotoAddItem' data-fieldid="{{itemParent}}">
       <view class="panelItem11 FlexColumn">
@@ -37,6 +27,8 @@
           <block wx:if="{{itemParent==2}}">答案</block>
           <block wx:if="{{itemParent==3}}">其它</block>
         </text>
+
+
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
 
           <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
@@ -56,14 +48,31 @@
         <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>
   </view>
-
+  <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
+    <view class="panelTag FlexColumn">
+      <view class="panelTag1">自动记号</view>
+      <block wx:for="{{Tags}}" wx:key="indexTag" wx:for-index="indexTag">
+        <view class="lineWidthAll FlexRow" wx:if="{{indexTag>0}}">
+          <view class="lineWidth640"></view>
+        </view>
+        <view class="panelTag2 FlexRow">
+          <view class="tag1">{{item}}</view>
+          <view class="tag2 FlexRow" bindtap='deleteItem' data-id="{{indexTag}}">
+            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
+          </view>
+        </view>
+      </block>
+    </view>
+  </block>
   </block>
   <view class='lineFooter'></view>
 
-  <!-- <view class="panelItem3Remark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view> -->
+  <!-- <view class="panelTimePlanRemark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view> -->
   <view style='height:300rpx;'></view>
 
   <view class='panelSave FlexRow'>

pages/main/add.wxss

@@ -5,18 +5,29 @@
   background-color: #F0F0F0;
 }
 
-.panelTag{
+.panelTimePlan {
+  min-height: 120rpx;
   width: 100%;
   justify-content: space-between;
   font-size: 28rpx;
-  min-height: 120rpx;
   background-color: #fff;
 }
 
-.panelTag .tag{
-  font-size: 28rpx;
+
+.panelTimePlan .panelTimePlan2 {
+  margin-left: 30rpx;
+}
+
+.panelTimePlan .panelTimePlan1{
   color:#787878;
-  margin-left: 20rpx;
+  font-weight: 500;
+}
+
+.panelTimePlanRemark{
+  font-size:24rpx;
+  margin-top:30rpx;
+  color:#787878;
+  font-weight: 400;
 }
 
 .panelTitle {
@@ -86,7 +97,6 @@
 }
 
 .panelItem .panelItem21 {
-  margin-right: 30rpx;
   font-weight: 400;
   flex-wrap: wrap;
   align-items: flex-start;
@@ -132,32 +142,50 @@
   height:30rpx;
 }
 
-.panelItem3 {
-  min-height: 100rpx;
+
+.panelTag{
   width: 100%;
-  justify-content: space-between;
-  font-size: 28rpx;
+  font-size: 24rpx;
   background-color: #fff;
+  margin: 10rpx 0;
+  align-items: flex-end;
 }
 
-.panelItem3 .panelItem32 {
-  margin-left: 30rpx;
+.panelTag .panelTag1{
+  width:640rpx;
+  font-size: 28rpx;
+  color:#1e1e1e;
+  text-align: left;
+  height:80rpx;
+  line-height: 100rpx;
+}
+.panelTag .panelTag2{
+  width:640rpx;
+  font-size: 28rpx;
+  color:#1e1e1e;
+  text-align: left;
+  line-height: 94rpx;
+  height:94rpx;
+  justify-content: space-between;
 }
 
-.panelItem3 .panelItem31{
+.panelTag .tag1{
+  font-size: 24rpx;
   color:#787878;
 }
-.panelItem3 .panelItem311{
-  color:#0071ef;
+
+.panelTag .tag2{
+  width:96rpx;
+  height:100rpx;
 }
 
-.panelItem3Remark{
-  font-size:24rpx;
-  margin-top:30rpx;
-  color:#787878;
-  font-weight: 400;
+.universalpic_del_gray_14x14{
+  width:14rpx;
+  height:14rpx;
 }
 
+
+
 .panelSave {
   width: 100%;
   background-color: #fff;

pages/main/detail.wxml

@@ -56,9 +56,6 @@
         </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>
-
-        <!-- <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" /> -->
-
         <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
       
   </block>

pages/main/preview.js

@@ -28,7 +28,12 @@ Page({
 
     if (options.type == "share") {
       wx.setNavigationBarTitle({
-        title: "查看共享"
+        title: "来自分享"
+      });
+    }
+    else if (options.type == "show") {
+      wx.setNavigationBarTitle({
+        title: "查看题卡"
       });
     }
   },

pages/main/preview.wxml

@@ -62,8 +62,6 @@
 
       <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'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
 
       </block>
@@ -74,9 +72,10 @@
 
   <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</view>
 
-  <view class='panelSave FlexRow' wx:if="{{ShowType=='share'}}">
-    <view class='btn3' bindtap="returnDefault">首页</view>
-    <view class='btn31 btn3' bindtap="copyCard" wx:if="{{!IsExistCard}}">另存为我的题卡</view>
+  <view class='panelSaveShare panelSave FlexRow' wx:if="{{ShowType=='share'}}">
+    <view class='text5 text3' bindtap="returnDefault">首页</view>
+    <view class='btn3' bindtap="copyCard">另存为我的题卡</view>
+    <view class='text5'></view>
   </view>
 
   <view class='panelSave FlexRow' wx:if="{{ShowType=='show'}}">
@@ -85,7 +84,7 @@
       <image class="universalpic_prev_black_30x30" src='../images/universalpic_prev_black_30x30.png' />
     </view>
     <view class='btn2 FlexRow'>
-      <button class="btn21" open-type='share'>共享给大家</button>
+      <button class="btn21" open-type='share'>分享给大家</button>
     </view>
     <view class='btn2 FlexRow' bindtap="onMore">
       <image class="universalpic_more_40x10" src='../images/universalpic_more_40x10.png' />

pages/main/preview.wxss

@@ -39,7 +39,7 @@
 }
 
 .text3 {
-  color: #0071ef;
+  color: #787878;
   width: 132rpx;
   line-height: 80rpx;
   text-align: center;
@@ -238,18 +238,22 @@
   height: 26rpx;
 }
 
+.panelSaveShare{
+  justify-content: space-between;
+}
 
 .btn3 {
   width: 375rpx;
   line-height: 120rpx;
+  height:120rpx;
   background-color: #fff;
   text-align: center;
-  color:#1e1e1e;
-}
-
-.btn31 {
   color: #0071ef;
 }
+.text5{
+  width:108rpx;
+  margin: 0 20rpx;
+}
 
 .universalpic_more_40x10 {
   width: 40rpx;

pages/main/searchWeb1.wxml

@@ -55,7 +55,7 @@
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}"  data-type="null">
+      <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="null">
         <view class="panelItemSearch1 FlexRow">
           <view class="panelItemSearch11">
             {{item.Key}}
@@ -85,7 +85,7 @@
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}"  data-type="many">
+      <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
         <view class="panelItemSearch1 FlexRow">
           <view class="panelItemSearch11">
             {{item.Key}}
@@ -100,7 +100,7 @@
         <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
           {{item.Author}} {{item.Dynasty}}
         </view>
-        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici'}}">
+        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='zici'}}">
           {{item.Content}}
         </view>
       </view>
@@ -108,5 +108,5 @@
     <view class='lineFooter'></view>
   </block>
 
-
+  <view style='height:100rpx;'></view>
 </view>