合并分支 'test' 到 'dev'

fix

1. frame 地址跟随域名

查看合并请求 !184

components/showcase/marketFrame.vue

@@ -4,7 +4,7 @@
        <div class="mask" @click="_close"></div>
        <div class="mask" @click="_close"></div>
        <div class="box" @click.stop>
        <div class="box" @click.stop>
          <iframe
          <iframe
-           :src="marketSrc ? `${DEF_SITE}/shop${marketSrc}` : `${DEF_SITE}/shop/showcase?uin=${channelInfo.uin}&caseId=${caseInfo.caseId}`"
+           :src="marketSrc ? `${origin}/shop${marketSrc}` : `${origin}/shop/showcase?uin=${channelInfo.uin}&caseId=${caseInfo.caseId}`"
            width="100%"
            width="100%"
            height="100%"
            height="100%"
          />
          />
@@ -20,12 +20,13 @@ export default {
     value: {},
     value: {},
     marketSrc: {
     marketSrc: {
       type: String,
       type: String,
-      default: ''
+      default: '',
     }
     }
   },
   },
   data() {
   data() {
     return {
     return {
-      show: false
+      show: false,
+      origin: process.env.DEF_SITE
     };
     };
   },
   },
   computed: {
   computed: {
@@ -49,6 +50,9 @@ export default {
       return process.env.DEF_SITE
       return process.env.DEF_SITE
     }
     }
   },
   },
+  mounted() {
+    this.origin = window.location.origin
+  },
   methods: {
   methods: {
     _close() {
     _close() {
       this.isShow = false;
       this.isShow = false;
@@ -100,7 +104,7 @@ export default {
         }
         }
     },
     },
     goMarket() {
     goMarket() {
-      window.location.href = `${this.DEF_SITE}/shop/home?uin=${this.channelInfo.uin}`
+      window.location.href = `${origin}/shop/home?uin=${this.channelInfo.uin}`
     }
     }
   },
   },
   watch: {
   watch: {