|
@@ -10,143 +10,143 @@
|
|
|
:screenTab="screenTab"
|
|
|
@goSearchPath="handlSearchPath"
|
|
|
/>
|
|
|
- <view class="order-section-top" :style="{ marginTop: navbarHeight + 'px' }">
|
|
|
- <scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
|
|
|
- <view
|
|
|
- v-for="(item, index) in orderTabBar"
|
|
|
- :key="index"
|
|
|
- class="tab-bar-item"
|
|
|
- :class="[currentTab == index ? 'active' : '']"
|
|
|
- :data-current="index"
|
|
|
- @tap.stop="onClickTab"
|
|
|
- >
|
|
|
- <text class="tab-bar-title">{{ item.text }}</text>
|
|
|
- </view>
|
|
|
- </scroll-view>
|
|
|
- <scroll-view scroll-x scroll-with-animation class="tab-screen" :scroll-left="scrollLeft">
|
|
|
- <view
|
|
|
- v-for="(item, index) in screenTabBar"
|
|
|
- :key="index"
|
|
|
- class="tab-screen-item"
|
|
|
- :class="[screenTab == index ? 'active' : '']"
|
|
|
- :data-current="index"
|
|
|
- @tap.stop="onClickScreenTab(index)"
|
|
|
- >{{ item.text }}</view
|
|
|
- >
|
|
|
- <view
|
|
|
- class="tab-screen-item"
|
|
|
- v-if="isManage"
|
|
|
- :data-current="3"
|
|
|
- :class="[screenTab == 3 ? 'active' : '']"
|
|
|
- @tap.stop="onClickScreenTab(3)"
|
|
|
- >组员订单</view
|
|
|
- >
|
|
|
- </scroll-view>
|
|
|
- </view>
|
|
|
- <swiper
|
|
|
- class="tab-content"
|
|
|
- :current="currentTab"
|
|
|
- duration="80"
|
|
|
- @animationfinish="onChange"
|
|
|
- :style="{ height: winHeight + 'px' }"
|
|
|
- >
|
|
|
- <swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
|
|
|
- <tui-skeleton
|
|
|
- v-if="skeletonShow"
|
|
|
- backgroundColor="#fafafa"
|
|
|
- borderRadius="10rpx"
|
|
|
- :isLoading="false"
|
|
|
- :loadingType="5"
|
|
|
- ></tui-skeleton>
|
|
|
- <scroll-view
|
|
|
- scroll-y
|
|
|
- class="scoll-y tui-skeleton"
|
|
|
- @scrolltolower="scrolltolower"
|
|
|
- :style="{ height: winHeight + 'px' }"
|
|
|
- >
|
|
|
- <view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
|
|
|
- <!-- 空白页 -->
|
|
|
- <empty
|
|
|
- v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
|
|
|
- :typeIndex="currentTab"
|
|
|
- :navbarHeight="navbarHeight"
|
|
|
- ></empty>
|
|
|
- <!-- 列表 -->
|
|
|
- <view v-else class="tui-order-content">
|
|
|
- <view
|
|
|
- class="tui-order-item"
|
|
|
- v-for="(order, orderIndex) in tabItem.orderList"
|
|
|
- :key="orderIndex"
|
|
|
- @click.stop="detail(order)"
|
|
|
- >
|
|
|
- <view class="order-title">
|
|
|
- <view class="order-title-name">
|
|
|
- <text>{{ order.clubName ? order.clubName : '' }}</text>
|
|
|
- <text class="tags" v-if="order.svipUserFlag == 0 && order.userIdentity === 2"
|
|
|
- >VIP</text
|
|
|
- >
|
|
|
- <text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
|
|
|
- <view class="name" v-if="screenTab === 3">【 {{ order.serviceName ? order.serviceName : '' }} 】</view>
|
|
|
- </view>
|
|
|
- <view class="order-title-t">
|
|
|
- <view class="Rebate " v-if="order.rebateFlag == 1">返佣</view>
|
|
|
- <text
|
|
|
- class="bage-buss tui-skeleton-fillet"
|
|
|
- v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
|
|
|
- >
|
|
|
- 协销
|
|
|
- </text>
|
|
|
- <text
|
|
|
- class="bage-auto tui-skeleton-fillet"
|
|
|
- v-if="
|
|
|
- order.orderSubmitType == 0 ||
|
|
|
- order.orderSubmitType == 1 ||
|
|
|
- order.orderSubmitType == 2
|
|
|
- "
|
|
|
- >
|
|
|
- 自主
|
|
|
- </text>
|
|
|
- <text class="bage-text tui-skeleton-fillet">
|
|
|
- 订单编号:{{ order.orderNo }}({{ order.orderId }})
|
|
|
- </text>
|
|
|
- <image
|
|
|
- class="bage-icon"
|
|
|
- src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
|
|
|
- mode="widthFix"
|
|
|
- v-if="order.secondHandOrderFlag == 1"
|
|
|
- >
|
|
|
- </image>
|
|
|
- </view>
|
|
|
- <view class="order-title-b">
|
|
|
- <view class="order-title-btxt tui-skeleton-fillet">
|
|
|
- 下单时间:{{ order.orderTime }}
|
|
|
+ <tui-skeleton
|
|
|
+ v-if="skeletonShow"
|
|
|
+ backgroundColor="#fafafa"
|
|
|
+ borderRadius="10rpx"
|
|
|
+ :isLoading="true"
|
|
|
+ :loadingType="5"
|
|
|
+ />
|
|
|
+ <template v-else>
|
|
|
+ <view class="order-section-top" :style="{ marginTop: navbarHeight + 'px' }">
|
|
|
+ <scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
|
|
|
+ <view
|
|
|
+ v-for="(item, index) in orderTabBar"
|
|
|
+ :key="index"
|
|
|
+ class="tab-bar-item"
|
|
|
+ :class="[currentTab == index ? 'active' : '']"
|
|
|
+ :data-current="index"
|
|
|
+ @tap.stop="onClickTab"
|
|
|
+ >
|
|
|
+ <text class="tab-bar-title">{{ item.text }}</text>
|
|
|
+ </view>
|
|
|
+ </scroll-view>
|
|
|
+ <scroll-view scroll-x scroll-with-animation class="tab-screen" :scroll-left="scrollLeft">
|
|
|
+ <view
|
|
|
+ v-for="(item, index) in screenTabBar"
|
|
|
+ :key="index"
|
|
|
+ class="tab-screen-item"
|
|
|
+ :class="[screenTab == index ? 'active' : '']"
|
|
|
+ :data-current="index"
|
|
|
+ @tap.stop="onClickScreenTab(index)"
|
|
|
+ >{{ item.text }}</view
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="tab-screen-item"
|
|
|
+ v-if="isManage"
|
|
|
+ :data-current="3"
|
|
|
+ :class="[screenTab == 3 ? 'active' : '']"
|
|
|
+ @tap.stop="onClickScreenTab(3)"
|
|
|
+ >组员订单</view
|
|
|
+ >
|
|
|
+ </scroll-view>
|
|
|
+ </view>
|
|
|
+ <swiper
|
|
|
+ class="tab-content"
|
|
|
+ :current="currentTab"
|
|
|
+ duration="80"
|
|
|
+ @animationfinish="onChange"
|
|
|
+ :style="{ height: winHeight + 'px' }"
|
|
|
+ >
|
|
|
+ <swiper-item v-for="(tabItem, index) in orderTabBar" :key="index" @touchmove.stop="">
|
|
|
+ <scroll-view
|
|
|
+ scroll-y
|
|
|
+ class="scoll-y tui-skeleton"
|
|
|
+ @scrolltolower="scrolltolower"
|
|
|
+ :style="{ height: winHeight + 'px' }"
|
|
|
+ >
|
|
|
+ <view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
|
|
|
+ <!-- 空白页 -->
|
|
|
+ <empty
|
|
|
+ v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
|
|
|
+ :typeIndex="currentTab"
|
|
|
+ :navbarHeight="navbarHeight"
|
|
|
+ />
|
|
|
+ <!-- 列表 -->
|
|
|
+ <view v-else class="tui-order-content">
|
|
|
+ <view
|
|
|
+ class="tui-order-item"
|
|
|
+ v-for="(order, orderIndex) in tabItem.orderList"
|
|
|
+ :key="orderIndex"
|
|
|
+ @click.stop="detail(order)"
|
|
|
+ >
|
|
|
+ <view class="order-title">
|
|
|
+ <view class="order-title-name">
|
|
|
+ <text>{{ order.clubName ? order.clubName : '' }}</text>
|
|
|
+ <text
|
|
|
+ class="tags"
|
|
|
+ v-if="order.svipUserFlag == 0 && order.userIdentity === 2"
|
|
|
+ >VIP</text
|
|
|
+ >
|
|
|
+ <text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
|
|
|
+ <view class="name" v-if="screenTab === 3"
|
|
|
+ >【 {{ order.serviceName ? order.serviceName : '' }} 】</view
|
|
|
+ >
|
|
|
</view>
|
|
|
- <view class="order-title-tip tui-skeleton-fillet">
|
|
|
- {{ StateExpFormat(order.status) }}
|
|
|
+ <view class="order-title-t">
|
|
|
+ <view class="order-title-tip tui-skeleton-fillet">
|
|
|
+ {{ order.status | statusFilters }}
|
|
|
+ </view>
|
|
|
+ <view class="bage ebate" v-if="order.rebateFlag == 1">返佣</view>
|
|
|
+ <text
|
|
|
+ class="bage buss tui-skeleton-fillet"
|
|
|
+ v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
|
|
|
+ >
|
|
|
+ 协销
|
|
|
+ </text>
|
|
|
+ <text
|
|
|
+ class="bage auto tui-skeleton-fillet"
|
|
|
+ v-if="
|
|
|
+ order.orderSubmitType == 0 ||
|
|
|
+ order.orderSubmitType == 1 ||
|
|
|
+ order.orderSubmitType == 2
|
|
|
+ "
|
|
|
+ >
|
|
|
+ 自主
|
|
|
+ </text>
|
|
|
+ <image
|
|
|
+ class="bage-icon"
|
|
|
+ src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
|
|
|
+ mode="widthFix"
|
|
|
+ v-if="order.secondHandOrderFlag == 1"
|
|
|
+ >
|
|
|
+ </image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <block v-for="(shop, index) in order.shopOrderList" :key="index">
|
|
|
<view class="goods-title">
|
|
|
- <view v-if="shop.shopPromotion" class="floor-item-act">
|
|
|
- <view class="floor-tags">{{ shop.shopPromotion.name }}</view>
|
|
|
+ <view v-if="order.shopPromotion" class="floor-item-act">
|
|
|
+ <view class="floor-tags">{{ order.shopPromotion.name }}</view>
|
|
|
</view>
|
|
|
- <view class="title-text tui-skeleton-fillet">{{ shop.shopName }}</view>
|
|
|
+ <view class="title-text tui-skeleton-fillet">{{ order.shopName }}</view>
|
|
|
</view>
|
|
|
<view
|
|
|
class="goods-item"
|
|
|
- v-for="(pros, prosIndex) in shop.orderProductList"
|
|
|
+ v-for="(pros, prosIndex) in order.orderProductList"
|
|
|
:key="prosIndex"
|
|
|
>
|
|
|
<view class="goods-pros-t">
|
|
|
<view class="pros-img tui-skeleton-fillet">
|
|
|
<image :src="pros.image" alt="" />
|
|
|
- <text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
|
|
|
+ <text
|
|
|
+ class="tips"
|
|
|
+ v-if="pros.productType == 2 || pros.productType == 1"
|
|
|
>赠品</text
|
|
|
>
|
|
|
</view>
|
|
|
<view class="pros-product clearfix">
|
|
|
- <view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
|
|
|
+ <view class="producttitle tui-skeleton-fillet">{{
|
|
|
+ pros.name
|
|
|
+ }}</view>
|
|
|
<view
|
|
|
class="productspec tui-skeleton-fillet"
|
|
|
v-if="pros.productCategory != 2"
|
|
@@ -186,7 +186,8 @@
|
|
|
:¥{{
|
|
|
pros.productPromotion == null
|
|
|
? '0.00'
|
|
|
- : pros.productPromotion.touchPrice | NumFormat
|
|
|
+ : pros.productPromotion.touchPrice
|
|
|
+ | NumFormat
|
|
|
}}
|
|
|
</text>
|
|
|
</view>
|
|
@@ -207,56 +208,63 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </block>
|
|
|
- <view class="order-footer">
|
|
|
- <view class="order-footer-top" v-if="order.discountFee != 0"
|
|
|
- >经理折扣:¥{{ order.discountFee | NumFormat }}</view
|
|
|
- >
|
|
|
- <view class="order-footer-bot">
|
|
|
- <view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
|
|
|
- <view
|
|
|
- class="money tui-skeleton-fillet"
|
|
|
- v-if="order.status == 31 || order.status == 32 || order.status == 33"
|
|
|
- >
|
|
|
- 已支付:<label style="color:#f94b4b ;"
|
|
|
- >¥{{ order.receiptAmount | NumFormat }}</label
|
|
|
+ <view class="order-footer">
|
|
|
+ <!-- <view class="order-footer-top" v-if="order.discountFee != 0"
|
|
|
+ >经理折扣:¥{{ order.discountFee | NumFormat }}</view
|
|
|
+ > -->
|
|
|
+ <view class="order-footer-bot">
|
|
|
+ <view class="count tui-skeleton-fillet"
|
|
|
+ >共{{ order.itemCount }}件商品</view
|
|
|
>
|
|
|
- </view>
|
|
|
- <view class="money tui-skeleton-fillet" v-else
|
|
|
- >待付总额:<label style="color:#f94b4b ;">
|
|
|
- ¥{{ order.pendingPayments | NumFormat }}</label
|
|
|
+ <view
|
|
|
+ class="money tui-skeleton-fillet"
|
|
|
+ v-if="order.status == 31 || order.status == 32 || order.status == 33"
|
|
|
>
|
|
|
+ 已支付:<label style="color:#f94b4b ;"
|
|
|
+ >¥{{ order.receiptAmount | NumFormat }}</label
|
|
|
+ >
|
|
|
+ </view>
|
|
|
+ <view class="money tui-skeleton-fillet" v-else
|
|
|
+ >待付总额:<label style="color:#f94b4b ;">
|
|
|
+ ¥{{ order.obligation | NumFormat }}</label
|
|
|
+ >
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <!-- 底部button -->
|
|
|
+ <cm-list-button
|
|
|
+ ref="orderButton"
|
|
|
+ v-if="screenTab != 3"
|
|
|
+ :status="order.status"
|
|
|
+ :order="order"
|
|
|
+ :shopOrderId="order.shopOrderId"
|
|
|
+ :rechargeGoods="order.rechargeGoods"
|
|
|
+ :userId="order.userId"
|
|
|
+ :secondHandOrderFlag="order.secondHandOrderFlag"
|
|
|
+ @buttonConfirm="handButtonConfirm"
|
|
|
+ />
|
|
|
</view>
|
|
|
- <!-- 底部button -->
|
|
|
- <cm-list-button
|
|
|
- ref="orderButton"
|
|
|
- v-if="screenTab != 3"
|
|
|
- :status="order.status"
|
|
|
- :order="order"
|
|
|
- :orderId="order.orderId"
|
|
|
- :rechargeGoods="order.rechargeGoods"
|
|
|
- :userId="order.userId"
|
|
|
- :secondHandOrderFlag="order.secondHandOrderFlag"
|
|
|
- @buttonConfirm="handButtonConfirm"
|
|
|
+ <!--加载loadding-->
|
|
|
+ <tui-loadmore :visible="loadding" :index="3" type="black"/>
|
|
|
+ <tui-nomore
|
|
|
+ :visible="!pullUpOn"
|
|
|
+ :backgroundColor="'#ffffff'"
|
|
|
+ :text="nomoreText"
|
|
|
/>
|
|
|
+ <!--加载loadding-->
|
|
|
</view>
|
|
|
- <!--加载loadding-->
|
|
|
- <tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
|
|
|
- <tui-nomore
|
|
|
- :visible="!pullUpOn"
|
|
|
- :backgroundColor="'#ffffff'"
|
|
|
- :text="nomoreText"
|
|
|
- ></tui-nomore>
|
|
|
- <!--加载loadding-->
|
|
|
</view>
|
|
|
- </view>
|
|
|
- </scroll-view>
|
|
|
- </swiper-item>
|
|
|
- </swiper>
|
|
|
+ </scroll-view>
|
|
|
+ </swiper-item>
|
|
|
+ </swiper>
|
|
|
+ </template>
|
|
|
<!-- 分享弹窗 -->
|
|
|
- <cm-share-popup :orderId="btnoRderID" :shareType="isShareType" v-if="isShareModal" @shareConfirm="onShareAppMessage" />
|
|
|
+ <cm-share-popup
|
|
|
+ :shopOrderId="handleShopOrderId"
|
|
|
+ :shareType="isShareType"
|
|
|
+ v-if="isShareModal"
|
|
|
+ @shareConfirm="onShareAppMessage"
|
|
|
+ />
|
|
|
<!-- 透明模态层 -->
|
|
|
<modal-layer v-if="isModalLayer"></modal-layer>
|
|
|
<view class="aganBj" v-show="showAgan">
|
|
@@ -269,8 +277,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="BtnAll">
|
|
|
- <view class="closebtn btn" @click="closeBtn">取消</view>
|
|
|
- <view class="cancel btn" @click="cancelBtn">确定</view>
|
|
|
+ <view class="closebtn btn" @click="showAgan = false">取消</view>
|
|
|
+ <view class="cancel btn" @click="handleAddAgian">确定</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -281,6 +289,17 @@
|
|
|
:rightDrawer="rightDrawer"
|
|
|
@handSearchConfirm="handSearchConfirmData"
|
|
|
/>
|
|
|
+ <!-- 提示弹窗 -->
|
|
|
+ <tui-modal
|
|
|
+ :show="modal"
|
|
|
+ @click="handleClick"
|
|
|
+ :content="contentModalText"
|
|
|
+ :button="modalButton"
|
|
|
+ color="#333"
|
|
|
+ :size="32"
|
|
|
+ shape="circle"
|
|
|
+ :maskClosable="false"
|
|
|
+ />
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
@@ -293,8 +312,10 @@ import empty from '@/components/empty'
|
|
|
import cmListButton from './components/cm-list-button' //操作按钮
|
|
|
import cmSharePopup from './components/cm-share-popup' //分享弹窗
|
|
|
import cmOrderDrawer from '../components/cm-order-drawer' //筛选抽屉
|
|
|
+import orderMixins from './mixins/orderMixins.js'
|
|
|
|
|
|
export default {
|
|
|
+ mixins: [orderMixins],
|
|
|
components: {
|
|
|
headerBack,
|
|
|
empty,
|
|
@@ -332,20 +353,20 @@ export default {
|
|
|
currentTab: 0, //预设当前项的值
|
|
|
screenTab: 0, //筛选预设当前项的值
|
|
|
scrollLeft: 0, //tab标题的滚动条位置
|
|
|
- serviceProviderId: 0, //协销用户ID
|
|
|
orderData: [],
|
|
|
- btnClubUserID: 0,
|
|
|
- btnoRderID: 0, //点击按钮传入的的订单ID
|
|
|
- pageNum: 1, //页数
|
|
|
- pageSize: 10, //条数
|
|
|
- groupServiceId: 0,
|
|
|
+ listQuery: {
|
|
|
+ pageNum: 1, //页数
|
|
|
+ pageSize: 10, //条数
|
|
|
+ groupServiceId: 0,
|
|
|
+ serviceProviderId: 0, //协销用户ID
|
|
|
+ listType: 0,
|
|
|
+ orderSubmitType: 0
|
|
|
+ },
|
|
|
scrollTop: 0,
|
|
|
- deteleType: '',
|
|
|
skeletonShow: true,
|
|
|
isClickChange: false,
|
|
|
isShareModal: false, //控制分享弹窗
|
|
|
isShareType: 2,
|
|
|
- isSeller: false,
|
|
|
isModalLayer: false,
|
|
|
loadding: false,
|
|
|
pullUpOn: true,
|
|
@@ -356,32 +377,19 @@ export default {
|
|
|
showAgan: false,
|
|
|
failList: [], // 再来一单可购买商品
|
|
|
promptitle: '',
|
|
|
- aganOrderId: 0, // 再来一单商品id
|
|
|
userId: 0,
|
|
|
manager: 0,
|
|
|
- rightDrawer: false //控制筛选抽屉
|
|
|
+ rightDrawer: false ,//控制筛选抽屉
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
- let self = this
|
|
|
if (option.type === 'detele') {
|
|
|
- self.isDelete = true
|
|
|
- }
|
|
|
- self.currentTab = option.listType
|
|
|
- self.getHeaderTopHeight() //设置自定义导航高度
|
|
|
- // 高度自适应
|
|
|
- uni.getSystemInfo({
|
|
|
- success: function(res) {
|
|
|
- let calc = res.windowHeight
|
|
|
- self.winHeight = calc - self.CustomBar - 82
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- filters: {
|
|
|
- NumFormat(value) {
|
|
|
- //处理金额
|
|
|
- return Number(value).toFixed(2)
|
|
|
+ this.isDelete = true
|
|
|
}
|
|
|
+ this.currentTab = option.listType
|
|
|
+ this.getHeaderTopHeight() //设置自定义导航高度
|
|
|
+ this.initGetStotage()
|
|
|
},
|
|
|
computed: {
|
|
|
...mapState(['isManage'])
|
|
@@ -391,6 +399,7 @@ export default {
|
|
|
const userInfo = await this.$api.getStorage()
|
|
|
this.userId = userInfo.userId ? userInfo.userId : 0
|
|
|
this.manager = userInfo.manager ? userInfo.manager : 0
|
|
|
+ this.listQuery.serviceProviderId = userInfo.serviceProviderId
|
|
|
this.getOrderDatainit(this.currentTab)
|
|
|
},
|
|
|
// 滚动切换标签样式
|
|
@@ -403,8 +412,8 @@ export default {
|
|
|
}
|
|
|
this.isClickChange = false
|
|
|
this.currentTab = index
|
|
|
+ this.listQuery.listType = index
|
|
|
this.checkCor()
|
|
|
- this.pageNum = 1
|
|
|
this.pullUpOn = true //切换时隐藏
|
|
|
this.loadding = false //切换时隐藏
|
|
|
this.nomoreText = ''
|
|
@@ -418,7 +427,7 @@ export default {
|
|
|
} else {
|
|
|
this.isClickChange = true
|
|
|
this.currentTab = tabIndex
|
|
|
- this.pageNum = 1
|
|
|
+ this.listQuery.listType = tabIndex
|
|
|
this.pullUpOn = true //切换时隐藏
|
|
|
this.loadding = false //切换时隐藏
|
|
|
this.getOrderDatainit(this.currentTab)
|
|
@@ -426,7 +435,7 @@ export default {
|
|
|
},
|
|
|
onClickScreenTab(index) {
|
|
|
this.screenTab = index
|
|
|
- this.pageNum = 1
|
|
|
+ this.listQuery.orderSubmitType = index
|
|
|
this.pullUpOn = true //切换时隐藏
|
|
|
this.loadding = false //切换时隐藏
|
|
|
this.nomoreText = ''
|
|
@@ -441,94 +450,101 @@ export default {
|
|
|
this.scrollLeft = 0
|
|
|
}
|
|
|
},
|
|
|
- getOrderDatainit(index, source) {
|
|
|
- setTimeout(() => {
|
|
|
- this.skeletonShow = false
|
|
|
- }, 1500)
|
|
|
- let orderItem = this.orderTabBar[index]
|
|
|
- let listType = orderItem.listType
|
|
|
- if (source === 'tabChange' && orderItem.loaded === true) {
|
|
|
- //tab切换只有第一次需要加载数据
|
|
|
- return
|
|
|
- }
|
|
|
- setTimeout(() => {
|
|
|
- this.$api.getStorage().then(resolve => {
|
|
|
- this.serviceProviderId = resolve.serviceProviderId
|
|
|
- this.SellerService.GetSellerOrderList({
|
|
|
- listType: index,
|
|
|
- orderSubmitType: this.screenTab,
|
|
|
- serviceProviderId: this.serviceProviderId,
|
|
|
- pageNum: 1,
|
|
|
- pageSize: this.pageSize,
|
|
|
- groupServiceId: this.groupServiceId
|
|
|
+ async getOrderDatainit(index, source) {
|
|
|
+ try {
|
|
|
+ this.listQuery.pageNum = 1
|
|
|
+ let orderItem = this.orderTabBar[index]
|
|
|
+ if (source === 'tabChange' && orderItem.loaded === true) {
|
|
|
+ //tab切换只有第一次需要加载数据
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
|
|
|
+ const res = await this.SellerService.GetSellerOrderList(this.listQuery)
|
|
|
+ const data = res.data
|
|
|
+ if (data.list && data.list.length > 0) {
|
|
|
+ orderItem.orderList = []
|
|
|
+ data.list.forEach(item => {
|
|
|
+ orderItem.orderList.push(item)
|
|
|
})
|
|
|
- .then(response => {
|
|
|
- let data = response.data
|
|
|
- if (data.list && data.list.length > 0) {
|
|
|
- let orderList = data.list.filter(item => {
|
|
|
- //添加不同状态下订单的表现形式
|
|
|
- item = Object.assign(item, this.StateExpFormat(item.listType))
|
|
|
- return item
|
|
|
- })
|
|
|
- orderItem.orderList = []
|
|
|
- orderList.forEach(item => {
|
|
|
- orderItem.orderList.push(item)
|
|
|
- })
|
|
|
- //loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
|
|
|
- this.$set(orderItem, 'loaded', true)
|
|
|
- this.hasNextPage = data.hasNextPage
|
|
|
- if (this.hasNextPage) {
|
|
|
- this.pullUpOn = false
|
|
|
- this.nomoreText = '上拉显示更多'
|
|
|
- } else {
|
|
|
- if (orderItem.orderList.length < 2) {
|
|
|
- this.pullUpOn = true
|
|
|
- } else {
|
|
|
- this.pullUpOn = false
|
|
|
- this.nomoreText = '已至底部'
|
|
|
- }
|
|
|
- }
|
|
|
- }else{
|
|
|
- orderItem.orderList = []
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- })
|
|
|
- })
|
|
|
- }, 600)
|
|
|
- },
|
|
|
- getOnReachBottomData(index) {
|
|
|
- //上拉加载
|
|
|
- this.SellerService.GetSellerOrderList({
|
|
|
- listType: index,
|
|
|
- orderSubmitType: this.screenTab,
|
|
|
- serviceProviderId: this.serviceProviderId,
|
|
|
- pageNum: (this.pageNum += 1),
|
|
|
- pageSize: this.pageSize,
|
|
|
- groupServiceId: this.groupServiceId
|
|
|
- })
|
|
|
- .then(response => {
|
|
|
- let orderItem = this.orderTabBar[index]
|
|
|
- let data = response.data
|
|
|
this.hasNextPage = data.hasNextPage
|
|
|
- orderItem.orderList = orderItem.orderList.concat(data.list)
|
|
|
- this.pullFlag = false // 防上拉暴滑
|
|
|
- setTimeout(() => {
|
|
|
- this.pullFlag = true
|
|
|
- }, 500)
|
|
|
if (this.hasNextPage) {
|
|
|
this.pullUpOn = false
|
|
|
this.nomoreText = '上拉显示更多'
|
|
|
} else {
|
|
|
- this.loadding = false
|
|
|
- this.pullUpOn = false
|
|
|
- this.nomoreText = '已至底部'
|
|
|
+ if (orderItem.orderList.length < 2) {
|
|
|
+ this.pullUpOn = true
|
|
|
+ } else {
|
|
|
+ this.pullUpOn = false
|
|
|
+ this.nomoreText = '已至底部'
|
|
|
+ }
|
|
|
}
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- })
|
|
|
+ } else {
|
|
|
+ this.$set(orderItem, 'loaded', true)
|
|
|
+ orderItem.orderList = []
|
|
|
+ }
|
|
|
+ this.skeletonShow = false
|
|
|
+ } catch (error) {
|
|
|
+ this.$util.msg(error.msg, 2000)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //上拉加载
|
|
|
+ async getOnReachBottomData(index) {
|
|
|
+ try {
|
|
|
+ this.listQuery.pageNum += 1
|
|
|
+ const res = await this.SellerService.GetSellerOrderList(this.listQuery)
|
|
|
+ const data = res.data
|
|
|
+ const orderItem = this.orderTabBar[index]
|
|
|
+ orderItem.orderList = orderItem.orderList.concat(data.list)
|
|
|
+ this.hasNextPage = data.hasNextPage
|
|
|
+ this.pullFlag = false // 防上拉暴滑
|
|
|
+ setTimeout(() => {
|
|
|
+ this.pullFlag = true
|
|
|
+ }, 500)
|
|
|
+ if (this.hasNextPage) {
|
|
|
+ this.pullUpOn = false
|
|
|
+ this.nomoreText = '上拉显示更多'
|
|
|
+ } else {
|
|
|
+ this.loadding = false
|
|
|
+ this.pullUpOn = false
|
|
|
+ this.nomoreText = '已至底部'
|
|
|
+ }
|
|
|
+ } catch (error) {
|
|
|
+ this.$util.msg(error.msg, 2000)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //获取点击
|
|
|
+ handButtonConfirm(data) {
|
|
|
+ console.log('data',data)
|
|
|
+ this.handleShopOrderId = data.shopOrderId
|
|
|
+ switch (data.type) {
|
|
|
+ case 'cancel': //取消订单
|
|
|
+ this.modal = true
|
|
|
+ this.contentModalText = '确认取消该订单吗?'
|
|
|
+ this.handleModelEven = 1
|
|
|
+ break
|
|
|
+ case 'delete': //删除订单
|
|
|
+ this.modal = true
|
|
|
+ this.contentModalText = '确认删除该订单吗?'
|
|
|
+ this.handleModelEven = 2
|
|
|
+ break
|
|
|
+ case 'confirm': // 确认订单
|
|
|
+ this.modal = true
|
|
|
+ this.contentModalText = '确认此订单吗?'
|
|
|
+ this.handleModelEven = 3
|
|
|
+ break
|
|
|
+ case 'again':
|
|
|
+ this.handOrderAgain(data.shopOrderId)
|
|
|
+ break
|
|
|
+ case 'query':
|
|
|
+ this.isModalLayer = true
|
|
|
+ this.$api.navigateTo('/pages/user/order/order-logistics?shopOrderId=' + data.shopOrderId)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //确定筛选
|
|
|
+ handSearchConfirmData(data) {
|
|
|
+ this.listQuery.groupServiceId = data.serviceProviderId
|
|
|
+ this.getOrderDatainit(this.currentTab)
|
|
|
},
|
|
|
scrolltolower() {
|
|
|
if (this.hasNextPage) {
|
|
@@ -540,161 +556,24 @@ export default {
|
|
|
detail(order) {
|
|
|
//订单详情跳转
|
|
|
this.isModalLayer = true
|
|
|
- if(this.screenTab === 3){
|
|
|
+ if (this.screenTab === 3) {
|
|
|
this.$api.navigateTo(
|
|
|
- `/pages/seller/order/order-club-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
|
|
|
- order.userId
|
|
|
- }`
|
|
|
+ `/pages/seller/order/order-club-details?listType=${this.currentTab}&shopOrderId=${
|
|
|
+ order.shopOrderId
|
|
|
+ }&userId=${order.userId}`
|
|
|
)
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.$api.navigateTo(
|
|
|
- `/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
|
|
|
- order.userId
|
|
|
- }`
|
|
|
+ `/pages/seller/order/order-details?listType=${this.currentTab}&shopOrderId=${
|
|
|
+ order.shopOrderId
|
|
|
+ }&userId=${order.userId}`
|
|
|
)
|
|
|
}
|
|
|
},
|
|
|
- handButtonConfirm(data) {
|
|
|
- //获取点击
|
|
|
- this.handShowAlert(data)
|
|
|
- this.btnoRderID = data.orderId
|
|
|
- },
|
|
|
- handShowAlert(data) {
|
|
|
- //执行
|
|
|
- console.log(data)
|
|
|
- switch (data.type) {
|
|
|
- case 'query':
|
|
|
- this.isModalLayer = true
|
|
|
- this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + data.orderId)
|
|
|
- break
|
|
|
- case 'delete':
|
|
|
- this.handOrderDetele(data.orderId)
|
|
|
- break
|
|
|
- case 'cancel':
|
|
|
- this.handCenceConfirm(data.orderId)
|
|
|
- break
|
|
|
- case 'confirm':
|
|
|
- this.handOrderConfirm(data.orderId)
|
|
|
- break
|
|
|
- case 'again':
|
|
|
- this.handOrderAgain(data.orderId)
|
|
|
- break
|
|
|
- }
|
|
|
- },
|
|
|
- handOrderAgain(orderId) {
|
|
|
- this.aganOrderId = orderId
|
|
|
- this.SellerService.SellerCreateOrderAgain({
|
|
|
- confirmFlag: 0,
|
|
|
- orderId: this.aganOrderId,
|
|
|
- serviceProviderId: this.serviceProviderId
|
|
|
- })
|
|
|
- .then(res => {
|
|
|
- if (res.code == 0) {
|
|
|
- this.$api.setStorage('orderUserInfo', {
|
|
|
- clubId: res.data.clubId,
|
|
|
- againBuyProductIds: res.data.productIds,
|
|
|
- userId: res.data.userId
|
|
|
- })
|
|
|
- this.$api.navigateTo('/pages/seller/cart/cart')
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- if (error.code == -3) {
|
|
|
- this.showAgan = true
|
|
|
- this.promptitle = error.msg
|
|
|
- this.failList = error.data
|
|
|
- } else if (error.code == -2) {
|
|
|
- this.$util.modal('', error.msg, '确定', '', false, () => {})
|
|
|
- } else {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- closeBtn() {
|
|
|
- //
|
|
|
- this.showAgan = false
|
|
|
- },
|
|
|
- cancelBtn() {
|
|
|
- // 再来一单弹窗
|
|
|
- this.SellerService.SellerCreateOrderAgain({
|
|
|
- serviceProviderId: this.serviceProviderId,
|
|
|
- orderId: this.aganOrderId,
|
|
|
- confirmFlag: 1
|
|
|
- }).then(res => {
|
|
|
- if (res.code == 0) {
|
|
|
- this.$api.navigateTo('/pages/seller/cart/cart')
|
|
|
- this.showAgan = false
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- handOrderConfirm(orderId) {
|
|
|
- //确认订单
|
|
|
- this.$util.modal('提示', '确认此订单?', '确定', '取消', true, () => {
|
|
|
- this.OrderService.AffirmOrder({ orderId: orderId })
|
|
|
- .then(response => {
|
|
|
- this.$util.msg(response.msg, 2000, true, 'success')
|
|
|
- setTimeout(() => {
|
|
|
- this.getOrderDatainit(this.currentTab)
|
|
|
- }, 2000)
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- handOrderDetele(orderId) {
|
|
|
- //删除订单
|
|
|
- this.$util.modal('提示', '确认删除该订单吗?', '确定', '取消', true, () => {
|
|
|
- this.OrderService.DeleteOrder({ orderId: orderId })
|
|
|
- .then(response => {
|
|
|
- this.$util.msg(response.msg, 2000, true, 'success')
|
|
|
- setTimeout(() => {
|
|
|
- this.getOrderDatainit(this.currentTab)
|
|
|
- }, 2000)
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- handCenceConfirm(orderId) {
|
|
|
- //取消订单
|
|
|
- this.$util.modal('提示', '确认取消该订单吗?', '确定', '取消', true, () => {
|
|
|
- this.OrderService.CancelOrder({ orderId: orderId ,userIdentity : 1 })
|
|
|
- .then(response => {
|
|
|
- this.$util.msg(response.msg, 2000, true, 'success')
|
|
|
- setTimeout(() => {
|
|
|
- this.getOrderDatainit(this.currentTab)
|
|
|
- }, 2000)
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- this.$util.msg(error.msg, 2000)
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- handSearchConfirmData(data) {
|
|
|
- //确定筛选
|
|
|
- this.groupServiceId = data.serviceProviderId
|
|
|
- this.getOrderDatainit(this.currentTab)
|
|
|
- },
|
|
|
handlSearchPath() {
|
|
|
this.$api.navigateTo('/pages/seller/order/search-order')
|
|
|
},
|
|
|
- onShareAppMessage(res) {
|
|
|
- //分享转发
|
|
|
- this.isShareModal = false
|
|
|
- if (res.from === 'button') {
|
|
|
- // 来自页面内转发按钮
|
|
|
- // console.log(res.target)
|
|
|
- }
|
|
|
- return {
|
|
|
- title: '您有新的订单,请点击查看~',
|
|
|
- path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${
|
|
|
- this.btnClubUserID
|
|
|
- }&serviceProviderId=${this.serviceProviderId}`,
|
|
|
- imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
|
|
|
- }
|
|
|
- },
|
|
|
+
|
|
|
PromotionsFormat(promo) {
|
|
|
//促销活动类型数据处理
|
|
|
if (promo != null) {
|
|
@@ -711,11 +590,10 @@ export default {
|
|
|
let stateText = '',
|
|
|
stateTextObject = {
|
|
|
0: '待确认',
|
|
|
- 4: '交易完成',
|
|
|
- 5: '订单完成',
|
|
|
- 6: '已关闭',
|
|
|
- 7: '交易全退',
|
|
|
- 77: '交易全退',
|
|
|
+ 2: '交易完成',
|
|
|
+ 4: '已关闭',
|
|
|
+ 5: '交易全退',
|
|
|
+ 6: '交易全退',
|
|
|
11: '待付款待发货',
|
|
|
12: '待付款部分发货',
|
|
|
13: '待付款已发货',
|
|
@@ -724,8 +602,7 @@ export default {
|
|
|
23: '部分付款已发货',
|
|
|
31: '已付款待发货',
|
|
|
32: '已付款部分发货',
|
|
|
- 33: '已付款已发货',
|
|
|
- 111: '待付款待发货'
|
|
|
+ 33: '已付款已发货'
|
|
|
}
|
|
|
Object.keys(stateTextObject).forEach(key => {
|
|
|
if (key == state) {
|
|
@@ -741,6 +618,7 @@ export default {
|
|
|
},
|
|
|
getHeaderTopHeight() {
|
|
|
// 状态栏高度
|
|
|
+ let self = this
|
|
|
let statusBarHeight = this.systeminfo.statusBarHeight
|
|
|
let headerPosi = this.headerBtnPosi
|
|
|
let btnPosi = {
|
|
@@ -755,6 +633,13 @@ export default {
|
|
|
right: this.systeminfo.screenWidth - headerPosi.right
|
|
|
}
|
|
|
this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
|
|
|
+ // 高度自适应
|
|
|
+ uni.getSystemInfo({
|
|
|
+ success: function(res) {
|
|
|
+ let calc = res.windowHeight
|
|
|
+ self.winHeight = calc - self.CustomBar - 82
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
setHeaderBtnPosi() {
|
|
|
// 获得胶囊按钮位置信息
|
|
@@ -777,7 +662,6 @@ export default {
|
|
|
},
|
|
|
onShow() {
|
|
|
this.isModalLayer = false
|
|
|
- this.initGetStotage()
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -933,69 +817,34 @@ page {
|
|
|
height: 50rpx;
|
|
|
display: block;
|
|
|
position: absolute;
|
|
|
- right: 0;
|
|
|
- top: 9rpx;
|
|
|
- }
|
|
|
- .bage-buss {
|
|
|
- display: inline-block;
|
|
|
- width: 72rpx;
|
|
|
- height: 30rpx;
|
|
|
- background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
|
|
|
- border-radius: 4rpx;
|
|
|
- line-height: 30rpx;
|
|
|
- font-size: $font-size-22;
|
|
|
- text-align: center;
|
|
|
- color: #ffffff;
|
|
|
- }
|
|
|
- .bage-auto {
|
|
|
- display: inline-block;
|
|
|
- width: 72rpx;
|
|
|
- height: 30rpx;
|
|
|
- background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
|
|
|
- border-radius: 4rpx;
|
|
|
- line-height: 30rpx;
|
|
|
- font-size: $font-size-22;
|
|
|
- text-align: center;
|
|
|
- color: #ffffff;
|
|
|
+ right: 110rpx;
|
|
|
+ top: 12rpx;
|
|
|
}
|
|
|
- .Rebate {
|
|
|
+ .bage{
|
|
|
display: inline-block;
|
|
|
width: 72rpx;
|
|
|
height: 32rpx;
|
|
|
- background: #ff7a51;
|
|
|
- border-radius: 6rpx;
|
|
|
+ margin: 19rpx 10rpx 0 10rpx;
|
|
|
+ border-radius: 4rpx;
|
|
|
line-height: 32rpx;
|
|
|
+ font-size: $font-size-22;
|
|
|
text-align: center;
|
|
|
color: #ffffff;
|
|
|
- margin-top: 10rpx;
|
|
|
- font-size: $font-size-22;
|
|
|
- margin-right: 20rpx;
|
|
|
- }
|
|
|
- .bage-text {
|
|
|
- display: inline-block;
|
|
|
- font-size: $font-size-28;
|
|
|
- line-height: 68rpx;
|
|
|
- text-align: left;
|
|
|
- color: $text-color;
|
|
|
- margin-left: 10rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- .order-title-b {
|
|
|
- width: 100%;
|
|
|
- height: 40rpx;
|
|
|
- float: left;
|
|
|
- margin-top: 8rpx;
|
|
|
- .order-title-btxt {
|
|
|
- float: left;
|
|
|
- font-size: $font-size-28;
|
|
|
- line-height: 40rpx;
|
|
|
- color: #999999;
|
|
|
- text-align: lef;
|
|
|
+ float: right;
|
|
|
+ &.buss{
|
|
|
+ background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
|
|
|
+ }
|
|
|
+ &.auto{
|
|
|
+ background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
|
|
|
+ }
|
|
|
+ &.ebate{
|
|
|
+ background: #ff7a51;
|
|
|
+ }
|
|
|
}
|
|
|
.order-title-tip {
|
|
|
- float: right;
|
|
|
+ float: left;
|
|
|
font-size: $font-size-28;
|
|
|
- line-height: 40rpx;
|
|
|
+ line-height: 68rpx;
|
|
|
text-align: right;
|
|
|
color: #ff2a2a;
|
|
|
}
|