Skip to content

Q
quantum-blocks-h5
Commit 19237f35 authored by 徐光星's avatar 徐光星
Browse files
Options

Merge branch 'feat/multiActivity' into 'master' 

Feat/multi activity

See merge request !113
parents d253080f c6c88670
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 27 deletions
app/web/page/activity/view/activity/index.ts
View file @ 19237f35
...@@ -59,8 +59,8 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -59,8 +59,8 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
showCouponModal: boolean = false; showCouponModal: boolean = false;
couponModalData: object = {}; couponModalData: object = {};
get layout() { get layout() {
if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) { if (isWxMp && !EASY_ENV_IS_NODE) {
this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up' && v.name !== 'cs-seckill'); this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-snap-up' && v.name !== 'cs-seckill');
} }
return this.pageData && this.pageData.elements.map(v => v.point) || []; return this.pageData && this.pageData.elements.map(v => v.point) || [];
} }
...@@ -120,8 +120,12 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -120,8 +120,12 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
} }
} }
mounted() { mounted() {
if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) { // if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) {
this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up' && v.name !== 'cs-seckill'); // // && v.name !== 'cs-snap-up' && v.name !== 'cs-seckill' 放开H5访问秒杀、抢购的限制
// this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar');
// }
if (isWxMp && !EASY_ENV_IS_NODE) {
this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-snap-up' && v.name !== 'cs-seckill');
} }
this.targetEle = document.querySelector('body'); this.targetEle = document.querySelector('body');
if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; } if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; }
......
config/apollo.json
View file @ 19237f35
{ {
"api": { "api": {
"apiHost": "https://quantum-blocks.q-gp.com", "apiHost": "https://quantum-blocks-yxm2.liangkebang.net",
"h5Host": "https://quantum-h5.q-gp.com", "h5Host": "https://quantum-h5-yxm2.liangkebang.net",
"opapiHost": "https://opapi.q-gp.com", "opapiHost": "https://opapi-yxm2.liangkebang.net",
"passportHost": "https://passportapi.q-gp.com", "passportHost": "https://passportapi-yxm2.liangkebang.net",
"talosHost": "https://talos.q-gp.com", "talosHost": "https://talos-yxm2.liangkebang.net",
"kdspHost": "https://kdsp-api.q-gp.com", "kdspHost": "https://kdsp-api-yxm2.liangkebang.net",
"loginUrl": "", "loginUrl": "",
"xyqbH5Host": "https://h5-api.q-gp.com", "newApolloFlag": true,
"h5ShopHost": "https://tenet.q-gp.com/#", "h5ShopHost": "https://tenet-yxm2.liangkebang.net/#",
"mallHost": "https://mall.q-gp.com", "mallHost": "https://mall-yxm2.liangkebang.net",
"xyqbH5Host": "https://mapi-yxm2.liangkebang.net",
"yxmTenantId": 560761, "yxmTenantId": 560761,
"appIdMap": { "appIdMap": {
"560761": "wxb3e6270e1b1e0bc7", "560761": "wxe16bf9293671506c",
"560867": "wxbd0bc68b270a1dab" "560867": "wxccb8435d68e8c7d6"
} }
}, },
"redis": { "redis": {
"port": 6379, "port": "30924",
"host": "r-2ze9ekrfpir1aewtvz.redis.rds.aliyuncs.com", "host": "172.16.92.56",
"password": "r-2ze9ekrfpir1aewtvz:ebJndATopF3g05qy", "password": "",
"db": 0 "db": 0
}, },
"qiniu": { "qiniu": {
"qiniuUpHost": "https://up-z0.qiniup.com", "qiniuUpHost": "https://up-z0.qiniup.com",
"qiniuHost": "https://appsync.lkbang.net" "qiniuHost": "https://appsync.lkbang.net"
},
"vertify": {
"/FZz8NUb3x0.txt": "ca1c52b4801a7741ccdbbe47797d574e",
"/Ra6UCOeIhV.txt": "0b54b6896ca0bdaa53b9b4e49c403f30",
"/2OqnbvHjoq.txt": "90e68e2c196781968dba89bd5e6ac182",
"/9HFuiOJ4BG.txt": "97efde44dc917901a8ca25a0feb54ad8",
"/bAgsGUG45y.txt": "25638138b18af91b2dd64db906b056a4",
"/c8PA5Gybed.txt": "03f5c047a87a73854381c1d19c50fd68",
"/J5QboPVm8N.txt": "8fb57cfb856841b9d877e61df0729232",
"/Jb5PMgT5lb.txt": "59297e3b609ad1c26e5b334fa56af181",
"/NqUTl0J6Ed.txt": "cbc525fd71a2beb519d349084dece8da",
"/qsBZfgOk4y.txt": "8a154639c8af235d06e4b291463fb7a0",
"/tPICMyeJfv.txt": "11f2efef0527b792380784ea1b4a4b65",
"/UBRJar2pST.txt": "3c6152f098bc4e3edad5b36f550cd268",
"/yB3tnMTnRc.txt": "5c9d1a08b3bda49beb0f950b1cdec27b",
"/gAnCcSGwFu.txt": "a8ae84f68ea72f82beff325a59fd2c58",
"/qqCExxuPJ7.txt": "a1da927722f735a09065407e32beb56a",
"/86b9af10a6b70c8be78c9095b24448ec.html": "5c9d1a08b3bda49beb0f950b1cdec27b",
"/bd_mapp_domaincer_25998612.txt": "a7ff4d126c6a7b90c73356e410a163b9",
"/MP_verify_f4VWFoFpHgzmqFbo.txt": "f4VWFoFpHgzmqFbo",
"/MP_verify_KbcgqpEmfvW0J3Ts.txt": "KbcgqpEmfvW0J3Ts"
} }
} }
\ No newline at end of file
config/apollo.ssr.json
View file @ 19237f35
{"apiHost":"https://quantum-blocks.q-gp.com","h5Host":"https://quantum-h5.q-gp.com","opapiHost":"https://opapi.q-gp.com","passportHost":"https://passportapi.q-gp.com","talosHost":"https://talos.q-gp.com","kdspHost":"https://kdsp-api.q-gp.com","loginUrl":"","xyqbH5Host":"https://h5-api.q-gp.com","h5ShopHost":"https://tenet.q-gp.com/#","mallHost":"https://mall.q-gp.com","yxmTenantId":560761,"appIdMap":{"560761":"wxb3e6270e1b1e0bc7","560867":"wxbd0bc68b270a1dab"},"qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.lkbang.net"} {"apiHost":"https://quantum-blocks-yxm2.liangkebang.net","h5Host":"https://quantum-h5-yxm2.liangkebang.net","opapiHost":"https://opapi-yxm2.liangkebang.net","passportHost":"https://passportapi-yxm2.liangkebang.net","talosHost":"https://talos-yxm2.liangkebang.net","kdspHost":"https://kdsp-api-yxm2.liangkebang.net","loginUrl":"","newApolloFlag":true,"h5ShopHost":"https://tenet-yxm2.liangkebang.net/#","mallHost":"https://mall-yxm2.liangkebang.net","xyqbH5Host":"https://mapi-yxm2.liangkebang.net","yxmTenantId":560761,"appIdMap":{"560761":"wxe16bf9293671506c","560867":"wxccb8435d68e8c7d6"},"qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.lkbang.net"}
\ No newline at end of file \ No newline at end of file
package-lock.json
View file @ 19237f35
...@@ -2367,9 +2367,9 @@ ...@@ -2367,9 +2367,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.64", "version": "0.3.65",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.64.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.65.tgz",
"integrity": "sha512-+jwT/+7St+ehknceeqE+gq7zybPRTfsFc3ozyHt3t1XnQR+U3SscgcGy3Z78DSvEgmZJ96mD9G/DJTIM6NGfqA==", "integrity": "sha512-UESBwLSObEr6cGJrlcnLeNrt+c2z/dOYAoy4TBIswtVdrbAU5KHRnSv4xV+960mHGSJdIfSgyvaVvXCbiwcHAw==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.9", "@qg/cherry-ui": "^2.23.9",
...@@ -23471,9 +23471,9 @@ ...@@ -23471,9 +23471,9 @@
} }
}, },
"sa-sdk-javascript": { "sa-sdk-javascript": {
"version": "1.24.15", "version": "1.25.5",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.24.15.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.25.5.tgz",
"integrity": "sha512-EWhuuYPKQw0eer4jSzwxaSMD+FMlcnyJ4Ty+F0wD0vsfcjOhggr/ox0+1xvwL6tR5FfPhHEzsLl+wIEzV31O4A==" "integrity": "sha512-u2SYFRoSuvH0UAQ4XK+H6xwUZuXu6W0VBpk7n62rvCrmwfWWvAAz3Jgk4KCxdoCOh7Q8MAycEgHqgSlsQb9g2g=="
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.2.1", "version": "5.2.1",
package.json
View file @ 19237f35
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1", "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
"stop": "egg-scripts stop", "stop": "egg-scripts stop",
"backend": "nohup egg-scripts start --port 7001 --workers 4", "backend": "nohup egg-scripts start --port 7001 --workers 4",
"dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=yxm npm run apollo && egg-bin dev -r egg-ts-helper/register", "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=yxm2 npm run apollo && egg-bin dev -r egg-ts-helper/register",
"debug": "egg-bin debug -r egg-ts-helper/register", "debug": "egg-bin debug -r egg-ts-helper/register",
"apollo": "node bin/apollo.js", "apollo": "node bin/apollo.js",
"build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool", "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"@better-scroll/core": "^2.0.5", "@better-scroll/core": "^2.0.5",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.23.10", "@qg/cherry-ui": "2.23.10",
"@qg/citrus-ui": "0.3.64", "@qg/citrus-ui": "0.3.65",
"@qg/js-bridge": "^1.1.12", "@qg/js-bridge": "^1.1.12",
"@sentry/vue": "^7.41.0", "@sentry/vue": "^7.41.0",
"babel-plugin-transform-vue-jsx": "^4.0.1", "babel-plugin-transform-vue-jsx": "^4.0.1",
......
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