xingyy/uni-Identify-quality
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xingyy:f4c743e0d4a978741ee2fdf7f75ec9ecd3989a88
Branches Tags
xingyy:master
xingyy:hanlin
xingyy:xingyy
xingyy:xuminyi
xingyy:dev
..
compare: xingyy:c1270dc839beeae93ef7b99c86abb0bdb693f81b
Branches Tags
xingyy:hanlin
xingyy:master
xingyy:xingyy
xingyy:xuminyi
xingyy:dev

No commits in common. "f4c743e0d4a978741ee2fdf7f75ec9ecd3989a88" and "c1270dc839beeae93ef7b99c86abb0bdb693f81b" have entirely different histories.
f4c743e0d4 ... c1270dc839

5 changed files with 15 additions and 22 deletions
Show Stats Expand all files Collapse all files

2
App.vue
View File

@ -3,7 +3,7 @@ import tabBar from "./util/tabbar";
export default { export default {
onLaunch: function() { onLaunch: function() {
uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2NjlHMEtKcFlKNE1qWGhyNEh5cHhBUSIsIk5pY2tOYW1lIjoi5YiY5bCP5benIiwiVGVsTnVtIjoiMTUyNjI0ODE0OTgiLCJBdmF0YXIiOiJodHRwczovL2NkbnMuZm9udHJlZS5jbi9pbnZlbnRvcnkvZmlsZXMvaW1nL2MzNWQ1ODVhLTVjNTMtMTFlZS04OGRmLTAyNDJhYzEzMDAyNS5qcGciLCJJRE51bSI6IjMyMDMyNDE5OTAwNTA5NjY0WCIsImV4cCI6MTY5NTgxMTk4NCwiaXNzIjoibWFsbCJ9.QDDAiN5xFtL7BelKfgbnej_nO52T_UxQ7GFicHnQA2U') // uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoiIiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IiIsImV4cCI6MTY5NTQzNjEwMSwiaXNzIjoibWFsbCJ9.qYzFMtoOOBuawYDTl7iuwlTTz7Fakhr8657PjxWhQ8I')
uni.hideTabBar(); uni.hideTabBar();
uni.setStorageSync("tabBar", tabBar); uni.setStorageSync("tabBar", tabBar);
}, },

12
components/uiq-tabbar/uiq-tabbar.vue
View File

@ -1,11 +1,11 @@
<template> <template>
<view class="tabbar"> <view class="tabbar">
<u-tabbar class="tabbar-ios-fix" :border="false" activeColor='#22bf8e' :value="current?current:0" :fixed="true" <u-tabbar :safeAreaInsetBottom="true" :placeholder="true" :border="false" class="tabbar-ios-fix" activeColor='#22bf8e' :value="current?current:0" :fixed="true"
:placeholder="true" :safeAreaInsetBottom="true" @change="handleTabClick"> @change="handleTabClick">
<u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text"> <u-tabbar-item v-for='(item,index) in tabList' :key="index" :text="item.text">
<image style="width: 52rpx;height: 52rpx;" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath"> <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="inactive-icon" class="u-page__item__slot-icon" :src="item.iconPath">
</image> </image>
<image style="width: 52rpx;height: 52rpx;" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath"> <image style="width: 52rpx;height: 52rpx;margin-top: 34rpx" slot="active-icon" class="u-page__item__slot-icon" :src="item.selectedIconPath">
</image> </image>
</u-tabbar-item> </u-tabbar-item>
</u-tabbar> </u-tabbar>
@ -42,7 +42,7 @@ export default {
} }
/*.tabbar-ios-fix { .tabbar-ios-fix {
bottom: calc(120rpx + env(safe-area-inset-bottom)); bottom: calc(120rpx + env(safe-area-inset-bottom));
}*/ }
</style> </style>

10
pages/contract/index.vue
View File

@ -51,13 +51,9 @@ export default {
}, },
methods:{ methods:{
async getDistanceFromTopToPageBottom(classValue) { async getDistanceFromTopToPageBottom(classValue) {
const {windowHeight, windowWidth} = await uni.getSystemInfo(); const { windowHeight, windowWidth } = await uni.getSystemInfo();
const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve)); const [{ top }] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
if(uni.getSystemInfoSync().platform === 'ios'){ this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
}else {
this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 110;
}
}, },
loadMore(){ loadMore(){

2
pages/mine/index.vue
View File

@ -61,7 +61,7 @@ export default {
const res = await this.$api.mine.infoOrders() const res = await this.$api.mine.infoOrders()
if(res.status === 0){ if(res.status === 0){
this.orderTotal = res.data.totalCount this.orderTotal = res.data.totalCount
this.validContractDays = res.data.nearCount this.validContractDays = res.data.nowCount
}else{ }else{
this.$common.msgToast(res.msg); this.$common.msgToast(res.msg);
} }

11
pages/order-goods/index.vue
View File

@ -50,8 +50,8 @@
<!-- <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>--> <!-- <div class="wrap1_2_2">订单号:{{ item.artworkName }}</div>-->
<div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div> <div class="wrap1_2_3">{{ item.artworkSquareSize }}平尺</div>
<div class="wrap1_2_4"> <div class="wrap1_2_4">
<div v-if="item.artworkStatus!==4"> <div v-if="item.artworkStatus!==1">
{{ item.startAt }}-{{ item.endAt }} {{ item.startAt ||''}}-{{ item.endAt||'' }}
</div> </div>
<div v-else>{{item.cycleName}} </div> <div v-else>{{item.cycleName}} </div>
@ -85,6 +85,7 @@
@confirm="popForward" @confirm="popForward"
></uni-popup-dialog> ></uni-popup-dialog>
</uni-popup> </uni-popup>
<div style="width: 100rpx;height: 100rpx;background: red;position: fixed;bottom: 0;z-index: 999"></div>
<tabbar :current="1"></tabbar> <tabbar :current="1"></tabbar>
</div> </div>
</template> </template>
@ -164,11 +165,7 @@ export default {
async getDistanceFromTopToPageBottom(classValue) { async getDistanceFromTopToPageBottom(classValue) {
const {windowHeight, windowWidth} = await uni.getSystemInfo(); const {windowHeight, windowWidth} = await uni.getSystemInfo();
const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve)); const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
if(uni.getSystemInfoSync().platform === 'ios'){ this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
}else {
this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 110;
}
}, },
openDelete(item) { openDelete(item) {
this.messageText = `确认删除吗` this.messageText = `确认删除吗`