fix app go.back

@@ -212,17 +212,9 @@ const yoho = {
      * @param success 调用成功的回调方法
      * @param success 调用成功的回调方法
      * @param fail 调用失败的回调方法
      * @param fail 调用失败的回调方法
      */
      */
-  goNewPage(args, success, fail) {
-    if (this.isApp && window.yohoInterface) {
-      if (args.header && args.header.headerid === '-1') {
-        args.showScrollbar = 'no';
-      }
+  goNewPage(args) {
+    if (this.isYohoBuy) {
 
 
-      window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
-        method: 'go.newPage',
-        arguments: args
-      });
-    } else if (this.isYohoBuy) {
       let url = args.url;
       let url = args.url;
 
 
       if (url.indexOf('openby:') < 0) {
       if (url.indexOf('openby:') < 0) {

 <template>
 <template>
-    <div :class="prefixCls" v-show="show"><slot></slot></div>
+  <div :class="prefixCls" v-show="show">
+    <slot></slot>
+  </div>
 </template>
 </template>
 <script>
 <script>
-    const prefixCls = 'yoho-tabs-tabpane';
+const prefixCls = 'yoho-tabs-tabpane';
 
 
-    export default {
+export default {
   name: 'TabPane',
   name: 'TabPane',
   props: {
   props: {
-            index: {
-                type: String
-            },
     label: {
     label: {
       type: String,
       type: String,
       default: ''
       default: ''
@@ -19,36 +18,28 @@
       default: false
       default: false
     }
     }
   },
   },
-        data () {
+  data() {
     return {
     return {
       prefixCls: prefixCls,
       prefixCls: prefixCls,
-                show: true
+      show: this.disabled
     };
     };
   },
   },
   methods: {
   methods: {
-            updateNav () {
+    updateNav() {
       this.$parent.updateNav();
       this.$parent.updateNav();
     }
     }
   },
   },
-        watch: {
-            label () {
-                this.updateNav();
-            },
-            disabled () {
-                this.updateNav();
-            }
-        },
-        created () {
+  created() {
     this.updateNav();
     this.updateNav();
   }
   }
-    };
+};
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-.yoho-tabs-tabpane {
-  background: #F0F0F0;
+  .yoho-tabs-tabpane {
+    background: #f0f0f0;
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
-}
+  }
 </style>
 </style>
 
 

@@ -2,10 +2,10 @@
   <div :class="classes">
   <div :class="classes">
     <slot name="tabs" v-bind:navList="navList">
     <slot name="tabs" v-bind:navList="navList">
       <div :class="[prefixCls + '-bar']">
       <div :class="[prefixCls + '-bar']">
-        <span class="back">
+        <span class="back" @click="onBackClick">
           <i class="iconfont fontcls">&#xe763;</i>
           <i class="iconfont fontcls">&#xe763;</i>
         </span>
         </span>
-        <span class="help">
+        <span class="help" @click="onHelpClick">
           <i class="iconfont fontcls">&#xe630;</i>
           <i class="iconfont fontcls">&#xe630;</i>
         </span>
         </span>
         <div>
         <div>
@@ -26,7 +26,7 @@
 
 
 <script>
 <script>
 export default {
 export default {
-  name: "Tabs",
+  name: 'Tabs',
   props: {
   props: {
     value: {
     value: {
       type: [String, Number]
       type: [String, Number]
@@ -34,7 +34,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      prefixCls: "yoho-tabs",
+      prefixCls: 'yoho-tabs',
       navList: [],
       navList: [],
       activeKey: this.value
       activeKey: this.value
     };
     };
@@ -44,7 +44,7 @@ export default {
       return [`${this.prefixCls}`];
       return [`${this.prefixCls}`];
     },
     },
     contentClasses() {
     contentClasses() {
-      return [`yoho-tabs-pane`];
+      return ['yoho-tabs-pane'];
     },
     },
     contentStyle() {
     contentStyle() {
       return [];
       return [];
@@ -53,6 +53,7 @@ export default {
   methods: {
   methods: {
     updateNav() {
     updateNav() {
       this.navList = [];
       this.navList = [];
+      console.log();
       this.getTabs().forEach((pane, index) => {
       this.getTabs().forEach((pane, index) => {
         this.navList.push({
         this.navList.push({
           label: pane.label,
           label: pane.label,
@@ -60,7 +61,9 @@ export default {
           disabled: pane.disabled
           disabled: pane.disabled
         });
         });
 
 
-        if (!pane.currentName) pane.currentName = index;
+        if (!pane.currentName) {
+          pane.currentName = index;
+        }
 
 
         if (index === 0) {
         if (index === 0) {
           if (!this.activeKey) {
           if (!this.activeKey) {
@@ -72,7 +75,7 @@ export default {
       this.updateStatus();
       this.updateStatus();
     },
     },
     getTabs() {
     getTabs() {
-      return this.$children.filter(item => item.$options.name === "TabPane");
+      return this.$children.filter(item => item.$options.name === 'TabPane');
     },
     },
     updateStatus() {
     updateStatus() {
       const tabs = this.getTabs();
       const tabs = this.getTabs();
@@ -83,19 +86,27 @@ export default {
       const nav = this.navList[index];
       const nav = this.navList[index];
 
 
       this.activeKey = nav.name;
       this.activeKey = nav.name;
-      this.$emit("input", nav.name);
+      this.$emit('input', nav.name);
     },
     },
     tabCls(item) {
     tabCls(item) {
       return [
       return [
-        "yoho-tab",
+        'yoho-tab',
         {
         {
-          [`yoho-tab-active`]: item.name === this.activeKey
+          ['yoho-tab-active']: item.name === this.activeKey
         }
         }
       ];
       ];
+    },
+    onBackClick() {
+      this.$yoho.finishPage({});
+    },
+    onHelpClick() {
+      this.$yoho.goNewPage({
+        url: window.location.protocol + '//m.yohobuy.com/service/qaDetail?keyword=%E4%BC%98%E6%83%A0%E5%88%B8&sonId=181'
+      });
     }
     }
   },
   },
   watch: {
   watch: {
-    activeKey(val) {
+    activeKey() {
       this.updateStatus();
       this.updateStatus();
     },
     },
     value(val) {
     value(val) {
@@ -103,7 +114,7 @@ export default {
     }
     }
   },
   },
   created() {
   created() {
-    // this.updateNav();
+    this.updateNav();
   }
   }
 };
 };
 </script>
 </script>
@@ -120,7 +131,7 @@ $yoho-tab: yoho-tab;
   display: inline-block;
   display: inline-block;
   width: 200px;
   width: 200px;
   height: 56px;
   height: 56px;
-  font-size: 12px;
+  font-size: 24px;
   color: white;
   color: white;
   border: 1px solid white;
   border: 1px solid white;
   box-sizing: border-box;
   box-sizing: border-box;
@@ -129,6 +140,10 @@ $yoho-tab: yoho-tab;
   line-height: 56px;
   line-height: 56px;
 }
 }
 
 
+.#{$yoho-tab} + .#{$yoho-tab} {
+  border-left: none;
+}
+
 .#{$yoho-tab}s-bar {
 .#{$yoho-tab}s-bar {
   width: 100%;
   width: 100%;
   height: 90px;
   height: 90px;
@@ -136,12 +151,11 @@ $yoho-tab: yoho-tab;
   background: #3a3a3a;
   background: #3a3a3a;
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;
-  position: fixed;
   z-index: 4;
   z-index: 4;
 }
 }
 
 
 .#{$yoho-tab}-active {
 .#{$yoho-tab}-active {
-  color: #444444;
+  color: #444;
   background-color: white;
   background-color: white;
 }
 }
 
 
@@ -156,13 +170,23 @@ $yoho-tab: yoho-tab;
 }
 }
 
 
 .back {
 .back {
+  display: inline-block;
+  width: 90px;
+  height: 90px;
+  line-height: 90px;
   position: absolute;
   position: absolute;
-  left: 20px;
+  left: 0;
+  text-align: center;
 }
 }
 
 
 .help {
 .help {
+  display: inline-block;
+  width: 90px;
+  height: 90px;
+  line-height: 90px;
   position: absolute;
   position: absolute;
-  right: 20px;
+  right: 0;
+  text-align: center;
 }
 }
 </style>
 </style>
 
 

-import Ufo from './ufo';
-import Yoho from './yoho';
-import Header from './components/header';
+import YohoPage from './list';
 
 
 export default [{
 export default [{
-  path: '/mapp/coupon',
-  component: Header,
-  children: [Ufo, Yoho]
+  path: '/mapp/coupon/yoho.html',
+  component: YohoPage,
 }];
 }];

+<template>
+  <LayoutApp>
+    <Tabs>
+      <template slot="panes">
+        <TabPane label="有货优惠券" disable="true">
+          <YohoPage></YohoPage>
+        </TabPane>
+        <TabPane label="UFO优惠券" disable="false">
+          <UfoPage></UfoPage>
+        </TabPane>
+      </template>
+    </Tabs>
+  </LayoutApp>
+</template>
+
+<script>
+
+import Tabs from './components/tabs';
+import YohoPage from './yoho';
+import UfoPage from './ufo';
+const TYPE = {notuse: 'notuse', use: 'use', overtime: 'overtime'};
+
+export default {
+  name: 'ListPage',
+  asyncData({store}) {
+    return Promise.all([
+      store.dispatch('coupon/yoho/fetchYohoList', {
+        type: TYPE.notuse,
+        refresh: true
+      }),
+      store.dispatch('coupon/yoho/fetchYohoList', {
+        type: TYPE.use,
+        refresh: true
+      }),
+      store.dispatch('coupon/yoho/fetchYohoList', {
+        type: TYPE.overtime,
+        refresh: true
+      }),
+      store.dispatch('coupon/yoho/fetchUfoList', {
+        limit: 100,
+        page: 1
+      }),
+    ]);
+  },
+  components: {
+    Tabs,
+    TabPane: Tabs.Pane,
+    YohoPage,
+    UfoPage
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

-export default {
-  path: 'ufo.html',
-  name: 'couponUfo',
-  component: () => import(/* webpackChunkName: "coupon" */ './list')
-};
+// export default {
+//   path: 'ufo.html',
+//   name: 'couponUfo',
+//   component: () => import(/* webpackChunkName: "coupon" */ './list')
+// };
+
+
+import UfoList from './list';
+
+export default UfoList;

@@ -21,12 +21,6 @@ export default {
   computed: {
   computed: {
     ...mapState(['ufoList']),
     ...mapState(['ufoList']),
   },
   },
-  asyncData({store}) {
-    return store.dispatch('coupon/yoho/fetchUfoList', {
-      limit: 100,
-      page: 1
-    });
-  },
   data() {
   data() {
     return {
     return {
       scrollOptions: {
       scrollOptions: {
@@ -40,6 +34,12 @@ export default {
   mounted() {
   mounted() {
   },
   },
   methods: {
   methods: {
+    getList() {
+      return this.$store.dispatch('coupon/yoho/fetchUfoList', {
+        limit: 100,
+        page: 1
+      });
+    }
   },
   },
   components: {
   components: {
     ScrollView,
     ScrollView,

-export default {
-  path: 'yoho.html',
-  name: 'couponYoho',
-  component: () => import(/* webpackChunkName: "coupon" */ './list')
-};
+// export default {
+//   path: 'yoho.html',
+//   name: 'couponYoho',
+//   component: () => import(/* webpackChunkName: "coupon" */ './list')
+// };
+
+import YohoList from './list';
+
+export default YohoList;

@@ -63,22 +63,6 @@ const TYPE = {notuse: 'notuse', use: 'use', overtime: 'overtime'};
 
 
 export default {
 export default {
   name: 'YohoCouponListPage',
   name: 'YohoCouponListPage',
-  asyncData({store}) {
-    return Promise.all([
-      store.dispatch('coupon/yoho/fetchYohoList', {
-        type: TYPE.notuse,
-        refresh: true
-      }),
-      store.dispatch('coupon/yoho/fetchYohoList', {
-        type: TYPE.use,
-        refresh: true
-      }),
-      store.dispatch('coupon/yoho/fetchYohoList', {
-        type: TYPE.overtime,
-        refresh: true
-      })
-    ]);
-  },
   data() {
   data() {
     return {
     return {
       selectIndex: 0,
       selectIndex: 0,
@@ -134,8 +118,6 @@ export default {
       return index;
       return index;
     }
     }
   },
   },
-  created() {
-  },
   mounted() {
   mounted() {
     this.fetchYohoNum();
     this.fetchYohoNum();
   },
   },
@@ -162,12 +144,16 @@ export default {
           this.inputCouponCode = '';
           this.inputCouponCode = '';
           this.$createToast({
           this.$createToast({
             txt: result.message,
             txt: result.message,
-            type: 'correct'
+            type: 'txt',
+            mask: true,
+            time: 1000
           }).show();
           }).show();
         } else {
         } else {
           this.$createToast({
           this.$createToast({
             txt: result.message,
             txt: result.message,
-            type: 'error'
+            type: 'txt',
+            mask: true,
+            time: 1000
           }).show();
           }).show();
         }
         }
       });
       });