Merge branch 'fix/mp' into 'master'

Fix/mp

See merge request !14

app/web/component/layout/activity/index.ts

@@ -26,10 +26,10 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production')
 // }
 
 if (EASY_ENV_IS_BROWSER) {
+  Vue.use(lazyload);
   const saDirective = new SaDirective();
   Vue.directive('track', saDirective.directive);
 }
-Vue.use(lazyload);
 @Component({
   name: 'Layout'
 })

app/web/config/dev.config.ts

@@ -5,7 +5,7 @@ export default {
   // apiHost: `http://192.168.28.199:7001/`,
   apiHost: 'https://quantum-blocks-vcc2.liangkebang.net/',
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
-  opapiHost: `https://opapi-vcc2.liangkebang.net`,
+  // opapiHost: `https://opapi-vcc2.liangkebang.net`,
   kdspHost: 'https://kdsp-api-vcc2.liangkebang.net',
   test: true
 };

app/web/config/prod.config.ts

@@ -3,6 +3,6 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 export default {
   apiHost: `https://quantum-blocks.q-gp.com/`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=production`,
-  opapiHost: `${protocol}//opapi.q-gp.com`,
+  // opapiHost: `${protocol}//opapi.q-gp.com`,
   test: false
 };

app/web/config/test.config.ts

@@ -2,7 +2,7 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
 export default {
   apiHost: `https://quantum-blocks-vcc2.liangkebang.net/`,
-  opApiHost: 'https://opapi-vcc2.liangkebang.net',
+  // opApiHost: 'https://opapi-vcc2.liangkebang.net',
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
   test: true
 };

app/web/service/init.service.ts

@@ -14,20 +14,22 @@ export default {
       const { meta } = to;
 
       // meta?.has?.header && store.commit('CHANGE_HEADER', meta.has.header); // 改变header
-      localStorageParams.forEach(item => {
-        if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
-          localStorage.set(item, to.query[item]);
-        } else {
-          localStorage.set(item, '');
-        }
-      });
-      cookiesParams.forEach(item => {
-        if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
-          Cookies.set(item, to.query[item]);
-        } else {
-          Cookies.remove(item);
-        }
-      });
+      if (router.mode === 'history' && !to.hash) {
+        localStorageParams.forEach(item => {
+          if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
+            localStorage.set(item, to.query[item]);
+          } else {
+            localStorage.set(item, '');
+          }
+        });
+        cookiesParams.forEach(item => {
+          if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
+            Cookies.set(item, to.query[item]);
+          } else {
+            Cookies.remove(item);
+          }
+        });
+      }
 
       // (isWechat || isApp || Cookies.get('h') === '0') && store.commit('CHANGE_HEADER', false); // 改变header
       // document.body.className = store.state.pay.header ? 'has-header' : '';
@@ -36,4 +38,4 @@ export default {
       next();
     });
   }
-};
+};
\ No newline at end of file

app/web/service/qg.service.ts

@@ -40,6 +40,8 @@ import Notify from '@qg/cherry-ui/src/notify';
 import Toast from '@qg/cherry-ui/src/toast';
 import citrusUi from '@qg/citrus-ui';
 import Loading from '@qg/cherry-ui/src/loading';
+import Text from '@qg/cherry-ui/src/text';
+import Tag from '@qg/cherry-ui/src/tag';
 
 Vue.use(Button);
 Vue.use(Image);
@@ -67,6 +69,8 @@ Vue.use(Tabs);
 // Vue.use(SwipeItem);
 // Vue.use(Swipe);
 Vue.use(BackTop);
+Vue.use(Text);
+Vue.use(Tag);
 
 Vue.use(citrusUi);
 

app/web/view/layout.html

@@ -152,8 +152,8 @@
       }
 
       *,
-      *:before,
-      *:after {
+      *::before,
+      *::after {
         box-sizing: border-box;
       }
 
@@ -176,13 +176,15 @@
         box-sizing: content-box;
       }
 
-      @media screen and (min-width: 769Px) {
+      @media screen and (min-width: 769px) {
         html {
-          font-size: 37.5Px !important;
+          font-size: 37.5px !important;
         }
+
         body {
-          max-width: 375Px;
-          /*max-height: 667Px;*/
+          max-width: 375px;
+
+          /* max-height: 667Px; */
           margin: 0 auto !important;
         }
       }
@@ -199,44 +201,52 @@
         z-index: 999;
         background-color: #fff;
       }
+
       .mainload .container {
         text-align: center;
       }
+
       .mainload p {
         font-size: 16px;
         color: #666;
         margin-top: 10px;
       }
+
       .mainload .circular {
         height: 36px;
         width: 36px;
         animation: loading-rotate 2s linear infinite;
       }
+
       .mainload .path {
         animation: loading-dash 1.5s ease-in-out infinite;
-        stroke-dasharray: 90,150;
+        stroke-dasharray: 90, 150;
         stroke-dashoffset: 0;
         stroke-width: 3;
         stroke: #ec3333;
         stroke-linecap: round;
       }
+
       @keyframes loading-rotate {
         to {
-          transform: rotate(1turn)
+          transform: rotate(1turn);
         }
       }
+
       @keyframes loading-dash {
         0% {
-          stroke-dasharray: 1,200;
-          stroke-dashoffset: 0
+          stroke-dasharray: 1, 200;
+          stroke-dashoffset: 0;
         }
+
         50% {
-          stroke-dasharray: 90,150;
-          stroke-dashoffset: -40px
+          stroke-dasharray: 90, 150;
+          stroke-dashoffset: -40px;
         }
+
         to {
-          stroke-dasharray: 90,150;
-          stroke-dashoffset: -120px
+          stroke-dasharray: 90, 150;
+          stroke-dashoffset: -120px;
         }
       }
 
@@ -247,9 +257,11 @@
         overflow: hidden;
         list-style: none;
         padding: 0;
+
         /* Fix of Webkit flickering */
         z-index: 1;
       }
+
       .swiper-wrapper {
         position: relative;
         width: 100%;
@@ -267,16 +279,19 @@
         -webkit-box-sizing: content-box;
         box-sizing: content-box;
       }
+
       .swiper-container-android .swiper-slide,
       .swiper-wrapper {
-        -webkit-transform: translate3d(0px, 0, 0);
-        transform: translate3d(0px, 0, 0);
+        -webkit-transform: translate3d(0, 0, 0);
+        transform: translate3d(0, 0, 0);
       }
+
       .swiper-container-multirow > .swiper-wrapper {
         -webkit-flex-wrap: wrap;
         -ms-flex-wrap: wrap;
         flex-wrap: wrap;
       }
+
       .swiper-slide {
         -webkit-flex-shrink: 0;
         -ms-flex-negative: 0;
@@ -290,6 +305,7 @@
         transition-property: transform;
         transition-property: transform, -webkit-transform;
       }
+
       .swiper-slide-invisible-blank {
         visibility: hidden;
       }
@@ -310,6 +326,7 @@
     <!-- <script src="https://activitystatic.lkbang.net/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.lkbang.net/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.lkbang.net/swiper/4.5.1/swiper.min.js"></script>
     <script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>

package.json

@@ -21,8 +21,9 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.5",
-    "@qg/cherry-ui": "^2.20.15",
-    "@qg/citrus-ui": "0.0.84",
+    "@qg/apollo-nodejs": "^2.1.2",
+    "@qg/cherry-ui": "2.20.19",
+    "@qg/citrus-ui": "0.1.0",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",

typings/app/controller/index.d.ts

-// This file is created by egg-ts-helper@1.25.8
+// This file is created by egg-ts-helper@1.25.9
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/index.d.ts

-// This file is created by egg-ts-helper@1.25.8
+// This file is created by egg-ts-helper@1.25.9
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/middleware/index.d.ts

-// This file is created by egg-ts-helper@1.25.8
+// This file is created by egg-ts-helper@1.25.9
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/service/index.d.ts

-// This file is created by egg-ts-helper@1.25.8
+// This file is created by egg-ts-helper@1.25.9
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/config/plugin.d.ts

-// This file is created by egg-ts-helper@1.25.8
+// This file is created by egg-ts-helper@1.25.9
 // Do not modify this file!!!!!!!!!
 
 import 'egg';