Browse Source

修改

v1
前端-胡立永 9 months ago
parent
commit
a53f96100d
6 changed files with 93 additions and 25 deletions
  1. +20
    -11
      pages.json
  2. +63
    -7
      pages/payment/payment.vue
  3. +9
    -6
      pages/weddingCelebration/weddingCelebration.vue
  4. BIN
      static/tabbar/5.png
  5. BIN
      static/tabbar/6.png
  6. +1
    -1
      store/store.js

+ 20
- 11
pages.json View File

@ -41,17 +41,26 @@
"tabBar": { "tabBar": {
"backgroundColor": "white", "backgroundColor": "white",
"selectedColor": "#33a5fc", "selectedColor": "#33a5fc",
"list": [{
"pagePath": "pages/payment/payment",
"iconPath": "static/tabbar/1.png",
"selectedIconPath": "static/tabbar/2.png",
"text": "加油"
}, {
"pagePath": "pages/center/center",
"iconPath": "static/tabbar/3.png",
"selectedIconPath": "static/tabbar/4.png",
"text": "个人中心"
}]
"list": [
{
"pagePath": "pages/payment/payment",
"iconPath": "static/tabbar/1.png",
"selectedIconPath": "static/tabbar/2.png",
"text": "加油"
},
{
"pagePath": "pages/weddingCelebration/weddingCelebration",
"iconPath": "static/tabbar/5.png",
"selectedIconPath": "static/tabbar/6.png",
"text": "佳通婚礼车队服务"
},
{
"pagePath": "pages/center/center",
"iconPath": "static/tabbar/3.png",
"selectedIconPath": "static/tabbar/4.png",
"text": "个人中心"
}
]
}, },
"uniIdRouter": {} "uniIdRouter": {}
} }

+ 63
- 7
pages/payment/payment.vue View File

@ -6,9 +6,10 @@
<uni-section title="油号" type="line" titleFontSize="34rpx"></uni-section> <uni-section title="油号" type="line" titleFontSize="34rpx"></uni-section>
<view class="select-oil"> <view class="select-oil">
<view class="oil-item"> <view class="oil-item">
<view class="oil active-oil">
<!-- <view class="unit"></view> -->
<view class="number">#95</view>
<view class="oil active-oil"
style="flex-direction: column;">
<view class="number">{{ configList.title.keyCentent }}</view>
<view class="unit">{{ configList.price.keyCentent }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -42,8 +43,21 @@
<PrivacyAgreementPoup ref="showPrivacy"></PrivacyAgreementPoup> <PrivacyAgreementPoup ref="showPrivacy"></PrivacyAgreementPoup>
<uni-fab ref="fab" :content="content" :horizontal="horizontal" :vertical="vertical" :direction="direction"
@trigger="clickMenu" />
<!-- <uni-fab
ref="fab"
:content="content"
:horizontal="horizontal"
:vertical="vertical"
:direction="direction"
@trigger="clickMenu" /> -->
<view class="phone"
@click="clickService(configList.phone.keyCentent)">
<uv-icon
size="45rpx"
color="#fff"
name="phone"></uv-icon>
</view>
</view> </view>
</template> </template>
@ -179,17 +193,59 @@
this.$api('getRechargePage', res => { this.$api('getRechargePage', res => {
this.rechargeList = res.result.records this.rechargeList = res.result.records
}) })
}
},
//
clickService(phoneNumber) {
uni.makePhoneCall({
phoneNumber,
success: () => {},
fail: () => {}
});
},
} }
} }
</script> </script>
<style scoped>
<style scoped lang="scss">
.payment { .payment {
height: 100vh; height: 100vh;
background: #F1F5F8; background: #F1F5F8;
width: 750rpx; width: 750rpx;
margin: 0 auto; margin: 0 auto;
.container{
.oil-item{
.active-oil{
}
.oil{
align-items: flex-start;
padding-left: 30rpx;
padding-right: 30rpx;
.number{
font-size: 26rpx;
}
.unit{
font-size: 30rpx;
margin-top: 10rpx;
}
}
}
}
}
.phone{
position: fixed;
right: 100rpx;
bottom: 10%;
background-color: #00aaff;
width: 100rpx;
height: 100rpx;
border-radius: 50rpx;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0 0 10rpx 10rpx #00aaff55;
} }
.container { .container {


+ 9
- 6
pages/weddingCelebration/weddingCelebration.vue View File

@ -5,38 +5,41 @@
<uni-card :is-shadow="false"> <uni-card :is-shadow="false">
<view class="weixin-top"> <view class="weixin-top">
<view class="title">微信号:</view> <view class="title">微信号:</view>
<view @click="copy(wx.keyCentent)" class="copy icon">
<view @click="copy(configList.wx.keyCentent)" class="copy icon">
<image src="@/static/weddingCelebration/copy.png" mode="widthFix"></image> <image src="@/static/weddingCelebration/copy.png" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="number">{{ wx.keyCentent }}</view>
<view class="number">{{ configList.wx.keyCentent }}</view>
</uni-card> </uni-card>
<uni-card :is-shadow="false"> <uni-card :is-shadow="false">
<view class="weixin-top"> <view class="weixin-top">
<view class="title">手机号:</view> <view class="title">手机号:</view>
<view @click="clickService(phone.keyCentent)" class="copy icon">
<view @click="clickService(configList.phone.keyCentent)" class="copy icon">
<image src="@/static/weddingCelebration/phone.png" mode="widthFix"></image> <image src="@/static/weddingCelebration/phone.png" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="number">{{ phone.keyCentent }}</view>
<view class="number">{{ configList.phone.keyCentent }}</view>
</uni-card> </uni-card>
</uni-section> </uni-section>
</view> </view>
</template> </template>
<script> <script>
import { mapState } from 'vuex'
export default { export default {
name : 'weddingCelebration', name : 'weddingCelebration',
data(){ data(){
return { return {
wx : {}, wx : {},
phone : {}, phone : {},
classifyKey : [ 'wx' , 'phone' ]
} }
}, },
computed : {
...mapState(['configList']),
},
onShow(){ onShow(){
this.getData()
// this.getData()
}, },
methods : { methods : {
back(){ back(){


BIN
static/tabbar/5.png View File

Before After
Width: 200  |  Height: 200  |  Size: 4.1 KiB

BIN
static/tabbar/6.png View File

Before After
Width: 200  |  Height: 200  |  Size: 4.1 KiB

+ 1
- 1
store/store.js View File

@ -19,7 +19,7 @@ const store = new Vuex.Store({
mutations: { mutations: {
// 初始化配置 // 初始化配置
initConfig(state) { initConfig(state) {
let config = ['preferential', 'wx']
let config = ['preferential', 'wx', 'phone', 'price', 'title']
config.forEach(k => { config.forEach(k => {
api('getConfig', { api('getConfig', {
keyValue : k keyValue : k


Loading…
Cancel
Save