diff --git a/src/main.js b/src/main.js
index 1aa5434..f580196 100755
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,7 @@ import router from './router'
import store from './store'
import ElementUI, { Message, Pagination } from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
-import { skipUrl, pageStop, pageMove, goTologin, copy } from "@/utils/common.js"
+import { skipUrl, pageStop, pageMove, goTologin, copy, startupUnderLoading, closeUnderLoading } from "@/utils/common.js"
import http from "@/utils/request"
Vue.config.productionTip = false
@@ -21,6 +21,8 @@ Vue.prototype.$pageStop = pageStop // 页面禁止滑动
Vue.prototype.$pageMove = pageMove // 页面可以滑动
Vue.prototype.$Message = Message // 消息提示框
Vue.prototype.$copy = copy // 复制
+Vue.prototype.$startupUnderLoading = startupUnderLoading // 复制
+Vue.prototype.$closeUnderLoading = closeUnderLoading // 复制
//svg文件引入
import './icons'
diff --git a/src/utils/common.js b/src/utils/common.js
index d41c461..b670580 100755
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -43,8 +43,24 @@ function copy(value, message) {
copyInput.remove();
if (message) this.$message.success(message);
-
-
+
+
}
-export { skipUrl, pageStop, pageMove, goTologin, copy }
\ No newline at end of file
+
+// 启动加载中
+function startupUnderLoading(that) {
+ that.loading = that.$loading({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+}
+
+// 关闭加载中
+function closeUnderLoading(that) {
+ that.loading.close();
+}
+
+
+export { skipUrl, pageStop, pageMove, goTologin, copy, startupUnderLoading, closeUnderLoading }
\ No newline at end of file
diff --git a/src/views/search/searchResult/SearchResult.vue b/src/views/search/searchResult/SearchResult.vue
index 162f900..7733e26 100755
--- a/src/views/search/searchResult/SearchResult.vue
+++ b/src/views/search/searchResult/SearchResult.vue
@@ -15,17 +15,15 @@
<!-- 结果数量 -->
<div class="numberResults flexacenter">大约找到 <div class="number">{{ count }}</div> 条结果</div>
- <div class="result-box flexacenter" v-if="false">
+ <div class="result-box flexacenter" v-if="list.length != 0 || loading">
<div class="result-item flexflex" v-for="(item, index) in list" :key="index">
<div class="result-header one-line">
<div class="result-label">{{ item.forum }}</div>
- <div class="result-title">诚招室友一起合租香港大学附近房子 女生</div>
- </div>
-
- <div class="result-content two-lines">
- {{ item.message }}
+ <!-- <div class="result-title">{{ item.subject }}</div> -->
+ <div class="result-title" v-html="item.subject"></div>
</div>
+ <div class="result-content two-lines" v-html="item.message"></div>
<div class="result-info flexacenter flex1">
<div class="user-info flexacenter">
@@ -54,7 +52,7 @@
</div>
</div>
- <div class="result-empty-box flexcenter shadow">
+ <div class="result-empty-box flexcenter shadow" v-else>
<img class="result-empty-icon" src="@/assets/img/icon/empty.png">
</div>
@@ -93,8 +91,8 @@ export default {
watch: {
searchResultState(val, oldval) {
- if (val) this.startupUnderLoading()
- else this.closeUnderLoading()
+ if (val) this.$startupUnderLoading(this)
+ else this.$closeUnderLoading(this)
}
},
@@ -129,23 +127,9 @@ export default {
// 点击改变页数
currentChange() {
- console.log("dfgdf", this.page);
this.getSearchResult()
},
- // 启动加载中
- startupUnderLoading() {
- this.loading = this.$loading({
- lock: true,
- text: '加载中...',
- background: 'rgba(0, 0, 0, 0.7)'
- });
- },
-
- // 关闭加载中
- closeUnderLoading() {
- this.loading.close();
- },
// 点击清空 input 的值
diff --git a/src/views/user/UserIndex.vue b/src/views/user/UserIndex.vue
index 8684d87..fc9e9ad 100755
--- a/src/views/user/UserIndex.vue
+++ b/src/views/user/UserIndex.vue
@@ -2,24 +2,24 @@
<div class="container">
<div class="header flexcenter flexcolumn">
<div class="portrait flexcenter shadow">
- <img class="portrait-icom" :src="info.avatar" />
+ <img class="portrait-icom" :src="user.avatar" />
</div>
- <div class="header-username flexacenter">{{ info.nickname }}</div>
+ <div class="header-username flexacenter">{{ user.nickname }}</div>
</div>
<!-- 数据展示板 -->
<div class="operation-box shadow data-presentation flexflex">
<div class="data-presentation-item flex1 flexcenter">
- <div class="data-presentation-number">279</div>
+ <div class="data-presentation-number">{{ count.prestige }}</div>
<div class="data-presentation-name">声望</div>
</div>
<div class="data-presentation-item flex1 flexcenter">
- <div class="data-presentation-number">279</div>
- <div class="data-presentation-name">声望</div>
+ <div class="data-presentation-number">{{ count.gtercurrency }}</div>
+ <div class="data-presentation-name">寄托币</div>
</div>
<div class="data-presentation-item flex1 flexcenter">
- <div class="data-presentation-number">279</div>
- <div class="data-presentation-name">声望</div>
+ <div class="data-presentation-number">{{ count.digest }}</div>
+ <div class="data-presentation-name">精华</div>
</div>
</div>
@@ -29,8 +29,8 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/information.png">消息
</div>
<div class="operation-right flexacenter">
- <div v-if="false" class="operation-data flexcenter">{{ count.collect }}</div>
- <div v-else class="unread-info flexcenter">{{ 1 }}</div>
+ <div v-if="user.messagenum == 0" class="operation-data flexcenter">{{ count.message }}</div>
+ <div v-else class="unread-info flexcenter">{{ user.messagenum }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -40,7 +40,7 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/collect.png">收藏
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.creation }}</div>
+ <div class="operation-data flexcenter">{{ count.fav }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -49,7 +49,7 @@
<img class="operation-icom" src="@/assets/img/user/postmessage.png" />发帖
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.likearticle }}</div>
+ <div class="operation-data flexcenter">{{ count.post }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -58,7 +58,7 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/replymessage.png" />回帖
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
+ <div class="operation-data flexcenter">{{ count.reply }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -70,7 +70,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/personaldata.png">个人资料
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.creation }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -79,7 +78,6 @@
<img class="operation-icom" src="@/assets/img/user/avatarsetting.png" />设置头像
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.likearticle }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -88,7 +86,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/mystatus.png" />我的状态
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -97,7 +94,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/changepassword.png" />修改密码
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -106,7 +102,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/bindemail.png" />绑定邮箱
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -115,7 +110,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/bindmobile.png" />绑定手机
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -124,7 +118,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/bindingthird-party .png" />绑定第三方账号
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -133,7 +126,6 @@
<img class="operation-icom" mode="widthFix" src="@/assets/img/user/visithomepage.png" />浏览个人主页
</div>
<div class="operation-right flexacenter">
- <div class="operation-data flexcenter">{{ count.comment }}</div>
<svg-icon icon-class="arrowsLeft" class-name="operation-right-icom"></svg-icon>
</div>
</div>
@@ -152,26 +144,31 @@ export default {
data() {
return {
- info: {
- avatar: "https://oss.gter.net/avatar/97KwEWANd_4DHWiY6VbnSUFSCKroYWFjYQ~~/middle",
- nickname: "Ada.Wu"
- },
- count: {
- collect: 10,
- creation: 10,
- likearticle: 10,
- comment: 10,
+ user: {
+ avatar: "",
+ nickname: "",
+ messagenum: 0
},
+ count: {},
};
},
mounted() {
-
+ this.init()
},
methods: {
+ init() {
+ this.$http.post("/api/user", "").then(res => {
+ console.log(res, "res");
+ let data = res.data
+ this.count = data.count
+ this.user = data.user
+ console.log(this.count);
+ })
+ },
},
};
</script>
diff --git a/src/views/user/user.vue b/src/views/user/user.vue
index 897aa50..b90ca67 100755
--- a/src/views/user/user.vue
+++ b/src/views/user/user.vue
@@ -14,12 +14,10 @@ export default {
data() {
return {
-
};
},
mounted() {
-
},
methods: {