Merge branch 'xym' into dev

src/assets/css/index.css

@@ -523,47 +523,47 @@ width: 620px!important;
   color: #242c43;
   font-weight: normal;
 }
-.apass_button .el-button {
+.apaas_button .el-button {
   min-width: 90px;
   color: #0f2683;
 }
-.apass_button .el-button--mini, 
-.apass_button .el-button--mini.is-round {
+.apaas_button .el-button--mini, 
+.apaas_button .el-button--mini.is-round {
   padding: 10px 15px;
 }
-.apass_button .el-button--primary {
+.apaas_button .el-button--primary {
   color: #fff;
   background-color: #0f2683;
   border-color: #0f2683;
 }
-.apass_button .el-button--primary.is-plain {
+.apaas_button .el-button--primary.is-plain {
   color: #0f2683;
   background-color: #e1e4fb;
   border-color: #e1e4fb;
 }
-.apass_button .el-button--danger {
+.apaas_button .el-button--danger {
   color: #fff;
   background-color: #e15260;
   border-color: #e15260;
 }
-.apass_button .el-button.is-disabled, 
-.apass_button .el-button.is-disabled:focus, 
-.apass_button .el-button.is-disabled:hover {
+.apaas_button .el-button.is-disabled, 
+.apaas_button .el-button.is-disabled:focus, 
+.apaas_button .el-button.is-disabled:hover {
   cursor: not-allowed;
 }
-.apass_button .el-button--warning.is-plain {
+.apaas_button .el-button--warning.is-plain {
   background-color: #fcefd6;
   border-color: #fac266;
   color: #e56600;
 }
-.apass_button .el-button--warning {
+.apaas_button .el-button--warning {
   background-color: #e56600;
   border-color: #e56600;
   color: #fff;
 }
-.apass_button .el-button.is-disabled,
-.apass_button .el-button.is-disabled:focus,
-.apass_button .el-button.is-disabled:hover {
+.apaas_button .el-button.is-disabled,
+.apaas_button .el-button.is-disabled:focus,
+.apaas_button .el-button.is-disabled:hover {
   color: #C0C4CC;
   cursor: not-allowed;
   background-image: none;
@@ -659,6 +659,10 @@ width: 620px!important;
   flex-direction: column;
   justify-content: space-between;
 }
+.apaas_detail_container .main_contaner.locked_height {
+  height: calc(100vh - 84px - 83px);
+  min-height: 800px;
+}
 .apaas_detail_container .detail_action {
   text-align: right;
   margin-top: 50px;
@@ -693,4 +697,28 @@ width: 620px!important;
   text-align: right;
   margin-top: 10px;
 }
+.apaas_steps {
+  height: 100%;
+}
+.apaas_steps .apaas_step {
+  height: 100%;
+}
+.apaas_steps .apaas_step .apaas_step_content {
+  height: calc(100% - 64px);
+  border-bottom: 1px solid #f4f7fc;
+  overflow: hidden;
+}
+.apaas_steps .apaas_step .apaas_step_action {
+  padding-top: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+.apaas_steps .apaas_step .apaas_step_action .el-button {
+  height: 44px;
+  width: 124px;
+}
+.apaas_steps .apaas_step .apaas_step_action .el-button + .el-button {
+  margin-left: 20px;
+}
 /* 详情页公共样式 by xuyiming ~~~end */
\ No newline at end of file

src/components/apass-dialog.vue

@@ -17,12 +17,12 @@
 
       <div
         slot="footer"
-        class="dialog_action apass_button"
+        class="dialog_action apaas_button"
         v-if="$slots.action"
       >
         <slot name="action"></slot>
       </div>
-      <div slot="footer" class="dialog_action apass_button" v-else>
+      <div slot="footer" class="dialog_action apaas_button" v-else>
         <el-button
           v-if="!cancelHide"
           :type="cancelType"

src/components/apass-list.vue

@@ -10,7 +10,7 @@
 
     <div class="main-container">
       <div class="header-container" v-if="!hideHeader">
-        <div class="header-left apass_button">
+        <div class="header-left apaas_button">
           <el-button
             v-if="listFilter.length"
             @click="showListFilter = !showListFilter"

src/components/app-build-steps/app-build-steps.vue

@@ -63,7 +63,7 @@
           <p v-if="doneSubTitle" v-text="doneSubTitle"></p>
         </div>
       </div>
-      <div class="done_action apass_button">
+      <div class="done_action apaas_button">
         <slot name="action"></slot>
       </div>
     </div>

src/components/service-info/app-info.vue

 <template>
-  <div class="application_info apass_button" v-if="data">
+  <div class="application_info apaas_button" v-if="data">
     <div class="main_container">
       <div class="main_container-left" v-if="data.logo">
         <el-avatar shape="square" :size="144" fit="cover" :src="data.logo" />

src/components/service-info/service-info.vue

 <template>
-  <div class="service_info apass_button" v-if="data">
+  <div class="service_info apaas_button" v-if="data">
     <div class="service_title">
       <span class="service_name" v-text="data.name"></span>
       <span class="service_type" v-if="data.type" v-text="data.type"></span>
@@ -94,7 +94,7 @@
             ></el-input-number>
           </div>
         </div>
-        <div class="apass_button commodity_action">
+        <div class="apaas_button commodity_action">
           <el-button
             type="warning"
             plain

src/pages/authority/organization/organizationedit.vue

@@ -51,7 +51,7 @@
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
 
-        <el-form-item class="apass_button">
+        <el-form-item class="apaas_button">
           <el-button type="primary" @click="onSubmit('form')" class="right"
             >保存</el-button
           >

src/pages/authority/role/addroles.vue

@@ -39,7 +39,7 @@
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
 
-        <el-form-item class="bottom-btn apass_button">
+        <el-form-item class="bottom-btn apaas_button">
           <el-button type="primary" @click="onSubmit('form')" class="right"
             >保存</el-button
           >

src/pages/authority/user/organizationuser.vue

@@ -148,7 +148,7 @@
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
 
-        <el-form-item class="apass_button">
+        <el-form-item class="apaas_button">
           <el-button
             @click="resetForm('form')"
             class="left"

src/pages/message-management/banner/banner-list.vue

@@ -62,7 +62,7 @@
               </el-date-picker>
             </div>
           </show-more-filter>
-          <div class="filter_action apass_button">
+          <div class="filter_action apaas_button">
             <el-button type="primary" @click="topFilterAction">
               查询
             </el-button>

src/pages/message-management/directed-push/directed-push-add.vue

@@ -14,23 +14,126 @@
       </el-breadcrumb>
     </div>
 
-    <div class="main_contaner">
+    <div class="main_contaner locked_height">
+      <steps
+        :active-step="step"
+        :done="done"
+        :show-done="true"
+        done-title="推送成功"
+        done-sub-title="用户可通过用户中心-消息通知查收推送内容"
+        class="apaas_steps"
+      >
+        <step
+          title="选择推送服务"
+          :step="0"
+          :active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
+          class="apaas_step"
+        >
+          <div class="apaas_step_content">
+            <p style="margin: 50px;text-align: center;">选择推送服务</p>
+          </div>
+          <div class="apaas_button apaas_step_action">
+            <el-button type="defalut" @click="backToList">
+              取消
+            </el-button>
+            <el-button type="primary" @click="step1Action">
+              下一步
+            </el-button>
+          </div>
+        </step>
+        <step
+          title="选择消息模板"
+          :step="1"
+          :active-icon="require('@/assets/imgs/progress_ic_bushudata.png')"
+          class="apaas_step"
+        >
+          <div class="apaas_step_content">
+            <p style="margin: 50px;text-align: center;">选择消息模板</p>
+          </div>
+          <div class="apaas_button apaas_step_action">
+            <el-button type="defalut" @click="backToList">
+              取消
+            </el-button>
+            <span>
+              <el-button type="defalut" @click="step = 0">
+                上一步
+              </el-button>
+              <el-button type="primary" @click="step2Action">
+                下一步
+              </el-button>
+            </span>
+          </div>
+        </step>
+        <step
+          title="选择目标用户"
+          :step="2"
+          :active-icon="require('@/assets/imgs/progress_ic_jingxiang.png')"
+          class="apaas_step"
+        >
+          <div class="apaas_step_content">
+            <p style="margin: 50px;text-align: center;">选择目标用户</p>
+          </div>
+          <div class="apaas_button apaas_step_action">
+            <el-button type="defalut" @click="backToList">
+              取消
+            </el-button>
+            <span>
+              <el-button type="defalut" @click="step = 1">
+                上一步
+              </el-button>
+              <el-button type="primary" @click="step3Action">
+                完成选择
+              </el-button>
+            </span>
+          </div>
+        </step>
 
+        <template slot="action">
+          <el-button type="primary" @click="backToList">
+            返回列表
+          </el-button>
+        </template>
+      </steps>
     </div>
   </div>
 </template>
 
 <script>
-import helper from "@/services/helper.js";
+import Steps from "@/components/app-build-steps/app-build-steps";
+import Step from "@/components/app-build-steps/app-build-step";
 
 export default {
+  components: {
+    Steps,
+    Step,
+  },
   data() {
     return {
-
-    }
+      step: 0,
+      done: false,
+    };
   },
   computed: {},
   created() {},
-  methods: {},
+  methods: {
+    backToList() {
+      this.$router.push("/message/directed_push");
+    },
+    step1Action() {
+      this.step = 1;
+    },
+    step2Action() {
+      this.step = 2;
+    },
+    step3Action() {
+      this.done = true;
+    },
+  },
 };
 </script>
+
+<style scoped>
+.main_contaner {
+  padding: 20px;
+}
+</style>

src/pages/message-management/directed-push/directed-push-list.vue

@@ -50,7 +50,7 @@
               </el-date-picker>
             </div>
           </show-more-filter>
-          <div class="filter_action apass_button">
+          <div class="filter_action apaas_button">
             <el-button type="primary" @click="topFilterAction">
               查询
             </el-button>

src/pages/message-management/message-alert/message-alert-list.vue

@@ -49,7 +49,7 @@
               </el-date-picker>
             </div>
           </show-more-filter>
-          <div class="filter_action apass_button">
+          <div class="filter_action apaas_button">
             <el-button type="primary" @click="topFilterAction">
               查询
             </el-button>

src/pages/message-management/message-template/message-template-detail.vue

@@ -60,7 +60,7 @@
         </el-form-item>
       </el-form>
 
-      <div class="apass_button detail_action">
+      <div class="apaas_button detail_action">
         <el-button
           type="default"
           @click="cancelAction"

src/pages/message-management/message-template/message-template-list.vue

@@ -50,7 +50,7 @@
               </el-date-picker>
             </div>
           </show-more-filter>
-          <div class="filter_action apass_button">
+          <div class="filter_action apaas_button">
             <el-button type="primary" @click="topFilterAction">
               查询
             </el-button>

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

@@ -49,7 +49,7 @@
               </el-date-picker>
             </div>
           </show-more-filter>
-          <div class="filter_action apass_button">
+          <div class="filter_action apaas_button">
             <el-button type="primary" @click="topFilterAction">
               查询
             </el-button>

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

@@ -40,7 +40,7 @@
           :isMap="$route.query.ad_type=='hgmap'"
           :position="index==0?'start':index==selected_arr.length-1?'end':index"
         ></recommen-box>
-        <div class="apass_button btn_recommon" v-if="look_flag">
+        <div class="apaas_button btn_recommon" v-if="look_flag">
             <el-button>取消</el-button>
             <el-button type="primary" @click="onSubmit">确定</el-button>
         </div>

src/pages/workbench/app_build.vue

@@ -109,7 +109,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <div class="apass_button step_action">
+        <div class="apaas_button step_action">
           <el-button type="primary" @click="step1Action">
             下一步
           </el-button>
@@ -167,7 +167,7 @@
             </el-upload>
           </el-form-item>
         </el-form>
-        <div class="apass_button step_action" style="margin-top: 120px;">
+        <div class="apaas_button step_action" style="margin-top: 120px;">
           <el-button
             type="defalut"
             :loading="step2Loading"
@@ -237,7 +237,7 @@
               </div>
             </el-upload>
           </el-form-item>
-          <div class="apass_button upload_action">
+          <div class="apaas_button upload_action">
             <el-button
               type="primary"
               @click="addImage"
@@ -268,7 +268,7 @@
             </div>
           </el-form-item>
         </el-form>
-        <div class="apass_button step_action">
+        <div class="apaas_button step_action">
           <el-button type="primary" @click="stepsDone">
             完成
           </el-button>

src/pages/workbench/fwgl/fwglList.vue

@@ -72,7 +72,7 @@
               </div>
             </div>
           </div>
-          <div class="admin_preview-right apass_button">
+          <div class="admin_preview-right apaas_button">
             <el-button type="primary" size="mini" @click="approveWorkspace">
               工作区域审批（{{ cloud_admin.unapprove }}）
             </el-button>
@@ -1857,10 +1857,10 @@ export default {
   margin-top: 15px;
   box-sizing: border-box;
 }
-.apass_button {
+.apaas_button {
   position: relative;
 }
-.apass_button > .el-button {
+.apaas_button > .el-button {
   position: absolute;
   top: 0;
   right: 0;

src/pages/workbench/fwgl/serviceEdit.vue

@@ -90,7 +90,7 @@
           </el-radio-group>
         </el-form-item>
         
-        <el-form-item class="apass_button">
+        <el-form-item class="apaas_button">
           <el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
           <el-button class="right" @click="calcle">取消</el-button>
         </el-form-item>

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -32,7 +32,7 @@
             />
             
           </info-list>
-          <div class="apass_button" v-if="now_service == 0&&public_flag">
+          <div class="apaas_button" v-if="now_service == 0&&public_flag">
             <el-button type="primary" @click="public_service">服务发布</el-button>
           </div>
           <div v-if="now_service==2" class="info_contain2">

src/pages/workbench/yygl/deployment.vue

@@ -49,7 +49,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <div class="apass_button step_action">
+        <div class="apaas_button step_action">
           <el-button
             type="primary"
             :disabled="is_loading"
@@ -177,7 +177,7 @@
         <div class="senior_box" @click="senior_flag = true" v-if="!senior_flag">
           高级配置
         </div>
-        <div class="apass_button step_action" v-if="!senior_flag">
+        <div class="apaas_button step_action" v-if="!senior_flag">
           <el-button type="primary" plain @click="pre_step">
             上一步
           </el-button>
@@ -196,7 +196,7 @@
           高级配置：
         </p>
         <v-apaas-code v-if="senior_flag" :datas="app_set_code"></v-apaas-code>
-        <div class="apass_button step_action" v-if="senior_flag">
+        <div class="apaas_button step_action" v-if="senior_flag">
           <el-button type="primary" plain @click="deal_code(0)">
             取消
           </el-button>
@@ -218,7 +218,7 @@
           :data="stateList"
           style="margin-top: 30px;"
         ></deployment-info>
-        <div class="apass_button step_action">
+        <div class="apaas_button step_action">
           <el-button
             type="primary"
             v-if="finallyState === 1"