diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue index be2d8c4..17459b7 100644 --- a/admin-web-master/src/components/chakan/map.vue +++ b/admin-web-master/src/components/chakan/map.vue @@ -182,9 +182,9 @@ {{scope.row.businessType || '-' }} - + diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 6764298..059c4ec 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,12 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://128.10.249.25:9003'; + baseURL = 'http://128.10.249.21:9003'; } else { diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue index 618a295..e2d7f78 100644 --- a/admin-web-master/src/views/activity/activityBz.vue +++ b/admin-web-master/src/views/activity/activityBz.vue @@ -843,7 +843,7 @@ solutionEditor: null, } }) - this.$emit('childClose', false); + } else { this.$message({ message: '请填写数据', diff --git a/admin-web-master/src/views/activity/activityHis.vue b/admin-web-master/src/views/activity/activityHis.vue index ce32d1f..159b910 100644 --- a/admin-web-master/src/views/activity/activityHis.vue +++ b/admin-web-master/src/views/activity/activityHis.vue @@ -534,7 +534,7 @@ - + diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue index 815266c..fa0d014 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue @@ -791,7 +791,7 @@ solutionEditor: null, } }) - this.$emit('childClose', false); + } else { this.$message({ message: '请填写数据', diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue index 6e684b8..200bc00 100644 --- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue +++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue @@ -533,7 +533,7 @@ - + diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue index 474c1e4..5e17128 100644 --- a/admin-web-master/src/views/scheme/sam.vue +++ b/admin-web-master/src/views/scheme/sam.vue @@ -66,8 +66,9 @@ diff --git a/admin-web-master/src/views/shopbus/businessList/index.vue b/admin-web-master/src/views/shopbus/businessList/index.vue index 70301d7..afc2076 100644 --- a/admin-web-master/src/views/shopbus/businessList/index.vue +++ b/admin-web-master/src/views/shopbus/businessList/index.vue @@ -467,7 +467,7 @@ name="3" > - +
{{ruleForm.certificateType==6?'身份证':''}}
 - + - + - +
{{shopDetails.certificateType=='6'?'身份证':''}}
@@ -154,13 +154,13 @@ - + + + + + + 物流公司：{{dataList.express}} + 快递单号：{{dataList.deliverFormid}} + + + + diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index 05955c5..04a1ae4 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,13 +8,13 @@ import uView from "uview-ui"; import DialogBox from './components/DialogBox/DialogBox'; // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -// let c1 = 'https://jy.scjysm.asia:18086/' -let c1 = 'https://zhgw-uat.028wlkj.com/' +let c1 = 'https://jy.scjysm.asia:18086/' +// let c1 = 'https://zhgw-uat.028wlkj.com/' Vue.config.productionTip = false Vue.prototype.$http = http Vue.prototype.$imgUrl = (url) => { - // return (c1 + "cdwlMall/questionnaire/file/static" + url); - return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); + return (c1 + "cdwlMall/questionnaire/file/static" + url); + // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); } Vue.prototype.$img = c1+ 'cdwlMall' // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload" diff --git a/lvdao-miniapp/pagesA/application/application.vue b/lvdao-miniapp/pagesA/application/application.vue index 4730d94..c92447c 100644 --- a/lvdao-miniapp/pagesA/application/application.vue +++ b/lvdao-miniapp/pagesA/application/application.vue @@ -48,8 +48,8 @@ - - @@ -73,7 +70,11 @@ imgurl: '', showShareModal: false, // 分享拉起框是否显示 showPosterMask: false, // 海报遮罩层是否显示 - posterUrl: '' // 海报图片地址 + posterUrl: '', // 海报图片地址 + mergedImageSrc: '', + canvasWidth: '', + canvasHeight: '', + imgUrls: [] }; }, onLoad(option) { @@ -84,87 +85,245 @@ this.$http.sendRequest('/cerePromotion/queryByPage', 'POST', this.pagesize, 1).then(res => { this.tableData = res.data.data.content[0] + this.imgUrls.push(this.imgurl + this.tableData.coverImage) }) }, + onReady() {}, mounted() { + }, methods: { // 点击分享按钮 - shareMsg() { - this.showShareModal = true; - }, - // 关闭分享拉起框 - closeShareModal() { - this.showShareModal = false; - }, - // 生成海报 - generatePoster() { - this.closeShareModal() - this.$http.sendRequest(`/cerePromotion/getSharePic/${this.tableData.id}`, 'GET','', 1).then(res => { - this.posterUrl = this.imgurl+res.data.data - this.showPosterMask = true; - }) - - // setTimeout(() => { - // this.posterUrl = 'https://dummyimage.com/800x600/ff0000/ffffff'; // 替换为真实的海报图片地址 - // this.showPosterMask = true; - // }, 1000); - }, - // 关闭海报遮罩层 - closePosterMask() { - this.showPosterMask = false; - this.posterUrl = ''; - }, - // 微信分享 - wechatShare() { - // this.closeShareModal(); - // uni.share({ - // provider: 'weixin', - // scene: 'WXSceneSession', - // type: 0, - // title: this.tableData.schemeTitle, - // summary: '分享描述', - // href: `https://zhgw-uat.028wlkj.com/cdwlMall/merchant-h5/#/pagesA/projectManagement/projectDetails?id=${this.tableData.id}`, // 分享链接 - // success: function(res) { - // console.log('分享成功', res); - // }, - // fail: function(err) { - // console.log('分享失败', err); - // } - // }); - }, - onShareAppMessage() { - return { - title: this.tableData.schemeTitle, - imageUrl: this.imgurl+this.tableData.coverImage, - path: `/pagesA/projectManagement/projectDetails?id=${this.tableData.id}`, - success(res) { - uni.showToast({ - icon: 'none', - title: '分享成功' - }) - }, - fail(err) { - console.log('分享失败', err); - } - }; - }, - // 保存图片到本地 - savePoster() { - uni.previewImage({ - urls:[this.posterUrl], - longPressActions: { - itemList: ['保存图片'], - success: function(data) { - console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片'); - }, - fail: function(err) { - console.log(err.errMsg); - } - } - }); - }, + shareMsg() { + this.showShareModal = true; + }, + // 关闭分享拉起框 + closeShareModal() { + this.showShareModal = false; + }, + // 生成海报 + generatePoster() { + this.closeShareModal() + this.$http.sendRequest(`/cerePromotion/getSharePic/${this.tableData.id}`, 'GET', '', 1).then(res => { + this.posterUrl = this.imgurl + res.data.data + this.imgUrls.push(this.imgurl + res.data.data) + this.mergeImages() + this.showPosterMask = true; + }) + + // setTimeout(() => { + // this.posterUrl = 'https://dummyimage.com/800x600/ff0000/ffffff'; // 替换为真实的海报图片地址 + // this.showPosterMask = true; + // }, 1000); + }, + getImageInfo(src) { + return new Promise((resolve, reject) => { + wx.getImageInfo({ + src, + success: (res) => resolve(res), + fail: (res) => reject(res) + }) + }); + }, + + mergeImages(imgs) { + + const imgUrls = this.imgUrls + const imgPromises = imgUrls.map((url) => { + return new Promise((resolve, reject) => { + uni.getImageInfo({ + src: url, + success: (res) => { + // 直接传递图片路径，无需创建 Image 对象 + resolve({ + path: res.path, + width: res.width, + height: res.height + }); + }, + fail: (err) => { + console.error('获取图片信息失败:', err); + reject(err); + } + }); + }); + }); + + Promise.all(imgPromises) + .then((imgInfos) => { + let maxHeight = 400; + let totalWidth = 300; + let scaledWidth = 0 + let scaledHeight = 0 + imgInfos.forEach((imgInfo, index) => { + if (index === 0) { + const imgInfo = imgInfos[index]; + const imgRatio = imgInfo.width / imgInfo.height; // 图片的宽高比例 + const canvasRatio = totalWidth / maxHeight; // 画布的宽高比例 + if (imgRatio > canvasRatio) { + // 图片更宽，按宽度缩放 + scaledWidth = totalWidth; + scaledHeight = maxHeight / imgRatio; + } else { + // 图片更高，按高度缩放 + scaledHeight = maxHeight; + scaledWidth = totalWidth * imgRatio; + } + + // 设置画布的宽度和高度为缩放后的图片宽度和高度 + this.canvasWidth = scaledWidth; + this.canvasHeight = scaledHeight; + } + maxHeight = Math.max(maxHeight, imgInfo.height); + totalWidth += imgInfo.width; + }); + + if (totalWidth === 0 || maxHeight === 0) { + console.error('计算得到的画布尺寸为0'); + return; + } + + const ctx = uni.createCanvasContext('mergeCanvas'); + uni.getSystemInfo({ + success: (systemInfo) => { + // 处理第一张图片，按窗口宽高比例缩放 + const firstImgInfo = imgInfos[0]; + // 清空画布并设置缩放 + ctx.setFillStyle('white'); + ctx.fillRect(0, 0, this.canvasWidth, this.canvasHeight); + + // 绘制第一张图片作为背景 + ctx.drawImage( + firstImgInfo.path, + 0, + 0, + this.canvasWidth, + this.canvasHeight, + ); + const secondImgInfo = imgInfos[1]; + // 绘制第二张图片在第一张图片上层右下角 + ctx.drawImage( + secondImgInfo.path, + this.canvasWidth-100, + this.canvasHeight-100, + 100, + 100 + ); + setTimeout(() => { + // 绘制完成后生成图片 + ctx.draw(false, () => { + uni.canvasToTempFilePath({ + canvasId: 'mergeCanvas', + success: (res) => { + console.log('生成临时文件成功，路径:', res + .tempFilePath); + this.mergedImageSrc = res + .tempFilePath; + }, + fail: (err) => { + console.error('生成临时文件失败', err); + } + }); + }); + }, 1000) + + }, + fail: (err) => { + console.error('获取设备信息失败', err); + } + }); + }) + .catch((err) => { + console.error('获取图片信息失败或图片加载失败', err); + }) + }, + + // 关闭海报遮罩层 + closePosterMask() { + this.showPosterMask = false; + this.mergedImageSrc = ''; + }, + onShareAppMessage() { + return { + title: this.tableData.schemeTitle, + imageUrl: this.imgurl + this.tableData.coverImage, + path: `/pagesA/projectManagement/projectDetails?id=${this.tableData.id}`, + success(res) { + uni.showToast({ + icon: 'none', + title: '分享成功' + }) + }, + fail(err) { + console.log('分享失败', err); + } + }; + }, + saveImage() { + // 获取图片信息 + uni.getImageInfo({ + src: this.mergedImageSrc, + success: (res) => { + const tempFilePath = res.path + // 检查保存相册权限 + uni.getSetting({ + success: (settingRes) => { + if (!settingRes.authSetting['scope.writePhotosAlbum']) { + // 没有权限，请求权限 + uni.authorize({ + scope: 'scope.writePhotosAlbum', + success: () => { + // 授权成功，保存图片 + this.saveImageToAlbum(tempFilePath); + }, + fail: () => { + // 授权失败，提示用户手动开启权限 + uni.showModal({ + title: '提示', + content: '请在设置中开启保存相册权限', + success: (modalRes) => { + if (modalRes.confirm) { + uni.openSetting(); + } + } + }); + } + }); + } else { + // 已有权限，保存图片 + this.saveImageToAlbum(tempFilePath); + } + } + }); + }, + fail: (err) => { + console.error('获取图片信息失败:', err); + uni.showToast({ + title: '获取图片信息失败', + icon: 'none' + }); + } + }); + }, + saveImageToAlbum(tempFilePath) { + uni.saveImageToPhotosAlbum({ + filePath: tempFilePath, + success: () => { + uni.showToast({ + title: '图片保存成功', + icon: 'success' + }); + }, + fail: (err) => { + console.error('保存图片到相册失败:', err); + uni.showToast({ + title: '保存图片到相册失败', + icon: 'none' + }); + } + }); + }, } }; @@ -269,69 +428,85 @@ } } } -.share-mask { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.3); - z-index: 99; -} - -.share-modal { - position: fixed; - bottom: -200px; /* 初始位置在屏幕外 */ - left: 0; - right: 0; - background-color: #fff; - border-top-left-radius: 10px; - border-top-right-radius: 10px; - // padding: 10px; - z-index: 100; - transition: bottom 0.3s ease; /* 添加过渡效果 */ -} - -.share-modal-animate { - bottom: 0; /* 动画结束位置 */ -} - -.share-option { - padding: 15px; - text-align: center; - border-bottom: 1px solid #eee; - background-color: #fff; - -} - -.poster-mask { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - z-index: 101; -} - -.poster-container { - position: relative; - background-color: #fff; - padding: 10px; - border-radius: 10px; - // height: 400px; -} - -.close-btn { - position: absolute; - top: 10px; - right: 10px; - font-size: 20px; - cursor: pointer; -} -button{padding: 0;margin: 0; border: 1px solid transparent;line-height: 1;font-size: 14px;} -button::after{ border: none; } + + .share-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.3); + z-index: 99; + } + + .share-modal { + position: fixed; + bottom: -200px; + /* 初始位置在屏幕外 */ + left: 0; + right: 0; + background-color: #fff; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + // padding: 10px; + z-index: 100; + transition: bottom 0.3s ease; + /* 添加过渡效果 */ + } + + .share-modal-animate { + bottom: 0; + /* 动画结束位置 */ + } + + .share-option { + padding: 15px; + text-align: center; + border-bottom: 1px solid #eee; + background-color: #fff; + + } + + .poster-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + z-index: 101; + + } + + .poster-container { + position: relative; + background-color: #fff; + padding: 10px; + border-radius: 10px; + // height: 400px; + width: 90%; + } + + .close-btn { + position: absolute; + top: 10px; + right: 10px; + font-size: 20px; + cursor: pointer; + } + + button { + padding: 0; + margin: 0; + border: 1px solid transparent; + line-height: 1; + font-size: 14px; + } + + button::after { + border: none; + } \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue b/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue index 7f85842..67c9406 100644 --- a/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue +++ b/lvdao-miniapp/pagesA/projectManagement/projectManagement.vue @@ -31,7 +31,7 @@ - + 宣传标题：{{item.schemeTitle}} diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 3b440d5..352c0d4 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,16 +21,16 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - // bases = 'http://128.10.249.25:9003'+ url; + bases = 'http://128.10.249.21:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - bases = c1 + 'cdwlMall/meserver/admin-server' + url; + // bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - // bases = 'http://128.10.249.25:9007' + url; + bases = 'http://128.10.249.21:9007' + url; // bases = c1 + 'cdwlMall/meserver/api' + url; }else{ @@ -38,10 +38,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // 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-uat.028wlkj.com/cdwlMall/business-server' + url; - // bases = 'http://128.10.249.25:9004' + url; + // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; + bases = 'http://128.10.249.21:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; - bases = c1 + 'cdwlMall/business-server' + url; + // bases = c1 + 'cdwlMall/business-server' + url; } var token = uni.getStorageSync('token') || ''; diff --git a/merchant-web-master/src/views/customerService/kefuMsg/index.vue b/merchant-web-master/src/views/customerService/kefuMsg/index.vue index db85bd3..983a551 100644 --- a/merchant-web-master/src/views/customerService/kefuMsg/index.vue +++ b/merchant-web-master/src/views/customerService/kefuMsg/index.vue @@ -262,7 +262,12 @@ } .kehu { - width: 30%; + height: auto; + /* 使用 inline-block 或 flex 让盒子根据内容自动调整大小 */ + max-width: 70%; /* 大致限制宽度为父元素的 70% */ + word-wrap: break-word; /* 允许长单词换行 */ + overflow-wrap: break-word; /* 同 word-wrap，更标准的写法 */ + display: inline-block; /* 让盒子根据内容自适应宽度 */ /* 假设消息框占据了屏幕宽度的80% */ padding: 16px; /* 消息框内的内边距 */ @@ -291,7 +296,12 @@ } .ziji { - width: 30%; + height: auto; + /* 使用 inline-block 或 flex 让盒子根据内容自动调整大小 */ + max-width: 70%; /* 大致限制宽度为父元素的 70% */ + word-wrap: break-word; /* 允许长单词换行 */ + overflow-wrap: break-word; /* 同 word-wrap，更标准的写法 */ + display: inline-block; /* 让盒子根据内容自适应宽度 */ /* 假设消息框占据了屏幕宽度的80% */ padding: 16px; /* 消息框内的内边距 */ diff --git a/settled-merchant-master/src/api/index.js b/settled-merchant-master/src/api/index.js index 94b4719..1ab08dd 100644 --- a/settled-merchant-master/src/api/index.js +++ b/settled-merchant-master/src/api/index.js @@ -3,8 +3,10 @@ import home from './home' const host = `${window.location.protocol}//${window.location.host}` const TIAOZHUAN = `${host}/cdwlMall/meserver/` // 获取当前环境变量 true => 生产环境 false => 开发环境 -const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'http://128.10.249.28:9007' -const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'http://128.10.249.28:9003' +// const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'http://128.10.249.29:9007' +// const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'http://128.10.249.29:9003' +const BASEURL = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'api' : 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' +const upUrl = (process.env.NODE_ENV === 'production') ? TIAOZHUAN + 'admin-server' : 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' export const api = { // 登录模块 ...home(BASEURL), diff --git a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue index 4ccf8ff..704711c 100644 --- a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue +++ b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue @@ -51,7 +51,25 @@ - + + + + + + + + + + + + + + - +
@@ -130,7 +148,7 @@ v-model="personalForm.enterpriseCardStartTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> 至 @@ -138,7 +156,7 @@ v-model="personalForm.enterpriseCardEndTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> @@ -221,6 +239,10 @@ export default { storeAddressDetail: '', // 店铺详细地址 enterpriseName: '', // 企业名称 enterpriseCode: '', // 统一社会信用代码 + legalRepresentative: '', // 法定代表人 + registeredCapital: '', // 注册资本 + dateEstablishment: '', // 成立日期 + emailAddress: '', // 电子邮箱 enterpriseRegion: '', // 注册地址 省-市-区 enterpriseAdress: '', // 注册地址详细 enterpriseStartTime: '', // 营业期限开始时间 @@ -279,11 +301,23 @@ export default { enterpriseCode: [ { required: true, message: '请输入社会信用代码', trigger: 'blur' } ], + legalRepresentative: [ + { required: true, message: '请输入法定代表人', trigger: 'blur' } + ], + registeredCapital: [ + { required: true, message: '请输入注册资本', trigger: 'blur' } + ], + dateEstablishment: [ + { required: true, message: '请输入成立日期', trigger: 'change' } + ], + emailAddress: [ + { required: true, message: '请输入电子邮箱', trigger: 'blur' } + ], enterpriseRegion: [ - { required: true, message: '请输入注册地址', trigger: 'change' } + { required: true, message: '请输入住所', trigger: 'change' } ], enterpriseAdress: [ - { required: true, message: '请输入注册详细地址', trigger: 'blur' } + { required: true, message: '请输入住所详细地址', trigger: 'blur' } ], enterpriseStartTime: [{required: true, message: '请选择营业执照起始日期'}], enterpriseEndTime: [{required: true, message: '请选择营业执照到期时间'}], diff --git a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue index d1e473f..b359fbb 100644 --- a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue +++ b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue @@ -51,7 +51,25 @@ - + + + + + + + + + + + + + + - +
@@ -68,7 +86,7 @@ v-model="personalForm.subjectStartTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> 至 @@ -76,7 +94,7 @@ v-model="personalForm.subjectEndTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> @@ -130,7 +148,7 @@ v-model="personalForm.subjectCardStartTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> 至 @@ -138,7 +156,7 @@ v-model="personalForm.subjectCardEndTime" type="date" placeholder="选择日期" - format="yyyy 年 MM 月 dd 日" + format="yyyy-MM-dd" value-format="yyyy-MM-dd"> @@ -221,6 +239,10 @@ export default { storeAddressDetail: '', // 店铺详细地址 subjectName: '', // 商户名称 subjectCode: '', // 统一社会信用代码 + legalRepresentative: '', // 法定代表人 + registeredCapital: '', // 注册资本 + dateEstablishment: '', // 成立日期 + emailAddress: '', // 电子邮箱 subjectRegion: '', // 注册地址 省-市-区 subjectAdress: '', // 注册地址详细 subjectStartTime: '', // 营业期限开始时间 @@ -279,11 +301,23 @@ export default { subjectCode: [ { required: true, message: '请输入社会信用代码', trigger: 'blur' } ], + legalRepresentative: [ + { required: true, message: '请输入法定代表人', trigger: 'blur' } + ], + registeredCapital: [ + { required: true, message: '请输入注册资本', trigger: 'blur' } + ], + dateEstablishment: [ + { required: true, message: '请输入成立日期', trigger: 'change' } + ], + emailAddress: [ + { required: true, message: '请输入电子邮箱', trigger: 'blur' } + ], subjectRegion: [ - { required: true, message: '请输入注册地址', trigger: 'blur' } + { required: true, message: '请输入住所', trigger: 'blur' } ], subjectAdress: [ - { required: true, message: '请输入注册详细地址', trigger: 'blur' } + { required: true, message: '请输入住所详细地址', trigger: 'blur' } ], subjectStartTime: [{required: true, message: '请选择营业执照起始日期'}], subjectEndTime: [{required: true, message: '请选择营业执照到期时间'}], diff --git a/settled-merchant-master/src/views/moblie/mEnterprise.vue b/settled-merchant-master/src/views/moblie/mEnterprise.vue index 15b8ad1..29791da 100644 --- a/settled-merchant-master/src/views/moblie/mEnterprise.vue +++ b/settled-merchant-master/src/views/moblie/mEnterprise.vue @@ -49,9 +49,30 @@
+
+
+ +
+
+
+ +
+
+
+ + +
+ +
+
+ +
-
- +
+
@@ -153,8 +174,11 @@
+
+ +
@@ -162,6 +186,18 @@ + + + = 1 && m <= 9) { - m = '0' + m - } - if (d >= 0 && d <= 9) { - d = '0' + d - } - return date.getFullYear() + '年-' + m + '月-' + d + '日' + let date = value + let m = date.getMonth() + 1 + let d = date.getDate() + if (m >= 1 && m <= 9) { + m = '0' + m + } + if (d >= 0 && d <= 9) { + d = '0' + d + } + return date.getFullYear() + '-' + m + '-' + d }, idTypeShowFn () { this.idTypeShow = true @@ -393,6 +526,13 @@ export default { closeStartTime () { this.startDateShow = false }, + chenStartTime (value) { + this.personalForm.dateEstablishment = this.dateTime(value) + this.chenliShow = false + }, + chencloseTime () { + this.chenliShow = false + }, // 选择截止时间 selectEndTime (value) { this.personalForm.enterpriseEndTime = this.dateTime(value) @@ -421,6 +561,75 @@ export default { this.idCardEndShow = false }, changeActive (index) { + console.log(index) + let self = this + if (index === 2) { + self.personalForm.shopAdress = '' + let reg = /^1[13456789]\d{9}$/ + self.personalForm.shopPhone = self.personalForm.servicePhone + self.personalForm.shopAdress = `${self.shopAdress}，${self.personalForm.storeAddressDetail}` + // alert('submit!') + if (self.personalForm.shopName === '') { + Toast.fail('请输入店铺名称') + return false + } + if (self.personalForm.servicePhone === '') { + Toast.fail('请输入客服电话') + return false + } else if (!reg.test(self.personalForm.servicePhone)) { + Toast.fail('客服电话号格式错误') + return false + } + if (self.personalForm.chargePersonName === '') { + Toast.fail('请输入店铺负责人') + return false + } + if (self.personalForm.chargePersonPhone === '') { + Toast.fail('请输入负责人电话') + return false + } else if (!reg.test(self.personalForm.chargePersonPhone)) { + Toast.fail('负责人电话式错误') + return false + } + if (self.personalForm.shopAdress === '') { + Toast.fail('请选择所在地区') + return false + } + if (self.personalForm.storeAddressDetail === '') { + Toast.fail('请输入详细地址') + return false + } + } + if (index === 3) { + if (self.personalForm.enterpriseName === '') { + Toast.fail('请输入企业名称') + return false + } + if (self.personalForm.enterpriseCode === '') { + Toast.fail('请输入社会信用代码') + return false + } + if (self.personalForm.subjectRegion === '') { + Toast.fail('请输入注册地址') + return false + } + if (self.personalForm.subjectAdress === '') { + Toast.fail('请输入注册详情地址') + return false + } + if (self.personalForm.subjectStartTime === '') { + Toast.fail('请选择营业开始时间') + return false + } + if (self.personalForm.subjectEndTime === '') { + Toast.fail('请选择营业截止时间') + return false + } + if (self.personalForm.subjectLicense === '') { + Toast.fail('请上传营业执照') + return false + } + } this.active = index }, formatter (type, val) { @@ -453,11 +662,11 @@ export default { self.sendReq(params, (res) => { if (res.code === '200') { if (type === 'license') { - self.personalForm.enterpriseLicense = res.data.url + self.personalForm.enterpriseLicense = res.data } else if (type === 'positive') { - self.personalForm.enterpriseCardPositive = res.data.url + self.personalForm.enterpriseCardPositive = res.data } else if (type === 'back') { - self.personalForm.enterpriseCardSide = res.data.url + self.personalForm.enterpriseCardSide = res.data } } else { Toast.fail(res.message) @@ -526,19 +735,35 @@ export default { return false } if (self.personalForm.enterpriseName === '') { - Toast.fail('请输入商户名称') + Toast.fail('请输入企业名称') return false } if (self.personalForm.enterpriseCode === '') { Toast.fail('请输入社会信用代码') return false } + if (self.personalForm.legalRepresentative === '') { + Toast.fail('请输入法定代表人') + return false + } + if (self.personalForm.registeredCapital === '') { + Toast.fail('请输入注册资本') + return false + } + if (self.personalForm.dateEstablishment === '') { + Toast.fail('请输入成立日期') + return false + } + if (self.personalForm.emailAddress === '') { + Toast.fail('请输入邮箱地址') + return false + } if (self.personalForm.enterpriseRegion === '') { - Toast.fail('请输入注册地址') + Toast.fail('请输入住所') return false } if (self.personalForm.enterpriseAdress === '') { - Toast.fail('请输入注册详情地址') + Toast.fail('请输入住所详情地址') return false } if (self.personalForm.enterpriseStartTime === '') { @@ -755,7 +980,7 @@ export default { .nextBtn { display: block; margin: 50px auto 0 auto; - width: 315px; + width: 40%; height: 42px; background: #333333; color: $mainColor; diff --git a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue index e0f1d28..8671564 100644 --- a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue +++ b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue @@ -49,9 +49,30 @@
+
+
+ +
+
+
+ +
+
+
+ + +
+ +
+
+ +
-
- +
+
@@ -165,6 +186,18 @@ + + + = 1 && m <= 9) { - m = '0' + m - } - if (d >= 0 && d <= 9) { - d = '0' + d - } - return date.getFullYear() + '年-' + m + '月-' + d + '日' + let m = date.getMonth() + 1 + let d = date.getDate() + if (m >= 1 && m <= 9) { + m = '0' + m + } + if (d >= 0 && d <= 9) { + d = '0' + d + } + return date.getFullYear() + '-' + m + '-' + d }, idTypeShowFn () { this.idTypeShow = true @@ -466,6 +525,13 @@ export default { closeStartTime () { this.startDateShow = false }, + chenStartTime (value) { + this.personalForm.dateEstablishment = this.dateTime(value) + this.chenliShow = false + }, + chencloseTime () { + this.chenliShow = false + }, // 选择截止时间 selectEndTime (value) { this.personalForm.subjectEndTime = this.dateTime(value)