更新

src/components/serviceRemind/index.vue

@@ -10,7 +10,9 @@
 
     <div class="descriptions-container">
       <div class="descriptions">
-        <div class="title"><i class="remind icon_service"></i>服务信息</div>
+        <div class="title">
+          <i class="remind iconfont icon-banbenhuiyuantubiao"></i>
+          服务信息</div>
         <el-row style="padding: 0 20px 10px">
           <el-col :span="12">
             <el-row>
@@ -39,7 +41,9 @@
       </div>
 
       <div class="descriptions">
-        <div class="title"><i class="remind icon_yunB"></i>云教室余额</div>
+        <div class="title">
+          <i class="remind iconfont icon-yunjiaoshiyue"></i>
+          云教室余额</div>
         <el-row style="padding: 0 20px 10px;">
           <el-col :span="24"
             >云教室总余额：<span class="color">{{ tInfo.balance | moneyFormat}}元</span></el-col
@@ -231,18 +235,20 @@ export default {
 }
 .remind {
   display: inline-block;
-  margin-right: 12px;
-}
-.icon_service {
-  width: 22px;
-  height: 18px;
-  background: url("./icon_service.png") no-repeat center;
-  background-size: contain;
-}
-.icon_yunB {
-  width: 16px;
-  height: 22px;
-  background: url("./icon_yunB.png") no-repeat center;
-  background-size: contain;
+  margin-right: 10px;
+  font-size: 22px;
+  color: var(--color-primary);
 }
+// .icon_service {
+//   width: 22px;
+//   height: 18px;
+//   background: url("./icon_service.png") no-repeat center;
+//   background-size: contain;
+// }
+// .icon_yunB {
+//   width: 16px;
+//   height: 22px;
+//   background: url("./icon_yunB.png") no-repeat center;
+//   background-size: contain;
+// }
 </style>

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -259,8 +259,9 @@
           :rules="[{ required: true, message: '请选择会员' }]"
           :label-width="formLabelWidth"
         >
+            <!-- :disabled="addDisabled" -->
           <el-select
-            :disabled="addDisabled"
+            disabled
             class="multiple"
             filterable
             style="width: 545px !important"
@@ -646,6 +647,7 @@ export default {
       tableList: [],
       addDisabled: false,
       title: "新增收费标准",
+      pageType: 'create',
       formLabelWidth: "120px",
       form: {
         currentDayFee: "",
@@ -686,6 +688,10 @@ export default {
     try {
       const res = await getAllmemberRank();
       this.remberList = res.data;
+      // 默认选中第一个
+      if(this.pageType == 'create' && this.remberList.length > 0) {
+        this.form.memberRankSettingId = this.remberList[0].id
+      }
     } catch {}
 
     this.getList();

src/views/platformManager/tenantApply/index.vue

@@ -17,12 +17,14 @@
         <el-form-item prop="name">
           <el-input
             v-model="searchForm.name"
+            clearable
             placeholder="机构名称"
           ></el-input>
         </el-form-item>
         <el-form-item prop="createTimer">
           <el-date-picker
             v-model.trim="searchForm.createTimer"
+            clearable
             type="daterange"
             range-separator="至"
             start-placeholder="申请开始时间"
@@ -127,7 +129,7 @@ export default {
       try {
         const { name, createTimer } = this.searchForm
         const res = await tenantApplyList({
-          name,
+          name: name,
           ...getTimes(createTimer, ["startDateTime", "endDateTime"], "YYYY-MM-DD HH:mm:ss"),
           page: this.pageInfo.page,
           rows: this.pageInfo.limit,

src/views/productService/components/serviceRenew.vue

@@ -3,7 +3,7 @@
     <div class="descriptions-container">
       <div class="descriptions">
         <div class="title">
-          {{ tenantInfo.platformServeName }}
+          <i class="iconfont icon-yunjiaoshibanben"></i>{{ tenantInfo.platformServeName }}
         </div>
         <el-row style="padding: 0 20px 20px">
           <el-col :span="6" class="border">
@@ -182,4 +182,9 @@ export default {
 .el-input, .el-select {
   width: 200px !important;
 }
+.icon-yunjiaoshibanben {
+  margin-right: 10px;
+  color: #999999;
+  font-size: 21px;
+}
 </style>

src/views/productService/index.vue

@@ -21,14 +21,14 @@
                     "
                   ></i>
                 </el-tooltip></el-col>
-            <el-col :span="24" class="subTitle"><i class="icon_balance"></i>云教室余额（元） <el-button plain round @click="onDetail" size="mini">扣费记录 <i class="el-icon-arrow-right"></i></el-button></el-col>
+            <el-col :span="24" class="subTitle"><i class="iconfont icon-yunjiaoshiyue"></i>云教室余额（元） <el-button plain round @click="onDetail" size="mini">扣费记录 <i class="el-icon-arrow-right"></i></el-button></el-col>
           </el-row>
         </div>
 
         <div class="descriptions">
           <el-row>
             <el-col :span="24" style="display: flex;align-items: center;"><span class="balance" style="font-size: 26px; margin-right: 0;">{{ dataInfo.serverName }}</span><span class="version" @click="versionVisible = true"><i class="icon_version"></i>版本对比</span></el-col>
-            <el-col :span="24" class="lastTime"><i class="icon_member"></i>
+            <el-col :span="24" class="lastTime"><i class="iconfont icon-banbenhuiyuantubiao"></i>
               剩余<span class="days">{{ dataInfo.validRemaining }}</span>天({{ dataInfo.expiryDateEnd }}到期)
               <span style="padding-left: 50px">
                 (学员上限) <span class="color">{{ dataInfo.studentNum }}/{{ dataInfo.studentUpLimit }}</span>人
@@ -205,20 +205,26 @@ export default {
     }
   }
 
-  .icon_member {
-    display: inline-block;
-    width: 24px;
-    height: 24px;
-    background: url('../../assets/images/base/icon_member.png') no-repeat center;
-    margin-right: 6px;
-  }
-  .icon_balance {
-    display: inline-block;
-    width: 24px;
-    height: 24px;
-    background: url('../../assets/images/base/icon_balance.png') no-repeat center;
+  .icon-yunjiaoshiyue, .icon-banbenhuiyuantubiao {
     margin-right: 6px;
+    color: var(--color-primary);
+    font-size: 24px;
   }
+
+  // .icon_member {
+  //   display: inline-block;
+  //   width: 24px;
+  //   height: 24px;
+  //   background: url('../../assets/images/base/icon_member.png') no-repeat center;
+  //   margin-right: 6px;
+  // }
+  // .icon_balance {
+  //   display: inline-block;
+  //   width: 24px;
+  //   height: 24px;
+  //   background: url('../../assets/images/base/icon_balance.png') no-repeat center;
+  //   margin-right: 6px;
+  // }
 }
 </style>
 

src/views/resetTeaming/index.vue

@@ -16,11 +16,13 @@
       </el-page-header>
       <div class="musicGroupOperation">
         <!-- 进行中才有乐团档案 -->
-        <span class="item" @click="gotoArchices" v-if="permission('/musicArchices') && team_status == 'PROGRESS'">乐团档案</span>
+        <span class="item" @click="gotoArchices" v-if="permission('/musicArchices') && team_status == 'PROGRESS'">
+          乐团档案
+        </span>
         <i class="line" v-if="permission('/musicArchices') && team_status == 'PROGRESS' && permission('recharge/findAll')"></i>
         <span class="item" @click="journalVisible = true" v-if="permission('recharge/findAll')">操作日志</span>
         <!-- <div
-          class="hearConcat"
+          class="hearConcat"`
           @click="gotoArchices"
           v-if="permission('/musicArchices')"
         >
@@ -482,6 +484,7 @@ export default {
     height: 16px;
     background: #DDDFE6;
     margin: 0 10px;
+    padding: 0;
   }
 }
 

vue.config.js

@@ -18,8 +18,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.251:8000' // 何国威
 // let target = 'http://192.168.3.250:8000' //邹璇
-// let target = 'http://192.168.3.112:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://192.168.3.119:8000' //勇哥
+// let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {