diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 89a4b636a..29e48a8cb 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -34,3 +34,4 @@
 @import './switch-cell.css';
 @import './express-way.css';
 @import './pay-order.css';
+@import './order-goods.css';
diff --git a/test/unit/specs/order-goods.spec.js b/test/unit/specs/order-goods.spec.js
index e950889f0..eef2d8ca5 100644
--- a/test/unit/specs/order-goods.spec.js
+++ b/test/unit/specs/order-goods.spec.js
@@ -76,6 +76,8 @@ describe('OrderGoods', () => {
       }
     });
 
+    wrapper.find('.van-button')[0].trigger('click');
+
     DOMChecker(wrapper, {
       text: {
         '.van-order-goods-empty p': '当前没有可购买的商品，请重新选择',
@@ -91,7 +93,6 @@ describe('OrderGoods', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
       propsData: {
-        itemList: [],
         emptyIcon: 'https://img.yzcdn.cn/upload_files/2017/07/01/FlIeRrn5bMRoWhcwp4Dp1TmVAXKy.jpg',
         emptyMessage: '测试',
         emptyButtonText: '测试'
@@ -109,6 +110,28 @@ describe('OrderGoods', () => {
     });
   });
 
+  it('edit message', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        message: ''
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.value = val;
+    });
+
+    const textarea = wrapper.find('textarea')[0];
+    textarea.value = '测试留言';
+    textarea.trigger('input');
+
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.value).to.equal('测试留言');
+    });
+  });
+
   it('message not editable', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
@@ -126,6 +149,29 @@ describe('OrderGoods', () => {
     });
   });
 
+  it('message not editable && empty', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        message: '',
+        messageEditable: false
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.value = val;
+    });
+
+    wrapper.vm.$nextTick(() => {
+      DOMChecker(wrapper, {
+        text: {
+          '.van-order-goods-message p': '无'
+        }
+      });
+    });
+  });
+
   it('points props', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
@@ -228,8 +274,26 @@ describe('OrderGoods', () => {
       count: {
         '.van-order-goods-card__message-button': 1,
         '.van-order-goods-card__message li': 2
+      },
+      style: {
+        '.van-order-goods-card__message': {
+          'display': 'none'
+        }
       }
     });
+
+    const messageButton = wrapper.find('.van-order-goods-card__message-button')[0];
+    messageButton.trigger('click');
+
+    setTimeout(function() {
+      DOMChecker(wrapper, {
+        noStyle: {
+          '.van-order-goods-card__message': {
+            'display': 'none'
+          }
+        }
+      });
+    }, 300);
   });
 
   it('multi items', () => {