From 463b129b1011652af4d4261da4e2797e04198f2f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 四月 2026 16:14:07 +0800
Subject: [PATCH] 调接口加页面
---
small-program/unpackage/dist/dev/mp-weixin/pages/itinerary/itinerary.js | 281 +++++++++++++++++++++++++++++--------------------------
1 files changed, 147 insertions(+), 134 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/itinerary/itinerary.js b/small-program/unpackage/dist/dev/mp-weixin/pages/itinerary/itinerary.js
index b9345e8..11ef485 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/itinerary/itinerary.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/itinerary/itinerary.js
@@ -98,34 +98,32 @@
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
var components
-try {
- components = {
- customTabbar: function () {
- return __webpack_require__.e(/*! import() | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then(__webpack_require__.bind(null, /*! @/components/custom-tabbar/custom-tabbar.vue */ 397))
- },
- }
-} catch (e) {
- if (
- e.message.indexOf("Cannot find module") !== -1 &&
- e.message.indexOf(".vue") !== -1
- ) {
- console.error(e.message)
- console.error("1. 鎺掓煡缁勪欢鍚嶇О鎷煎啓鏄惁姝ｇ‘")
- console.error(
- "2. 鎺掓煡缁勪欢鏄惁绗﹀悎 easycom 瑙勮寖锛屾枃妗ｏ細https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
- )
- console.error(
- "3. 鑻ョ粍浠朵笉绗﹀悎 easycom 瑙勮寖锛岄渶鎵嬪姩寮曞叆锛屽苟鍦� components 涓敞鍐岃缁勪欢"
- )
- } else {
- throw e
- }
-}
var render = function () {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
- var g0 = !_vm.isLoadingMore ? !_vm.hasMore && _vm.visibleOrders.length : null
+ var l1 = _vm.__map(_vm.dataList, function (item, index) {
+ var $orig = _vm.__get_orig(item)
+ var l0 = item.detailList
+ ? _vm.__map(item.detailList, function (goods, __i1__) {
+ var $orig = _vm.__get_orig(goods)
+ var g0 = ((goods.subtotal || 0) / 100).toFixed(2)
+ return {
+ $orig: $orig,
+ g0: g0,
+ }
+ })
+ : null
+ var g1 = ((item.estimatedAmount || 0) / 100).toFixed(2)
+ var g2 = ((item.declaredFee || 0) / 100).toFixed(2)
+ return {
+ $orig: $orig,
+ l0: l0,
+ g1: g1,
+ g2: g2,
+ }
+ })
+ var g3 = !_vm.isLoadingMore ? !_vm.hasNext && _vm.dataList.length : null
if (!_vm._isMounted) {
_vm.e0 = function ($event, item) {
var _temp = arguments[arguments.length - 1].currentTarget.dataset,
@@ -139,7 +137,8 @@
{},
{
$root: {
- g0: g0,
+ l1: l1,
+ g3: g3,
},
}
)
@@ -176,154 +175,168 @@
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 34));
var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 36));
var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
var _vuex = __webpack_require__(/*! vuex */ 37);
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var CustomTabbar = function CustomTabbar() {
- __webpack_require__.e(/*! require.ensure | components/custom-tabbar/custom-tabbar */ "components/custom-tabbar/custom-tabbar").then((function () {
- return resolve(__webpack_require__(/*! @/components/custom-tabbar/custom-tabbar.vue */ 397));
- }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
-};
-var baseOrders = [{
- id: 1,
- mode: 'local',
- status: '寰呮牳楠�',
- statusKey: 'verify',
- fromName: '涓搧蹇繍鍗楃珯鏃楄埌搴�',
- userName: '钄″瓙鐟�',
- goods: [{
- name: '澶т欢琛屾潕绠�',
- size: '24-28瀵�',
- price: '锟�35'
- }, {
- name: '涓欢琛屾潕绠�',
- size: '24-28瀵�',
- price: '锟�35'
- }, {
- name: '灏忎欢琛屾潕绠�',
- size: '24-28瀵�',
- price: '锟�35'
- }],
- payAmount: '楼125.00',
- insurance: '楼20',
- pickupTime: '2026-04-12 10:10',
- actionText: '鐢宠閫�娆�'
-}, {
- id: 2,
- mode: 'city',
- status: '寰呮牳楠�',
- statusKey: 'verify',
- fromName: '涓搧蹇繍鍗楃珯鏃楄埌搴�',
- toName: '涓芥灚閰掑簵34...',
- userName: '钄″瓙鐟�',
- goods: [{
- name: '澶т欢琛屾潕绠�',
- size: '24-28瀵�',
- price: '锟�35'
- }, {
- name: '涓欢琛屾潕绠�',
- size: '24-28瀵�',
- price: '锟�35'
- }],
- payAmount: '楼90.00',
- insurance: '楼20',
- pickupTime: '',
- actionText: '鐢宠閫�娆�'
-}];
var _default = {
- components: {
- CustomTabbar: CustomTabbar
- },
- onReachBottom: function onReachBottom() {
- this.loadMore();
- },
- computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight'])), {}, {
- filteredOrders: function filteredOrders() {
- var _this = this;
- if (this.activeTab === 'all') {
- return this.orders;
- }
- return this.orders.filter(function (item) {
- return item.statusKey === _this.activeTab;
- });
- },
- visibleOrders: function visibleOrders() {
- return this.filteredOrders.slice(0, this.pageSize);
- },
- hasMore: function hasMore() {
- return this.pageSize < this.filteredOrders.length;
- }
- }),
+ computed: _objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight'])),
data: function data() {
return {
- activeTab: 'all',
- pageSize: 4,
+ activeTab: -1,
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ hasNext: true,
+ userType: 0,
isLoadingMore: false,
filterTabs: [{
label: '鍏ㄩ儴',
- value: 'all'
+ value: -1
}, {
label: '寰呮敮浠�',
- value: 'pending'
+ value: 0
}, {
label: '寰呮牳楠�',
- value: 'verify'
+ value: 1
}, {
label: '寰呴厤閫�',
- value: 'delivery'
+ value: 2
}, {
label: '寰呮敹璐�',
- value: 'receive'
+ value: 3
}, {
- label: '寰呮牳楠�',
- value: 'verify'
+ label: '宸插畬鎴�',
+ value: 4
}, {
- label: '寰呴厤閫�',
- value: 'delivery'
- }, {
- label: '寰呮敹璐�',
- value: 'receive'
+ label: '宸查��娆�',
+ value: 5
}],
- orders: [].concat(baseOrders, (0, _toConsumableArray2.default)(baseOrders.map(function (item, index) {
- return _objectSpread(_objectSpread({}, item), {}, {
- id: item.id + (index + 1) * 10
- });
- })), (0, _toConsumableArray2.default)(baseOrders.map(function (item, index) {
- return _objectSpread(_objectSpread({}, item), {}, {
- id: item.id + (index + 1) * 20
- });
- })))
+ dataList: []
};
},
watch: {
activeTab: function activeTab() {
- this.pageSize = 4;
+ this.getFirstPageData();
}
},
- methods: {
- loadMore: function loadMore() {
- var _this2 = this;
- if (!this.hasMore || this.isLoadingMore) {
- return;
+ onLoad: function onLoad(options) {
+ console.log(options);
+ this.activeTab = -1;
+ if (options.status) {
+ this.activeTab = Number(options.status);
+ }
+ this.getFirstPageData();
+ var that = this;
+ uni.$on('updateOrder', function (data) {
+ console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 锛屾惡甯﹀弬鏁� msg 涓猴細', data);
+ if (data.delete == 1) {
+ //鍒犻櫎璁㈠崟锛屽己鍒跺埛鏂版暟鎹�
+ that.getFirstPageData();
+ } else if (data.info != null && data.info.orderId != null) {
+ console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 01锛�', data);
+ that.dataList.forEach(function (item, index) {
+ if (item.id == data.info.orderId) {
+ console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 02锛�', data);
+ item.status = data.info.orderStatus;
+ }
+ });
}
- this.isLoadingMore = true;
- setTimeout(function () {
- _this2.pageSize += 2;
- _this2.isLoadingMore = false;
- }, 300);
+ });
+ },
+ onShow: function onShow() {
+ // this.showDone=false
+ // this.showCancel=false
+ // this.showDelete=false
+ // this.showQrcode=false
+ // this.showPay=false
+ // this.showPhone=false
+ this.loading = false, this.currentOrder = null;
+ },
+ onReachBottom: function onReachBottom() {
+ this.getDataList();
+ },
+ methods: {
+ getFirstPageData: function getFirstPageData() {
+ this.currentPage = 0;
+ this.hasNext = true;
+ this.total = 0;
+ this.dataList = [];
+ this.getDataList();
+ },
+ getDataList: function getDataList() {
+ var _this = this;
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ var that, res, _that$dataList;
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ if (!(_this.loading || !_this.hasNext)) {
+ _context.next = 2;
+ break;
+ }
+ return _context.abrupt("return");
+ case 2:
+ _this.loading = true;
+ _this.currentPage = _this.currentPage + 1;
+ if (_this.currentPage == 1) {
+ _this.hasNext = true;
+ _this.dataList = [];
+ }
+ that = _this;
+ res = {};
+ _context.next = 9;
+ return that.$u.api.myOrderPage({
+ capacity: 10,
+ model: {
+ combinedStatus: _this.activeTab == -1 ? '' : _this.activeTab
+ },
+ page: _this.currentPage
+ });
+ case 9:
+ res = _context.sent;
+ console.log(res);
+ if (res.code === 200) {
+ if (res.data && res.data.page === _this.currentPage) {
+ res.data.records = res.data.records || [];
+ (_that$dataList = that.dataList).push.apply(_that$dataList, (0, _toConsumableArray2.default)(res.data.records));
+ that.total = res.data.total;
+ if (_this.currentPage >= res.data.pageCount || 0) {
+ that.hasNext = false;
+ } else {
+ that.hasNext = true;
+ }
+ }
+ }
+ _this.loading = false;
+ case 13:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee);
+ }))();
+ },
+ jumpOrderDetail: function jumpOrderDetail(id) {
+ uni.navigateTo({
+ url: '/pages/details-entry/details-entry?userType=' + this.userType + '&id=' + id
+ });
}
}
};
exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
/***/ }),
--
Gitblit v1.9.3