This commit is contained in:
Gao xiaosong
2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions

View File

@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -234,7 +234,7 @@ var _default = { name: "goodsReturn", components: {// VueCoreImageUpload
refund_reason_wap_explain: refund_reason_wap_explain }).
then(function (res) {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000 });
@ -253,6 +253,7 @@ var _default = { name: "goodsReturn", components: {// VueCoreImageUpload
this.getOrderDetail();
this.getRefundReason();
} };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ })

View File

@ -110,15 +110,6 @@ var render = function() {
if (!_vm._isMounted) {
_vm.e0 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
_vm.e1 = function($event) {
$event.stopPropagation()
return _vm.$yrouter.push({
path: "/pages/shop/GoodsCon/index",
@ -128,7 +119,7 @@ var render = function() {
})
}
_vm.e2 = function($event) {
_vm.e1 = function($event) {
$event.stopPropagation()
return _vm.$yrouter.push({
path: "/pages/activity/GroupDetails/index",
@ -138,7 +129,7 @@ var render = function() {
})
}
_vm.e3 = function($event) {
_vm.e2 = function($event) {
$event.stopPropagation()
return _vm.$yrouter.push({
path: "/pages/activity/DargainDetails/index",
@ -148,7 +139,7 @@ var render = function() {
})
}
_vm.e4 = function($event) {
_vm.e3 = function($event) {
$event.stopPropagation()
return _vm.$yrouter.push({
path: "/pages/activity/SeckillDetails/index",
@ -158,25 +149,7 @@ var render = function() {
})
}
_vm.e5 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
_vm.e6 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
_vm.e7 = function($event) {
_vm.e4 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/Logistics/index",
query: {
@ -184,24 +157,6 @@ var render = function() {
}
})
}
_vm.e8 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
_vm.e9 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
}
_vm.$mp.data = Object.assign(
@ -412,8 +367,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
@ -596,9 +549,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18); //
//
//
//
//
//
var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var Payment = function Payment() {return __webpack_require__.e(/*! import() | components/Payment */ "components/Payment").then(__webpack_require__.bind(null, /*! @/components/Payment */ 587));};var DataFormat = function DataFormat() {return __webpack_require__.e(/*! import() | components/DataFormat */ "components/DataFormat").then(__webpack_require__.bind(null, /*! @/components/DataFormat */ 577));};var STATUS = ["待付款", "待发货", "待收货", "待评价", "已完成", "", "", "", "", "待付款"];var NAME = "MyOrder";var _default = { name: NAME, data: function data() {return { offlinePayStatus: 2, orderData: {}, type: "", page: 1, limit: 20, loaded: false, loading: false, orderList: [], pay: false, payType: ["yue", "weixin"], from: (0, _utils.isWeixin)() ? "weixin" : "weixinh5" };}, components: { Loading: Loading, Payment: Payment, DataFormat: DataFormat }, computed: (0, _vuex.mapGetters)(["userInfo"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) {var type = parseInt(this.$yroute.query.type) || 0;if (this.type !== type) {this.changeType(type);}this.getOrderData();}}, type: function type() {} }, methods: { dataFormat: _utils.dataFormat, setOfflinePayStatus: function setOfflinePayStatus(status) {var that = this;that.offlinePayStatus = status;if (status === 1) {if (that.payType.indexOf("offline") < 0) {that.payType.push("offline");}}}, getOrderData: function getOrderData() {var _this = this;(0, _order.getOrderData)().then(function (res) {_this.orderData = res.data;});}, takeOrder: function takeOrder(order) {var _this2 = this;(0, _order2.takeOrderHandle)(order.orderId).finally(function () {_this2.reload();_this2.getOrderData();});}, reload: function reload() {this.changeType(this.type);}, changeType: function changeType(type) {this.type = type;this.orderList = [];this.page = 1;this.loaded = false;this.loading = false;this.getOrderList();}, getOrderList: function getOrderList() {var _this3 = this;if (this.loading || this.loaded) return;this.loading = true;var page = this.page,limit = this.limit,type = this.type;(0, _order.getOrderList)({ page: page, limit: limit, type: type }).then(function (res) {_this3.orderList = _this3.orderList.concat(res.data);_this3.page++;_this3.loaded = res.data.length < _this3.limit;_this3.loading = false;});}, getStatus: function getStatus(order) {return STATUS[order._status._type];}, cancelOrder: function cancelOrder(order) {var _this4 = this;(0, _order2.cancelOrderHandle)(order.orderId).then(function () {_this4.getOrderData();_this4.orderList.splice(_this4.orderList.indexOf(order), 1);}).catch(function () {_this4.reload();});}, paymentTap: function paymentTap(order) {var _this5 = this;var that = this;if (!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)) {that.setOfflinePayStatus(order.offlinePayStatus);}this.pay = true;this.toPay = function (type) {(0, _order2.payOrderHandle)(order.orderId, type, that.from).then(function () {var type = parseInt(_this5.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();}).catch(function () {var type = parseInt(that.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();});};}, toPay: function toPay() {} }, mounted: function mounted() {this.type = parseInt(this.$yroute.query.type) || 0;this.getOrderData();this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;
var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var Payment = function Payment() {return __webpack_require__.e(/*! import() | components/Payment */ "components/Payment").then(__webpack_require__.bind(null, /*! @/components/Payment */ 587));};var DataFormat = function DataFormat() {return __webpack_require__.e(/*! import() | components/DataFormat */ "components/DataFormat").then(__webpack_require__.bind(null, /*! @/components/DataFormat */ 577));};var STATUS = ["待付款", "待发货", "待收货", "待评价", "已完成", "", "", "", "", "待付款"];var NAME = "MyOrder";var _default = { name: NAME, data: function data() {return { offlinePayStatus: 2, orderData: {}, type: "", page: 1, limit: 20, loaded: false, loading: false, orderList: [], pay: false, payType: ["yue", "weixin"], from: (0, _utils.isWeixin)() ? "weixin" : "weixinh5" };}, components: { Loading: Loading, Payment: Payment, DataFormat: DataFormat }, computed: (0, _vuex.mapGetters)(["userInfo"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) {var type = parseInt(this.$yroute.query.type) || 0;if (this.type !== type) {this.changeType(type);}this.getOrderData();}}, type: function type() {} }, methods: { goOrderDetails: function goOrderDetails(order) {this.$yrouter.push({ path: "/pages/order/OrderDetails/index", query: { id: order.orderId } });}, dataFormat: _utils.dataFormat, setOfflinePayStatus: function setOfflinePayStatus(status) {var that = this;that.offlinePayStatus = status;if (status === 1) {if (that.payType.indexOf("offline") < 0) {that.payType.push("offline");}}}, getOrderData: function getOrderData() {var _this = this;(0, _order.getOrderData)().then(function (res) {_this.orderData = res.data;});}, takeOrder: function takeOrder(order) {var _this2 = this;(0, _order2.takeOrderHandle)(order.orderId).finally(function () {_this2.reload();_this2.getOrderData();});}, reload: function reload() {this.changeType(this.type);}, changeType: function changeType(type) {this.type = type;this.orderList = [];this.page = 1;this.loaded = false;this.loading = false;this.getOrderList();}, getOrderList: function getOrderList() {var _this3 = this;if (this.loading || this.loaded) return;this.loading = true;var page = this.page,limit = this.limit,type = this.type;(0, _order.getOrderList)({ page: page, limit: limit, type: type }).then(function (res) {_this3.orderList = _this3.orderList.concat(res.data);_this3.page++;_this3.loaded = res.data.length < _this3.limit;_this3.loading = false;});}, getStatus: function getStatus(order) {return STATUS[order._status._type];}, cancelOrder: function cancelOrder(order) {var _this4 = this;(0, _order2.cancelOrderHandle)(order.orderId).then(function () {_this4.getOrderData();_this4.orderList.splice(_this4.orderList.indexOf(order), 1);}).catch(function () {_this4.reload();});}, paymentTap: function paymentTap(order) {var _this5 = this;var that = this;if (!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)) {that.setOfflinePayStatus(order.offlinePayStatus);}this.pay = true;this.toPay = function (type) {(0, _order2.payOrderHandle)(order.orderId, type, that.from).then(function () {var type = parseInt(_this5.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();}).catch(function () {var type = parseInt(that.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();});};}, toPay: function toPay() {} }, mounted: function mounted() {this.type = parseInt(this.$yroute.query.type) || 0;this.getOrderData();this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;
/***/ }),

File diff suppressed because one or more lines are too long

View File

@ -107,7 +107,7 @@ var render = function() {
_vm.e1 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/GoodsReturn/index",
path: "/pages/order/Logistics/index",
query: {
id: _vm.orderInfo.orderId
}
@ -131,24 +131,6 @@ var render = function() {
}
})
}
_vm.e4 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/Logistics/index",
query: {
id: _vm.orderInfo.orderId
}
})
}
_vm.e5 = function($event) {
return _vm.$yrouter.push({
path: "/pages/activity/GroupRule/index",
query: {
id: _vm.orderInfo.pinkId
}
})
}
}
}
var recyclableRender = false
@ -183,7 +165,17 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));
@ -797,7 +789,7 @@ var NAME = "OrderDetails";var _default =
_this4.setOfflinePayStatus(_this4.orderInfo.offlinePayStatus);
}).
catch(function (err) {
wx.showToast({
uni.showToast({
title: err.response.data.msg,
icon: "none",
duration: 2000 });
@ -808,6 +800,7 @@ var NAME = "OrderDetails";var _default =
that = this;_context.next = 3;return (
(0, _order2.payOrderHandle)(this.orderInfo.orderId, type, that.from));case 3:
that.getDetail();case 4:case "end":return _context.stop();}}}, _callee, this);}));function toPay(_x) {return _toPay.apply(this, arguments);}return toPay;}() } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),

File diff suppressed because one or more lines are too long

View File

@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
@ -501,7 +501,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
var data = res.data;
if (data.status === "EXTEND_ORDER") {
_this.$yrouter.replace({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: data.result.orderId } });
} else {
@ -577,7 +577,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
}
}
wx.showLoading({ title: "生成订单中" });
uni.showLoading({ title: "生成订单中" });
(0, _order.createOrder)(this.orderGroupInfo.orderKey, {
realName: this.contacts,
phone: this.contactsTel,
@ -594,7 +594,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
shippingType: parseInt(shipping_type) + 1 }).
then(function (res) {
wx.hideLoading();
uni.hideLoading();
var data = res.data;
switch (data.status) {
case "ORDER_EXIST":
@ -603,24 +603,24 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
case "PAY_ERROR":
_this3.$dialog.toast({ mes: res.msg });
_this3.$yrouter.replace({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: data.result.orderId } });
break;
case "SUCCESS":
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000 });
_this3.$yrouter.replace({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: data.result.orderId } });
break;
case "WECHAT_H5_PAY":
_this3.$yrouter.replace({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: data.result.orderId } });
setTimeout(function () {
@ -630,7 +630,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
case "WECHAT_PAY":
(0, _wechat.weappPay)(data.result.jsConfig).then(function (res) {
_this3.$yrouter.replace({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: data.result.orderId } });
});
@ -638,16 +638,17 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
// 下面为原先微信支付方式,
// pay(data.result.jsConfig).finally(() => {
// this.$yrouter.replace({
// path: "/pages/order/OrderDetails/main" ,query: { id: data.result.orderId}
// path: "/pages/order/OrderDetails/index" ,query: { id: data.result.orderId}
// });
// });
}
}).
catch(function (err) {
wx.hideLoading();
uni.hideLoading();
_this3.$dialog.error(err.response.data.msg || "创建订单失败");
});
} } };exports.default = _default;
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),

View File

@ -1,4 +1,3 @@
{
"navigationBarTitleText": "PaymentStatus",
"usingComponents": {}
"navigationBarTitleText": "PaymentStatus"
}

View File

@ -98,26 +98,6 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
if (!_vm._isMounted) {
_vm.e0 = function($event) {
return _vm.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
id: _vm.order.orderId
}
})
}
_vm.e1 = function($event) {
$event.stopPropagation()
return _vm.$yrouter.push({
path: "/pages/shop/GoodsCon/index",
query: {
id: _vm.cart.productInfo.id
}
})
}
}
}
var recyclableRender = false
var staticRenderFns = []
@ -189,12 +169,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
@ -246,13 +220,14 @@ var _order = __webpack_require__(/*! @/api/order */ 352); //
//
//
//
//
//
//
//
//
//
var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: "ReturnList", components: { Loading: Loading }, data: function data() {return { orderList: [], page: 1, limit: 20, loading: false, loaded: false };}, methods: { getOrderList: function getOrderList() {var _this = this;var page = this.page,limit = this.limit;if (this.loading || this.loaded) return;this.loading = true;(0, _order.getOrderList)({ page: page, limit: limit, type: -3 }).then(function (res) {_this.orderList = _this.orderList.concat(res.data);_this.loading = false;_this.loaded = res.data.length < limit;_this.page++;});} }, mounted: function mounted() {this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;
var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: "ReturnList", components: { Loading: Loading }, data: function data() {return { orderList: [], page: 1, limit: 20, loading: false, loaded: false };}, methods: { goGoodsCon: function goGoodsCon(cart) {this.$yrouter.push({ path: "/pages/shop/GoodsCon/index", query: { id: cart.productInfo.id } });}, goOrderDetails: function goOrderDetails(order) {this.$yrouter.push({ path: "/pages/order/OrderDetails/index", query: { id: order.orderId } });}, getOrderList: function getOrderList() {var _this = this;var page = this.page,limit = this.limit;if (this.loading || this.loaded) return;this.loading = true;(0, _order.getOrderList)({ page: page, limit: limit, type: -3 }).then(function (res) {_this.orderList = _this.orderList.concat(res.data);_this.loading = false;_this.loaded = res.data.length < limit;_this.page++;});} },
mounted: function mounted() {
this.getOrderList();
},
onReachBottom: function onReachBottom() {
!this.loading && this.getOrderList();
} };exports.default = _default;
/***/ })

View File

@ -1 +1 @@
<view data-ref="container" class="return-list _div vue-ref"><block wx:for="{{orderList}}" wx:for-item="order" wx:for-index="orderListIndex" wx:key="orderListIndex"><view class="goodWrapper _div"><block wx:if="{{order._status._type===-1}}"><view class="iconfont icon-tuikuanzhong powder _div"></view></block><block wx:if="{{order._status._type===-2}}"><view class="iconfont icon-yituikuan _div"></view></block><view class="orderNum _div">{{"订单号:"+order.orderId}}</view><block wx:for="{{order.cartInfo}}" wx:for-item="cart" wx:for-index="cartInfoIndex" wx:key="cartInfoIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}" data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" catchtap="__e"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><block wx:else><view class="attr line1 _div">{{cart.productInfo.storeName}}</view></block><view class="money _div">{{"¥"+cart.productInfo.price}}</view></view></view></block><view class="totalSum _div">{{'共'+(order.cartInfo.length||0)+'件商品,总金额'}}<label class="font-color-red price _span">{{"¥"+order.payPrice}}</label></view></view></block><block wx:if="{{orderList.length===0&&page>1}}"><view class="noCart _div"><view class="pictrue _div"><image src="{{$VUE_APP_RESOURCES_URL+'/images/noOrder.png'}}" class="_img"></image></view></view></block><loading vue-id="2035e57b-1" loaded="{{loaded}}" loading="{{loading}}" bind:__l="__l"></loading></view>
<view data-ref="container" class="return-list _div vue-ref"><block wx:for="{{orderList}}" wx:for-item="order" wx:for-index="orderListIndex" wx:key="orderListIndex"><view class="goodWrapper _div"><block wx:if="{{order._status._type===-1}}"><view class="iconfont icon-tuikuanzhong powder _div"></view></block><block wx:if="{{order._status._type===-2}}"><view class="iconfont icon-yituikuan _div"></view></block><view class="orderNum _div">{{"订单号:"+order.orderId}}</view><block wx:for="{{order.cartInfo}}" wx:for-item="cart" wx:for-index="cartInfoIndex" wx:key="cartInfoIndex"><view data-event-opts="{{[['tap',[['goOrderDetails',['$0'],[[['orderList','',orderListIndex]]]]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}" data-event-opts="{{[['tap',[['goGoodsCon',['$0'],[[['orderList','',orderListIndex],['cartInfo','',cartInfoIndex]]]]]]]}}" catchtap="__e"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><block wx:else><view class="attr line1 _div">{{cart.productInfo.storeName}}</view></block><view class="money _div">{{"¥"+cart.productInfo.price}}</view></view></view></block><view class="totalSum _div">{{'共'+(order.cartInfo.length||0)+'件商品,总金额'}}<label class="font-color-red price _span">{{"¥"+order.payPrice}}</label></view></view></block><block wx:if="{{orderList.length===0&&page>1}}"><view class="noCart _div"><view class="pictrue _div"><image src="{{$VUE_APP_RESOURCES_URL+'/images/noOrder.png'}}" class="_img"></image></view></view></block><loading vue-id="2035e57b-1" loaded="{{loaded}}" loading="{{loading}}" bind:__l="__l"></loading></view>