Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/data-analysis/my-service.vue

@@ -579,7 +579,9 @@ export default {
         .then(response => {
           if (response.data.success == 1) {
             this.toplistData = response.data.data;
-            this.toplistTargetValue = this.toplistData[0].request_count;
+            if (this.toplistData && this.toplistData.length != 0) {
+              this.toplistTargetValue = this.toplistData[0].request_count;
+            }
           }
         });
     },
@@ -601,7 +603,9 @@ export default {
         })
         .then(response => {
           if (response.data.success == 1) {
-            this.commentlistData = response.data.data;
+            this.commentlistData = response.data.data.concat(
+              this.commentlistData
+            );
             this.last_id = this.commentlistData[0].last_id;
           }
         });

src/pages/message-management/recommended/recommened-selected-list.vue

+<template>
+    <div class="yygl_container">
+        <p class="now_page_title">
+            我的服务 / 111 /
+            <span>服务详情</span>
+        </p>
+        <div class="select_box">
+            <p class="box_title">
+                <span></span>
+                推荐位管理
+            </p>
+        </div>
+
+        <div class="selected_box">
+            <p class="box_title">
+                <span></span>
+                已选择列表
+            </p>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: [],
+    components: {
+
+    },
+    data() {
+        return {
+
+        };
+    },
+    watch: {
+
+    },
+    computed: {
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
+};
+</script>
+
+<style scoped>
+.yygl_container {
+  height: calc(100vh - 84px);
+  overflow: hidden;
+  background-color: #f6f7fb;
+  padding: 20px;
+}
+.now_page_title {
+  margin: 15px 0;
+  color: #898d9e;
+}
+.now_page_title span {
+  color: #242c43;
+}
+.select_box{
+    float: left;
+    width: calc(100% - 400px); 
+    margin-right: 20px;
+    background-color: #ffffff;
+	box-shadow: 0px 3px 6px 0px 
+		#f4f7fc;
+	border-radius: 12px;
+}
+.selected_box{
+    float: left;
+    width: 400px; 
+    background-color: #ffffff;
+	box-shadow: 0px 3px 6px 0px 
+		#f4f7fc;
+	border-radius: 12px;
+}
+.box_title{
+    height:60px;
+    line-height: 60px;
+    border-bottom: 1px solid #e3e5ef;
+    font-size: 16px;
+    color: #58617a;
+    font-weight: 600;
+}
+.box_title span{
+    width: 4px;
+	height: 16px;
+	background-color: #515fe7;
+	border-radius: 2px;
+    display: inline-block;
+}
+</style>

src/pages/workbench/fwgl/cloud-detail.vue

@@ -32,11 +32,11 @@
               <span class="head_right_msg_item">{{ cloudData.phone }}</span>
               资源申请状态：
               <span
-                v-if="apply_type == 0"
+                v-if="apploy_msg.first_level == 0"
                 class="head_right_msg_item apply_wait"
               >待审批</span>
-              <span v-if="apply_type == 1" class="head_right_msg_item apply_success">审批通过</span>
-              <span v-if="apply_type == -1" class="head_right_msg_item apply_refuse">审批未通过</span>
+              <span v-if="apploy_msg.first_level == 1 && apploy_msg.second_level == 1" class="head_right_msg_item apply_success">审批通过</span>
+              <span v-if="apploy_msg.first_level == -1 || (apploy_msg.first_level == 1 && apploy_msg.second_level == -1)" class="head_right_msg_item apply_refuse">审批未通过</span>
             </p>
             <p class="head_right_msg_p">
               业务系统名：

src/router/index.js

@@ -379,6 +379,11 @@ export default new Router({
               name: "recommended",
               component: () => import("@/pages/message-management/recommended/recommended-list"),
             },
+            {
+              path: "/message/recommend_selected", // 推荐位管理选择列表
+              name: "recommend_selected",
+              component: () => import("@/pages/message-management/recommended/recommened-selected-list"),
+            },
             {
               path: "/message/directed_push", // 定向推送列表
               name: "directed_push",