Merge branch 'dev_ren' into 'master'

Dev ren

See merge request !66

src/views/orderManagement/demandList/index.vue

@@ -28,7 +28,17 @@
         <el-button type="primary" plain @click="clear">清除搜索</el-button>
       </el-form>
       <div class="orderItem" v-for="(item, idx) in tableData" :key="idx">
-        <div class="itemTop">提交时间：{{ item.crtTimeStr }}</div>
+        <div class="itemTop">
+          提交时间：{{ item.crtTimeStr }}
+
+          <span style="color: red; margin-left: 10px" v-if="item.type == 1"
+            >标准数据</span
+          ><span style="color: orange; margin-left: 10px" v-if="item.type == 2"
+            >行业应用</span
+          ><span style="color: blue; margin-left: 10px" v-if="item.type == 3"
+            >影像图库</span
+          >
+        </div>
         <div class="itemContent">
           <div class="itemLeft">
             <div class="itemInfo">
@@ -54,7 +64,7 @@
                 <p v-if="item.type == 2">联系方式：{{ item.contactPhone }}</p>
               </div>
               <div v-if="item.type == 3">
-                <p>定制类型：{{ item.dataType }}</p>
+                <p>数据类型：{{ item.dataType }}</p>
                 <p>数据格式：{{ item.dataFormat }}</p>
               </div>
             </div>