diff --git a/public/pages/admin/couponDetailManage/couponDetailManage.html b/public/pages/admin/couponDetailManage/couponDetailManage.html index 83d879d83..8115eeffe 100644 --- a/public/pages/admin/couponDetailManage/couponDetailManage.html +++ b/public/pages/admin/couponDetailManage/couponDetailManage.html @@ -1,116 +1,99 @@
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
- -
-
-
- -
+ +
+
+
+ + + +
+
+
+
+
+
+
- - +
+
+
+ +
+
+
+
+ +
-
-
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
{{couponDetail.detailId}}{{couponDetail.shopName}}{{couponDetail.couponName}}{{couponDetail.actualPrice}}{{couponDetail.buyPrice}}{{couponDetail.amount}}{{couponDetail.buyCount}}{{couponDetail.validityDay}}
-
    -
    - - -
    +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    {{couponDetail.detailId}}{{couponDetail.shopName}}{{couponDetail.couponName}}{{couponDetail.actualPrice}}{{couponDetail.buyPrice}}{{couponDetail.amount}}{{couponDetail.buyCount}}{{couponDetail.validityDay}}
    + + +
    +
    @@ -119,4 +102,4 @@ -
    +
    \ No newline at end of file diff --git a/public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.html b/public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.html similarity index 78% rename from public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.html rename to public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.html index e22afb458..60dc675c3 100644 --- a/public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.html +++ b/public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.html @@ -2,7 +2,7 @@
    - +
    @@ -11,29 +11,29 @@
    - +
    - + + + +
    - +
    @@ -44,7 +44,7 @@
    - +
    @@ -53,33 +53,33 @@ - + - + - + - + - + - + - + - + - + {{order.cartId}} {{order.prodName}} {{order.specValue}} diff --git a/public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.js b/public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.js similarity index 69% rename from public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.js rename to public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.js index 7d36e8d10..3c75574a5 100644 --- a/public/pages/admin/storeOrderCartReturnManage/storeOrderCartReturnManage.js +++ b/public/pages/admin/storeOrderCartReturn/storeOrderCartReturn.js @@ -4,7 +4,7 @@ var DEFAULT_ROWS = 10; vc.extends({ data: { - storeOrderCartReturnManageInfo: { + storeOrderCartReturnInfo: { orderCarts: [], total: 0, records: 1, @@ -12,7 +12,8 @@ conditions: { cartId: '', state: '', - prodName: '' + prodName: '', + mallApiCode:'queryStoreOrderCartReturnBmoImpl' }, curOrderCart: {} } @@ -21,10 +22,10 @@ $that._listOrders(DEFAULT_PAGE, DEFAULT_ROWS); }, _initEvent: function() { - vc.on('storeOrderCartReturnManage', 'goBack', function(_param) { - $that.storeOrderCartReturnManageInfo.orderDetail = false; + vc.on('storeOrderCartReturn', 'goBack', function(_param) { + $that.storeOrderCartReturnInfo.orderDetail = false; }); - vc.on('storeOrderCartReturnManage', 'list', function() { + vc.on('storeOrderCartReturn', 'list', function() { $that._listOrders(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('pagination', 'page_event', function(_currentPage) { @@ -33,21 +34,21 @@ }, methods: { _listOrders: function(_page, _rows) { - $that.storeOrderCartReturnManageInfo.conditions.page = _page; - $that.storeOrderCartReturnManageInfo.conditions.row = _rows; + $that.storeOrderCartReturnInfo.conditions.page = _page; + $that.storeOrderCartReturnInfo.conditions.row = _rows; let param = { - params: $that.storeOrderCartReturnManageInfo.conditions + params: $that.storeOrderCartReturnInfo.conditions }; //发送get请求 - vc.http.apiGet('/storeOrderCartReturn/queryStoreOrderCartReturn', + vc.http.apiGet('/mall.getAdminMallOpenApi', param, function(json, res) { let _json = JSON.parse(json); - $that.storeOrderCartReturnManageInfo.total = _json.total; - $that.storeOrderCartReturnManageInfo.records = _json.records; - $that.storeOrderCartReturnManageInfo.orderCarts = _json.data; + $that.storeOrderCartReturnInfo.total = _json.total; + $that.storeOrderCartReturnInfo.records = _json.records; + $that.storeOrderCartReturnInfo.orderCarts = _json.data; - let _orderCarts = $that.storeOrderCartReturnManageInfo.orderCarts; + let _orderCarts = $that.storeOrderCartReturnInfo.orderCarts; _orderCarts.forEach(item => { let _productSpecDetails = item.productSpecDetails; @@ -60,8 +61,8 @@ }); vc.emit('pagination', 'init', { - total: $that.storeOrderCartReturnManageInfo.records, - dataCount: $that.storeOrderCartReturnManageInfo.total, + total: $that.storeOrderCartReturnInfo.records, + dataCount: $that.storeOrderCartReturnInfo.total, currentPage: _page }); },