日常提交
This commit is contained in:
parent
82e877b7b9
commit
34ad2076f0
6
app.json
6
app.json
@ -45,6 +45,12 @@
|
|||||||
"iconPath": "assets/icon/tabs/tab1.png",
|
"iconPath": "assets/icon/tabs/tab1.png",
|
||||||
"selectedIconPath": "assets/icon/tabs/tab1-active.png"
|
"selectedIconPath": "assets/icon/tabs/tab1-active.png"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"pagePath": "pages/shop/index/index",
|
||||||
|
"text": "生活圈",
|
||||||
|
"iconPath": "assets/icon/tabs/tab2.png",
|
||||||
|
"selectedIconPath": "assets/icon/tabs/tab2-active.png"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pagePath": "pages/order/index/index",
|
"pagePath": "pages/order/index/index",
|
||||||
"text": "订单",
|
"text": "订单",
|
||||||
|
|||||||
@ -75,8 +75,8 @@ Page({
|
|||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
app.globalData.needRefreshOrderList = false;
|
app.globalData.needRefreshOrderList = false;
|
||||||
if(app.globalData.accessToken){
|
if(app.globalData.accessToken){
|
||||||
this.pager.tab1.loading = false;
|
this.data.pager.tab1.loading = false;
|
||||||
this.pager.tab3.loading = false;
|
this.data.pager.tab3.loading = false;
|
||||||
|
|
||||||
this.loadOrderList();
|
this.loadOrderList();
|
||||||
this.loadMerchantOrderList();
|
this.loadMerchantOrderList();
|
||||||
|
|||||||
@ -1,17 +1,17 @@
|
|||||||
<!-- <nav-bar class="nav-bar"/> -->
|
<!-- <nav-bar class="nav-bar"/> -->
|
||||||
<view class="custom-scroll-view">
|
<view class="custom-scroll-view">
|
||||||
|
|
||||||
<!-- <view class="tab-bar">
|
<view class="tab-bar">
|
||||||
<view class="item-container {{tabIndex==0?'current':''}}" bind:tap="changeTab" data-index="0">
|
<view class="item-container {{tabIndex==0?'current':''}}" bind:tap="changeTab" data-index="0">
|
||||||
<view class="item">配送订单</view>
|
<view class="item">配送订单</view>
|
||||||
</view> -->
|
</view>
|
||||||
<!-- <view class="item-container {{tabIndex==1?'current':''}}" bind:tap="changeTab" data-index="1">
|
<!-- <view class="item-container {{tabIndex==1?'current':''}}" bind:tap="changeTab" data-index="1">
|
||||||
<view class="item">消费买单</view>
|
<view class="item">消费买单</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
<!-- <view class="item-container {{tabIndex==2?'current':''}}" bind:tap="changeTab" data-index="2">
|
<view class="item-container {{tabIndex==2?'current':''}}" bind:tap="changeTab" data-index="2">
|
||||||
<view class="item">商品订单</view>
|
<view class="item">商品订单</view>
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view>
|
||||||
<!-- <swiper style="height:{{scrollViewHeight*2}}rpx"> -->
|
<!-- <swiper style="height:{{scrollViewHeight*2}}rpx"> -->
|
||||||
|
|
||||||
<!-- 跑腿列表 -->
|
<!-- 跑腿列表 -->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user