diff --git a/lvdao-miniapp/pages/accepting/accepting.vue b/lvdao-miniapp/pages/accepting/accepting.vue index 461ab0e..988b37b 100644 --- a/lvdao-miniapp/pages/accepting/accepting.vue +++ b/lvdao-miniapp/pages/accepting/accepting.vue @@ -4,7 +4,7 @@ - + {{ diff --git a/lvdao-miniapp/pages/complaint/complaint.vue b/lvdao-miniapp/pages/complaint/complaint.vue index b115aac..12c7b63 100644 --- a/lvdao-miniapp/pages/complaint/complaint.vue +++ b/lvdao-miniapp/pages/complaint/complaint.vue @@ -143,13 +143,15 @@ } this.ruleForm.applicationTime = this.currentTime() this.ruleForm.createUser = uni.getStorageSync('user').phone - this.ruleForm.onSitePhoto.map(item=>{ - item.replace(this.$img,'') + this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{ + return item.replace(this.$img,''); }) + let info = { ...this.ruleForm, onSitePhoto:this.ruleForm.onSitePhoto.join(','), } + this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST',info,1).then(res => { uni.navigateTo({ url: '/pages/serve/serve' 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/record/record.vue b/lvdao-miniapp/pages/record/record.vue index 7b905a9..9696aaf 100644 --- a/lvdao-miniapp/pages/record/record.vue +++ b/lvdao-miniapp/pages/record/record.vue @@ -28,20 +28,21 @@ return { recordList:'', pageindex: { + auditStatus:1, pageNumber: 0, pageSize: 10 }, activesType: [ { - value: 0, - label: '商铺申请记录' - },{ value: 1, - label: '场地申请记录' + label: '待审核' + },{ + value:2, + label: '待签约' }, { - value: 2, - label: '广告位申请记录' + value: 3, + label: '已驳回' } ], typeShow:false, @@ -71,19 +72,9 @@ }) }, typeChange(e) { - this.pageindex.start = e[0].labels - if(e[0].value == 2){ - this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => { - this.recordList = item.data.data.content - }) - }else{ - this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => { - this.recordList = res.data.data.content - }) - } - - this.getALL() + this.pageindex.auditStatus = e[0].value + this.getALL() }, } } diff --git a/lvdao-miniapp/pages/repair/repair.vue b/lvdao-miniapp/pages/repair/repair.vue index cfe2824..55abd1f 100644 --- a/lvdao-miniapp/pages/repair/repair.vue +++ b/lvdao-miniapp/pages/repair/repair.vue @@ -5,7 +5,7 @@ + + + 评价 + + +

+ 剩余 {{ remainingCharacters }} 字 +

+ + 提交 + + @@ -53,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 => { @@ -79,15 +115,44 @@ 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-h5/config/api.js b/wenjuan-h5/config/api.js index f98b88e..29a66ed 100644 --- a/wenjuan-h5/config/api.js +++ b/wenjuan-h5/config/api.js @@ -1,8 +1,8 @@ // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server' // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' -let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' -let DOMAIN_PREFIX = 'http://172.16.61.125:9007' +// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' +// let DOMAIN_PREFIX = 'http://172.16.61.125:9007' // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' @@ -14,14 +14,16 @@ let DOMAIN_PREFIX = 'http://172.16.61.125:9007' // const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server` // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -// const DOMAIN_PREFIXPING = `http://192.168.2.152:9003` -// const DOMAIN_PREFIX = 'http://192.168.2.152:9007' +let DOMAIN_PREFIXPING = `http://10.0.0.41:9003` +let DOMAIN_PREFIX = 'http://10.0.0.41:9007' let host = window.location.host; let hostall = window.location.href; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { + DOMAIN_PREFIXPING = 'http://10.0.0.41:9003' DOMAIN_PREFIX = 'http://10.0.0.41:9007' + } else { let c1 = hostall.split('cdwlMall')[0]; DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server` diff --git a/wenjuan-h5/pages_category_page1/question/question.vue b/wenjuan-h5/pages_category_page1/question/question.vue index bb6d908..9eee1e1 100644 --- a/wenjuan-h5/pages_category_page1/question/question.vue +++ b/wenjuan-h5/pages_category_page1/question/question.vue @@ -274,7 +274,7 @@ if (res.data.id) { this.wenjuan = res.data this.wenjuan.question = JSON.parse(res.data.question) - console.error(this.wenjuan.question) + //检查this.wenjuan.question这个list的每个里面是否有maxChoose参数，没有的话就加一个 // this.wenjuan.question.forEach(item => { // console.log(item) @@ -677,7 +677,7 @@ // questionnaireScore: null, // } - // console.log(obj.question) + obj.question = JSON.stringify(obj.question) let tijiaoObj = { questionnaireId: this.wenjuanIds, @@ -693,11 +693,13 @@ question: obj.question } + // console.log(result) // console.log(JSON.stringify(result)) - console.log(tijiaoObj) + // console.log(tijiaoObj) // console.log(JSON.stringify(tijiaoObj)) // return + NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => { // this.show =true @@ -752,7 +754,7 @@ // this.$forceUpdate(); }, chooseAnswerOne(options, chooseItem, idx) { - console.error(options, chooseItem, idx) + options.forEach(item => { item.disabled = false }) @@ -760,11 +762,13 @@ for (let key in this.wenjuan.question) { this.wenjuan.question[key].options.map(res => { if (res.answer == chooseItem.answer) { - console.error('；；',chooseItem.answer) + this.wenjuan.question[key].choose = chooseItem.answer + } }) } + // console.error({ // ...this.myChoose // }) @@ -776,14 +780,14 @@ // ...chooseItem // } chooseItem.disabled = true + }, chooseAnswer(val,idx,item,index) { - console.log(val,idx,item,index) - console.error(this.wenjuan.question[Number(index)].options[idx]) + if (item.maxChoose && item.maxChoose > 0) { // 获取当前题目的已选中选项数量 const selectedCount = item.options.filter(option => option.disabled).length; - console.error(selectedCount) + // 如果已选中到达 maxChoose，并且当前项未被选中，则不允许选择 if (selectedCount > item.maxChoose ) { uni.showToast({ @@ -798,7 +802,7 @@ } }, chooseAnswerMore(chooseItem, idx, item) { - console.log(chooseItem, idx, item) + // item.maxChoose =2 if (item.maxChoose && item.maxChoose > 0) { // 获取当前题目的已选中选项数量 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/components/dajuanTongji/index.vue b/wenjuan-pc/src/components/dajuanTongji/index.vue index 4cc110e..a3d4855 100644 --- a/wenjuan-pc/src/components/dajuanTongji/index.vue +++ b/wenjuan-pc/src/components/dajuanTongji/index.vue @@ -160,9 +160,9 @@ export default { } }, mounted () { - this.loadQuestionByIndex(this.index) - this.tubiao() - console.log(JSON.parse(this.obj)) + // this.loadQuestionByIndex(this.index) + // this.tubiao() + // this.processData() }, onload () { @@ -183,7 +183,7 @@ export default { methods: { init (data) { this.tableData = data; - // console.log('initdata',data); + this.loadQuestionByIndex(this.index) this.tubiao() }, @@ -195,8 +195,13 @@ export default { } = this.tableData; var list = []; // 用于存储结果 + var table =null + if(typeof cereQuestionnaireTable.question == 'string'){ + table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据 + }else{ + table = cereQuestionnaireTable.question + } - var table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据 // 遍历 groupKeys 中的每个条目 // for (let i = 0; i < groupKeys.length; i++) { @@ -322,6 +327,7 @@ export default { this.tiList = []; this.tiList = optionlist + this.tiList = optionlist.filter(item => typeof item.title === 'string' && item.title.trim() !== ''); }, // 初始化选项统计，确保每个选项都有统计数据 initOptionStats (optionSettings) { @@ -342,6 +348,7 @@ export default { }, tubiao () { + const res = this.tiList.map(function (item) { return { name: item.title, diff --git a/wenjuan-pc/src/main.js b/wenjuan-pc/src/main.js index 96963b3..f2af612 100644 --- a/wenjuan-pc/src/main.js +++ b/wenjuan-pc/src/main.js @@ -29,8 +29,9 @@ 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://192.168.2.225:9007' -Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2 +// 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 fd1f41c..9ce14d2 100644 --- a/wenjuan-pc/src/utils/request.js +++ b/wenjuan-pc/src/utils/request.js @@ -21,7 +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://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; diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue index 6688ca7..74705cc 100644 --- a/wenjuan-pc/src/views/investigation/index.vue +++ b/wenjuan-pc/src/views/investigation/index.vue @@ -244,7 +244,7 @@
- {{ item.choose }} + {{ item.choose}}
@@ -2120,6 +2120,22 @@ export default { if (typeof this.daxiangData.question === 'string') { this.daxiangData.question = JSON.parse(this.daxiangData.question) } + + + for(let key in this.daxiangData.question){ + +if(this.daxiangData.question[key].type == '单选') { + + if( Array.isArray(this.daxiangData.question[key].choose) ) { + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose.join(',') + + } + } + if(this.daxiangData.question[key].type == '文本') { + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose[0] + } + } + // this.daxiangData.question = this.xuanxiang(question) // for (const key in this.daxiangData.question) {