pages style

.idea/workspace.xml

@@ -3,10 +3,15 @@
   <component name="ChangeListManager">
     <list default="true" id="2ecf3c01-ae46-4667-8997-db10a46d1157" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/component/follow/follow.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/component/follow/follow.wxml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/component/my/my.js" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/component/my/my.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/component/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.wxss" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/main/class/class.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/main/class/class.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/utils/APIClient.js" beforeDir="false" afterPath="$PROJECT_DIR$/utils/APIClient.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -22,46 +27,47 @@
     <session id="-1384404472">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="6" />
+          <entry key="project.closed" value="8" />
           <entry key="project.open.time.15" value="1" />
+          <entry key="project.open.time.20" value="1" />
           <entry key="project.open.time.26" value="1" />
           <entry key="project.open.time.30" value="1" />
           <entry key="project.open.time.32" value="1" />
           <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.5" value="1" />
-          <entry key="project.opened" value="6" />
+          <entry key="project.open.time.5" value="2" />
+          <entry key="project.opened" value="8" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="jpg" value="1" />
-          <entry key="js" value="29" />
+          <entry key="js" value="41" />
           <entry key="json" value="5" />
-          <entry key="wxml" value="17" />
-          <entry key="wxss" value="9" />
+          <entry key="wxml" value="32" />
+          <entry key="wxss" value="20" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="Image" value="1" />
           <entry key="JSON" value="5" />
-          <entry key="JavaScript" value="29" />
-          <entry key="PLAIN_TEXT" value="26" />
+          <entry key="JavaScript" value="41" />
+          <entry key="PLAIN_TEXT" value="52" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="js" value="1245" />
+          <entry key="js" value="1335" />
           <entry key="json" value="5" />
-          <entry key="wxml" value="160" />
+          <entry key="wxml" value="166" />
           <entry key="wxss" value="87" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="JSON" value="5" />
-          <entry key="JavaScript" value="1245" />
-          <entry key="PLAIN_TEXT" value="247" />
+          <entry key="JavaScript" value="1335" />
+          <entry key="PLAIN_TEXT" value="253" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -71,63 +77,33 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="6" column="136" lean-forward="true" selection-start-line="6" selection-start-column="136" selection-end-line="6" selection-end-column="136" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="49" column="24" lean-forward="true" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2460">
-              <caret line="82" column="23" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="23" />
-              <folding>
-                <element signature="e#0#54#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.wxml">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
+        <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="225" column="38" lean-forward="true" selection-start-line="225" selection-start-column="38" selection-end-line="225" selection-end-column="38" />
+            <state relative-caret-position="114">
+              <caret line="5" column="32" lean-forward="true" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
+        <entry file="file://$PROJECT_DIR$/component/follow/follow.wxss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
+            <state relative-caret-position="270">
+              <caret line="48" column="25" lean-forward="true" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/index/index.js">
+        <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2070">
-              <caret line="69" column="32" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
-              <folding>
-                <element signature="n#!!doc" expanded="true" />
-                <element signature="e#20#81#0" expanded="true" />
-                <element signature="e#104#156#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="90">
+              <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -135,35 +111,31 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/component/my/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="630">
-              <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+            <state relative-caret-position="1260">
+              <caret line="42" column="24" lean-forward="true" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/hot/hot.js">
+        <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3630">
-              <caret line="121" column="11" selection-start-line="121" selection-start-column="11" selection-end-line="121" selection-end-column="11" />
+            <state relative-caret-position="90">
+              <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="870">
-              <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxss">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
+        <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
+            <state relative-caret-position="90">
+              <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
             </state>
           </provider>
         </entry>
@@ -196,11 +168,14 @@
         <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss" />
         <option value="$PROJECT_DIR$/app.json" />
         <option value="$PROJECT_DIR$/utils/httpUtil.js" />
-        <option value="$PROJECT_DIR$/pages/index/index.js" />
         <option value="$PROJECT_DIR$/component/my/my.wxml" />
-        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" />
         <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" />
         <option value="$PROJECT_DIR$/utils/APIClient.js" />
+        <option value="$PROJECT_DIR$/pages/main/class/class.js" />
+        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" />
+        <option value="$PROJECT_DIR$/pages/user/myread/myread.wxml" />
+        <option value="$PROJECT_DIR$/component/follow/follow.wxml" />
+        <option value="$PROJECT_DIR$/pages/index/index.js" />
         <option value="$PROJECT_DIR$/component/my/my.js" />
       </list>
     </option>
@@ -282,6 +257,12 @@
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <item name="component" type="462c0819:PsiDirectoryNode" />
+              <item name="follow" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="reader" type="462c0819:PsiDirectoryNode" />
+              <item name="component" type="462c0819:PsiDirectoryNode" />
               <item name="my" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -289,6 +270,12 @@
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="reader" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -330,11 +317,13 @@
       <workItem from="1541554466111" duration="5820000" />
       <workItem from="1541581837551" duration="14978000" />
       <workItem from="1541640549483" duration="10184000" />
+      <workItem from="1541676119862" duration="6983000" />
+      <workItem from="1541727401339" duration="7751000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="40315000" />
+    <option name="totallyTimeSpent" value="55049000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -386,26 +375,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1596">
-          <caret line="40" column="14" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/main/reading/reading.wxml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/social/works/works.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="780">
-          <caret line="26" column="33" lean-forward="true" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/image/timg.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -424,19 +396,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="20" column="51" lean-forward="true" selection-start-line="20" selection-start-column="51" selection-end-line="20" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/component/hot/hot.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/main/reading/reading.wxss">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -458,13 +420,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2310">
@@ -479,102 +434,224 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
+    <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
+        <state relative-caret-position="810">
+          <caret line="27" column="20" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
+    <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="20" />
+        <state relative-caret-position="30">
+          <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
+    <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="46" column="34" lean-forward="true" selection-start-line="46" selection-start-column="34" selection-end-line="46" selection-end-column="34" />
+        <state relative-caret-position="870">
+          <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.js">
+    <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2070">
-          <caret line="69" column="32" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
+        <state relative-caret-position="451">
+          <caret line="268" column="38" selection-start-line="268" selection-start-column="38" selection-end-line="268" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-90">
+          <caret column="7" selection-start-column="7" selection-end-column="7" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#20#81#0" expanded="true" />
-            <element signature="e#104#156#0" expanded="true" />
+            <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/collage-details/collage-details.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/grade-details/grade-details.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/group-details/group-details.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/my-group/my-group.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
+        <state relative-caret-position="1980">
+          <caret line="66" column="29" selection-start-line="66" selection-start-column="29" selection-end-line="66" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
+    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
+        <state relative-caret-position="150">
+          <caret line="5" column="7" selection-end-line="5" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/component/hot/hot.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3630">
-          <caret line="121" column="11" selection-start-line="121" selection-start-column="11" selection-end-line="121" selection-end-column="11" />
+        <state relative-caret-position="150">
+          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+    <entry file="file://$PROJECT_DIR$/pages/main/books/books.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="9" column="60" selection-start-line="9" selection-start-column="60" selection-end-line="9" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="6" column="136" selection-start-line="6" selection-start-column="136" selection-end-line="6" selection-end-column="136" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2460">
-          <caret line="82" column="23" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="23" />
+        <state relative-caret-position="570">
+          <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/popup/popup.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/social/works/works.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
           <folding>
             <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
+    <entry file="file://$PROJECT_DIR$/pages/social/works/works.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/social/works/works.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="870">
-          <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
+        <state relative-caret-position="780">
+          <caret line="26" column="33" lean-forward="true" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
+    <entry file="file://$PROJECT_DIR$/pages/index/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="6" column="136" lean-forward="true" selection-start-line="6" selection-start-column="136" selection-end-line="6" selection-end-column="136" />
+        <state relative-caret-position="210">
+          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <element signature="e#20#81#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+    <entry file="file://$PROJECT_DIR$/component/my/my.wxss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="49" column="24" lean-forward="true" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
+        <state relative-caret-position="1200">
+          <caret line="40" column="14" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/component/my/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+        <state relative-caret-position="1260">
+          <caret line="42" column="24" lean-forward="true" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
+    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1020">
+          <caret line="34" column="11" lean-forward="true" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="48" column="25" lean-forward="true" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="225" column="38" lean-forward="true" selection-start-line="225" selection-start-column="38" selection-end-line="225" selection-end-column="38" />
+        <state relative-caret-position="114">
+          <caret line="5" column="32" lean-forward="true" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
         </state>
       </provider>
     </entry>

app.json

@@ -16,7 +16,10 @@
     "pages/user/myconcern/myconcern",
     "pages/groupPage/my-group/my-group",
     "pages/user/myWallet/myWallet",
-    "pages/groupPage/make-money/make-money"
+    "pages/groupPage/make-money/make-money",
+    "pages/user/mycourse/mycourse",
+    "pages/user/myread/myread",
+    "pages/user/mycollection/mycollection"
   ],
   "window": {
     "backgroundTextStyle": "light",

component/follow/follow.wxml

@@ -11,16 +11,16 @@
       <image class="wareCardImg" src="{{item.img}}" />
       <text class="wareCardTitle">{{item.title}}</text>
       <view class="bottomData">
-                    <text class="wareCardTip">{{item.grade}}</text>
-                    <view class="wareCardPlays">
-                        <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
-                        <text>{{item.plays}}</text>
-                    </view>
-                    <view class="wareCardLikes">
-                        <image class="wareCardLikesImg" src="../../static/image/like.png" />
-                        <text>{{item.likes}}</text>
-                    </view>
-                </view>
+        <text class="wareCardTip">{{item.grade}}</text>
+        <view class="wareCardPlays">
+            <image class="wareCardPlaysImg" src="../../static/image/hotPlays.png" />
+            <text>{{item.plays}}</text>
+        </view>
+        <view class="wareCardLikes">
+            <image class="wareCardLikesImg" src="../../static/image/like.png" />
+            <text>{{item.likes}}</text>
+        </view>
+    </view>
     </view>
   </view>
 </template>

component/my/my.js

@@ -4,6 +4,9 @@ export const myInit =  (that) => {
     myData: {
         title: '修改资料',
         concern: '我的关注',
+        course: '我的课程',
+        read: '我的朗读',
+        keep: '我的收藏',
         schoolCity: '青岛市',
         schoolName: '黄岛区志贤中学',
         playNum: 31549,
@@ -30,8 +33,25 @@ export const myInit =  (that) => {
     wx.navigateTo({
       url: `../user/myWallet/myWallet?title=${title}`
     });
-  }
-
+  },
+  that.toMyCourse = e => {
+    let title = e.currentTarget.dataset.title;
+    wx.navigateTo({
+      url: `../user/mycourse/mycourse?title=${title}`
+    });
+  },
+  that.toMyRead = e => {
+    let title = e.currentTarget.dataset.title;
+    wx.navigateTo({
+      url: `../user/myread/myread?title=${title}`
+    });
+  },
+  that.toMyKeep = e => {
+    let title = e.currentTarget.dataset.title;
+    wx.navigateTo({
+      url: `../user/mycollection/mycollection?title=${title}`
+    });
+  },
   that.userInfo = function () {
       const userInfo = wx.getStorageSync('user');
       console.log(userInfo.data.data.data);

component/my/my.wxml

@@ -70,7 +70,7 @@
           </view>
         </view>
       </view>
-      <view class='course-module'>
+      <view class='course-module' bindtap='toMyCourse' data-title='{{ myData.course }}'>
         <view class='wallet-center'>
           <view class='wallet-left'>
             <view class='icon-box'>
@@ -96,7 +96,7 @@
           </view>
         </view>
       </view>
-      <view class='reading-module'>
+      <view class='reading-module' bindtap='toMyRead' data-title='{{ myData.read }}'>
         <view class='wallet-center'>
           <view class='wallet-left'>
             <view class='icon-box'>
@@ -109,7 +109,7 @@
           </view>
         </view>
       </view>
-      <view class='keep-module'>
+      <view class='keep-module' bindtap='toMyKeep' data-title='{{ myData.keep }}'>
         <view class='wallet-center'>
           <view class='wallet-left'>
             <view class='icon-box'>

component/my/my.wxss

@@ -192,6 +192,7 @@ image{
 }
 
 .wallet-right{
+  margin-bottom: 20rpx;
   width: 16rpx;
   height: 28rpx;  
 }

pages/index/index.js

@@ -85,13 +85,13 @@ Page({
     }
     if (myIndex == 3) {
       myInit(this);
-      getOpenidSessionKey( res => {
-        console.log(res);
-      }, (error) => {
-        this.setData({
-          hide: !this.data.hide
-        });
-      });
+      // getOpenidSessionKey( res => {
+      //   console.log(res);
+      // }, (error) => {
+      //   this.setData({
+      //     hide: !this.data.hide
+      //   });
+      // });
     }
   },
   onLoad: function (options) {

pages/main/class/class.js

@@ -8,7 +8,6 @@ Page({
     playBtn: false,
     gesture: true,
     videoUrl: '',
-    title: '',
     poster: '',
     works: [],
     total: '',

pages/user/myEdit/myEdit.js

@@ -47,9 +47,12 @@ Page({
   },
   formSubmit: function(e){
     let { nickname, picker, radioGroup1, radioGroup2, address } = e.detail.value;
-    let wechatName = nickname, mobile = '13994969642', gender = 3, schoolProvince = 11, schoolCity = '运城市', schoolName = '康杰中学', profession = radioGroup2, birthday = picker;
-    httpRequestApi.settingUserInfo(wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday).success(res => {
-      console.log(res.data.data);
+    let uid = 1, wechatName = nickname, mobile = '13994969642', gender = 3, schoolProvince = 11, schoolCity = '运城市', schoolName = '康杰中学', profession = radioGroup2, birthday = picker;
+    httpRequestApi.settingUserInfo(uid, wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday).success(res => {
+      console.log(res.data.data.wechatName);//修改资料成功后 调用 getUserInfo
+      // this.setData({
+      //     nickname: res.data.data.wechatName
+      // });
         wx.redirectTo({
             url: '/pages/index/index?index=3'
         });

pages/user/mycollection/mycollection.js

@@ -0,0 +1,148 @@
+// pages/user/mycollection/mycollection.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    collection_data: [
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '木小雅',
+        time: '10-18 09:56'
+      }
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (option) {
+    console.log(option.title);
+    if (option.title) {
+      wx.setNavigationBarTitle({
+        title: option.title//页面标题为路由参数
+      });
+      this.setData({
+        title: option.title
+      });
+    }
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user/mycollection/mycollection.json

@@ -0,0 +1 @@
+{}

pages/user/mycollection/mycollection.wxml

@@ -0,0 +1,36 @@
+<view class='my-collection'>
+  <view class='collection-article' wx:for="{{ collection_data }}" wx:key="{{ index }}">
+    <view class='collection-top'>
+      <view class='top-img'>
+        <image src='{{ item.avatarUrl }}'></image>
+      </view>
+      <view class='collection-info'>
+        <view class='title'>{{ item.nickName }}</view>
+        <view class='date'>{{ item.time }}</view>
+      </view>
+    </view>
+    <view class='video-preview'>
+      <image src='{{ item.previewUrl }}'></image>
+    </view>
+    <view class='content-title'>
+      {{ item.title }}
+    </view>
+    <view class='content-detail'>
+      <view class='left'>{{ item.grade }}</view>
+      <view class='right'>
+        <view class='right-detail'>
+          <view class='play-img'>
+            <image src='../../../static/image/hotPlays.png'></image>
+          </view>
+          <text>{{ item.plays }}</text>
+        </view>
+        <view class='right-detail'>
+          <view class='point-img'>
+            <image src='../../../static/image/like.png'></image>
+          </view>
+          <text>{{ item.likes }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

pages/user/mycollection/mycollection.wxss

@@ -0,0 +1,113 @@
+.my-collection{
+  width: 750rpx;
+  background: #F0F1F5;
+}
+
+.collection-article{
+  margin-bottom: 4rpx;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 23rpx;
+  background: #FFFFFF;
+}
+
+.collection-top{
+  width: 100%;
+  height: 120rpx;
+  display: flex;
+  align-items: center;
+}
+
+.top-img{
+  margin-right: 14rpx;
+  width: 96rpx;
+  height: 96rpx;
+  border-radius: 50%;
+}
+
+.top-img>image{
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.collection-info{
+  width: 580rpx;
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+}
+
+.collection-info>.title{
+  color: #000000;
+  font-weight: 600;
+}
+
+.collection-info>.date{
+  color: #686868;
+  font-weight: lighter;
+}
+
+.video-preview{
+  margin-top: 10rpx;
+  width: 100%;
+  height: 290rpx;
+  border-radius: 20rpx;
+}
+
+.video-preview>image{
+  width: 100%;
+  height: 100%;
+  border-radius: 20rpx;
+}
+
+.content-title{
+  margin-top: 10rpx;
+  width: 100%;
+  height: 50rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #414141;
+}
+
+.content-detail{
+  width: 100%;
+  height: 60rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 24rpx;
+}
+
+.left{
+  width: 200rpx;
+}
+
+.right{
+  width: 220rpx;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.right image{
+  width: 100%;
+  height: 100%;
+}
+
+.play-img{
+  width: 20rpx;
+  height: 20rpx;
+}
+
+.point-img{
+  width: 26rpx;
+  height: 24rpx;
+}
+
+.right-detail{
+  width: 100rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}

pages/user/mycourse/mycourse.js

@@ -0,0 +1,110 @@
+import httpRequestApi from '../../../utils/APIClient';
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    title: '',
+    bookList: [
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '一年级语文下学期'
+      },
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '二年级语文下学期'
+      },
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '三年级语文下学期'
+      },
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '一年级语文下学期'
+      },
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '二年级语文下学期'
+      },
+      {
+        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+        title: '三年级语文下学期'
+      }
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (option) {
+    console.log(option.title);
+    if (option.title) {
+      wx.setNavigationBarTitle({
+        title: option.title//页面标题为路由参数
+      });
+      this.setData({
+        title: option.title
+      });
+    }
+
+    // httpRequestApi.getAllBooks(1, 10).success((res) => {
+    //   this.setData({
+    //     bookList: res.data.data.list
+    //   },()=>{
+    //     console.log(this.data.bookList);
+    //   });
+    // }).fail((error) => {
+    //   console.log('错误', error)
+    // });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user/mycourse/mycourse.json

@@ -0,0 +1 @@
+{}

pages/user/mycourse/mycourse.wxml

@@ -0,0 +1,10 @@
+<view class='my-course'>
+  <block wx:for="{{ bookList }}" wx:key="{{ index }}">
+    <view class="book-item">
+      <view class='book-box'>
+        <image class="item-img" src="{{ item.iconImg }}"></image>
+      </view>
+      <view class='item-title'>{{ item.title }}</view>
+    </view>    
+  </block>             
+</view>

pages/user/mycourse/mycourse.wxss

@@ -0,0 +1,32 @@
+.my-course {
+  margin-top: 44rpx;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+
+.book-item{
+  margin-bottom: 20rpx;
+  width: 214rpx;
+}
+
+.book-box{
+  width: 214rpx;
+  height: 290rpx;
+}
+
+.book-box>image{
+  width:100%;
+  height: 100%;
+}
+
+.book-item>.item-title{
+  margin-top:18rpx;
+  width: 100%;
+  font-size: 24rpx;
+  color:#373737;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}

pages/user/myread/myread.js

@@ -0,0 +1,148 @@
+// pages/user/myread/myread.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    wareCards: [
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      },
+      {
+        title: "古诗词诵读（一）江南",
+        grade: "一年级(上学期)",
+        avatarUrl: '../../../static/image/timg.jpg',
+        previewUrl: "../../../static/image/timg.jpg",
+        plays: "17230",
+        likes: "71230",
+        classId: "1",
+        avatar: '../../static/image/timg.jpg',
+        nickName: '喔喔',
+        time: '10-18 09:56'
+      }
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (option) {
+    console.log(option.title);
+    if (option.title) {
+      wx.setNavigationBarTitle({
+        title: option.title//页面标题为路由参数
+      });
+      this.setData({
+        title: option.title
+      });
+    }
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user/myread/myread.json

@@ -0,0 +1 @@
+{}

pages/user/myread/myread.wxml

@@ -0,0 +1,36 @@
+<view class='my-read'>
+  <view class='read-article' wx:for="{{ wareCards }}" wx:key="{{ index }}">
+    <view class='read-top'>
+      <view class='top-img'>
+        <image src='{{ item.avatarUrl }}'></image>
+      </view>
+      <view class='read-info'>
+        <view class='title'>{{ item.nickName }}</view>
+        <view class='date'>{{ item.time }}</view>
+      </view>
+    </view>
+    <view class='video-preview'>
+      <image src='{{ item.previewUrl }}'></image>
+    </view>
+    <view class='content-title'>
+      {{ item.title }}
+    </view>
+    <view class='content-detail'>
+      <view class='left'>{{ item.grade }}</view>
+      <view class='right'>
+        <view class='right-detail'>
+          <view class='play-img'>
+            <image src='../../../static/image/hotPlays.png'></image>
+          </view>
+          <text>{{ item.plays }}</text>
+        </view>
+        <view class='right-detail'>
+          <view class='point-img'>
+            <image src='../../../static/image/like.png'></image>
+          </view>
+          <text>{{ item.likes }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

pages/user/myread/myread.wxss

@@ -0,0 +1,113 @@
+.my-read{
+  width: 750rpx;
+  background: #F0F1F5;
+}
+
+.read-article{
+  margin-bottom: 4rpx;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 23rpx;
+  background: #FFFFFF;
+}
+
+.read-top{
+  width: 100%;
+  height: 120rpx;
+  display: flex;
+  align-items: center;
+}
+
+.top-img{
+  margin-right: 14rpx;
+  width: 96rpx;
+  height: 96rpx;
+  border-radius: 50%;
+}
+
+.top-img>image{
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.read-info{
+  width: 580rpx;
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+}
+
+.read-info>.title{
+  color: #000000;
+  font-weight: 600;
+}
+
+.read-info>.date{
+  color: #686868;
+  font-weight: lighter;
+}
+
+.video-preview{
+  margin-top: 10rpx;
+  width: 100%;
+  height: 290rpx;
+  border-radius: 20rpx;
+}
+
+.video-preview>image{
+  width: 100%;
+  height: 100%;
+  border-radius: 20rpx;
+}
+
+.content-title{
+  margin-top: 10rpx;
+  width: 100%;
+  height: 50rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #414141;
+}
+
+.content-detail{
+  width: 100%;
+  height: 60rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 24rpx;
+}
+
+.left{
+  width: 200rpx;
+}
+
+.right{
+  width: 220rpx;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.right image{
+  width: 100%;
+  height: 100%;
+}
+
+.play-img{
+  width: 20rpx;
+  height: 20rpx;
+}
+
+.point-img{
+  width: 26rpx;
+  height: 24rpx;
+}
+
+.right-detail{
+  width: 100rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}

project.config.json

@@ -36,7 +36,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 7,
+			"current": 13,
 			"list": [
 				{
 					"id": 0,
@@ -85,6 +85,42 @@
 					"name": "作品页面",
 					"pathName": "pages/social/works/works",
 					"query": "id=1541489786444388&title=铺满色巴掌的水泥道"
+				},
+				{
+					"id": -1,
+					"name": "read",
+					"pathName": "pages/user/myread/myread",
+					"query": "productId=1"
+				},
+				{
+					"id": -1,
+					"name": "keep",
+					"pathName": "pages/user/mycollection/mycollection",
+					"query": "productId=1"
+				},
+				{
+					"id": -1,
+					"name": "course",
+					"pathName": "pages/user/mycourse/mycourse",
+					"query": "productId=1"
+				},
+				{
+					"id": -1,
+					"name": "course",
+					"pathName": "pages/user/mycourse/mycourse",
+					"query": "productId=1"
+				},
+				{
+					"id": -1,
+					"name": "course",
+					"pathName": "pages/index/index",
+					"query": "productId=1"
+				},
+				{
+					"id": -1,
+					"name": "course",
+					"pathName": "pages/user/mycourse/mycourse",
+					"query": "productId=1"
 				}
 			]
 		}

utils/APIClient.js

@@ -253,10 +253,10 @@ module.exports = {
 		}).url(url).data(data).method('POST').send();
 	},
   // 修改资料
-  settingUserInfo(wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday){
+  settingUserInfo(uid, wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday){
     let url = getBaseUrl(`wx/user`);
     return request.getInstance().header({
-      uid: wx.getStorageSync('uid')
+      uid
     }).data({
       wechatName: wechatName,
       mobile: mobile,