Skip to content

U
user
Commit ba44218c by 宋冰琦
Options

修改标题title样式效果

parent db8a9999
Showing with 396 additions and 67 deletions
menuSubPackage/pages/areaSelect/areaSelect.vue
<template>
<view ew class="product-list">
<view class="provice_city">
<view class="product-list">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">选择门店</view>
</view>
<view class="provice_city" :style="{'margin-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<view class="text" @click="showArea">
<text>{{areaName.proviceName}}-</text>
<text v-show="areaName.proviceName!=areaName.cityName">{{areaName.cityName}}-</text>
......@@ -10,25 +14,27 @@
<image :style="{'height':'100%','width':'100%'}" :src="'../../../static/imgs/jiantouhei2.png'" />
</view>
</view>
<div v-for="item in finalList" :key="item.id" @click="selectedShop(item)" class="shop_item" :class="shopId==item.id?'active':''">
<div class="header">
<view class="name">{{ item.name }}</view>
<view class="adressBox">
<view class="map"><u-icon name="map" color="#999999" size="12"></u-icon></view>
<view class="address">{{ item.address }}</view>
</view>
<view class="timeBox">
<view class="clock"><u-icon name="clock" color="#999999" size="10"></u-icon></view>
<view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
</view>
</div>
<view class="line" />
<div class="dec">
<view :style="{'height':'34rpx'}" class="distance1" v-show="item.distance && item.distance!=-1"></view>
<view class="goshop">去品尝</view>
<view :style="{'height':'34rpx'}" class="distance" v-show="item.distance && item.distance!=-1">距离{{ item.distance }}</view>
</div>
</div>
<view >
<div v-for="item in finalList" :key="item.id" @click="selectedShop(item)" class="shop_item" :class="shopId==item.id?'active':''" >
<div class="header">
<view class="name">{{ item.name }}</view>
<view class="adressBox">
<view class="map"><u-icon name="map" color="#999999" size="12"></u-icon></view>
<view class="address">{{ item.address }}</view>
</view>
<view class="timeBox">
<view class="clock"><u-icon name="clock" color="#999999" size="10"></u-icon></view>
<view class="time">{{ item.startTime }} - {{ item.endTime }}</view>
</view>
</div>
<view class="line" />
<div class="dec">
<view :style="{'height':'34rpx'}" class="distance1" v-show="item.distance && item.distance!=-1"></view>
<view class="goshop">去品尝</view>
<view :style="{'height':'34rpx'}" class="distance" v-show="item.distance && item.distance!=-1">距离{{ item.distance }}</view>
</div>
</div>
</view>
<AreaPicker ref="AreaPicker" noSwitch @sendAreaInfo="updataAreaInfo"/>
</view>
</template>
......@@ -36,6 +42,7 @@
<script>
import { $EventBus } from '@/utils/EventBus';
import AreaPicker from '@/components/AreaPicker/index.vue'
import Utils from '@/utils/utils'
export default {
components: {AreaPicker},
......@@ -45,7 +52,8 @@ export default {
columns: [],
list: [],
areaName:{},
shopId:0
shopId:0,
Utils
}
},
onShow() {
......@@ -56,6 +64,9 @@ export default {
this.areaName = uni.getStorageSync('areaName')
},
computed: {
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
finalList() {
const {list} = this
const val = list.sort((a,b)=>{
......@@ -95,6 +106,28 @@ export default {
background: #F2F2F2;
height:100vh ;
overflow: auto;
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
}
.provice_city{
......
menuSubPackage/pages/goodsDetail/goodsDetail.vue
......@@ -301,7 +301,7 @@ export default {
}
},
async shoppingCart() {
if(!this.shopState&&!this.isInRange){
if(!this.shopState||!this.isInRange){
return
}
if(this.checkNum('addShop')){
......@@ -331,7 +331,7 @@ export default {
this.loginByPhoneNumber(e);
return
}
if(!this.shopState&&!this.isInRange){
if(!this.shopState||!this.isInRange){
return
}
......
mineSubPackage/pages/coupon/index.vue
<template>
<view class="bigBox">
<Tabs :list='list' @changeTab="changeTab" :newIndex="current" />
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="goBack" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">我的HOOLOO券</view>
</view>
<view :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<Tabs :list='list' @changeTab="changeTab" :newIndex="current" />
</view>
<view>
<swiper :current="current" class="swiper" @change="swiperChange">
<swiper-item>
......@@ -48,15 +54,24 @@ export default {
current: 0,
actionIndx:0,
canuse:[],
cantuse:[]
cantuse:[],
};
},
computed: {
systemBarHeight(){
return this.$store.state.user.systemBarHeight
}
},
mounted(){
console.log(12)
this.getTickList(true)
this.getTickList(false)
},
methods: {
goBack(){
wx.navigateBack({
delta: 1
});
},
getTickList(val) {
Mine.getUserList(val).then(res=>{
const { data } = res
......@@ -117,6 +132,28 @@ export default {
<style lang="scss" scoped>
.bigBox {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
.swiper {
background: #F8F8F8;
height: calc(100vh - 90rpx);
......
mineSubPackage/pages/msg/index.vue
<template>
<scroll-view class="msg" scroll-y>
<view class="empty" v-show="empty == true">
<view :style="{'text-align':'center'}">
<image class="empty_icon" src="/static/imgs/wuxiaoxizhanweitu.png"></image>
</view>
<view class="empty_text">——暂无消息，去品尝杯咖啡吧——</view>
<button class="empty_button" @click="goHome">去品尝</button>
<view class="bigBox">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">消息列表</view>
</view>
<view :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<scroll-view class="msg" scroll-y>
<view class="empty" v-show="empty == true">
<view :style="{'text-align':'center'}">
<image class="empty_icon" src="/static/imgs/wuxiaoxizhanweitu.png"></image>
</view>
<view class="empty_text">——暂无消息，去品尝杯咖啡吧——</view>
<button class="empty_button" @click="goHome">去品尝</button>
</view>
<view class="msg_item" v-for="item in list" @click="toRead(item)" :key="item.id">
<view class="msg_item_title_time">
<view v-if="item.isRead == 1" class="sign"></view>
<h3 class="title">{{ item.title || 'HOOLOO' }}</h3>
<view class="time">{{ item.createdAt }}</view>
</view>
<view class="msg_content">{{ item.message }}</view>
</view>
<show-toast ref="toast"/>
</scroll-view>
</view>
<view class="msg_item" v-for="item in list" @click="toRead(item)" :key="item.id">
<view class="msg_item_title_time">
<view v-if="item.isRead == 1" class="sign"></view>
<h3 class="title">{{ item.title || 'HOOLOO' }}</h3>
<view class="time">{{ item.createdAt }}</view>
</view>
<view class="msg_content">{{ item.message }}</view>
</view>
<show-toast ref="toast"/>
</scroll-view>
</view>
</template>
<script>
import Mine from '@/request/mine'
import Utils from '@/utils/utils'
export default {
data() {
return {
empty: false,
list: []
list: [],
Utils
}
},
onShow() {
this.getList()
},
computed:{
systemBarHeight(){
return this.$store.state.user.systemBarHeight
}
},
methods: {
async getList() {
const { data } = await Mine.getMsg();
......@@ -67,7 +84,27 @@ export default {
</script>
<style lang="scss" scoped>
.bigBox {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
}
.empty {
position: fixed;
/* 居中对齐begin */
......
mineSubPackage/pages/userInfo/index.vue
<template>
<view>
<view class="page">
<view class="bigBox">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">个人信息</view>
</view>
<view class="page" :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<view class="avatarBox">
<image class="avatar" :src="userInfo.avatarUrl"/>
</view>
......@@ -67,6 +71,7 @@
<script>
import Modal from '@/components/Modal/index.vue'
import Mine from '@/request/mine'
import Utils from '@/utils/utils'
import Store from '@/store';
export default {
components: { Modal },
......@@ -83,6 +88,9 @@ export default {
userInfoStorage() {
return this.$store.state.user.userInfo;
},
systemBarHeight(){
return this.$store.state.user.systemBarHeight
}
},
watch:{
'userInfo.name':{
......@@ -105,6 +113,7 @@ export default {
},
data() {
return {
Utils,
valateText:'',
canEditBirthday:true,
valate:false,
......@@ -227,6 +236,29 @@ export default {
</script>
<style scoped lang="less">
.bigBox {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
}
.page{
background: #F8F8F8;
height: 100vh;
......@@ -272,6 +304,8 @@ export default {
display: flex;
align-items: center;
justify-content: flex-start;
box-sizing: border-box;
padding-top: 7rpx;
.label {
font-size: 28rpx;
......
orderSubPackage/pages/coupon/index.vue
<template>
<view class="bigBox">
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">我的HOOLOO券</view>
</view>
<view :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
</view>
<view class="ticketList">
<swiper :current="current" class="swiper" @change="swiperChange">
<swiper-item>
......@@ -39,10 +45,14 @@
<script>
import Ticket from '@/components/Ticket/index.vue'
import Utils from '@/utils/utils'
import Tabs from '@/components/Tabs/index.vue'
export default {
components: {Ticket,Tabs},
computed:{
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
// canuse(){
// const list = this.$store.state.order.tickListSettle.canuse
// list.sort((a,b)=>{
......@@ -68,6 +78,7 @@ export default {
},
data() {
return {
Utils,
list1: [
{
name: "可使用",
......@@ -150,6 +161,28 @@ export default {
<style lang="scss" scoped>
.bigBox {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
.ticketList {
// margin-bottom: 176rpx;
.swiper {
......
orderSubPackage/pages/orderInfo/index.vue
......@@ -418,7 +418,7 @@ export default {
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
......
orderSubPackage/pages/refundInfo/index.vue
<template>
<view class="big">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">退款详情</view>
</view>
<view class="refundStep">
<view class="refund_title">退款进程</view>
<view class="refund_list" v-for="(item,index) in newList">
......@@ -28,11 +32,13 @@
</template>
<script>
import Utils from '@/utils/utils'
import order from '@/request/order'
export default {
data() {
return {
flag:false,
Utils,
list:[
{
skuName:'',
......@@ -62,6 +68,11 @@ export default {
newList:[]
};
},
computed: {
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
},
mounted() {
this.getRefundInfo()
......@@ -148,12 +159,32 @@ export default {
<style scoped lang="scss">
.big {
background: #F8F8F8;
padding-top: 32rpx;
height: 100vh;
.topBar{
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
}
.refundStep {
background: white;
margin: 0rpx 32rpx 32rpx 32rpx;
margin: 32rpx 32rpx 32rpx 32rpx;
padding-bottom: 32rpx;
overflow: hidden;
......
orderSubPackage/pages/settlement/index.vue
<template>
<view class="pages">
<div class="shop_info">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">订单结算</view>
</view>
<div class="shop_info" :style="{'margin-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight+Utils.getPx(32))+'px'}">
<h3>门店确认</h3>
<div class="address">
<div class="address_1">{{ shopData.name }}</div>
......@@ -256,6 +260,9 @@ export default {
}
},
computed: {
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
selectCoupon() {
const data = this.$store.state.order.selectTicket
return data
......@@ -311,6 +318,11 @@ export default {
}
},
methods: {
getPx(rpx) {
// console.log((rpx * (wx.getSystemInfoSync().windowWidth / 750)));
// console.log(wx.getSystemInfoSync().windowWidth);
return rpx * (wx.getSystemInfoSync().windowWidth / 750);
},
async getMessageFlag() {
const {data} = await User.getUserMsgInfo()
console.log(data)
......@@ -516,6 +528,28 @@ export default {
<style lang="scss" scoped>
.pages {
padding-top: 1rpx;
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
}
.messageBox {
......
orderSubPackage/pages/showhow/index.vue
<template>
<view class="bigBox">
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon>
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">实景演示</view>
</view>
<view :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<Tabs :list='list1' @changeTab="changeTab" :newIndex="current" />
</view>
<view>
<swiper :current="current" class="swiper" @change="swiperChange">
<swiper-item>
......@@ -20,6 +26,7 @@
<script>
import Ticket from '@/components/Ticket/index.vue'
import Utils from '@/utils/utils'
import Tabs from '@/components/Tabs/index.vue'
export default {
components: {Ticket,Tabs},
......@@ -35,11 +42,17 @@ export default {
],
nouserList:[],
current: 0,
actionIndx:0
actionIndx:0,
Utils
};
},
mounted(){
},
computed:{
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
},
methods: {
changeTab(current) {
this.current = current;
......@@ -53,6 +66,28 @@ export default {
<style lang="scss" scoped>
.bigBox {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
}
}
.swiper {
background: #F8F8F8;
height: calc(100vh - 64rpx);
......
orderSubPackage/pages/terms/index.vue
......@@ -538,7 +538,7 @@ export default {
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
font-weight: 600;
text-align: center;
width: 79%;
color: #333333
......
pages.json
......@@ -15,6 +15,7 @@
"path": "pages/order/order",
"style": {
"navigationBarTitleText": "我的订单",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -43,6 +44,7 @@
"path": "pages/areaSelect/areaSelect",
"style": {
"navigationBarTitleText": "选择门店",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
......@@ -55,6 +57,7 @@
"path": "pages/settlement/index",
"style": {
"navigationBarTitleText": "订单结算",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -70,6 +73,7 @@
"path": "pages/coupon/index",
"style": {
"navigationBarTitleText": "我的HOOLOO券",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -77,6 +81,7 @@
"path": "pages/refundInfo/index",
"style": {
"navigationBarTitleText": "退款详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -92,6 +97,7 @@
"path": "pages/showhow/index",
"style": {
"navigationBarTitleText": "实景演示",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
......@@ -104,6 +110,7 @@
"path": "pages/msg/index",
"style": {
"navigationBarTitleText": "消息列表",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -118,6 +125,7 @@
"path": "pages/coupon/index",
"style": {
"navigationBarTitleText": "我的HOOLOO券",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
......@@ -125,6 +133,7 @@
"path": "pages/userInfo/index",
"style": {
"navigationBarTitleText": "个人信息",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
......
pages/menu/menu.vue
......@@ -188,13 +188,13 @@ export default {
const location = uni.getStorageSync("location")
const shopInfo = uni.getStorageSync("shopInfo")
const {lat:latloc,lng:lngloc} = location
const {lat:latshop,lng:lngshop,distance:shopdistanceshop} = JSON.parse(shopInfo)
const {lat:latshop,lng:lngshop,distanceLimit} = JSON.parse(shopInfo)
const distance = Utils.getDistances(latloc,lngloc,latshop,lngshop)
if(!shopdistanceshop){
if(!distanceLimit){
this.isInRange = true
}else{
console.log(parseInt(distance.distance_str)<parseInt(shopdistanceshop))
this.isInRange = parseInt(distance.distance_str)<parseInt(shopdistanceshop)
console.log(parseInt(distance.distance_str)<parseInt(distanceLimit))
this.isInRange = parseInt(distance.distance_str)<parseInt(distanceLimit)
}
uni.setStorageSync("isInRange",this.isInRange)
});
......
pages/order/order.vue
<template>
<view class="pages">
<view class="topBar" :style="{'padding-top':systemBarHeight.statusBarHeight+'px','height':systemBarHeight.navigationBarHeight+'px'}">
<!-- <u-icon @click="Utils.goBack()" name="arrow-left" color="#000000" size="20"></u-icon> -->
<view class="tabTitle" :style="{'line-height':systemBarHeight.navigationBarHeight+'px'}">我的订单</view>
</view>
<view v-show="false">{{userms}}</view>
<view class="empty" v-show="userms && empty == true">
<view :style="{'padding-top':(systemBarHeight.statusBarHeight+systemBarHeight.navigationBarHeight)+'px'}">
<view class="empty" v-show="userms && empty == true">
<view :style="{'text-align':'center'}">
<image class="empty_icon" src="/static/imgs/wudingdanzhanweitu.png"></image>
</view>
<view class="empty_text">——您还未下单，下单品尝一下吧——</view>
<button class="empty_button" @click="goHome">去品尝</button>
</view>
<view class="empty_notdl" v-show="!userms">
</view>
<view class="empty_notdl" v-show="!userms">
<view :style="{'text-align':'center'}">
<image class="empty_icon" src="/static/imgs/weidengluzhanweitu.png"></image>
</view>
<view class="empty_text">——您还未登录，请先登录——</view>
<button class="empty_button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">去登录</button>
</view>
<view class="orders" :style="{'padding-bottom':orderBottom+'rpx'}">
</view>
<view class="orders" :style="{'padding-bottom':orderBottom+'rpx'}">
<view class="order_item" v-for="item in list" :key="item.id" @click="openInfo(item)">
<view class="order_header">
<view>
......@@ -63,7 +68,9 @@
<a class="btn" v-else @click.stop="oneMoreOrder(item)" type="primary">再来一单</a>
</view>
</view>
</view>
</view>
<show-toast ref="toast"/>
<taBar select="1"></taBar>
</view>
......@@ -104,7 +111,10 @@ export default {
computed: {
userms() {
return this.$store.getters.Authorization;
}
},
systemBarHeight(){
return this.$store.state.user.systemBarHeight
},
},
methods: {
refundInfo(item) {
......@@ -250,6 +260,30 @@ export default {
</script>
<style lang="scss" scoped>
.pages {
.topBar{
position: fixed;
width: 100%;
background: white;
display: flex;
justify-content: flex-start;
align-items: center;
z-index: 9999;
padding-left: 34rpx;
// .arrow-left {
// margin-left: 20rpx;
// }
.tabTitle{
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
text-align: center;
width: 92%;
color: #333333
}
}
}
.empty {
position: fixed;
/* 居中对齐begin */
......
utils/utils.js
......@@ -202,5 +202,17 @@ export default {
distance_str: distance_str
}
return objData
}
},
// 单位转换
getPx(rpx) {
// console.log((rpx * (wx.getSystemInfoSync().windowWidth / 750)));
// console.log(wx.getSystemInfoSync().windowWidth);
return rpx * (wx.getSystemInfoSync().windowWidth / 750);
},
// 返回上一页
goBack() {
wx.navigateBack({
delta: 1
});
},
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment