Merge branch 'xym' into dev

src/components/apass-table.vue

@@ -499,10 +499,11 @@ export default {
 .more_action_list > li:first-child::before {
   content: "";
   position: absolute;
-  top: -14px;
-  right: calc(50% - 14px);
-  width: 28px;
-  height: 14px;
+  top: -20px;
+  right: calc(50% - 20px);
+  width: 40px;
+  height: 20px;
+  /* background-color: red; */
 }
 .more_action_list > li:first-child::after {
   content: "";

src/pages/workbench/fwgl/fwglList.vue

@@ -106,7 +106,7 @@
       :title="dialogInfo.title"
       :msg="dialogInfo.msg"
       :submit="dialogInfo.submit"
-      :sunbmitText="dialogInfo.sunbmitText"
+      :sunbmit-text="dialogInfo.sunbmitText"
     ></apass-dialog>
 
     <allot-info-confirm
@@ -148,6 +148,7 @@ export default {
       title: "",
       msg: "",
       submit: null,
+      sunbmitText: "",
     },
     listUrl: "",
     deleteUrl: "",
@@ -1064,8 +1065,7 @@ export default {
                 callback(item) {
                   if (item.state == 0) {
                     return null; // 已下架，上架的操作需要普通用户申请
-                  } else
-                  if (item.state == 1) {
+                  } else if (item.state == 1) {
                     return _self.soldOutItem(item); // 已上架，超管用户可以直接下架
                   } else if (item.state == 2) {
                     return _self.soldUpItem(item); // 上架审核中，超管用户可以直接上架
@@ -1398,7 +1398,6 @@ export default {
     applyForSoldUpItem(item) {
       this.dialogInfo.title = "提示";
       this.dialogInfo.msg = "确认申请上架此服务吗？";
-      this.dialogInfo.cancelText = "取消";
       this.dialogInfo.sunbmitText = "发送通知";
       this.dialogInfo.submit = () => {
         this.$http
@@ -1433,7 +1432,6 @@ export default {
       this.dialogInfo.title = "是否确定下架服务";
       this.dialogInfo.msg =
         "下架此服务会导致用户被迫暂停对服务的调用，下架前需向超级管理员发送通知，超级管理员通过后此服务将会从服务超市中下架。";
-      this.dialogInfo.cancelText = "取消";
       this.dialogInfo.sunbmitText = "发送通知";
       this.dialogInfo.submit = () => {
         this.$http
@@ -1467,7 +1465,6 @@ export default {
     soldUpItem(item) {
       this.dialogInfo.title = "提示";
       this.dialogInfo.msg = "确认上架此服务吗？";
-      this.dialogInfo.cancelText = "";
       this.dialogInfo.sunbmitText = "确定";
       this.dialogInfo.submit = () => {
         this.$http
@@ -1501,7 +1498,6 @@ export default {
       this.dialogInfo.title = "提示";
       this.dialogInfo.msg =
         "下架此服务会导致调用该服务的<br />用户被迫暂停对服务的调用";
-      this.dialogInfo.cancelText = "";
       this.dialogInfo.sunbmitText = "确定";
       this.dialogInfo.submit = () => {
         this.$http
@@ -1534,7 +1530,6 @@ export default {
     deleteItem(item) {
       this.dialogInfo.title = "";
       this.dialogInfo.msg = "是否删除该条服务？";
-      this.dialogInfo.cancelText = "";
       this.dialogInfo.sunbmitText = "";
       this.dialogInfo.submit = () => {
         this.$http