Browse Source

Merge branch 'dev' into voice

voice
zmt 4 years ago
parent
commit
777ae74e72
  1. 3
      .gitignore
  2. 10
      src/components/organize_order/organize_order.vue
  3. 4
      src/components/reservation_order/reservation_order.vue
  4. 4
      src/components/timing_order/timing_order.vue
  5. 137
      src/pages/order_list/order_list.vue
  6. 65
      src/pages/write_off/search_result/search_result.vue
  7. 3
      src/subpackage/device/js/device_api.js
  8. 11
      src/subpackage/device/pages/locker_manage/locker_manage.vue
  9. 29
      src/subpackage/device/pages/order_manage/order_manage.vue
  10. 1887
      yarn.lock

3
.gitignore

@ -3,6 +3,8 @@ node_modules/
unpackage/
dist/
.hbuilderx/
# local env files
.env.local
.env.*.local
@ -21,3 +23,4 @@ yarn-error.log*
*.njsproj
*.sln
*.sw*

10
src/components/organize_order/organize_order.vue

@ -2,7 +2,7 @@
<view class="timing-order" @click="toOrderDetails">
<view class="ro-header">
<view class="rh-view">{{orderInfo.original_order.extension.stadium_name || '-'}}</view>
<text :class="[ 'rh-text', orderInfo.original_order.pay_status == 0?'rh-active':'' ]">{{zh_order_status(orderInfo.original_order.pay_status)}}</text>
<text :class="[ 'rh-text', orderInfo.original_order&&orderInfo.original_order.pay_status == 0?'rh-active':'' ]">{{zh_order_status(orderInfo.original_order&&orderInfo.original_order.pay_status)}}</text>
</view>
<view class="ro-section">
<view class="rs-line">
@ -38,7 +38,7 @@
</view>
</view>
<view class="ro-bot" v-if="orderInfo.original_order.pay_status != 0">
<view class="ro-bot" v-if="orderInfo.original_order&&orderInfo.original_order.pay_status != 0">
<!-- status == End 可发放金额-->
<!-- <view v-if="orderInfo.status=='End'" class="ro-btn" @click="clickSendAmount">发放金额</view> -->
<view class="rb-total">实付款 <text class="rt-txt"> ¥{{orderInfo.original_order.pay_amount || 0}}</text></view>
@ -54,7 +54,7 @@ export default {
props: {
orderInfo: {
type: Object,
default: ()=>({})
default: ()=>({ })
}
},
computed: {
@ -174,10 +174,6 @@ export default {
.rv-active{
color: $themeColor;
}
>image{
width: 32rpx;
height: 32rpx;
}
}
}

4
src/components/reservation_order/reservation_order.vue

@ -16,7 +16,7 @@
<view class="rs-line">
<view class="rl-view">预订项目</view>
<view class="rl-view">
<view class="rv-view"><text>{{ zh_type_name(orderInfo.order_type) }}</text></view>
<view class="rv-view"><text class="rv-text">{{ zh_type_name(orderInfo.order_type) }}</text></view>
</view>
</view>
<!-- 场次 -->
@ -195,7 +195,7 @@ export default {
line-height: 40upx;
font-size: 24upx;
color: #9c9c9f;
>text{
>.rv-text{
color: #333;
}
}

4
src/components/timing_order/timing_order.vue

@ -10,7 +10,7 @@
<view class="rl-view">
<view class="rv-view">{{orderInfo.order_no || '-'}}</view>
</view>
<image src="/static/images/icon/arrow_b2.png"></image>
<image class="rl-image" src="/static/images/icon/arrow_b2.png"></image>
</view>
<!-- 场次有 人次没有 order_type: 1场次 2人次 -->
<view class="rs-line" v-if="orderInfo.order_type == 1">
@ -125,7 +125,7 @@ export default {
.rv-active{
color: $themeColor;
}
>image{
>.rl-image{
width: 32rpx;
height: 32rpx;
}

137
src/pages/order_list/order_list.vue

@ -11,7 +11,12 @@
</picker>
</view>
<view class="ol-select-type" v-if="orderType == 10">
<view v-for="(oitem,oi) in selectOrderType" :key="oi" :class="oitem.active?'als-active':''" @click="tabTypeChange(oi)">{{oitem.name}}</view>
<view
v-for="(oitem,oi) in selectOrderType"
:key="oi"
:class="oitem.type == selectedOrderType ?'als-active':''"
@click="tabTypeChange(oitem)"
>{{oitem.name || '-'}}</view>
</view>
<view class="oh-ctrl">
@ -47,7 +52,7 @@
<view class="ox-dark-mask" v-if="isShowClassify" @click="hideClassify">
<view class="ol-classify" @click.stop="()=>false">
<view class="oc-title">
{{titleName}}
{{ titleName }}
</view>
<view class="oc-tabs">
<view
@ -95,40 +100,26 @@
import timing_order from '../../components/timing_order/timing_order.vue'
import organize_order from '../../components/organize_order/organize_order.vue'
import util from '../../utils/util';
import { servers } from '../../js/server';
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:'已退款'},
];
const memClassify = [ // tab
{id:'', name:'全部'},
{id:1, name:'使用中'},
{id:0, name:'已失效'},
]
const intClassify = [ // tab
{id:'', name:'全部'},
{id:1, name:'待发货'},
{id:2, name:'已发货'},
{id:3, name:'已完成'},
// tab
const resClassify = [ {id:'', name:'全部'}, {id:1, name:'待使用'}, {id:2, name:'已使用'}, {id:3, name:'已失效'}, {id:4, name:'已退款'}, ];
// tab
const memClassify = [
{id:'', name:'全部'}, {id:1, name:'使用中'}, {id:0, name:'已失效'},
]
const timClassify = [ // tab ///退 [/0/1/4]
{id:'', name:'全部'},
{id:0, name:'计费中'},
{id:1, name:'已完成'},
{id:4, name:'已退款'},
]
const orgClassify = [ // tab ///退 [/0/1/4]
{id:'', name:'全部'},
{id:1, name:'已付款'},
{id:2, name:'已完成'},
{id:4, name:'已退款'},
]
// tab
const intClassify = [ {id:'', name:'全部'}, {id:1, name:'待发货'}, {id:2, name:'已发货'}, {id:3, name:'已完成'}, ]
// tab ///退 [/0/1/4]
const timClassify = [ {id:'', name:'全部'}, {id:0, name:'计费中'}, {id:1, name:'已完成'}, {id:4, name:'已退款'}, ]
// tab ///退 [/0/1/4]
const orgClassify = [ {id:'', name:'全部'}, {id:1, name:'已付款'}, {id:2, name:'已完成'}, {id:4, name:'已退款'}, ]
export default {
components: {
// 'reservation-order': order.reservation,
@ -149,8 +140,12 @@
return [];
},
titleName(){
let { orderType } = this;
if(orderType == 3)return '预约订单';
let { orderType, appointOrderType } = this;
if(orderType == 3){
if(appointOrderType == 0)return '订场订单';
if(appointOrderType == 1)return '次卡订单';
return '预约订单';
}
if(orderType == 4)return '会员卡订单';
if(orderType == 5)return '积分商城订单';
if(orderType == 1)return '计时订单';
@ -183,60 +178,52 @@
orderInfo: {}, // 退
orderList: [], //
page: 1,
selectOrderType:[ //
{
name:"发起约玩",
active:true,
type:"Main"
},
{
name:"参与约玩",
active:false,
type:"Sub"
}
],
selectedOrderType:"Main",//
selectedOrderType: "Main",//
// 20210706 // , ->
appointOrderType: ''
}
},
onReachBottom(){
let { curTabID, periodInfo, orderType, curSelectedStore, page } = this;
let { curTabID, periodInfo, orderType, curSelectedStore, page, appointOrderType } = this;
let _curSelectedStore = curSelectedStore || {};
this.getOrderList({
begin: periodInfo.start,
end: periodInfo.end,
//
// - 1 使 / 2 使 / 3 / 4 退
// - 1 '使' / 0 ''
// - 1 / 2 / 3 / 4
end: periodInfo.end,
status: curTabID,
stadium_id: _curSelectedStore.id || '',
page: ++page,
orderType: orderType,
order_type: appointOrderType,
})
},
onLoad(options){
let _type = options.order_type
let _type = options.order_type || '';
this.orderType = _type;
this.$nextTick(_=>{
uni.setNavigationBarTitle({
title: this.titleName
})
})
let defaultTime = this.getDefaultTimeLimit(_type);
this.periodInfo = defaultTime;
//
if(options.order_type == 3&&options.type!=undefined)this.appointOrderType = options.type;
this.$nextTick(_=>{ uni.setNavigationBarTitle({ title: this.titleName }) });
this.periodInfo = this.getDefaultTimeLimit(_type);
this.getStoreList();
this.getOrderList({
begin: defaultTime.start,
end: defaultTime.end,
orderType: _type
})
this.$nextTick(this.refreshList);
},
onUnload() {
},
methods: {
//
// 3->,4->,5->,1->
@ -246,18 +233,18 @@
let _beforeSeven = _date.getTime() - _sevenTimeStemp;
let _afterSeven = _date.getTime() + _sevenTimeStemp;
let _obj = {
start: '',
end: ''
}
let _obj = { start: '', end: '' };
if(type == 3 )_obj['start']=util.formatDate({}),_obj['end'] = util.formatDate({date: _afterSeven});
if(type == 4 || type == 1)_obj['start']=util.formatDate({date: _beforeSeven}),_obj['end'] = util.formatDate({});
console.log(_obj)
return _obj;
},
//
refreshList(){
let { curTabID, periodInfo, orderType, curSelectedStore, page } = this;
let { curTabID, periodInfo, orderType, curSelectedStore, page, appointOrderType } = this;
let _curSelectedStore = curSelectedStore || {};
this.orderList = [];
this.page = 1;
@ -265,13 +252,10 @@
this.getOrderList({
begin: periodInfo.start,
end: periodInfo.end,
//
// - 1 使 / 2 使 / 3 / 4 退
// - 1 '使' / 0 ''
// - 1 / 2 / 3 / 4
status: curTabID,
stadium_id: _curSelectedStore.id,
orderType: orderType,
order_type: appointOrderType,
})
},
tabChange: util.debounce(function(ID){
@ -282,14 +266,11 @@
},300,300),
//type
tabTypeChange: util.debounce(function(index){
for(var i of this.selectOrderType){
i.active = false
}
this.selectOrderType[index].active = true
this.selectedOrderType = this.selectOrderType[index].type
tabTypeChange: util.debounce(function(item){
this.selectedOrderType = item.type
this.$nextTick(this.refreshList);
},300,true),
storeChange(e){
let { value } = e.detail;
let { storeList } = this;
@ -381,6 +362,7 @@
page,
page_size,
order_type,
orderType
}
if(this.orderType == "10"){ //, 0430.0507()
postData['type'] = this.selectedOrderType;
@ -410,15 +392,6 @@
},
detailChange(){
console.log("点击了吗66")
// let _query = {}
// _query["stadium_id"] = e.stadium_id
// _query["order_no"] = e.order_no
// _query["order_type"] = this.orderType
// util.routeTo(`/subpackage/device/pages/order_details/order_details?query=${util.jsonStr(_query)}`,'nT');
},
}
</script>

65
src/pages/write_off/search_result/search_result.vue

@ -61,51 +61,56 @@ export default {
curStadium: {}, //
writeOffList: [], // ,
curDate: util.formatDate({}),
page: 1,
totalNum: 0,
}
},
// 20210716
// onReachBottom(){
// let { page, curDate, curStadium } = this;
// this.getList({
// brand_id: curStadium.brand_id || '',
// stadium_id: curStadium.id || '',
// date: curDate || '',
// page: ++page,
// });
// },
onLoad(){
this.initPage();
},
onShow(){
let { curStadium, curDate } = this;
if(curStadium&&curStadium.id)this.getList({
brand_id: curStadium.brand_id || '',
stadium_id: curStadium.id,
date: curDate,
});
let { curStadium } = this;
if(curStadium&&curStadium.id)this.refreshList();
},
methods: {
dateChange(e){
let { curStadium } = this;
this.curDate = e.detail.value;
refreshList(){
let { curDate, curStadium } = this;
this.page = 1;
this.writeOffList = [];
this.getList({
brand_id: curStadium.brand_id || '',
stadium_id: curStadium.id,
date: e.detail.value,
stadium_id: curStadium.id || '',
date: curDate || '',
});
},
dateChange(e){
this.curDate = e.detail.value;
this.$nextTick(this.refreshList);
},
stadiumChange(e){
let { stadiumList, curDate } = this;
let { stadiumList } = this;
this.curStadium = stadiumList[e.detail.value];
this.getList({
brand_id: stadiumList[e.detail.value].brand_id || '',
stadium_id: stadiumList[e.detail.value].id,
date: curDate,
});
this.$nextTick(this.refreshList);
},
async initPage(){
let { brandInfo } = this;
try{
let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
this.stadiumList = _storeList || [];
if(_storeList.length) this.curStadium = _storeList[0];
console.warn(util.formatDate({}))
this.getList({
brand_id: brandInfo.brand.id || '',
stadium_id: _storeList[0].id,
date: util.formatDate({}),
});
this.$nextTick(this.refreshList);
}catch(err){
console.warn('加载数据失败!', err);
}
@ -118,18 +123,22 @@ export default {
})
util.routeTo(`/pages/write_off/operate/operate`, 'nT');
},
getList({ brand_id, stadium_id = '', date = '' }){
getList({ brand_id, stadium_id = '', date = '', page = 1, page_size = '' }){
util.showLoad();
servers.get({
url: API.writeOff.listVerifyRecord,
data: { brand_id, stadium_id, date },
data: { brand_id, stadium_id, date, page, page_size },
failMsg: '加载失败!',
})
.then(res=>{
util.hideLoad();
this.totalNum = res.total || 0;
let _list = res.list || [];
this.writeOffList = _list;
console.warn(res, 'jijjjjjjjjj')
if(page == 1)return this.writeOffList = _list;
if(!_list.length)return util.showNone('没有更多!');
this.page = page;
this.writeOffList = [...this.writeOffList, ..._list];
})
},
getStoreList({

3
src/subpackage/device/js/device_api.js

@ -15,7 +15,8 @@ export const DEVICE_API = {
leaseList:`${ORIGIN}/admin/stadium/lease/cabinet/list`, // 租售柜列表
lockerList:`${ORIGIN}/admin/stadium/locker/cabinet/list`, // 储物柜列表
leaseTest:`${ORIGIN}/admin/stadium/lease/cabinet/test`, // 储物柜打开
leaseTest:`${ORIGIN}/admin/stadium/lease/cabinet/test`, // 租售柜打开
lockerTest:`${ORIGIN}/admin/stadium/locker/cabinet/test`, // 储物柜打开
leaseReset:`${ORIGIN}/admin/stadium/lease/cabinet/reset`, // 储物柜补货

11
src/subpackage/device/pages/locker_manage/locker_manage.vue

@ -212,11 +212,20 @@ export default {
})
.catch(util.hideLoad)
},
//
// e.page_id == 8 ||  //
// e.page_id == 9 ||  //
getOpenApi(){
let { optionsQuery } = this;
if(optionsQuery.page_id == 8)return deviceApi.leaseTest;
if(optionsQuery.page_id == 9)return deviceApi.lockerTest;
},
openLockerReq(cabinet_ids){
let { curStoreInfo } = this;
util.showLoad();
return deviceServer.get({
url: deviceApi.leaseTest,
url: this.getOpenApi(),
data: {
brand_id: curStoreInfo.brand_id,
cabinet_ids: cabinet_ids,

29
src/subpackage/device/pages/order_manage/order_manage.vue

@ -1,10 +1,10 @@
<template>
<view class="order-manage">
<view class="om-section" v-for="(e, i) in tabList" :key="e.id">
<view class="om-section" v-for="e in tabList" :key="e.id">
<view class="os-tit">{{e.name}}</view>
<view class="os-tabs">
<view class="ot-item" v-for="(j, k) in e.itemList" :key="k" @click="toPageInfo(j)">
<image mode="aspectFit" :src="'/subpackage/device/static/images/order/tab_'+ e.id + '_' + k + '.png'"></image>
<image mode="aspectFit" :src="j.icon"></image>
<view>{{j.name}}</view>
</view>
</view>
@ -23,28 +23,39 @@ const tabList = [
itemList:[
{
id: 3,
name: "预约订单",
path: '/pages/order_list/order_list',
name: "订场订单",
path: '/pages/order_list/order_list?order_type=3&type=0',
icon: '/subpackage/device/static/images/order/tab_0_0.png'
},
{
id: 3,
name: "次卡订单",
path: '/pages/order_list/order_list?order_type=3&type=1',
icon: '/subpackage/device/static/images/order/tab_0_0.png'
},
{
id: 1,
name: "计时订单",
path: '/pages/order_list/order_list',
icon: '/subpackage/device/static/images/order/tab_0_1.png'
},
{
id: 2,
name: "商城订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_2.png'
},
{
id: 0,
name: "课程订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_3.png'
},
{
id: 10,
name: "约玩订单",
path: '/pages/order_list/order_list',
icon: '/subpackage/device/static/images/order/tab_0_4.png'
// path: '',
},
{
@ -52,36 +63,43 @@ const tabList = [
name: "储值卡订单",
// path: '/pages/order_list/order_list',
path: '',
icon: '/subpackage/device/static/images/order/tab_0_5.png'
},
{
id: 6,
name: "售货柜订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_6.png'
},
{
id: 7,
name: "储物柜订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_7.png'
},
{
id: 8,
name: "租售柜订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_8.png'
},
{
id: 9,
name: "咖啡机订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_9.png'
},
{
id: 5,
name: "积分兑换订单",
path: '/pages/order_list/order_list',
icon: '/subpackage/device/static/images/order/tab_0_10.png'
},
{
id: 11,
name: "浴室订单",
path: '',
icon: '/subpackage/device/static/images/order/tab_0_11.png'
}
],
},
@ -93,6 +111,7 @@ const tabList = [
id: 0,
name: "售后维权",
path: '',
icon: '/subpackage/device/static/images/order/tab_1_0.png'
},
],
},
@ -113,7 +132,7 @@ export default {
util.routeTo(tabInfo.path,'nT');
},
isOrderTab(ID){
return ID == 3 || ID == 4 || ID == 5 || ID == 1 || ID == 10
return ID == 4 || ID == 5 || ID == 1 || ID == 10
},
}
}

1887
yarn.lock
File diff suppressed because it is too large
View File

Loading…
Cancel
Save