提交一下

1

src/utils/vueFilter.js

@@ -502,7 +502,10 @@ Vue.filter("editionFilter", value => {
     "ios-education": "苹果-管理端",
     "android-teacher": "安卓-老师端",
     "android-student": "安卓-学生端",
-    "android-education": "安卓-管理端"
+    "android-education": "安卓-管理端",
+    "ios-electron":"苹果-桌面端",
+    "win-electron":"win-桌面端",
+
   };
   return template[value];
 });

src/views/categroyManager/specialSetup/chargesList.vue

@@ -76,10 +76,7 @@
                 现价(元)
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">学生实际缴费金额</div>
-                  <i
-                    class="el-icon-question"
-                    style="font-size: 18px; color: #f56c6c"
-                  ></i>
+                  <i class="el-icon-question" style="font-size: 18px; color: #f56c6c"></i>
                 </el-tooltip>
               </p>
             </template>
@@ -92,8 +89,7 @@
               {{ numeral(scope.row.totalOriginalPrice).format("0,0") }}
             </template>
           </el-table-column>
-          <el-table-column prop="updateTime" label="修改时间">
-          </el-table-column>
+          <el-table-column prop="updateTime" label="修改时间"> </el-table-column>
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <el-button
@@ -111,7 +107,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- <pagination
+        <pagination
           :saveKey="'chargesList'"
           sync
           :total.sync="pageInfo.total"
@@ -119,7 +115,7 @@
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"
           @pagination="getList"
-        /> -->
+        />
       </div>
     </div>
     <emptyPage
@@ -194,15 +190,9 @@ export default {
         courseFee: null,
       },
       rules: {
-        courseFee: [
-          { required: true, message: "请输入课程费用", trigger: "blur" },
-        ],
-        chargeTypeId: [
-          { required: true, message: "请选择收费类型", trigger: "change" },
-        ],
-        organId: [
-          { required: true, message: "请选择所属分部", trigger: "change" },
-        ],
+        courseFee: [{ required: true, message: "请输入课程费用", trigger: "blur" }],
+        chargeTypeId: [{ required: true, message: "请选择收费类型", trigger: "change" }],
+        organId: [{ required: true, message: "请选择所属分部", trigger: "change" }],
       },
       pageInfo: {
         // 分页规则
@@ -320,11 +310,9 @@ export default {
         type: "warning",
       })
         .then(() => {
-          musicGroupOrganizationCourseSettingsDel({ id: row.id }).then(
-            (res) => {
-              this.messageTips("删除", res);
-            }
-          );
+          musicGroupOrganizationCourseSettingsDel({ id: row.id }).then((res) => {
+            this.messageTips("删除", res);
+          });
         })
         .catch(() => {});
     },

src/views/editionManager/editionList.vue

@@ -9,13 +9,13 @@
         @click="createEdi"
         v-permission="'appVersionInfo/add'"
         type="primary"
-        style="margin-bottom:20px"
+        style="margin-bottom: 20px"
       >
         新建
       </el-button>
       <el-upload
         v-permission="'import/importRedemptionCode'"
-        style="display: inline-block;margin-left:10px;"
+        style="display: inline-block; margin-left: 10px"
         action="/api-web/import/importRedemptionCode"
         :show-file-list="false"
         :before-upload="beforeUpload"
@@ -24,12 +24,7 @@
         :on-error="handleError"
         :on-success="handleSuccess"
       >
-        <el-button
-          type="primary"
-          style="margin-bottom:20px"
-        >
-          导入兑换码
-        </el-button>
+        <el-button type="primary" style="margin-bottom: 20px"> 导入兑换码 </el-button>
       </el-upload>
 
       <save-form :inline="true" @submit="search" :model="searchForm">
@@ -53,21 +48,13 @@
           :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" prop="id" label="编号"></el-table-column>
           <el-table-column align="center" prop="platform" label="客户端">
             <template slot-scope="scope">
               <div>{{ scope.row.platform | editionFilter }}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="version"
-            label="版本号"
-          ></el-table-column>
+          <el-table-column align="center" prop="version" label="版本号"></el-table-column>
           <el-table-column align="center" prop="isForceUpdate" label="强制更新">
             <template slot-scope="scope">
               <div>{{ scope.row.isForceUpdate ? "是" : "否" }}</div>
@@ -83,17 +70,9 @@
               <overflow-text :text="scope.row.description"></overflow-text>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="downloadUrl"
-            width="120"
-            label="下载链接"
-          >
+          <el-table-column align="center" prop="downloadUrl" width="120" label="下载链接">
             <template slot-scope="scope">
-              <overflow-text
-                width="120px"
-                :text="scope.row.downloadUrl"
-              ></overflow-text>
+              <overflow-text width="120px" :text="scope.row.downloadUrl"></overflow-text>
             </template>
           </el-table-column>
           <el-table-column align="center" label="操作">
@@ -175,26 +154,16 @@
           </el-select>
         </el-form-item>
         <el-form-item label="下载链接" prop="downloadUrl">
-          <el-input
-            v-model.trim="sectionForm.downloadUrl"
-            type="textarea"
-          ></el-input>
+          <el-input v-model.trim="sectionForm.downloadUrl" type="textarea"></el-input>
         </el-form-item>
         <el-form-item label="描述" prop="description">
-          <el-input
-            type="textarea"
-            v-model="sectionForm.description"
-          ></el-input>
+          <el-input type="textarea" v-model="sectionForm.description"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="sectionVisible=false">取 消</el-button>
-        <el-button v-if="isNew" type="primary" @click="createEdition"
-          >确 定</el-button
-        >
-        <el-button v-if="!isNew" type="primary" @click="resetEdition"
-          >确 定</el-button
-        >
+        <el-button @click="sectionVisible = false">取 消</el-button>
+        <el-button v-if="isNew" type="primary" @click="createEdition">确 定</el-button>
+        <el-button v-if="!isNew" type="primary" @click="resetEdition">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -206,7 +175,7 @@ import {
   resetAppVersionInfo,
 } from "@/api/systemManage";
 import pagination from "@/components/Pagination/index";
-import { getToken, getTenantId} from "@/utils/auth";
+import { getToken, getTenantId } from "@/utils/auth";
 import { decode } from "js-base64";
 import load from "@/utils/loading";
 export default {
@@ -234,6 +203,8 @@ export default {
         { value: "android-teacher", label: "安卓-老师端" },
         { value: "android-student", label: "安卓-学生端" },
         { value: "android-education", label: "安卓-管理端" },
+        { value: "ios-electron", label: "苹果-桌面端" },
+        { value: "win-electron", label: "win-桌面端" },
       ],
       sectionForm: {
         platform: "",
@@ -244,21 +215,15 @@ export default {
         id: "",
       },
       sectionRules: {
-        platform: [
-          { required: true, message: "请选择客户端", trigger: "blur" },
-        ],
+        platform: [{ required: true, message: "请选择客户端", trigger: "blur" }],
         version: [{ required: true, message: "请输入版本号", trigger: "blur" }],
-        isForceUpdate: [
-          { required: true, message: "请选择是否强更", trigger: "blur" },
-        ],
-        status: [
-          { required: true, message: "请选择版本状态", trigger: "blur" },
-        ],
+        isForceUpdate: [{ required: true, message: "请选择是否强更", trigger: "blur" }],
+        status: [{ required: true, message: "请选择版本状态", trigger: "blur" }],
       },
       isNew: false,
       headers: {
         Authorization: getToken(),
-        tenantId: getTenantId()
+        tenantId: getTenantId(),
       },
     };
   },
@@ -277,9 +242,7 @@ export default {
       this.getList();
     },
     getList() {
-      this.searchForm.search
-        ? this.searchForm.search
-        : (this.searchForm.search = null);
+      this.searchForm.search ? this.searchForm.search : (this.searchForm.search = null);
       appVersionInfo({
         search: this.searchForm.search,
         page: this.rules.page,
@@ -308,8 +271,7 @@ export default {
         this.$alert(str, "导入结果", {
           confirmButtonText: "确定",
           dangerouslyUseHTMLString: true,
-          callback: (action) => {
-          },
+          callback: (action) => {},
         });
       } else {
         this.$message.error(response.msg);
@@ -321,7 +283,6 @@ export default {
     createEdi() {
       this.isNew = true;
       this.sectionVisible = true;
-
     },
     createEdition() {
       this.$refs.sectionForm.validate((v) => {
@@ -383,5 +344,4 @@ export default {
   },
 };
 </script>
-<style lang="sass">
-</style>
+<style lang="sass"></style>