Merge remote-tracking branch 'origin/master'

src/views/port/port/assets.vue

@@ -1,5 +1,12 @@
 <template>
   <div>
+    <el-form :model="form" label-width="80px">
+      <el-form-item>
+        <input v-model="form.userName" style="padding: 10px 10px;float: initial;" placeholder=请输入要查询的用户名>
+        <input v-model="form.connectorName" style="padding: 10px 10px;float: initial;margin-left: 20px" placeholder=请输入要查询的接口名称>
+        <el-button @click="findConnectorUserList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
+      </el-form-item>
+    </el-form>
     <p style="font-weight: bold;font-size: 20px">余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
     <el-table
       :data="tableData"
@@ -44,17 +51,17 @@
         </template>
       </el-table-column>
 
-<!--      <el-table-column label="操作">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="danger"-->
-<!--            @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>

src/views/port/port/employee.vue

@@ -20,8 +20,8 @@
         <el-main>
           <el-form label-width="40px" :model="form">
             <el-form-item>
-              <input v-model="form.connectorName" style="padding: 10px 10px;float: initial" placeholder=请输入关键字>
-              <el-button @click="findApiList()" style="padding: 10px 10px">查询</el-button>
+              <input v-model="form.connectorName" style="padding: 10px 10px;float: initial;" placeholder=请输入关键字>
+              <el-button @click="findApiList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
 
             </el-form-item>
           </el-form>
@@ -29,7 +29,7 @@
             <el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
               <el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
                 <div slot="header" class="clearfix">
-                  <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
+                  <span style="font-weight: bold;font-size: 30px">{{connector.connectorName}}</span>
                   <el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
                 </div>
                 <span style="font-weight: bold;font-size: 20px">产品图片:</span><br>