Browse Source

fix all

voice
刘嘉炜 5 years ago
parent
commit
5362ef98a1
  1. 11
      src/pages/collection/detail/detail.vue
  2. 6
      src/pages/collection/record/record.vue
  3. 2
      src/pages/employee/authority_select/authority_select.vue
  4. 14
      src/pages/turnover/turnover.vue

11
src/pages/collection/detail/detail.vue

@ -2,7 +2,7 @@
<view class="collection-detail"> <view class="collection-detail">
<view class="cd-address">当前所在门店{{storeInfo.name || '-'}}</view> <view class="cd-address">当前所在门店{{storeInfo.name || '-'}}</view>
<view class="cd-overview"> <view class="cd-overview">
<picker mode="multiSelector" :range="timerArr" @change="dateChange">
<picker mode="multiSelector" :range="timerArr" @change="dateChange" :value="curTimePickerValue">
<view class="co-time"> <view class="co-time">
<text>{{curSelectedDate.month || 0}}{{curSelectedDate.date || 0}}</text> <text>{{curSelectedDate.month || 0}}{{curSelectedDate.date || 0}}</text>
<view></view> <view></view>
@ -47,6 +47,7 @@ export default {
receiveList: [], receiveList: [],
receiveInfo: {}, // receiveInfo: {}, //
timerArr: [], // timerArr: [], //
curTimePickerValue:[0,0], // picker
curType: 0, curType: 0,
curSelectedDate: { curSelectedDate: {
year: '', year: '',
@ -59,8 +60,10 @@ export default {
let _query = util.jsonPar(options.query); let _query = util.jsonPar(options.query);
this.storeInfo = _query.store; this.storeInfo = _query.store;
this.detail = _query.detail; this.detail = _query.detail;
this.timerArr = this.getTimerArr(_query.detail.date);
let _curDate = _query.detail.date || ''
let _curTime = new Date(_curDate.replace(/\-/g,'/'));
this.timerArr = this.getTimerArr(_curDate.replace(/\-/g,'/'));
this.curTimePickerValue = [_curTime.getMonth(), _curTime.getDate()-1]
this.getDetail({ this.getDetail({
date: _query.detail.date, date: _query.detail.date,
type: this.curType, type: this.curType,
@ -97,7 +100,7 @@ export default {
stadium_id: storeInfo.id, stadium_id: storeInfo.id,
}) })
}, },
getTimerArr(curDate){
getTimerArr(curDate = ''){
let _dateObj = new Date(curDate); let _dateObj = new Date(curDate);
let _year = _dateObj.getFullYear(); let _year = _dateObj.getFullYear();
let _month = util.formatNumber(_dateObj.getMonth()+1); let _month = util.formatNumber(_dateObj.getMonth()+1);

6
src/pages/collection/record/record.vue

@ -10,7 +10,7 @@
</picker> </picker>
</view> </view>
<view class="cr-overview"> <view class="cr-overview">
<picker mode="multiSelector" :range="timerArr" @change="dateChange">
<picker mode="multiSelector" :range="timerArr" :value="curTimePickerValue" @change="dateChange">
<view class="co-time"> <view class="co-time">
<text>{{curDate.year || 0}}{{curDate.month || 0}}</text> <text>{{curDate.year || 0}}{{curDate.month || 0}}</text>
<view></view> <view></view>
@ -52,6 +52,10 @@ export default {
new Array(12).fill(1).map((e,i)=>util.formatNumber(i+1)) new Array(12).fill(1).map((e,i)=>util.formatNumber(i+1))
] ]
}, },
// picker
curTimePickerValue(){
return [0, new Date().getMonth()]
},
formatDate(){ formatDate(){
return (date = '') => { return (date = '') => {
if(util.isSameDay(new Date().getTime(), new Date(date.replace(/\-/g,'/')).getTime()))return '今天' if(util.isSameDay(new Date().getTime(), new Date(date.replace(/\-/g,'/')).getTime()))return '今天'

2
src/pages/employee/authority_select/authority_select.vue

@ -183,7 +183,7 @@ export default {
servers.get({ servers.get({
url: API.employee.employeeDelete, url: API.employee.employeeDelete,
data: { data: {
id: [options_query.userInfo.id]
id: options_query.userInfo.id
}, },
isDefaultGet: false isDefaultGet: false
}) })

14
src/pages/turnover/turnover.vue

@ -5,8 +5,10 @@
<view :class="[tabID == 1?'active':'']" @click="tabChange(1)">门店</view> <view :class="[tabID == 1?'active':'']" @click="tabChange(1)">门店</view>
</view> </view>
<view class="tc-total-section"> <view class="tc-total-section">
<!-- 品牌 -->
<view class="tts-address" v-if="tabID == 0&&storeList.length > 1"> <view class="tts-address" v-if="tabID == 0&&storeList.length > 1">
<image class="ta-logo" :src="pageInfo.logo" mode="aspectFit"></image>
<view>{{pageInfo.name || '-'}}</view> <view>{{pageInfo.name || '-'}}</view>
<!-- <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> --> <!-- <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> -->
</view> </view>
@ -287,6 +289,7 @@ export default {
height: 108upx; height: 108upx;
border-bottom: 2upx solid #D8D8D8; border-bottom: 2upx solid #D8D8D8;
@include centerFlex(space-between); @include centerFlex(space-between);
>view{ >view{
flex-grow: 1; flex-grow: 1;
font-size: 28upx; font-size: 28upx;
@ -299,6 +302,15 @@ export default {
width: 28upx; width: 28upx;
height: 28upx; height: 28upx;
} }
.ta-logo{
justify-self: flex-start;
flex-shrink: 0;
flex-grow: 0;
margin-right: 20upx;
margin-left: 0;
width: 52upx;
height: 52upx;
}
} }
.tts-money{ .tts-money{
padding-top: 48upx; padding-top: 48upx;

Loading…
Cancel
Save