Merge branch 'zj' into dev

src/components/app-list/app-card.vue

@@ -59,7 +59,7 @@ export default {
       this.$emit("delete-action", this.data);
     },
     intoDetail() {
-      this.$router.push(`${this.detailsUrl}${this.data.up_userid}`);
+      this.$router.push(`${this.detailsUrl}${this.data.app_id}`);
     },
   },
 };

src/components/service-header.vue

@@ -7,10 +7,10 @@
       <p class="info_title">
         <span>{{ data.name }}</span>
         <span class="bs" v-if="data.aqdetail" @click="subevent(0)">一键部署</span>
-        <span class="info_fix" v-if="data.yydetail" @click="subevent(1)">我要编辑</span>
-        <span class="right gap" v-if="data.yydetail">|</span>
-        <span class="right underline" v-if="data.yydetail" @click="subevent(2)" title="申请下线至开发者应用">申请下线</span>
-        <span class="right undersell" v-if="data.yydetail" @click="subevent(3)">申请下架</span>
+        <span class="info_fix" v-if="data.fxdetail" @click="subevent(1)">我要编辑</span>
+        <span class="right gap" v-if="data.yydetail||data.xxdetail">|</span>
+        <span class="right underline" v-if="data.xxdetail" @click="subevent(2)" title="申请下线至开发者应用">{{data.xxdetail}}</span>
+        <span class="right undersell" v-if="data.yydetail" @click="subevent(3)">{{data.yydetail}}</span>
         <span class="right undersell undermy" v-if="data.bsdetail" @click="subevent(4)">申请密钥</span>
         <span class="info_fix" v-if="data.fixed" @click="goto_page(data.fixedurl)">我要修改</span>
       </p>
@@ -61,11 +61,11 @@ export default {
           }else if(val == 1){
               this.$emit('editapp')
           }else if(val == 2){
-              this.$emit('unline',0)
+              this.$emit('unline',this.data)
           }else if(val == 3){
-              this.$emit('unsell',1)
+              this.$emit('unsell',this.data)
           }else if(val == 4){
-              this.$emit('applymy',1)
+              this.$emit('applymy')
           }
       },
       goto_page(url){

src/components/service-tabs/service-tab-comments.vue

@@ -33,6 +33,10 @@ export default {
       type: String,
       required: true,
     },
+    is_app_detail:{
+      type: Boolean,
+      default: false,
+    }
   },
   data: () => ({
     commentsTtotal: 0,
@@ -75,16 +79,31 @@ export default {
       this.init();
     },
     init() {
-      this.$http
-        .get(this.url, {
+      if(this.is_app_detail){
+        var temp = {
+            params: {
+              page: this.currentPage,
+              limit: this.pageSize,
+            },
+          }
+      }else{
+        var temp = {
             params: {
               page: this.currentPage,
               size: this.pageSize,
             },
-        })
+          }
+      }
+      this.$http
+        .get(this.url, temp)
         .then(({ data }) => {
+          if(this.is_app_detail){
+            this.commentsTtotal = data.data.overview.total;
+            this.commentsList = data.data.list;
+          }else{
             this.commentsTtotal = data.total;
             this.commentsList = data.data;
+          }
         })
         .catch(function(error) {
           console.log(error);

src/components/table/table-um.vue

@@ -53,10 +53,12 @@
         :border="border"
         @select="select"
         @select-all="selectAll"
+        v-infinite-scroll="asynload"
         :defaultSelections="defaultSelections"
         element-loading-text="加载中..."
         :empty-text="emptyText"
         :stripe="stripe"
+        :style="{height:isLoad,overflow:isLoad?'auto':''}"
         row-key="id"
         :show-header="showHeader"
         default-expand-all
@@ -264,6 +266,10 @@ export default {
     "v-apaas-table-filter": TableFilter
   },
   props: {
+    //是否控制5行显示
+    isLoad:'',
+    //是否滚动加载
+    asyn_load1:{ type: Boolean, default: false },
     // 表格型号：mini,medium,small
     size: { type: String, default: "medium" },
     loading: { type: Boolean, default: false },
@@ -429,6 +435,12 @@ export default {
     }
   },
   methods: {
+    asynload(){
+      console.log('111');
+      if(this.asyn_load1){
+        this.$emit("load_data");
+      }
+    },
     //本地删除
     deleteLocal(val) {
       this.selectedTabsPage.splice(val.$index, 1);

src/components/upload_file.vue

@@ -127,6 +127,8 @@ export default {
           this.$message.error("上传图片大小不能超过 10MB!");
         }
         return isJPG && isLt10M;
+      } else {
+
       }
     },
     handleAvatarSuccess(response, file, fileList) {
@@ -147,6 +149,14 @@ export default {
           });
         }
         this.$emit("getNewList", this.fileArray);
+      } else {
+        if (response.success == 1) {
+          this.fileArray.push({
+            url: response.data,
+            name: file.name
+          });
+        }
+        this.$emit("getNewList", this.fileArray);
       }
       this.hideUpload = fileList.length >= this.max;
     },

src/main.js

@@ -4,6 +4,10 @@ import store from "@/store";
 
 import Vue from 'vue'
 
+import mavonEditor from 'mavon-editor'
+import 'mavon-editor/dist/css/index.css'
+Vue.use(mavonEditor)
+
 import VueResource from "vue-resource";
 Vue.use(VueResource);
 

src/pages/authority/organizationuser.vue

@@ -257,7 +257,7 @@ export default {
                   desc:data.description,
                   person:data.create_user,
                   date:data.create_date,
-                  ip:transform_func(data.ip_whitelist),
+                  ip:this.transform_func(data.ip_whitelist),
                   domain:data.domain_name
                 }
             })

src/pages/workbench/yygl/app_edit.vue

@@ -233,7 +233,7 @@ export default {
       getNewList(val) {
         console.log(val);
         this.form.fileList = ""
-        this.form.fileList = url.map((v,k)=>{
+        this.form.fileList = val.map((v,k)=>{
           return v.url
         }).join(';')
         console.log(this.form.fileList)

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -564,7 +564,7 @@ export default {
     getNewList(val) {
       console.log(val);
       this.form.fileList = "";
-      this.form.fileList = url
+      this.form.fileList = val
         .map((v, k) => {
           return v.url;
         })
@@ -574,7 +574,7 @@ export default {
     getNewList1(val) {
       console.log(val);
       this.fileList = "";
-      this.fileList = url
+      this.fileList = val
         .map((v, k) => {
           return v.url;
         })