diff --git a/miniprogram/app.json b/miniprogram/app.json index 96ba6d0..386368a 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -19,8 +19,11 @@ "style": "v2", "sitemapLocation": "sitemap.json", "usingComponents": { - "van-notice-bar": "@vant/weapp/notice-bar/index", - "van-toast": "@vant/weapp/toast/index", - "van-popup": "@vant/weapp/popup/index" + "VanNoticeBar": "@vant/weapp/notice-bar/index", + "VanDivider": "@vant/weapp/divider/index", + "VanPopup": "@vant/weapp/popup/index", + "VanIcon": "@vant/weapp/icon/index", + "VanEmpty": "@vant/weapp/empty/index", + "van-toast": "@vant/weapp/toast/index" } } \ No newline at end of file diff --git a/miniprogram/asset/image/contacter.png b/miniprogram/asset/image/contacter.png new file mode 100644 index 0000000..4b6a0a3 Binary files /dev/null and b/miniprogram/asset/image/contacter.png differ diff --git a/miniprogram/asset/image/share.png b/miniprogram/asset/image/share.png deleted file mode 100644 index 47910b6..0000000 Binary files a/miniprogram/asset/image/share.png and /dev/null differ diff --git a/miniprogram/components/userNumberChkeck/userNumberChkeck.less b/miniprogram/components/userNumberChkeck/userNumberChkeck.less index eb6626a..d0c0db1 100644 --- a/miniprogram/components/userNumberChkeck/userNumberChkeck.less +++ b/miniprogram/components/userNumberChkeck/userNumberChkeck.less @@ -30,8 +30,8 @@ } .logo { - width: 200rpx; - height: 200rpx; + width: 120rpx; + height: 120rpx; margin: 50rpx auto; margin-bottom: 90rpx; @@ -42,7 +42,7 @@ .title { text-align: center; font-weight: 600; - font-size: 50rpx; + font-size: 35rpx; color: #4b4b4b; } } @@ -50,6 +50,7 @@ .memberNotice { text-align: center; font-weight: 200; + font-size: 23rpx; } .getPhoneNumber { @@ -66,6 +67,7 @@ .userProtocolModel { text-align: center; margin-bottom: 30rpx; + font-size: 25rpx; .textInside { position: relative; @@ -74,9 +76,10 @@ .agreeButton { position: absolute; - left: 0rpx; + left: 30rpx; top: 50%; transform: translateY(-50%); + font-size: 25rpx; width: 35rpx; height: 35rpx; line-height: 35rpx; diff --git a/miniprogram/pages/ContactUs/ContactUs.js b/miniprogram/pages/ContactUs/ContactUs.js index 66bcfde..e837f5b 100644 --- a/miniprogram/pages/ContactUs/ContactUs.js +++ b/miniprogram/pages/ContactUs/ContactUs.js @@ -7,7 +7,9 @@ Page({ * 页面的初始数据 */ data: { - imgUrl: 'https://formall.oss-accelerate.aliyuncs.com/ga/payOrder-1.png', + data: null, + imgUrl: "", + currentQrCode: "", showImage: false }, @@ -26,15 +28,16 @@ Page({ console.log(res, 'chatLink'); that.setData({ - imgUrl: res.data.linkQrCode + data: res.data }) }).catch(err => { console.log(err, 'err'); }) }, - checkImage() { + checkImage(e) { this.setData({ + currentQrCode: e.currentTarget.dataset.qrcode, showImage: true }) }, @@ -45,6 +48,13 @@ Page({ }) }, + makePhoneCall(e){ + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.phone + }) + }, + + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/ContactUs/ContactUs.less b/miniprogram/pages/ContactUs/ContactUs.less index 3c03d3c..280467b 100644 --- a/miniprogram/pages/ContactUs/ContactUs.less +++ b/miniprogram/pages/ContactUs/ContactUs.less @@ -4,29 +4,92 @@ page { } .content { - padding: 50rpx 0; - - .backGround { - position: relative; - width: 650rpx; - height: 400rpx; - line-height: 150rpx; - font-size: 60rpx; + padding: 30rpx; + + .infoCard { + width: 100%; + color: #ffffff; + background-color: #4ac987; + border-radius: 15rpx; + margin: auto; + padding: 30rpx; + box-sizing: border-box; + + .linkFirstSlogan { + font-size: 45rpx; + font-weight: 600; + margin-bottom: 15rpx; + } + + .linkSecondSlogan { + font-size: 32rpx; + font-weight: 600; + margin-bottom: 18rpx; + } + + .title { + font-size: 25rpx; + margin-bottom: 15rpx; + } + + .address { + font-size: 22rpx; + } + } + + .contacter { + display: flex; + align-items: center; + justify-content: space-around; + width: 100%; + border-radius: 15rpx; margin: auto; - border-radius: 50rpx; - overflow: hidden; - - image { - position: absolute; - top: 0; - left: 50%; - transform: translateX(-50%); - width: 100%; - height: 100%; + margin-bottom: 25rpx; + padding: 30rpx; + box-sizing: border-box; + border: 1px dashed #999999; + + .image { + width: 28%; + + image { + width: 100%; + } + } + + .info { + width: 58%; + color: #646464; + + view { + margin-bottom: 12rpx; + } + + .icon { + margin-right: 15rpx; + } + + // .name {} + + .phone { + color: #4ac987; + } + + .mail { + font-size: 22rpx; + } } } } .scaleImage { - width: 700rpx; + position: relative; + width: 390rpx; + text-align: center; + padding: 20rpx; + + image { + width: 100%; + } + } \ No newline at end of file diff --git a/miniprogram/pages/ContactUs/ContactUs.wxml b/miniprogram/pages/ContactUs/ContactUs.wxml index 8c68ddb..0ebc0f7 100644 --- a/miniprogram/pages/ContactUs/ContactUs.wxml +++ b/miniprogram/pages/ContactUs/ContactUs.wxml @@ -1,9 +1,54 @@ - - + + + {{data.linkFirstSlogan}} + + + {{data.linkSecondSlogan}} + + + + {{data.linkCompany}} + + + {{data.linkCompanyAddress}} + + 联系人 + + + + + + + + + + {{item.name}} + + + + + {{item.phone}} + + + + + {{item.email}} + + + + + + + + - - - \ No newline at end of file + + + + + 长按识别二维码 + + \ No newline at end of file diff --git a/miniprogram/pages/chat/chat.wxml b/miniprogram/pages/chat/chat.wxml index 6990bb5..25ebe07 100644 --- a/miniprogram/pages/chat/chat.wxml +++ b/miniprogram/pages/chat/chat.wxml @@ -1,6 +1,6 @@ - + @@ -12,8 +12,6 @@ - - {{item.message}} diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index 6953856..ba0b5f7 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -236,7 +236,7 @@ Page({ }) return { title: '小闲聊', - path: '/page/index/index', + path: '/pages/index/index', promise } }, @@ -250,7 +250,7 @@ Page({ }) return { title: '小闲聊', - path: '/page/index/index', + path: '/pages/index/index', promise } } diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 919596b..c204697 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,7 +1,7 @@ - +