Skip to content

M
mr-julyedu
Commit b3e3648f by FE
Options

build

parents 81dfc761 b13bed21
Showing with 44 additions and 38 deletions
build/asset-manifest.json
......@@ -18,8 +18,8 @@
"Activity.js": "/mrstatic/js/Activity.2d5072de.chunk.js",
"Activity.js.map": "/mrstatic/js/Activity.2d5072de.chunk.js.map",
"BargainMiddlePage.css": "/mrstatic/css/BargainMiddlePage.2a913483.chunk.css",
"BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.d06f09a5.chunk.js",
"BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.d06f09a5.chunk.js.map",
"BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.2dee5005.chunk.js",
"BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.2dee5005.chunk.js.map",
"Classify.css": "/mrstatic/css/Classify.127d35ae.chunk.css",
"Classify.js": "/mrstatic/js/Classify.f764cc42.chunk.js",
"Classify.js.map": "/mrstatic/js/Classify.f764cc42.chunk.js.map",
......@@ -93,9 +93,9 @@
"newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.3376237c.chunk.css",
"newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.28e0fa52.chunk.js",
"newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.28e0fa52.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.c7ce3364.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.28379123.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.28379123.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.11291145.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.8e742ef2.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.8e742ef2.chunk.js.map",
"prize-winner-list.css": "/mrstatic/css/prize-winner-list.ce85cb83.chunk.css",
"prize-winner-list.js": "/mrstatic/js/prize-winner-list.8fe3351f.chunk.js",
"prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.8fe3351f.chunk.js.map",
......@@ -105,8 +105,8 @@
"python-class.css": "/mrstatic/css/python-class.11408886.chunk.css",
"python-class.js": "/mrstatic/js/python-class.56d079a1.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.56d079a1.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.961a7649.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.961a7649.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.a7861d10.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.a7861d10.js.map",
"search.css": "/mrstatic/css/search.efa1dd44.chunk.css",
"search.js": "/mrstatic/js/search.b8aee097.chunk.js",
"search.js.map": "/mrstatic/js/search.b8aee097.chunk.js.map",
......@@ -186,7 +186,7 @@
"mrstatic/css/main.fe158352.chunk.css.map": "/mrstatic/css/main.fe158352.chunk.css.map",
"mrstatic/css/myorders.841d0cfb.chunk.css.map": "/mrstatic/css/myorders.841d0cfb.chunk.css.map",
"mrstatic/css/newyear-2019-landing.3376237c.chunk.css.map": "/mrstatic/css/newyear-2019-landing.3376237c.chunk.css.map",
"mrstatic/css/newyear-yearIndex.c7ce3364.chunk.css.map": "/mrstatic/css/newyear-yearIndex.c7ce3364.chunk.css.map",
"mrstatic/css/newyear-yearIndex.11291145.chunk.css.map": "/mrstatic/css/newyear-yearIndex.11291145.chunk.css.map",
"mrstatic/css/prize-winner-list.ce85cb83.chunk.css.map": "/mrstatic/css/prize-winner-list.ce85cb83.chunk.css.map",
"mrstatic/css/purchased.7558403e.chunk.css.map": "/mrstatic/css/purchased.7558403e.chunk.css.map",
"mrstatic/css/python-class.11408886.chunk.css.map": "/mrstatic/css/python-class.11408886.chunk.css.map",
......@@ -200,6 +200,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.990a9948a0108303166dde8c113a1b55.js": "/precache-manifest.990a9948a0108303166dde8c113a1b55.js",
"precache-manifest.fea19535501701a36774f4eb4d128ab7.js": "/precache-manifest.fea19535501701a36774f4eb4d128ab7.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/newyear-yearIndex.28379123.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/newyear-yearIndex.8e742ef2.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.990a9948a0108303166dde8c113a1b55.js → build/precache-manifest.fea19535501701a36774f4eb4d128ab7.js
......@@ -44,12 +44,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Activity.2d5072de.chunk.js"
},
{
"revision": "d498f0281b1e04ad3cac",
"revision": "8e45b0ee3ccfdb07479e",
"url": "/mrstatic/css/BargainMiddlePage.2a913483.chunk.css"
},
{
"revision": "d498f0281b1e04ad3cac",
"url": "/mrstatic/js/BargainMiddlePage.d06f09a5.chunk.js"
"revision": "8e45b0ee3ccfdb07479e",
"url": "/mrstatic/js/BargainMiddlePage.2dee5005.chunk.js"
},
{
"revision": "87918d8ec6e98a2e30a5",
......@@ -244,12 +244,12 @@ self.__precacheManifest = [
"url": "/mrstatic/js/newyear-2019-landing.28e0fa52.chunk.js"
},
{
"revision": "c06a073841a298bb0269",
"url": "/mrstatic/css/newyear-yearIndex.c7ce3364.chunk.css"
"revision": "ed38609905778f736a12",
"url": "/mrstatic/css/newyear-yearIndex.11291145.chunk.css"
},
{
"revision": "c06a073841a298bb0269",
"url": "/mrstatic/js/newyear-yearIndex.28379123.chunk.js"
"revision": "ed38609905778f736a12",
"url": "/mrstatic/js/newyear-yearIndex.8e742ef2.chunk.js"
},
{
"revision": "b75b5f4c3888b95464ba",
......@@ -276,8 +276,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.56d079a1.chunk.js"
},
{
"revision": "1052c57acc1a36119560",
"url": "/mrstatic/js/runtime~main.961a7649.js"
"revision": "5e01288ffb5f0b209e6c",
"url": "/mrstatic/js/runtime~main.a7861d10.js"
},
{
"revision": "394d6493ac7e0fcbacf6",
......@@ -392,38 +392,42 @@ self.__precacheManifest = [
"url": "/mrstatic/js/51.94631494.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
},
{
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
},
{
"revision": "81a489ac63f2f2df5ab412e0782bd54c",
"url": "/mrstatic/media/kanjia_cg_icon.81a489ac.png"
},
{
"revision": "d76ebce726bdf3459fa14e96d84c5b9a",
"url": "/mrstatic/media/formal-banner.d76ebce7.png"
},
{
"revision": "9ab091267ae7c83bd30d0f5ad018a8c9",
"url": "/mrstatic/media/dalibao_bj.9ab09126.png"
},
{
"revision": "d76ebce726bdf3459fa14e96d84c5b9a",
"url": "/mrstatic/media/formal-banner.d76ebce7.png"
},
{
"revision": "80011994e30adf599e5f47fcc81bc06d",
"url": "/mrstatic/media/progress-share-bg.80011994.png"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
......@@ -432,15 +436,11 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "1b6fdce49609210b6133d635697422fd",
"revision": "0aff08d9ba91723411cbe51f13defe12",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.990a9948a0108303166dde8c113a1b55.js"
"/precache-manifest.fea19535501701a36774f4eb4d128ab7.js"
);
workbox.clientsClaim();
......
src/common/addressPopup/index.js
......@@ -90,7 +90,10 @@ class AddressPopup extends Component {
<h2 className="address-form__title">收货信息</h2>
{
prize ? (
<p className='address__prize'>您抽中了{prize}<span style={{'color': '#FF4000'}}>实物奖品</span></p>
<p className='address__prize'>
您抽中了
<span style={{'color': '#FF4000'}}>{prize}</span>
</p>
) : (null)
}
{
......
src/components/activity/newyear-2019/common/splitSuccess/index.scss
......@@ -64,6 +64,7 @@
height: 25px;
border-radius: 50%;
background-color: #fff;
background-size: cover;
}
.member-item__captain {
......
src/components/activity/newyear-2019/myTreasure/index.js
......@@ -460,7 +460,7 @@ class MyTreasure extends Component {
<SplitSuccess
ids={ids}
data={splitInfo}
handleToInvite={this.handleToInvite}
handleToInvite={() => this.handleToInvite(splitInfo.treasure_code)}
handleToBindPhone={this.handleToBindPhone}
handleToBindAddress={this.handleToBindAddress}
successSplitTreasure={this.successSplitTreasure}
......@@ -510,7 +510,7 @@ class MyTreasure extends Component {
skip="year"
tip={
<>
<p className="address-treasure__desc">恭喜您获得 奖品名称奖品名称奖品名称</p>
<p className="address-treasure__desc">恭喜您获得 {prizeName}</p>
<p className="address-treasure__notice">请及时填写/确认收货信息，活动结束后统一邮寄</p>
</>
}
......
src/components/bargainMiddlePage/index.js
......@@ -634,7 +634,7 @@ function CourseDes(props) {
<span className={'discount-price'}>￥{course.course_price}</span>
{/* is_originator 是否发起人 0-否 1-是 */}
{
(is_originator == 1 && bargain_status == 0 || bargain_status == 1) &&
(is_originator == 1 && bargain_status != 3) &&
<button className={'purchase-btn'} onClick={toCart}>
¥{course.pay_price}去支付
</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment