From 354e3811f7b1fad2df183449dbd719b6fe199b48 Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Thu, 2 Jan 2025 17:41:56 +0800 Subject: [PATCH] '验收' --- main.js | 7 +++++-- manifest.json | 14 ++++++++++---- pages.json | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- pages/accepting/accepting.vue | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ pages/activityAdd/activityAdd.vue | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- pages/activityDetail/activityDetail.scss | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/activityDetail/activityDetail.vue | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/advertisement/advertisement.vue | 19 ++++++++----------- pages/advertisementAdd/advertisementAdd.vue | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------- pages/advertisementApply/advertisementApply.vue | 8 ++++---- pages/advertisementDetail/advertisementDetail.scss | 2 +- pages/advertisementDetail/advertisementDetail.vue | 31 ++++++++++++++++--------------- pages/advertisementTime/advertisementTime.vue | 10 +++++----- pages/business/businessDetail/businessDetail.vue | 38 ++++++++++++++++++-------------------- pages/business/businessList/businessList.vue | 59 +++++++++++++++++++++++++++++++++++++++++++---------------- pages/complaint/complaint.vue | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- pages/createQuestionnaire/createQuestionnaire.scss | 6 ++++++ pages/createQuestionnaire/createQuestionnaire.vue | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- pages/details/details.scss | 3 +-- pages/details/details.vue | 70 +++++++++++++++++++++++++++++++++++++++++----------------------------- pages/dialogue/dialogue.vue | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/field/field.scss | 53 +++++++++++++++++++++-------------------------------- pages/field/field.vue | 61 ++++++++++++++++++++++++++++++++++++++++++------------------- pages/home/home.scss | 6 +++++- pages/home/home.vue | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- pages/intentionApply/intentionApply.vue | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------- pages/leaseAdd/leaseAdd.vue | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------- pages/login/login.vue | 3 +-- pages/marketing/marketingDetail/marketingDetail.scss | 19 ++++++++++++++----- pages/marketing/marketingDetail/marketingDetail.vue | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- pages/marketing/marketingList/marketingList.scss | 4 ++++ pages/marketing/marketingList/marketingList.vue | 51 +++++++++++++++++++++++++++++++++++++-------------- pages/message/message.vue | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- pages/my/my - 副本.vue | 74 +++++++++++++++++++++++++++++++++++++------------------------------------- pages/my/my.vue | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- pages/mycreated/mycreated.vue | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ pages/participation/participation.scss | 8 ++++++++ pages/participation/participation.vue | 64 +++++++++++++++++++++++++++++++++++++++++++++++++--------------- pages/procedureDetail/procedureDetail.vue | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/propertyPay/propertyPayList/propertyPayList.vue | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ pages/questionnaire/questDetail/questDetail.vue | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/questionnaire/questionnaire.vue | 85 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ pages/record/record.vue | 41 ++++++++++++++++++++++++----------------- pages/repair/repair.vue | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- pages/saleReport/saleReport.vue | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/salesReporting/salesReporting.scss | 20 ++++++++++++++------ pages/salesReporting/salesReporting.vue | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------- pages/serve/jiDed.vue | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/serve/serve.scss | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/serve/serve.vue | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/setPage/setPage.vue | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/shopjcMsg/shopjcMsg.vue | 14 ++++++++++++-- pages/shops/shops.scss | 4 ++-- pages/shops/shops.vue | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------- pages/ticketBooking/ticketBooking.vue | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/workbench/workbench.scss | 5 ++--- pages/workbench/workbench.vue | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ project.config.json | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ static/images/back-icon.png | Bin 138406 -> 0 bytes static/images/front-icon.png | Bin 138559 -> 0 bytes static/images/location-icon.png | Bin 548 -> 0 bytes static/images/sevice-icon.png | Bin 1737 -> 0 bytes static/images/share-icon.png | Bin 1475 -> 0 bytes static/images/uploadID1.png | Bin 8799 -> 0 bytes static/images/uploadID2.png | Bin 8326 -> 0 bytes uni_modules/wn-calendar/components/wn-calendar/wn-calendar.vue | 4 ++-- unpackage/res/icons/1024x1024.png | Bin 75146 -> 0 bytes unpackage/res/icons/120x120.png | Bin 3413 -> 0 bytes unpackage/res/icons/144x144.png | Bin 4445 -> 0 bytes unpackage/res/icons/152x152.png | Bin 4695 -> 0 bytes unpackage/res/icons/167x167.png | Bin 5356 -> 0 bytes unpackage/res/icons/180x180.png | Bin 5855 -> 0 bytes unpackage/res/icons/192x192.png | Bin 6514 -> 0 bytes unpackage/res/icons/20x20.png | Bin 447 -> 0 bytes unpackage/res/icons/29x29.png | Bin 705 -> 0 bytes unpackage/res/icons/40x40.png | Bin 906 -> 0 bytes unpackage/res/icons/58x58.png | Bin 1442 -> 0 bytes unpackage/res/icons/60x60.png | Bin 1474 -> 0 bytes unpackage/res/icons/72x72.png | Bin 1881 -> 0 bytes unpackage/res/icons/76x76.png | Bin 2003 -> 0 bytes unpackage/res/icons/80x80.png | Bin 2106 -> 0 bytes unpackage/res/icons/87x87.png | Bin 2330 -> 0 bytes unpackage/res/icons/96x96.png | Bin 2606 -> 0 bytes utils/request.js | 23 ++++++++--------------- utils/rsaEncrypt.js | 23 ----------------------- utils/secret.js | 18 ------------------ 86 files changed, 4448 insertions(+), 1138 deletions(-) create mode 100644 pages/activityDetail/activityDetail.scss create mode 100644 pages/activityDetail/activityDetail.vue create mode 100644 pages/dialogue/dialogue.vue create mode 100644 pages/procedureDetail/procedureDetail.vue create mode 100644 pages/questionnaire/questDetail/questDetail.vue create mode 100644 pages/saleReport/saleReport.vue create mode 100644 pages/serve/jiDed.vue create mode 100644 pages/serve/serve.scss create mode 100644 pages/serve/serve.vue create mode 100644 pages/setPage/setPage.vue create mode 100644 pages/ticketBooking/ticketBooking.vue create mode 100644 project.config.json delete mode 100644 static/images/back-icon.png delete mode 100644 static/images/front-icon.png delete mode 100644 static/images/location-icon.png delete mode 100644 static/images/sevice-icon.png delete mode 100644 static/images/share-icon.png delete mode 100644 static/images/uploadID1.png delete mode 100644 static/images/uploadID2.png delete mode 100644 unpackage/res/icons/1024x1024.png delete mode 100644 unpackage/res/icons/120x120.png delete mode 100644 unpackage/res/icons/144x144.png delete mode 100644 unpackage/res/icons/152x152.png delete mode 100644 unpackage/res/icons/167x167.png delete mode 100644 unpackage/res/icons/180x180.png delete mode 100644 unpackage/res/icons/192x192.png delete mode 100644 unpackage/res/icons/20x20.png delete mode 100644 unpackage/res/icons/29x29.png delete mode 100644 unpackage/res/icons/40x40.png delete mode 100644 unpackage/res/icons/58x58.png delete mode 100644 unpackage/res/icons/60x60.png delete mode 100644 unpackage/res/icons/72x72.png delete mode 100644 unpackage/res/icons/76x76.png delete mode 100644 unpackage/res/icons/80x80.png delete mode 100644 unpackage/res/icons/87x87.png delete mode 100644 unpackage/res/icons/96x96.png delete mode 100644 utils/rsaEncrypt.js delete mode 100644 utils/secret.js diff --git a/main.js b/main.js index 6b42b04..71527d1 100644 --- a/main.js +++ b/main.js @@ -10,8 +10,11 @@ import DialogBox from './components/DialogBox/DialogBox'; Vue.config.productionTip = false Vue.prototype.$http = http Vue.prototype.$imgUrl = (url) => { - return ("http://8.130.38.56:8027/local/file/static" + url); -}; + return ("https://jy.scjysm.asia:18086/mefile/file/static" + url); +} +// Vue.prototype.$upload = "http://172.16.61.48/admin-server/file/upload" + +Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload" // 全局组件 Vue.component('DialogBox', DialogBox); diff --git a/manifest.json b/manifest.json index 1261014..e906dcf 100644 --- a/manifest.json +++ b/manifest.json @@ -101,9 +101,13 @@ "mp-weixin" : { "appid" : "wx005c61919377e6af", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "es6" : true, + "postcss" : false, + "minified" : false }, - "usingComponents" : true + "usingComponents" : true, + "permission" : {} }, "mp-alipay" : { "usingComponents" : true @@ -116,7 +120,8 @@ }, "h5" : { "router" : { - "mode" : "history" + "mode" : "hash", + "base" : "./" }, "title" : "商城", "devServer" : { @@ -129,6 +134,7 @@ "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U" } } - } + }, + "template" : "home.vue" } } diff --git a/pages.json b/pages.json index b347d85..d960384 100644 --- a/pages.json +++ b/pages.json @@ -99,7 +99,7 @@ { "path": "pages/recordService/recordService", "style": { - "navigationBarTitleText": "服务记录", + "navigationBarTitleText": "申请记录", "navigationBarBackgroundColor": "#FFFFFF" } }, @@ -120,7 +120,7 @@ { "path": "pages/repair/repair", "style": { - "navigationBarTitleText": "故障报修", + "navigationBarTitleText": "报事报修", "navigationBarBackgroundColor": "#FFFFFF" } }, @@ -301,8 +301,80 @@ "navigationBarTitleText": "缴费记录", "navigationBarBackgroundColor": "#FFFFFF" } - } - + }, + { + "path": "pages/privacy/privacy", + "style": { + "navigationBarTitleText": "用户隐私政策", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "pages/ticketBooking/ticketBooking", + "style": { + "navigationBarTitleText": "票务预定", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/saleReport/saleReport", + "style" : + { + "navigationBarTitleText" : "销售上报", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/procedureDetail/procedureDetail", + "style" : + { + "navigationBarTitleText" : "通知详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/dialogue/dialogue", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/serve/serve", + "style": { + "navigationBarTitleText": "服务记录", + "navigationBarBackgroundColor": "#FFFFFF" + } + },{ + "path" : "pages/activityDetail/activityDetail", + "style": { + "navigationBarTitleText": "详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/serve/jiDed", + "style": { + "navigationBarTitleText": "详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/setPage/setPage", + "style": { + "navigationBarTitleText": "创建问卷", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path" : "pages/questionnaire/questDetail/questDetail", + "style": { + "navigationBarTitleText": "问卷详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + } + + ], "globalStyle": { "navigationBarTextStyle": "black" diff --git a/pages/accepting/accepting.vue b/pages/accepting/accepting.vue index 6cc712f..693d0d3 100644 --- a/pages/accepting/accepting.vue +++ b/pages/accepting/accepting.vue @@ -4,21 +4,30 @@ - + - 这里有标题这里有标题这里有... - + {{ + record.cereBasicInformationShop&&record.cereBasicInformationShop.shopName?record.cereBasicInformationShop.shopName:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.venueName?record.cereBasicInformationVenue.venueName:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.advertisingName?record.cereAdvertisingInformation.advertisingName:''}} + + + + {{ + record.cereBasicInformationShop&&record.cereBasicInformationShop.detailedLocation?record.cereBasicInformationShop.detailedLocation:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.detailedLocation?record.cereBasicInformationVenue.detailedLocation:'' + }} - - - 这里有地址这里有地址这里... + + 广告位类型： + {{record.advertisingSpaceType?record.advertisingSpaceType:'' + }} - 租金：￥1067/月 - 面积：81/m² + 租金：￥1067/月 + 租金：￥1067/天 + 面积：81/m² @@ -27,77 +36,89 @@ 申请时间 - 2022-02-22 14:00 + {{record.applicationTime}} 申请状态 - 申请中 + {{record.auditStatus == '1'?'待审核':record.auditStatus == '2'?'审核通过':record.auditStatus == '3'?'已驳回':''}} - + 经营用途 - 火锅店 + {{record.businessPurpose}} - + + 投放时段 + {{record.scheduleTime}} + + + 链接 + {{record.redirectUrl}} + + + 广告标题 + {{record.adTitle}} + + 意向租期 - 2022-03-22 至 2024-02-22 + {{record.intendedLeaseTerm}} - + 经营主体 - 企业 + {{record.operatingEntity}} - + 广告图片 - + 经营者姓名 - 张三 + {{record.operatorName||record.lesseeName}} 证件类型 - 身份证 + {{record.idCardType}} 身份证号码 - 1646448898498 + {{record.idNumber || record.idCardNumber}} 身份证有效期 - 2022-03-22 至 2024-02-22 + {{record.idValidStart || record.idCardValidStart}}至 {{record.idValidEnd || record.idCardValidEnd}} 身份证照片 - + - + 企业授权书 - + - - + + - 租期：2年 - 租金：1067/月 - 合计：10,646.00元 + 租期：2年 2/天 + 租金：1067/月 150/天 + 合计：元 - 查看合同 - 立即支付 + + 立即支付 @@ -108,21 +129,8 @@ data() { return { record:{}, - recordList:[ - { - recordName:'这里有名称这里有名称', - porName:'徐丽', - tTime:'2022-02-22 12：00：00', - state:'受理中' - }, - { - recordName:'这里有名称这里有名称', - porName:'徐丽', - tTime:'2022-02-22 12：00：00', - state:'已通过' - } - ] - }; + + } }, onLoad(options) { const item = JSON.parse(decodeURIComponent(options.item)); @@ -130,7 +138,49 @@ this.record = item }, methods: { - + Zhicheck(){ + let payList ={ + additional: "附加交易授权", + backUrl: "", + channelId: "", + expireTime: 1800, + finishUrl: "", + latitude: "1", + longitude: "1", + orderNo: "", + payId: "", + payMerData: [ + { + amount: 100, + body: "租赁信息", + } + ], + payType: "Online", + returnUrl: "", + showBtn: "1", + siteId: "", + toApp: "0", + totalAmount: 100, + uid: "1693617316237021185", + universalLink: "" + } + const randomNumber = Math.floor(Math.random() * 10000); // 生成一个0到9999之间的随机数 + const timestamp = new Date().getTime(); // 获取当前时间的时间戳 + payList.orderNo = `${randomNumber}${timestamp}` + + payList.uid =uni.getStorageSync('shopId') + this.$http.sendRequest('/aggregationPayment/createOrder', 'POST', payList,1).then(res => { + uni.showModal({ + title: res.data.message, + showCancel:false, + success:ress => { + uni.switchTab({ + url: '/pages/my/my' + }) + } + }) + }) + } } } diff --git a/pages/activityAdd/activityAdd.vue b/pages/activityAdd/activityAdd.vue index 7e8f7f3..39d9dac 100644 --- a/pages/activityAdd/activityAdd.vue +++ b/pages/activityAdd/activityAdd.vue @@ -3,12 +3,12 @@ - + - + @@ -19,26 +19,26 @@ - + - + - + - - + + - 提交 + 提交 @@ -47,13 +47,20 @@ export default { data() { return { + fileList: [], form: { - fileList: [], - name: '', - type: '', + activityName: '', + startTime:'', + endTime:'', + activityType:'', + maxParticipants:'', + region:'', + content:'', + auditStatus:'1', + createUser:'', + createDate:'', + coverImage:'', num: 0, - startTime: '', - endTime: '', }, active: '', // 文件上传地址 startShow: false, @@ -93,8 +100,62 @@ return `${year}-${month}-${day} ${hour}:${minute}:${second}`; }, typeChange(val) { - this.form.type = val[0].name; + this.form.activityType = val[0].label; }, + submit() { + + let files = [] + // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作) + files = this.$refs.uUpload.lists.filter(val => { + return val.progress == 100; + }) + // 如果您不需要进行太多的处理，直接如下即可 + // files = this.$refs.uUpload.lists; + files.map(item=>{ + let fileList ={ + name:item.file.name, + url:item.response.data.url + } + this.fileList.push(fileList) + + }) + if(this.fileList.length!=0){ + this.form.coverImage = this.fileList[0].url + } + this.form.createUser = uni.getStorageSync('shopId') + this.form.createDate = this.currentTime() + + this.$http.sendRequest('/cereActivityApplication/add', 'POST',this.form,1).then(res => { + uni.navigateTo({ + url: '/pages/mycreated/mycreated' + }) + }).catch(err => { + console.log(err) + //请求失败 + }) + + }, + // 获取时间 + currentTime() { + let date = new Date(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; // 月份从0~11，所以加一 + let day = date.getDate(); + let hours = date.getHours(); + let minutes = date.getMinutes(); + let seconds = date.getSeconds(); + + // 为月、日、时、分、秒添加前导零（如果需要） + month = month < 10 ? '0' + month : month; + day = day < 10 ? '0' + day : day; + hours = hours < 10 ? '0' + hours : hours; + minutes = minutes < 10 ? '0' + minutes : minutes; + seconds = seconds < 10 ? '0' + seconds : seconds; + + // 拼接日期和时间字符串 + let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + return strDate; + }, } } diff --git a/pages/activityDetail/activityDetail.scss b/pages/activityDetail/activityDetail.scss new file mode 100644 index 0000000..c282da8 --- /dev/null +++ b/pages/activityDetail/activityDetail.scss @@ -0,0 +1,84 @@ +.page { + position: relative; + width: 100%; + // height: 100%; + overflow-x: hidden; + // overflow-y: auto; +} +.page-info { + width: 100%; + padding: 24rpx; +} +// 活动详情 +.banner { + width: 100%; + margin-top: 10rpx; + border-radius: 30rpx; + background-color: #fff; + padding: 24rpx 30rpx; + color: #888D9C; + .title { + font-weight: 700; + color: #3D3D3D; + font-size: 28rpx; + margin-bottom: 30rpx; + } + .banner-info-top { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 30rpx; + } +} +// 活动信息 +.info-box { + margin-top: 30rpx; + .title { + font-weight: 700; + color: #3D3D3D; + font-size: 28rpx; + margin-bottom: 10rpx; + } + .info-item { + font-size: 26rpx; + line-height: 50rpx; + } +} + +/* 底部 */ +.page-footer{ + position: fixed; + left: 0; + bottom: 0; + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 125rpx; + background-color: #FFFFFF; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .footer-btn { + display: flex; + width: 70vw; + } + .footer-service { + display: flex; + flex-direction: column; + align-items: center; + text { + margin-top: 6rpx; + line-height: 42rpx; + } + } +} + +.userForm { + .form-box { + padding: 28rpx; + } + .title { + font-size: 32rpx; + font-weight: 700; + } +} \ No newline at end of file diff --git a/pages/activityDetail/activityDetail.vue b/pages/activityDetail/activityDetail.vue new file mode 100644 index 0000000..d838780 --- /dev/null +++ b/pages/activityDetail/activityDetail.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/pages/advertisement/advertisement.vue b/pages/advertisement/advertisement.vue index 3756abb..57516ab 100644 --- a/pages/advertisement/advertisement.vue +++ b/pages/advertisement/advertisement.vue @@ -2,7 +2,7 @@ - + 搜索 @@ -11,18 +11,15 @@ - + + 筛选 - + --> @@ -60,7 +57,7 @@ return { tableData: [], query: { - keyword: '', + advertisingName: '', advertisingType: '', }, pageindex: { @@ -93,7 +90,7 @@ //查询全数据 getAll() { let query = Object.assign(this.pageindex, this.query); - this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', query, 1).then(res => { + this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', query, 1).then(res => { //成功回调 this.tableData = res.data.data.content; }).catch(err => { @@ -105,8 +102,8 @@ this.pageindex = { pageNumber: 1, pageSize: 10, - }; - this.getAll(); + } + this.getAll() }, queryChange(key, val) { this.query[`${key}`] = val[0].value; diff --git a/pages/advertisementAdd/advertisementAdd.vue b/pages/advertisementAdd/advertisementAdd.vue index b0d752d..3205276 100644 --- a/pages/advertisementAdd/advertisementAdd.vue +++ b/pages/advertisementAdd/advertisementAdd.vue @@ -4,140 +4,178 @@ - + - - + + + + - - + + - - + + - - + + - - + + - + - + + + + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + + - - + + - + + + - - + + + + + - - - + + - - + + + - - + + + - - - - + + + + 点击上传证件人像面 - - - + + + 点击上传证件国徽面 - + 上传示例 - + 人脸示例图 - + 国徽面示例图 - 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。 - - - - 是 - 否 + 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。 + + + + 是 + 否 - - + + + + + + - 上一步 + 上一步 下一步 提交申请 @@ -148,50 +186,191 @@ export default { data() { return { - active: 2, - numList: [{name: '租赁信息'}, {name: '主体信息'}, {name: '经营者信息'}], + active: 0, + numList: [{ + name: '租赁信息' + }, { + name: '主体信息' + }, { + name: '经营者信息' + }], model1: { - name: '', + scheduleTime: '', + advertisementContent: '', + redirectUrl: '', + coverImage: '', + adTitle: '', + subjectName: '', + unifiedSocialCreditCode: '', type: '', - typeShow: false, - fileList: [], // 文件列表 + legalRepresentative: '', + businessScope: '', + registeredCapital: '', + establishmentDate: '', + address: '', + emailAddress: '', + businessStartDate: '', + businessEndDate: '', + businessLicense: '', + lesseeName: '', + idCardType: '', + idCardNumber: '', + idCardValidStart: '', + idCardValidEnd: '', + isLegalPerson: '0', + idCardPhotoFront:'', + idCardPhotoBack:'', + enterpriseAuthorization: '', + auditStatus: '1' }, rules: {}, // 类型 showType: false, - activesType: [ - {value: 1, label: '类型1'}, - {value: 2, label: '类型2'}, - ], - // 上传文件 - active: '', // 地址 - - }; + params: { + year: true, + month: true, + day: true, + hour: true, + minute: true, + second: true + }, + params1: { + year: true, + month: true, + day: true + }, + TimeStratshow: false, + typeShow: false, + activesType: [{ + value: 1, + label: '个人' + }, { + value: 2, + label: '企业' + }], + idType: [{ + value: 1, + label: '身份证' + }, ], + IdtypeShow: false, + busStartshow: false, + busEndtshow: false, + idCardStartshow: false, + idCardEndtshow: false, + params: { + year: true, + month: true, + day: true, + }, + ziyuanId: '', + ziyuanType:'', + + } + }, + onLoad(option) { + this.ziyuanId = option.ids + this.ziyuanType = option.type }, - onLoad() { - // 检查用户是否登录 - const isLogin = uni.getStorageSync('token') || false; - if (!isLogin) { - // 如果未登录，跳转到登录页面 - uni.redirectTo({ - url: '/pages/login/login' - }); - } - }, - methods:{ + onShow() { + let shopId = { + shopId:uni.getStorageSync('shopId') || '' + } + const isLogin = uni.getStorageSync('token'); + if (isLogin =='') { + // 如果未登录，跳转到登录页面 + uni.navigateTo({ + url: '/pages/login/login' + }) + }else{ + let page={ + condition:2 + } + this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => { + if(res.data.code !="20004"){ + this.shopMsg = res.data.data + this.Islogin= false + this.$http.sendRequest('/index/index', 'POST',page).then(res => { + //成功回调 + this.tongji = res.data.data + }) + }else{ + uni.navigateTo({ + url: '/pages/login/login' + }) + } + }) + } + + }, + methods: { typeChange(e) { this.model1.type = e[0].label; }, - go(){ - uni.navigateTo({ - url: '/pages/record/record' + getCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = ('0' + (now.getMonth() + 1)).slice(-2); + const day = ('0' + now.getDate()).slice(-2); + const hours = ('0' + now.getHours()).slice(-2); + const minutes = ('0' + now.getMinutes()).slice(-2); + const seconds = ('0' + now.getSeconds()).slice(-2); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, + go() { + let coverImg = [] + let files = [] + let idCardOne = [] + let idCardTwo = [] + let enterS = [] + // // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作) + coverImg = this.$refs.coverImage.lists.filter(val => { + return val.progress == 100; }) - }, - toChangeTime(val) { - uni.navigateTo({ - url: `/pages/advertisementTime/advertisementTime?val=${val}` + coverImg.map(item => { + this.model1.coverImage = item.response.data.url + }) + files = this.$refs.businessLicense.lists.filter(val => { + return val.progress == 100; + }) + + files.map(item => { + this.model1.businessLicense = item.response.data.url + }) + idCardOne = this.$refs.idCardPhotoFront.lists.filter(val => { + return val.progress == 100; + }) + idCardOne.map(item => { + this.model1.idCardPhotoFront = item.response.data.url + + }) + idCardTwo = this.$refs.idCardPhotoBack.lists.filter(val => { + return val.progress == 100; + }) + idCardTwo.map(item => { + this.model1.idCardPhotoBack = item.response.data.url + }) + enterS = this.$refs.enter.lists.filter(val => { + return val.progress == 100; + }) + enterS.map(item => { + this.model1.enterpriseAuthorization = item.response.data.url + }) + this.model1.rentalResourcesId = this.ziyuanId + this.model1.advertisingSpaceType = this.ziyuanType + this.model1.applicant = uni.getStorageSync('shopId') + this.model1.applicationTime = this.getCurrentTime() + this.$http.sendRequest('/cereAdvertiserInfo/add', 'POST', this.model1, 1).then(res => { + uni.navigateTo({ + url: '/pages/record/record' + }) }) }, + // toChangeTime(val) { + // uni.navigateTo({ + // url: `/pages/advertisementTime/advertisementTime?val=${val}` + // }) + // }, // 上一步 toBefor() { this.active = +this.active - 1; @@ -199,11 +378,66 @@ // 下一步 toNext() { this.active = +this.active + 1; - } + }, + startTimeChange(val) { + this.model1.scheduleTime = this.timeChange(val) + }, + timeChange(val) { + const { + year, + month, + day, + } = val; + return `${year}-${month}-${day}`; + }, + leiXpops(val) { + this.model1.intentionalBusinessType = val[0].label + }, + busStTimeChange(val) { + this.model1.businessStartDate = this.timeChange(val) + this.model1.businessEndDate = '' + }, + busEndTimeChange(val) { + const time = this.timeChange(val); + if (new Date(time).getTime() > new Date(this.model1.businessStartDate).getTime()) { + this.model1.businessEndDate = time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + idCardStTimeChange(val) { + this.model1.idCardValidStart = this.timeChange1(val) + this.model1.idCardValidEnd = '' + }, + idCardEndTimeChange(val) { + const time = this.timeChange1(val); + if (new Date(time).getTime() > new Date(this.model1.idCardValidStart).getTime()) { + this.model1.idCardValidEnd = time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + IdtypeChange(e) { + this.model1.idCardType = e[0].label; + }, + timeChange1(val) { + const { + year, + month, + day + } = val; + return `${year}-${month}-${day}`; + }, } } + \ No newline at end of file diff --git a/pages/advertisementApply/advertisementApply.vue b/pages/advertisementApply/advertisementApply.vue index 53eaee5..2b4a669 100644 --- a/pages/advertisementApply/advertisementApply.vue +++ b/pages/advertisementApply/advertisementApply.vue @@ -77,7 +77,7 @@ - + 点击上传证件人像面 @@ -85,7 +85,7 @@ - + 点击上传证件国徽面 @@ -96,11 +96,11 @@ 上传示例 - + 人脸示例图 - + 国徽面示例图 diff --git a/pages/advertisementDetail/advertisementDetail.scss b/pages/advertisementDetail/advertisementDetail.scss index 61a2a9d..5fa5eb8 100644 --- a/pages/advertisementDetail/advertisementDetail.scss +++ b/pages/advertisementDetail/advertisementDetail.scss @@ -144,7 +144,7 @@ padding-bottom: env(safe-area-inset-bottom); .footer-btn { display: flex; - width: 70vw; + } .footer-service { display: flex; diff --git a/pages/advertisementDetail/advertisementDetail.vue b/pages/advertisementDetail/advertisementDetail.vue index 5900783..e18bdfe 100644 --- a/pages/advertisementDetail/advertisementDetail.vue +++ b/pages/advertisementDetail/advertisementDetail.vue @@ -66,19 +66,20 @@ - - + - - - + --> + + 意向申请 + 租赁申请 + + + + @@ -103,13 +104,13 @@ export default { onLoad(option){ let data = JSON.parse(option.item) this.tableData = data; - console.log(this.tableData); }, methods: { leaseAdd(url){ - uni.navigateTo({ - url - }) + console.log(this.tableData) + uni.navigateTo({ + url:`${url}?ids=${this.tableData.id}&type=${this.tableData.advertisingType}` + }) } } }; diff --git a/pages/advertisementTime/advertisementTime.vue b/pages/advertisementTime/advertisementTime.vue index 156586e..6c0d1f6 100644 --- a/pages/advertisementTime/advertisementTime.vue +++ b/pages/advertisementTime/advertisementTime.vue @@ -1,6 +1,6 @@ @@ -87,7 +82,10 @@ export default { } }; }, - onLoad(option){}, + onLoad(option){ + this.tableData = JSON.parse(option.item) + console.log(this.tableData) + }, methods: { submit() { this.joinShow = false; diff --git a/pages/business/businessList/businessList.vue b/pages/business/businessList/businessList.vue index 37dec5a..0e4a6ba 100644 --- a/pages/business/businessList/businessList.vue +++ b/pages/business/businessList/businessList.vue @@ -3,18 +3,18 @@ - + 搜索 - + - 商务合作标题商务合作标题商务合作标题商务合作标题 - 2023-02-02 14:54 + {{v.title}} + - + @@ -37,24 +37,29 @@ { name: '已结束' }, ], current: 0, - datalist: [{}, {}, {}], + datalist: [], total: 2, statuslist: 'loadmore', - query: { - keyword: '', - pageSize: 10, - pageNum: 0, - }, + query: { + title: '', + pageNumber: 1, + pageSize: 10, + + }, listIn:0, num:0, + list:[] }; }, onLoad(option) { - console.log(option.id); - this.num = option.id; + // console.log(option.id); + // this.num = option.id; this.statuslist = 'nomore'; }, + mounted() { + this.getALL() + }, onPullDownRefresh(e) { let that = this that.statuslist = 'loading'; @@ -72,7 +77,27 @@ tabsChange(val) { this.current = val; }, - search() {}, + search() { + this.$http.sendRequest('/cereBusinessCooperation/queryByPage', 'POST', this.query,1).then(res => { + this.list =res.data.data.content + this.query ={ + title: '', + pageNumber: 1, + pageSize: 10, + + } + }) + }, + getALL(){ + let pagesize = { + pageNumber: 1, + pageSize: 2 + } + + this.$http.sendRequest('/cereBusinessCooperation/queryByPage', 'POST', pagesize,1).then(res => { + this.list =res.data.data.content + }) + }, loading() { let that = this if(that.statuslist == 'nomore') return; @@ -88,10 +113,12 @@ sel(val){ this.listIn = val }, - toDetail() { + toDetail(items) { + let msg = JSON.stringify(items) uni.navigateTo({ - url: '/pages/business/businessDetail/businessDetail' + url: `/pages/business/businessDetail/businessDetail?item=${msg}` }) + }, reconciliationdetail() { diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue index 82af1eb..9fde5a3 100644 --- a/pages/complaint/complaint.vue +++ b/pages/complaint/complaint.vue @@ -1,42 +1,76 @@ @@ -40,14 +50,125 @@ return { form: { name: '', + remarks:'', + questionId:'', + }, - value:0 - }; + items: [{ + tikuTitle: '', + questionBank:'用户端题库', + questionType: '', + optionSettings: [{ + ules:'' + }], + }], + xuanSet:[{ + ules:'' + }], + value:0, + typeShow:false, + questionnaireType: [{ + value: 1, + label: '单选' + }, + { + value: 2, + label: '多选' + } + ], + tixinIndex:0, + formS:{ + + } + } + }, + onLoad(option) { + if(option.data){ + this.form = {...this.form,...JSON.parse(option.data)} + this.formS = JSON.parse(option.data) + } + }, methods:{ + go(urls){ + uni.navigateTo({ + url:`${urls}` + }) + }, bindTextAreaBlur: function (e) { console.log(e.detail.value) - } + }, + addItems() { + this.items.push({ + tikuTitle: '', + questionBank:'用户端题库', + questionType: '', + optionSettings: [{ + ules:'' + }], + }) + }, + addxuan(index){ + this.items[index].optionSettings.push({ + ules:'', + }) + }, + del(index){ + this.items.splice(index, 1) + + }, + moveUp(index) { + if (index > 0) { + // 使用数组的 splice 方法交换元素位置 + this.items.splice(index - 1, 0, this.items.splice(index, 1)[0]); + } + }, + moveDown(index) { + if (index < this.items.length - 1) { + // 使用数组的 splice 方法交换元素位置 + this.items.splice(index + 1, 0, this.items.splice(index, 1)[0]); + } + }, + tijiao(){ + let Ids = []; + let promises = this.items.map(tem => { + tem.optionSettings = tem.optionSettings.map(item => `"ules":"${item.ules}"`).join(',') + tem.user = uni.getStorageSync('shopId'); + return this.$http.sendRequest('/cereQuestionManagement/add', 'POST', tem, 1).then(res => { + Ids.push(res.data.data.id) + }) + }) + + Promise.all(promises).then(() => { + this.form.questionId = Ids.join(','); + let obj = { ...this.form, ...this.formS } + this.$http.sendRequest('/cereQuestionnaireTable/add', 'POST', obj, 1).then(res => { + uni.redirectTo({ + url: '/pages/questionnaire/questionnaire' + }) + }) + }).catch(error => { + console.error('Error:', error); + }) + }, + tixin(index){ + this.typeShow = true + this.tixinIndex = index + }, + typeChange(e) { + this.items[this.tixinIndex].questionType = e[0].label + }, + goDetail(){ + + let obj ={ + msg :this.items + } + obj = JSON.stringify(obj) + uni.navigateTo({ + url: `/pages/questionnaire/questDetail/questDetail?detail=${JSON.stringify(obj)}` + }) + + }, } } diff --git a/pages/details/details.scss b/pages/details/details.scss index 7172075..e25d405 100644 --- a/pages/details/details.scss +++ b/pages/details/details.scss @@ -150,7 +150,6 @@ padding-bottom: env(safe-area-inset-bottom); .footer-btn { display: flex; - width: 70vw; } .footer-service { display: flex; @@ -158,7 +157,7 @@ align-items: center; text { margin-top: 6rpx; - line-height: 42rpx; + line-height: 32rpx; } } } \ No newline at end of file diff --git a/pages/details/details.vue b/pages/details/details.vue index 03a8997..cad3acf 100644 --- a/pages/details/details.vue +++ b/pages/details/details.vue @@ -1,20 +1,18 @@ @@ -120,21 +119,34 @@ export default { ], latitude: 39.909, longitude: 116.39742, + qianzui:'', }; }, onLoad(option){ + let data = JSON.parse(option.item) + console.log(data) + if(data.shopName){ + this.qianzui = 'sp' + }else{ + this.qianzui = 'cd' + } this.swiperList[0].url = data.displayMainImage || data.locationDiagram - this.tableData = data; - let location = JSON.parse(data.mapPunctuation) + this.tableData = data + let location + if(data.mapPunctuation){ + location = JSON.parse(data.mapPunctuation) + }else{ + location = JSON.parse(data.mapMarker) + } this.latitude = location.latitude; this.longitude = location.longitude; - console.log(this.swiperList, this.tableData); + }, methods: { leaseAdd(url){ uni.navigateTo({ - url + url:`${url}?ids=${this.qianzui+this.tableData.id}` }) } } diff --git a/pages/dialogue/dialogue.vue b/pages/dialogue/dialogue.vue new file mode 100644 index 0000000..b0ac188 --- /dev/null +++ b/pages/dialogue/dialogue.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/pages/field/field.scss b/pages/field/field.scss index 7aeb72c..4406a8a 100644 --- a/pages/field/field.scss +++ b/pages/field/field.scss @@ -13,39 +13,25 @@ margin: 20rpx; .search{ display: flex; + width:100%; align-items: center; - width: 100%; - height: 72rpx; - // border: 2rpx solid #E8E8E8; - border-radius: 100rpx; - .icon{ - display: flex; - align-items: center; - margin-left: 20rpx; - margin-right: 15rpx; - image{ - width: 29rpx; - height: 29rpx; - } - } - .hint{ - display: flex; - align-items: center; + justify-content: space-between; + position: relative; + background-color: #FFFFFF; + border-radius: 35rpx; + padding: 0 10rpx; + border: 2rpx solid #E8E8E8; + + .u-search { position: relative; - width: 100%; - .max{ - font-size: 26rpx; - color: #fff; - background-color:#3F9B6A; - border-radius: 100rpx; - padding: 10rpx 25rpx; - position: absolute; - right: 0; - } - .min{ - font-size: 26rpx; - color: #B5B5B5; - } + } + .u-btn { + border: unset; + border: 0px transparent; + height: 46rpx; + width: 88rpx; + font-size: 24rpx; + border-radius: 35rpx; } } } @@ -85,7 +71,10 @@ padding: 0 25rpx; .list{ display: flex; - margin-bottom: 40rpx; + margin-bottom: 20rpx; + background-color: #fff; + padding: 14rpx; + border-radius: 14rpx; .thumb{ display: flex; align-items: center; diff --git a/pages/field/field.vue b/pages/field/field.vue index 1a8159c..8252c9b 100644 --- a/pages/field/field.vue +++ b/pages/field/field.vue @@ -4,22 +4,17 @@ - - + + 搜索 - + 区域 + - + - + - + - 标题 + {{item.activityName}} - 活动日期：04-13至05-10 - 举办方：咖啡厅 + 创建时间：{{item.startTime}} + 参与人数：{{item.maxParticipants}} @@ -261,18 +269,18 @@ 营销推广活动 - 查看更多 > + 查看更多 > - + - + - 标题 + {{item.title}} - 活动日期：04-13至05-10 - 举办方：咖啡厅 + 活动日期：{{item.startTime}}至{{item.endTime}} + 举办方： @@ -283,15 +291,15 @@ 商务合作 - 查看更多 > + 查看更多 > - + - + - 标题 + {{item.title}} @@ -318,8 +326,8 @@ tableData: [], procedureData:[],//公告 pageindex: { - pageNumber: 1, - pageSize: 10 + pageNumber: 1, + pageSize: 10, }, swiperList: [],//轮播 zujin:[ @@ -345,7 +353,10 @@ name: '广告位' } ], - current:0 + current:0, + yingxiaoData:[], + shangwuData:[], + activity:[] } }, onLoad() { @@ -364,6 +375,21 @@ pageNumber: 1, pageSize: 2 } + let actPages = { + pageNumber: 1, + pageSize: 2, + reviewStatus:'2' + } + let shopAct = { + auditStatus:'3', + pageNumber: 1, + pageSize: 2, + } + let shanghu = { + status:'1', + pageNumber: 1, + pageSize: 2, + } this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', pagesize,1).then(res => { //成功回调 @@ -373,11 +399,24 @@ //成功回调 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) { - this.current = type; + let pagesize = { + pageNumber: 1, + pageSize: 2 + } + this.current = type if (type == 0) { - this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex,1).then(res => { + this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', pagesize,1).then(res => { //成功回调 this.tableData = res.data.data.content }).catch(err => { @@ -385,7 +424,7 @@ //请求失败 }) } else if (type == 1) { - this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', this.pageindex,1).then(res => { + this.$http.sendRequest('/cereBasicInformationVenue/queryByPage', 'POST', pagesize,1).then(res => { //成功回调 this.tableData = res.data.data.content }).catch(err => { @@ -394,8 +433,8 @@ }) } else if (type == 2) { - this.pageindex.advertisingType = '线上广告位' - this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', this.pageindex,1).then(res => { + pagesize.advertisingType = '线上广告位' + this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize,1).then(res => { //成功回调 this.tableData = res.data.data.content }).catch(err => { @@ -416,9 +455,20 @@ }) }, toDetail(item, path) { - let items = JSON.stringify(item); uni.navigateTo({ - url: `${path}?item=${items}` + url: `${path}?item=${item}` + }) + + }, + toDetailTwo(item, path){ + let items = JSON.stringify(item) + uni.navigateTo({ + url: `${path}?item=${items}` + }) + }, + goDetail(path) { + uni.navigateTo({ + url: `${path}` }) }, advertisement() { @@ -427,10 +477,15 @@ }) }, gaozhi(item){ + // let items = JSON.stringify(item) + // uni.navigateTo({ + // url: `/pages/procedureDetail/procedureDetail?item=${items}` + // }) let items = JSON.stringify(item) uni.navigateTo({ url: `/pages/procedure/procedure?item=${items}` }) + }, details(item) { let items = JSON.stringify(item) @@ -482,6 +537,17 @@ tabsChange(itme){ console.log(itme) this.onCouponTab(itme) + }, + wuye(){ + uni.navigateTo({ + url: `/pages/propertyPay/propertyPayList/propertyPayList` + }) + + }, + piaowu(){ + uni.navigateTo({ + url: `/pages/ticketBooking/ticketBooking` + }) } } }; diff --git a/pages/intentionApply/intentionApply.vue b/pages/intentionApply/intentionApply.vue index c93815e..6e91019 100644 --- a/pages/intentionApply/intentionApply.vue +++ b/pages/intentionApply/intentionApply.vue @@ -11,97 +11,116 @@ - + - - + + + + - - + + + + + + + - - + + - - + + - - + + - - + + - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + + - - + + + - + - - + + - - - + + + - - + + - - + + + + + + + + - + - + 点击上传证件人像面 - - + + - + 点击上传证件国徽面 @@ -112,30 +131,35 @@ 上传示例 - + 人脸示例图 - + 国徽面示例图 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。 - - + + 是 - 否 + 否 - - + + + + + + + 上一步 @@ -149,44 +173,205 @@ export default { data() { return { - active: 2, + active: 0, numList: [{name: '意向申请'}, {name: '主体信息'}, {name: '经营者信息'}], + // model1: { + // name: '', + // type: '', + // typeShow: false, + // fileList: [], // 文件列表 + // }, model1: { - name: '', - type: '', - typeShow: false, - fileList: [], // 文件列表 + intentCustomerName: '', //意向客户名称 + contactPhone: '', //联系电话 + entityType: '', //主体类型 + customerLevel: '', //客户级别 + isLegalPerson: '', //是否为法人(0:否,1:是) + enterpriseAuthorization: '', //企业授权书 + idCardNumber: '', //身份证号 + idCardType: '', //证件类型 + idCardValidStart: '', //身份证有效开始时间 + idCardValidEnd: '', //身份证有效结束时间 + idCardPhotoFront: '', //身份证照片(正面) + idCardPhotoBack: '', //身份证照片(反面) + subjectName: '', //主体名称 + unifiedSocialCreditCode: '', //统一社会信用代码 + type: '', //类型(可能是企业类型等) + legalRepresentative: '', //法定代表人 + businessScope: '', //经营范围 + registeredCapital: '', //注册资本 + establishmentDate: '', //成立日期 + address: '', //住所 + emailAddress: '', //邮箱地址 + businessStartTime: '', //营业开始时间(如果为全天，则可为NULL或指定默认时 + businessEndTime: '', //营业结束时间(如果为全天，则可为NULL或指定默认时 + businessLicense: '', //营业执照(存储路径或URL) + intendedResources: '', //意向资源 + auditStatus:'1', + rentalPeriodStartTime:'', + rentalPeriodEndTime:'', + leaseTerm:'', + rent:'', + intentionalBusinessType:'', + intendedArea:'', + intentionalStoreLocation:'', + intentionalStoreName:'' }, + TimeStratshow:false, + TimeEndshow:false, rules: {}, // 类型 showType: false, activesType: [ - {value: 1, label: '类型1'}, - {value: 2, label: '类型2'}, + {value:1 , label: '个人'}, + {value:2 , label: '企业'}, ], + idType: [ + {value:1 , label: '身份证'}, + ], + // 上传文件 active: '', // 地址 + ziyuanId:'', + params: { + year: true, + month: true, + day: true, + }, + params1: { + year: true, + month: true, + day: true + }, + leiXinglist: [{ + value: '商铺', + label: '商铺' + }, + { + value: '场地', + label: '场地' + }, + { + value: '广告位', + label: '广告位' + } + ], + leiXpopup :false, + typeShow:false, + IdtypeShow:false, + busStartshow:false, + busEndtshow:false, + idCardStartshow:false, - }; + idCardEndtshow:false, + + } }, onLoad(option) { - // 检查用户是否登录 - const isLogin = uni.getStorageSync('token') || false; - if (!isLogin) { - // 如果未登录，跳转到登录页面 - uni.redirectTo({ - url: '/pages/login/login' - }); - } + this.ziyuanId = option.ids + }, + onShow() { + let shopId = { + shopId:uni.getStorageSync('shopId') || '' + } + const isLogin = uni.getStorageSync('token'); + if (isLogin =='') { + // 如果未登录，跳转到登录页面 + uni.navigateTo({ + url: '/pages/login/login' + }) + }else{ + let page={ + condition:2 + } + this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => { + if(res.data.code !="20004"){ + this.shopMsg = res.data.data + this.Islogin= false + this.$http.sendRequest('/index/index', 'POST',page).then(res => { + //成功回调 + this.tongji = res.data.data + }) + }else{ + uni.navigateTo({ + url: '/pages/login/login' + }) + } + }) + } + }, methods:{ + startTimeChange(val) { + this.model1.rentalPeriodStartTime = this.timeChange(val) + this.model1.rentalPeriodEndTime = '' + }, + EndTimeChange(val){ + const time = this.timeChange(val); + if(new Date(time).getTime() > new Date(this.model1.rentalPeriodStartTime).getTime()) { + this.model1.rentalPeriodEndTime= time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + timeChange(val) { + const { year, month, day} = val; + return `${year}-${month}-${day}`; + }, + timeChange1(val) { + const { year, month, day } = val; + return `${year}-${month}-${day}`; + }, typeChange(e) { this.model1.type = e[0].label; }, + IdtypeChange(e) { + this.model1.idCardType = e[0].label; + }, go(){ - uni.navigateTo({ - url: '/pages/record/record' + let busfiles = [] + let idfilesz = [] + let idfilesf= [] + let enterper= [] + // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作) + busfiles = this.$refs.businessLicense.lists.filter(val => { + return val.progress == 100; }) + idfilesz = this.$refs.idCardzhen.lists.filter(val => { + return val.progress == 100; + }) + idfilesf = this.$refs.idCardFan.lists.filter(val => { + return val.progress == 100; + }) + enterper = this.$refs.enter.lists.filter(val => { + return val.progress == 100; + }) + + busfiles.map(item=>{ + this.model1.businessLicense = item.response.data.url + }) + idfilesz.map(item=>{ + this.model1.idCardPhotoFront = item.response.data.url + }) + idfilesf.map(item=>{ + this.model1.idCardPhotoBack = item.response.data.url + }) + enterper.map(item=>{ + this.model1.enterpriseAuthorization = item.response.data.url + }) + this.model1.intendedResources = this.ziyuanId + this.model1.createUser = uni.getStorageSync('shopId') + this.$http.sendRequest('/cereCustomerInfo/add', 'POST',this.model1,1).then(res => { + uni.switchTab({ + url: '/pages/home/home' + }) + }) + // uni.navigateTo({ + // url: '/pages/record/record' + // }) }, // 上一步 toBefor() { @@ -195,7 +380,43 @@ // 下一步 toNext() { this.active = +this.active + 1; - } + }, + leiXpops(val){ + this.model1.intentionalBusinessType = val[0].label + }, + busStTimeChange(val){ + this.model1.businessStartTime = this.timeChange(val) + this.model1.businessEndTime = '' + }, + busEndTimeChange(val){ + const time = this.timeChange(val); + + if(new Date(time).getTime() > new Date(this.model1.businessStartTime).getTime()) { + this.model1.businessEndTime= time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + idCardStTimeChange(val){ + this.model1.idCardValidStart = this.timeChange1(val) + this.model1.idCardValidEnd = '' + }, + idCardEndTimeChange(val){ + const time = this.timeChange1(val); + + if(new Date(time).getTime() > new Date(this.model1.idCardValidStart).getTime()) { + this.model1.idCardValidEnd= time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + } } diff --git a/pages/leaseAdd/leaseAdd.vue b/pages/leaseAdd/leaseAdd.vue index 4d30c02..06e0b66 100644 --- a/pages/leaseAdd/leaseAdd.vue +++ b/pages/leaseAdd/leaseAdd.vue @@ -4,125 +4,153 @@ - + - - + + - - + + - - + + - + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + + + + + + - + - - + + + + + - - - + + - - + + + - - + + + - - - + + + 点击上传证件人像面 - - - + + + 点击上传证件国徽面 - + 上传示例 - + 人脸示例图 - + 国徽面示例图 - 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。 - - - + 请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。 + + + 是 - 否 + 否 - - + + + + + - 上一步 + 上一步 下一步 提交申请 @@ -133,43 +161,165 @@ export default { data() { return { - active: 2, - numList: [{name: '租赁信息'}, {name: '主体信息'}, {name: '经营者信息'}], + active: 0, + numList: [{ + name: '租赁信息' + }, { + name: '主体信息' + }, { + name: '经营者信息' + }], model1: { - name: '', - type: '', - typeShow: false, - fileList: [], // 文件列表 + businessPurpose: '', + intendedLeaseTerm: '', + operatingEntity: '', + entityName: '', + unifiedSocialCreditCode: '', + entityType: '', + legalRepresentative: '', + businessScope: '', + registeredCapital: '', + establishmentDate: '', + residence: '', + emailAddress: '', + businessStartDate: '', + businessEndDate: '', + operatorName: '', + idCardType: '', + idNumber: '', + idValidStart: '', + idValidEnd: '', + idPhotoFront:'', + idPhotoBack: '', + isLegalPerson: '', + enterpriseAuthorization: '', + auditStatus: '1' }, rules: {}, // 类型 showType: false, - activesType: [ - {value: 1, label: '类型1'}, - {value: 2, label: '类型2'}, + params: { + year: true, + month: true, + day: true, + }, + params1: { + year: true, + month: true, + day: true + }, + TimeStratshow: false, + typeShow: false, + activesType: [{ + value: 1, + label: '个人' + }, + { + value: 2, + label: '企业' + }, ], - // 上传文件 - active: '', // 地址 - + idType: [{ + value: 1, + label: '身份证' + }, ], + IdtypeShow: false, + busStartshow: false, + busEndtshow: false, + idCardStartshow: false, + idCardEndtshow: false, + ziyuanId: '' + }; }, onLoad(option) { - // 检查用户是否登录 - const isLogin = uni.getStorageSync('token') || false; - if (!isLogin) { - // 如果未登录，跳转到登录页面 - uni.redirectTo({ - url: '/pages/login/login' - }); - } + this.ziyuanId = option.ids }, - methods:{ + onShow() { + let shopId = { + shopId:uni.getStorageSync('shopId') || '' + } + const isLogin = uni.getStorageSync('token'); + if (isLogin =='') { + // 如果未登录，跳转到登录页面 + uni.navigateTo({ + url: '/pages/login/login' + }) + }else{ + let page={ + condition:2 + } + this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => { + if(res.data.code !="20004"){ + this.shopMsg = res.data.data + this.Islogin= false + this.$http.sendRequest('/index/index', 'POST',page).then(res => { + //成功回调 + this.tongji = res.data.data + }) + }else{ + uni.navigateTo({ + url: '/pages/login/login' + }) + } + }) + } + + }, + methods: { typeChange(e) { - this.model1.type = e[0].label; + this.model1.entityType = e[0].label; }, - go(){ - uni.navigateTo({ - url: '/pages/record/record' +getCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = ('0' + (now.getMonth() + 1)).slice(-2); + const day = ('0' + now.getDate()).slice(-2); + const hours = ('0' + now.getHours()).slice(-2); + const minutes = ('0' + now.getMinutes()).slice(-2); + const seconds = ('0' + now.getSeconds()).slice(-2); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, + go() { + let files = [] + let idCardOne = [] + let idCardTwo = [] + let enter = [] + // // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作) + files = this.$refs.businessLicense.lists.filter(val => { + return val.progress == 100; + }) + files.map(item => { + this.model1.businessLicense = item.response.data.url + }) + idCardOne = this.$refs.idPhotoFront.lists.filter(val => { + return val.progress == 100; + }) + idCardOne.map(item => { + this.model1.idPhotoFront = item.response.data.url + + }) + idCardTwo = this.$refs.idPhotoBack.lists.filter(val => { + return val.progress == 100; + }) + idCardTwo.map(item => { + this.model1.idPhotoBack = item.response.data.url + }) + enter = this.$refs.enter.lists.filter(val => { + return val.progress == 100; + }) + enter.map(item => { + this.model1.enterpriseAuthorization = item.response.data.url + }) + + this.model1.rentalResourcesId = this.ziyuanId + this.model1.applicant = uni.getStorageSync('shopId') + this.model1.applicationTime = this.getCurrentTime() + this.$http.sendRequest('/cereBusinessInfo/add', 'POST', this.model1, 1).then(res => { + uni.redirectTo({ + url: '/pages/record/record' + }) }) }, // 上一步 @@ -179,11 +329,67 @@ // 下一步 toNext() { this.active = +this.active + 1; - } + }, + startTimeChange(val) { + this.model1.scheduleTime = this.timeChange(val) + }, + timeChange(val) { + const { + year, + month, + day, + } = val; + return `${year}-${month}-${day}`; + }, + leiXpops(val) { + this.model1.intentionalBusinessType = val[0].label + }, + busStTimeChange(val) { + this.model1.businessStartDate = this.timeChange(val) + this.model1.businessEndDate = '' + }, + busEndTimeChange(val) { + const time = this.timeChange(val); + if (new Date(time).getTime() > new Date(this.model1.businessStartDate).getTime()) { + this.model1.businessEndDate = time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + idCardStTimeChange(val) { + this.model1.idValidStart = this.timeChange1(val) + this.model1.idValidEnd = '' + + }, + idCardEndTimeChange(val) { + const time = this.timeChange1(val); + if (new Date(time).getTime() > new Date(this.model1.idValidStart).getTime()) { + this.model1.idValidEnd = time + } else { + this.$refs.uToast.show({ + title: '结束时间不能小于开始时间', + type: 'error', + }) + } + }, + IdtypeChange(e) { + this.model1.idCardType = e[0].label; + }, + timeChange1(val) { + const { + year, + month, + day + } = val; + return `${year}-${month}-${day}`; + }, } } + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 35b585b..d477223 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -108,7 +108,6 @@ }, goyinsi(){ - console.log('1222222222222') uni.navigateTo({ url: '/pages/privacy/privacy' }); @@ -139,7 +138,7 @@ uni.setStorageSync('token', res.data.data.token); uni.setStorageSync('shopId', res.data.data.shopId); uni.switchTab({ - url: '/pages/my/my' + url: '/pages/home/home' }) }else{ uni.showToast({ diff --git a/pages/marketing/marketingDetail/marketingDetail.scss b/pages/marketing/marketingDetail/marketingDetail.scss index c282da8..d1a7154 100644 --- a/pages/marketing/marketingDetail/marketingDetail.scss +++ b/pages/marketing/marketingDetail/marketingDetail.scss @@ -28,6 +28,13 @@ align-items: center; justify-content: space-between; margin-bottom: 30rpx; + + } + .times{ + white-space: nowrap; /* 不换行 */ + overflow: hidden; /* 隐藏超出部分 */ + text-overflow: ellipsis; /* 显示省略号 */ + width:70%; } } // 活动信息 @@ -50,17 +57,17 @@ position: fixed; left: 0; bottom: 0; - display: flex; - align-items: center; - justify-content: center; + // display: flex; + // align-items: center; + // justify-content: center; width: 100%; height: 125rpx; background-color: #FFFFFF; padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); .footer-btn { - display: flex; - width: 70vw; + padding: 0 10%; + margin-top: 20rpx; } .footer-service { display: flex; @@ -74,8 +81,10 @@ } .userForm { + margin: 0 40rpx ; .form-box { padding: 28rpx; + } .title { font-size: 32rpx; diff --git a/pages/marketing/marketingDetail/marketingDetail.vue b/pages/marketing/marketingDetail/marketingDetail.vue index 710233d..4d03cb8 100644 --- a/pages/marketing/marketingDetail/marketingDetail.vue +++ b/pages/marketing/marketingDetail/marketingDetail.vue @@ -2,26 +2,18 @@ - + - - - 客服 - + - 报名参加 - - - - 分享 + 报名参加 + + - - - 请填写您的报名信息 - - - 提交 + + + + 请填写您的报名信息 + + + 提交 + + @@ -74,21 +70,79 @@ export default { ], joinShow: false, form: { - name: '', - pahone: '', + activityId:'', + userId:'', + createTime:'', + createUser:'', + userName: '', + userPhone: '', + }, + pagesize: { + pageNumber: 1, + pageSize: 2, + id:null, } }; }, - onLoad(option){}, + onLoad(option){ + let str = unescape(option.scene); + +if(option.scene){ + let str = unescape(option.scene) + // 使用 split() 方法按等号分割字符串，并获取第二个元素（索引为1），即带单引号的值 + let valueWithQuotes = str.split('=')[1]; + + // 使用 slice() 或 substring() 去除两端的单引号 + let value = valueWithQuotes.slice(1, -1); + this.pagesize.id = value + this.form.activityId = value +}else{ + this.pagesize.id = option.item + this.form.activityId = option.item +} + this.$http.sendRequest('/cereMarketingActivity/queryById', 'POST',this.pagesize,1).then(res => { + this.tableData =res.data.data + }) + + }, methods: { submit() { - this.joinShow = false; + this.form.createTime = this.getCurrentDateTime() + this.$http.sendRequest('/cereEventRegistration/add', 'POST',this.form,1).then(res => { + + // uni.showToast({ + // title: res.data.message, + // duration: 2000, + + // }) + this.$refs.uToast.show({ + title: res.data.message, + url: '/pages/home/home' + }) + // uni.switchTab({ + // url: '/pages/home/home' + // }) + }) + this.joinShow = false + + }, leaseAdd(){ uni.navigateTo({ url: '/pages/leaseAdd/leaseAdd' }) }, + getCurrentDateTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1 + const day = String(now.getDate()).padStart(2, '0'); + const hours = String(now.getHours()).padStart(2, '0'); + const minutes = String(now.getMinutes()).padStart(2, '0'); + const seconds = String(now.getSeconds()).padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, } }; diff --git a/pages/marketing/marketingList/marketingList.scss b/pages/marketing/marketingList/marketingList.scss index 85f60d0..331cb7a 100644 --- a/pages/marketing/marketingList/marketingList.scss +++ b/pages/marketing/marketingList/marketingList.scss @@ -99,6 +99,10 @@ line-height: 30rpx; color: #3D3D3D; margin-bottom: 12rpx; + white-space: nowrap; /* 防止文本换行 */ + text-overflow: ellipsis; /* 显示省略号 */ + /* 如果需要设置宽度，可以添加 width 属性 */ + overflow:hidden; } } } diff --git a/pages/marketing/marketingList/marketingList.vue b/pages/marketing/marketingList/marketingList.vue index 1044b1b..db854ca 100644 --- a/pages/marketing/marketingList/marketingList.vue +++ b/pages/marketing/marketingList/marketingList.vue @@ -3,10 +3,10 @@ - + 搜索 - + - + - + - 这里有标题这里有标题这里有标题 - 锦江绿道官方活动 + {{item.title}} + 活动时间：{{item.startTime}}至{{item.endTime}} @@ -42,13 +42,13 @@ data() { return { status: 'loadmore', - list: 3, + list: [], total: 1, query: { - keyword: '', // 搜索项 + title: '', // 搜索项 sortType: '', // 排序方式 status: '', // 活动状态 - pageNum: 0, + pageNumber:1, pageSize: 10, }, sortshow: false, @@ -81,7 +81,20 @@ onReachBottom(e) { this.loading(); }, + mounted() { + this.getALL() + }, methods: { + getALL(){ + let pagesize = { + pageNumber: 1, + pageSize: 2 + } + + this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', pagesize,1).then(res => { + this.list =res.data.data.content + }) + }, toMyAdd() { // 跳转我的活动申请 uni.navigateTo({ @@ -89,8 +102,17 @@ }) }, search() { - // 搜索 - // this.loading(); + this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', this.query,1).then(res => { + this.list =res.data.data.content + this.query ={ + title: '', // 搜索项 + sortType: '', // 排序方式 + status: '', // 活动状态 + pageNumber: 1, + pageSize: 10, + + } + }) }, queryChange(key, val) { this.query[`${key}`] = val[0].value; @@ -106,9 +128,10 @@ that.status = that.list >= that.total ? 'nomore' : 'loadmore'; }, 300) }, - toDetail() { + toDetail(items) { + let msg = JSON.stringify(items) uni.navigateTo({ - url: '/pages/marketing/marketingDetail/marketingDetail' + url: `/pages/marketing/marketingDetail/marketingDetail?item=${msg}` }) }, join(){ diff --git a/pages/message/message.vue b/pages/message/message.vue index be88856..6833881 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -15,7 +15,7 @@ - + @@ -25,16 +25,16 @@ 通知消息 - 这里有最新消息这里有最新消息这里有最新消息这里有最新消息 + {{tableList[0].content}} - 2 - 11:28 + + {{formatTime(tableList[0].createdAt)}} - + + - + + @@ -192,7 +192,7 @@ - + --> @@ -209,17 +209,46 @@ data() { return { scrollTop: 0, - }; + tableList:[], + pagesize :{ + pageNumber: 1, + pageSize: 2 + } + } }, onLoad() { - // 检查用户是否登录 - const isLogin = uni.getStorageSync('token') || false; - if (!isLogin) { + + }, + onShow() { + let shopId = { + shopId:uni.getStorageSync('shopId') || '' + } + const isLogin = uni.getStorageSync('token'); + if (isLogin =='') { // 如果未登录，跳转到登录页面 - + uni.navigateTo({ + url: '/pages/login/login' + }) }else{ - this.cheng = false - } + let page={ + condition:2 + } + this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => { + if(res.data.code !="20004"){ + this.shopMsg = res.data.data + this.Islogin= false + this.$http.sendRequest('/index/index', 'POST',page).then(res => { + //成功回调 + this.tongji = res.data.data + }) + }else{ + uni.navigateTo({ + url: '/pages/login/login' + }) + } + }) + } + }, onReady() { uni.hideTabBar(); @@ -227,7 +256,37 @@ onPageScroll(e) { this.scrollTop = e.scrollTop; }, + mounted() { + this.getALL() + }, methods:{ + getALL(){ + this.$http.sendRequest('/cereMessageNotification/queryByPage','POST',this.pagesize,1).then(res => { + this.tableList =res.data.data.content + }) + }, + toDialogue(){ + uni.navigateTo({ + url:'/pages/dialogue/dialogue' + }) + }, + toMsgList(){ + uni.navigateTo({ + url:'/pages/procedureDetail/procedureDetail' + }) + }, + formatTime(dateTimeString) { + let date = new Date(dateTimeString); + let hours = date.getHours(); + let minutes = date.getMinutes(); + let seconds = date.getSeconds(); + + hours = hours < 10 ? '0' + hours : hours; + minutes = minutes < 10 ? '0' + minutes : minutes; + seconds = seconds < 10 ? '0' + seconds : seconds; + + return hours + ':' + minutes + ':' + seconds; + }, } } diff --git a/pages/my/my - 副本.vue b/pages/my/my - 副本.vue index e90451e..a755959 100644 --- a/pages/my/my - 副本.vue +++ b/pages/my/my - 副本.vue @@ -209,7 +209,7 @@ - + @@ -233,9 +233,9 @@ diff --git a/pages/participation/participation.scss b/pages/participation/participation.scss index 6a4e523..6560836 100644 --- a/pages/participation/participation.scss +++ b/pages/participation/participation.scss @@ -165,3 +165,11 @@ } } } +.huo-card-item{ + font-size: 20rpx; + line-height: 1.5; + white-space: nowrap; /* 防止文本换行 */ + text-overflow: ellipsis; /* 显示省略号 */ + /* 如果需要设置宽度，可以添加 width 属性 */ + overflow:hidden; + } \ No newline at end of file diff --git a/pages/participation/participation.vue b/pages/participation/participation.vue index e7da3e3..eb94d10 100644 --- a/pages/participation/participation.vue +++ b/pages/participation/participation.vue @@ -1,8 +1,8 @@ diff --git a/pages/questionnaire/questDetail/questDetail.vue b/pages/questionnaire/questDetail/questDetail.vue new file mode 100644 index 0000000..3e67894 --- /dev/null +++ b/pages/questionnaire/questDetail/questDetail.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/pages/questionnaire/questionnaire.vue b/pages/questionnaire/questionnaire.vue index bd16aaa..a7e16a6 100644 --- a/pages/questionnaire/questionnaire.vue +++ b/pages/questionnaire/questionnaire.vue @@ -1,31 +1,31 @@