@@ -61,14 +61,13 @@ Page({ | |||||
display:"none" | display:"none" | ||||
}) | }) | ||||
}, | }, | ||||
/** | /** | ||||
* gotopay | * gotopay | ||||
*/ | */ | ||||
gotopay:function(){ | gotopay:function(){ | ||||
let that = this; | let that = this; | ||||
console.log(that.data.questions1) | |||||
if (that.data.questions1 == 'questions1' || that.data.questions2 == 'questions2'){ | |||||
console.log(that.data.questions1); | |||||
if (that.data.questions1 || that.data.questions2){ | |||||
that.setData({ | that.setData({ | ||||
display: "none", | display: "none", | ||||
}) | }) | ||||
@@ -101,8 +100,6 @@ Page({ | |||||
}) | }) | ||||
} | } | ||||
}, | }, | ||||
countdown(end_time) { | countdown(end_time) { | ||||
let that = this; | let that = this; | ||||
@@ -90,4 +90,4 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 问卷调查 --> | <!-- 问卷调查 --> | ||||
<questionnaire wx:if="{{display=='block'}}" questionnaire="{{questionnaire}}" questionId="{{questionId}}" bind:myevent="close" bind:myevent1="formSubmit" /> | |||||
<questionnaire wx:if="{{display=='block'}}" questionnaire="{{questionnaire}}" questionId="{{questionId}}" bind:myevent="close" bind:myevent="formSubmit" /> |
@@ -24,13 +24,24 @@ | |||||
"current": -1, | "current": -1, | ||||
"list": [] | "list": [] | ||||
}, | }, | ||||
"plugin": { | |||||
"current": -1, | |||||
"list": [] | |||||
}, | |||||
"game": { | "game": { | ||||
"currentL": -1, | "currentL": -1, | ||||
"list": [] | "list": [] | ||||
}, | }, | ||||
"miniprogram": { | "miniprogram": { | ||||
"current": -1, | |||||
"list": [] | |||||
"current": 0, | |||||
"list": [ | |||||
{ | |||||
"id": 0, | |||||
"name": "fhrufhr", | |||||
"pathName": "pages/index/index", | |||||
"query": "scene=\"1111\"" | |||||
} | |||||
] | |||||
} | } | ||||
} | } | ||||
} | } |