接口对接

This commit is contained in:
donqi 2022-06-06 22:09:43 +08:00
parent 04d54d172c
commit fb68cd3c90
6 changed files with 217 additions and 32 deletions

View File

@ -263,7 +263,7 @@
type: 'ordersFinish',
name: '已完成'
}],
servOrderType: 'servOrder',
servOrderType: 0,
productOrderTabList: [{
type: 'pdOrdersWait2Pay',
name: '待付款'
@ -280,7 +280,7 @@
type: 'pdOrdersFinish',
name: '已完成'
}],
productOrderType: 'productOrder'
productOrderType: 1
}
},
onReady() {

View File

@ -0,0 +1,113 @@
<template>
<!-- 报价/客户支付模态框 -->
<view class="cu-modal" :class="show?'show':''">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end solid-bottom">
<view class="content">发送急报</view>
<view class="action" data-modal="sendUrgentMsgModal" @click="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding padding-lr-xl bg-white text-left">
<view>
<text>TO</text>
<button class="cu-btn" :class="toWho === 0 ? 'bg-main-color' : ''" @click="changeToWho(0)">商家</button>
<button class="cu-btn margin-left-sm" :class="toWho === 1 ? 'bg-main-color' : ''" @click="changeToWho(1)">平台</button>
</view>
<view class="margin-top-sm">
<textarea style="width: 100%;" class="solid radius text-left padding-sm" v-model="detailDesc" maxlength="-1"
placeholder="请输入需报商家或平台的情况,申请厂家配件请以“申请配件”开头"></textarea>
</view>
<view class="margin-top-sm">
<view class="margin-bottom-sm">上传照片</view>
<view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="viewImage($event, imgList)"
:data-url="item">
<image :src="item" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="delImg($event, imgList)" :data-index="index">
<text class='cuIcon-close'></text>
</view>
</view>
<view class="solids" @tap="chooseImgList" v-if="imgList.length<9">
<text class='cuIcon-cameraadd'></text>
</view>
</view>
</view>
</view>
<view class="cu-bar bg-white solid-top">
<view class="action margin-0 flex-sub text-main-color solid-left" data-modal="sendUrgentMsgModal"
@tap="hideModal" @click="sendUrgentMsg">发送急报</view>
</view>
</view>
</view>
</template>
<script>
export default {
nama: 'new-serv-price',
props: {
show: {
type: Boolean,
default: false
},
data: {
type: Object,
default: {}
}
},
data() {
return {
toWho: 0,
detailDesc: '',
imgList: []
}
},
methods: {
hideModal(e) {
this.$emit(this.$globalFun.HIDE_MODAL, e);
},
sendUrgentMsg(e) {
},
changeToWho(toWho) {
this.toWho = toWho;
},
chooseImgList(e) {
uni.chooseImage({
count: 9, //9
sizeType: ['original', 'compressed'], //
sourceType: ['album'], //
success: (res) => {
if (this.imgList.length != 0) {
this.imgList = this.imgList.concat(res.tempFilePaths)
} else {
this.imgList = res.tempFilePaths
}
}
});
},
viewImage(e, imgList) {
uni.previewImage({
urls: imgList,
current: e.currentTarget.dataset.url
});
},
delImg(e, imgList) {
uni.showModal({
title: '',
content: '确定要删除这张图片吗?',
cancelText: '取消',
confirmText: '确定',
success: res => {
if (res.confirm) {
imgList.splice(e.currentTarget.dataset.index, 1)
}
}
})
}
}
}
</script>
<style>
</style>

View File

@ -33,7 +33,7 @@
</view>
</template>
<view>
<view v-for="(item, index1) in billItem.statement" class="bg-white padding flex justify-between align-center" @click="showDetail">
<view v-for="(item, index1) in billItem.statement" class="bg-white padding flex justify-between align-center" @click="showDetail(bill[index].statement[index1])">
<view>
<view class="margin-bottom-xs" v-if="item.financialDetailType == 1">师傅转派</view>
<view class="margin-bottom-xs" v-else-if="item.financialDetailType == 2">多级分销</view>
@ -122,9 +122,9 @@
// #endif
}
},
showDetail() {
showDetail(item) {
uni.navigateTo({
url: '/pages/my/statement-desc'
url: '/pages/my/statement-desc?statementDesc=' + encodeURIComponent(JSON.stringify(item))
})
},
bindBankAccount() {

View File

@ -42,7 +42,10 @@
<view class="text-lg"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.financialMaster.payMoney}}</text></view>
</view>
<view v-if="orderType === 'servOrder'" class="padding-tb-sm flex justify-end oper-bar">
<view v-if="orderType === 0" class="padding-tb-sm flex justify-end oper-bar">
<!-- <view class="padding-tb-sm flex justify-end oper-bar">
</view> -->
<button v-if="shopOrder.subProcessStatus <= 4 && shopOrder.mainProcess !== 'ordersWait2Serv'"
class="cu-btn line-black margin-right-sm">取消订单</button>
<button v-if="shopOrder.subProcessStatus >= 1 && shopOrder.subProcessStatus <= 2"
@ -59,7 +62,7 @@
class="cu-btn line-black margin-right-sm">查看进度</button>
<button v-if="shopOrder.payStatus === 0" class="cu-btn bg-main-color">付款</button>
</view>
<view v-if="orderType === 'servOrder' && shopOrder.subProcessStatus === 4"
<view v-if="orderType === 0 && shopOrder.subProcessStatus === 4"
class="padding-tb-sm solid-top">
<view>师傅已提交完成请验收</view>
<view>服务保障权益期</view>
@ -80,7 +83,7 @@
</view>
</view>
<view
v-if="orderType === 'servOrder' && (shopOrder.subProcessStatus === 2 || shopOrder.subProcessStatus === 3)"
v-if="orderType === 0 && (shopOrder.subProcessStatus === 2 || shopOrder.subProcessStatus === 3)"
class="padding-tb-sm solid-top">
<view>约定服务时间</view>
<view class="flex justify-between align-end">
@ -99,7 +102,7 @@
</view>
</view>
</view>
<view v-else-if="orderType === 'servOrder' && shopOrder.subProcessStatus === 1"
<view v-else-if="orderType === 0 && shopOrder.subProcessStatus === 1"
class="padding-tb-sm solid-top text-orange">
路途遥远服务内容稍难时间紧迫您可以试试追加赏金重金之下必有勇夫噢
</view>
@ -107,6 +110,7 @@
</view>
</view>
<load-status-bar ref="loadStatusBar"></load-status-bar>
<confirm-modal ref="confirmModal" :content="'是否确定取消订单?'" @confirm="cancelOrder"></confirm-modal>
</view>
</template>
@ -208,6 +212,12 @@
uni.navigateTo({
url: '/pages/my/serv-detail'
})
},
decideIfCancelOrder() {
this.$refs.confirmModal.showModal();
},
cancelOrder() {
console.log("取消订单")
}
}
}

View File

@ -1,4 +1,5 @@
<template>
<page-meta :page-style="'overflow:'+(ifShowPageMeta?'hidden':'visible')"></page-meta>
<view>
<!-- 顶部操作条 -->
<cu-custom :bgColor="'bg-main-color'" :isBack="true">
@ -97,23 +98,36 @@
<view class="margin-top-xs">订单时间{{servDetail.createTime}}</view>
</view>
<!-- 底部操作栏 -->
<view class="cu-bar bg-white tabbar border shop fixed-bottom-bar">
<view class="action">
<view class="cu-bar bg-white tabbar border fixed-bottom-bar">
<view class="action" data-popup="orderManage" @click="togglePopup">
<view class="cuIcon-list"></view> 订单管理
</view>
<view class="action">
<view class="action" data-modal="sendUrgentMsgModal" @click="showModal">
<view class="cuIcon-mail">
<view class="cu-tag badge" v-if="servDetail.talkMsgNum > 0">{{servDetail.talkMsgNum}}</view>
</view>
发送急报
</view>
<view class="bg-main-color submit">立即上门</view>
<!-- <view class="bg-main-color submit">立即上门</view> -->
</view>
<uni-popup ref="orderManage" type="bottom" @change="changePopupState">
<view class="bg-white text-center">
<view v-for="(menu,index) in orderManageMenu" class="padding solid-bottom" :data-action="menu.action" @click="clickOrderManageMenu">
{{menu.name}}
</view>
</view>
<!-- 底部占位 -->
<view class="cu-bar bg-white fixed-bottom-bar"></view>
</uni-popup>
<!-- 模态框 -->
<urgent-msg :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
<confirm-modal ref="confirmModal" :content="'是否确定取消订单?'" @confirm="cancelOrder"></confirm-modal>
</view>
</template>
<script>
import productPicked from '@/components/goods-card/product-picked.vue';
import urgentMsg from '@/pages/my/modal/urgent-msg.vue';
export default {
components: {
@ -125,11 +139,22 @@
servDetail: {},
finishRecord4Show: [],
servingColumnHeaders: ['购买型号', '购买量', '待服务'],
servedColumnHeaders: ['购买型号', '购买量', '已服务']
servedColumnHeaders: ['购买型号', '购买量', '已服务'],
process: '',
ifShowPageMeta: false,
orderManageMenu: [{
name: '取消订单',
action: 'decideIfCancelOrder'
}],
sendUrgentMsgModal: false
}
},
onLoad() {
this.loadData();
// this.bindEvent();
},
onUnload() {
// this.offBindEvent();
},
methods: {
async loadData() {
@ -142,6 +167,37 @@
}
this.finishList4Show[i].finishList = finishList;
}
},
// bindEvent() {
// uni.$on(this.$globalFun.CONFIRM, this.cancelOrder);
// },
// offBindEvent() {
// uni.$off(this.$globalFun.CONFIRM);
// },
changePopupState(e) {
this.ifShowPageMeta = e.show;
},
togglePopup(e) {
if (this.ifShowPageMeta) {
this.$refs[e.currentTarget.dataset.popup].close();
} else {
this.$refs[e.currentTarget.dataset.popup].open();
}
},
showModal(e) {
this[e.currentTarget.dataset.modal] = true;
},
hideModal(e) {
this[e.currentTarget.dataset.modal] = false;
},
clickOrderManageMenu(e) {
this[e.currentTarget.dataset.action](e);
},
decideIfCancelOrder() {
this.$refs.confirmModal.showModal();
},
cancelOrder() {
console.log("取消订单")
}
}
}

View File

@ -7,37 +7,42 @@
</cu-custom>
<view class="padding margin-top-sm bg-white">
<view class="padding-tb-lg text-center solid-bottom">
<view class="text-black text-sl">{{statementDesc.inOutMoney}}</view>
<view class="text-gray">{{statementDesc.name}}</view>
<view class="text-black text-sl">{{statementDesc.payMoney}}</view>
<view class="text-gray" v-if="statementDesc.remark">{{statementDesc.remark}}</view>
</view>
<view class="padding-tb-lg">
<view class="margin-bottom-sm">
<text class="text-gray">当前状态</text>
<text>{{statementDesc.status === '0' ? '交易成功' : '交易失败'}}</text>
<text>{{statementDesc.payStatus == 0 ? '未付款' : '已付款'}}</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">详情说明</text>
<text>{{statementDesc.desc}}</text>
<text v-if="statementDesc.remark">{{statementDesc.remark}}</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">到帐备注</text>
<text>{{statementDesc.payRemark}}</text>
<text v-if="statementDesc.payType != null && statementDesc.payType != undefined">
<text v-if="statementDesc.payType == 0">微信</text>
<text v-else-if="statementDesc.payType == 1">支付宝</text>
<text v-else-if="statementDesc.payType == 2">线下</text>
<text>支付到帐</text>
</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">提现单号</text>
<text>{{statementDesc.extractCode}}</text>
<text v-if="statementDesc.extractCode">{{statementDesc.extractCode}}</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">发起时间</text>
<text>{{statementDesc.createTime}}</text>
<text v-if="statementDesc.payTime">{{statementDesc.payTime}}</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">订单编号</text>
<text>{{statementDesc.orderCode}}</text>
<text v-if="statementDesc.orderDetailCode">{{statementDesc.orderDetailCode}}</text>
</view>
<view class="margin-bottom-sm">
<text class="text-gray">订单时间</text>
<text>{{statementDesc.orderCreateTime}}</text>
<text v-if="statementDesc.orderCreateTime">{{statementDesc.orderCreateTime}}</text>
</view>
</view>
</view>
@ -51,13 +56,14 @@
statementDesc: {}
}
},
onLoad() {
this.loadData();
onLoad(options) {
this.statementDesc = JSON.parse(decodeURIComponent(options.statementDesc));
// this.loadData();
},
methods: {
async loadData() {
this.statementDesc = await this.$api.data('statementDesc');
}
// async loadData() {
// this.statementDesc = await this.$api.data('statementDesc');
// }
},
}
</script>