Browse Source

fix bug

voice
刘嘉炜 4 years ago
parent
commit
35b0fd3849
  1. 2
      src/pages/employee/manage/manage.vue
  2. 2
      src/pages/employee/perfect_info/perfect_info.vue
  3. 29
      src/pages/order_list/order_list.vue
  4. 2
      src/pages/time_select/date/date.vue

2
src/pages/employee/manage/manage.vue

@ -28,7 +28,7 @@
<image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
</view>
</view>
<view class="ei-user">
<view class="ei-user" v-if="employeeInfo.is_super == 1">
<view>
<image mode="aspectFill" :src="employeeInfo.admin.avatar_url || ''"></image>
<view class="eu-name">{{employeeInfo.admin.actual_name || '-'}}</view>

2
src/pages/employee/perfect_info/perfect_info.vue

@ -88,7 +88,7 @@ export default {
iv: userRes.detail.iv,
actual_name: userName,
mobile: userPhone,
brand_id: brand_id || 37,
brand_id: brand_id,
// brand_id: sceneQuery.b,
// rid: sceneQuery.r,
// brand_id: 37,

29
src/pages/order_list/order_list.vue

@ -47,7 +47,7 @@
<view
v-for="e in classifyArr"
:key="e.id"
:class="['ot-item',e.id === curTabID?'active':'']"
:class="['ot-item',e.id.toString() === curTabID.toString()?'active':'']"
@click="tabChange(e.id)"
>{{e.name}}</view>
</view>
@ -91,22 +91,22 @@
import { API } from '../../js/api';
import { mapState } from 'vuex';
const resClassify = [ // tab
{id:'',name:'全部'},
{id:1,name:'待使用'},
{id:2,name:'已使用'},
{id:3,name:'已失效'},
{id:4,name:'已退款'},
{id:'', name:'全部'},
{id:1, name:'待使用'},
{id:2, name:'已使用'},
{id:3, name:'已失效'},
{id:4, name:'已退款'},
];
const memClassify = [ // tab
{id:'',name:'全部'},
{id:1,name:'使用中'},
{id:0,name:'已失效'},
{id:'', name:'全部'},
{id:1, name:'使用中'},
{id:0, name:'已失效'},
]
const intClassify = [ // tab
{id:'',name:'全部'},
{id:1,name:'待发货'},
{id:2,name:'已发货'},
{id:3,name:'已完成'},
{id:'', name:'全部'},
{id:1, name:'待发货'},
{id:2, name:'已发货'},
{id:3, name:'已完成'},
]
export default {
components: {
@ -167,7 +167,7 @@
//
// - 1 使 / 2 使 / 3 / 4 退
// - 1 '使' / 0 ''
// - 1 / 2 / 3 / 4
// - 1 / 2 / 3 / 4
status: curTabID,
stadium_id: _curSelectedStore.id || '',
page: ++page,
@ -234,6 +234,7 @@
this.curTabID = ID;
this.hideClassify();
this.$nextTick(this.refreshList);
},300,300),
storeChange(e){
let { value } = e.detail;

2
src/pages/time_select/date/date.vue

@ -15,7 +15,7 @@
<view :class="[isSameDay(item.defineDate || '')?'active':'']" @click="timeChange(item)">
<view :class="[item.isUnStart?'unstart-active':'']" >{{item.showDate}}</view>
<view>
<text v-if="item.money>0">¥{{item.money}}</text>
<text v-if="!item.isUnStart&&!!item.defineDate">¥{{item.money || '0.00'}}</text>
</view>
</view>
</view>

Loading…
Cancel
Save