@fonixtree/magic-design 2.0.200 → 2.0.203

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.
Files changed (399) hide show
  1. package/es/assets/fonts/AvenirNext-Bold.ttf +0 -0
  2. package/es/assets/fonts/AvenirNext-DemiBold.ttf +0 -0
  3. package/es/assets/fonts/AvenirNext-Medium.ttf +0 -0
  4. package/es/assets/fonts/AvenirNext-Regular.ttf +0 -0
  5. package/es/assets/fonts/Montserrat-Bold.ttf +0 -0
  6. package/es/assets/fonts/Montserrat-Medium.ttf +0 -0
  7. package/es/assets/fonts/Montserrat-Regular.ttf +0 -0
  8. package/es/assets/fonts/Montserrat-SemiBold.ttf +0 -0
  9. package/es/assets/fonts/magic-box-iconfont.css +38 -6
  10. package/es/assets/fonts/magic-box-iconfont.js +1 -1
  11. package/es/assets/fonts/magic-box-iconfont.ttf +0 -0
  12. package/es/assets/fonts/magic-box-iconfont.woff +0 -0
  13. package/es/assets/fonts/magic-box-iconfont.woff2 +0 -0
  14. package/es/assets/images/base64/index.js +8 -2
  15. package/es/assets/images/layout-icon/banner-slide-layout3.png +0 -0
  16. package/es/assets/images/layout-icon/grouped-carousel-layout1.png +0 -0
  17. package/es/assets/images/layout-icon/news-layout1.png +0 -0
  18. package/es/assets/images/layout-icon/search-dito-layout1.png +0 -0
  19. package/es/assets/images/layout-icon/slide-image-layout1.png +0 -0
  20. package/es/assets/less/font.less +30 -0
  21. package/es/assets/less/global.less +5 -0
  22. package/es/common/ColorPickerInput/index.less +2 -0
  23. package/es/common/CountDown/index.js +29 -2
  24. package/es/common/CountDown/index.less +38 -5
  25. package/es/common/ErrorBoundary/index.js +90 -0
  26. package/es/common/FontStyles/index.less +1 -1
  27. package/es/common/LinkModal/ProductList/index.js +484 -0
  28. package/es/common/LinkModal/ProductList/index.less +130 -0
  29. package/es/common/LinkModal/index.js +8 -1
  30. package/es/common/ProductCardModal/imgs/dot-icon.png +0 -0
  31. package/es/common/ProductCardModal/index.js +255 -0
  32. package/es/common/ProductCardModal/index.less +131 -0
  33. package/es/common/Toast/index.js +30 -0
  34. package/es/common/Toast/index.less +29 -0
  35. package/es/common/UrlPicker/index.js +1 -1
  36. package/es/common/Video/index.js +5 -3
  37. package/es/common/VideoPC/background.png +0 -0
  38. package/es/common/VideoPC/closeImg.png +0 -0
  39. package/es/common/VideoPC/components/index.js +100 -0
  40. package/es/common/VideoPC/components/index.less +62 -0
  41. package/es/common/VideoPC/cover.png +0 -0
  42. package/es/common/VideoPC/index.js +750 -0
  43. package/es/common/VideoPC/index.less +79 -0
  44. package/es/common/index.js +32 -0
  45. package/es/composite-comp/common/components/ImageLabel/index.js +2 -2
  46. package/es/composite-comp/common/components/ImageLabel/index.less +23 -7
  47. package/es/composite-comp/common/components/ProductItem/index.js +41 -24
  48. package/es/composite-comp/common/components/ProductItem/index.less +17 -15
  49. package/es/composite-comp/common/config-panels/BackgroundConfig/index.js +16 -12
  50. package/es/composite-comp/common/config-panels/SpacingConfig/index.js +30 -0
  51. package/es/composite-comp/dito/components/Bargain/defaultJSON.js +24 -0
  52. package/es/composite-comp/dito/components/CommonFunctions/defaultJSON.js +1 -1
  53. package/es/composite-comp/dito/components/CommonFunctions/mobile/index.js +8 -0
  54. package/es/composite-comp/dito/components/CommonFunctions/mobile/index.less +3 -0
  55. package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +49 -11
  56. package/es/composite-comp/dito/components/FlashDeal/mobile/index.js +15 -14
  57. package/es/composite-comp/dito/components/FlashDeal/mobile/index.less +9 -1
  58. package/es/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.js +197 -0
  59. package/es/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.less +100 -0
  60. package/es/composite-comp/dito/components/FlashDeal/pc/index.js +18 -22
  61. package/es/composite-comp/dito/components/FlashDeal/pc/index.less +19 -30
  62. package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js +24 -0
  63. package/es/composite-comp/dito/components/GroupBuy/mobile/index.js +8 -5
  64. package/es/composite-comp/dito/components/GroupBuy/mobile/index.less +5 -2
  65. package/es/composite-comp/dito/components/GroupedCarousel/defaultJSON.js +312 -0
  66. package/es/composite-comp/dito/components/GroupedCarousel/index.js +86 -0
  67. package/es/composite-comp/dito/components/GroupedCarousel/pc/index.js +189 -0
  68. package/es/composite-comp/dito/components/GroupedCarousel/pc/index.less +65 -0
  69. package/es/composite-comp/dito/components/News/defaultJSON.js +172 -0
  70. package/{lib/composite-comp/dito/components/Orders → es/composite-comp/dito/components/News}/index.js +13 -13
  71. package/es/composite-comp/dito/components/News/pc/index.js +113 -0
  72. package/es/composite-comp/dito/components/News/pc/index.less +46 -0
  73. package/es/composite-comp/dito/components/Orders/defaultJSON.js +1 -1
  74. package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js +75 -2
  75. package/es/composite-comp/dito/components/PersonalInformation/mobile/images/avatar.png +0 -0
  76. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js +159 -21
  77. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less +108 -9
  78. package/es/composite-comp/dito/components/Recommend/defaultJSON.js +55 -1
  79. package/es/composite-comp/dito/components/Recommend/mobile/imgs/card.png +0 -0
  80. package/es/composite-comp/dito/components/Recommend/mobile/index.js +177 -20
  81. package/es/composite-comp/dito/components/Recommend/mobile/index.less +24 -1
  82. package/es/composite-comp/dito/components/SearchBanner/defaultJSON.js +234 -0
  83. package/es/composite-comp/dito/components/SearchBanner/imgs/defaultImg.png +0 -0
  84. package/es/composite-comp/dito/components/SearchBanner/imgs/pcDefImg1.png +0 -0
  85. package/es/composite-comp/dito/components/SearchBanner/index.js +108 -0
  86. package/es/composite-comp/dito/components/SearchBanner/mobile/index.js +293 -0
  87. package/es/composite-comp/dito/components/SearchBanner/mobile/index.less +108 -0
  88. package/es/composite-comp/dito/components/SearchDITO/defaultJSON.js +221 -0
  89. package/es/composite-comp/dito/components/SearchDITO/index.js +86 -0
  90. package/es/composite-comp/dito/components/SearchDITO/pc/components/ConfirmModal/index.less +69 -0
  91. package/es/composite-comp/dito/components/SearchDITO/pc/components/Header/index.js +602 -0
  92. package/es/composite-comp/dito/components/SearchDITO/pc/components/Header/index.less +184 -0
  93. package/es/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js +153 -0
  94. package/es/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.less +25 -0
  95. package/es/composite-comp/dito/components/SearchDITO/pc/imgs/avatar.png +0 -0
  96. package/es/composite-comp/dito/components/SearchDITO/pc/index.js +176 -0
  97. package/es/composite-comp/dito/components/SearchDITO/pc/index.less +57 -0
  98. package/es/composite-comp/dito/components/SignBoard/mobile/index.js +1 -1
  99. package/es/composite-comp/dito/components/SlideImage/defaultJSON.js +138 -0
  100. package/es/composite-comp/dito/components/SlideImage/index.js +86 -0
  101. package/es/composite-comp/dito/components/SlideImage/pc/components/CardItem/index.js +105 -0
  102. package/es/composite-comp/dito/components/SlideImage/pc/components/CardItem/index.less +5 -0
  103. package/es/composite-comp/dito/components/SlideImage/pc/components/ParallaxScroll/index.js +170 -0
  104. package/es/composite-comp/dito/components/SlideImage/pc/components/ParallaxScroll/index.less +23 -0
  105. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/imgs/cursor.png +0 -0
  106. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/imgs/d.png +0 -0
  107. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.js +176 -0
  108. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less +61 -0
  109. package/es/composite-comp/dito/components/SlideImage/pc/index.js +76 -0
  110. package/es/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js +7 -0
  111. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +7 -0
  112. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +7 -20
  113. package/es/composite-comp/dito/config-panels/FlashDealConfig/index.js +15 -1
  114. package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +7 -0
  115. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigGroup/index.js +149 -0
  116. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigGroup/index.less +16 -0
  117. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigTitle/index.js +93 -0
  118. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigTitle/index.less +0 -0
  119. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/imgs/defaultImg.png +0 -0
  120. package/es/composite-comp/dito/config-panels/GroupedCarouselConfig/index.js +114 -0
  121. package/es/composite-comp/dito/config-panels/NewsConfig/ConfigGroup/index.js +148 -0
  122. package/es/composite-comp/dito/config-panels/NewsConfig/ConfigGroup/index.less +16 -0
  123. package/es/composite-comp/dito/config-panels/NewsConfig/ConfigTitle/index.js +101 -0
  124. package/es/composite-comp/dito/config-panels/NewsConfig/ConfigTitle/index.less +0 -0
  125. package/es/composite-comp/dito/config-panels/NewsConfig/imgs/defaultImg.png +0 -0
  126. package/{lib/composite-comp/dito/config-panels/OrdersConfig → es/composite-comp/dito/config-panels/NewsConfig}/index.js +40 -40
  127. package/es/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigDecoration/index.js +91 -0
  128. package/es/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigDecoration/index.less +9 -0
  129. package/es/composite-comp/dito/config-panels/{OrdersConfig/ConfigGroup → PersonalInformationConfig/OrdersConfigGroup}/index.js +2 -2
  130. package/es/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +23 -5
  131. package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +17 -1
  132. package/es/composite-comp/dito/config-panels/RecommendConfig/index.js +10 -3
  133. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +197 -0
  134. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.less +7 -0
  135. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigImageGroup/index.js +148 -0
  136. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigImageGroup/index.less +0 -0
  137. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigSetting/index.js +226 -0
  138. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigSetting/index.less +9 -0
  139. package/es/composite-comp/dito/config-panels/SearchBannerConfig/imgs/defaultImg.png +0 -0
  140. package/es/composite-comp/dito/config-panels/SearchBannerConfig/index.js +65 -0
  141. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigContent/index.js +165 -0
  142. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigContent/index.less +7 -0
  143. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigImageGroup/index.js +179 -0
  144. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigImageGroup/index.less +0 -0
  145. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigSetting/index.js +181 -0
  146. package/es/composite-comp/dito/config-panels/SearchDITOConfig/ConfigSetting/index.less +9 -0
  147. package/es/composite-comp/dito/config-panels/SearchDITOConfig/imgs/defaultImg.png +0 -0
  148. package/es/composite-comp/dito/config-panels/SearchDITOConfig/index.js +69 -0
  149. package/es/composite-comp/dito/config-panels/SlideImageConfig/ConfigGroup/index.js +150 -0
  150. package/es/composite-comp/dito/config-panels/SlideImageConfig/ConfigGroup/index.less +16 -0
  151. package/es/composite-comp/dito/config-panels/SlideImageConfig/imgs/defaultImg.png +0 -0
  152. package/es/composite-comp/dito/config-panels/SlideImageConfig/index.js +134 -0
  153. package/es/composite-comp/dito/second-config-panels/GroupedCarouselSecondConfig/index.js +196 -0
  154. package/es/composite-comp/dito/second-config-panels/NewsSecondConfig/index.js +133 -0
  155. package/es/composite-comp/dito/second-config-panels/NewsSecondConfig/index.less +8 -0
  156. package/es/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +64 -1
  157. package/es/composite-comp/dito/second-config-panels/SearchBannerSecondConfig/index.js +98 -0
  158. package/es/composite-comp/dito/second-config-panels/SearchDITOSecondConfig/index.js +366 -0
  159. package/es/composite-comp/dito/second-config-panels/SearchDITOSecondConfig/index.less +79 -0
  160. package/es/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.js +243 -0
  161. package/es/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less +71 -0
  162. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +4 -3
  163. package/es/composite-comp/nuri/components/AffiliateRecommend/mobile/index.js +1 -1
  164. package/es/composite-comp/nuri/components/AffiliateRecommend/mobile/index.less +15 -15
  165. package/es/composite-comp/public/components/Stores/mobile/index.less +3 -0
  166. package/es/constants/component-types.js +33 -9
  167. package/es/constants/index.js +44 -20
  168. package/es/constants/layout.js +46 -2
  169. package/es/core/Designer/ConfigPanel/index.js +18 -1
  170. package/es/core/Designer/index.js +2 -2
  171. package/es/core/Renderer/index.js +37 -2
  172. package/es/decorator/compositeDecorator.js +14 -4
  173. package/es/decorator/metaDecorator.js +1 -2
  174. package/es/locale/ar/ar.json +18 -1
  175. package/es/locale/en/en.json +18 -1
  176. package/es/locale/es/es.json +18 -1
  177. package/es/locale/mn/mn.json +4 -0
  178. package/es/meta-comp/components/Button/editable.js +3 -1
  179. package/es/meta-comp/components/Button/index.js +13 -4
  180. package/es/meta-comp/components/Button/index.less +8 -1
  181. package/es/meta-comp/components/Image/index.js +7 -2
  182. package/es/meta-comp/components/Image/index.less +7 -0
  183. package/es/meta-comp/components/Text/index.js +6 -2
  184. package/es/meta-comp/components/Text/index.less +3 -0
  185. package/es/mobx/Frame.js +12 -1
  186. package/es/mobx/Store.js +12 -0
  187. package/es/utils/androidUtil.js +10 -2
  188. package/es/utils/businessUtil.js +218 -3
  189. package/es/utils/commonUtil.js +155 -4
  190. package/es/utils/coreUtil.js +59 -4
  191. package/es/utils/messageUtil.js +40 -0
  192. package/es/utils/pluginsUtil.js +1 -0
  193. package/lib/assets/fonts/AvenirNext-Bold.ttf +0 -0
  194. package/lib/assets/fonts/AvenirNext-DemiBold.ttf +0 -0
  195. package/lib/assets/fonts/AvenirNext-Medium.ttf +0 -0
  196. package/lib/assets/fonts/AvenirNext-Regular.ttf +0 -0
  197. package/lib/assets/fonts/Montserrat-Bold.ttf +0 -0
  198. package/lib/assets/fonts/Montserrat-Medium.ttf +0 -0
  199. package/lib/assets/fonts/Montserrat-Regular.ttf +0 -0
  200. package/lib/assets/fonts/Montserrat-SemiBold.ttf +0 -0
  201. package/lib/assets/fonts/magic-box-iconfont.css +38 -6
  202. package/lib/assets/fonts/magic-box-iconfont.js +1 -1
  203. package/lib/assets/fonts/magic-box-iconfont.ttf +0 -0
  204. package/lib/assets/fonts/magic-box-iconfont.woff +0 -0
  205. package/lib/assets/fonts/magic-box-iconfont.woff2 +0 -0
  206. package/lib/assets/images/base64/index.js +8 -2
  207. package/lib/assets/images/layout-icon/banner-slide-layout3.png +0 -0
  208. package/lib/assets/images/layout-icon/grouped-carousel-layout1.png +0 -0
  209. package/lib/assets/images/layout-icon/news-layout1.png +0 -0
  210. package/lib/assets/images/layout-icon/search-dito-layout1.png +0 -0
  211. package/lib/assets/images/layout-icon/slide-image-layout1.png +0 -0
  212. package/lib/assets/less/font.less +30 -0
  213. package/lib/assets/less/global.less +5 -0
  214. package/lib/common/ColorPickerInput/index.less +2 -0
  215. package/lib/common/CountDown/index.js +29 -2
  216. package/lib/common/CountDown/index.less +38 -5
  217. package/lib/common/ErrorBoundary/index.js +90 -0
  218. package/lib/common/FontStyles/index.less +1 -1
  219. package/lib/common/LinkModal/ProductList/index.js +484 -0
  220. package/lib/common/LinkModal/ProductList/index.less +130 -0
  221. package/lib/common/LinkModal/index.js +8 -1
  222. package/lib/common/ProductCardModal/imgs/dot-icon.png +0 -0
  223. package/lib/common/ProductCardModal/index.js +255 -0
  224. package/lib/common/ProductCardModal/index.less +131 -0
  225. package/lib/common/Toast/index.js +30 -0
  226. package/lib/common/Toast/index.less +29 -0
  227. package/lib/common/UrlPicker/index.js +1 -1
  228. package/lib/common/Video/index.js +5 -3
  229. package/lib/common/VideoPC/background.png +0 -0
  230. package/lib/common/VideoPC/closeImg.png +0 -0
  231. package/lib/common/VideoPC/components/index.js +100 -0
  232. package/lib/common/VideoPC/components/index.less +62 -0
  233. package/lib/common/VideoPC/cover.png +0 -0
  234. package/lib/common/VideoPC/index.js +750 -0
  235. package/lib/common/VideoPC/index.less +79 -0
  236. package/lib/common/index.js +32 -0
  237. package/lib/composite-comp/common/components/ImageLabel/index.js +2 -2
  238. package/lib/composite-comp/common/components/ImageLabel/index.less +23 -7
  239. package/lib/composite-comp/common/components/ProductItem/index.js +41 -24
  240. package/lib/composite-comp/common/components/ProductItem/index.less +17 -15
  241. package/lib/composite-comp/common/config-panels/BackgroundConfig/index.js +16 -12
  242. package/lib/composite-comp/common/config-panels/SpacingConfig/index.js +30 -0
  243. package/lib/composite-comp/dito/components/Bargain/defaultJSON.js +24 -0
  244. package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js +1 -1
  245. package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js +8 -0
  246. package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.less +3 -0
  247. package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +49 -11
  248. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js +15 -14
  249. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less +9 -1
  250. package/lib/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.js +197 -0
  251. package/lib/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.less +100 -0
  252. package/lib/composite-comp/dito/components/FlashDeal/pc/index.js +18 -22
  253. package/lib/composite-comp/dito/components/FlashDeal/pc/index.less +19 -30
  254. package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js +24 -0
  255. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.js +8 -5
  256. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.less +5 -2
  257. package/lib/composite-comp/dito/components/GroupedCarousel/defaultJSON.js +312 -0
  258. package/lib/composite-comp/dito/components/GroupedCarousel/index.js +86 -0
  259. package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.js +189 -0
  260. package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.less +65 -0
  261. package/lib/composite-comp/dito/components/News/defaultJSON.js +172 -0
  262. package/{es/composite-comp/dito/components/Orders → lib/composite-comp/dito/components/News}/index.js +13 -13
  263. package/lib/composite-comp/dito/components/News/pc/index.js +113 -0
  264. package/lib/composite-comp/dito/components/News/pc/index.less +46 -0
  265. package/lib/composite-comp/dito/components/Orders/defaultJSON.js +1 -1
  266. package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js +75 -2
  267. package/lib/composite-comp/dito/components/PersonalInformation/mobile/images/avatar.png +0 -0
  268. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js +159 -21
  269. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less +108 -9
  270. package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +55 -1
  271. package/lib/composite-comp/dito/components/Recommend/mobile/imgs/card.png +0 -0
  272. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +177 -20
  273. package/lib/composite-comp/dito/components/Recommend/mobile/index.less +24 -1
  274. package/lib/composite-comp/dito/components/SearchBanner/defaultJSON.js +234 -0
  275. package/lib/composite-comp/dito/components/SearchBanner/imgs/defaultImg.png +0 -0
  276. package/lib/composite-comp/dito/components/SearchBanner/imgs/pcDefImg1.png +0 -0
  277. package/lib/composite-comp/dito/components/SearchBanner/index.js +108 -0
  278. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js +293 -0
  279. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.less +108 -0
  280. package/lib/composite-comp/dito/components/SearchDITO/defaultJSON.js +221 -0
  281. package/lib/composite-comp/dito/components/SearchDITO/index.js +86 -0
  282. package/lib/composite-comp/dito/components/SearchDITO/pc/components/ConfirmModal/index.less +69 -0
  283. package/lib/composite-comp/dito/components/SearchDITO/pc/components/Header/index.js +602 -0
  284. package/lib/composite-comp/dito/components/SearchDITO/pc/components/Header/index.less +184 -0
  285. package/lib/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js +153 -0
  286. package/lib/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.less +25 -0
  287. package/lib/composite-comp/dito/components/SearchDITO/pc/imgs/avatar.png +0 -0
  288. package/lib/composite-comp/dito/components/SearchDITO/pc/index.js +176 -0
  289. package/lib/composite-comp/dito/components/SearchDITO/pc/index.less +57 -0
  290. package/lib/composite-comp/dito/components/SignBoard/mobile/index.js +1 -1
  291. package/lib/composite-comp/dito/components/SlideImage/defaultJSON.js +138 -0
  292. package/lib/composite-comp/dito/components/SlideImage/index.js +86 -0
  293. package/lib/composite-comp/dito/components/SlideImage/pc/components/CardItem/index.js +105 -0
  294. package/lib/composite-comp/dito/components/SlideImage/pc/components/CardItem/index.less +5 -0
  295. package/lib/composite-comp/dito/components/SlideImage/pc/components/ParallaxScroll/index.js +170 -0
  296. package/lib/composite-comp/dito/components/SlideImage/pc/components/ParallaxScroll/index.less +23 -0
  297. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/imgs/cursor.png +0 -0
  298. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/imgs/d.png +0 -0
  299. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.js +176 -0
  300. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less +61 -0
  301. package/lib/composite-comp/dito/components/SlideImage/pc/index.js +76 -0
  302. package/lib/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js +7 -0
  303. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +7 -0
  304. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +7 -20
  305. package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js +15 -1
  306. package/lib/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +7 -0
  307. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigGroup/index.js +149 -0
  308. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigGroup/index.less +16 -0
  309. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigTitle/index.js +93 -0
  310. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/ConfigTitle/index.less +0 -0
  311. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/imgs/defaultImg.png +0 -0
  312. package/lib/composite-comp/dito/config-panels/GroupedCarouselConfig/index.js +114 -0
  313. package/lib/composite-comp/dito/config-panels/NewsConfig/ConfigGroup/index.js +148 -0
  314. package/lib/composite-comp/dito/config-panels/NewsConfig/ConfigGroup/index.less +16 -0
  315. package/lib/composite-comp/dito/config-panels/NewsConfig/ConfigTitle/index.js +101 -0
  316. package/lib/composite-comp/dito/config-panels/NewsConfig/ConfigTitle/index.less +0 -0
  317. package/lib/composite-comp/dito/config-panels/NewsConfig/imgs/defaultImg.png +0 -0
  318. package/{es/composite-comp/dito/config-panels/OrdersConfig → lib/composite-comp/dito/config-panels/NewsConfig}/index.js +40 -40
  319. package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigDecoration/index.js +91 -0
  320. package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigDecoration/index.less +9 -0
  321. package/lib/composite-comp/dito/config-panels/{OrdersConfig/ConfigGroup → PersonalInformationConfig/OrdersConfigGroup}/index.js +2 -2
  322. package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +23 -5
  323. package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +17 -1
  324. package/lib/composite-comp/dito/config-panels/RecommendConfig/index.js +10 -3
  325. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +197 -0
  326. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.less +7 -0
  327. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigImageGroup/index.js +148 -0
  328. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigImageGroup/index.less +0 -0
  329. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigSetting/index.js +226 -0
  330. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigSetting/index.less +9 -0
  331. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/imgs/defaultImg.png +0 -0
  332. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/index.js +65 -0
  333. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigContent/index.js +165 -0
  334. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigContent/index.less +7 -0
  335. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigImageGroup/index.js +179 -0
  336. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigImageGroup/index.less +0 -0
  337. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigSetting/index.js +181 -0
  338. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/ConfigSetting/index.less +9 -0
  339. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/imgs/defaultImg.png +0 -0
  340. package/lib/composite-comp/dito/config-panels/SearchDITOConfig/index.js +69 -0
  341. package/lib/composite-comp/dito/config-panels/SlideImageConfig/ConfigGroup/index.js +150 -0
  342. package/lib/composite-comp/dito/config-panels/SlideImageConfig/ConfigGroup/index.less +16 -0
  343. package/lib/composite-comp/dito/config-panels/SlideImageConfig/imgs/defaultImg.png +0 -0
  344. package/lib/composite-comp/dito/config-panels/SlideImageConfig/index.js +134 -0
  345. package/lib/composite-comp/dito/second-config-panels/GroupedCarouselSecondConfig/index.js +196 -0
  346. package/lib/composite-comp/dito/second-config-panels/NewsSecondConfig/index.js +133 -0
  347. package/lib/composite-comp/dito/second-config-panels/NewsSecondConfig/index.less +8 -0
  348. package/lib/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +64 -1
  349. package/lib/composite-comp/dito/second-config-panels/SearchBannerSecondConfig/index.js +98 -0
  350. package/lib/composite-comp/dito/second-config-panels/SearchDITOSecondConfig/index.js +366 -0
  351. package/lib/composite-comp/dito/second-config-panels/SearchDITOSecondConfig/index.less +79 -0
  352. package/lib/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.js +243 -0
  353. package/lib/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less +71 -0
  354. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +4 -3
  355. package/lib/composite-comp/nuri/components/AffiliateRecommend/mobile/index.js +1 -1
  356. package/lib/composite-comp/nuri/components/AffiliateRecommend/mobile/index.less +15 -15
  357. package/lib/composite-comp/public/components/Stores/mobile/index.less +3 -0
  358. package/lib/constants/component-types.js +33 -9
  359. package/lib/constants/index.js +44 -20
  360. package/lib/constants/layout.js +46 -2
  361. package/lib/core/Designer/ConfigPanel/index.js +18 -1
  362. package/lib/core/Designer/index.js +2 -2
  363. package/lib/core/Renderer/index.js +37 -2
  364. package/lib/decorator/compositeDecorator.js +14 -4
  365. package/lib/decorator/metaDecorator.js +1 -2
  366. package/lib/locale/ar/ar.json +18 -1
  367. package/lib/locale/en/en.json +18 -1
  368. package/lib/locale/es/es.json +18 -1
  369. package/lib/locale/mn/mn.json +4 -0
  370. package/lib/meta-comp/components/Button/editable.js +3 -1
  371. package/lib/meta-comp/components/Button/index.js +13 -4
  372. package/lib/meta-comp/components/Button/index.less +8 -1
  373. package/lib/meta-comp/components/Image/index.js +7 -2
  374. package/lib/meta-comp/components/Image/index.less +7 -0
  375. package/lib/meta-comp/components/Text/index.js +6 -2
  376. package/lib/meta-comp/components/Text/index.less +3 -0
  377. package/lib/mobx/Frame.js +12 -1
  378. package/lib/mobx/Store.js +12 -0
  379. package/lib/utils/androidUtil.js +10 -2
  380. package/lib/utils/businessUtil.js +218 -3
  381. package/lib/utils/commonUtil.js +155 -4
  382. package/lib/utils/coreUtil.js +59 -4
  383. package/lib/utils/messageUtil.js +40 -0
  384. package/lib/utils/pluginsUtil.js +1 -0
  385. package/package.json +5 -2
  386. package/es/composite-comp/dito/components/FlashDeal/pc/imgs/defImg1.png +0 -0
  387. package/es/composite-comp/dito/components/FlashDeal/pc/imgs/defImg2.png +0 -0
  388. package/es/composite-comp/dito/components/FlashDeal/pc/imgs/defImg3.png +0 -0
  389. package/es/composite-comp/dito/components/Orders/mobile/index.js +0 -352
  390. package/es/composite-comp/dito/components/Orders/mobile/index.less +0 -86
  391. package/es/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.less +0 -9
  392. package/lib/composite-comp/dito/components/FlashDeal/pc/imgs/defImg1.png +0 -0
  393. package/lib/composite-comp/dito/components/FlashDeal/pc/imgs/defImg2.png +0 -0
  394. package/lib/composite-comp/dito/components/FlashDeal/pc/imgs/defImg3.png +0 -0
  395. package/lib/composite-comp/dito/components/Orders/mobile/index.js +0 -352
  396. package/lib/composite-comp/dito/components/Orders/mobile/index.less +0 -86
  397. package/lib/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.less +0 -9
  398. /package/es/composite-comp/dito/config-panels/PersonalInformationConfig/{ConfigGroup → PersonInfoConfigGroup}/index.js +0 -0
  399. /package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/{ConfigGroup → PersonInfoConfigGroup}/index.js +0 -0
@@ -0,0 +1,221 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.groupSourceJSON = exports.getDefaultJSON = void 0;
7
+
8
+ var _uuid = require("uuid");
9
+
10
+ var groupSourceJSON = function groupSourceJSON(parentId, type) {
11
+ var groupId = (0, _uuid.v4)();
12
+
13
+ if (type === 'image') {
14
+ return {
15
+ id: groupId,
16
+ parentId: parentId,
17
+ image: {
18
+ id: (0, _uuid.v4)(),
19
+ parentId: groupId,
20
+ open: true,
21
+ type: 'IMAGE',
22
+ content: {
23
+ h5Name: 'Image Name',
24
+ pcName: 'Image Name',
25
+ h5ImgSrc: '',
26
+ pcImgSrc: '',
27
+ clickUrl: ''
28
+ },
29
+ hover: {
30
+ open: false,
31
+ backgroundType: 'enlarge',
32
+ magnification: 1.5,
33
+ pcImgHoverUrl: '',
34
+ h5ImgHoverUrl: ''
35
+ }
36
+ }
37
+ };
38
+ } else {
39
+ return {
40
+ id: groupId,
41
+ parentId: parentId,
42
+ overilay: {
43
+ open: true,
44
+ content: {
45
+ h5Name: 'Video Name',
46
+ pcName: 'Video Name',
47
+ h5ImgSrc: '',
48
+ pcImgSrc: '',
49
+ clickUrl: ''
50
+ },
51
+ hover: {}
52
+ },
53
+ video: {
54
+ sourceType: 'Upload',
55
+ sourceUrl: '',
56
+ startAt: '',
57
+ progressBar: true,
58
+ loop: true,
59
+ autoplay: false,
60
+ videoSound: false,
61
+ speed: 1,
62
+ playPosition: 'Play in Box',
63
+ playButton: 'Middle'
64
+ },
65
+ playIcon: {
66
+ open: true,
67
+ parentId: groupId,
68
+ id: (0, _uuid.v4)(),
69
+ type: 'PLAY',
70
+ size: 48,
71
+ pcSize: 60,
72
+ iconType: 'light-playicon-01',
73
+ iconColor: 'Light'
74
+ },
75
+ clickUrl: ''
76
+ };
77
+ }
78
+ };
79
+
80
+ exports.groupSourceJSON = groupSourceJSON;
81
+
82
+ var getDefaultJSON = function getDefaultJSON() {
83
+ var compId = (0, _uuid.v4)();
84
+ return {
85
+ id: compId,
86
+ type: 'SEARCH_DITO',
87
+ content: {
88
+ logo: {
89
+ id: (0, _uuid.v4)(),
90
+ open: true,
91
+ type: 'IMAGE',
92
+ content: {
93
+ h5Name: 'name2',
94
+ pcName: 'name2',
95
+ h5ImgSrc: '',
96
+ pcImgSrc: '',
97
+ clickUrl: ''
98
+ },
99
+ hover: {
100
+ open: false,
101
+ backgroundType: 'enlarge',
102
+ magnification: 1.5,
103
+ pcImgHoverUrl: '',
104
+ h5ImgHoverUrl: ''
105
+ }
106
+ },
107
+ navigation: {
108
+ id: (0, _uuid.v4)(),
109
+ open: true
110
+ },
111
+ icon: {
112
+ open: true,
113
+ color: {
114
+ pc: '#2C2C2C'
115
+ },
116
+ searchIcon: {
117
+ pc: true
118
+ },
119
+ cartIcon: {
120
+ pc: true
121
+ }
122
+ },
123
+ login: {
124
+ id: (0, _uuid.v4)(),
125
+ open: true,
126
+ type: 'BUTTON',
127
+ text: 'Login',
128
+ content: {
129
+ url: '',
130
+ backgroundColor: '#CE1126'
131
+ },
132
+ buttonText: {
133
+ sizeType: 'Customize font styles',
134
+ fontWeight: 500,
135
+ pcFontSize: 14,
136
+ fontStyle: 'normal',
137
+ color: '#fff'
138
+ },
139
+ buttonBorder: {
140
+ open: true,
141
+ borderColor: '',
142
+ borderRadius: 8
143
+ },
144
+ spacing: {
145
+ pc: {
146
+ paddingTop: 5,
147
+ paddingBottom: 5,
148
+ paddingLeft: 12,
149
+ paddingRight: 12
150
+ },
151
+ mobile: {
152
+ paddingTop: 0,
153
+ paddingBottom: 0,
154
+ paddingLeft: 0,
155
+ paddingRight: 0
156
+ }
157
+ },
158
+ buttonIcon: {
159
+ iconUrl: '',
160
+ layout: 'right'
161
+ },
162
+ hover: null
163
+ },
164
+ searchBarBg: {
165
+ opacity: 100,
166
+ color: '#fff',
167
+ image: '',
168
+ bgType: 'color'
169
+ }
170
+ },
171
+ groupSource: [groupSourceJSON(compId, 'video')],
172
+ setting: {
173
+ // 自动轮播
174
+ autoplay: {
175
+ open: true,
176
+ interval: 3
177
+ },
178
+ // 面板指示点
179
+ dots: {
180
+ open: true,
181
+ layout: 'layout1',
182
+ color: {
183
+ pc: '#eee',
184
+ mobile: '#fff'
185
+ },
186
+ hoverColor: {
187
+ pc: '#fff',
188
+ mobile: '#fff'
189
+ },
190
+ size: {
191
+ pc: 16,
192
+ mobile: 8
193
+ },
194
+ hoverSize: {
195
+ pc: 16,
196
+ mobile: 8
197
+ }
198
+ }
199
+ },
200
+ spacing: {
201
+ pc: {
202
+ paddingTop: 0,
203
+ paddingBottom: 0,
204
+ marginBottom: window.magicDesign.compSpacing * 1.5,
205
+ fillUp: false
206
+ },
207
+ mobile: {
208
+ paddingTop: 0,
209
+ paddingBottom: 0,
210
+ paddingLeft: 0,
211
+ paddingRight: 0,
212
+ marginBottom: window.magicDesign.compSpacing
213
+ }
214
+ },
215
+ customize: {
216
+ layout: 'layout1'
217
+ }
218
+ };
219
+ };
220
+
221
+ exports.getDefaultJSON = getDefaultJSON;
@@ -0,0 +1,86 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireWildcard(require("react"));
9
+
10
+ var _defaultJSON = require("./defaultJSON");
11
+
12
+ var _index = _interopRequireDefault(require("./pc/index"));
13
+
14
+ var _coreUtil = require("../../../../utils/coreUtil");
15
+
16
+ var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
17
+
18
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
19
+
20
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
21
+
22
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
23
+
24
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
25
+
26
+ var __extends = void 0 && (void 0).__extends || function () {
27
+ var _extendStatics = function extendStatics(d, b) {
28
+ _extendStatics = Object.setPrototypeOf || {
29
+ __proto__: []
30
+ } instanceof Array && function (d, b) {
31
+ d.__proto__ = b;
32
+ } || function (d, b) {
33
+ for (var p in b) {
34
+ if (b.hasOwnProperty(p)) d[p] = b[p];
35
+ }
36
+ };
37
+
38
+ return _extendStatics(d, b);
39
+ };
40
+
41
+ return function (d, b) {
42
+ _extendStatics(d, b);
43
+
44
+ function __() {
45
+ this.constructor = d;
46
+ }
47
+
48
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
49
+ };
50
+ }();
51
+
52
+ var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
53
+ var c = arguments.length,
54
+ r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
55
+ d;
56
+ if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
57
+ if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
58
+ }
59
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
60
+ };
61
+
62
+ var SearchDito =
63
+ /** @class */
64
+ function (_super) {
65
+ __extends(SearchDito, _super);
66
+
67
+ function SearchDito() {
68
+ return _super !== null && _super.apply(this, arguments) || this;
69
+ }
70
+
71
+ SearchDito.prototype.render = function () {
72
+ var nodeData = this.props.nodeData;
73
+ return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_index["default"], {
74
+ data: nodeData
75
+ }) : null);
76
+ };
77
+
78
+ SearchDito.defaultProps = {};
79
+ SearchDito.type = 'SEARCH_DITO';
80
+ SearchDito.getDefaultJSON = _defaultJSON.getDefaultJSON;
81
+ SearchDito = __decorate([_compositeDecorator["default"]], SearchDito);
82
+ return SearchDito;
83
+ }(_react.Component);
84
+
85
+ var _default = SearchDito;
86
+ exports["default"] = _default;
@@ -0,0 +1,69 @@
1
+ .search-dito-confirm-modal {
2
+ position: fixed;
3
+ left: 0;
4
+ top: 0;
5
+ right: 0;
6
+ bottom: 0;
7
+ z-index: 1000;
8
+ display: flex;
9
+ align-items: center;
10
+ justify-content: center;
11
+
12
+ .modal-shadow {
13
+ width: 100%;
14
+ height: 100%;
15
+ background-color: rgba(0, 0, 0, 0.5);
16
+ position: absolute;
17
+ left: 0;
18
+ top: 0;
19
+ z-index: -1;
20
+ }
21
+
22
+ .modal-content {
23
+ background-color: #fff;
24
+ width: 400px;
25
+ max-height: 90%;
26
+ padding: 16px;
27
+ margin-top: -30px;
28
+ border-radius: 24px;
29
+
30
+ .modal-title {
31
+ text-align: center;
32
+ margin: 20px auto;
33
+ }
34
+
35
+ .modal-btn-wrap {
36
+ display: flex;
37
+ align-items: center;
38
+ justify-content: center;
39
+ gap: 20px;
40
+
41
+ div {
42
+ padding: 12px 0;
43
+ width: 100px;
44
+ text-align: center;
45
+ border-radius: 50px;
46
+ font-size: 16px;
47
+ color: #2c2c2c;
48
+ font-weight: 600;
49
+ background-color: #fff;
50
+ border: 1px solid #cecece;
51
+ cursor: pointer;
52
+
53
+ &:nth-child(2) {
54
+ background-color: #ce1126;
55
+ color: #fff;
56
+ border-color: #ce1126;
57
+ }
58
+ }
59
+ }
60
+ }
61
+ }
62
+
63
+
64
+ @media (min-width: 750px) {
65
+ .search-dito-confirm-modal {
66
+
67
+ .modal-content {}
68
+ }
69
+ }