更新

src/App.vue

@@ -260,13 +260,14 @@ input[type="number"] {
 // 公用编剧模板
 .m-container {
   box-sizing: border-box;
-  background-color: #eef4f9;
+  // background-color: #eef4f9;
   width: 100%;
   min-height: 560px;
   padding-top: 10px;
   .m-core {
     padding: 18px 20px 40px;
     margin-bottom: 20px;
+    border-radius: 2px;
     background-color: #fff;
     position: relative;
   }

src/store/modules/app.js

@@ -47,7 +47,12 @@ const mutations = {
     state.loadCount = 0
   },
   SET_LOAD_COUNT: (state, count) => {
-    state.loadCount += count
+    // 判断是否已经到0了
+    if(state.loadCount <= 0) {
+      state.loadCount = 0
+    } else {
+      state.loadCount += count
+    }
   },
   TOGGLE_SIDEBAR: state => {
     // state.sidebar.opened = !state.sidebar.opened

src/views/baseRulesManager/components/dayaTeamRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <!-- <el-button  type="primary">添加规则</el-button> -->
 
       <el-form :inline="true" :model="form" ref="form">

src/views/baseRulesManager/components/goodsRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"

src/views/baseRulesManager/components/otherRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <!-- <el-button  type="primary">添加规则</el-button> -->
 
       <el-form :inline="true" :model="form" ref="form">

src/views/categroyManager/productSystem/memberSet.vue

@@ -4,100 +4,102 @@
       <div class="squrt"></div>
       会员设置
     </h2>
-    <save-form
-      :inline="true"
-      class="searchForm"
-      save-key="memberSet"
-      @submit="search"
-      @reset="onReSet"
-      :model.sync="searchForm"
-    >
-      <!-- 状态 指导老师 活动方案-->
-      <el-form-item>
-        <el-input
-          v-model.trim="searchForm.search"
-          clearable
-          placeholder="会员名称"
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <!-- <el-button native-type="reset" type="primary">重置</el-button> -->
-      </el-form-item>
-    </save-form>
-    <el-button
-      type="primary"
-      style="margin-bottom: 20px"
-      v-permission="'memberRankSetting/add'"
-      @click="addLeave"
-      >新增会员等级</el-button
-    >
-    <el-table
-      :data="tableList"
-      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-    >
-      <el-table-column
-        align="center"
-        prop="name"
-        label="会员名称"
-      ></el-table-column>
-      <el-table-column align="center" prop="type" label="会员标识">
-        <template slot-scope="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.icon"
-            :preview-src-list="[scope.row.icon]"
-          >
-          </el-image>
-        </template>
-      </el-table-column>
-            <el-table-column align="center" prop="type" label="试用会员标识">
-        <template slot-scope="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.experienceIcon"
-            :preview-src-list="[scope.row.experienceIcon]"
-          >
-          </el-image>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        align="center"
-        prop="type"
-        label="是否新用户试用"
-      ></el-table-column> -->
-      <el-table-column
-        align="center"
-        prop="updateTime"
-        width="100px"
-        label="修改时间"
-      ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="operatorName"
-        label="修改人"
-      ></el-table-column>
-      <el-table-column align="center" label="操作">
-        <template slot-scope="scope">
-          <div>
-            <!-- memberRankSetting/add -->
-            <auth auths="memberRankSetting/get">
-              <el-button type="text" @click="resetMember(scope.row)"
-                >详情</el-button
-              >
-            </auth>
-            <auth
-              :auths="['memberRankSetting/get', 'memberRankSetting/update']"
-              mulit
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        class="searchForm"
+        save-key="memberSet"
+        @submit="search"
+        @reset="onReSet"
+        :model.sync="searchForm"
+      >
+        <!-- 状态 指导老师 活动方案-->
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            clearable
+            placeholder="会员名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <!-- <el-button native-type="reset" type="primary">重置</el-button> -->
+        </el-form-item>
+      </save-form>
+      <el-button
+        type="primary"
+        style="margin-bottom: 20px"
+        v-permission="'memberRankSetting/add'"
+        @click="addLeave"
+        >新增会员等级</el-button
+      >
+      <el-table
+        :data="tableList"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
+        <el-table-column
+          align="center"
+          prop="name"
+          label="会员名称"
+        ></el-table-column>
+        <el-table-column align="center" prop="type" label="会员标识">
+          <template slot-scope="scope">
+            <el-image
+              style="width: 100px; height: 100px"
+              :src="scope.row.icon"
+              :preview-src-list="[scope.row.icon]"
+            >
+            </el-image>
+          </template>
+        </el-table-column>
+              <el-table-column align="center" prop="type" label="试用会员标识">
+          <template slot-scope="scope">
+            <el-image
+              style="width: 100px; height: 100px"
+              :src="scope.row.experienceIcon"
+              :preview-src-list="[scope.row.experienceIcon]"
             >
-              <el-button type="text" @click="resetMember(scope.row, 'update')"
-                >修改</el-button
+            </el-image>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          align="center"
+          prop="type"
+          label="是否新用户试用"
+        ></el-table-column> -->
+        <el-table-column
+          align="center"
+          prop="updateTime"
+          width="100px"
+          label="修改时间"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="operatorName"
+          label="修改人"
+        ></el-table-column>
+        <el-table-column align="center" label="操作">
+          <template slot-scope="scope">
+            <div>
+              <!-- memberRankSetting/add -->
+              <auth auths="memberRankSetting/get">
+                <el-button type="text" @click="resetMember(scope.row)"
+                  >详情</el-button
+                >
+              </auth>
+              <auth
+                :auths="['memberRankSetting/get', 'memberRankSetting/update']"
+                mulit
               >
-            </auth>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
+                <el-button type="text" @click="resetMember(scope.row, 'update')"
+                  >修改</el-button
+                >
+              </auth>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <el-dialog
       :title="title"
       :close-on-click-modal="false"

src/views/categroyManager/subjectCategroyList.vue

@@ -5,10 +5,10 @@
       <div class="squrt"></div>
       声部分类管理
     </h2>
-       <auth auths="subject/upset/insertCate">
-    <el-button @click="addCategory" type="primary">添加</el-button>
-       </auth>
     <div class="m-core">
+      <auth auths="subject/upset/insertCate" style="padding-bottom: 20px">
+        <el-button @click="addCategory" type="primary">添加</el-button>
+       </auth>
       <!-- <save-form
         :inline="true"
         :model="searchForm"

src/views/courseRulersManager/components/leBaoRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"

src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"

src/views/courseRulersManager/components/onlineCloudRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"

src/views/courseRulersManager/components/serverMinitor.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <!-- <el-alert
           style="margin: 10px 0"

src/views/courseRulersManager/components/studentAttRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
 
         <el-alert

src/views/courseRulersManager/components/teamRules.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"

src/views/mailInfoManager/index.vue

@@ -6,101 +6,103 @@
     </h2>
     <!-- <h3 class="infoTitle">优惠券信息</h3>
     <el-divider></el-divider> -->
-    <el-form :model="form" ref="form" class="form">
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="服务器主机名"
-            prop="hostName"
-            :rules="[{ required: true, message: '请输入服务器主机名' }]"
-          >
-            <el-input
-              style="width: 355px !important"
-              v-model="form.hostName"
-              placeholder="请输服务器主机名"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+    <div class="m-core">
+      <el-form :model="form" ref="form" class="form">
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="服务器主机名"
+              prop="hostName"
+              :rules="[{ required: true, message: '请输入服务器主机名' }]"
+            >
+              <el-input
+                style="width: 355px !important"
+                v-model="form.hostName"
+                placeholder="请输服务器主机名"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col style="width: 395px">
-          <el-form-item
-            label="服务器端口号"
-            prop="smtpPort"
-            :rules="[{ required: true, message: '请输入服务器端口号' }]"
-          >
-            <el-input
-              style="width: 355px !important"
-              v-model="form.smtpPort"
-              placeholder="请输入服务器端口号"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="服务器用户名"
-            prop="userName"
-            :rules="[{ required: true, message: '请输入服务器用户名' }]"
-          >
-            <el-input
-              style="width: 355px !important"
-              v-model="form.userName"
-              placeholder="请输入服务器用户名"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px">
-          <el-form-item
-            label="服务器密码"
-            prop="password"
-            :rules="[{ required: true, message: '请输入服务器密码' }]"
-          >
-            <el-input
-              show-password
-              style="width: 355px !important"
-              v-model="form.password"
-              placeholder="请输入服务器密码"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+          <el-col style="width: 395px">
+            <el-form-item
+              label="服务器端口号"
+              prop="smtpPort"
+              :rules="[{ required: true, message: '请输入服务器端口号' }]"
+            >
+              <el-input
+                style="width: 355px !important"
+                v-model="form.smtpPort"
+                placeholder="请输入服务器端口号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="服务器用户名"
+              prop="userName"
+              :rules="[{ required: true, message: '请输入服务器用户名' }]"
+            >
+              <el-input
+                style="width: 355px !important"
+                v-model="form.userName"
+                placeholder="请输入服务器用户名"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px">
+            <el-form-item
+              label="服务器密码"
+              prop="password"
+              :rules="[{ required: true, message: '请输入服务器密码' }]"
+            >
+              <el-input
+                show-password
+                style="width: 355px !important"
+                v-model="form.password"
+                placeholder="请输入服务器密码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="邮箱"
-            prop="from"
-            :rules="[{ required: true, message: '请输入邮箱' }]"
-          >
-            <el-input
-              style="width: 355px !important"
-              v-model="form.from"
-              placeholder="请输入邮箱"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px">
-          <el-form-item
-            label="落款名称"
-            prop="fromName"
-            :rules="[{ required: true, message: '请输入落款名称' }]"
-          >
-            <el-input
-              style="width: 355px !important"
-              v-model="form.fromName"
-              placeholder="请输入落款名称"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-<!--  -->
-      <el-form-item>
-        <el-button type="primary" v-permission="'sysEmail/update'"  @click="setEmil">保存</el-button>
-        <!-- <el-button type="primary" v-else @click="addCoupon">提交</el-button> -->
-        <el-button type="danger" @click="resetForm">重置</el-button>
-      </el-form-item>
-    </el-form>
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="邮箱"
+              prop="from"
+              :rules="[{ required: true, message: '请输入邮箱' }]"
+            >
+              <el-input
+                style="width: 355px !important"
+                v-model="form.from"
+                placeholder="请输入邮箱"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px">
+            <el-form-item
+              label="落款名称"
+              prop="fromName"
+              :rules="[{ required: true, message: '请输入落款名称' }]"
+            >
+              <el-input
+                style="width: 355px !important"
+                v-model="form.fromName"
+                placeholder="请输入落款名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+  <!--  -->
+        <el-form-item>
+          <el-button type="primary" v-permission="'sysEmail/update'"  @click="setEmil">保存</el-button>
+          <!-- <el-button type="primary" v-else @click="addCoupon">提交</el-button> -->
+          <el-button type="danger" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
 </template>
 <script>

src/views/organManager/index.vue

@@ -4,135 +4,137 @@
       <div class="squrt"></div>
       机构列表
     </h2>
-    <save-form
-      :inline="true"
-      class="searchForm"
-      ref="searchForm"
-      @submit="search"
-      @reset="reset"
-      :saveKey="'platformServiceManager'"
-      :model.sync="searchForm"
-    >
-      <el-form-item :rules="[]">
-        <el-input v-model="searchForm.search" placeholder="机构编号/名称/电话"></el-input>
-      </el-form-item>
-      <el-form-item prop="createTimer">
-        <el-date-picker
-          v-model.trim="searchForm.createTimer"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          :picker-options="{ firstDayOfWeek: 1 }"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item prop="createdName">
-        <el-input v-model="searchForm.createdName" placeholder="请输入添加人"></el-input>
-      </el-form-item>
-      <el-form-item prop="payState">
-        <el-select
-          v-model.trim="searchForm.payState"
-          filterable
-          placeholder="请选择支付状态"
-          clearable
-        >
-          <el-option label="未缴费" :value="0"></el-option>
-          <el-option label="已缴费" :value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="state">
-        <el-select
-          v-model.trim="searchForm.state"
-          filterable
-          placeholder="请选择机构状态"
-          clearable
-        >
-          <!-- <el-option label="草稿" :value="0"></el-option> -->
-          <el-option label="启动" :value="1"></el-option>
-          <el-option label="停用" :value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button native-type="reset" type="primary">重置</el-button>
-      </el-form-item>
-    </save-form>
-    <el-button  style="margin-bottom: 20px;" type="primary" v-permission="'tenantInfo/add'" @click="openService('create')" icon="el-icon-plus">新增机构</el-button>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table
-        :data="tableList"
-        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        class="searchForm"
+        ref="searchForm"
+        @submit="search"
+        @reset="reset"
+        :saveKey="'platformServiceManager'"
+        :model.sync="searchForm"
       >
-        <el-table-column align="center" prop="id" label="机构编号">
-        </el-table-column>
-        <el-table-column align="center" label="机构名称" prop="name">
-        </el-table-column>
-        <el-table-column align="center" label="联系人" prop="contacts">
-        </el-table-column>
-        <el-table-column align="center" label="联系人电话" prop="phone">
-        </el-table-column>
-        <el-table-column align="center" label="服务" prop="serveName">
-        </el-table-column>
-        <el-table-column align="center" label="人数" prop="studentUpLimit">
-          <template slot-scope="scope">
-            {{ scope.row.studentCount }}/{{ scope.row.studentUpLimit }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="有效期到期时间" prop="expireDate">
-          <template slot-scope="scope">
-            {{ scope.row.expireDate | formatTimer }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
-        </el-table-column> -->
-        <el-table-column align="center" label="缴费状态" prop="payState">
-          <template slot-scope="scope">
-            {{ scope.row.payState | organPayState }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="添加人" prop="createdName">
-        </el-table-column>
-        <el-table-column align="center" label="机构状态" prop="state">
-          <template slot-scope="scope">
-            {{ scope.row.state | organState }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="操作">
-          <template slot-scope="scope">
-            <el-button
-              @click="openService('look', scope.row)"
-              v-permission="'tenantInfo/info'"
-              type="text"
-              >查看</el-button>
-            <el-button
-              @click="openService('update', scope.row)"
-              v-permission="'tenantInfo/update'"
-              type="text"
-              >修改</el-button>
-            <el-button
-              @click="changeOrgan(scope.row)"
-              v-permission="scope.row.state == 1 ? 'tenantInfo/opsState/stop' : 'tenantInfo/opsState/open'"
-              type="text"
-              >{{ scope.row.state == 1 ? '停用' : '启用' }}</el-button>
-            <el-button
-              v-if="scope.row.payState != 1"
-              @click="onQrCode(scope.row)"
-              type="text"
-              >缴费二维码</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-       :saveKey="'platformServiceManager'"
-        sync
-        :total.sync="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+        <el-form-item :rules="[]">
+          <el-input v-model="searchForm.search" placeholder="机构编号/名称/电话"></el-input>
+        </el-form-item>
+        <el-form-item prop="createTimer">
+          <el-date-picker
+            v-model.trim="searchForm.createTimer"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :picker-options="{ firstDayOfWeek: 1 }"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item prop="createdName">
+          <el-input v-model="searchForm.createdName" placeholder="请输入添加人"></el-input>
+        </el-form-item>
+        <el-form-item prop="payState">
+          <el-select
+            v-model.trim="searchForm.payState"
+            filterable
+            placeholder="请选择支付状态"
+            clearable
+          >
+            <el-option label="未缴费" :value="0"></el-option>
+            <el-option label="已缴费" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="state">
+          <el-select
+            v-model.trim="searchForm.state"
+            filterable
+            placeholder="请选择机构状态"
+            clearable
+          >
+            <!-- <el-option label="草稿" :value="0"></el-option> -->
+            <el-option label="启动" :value="1"></el-option>
+            <el-option label="停用" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <el-button  style="margin-bottom: 20px;" type="primary" v-permission="'tenantInfo/add'" @click="openService('create')" icon="el-icon-plus">新增机构</el-button>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column align="center" prop="id" label="机构编号">
+          </el-table-column>
+          <el-table-column align="center" label="机构名称" prop="name">
+          </el-table-column>
+          <el-table-column align="center" label="联系人" prop="contacts">
+          </el-table-column>
+          <el-table-column align="center" label="联系人电话" prop="phone">
+          </el-table-column>
+          <el-table-column align="center" label="服务" prop="serveName">
+          </el-table-column>
+          <el-table-column align="center" label="人数" prop="studentUpLimit">
+            <template slot-scope="scope">
+              {{ scope.row.studentCount }}/{{ scope.row.studentUpLimit }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="有效期到期时间" prop="expireDate">
+            <template slot-scope="scope">
+              {{ scope.row.expireDate | formatTimer }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
+          </el-table-column> -->
+          <el-table-column align="center" label="缴费状态" prop="payState">
+            <template slot-scope="scope">
+              {{ scope.row.payState | organPayState }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="添加人" prop="createdName">
+          </el-table-column>
+          <el-table-column align="center" label="机构状态" prop="state">
+            <template slot-scope="scope">
+              {{ scope.row.state | organState }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                @click="openService('look', scope.row)"
+                v-permission="'tenantInfo/info'"
+                type="text"
+                >查看</el-button>
+              <el-button
+                @click="openService('update', scope.row)"
+                v-permission="'tenantInfo/update'"
+                type="text"
+                >修改</el-button>
+              <el-button
+                @click="changeOrgan(scope.row)"
+                v-permission="scope.row.state == 1 ? 'tenantInfo/opsState/stop' : 'tenantInfo/opsState/open'"
+                type="text"
+                >{{ scope.row.state == 1 ? '停用' : '启用' }}</el-button>
+              <el-button
+                v-if="scope.row.payState != 1"
+                @click="onQrCode(scope.row)"
+                type="text"
+                >缴费二维码</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+        :saveKey="'platformServiceManager'"
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
     <qr-code v-model="qrcodeStatus" title="机构缴费二维码" :codeUrl="codeUrl" />
   </div>

src/views/platformManager/productManger/index.vue

@@ -4,7 +4,8 @@
       <div class="squrt"></div>
       产品管理
     </h2>
-    <save-form
+    <div class="m-core">
+      <save-form
       :inline="true"
       class="searchForm"
       ref="searchForm"
@@ -67,6 +68,7 @@
         @pagination="getList"
       />
     </div>
+    </div>
     <el-dialog
       :title="isAdd ? '新增产品' : '修改产品'"
       class="courseMask"

src/views/platformManager/serviceManager/form.vue

@@ -5,13 +5,13 @@
       <el-page-header @back="onCancel"
                       :content="(payType == 'create' ? '新增服务' : '修改服务')"></el-page-header>
     </h2>
-    <div class="m-core" style="overflow: hidden; background-color: #eef4f9;">
+    <div class="m-core" style="overflow: hidden; background-color: #eef4f9; padding: 0;">
       <el-form :model="form"
                 ref="accountForm"
                 :inline="true"
                 label-position="right"
                 label-width="120px">
-        <div style="background: #fff;">
+        <div style="background: #fff;padding: 16px 34px 10px;margin-bottom: 20px;">
           <el-alert
             title="服务信息"
             type="info"
@@ -31,58 +31,62 @@
           </el-form-item>
         </div>
 
-        <el-alert
-          title="服务属性"
-          type="info"
-          :closable="false"
-          style="margin-bottom: 20px"
-        ></el-alert>
-
-        <div class="serviceAttr" v-for="(attrList, index) in form.attrList" :key="index">
-          <div class="serviceBlock">
-            <el-form-item label="付费模式"
-              :prop="'attrList.' + index + '.mode'"
-              :rules="[{ required: true, message: '请选择付费模式', trigger: 'change' }]">
-              <el-select v-model="attrList.mode" placeholder="请选择付费模式">
-                <el-option label="月" value="MONTH"></el-option>
-                <el-option label="年" value="YEAR"></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
-          <div class="serviceBlock">
-            <div v-for="(attrItem, i) in attrList.attr" :key="i">
-              <el-form-item label="学员上限"
-                :prop="'attrList.' + index + '.attr.' + i + '.studentUpLimit'"
-                :rules="[{ required: true, message: '请输入学员上限', trigger: 'blur' },
-                  {type: 'number', message: '学员上限必须为数字值' }]">
-                <el-input v-model.number="attrItem.studentUpLimit" placeholder="请输入学员上限">
-                  <span slot="append">人</span>
-                </el-input>
+        <div style="background: #fff;padding: 16px 34px 10px;margin-bottom: 20px;">
+          <el-alert
+            title="服务属性"
+            type="info"
+            :closable="false"
+            class="smallTitle"
+          ></el-alert>
+          <div class="serviceAttr" v-for="(attrList, index) in form.attrList" :key="index">
+            <div class="serviceBlock">
+              <el-form-item label="付费模式"
+                :prop="'attrList.' + index + '.mode'"
+                :rules="[{ required: true, message: '请选择付费模式', trigger: 'change' }]">
+                <el-select v-model="attrList.mode" placeholder="请选择付费模式">
+                  <el-option label="月" value="MONTH"></el-option>
+                  <el-option label="年" value="YEAR"></el-option>
+                </el-select>
               </el-form-item>
-              <el-form-item label="服务原价"
-                :prop="'attrList.' + index + '.attr.' + i + '.originalPrice'"
-                :rules="[{ required: true, message: '请输入服务原价', trigger: 'blur' },
-                  {type: 'number', message: '服务原价必须为数字值' }]">
-                <el-input v-model.number="attrItem.originalPrice" placeholder="请输入服务原价">
-                  <span slot="append">元</span>
-                </el-input>
+              <el-form-item class="add">
+                <el-button icon="el-icon-plus" plain style="width: 140px;border-color: #00A79D;color: #00A79D;" @click="onAddItem('child', attrList.attr)">添加模式</el-button>
               </el-form-item>
-              <el-button icon="el-icon-minus"  circle type="danger" @click="onRemoveItem(attrList.attr, i)" :disabled="attrList.attr.length <= 1"></el-button>
             </div>
-            <el-form-item class="add" style="padding-left: 120px; display: block;">
-              <el-button icon="el-icon-plus" style="width: 200px" @click="onAddItem('child', attrList.attr)">添加模式</el-button>
-            </el-form-item>
+            <div class="serviceBlock">
+              <div v-for="(attrItem, i) in attrList.attr" :key="i">
+                <el-form-item label="学员上限"
+                  :prop="'attrList.' + index + '.attr.' + i + '.studentUpLimit'"
+                  :rules="[{ required: true, message: '请输入学员上限', trigger: 'blur' },
+                    {type: 'number', message: '学员上限必须为数字值' }]">
+                  <el-input v-model.number="attrItem.studentUpLimit" placeholder="请输入学员上限">
+                    <span slot="append">人</span>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="服务原价"
+                  :prop="'attrList.' + index + '.attr.' + i + '.originalPrice'"
+                  :rules="[{ required: true, message: '请输入服务原价', trigger: 'blur' },
+                    {type: 'number', message: '服务原价必须为数字值' }]">
+                  <el-input v-model.number="attrItem.originalPrice" placeholder="请输入服务原价">
+                    <span slot="append">元</span>
+                  </el-input>
+                </el-form-item>
+                <el-button circle type="text" @click="onRemoveItem(attrList.attr, i)" :disabled="attrList.attr.length <= 1">删除</el-button>
+              </div>
+            </div>
+            <div class="list-remove">
+              <el-button type="text"  icon="el-icon-delete" @click="onRemoveItem(form.attrList, index)" :disabled="form.attrList.length <= 1">删除</el-button>
+            </div>
           </div>
-          <div class="list-remove">
-            <el-button type="text"  icon="el-icon-delete" @click="onRemoveItem(form.attrList, index)" :disabled="form.attrList.length <= 1">删除</el-button>
+          <el-form-item class="add" style="margin-top: 18px;    padding-left: 50px;">
+            <el-button icon="el-icon-plus" type="primary" style="width: 160px" :disabled="form.attrList.length >= 2" @click="onAddItem('parent')">添加模式</el-button>
+          </el-form-item>
+
+          <div class="btn-group">
+            <el-button @click="onCancel" >取 消</el-button>
+            <el-button type="primary"  @click="onSubmit('accountForm')">确 定</el-button>
           </div>
         </div>
-        <el-form-item class="add" style="margin-top: 18px">
-          <el-button icon="el-icon-plus" style="width: 200px" :disabled="form.attrList.length >= 2" @click="onAddItem('parent')">添加模式</el-button>
-        </el-form-item>
       </el-form>
-      <el-button type="primary"  @click="onSubmit('accountForm')">确 定</el-button>
-      <el-button @click="onCancel" >取 消</el-button>
     </div>
   </div>
 </template>
@@ -265,10 +269,10 @@ export default {
   position: relative;
   margin-top: 18px;
   padding-top: 18px;
-  background-color: #f4f4f5;
   overflow: hidden;
   display: flex;
   flex-wrap: wrap;
+  flex-direction: column;
 }
 .list-remove {
   position: absolute;
@@ -282,15 +286,34 @@ export default {
     }
   }
 }
+.el-select, .el-input {
+  width: 200px !important;
+}
+
+.btn-group {
+  text-align: center;
+  padding-bottom: 20px;
+}
 
 .smallTitle {
   background: #fff;
   border-bottom: 1px solid #E8E8E8;
   margin-bottom: 20px;
+  padding-bottom: 15px;
   color: #393F3E;
-  .el-alert__title {
-    font-size: 16px;
+  padding-left: 0;
+  &::before {
+    content: ' ';
+    display: inline-block;
+    height: 16px;
+    width: 3px;
+    border-radius: 2px;
+    background-color: var(--color-primary);
+  }
+  /deep/.el-alert__title {
+    font-size: 16px !important;
   }
 }
 
+
 </style>

src/views/tenantSetting/chargingRecord.vue

@@ -7,169 +7,171 @@
     <h2>
       <el-page-header @back="onCancel" content="扣费记录"></el-page-header>
     </h2>
-    <save-form
-      :inline="true"
-      class="searchForm"
-      ref="searchForm"
-      @submit="search"
-      @reset="reset"
-      :saveKey="'tenantTradeManager'"
-      :model.sync="searchForm"
-    >
-      <el-form-item prop="search">
-        <el-input
-          placeholder="课程名/编号"
-          clearable
-          type="text"
-          v-model.trim="searchForm.search"
-        ></el-input>
-      </el-form-item>
-      <el-form-item prop="organId">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.organId"
-          filterable
-          multiple
-          collapse-tags
-          clearable
-          placeholder="请选择分部"
-        >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        class="searchForm"
+        ref="searchForm"
+        @submit="search"
+        @reset="reset"
+        :saveKey="'tenantTradeManager'"
+        :model.sync="searchForm"
+      >
+        <el-form-item prop="search">
+          <el-input
+            placeholder="课程名/编号"
+            clearable
+            type="text"
+            v-model.trim="searchForm.search"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            filterable
+            multiple
+            collapse-tags
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
-      <el-form-item prop="type">
-        <el-select
-          v-model.trim="searchForm.type"
-          clearable
-          filterable
-          @clear="onClear('type')"
-          placeholder="课程类型"
-        >
-          <el-option
-            v-for="(item, index) in courseType"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="teacherId">
-          <remote-search
-            :commit="'setTeachers'"
-            v-model="searchForm.teacherId"
-          />
+        <el-form-item prop="type">
+          <el-select
+            v-model.trim="searchForm.type"
+            clearable
+            filterable
+            @clear="onClear('type')"
+            placeholder="课程类型"
+          >
+            <el-option
+              v-for="(item, index) in courseType"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
+        <el-form-item prop="teacherId">
+            <remote-search
+              :commit="'setTeachers'"
+              v-model="searchForm.teacherId"
+            />
+          </el-form-item>
 
-      <el-form-item prop="status">
-        <el-select
-          v-model.trim="searchForm.status"
-          clearable
-          filterable
-          @clear="onClear('status')"
-          placeholder="课程状态"
-        >
-          <el-option
-            v-for="(item, index) in courseStatus"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="deductState">
-        <el-select
-          v-model.trim="searchForm.deductState"
-          clearable
-          filterable
-          @clear="onClear('deductState')"
-          placeholder="扣费状态"
+        <el-form-item prop="status">
+          <el-select
+            v-model.trim="searchForm.status"
+            clearable
+            filterable
+            @clear="onClear('status')"
+            placeholder="课程状态"
+          >
+            <el-option
+              v-for="(item, index) in courseStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="deductState">
+          <el-select
+            v-model.trim="searchForm.deductState"
+            clearable
+            filterable
+            @clear="onClear('deductState')"
+            placeholder="扣费状态"
+          >
+            <el-option v-for="(item, key) of chargingStatus" :key="key" :label="item" :value="key"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="createTimer">
+          <el-date-picker
+            v-model.trim="searchForm.createTimer"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="课程开始时间"
+            end-placeholder="课程结束时间"
+            :picker-options="{ firstDayOfWeek: 1 }"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <!-- <div style="font-size: 14px; padding-bottom: 10px">
+        扣费总额：<span style="color: var(--color-primary)">1,000元</span>
+        <i style="width: 10px; display: inline-block"></i>
+        冻结金额：<span style="color: var(--color-primary)">1,000元</span>
+      </div> -->
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-          <el-option v-for="(item, key) of chargingStatus" :key="key" :label="item" :value="key"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="createTimer">
-        <el-date-picker
-          v-model.trim="searchForm.createTimer"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="课程开始时间"
-          end-placeholder="课程结束时间"
-          :picker-options="{ firstDayOfWeek: 1 }"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button native-type="reset" type="primary">重置</el-button>
-      </el-form-item>
-    </save-form>
-    <!-- <div style="font-size: 14px; padding-bottom: 10px">
-      扣费总额：<span style="color: var(--color-primary)">1,000元</span>
-      <i style="width: 10px; display: inline-block"></i>
-      冻结金额：<span style="color: var(--color-primary)">1,000元</span>
-    </div> -->
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table
-        :data="tableList"
-        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-      >
-        <el-table-column align="center" label="课程编号" prop="courseId">
-        </el-table-column>
-        <el-table-column align="center" label="所属分部" prop="organName">
-        </el-table-column>
-        <el-table-column align="center" label="课程类型" prop="type">
-          <template slot-scope="scope">
-            {{ scope.row.type | courseTypeFormat }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="姓名" prop="tenantId">
-        </el-table-column> -->
-        <el-table-column align="center" label="老师" prop="teacherName">
-        </el-table-column>
-        <el-table-column align="center" label="课程人数" prop="studentNum">
-        </el-table-column>
-        <el-table-column align="center" label="课程时间">
-          <template slot-scope="scope">
-            {{ scope.row.classDate }}
-            {{ scope.row.startClassTime }}~{{ scope.row.endClassTime }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
-        </el-table-column> -->
-        <el-table-column align="center" label="课程状态">
-          <template slot-scope="scope">
-            {{ scope.row.status | coursesStatus }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="扣费状态">
-          <template slot-scope="scope">
-            {{ scope.row.deductState | chargingStatus }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="扣费金额（元）">
-          <template slot-scope="scope">
-            {{ scope.row.amount | moneyFormat }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        :saveKey="'tenantTradeManager'"
-        sync
-        :total.sync="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
-    </div>
+          <el-table-column align="center" label="课程编号" prop="courseId">
+          </el-table-column>
+          <el-table-column align="center" label="所属分部" prop="organName">
+          </el-table-column>
+          <el-table-column align="center" label="课程类型" prop="type">
+            <template slot-scope="scope">
+              {{ scope.row.type | courseTypeFormat }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="姓名" prop="tenantId">
+          </el-table-column> -->
+          <el-table-column align="center" label="老师" prop="teacherName">
+          </el-table-column>
+          <el-table-column align="center" label="课程人数" prop="studentNum">
+          </el-table-column>
+          <el-table-column align="center" label="课程时间">
+            <template slot-scope="scope">
+              {{ scope.row.classDate }}
+              {{ scope.row.startClassTime }}~{{ scope.row.endClassTime }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
+          </el-table-column> -->
+          <el-table-column align="center" label="课程状态">
+            <template slot-scope="scope">
+              {{ scope.row.status | coursesStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="扣费状态">
+            <template slot-scope="scope">
+              {{ scope.row.deductState | chargingStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="扣费金额（元）">
+            <template slot-scope="scope">
+              {{ scope.row.amount | moneyFormat }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :saveKey="'tenantTradeManager'"
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
 
+    </div>
     <el-dialog title="订单详情" :visible.sync="orderVisible" width="1200px">
       <order-info />
     </el-dialog>

src/views/tenantSetting/tenantInfo.vue

@@ -5,7 +5,7 @@
       机构管理
     </h2>
     <!-- 列表 -->
-    <div class="m-core" v-if="status">
+    <div v-if="status">
       <!-- 机构基本信息 -->
         <organInfo ref="organInfo" :data="info" type="update" tenantInfo="SETTING" />
 

src/views/tenantSetting/tenantTradeManager.vue

@@ -4,133 +4,135 @@
       <div class="squrt"></div>
       机构交易管理
     </h2>
-    <save-form
-      :inline="true"
-      class="searchForm"
-      ref="searchForm"
-      @submit="search"
-      @reset="reset"
-      :saveKey="'tenantTradeManager'"
-      :model.sync="searchForm"
-    >
-      <el-form-item prop="transNo">
-        <el-input
-          placeholder="交易流水号"
-          clearable
-          type="text"
-          v-model.trim="searchForm.transNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item prop="orderNo">
-        <el-input
-          placeholder="订单号"
-          clearable
-          type="text"
-          v-model.trim="searchForm.orderNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item prop="orderType">
-        <el-select
-          v-model.trim="searchForm.orderType"
-          clearable
-          filterable
-          @clear="onClear('orderType')"
-          placeholder="交易类型"
-        >
-          <el-option
-            v-for="(item, key, index) in tenantStatus"
-            :key="index"
-            :label="item"
-            :value="key"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="orderState">
-        <el-select
-          v-model.trim="searchForm.orderState"
-          clearable
-          filterable
-          @clear="onClear('orderState')"
-          placeholder="交易状态"
-        >
-          <el-option label="待支付" :value="0"></el-option>
-          <el-option label="已支付" :value="1"></el-option>
-          <el-option label="支付失败" :value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="createTimer">
-        <el-date-picker
-          v-model.trim="searchForm.createTimer"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="订单开始时间"
-          :default-time="['00:00:00', '23:59:59']"
-          end-placeholder="订单结束时间"
-          :picker-options="{ firstDayOfWeek: 1 }"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button native-type="reset" type="primary">重置</el-button>
-      </el-form-item>
-    </save-form>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table
-        :data="tableList"
-        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-      >
-        <el-table-column align="center" prop="transNo" label="交易流水号">
-        </el-table-column>
-        <el-table-column align="center" label="订单号" prop="orderNo">
-        </el-table-column>
-        <el-table-column align="center" label="订单时间" prop="createdTime">
-        </el-table-column>
-        <!-- <el-table-column align="center" label="机构编号" prop="tenantId">
-        </el-table-column> -->
-        <el-table-column align="center" label="机构名称" prop="tenantName">
-        </el-table-column>
-        <el-table-column align="center" label="交易类型">
-          <template slot-scope="scope">
-            {{ scope.row.orderType | tenantStatus }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="订单金额">
-          <template slot-scope="scope">
-            {{ scope.row.expectAmount | moneyFormat }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
-        </el-table-column> -->
-        <el-table-column align="center" label="支付金额">
-          <template slot-scope="scope">
-            {{ scope.row.actualAmount | moneyFormat }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="交易状态">
-          <template slot-scope="scope">
-            {{ scope.row.orderState | tenantOrderStatus }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="操作">
-          <template slot-scope="scope">
-            <el-button
-              @click="openService(scope.row)"
-              v-permission="'tenantInfo/info'"
-              type="text"
-              >查看</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <pagination
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        class="searchForm"
+        ref="searchForm"
+        @submit="search"
+        @reset="reset"
         :saveKey="'tenantTradeManager'"
-        sync
-        :total.sync="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+        :model.sync="searchForm"
+      >
+        <el-form-item prop="transNo">
+          <el-input
+            placeholder="交易流水号"
+            clearable
+            type="text"
+            v-model.trim="searchForm.transNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="orderNo">
+          <el-input
+            placeholder="订单号"
+            clearable
+            type="text"
+            v-model.trim="searchForm.orderNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="orderType">
+          <el-select
+            v-model.trim="searchForm.orderType"
+            clearable
+            filterable
+            @clear="onClear('orderType')"
+            placeholder="交易类型"
+          >
+            <el-option
+              v-for="(item, key, index) in tenantStatus"
+              :key="index"
+              :label="item"
+              :value="key"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="orderState">
+          <el-select
+            v-model.trim="searchForm.orderState"
+            clearable
+            filterable
+            @clear="onClear('orderState')"
+            placeholder="交易状态"
+          >
+            <el-option label="待支付" :value="0"></el-option>
+            <el-option label="已支付" :value="1"></el-option>
+            <el-option label="支付失败" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="createTimer">
+          <el-date-picker
+            v-model.trim="searchForm.createTimer"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="订单开始时间"
+            :default-time="['00:00:00', '23:59:59']"
+            end-placeholder="订单结束时间"
+            :picker-options="{ firstDayOfWeek: 1 }"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column align="center" prop="transNo" label="交易流水号">
+          </el-table-column>
+          <el-table-column align="center" label="订单号" prop="orderNo">
+          </el-table-column>
+          <el-table-column align="center" label="订单时间" prop="createdTime">
+          </el-table-column>
+          <!-- <el-table-column align="center" label="机构编号" prop="tenantId">
+          </el-table-column> -->
+          <el-table-column align="center" label="机构名称" prop="tenantName">
+          </el-table-column>
+          <el-table-column align="center" label="交易类型">
+            <template slot-scope="scope">
+              {{ scope.row.orderType | tenantStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="订单金额">
+            <template slot-scope="scope">
+              {{ scope.row.expectAmount | moneyFormat }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
+          </el-table-column> -->
+          <el-table-column align="center" label="支付金额">
+            <template slot-scope="scope">
+              {{ scope.row.actualAmount | moneyFormat }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="交易状态">
+            <template slot-scope="scope">
+              {{ scope.row.orderState | tenantOrderStatus }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                @click="openService(scope.row)"
+                v-permission="'tenantInfo/info'"
+                type="text"
+                >查看</el-button>
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <pagination
+          :saveKey="'tenantTradeManager'"
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
 
     <el-dialog title="订单详情" :visible.sync="orderVisible" width="1200px">