-
-
-
-
![]()
-
+
+
+
![]()
+
{{ item.actStatusVal }}
-
[{{ '活动' }}] {{ item.actName }}
+
[{{ "活动" }}] {{ item.actName }}
- {{ '活动时间' }}:{{ item.actStartDate }}-{{ item.actEndDate }}
+ {{ "活动时间" }}:{{ item.actStartDate }}-{{ item.actEndDate }}
-
{{ '领取礼包' }}
-
{{ '抽奖' }}
-
{{ '种植' }}
+
{{ "领取礼包" }}
+
{{ "抽奖" }}
+
{{ "种植" }}
-
+
积分:{{ item.point }}
@@ -54,93 +63,84 @@
-
+
-
+
-
{{ '种植' }}
+
{{ "种植" }}
-
{{ '数量' }}:
-
+
{{ "数量" }}:
+
-
{{ '公益金' }}:
+
{{ "公益金" }}:
¥{{ treeObj.amount | numberToCurrency }}
-
-
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/index/components/in-site-message.vue b/src/views/index/components/in-site-message.vue
new file mode 100644
index 0000000..7b5fbf5
--- /dev/null
+++ b/src/views/index/components/in-site-message.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/index/components/sidebarRight.vue b/src/views/index/components/sidebarRight.vue
index 4ea8ef3..b703611 100644
--- a/src/views/index/components/sidebarRight.vue
+++ b/src/views/index/components/sidebarRight.vue
@@ -24,6 +24,7 @@
+
@@ -31,9 +32,12 @@
import * as sid from "@/api/sidebaruserinfo.js";
import { mapGetters } from "vuex";
import "swiper/dist/css/swiper.css";
+import InSiteMessage from "./in-site-message.vue";
export default {
name: "sidebarUserInfo",
- components: {},
+ components: {
+ InSiteMessage,
+ },
computed: {
...mapGetters(["userInfo"]),
},
@@ -110,15 +114,7 @@ export default {
display: block !important;
height: 300px !important;
}
-.title2 {
- height: 17px;
- font-size: 16px;
- font-family: PingFang SC-Regular, PingFang SC;
- font-weight: 400;
- color: #3499ff;
- cursor: pointer;
- text-align: center;
-}
+
.swiper-pagination {
top: 200px;
}
diff --git a/src/views/index/components/sidebarUserInfo.vue b/src/views/index/components/sidebarUserInfo.vue
index 18d6b67..64b2222 100644
--- a/src/views/index/components/sidebarUserInfo.vue
+++ b/src/views/index/components/sidebarUserInfo.vue
@@ -119,42 +119,6 @@
{{ userSec }}
秒
-
-
-
@@ -162,7 +126,6 @@
import * as sid from "@/api/sidebaruserinfo.js";
import { mapGetters } from "vuex";
import user from "@/store/modules/user";
-import { repurchase } from "@/api";
export default {
name: "sidebarUserInfo",
computed: {
@@ -170,19 +133,6 @@ export default {
return user;
},
...mapGetters(["userInfo"]),
-
- optionSingleHeightTime() {
- return {
- step: 0.6, // 数值越大速度滚动越快
- limitMoveNum: this.listData.length, // 开始无缝滚动的数据量 this.dataList.length
- hoverStop: true, // 是否开启鼠标悬停stop
- direction: 1, // 0向下 1向上 2向左 3向右
- openWatch: true, // 开启数据实时监控刷新dom
- singleHeight: 14, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
- singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
- waitTime: 1000, // 单步运动停止的时间(默认值1000ms)
- };
- },
},
data() {
return {
@@ -190,29 +140,14 @@ export default {
userDay: 0,
userHr: 0,
awards: {},
- queryParams: {
- pageNum: 1,
- pageSize: 5,
- },
userMin: 0,
userSec: 0,
_interval: "",
toLiveBtn: "",
isHandImg: true,
- listData: [], //站内信列表
- feedbackTypeList: [], //意见反馈类型列表
- feedbackForm: {
- type: "",
- idea: "",
- },
- ksList: [],
- userPrice: 0,
- awardPrice: 0,
- awardsList: [],
};
},
created() {
- this.getData();
this.countdown();
this.getUserAwards();
},
@@ -229,11 +164,6 @@ export default {
},
});
},
- getUserKs() {
- repurchase({ wallType: this.remIndex1 }).then((res) => {
- this.ksList = res.rows;
- });
- },
defaultSrc() {
this.isHandImg = false;
@@ -273,52 +203,6 @@ export default {
that.userSec = sec;
}, 1000);
},
- //跳转详情页
- goMore(index) {
- //1公告 2站内信
- this.$router.push({
- path: "/noticeLists",
- query: { index: index },
- });
- },
- //提交意见反馈
- submitFeed(formName) {
- if (this.feedbackForm.type == "" || this.feedbackForm.type == undefined) {
- this.$message({
- message: "请选择反馈类型",
- type: "error",
- });
- return;
- }
- if (this.feedbackForm.idea == "" || this.feedbackForm.idea == undefined) {
- this.$message({
- message: "请输入反馈内容",
- type: "error",
- });
- return;
- }
- this.$refs[formName].validate((valid) => {
- if (valid) {
- this.$confirm("是否确认提交意见反馈" + "?", "", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }).then((_) => {
- sid.saveFeedBack(this.feedbackForm).then((res) => {
- if (res.code == 200) {
- this.$message({
- message: "提交成功",
- type: "success",
- });
- this.$refs.feedbackForm.clearValidate();
- this.getFeedBackList();
- this.feedbackForm = { type: "", idea: "" };
- }
- });
- });
- }
- });
- },
//获取用户真实奖衔
getUserAwards() {
@@ -326,18 +210,6 @@ export default {
this.awards = res.data;
});
},
- getData() {
- //functionType 公告1 站内信2
- sid.getNoticeList({ functionType: 2 }).then((res) => {
- this.listData = res.rows;
- });
- sid.getFeedbackType().then((res) => {
- this.feedbackTypeList = res.data;
- });
- sid.memberAwards().then((res) => {
- this.awardsList = res.data;
- });
- },
goRouter(index) {
//1等级2奖衔
this.$router.push({
@@ -367,32 +239,7 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
}
-.styleColors0 {
- color: #f64e49;
- font-size: 14px;
-}
-.styleColors1 {
- color: #85b9fe;
- font-size: 14px;
-}
-.styleColors2 {
- color: #6be8b0;
- font-size: 14px;
-}
-.title-con {
- color: #333;
- font-size: 24px;
- font-weight: 600;
- text-align: center;
- margin: 5px 0 15px 0;
-}
-
-.more {
- color: #41b2ff;
- font-size: 16px;
- cursor: pointer;
-}
::v-deep .el-input--suffix .el-input__inner {
background: #fff !important;
}
@@ -494,33 +341,7 @@ export default {
line-height: 40px;
}
}
- .celebrity {
- text-align: center;
- .celebrity-content {
- display: flex;
- height: 180px;
- flex-wrap: wrap;
- margin-left: -40px;
- // height: 135px;
- //padding: 0 30px 0 0;
- justify-content: center;
- //align-items: center;
- .celebrity-list {
- margin-bottom: 20px;
- img {
- width: 66px;
- height: 66px;
- margin-left: 40px;
- }
- }
- }
- .title {
- color: #333;
- font-size: 24px;
- font-weight: 600;
- margin: 30px 0 15px 0;
- }
- }
+
.awardscard {
width: 346px;
margin: 0 auto;
@@ -547,41 +368,6 @@ export default {
}
}
.user-cards-left {
- .rank {
- font-size: 14px;
- color: #fff;
- margin: 5px 10px;
- display: flex;
- justify-content: space-between;
- }
- .lines {
- height: 1px;
- background: #ffffff;
- margin-top: 10px;
- }
- .experience {
- font-size: 8px;
- margin: 15px 0 0 0px;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 0 0px;
- flex-wrap: wrap;
- color: #fff;
- span {
- font-size: 12px;
- }
- .ju_text1 {
- font-weight: 400;
- }
-
- .ju_text2 {
- color: #fb3024;
- font-weight: bold;
- font-size: 12px;
- padding: 0 3px;
- }
- }
.schedule {
// width: 149px;
flex: 1;
@@ -640,36 +426,6 @@ export default {
}
}
}
- .znBox {
- margin-top: 20px;
- border-top: 5px solid rgba(0, 0, 0, 0.05);
- // border-bottom: 5px solid rgba(0, 0, 0, 0.05);
- padding: 20px;
- text-align: center;
- .zntitle {
- font-size: 24px;
- font-family: PingFang SC-Medium, PingFang SC;
- font-weight: 500;
- color: #333333;
- }
- .znCenter {
- .znContent {
- height: 220px;
- overflow: hidden;
- }
- }
- }
-}
-
-.yt1 {
- font-weight: 600;
- font-size: 18px;
- margin-left: 10px;
-}
-.hisImg {
- width: 40px;
- height: 40px;
- margin-left: 10px;
}
.honor_wrapper {
@@ -691,17 +447,4 @@ export default {
}
}
}
-
-::v-deep .ideaselect .el-input__inner {
- width: 260px;
- border-radius: 6px 6px 6px 6px;
- //background: rgba(0, 0, 0, 0.05) !important;
-}
-
-::v-deep .ideainput .el-textarea__inner {
- width: 260px;
- height: 160px;
- border-radius: 10px 10px 10px 10px;
- //background: rgba(0, 0, 0, 0.05) !important;
-}
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index af2dc8f..37bdf58 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -189,69 +189,6 @@