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