fe / ufo-app-web · Commits

Go to a project

Authored by hongyong.zhao
Commit a5bafdad5e27288a263cf8ce5bcddc3c1013e3a0 2 parents b18f9d00 5cf5e387

Merge branch 'feature/alipayfix' into 'master' 

Feature/alipayfix



See merge request !20
Inline Side-by-side
Showing 11 changed files with 135 additions and 71 deletions
import md5 from 'yoho-md5';
import md5 from 'crypto-js/md5';
import * as signUtils from 'utils/sign.js';
export const getImgUrl = function(src, width = 300, height = 300, mode = 2) {
... ... @@ -56,5 +56,5 @@ export const sign = (op) => {
const str = `${signUtils.joinParams(p, signUtils.sortParams(p))}`;
signUtils.setSign(p, md5(`${str}_${str.length}`));
signUtils.setSign(p, md5(`${str}_${str.length}`).toString());
};
... ...
<template>
<div class="full bg">
<div class="full">
<div class="header">
<div class="back-wrapper" @touchend="onBack">
<div class="back"></div>
... ... @@ -11,9 +11,6 @@
<div class="logo"></div>
</div>
<div class="item">
<div class="title"></div>
</div>
<div class="item">
<div class="desc"></div>
... ... @@ -36,14 +33,17 @@
</div>
<div class="item">
<div class="btn" @click="onClick"></div>
</div>
<div class="item">
<div class="tip"></div>
</div>
<div class="item">
<div class="btn" @click="onClick"></div>
<div class="shoe"></div>
</div>
<div class="shoe bg1"></div>
</div>
... ... @@ -141,11 +141,7 @@ export default {
<style lang="scss" scoped>
.full {
position: relative;
}
.bg {
background-image: url("~statics/image/alipay/bg1.png");
background-size: contain;
background-color: #f5f5f5;
}
.bg1 {
... ... @@ -155,43 +151,36 @@ export default {
.logo {
display: inline-block;
width: 361px;
height: 62px;
margin-top: 45px;
background-image: url("~statics/image/alipay/logo.png");
width: 750px;
height: 313px;
/*margin-top: 45px;*/
background-image: url("//cdn.yoho.cn/20190711/top_logo.png?imageView2/2/format/jpg");
background-size: cover;
}
.title {
display: inline-block;
width: 474px;
height: 240px;
margin-top: 40px;
background-image: url("~statics/image/alipay/title.png");
background-size: cover;
}
.desc {
display: inline-block;
width: 645px;
height: 352px;
width: 750px;
height: 1170px;
margin-top: 30px;
background-image: url("~statics/image/alipay/desc.png");
background-image: url("//cdn.yoho.cn/20190711/desc.png?imageView2/2/format/jpg");
background-size: cover;
}
.tip {
display: inline-block;
width: 483px;
height: 52px;
width: 750px;
height: 215px;
margin-top: 20px;
background-image: url("~statics/image/alipay/tip.png");
background-size: cover;
}
.shoe {
width: 100%;
height: 213px;
display: inline-block;
width: 750px;
height: 128px;
background-image: url("~statics/image/alipay/bg2.png");
background-size: cover;
}
... ... @@ -271,7 +260,7 @@ export default {
.back {
width: 24PX;
height: 24PX;
background: url(~statics/image/order/back@3x.png) no-repeat;
background: url(~statics/image/alipay/back@3x.png) no-repeat;
background-size: cover;
}
}
... ...

281 KB | W: | H:

17.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

50.4 KB | W: | H:

264 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

9.04 KB | W: | H:

63.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -39,6 +39,7 @@
"connect-multiparty": "^2.2.0",
"connect-redis": "^3.4.0",
"cookie-parser": "^1.4.3",
"crypto-js": "^3.1.9-1",
"cube-ui": "^1.12.6",
"express": "^4.16.4",
"express-session": "^1.15.6",
... ... @@ -48,6 +49,7 @@
"lodash": "^4.17.11",
"lottie-web": "^5.4.2",
"mysql": "^2.16.0",
"nodemon": "^1.19.1",
"qiniu": "^7.2.1",
"request": "^2.88.0",
"request-promise": "^4.2.2",
... ... @@ -105,7 +107,6 @@
"memory-fs": "^0.4.1",
"mini-css-extract-plugin": "^0.5.0",
"node-sass": "^4.11.0",
"nodemon": "^1.18.8",
"postcss-calc": "^7.0.1",
"postcss-loader": "^3.0.0",
"postcss-pxtorem": "^4.0.1",
... ...
... ... @@ -1017,6 +1017,10 @@ async-each@^1.0.0:
version "1.0.1"
resolved "http://npm.yohops.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
async-each@^1.0.1:
version "1.0.3"
resolved "http://npm.yohops.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
async-foreach@^0.1.3:
version "0.1.3"
resolved "http://npm.yohops.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
... ... @@ -1290,6 +1294,21 @@ braces@^2.3.0, braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"
braces@^2.3.2:
version "2.3.2"
resolved "http://npm.yohops.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
dependencies:
arr-flatten "^1.1.0"
array-unique "^0.3.2"
extend-shallow "^2.0.1"
fill-range "^4.0.0"
isobject "^3.0.1"
repeat-element "^1.1.2"
snapdragon "^0.8.1"
snapdragon-node "^2.0.1"
split-string "^3.0.2"
to-regex "^3.0.1"
brorand@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
... ... @@ -1524,7 +1543,7 @@ caniuse-lite@^1.0.30000921:
capture-stack-trace@^1.0.0:
version "1.0.1"
resolved "http://npm.yohops.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#ed0a1edb87c05d4db1037c5f8f483d8a3b5f0825"
resolved "http://npm.yohops.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
caseless@~0.12.0:
version "0.12.0"
... ... @@ -1588,7 +1607,7 @@ check-types@^7.3.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4:
chokidar@^2.0.0, chokidar@^2.0.2:
version "2.0.4"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
dependencies:
... ... @@ -1607,6 +1626,24 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4:
optionalDependencies:
fsevents "^1.2.2"
chokidar@^2.1.5:
version "2.1.6"
resolved "http://npm.yohops.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
dependencies:
anymatch "^2.0.0"
async-each "^1.0.1"
braces "^2.3.2"
glob-parent "^3.1.0"
inherits "^2.0.3"
is-binary-path "^1.0.0"
is-glob "^4.0.0"
normalize-path "^3.0.0"
path-is-absolute "^1.0.0"
readdirp "^2.2.1"
upath "^1.1.1"
optionalDependencies:
fsevents "^1.2.7"
chownr@^1.0.1, chownr@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
... ... @@ -1833,8 +1870,8 @@ concat-stream@^1.5.0:
typedarray "^0.0.6"
configstore@^3.0.0:
version "3.1.1"
resolved "http://npm.yohops.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
version "3.1.2"
resolved "http://npm.yohops.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
dependencies:
dot-prop "^4.1.0"
graceful-fs "^4.1.2"
... ... @@ -2052,6 +2089,10 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
crypto-js@^3.1.9-1:
version "3.1.9-1"
resolved "http://npm.yohops.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
crypto-random-string@^1.0.0:
version "1.0.0"
resolved "http://npm.yohops.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
... ... @@ -2202,10 +2243,6 @@ deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
deep-extend@~0.4.0:
version "0.4.2"
resolved "http://npm.yohops.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
deep-is@~0.1.3:
version "0.1.3"
resolved "http://npm.yohops.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
... ... @@ -3145,6 +3182,13 @@ fsevents@^1.2.2:
nan "^2.9.2"
node-pre-gyp "^0.10.0"
fsevents@^1.2.7:
version "1.2.9"
resolved "http://npm.yohops.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
dependencies:
nan "^2.12.1"
node-pre-gyp "^0.12.0"
fstream@^1.0.0, fstream@^1.0.2:
version "1.0.11"
resolved "http://npm.yohops.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
... ... @@ -4542,8 +4586,8 @@ lower-case@^1.1.1:
resolved "http://npm.yohops.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
lowercase-keys@^1.0.0:
version "1.0.0"
resolved "http://npm.yohops.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
version "1.0.1"
resolved "http://npm.yohops.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
lru-cache@^4.0.1:
version "4.1.1"
... ... @@ -4944,6 +4988,10 @@ nan@^2.10.0, nan@^2.9.2:
version "2.11.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
nan@^2.12.1:
version "2.14.0"
resolved "http://npm.yohops.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
nanomatch@^1.2.9:
version "1.2.9"
resolved "http://npm.yohops.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
... ... @@ -5059,6 +5107,21 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
node-pre-gyp@^0.12.0:
version "0.12.0"
resolved "http://npm.yohops.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.1"
needle "^2.2.1"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4"
node-releases@^1.0.5:
version "1.1.1"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.1.tgz#8fff8aea1cfcad1fb4205f805149054fbf73cafd"
... ... @@ -5102,15 +5165,15 @@ node-zookeeper-client@^0.2.2:
async "~0.2.7"
underscore "~1.4.4"
nodemon@^1.18.8:
version "1.18.8"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.8.tgz#eb4c0052dc81395bdc503f3c8ae3cba86ca7146a"
nodemon@^1.19.1:
version "1.19.1"
resolved "http://npm.yohops.com/nodemon/-/nodemon-1.19.1.tgz#576f0aad0f863aabf8c48517f6192ff987cd5071"
dependencies:
chokidar "^2.0.4"
chokidar "^2.1.5"
debug "^3.1.0"
ignore-by-default "^1.0.1"
minimatch "^3.0.4"
pstree.remy "^1.1.3"
pstree.remy "^1.1.6"
semver "^5.5.0"
supports-color "^5.2.0"
touch "^3.1.0"
... ... @@ -5151,6 +5214,10 @@ normalize-path@^2.1.1:
dependencies:
remove-trailing-separator "^1.0.1"
normalize-path@^3.0.0:
version "3.0.0"
resolved "http://npm.yohops.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
normalize-range@^0.1.2:
version "0.1.2"
resolved "http://npm.yohops.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
... ... @@ -5883,9 +5950,9 @@ psl@^1.1.24, psl@^1.1.28:
version "1.1.29"
resolved "http://npm.yohops.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
pstree.remy@^1.1.3:
version "1.1.4"
resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.4.tgz#a03d5dbc06ba639fb6dd4874644c4bad9882ec21"
pstree.remy@^1.1.6:
version "1.1.7"
resolved "http://npm.yohops.com/pstree.remy/-/pstree.remy-1.1.7.tgz#c76963a28047ed61542dc361aa26ee55a7fa15f3"
public-encrypt@^4.0.0:
version "4.0.3"
... ... @@ -5998,16 +6065,7 @@ raw-body@2.3.3:
iconv-lite "0.4.23"
unpipe "1.0.0"
rc@^1.0.1, rc@^1.1.6:
version "1.2.5"
resolved "http://npm.yohops.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
dependencies:
deep-extend "~0.4.0"
ini "~1.3.0"
minimist "^1.2.0"
strip-json-comments "~2.0.1"
rc@^1.2.7:
rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
dependencies:
... ... @@ -6104,6 +6162,14 @@ readdirp@^2.0.0:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"
readdirp@^2.2.1:
version "2.2.1"
resolved "http://npm.yohops.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
dependencies:
graceful-fs "^4.1.11"
micromatch "^3.1.10"
readable-stream "^2.0.2"
rechoir@^0.6.2:
version "0.6.2"
resolved "http://npm.yohops.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
... ... @@ -6195,8 +6261,8 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0:
unicode-match-property-value-ecmascript "^1.0.2"
registry-auth-token@^3.0.1:
version "3.3.2"
resolved "http://npm.yohops.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
version "3.4.0"
resolved "http://npm.yohops.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
dependencies:
rc "^1.1.6"
safe-buffer "^5.0.1"
... ... @@ -6572,7 +6638,11 @@ semver-diff@^2.0.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
semver@^5.0.3, semver@^5.1.0:
version "5.7.0"
resolved "http://npm.yohops.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
semver@^5.3.0:
version "5.5.0"
resolved "http://npm.yohops.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
... ... @@ -7498,7 +7568,7 @@ unc-path-regex@^0.1.2:
undefsafe@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
resolved "http://npm.yohops.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
dependencies:
debug "^2.2.0"
... ... @@ -7625,9 +7695,13 @@ upath@^1.0.5:
version "1.1.0"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
upath@^1.1.1:
version "1.1.2"
resolved "http://npm.yohops.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
update-notifier@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
resolved "http://npm.yohops.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
dependencies:
boxen "^1.2.1"
chalk "^2.0.1"
... ... @@ -8113,8 +8187,8 @@ wide-align@^1.1.0:
string-width "^1.0.2"
widest-line@^2.0.0:
version "2.0.0"
resolved "http://npm.yohops.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
version "2.0.1"
resolved "http://npm.yohops.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
dependencies:
string-width "^2.1.1"
... ... @@ -8182,8 +8256,8 @@ wrappy@1:
resolved "http://npm.yohops.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
write-file-atomic@^2.0.0:
version "2.3.0"
resolved "http://npm.yohops.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
version "2.4.3"
resolved "http://npm.yohops.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
dependencies:
graceful-fs "^4.1.11"
imurmurhash "^0.1.4"
... ...