Merge branch 'feature/order_edit' into pre-release

# Conflicts:
#	src/views/ecw/order/index.vue

src/views/ecw/order/detail.vue

@@ -81,10 +81,10 @@
         </el-descriptions-item>
         <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{order.channelName}}</el-descriptions-item>
         <el-descriptions-item :label="$t('服务')" >
-          <el-tag v-if="order.type.indexOf('1') > -1">
+          <el-tag v-if="order.type && order.type.indexOf('1') > -1">
             {{ $t('集运') }}
           </el-tag>
-          <el-tag v-if="order.type.indexOf('2') > -1">
+          <el-tag v-if="order.type && order.type.indexOf('2') > -1">
             {{ $t('海外仓') }}
           </el-tag>
         </el-descriptions-item>

src/views/ecw/order/index.vue

@@ -1758,17 +1758,13 @@ export default {
     // 增值服务文本
     getTypeText(){
       return type => {
-        if (type) {
-          const arr = []
-          if(type.indexOf('1') > -1){
-            arr.push(this.$t('集运'))
-          }
-          if(type.indexOf('2') > -1){
-            arr.push(this.$t('海外仓'))
-          }
-          return arr.join(",")
-        } else {
-          return null
+        if(!type) return ""
+        const arr = []
+        if(type.indexOf('1') > -1){
+          arr.push(this.$t('集运'))
+        }
+        if(type.indexOf('2') > -1){
+          arr.push(this.$t('海外仓'))
         }
       }
     }