fe / yoho-activity-platform · Commits

Go to a project

Authored by 陈峰
Commit 3c72e8bfd3262eca1ec09c27f16e0c4221767767 2 parents 7cdc91b8 1ab8b186

Merge branch 'release/6.7.9' of http://git.yoho.cn/fe/yoho-activity-platform into release/6.7.9

Inline Side-by-side
Showing 3 changed files with 64 additions and 35 deletions
... ... @@ -244,7 +244,7 @@ class ActWheelSurfModel extends global.yoho.BaseModel {
}
});
sendMessage(0, {}, {succeedTimes: sendResult.data.amount || 0}, 0);
sendMessage(0, {}, {succeedTimes: sendResult.data && sendResult.data.amount || 0}, 0);
if (sendResult && sendResult.code === 200) {
if (sendResult.data.isRepReceive === 'N') {
... ...
... ... @@ -147,7 +147,7 @@
</div>
<div class="bottom-btn">
<Button type="primary" @click="save" class="save">保存</Button>
<Button type="warning" @click="save" class="preview">预览</Button>
<Button type="warning" @click="preview" class="preview">预览</Button>
</div>
</div>
</TabPane>
... ... @@ -224,6 +224,9 @@
});
}).catch(() => {});
},
preview() {
window.open(`https://ad.yoho.cn/html5/2018/10/wheelSurf/home.html?actId=${this.actId}`);
},
getConf() {
$.ajax({
url: '/admin/wheelSurf/api/config/detail',
... ...
... ... @@ -179,7 +179,7 @@ address@>=0.0.1:
version "1.0.3"
resolved "http://npm.yohops.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
adler-32@~1.2.0:
adler-32@, adler-32@~1.2.0:
version "1.2.0"
resolved "http://npm.yohops.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
dependencies:
... ... @@ -1612,6 +1612,15 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"
cfb@>=0.10.0:
version "1.1.0"
resolved "http://npm.yohops.com/cfb/-/cfb-1.1.0.tgz#44fb1b30eee014fa5633a0ed5f26c87fd765799a"
dependencies:
adler-32 "~1.2.0"
commander "^2.16.0"
crc-32 "~1.2.0"
printj "~1.1.2"
cfb@~1.0.2:
version "1.0.8"
resolved "http://npm.yohops.com/cfb/-/cfb-1.0.8.tgz#77f213493d697d754fd9c0f5511eab5ad72d02cf"
... ... @@ -1899,6 +1908,14 @@ codepage@~1.12.0:
commander "~2.14.1"
exit-on-epipe "~1.0.1"
codepage@~1.3.6:
version "1.3.8"
resolved "http://npm.yohops.com/codepage/-/codepage-1.3.8.tgz#4f2e5d7c0975de28f88498058dcb5afcab6a5f71"
dependencies:
commander ""
concat-stream ""
voc ""
collapse-white-space@^1.0.2:
version "1.0.4"
resolved "http://npm.yohops.com/collapse-white-space/-/collapse-white-space-1.0.4.tgz#ce05cf49e54c3277ae573036a26851ba430a0091"
... ... @@ -1910,12 +1927,6 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"
collections@^3.0.0:
version "3.0.0"
resolved "http://npm.yohops.com/collections/-/collections-3.0.0.tgz#27e3894df1b24cedfc55a1bbb0c0da12f68bab31"
dependencies:
weak-map "~1.0.x"
color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
version "1.9.3"
resolved "http://npm.yohops.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
... ... @@ -1993,6 +2004,10 @@ colornames@^1.1.1:
version "1.1.1"
resolved "http://npm.yohops.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
colors@0.6.2:
version "0.6.2"
resolved "http://npm.yohops.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
colors@1.0.x:
version "1.0.3"
resolved "http://npm.yohops.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
... ... @@ -2031,14 +2046,14 @@ combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
commander@, commander@^2.13.0, commander@^2.14.1, commander@^2.16.0:
version "2.19.0"
resolved "http://npm.yohops.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
commander@2.15.1:
version "2.15.1"
resolved "http://npm.yohops.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
commander@^2.13.0, commander@^2.14.1:
version "2.19.0"
resolved "http://npm.yohops.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
commander@~2.13.0:
version "2.13.0"
resolved "http://npm.yohops.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
... ... @@ -2081,7 +2096,7 @@ concat-map@0.0.1:
version "0.0.1"
resolved "http://npm.yohops.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
concat-stream@, concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
version "1.6.2"
resolved "http://npm.yohops.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
dependencies:
... ... @@ -2285,7 +2300,7 @@ cosmiconfig@^5.0.0:
js-yaml "^3.9.0"
parse-json "^4.0.0"
crc-32@~1.2.0:
crc-32@, crc-32@~1.2.0:
version "1.2.0"
resolved "http://npm.yohops.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
dependencies:
... ... @@ -3386,13 +3401,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
md5.js "^1.3.4"
safe-buffer "^5.1.1"
excel-export@^0.5.1:
version "0.5.1"
resolved "http://npm.yohops.com/excel-export/-/excel-export-0.5.1.tgz#6d08787f98b2ec931e4b3dcff18cc9083bbb8b77"
dependencies:
collections "^3.0.0"
node-zip "1.x"
execa@^0.10.0:
version "0.10.0"
resolved "http://npm.yohops.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
... ... @@ -3868,6 +3876,10 @@ forwarded@~0.1.2:
version "0.1.2"
resolved "http://npm.yohops.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
frac@0.3.1:
version "0.3.1"
resolved "http://npm.yohops.com/frac/-/frac-0.3.1.tgz#577677b7fdcbe6faf7c461f1801d34137cda4354"
frac@~1.1.2:
version "1.1.2"
resolved "http://npm.yohops.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
... ... @@ -5551,9 +5563,9 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
jszip@2.5.0:
version "2.5.0"
resolved "http://npm.yohops.com/jszip/-/jszip-2.5.0.tgz#7444fd8551ddf3e5da7198fea0c91bc8308cc274"
jszip@2.4.0:
version "2.4.0"
resolved "http://npm.yohops.com/jszip/-/jszip-2.4.0.tgz#487a93b76c3bffa6cb085cd61eb934eabe2d294f"
dependencies:
pako "~0.2.5"
... ... @@ -6903,12 +6915,6 @@ node-sass@^4.8.3:
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"
node-zip@1.x:
version "1.1.1"
resolved "http://npm.yohops.com/node-zip/-/node-zip-1.1.1.tgz#94d1ad674a3cd46a1588dd736f4a9a78c757eb62"
dependencies:
jszip "2.5.0"
node-zookeeper-client@^0.2.2:
version "0.2.2"
resolved "http://npm.yohops.com/node-zookeeper-client/-/node-zookeeper-client-0.2.2.tgz#097bda01999eef8f602ce068b632600069dbf685"
... ... @@ -10218,6 +10224,14 @@ ssf@~0.10.1:
dependencies:
frac "~1.1.2"
ssf@~0.8.1:
version "0.8.2"
resolved "http://npm.yohops.com/ssf/-/ssf-0.8.2.tgz#b9d4dc6a1c1bcf76f8abfa96d7d7656fb2abecd6"
dependencies:
colors "0.6.2"
frac "0.3.1"
voc ""
sshpk@^1.7.0:
version "1.15.1"
resolved "http://npm.yohops.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
... ... @@ -11499,6 +11513,10 @@ vm-browserify@0.0.4:
dependencies:
indexof "0.0.1"
voc@:
version "1.1.0"
resolved "http://npm.yohops.com/voc/-/voc-1.1.0.tgz#d1a08aeff66646bf17cdba2e47c935a7a9b0218b"
vue-hot-reload-api@^2.2.0:
version "2.3.1"
resolved "http://npm.yohops.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
... ... @@ -11573,10 +11591,6 @@ wcwidth@^1.0.0:
dependencies:
defaults "^1.0.3"
weak-map@~1.0.x:
version "1.0.5"
resolved "http://npm.yohops.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb"
webpack-bundle-analyzer@^2.8.2:
version "2.13.1"
resolved "http://npm.yohops.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526"
... ... @@ -11842,6 +11856,18 @@ xdg-basedir@^3.0.0:
version "3.0.0"
resolved "http://npm.yohops.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
xlsx-style@^0.8.13:
version "0.8.13"
resolved "http://npm.yohops.com/xlsx-style/-/xlsx-style-0.8.13.tgz#ed238d6b8c0562f9447c2906abbded2d339e0486"
dependencies:
adler-32 ""
cfb ">=0.10.0"
codepage "~1.3.6"
commander ""
crc-32 ""
jszip "2.4.0"
ssf "~0.8.1"
xlsx@^0.11.16:
version "0.11.19"
resolved "http://npm.yohops.com/xlsx/-/xlsx-0.11.19.tgz#2f019d9df756f6345aac5bc1af2442cf22a025e3"
... ...