diff --git a/assets/img/closed.png b/assets/img/closed.png
new file mode 100644
index 0000000..edbb13e
Binary files /dev/null and b/assets/img/closed.png differ
diff --git a/assets/img/headbg.png b/assets/img/headbg.png
new file mode 100644
index 0000000..a07ef0a
Binary files /dev/null and b/assets/img/headbg.png differ
diff --git a/assets/img/ques_bg.png b/assets/img/ques_bg.png
new file mode 100644
index 0000000..5695fd7
Binary files /dev/null and b/assets/img/ques_bg.png differ
diff --git a/assets/img/ques_gou.png b/assets/img/ques_gou.png
new file mode 100644
index 0000000..8a1492d
Binary files /dev/null and b/assets/img/ques_gou.png differ
diff --git a/assets/img/quesimg01.png b/assets/img/quesimg01.png
new file mode 100644
index 0000000..03a3c57
Binary files /dev/null and b/assets/img/quesimg01.png differ
diff --git a/components/questionnaire/questionnaire.js b/components/questionnaire/questionnaire.js
new file mode 100644
index 0000000..23a0208
--- /dev/null
+++ b/components/questionnaire/questionnaire.js
@@ -0,0 +1,27 @@
+const Http = require("../../utils/HttpBasics");
+var config = require("../../config/config.js");
+Component({
+ properties: {
+ questionnaire: {
+ type: Object,
+ value: {}
+ }
+ },
+ data: {
+ flag: false,
+ },
+ methods:{
+ close:function(){
+ this.setData({ flag: true })
+ }
+ },
+ onReady: function () {
+ console.log(this.questionnaire, 999999999)
+ },
+ onLoad: function (options) {
+ console.log(this.questionnaire, 999999999)
+ },
+ onShow: function () {
+ console.log(this.questionnaire, 999999999)
+ }
+});
\ No newline at end of file
diff --git a/components/questionnaire/questionnaire.json b/components/questionnaire/questionnaire.json
new file mode 100644
index 0000000..2176e13
--- /dev/null
+++ b/components/questionnaire/questionnaire.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+
+ }
+}
\ No newline at end of file
diff --git a/components/questionnaire/questionnaire.wxml b/components/questionnaire/questionnaire.wxml
new file mode 100644
index 0000000..e17bf88
--- /dev/null
+++ b/components/questionnaire/questionnaire.wxml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/questionnaire/questionnaire.wxss b/components/questionnaire/questionnaire.wxss
new file mode 100644
index 0000000..730a22c
--- /dev/null
+++ b/components/questionnaire/questionnaire.wxss
@@ -0,0 +1,73 @@
+.b1 {
+ position: fixed;
+ top: 0px;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ background: rgba(0, 0, 0, 0.8);
+ overflow: hidden;
+ z-index: 1000000000000;
+}
+
+.con {
+ position: absolute;
+ top: 120rpx;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ margin: auto;
+ width: 587rpx;
+
+}
+
+.con .image {
+ display: block;
+ width: 100%;
+}
+
+.img {
+ margin-top: -48rpx;
+}
+
+.question {
+ display: block;
+ width: 587rpx;
+ background: #fff;
+ border-bottom-left-radius: 22rpx;
+ border-bottom-right-radius: 22rpx;
+ overflow: hidden;
+}
+
+.ques {
+ width: 511rpx;
+ margin: 0 auto;
+ height: 86rpx;
+ line-height: 86rpx;
+ text-align: center;
+ font-size: 30rpx;
+ color: #333;
+ border-bottom: 1rpx solid #eee;
+}
+
+.title {
+ width: 511rpx;
+ display: block;
+ text-align: center;
+ height: 50rpx;
+ margin: 0 auto;
+ padding-top:10rpx;
+ padding-bottom:20rpx;
+ font-size: 32rpx;
+ font-weight: bold;
+ line-height: 41rpx;
+ border-bottom: 1rpx solid #eee;
+}
+.quessss >view:last-child{
+ border-bottom:0;
+}
+.close{
+ position: relative;
+ z-index: 1000000000000000;
+ display: block;
+ width: 70rpx;
+}
\ No newline at end of file
diff --git a/config/config.js b/config/config.js
index 405e1e8..f5b1290 100755
--- a/config/config.js
+++ b/config/config.js
@@ -53,7 +53,7 @@ var config = {
* 订单列表
*/
orderList: "/order/list",
-
+ getWeRunData: '/user/getWeRunData',
/**
* 订单详情
*/
@@ -77,6 +77,7 @@ var config = {
/**
* 车场信息获取
*/
+ scoreLevelInfo: '/mall/scoreLevelInfo',
getParkInfo: "/wxPark/info",
/**
* 用户所绑车牌获取
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 851f70b..68ecccd 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -20,6 +20,12 @@ Page({
result: [],
end_time: '',
clock: "已经截止",
+ questionnaire: {
+ title: "问题1" ,
+ questions: [
+ { ques: "小主,您有喜欢的小鲜肉吗?" },
+ { ques: "小主,您有娃吗?" }]
+ },
},
phone: function () {
diff --git a/pages/coupon/detail/index.json b/pages/coupon/detail/index.json
index 377ba9f..1569a86 100644
--- a/pages/coupon/detail/index.json
+++ b/pages/coupon/detail/index.json
@@ -1,6 +1,6 @@
{
"usingComponents": {
-
+ "questionnaire": "../../../components/questionnaire/questionnaire"
},
"navigationBarTitleText": "券详情"
}
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 943fce6..6007743 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -88,4 +88,6 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index 03709ed..3573d03 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -22,7 +22,7 @@
住址
{{name}}
- 请输入地址
+ 请选择地址
\ No newline at end of file