|
|
@@ -231,13 +231,21 @@
|
|
|
*/
|
|
|
async initParams(options) {
|
|
|
const activeId = options.activeId
|
|
|
+ // if (this.$isNotEmpty(activeId)) {
|
|
|
+ // //活动列表传进来
|
|
|
+ // this.activeId = activeId
|
|
|
+ // } else if (this.$isNotEmpty(this.vuex_active_setting) &&
|
|
|
+ // this.$isNotEmpty(this.vuex_active_setting.defaultActiveId)) {
|
|
|
+ // //缓存中有活动id
|
|
|
+ // this.activeId = this.vuex_active_setting.defaultActiveId
|
|
|
+ // } else {
|
|
|
+ // //获取默认的活动id
|
|
|
+ // this.activeId = await this.getDefaultActiveId()
|
|
|
+ // }
|
|
|
+
|
|
|
if (this.$isNotEmpty(activeId)) {
|
|
|
//活动列表传进来
|
|
|
this.activeId = activeId
|
|
|
- } else if (this.$isNotEmpty(this.vuex_active_setting) &&
|
|
|
- this.$isNotEmpty(this.vuex_active_setting.defaultActiveId)) {
|
|
|
- //缓存中有活动id
|
|
|
- this.activeId = this.vuex_active_setting.defaultActiveId
|
|
|
} else {
|
|
|
//获取默认的活动id
|
|
|
this.activeId = await this.getDefaultActiveId()
|