chengjie 6 年之前
父节点
当前提交
dca93b3c01

+ 2 - 2
app.js

@@ -25,7 +25,7 @@ App({
25
     }
25
     }
26
   },
26
   },
27
   globalData: {
27
   globalData: {
28
-    Version: "1.0.1",
28
+    Version: "1.0.1.2",
29
     IsProduction: true,
29
     IsProduction: true,
30
     ShareTitle: "可以用来记忆一切的工具",
30
     ShareTitle: "可以用来记忆一切的工具",
31
     SharePath: "pages/index/index",
31
     SharePath: "pages/index/index",
@@ -61,6 +61,6 @@ App({
61
     TempFieldNumber:0,//资料搜索时的段落编号
61
     TempFieldNumber:0,//资料搜索时的段落编号
62
     TempSearcchBackNumber:3,//资料搜索时返回的页面数
62
     TempSearcchBackNumber:3,//资料搜索时返回的页面数
63
     MemoryLevel:0,//记忆水平
63
     MemoryLevel:0,//记忆水平
64
-    
64
+
65
   }
65
   }
66
 })
66
 })

二进制
pages/images/universalpic_del_black_20x28.png


二进制
pages/images/universalpic_edit_gray_25x25.png


二进制
pages/images/universalpic_info_black_26x26.png


二进制
pages/images/universalpic_screenshot_gray_30x30.png


二进制
pages/images/universalpic_screenshot_jl_bgimage_360x360.png


二进制
pages/images/universalpic_shelve_gray_26x26.png


二进制
pages/images/universalpic_typesize_gray_30x18.png


二进制
pages/images/universalpic_undo_gray_26x20.png


二进制
pages/images/universalpic_undo_gray_30x22.png


二进制
pages/images/universalpic_undo_white_30p_26x20.png


+ 5 - 0
pages/index/notice.js

@@ -13,4 +13,9 @@ Page({
13
 
13
 
14
     wx.hideShareMenu();
14
     wx.hideShareMenu();
15
   },
15
   },
16
+  onPullDownRefresh:function(){
17
+    wx.reLaunch({
18
+      url: './index',
19
+    })
20
+  }
16
 });
21
 });

+ 2 - 1
pages/index/notice.json

@@ -1,3 +1,4 @@
1
 {
1
 {
2
-  "navigationBarTitleText": "通知"
2
+  "navigationBarTitleText": "通知",
3
+  "enablePullDownRefresh": true
3
 }
4
 }

+ 11 - 9
pages/main/add.wxml

@@ -46,17 +46,19 @@
46
   <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
46
   <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
47
     <view class="panelTag FlexColumn">
47
     <view class="panelTag FlexColumn">
48
       <view class="panelTag1">自动记号</view>
48
       <view class="panelTag1">自动记号</view>
49
-      <block wx:for="{{Tags}}" wx:key="indexTag" wx:for-index="indexTag">
50
-        <view class="lineWidthAll FlexRow" wx:if="{{indexTag>0}}">
51
-          <view class="lineWidth640"></view>
52
-        </view>
53
-        <view class="panelTag2 FlexRow">
54
-          <view class="tag1">{{item}}</view>
55
-          <view class="tag2 FlexRow" bindtap='deleteItem' data-id="{{indexTag}}">
49
+      <view class="lineWidthAll FlexRow">
50
+        <view class="lineWidth640"></view>
51
+      </view>
52
+
53
+      <view class='panelTag1 FlexRow'>
54
+        <block wx:for="{{Tags}}" wx:key="indexTag" wx:for-index="indexTag">
55
+          <view class="panelTag2 FlexRow" bindtap='deleteItem' data-id="{{indexTag}}">
56
+            <view class="tag1">{{item}}</view>
56
             <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
57
             <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
57
           </view>
58
           </view>
58
-        </view>
59
-      </block>
59
+        </block>
60
+      </view>
61
+      <view style='height:30rpx;'></view>
60
     </view>
62
     </view>
61
   </block>
63
   </block>
62
   </block>
64
   </block>

+ 13 - 16
pages/main/add.wxss

@@ -164,32 +164,28 @@
164
   font-size: 28rpx;
164
   font-size: 28rpx;
165
   color:#1e1e1e;
165
   color:#1e1e1e;
166
   text-align: left;
166
   text-align: left;
167
-  height:80rpx;
167
+  min-height:80rpx;
168
   line-height: 100rpx;
168
   line-height: 100rpx;
169
+  flex-wrap: wrap;
170
+  justify-content: flex-start;
169
 }
171
 }
170
 .panelTag .panelTag2{
172
 .panelTag .panelTag2{
171
-  width:640rpx;
172
-  font-size: 28rpx;
173
-  color:#1e1e1e;
174
-  text-align: left;
175
-  line-height: 94rpx;
176
-  height:94rpx;
177
-  justify-content: space-between;
173
+  line-height: 73rpx;
174
+  height:73rpx;
175
+  border:1rpx solid #9B9B9B;
176
+  margin: 30rpx 30rpx 0 0;
177
+  border-radius: 10rpx;
178
 }
178
 }
179
 
179
 
180
 .panelTag .tag1{
180
 .panelTag .tag1{
181
   font-size: 24rpx;
181
   font-size: 24rpx;
182
   color:#787878;
182
   color:#787878;
183
+  margin-left: 30rpx;
183
 }
184
 }
184
-
185
-.panelTag .tag2{
186
-  width:96rpx;
187
-  height:100rpx;
188
-}
189
-
190
 .universalpic_del_gray_14x14{
185
 .universalpic_del_gray_14x14{
191
   width:14rpx;
186
   width:14rpx;
192
   height:14rpx;
187
   height:14rpx;
188
+  margin: 0 30rpx 0 20rpx;
193
 }
189
 }
194
 
190
 
195
 
191
 
@@ -204,7 +200,7 @@
204
   z-index: 10;
200
   z-index: 10;
205
   color: #0071ef;
201
   color: #0071ef;
206
   justify-content: space-between;
202
   justify-content: space-between;
207
-  border-top: 2rpx solid #d2d2d2;
203
+  border-top: 1rpx solid #d2d2d2;
208
 }
204
 }
209
 
205
 
210
 .panelSave .panelSave1 {
206
 .panelSave .panelSave1 {
@@ -236,8 +232,9 @@
236
 }
232
 }
237
 
233
 
238
 .panelSave .panelSave4 {
234
 .panelSave .panelSave4 {
239
-  width: 148rpx;
235
+  width: 108rpx;
240
   margin:0;
236
   margin:0;
237
+  font-size:24rpx;
241
 }
238
 }
242
 
239
 
243
 
240
 

+ 4 - 3
pages/main/searchWeb.wxss

@@ -85,16 +85,17 @@
85
   overflow-x: hidden;
85
   overflow-x: hidden;
86
 }
86
 }
87
 
87
 
88
-
89
 .panelItemSearch .panelItemSearch12{
88
 .panelItemSearch .panelItemSearch12{
90
-  border:1rpx solid #0071EF;
89
+  border:2rpx solid #0071EF;
91
   font-size:20rpx;
90
   font-size:20rpx;
92
   text-align: center;
91
   text-align: center;
93
   line-height: 34rpx;
92
   line-height: 34rpx;
94
   width:60rpx;
93
   width:60rpx;
95
   color:#0071EF;
94
   color:#0071EF;
96
   margin-right: 30rpx;
95
   margin-right: 30rpx;
97
-  margin-top: 32rpx
96
+  margin-top: 32rpx;
97
+  border-radius: 17rpx;
98
+  font-weight: 500;
98
 }
99
 }
99
 
100
 
100
 .panelItemSearch .panelItemSearch2{
101
 .panelItemSearch .panelItemSearch2{

+ 6 - 5
pages/main/searchWeb1.js

@@ -67,6 +67,10 @@ Page({
67
         }
67
         }
68
         arr.unshift(search);
68
         arr.unshift(search);
69
 
69
 
70
+        if (arr.length > 10) {
71
+          arr.pop();
72
+        }
73
+
70
         wx.setStorageSync("SearchTextList", arr);
74
         wx.setStorageSync("SearchTextList", arr);
71
         that.setData({
75
         that.setData({
72
           SearchTextList: arr,
76
           SearchTextList: arr,
@@ -104,13 +108,10 @@ Page({
104
 
108
 
105
   deleteItem: function (e) {
109
   deleteItem: function (e) {
106
     var that = this;
110
     var that = this;
107
-    var index = e.currentTarget.dataset.id;
108
-    that.data.SearchTextList.splice(index, 1);
109
     that.setData({
111
     that.setData({
110
-      SearchTextList: that.data.SearchTextList,
112
+      SearchTextList: [],
111
     });
113
     });
112
-    wx.setStorageSync("SearchTextList", that.data.SearchTextList);
113
-
114
+    wx.removeStorageSync("SearchTextList");
114
   },
115
   },
115
   searchResult: function (search, searchType, author) {
116
   searchResult: function (search, searchType, author) {
116
 
117
 

+ 13 - 4
pages/main/searchWeb1.wxml

@@ -17,10 +17,19 @@
17
     <view class='lineFooter'></view>
17
     <view class='lineFooter'></view>
18
 
18
 
19
     <block wx:if="{{SearchTextList.length>0}}">
19
     <block wx:if="{{SearchTextList.length>0}}">
20
-      <view class="panelTitle FlexRow">
21
-        <view class="panelTitle1">搜索记录</view>
20
+      <view class="panelTitle0 panelTitle FlexRow">
21
+        <view class="panelTitle3">近期搜索</view>
22
+        <view class="panelTitle4 FlexRow" bindtap='deleteItem'>
23
+          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
24
+        </view>
25
+      </view>
26
+
27
+      <view class='panelItemSearch0 FlexRow'>
28
+        <view class="panelTag FlexRow" wx:for="{{SearchTextList}}" wx:key="index" bindtap='onSearch' data-search="{{item}}">
29
+          <view class="panelTag0">{{item}}</view>
30
+        </view>
22
       </view>
31
       </view>
23
-      <block wx:for="{{SearchTextList}}" wx:key="index">
32
+      <!-- <block wx:for="{{SearchTextList}}" wx:key="index">
24
         <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
33
         <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
25
           <view class="lineWidth720"></view>
34
           <view class="lineWidth720"></view>
26
         </view>
35
         </view>
@@ -37,7 +46,7 @@
37
           </view>
46
           </view>
38
         </view>
47
         </view>
39
 
48
 
40
-      </block>
49
+      </block> -->
41
       <view class='lineFooter'></view>
50
       <view class='lineFooter'></view>
42
     </block>
51
     </block>
43
   </block>
52
   </block>

+ 40 - 37
pages/main/searchWeb1.wxss

@@ -95,6 +95,27 @@
95
   margin-bottom: 32rpx;
95
   margin-bottom: 32rpx;
96
 }
96
 }
97
 
97
 
98
+
99
+.panelTitle0 {
100
+  background-color: #fff;
101
+  margin-top: 10rpx;
102
+}
103
+
104
+.panelTitle .panelTitle3 {
105
+  font-size: 32rpx;
106
+  margin: 30rpx;
107
+}
108
+
109
+.panelTitle .panelTitle4 {
110
+  width:80rpx;
111
+  height:88rpx;
112
+}
113
+
114
+.universalpic_del_black_20x28{
115
+  width:20rpx;
116
+  height:28rpx;
117
+}
118
+
98
 .panelItem {
119
 .panelItem {
99
   width: 100%;
120
   width: 100%;
100
   align-items: flex-start;
121
   align-items: flex-start;
@@ -129,50 +150,24 @@
129
 .panelItemSearch0 {
150
 .panelItemSearch0 {
130
   width: 100%;
151
   width: 100%;
131
   justify-content: flex-start;
152
   justify-content: flex-start;
132
-  font-size: 28rpx;
133
-  min-height: 100rpx;
134
-  height:auto;
153
+  font-size: 24rpx;
135
   background-color: #fff;
154
   background-color: #fff;
136
-}
137
-
138
-.panelItemSearch0 .panelItemSearch01 {
139
-  margin-left: 30rpx;
140
-  font-weight: 400;
141
-}
142
-
143
-.panelItemSearch .panelItemSearch2 {
144
-  color: #1e1e1e;
145
-  font-weight: 400;
146
-  justify-content: space-between;
147
-  width:720rpx;
148
-}
149
-
150
-.panelItemSearch0 .panelItemSearchText01{
151
-  width:624rpx;
152
-  font-size:28rpx;
153
-  justify-content: flex-start;
154
-  height:100rpx;
155
-  line-height: 100rpx;
155
+  flex-wrap: wrap;
156
 }
156
 }
157
 
157
 
158
 
158
 
159
-.panelItemSearch0 .panelItemSearchText101{
159
+.panelItemSearch0 .panelTag{
160
+  line-height: 73rpx;
161
+  height:73rpx;
162
+  border:1rpx solid #9B9B9B;
163
+  margin: 0 0 30rpx 30rpx;
164
+  border-radius: 10rpx;
160
   color:#787878;
165
   color:#787878;
161
-  font-size:24rpx;
162
-  margin-right: 10rpx;
163
 }
166
 }
164
-
165
-.panelItemSearch0 .panelItemSearch021{
166
-  width:96rpx;
167
-  height:100rpx;
167
+.panelItemSearch0 .panelTag0{
168
+  margin: 0 30rpx;
168
 }
169
 }
169
 
170
 
170
-.universalpic_del_gray_14x14{
171
-  width:14rpx;
172
-  height:14rpx;
173
-}
174
-
175
-
176
 .panelItemSearch {
171
 .panelItemSearch {
177
   width: 100%;
172
   width: 100%;
178
   min-height: 134rpx;
173
   min-height: 134rpx;
@@ -188,6 +183,13 @@
188
   width:100%;
183
   width:100%;
189
 }
184
 }
190
 
185
 
186
+.panelItemSearch .panelItemSearch2 {
187
+  color: #1e1e1e;
188
+  font-weight: 400;
189
+  justify-content: space-between;
190
+  width:720rpx;
191
+}
192
+
191
 .panelItemSearch .panelItemSearch11{
193
 .panelItemSearch .panelItemSearch11{
192
   width:624rpx;
194
   width:624rpx;
193
   font-size:28rpx;
195
   font-size:28rpx;
@@ -205,7 +207,8 @@
205
   width:60rpx;
207
   width:60rpx;
206
   color:#0071EF;
208
   color:#0071EF;
207
   margin-right: 30rpx;
209
   margin-right: 30rpx;
208
-  margin-top: 34rpx
210
+  margin-top: 34rpx;
211
+  border-radius: 17rpx;
209
 }
212
 }
210
 
213
 
211
 .panelItemSearch .panelItemSearch2{
214
 .panelItemSearch .panelItemSearch2{

+ 1 - 1
pages/main/setting.wxml

@@ -1,6 +1,6 @@
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
   <view class="panelTitle FlexRow">
2
   <view class="panelTitle FlexRow">
3
-    <view class="panelTitle1">初始任务量</view>
3
+    <view class="panelTitle1">任务量</view>
4
     <view class="panelTitle2"></view>
4
     <view class="panelTitle2"></view>
5
   </view>
5
   </view>
6
   <view class="panelItem FlexRow">
6
   <view class="panelItem FlexRow">

+ 1 - 1
utils/main.js

@@ -510,7 +510,7 @@ function saveTempImage(serverUrl, tempUrl) {
510
     list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
510
     list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
511
   }
511
   }
512
 
512
 
513
-  if (list>200){
513
+  if (list.length>200){
514
     list.pop();
514
     list.pop();
515
   }
515
   }
516
   wx.setStorageSync("TempImageList", list);
516
   wx.setStorageSync("TempImageList", list);