@fonixtree/magic-design 2.0.116 → 2.0.118
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/composite-comp/dito/components/HeadNavigation/mobile/index.js +1 -1
- package/es/composite-comp/dito/components/SearchBar/mobile/index.js +3 -1
- package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.js +2 -1
- package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
- package/es/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js +11 -13
- package/es/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.less +6 -6
- package/es/composite-comp/monpay/components/MerchantSales/mobile/index.js +29 -21
- package/es/composite-comp/monpay/components/MerchantSales/mobile/index.less +2 -2
- package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js +4 -6
- package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +2 -2
- package/es/constants/index.js +1 -1
- package/es/utils/commonUtil.js +1 -1
- package/es/utils/coreUtil.js +4 -4
- package/lib/composite-comp/dito/components/HeadNavigation/mobile/index.js +1 -1
- package/lib/composite-comp/dito/components/SearchBar/mobile/index.js +3 -1
- package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.js +2 -1
- package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
- package/lib/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js +11 -13
- package/lib/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.less +6 -6
- package/lib/composite-comp/monpay/components/MerchantSales/mobile/index.js +29 -21
- package/lib/composite-comp/monpay/components/MerchantSales/mobile/index.less +2 -2
- package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js +4 -6
- package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +2 -2
- package/lib/constants/index.js +1 -1
- package/lib/utils/commonUtil.js +1 -1
- package/lib/utils/coreUtil.js +4 -4
- package/package.json +1 -1
|
@@ -361,7 +361,9 @@ function (_super) {
|
|
|
361
361
|
}, data.content && ((_b = data.content.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
362
362
|
className: "search-input-wrap",
|
|
363
363
|
onClick: function onClick() {
|
|
364
|
-
return (0, _coreUtil.clickUrl)('/search-page'
|
|
364
|
+
return (0, _coreUtil.clickUrl)('/search-page', {
|
|
365
|
+
searchValue: value
|
|
366
|
+
});
|
|
365
367
|
},
|
|
366
368
|
style: {
|
|
367
369
|
borderColor: (_d = (_c = data.content.box) === null || _c === void 0 ? void 0 : _c.color) === null || _d === void 0 ? void 0 : _d.mobile,
|
package/es/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js
RENAMED
|
@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
11
|
|
|
12
|
-
var _commonUtil = require("../../../../../../utils/commonUtil");
|
|
13
|
-
|
|
14
12
|
var _components = require("../../../../../../meta-comp/components");
|
|
15
13
|
|
|
16
14
|
var _common = require("../../../../../../common");
|
|
@@ -76,19 +74,19 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
|
76
74
|
return t;
|
|
77
75
|
};
|
|
78
76
|
|
|
79
|
-
var
|
|
77
|
+
var StoreItem =
|
|
80
78
|
/** @class */
|
|
81
79
|
function (_super) {
|
|
82
|
-
__extends(
|
|
80
|
+
__extends(StoreItem, _super);
|
|
83
81
|
|
|
84
|
-
function
|
|
82
|
+
function StoreItem() {
|
|
85
83
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
86
84
|
|
|
87
85
|
_this.state = {};
|
|
88
86
|
return _this;
|
|
89
87
|
}
|
|
90
88
|
|
|
91
|
-
|
|
89
|
+
StoreItem.prototype.render = function () {
|
|
92
90
|
var _a = this.props,
|
|
93
91
|
data = _a.data,
|
|
94
92
|
panelProps = _a.panelProps,
|
|
@@ -96,31 +94,31 @@ function (_super) {
|
|
|
96
94
|
rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
|
|
97
95
|
|
|
98
96
|
return /*#__PURE__*/_react["default"].createElement("div", _extends({
|
|
99
|
-
className: (0, _classnames["default"])('monpay-merchant-
|
|
97
|
+
className: (0, _classnames["default"])('monpay-merchant-store-item-wrap'),
|
|
100
98
|
onClick: function onClick() {
|
|
101
99
|
return onItemClick();
|
|
102
100
|
}
|
|
103
101
|
}, rest), /*#__PURE__*/_react["default"].createElement("div", {
|
|
104
102
|
className: "img-wrap"
|
|
105
103
|
}, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
|
|
106
|
-
className: "
|
|
104
|
+
className: "store-img",
|
|
107
105
|
lazy: true,
|
|
108
|
-
src:
|
|
106
|
+
src: data.storeLogoUrl
|
|
109
107
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
110
108
|
className: "sale-tag"
|
|
111
109
|
})), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
112
110
|
className: "prodName",
|
|
113
111
|
data: __assign(__assign({}, panelProps.merchantName), {
|
|
114
|
-
text: data.
|
|
112
|
+
text: data.storeName
|
|
115
113
|
})
|
|
116
114
|
}));
|
|
117
115
|
};
|
|
118
116
|
|
|
119
|
-
|
|
117
|
+
StoreItem.defaultProps = {
|
|
120
118
|
data: {}
|
|
121
119
|
};
|
|
122
|
-
return
|
|
120
|
+
return StoreItem;
|
|
123
121
|
}(_react["default"].Component);
|
|
124
122
|
|
|
125
|
-
var _default =
|
|
123
|
+
var _default = StoreItem;
|
|
126
124
|
exports["default"] = _default;
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
.monpay-merchant-
|
|
1
|
+
.monpay-merchant-store-item-wrap {
|
|
2
2
|
display: flex;
|
|
3
3
|
flex-direction: column;
|
|
4
|
-
width: 2.
|
|
4
|
+
width: 2.06rem;
|
|
5
5
|
margin-bottom: 0.32rem;
|
|
6
6
|
cursor: pointer;
|
|
7
7
|
position: relative;
|
|
8
8
|
}
|
|
9
|
-
.monpay-merchant-
|
|
9
|
+
.monpay-merchant-store-item-wrap .img-wrap {
|
|
10
10
|
position: relative;
|
|
11
11
|
}
|
|
12
|
-
.monpay-merchant-
|
|
12
|
+
.monpay-merchant-store-item-wrap .img-wrap .store-img {
|
|
13
13
|
width: 2.08rem;
|
|
14
14
|
height: 2.08rem;
|
|
15
15
|
border-radius: 0.16rem;
|
|
16
16
|
}
|
|
17
|
-
.monpay-merchant-
|
|
17
|
+
.monpay-merchant-store-item-wrap .img-wrap .sale-tag {
|
|
18
18
|
background: url('../img/sale.png') no-repeat center center;
|
|
19
19
|
background-size: 100%;
|
|
20
20
|
width: 1.1rem;
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
top: 0;
|
|
24
24
|
left: 0;
|
|
25
25
|
}
|
|
26
|
-
.monpay-merchant-
|
|
26
|
+
.monpay-merchant-store-item-wrap .prodName {
|
|
27
27
|
font-weight: 400;
|
|
28
28
|
font-size: 0.28rem;
|
|
29
29
|
color: #000;
|
|
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
require("./index.less");
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _StoreItem = _interopRequireDefault(require("./StoreItem"));
|
|
13
13
|
|
|
14
14
|
var _card = _interopRequireDefault(require("./img/card.png"));
|
|
15
15
|
|
|
@@ -193,20 +193,25 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
|
|
|
193
193
|
};
|
|
194
194
|
|
|
195
195
|
var defaultData = [{
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
offerName: 'Product Name'
|
|
196
|
+
storeId: 1,
|
|
197
|
+
storeLogoUrl: _card["default"],
|
|
198
|
+
storeName: 'Store Name'
|
|
200
199
|
}, {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
offerName: 'Product Name'
|
|
200
|
+
storeId: 2,
|
|
201
|
+
storeLogoUrl: _card["default"],
|
|
202
|
+
storeName: 'Store Name'
|
|
205
203
|
}, {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
204
|
+
storeId: 3,
|
|
205
|
+
storeLogoUrl: _card["default"],
|
|
206
|
+
storeName: 'Store Name'
|
|
207
|
+
}, {
|
|
208
|
+
storeId: 4,
|
|
209
|
+
storeLogoUrl: _card["default"],
|
|
210
|
+
storeName: 'Store Name'
|
|
211
|
+
}, {
|
|
212
|
+
storeId: 5,
|
|
213
|
+
storeLogoUrl: _card["default"],
|
|
214
|
+
storeName: 'Store Name'
|
|
210
215
|
}];
|
|
211
216
|
|
|
212
217
|
var MerchantSalesMobile =
|
|
@@ -226,8 +231,11 @@ function (_super) {
|
|
|
226
231
|
_this.getData = function () {
|
|
227
232
|
return __awaiter(_this, void 0, void 0, function () {
|
|
228
233
|
var res, list;
|
|
229
|
-
|
|
230
|
-
|
|
234
|
+
|
|
235
|
+
var _a;
|
|
236
|
+
|
|
237
|
+
return __generator(this, function (_b) {
|
|
238
|
+
switch (_b.label) {
|
|
231
239
|
case 0:
|
|
232
240
|
return [4
|
|
233
241
|
/*yield*/
|
|
@@ -240,8 +248,8 @@ function (_super) {
|
|
|
240
248
|
}, 'POST')];
|
|
241
249
|
|
|
242
250
|
case 1:
|
|
243
|
-
res =
|
|
244
|
-
list = res.
|
|
251
|
+
res = _b.sent();
|
|
252
|
+
list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
|
|
245
253
|
this.setState({
|
|
246
254
|
list: list
|
|
247
255
|
});
|
|
@@ -269,7 +277,7 @@ function (_super) {
|
|
|
269
277
|
var panelProps = this.props.panelProps;
|
|
270
278
|
var list = this.state.list;
|
|
271
279
|
|
|
272
|
-
var _list = list.length
|
|
280
|
+
var _list = list.length > 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
|
|
273
281
|
|
|
274
282
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
275
283
|
className: "monpay-merchant-sales-mobile"
|
|
@@ -279,11 +287,11 @@ function (_super) {
|
|
|
279
287
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
280
288
|
className: "merchant-sales-list"
|
|
281
289
|
}, _list.map(function (item) {
|
|
282
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
283
|
-
key: item.
|
|
290
|
+
return /*#__PURE__*/_react["default"].createElement(_StoreItem["default"], {
|
|
291
|
+
key: item.storeId,
|
|
284
292
|
data: item,
|
|
285
293
|
onItemClick: function onItemClick() {
|
|
286
|
-
(0, _coreUtil.clickUrl)(
|
|
294
|
+
(0, _coreUtil.clickUrl)('/main/discount');
|
|
287
295
|
},
|
|
288
296
|
panelProps: panelProps.content
|
|
289
297
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.monpay-merchant-sales-mobile {
|
|
2
|
-
padding: 0.
|
|
2
|
+
padding: 0.36rem;
|
|
3
3
|
}
|
|
4
4
|
.monpay-merchant-sales-mobile .headerImg {
|
|
5
5
|
display: block;
|
|
@@ -9,6 +9,6 @@
|
|
|
9
9
|
margin-top: 0.32rem;
|
|
10
10
|
display: flex;
|
|
11
11
|
align-items: center;
|
|
12
|
-
|
|
12
|
+
gap: 0.24rem;
|
|
13
13
|
flex-wrap: wrap;
|
|
14
14
|
}
|
|
@@ -105,26 +105,24 @@ function SearchCondition(props) {
|
|
|
105
105
|
};
|
|
106
106
|
|
|
107
107
|
var hideBottomBar = function hideBottomBar() {
|
|
108
|
-
var homeNavBar = document.querySelector('
|
|
108
|
+
var homeNavBar = document.querySelector('#bottom-menu');
|
|
109
109
|
if (homeNavBar) homeNavBar.style.visibility = 'hidden';
|
|
110
|
-
var toTop = document.querySelector('
|
|
110
|
+
var toTop = document.querySelector('#homeToTop');
|
|
111
111
|
if (toTop) toTop.style.visibility = 'hidden';
|
|
112
112
|
};
|
|
113
113
|
|
|
114
114
|
var showBottomBar = function showBottomBar() {
|
|
115
|
-
var homeNavBar = document.querySelector('
|
|
115
|
+
var homeNavBar = document.querySelector('#bottom-menu');
|
|
116
116
|
if (homeNavBar) homeNavBar.style.visibility = 'visible';
|
|
117
|
-
var toTop = document.querySelector('
|
|
117
|
+
var toTop = document.querySelector('#homeToTop');
|
|
118
118
|
if (toTop) toTop.style.visibility = 'visible';
|
|
119
119
|
};
|
|
120
120
|
|
|
121
121
|
(0, _react.useEffect)(function () {
|
|
122
122
|
if (visible) {
|
|
123
123
|
hideBottomBar();
|
|
124
|
-
console.log('hide');
|
|
125
124
|
} else {
|
|
126
125
|
showBottomBar();
|
|
127
|
-
console.log('show');
|
|
128
126
|
}
|
|
129
127
|
}, [visible]);
|
|
130
128
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -754,7 +754,7 @@ function (_super) {
|
|
|
754
754
|
}, 140);
|
|
755
755
|
if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
|
|
756
756
|
if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
|
|
757
|
-
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
757
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
758
758
|
className: "monpay-recommend-mobile recommend_" + panelProps.id
|
|
759
759
|
}, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
760
760
|
className: "headerImg",
|
|
@@ -855,7 +855,7 @@ function (_super) {
|
|
|
855
855
|
})), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
856
856
|
className: "btnSeeAll",
|
|
857
857
|
data: _seeAll
|
|
858
|
-
})));
|
|
858
|
+
}))));
|
|
859
859
|
};
|
|
860
860
|
|
|
861
861
|
RecommendMobile.defaultProps = {
|
package/es/constants/index.js
CHANGED
package/es/utils/commonUtil.js
CHANGED
package/es/utils/coreUtil.js
CHANGED
|
@@ -302,14 +302,14 @@ function isUrl(string) {
|
|
|
302
302
|
}
|
|
303
303
|
}
|
|
304
304
|
|
|
305
|
-
var clickUrl = function clickUrl(url) {
|
|
305
|
+
var clickUrl = function clickUrl(url, state) {
|
|
306
306
|
var _a;
|
|
307
307
|
|
|
308
308
|
if (url === void 0) {
|
|
309
309
|
url = '';
|
|
310
310
|
}
|
|
311
311
|
|
|
312
|
-
console.log('clickUrl...', url); // 只读模式,设计模式,url为空,邮箱模版
|
|
312
|
+
console.log('clickUrl...', url, state); // 只读模式,设计模式,url为空,邮箱模版
|
|
313
313
|
// if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
|
|
314
314
|
// return;
|
|
315
315
|
// }
|
|
@@ -394,10 +394,10 @@ var clickUrl = function clickUrl(url) {
|
|
|
394
394
|
window.open(link);
|
|
395
395
|
}
|
|
396
396
|
} else {
|
|
397
|
-
(0, _commonUtil.navigateTo)(link);
|
|
397
|
+
(0, _commonUtil.navigateTo)(link, state);
|
|
398
398
|
}
|
|
399
399
|
} else {
|
|
400
|
-
(0, _commonUtil.navigateTo)(link);
|
|
400
|
+
(0, _commonUtil.navigateTo)(link, state);
|
|
401
401
|
}
|
|
402
402
|
}
|
|
403
403
|
};
|
|
@@ -361,7 +361,9 @@ function (_super) {
|
|
|
361
361
|
}, data.content && ((_b = data.content.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
362
362
|
className: "search-input-wrap",
|
|
363
363
|
onClick: function onClick() {
|
|
364
|
-
return (0, _coreUtil.clickUrl)('/search-page'
|
|
364
|
+
return (0, _coreUtil.clickUrl)('/search-page', {
|
|
365
|
+
searchValue: value
|
|
366
|
+
});
|
|
365
367
|
},
|
|
366
368
|
style: {
|
|
367
369
|
borderColor: (_d = (_c = data.content.box) === null || _c === void 0 ? void 0 : _c.color) === null || _d === void 0 ? void 0 : _d.mobile,
|
package/lib/composite-comp/monpay/components/MerchantSales/mobile/{ProductItem → StoreItem}/index.js
RENAMED
|
@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
11
|
|
|
12
|
-
var _commonUtil = require("../../../../../../utils/commonUtil");
|
|
13
|
-
|
|
14
12
|
var _components = require("../../../../../../meta-comp/components");
|
|
15
13
|
|
|
16
14
|
var _common = require("../../../../../../common");
|
|
@@ -76,19 +74,19 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
|
76
74
|
return t;
|
|
77
75
|
};
|
|
78
76
|
|
|
79
|
-
var
|
|
77
|
+
var StoreItem =
|
|
80
78
|
/** @class */
|
|
81
79
|
function (_super) {
|
|
82
|
-
__extends(
|
|
80
|
+
__extends(StoreItem, _super);
|
|
83
81
|
|
|
84
|
-
function
|
|
82
|
+
function StoreItem() {
|
|
85
83
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
86
84
|
|
|
87
85
|
_this.state = {};
|
|
88
86
|
return _this;
|
|
89
87
|
}
|
|
90
88
|
|
|
91
|
-
|
|
89
|
+
StoreItem.prototype.render = function () {
|
|
92
90
|
var _a = this.props,
|
|
93
91
|
data = _a.data,
|
|
94
92
|
panelProps = _a.panelProps,
|
|
@@ -96,31 +94,31 @@ function (_super) {
|
|
|
96
94
|
rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
|
|
97
95
|
|
|
98
96
|
return /*#__PURE__*/_react["default"].createElement("div", _extends({
|
|
99
|
-
className: (0, _classnames["default"])('monpay-merchant-
|
|
97
|
+
className: (0, _classnames["default"])('monpay-merchant-store-item-wrap'),
|
|
100
98
|
onClick: function onClick() {
|
|
101
99
|
return onItemClick();
|
|
102
100
|
}
|
|
103
101
|
}, rest), /*#__PURE__*/_react["default"].createElement("div", {
|
|
104
102
|
className: "img-wrap"
|
|
105
103
|
}, /*#__PURE__*/_react["default"].createElement(_common.NewImg, {
|
|
106
|
-
className: "
|
|
104
|
+
className: "store-img",
|
|
107
105
|
lazy: true,
|
|
108
|
-
src:
|
|
106
|
+
src: data.storeLogoUrl
|
|
109
107
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
110
108
|
className: "sale-tag"
|
|
111
109
|
})), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
112
110
|
className: "prodName",
|
|
113
111
|
data: __assign(__assign({}, panelProps.merchantName), {
|
|
114
|
-
text: data.
|
|
112
|
+
text: data.storeName
|
|
115
113
|
})
|
|
116
114
|
}));
|
|
117
115
|
};
|
|
118
116
|
|
|
119
|
-
|
|
117
|
+
StoreItem.defaultProps = {
|
|
120
118
|
data: {}
|
|
121
119
|
};
|
|
122
|
-
return
|
|
120
|
+
return StoreItem;
|
|
123
121
|
}(_react["default"].Component);
|
|
124
122
|
|
|
125
|
-
var _default =
|
|
123
|
+
var _default = StoreItem;
|
|
126
124
|
exports["default"] = _default;
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
.monpay-merchant-
|
|
1
|
+
.monpay-merchant-store-item-wrap {
|
|
2
2
|
display: flex;
|
|
3
3
|
flex-direction: column;
|
|
4
|
-
width: 2.
|
|
4
|
+
width: 2.06rem;
|
|
5
5
|
margin-bottom: 0.32rem;
|
|
6
6
|
cursor: pointer;
|
|
7
7
|
position: relative;
|
|
8
8
|
}
|
|
9
|
-
.monpay-merchant-
|
|
9
|
+
.monpay-merchant-store-item-wrap .img-wrap {
|
|
10
10
|
position: relative;
|
|
11
11
|
}
|
|
12
|
-
.monpay-merchant-
|
|
12
|
+
.monpay-merchant-store-item-wrap .img-wrap .store-img {
|
|
13
13
|
width: 2.08rem;
|
|
14
14
|
height: 2.08rem;
|
|
15
15
|
border-radius: 0.16rem;
|
|
16
16
|
}
|
|
17
|
-
.monpay-merchant-
|
|
17
|
+
.monpay-merchant-store-item-wrap .img-wrap .sale-tag {
|
|
18
18
|
background: url('../img/sale.png') no-repeat center center;
|
|
19
19
|
background-size: 100%;
|
|
20
20
|
width: 1.1rem;
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
top: 0;
|
|
24
24
|
left: 0;
|
|
25
25
|
}
|
|
26
|
-
.monpay-merchant-
|
|
26
|
+
.monpay-merchant-store-item-wrap .prodName {
|
|
27
27
|
font-weight: 400;
|
|
28
28
|
font-size: 0.28rem;
|
|
29
29
|
color: #000;
|
|
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
require("./index.less");
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _StoreItem = _interopRequireDefault(require("./StoreItem"));
|
|
13
13
|
|
|
14
14
|
var _card = _interopRequireDefault(require("./img/card.png"));
|
|
15
15
|
|
|
@@ -193,20 +193,25 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
|
|
|
193
193
|
};
|
|
194
194
|
|
|
195
195
|
var defaultData = [{
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
offerName: 'Product Name'
|
|
196
|
+
storeId: 1,
|
|
197
|
+
storeLogoUrl: _card["default"],
|
|
198
|
+
storeName: 'Store Name'
|
|
200
199
|
}, {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
offerName: 'Product Name'
|
|
200
|
+
storeId: 2,
|
|
201
|
+
storeLogoUrl: _card["default"],
|
|
202
|
+
storeName: 'Store Name'
|
|
205
203
|
}, {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
204
|
+
storeId: 3,
|
|
205
|
+
storeLogoUrl: _card["default"],
|
|
206
|
+
storeName: 'Store Name'
|
|
207
|
+
}, {
|
|
208
|
+
storeId: 4,
|
|
209
|
+
storeLogoUrl: _card["default"],
|
|
210
|
+
storeName: 'Store Name'
|
|
211
|
+
}, {
|
|
212
|
+
storeId: 5,
|
|
213
|
+
storeLogoUrl: _card["default"],
|
|
214
|
+
storeName: 'Store Name'
|
|
210
215
|
}];
|
|
211
216
|
|
|
212
217
|
var MerchantSalesMobile =
|
|
@@ -226,8 +231,11 @@ function (_super) {
|
|
|
226
231
|
_this.getData = function () {
|
|
227
232
|
return __awaiter(_this, void 0, void 0, function () {
|
|
228
233
|
var res, list;
|
|
229
|
-
|
|
230
|
-
|
|
234
|
+
|
|
235
|
+
var _a;
|
|
236
|
+
|
|
237
|
+
return __generator(this, function (_b) {
|
|
238
|
+
switch (_b.label) {
|
|
231
239
|
case 0:
|
|
232
240
|
return [4
|
|
233
241
|
/*yield*/
|
|
@@ -240,8 +248,8 @@ function (_super) {
|
|
|
240
248
|
}, 'POST')];
|
|
241
249
|
|
|
242
250
|
case 1:
|
|
243
|
-
res =
|
|
244
|
-
list = res.
|
|
251
|
+
res = _b.sent();
|
|
252
|
+
list = ((_a = res.storePage) === null || _a === void 0 ? void 0 : _a.list) || [];
|
|
245
253
|
this.setState({
|
|
246
254
|
list: list
|
|
247
255
|
});
|
|
@@ -269,7 +277,7 @@ function (_super) {
|
|
|
269
277
|
var panelProps = this.props.panelProps;
|
|
270
278
|
var list = this.state.list;
|
|
271
279
|
|
|
272
|
-
var _list = list.length
|
|
280
|
+
var _list = list.length > 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
|
|
273
281
|
|
|
274
282
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
275
283
|
className: "monpay-merchant-sales-mobile"
|
|
@@ -279,11 +287,11 @@ function (_super) {
|
|
|
279
287
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
280
288
|
className: "merchant-sales-list"
|
|
281
289
|
}, _list.map(function (item) {
|
|
282
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
283
|
-
key: item.
|
|
290
|
+
return /*#__PURE__*/_react["default"].createElement(_StoreItem["default"], {
|
|
291
|
+
key: item.storeId,
|
|
284
292
|
data: item,
|
|
285
293
|
onItemClick: function onItemClick() {
|
|
286
|
-
(0, _coreUtil.clickUrl)(
|
|
294
|
+
(0, _coreUtil.clickUrl)('/main/discount');
|
|
287
295
|
},
|
|
288
296
|
panelProps: panelProps.content
|
|
289
297
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.monpay-merchant-sales-mobile {
|
|
2
|
-
padding: 0.
|
|
2
|
+
padding: 0.36rem;
|
|
3
3
|
}
|
|
4
4
|
.monpay-merchant-sales-mobile .headerImg {
|
|
5
5
|
display: block;
|
|
@@ -9,6 +9,6 @@
|
|
|
9
9
|
margin-top: 0.32rem;
|
|
10
10
|
display: flex;
|
|
11
11
|
align-items: center;
|
|
12
|
-
|
|
12
|
+
gap: 0.24rem;
|
|
13
13
|
flex-wrap: wrap;
|
|
14
14
|
}
|
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js
CHANGED
|
@@ -105,26 +105,24 @@ function SearchCondition(props) {
|
|
|
105
105
|
};
|
|
106
106
|
|
|
107
107
|
var hideBottomBar = function hideBottomBar() {
|
|
108
|
-
var homeNavBar = document.querySelector('
|
|
108
|
+
var homeNavBar = document.querySelector('#bottom-menu');
|
|
109
109
|
if (homeNavBar) homeNavBar.style.visibility = 'hidden';
|
|
110
|
-
var toTop = document.querySelector('
|
|
110
|
+
var toTop = document.querySelector('#homeToTop');
|
|
111
111
|
if (toTop) toTop.style.visibility = 'hidden';
|
|
112
112
|
};
|
|
113
113
|
|
|
114
114
|
var showBottomBar = function showBottomBar() {
|
|
115
|
-
var homeNavBar = document.querySelector('
|
|
115
|
+
var homeNavBar = document.querySelector('#bottom-menu');
|
|
116
116
|
if (homeNavBar) homeNavBar.style.visibility = 'visible';
|
|
117
|
-
var toTop = document.querySelector('
|
|
117
|
+
var toTop = document.querySelector('#homeToTop');
|
|
118
118
|
if (toTop) toTop.style.visibility = 'visible';
|
|
119
119
|
};
|
|
120
120
|
|
|
121
121
|
(0, _react.useEffect)(function () {
|
|
122
122
|
if (visible) {
|
|
123
123
|
hideBottomBar();
|
|
124
|
-
console.log('hide');
|
|
125
124
|
} else {
|
|
126
125
|
showBottomBar();
|
|
127
|
-
console.log('show');
|
|
128
126
|
}
|
|
129
127
|
}, [visible]);
|
|
130
128
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -754,7 +754,7 @@ function (_super) {
|
|
|
754
754
|
}, 140);
|
|
755
755
|
if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
|
|
756
756
|
if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
|
|
757
|
-
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
757
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
758
758
|
className: "monpay-recommend-mobile recommend_" + panelProps.id
|
|
759
759
|
}, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
760
760
|
className: "headerImg",
|
|
@@ -855,7 +855,7 @@ function (_super) {
|
|
|
855
855
|
})), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
856
856
|
className: "btnSeeAll",
|
|
857
857
|
data: _seeAll
|
|
858
|
-
})));
|
|
858
|
+
}))));
|
|
859
859
|
};
|
|
860
860
|
|
|
861
861
|
RecommendMobile.defaultProps = {
|
package/lib/constants/index.js
CHANGED
package/lib/utils/commonUtil.js
CHANGED
package/lib/utils/coreUtil.js
CHANGED
|
@@ -302,14 +302,14 @@ function isUrl(string) {
|
|
|
302
302
|
}
|
|
303
303
|
}
|
|
304
304
|
|
|
305
|
-
var clickUrl = function clickUrl(url) {
|
|
305
|
+
var clickUrl = function clickUrl(url, state) {
|
|
306
306
|
var _a;
|
|
307
307
|
|
|
308
308
|
if (url === void 0) {
|
|
309
309
|
url = '';
|
|
310
310
|
}
|
|
311
311
|
|
|
312
|
-
console.log('clickUrl...', url); // 只读模式,设计模式,url为空,邮箱模版
|
|
312
|
+
console.log('clickUrl...', url, state); // 只读模式,设计模式,url为空,邮箱模版
|
|
313
313
|
// if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
|
|
314
314
|
// return;
|
|
315
315
|
// }
|
|
@@ -394,10 +394,10 @@ var clickUrl = function clickUrl(url) {
|
|
|
394
394
|
window.open(link);
|
|
395
395
|
}
|
|
396
396
|
} else {
|
|
397
|
-
(0, _commonUtil.navigateTo)(link);
|
|
397
|
+
(0, _commonUtil.navigateTo)(link, state);
|
|
398
398
|
}
|
|
399
399
|
} else {
|
|
400
|
-
(0, _commonUtil.navigateTo)(link);
|
|
400
|
+
(0, _commonUtil.navigateTo)(link, state);
|
|
401
401
|
}
|
|
402
402
|
}
|
|
403
403
|
};
|