diff --git a/wenjuan/.editorconfig b/wenjuan/.editorconfig index ea6e20f..3f79f94 100644 --- a/wenjuan/.editorconfig +++ b/wenjuan/.editorconfig @@ -7,7 +7,7 @@ indent_style = space indent_size = 2 end_of_line = lf insert_final_newline = true -trim_trailing_whitespace = true +trim_trailing_whitespace = true [*.md] insert_final_newline = false diff --git a/yslvdao-miniapp/main.js b/yslvdao-miniapp/main.js index 71527d1..627ee24 100644 --- a/yslvdao-miniapp/main.js +++ b/yslvdao-miniapp/main.js @@ -1,21 +1,24 @@ import Vue from 'vue'; import App from './App'; import http from '@/utils/request.js' - import uView from "uview-ui"; - +// import {decrypt,encrypt} from '@/utils/rsaEncrypt.js' // 弹出框 import DialogBox from './components/DialogBox/DialogBox'; Vue.config.productionTip = false Vue.prototype.$http = http +// Vue.prototype.$decrypt = decrypt Vue.prototype.$imgUrl = (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.prototype.$upload = "http://172.16.61.48/admin-server/file/upload" +// Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload" +// Vue.prototype.$upload = "http://192.168.8.106:9003/miniio/upload" +Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/miniio/upload" +Vue.prototype.$img = "http://172.16.61.48/cdwlMall" // 全局组件 Vue.component('DialogBox', DialogBox); diff --git a/yslvdao-miniapp/manifest.json b/yslvdao-miniapp/manifest.json index e906dcf..e7c864b 100644 --- a/yslvdao-miniapp/manifest.json +++ b/yslvdao-miniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "绿道", - "appid" : "__UNI__F034047", + "appid" : "__UNI__93E0C91", "description" : "", "versionName" : "1.0.2", "versionCode" : "100", diff --git a/yslvdao-miniapp/pages.json b/yslvdao-miniapp/pages.json index d960384..8b5ef46 100644 --- a/yslvdao-miniapp/pages.json +++ b/yslvdao-miniapp/pages.json @@ -376,6 +376,19 @@ ], + "subpackages": [{ + "root": "pagesA", + "name": "pagesA", + "pages": [ + { + "path": "leaseAdd/leaseAdd", + "style": { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "商家入驻" + } + } + ] + }], "globalStyle": { "navigationBarTextStyle": "black" }, diff --git a/yslvdao-miniapp/pages/accepting/accepting.vue b/yslvdao-miniapp/pages/accepting/accepting.vue index 693d0d3..42eb6df 100644 --- a/yslvdao-miniapp/pages/accepting/accepting.vue +++ b/yslvdao-miniapp/pages/accepting/accepting.vue @@ -19,7 +19,7 @@ record.cereBasicInformationShop&&record.cereBasicInformationShop.detailedLocation?record.cereBasicInformationShop.detailedLocation:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.detailedLocation?record.cereBasicInformationVenue.detailedLocation:'' }} - + @@ -64,7 +64,7 @@ 经营主体 - {{record.operatingEntity}} + {{record.operatingEntity}} @@ -85,22 +85,40 @@ 身份证号码 - {{record.idNumber || record.idCardNumber}} + {{ record.idNumber || record.idCardNumber}} + 身份证有效期 {{record.idValidStart || record.idCardValidStart}}至 {{record.idValidEnd || record.idCardValidEnd}} - - 身份证照片 + + + 身份证正面 + + + + + + 身份证反面 + + + 企业授权书 @@ -125,6 +143,7 @@ + + \ No newline at end of file diff --git a/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue index 18ebf8e..9b9535d 100644 --- a/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue +++ b/yslvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue @@ -28,7 +28,9 @@ - + + @@ -36,7 +38,7 @@ - + @@ -85,7 +87,9 @@ @confirm="busEndTimeChange"> - + + @@ -104,13 +108,13 @@ - + - + - + - + 点击上传证件人像面 - + - - + + @@ -203,7 +213,7 @@ redirectUrl: '', coverImage: '', adTitle: '', - cpc:'', + cpc: '', subjectName: '', unifiedSocialCreditCode: '', type: '', @@ -222,8 +232,8 @@ idCardValidStart: '', idCardValidEnd: '', isLegalPerson: '0', - idCardPhotoFront:'', - idCardPhotoBack:'', + idCardPhotoFront: '', + idCardPhotoBack: '', enterpriseAuthorization: '', auditStatus: '1' }, @@ -267,7 +277,7 @@ day: true, }, ziyuanId: '', - ziyuanType:'', + ziyuanType: '', } }, @@ -276,98 +286,133 @@ this.ziyuanType = option.type }, 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' - }) - } - }) - } - + 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: { + onsuccess1(e, file, fileList, ziduan) { + console.error(e, file, fileList, ziduan) + uni.uploadFile({ + url: this.$upload, // 仅为示例，请替换为您的服务器上传接口 + filePath: e[0].url, + name: 'file', // 后端接收的文件参数名 + formData: { + filePath: 'xcx', // 其他表单数据 + }, + success: (uploadFileRes) => { + this.model1[ziduan] = this.$img + JSON.parse(uploadFileRes.data).data + + console.log('上传成功', this.model1); + uni.showToast({ + title: '上传成功', + icon: 'success', + }); + }, + fail: (err) => { + console.error('上传失败', err); + uni.showToast({ + title: '上传失败', + icon: 'none', + }); + }, + }); + }, typeChange(e) { this.model1.type = e[0].label; }, - 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}`; - }, + 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; - }) - 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 - }) + // let coverImg = [] + // let files = [] + // let idCardOne = [] + // let idCardTwo = [] + // let enterS = [] + // // // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作) + // coverImg = this.$refs.coverImage.lists.filter(val => { + // return val.progress == 100; + // }) + // 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() + console.error({ + ...this.model1 + }) + // return this.$http.sendRequest('/cereAdvertiserInfo/add', 'POST', this.model1, 1).then(res => { - uni.navigateTo({ - url: '/pages/record/record' - }) + uni.showToast({ + title: '提交成功', + icon: 'none', + }); + setTimeout(() => { + uni.navigateBack() + }, 1000) }) }, // toChangeTime(val) { diff --git a/yslvdao-miniapp/pages/home/home.scss b/yslvdao-miniapp/pages/home/home.scss index 0df8f80..8fa03df 100644 --- a/yslvdao-miniapp/pages/home/home.scss +++ b/yslvdao-miniapp/pages/home/home.scss @@ -357,7 +357,14 @@ align-items: center; } .card_title{ - font-size:16px; + // font-size:16px; + font-size: 30rpx; + font-weight: bold; + } + .card_more{ + // font-size:16px; + color: #555555; + font-size: 21rpx; } } .other-business { diff --git a/yslvdao-miniapp/pages/home/home.vue b/yslvdao-miniapp/pages/home/home.vue index de95b95..7b1a2b4 100644 --- a/yslvdao-miniapp/pages/home/home.vue +++ b/yslvdao-miniapp/pages/home/home.vue @@ -267,13 +267,16 @@ - + 营销推广活动 - 查看更多 > + + 查看更多 + + - + @@ -289,9 +292,16 @@ - + + 商务合作 - 查看更多 > + + 查看更多 + + @@ -307,7 +317,7 @@ - + @@ -370,6 +380,12 @@ this.onCouponTab(0) }, methods: { + toDetailhd(items) { + let msg = JSON.stringify(items) + uni.navigateTo({ + url: `/pages/marketing/marketingDetail/marketingDetail?item=${msg}` + }) + }, getALL(){ let pagesize = { pageNumber: 1, diff --git a/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue index 43cb1b3..a3056d5 100644 --- a/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue +++ b/yslvdao-miniapp/pages/leaseAdd/leaseAdd.vue @@ -59,8 +59,12 @@ - + + + @@ -77,13 +81,13 @@ - + - + - + 点击上传证件人像面 - + - - + + @@ -189,7 +199,7 @@ idNumber: '', idValidStart: '', idValidEnd: '', - idPhotoFront:'', + idPhotoFront: '', idPhotoBack: '', isLegalPerson: '', enterpriseAuthorization: '', @@ -236,91 +246,136 @@ 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' - }) - } - }) - } - + 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: { + onsuccess1(e, file, fileList, ziduan) { + console.error(e, file, fileList, ziduan) + uni.uploadFile({ + url: this.$upload, // 仅为示例，请替换为您的服务器上传接口 + filePath: e[0].url, + name: 'file', // 后端接收的文件参数名 + formData: { + filePath: 'xcx', // 其他表单数据 + }, + success: (uploadFileRes) => { + if (ziduan == 'businessLicense') { + this.model1.businessLicense = this.$img + JSON.parse(uploadFileRes.data).data + console.error(this.model1.businessLicense) + } else if (ziduan == 'idPhotoFront') { + this.model1.idPhotoFront = this.$img + JSON.parse(uploadFileRes.data).data + } else if (ziduan == 'idPhotoBack') { + this.model1.idPhotoBack = this.$img + JSON.parse(uploadFileRes.data).data + } else { + this.model1.enterpriseAuthorization = this.$img + JSON.parse(uploadFileRes.data) + .data + } + + console.log('上传成功', this.model1); + uni.showToast({ + title: '上传成功', + icon: 'success', + }); + }, + fail: (err) => { + console.error('上传失败', err); + uni.showToast({ + title: '上传失败', + icon: 'none', + }); + }, + }); + }, typeChange(e) { this.model1.entityType = e[0].label; }, -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); + 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}`; - }, + 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 + // 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 + // }) - }) - 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() - + console.error(this.model1) + // return this.$http.sendRequest('/cereBusinessInfo/add', 'POST', this.model1, 1).then(res => { - uni.redirectTo({ - url: '/pages/record/record' - }) + // uni.redirectTo({ + // url: '/pages/record/record' + // }) + uni.showToast({ + title: '提交成功', + icon: 'none', + }); + setTimeout(() => { + uni.navigateBack() + }, 1000) }) }, // 上一步 diff --git a/yslvdao-miniapp/pages/login/login.scss b/yslvdao-miniapp/pages/login/login.scss index 33b88c1..026bc54 100644 --- a/yslvdao-miniapp/pages/login/login.scss +++ b/yslvdao-miniapp/pages/login/login.scss @@ -36,17 +36,18 @@ /* 填写 */ .input-info{ padding: 0 6%; - margin: 80rpx 0 40rpx 0; + // margin: 80rpx 0 40rpx 0; .info{ display: flex; align-items:center; justify-content: space-between; width: 100%; height: 100rpx; - background-color: #F2F4F6; - border-radius: 20rpx; + background-color: #fff; + border-radius: 32rpx; margin-bottom: 40rpx; padding: 0 30rpx 0 40rpx; + border: 2rpx solid rgba(15,187,89,0.1804); input{ width: 70%; height: 100%; @@ -105,8 +106,8 @@ justify-content: center; width: 88%; height: 90rpx; - background-color:#3f9b6a; - border-radius: 10rpx; + background-color:#0FBB59; + border-radius: 32rpx; color: #FFFFFF; font-size: 32rpx; } diff --git a/yslvdao-miniapp/pages/my/my.vue b/yslvdao-miniapp/pages/my/my.vue index 65c2484..e69c78d 100644 --- a/yslvdao-miniapp/pages/my/my.vue +++ b/yslvdao-miniapp/pages/my/my.vue @@ -18,18 +18,18 @@