diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss index ced0478..33c4227 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss @@ -86,7 +86,7 @@ .userForm { margin: 0 40rpx ; .form-box { - padding: 28rpx; + padding: 18rpx 30rpx; } .title { diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue index 5ca9fa6..a8d9d99 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue @@ -32,7 +32,7 @@ 客服 --> - 报名参加 + 报名参加 - + - + 请填写您的报名信息 - - + + 提交 @@ -112,7 +112,28 @@ if(option.scene){ }, methods: { + baoShow(){ + this.joinShow = true + this.form.userName = '' + this.form.userPhone = '' + }, submit() { + if (!this.form.userName) { + uni.showToast({ + icon: 'none', + title: '请输入姓名' + }); + return + } + + + if (!this.form.userPhone) { + uni.showToast({ + icon: 'none', + title: '请输入联系电话' + }); + return + } this.form.createTime = this.getCurrentDateTime() this.$http.sendRequest('/cereEventRegistration/add', 'POST',this.form,1).then(res => { diff --git a/lvdao-miniapp/pages/serve/jiDed.vue b/lvdao-miniapp/pages/serve/jiDed.vue index adac8af..1d9cb2e 100644 --- a/lvdao-miniapp/pages/serve/jiDed.vue +++ b/lvdao-miniapp/pages/serve/jiDed.vue @@ -17,6 +17,10 @@ 备注信息 {{record.memo || record.remark}} + + 评价信息 + + {{record.estimate || '无'}} 现场照片 diff --git a/lvdao-miniapp/pages/serve/serve.scss b/lvdao-miniapp/pages/serve/serve.scss index c1f7d0a..11822c9 100644 --- a/lvdao-miniapp/pages/serve/serve.scss +++ b/lvdao-miniapp/pages/serve/serve.scss @@ -74,3 +74,25 @@ } } } + .content{ + display: flex; + align-items: center; + text-align: right; + input{ + width: 100%; + color: #222222; + font-size: 26rpx; + padding-top: 6rpx; + /* #ifdef MP */ + padding-top: 5rpx; + /* #endif */ + } + image { + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; + /* #ifdef MP */ + margin-top: 5rpx; + /* #endif */ + } + } diff --git a/lvdao-miniapp/pages/serve/serve.vue b/lvdao-miniapp/pages/serve/serve.vue index c97b730..a9bac99 100644 --- a/lvdao-miniapp/pages/serve/serve.vue +++ b/lvdao-miniapp/pages/serve/serve.vue @@ -15,6 +15,9 @@ 申请时间：{{item.applicationTime}} 状态：{{item.status=='1'?'受理中':'已完成'}} + + 评价 + @@ -25,13 +28,25 @@ 申请时间：{{item.applicationTime}} 状态：{{item.status=='1'?'受理中':'已完成'}} - - 评价 + + 评价 + + + 评价 + + +

+ 剩余 {{ remainingCharacters }} 字 +

+ + 提交 + + @@ -56,13 +71,31 @@ label: '报修记录' } ], - typeShow:false + typeShow:false, + joinShow:false, + form:{ + estimate:'', + id:'' + }, + indexMsg :0 } }, mounted(){ this.getALL() }, + computed: { + remainingCharacters() { + const maxLength = 150; + return maxLength - this.form.estimate.length; + } + }, methods: { + baoShow(val,ids){ + this.joinShow = true + this.form.estimate = '' + this.form.id = ids + this.indexMsg = val + }, getALL(){ this.pageindex.createUser =uni.getStorageSync('user').phone this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => { @@ -82,17 +115,43 @@ this.pageindex.start = e[0].labels if(e[0].value == 0){ - this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => { - this.recordList = res.data.data.content + + this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => { + this.toushu = res.data.data.content + this.recordList =[] }) }else{ - this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => { - this.toushu = res.data.data.content + this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => { + this.recordList = res.data.data.content + this.toushu = [] }) } }, submit(){ - + if (!this.form.estimate) { + uni.showToast({ + icon: 'none', + title: '请输入评价信息' + }); + return; + } + if(this.indexMsg == 1){ + this.$http.sendRequest('/cereComplaintsSuggestions/edit', 'POST',this.form,1).then(res => { + uni.showToast({ + icon: 'success', + title: '评价成功' + }); + }) + this.joinShow = false + }else{ + this.$http.sendRequest('/cereReportIssuesRepairs/edit', 'POST',this.form,1).then(res => { + uni.showToast({ + icon: 'success', + title: '评价成功' + }); + }) + this.joinShow = false + } } } } diff --git a/wenjuan-pc/dist.zip b/wenjuan-pc/dist.zip deleted file mode 100644 index 759a266..0000000 --- a/wenjuan-pc/dist.zip +++ /dev/null diff --git a/wenjuan-pc/src/main.js b/wenjuan-pc/src/main.js index 6b6c26f..f2af612 100644 --- a/wenjuan-pc/src/main.js +++ b/wenjuan-pc/src/main.js @@ -29,8 +29,8 @@ Vue.prototype.$echarts = echarts // Vue.prototype.$API = '/cdwlMall/meserver/api' // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api' // Vue.prototype.$hostUrl = 'https://h5.028wlkj.com/cdwlMall/' -Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api' -// Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api` +// Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api' +Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api` // Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2 Vue.prototype.$hostUrl = `${window.location.protocol}//${window.location.host}/cdwlMall` diff --git a/wenjuan-pc/src/utils/request.js b/wenjuan-pc/src/utils/request.js index cd5aca3..9ce14d2 100644 --- a/wenjuan-pc/src/utils/request.js +++ b/wenjuan-pc/src/utils/request.js @@ -21,8 +21,8 @@ let hostall = window.location.href; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://10.0.0.41:9003'; - // baseURL = 'http://172.16.61.125:9003'; + // baseURL = 'http://10.0.0.41:9003'; + baseURL = 'http://172.16.61.123:9003'; // baseURL = 'http://172.16.61.125:9003'; // baseURL = 'http://192.168.2.36:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;