From 68b046b071f886a92ab075585f3ac69ce2f8db76 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Tue, 25 Feb 2025 16:06:01 +0800
Subject: [PATCH] 1
---
lvdao-miniapp/pages/home/home.vue | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------
lvdao-miniapp/pages/questionnaire/questionnaire.scss | 2 +-
lvdao-miniapp/pages/questionnaire/questionnaire.vue | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
lvdao-miniapp/utils/request.js | 36 ++++++++++++++++++++----------------
4 files changed, 333 insertions(+), 209 deletions(-)
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index 1ede113..25ce28d 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -1,11 +1,12 @@
-
+
-
+
+
@@ -32,9 +33,9 @@
公告
- {{item.announcementTitle}}
+ {{item.announcementTitle}}
-
+
@@ -42,7 +43,7 @@
-
+
租商铺
@@ -66,13 +67,13 @@
-
+
物业缴费
-
-
- 类型:
+ 类型:
{{item.advertisingType}}
@@ -257,64 +262,73 @@
-
+
商家活动信息
- 查看更多
+ 查看更多
-
-
+
+
-
+
{{item.activityName || '标题'}}
活动时间:{{item.startTime}}
参与人数:{{item.maxParticipants}}
-
+
-
+
营销推广活动
- 查看更多
-
+ 查看更多
+
+
-
-
-
+
+
+
-
-
+
+
{{item.title}}
活动日期:{{item.startTime}}至{{item.endTime}}
-
-
+
+
-
+
商务合作
- 查看更多
+ 查看更多
-
-
+
+
-
+
{{item.title}}
@@ -325,9 +339,43 @@
-
+
+
+
+
+ 核销信息
+
+ 名称:
+ {{hxinfo.resourceName}}
+
+
+ 预约时间:
+ {{hxinfo.reservationTime}}
+
+
+ 人数:
+ {{hxinfo.numberOfPeople}}
+
+
+ 联系人:
+ {{hxinfo.contactPerson}}
+
+
+ 手机号:
+
+ {{hxinfo.contactNumber}}
+
+
+
+
+ 取消
+ 确认
+
+
+
+
@@ -339,28 +387,34 @@
},
data() {
return {
+ isshow: false,
scrollTop: 0,
OrderType: 0,
tableData: [],
- procedureData:[],//公告
+ procedureData: [], //公告
pageindex: {
- pageNumber: 1,
- pageSize: 10,
+ pageNumber: 1,
+ pageSize: 10,
},
- swiperList: [],//轮播
- zujin:[
- {price:'4800'},
- {price:'3400'},
- {price:'3000'}
+ swiperList: [], //轮播
+ zujin: [{
+ price: '4800'
+ },
+ {
+ price: '3400'
+ },
+ {
+ price: '3000'
+ }
],
- biaoqian:[
+ biaoqian: [
// {name:'4800'},
// {price:'3400'},
// {price:'3000'}
],
show: false,
- xuanval:0,
- xuanList:['区域','租金','默认排序','筛选'],
+ xuanval: 0,
+ xuanList: ['区域', '租金', '默认排序', '筛选'],
list: [{
name: '商铺'
},
@@ -371,11 +425,12 @@
name: '广告位'
}
],
- current:0,
- yingxiaoData:[],
- shangwuData:[],
- activity:[],
- imgurl:''
+ current: 0,
+ yingxiaoData: [],
+ shangwuData: [],
+ activity: [],
+ imgurl: '',
+ hxinfo: {}
}
},
onLoad() {
@@ -396,59 +451,97 @@
this.onCouponTab(0)
},
methods: {
- getALL(){
+ submit() {
+ let c1 = {
+ id:this.hxinfo.id,
+ checkId: uni.getStorageSync('user').phone
+ }
+ this.$http.sendRequest('/trafficPush/confirmVerification', 'POST', c1,1).then(res1 => {
+ console.log(res1);
+ })
+ },
+ call(e) {
+ uni.makePhoneCall({
+ phoneNumber: e
+ });
+ },
+ smcode() {
+ let that = this
+ uni.scanCode({
+ success: function(res) {
+ console.log('条码类型:' + res.scanType);
+ console.log('条码内容:' + res.result);
+ // uni.request({
+ // url: res.result,
+ // success: (res) => {
+ // console.log(JSON.stringify(res.data));
+ // that.hxinfo = res.data
+ // }
+ // });
+ let url = res.result.split('?')
+ let urlObj = url[1].split('=')
+ console.log(urlObj[1]);
+ that.$http.sendRequest('/trafficPush/verificationInformation', 'POST', {sceneId:urlObj[1]},1).then(res1 => {
+ console.log(res1);
+ that.hxinfo = res1.data.data
+ that.isshow = true
+ })
+ }
+ });
+ },
+ getALL() {
let pagesize = {
pageNumber: 1,
pageSize: 2
}
- let actPages = {
+ let actPages = {
pageNumber: 0,
pageSize: 10,
- reviewStatus:'2',
- orderingRule:3
+ reviewStatus: '2',
+ orderingRule: 3
}
let shopAct = {
- auditStatus:'3',
+ auditStatus: '3',
pageNumber: 0,
pageSize: 10,
- orderingRule:3
+ orderingRule: 3
}
let shanghu = {
- status:'1',
+ status: '1',
pageNumber: 0,
pageSize: 10,
}
- // 公告
- this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => {
- this.procedureData = res.data.data.content.slice(-2)
- })
- // 轮播图
- this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex,1).then(res => {
- this.swiperList =res.data.data.content
- })
- // 营销推广活动
- this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST',actPages,1).then(res => {
- this.yingxiaoData =res.data.data.content
- })
- // 商务合作
- this.$http.sendRequest('/cereBusinessCooperation/queryByPage', 'POST', shanghu,1).then(res => {
- this.shangwuData =res.data.data.content
- })
- // 商家活动
- this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',shopAct,1).then(res => {
- this.activity = res.data.data.content
- })
+ // 公告
+ this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize, 1).then(res => {
+ this.procedureData = res.data.data.content.slice(-2)
+ })
+ // 轮播图
+ this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex, 1).then(res => {
+ this.swiperList = res.data.data.content
+ })
+ // 营销推广活动
+ this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', actPages, 1).then(res => {
+ this.yingxiaoData = res.data.data.content
+ })
+ // 商务合作
+ this.$http.sendRequest('/cereBusinessCooperation/queryByPage', 'POST', shanghu, 1).then(res => {
+ this.shangwuData = res.data.data.content
+ })
+ // 商家活动
+ this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST', shopAct, 1).then(res => {
+ this.activity = res.data.data.content
+ })
},
onCouponTab(type) {
let pagesize = {
pageNumber: 0,
pageSize: 10,
- publishStatus:'2'
+ publishStatus: '2'
}
this.current = type
if (type == 0) {
pagesize.pageNumber = 0
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', pagesize,1).then(res => {
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', pagesize, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
}).catch(err => {
@@ -456,18 +549,18 @@
//请求失败
})
} else if (type == 1) {
- this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', pagesize,1).then(res => {
+ this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', pagesize, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
}).catch(err => {
console.log(err)
//请求失败
})
-
+
} else if (type == 2) {
pagesize.pageNumber = 0
// pagesize.advertisingType = '线上广告位'
- this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize,1).then(res => {
+ this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
}).catch(err => {
@@ -491,13 +584,13 @@
uni.navigateTo({
url: `${path}?item=${item}`
})
-
+
},
- toDetailTwo(item, path){
- let items = JSON.stringify(item)
- uni.navigateTo({
- url: `${path}?item=${items}`
- })
+ toDetailTwo(item, path) {
+ let items = JSON.stringify(item)
+ uni.navigateTo({
+ url: `${path}?item=${items}`
+ })
},
goDetail(path) {
uni.navigateTo({
@@ -509,96 +602,96 @@
url: '/pages/advertisement/advertisement'
})
},
- gaozhi(item){
+ gaozhi(item) {
// let items = JSON.stringify(item)
// uni.navigateTo({
// url: `/pages/procedureDetail/procedureDetail?item=${items}`
// })
- uni.setStorageSync('gghd',item);
+ uni.setStorageSync('gghd', item);
let items = item
uni.navigateTo({
url: `/pages/procedure/procedure?item=${items.id}`
})
-
+
},
- details(item) {
- let items = JSON.stringify(item)
- if(this.current == 0 || this.current == 1){
- uni.navigateTo({
- url: `/pages/details/details?item=${items}`
- })
- }else{
- uni.navigateTo({
- url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
- })
- }
-
- },
- setList(val){
-
+ details(item) {
+ let items = JSON.stringify(item)
+ if (this.current == 0 || this.current == 1) {
+ uni.navigateTo({
+ url: `/pages/details/details?item=${items}`
+ })
+ } else {
+ uni.navigateTo({
+ url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+ })
+ }
+
+ },
+ setList(val) {
+
this.xuanval = val
console.log(this.tableData)
- if(val == 0){
- const filteredTableData = this.tableData.filter(item => item.hasOwnProperty('belongingRegion'));
-
- // 提取 belongingRegion 字段并进行去重
- const labeledBelongingRegions = filteredTableData.map(item => ({
- label: item.belongingRegion
- }));
-
- const uniqueBelongingRegions = [...new Set(labeledBelongingRegions)];
+ if (val == 0) {
+ const filteredTableData = this.tableData.filter(item => item.hasOwnProperty('belongingRegion'));
+
+ // 提取 belongingRegion 字段并进行去重
+ const labeledBelongingRegions = filteredTableData.map(item => ({
+ label: item.belongingRegion
+ }));
+
+ const uniqueBelongingRegions = [...new Set(labeledBelongingRegions)];
console.log(uniqueBelongingRegions)
- this.list = uniqueBelongingRegions
- }else if(val == 1){
+ this.list = uniqueBelongingRegions
+ } else if (val == 1) {
this.list = []
- }else if(val == 2){
+ } else if (val == 2) {
this.list = []
}
this.show = true
},
confirm(val) {
- let page = {
- pageNumber: 1,
- pageSize: 10,
- belongingRegion:val[0].label
- }
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', page, 1).then(res => {
- //成功回调
- this.tableData = res.data.data.content
- })
-
+ let page = {
+ pageNumber: 1,
+ pageSize: 10,
+ belongingRegion: val[0].label
+ }
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', page, 1).then(res => {
+ //成功回调
+ this.tableData = res.data.data.content
+ })
+
},
- tabsChange(itme){
+ tabsChange(itme) {
console.log(itme)
this.onCouponTab(itme)
},
- gopath(e){
+ gopath(e) {
uni.navigateTo({
url: e
})
-
+
},
- wuye(){
+ wuye() {
uni.navigateTo({
url: `/pages/propertyPay/propertyPayList/propertyPayList`
})
-
+
},
- piaowu(){
+ piaowu() {
uni.navigateTo({
url: `/pages/ticketBooking/ticketBooking`
})
},
- goList(){
- if(this.current == 0){
+ goList() {
+ if (this.current == 0) {
uni.navigateTo({
url: `/pages/shops/shops`
})
- }else if(this.current == 1){
+ } else if (this.current == 1) {
uni.navigateTo({
url: `/pages/field/field`
})
- }else{
+ } else {
uni.navigateTo({
url: `/pages/advertisement/advertisement`
})
@@ -610,4 +703,18 @@
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/questionnaire/questionnaire.scss b/lvdao-miniapp/pages/questionnaire/questionnaire.scss
index d4774cf..7aafabd 100644
--- a/lvdao-miniapp/pages/questionnaire/questionnaire.scss
+++ b/lvdao-miniapp/pages/questionnaire/questionnaire.scss
@@ -47,7 +47,7 @@
display: flex;
justify-content: center;
align-items: center;
- width: 25%;
+ // width: 25%;
height: 100%;
text {
font-size: 26rpx;
diff --git a/lvdao-miniapp/pages/questionnaire/questionnaire.vue b/lvdao-miniapp/pages/questionnaire/questionnaire.vue
index e1889c2..46176c8 100644
--- a/lvdao-miniapp/pages/questionnaire/questionnaire.vue
+++ b/lvdao-miniapp/pages/questionnaire/questionnaire.vue
@@ -1,39 +1,45 @@
-
-
-
+
+
- 问卷类型
-
- {queryChange('questionnaireType', v)}">
+ {{query.questionnaireType?query.questionnaireType:'问卷类型'}}
+
+ {queryChange('questionnaireType', v)}">
-
+
-
-
-
-
- {{item.title}}
- 填写时长:{{item.estimatedTime}}分钟
- 填写时段:{{item.startDate}}至{{item.endDate}}
- 问卷类型:{{item.questionnaireType}}
-
+
+
+
+
+ {{item.title}}
+ 填写时长:{{item.estimatedTime}}分钟
+ 填写时段:{{item.startDate}}至{{item.endDate}}
+ 问卷类型:{{item.questionnaireType}}
+
-
@@ -45,40 +51,53 @@
data() {
return {
show: false,
- areList: [
- {value: '物业问卷', label: '物业问卷'},
- {value: '招商问卷', label: '招商问卷'},
- {value: '满意度问卷', label: '满意度问卷'},
- {value: '社会调查问卷', label: '社会调查问卷'},
+ areList: [{
+ value: '物业问卷',
+ label: '物业问卷'
+ },
+ {
+ value: '招商问卷',
+ label: '招商问卷'
+ },
+ {
+ value: '满意度问卷',
+ label: '满意度问卷'
+ },
+ {
+ value: '社会调查问卷',
+ label: '社会调查问卷'
+ },
], // 区域列表
query: {
questionnaireType: '',
title: '',
- pageNumber: 0,
- pageSize: 10,
- publishPort:'商家端'
+ pageNumber: 0,
+ pageSize: 10,
+ publishPort: '商家端'
},
- tableData:[],
- pagesize:{
- pageNumber: 0,
- pageSize: 10,
- publishPort:'商家端'
- }
+ tableData: [],
+ pagesize: {
+ pageNumber: 0,
+ pageSize: 10,
+ publishPort: '商家端'
+ },
+ imgurl:''
};
},
mounted() {
+ this.imgurl = this.$img
this.getAll()
-
+
},
- methods:{
- getAll(){
-
- this.$http.sendRequest('/cereQuestionnaireTable/queryByPage', 'POST', this.pagesize,1).then(res => {
+ methods: {
+ getAll() {
+
+ this.$http.sendRequest('/cereQuestionnaireTable/queryByPage', 'POST', this.pagesize, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
})
},
- go(urls){
+ go(urls) {
uni.navigateTo({
url: urls
})
@@ -88,25 +107,19 @@
this.search();
},
search() {
- this.$http.sendRequest('/cereQuestionnaireTable/queryByPage', 'POST', this.query,1).then(res => {
+ this.$http.sendRequest('/cereQuestionnaireTable/queryByPage', 'POST', this.query, 1).then(res => {
//成功回调
this.tableData = res.data.data.content
- this.query = {
- questionnaireType: '',
- title: '',
- pageNumber: 1,
- pageSize: 2
- }
})
},
- createWen(){
+ createWen() {
uni.navigateTo({
url: '/pages/createQuestionnaire/createQuestionnaire'
})
},
- goview(item){
+ goview(item) {
const host = `${window.location.protocol}//${window.location.host}`
- let wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
+ let wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
// const host = 'https://jy.scjysm.asia:18086/cdwlMall/meh5/'
// const host = 'http://localhost:8080/cdwlMall/meh5/'
// let wenjuanUrl = `${host}pages_category_page1/question/question?ids=${item.id}`
@@ -119,5 +132,5 @@
+ @import 'questionnaire.scss';
+
\ No newline at end of file
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 1fc27ca..6e8b93c 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -16,8 +16,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
if(baseUrl == 1){
// bases = 'http://172.16.61.125:9003/' + url;
// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
- bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
+ // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
// bases = 'http://192.168.2.230:9003' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
@@ -25,8 +25,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
}else if(baseUrl == 3){
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
- bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+ // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
// bases = 'http://192.168.2.107:9007' + url;
// bases = 'http://192.168.2.230:9007' + url;
@@ -34,8 +34,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://172.16.61.125:9004/' + url;
// bases = 'http://172.16.61.48/business-server' + url;
// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
- bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+ // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
// bases = 'http://192.168.2.230:9004' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
@@ -110,17 +110,21 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
})
break;
case '500':
- uni.showModal({
- title: '登录提示',
- content: '系统错误,请重新登录!',
- success:ress => {
- if (ress.confirm) {
- uni.redirectTo({
- url:'/pages/login/login'
- })
- }
- }
+ uni.showToast({
+ icon:'none',
+ title:res.data.msg?res.data.msg:'系统错误,请重新登录!'
})
+ // uni.showModal({
+ // title: '登录提示',
+ // content: res.data.msg?res.data.msg:'系统错误,请重新登录!',
+ // success:ress => {
+ // if (ress.confirm) {
+ // uni.redirectTo({
+ // url:'/pages/login/login'
+ // })
+ // }
+ // }
+ // })
break;
default:
--
libgit2 0.21.4