diff --git a/pages.json b/pages.json
index f6c434e..0986c6b 100644
--- a/pages.json
+++ b/pages.json
@@ -218,6 +218,15 @@
}
}
+ ,{
+ "path" : "pages/guide/feedbackinfo",
+ "style" :
+ {
+ "navigationBarTitleText": "意见建议详情",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 9fe6204..65bd4f4 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -48,20 +48,20 @@
-
-
-
-
- 活动场次
-
-
-
-
-
-
-
-
+
+
+
+
+ 活动场次
+
+
+
+
+
+
+
+
@@ -114,9 +114,9 @@
topSwiperIndex: 0,
chooseNum: "",
numbers: [],
- showNumbers: false,
- teamType:"",
- activity_number_id:""
+ showNumbers: false,
+ teamType: "",
+ activity_number_id: ""
}
},
onLoad(options) {
@@ -150,32 +150,34 @@
name: this.list.name,
address: this.list.address
})
- },
- closeNum(){
- this.showNumbers=false
- this.chooseNum = ""
- },
- numChange(val) {
- console.log(val)
- this.activity_number_id = val
- console.log("book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id)
- // uni.navigateTo({
- // url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
- // })
+ },
+ closeNum() {
+ this.showNumbers = false
+ this.chooseNum = ""
+ },
+ numChange(val) {
+ console.log(val)
+ this.activity_number_id = val
+ console.log("book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id=" + this
+ .activity_number_id)
+ // uni.navigateTo({
+ // url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
+ // })
},
tobook(type) {
- // this.showNumbers = true
- this.teamType = type;
-
- if(this.util.isNull(this.activity_number_id)){
- uni.showToast({
- icon: "none",
- title: "请选择活动场次"
- })
- return false;
- }
- uni.navigateTo({
- url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
+ // this.showNumbers = true
+ this.teamType = type;
+
+ if (this.util.isNull(this.activity_number_id)) {
+ uni.showToast({
+ icon: "none",
+ title: "请选择活动场次"
+ })
+ return false;
+ }
+ uni.navigateTo({
+ url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id=" + this
+ .activity_number_id
})
},
loadActiveInfo() {
@@ -190,17 +192,20 @@
},
utilSuccess: function(res) {
res.isCanBook = that.$moment(nt).isBefore(res.end_plan);
- that.list = res;
- let numberArr = []
- let nowTime = that.getNowTime()
- for(var m of res.numbers){
- m.label = m.name + "(" + that.timeFormat(m.start_time,"yyyy年MM月DD日") + " " + that.getHm(m.start_time)+"-"+that.getHm(m.end_time) + ")"
- if(m.has_total==m.total&&m.total!=0 || that.compareDate(nowTime,m.end_plan)){
- m.disabled = true
- }
-
-
- numberArr.push(m)
+ that.list = res;
+ let numberArr = []
+ let nowTime = that.getNowTime()
+ for (var m of res.numbers) {
+ m.label = m.name + "(" + that.timeFormat(m.start_time, "yyyy年MM月DD日") + " " + that
+ .getHm(m.start_time) + "-" + that.getHm(m.end_time) + ")"
+ if (m.has_total == m.total && m.total != 0 || that.compareDate(nowTime, m
+ .end_plan)) {
+ m.disabled = true
+ }
+ numberArr.push(m);
+ if(that.chooseNum==""){
+ that.chooseNum=m.id;
+ }
}
that.numbers = numberArr
wx.setStorage({
@@ -215,23 +220,23 @@
}
})
- },
- // 比较时间
- getNowTime(){
- const date = new Date();
- let year = date.getFullYear();
- let month = date.getMonth() + 1;
- let day = date.getDate();
- let hours = date.getHours()
- let minutes = date.getMinutes()
- let seconds =date.getSeconds()
- month = month > 9 ? month : '0' + month;
- day = day > 9 ? day : '0' + day;
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
- },
- compareDate(d1, d2) {
- let reg = new RegExp('-', 'g')
- return ((new Date(d1.replace(reg, '/'))) > (new Date(d2.replace(reg, '/'))))
+ },
+ // 比较时间
+ getNowTime() {
+ const date = new Date();
+ let year = date.getFullYear();
+ let month = date.getMonth() + 1;
+ let day = date.getDate();
+ let hours = date.getHours()
+ let minutes = date.getMinutes()
+ let seconds = date.getSeconds()
+ month = month > 9 ? month : '0' + month;
+ day = day > 9 ? day : '0' + day;
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
+ compareDate(d1, d2) {
+ let reg = new RegExp('-', 'g')
+ return ((new Date(d1.replace(reg, '/'))) > (new Date(d2.replace(reg, '/'))))
},
topSwiperTab(e) {
var that = this;
@@ -296,18 +301,20 @@
box-sizing: border-box;
/* background: linear-gradient(0deg, #ffffff 85%, #E4C8A2); */
}
- .mpopup{
- margin-top:0rpx;
- min-height:200rpx
-
- }
- .mpopup-title{
- padding:20rpx 0
+
+ .mpopup {
+ margin-top: 0rpx;
+ min-height: 200rpx
+ }
+
+ .mpopup-title {
+ padding: 20rpx 0
}
+
.numbers {
/* min-height: 300rpx; */
- padding: 31rpx 24rpx;
- padding-bottom:13rpx;
+ padding: 31rpx 24rpx;
+ padding-bottom: 13rpx;
}
.numbers .u-radio {
@@ -326,4 +333,4 @@
.colortext {
color: #D98012
}
-
+
\ No newline at end of file
diff --git a/pages/guide/feedback.vue b/pages/guide/feedback.vue
index ceb12f8..705af53 100644
--- a/pages/guide/feedback.vue
+++ b/pages/guide/feedback.vue
@@ -63,22 +63,40 @@
method: "POST",
utilSuccess: function(res) {
console.log(res)
- uni.showToast({
- icon: "none",
- title: "投诉建议成功",
- complete() {
- uni.reLaunch({
- url: "/pages/success/success?from=feed"
- })
- }
- })
+ that.newsSubscription();
},
utilFail: function(res) {
that.util.toast(res);
}
})
- }
+ },
+ newsSubscription() {
+ uni.getSetting({
+ withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
+ success(res) {
+ if (res.authSetting['scope.subscribeMessage']) {
+ uni.redirectTo({
+ url: '/pages/success/success?from=feed'
+ })
+ } else {
+ // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+ uni.requestSubscribeMessage({
+ tmplIds: ['gPP22-SXuJmK9ffJZTNOSdq56Q2RmD2Qdg8ntteAO-Y'],
+ success(res) {
+ uni.showToast({
+ title: '订阅成功'
+ })
+ uni.redirectTo({
+ url: '/pages/success/success?from=feed'
+ })
+ }
+ })
+ }
+ }
+ });
+ },
+
}
}
@@ -118,4 +136,4 @@
.bgbottom {
height: 40rpx;
}
-
+
\ No newline at end of file
diff --git a/pages/guide/feedbackinfo.vue b/pages/guide/feedbackinfo.vue
new file mode 100644
index 0000000..0f23a23
--- /dev/null
+++ b/pages/guide/feedbackinfo.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+ 反馈时间：{{info.created_at||""}}
+
+
+ 反馈内容：
+
+
+ 回复时间：{{info.reply_time||""}}
+
+
+ 回复内容：
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index 91b50d4..a2f5f43 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -127,22 +127,38 @@
data: this.form,
method: "POST",
utilSuccess: function(res) {
- console.log(res)
- uni.showToast({
- icon: "none",
- title: "投诉建议成功",
- complete() {
- uni.reLaunch({
- url: "/pages/success/success?from=feed"
- })
- }
- })
+ that.newsSubscription();
},
utilFail: function(res) {
that.util.toast(res);
}
})
+ },
+ newsSubscription() {
+ uni.getSetting({
+ withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
+ success(res) {
+ if (res.authSetting['scope.subscribeMessage']) {
+ uni.redirectTo({
+ url: '/pages/success/success?from=feed'
+ })
+ } else {
+ // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+ uni.requestSubscribeMessage({
+ tmplIds: ['gPP22-SXuJmK9ffJZTNOSdq56Q2RmD2Qdg8ntteAO-Y'],
+ success(res) {
+ uni.showToast({
+ title: '订阅成功'
+ })
+ uni.redirectTo({
+ url: '/pages/success/success?from=feed'
+ })
+ }
+ })
+ }
+ }
+ });
}
}
}