Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/components/sharePic.vue

@@ -102,9 +102,9 @@
           style="width: 653px;font-size: 34px;padding-left: 32px;margin-right: 10px;"
         >
           <span class="groupPriceContainer">拼团价 ¥</span>
-          <span class="groupPrice" style="font-size: 64px;margin-right: 10px;">¥0</span>
+          <span class="groupPrice" style="font-size: 64px;margin-right: 15px;">¥0</span>
           <span class="salePrice" style="line-height: 134px;font-size: 34px;"
-            >¥{{ sharePicData.activityPrice }}</span
+            >售价¥{{ sharePicData.activityPrice }}</span
           >
         </div>
         <div class="skuSuccess">
@@ -375,10 +375,10 @@ body {
   display: inline-block;
   color: @white;
 }
-.skuImg .skuInfo .skuPrice .salePrice {
-  text-decoration: line-through;
-  font-weight: lighter;
-}
+// .skuImg .skuInfo .skuPrice .salePrice {
+// text-decoration: line-through;
+// font-weight: lighter;
+// }
 .skuImg .skuInfo .skuSuccess {
   flex: 1;
   flex-shrink: 0;

src/mixins/goodsCheck.mixin.js

@@ -2,7 +2,7 @@ import Bridge from '@qg/js-bridge';
 import MpBridge from '@/service/mp';
 import { isWxMp, isApp } from '@/service/validation.service';
 import localStorage from '@/service/localStorage.service';
-import cookies from '@/service/cookieStorage.service';
+import sessionStorage from '@/service/sessionStorage.service';
 export default {
   data() {
     return {
@@ -18,8 +18,10 @@ export default {
           const appData = json.data || {};
           if (appData && appData.token) {
             localStorage.set('vccToken', appData.token);
-            cookies.set('vccToken', appData.token);
-            // window.sessionStorage.setItem('vccToken', appData.token);
+            sessionStorage.set('vccToken', appData.token);
+            // const query = JSON.parse(JSON.stringify(_this.$route.query));
+            // const name = _this.$route.name;p
+            // query.vccToken = appData.token;
             _this.$nextTick(() => {
               window.location.reload();
             });
@@ -30,7 +32,6 @@ export default {
     },
     checkLogin() {
       const vccToken = localStorage.get('vccToken');
-      this.$toast(vccToken);
       const needLogin = vccToken ? false : true;
       if (needLogin) {
         if (isApp) this.nativeBridge = new Bridge();

src/service/init.service.js

@@ -5,18 +5,17 @@ import store from '../store';
 import { isWechat, isApp, isAndroid, isIOS } from './validation.service';
 import Cookies from './cookieStorage.service';
 import localStorage from './localStorage.service';
+import sessionStorage from './sessionStorage.service';
 // import { Toast } from '@qg/cherry-ui';
 
 export default {
   // token校验，整个流程都是登陆后的
   init: router => {
     router.beforeEach((to, from, next) => {
-      console.log(!to.query.vccToken);
-      // if (!to.query.vccToken) {
-      //   to.query.vccToken = Cookies.get('vccToken') || '';
-      // }
-      localStorage.remove('vccToken');
       Cookies.set('h', 0);
+      if (!to.query.vccToken) {
+        to.query.vccToken = sessionStorage.get('vccToken') || '';
+      }
       // 所有自定义路由字段在此处理
       const { meta } = to;
       isWechat && localStorage.set('vccChannel', '159913');
@@ -29,16 +28,13 @@ export default {
         const value = to.query[item];
         if (item === 'vccToken' && value === '') {
           localStorage.remove('vccToken');
-          Cookies.remove('vccToken');
+          sessionStorage.remove(item);
         }
         if (value && value !== '{token}' && value !== '{vccToken}') {
-          console.log(item, value);
           localStorage.set(item, value);
-          Cookies.set(item, value);
+          sessionStorage.set(item, value);
         }
       });
-      // alert(Cookies.get('vccToken'));
-      localStorage.set('vccToken', Cookies.get('vccToken') || '');
       (isWechat || isApp || Cookies.get('h') === '0') && store.commit('CHANGE_HEADER', false); // 改变header
       document.body.className = store.state.pay.header ? 'has-header' : '';
       store.commit('CHANGE_TITLE', meta?.title); // 改变title

src/service/sessionStorage.service.js

+export default {
+  get(key) {
+    let result = window.sessionStorage.getItem(key);
+    try {
+      return JSON.parse(result);
+    } catch (e) {
+      return result;
+    }
+  },
+  set(key, value) {
+    let toString = Object.prototype.toString;
+    if (toString.call(value) === '[object Array]' || toString.call(value) === '[object Object]') {
+      value = JSON.stringify(value);
+    }
+    return window.sessionStorage.setItem(key, value);
+  },
+  remove(key) {
+    return window.sessionStorage.removeItem(key);
+  },
+  clear() {
+    return window.sessionStorage.clear();
+  }
+};

src/views/goodsDetail/index.vue

@@ -269,6 +269,7 @@ export default {
     })
   },
   created() {
+    console.log(this.$route);
     this.hasLogin = localStorage.get('vccToken') ? true : false;
     this.detailParam = { ...this.$route.query };
     localStorage.remove('orderData');