diff --git a/.beagle-arm.yml b/.beagle-arm.yml
index db4e66cd6a65bc4d4749efda1f6a76711a7374ea..ba8c8f93c5dc41e55d11ed8f53aeb5cbe105c19c 100644
--- a/.beagle-arm.yml
+++ b/.beagle-arm.yml
@@ -32,7 +32,7 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
-    repo: wod/apaas/apaas-v3-ui-arm64
+    repo: wod/apaas/apaas-ui-arm64
     version: "v3.0.0"
     channel: alpha
     registry: registry.cn-qingdao.aliyuncs.com
@@ -48,7 +48,7 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim
-    repo: wod/apaas/apaas-v3-ui-arm64
+    repo: wod/apaas/apaas-ui-arm64
     version: "v3.0.0"
     registry: registry.cn-qingdao.aliyuncs.com
     secrets:
diff --git a/.beagle.yml b/.beagle.yml
index 6cd0808d140fe7eceaf5785f7002efcf5ff56a99..c58d19f52814c22050b9386d55b854026120e839 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -35,8 +35,8 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-v3-ui
-    version: 1.0.0
+    repo: apaas/apaas-ui
+    version: "v3.0.0"
     channel: alpha
     registry: hub.wodcloud.com
     when:
@@ -46,16 +46,16 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock    
     base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0
-    repo: apaas/apaas-v3-ui
-    version: 1.0.0
+    repo: apaas/apaas-ui
+    version: "v3.0.0"
     registry: hub.wodcloud.com
     when:
       branch: master  
   deploy:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0
     namespace: apaas-v3
-    deployment: apaas-v3-ui
-    container: apaas-v3-ui
+    deployment: apaas-ui
+    container: apaas-ui
     registry: hub.wodcloud.com
 
 branches: [master,dev]
diff --git a/src/assets/imgs/ic_pushing.png b/src/assets/imgs/ic_pushing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c109499006552e3c549b50c8e1c4e4d9b36205fc
Binary files /dev/null and b/src/assets/imgs/ic_pushing.png differ
diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue
index 38f1bf12f7837c36ca9465577cc489ebcc9814a6..8985b17fcc2709e9aa1e289e344cdc621c445745 100644
--- a/src/components/order-list/order-list-cell.vue
+++ b/src/components/order-list/order-list-cell.vue
@@ -93,12 +93,12 @@
             <div class="approval_status_btn" slot="reference">服务评价</div>
           </el-popover>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</div>
           <div
-            v-else-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
+            v-else-if="cellItem.order_type != 3 && cellItem.approval_second_level == 1 && cellItem.pay_status != -1 && cellItem.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</div>
diff --git a/src/components/recommen/screen-type.vue b/src/components/recommen/screen-type.vue
index dfaa7c3eadc35dbc784f9d0e675636e06c2b259c..c070a7cdb8c4dbe77fb8dee1f4636dee4d4de074 100644
--- a/src/components/recommen/screen-type.vue
+++ b/src/components/recommen/screen-type.vue
@@ -75,12 +75,10 @@ export default {
 
     },
     mounted() {
-        window.onresize = ()=>{
-            this.pageResize();
-        }
+        window.addEventListener("resize", this.pageResize);
     },
     destroyed(){
-      window.onresize = null;
+        window.removeEventListener("resize", this.pageResize);
     },
     methods: {
         openflag_func(){
diff --git a/src/components/show-more-filter.vue b/src/components/show-more-filter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b7f4a31d510f5ae695bafb3da98f2eab0557bb7d
--- /dev/null
+++ b/src/components/show-more-filter.vue
@@ -0,0 +1,95 @@
+<template>
+  <div ref="container" class="show_more_filter">
+    <slot></slot>
+
+    <a
+      v-if="showBtn"
+      class="show_more_btn"
+      :style="{
+        left: btnLeft,
+      }"
+      @click="toggle"
+    >
+      更多检索
+      <i
+        data-v-3b31b76f=""
+        :class="showMore ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+      ></i>
+    </a>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showBtn: false,
+      showMore: false,
+      btnLeft: 0,
+    };
+  },
+  mounted() {
+    this.resize();
+    window.addEventListener("resize", this.resize);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.resize);
+  },
+  methods: {
+    resize() {
+      this.$nextTick(() => {
+        let container = this.$refs.container;
+        let containerWidth = container.getBoundingClientRect().width - 80;
+        let filters = container.querySelectorAll(".filter_item");
+        let totalWidth = 0;
+        let wrapFlag = false;
+
+        this.showBtn = false;
+
+        filters.forEach((filter, index) => {
+          filter.style.display = "inline-block";
+
+          let filterWidth =
+            Math.ceil(filter.getBoundingClientRect().width) + 15;
+
+          totalWidth += filterWidth;
+
+          if (totalWidth > containerWidth) {
+            this.showBtn = true;
+
+            if (!wrapFlag) {
+              this.btnLeft = totalWidth - filterWidth + 5 + "px";
+              wrapFlag = true;
+            }
+            console.log(totalWidth, containerWidth, this.btnLeft);
+
+            filter.style.display = this.showMore ? "inline-block" : "none";
+          } else {
+            filter.style.display = "inline-block";
+          }
+        });
+      });
+    },
+    toggle() {
+      this.showMore = !this.showMore;
+      this.resize();
+    },
+  },
+};
+</script>
+
+<style scoped>
+.show_more_filter {
+  position: relative;
+  padding-right: 80px;
+}
+.show_more_btn {
+  position: absolute;
+  top: 25px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #8890a7;
+  cursor: pointer;
+  user-select: none;
+}
+</style>
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 8c5414c9eba5471e47c6893beb159cddd33008a5..90b1bf2a06573f6bc6bdde952268204e8d512aa3 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="index_container">
-    <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/services_shop' || $route.fullPath == '/fwzc/fwcs' || $route.fullPath == '/app_build'"></div>
+    <div class="decor" v-if="$route.fullPath == '/workplace' || $route.fullPath == '/services_shop' || $route.fullPath == '/fwzc/fwcs' || $route.fullPath == '/app_build' || $route.fullPath == '/intelligent_drawing'"></div>
     <router-view/>
   </div>
 </template>
diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue
index eb2de2b850185330fda68d376a9809f4c3e573ad..6dbd619528088dea7b1d52d9a440afa3c096e9ce 100644
--- a/src/pages/message-management/banner/banner-list.vue
+++ b/src/pages/message-management/banner/banner-list.vue
@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">banner搜索：</span>
               <el-input
@@ -61,7 +61,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -90,11 +90,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],
diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue
index 7f60a1e1ad86a2d213f15407194382ce285bfbc1..be7ecfb52a10e9ac0c04caa88bad5bfe985afad5 100644
--- a/src/pages/message-management/directed-push/directed-push-list.vue
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">消息模板名称：</span>
               <el-input
@@ -32,8 +32,9 @@
               <span class="filter_title">状态：</span>
               <el-select v-model="topFilter.state" placeholder="请选择">
                 <el-option label="全部" value=""> </el-option>
-                <el-option label="推送成功" value="1"> </el-option>
-                <el-option label="推送失败" value="0"> </el-option>
+                <el-option label="推送成功" value="success"> </el-option>
+                <el-option label="推送失败" value="fail"> </el-option>
+                <el-option label="推送中" value="pushing"> </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -48,7 +49,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -67,13 +68,78 @@
 
     <apass-dialog
       ref="dialog"
-      :msg="dialogInfo.msg"
-      :cancel-text="dialogInfo.cancelText"
-      :cancel-type="dialogInfo.cancelType"
-      :cancel="dialogInfo.cancel"
-      :sunbmit-text="dialogInfo.sunbmitText"
-      :submit="dialogInfo.submit"
-    ></apass-dialog>
+      width="800"
+      title="查看"
+      @cancel="cancelAction"
+      @submit="submitAction"
+    >
+      <div class="detail_dialog" slot="content" v-if="templateDetail">
+        <div class="detail_item">
+          <p class="item_title">
+            消息模板名称：
+          </p>
+          <p class="item_content">
+            {{ templateDetail.tpl_name }}
+          </p>
+        </div>
+        <div class="detail_item">
+          <p class="item_title">
+            模板类型：
+          </p>
+          <p class="item_content">
+            {{ templateDetail.tpl_type }}
+          </p>
+        </div>
+        <div class="detail_item full_line">
+          <p class="item_title">
+            消息详情：
+          </p>
+          <div class="full_content">
+            <div class="apass_scroll">
+              <p class="item_content">
+                {{ templateDetail.contents }}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="detail_item full_line">
+          <p class="item_title">
+            目标用户：
+          </p>
+          <div class="full_content">
+            <div class="apass_scroll">
+              <p class="item_content">
+                {{ templateDetail.receive_user }}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="detail_item">
+          <p class="item_title">
+            推送时间：
+          </p>
+          <p class="item_content">
+            {{ templateDetail.push_time }}
+          </p>
+        </div>
+        <div class="detail_item">
+          <p class="item_title">
+            推送状态：
+          </p>
+          <p class="item_content">
+            {{ templateDetail.state }}
+          </p>
+        </div>
+        <div class="detail_item">
+          <p class="item_title">
+            推送流水号：
+          </p>
+          <p class="item_content">
+            {{ templateDetail.id }}
+          </p>
+        </div>
+      </div>
+    </apass-dialog>
   </div>
 </template>
 
@@ -81,11 +147,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],
@@ -105,6 +173,7 @@ export default {
       push_time: "",
     },
     tempFilter: null,
+    templateDetail: null,
   }),
   created() {
     this.listHeader = [
@@ -113,40 +182,37 @@ export default {
         prop: "state",
         type: "image-tooltip",
         getImage(item) {
-          return item.state == 1
-            ? require("@/assets/imgs/ic_true.png")
-            : require("@/assets/imgs/ic_failed.png");
+          return [
+            require("@/assets/imgs/ic_failed.png"),
+            require("@/assets/imgs/ic_true.png"),
+            require("@/assets/imgs/ic_pushing.png"),
+          ][item.state || 0];
         },
         getTooltip(item) {
-          return item.state == 1 ? "推送成功" : "推送失败";
+          return ["推送失败", "推送成功", "推送中"][item.state || 0];
         },
         align: "center",
         width: 60,
       },
       {
         label: "推送流水号",
-        prop: "push_num",
+        prop: "id",
         width: 240,
       },
       {
         label: "消息模板名称",
-        prop: "name",
+        prop: "tpl_name",
         type: "button",
         callback: this.detailAction,
         width: 300,
       },
       {
         label: "消息详情",
-        prop: "detail",
+        prop: "contents",
       },
       {
         label: "接收用户",
-        prop: "users",
-        getText(item) {
-          let users = item.users || [];
-
-          return users.join("，");
-        },
+        prop: "receive_user",
         width: 300,
       },
       {
@@ -163,122 +229,25 @@ export default {
   },
   methods: {
     initList(filter) {
-      let fullFilter = {
-        ...filter,
-        ...this.topFilter,
+      let params = {
+        page: filter.page,
+        size: filter.size,
+        tplname: this.topFilter.name,
+        state: this.topFilter.state,
+        time_s: (this.topFilter.push_time && this.topFilter.push_time[0]) || "",
+        time_e: (this.topFilter.push_time && this.topFilter.push_time[1]) || "",
       };
 
-      this.tempFilter = filter; // filter存档，用于页面刷新
-
-      console.log(fullFilter);
+      // console.log(params);
 
-      this.listTotal = 55;
-      this.listData = [
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["张三", "李四", "王五"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["张三", "李四", "王五"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["张三", "李四", "王五"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["张三", "李四", "王五"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          push_num: "propelling2020001",
-          name: "服务定向推送的消息",
-          detail:
-            "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！",
-          users: ["杨过", "小龙女", "冯宝宝"],
-          push_time: "2020-07-18T14:25:09+08:00",
-        },
-      ];
+      this.tempFilter = filter; // filter存档，用于页面刷新
 
-      /* this.$http
-        .get("/apaas/service/v3/resource/apply/approveList", {
-          params: {
-            search: filter.keyword,
-            page: filter.page,
-            limit: filter.size,
-            state: filter.state,
-          },
-        })
+      this.$http
+        .get("/apaas/service/v3/push/directmsg/list", { params })
         .then(({ data }) => {
           if (data.success == 1) {
-            this.listTotal = data.total;
-            this.listData = data.data;
+            this.listTotal = (data.data && data.data.total) || 0;
+            this.listData = (data.data && data.data.data) || [];
           } else {
             this.$message({
               message: data.errMsg || "获取列表失败",
@@ -288,8 +257,13 @@ export default {
         })
         .catch((error) => {
           console.log(error);
-        }); */
-    }, // TODO: 列表待调试
+
+          this.$message({
+            message: "获取列表失败",
+            type: "warning",
+          });
+        });
+    },
     topFilterAction() {
       this.initList(this.tempFilter);
     },
@@ -309,7 +283,47 @@ export default {
       console.log("新建模板");
     },
     detailAction(item) {
-      console.log(`查看${item.name}`);
+      this.$http
+        .get(`/apaas/service/v3/push/directmsg/view/${item.id}`)
+        .then(({ data }) => {
+          if (data.success == 1) {
+            let detail = data.data || {};
+
+            this.templateDetail = {
+              tpl_name: detail.tpl_name || "",
+              tpl_type: ["", "服务推送", "平台维护", "版本更新", "自动消息"][
+                detail.tpl_type || 0
+              ],
+              contents: detail.contents || "",
+              receive_user: detail.receive_user || "",
+              push_time: helper.dateStringTransform(detail.push_time || ""),
+              state: ["推送失败", "推送成功", "推送中"][item.state || 0],
+              id: detail.id || "",
+              tpl_id: detail.tpl_id || "",
+              create_user: detail.create_user || "",
+            };
+            this.$refs.dialog.show();
+          } else {
+            this.$message({
+              message: data.errMsg || "获取详情失败",
+              type: "warning",
+            });
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+
+          this.$message({
+            message: "获取详情失败",
+            type: "warning",
+          });
+        });
+    },
+    cancelAction() {
+      this.$refs.dialog.hide();
+    },
+    submitAction() {
+      this.$refs.dialog.hide();
     },
   },
 };
@@ -319,4 +333,40 @@ export default {
 .list_container {
   height: 100%;
 }
+.detail_dialog {
+  display: flex;
+  flex-wrap: wrap;
+  text-align: left;
+}
+.detail_dialog .detail_item {
+  flex: 1 1 auto;
+  width: 50%;
+  margin-top: 20px;
+}
+.detail_dialog .detail_item.full_line {
+  width: 100%;
+}
+.detail_dialog .detail_item p {
+  padding: 0 15px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #8890a7;
+}
+.detail_dialog .detail_item .item_content {
+  color: #000;
+  margin-top: 10px;
+}
+.detail_dialog .detail_item .full_content {
+  padding: 10px 0;
+  border-radius: 8px;
+  background-color: #f8f9fd;
+  margin-top: 5px;
+}
+.detail_dialog .detail_item .full_content > .apass_scroll {
+  height: 176px;
+  overflow: auto;
+}
+.detail_dialog .detail_item .full_content .item_content {
+  margin: 0;
+}
 </style>
diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue
index 4c1250e80f50bc0c58c5d644bd2e406a8333a8aa..52e5bde5f121d1581d3ba97f9757d532db8e4590 100644
--- a/src/pages/message-management/message-alert/message-alert-list.vue
+++ b/src/pages/message-management/message-alert/message-alert-list.vue
@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">消息模板名称：</span>
               <el-input
@@ -48,7 +48,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -77,11 +77,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],
diff --git a/src/pages/message-management/message-template/message-template-list.vue b/src/pages/message-management/message-template/message-template-list.vue
index dca10d25447b747b687ad6e630b97d309cae6bd8..ce1f59e9aac3d07ac391b09b63867442652cd4d6 100644
--- a/src/pages/message-management/message-template/message-template-list.vue
+++ b/src/pages/message-management/message-template/message-template-list.vue
@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">消息模板搜索：</span>
               <el-input
@@ -49,7 +49,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -78,11 +78,13 @@
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
     apassDialog,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],
diff --git a/src/pages/message-management/recommended/recommended-list.vue b/src/pages/message-management/recommended/recommended-list.vue
index 70fd6ba5ee989f112fb25bafe047462bd0faa9cb..e8e2f87baa4cbff3bafcca3da191bd38af0e2cf7 100644
--- a/src/pages/message-management/recommended/recommended-list.vue
+++ b/src/pages/message-management/recommended/recommended-list.vue
@@ -20,7 +20,7 @@
 
       <template slot="top">
         <div class="top_fliter">
-          <div class="filter_list">
+          <show-more-filter class="filter_list">
             <div class="filter_item">
               <span class="filter_title">推荐位名称：</span>
               <el-input
@@ -48,7 +48,7 @@
               >
               </el-date-picker>
             </div>
-          </div>
+          </show-more-filter>
           <div class="filter_action apass_button">
             <el-button type="primary" @click="topFilterAction">
               查询
@@ -66,10 +66,12 @@
 <script>
 import helper from "@/services/helper.js";
 import apassList from "@/components/apass-list";
+import showMoreFilter from "@/components/show-more-filter";
 
 export default {
   components: {
     apassList,
+    showMoreFilter,
   },
   data: () => ({
     listHeader: [],
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index d06314c6d4cf32773939d9522f701ff5aa90b1f4..96cbf74d557b54ccdf93fafdd91d007924f3f02b 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -37,7 +37,7 @@
         </div>
         <div class="btn_group">
           <el-popover
-            v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
+            v-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 0"
             placement="right-start"
             width="300"
             v-model="visible"
@@ -65,12 +65,12 @@
             <el-button class="evaluation" slot="reference">服务评价</el-button>
           </el-popover>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && !showMsgBox"
             class="approval_status_btn"
             @click="getMessage"
           >查看评价</el-button>
           <el-button
-            v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
+            v-else-if="orderDetail.order_type != 3 && orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
             class="approval_status_btn"
             @click="showMsgBox = false"
           >收起评价</el-button>
@@ -86,6 +86,22 @@
           >取消申请</el-button>
         </div>
       </div>
+      <el-collapse-transition>
+        <div v-if="showMsgBox" class="evaluation_msg">
+          <div class="msg_title">服务评分：</div>
+          <div class="msg_rate">
+            <el-rate
+              v-model="message.score"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}"
+            ></el-rate>
+          </div>
+          <div class="msg_title">评价详情：</div>
+          <div class="msg_text">{{ message.content }}</div>
+        </div>
+      </el-collapse-transition>
       <div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
       <div class="detail_service">
         <el-row class="detail_service_row">
@@ -456,6 +472,7 @@ export default {
           duration_unit: this.cellItem.duration_unit
         };
       }
+      window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
       this.$router.push({
         path: "/shop/shop_car_apply",
         query: query
@@ -478,6 +495,37 @@ export default {
             });
           }
         });
+    },
+    getMessage() {
+      if (this.cellItem.order_type == 1) {
+        this.$api.user
+          .getServiceEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      } else if (this.cellItem.order_type == 2) {
+        this.$api.user
+          .getAppEvaluation({ apply_id: this.cellItem.apply_id })
+          .then(response => {
+            if (response.data.success == 1) {
+              this.message = response.data.data;
+              this.showMsgBox = true;
+            } else {
+              this.$message({
+                message: "获取评价失败",
+                type: "error"
+              });
+            }
+          });
+      }
     }
   }
 };
@@ -759,6 +807,22 @@ export default {
   display: block;
   margin-top: 20px;
 }
+.evaluation_msg {
+  height: 100%;
+  border-top: 1px #ededed solid;
+  padding: 20px;
+}
+.msg_title {
+  color: #8890a7;
+  margin: 0 0 10px;
+}
+.msg_rate {
+  margin: 0 0 10px 20px;
+}
+.msg_text {
+  margin-left: 20px;
+  color: #242c43;
+}
 </style>
 <style>
 .pop_rate .el-rate__icon {
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index b85c215a30e00592aa4d0f82028fbe0fa71ccb66..6826daf085b8ded7ac59c41b24213a9885b22002 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -9,9 +9,9 @@
         <el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
-      <div v-if="activeName == '0'">
-        <el-form ref="form" :model="user_data">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '0'">
+        <el-form ref="form" :model="user_data" :rules="rules_user">
+          <el-form-item class="info_item" prop="accountNo">
             <p>账号：</p>
             <el-input v-model="user_data.accountNo"></el-input>
           </el-form-item>
@@ -20,7 +20,7 @@
             <el-input type="password" v-model="user_data.password" :disabled="true"></el-input>
             <el-button class="option_btn" @click="changePassword">修改密码</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="nickname">
             <p>昵称：</p>
             <el-input v-model="user_data.nickname"></el-input>
           </el-form-item>
@@ -35,15 +35,15 @@
               @getNewList="getNewList"
             ></upload-file>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="contactPerson">
             <p>联系人：</p>
             <el-input v-model="user_data.contactPerson"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="phone">
             <p>手机号：</p>
             <el-input v-model="user_data.phone"></el-input>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="email">
             <p>邮箱：</p>
             <el-input v-model="user_data.email"></el-input>
           </el-form-item>
@@ -70,9 +70,9 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="activeName == '1'">
-        <el-form ref="formBusiness" :model="formBusiness">
-          <el-form-item class="info_item">
+      <div v-show="activeName == '1'">
+        <el-form ref="formBusiness" :model="formBusiness" :rules="rules_bussiness">
+          <el-form-item class="info_item" prop="businessSystemName">
             <p>业务系统名：</p>
             <el-input v-model="formBusiness.businessSystemName"></el-input>
           </el-form-item>
@@ -118,7 +118,7 @@
             <el-button class="option_btn" @click="copyKey">复制</el-button>
             <el-button class="option_btn_gray" @click="resetKey">重置</el-button>
           </el-form-item>
-          <el-form-item class="info_item">
+          <el-form-item class="info_item" prop="description">
             <p>描述：</p>
             <el-input type="textarea" :rows="2" v-model="formBusiness.description"></el-input>
           </el-form-item>
@@ -263,7 +263,37 @@ export default {
       newIpWhite: "",
       newIpBlack: "",
       diaPassWord: false,
-      upLevelDia: false
+      upLevelDia: false,
+      rules_user: {
+        accountNo: [
+          { required: true, message: "请输入账号", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        nickname: [
+          { required: true, message: "请输入昵称", trigger: "blur" },
+          { max: 8, message: "长度请小于8个字符", trigger: "blur" }
+        ],
+        contactPerson: [
+          { max: 6, message: "长度请小于6个字符", trigger: "blur" }
+        ],
+        phone: [
+          { pattern: /^1[34578]\d{9}$/, message: "请输入正确的手机号码" }
+        ],
+        email: [
+          {
+            pattern: /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/,
+            message: "请输入正确的邮箱"
+          }
+        ]
+      },
+      rules_bussiness: {
+        businessSystemName: [
+          { max: 16, message: "长度请小于16个字符", trigger: "blur" }
+        ],
+        description: [
+          { max: 500, message: "长度请小于500个字符", trigger: "blur" }
+        ]
+      }
     };
   },
   mounted() {
@@ -320,42 +350,68 @@ export default {
     registe() {
       let query = {};
       if (this.activeName == 0) {
-        console.log(this.user_data, this.imgList);
-        query = {
-          pageType: "personalFile", // this page is user info
-          user_id: this.user_data.accountNo,
-          user_name: this.user_data.nickname,
-          phone: this.user_data.phone,
-          email: this.user_data.email,
-          is_admin: this.user_data.userType,
-          link_man: this.user_data.contactPerson,
-          picture_path: this.imgList[0]
-        };
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            query = {
+              pageType: "personalFile", // this page is user info
+              user_id: this.user_data.accountNo,
+              user_name: this.user_data.nickname,
+              phone: this.user_data.phone,
+              email: this.user_data.email,
+              is_admin: this.user_data.userType,
+              link_man: this.user_data.contactPerson,
+              picture_path: this.imgList[0]
+            };
+            this.$api.authority.setUserInfo(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message({
+                  message: "修改个人信息成功",
+                  type: "success"
+                });
+                this.getUserInfo();
+              } else {
+                this.$message({
+                  message: "修改个人信息失败",
+                  type: "error"
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
       } else if (this.activeName == 1) {
-        query = {
-          pageType: "systemFile", // this page is system info
-          user_id: this.user_data.accountNo,
-          system_name: this.formBusiness.businessSystemName,
-          domain_name: this.formBusiness.domainName,
-          ip_whitelist: this.formBusiness.ip_white,
-          ip_blacklist: this.formBusiness.ip_black,
-          description: this.formBusiness.description
-        };
+        this.$refs["formBusiness"].validate(valid => {
+          console.log(valid);
+          if (valid) {
+            query = {
+              pageType: "systemFile", // this page is system info
+              user_id: this.user_data.accountNo,
+              system_name: this.formBusiness.businessSystemName,
+              domain_name: this.formBusiness.domainName,
+              ip_whitelist: this.formBusiness.ip_white,
+              ip_blacklist: this.formBusiness.ip_black,
+              description: this.formBusiness.description
+            };
+            this.$api.authority.setUserInfo(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message({
+                  message: "修改个人信息成功",
+                  type: "success"
+                });
+                this.getUserInfo();
+              } else {
+                this.$message({
+                  message: "修改个人信息失败",
+                  type: "error"
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
       }
-      this.$api.authority.setUserInfo(query).then(response => {
-        if (response.data.success == 1) {
-          this.$message({
-            message: "修改个人信息成功",
-            type: "success"
-          });
-          this.getUserInfo();
-        } else {
-          this.$message({
-            message: "修改个人信息失败",
-            type: "error"
-          });
-        }
-      });
     },
     changePassword() {
       this.diaPassWord = true;
diff --git a/src/pages/workbench/intelligent_drawing.vue b/src/pages/workbench/intelligent_drawing.vue
new file mode 100644
index 0000000000000000000000000000000000000000..38e304737ff040e71b7072c67b104cf2a062abd4
--- /dev/null
+++ b/src/pages/workbench/intelligent_drawing.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="intelligent_drawing-container">
+    <div class="apass_breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item>在线组件工具</el-breadcrumb-item>
+        <el-breadcrumb-item>智能制图</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+
+    <div class="main-container"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped>
+.intelligent_drawing-container {
+  margin: -157px 40px 20px;
+}
+.main-container {
+  min-height: calc(100vh - 150px - 43px);
+  border-radius: 12px;
+  background-color: #fff;
+  padding: 30px;
+}
+</style>
+
+<style>
+.intelligent_drawing-container .apass_breadcrumb {
+  padding: 0 20px;
+}
+.intelligent_drawing-container .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
+  color: #626de9;
+}
+.intelligent_drawing-container
+  .apass_breadcrumb
+  > .el-breadcrumb
+  .el-breadcrumb__item:last-child
+  .el-breadcrumb__inner {
+  color: #b4c0f5;
+}
+</style>
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index c6f6e7bd0d078940d3c4dae1664300185603c5bb..49dcc4d7da98b2d3e0f86ae1117792a029806fba 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -965,7 +965,7 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_znht.png"),
           bg: "#e5f4fe",
           color: "#38aef9",
-          url: "https://apaasgis.wodcloud.com/portal/geoplat/viewer/mapViewer.html",
+          url: "https://apaasgis.wodcloud.com/portal/nologoplat/viewer/mapViewer.html",
           target: 1
         },
         {
@@ -985,7 +985,7 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
           bg: "#e6ebfe",
           color: "#515fe7",
-          url: "https://apaas.wodcloud.com/lcgl/index.html#/",
+          url: "https://apaas-nologo.wodcloud.com/lcgl/index.html#/",
           target: 1
         },
         {
diff --git a/src/request/api/user.js b/src/request/api/user.js
index 56dcb187997dff36139e217e7b6c14413b3f6e56..160679c3058b4f2ffc42e3d08ed8fa49ffe49168 100644
--- a/src/request/api/user.js
+++ b/src/request/api/user.js
@@ -11,7 +11,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/domains`);
     },
     delOrder(params) {
-        return axios.delete(`/order/del?order_id=${params.id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/del?order_id=${params.id}`);
     },
     addServiceEvaluation(params) {
         return axios.post(`/apaas/serviceapp/v3/order/estimate`, params);
@@ -35,7 +35,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}&kind=${params.kind}`);
     },
     cancelOrder(params) {
-        return axios.delete(`/order/cancel?order_id=${params.order_id}`);
+        return axios.delete(`/apaas/serviceapp/v3/order/cancel?order_id=${params.order_id}`);
     },
 
     // user info
diff --git a/src/router/index.js b/src/router/index.js
index 7f0493bf0fd3d03d0dbde5f934ade38798e25801..bdb081fcd98b9d90a243139a4e22f8ee732e6649 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -237,6 +237,11 @@ export default new Router({
           name: "app_build",
           component: () => import("@/pages/workbench/app_build"),
         }, // 应用构建（镜像形式）
+        {
+          path: "/intelligent_drawing",
+          name: "intelligent_drawing",
+          component: () => import("@/pages/workbench/intelligent_drawing"),
+        }, // 智能制图
         {
           path: "/user", // 个人中心
           name: "user",