Skip to content

Q
quantum-blocks-h5
Commit cbef616c authored by shida.liu's avatar shida.liu
Browse files
Options

Merge branch 'master' into feature-20241014-harmony

parents ab1da66e 78af864f
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
.sentryclirc.js
View file @ cbef616c
...@@ -12,7 +12,7 @@ module.exports = { ...@@ -12,7 +12,7 @@ module.exports = {
include: [ include: [
{ {
paths: ['./public/js'], paths: ['./public/js'],
urlPrefix: `https://misc.lkbang.net/qb/` urlPrefix: `https://miscs.91xr.cn/qb/`
} }
] ]
}; };
app/web/component/layout/activity/index.ts
View file @ cbef616c
...@@ -68,12 +68,12 @@ export default class Layout extends Vue { ...@@ -68,12 +68,12 @@ export default class Layout extends Vue {
isNode: boolean = EASY_ENV_IS_NODE; isNode: boolean = EASY_ENV_IS_NODE;
scriptSrc: string[] = [ scriptSrc: string[] = [
// `<script src="https://activitystatic.lkbang.net/vue/2.6.11/vue.min.js"></script>`, // `<script src="https://activitystatic.91xr.cn/vue/2.6.11/vue.min.js"></script>`,
// `<script src="https://activitystatic.lkbang.net/vue-router/3.2.0/vue-router.min.js"></script>`, // `<script src="https://activitystatic.91xr.cn/vue-router/3.2.0/vue-router.min.js"></script>`,
// `<script src="https://activitystatic.lkbang.net/vuex/3.4.0/vuex.min.js"></script>`, // `<script src="https://activitystatic.91xr.cn/vuex/3.4.0/vuex.min.js"></script>`,
`<script src="https://activitystatic.lkbang.net/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>`, `<script src="https://activitystatic.91xr.cn/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>`,
`<script src="https://activitystatic.lkbang.net/swiper/4.5.1/swiper.min.js"></script>`, `<script src="https://activitystatic.91xr.cn/swiper/4.5.1/swiper.min.js"></script>`,
`<script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>` `<script src="https://activitystatic.91xr.cn/axios/0.19.2/axios.min.js"></script>`
]; ];
talosHost: string = config.kdspHost; talosHost: string = config.kdspHost;
get title() { get title() {
......
app/web/component/layout/activity/index.vue
View file @ cbef616c
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover"> <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui,viewport-fit=cover">
<link rel="shortcut icon" href="data:image/png;base64" type="image/x-icon" /> <link rel="shortcut icon" href="data:image/png;base64" type="image/x-icon" />
<link rel="dns-prefetch" :href="talosHost" /> <link rel="dns-prefetch" :href="talosHost" />
<link rel="preconnect" href="https://appsync.lkbang.net"> <link rel="preconnect" href="https://appsync.91xr.cn">
<link rel="dns-prefetch" href="//misc.lkbang.net"> <link rel="dns-prefetch" href="//miscs.91xr.cn">
<link rel="dns-prefetch" href="//appsync.lkbang.net"> <link rel="dns-prefetch" href="//appsync.91xr.cn">
<link rel="dns-prefetch" href="//img.lkbang.net"> <link rel="dns-prefetch" href="//img.91xr.cn">
<link rel="dns-prefetch" href="//img10.360buyimg.com"> <link rel="dns-prefetch" href="//img10.360buyimg.com">
<link rel="dns-prefetch" href="//img11.360buyimg.com"> <link rel="dns-prefetch" href="//img11.360buyimg.com">
<link rel="dns-prefetch" href="//img12.360buyimg.com"> <link rel="dns-prefetch" href="//img12.360buyimg.com">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<link rel="dns-prefetch" href="//img30.360buyimg.com"> <link rel="dns-prefetch" href="//img30.360buyimg.com">
<link rel="dns-prefetch" href="//kdspstatic.q-gp.com"> <link rel="dns-prefetch" href="//kdspstatic.q-gp.com">
<!-- <link rel="stylesheet" href="/public/asset/css/reset.css"> --> <!-- <link rel="stylesheet" href="/public/asset/css/reset.css"> -->
<!-- <link rel="stylesheet" type="text/css" href="https://activitystatic.lkbang.net/swiper/4.5.1/css/swiper.min.css"> --> <!-- <link rel="stylesheet" type="text/css" href="https://activitystatic.91xr.cn/swiper/4.5.1/css/swiper.min.css"> -->
</head> </head>
<body> <body>
<div class="mainload"> <div class="mainload">
......
app/web/lib/config.ts
View file @ cbef616c
...@@ -169,7 +169,7 @@ export const basicComponents = [ ...@@ -169,7 +169,7 @@ export const basicComponents = [
// value: { // value: {
// width: '5.067rem', // width: '5.067rem',
// height: '3.733rem', // height: '3.733rem',
// src: 'https://appsync.lkbang.net/Fs0qmUsMry39AjHDf_W-qgn8XEy6', // src: 'https://appsync.91xr.cn/Fs0qmUsMry39AjHDf_W-qgn8XEy6',
// fit: 'contain', // fit: 'contain',
// }, // },
// commonStyle: {} // commonStyle: {}
......
app/web/page/activity/component/invalidNotice/index.vue
View file @ cbef616c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="invalidModal"> <div class="invalidModal">
<cr-popup v-model="show" round :close-on-click-overlay="false"> <cr-popup v-model="show" round :close-on-click-overlay="false">
<div class="content"> <div class="content">
<img src="https://img.lkbang.net/activityInvalid.18ea3ddc.png" alt=""> <img src="https://img.91xr.cn/activityInvalid.18ea3ddc.png" alt="">
<p class="title">活动已结束</p> <p class="title">活动已结束</p>
<p class="subtitle">请关注更多精彩活动</p> <p class="subtitle">请关注更多精彩活动</p>
<cr-button type="primary" shape="circle" @click="toOtherActivity">去看看其他活动</cr-button> <cr-button type="primary" shape="circle" @click="toOtherActivity">去看看其他活动</cr-button>
......
app/web/view/layout.html
View file @ cbef616c
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8"> <meta http-equiv="content-type" content="text/html;charset=utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no,viewport-fit=cover"> <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no,viewport-fit=cover">
<link rel="shortcut icon" href="data:image/png;base64" type="image/x-icon" /> <link rel="shortcut icon" href="data:image/png;base64" type="image/x-icon" />
<link rel="preconnect" href="https://appsync.lkbang.net"> <link rel="preconnect" href="https://appsync.91xr.cn">
<link rel="dns-prefetch" href="//misc.lkbang.net"> <link rel="dns-prefetch" href="//miscs.91xr.cn">
<link rel="dns-prefetch" href="//appsync.lkbang.net"> <link rel="dns-prefetch" href="//appsync.91xr.cn">
<link rel="dns-prefetch" href="//img.lkbang.net"> <link rel="dns-prefetch" href="//img.91xr.cn">
<link rel="dns-prefetch" href="//img10.360buyimg.com"> <link rel="dns-prefetch" href="//img10.360buyimg.com">
<link rel="dns-prefetch" href="//img11.360buyimg.com"> <link rel="dns-prefetch" href="//img11.360buyimg.com">
<link rel="dns-prefetch" href="//img12.360buyimg.com"> <link rel="dns-prefetch" href="//img12.360buyimg.com">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="dns-prefetch" href="//img20.360buyimg.com"> <link rel="dns-prefetch" href="//img20.360buyimg.com">
<link rel="dns-prefetch" href="//img30.360buyimg.com"> <link rel="dns-prefetch" href="//img30.360buyimg.com">
<link rel="dns-prefetch" href="//kdspstatic.q-gp.com"> <link rel="dns-prefetch" href="//kdspstatic.q-gp.com">
<!-- <link rel="stylesheet" type="text/css" href="https://activitystatic.lkbang.net/swiper/4.5.1/css/swiper.min.css"> --> <!-- <link rel="stylesheet" type="text/css" href="https://activitystatic.91xr.cn/swiper/4.5.1/css/swiper.min.css"> -->
<style> <style>
/* stylelint-disable */ /* stylelint-disable */
/** /**
...@@ -320,11 +320,11 @@ ...@@ -320,11 +320,11 @@
</div> </div>
<!--vue-ssr-outlet--> <!--vue-ssr-outlet-->
</div> </div>
<!-- <script src="https://activitystatic.lkbang.net/vue/2.6.11/vue.min.js"></script> --> <!-- <script src="https://activitystatic.91xr.cn/vue/2.6.11/vue.min.js"></script> -->
<!-- <script src="https://activitystatic.lkbang.net/vue-router/3.2.0/vue-router.min.js"></script> --> <!-- <script src="https://activitystatic.91xr.cn/vue-router/3.2.0/vue-router.min.js"></script> -->
<!-- <script src="https://activitystatic.lkbang.net/vuex/3.4.0/vuex.min.js"></script> --> <!-- <script src="https://activitystatic.91xr.cn/vuex/3.4.0/vuex.min.js"></script> -->
<script src="https://misc.lkbang.net/common/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script> <script src="https://miscs.91xr.cn/common/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>
<script src="https://misc.lkbang.net/common/swiper/4.5.1/swiper.min.js"></script> <script src="https://miscs.91xr.cn/common/swiper/4.5.1/swiper.min.js"></script>
<script src="https://misc.lkbang.net/common/axios/0.19.2/axios.min.js"></script> <script src="https://miscs.91xr.cn/common/axios/0.19.2/axios.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
package-lock.json
View file @ cbef616c
...@@ -2367,9 +2367,9 @@ ...@@ -2367,9 +2367,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.68", "version": "0.3.69",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.68.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.69.tgz",
"integrity": "sha512-kTQtJotTB4DOTN5PLStzhalKSHBEfbPajFlJmsWVfiYaKH607r9SR7FG8bfEiHegIQeJIHFPAfEfQ5htnyF+qg==", "integrity": "sha512-sMA4cUQHkH3OiC2Ycf3IiV7AXeBrlnSlv1Ts43HGqgDVI0KyOwiUEPz1K4KTTo5HJBh2r2uTCanvQJ1EbgB6Yw==",
"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.26.15", "version": "1.26.18",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.26.15.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.26.18.tgz",
"integrity": "sha512-T4i/Oyez82O1GO6PYim2oEn0fW5yN0BYoWv/jGzfYdely3536gwT6e72nmKynqVnMm4v5TRRJdkdCWSWKyJR8Q==" "integrity": "sha512-uTYdeUbP5vkqWhPquaRi2TJzOwQbx4lk6+zgEpPUvU5HIRloaxYWZE15B+02/x16m1ubFk9xOkF77A9qTjMQRQ=="
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.2.1", "version": "5.2.1",
upload-cos.js
View file @ cbef616c
...@@ -3,7 +3,7 @@ const path = require("path"); ...@@ -3,7 +3,7 @@ const path = require("path");
const fs = require('fs'); const fs = require('fs');
const prefix = process.env.COS_ENV === 'production' ? 'qb' : 'qb-test'; const prefix = process.env.COS_ENV === 'production' ? 'qb' : 'qb-test';
const cdnPrefix = `https://misc.lkbang.net/${prefix}/`; const cdnPrefix = `https://miscs.91xr.cn/${prefix}/`;
console.log('prefix', process.env); console.log('prefix', process.env);
......
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