Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

src/views/company/companyRole/index.vue

@@ -96,6 +96,11 @@
           ></el-switch>
         </template>
       </el-table-column>
+      <el-table-column label="默认角色" align="center" width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.defaultRole == '1' ? '是' : '否' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -157,6 +162,12 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="默认角色">
+          <el-radio-group v-model="form.defaultRole">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
@@ -419,6 +430,7 @@ export default {
         roleKey: undefined,
         roleSort: 0,
         status: "0",
+        defaultRole: "0",
         menuIds: [],
         deptIds: [],
         menuCheckStrictly: true,

src/views/member/list.vue

@@ -89,6 +89,12 @@
           value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="APP用户" prop="isAppUser">
+        <el-select v-model="queryParams.isAppUser" placeholder="请选择" clearable size="small">
+          <el-option label="是" :value="1" />
+          <el-option label="否" :value="0" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -192,6 +198,13 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="APP用户" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isAppUser === 1 ? 'success' : 'danger'">
+            {{ scope.row.isAppUser === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="标签" align="center" prop="tag" show-overflow-tooltip />
       <el-table-column label="最后看课时间" align="center" prop="lastWatchDate" width="160" />
 <!--      <el-table-column label="停课天数" align="center" prop="stopWatchDays" />-->
@@ -389,6 +402,7 @@ export default {
         registerStartTime: null,
         registerEndTime: null,
         projectId: null,
+        isAppUser: null,
       },
       // 表单参数
       form: {},

src/views/member/mylist.vue

@@ -79,6 +79,12 @@
           value-format="yyyy-MM-dd"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="APP用户" prop="isAppUser">
+        <el-select v-model="queryParams.isAppUser" placeholder="请选择" clearable size="small">
+          <el-option label="是" :value="1" />
+          <el-option label="否" :value="0" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -202,6 +208,13 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="APP用户" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isAppUser === 1 ? 'success' : 'danger'">
+            {{ scope.row.isAppUser === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="标签" align="center" prop="tag" show-overflow-tooltip />
       <el-table-column label="最后看课时间" align="center" prop="lastWatchDate" width="160" />
       <el-table-column label="停课天数" align="center" prop="stopWatchDays" />