Merge branch 'feature/xym' into 'release'

Feature/xym

See merge request !11

src/store/modules/user.js

@@ -40,7 +40,9 @@ const user = {
       console.log('setToken 2', params);
       commit('SET_TOKEN', params);
       localStorage.setItem('couponToken', params);
+      localStorage.setItem('mallToken', params);
       setCookie('couponToken', params)
+      setCookie('mallToken', params)
       dispatch('getUserInfo');
     },
     // 获取用户信息

src/views/coupon/components/coupon-tips.vue

@@ -51,7 +51,7 @@
 </template>
 <script>
 import { getWebPageUrl } from "@/utils";
-
+import { setCookie, getCookie, delCookie } from '@/utils/index';
 export default {
   components: {},
   props: {
@@ -74,6 +74,7 @@ export default {
   data() {
     return {
       currentIndex: 0,
+      token: ''
     };
   },
   mounted() { },
@@ -93,8 +94,20 @@ export default {
       this.$emit('update:visible', false);
       this.$emit('close', false);
     },
+    getUrlKey(name) {
+      if (decodeURIComponent && location.href) {
+        return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+      } else {
+        return null
+      }
+    },
     navigateToWithdraw() {
-        let webUrl = getWebPageUrl(`mall/banlance-detail?type=1`);
+      let query = this.$route.query
+      this.token = this.getUrlKey('token') || (query && query.token)
+      let token = this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken || localStorage.getItem("couponToken") || getCookie("couponToken")
+      setCookie("mallToken", token)
+      let webUrl = getWebPageUrl(`mall/banlance-detail?token=${token}&type=1&formType=exam`);
+      console.log("🚀 ~ navigateToWithdraw ~ webUrl:", webUrl)
       location.replace(webUrl);
       return
     }