diff --git a/pages.json b/pages.json
index 882d1e6..b76c371 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,8 @@
"mine-index": "view",
"notice-index": "view",
"subscribe": "view",
- "my-notice": "view"
+ "my-notice": "view",
+ "my-notice-tg": "view"
}
}
}, {
@@ -55,6 +56,18 @@
"navigationBarTitleText": "报名",
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "report-list",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "card-item",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
]
}, {
@@ -81,11 +94,23 @@
"navigationBarTitleText": "我的通告"
}
},
+ {
+ "path": "my-notice-tg",
+ "style": {
+ "navigationBarTitleText": "我的通告"
+ }
+ },
{
"path": "my-notice-item",
"style": {
"navigationBarTitleText": "我的通告组件"
}
+ },
+ {
+ "path": "my-notice-item-tg",
+ "style": {
+ "navigationBarTitleText": "我的通告组件"
+ }
}
]
}, {
diff --git a/pages/components/my-notice-item-tg.vue b/pages/components/my-notice-item-tg.vue
new file mode 100644
index 0000000..8f1f572
--- /dev/null
+++ b/pages/components/my-notice-item-tg.vue
@@ -0,0 +1,170 @@
+
+
+ 报名中
+
+
+
+
+
+
+
+ 关闭
+
+ 重启
+ 查看详情
+ 发类似
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/components/my-notice-tg.vue b/pages/components/my-notice-tg.vue
new file mode 100644
index 0000000..56398cd
--- /dev/null
+++ b/pages/components/my-notice-tg.vue
@@ -0,0 +1,158 @@
+
+
+
+
+ 我的通告
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 24157ab..aa5ec65 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,11 +3,11 @@
-
-
-
-
+
+
+
+
+
@@ -25,6 +25,7 @@
import subscribe from '@/pages/components/subscribe.vue'
import mineIndex from '@/pages/mine/mine-index.vue'
import myNotice from '@/pages/components/my-notice.vue'
+ import myNoticeTg from '@/pages/components/my-notice-tg.vue'
import {
getSiteConfig
} from '@/api/system/config.js'
@@ -38,7 +39,8 @@
noticeIndex,
subscribe,
mineIndex,
- myNotice
+ myNotice,
+ myNoticeTg
},
data() {
return {
@@ -57,6 +59,19 @@
menuCode: "home",
}
},
+ watch: {
+ nowUserType(newVal, oldVal) {
+ console.log(newVal, "newVal")
+ console.log(oldVal, "oldVal")
+ this.nowUserType = newVal;
+ },
+ },
+ mounted() {
+ this.nowUserType = getUserType()
+ },
+ onShow() {
+ this.nowUserType = getUserType()
+ },
onLoad: function() {
this.nowUserType = getUserType()
this.selectSiteConfig("platform_tel")
@@ -74,6 +89,7 @@
* @param {Object} code
*/
changeMenu(code) {
+ this.nowUserType = getUserType()
this.menuCode = code
},
/**
diff --git a/pages/mine/card/my-card.vue b/pages/mine/card/my-card.vue
index 0bf148a..22de4db 100644
--- a/pages/mine/card/my-card.vue
+++ b/pages/mine/card/my-card.vue
@@ -42,9 +42,6 @@
粉丝:{{ formatNumberWithUnits(item.fansNum) }}
-
-
-
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 69d4b94..22cda66 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -215,12 +215,8 @@
popupImgUrl: "",
}
},
- onShow() {
-
- },
- onLoad() {
-
- },
+ onShow() {},
+ onLoad() {},
mounted() {
if (null != getJSONData(constant.userInfo)) {
this.userInfo = getJSONData(constant.userInfo)
@@ -256,7 +252,6 @@
changeUserType(type) {
changeUserType(type)
this.localUserType = type
- this.$emit('update:nowUserType', this.localUserType)
this.getDetail()
this.$forceUpdate()
},
diff --git a/pages/notice/card-item.vue b/pages/notice/card-item.vue
new file mode 100644
index 0000000..c9e84a1
--- /dev/null
+++ b/pages/notice/card-item.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.platformName}}博主
+
+
+ 待定
+ 合适
+
+
+
+
+
+ {{ item.accountName }}
+
+
+
+ 粉丝:{{ formatNumberWithUnits(item.fansNum) }}
+
+
+
+
+
+ 主页
+
+ {{item.ifChecked?"待定":"合适"}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 8c860b9..1d8f853 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -1,8 +1,23 @@
-
+
+
+ 已报名:{{imageArray.length||0}}人
+
+
+
+
+
+
+
+ 查看报名
+
-
+
已报名:{{imageArray.length||0}}人
@@ -206,6 +221,8 @@
},
data() {
return {
+ //是否是看自己的通告-通告主
+ viewMy: false,
//通告ID
noticeId: null,
imageUrl: config.baseUrl,
@@ -273,6 +290,9 @@
// this.$refs.alertDialog.open()
},
onLoad(params) {
+ if (params.viewMy) {
+ this.viewMy = true
+ }
this.noticeId = params.id
if (null != getJSONData(constant.userInfo)) {
this.userInfo = getJSONData(constant.userInfo)
@@ -354,6 +374,12 @@
});
})
},
+ /**
+ * 去报名列表
+ */
+ goReportList() {
+ this.$tab.navigateTo('/pages/notice/report-list')
+ },
/**
* 查通告详情
*/
@@ -785,6 +811,16 @@
}
}
}
+
+ .view-report-button {
+ text-align: center;
+ margin: auto;
+ border-radius: 40rpx;
+ width: 75%;
+ background-color: #FC1F3E;
+ color: white;
+ padding: 15rpx 0;
+ }
}
.dl-bottom-box {
diff --git a/pages/notice/report-list.vue b/pages/notice/report-list.vue
new file mode 100644
index 0000000..bdbae91
--- /dev/null
+++ b/pages/notice/report-list.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file