Browse Source

展开,收起加上指示图标

sophieChenyx 6 years ago
parent
commit
197fb6f00f

BIN
.DS_Store


+ 24 - 3
.idea/workspace.xml

@@ -15,6 +15,15 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="lessonList.wxml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/compontents/lesson_list/lessonList.wxml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>downUp</find>
@@ -60,6 +69,12 @@
             <path>
               <item name="efunbox-schedule-miniApps" type="b2602c69:ProjectViewProjectNode" />
               <item name="efunbox-schedule-miniApps" type="462c0819:PsiDirectoryNode" />
+              <item name="compontents" type="462c0819:PsiDirectoryNode" />
+              <item name="lesson_list" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="efunbox-schedule-miniApps" type="b2602c69:ProjectViewProjectNode" />
+              <item name="efunbox-schedule-miniApps" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
@@ -99,17 +114,18 @@
       <workItem from="1524652261658" duration="616000" />
       <workItem from="1524663262852" duration="109000" />
       <workItem from="1524705659225" duration="247000" />
-      <workItem from="1524792294462" duration="308000" />
+      <workItem from="1524792294462" duration="506000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1280000" />
+    <option name="totallyTimeSpent" value="1478000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19861111" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -134,4 +150,9 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/compontents/lesson_list/lessonList.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+  </component>
 </project>

+ 6 - 3
compontents/lesson_list/lessonList.js

@@ -16,7 +16,8 @@ Component({
   data: {
     flag: false,
     animationData: {},
-    downUp: '展开'
+    downUp: '展开',
+    src: '../../pages/image/toUp.png'
   },
 
   /**
@@ -30,13 +31,15 @@ Component({
         this.util(flage, '270rpx');
         this.setData({
           'flag': false,
-          'downUp': '展开'
+          'downUp': '展开',
+          'src':'../../pages/image/toUp.png'
       })
       } else {
         this.util(flage, height + 'rpx');
         this.setData({
           'flag': true,
-          'downUp': '收起'
+          'downUp': '收起',
+          'src': '../../pages/image/toDown.png'
         })
       }
     },

+ 7 - 1
compontents/lesson_list/lessonList.wxml

@@ -19,5 +19,11 @@
             </view>
         </view>
     </view>
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+
+
+    <view class="unfold">
+      <image class="dirImg" src="{{src}}"></image>
+      <text data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+    </view>
+    
 </view>

+ 10 - 0
compontents/lesson_list/lessonList.wxss

@@ -113,5 +113,15 @@
     right: 28rpx;
     bottom: 24rpx;
     font-size: 28rpx;
+    line-height: 28rpx;
+    height: 28rpx;
     color: #93AAFA;
+}
+.dirImg{
+  width: 16rpx;
+  height: 9rpx;
+  position: absolute;
+  top: 50%;
+  left: -20rpx;
+  margin-top: -5rpx;
 }

+ 6 - 3
compontents/preview/preview.js

@@ -16,7 +16,8 @@ Component({
   data: {
     flag: false,
     animationData: {},
-    downUp: '展开'
+    downUp: '展开',
+    src: '../../pages/image/toUp.png'
   },
 
   /**
@@ -31,13 +32,15 @@ Component({
         this.util(flage, '270rpx');
         this.setData({
           'flag': false,
-          'downUp': '展开'
+          'downUp': '展开',
+          'src': '../../pages/image/toUp.png'
         })
       } else {
         this.util(flage, height + 'rpx');
         this.setData({
           'flag': true,
-          'downUp': '收起'
+          'downUp': '收起',
+          'src': '../../pages/image/toDown.png'
         })
       }
     },

+ 6 - 1
compontents/preview/preview.wxml

@@ -17,5 +17,10 @@
         </view>
     </view>
     
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+    <view class="unfold">
+      <image class="dirImg" src="{{src}}"></image>
+      <text data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+    </view>
+
+    
 </view>

+ 11 - 1
compontents/preview/preview.wxss

@@ -61,5 +61,15 @@
     right: 28rpx;
     bottom: 24rpx;
     font-size: 28rpx;
+    line-height: 28rpx;
+    height: 28rpx;
     color: #93AAFA;
-}
+}
+.dirImg{
+  width: 16rpx;
+  height: 9rpx;
+  position: absolute;
+  top: 50%;
+  left: -20rpx;
+  margin-top: -5rpx;
+}

+ 6 - 3
compontents/target/target.js

@@ -16,7 +16,8 @@ Component({
   data: {
     flag: false,
     animationData: {},
-    downUp: '展开'
+    downUp: '展开',
+    src: '../../pages/image/toUp.png'
   },
 
   /**
@@ -29,13 +30,15 @@ Component({
         this.util(flage, '156rpx');
         this.setData({
           'flag': false,
-          'downUp': '展开'
+          'downUp': '展开',
+          'src': '../../pages/image/toUp.png'
         })
       } else {
         this.util(flage, '200rpx');
         this.setData({
           'flag': true,
-          'downUp': '收起'
+          'downUp': '收起',
+          'src': '../../pages/image/toDown.png'
         })
       }
     },

+ 7 - 1
compontents/target/target.wxml

@@ -6,5 +6,11 @@
     <view class="{{ flag ? 'target-txt-show' : 'target-txt'}}" animation="{{animationData}}">
         <text class="week">第五周:{{wxObjectives}}</text>
     </view>
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+
+
+    <view class="unfold">
+      <image class="dirImg" src="{{src}}"></image>
+      <text data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
+    </view>
+
 </view>

+ 11 - 1
compontents/target/target.wxss

@@ -42,7 +42,17 @@
 .unfold {
     position: absolute;
     right: 28rpx;
-    bottom: 10rpx;
+    bottom: 24rpx;
     font-size: 28rpx;
+    line-height: 28rpx;
+    height: 28rpx;
     color: #93AAFA;
+}
+.dirImg{
+  width: 16rpx;
+  height: 9rpx;
+  position: absolute;
+  top: 50%;
+  left: -20rpx;
+  margin-top: -5rpx;
 }

BIN
pages/.DS_Store


BIN
pages/image/toDown.png


BIN
pages/image/toUp.png


+ 0 - 2
pages/index/index.wxml

@@ -93,8 +93,6 @@
                 </view>
               </scroll-view>
               
-
-
             </view>
             <!-- 课模板 -->
             <view>