Skip to content

Q
quantum-blocks-h5
Commit 730ab959 authored by 郭志伟's avatar 郭志伟
Browse files
Options

fix: 调整back-top

parent 41263106
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 40 deletions
app/controller/activity.ts
View file @ 730ab959
...@@ -2,19 +2,19 @@ import { Controller, Context } from 'egg'; ...@@ -2,19 +2,19 @@ import { Controller, Context } from 'egg';
export default class ActivityController extends Controller { export default class ActivityController extends Controller {
public async home(ctx: Context) { public async home(ctx: Context) {
const redisKey = `quantum-blocks:page:${ctx.params.id}`; // const redisKey = `quantum-blocks:page:${ctx.params.id}`;
let body = await ctx.service.redis.get(redisKey); // let body = await ctx.service.redis.get(redisKey);
if (body) { // if (body) {
ctx.logger.info('请求redis成功 key: %j', redisKey); // ctx.logger.info('请求redis成功 key: %j', redisKey);
} // }
if (!body) { // if (!body) {
let apollo = {}; // let apollo = {};
if (process.env.NODE_ENV === 'production' && process.env.EGG_SERVER_ENV === 'sit') { // if (process.env.NODE_ENV === 'production' && process.env.EGG_SERVER_ENV === 'sit') {
apollo = ctx.app.config.apollo || {}; // apollo = ctx.app.config.apollo || {};
} // }
body = await ctx.renderView('activity.js', { url: ctx.url, apollo }); let body = await ctx.renderView('activity.js', { url: ctx.url });
await ctx.service.redis.set(redisKey, body); // await ctx.service.redis.set(redisKey, body);
} // }
ctx.body = body; ctx.body = body;
} }
} }
\ No newline at end of file
app/web/component/layout/activity/index.vue
View file @ 730ab959
...@@ -195,7 +195,9 @@ body, ...@@ -195,7 +195,9 @@ body,
#app { #app {
height: 100%; height: 100%;
} }
.cr-back-top__txt {
margin-top: -1.5px;
}
.cr-popup .cr-notify { .cr-popup .cr-notify {
font-size: 14px; font-size: 14px;
} }
......
app/web/page/activity/view/activity/index.ts
View file @ 730ab959
...@@ -35,12 +35,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) { ...@@ -35,12 +35,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
} }
get backTopList() { get backTopList() {
return isApp && this.pageData && this.pageData.props.showShopCart ? [ return isApp && this.pageData && this.pageData.props.btAttachVal ? this.pageData.props.btAttachVal : [];
{
icon: 'shopping-cart-o',
url: 'xyqb://shoppingCartTab'
}
] : [];
} }
@Watch('pageData', { deep: true }) @Watch('pageData', { deep: true })
......
app/web/page/store/modules/activity/state.ts
View file @ 730ab959
...@@ -64,17 +64,19 @@ export const defaultState = { ...@@ -64,17 +64,19 @@ export const defaultState = {
backgroundImage: '' backgroundImage: ''
}, },
props: { props: {
showPageBottomTip: true,
pageBottomTxt: '没有更多啦～',
pageBottomColor: '#fff',
showBackTop: true, showBackTop: true,
showShopCart: true, btAttachVal: [
backTopAttachInfo: [
{ {
name: '购物车',
icon: 'shopping-cart-o', icon: 'shopping-cart-o',
url: 'xyqb://shoppingCartTab' url: 'xyqb://shoppingCartTab',
color: '#333',
background: '#fff'
} }
], ],
showPageBottomTip: true,
pageBottomTxt: '没有更多啦～',
pageBottomColor: '#fff'
}, },
elements: [], elements: [],
} }
......
app/web/view/layout.html
View file @ 730ab959
...@@ -172,6 +172,9 @@ ...@@ -172,6 +172,9 @@
.cr-popup .cr-notify { .cr-popup .cr-notify {
font-size: 14px; font-size: 14px;
} }
.cr-back-top__txt {
margin-top: -1.5px;
}
.cr-toast .cr-toast--inner { .cr-toast .cr-toast--inner {
box-sizing: content-box; box-sizing: content-box;
......
package-lock.json
View file @ 730ab959
...@@ -1648,9 +1648,9 @@ ...@@ -1648,9 +1648,9 @@
"integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg==" "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.21.1-beta9", "version": "2.21.1-beta10",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta9.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta10.tgz",
"integrity": "sha512-evaqcwGPrg/RqgHZW3pFU2QpvmIlNZMA83QdGV7U58XrkTuQ4C4wE6FgB0M7kGTZzf/IpfjOZL5ZuGfSaOlGUw==", "integrity": "sha512-AP6XHWzqJmsfU8veNwtfQbDpjVtDG0yTJZDsetWGV+XBKJU0d7jrJRaoeAqsRvJ/YaAZwtsAs1LfRSd+k7a6xA==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
...@@ -1658,9 +1658,9 @@ ...@@ -1658,9 +1658,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.1.15-beta6", "version": "0.1.15-beta7",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta6.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta7.tgz",
"integrity": "sha512-SjzMlXC5L3ca+/BL0KfACju7njTO0hdU9OiHx+fIZEh1Z45ft59XUHWl5HY2+qMlGWlDxK7eVvJydtmBvNYVcA==", "integrity": "sha512-o0n726pSjG5b2Xgd9A5pE0ApM2KN0oo5nlaEeZPr18hYmBfNdVeHdMkonllkoUcHHvC3bf6Cgzp9qcLOGsN/hA==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.21.1-beta5", "@qg/cherry-ui": "^2.21.1-beta5",
...@@ -1672,6 +1672,18 @@ ...@@ -1672,6 +1672,18 @@
"swiper": "^4.5.1", "swiper": "^4.5.1",
"vuex": "^3.6.0", "vuex": "^3.6.0",
"weixin-js-sdk": "^1.6.0" "weixin-js-sdk": "^1.6.0"
},
"dependencies": {
"@qg/cherry-ui": {
"version": "2.21.1-beta9",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta9.tgz",
"integrity": "sha512-evaqcwGPrg/RqgHZW3pFU2QpvmIlNZMA83QdGV7U58XrkTuQ4C4wE6FgB0M7kGTZzf/IpfjOZL5ZuGfSaOlGUw==",
"requires": {
"@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3",
"vue-video-player": "^5.0.2"
}
}
} }
}, },
"@qg/js-bridge": { "@qg/js-bridge": {
...@@ -20870,9 +20882,9 @@ ...@@ -20870,9 +20882,9 @@
"integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
}, },
"rollup": { "rollup": {
"version": "2.52.2", "version": "2.52.3",
"resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.52.2.tgz", "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.52.3.tgz",
"integrity": "sha512-4RlFC3k2BIHlUsJ9mGd8OO+9Lm2eDF5P7+6DNQOp5sx+7N/1tFM01kELfbxlMX3MxT6owvLB1ln4S3QvvQlbUA==", "integrity": "sha512-QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg==",
"requires": { "requires": {
"fsevents": "~2.3.2" "fsevents": "~2.3.2"
}, },
...@@ -20949,9 +20961,9 @@ ...@@ -20949,9 +20961,9 @@
} }
}, },
"sa-sdk-javascript": { "sa-sdk-javascript": {
"version": "1.18.1", "version": "1.18.2",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.1.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.18.2.tgz",
"integrity": "sha512-mMf79NsBNRR6qQ4fVU9IAcDMvlDpp2q2uJd/0BSKGT2ZGSzVieo7OsGK/AUm5LzO/Ch9IbXQgePiL2GXFgXf6A==" "integrity": "sha512-DzNLzfhfOlQluu/UxYjm5ri2qjHy1mND5l+CX+jDM150GUZmArxEnJ+vyeLMT0oHRYfAksxegsObSeYxVhXVxw=="
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.2.1", "version": "5.2.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