Browse Source

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/2.2.8
海洋之声 6 years ago
parent
commit
7fac757547
3 changed files with 16 additions and 8 deletions
  1. +2
    -5
      pages/coupon/detail/index.js
  2. +1
    -1
      pages/coupon/detail/index.wxml
  3. +13
    -2
      project.config.json

+ 2
- 5
pages/coupon/detail/index.js View File

@@ -61,14 +61,13 @@ Page({
display:"none"
})
},

/**
* gotopay
*/
gotopay:function(){
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({
display: "none",
})
@@ -101,8 +100,6 @@ Page({
})
}
},


countdown(end_time) {
let that = this;


+ 1
- 1
pages/coupon/detail/index.wxml View File

@@ -90,4 +90,4 @@
</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" />

+ 13
- 2
project.config.json View File

@@ -24,13 +24,24 @@
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
"current": 0,
"list": [
{
"id": 0,
"name": "fhrufhr",
"pathName": "pages/index/index",
"query": "scene=\"1111\""
}
]
}
}
}

Loading…
Cancel
Save