@@ -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" | |||
} | |||
} |
@@ -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; | |||
@@ -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 | |||
}) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
@@ -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%; | |||
} | |||
} |
@@ -1,9 +1,54 @@ | |||
<!--pages/productDetail/productDetail.wxml--> | |||
<view class="content"> | |||
<view class="backGround" bindtap="checkImage"> | |||
<image src="{{imgUrl}}" mode="widthFix" /> | |||
<view class="infoCard"> | |||
<view wx:if="{{data.linkFirstSlogan}}" class="linkFirstSlogan"> | |||
<text user-select="true">{{data.linkFirstSlogan}}</text> | |||
</view> | |||
<view wx:if="{{data.linkSecondSlogan}}" class="linkSecondSlogan"> | |||
<text user-select="true">{{data.linkSecondSlogan}}</text> | |||
</view> | |||
<view wx:if="{{data.linkCompany}}" class="title"> | |||
<VanIcon name="home-o" style="margin-right: 10rpx;" /> | |||
<text user-select="true">{{data.linkCompany}}</text> | |||
</view> | |||
<view wx:if="{{data.linkCompanyAddress}}" class="address"> | |||
<VanIcon name="location-o" style="margin-right: 10rpx;" /> <text user-select="true">{{data.linkCompanyAddress}}</text> | |||
</view> | |||
</view> | |||
<VanDivider borderColor="#4ac987" contentPosition="center">联系人</VanDivider> | |||
<block wx:if="{{data.linkList && data.linkList.length > 0}}"> | |||
<view class="contacter" wx:for="{{data.linkList}}" wx:key="index"> | |||
<view class="image" bindtap="checkImage" data-qrCode="{{item.qrCode}}"> | |||
<image src="{{item.qrCode}}" mode="widthFix" /> | |||
</view> | |||
<view class="info"> | |||
<view class="name"> | |||
<VanIcon class="icon" name="contact" /> | |||
<text user-select="true">{{item.name}}</text> | |||
</view> | |||
<view class="phone" bindtap="makePhoneCall" data-phone="{{item.phone}}"> | |||
<VanIcon class="icon" name="phone-o" /> | |||
<text user-select="true">{{item.phone}}</text> | |||
</view> | |||
<view class="mail"> | |||
<VanIcon class="icon" name="envelop-o" /> | |||
<text user-select="true">{{item.email}}</text> | |||
</view> | |||
</view> | |||
</view> | |||
</block> | |||
<block wx:if="{{data.linkList && data.linkList.length <= 0}}"> | |||
<VanEmpty description="暂无联系人" /> | |||
</block> | |||
</view> | |||
<van-popup show="{{ showImage }}" bind:close="closeImage"> | |||
<image src="{{imgUrl}}" class="scaleImage" show-menu-by-longpress="true" mode="widthFix" /> | |||
</van-popup> | |||
<VanPopup show="{{ showImage }}" bind:close="closeImage"> | |||
<view class="scaleImage"> | |||
<image src="{{currentQrCode}}" show-menu-by-longpress="true" mode="widthFix" /> | |||
<view>长按识别二维码</view> | |||
</view> | |||
</VanPopup> |
@@ -1,6 +1,6 @@ | |||
<!--pages/chat/chat.wxml--> | |||
<block wx:if="{{noticeText}}" class="noticeBar"> | |||
<van-notice-bar color="#ffffff" background="#4ac987" left-icon="volume-o" mode="link" text="{{noticeText}}" bindtap="goToProductDetail" /> | |||
<VanNoticeBar color="#ffffff" background="#4ac987" left-icon="volume-o" mode="link" text="{{noticeText}}" bindtap="goToProductDetail" /> | |||
</block> | |||
<view class="content" id='scrollSingel' bindtap="contentWatch"> | |||
<view class="chatItem" wx:for="{{chatList}}" wx:key="index"> | |||
@@ -12,8 +12,6 @@ | |||
<image wx:if="{{item.id != 1}}" class="arrowWhite" src="../../asset/icon/arrowWhite.png" mode="heightFix" /> | |||
<view class="{{item.id == 1 ? 'message right' : 'message left'}}"> | |||
<text user-select="true">{{item.message}}</text> | |||
<image class="loading" wx:if="{{item.id == 1 && (index + 1 == chatList.length) && isLoading}}" src="../../asset/icon/loading.png" mode="heightFix" /> | |||
@@ -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 | |||
} | |||
} | |||
@@ -1,7 +1,7 @@ | |||
<!--index.wxml--> | |||
<view class="content"> | |||
<block wx:if="{{noticeText}}" class="noticeBar"> | |||
<van-notice-bar color="#ffffff" background="#4ac987" left-icon="volume-o" mode="link" text="{{noticeText}}" bindtap="goToProductDetail" /> | |||
<VanNoticeBar color="#ffffff" background="#4ac987" left-icon="volume-o" mode="link" text="{{noticeText}}" bindtap="goToProductDetail" /> | |||
</block> | |||
<view class="{{logoActive ? 'logo active' : 'logo' }}"> | |||
<view class="{{holdingSwitch ? 'tinyChatICon active' : 'tinyChatICon' }}" bindtouchstart="iconTouchStart" bindtouchend="iconTouchEnd"> | |||
@@ -1,11 +1,10 @@ | |||
// pages/orderDetail/orderDetail.ts | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
detail: null | |||
}, | |||
/** | |||
@@ -22,6 +22,11 @@ Page({ | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad(options) { | |||
if (app.globalData.noticeText) { | |||
this.setData({ | |||
noticeText: app.globalData.noticeText | |||
}) | |||
} | |||
this.setData({ | |||
userInfo: JSON.parse(options.userInfo) | |||
}) | |||
@@ -48,6 +53,13 @@ Page({ | |||
// }) | |||
// }, | |||
// 跳转至联系我们页面 | |||
goToProductDetail() { | |||
wx.navigateTo({ | |||
url: '/pages/ContactUs/ContactUs', | |||
}) | |||
}, | |||
getProductList() { | |||
const that = this | |||
request.get({ | |||
@@ -89,7 +101,7 @@ Page({ | |||
}, | |||
createPayOrder() { | |||
if (this.data.phone) { | |||
if (!this.data.phone) { | |||
this.setData({ | |||
isShowNumberCheck: true | |||
}) | |||
@@ -1,4 +1,7 @@ | |||
<!--pages/payOrder.wxml--> | |||
<block wx:if="{{noticeText}}" class="noticeBar"> | |||
<VanNoticeBar color="#ffffff" background="#4ac987" left-icon="volume-o" mode="link" text="{{noticeText}}" bindtap="goToProductDetail" /> | |||
</block> | |||
<view class="content"> | |||
<view class="backGround"> | |||
<image src="{{imgUrl}}" mode="" /> | |||