合并代码

.idea/workspace.xml

@@ -2,19 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2ecf3c01-ae46-4667-8997-db10a46d1157" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <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/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/user/mine/mine.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/mine/mine.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/mine/mine.wxml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/mine/mine.wxss" beforeDir="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$/pages/user/myEdit/myEdit.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/image/Group 8@2x.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/image/edit.png" beforeDir="false" afterPath="$PROJECT_DIR$/static/image/edit.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,37 +24,43 @@
     <session id="-1384404472">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="3" />
           <entry key="project.open.time.15" value="1" />
+          <entry key="project.open.time.30" value="1" />
           <entry key="project.open.time.5" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="js" value="9" />
-          <entry key="json" value="3" />
-          <entry key="wxml" value="4" />
-          <entry key="wxss" value="2" />
+          <entry key="jpg" value="1" />
+          <entry key="js" value="16" />
+          <entry key="json" value="4" />
+          <entry key="wxml" value="14" />
+          <entry key="wxss" value="8" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JSON" value="3" />
-          <entry key="JavaScript" value="9" />
-          <entry key="PLAIN_TEXT" value="6" />
+          <entry key="Image" value="1" />
+          <entry key="JSON" value="4" />
+          <entry key="JavaScript" value="16" />
+          <entry key="PLAIN_TEXT" value="22" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
+          <entry key="js" value="2" />
           <entry key="json" value="1" />
-          <entry key="wxss" value="24" />
+          <entry key="wxml" value="3" />
+          <entry key="wxss" value="86" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="JSON" value="1" />
-          <entry key="PLAIN_TEXT" value="24" />
+          <entry key="JavaScript" value="2" />
+          <entry key="PLAIN_TEXT" value="89" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -68,25 +69,56 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret column="21" selection-start-column="21" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
+        <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+            <state relative-caret-position="2070">
+              <caret line="69" column="98" selection-start-line="69" selection-start-column="98" selection-end-line="69" selection-end-column="98" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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>
+      </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="-150">
+              <caret line="61" column="5" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="61" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2730">
+              <caret line="91" column="18" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+        <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
+            <state relative-caret-position="240">
+              <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
             </state>
           </provider>
         </entry>
@@ -106,6 +138,9 @@
       <list>
         <option value="$PROJECT_DIR$/component/my/my.wxss" />
         <option value="$PROJECT_DIR$/pages/index/index.json" />
+        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml" />
+        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.js" />
+        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss" />
       </list>
     </option>
   </component>
@@ -127,7 +162,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -138,13 +172,63 @@
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
+              <item name="component" 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="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="hot" 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>
+              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
+              <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="main" 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="main" type="462c0819:PsiDirectoryNode" />
+              <item name="class" 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="main" type="462c0819:PsiDirectoryNode" />
+              <item name="reading" 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>
             <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" />
+              <item name="myconcern" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
@@ -153,10 +237,16 @@
               <item name="user" type="462c0819:PsiDirectoryNode" />
               <item name="myEdit" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
+              <item name="reader" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -164,6 +254,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -189,11 +280,12 @@
       <updated>1541144282324</updated>
       <workItem from="1541144291161" duration="762000" />
       <workItem from="1541157092216" duration="2211000" />
+      <workItem from="1541402122086" duration="6360000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2973000" />
+    <option name="totallyTimeSpent" value="9333000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -231,13 +323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="480">
@@ -252,13 +337,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="23" selection-start-column="13" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -273,13 +351,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="22" selection-start-column="16" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -322,17 +393,117 @@
     <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+    <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="390">
-          <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
+        <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$/static/image/timg.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
-          <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+          <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/hot/hot.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-290" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-150">
+          <caret line="61" column="5" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="61" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="17" column="15" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="17" selection-end-column="15" />
+        </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$/pages/user/myEdit/myEdit.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1530">
+          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/my/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="2" column="13" lean-forward="true" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="21" selection-start-column="21" selection-end-column="21" />
+        </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>
+          <caret column="15" lean-forward="true" selection-start-column="15" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2730">
+          <caret line="91" column="18" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
+        </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="2070">
+          <caret line="69" column="98" selection-start-line="69" selection-start-column="98" selection-end-line="69" selection-end-column="98" />
         </state>
       </provider>
     </entry>

app.json

@@ -12,6 +12,8 @@
     "pages/groupPage/group-details/group-details",
     "pages/groupPage/grade-details/grade-details",
     "pages/groupPage/collage-details/collage-details"
+    "pages/main/searchResult/searchResult",
+    "pages/user/myconcern/myconcern"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -19,5 +21,6 @@
     "navigationBarTitleText": "小学语文课文朗读",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#61CA54"
-  }
+  },
+  "debug": false
 }

component/group/group.wxss

@@ -1,12 +1,12 @@
 ::-webkit-scrollbar {
     display: none;
-  }
+}
 
 .group {
     height: 100%;
     width: 100%;
     padding-bottom: 102rpx;
-    box-sizing: border-box; 
+    box-sizing: border-box;
 }
 
 scroll-view {
@@ -16,7 +16,7 @@ scroll-view {
 .group-container {
     width: 100%;
     box-sizing: border-box;
-    padding: 0 18rpx; 
+    padding: 0 18rpx;
     background: #fff;
 }
 
@@ -50,7 +50,7 @@ scroll-view {
 
 .whole-group {
     margin-top: 32rpx;
-    padding: 0 18rpx; 
+    padding: 0 18rpx;
     box-sizing: border-box;
 }
 
@@ -65,7 +65,7 @@ scroll-view {
 
 .title .left {
     font-size: 32rpx;
-    padding-left: 52rpx; 
+    padding-left: 52rpx;
 }
 
 .quota {
@@ -73,7 +73,7 @@ scroll-view {
     color: red;
 }
 
-.title .ren  {
+.title .ren {
     width: 42rpx;
     height: 36rpx;
     position: absolute;

component/my/my.js

@@ -2,6 +2,7 @@ export const myInit =  (that) => {
   that.setData({
     myData: {
         title: '修改资料',
+        concern: '我的关注',
         imgUrl: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
         name: 'ABC',
         address:['北京海淀','中关村','三小'],
@@ -16,6 +17,12 @@ export const myInit =  (that) => {
     wx.navigateTo({
       url: `../user/myEdit/myEdit?title=${title}`
     });
+  },
+  that.toMyConcern = e => {
+    let title = e.currentTarget.dataset.title;
+    wx.navigateTo({
+      url: `../user/myconcern/myconcern?title=${title}`
+    });
   }
 
 }

component/my/my.wxml

@@ -122,7 +122,7 @@
           </view>
         </view>
       </view>
-      <view class='myfollow-module'>
+      <view class='myfollow-module' bindtap='toMyConcern' data-title='{{ myData.concern }}'>
         <view class='wallet-center'>
           <view class='wallet-left'>
             <view class='icon-box'>

component/my/my.wxss

@@ -11,7 +11,7 @@
 }
 
 .mine-info{
-  margin-top: 80rpx;
+  /* margin-top: 80rpx; */
   width: 100%;
   height: 344rpx;
   background: #FFFFFF;

pages/user/myEdit/myEdit.js

@@ -5,30 +5,49 @@ Page({
    */
   data: {
     zradio: [
-      { sex: '女', bool: false },
-      { sex: '男', bool: false }
+      { name: 'radio', sex: '女', bool: false, checked: true },
+      { name: 'radio', sex: '男', bool: false, checked: false }
     ],
+    flag: true,
     occupations: [
-      { occupation: '家长', bool: false },
-      { occupation: '老师', bool: false },
-      { occupation: '学生', checked: true, bool: false  }
+      { name: 'radio', occupation: '家长', checked: false, status: 0 },
+      { name: 'radio', occupation: '老师', checked: false, status: 1 },
+      { name: 'radio', occupation: '学生', checked: true, status: 2  }
     ],
-    region: ['北京市', '海淀区','清华大学']
+    region: ['北京市', '海淀区','万泉胜景远小学']
   },
   radioChange: function (e) {
     var zradio = this.data.zradio;
     var index = e.currentTarget.dataset.index;
-    console.log(index);
-    if (this.data.zradio[index].bool) {
-      console.log(zradio[index].bool);
-      zradio[index].bool = false;
-    } else {
-      zradio[index].bool = true;
-    };
+    for (let i = 0; i < zradio.length;i++){
+      if (zradio[i].checked){
+        zradio[i].checked = false;
+      }
+      else{
+        zradio[i].checked = true;
+      }
+    }
     this.setData({
       zradio: zradio
     });
   },
+  radioSetting:function(e){
+    let occupations = this.data.occupations;
+    let index = e.currentTarget.dataset.index;
+    for (let i = 0; i < occupations.length;i++){
+      let state = index;//缓存 用户当前点击的索引。
+      if (occupations[state].checked){
+        occupations[state].checked = false;
+      }
+      else{
+        occupations[state].checked = true;
+      }
+    }
+    this.setData({
+      occupations: occupations
+    });
+    console.log(occupations);
+  },
   formSubmit: function (e) {
     console.log('form发生了submit事件，携带数据为：', e.detail.value)
   },

pages/user/myEdit/myEdit.wxml

@@ -2,7 +2,7 @@
   <view class='setting-info'>
     <form bindsubmit="formSubmit">
       <view class='nickname-box'>
-        <view>昵称</view>
+        <text class='setting-title'>昵称</text>
         <view class='user-action'>
           <input class='nickname' type='text' placeholder='喔喔' placeholder-class='placeholderStyle'>
           </input>
@@ -12,41 +12,41 @@
         </view>
       </view>
       <view class='sex-box'>
-        <text class='sex-title'>性别</text>
+        <text class='setting-title'>性别</text>
         <view class='radio-box' wx:for='{{ zradio }}' wx:key='{{ index }}' data-index='{{ index }}' bindtap='radioChange'>
           <view>{{ item.sex }}</view>
           <view class='radio'>
-            <view class='circle' wx:if='{{ item.bool }}'></view>
+            <view class='circle' wx:if='{{ item.bool === !item.checked }}'></view>
           </view>
         </view>
       </view>
       <view class='birthday-box'>
-        <text class='birthday-title'>生日</text>
+        <text class='setting-title'>生日</text>
         <view class='date'>2001年12月12日</view>
       </view>
       <view class='occupation-box'>
-        <view class='occupation-title'>职业</view>
-        <view wx:for='{{ occupations }}' wx:key='{{ index }}' data-index='{{ index }}' bindtap='radioChange'>
+        <text class='setting-title'>职业</text>
+        <view class='radio-box' wx:for='{{ occupations }}' wx:key='{{ index }}' data-index='{{ index }}' bindtap='radioSetting'>
           <view>{{ item.occupation }}</view>
           <view class='radio'>
-            <view class='circle' wx:if='{{ item.bool === !item.checked }}'></view>
+            <view class='circle' wx:if='{{ item.status === index && item.checked }}'></view>
           </view>
         </view>
       </view>
       <view class='school-box'>
-        <text class='sex'>学校</text>
-        <view class="address-box">
-          <picker mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
-          <view class="picker" style='margin-left:30rpx;'>
-            {{region[0]}}，{{region[1]}}，{{region[2]}}
+        <text class='setting-title'>学校</text>
+        <picker mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
+          <view class="picker">
+            {{region[0]}}{{region[1]}}{{region[2]}}
           </view>
         </picker>
+        <view class='edit-image'>
+          <image src='../../../static/image/edit.png' class='icon'></image>
         </view>
       </view>
       <view class="submit-btn">
         <button class='btn' formType="submit">确定</button>
       </view>
     </form>
-
   </view>
 </view>

pages/user/myEdit/myEdit.wxss

@@ -24,9 +24,13 @@
   border-radius: 12rpx;
 }
 
+.setting-title{
+  display: inline-block;
+  width: 94rpx; 
+}
+
 .user-action{
   position: relative;
-  left: 30rpx;
 }
 
 .placeholderStyle{
@@ -96,12 +100,8 @@
   border-radius: 12rpx;
 }
 
-.birthday-box .birthday{
-  margin-left: 26rpx;
-}
-
-.date{
-  margin-left: 26rpx;
+.birthday-title{
+  margin-right: 30rpx;
 }
 
 .occupation-box{
@@ -116,7 +116,7 @@
 }
 
 .occupation-title{
-  border: 1px solid #539BF0
+  margin-right: 30rpx;
 }
 
 .school-box{
@@ -128,11 +128,23 @@
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
+  position: relative;
+}
+
+.school-title{
+  margin-right: 30rpx;
+}
+
+.edit-image{
+  position: absolute;
+  right: 136rpx;
+  width: 22rpx;
+  height: 32rpx;
 }
 
 .submit-btn{
-  margin-top: 326rpx;
-  width: 750rpx;
+  margin-top: 392rpx;
+  width: 716rpx;
   height: 200rpx;
   display: flex;
   justify-content: center;

pages/user/myconcern/myconcern.js

@@ -0,0 +1,149 @@
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+      fullScreenBtn: false,
+      playBtn: false,
+      gesture: true,
+      concerns:[
+          {
+              nickName: '清然未',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: false
+          },
+          {
+              nickName: '木小雅',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: true
+          },
+          {
+              nickName: '清然未',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: false
+          },
+          {
+              nickName: '木小雅',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: true
+          },
+          {
+              nickName: '清然未',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: false
+          },
+          {
+              nickName: '清然未',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: false
+          },
+          {
+              nickName: '清然未',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: false
+          },
+          {
+              nickName: '木小雅',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: true
+          },
+          {
+              nickName: '木小雅',
+              time: '10-18 09:56',
+              avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
+              concerned: '已关注',
+              followBack: '相互关注',
+              flag: true
+          },
+      ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  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/myconcern/myconcern.json

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

pages/user/myconcern/myconcern.wxml

@@ -0,0 +1,25 @@
+<view class='my-concern'>
+  <view class="concern-center">
+    <view class='concern-info' wx:for="{{ concerns }}" wx:key="{{ index }}">
+      <view class='avatar-box'>
+        <image class='avatar-image' src="{{ item.avatar }}" />
+      </view>
+      <view class="avatar-name">
+        <text class="nickName">{{ item.nickName }}</text>
+        <text class="time">{{ item.time }}</text>
+      </view>
+      <view class="avatar-follow" wx:if='{{ item.flag }}'>
+        <view class='avatar-img'>
+          <image class='avatar-images' src="../../../static/image/concerned.png" />
+        </view>
+        <view class="follow-status">{{ item.concerned }}</view>
+      </view>
+      <view class="avatar-follow" wx:elif='{{ item.followBack === item.followBack || item.flag }}'>
+        <view class='avatar-img'>
+          <image class='avatar-images' src="../../../static/image/concernback.png" />
+        </view>
+        <view class="follow-status">{{ item.followBack }}</view>
+      </view>
+    </view>
+  </view>
+</view>

pages/user/myconcern/myconcern.wxss

@@ -0,0 +1,76 @@
+page{
+  width: 750rpx;
+  background: #F0F1F5;
+}
+
+.concern-center{
+  width: 716rpx;
+  margin: 20rpx auto;
+}
+
+.concern-info{
+  margin-bottom: 20rpx;
+  width: 100%;
+  height: 132rpx;
+  display: flex;
+  align-items: center;
+  border-radius: 12rpx;
+  background: #FFFFFF;
+}
+
+.avatar-image{
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.avatar-box{
+  margin-left: 20rpx;
+  width: 96rpx;
+  height: 96rpx;
+  border-radius: 50%;
+}
+
+.avatar-name{
+  display: flex;
+  flex-direction: column;
+  margin-left: 14rpx;
+}
+
+.nickName{
+  width: 200rpx;
+  height: 44rpx;
+  color: #000000;
+  font-size: 32rpx;
+}
+
+.time{
+  width: 200rpx;
+  height: 44rpx;
+  color: #686868;
+  font-size: 32rpx;
+}
+
+.avatar-follow{
+  margin-left: 270rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100rpx;
+}
+
+.avatar-img{
+  width: 46rpx;
+  height: 40rpx;
+}
+
+.avatar-images{
+  width: 100%;
+  height: 100%;
+}
+
+.follow-status{
+  margin-top: 8rpx;
+  color: #686868;
+  font-size: 20rpx;
+}