clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台接口对接

This commit is contained in:
donqi 2022-06-02 17:39:14 +08:00
parent 3a8baa3d81
commit 04d54d172c
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/js/request.js
View File

@ -6,9 +6,9 @@ export default {
uni.addInterceptor('request', { uni.addInterceptor('request', {
invoke(args) { invoke(args) {
// request 触发前拼接 url // request 触发前拼接 url
args.url = 'https://www.opsoul.com' + args.url; // args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://10.45.137.214:80' + args.url; // args.url = 'http://10.45.137.214:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url; args.url = 'http://127.0.0.1:80' + args.url;
if (args.data) { if (args.data) {
args.data.deptId = globalData.deptId; args.data.deptId = globalData.deptId;
args.data.from = globalData.from; args.data.from = globalData.from;
@ -309,18 +309,18 @@ export default {
} }
return resObj; return resObj;
}, },
async qryOrderGoodsPage(params = {}) { // async qryOrderGoodsPage(params = {}) {
let res = await uni.request({ // let res = await uni.request({
url: '/order/goods/list', // url: '/order/goods/list',
method: 'POST', // method: 'POST',
data: params, // data: params,
header: { // header: {
pageNum: params.pageNum, // pageNum: params.pageNum,
pageSize: params.pageSize // pageSize: params.pageSize
} // }
}) // })
return res[1].data; // return res[1].data;
}, // },
async bindBankCard(params) { async bindBankCard(params) {
let res = await uni.request({ let res = await uni.request({
url: '/customer/bankcard/bind', url: '/customer/bankcard/bind',
@ -360,5 +360,17 @@ export default {
data: params data: params
}) })
return res[1].data; return res[1].data;
},
async qryOrderPage(params = {}) {
let res = await uni.request({
url: '/order/master/app/list',
method: 'POST',
data: params,
header: {
pageNum: params.pageNum,
pageSize: params.pageSize
}
})
return res[1].data;
} }
} }

34
pages/my/my-order.vue
View File

@ -22,7 +22,7 @@
<view class="cu-bar solid-bottom"> <view class="cu-bar solid-bottom">
<view class="action bar-first-action"> <view class="action bar-first-action">
<text class="cuIcon-shopfill text-main-color"></text> <text class="cuIcon-shopfill text-main-color"></text>
{{shopOrder.shopName}} {{shopOrder.worker.name}}
<view> <view>
<view class="cuIcon-right"></view> <view class="cuIcon-right"></view>
</view> </view>
@ -31,16 +31,16 @@
</view> </view>
<view class="padding-lr"> <view class="padding-lr">
<view class="margin-top-sm"> <view class="margin-top-sm">
<product-picked :product="shopOrder.product" :pickedList="shopOrder.product.pickedList"> <product-picked :product="shopOrder.orderGoods" :pickedList="shopOrder.orderGoods.pickedList">
</product-picked> </product-picked>
</view> </view>
<view class="flex justify-end align-end padding-bottom-sm"> <view class="flex justify-end align-end padding-bottom-sm">
<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">1049.00</text> <view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.financialMaster.totalMoney}}</text>
</view> </view>
<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">50.00</text> <view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.financialMaster.discountMoney}}</text>
</view> </view>
<view class="text-lg"><text>需付款</text><text <view class="text-lg"><text>需付款</text><text
class="text-price text-red text-lg text-bold">999.00</text></view> class="text-price text-red text-lg text-bold">{{shopOrder.financialMaster.payMoney}}</text></view>
</view> </view>
<view v-if="orderType === 'servOrder'" class="padding-tb-sm flex justify-end oper-bar"> <view v-if="orderType === 'servOrder'" class="padding-tb-sm flex justify-end oper-bar">
<button v-if="shopOrder.subProcessStatus <= 4 && shopOrder.mainProcess !== 'ordersWait2Serv'" <button v-if="shopOrder.subProcessStatus <= 4 && shopOrder.mainProcess !== 'ordersWait2Serv'"
@ -159,12 +159,23 @@
orderType: this.orderType orderType: this.orderType
}); });
}, },
reloadOrderPage(params = {}) {
this.pageParams = [];
for(let i = 0; i < this.tabHeaderList.length; i++) {
this.pageParams.push({
pageNum: 0
});
}
this.myOrders = [];
this.$refs.loadStatusBar.showLoadMore();
this.loadOrderPage(params);
},
async loadOrderPage(params) { async loadOrderPage(params) {
params.pageNum = this.pageParams[this.tabCur].pageNum; params.pageNum = this.pageParams[this.tabCur].pageNum;
params.pageSize = this.$globalData.pageSize; params.pageSize = this.$globalData.initPageSize;
this.$refs.loadStatusBar.showLoading(); this.$refs.loadStatusBar.showLoading();
try { try {
let res = await this.$request.qryOrderGoodsPage(params); let res = await this.$request.qryOrderPage(params);
let rowsLength = res.rows.length; let rowsLength = res.rows.length;
if (rowsLength > 0) { if (rowsLength > 0) {
this.myOrders = this.myOrders.concat(res.rows); this.myOrders = this.myOrders.concat(res.rows);
@ -183,14 +194,9 @@
tabSelect(e) { tabSelect(e) {
this.tabCur = e.currentTarget.dataset.id; this.tabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60 this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
this.resetPageData(); this.reloadOrderPage({
this.loadOrderPage({
orderType: this.tabHeaderList[this.tabCur].type orderType: this.tabHeaderList[this.tabCur].type
}); })
},
resetPageData() {
this.myOrders = [];
this.$refs.loadStatusBar.showLoadMore();
}, },
updateAgreeStatus(status, index) { updateAgreeStatus(status, index) {
this.myOrders[index].agreedServTime.customerAgreeStatus = status; this.myOrders[index].agreedServTime.customerAgreeStatus = status;