Merge branch 'master' of http://git.lcpcp.cc/root/lcoco

pages.json

@@ -1,435 +1,443 @@
 {
-  "tabBar": {
-    "backgroundColor": "#fff",
-    "selectedColor": "#000000",
-    "color": "#999999",
-    "borderStyle": "white",
-    "fontSize": "12px",
-    "iconWidth": "22px",
-    "height": "50px",
-    "list": [
-      {
-        "text": "icoco",
-        "pagePath": "pages/index/index",
-        "iconPath": "/static/img/tabBar/index-no.png",
-        "selectedIconPath": "/static/img/tabBar/index.png"
-      },
-      {
-        "text": "圈子",
-        "pagePath": "pages/circle/index",
-        "iconPath": "/static/img/tabBar/circle-no.png",
-        "selectedIconPath": "/static/img/tabBar/circle.png"
-      },
-      {
-        "text": "消息",
-        "pagePath": "pages/msg/index",
-        "iconPath": "/static/img/tabBar/msg-no.png",
-        "selectedIconPath": "/static/img/tabBar/msg.png"
-      },
-      //      {
-      //        "text": "排行榜",
-      //        "pagePath": "pages/ranking/index",
-      //        "iconPath": "/static/img/tabBar/ranking-no.png",
-      //        "selectedIconPath": "/static/img/tabBar/ranking.png"
-      //      },
-      {
-        "text": "我的",
-        "pagePath": "pages/my/index",
-        "iconPath": "/static/img/tabBar/my-no.png",
-        "selectedIconPath": "/static/img/tabBar/my.png"
-      }
-    ]
-  },
-  "pages": [
-    {
-      "path": "pages/login/index",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "登陆",
-        "enablePullDownRefresh": false,
-        "app-plus": {
-          "subNVues": [
-            {
-              "id": "loginContent",
-              "path": "pages/login/model/loginContent",
-              "style": {
-                "position": "absolute",
-                "top": "0",
-                "bottom": "0",
-                "left": "0",
-                "right": "0",
-                "background": "transparent"
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false,
-        "app-plus": {
-          "bounce": "none"
-        }
-      }
-    },
-    {
-      "path": "pages/text/index",
-      "style": {
-        "navigationBarTitleText": "列表演示"
-      }
-    },
-    {
-      "path": "pages/login/model/loginContent",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/localPhoneLogin",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/otherPhoneLogin",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/passLogin",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/forgetPass",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/perfect/sexAndAge",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/perfect/nickname",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/perfect/cards",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/text/tantan",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/circle/index",
-      "style": {
-        "navigationBarTitleText": "圈子",
-        "enablePullDownRefresh": false
-      }
-    },
-		{
-		  "path": "pages/circle/recommended",
-		  "style": {
-		    "navigationBarTitleText": "热聊话题",
-		    "enablePullDownRefresh": false
-		  }
-		},
-    {
-      "path": "pages/msg/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/ranking/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationBarTextStyle": "white",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/editInformation",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationBarTextStyle": "white",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/nickname",
-      "style": {
-        "navigationBarTitleText": "修改昵称",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/age",
-      "style": {
-        "navigationBarTitleText": "设置性别",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/school",
-      "style": {
-        "navigationBarTitleText": "设置学习",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/we-chat",
-      "style": {
-        "navigationBarTitleText": "设置微信",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/about-me",
-      "style": {
-        "navigationBarTitleText": "设置签名",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/edit/making-friends",
-      "style": {
-        "navigationBarTitleText": "交友目的",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set",
-      "style": {
-        "navigationBarTitleText": "设置",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/autonym",
-      "style": {
-        "navigationBarTitleText": "实名认证",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/change-pass",
-      "style": {
-        "navigationBarTitleText": "修改密码",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/chang-phone",
-      "style": {
-        "navigationBarTitleText": "修改手机号码",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/more-set",
-      "style": {
-        "navigationBarTitleText": "更多设置",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/push-set",
-      "style": {
-        "navigationBarTitleText": "推送通知管理",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/blacklist",
-      "style": {
-        "navigationBarTitleText": "黑名单",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/set/conversion",
-      "style": {
-        "navigationBarTitleText": "兑换码",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/agreement",
-      "style": {
-        "navigationBarTitleText": "用户协议",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/privacy",
-      "style": {
-        "navigationBarTitleText": "隐私政策",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/personage",
-      "style": {
-        "navigationBarTitleText": "隐私政策",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/all-permission",
-      "style": {
-        "navigationBarTitleText": "相关许可证",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/permission",
-      "style": {
-        "navigationBarTitleText": "可证",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my/agreement/about-us",
-      "style": {
-        "navigationBarTitleText": "关乎我们",
-        "navigationBarTextStyle": "black",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/circle/circle",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-		{
-		  "path": "pages/circle/interactiveCenter",
-		  "style": {
-		    "navigationBarTitleText": "互动中心",
-		    "enablePullDownRefresh": false
-		  }
-		},
-	{
-	  "path": "pages/wallet/wallet",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false,
-		"navigationBarTextStyle": "white"
-	  }
+	"tabBar": {
+		"backgroundColor": "#fff",
+		"selectedColor": "#000000",
+		"color": "#999999",
+		"borderStyle": "white",
+		"fontSize": "12px",
+		"iconWidth": "22px",
+		"height": "50px",
+		"list": [{
+				"text": "icoco",
+				"pagePath": "pages/index/index",
+				"iconPath": "/static/img/tabBar/index-no.png",
+				"selectedIconPath": "/static/img/tabBar/index.png"
+			},
+			{
+				"text": "圈子",
+				"pagePath": "pages/circle/index",
+				"iconPath": "/static/img/tabBar/circle-no.png",
+				"selectedIconPath": "/static/img/tabBar/circle.png"
+			},
+			{
+				"text": "消息",
+				"pagePath": "pages/msg/index",
+				"iconPath": "/static/img/tabBar/msg-no.png",
+				"selectedIconPath": "/static/img/tabBar/msg.png"
+			},
+			//      {
+			//        "text": "排行榜",
+			//        "pagePath": "pages/ranking/index",
+			//        "iconPath": "/static/img/tabBar/ranking-no.png",
+			//        "selectedIconPath": "/static/img/tabBar/ranking.png"
+			//      },
+			{
+				"text": "我的",
+				"pagePath": "pages/my/index",
+				"iconPath": "/static/img/tabBar/my-no.png",
+				"selectedIconPath": "/static/img/tabBar/my.png"
+			}
+		]
 	},
-	{
-	  "path": "pages/wallet/bill",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false
-	  }
-	},
-	{
-	  "path": "pages/wallet/gift-wall",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false,
-		"navigationBarTextStyle": "white"
-	  }
-	},
-	{
-	  "path": "pages/wallet/like-user",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false
-	  }
-	},
-	{
-	  "path": "pages/wallet/visitor",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false
-	  }
-	},
-	{
-	  "path": "pages/wallet/like-me",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false
-	  }
+	"pages": [{
+			"path": "pages/login/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "登陆",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"subNVues": [{
+						"id": "loginContent",
+						"path": "pages/login/model/loginContent",
+						"style": {
+							"position": "absolute",
+							"top": "0",
+							"bottom": "0",
+							"left": "0",
+							"right": "0",
+							"background": "transparent"
+						}
+					}]
+				}
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/text/index",
+			"style": {
+				"navigationBarTitleText": "列表演示"
+			}
+		},
+		{
+			"path": "pages/login/model/loginContent",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/localPhoneLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/otherPhoneLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/passLogin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/forgetPass",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/perfect/sexAndAge",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/perfect/nickname",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/perfect/cards",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/text/tantan",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/index",
+			"style": {
+				"navigationBarTitleText": "圈子",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/circle",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/interactiveCenter",
+			"style": {
+				"navigationBarTitleText": "互动中心",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/recommended",
+			"style": {
+				"navigationBarTitleText": "热聊话题",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/followTopic",
+			"style": {
+				"navigationBarTitleText": "关注的话题",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/circle/topic",
+			"style": {
+				"navigationBarTitleText": "关注的话题",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/msg/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ranking/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/editInformation",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/nickname",
+			"style": {
+				"navigationBarTitleText": "修改昵称",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/age",
+			"style": {
+				"navigationBarTitleText": "设置性别",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/school",
+			"style": {
+				"navigationBarTitleText": "设置学习",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/we-chat",
+			"style": {
+				"navigationBarTitleText": "设置微信",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/about-me",
+			"style": {
+				"navigationBarTitleText": "设置签名",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/edit/making-friends",
+			"style": {
+				"navigationBarTitleText": "交友目的",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set",
+			"style": {
+				"navigationBarTitleText": "设置",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/autonym",
+			"style": {
+				"navigationBarTitleText": "实名认证",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/change-pass",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/chang-phone",
+			"style": {
+				"navigationBarTitleText": "修改手机号码",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/more-set",
+			"style": {
+				"navigationBarTitleText": "更多设置",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/push-set",
+			"style": {
+				"navigationBarTitleText": "推送通知管理",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/blacklist",
+			"style": {
+				"navigationBarTitleText": "黑名单",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/set/conversion",
+			"style": {
+				"navigationBarTitleText": "兑换码",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/agreement",
+			"style": {
+				"navigationBarTitleText": "用户协议",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/privacy",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/personage",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/all-permission",
+			"style": {
+				"navigationBarTitleText": "相关许可证",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/permission",
+			"style": {
+				"navigationBarTitleText": "可证",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/my/agreement/about-us",
+			"style": {
+				"navigationBarTitleText": "关乎我们",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/wallet",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/wallet/bill",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/gift-wall",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/wallet/like-user",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/visitor",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/like-me",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/wave-point",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarTextStyle": "white"
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "custom"
 	},
-	{
-	  "path": "pages/wallet/wave-point",
-	  "style": {
-	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false,
-		"navigationBarTextStyle": "white"
-	  }
+	"condition": {
+		"current": 0,
+		"list": [{
+			"name": "列表调试",
+			"path": "/pages/perfect/cards",
+			"query": ""
+		}]
 	}
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom"
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "列表调试",
-        "path": "/pages/perfect/cards",
-        "query": ""
-      }
-    ]
-  }
 }

pages/circle/followTopic.vue

@@ -0,0 +1,128 @@
+<template>
+	<view class="follow-topic flex-common-css">
+		<Nav :titleColor="'#000'" :title="'关注的话题'"></Nav>
+		<scroll-view :scroll-y="true" class="list-scroll" @scroll="scroll" @scrolltolower="scrolltolower">
+			<view class="topic-list-box" v-for="(item,index) in dataList" :key="index">
+				<view class="topic-list-left">
+					<image class="topic-list-left-img sys-radius-12" :src="item.img" mode=""></image>
+					<view class="topic-list-left-text">
+						<view class="topic-list-left-name sys-size-32 sys-color-black">
+							# {{item.name}}
+						</view>
+						<view class="topic-list-left-info sys-size-24 sys-color-gray-9">
+							{{item.num}}条动态
+						</view>
+					</view>
+				</view>
+				<view class="topic-list-right sys-background-F2F2F2 sys-radius-round" @click="goToTopic(item.id)">
+					<uni-icons type="right" size="15" color="#999999"></uni-icons>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				dataList: [{
+					'img': '/static/img/login/2.jpg',
+					'name': '嘿，我在我在我在我在我...',
+					'num': '1.5w',
+					'time': '04-13 06:03:56',
+					'id': '1',
+					'likeStyle': '1',
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': 'wwwwww',
+					'text': '今天手机好像撞邪了，拦都拦不住硬要给你打招呼~',
+					'imgTwo': '/static/img/temporary/1.png',
+					'time': '04-13 06:03:56',
+					'likeStyle': '1',
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': 'wwwwww',
+					'text': '今天手机好像撞邪了，拦都拦不住硬要给你打招呼~',
+					'imgTwo': '/static/img/temporary/1.png',
+					'time': '04-13 06:03:56',
+					'likeStyle': '2',
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': 'wwwwww',
+					'text': '今天手机好像撞邪了，拦都拦不住硬要给你打招呼~',
+					'imgTwo': '/static/img/temporary/1.png',
+					'time': '04-13 06:03:56',
+					'likeStyle': '2',
+				}],
+			};
+		},
+		mounted() {},
+		methods: {
+			scroll() {},
+			scrolltolower() {},
+			goToTopic(id) {
+				console.log(id);
+				uni.navigateTo({
+					url: '/pages/circle/topic'
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.follow-topic {
+		.list-scroll {
+			width: 100%;
+			flex: 1;
+			overflow: auto;
+			padding: 32rpx 40rpx 0 32rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+
+			.topic-list-box {
+				width: 100%;
+				height: auto;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin: 0 0 40rpx 0;
+
+				.topic-list-left {
+					display: flex;
+					align-items: center;
+
+					.topic-list-left-img {
+						width: 112rpx;
+						height: 112rpx;
+						margin: 0 20rpx 0 0;
+					}
+
+					.topic-list-left-text {
+						.topic-list-left-name {
+							margin: 0 0 8rpx 0;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							overflow: hidden;
+							word-break: break-all;
+						}
+
+						.topic-list-left-info {}
+					}
+				}
+
+				.topic-list-right {
+					width: 52rpx;
+					height: 52rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					line-height: 52rpx;
+				}
+			}
+		}
+	}
+</style>

pages/circle/topic.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="topic flex-common-css">
+		<Nav class="nav-class" :bgckgroundBox="!isScroll?'transparent':'#fff'" :titleColor="isScroll?'#000':'#fff'">
+		</Nav>
+		<scroll-view :scroll-y="true" class="list-scroll" @scroll="scroll" @scrolltolower="scrolltolower">
+			<view class="head-bg-img">
+				<image class="bg-img" src="@/static/img/circle/1.png" mode=""></image>
+				<view class="placeholder-box">
+					<view class="placeholder"></view>
+				</view>
+			</view>
+			<view class="content-box">
+				<view class="title-box">
+					<view class="title-box-left">
+						<view
+							class="icon sys-height-40 sys-radius-round sys-background-black sys-color-white sys-weight-600">
+							#
+						</view>
+						<view class="title-name sys-weight-600">
+							我最爱的OOTD
+						</view>
+					</view>
+					<view
+						class="title-box-right sys-background-black sys-radius-12 sys-color-white sys-size-28 sys-height-56">
+						关注
+					</view>
+				</view>
+				<view class="list-type">
+					<view class="list-type-l">
+						<view class="type sys-size-28 sys-weight-600" @click="selectType(1)"
+							:class="typeNum == 1?'sys-color-black type-border':'sys-color-gray-9'">
+							最新
+						</view>
+						<view class="type sys-size-28 sys-weight-600" @click="selectType(2)"
+							:class="typeNum == 2?'sys-color-black type-border':'sys-color-gray-9'">
+							最热
+						</view>
+					</view>
+					<view class="list-type-r sys-size-24 sys-color-gray-9">
+						1573条动态
+					</view>
+				</view>
+				<MyPraise class="my-praise" :tagNum="1"></MyPraise>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import MyPraise from "@/pages/my/model/my-praise";
+	export default {
+		components: {
+			MyPraise,
+		},
+		data() {
+			return {
+				isScroll: false,
+				typeNum: 1,
+			};
+		},
+		mounted() {},
+		methods: {
+			scroll(e) {
+				if (e.detail.scrollTop > 50) {
+					this.isScroll = true
+				} else {
+					this.isScroll = false
+				}
+			},
+			scrolltolower() {
+				console.log('触底');
+			},
+			selectType(num) {
+				this.typeNum = num
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.topic {
+		.nav-class {
+			position: absolute;
+			left: 0;
+			top: 0;
+		}
+
+		.list-scroll {
+			width: 100%;
+			flex: 1;
+			overflow: auto;
+
+			.head-bg-img {
+				width: 100%;
+				height: 352rpx;
+				position: relative;
+
+				.bg-img {
+					width: 100%;
+					height: 100%;
+				}
+
+				.placeholder-box {
+					width: 100%;
+					height: 48rpx;
+					// background: #333;
+					position: absolute;
+					bottom: 0;
+
+					.placeholder {
+						width: 100%;
+						height: 100%;
+						border-radius: 32rpx 32rpx 0 0;
+						background: #fff;
+					}
+				}
+			}
+
+			.content-box {
+				width: 100%;
+				height: auto;
+				display: flex;
+				flex-direction: column;
+
+				.title-box {
+					width: 100%;
+					height: auto;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 0 32rpx;
+					box-sizing: border-box;
+					margin: 0 0 50rpx 0;
+
+					.title-box-left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							width: 40rpx;
+							margin: 0 8rpx 0 0;
+							text-align: center;
+						}
+
+						.title-name {}
+					}
+
+					.title-box-right {
+						padding: 0 32rpx;
+					}
+				}
+
+				.list-type {
+					display: flex;
+					// align-items: center;
+					justify-content: space-between;
+					padding: 0 32rpx;
+					border-bottom: 1rpx solid #F2F2F2;
+
+					.list-type-l {
+						display: flex;
+						align-items: center;
+
+						.type {
+							padding: 0 0 26rpx 0;
+							margin: 0 60rpx 0 0;
+						}
+
+						.type-border {
+							border-bottom: 4rpx solid #000000;
+						}
+					}
+
+					.list-type-r {}
+				}
+			}
+		}
+	}
+</style>

pages/circle/topicPlaza.vue

@@ -0,0 +1,59 @@
+<template>
+	<view class="topic-plaza flex-common-css">
+		<Nav class="nav-class" :bgckgroundBox="!isScroll?'#141414':'#fff'" :titleColor="isScroll?'#000':'#fff'">
+		</Nav>
+		<scroll-view :scroll-y="true" class="list-scroll" @scroll="scroll" @scrolltolower="scrolltolower">
+			<view class="swiper-box">
+				<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="current"
+					:mode="mode" :dots-styles="dotsStyles" field="content">
+					<swiper class="swiper-box">
+						<swiper-item v-for="(item, index) in 3" :key="index">
+							<view class="swiper-item" :class="'swiper-item'">
+								<!-- <text style="color: #fff; font-size: 32px;">{{index+1}}</text> -->
+							</view>
+						</swiper-item>
+					</swiper>
+				</uni-swiper-dot>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				isScroll: false,
+			};
+		},
+		mounted() {},
+		methods: {
+			scroll(e) {
+				if (e.detail.scrollTop > 50) {
+					this.isScroll = true
+				} else {
+					this.isScroll = false
+				}
+			},
+			scrolltolower() {
+				console.log('触底');
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.topic-plaza {
+		.list-scroll {
+			width: 100%;
+			flex: 1;
+			overflow: auto;
+
+			.swiper-box {
+				width: 100%;
+				height: 436rpx;
+			}
+		}
+	}
+</style>

static/css/sys.css

@@ -223,6 +223,10 @@ overflow: hidden;
 .sys-webkit-box-3{
   -webkit-line-clamp: 3;
 }
+.sys-height-40{
+  height: 40rpx;
+  line-height: 40rpx;
+}
 .sys-height-44{
   height: 44rpx;
   line-height: 44rpx;