This commit is contained in:
parent
64a3cef6f2
commit
7825a73d37
|
|
@ -1,6 +1,6 @@
|
|||
import request from '@/utils/request';
|
||||
|
||||
//提交零售订单
|
||||
//提交零售订单(支付一起)
|
||||
export const createOrderApi = (data)=>{
|
||||
return request.post('/order/RetailOrder/createOrder', data);
|
||||
}
|
||||
|
|
@ -14,3 +14,8 @@ export const orderListApi = (data)=>{
|
|||
export const orderDetailApi = (data)=>{
|
||||
return request.get('/order/RetailOrder/detail', data);
|
||||
}
|
||||
|
||||
//提交
|
||||
export const rePaymentApi = (data)=>{
|
||||
return request.post('/order/RetailOrder/Repayment', data);
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
let BASE_URL
|
||||
import store from "@/store/user.js"
|
||||
// 环境
|
||||
let env = "dev"
|
||||
// let env = "dev"
|
||||
// let env = "test"
|
||||
// let env = "prod"
|
||||
let env = "prod"
|
||||
|
||||
switch(env){
|
||||
case 'prod': BASE_URL = 'https://erp.lihaink.cn';break;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@
|
|||
<view class="">待付款</view>
|
||||
</view>
|
||||
<view class="list-item" @click="navTo(2)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96915202404261403582769.png"></image>
|
||||
<view class="">待发货</view>
|
||||
</view>
|
||||
<view class="list-item" @click="navTo(3)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image>
|
||||
<view class="">待收货</view>
|
||||
</view>
|
||||
|
|
@ -130,7 +134,7 @@
|
|||
left: 0;
|
||||
z-index: 3;
|
||||
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png');
|
||||
background-size: 38% 100%;
|
||||
background-size: 28% 100%;
|
||||
background-position: right;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
<view>¥{{item.sell}}</view>
|
||||
</view>
|
||||
<view class="tips">
|
||||
<view>数量</view>
|
||||
<view>{{item.goods_unit}}</view>
|
||||
<view>x{{item.nums}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="time">
|
||||
预计48小时发货
|
||||
{{item.msg}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -100,11 +100,20 @@
|
|||
</view>
|
||||
<view style="width: 100%;height: 200rpx;"></view>
|
||||
|
||||
<view class="fiexd-btn-box">
|
||||
<view style="color: #777777;" @click="showCancel=true">取消订单</view>
|
||||
<view style="width: 450rpx;">
|
||||
<up-button color="#20B128" shape="circle">立即支付 ¥{{datas.total}}</up-button>
|
||||
</view>
|
||||
<view class="fiexd-btn-box" v-if="datas.number">
|
||||
<block v-if="!datas.paid">
|
||||
<view style="color: #777777;" @click="showCancel=true">取消订单</view>
|
||||
<view style="width: 450rpx;">
|
||||
<up-button color="#20B128" shape="circle" @click="rePay">立即支付 ¥{{datas.total}}</up-button>
|
||||
</view>
|
||||
</block>
|
||||
<block v-else>
|
||||
<view></view>
|
||||
<view style="width: 450rpx;">
|
||||
<up-button v-if="datas.status==0||datas.status==1" color="#20B128" shape="circle" @click="">确认收货</up-button>
|
||||
<up-button v-else color="#20B128" shape="circle" @click="">再次购买</up-button>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
|
||||
<up-popup :show="showCancel" closeable round="10" @close="showCancel=false">
|
||||
|
|
@ -129,7 +138,7 @@
|
|||
import cancelDict from "@/dict/cancelDict.js";
|
||||
import addressPopup from "@/components/addressPopup.vue";
|
||||
import modal from "@/components/modal.vue";
|
||||
import { orderDetailApi } from "@/api/order.js"
|
||||
import { orderDetailApi, rePaymentApi } from "@/api/order.js"
|
||||
|
||||
const showCancel = ref(false);
|
||||
const showAddress = ref(false);
|
||||
|
|
@ -170,6 +179,15 @@
|
|||
return price.split('.')[index] || (index ? '00' : '0');
|
||||
}
|
||||
|
||||
const rePay = ()=>{
|
||||
rePaymentApi({
|
||||
order_id: datas.value.id,
|
||||
pay_type: 1
|
||||
}).then(res=>{
|
||||
console.log(res);
|
||||
})
|
||||
}
|
||||
|
||||
// 设置目标日期
|
||||
let targetDate = "";
|
||||
let timer = null;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<swiper-item class="swiper-item" v-for="(list, k) in orderList" :key="k">
|
||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||
<view class="page-box">
|
||||
<view v-if="true" class="list">
|
||||
<view v-if="list.length>0" class="list">
|
||||
<good v-for="(item, index) in list" :datas="item" :key="index" :type="k"></good>
|
||||
</view>
|
||||
<view v-else style="padding-top: 100rpx;">
|
||||
|
|
@ -71,7 +71,6 @@
|
|||
paid: paid
|
||||
}).then(res=>{
|
||||
orderList.value[type] = res.data.lists;
|
||||
console.log(orderList.value);
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,21 +40,22 @@ const _sfc_main = {
|
|||
d: common_vendor.t(common_vendor.unref(userInfo).id),
|
||||
e: common_vendor.o(($event) => navTo(1)),
|
||||
f: common_vendor.o(($event) => navTo(2)),
|
||||
g: common_vendor.o(($event) => navTo()),
|
||||
h: common_vendor.p({
|
||||
g: common_vendor.o(($event) => navTo(3)),
|
||||
h: common_vendor.o(($event) => navTo()),
|
||||
i: common_vendor.p({
|
||||
title: "我的地址",
|
||||
isLink: true,
|
||||
url: "/pagesOrder/addressList/addressList"
|
||||
}),
|
||||
i: common_vendor.p({
|
||||
j: common_vendor.p({
|
||||
title: "意见反馈",
|
||||
isLink: true
|
||||
}),
|
||||
j: common_vendor.p({
|
||||
k: common_vendor.p({
|
||||
title: "关于我们",
|
||||
isLink: true
|
||||
}),
|
||||
k: common_vendor.p({
|
||||
l: common_vendor.p({
|
||||
title: "退出登录",
|
||||
isLink: true,
|
||||
url: "/pages/login/login"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<view><up-navbar wx:if="{{a}}" u-i="39cfeb26-0" bind:__l="__l" u-p="{{a}}"></up-navbar><view class="user-info"><image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp" mode="widthFix"></image><view class="u-card"><up-avatar wx:if="{{b}}" u-i="39cfeb26-1" bind:__l="__l" u-p="{{b}}"></up-avatar><view class="content"><view class="u-phone">{{c}}</view><view class="u-id">ID: {{d}}</view></view></view></view><view class="order-info-box"><view class="order-info"><view class="info-head">我的订单</view><view class="info-list"><view class="list-item" bindtap="{{e}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image><view class="">待付款</view></view><view class="list-item" bindtap="{{f}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image><view class="">待收货</view></view><view class="list-item" bindtap="{{g}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image><view class="">全部订单</view></view></view></view></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-2" bind:__l="__l"><up-cell wx:if="{{h}}" u-i="39cfeb26-3,39cfeb26-2" bind:__l="__l" u-p="{{h}}"></up-cell></up-cell-group></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-4" bind:__l="__l"><up-cell wx:if="{{i}}" u-i="39cfeb26-5,39cfeb26-4" bind:__l="__l" u-p="{{i}}"></up-cell><up-cell wx:if="{{j}}" u-i="39cfeb26-6,39cfeb26-4" bind:__l="__l" u-p="{{j}}"></up-cell><up-cell wx:if="{{k}}" u-i="39cfeb26-7,39cfeb26-4" bind:__l="__l" u-p="{{k}}"></up-cell></up-cell-group></view></view>
|
||||
<view><up-navbar wx:if="{{a}}" u-i="39cfeb26-0" bind:__l="__l" u-p="{{a}}"></up-navbar><view class="user-info"><image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp" mode="widthFix"></image><view class="u-card"><up-avatar wx:if="{{b}}" u-i="39cfeb26-1" bind:__l="__l" u-p="{{b}}"></up-avatar><view class="content"><view class="u-phone">{{c}}</view><view class="u-id">ID: {{d}}</view></view></view></view><view class="order-info-box"><view class="order-info"><view class="info-head">我的订单</view><view class="info-list"><view class="list-item" bindtap="{{e}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image><view class="">待付款</view></view><view class="list-item" bindtap="{{f}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96915202404261403582769.png"></image><view class="">待发货</view></view><view class="list-item" bindtap="{{g}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image><view class="">待收货</view></view><view class="list-item" bindtap="{{h}}"><image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image><view class="">全部订单</view></view></view></view></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-2" bind:__l="__l"><up-cell wx:if="{{i}}" u-i="39cfeb26-3,39cfeb26-2" bind:__l="__l" u-p="{{i}}"></up-cell></up-cell-group></view><view class="card"><up-cell-group u-s="{{['d']}}" u-i="39cfeb26-4" bind:__l="__l"><up-cell wx:if="{{j}}" u-i="39cfeb26-5,39cfeb26-4" bind:__l="__l" u-p="{{j}}"></up-cell><up-cell wx:if="{{k}}" u-i="39cfeb26-6,39cfeb26-4" bind:__l="__l" u-p="{{k}}"></up-cell><up-cell wx:if="{{l}}" u-i="39cfeb26-7,39cfeb26-4" bind:__l="__l" u-p="{{l}}"></up-cell></up-cell-group></view></view>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
left: 0;
|
||||
z-index: 3;
|
||||
background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png");
|
||||
background-size: 38% 100%;
|
||||
background-size: 28% 100%;
|
||||
background-position: right;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,6 +54,14 @@ const _sfc_main = {
|
|||
price = price + "";
|
||||
return price.split(".")[index] || (index ? "00" : "0");
|
||||
};
|
||||
const rePay = () => {
|
||||
api_order.rePaymentApi({
|
||||
order_id: datas.value.id,
|
||||
pay_type: 1
|
||||
}).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
};
|
||||
let timer = null;
|
||||
common_vendor.onLoad((option) => {
|
||||
common_vendor.index.setNavigationBarTitle({
|
||||
|
|
@ -95,7 +103,9 @@ const _sfc_main = {
|
|||
}),
|
||||
c: common_vendor.t(item.class_name),
|
||||
d: common_vendor.t(item.sell),
|
||||
e: common_vendor.t(item.nums)
|
||||
e: common_vendor.t(item.goods_unit),
|
||||
f: common_vendor.t(item.nums),
|
||||
g: common_vendor.t(item.msg)
|
||||
};
|
||||
}),
|
||||
f: datas.value.paid == 0
|
||||
|
|
@ -131,13 +141,35 @@ const _sfc_main = {
|
|||
y: common_vendor.t(datas.value.create_time),
|
||||
z: datas.value.paid
|
||||
}, datas.value.paid ? {} : {}), {
|
||||
A: common_vendor.o(($event) => showCancel.value = true),
|
||||
B: common_vendor.t(datas.value.total),
|
||||
C: common_vendor.p({
|
||||
A: datas.value.number
|
||||
}, datas.value.number ? common_vendor.e({
|
||||
B: !datas.value.paid
|
||||
}, !datas.value.paid ? {
|
||||
C: common_vendor.o(($event) => showCancel.value = true),
|
||||
D: common_vendor.t(datas.value.total),
|
||||
E: common_vendor.o(rePay),
|
||||
F: common_vendor.p({
|
||||
color: "#20B128",
|
||||
shape: "circle"
|
||||
})
|
||||
} : common_vendor.e({
|
||||
G: datas.value.status == 0 || datas.value.status == 1
|
||||
}, datas.value.status == 0 || datas.value.status == 1 ? {
|
||||
H: common_vendor.o(() => {
|
||||
}),
|
||||
D: common_vendor.f(common_vendor.unref(dict_cancelDict.list), (item, index, i0) => {
|
||||
I: common_vendor.p({
|
||||
color: "#20B128",
|
||||
shape: "circle"
|
||||
})
|
||||
} : {
|
||||
J: common_vendor.o(() => {
|
||||
}),
|
||||
K: common_vendor.p({
|
||||
color: "#20B128",
|
||||
shape: "circle"
|
||||
})
|
||||
})) : {}, {
|
||||
L: common_vendor.f(common_vendor.unref(dict_cancelDict.list), (item, index, i0) => {
|
||||
return common_vendor.e({
|
||||
a: common_vendor.t(item.name),
|
||||
b: cancelType.value == item.value
|
||||
|
|
@ -150,23 +182,23 @@ const _sfc_main = {
|
|||
f: common_vendor.o(($event) => cancelType.value = item.value, item.value)
|
||||
});
|
||||
}),
|
||||
E: common_vendor.o(submitCancel),
|
||||
F: common_vendor.p({
|
||||
M: common_vendor.o(submitCancel),
|
||||
N: common_vendor.p({
|
||||
color: "#20B128",
|
||||
shape: "circle"
|
||||
}),
|
||||
G: common_vendor.o(($event) => showCancel.value = false),
|
||||
H: common_vendor.p({
|
||||
O: common_vendor.o(($event) => showCancel.value = false),
|
||||
P: common_vendor.p({
|
||||
show: showCancel.value,
|
||||
closeable: true,
|
||||
round: "10"
|
||||
}),
|
||||
I: common_vendor.o(($event) => showAddress.value = false),
|
||||
J: common_vendor.o(changeAddress),
|
||||
K: common_vendor.p({
|
||||
Q: common_vendor.o(($event) => showAddress.value = false),
|
||||
R: common_vendor.o(changeAddress),
|
||||
S: common_vendor.p({
|
||||
show: showAddress.value
|
||||
}),
|
||||
L: common_vendor.p({
|
||||
T: common_vendor.p({
|
||||
show: false,
|
||||
content: "您还没有添加收货地址，请点击添加"
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<view class=""><view class="m-card m-address" style="margin-top:20rpx"><view class="address-info"><view class="top"><up-icon wx:if="{{a}}" u-i="666b5ad0-0" bind:__l="__l" u-p="{{a}}"></up-icon><view class="t-name">小王</view><view>155****9999</view></view><view class="bottom u-line-2"> 四川泸州市龙马潭区莲花池街道商业街1号 </view></view><view wx:if="{{b}}" class="address-btn"><view style="width:80px"><up-button wx:if="{{d}}" u-s="{{['d']}}" bindclick="{{c}}" u-i="666b5ad0-1" bind:__l="__l" u-p="{{d}}">修改</up-button></view></view></view><view wx:for="{{e}}" wx:for-item="item" class="m-card m-good"><view class="image"><up-image wx:if="{{item.b}}" u-i="{{item.a}}" bind:__l="__l" u-p="{{item.b}}"></up-image></view><view class="body-content"><view><view class="title"><view>{{item.c}}</view><view>¥{{item.d}}</view></view><view class="tips"><view>数量</view><view>x{{item.e}}</view></view></view><view class="time"> 预计48小时发货 </view></view></view><view wx:if="{{f}}" class="m-card good-info"><view wx:if="{{g}}" class="row"><view>商品总价 <text>共计{{h}}款商品</text></view><view><text>¥</text>{{i}}<text>.{{j}}</text></view></view><view class="row"><view>运费</view><view><text>¥</text>0<text>.00</text></view></view><view class="row-need"><view style="margin-right:10rpx">需付款</view><view><text>¥</text>{{k}}<text>.{{l}}</text></view></view></view><view class="m-card good-info"><view class="head-title">订单信息</view><block wx:if="{{m}}"><view class="row"><view>订单编号</view><up-copy wx:if="{{o}}" u-s="{{['d']}}" u-i="666b5ad0-3" bind:__l="__l" u-p="{{o}}"><text>{{n}} | 复制</text></up-copy></view><view class="row"><view>下单时间</view><view>{{p}}</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view wx:if="{{q}}">已支付</view><view wx:else class="red">待支付</view></view></block><block wx:else><view wx:if="{{r}}" class="row"><view>实付款</view><view><text>¥</text>{{s}}<text>.{{t}}</text></view></view><view class="row"><view>订单编号</view><up-copy wx:if="{{w}}" u-s="{{['d']}}" u-i="666b5ad0-4" bind:__l="__l" u-p="{{w}}"><text>{{v}} | 复制</text></up-copy></view><view class="row"><view>支付方式</view><view>{{x}}</view></view><view class="row"><view>下单时间</view><view>{{y}}</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view wx:if="{{z}}">已支付</view><view wx:else class="red">待支付</view></view></block></view><view style="width:100%;height:200rpx"></view><view class="fiexd-btn-box"><view style="color:#777777" bindtap="{{A}}">取消订单</view><view style="width:450rpx"><up-button wx:if="{{C}}" u-s="{{['d']}}" u-i="666b5ad0-5" bind:__l="__l" u-p="{{C}}">立即支付 ¥{{B}}</up-button></view></view><up-popup wx:if="{{H}}" u-s="{{['d']}}" bindclose="{{G}}" u-i="666b5ad0-6" bind:__l="__l" u-p="{{H}}"><view class="cancel-popup"><view class="head-title">订单取消</view><view wx:for="{{D}}" wx:for-item="item" wx:key="e" class="row" bindtap="{{item.f}}"><view>{{item.a}}</view><image wx:if="{{item.b}}" src="{{item.c}}"></image><image wx:else src="{{item.d}}"></image></view><up-button wx:if="{{F}}" u-s="{{['d']}}" bindclick="{{E}}" u-i="666b5ad0-7,666b5ad0-6" bind:__l="__l" u-p="{{F}}">提交</up-button></view></up-popup><address-popup wx:if="{{K}}" bindclose="{{I}}" bindchange="{{J}}" u-i="666b5ad0-8" bind:__l="__l" u-p="{{K}}"></address-popup><modal wx:if="{{L}}" u-i="666b5ad0-9" bind:__l="__l" u-p="{{L}}"></modal></view>
|
||||
<view class=""><view class="m-card m-address" style="margin-top:20rpx"><view class="address-info"><view class="top"><up-icon wx:if="{{a}}" u-i="666b5ad0-0" bind:__l="__l" u-p="{{a}}"></up-icon><view class="t-name">小王</view><view>155****9999</view></view><view class="bottom u-line-2"> 四川泸州市龙马潭区莲花池街道商业街1号 </view></view><view wx:if="{{b}}" class="address-btn"><view style="width:80px"><up-button wx:if="{{d}}" u-s="{{['d']}}" bindclick="{{c}}" u-i="666b5ad0-1" bind:__l="__l" u-p="{{d}}">修改</up-button></view></view></view><view wx:for="{{e}}" wx:for-item="item" class="m-card m-good"><view class="image"><up-image wx:if="{{item.b}}" u-i="{{item.a}}" bind:__l="__l" u-p="{{item.b}}"></up-image></view><view class="body-content"><view><view class="title"><view>{{item.c}}</view><view>¥{{item.d}}</view></view><view class="tips"><view>{{item.e}}</view><view>x{{item.f}}</view></view></view><view class="time">{{item.g}}</view></view></view><view wx:if="{{f}}" class="m-card good-info"><view wx:if="{{g}}" class="row"><view>商品总价 <text>共计{{h}}款商品</text></view><view><text>¥</text>{{i}}<text>.{{j}}</text></view></view><view class="row"><view>运费</view><view><text>¥</text>0<text>.00</text></view></view><view class="row-need"><view style="margin-right:10rpx">需付款</view><view><text>¥</text>{{k}}<text>.{{l}}</text></view></view></view><view class="m-card good-info"><view class="head-title">订单信息</view><block wx:if="{{m}}"><view class="row"><view>订单编号</view><up-copy wx:if="{{o}}" u-s="{{['d']}}" u-i="666b5ad0-3" bind:__l="__l" u-p="{{o}}"><text>{{n}} | 复制</text></up-copy></view><view class="row"><view>下单时间</view><view>{{p}}</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view wx:if="{{q}}">已支付</view><view wx:else class="red">待支付</view></view></block><block wx:else><view wx:if="{{r}}" class="row"><view>实付款</view><view><text>¥</text>{{s}}<text>.{{t}}</text></view></view><view class="row"><view>订单编号</view><up-copy wx:if="{{w}}" u-s="{{['d']}}" u-i="666b5ad0-4" bind:__l="__l" u-p="{{w}}"><text>{{v}} | 复制</text></up-copy></view><view class="row"><view>支付方式</view><view>{{x}}</view></view><view class="row"><view>下单时间</view><view>{{y}}</view></view><view class="row" style="margin-bottom:0"><view>支付状态</view><view wx:if="{{z}}">已支付</view><view wx:else class="red">待支付</view></view></block></view><view style="width:100%;height:200rpx"></view><view wx:if="{{A}}" class="fiexd-btn-box"><block wx:if="{{B}}"><view style="color:#777777" bindtap="{{C}}">取消订单</view><view style="width:450rpx"><up-button wx:if="{{F}}" u-s="{{['d']}}" bindclick="{{E}}" u-i="666b5ad0-5" bind:__l="__l" u-p="{{F}}">立即支付 ¥{{D}}</up-button></view></block><block wx:else><view></view><view style="width:450rpx"><up-button wx:if="{{G}}" u-s="{{['d']}}" bindclick="{{H}}" u-i="666b5ad0-6" bind:__l="__l" u-p="{{I}}">确认收货</up-button><up-button wx:else u-s="{{['d']}}" bindclick="{{J}}" u-i="666b5ad0-7" bind:__l="__l" u-p="{{K||''}}">再次购买</up-button></view></block></view><up-popup wx:if="{{P}}" u-s="{{['d']}}" bindclose="{{O}}" u-i="666b5ad0-8" bind:__l="__l" u-p="{{P}}"><view class="cancel-popup"><view class="head-title">订单取消</view><view wx:for="{{L}}" wx:for-item="item" wx:key="e" class="row" bindtap="{{item.f}}"><view>{{item.a}}</view><image wx:if="{{item.b}}" src="{{item.c}}"></image><image wx:else src="{{item.d}}"></image></view><up-button wx:if="{{N}}" u-s="{{['d']}}" bindclick="{{M}}" u-i="666b5ad0-9,666b5ad0-8" bind:__l="__l" u-p="{{N}}">提交</up-button></view></up-popup><address-popup wx:if="{{S}}" bindclose="{{Q}}" bindchange="{{R}}" u-i="666b5ad0-10" bind:__l="__l" u-p="{{S}}"></address-popup><modal wx:if="{{T}}" u-i="666b5ad0-11" bind:__l="__l" u-p="{{T}}"></modal></view>
|
||||
|
|
@ -56,7 +56,6 @@ const _sfc_main = {
|
|||
paid
|
||||
}).then((res) => {
|
||||
orderList.value[type] = res.data.lists;
|
||||
console.log(orderList.value);
|
||||
});
|
||||
};
|
||||
common_vendor.onLoad((options) => {
|
||||
|
|
@ -93,7 +92,9 @@ const _sfc_main = {
|
|||
}),
|
||||
e: common_vendor.f(orderList.value, (list, k, i0) => {
|
||||
return common_vendor.e({
|
||||
a: common_vendor.f(list, (item, index, i1) => {
|
||||
a: list.length > 0
|
||||
}, list.length > 0 ? {
|
||||
b: common_vendor.f(list, (item, index, i1) => {
|
||||
return {
|
||||
a: index,
|
||||
b: "aea1ad54-3-" + i0 + "-" + i1,
|
||||
|
|
@ -103,8 +104,14 @@ const _sfc_main = {
|
|||
})
|
||||
};
|
||||
})
|
||||
} : {
|
||||
c: "aea1ad54-4-" + i0,
|
||||
d: common_vendor.p({
|
||||
text: "订单空空如也",
|
||||
icon: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/29955202404260944367594.png"
|
||||
})
|
||||
}, {
|
||||
d: k
|
||||
e: k
|
||||
});
|
||||
}),
|
||||
f: swiperCurrent.value,
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<view><up-sticky wx:if="{{d}}" u-s="{{['d']}}" u-i="aea1ad54-0" bind:__l="__l" u-p="{{d}}"><view style="padding:10rpx 20rpx 0 20rpx"><up-search wx:if="{{a}}" u-i="aea1ad54-1,aea1ad54-0" bind:__l="__l" u-p="{{a}}"></up-search></view><up-tabs wx:if="{{c}}" bindchange="{{b}}" u-i="aea1ad54-2,aea1ad54-0" bind:__l="__l" u-p="{{c}}"></up-tabs></up-sticky><swiper class="swiper-box" current="{{f}}" bindanimationfinish="{{g}}"><swiper-item wx:for="{{e}}" wx:for-item="list" wx:key="d" class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{true}}" class="list"><good wx:for="{{list.a}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{item.c}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{list.c}}" u-i="{{list.b}}" bind:__l="__l" u-p="{{list.c}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper></view>
|
||||
<view><up-sticky wx:if="{{d}}" u-s="{{['d']}}" u-i="aea1ad54-0" bind:__l="__l" u-p="{{d}}"><view style="padding:10rpx 20rpx 0 20rpx"><up-search wx:if="{{a}}" u-i="aea1ad54-1,aea1ad54-0" bind:__l="__l" u-p="{{a}}"></up-search></view><up-tabs wx:if="{{c}}" bindchange="{{b}}" u-i="aea1ad54-2,aea1ad54-0" bind:__l="__l" u-p="{{c}}"></up-tabs></up-sticky><swiper class="swiper-box" current="{{f}}" bindanimationfinish="{{g}}"><swiper-item wx:for="{{e}}" wx:for-item="list" wx:key="e" class="swiper-item"><scroll-view scroll-y style="height:100%;width:100%"><view class="page-box"><view wx:if="{{list.a}}" class="list"><good wx:for="{{list.b}}" wx:for-item="item" wx:key="a" u-i="{{item.b}}" bind:__l="__l" u-p="{{item.c}}"></good></view><view wx:else style="padding-top:100rpx"><up-empty wx:if="{{list.d}}" u-i="{{list.c}}" bind:__l="__l" u-p="{{list.d}}"></up-empty></view><view style="width:100%;height:200rpx"></view></view></scroll-view></swiper-item></swiper></view>
|
||||
Loading…
Reference in New Issue