From 606c2896c13e0540e335316491498b1230fc3826 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 12 Oct 2018 16:36:57 +0800
Subject: [PATCH] [improvement] add link mixin (#750)

---
 packages/card/index.ts  | 22 +++++++++-------------
 packages/cell/index.ts  | 18 +++---------------
 packages/mixins/link.ts | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 packages/mixins/link.ts

diff --git a/packages/card/index.ts b/packages/card/index.ts
index 1de5bfeb..97f96767 100644
--- a/packages/card/index.ts
+++ b/packages/card/index.ts
@@ -1,33 +1,32 @@
+import { link } from '../mixins/link';
 import { VantComponent } from '../common/component';
 
 VantComponent({
   classes: [
+    'num-class',
+    'desc-class',
     'thumb-class',
     'title-class',
     'price-class',
     'origin-price-class',
-    'desc-class',
-    'num-class'
   ],
 
+  mixins: [link],
+
   props: {
     tag: String,
     num: String,
     desc: String,
     thumb: String,
-    thumbMode: {
-      type: String,
-      value: 'scaleToFill'
-    },
     title: String,
     price: String,
-    originPrice: String,
     centered: Boolean,
     lazyLoad: Boolean,
     thumbLink: String,
-    linkType: {
+    originPrice: String,
+    thumbMode: {
       type: String,
-      value: 'navigateTo'
+      value: 'scaleToFill'
     },
     currency: {
       type: String,
@@ -37,10 +36,7 @@ VantComponent({
 
   methods: {
     onClickThumb() {
-      const { thumbLink } = this.data;
-      if (thumbLink) {
-        wx[this.data.linkType]({ url: thumbLink });
-      }
+      this.jumpLink('thumbLink');
     }
   }
 });
diff --git a/packages/cell/index.ts b/packages/cell/index.ts
index b3c2edc7..2dd8ca41 100644
--- a/packages/cell/index.ts
+++ b/packages/cell/index.ts
@@ -1,3 +1,4 @@
+import { link } from '../mixins/link';
 import { VantComponent } from '../common/component';
 
 VantComponent({
@@ -7,10 +8,11 @@ VantComponent({
     'value-class'
   ],
 
+  mixins: [link],
+
   props: {
     title: null,
     value: null,
-    url: String,
     icon: String,
     label: String,
     center: Boolean,
@@ -19,10 +21,6 @@ VantComponent({
     clickable: Boolean,
     titleWidth: String,
     customStyle: String,
-    linkType: {
-      type: String,
-      value: 'navigateTo'
-    },
     border: {
       type: Boolean,
       value: true
@@ -44,15 +42,5 @@ VantComponent({
       const { titleWidth } = this.data;
       return titleWidth ? `max-width: ${titleWidth};min-width: ${titleWidth}` : '';
     }
-  },
-
-  methods: {
-    onClick() {
-      const { url } = this.data;
-      if (url) {
-        wx[this.data.linkType]({ url });
-      }
-      this.$emit('click');
-    }
   }
 });
diff --git a/packages/mixins/link.ts b/packages/mixins/link.ts
new file mode 100644
index 00000000..cea51e02
--- /dev/null
+++ b/packages/mixins/link.ts
@@ -0,0 +1,18 @@
+export const link = Behavior({
+  properties: {
+    url: String,
+    linkType: {
+      type: String,
+      value: 'navigateTo'
+    }
+  },
+
+  methods: {
+    jumpLink(urlKey = 'url') {
+      const url = this.data[urlKey];
+      if (url) {
+        wx[this.data.linkType]({ url });
+      }
+    }
+  }
+});