完善订单列表功能
This commit is contained in:
parent
8b0a19c458
commit
719ae35b5f
|
@ -6,14 +6,27 @@
|
||||||
</block>
|
</block>
|
||||||
<block v-if="order.state == 2">
|
<block v-if="order.state == 2">
|
||||||
<view class="btn active" @click.stop="confirmPrice">
|
<view class="btn active" @click.stop="confirmPrice">
|
||||||
<text>尾款确认</text>
|
<text>确认完成</text>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<block v-if="order.state == 4">
|
<block v-if="order.state == 4">
|
||||||
<view class="btn normal">待用户支付尾款</view>
|
<view class="btn normal">待用户支付尾款</view>
|
||||||
</block>
|
</block>
|
||||||
|
<block v-if="order.state == 5">
|
||||||
|
<view class="btn normal">待用户确认</view>
|
||||||
|
</block>
|
||||||
|
<block v-if="order.state == 6">
|
||||||
|
<view class="btn normal">已完成</view>
|
||||||
|
</block>
|
||||||
|
</block>
|
||||||
|
<block v-if="order.listType == 't3'">
|
||||||
|
<block v-if="order.state == 2">
|
||||||
|
<view class="btn normal">待用户确认</view>
|
||||||
|
</block>
|
||||||
|
<block v-if="order.state == 3">
|
||||||
|
<view class="btn normal">已完成</view>
|
||||||
|
</block>
|
||||||
</block>
|
</block>
|
||||||
<block v-if="order.listType == 't3'"> </block>
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<text class="text">1)添加后,请客户在小程序订单中支付尾款</text>
|
<text class="text">1)添加后,请客户在小程序订单中支付尾款</text>
|
||||||
<text class="text">2)没有尾款的话,请直接点击确认提交</text>
|
<text class="text">2)没有尾款的话,请直接点击确认提交</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn" @click="confirmPrice">确认添加</view>
|
<view class="btn" @click="confirmPrice">确认</view>
|
||||||
</view>
|
</view>
|
||||||
</widget-modal>
|
</widget-modal>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -20,14 +20,16 @@
|
||||||
<text class="title">订单编号:</text>
|
<text class="title">订单编号:</text>
|
||||||
<text class="text">{{ order.orderId }}</text>
|
<text class="text">{{ order.orderId }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="order-desc-row">
|
<block v-if="order.listType != 't3'">
|
||||||
<text class="title">服务分类:</text>
|
<view class="order-desc-row">
|
||||||
<text class="text">{{ order.cate }}</text>
|
<text class="title">服务分类:</text>
|
||||||
</view>
|
<text class="text">{{ order.cate }}</text>
|
||||||
<view class="order-desc-row limit-line clamp-1">
|
</view>
|
||||||
<text class="title">需求内容:</text>
|
<view class="order-desc-row limit-line clamp-1">
|
||||||
<text class="text">{{ order.content }}</text>
|
<text class="title">需求内容:</text>
|
||||||
</view>
|
<text class="text">{{ order.content }}</text>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
<view class="order-desc-row">
|
<view class="order-desc-row">
|
||||||
<text class="title">下单时间:</text>
|
<text class="title">下单时间:</text>
|
||||||
<text class="text">{{ order.createTime }}</text>
|
<text class="text">{{ order.createTime }}</text>
|
||||||
|
|
|
@ -10,21 +10,40 @@ export default {
|
||||||
prototype.$request(options.request).then(response => {
|
prototype.$request(options.request).then(response => {
|
||||||
if (response.code == 1) {
|
if (response.code == 1) {
|
||||||
let list = [];
|
let list = [];
|
||||||
response.data.forEach(item => {
|
if (options.listType == "t1" || options.listType == "t2") {
|
||||||
list.push({
|
response.data.forEach(item => {
|
||||||
listType: options.listType,
|
list.push({
|
||||||
id: item.id,
|
listType: options.listType,
|
||||||
orderId: item.order,
|
id: item.id,
|
||||||
username: "用户名称",
|
orderId: item.order,
|
||||||
cate: "待返数据",
|
username: "用户名称",
|
||||||
content: item.desc,
|
cate: "待返数据",
|
||||||
createTime: item.time,
|
content: item.desc,
|
||||||
serviceTime: item.times,
|
createTime: item.time,
|
||||||
orderType: item.types,
|
serviceTime: item.times,
|
||||||
state: item.status,
|
orderType: item.types,
|
||||||
price: item.money,
|
state: item.status,
|
||||||
|
price: item.money,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
} else if (options.listType == "t3") {
|
||||||
|
response.data.forEach(item => {
|
||||||
|
list.push({
|
||||||
|
listType: options.listType,
|
||||||
|
id: item.id,
|
||||||
|
orderId: item.order,
|
||||||
|
username: "用户名称",
|
||||||
|
cate: "待返数据",
|
||||||
|
content: "",
|
||||||
|
createTime: item.times,
|
||||||
|
serviceTime: item.starttime,
|
||||||
|
orderType: 1,
|
||||||
|
state: item.status,
|
||||||
|
price: item.money,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return resolve(list);
|
return resolve(list);
|
||||||
}
|
}
|
||||||
return reject(response.msg);
|
return reject(response.msg);
|
||||||
|
|
|
@ -21,21 +21,40 @@ export default {
|
||||||
prototype.$request(options.request).then(response => {
|
prototype.$request(options.request).then(response => {
|
||||||
if (response.code == 1) {
|
if (response.code == 1) {
|
||||||
let list = [];
|
let list = [];
|
||||||
response.data.forEach(item => {
|
|
||||||
list.push({
|
if (options.listType == "t1" || options.listType == "t2") {
|
||||||
listType: options.listType,
|
response.data.forEach(item => {
|
||||||
id: item.id,
|
list.push({
|
||||||
orderId: item.order,
|
listType: options.listType,
|
||||||
username: "用户名称",
|
id: item.id,
|
||||||
cate: "待返数据",
|
orderId: item.order,
|
||||||
content: item.desc,
|
username: "用户名称",
|
||||||
createTime: item.time,
|
cate: "待返数据",
|
||||||
serviceTime: item.times,
|
content: item.desc,
|
||||||
orderType: item.types,
|
createTime: item.time,
|
||||||
state: item.status,
|
serviceTime: item.times,
|
||||||
price: item.money,
|
orderType: item.types,
|
||||||
|
state: item.status,
|
||||||
|
price: item.money,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
} else if (options.listType == "t3") {
|
||||||
|
response.data.forEach(item => {
|
||||||
|
list.push({
|
||||||
|
listType: options.listType,
|
||||||
|
id: item.id,
|
||||||
|
orderId: item.order,
|
||||||
|
username: "用户名称",
|
||||||
|
cate: "待返数据",
|
||||||
|
content: "",
|
||||||
|
createTime: item.times,
|
||||||
|
serviceTime: item.starttime,
|
||||||
|
orderType: 1,
|
||||||
|
state: item.status,
|
||||||
|
price: item.money,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
return resolve(list);
|
return resolve(list);
|
||||||
}
|
}
|
||||||
return reject(response.msg);
|
return reject(response.msg);
|
||||||
|
@ -62,7 +81,7 @@ export default {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
prototype.$request(options.request).then(response => {
|
prototype.$request(options.request).then(response => {
|
||||||
if (response.code == 1) {
|
if (response.code == 1) {
|
||||||
return resolve(response.data);
|
return resolve(response);
|
||||||
}
|
}
|
||||||
return reject(response.msg);
|
return reject(response.msg);
|
||||||
}).catch(e => { });
|
}).catch(e => { });
|
||||||
|
|
Loading…
Reference in New Issue