Merge branch 'dev_hxz' of http://120.27.146.32:8888/wangfulong/shop-new into dev_hxz

src/views/system/order/components/orderDetail.vue

@@ -833,6 +833,13 @@ export default {
   /deep/.el-input--medium .el-input__inner {
     height: 28px;
   }
+  /deep/input::-webkit-input-placeholder{
+    color:#606266;
+  }
+  /deep/input::-moz-placeholder{
+    color:#606266;
+    opacity: 1
+  }
 
   .orderDetail {
     height: 660px;