Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/publicCustomer/index.vue

@@ -164,14 +164,14 @@
           <span style="color:#e6a23c" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#3874F6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '暂缓'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?$t(scope.data.column.data[[scope.data.column.columnname]]):'--'}}