Uniapp/lucky_shop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 暂时保存

Browse Source
This commit is contained in:
ZF Sun
2026-01-05 11:22:38 +08:00
parent b24f77be1a
commit be51b30fb4
48 changed files with 381 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pages_order/list.vue → pages_order/base/list.vue
View File

@@ -165,7 +165,7 @@
</template>
<script>
import orderMethod from './public/js/orderMethod.js';
import orderMethod from '../public/js/orderMethod.js';
export default {
components: {
@@ -214,7 +214,7 @@ export default {
if (this.$refs.mescroll) this.$refs.mescroll.refresh();
} else {
this.$nextTick(() => {
this.$refs.login.open('/pages_order/list?status=' + this.orderStatus);
this.$refs.login.open('/pages_order/base/list?status=' + this.orderStatus);
})
}
},
@@ -367,13 +367,13 @@ export default {
switch (parseInt(data.order_type)) {
case 2:
// 自提订单
this.$util.redirectTo('/pages_order/detail_pickup', {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: data.order_id
});
break;
case 3:
// 本地配送订单
this.$util.redirectTo('/pages_order/detail_local_delivery', {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: data.order_id
});
break;
@@ -384,7 +384,7 @@ export default {
});
break;
default:
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: data.order_id
});
break;
@@ -462,7 +462,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/list.scss';
@import '../public/css/list.scss';
</style>
<style lang="scss" scoped>

0
pages_order/payment.vue → pages_order/base/payment.vue
View File

8
pages_order/detail.vue → pages_order/detail/detail.vue
View File

@@ -633,7 +633,7 @@
</template>
<script>
import orderMethod from './public/js/orderMethod.js';
import orderMethod from '../public/js/orderMethod.js';
export default {
components: {
@@ -679,7 +679,7 @@ export default {
this.getOrderData();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
back: '/pages_order/detail/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
});
}
},
@@ -746,7 +746,7 @@ export default {
title: '未获取到订单信息！'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1500);
}
},
@@ -837,7 +837,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/detail.scss';
@import '../public/css/detail.scss';
</style>
<style scoped>
.pickup-code-info .code img:nth-child(1) {

2
pages_order/detail_local_delivery.vue → pages_order/detail/detail_local_delivery.vue
View File

@@ -14,7 +14,7 @@ export default {
},
onLoad(option) {
if (option.order_id) {
this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
this.$util.redirectTo('/pages_order/detail/detail', {order_id: option.order_id}, 'redirectTo');
}
}
};

2
pages_order/detail_pickup.vue → pages_order/detail/detail_pickup.vue
View File

@@ -14,7 +14,7 @@ export default {
},
onLoad(option) {
if (option.order_id) {
this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
this.$util.redirectTo('/pages_order/detail/detail', {order_id: option.order_id}, 'redirectTo');
}
}
};

6
pages_order/detail_point.vue → pages_order/detail/detail_point.vue
View File

@@ -170,7 +170,7 @@ export default {
this.getOrderData();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
back: '/pages_order/detail_point?order_id=' + this.orderId
back: '/pages_order/detail/detail_point?order_id=' + this.orderId
});
}
},
@@ -211,7 +211,7 @@ export default {
title: '未获取到订单信息！'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1500);
}
},
@@ -301,7 +301,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/detail.scss';
@import '../public/css/detail.scss';
</style>
<style scoped>
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {