修改

dist/static/css/chunk-08dff963.15bc3a64.css

@@ -1 +0,0 @@
-.left[data-v-28deca8c]{margin-right:20px}.listWrap[data-v-28deca8c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-0c0f60b7.47f7abb7.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-21c40686],.el-button--primary[data-v-21c40686]:active,.el-button--primary[data-v-21c40686]:focus,.el-button--primary[data-v-21c40686]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-21c40686]{margin-top:40px}.el-col[data-v-21c40686]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-21c40686]{width:200px;margin:0 20px}[data-v-21c40686] .el-tree-node__content{height:40px!important}.moreRule[data-v-21c40686]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-21c40686]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-21c40686]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-21c40686]{display:inline-block}.moreRuleIn .el-form-item[data-v-21c40686]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-21c40686] .el-form-item__content{margin-left:0!important}.max[data-v-21c40686],.min[data-v-21c40686]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-1b28f35d.ffd335a3.css

@@ -0,0 +1 @@
+.left[data-v-6d649c07]{margin-right:20px}.listWrap[data-v-6d649c07]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-91b6c4fe.212d2268.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-73c8fc18],.el-button--primary[data-v-73c8fc18]:active,.el-button--primary[data-v-73c8fc18]:focus,.el-button--primary[data-v-73c8fc18]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-73c8fc18]{margin-top:40px}.el-col[data-v-73c8fc18]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-73c8fc18]{width:200px;margin:0 20px}[data-v-73c8fc18] .el-tree-node__content{height:40px!important}.moreRule[data-v-73c8fc18]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-73c8fc18]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-73c8fc18]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-73c8fc18]{display:inline-block}.moreRuleIn .el-form-item[data-v-73c8fc18]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-73c8fc18] .el-form-item__content{margin-left:0!important}.max[data-v-73c8fc18],.min[data-v-73c8fc18]{display:inline-block;width:180px;text-align:center;margin-right:10px}

src/views/businessManager/orderManager/expend.vue

@@ -29,10 +29,10 @@
           <el-table-column align='center' prop="amount"
                           label="提现金额">
           </el-table-column>
-          <!-- <el-table-column align='center' prop="balance"
-                          label="账户余额">
-          </el-table-column> -->
-          <el-table-column align='center' prop="bankCardNo"
+          <el-table-column align='center' prop="balance"
+                          label="账户余额(元)">
+          </el-table-column>
+          <el-table-column align='center' prop="bankCardNo" width="200"
                           label="提现账户">
           </el-table-column>
           <el-table-column align='center'
@@ -44,30 +44,34 @@
           <el-table-column align='center'
                           label="支付账号">
             <template slot-scope="scope">
-              <el-input type="text" v-model="scope.row.platformAccountNo" placeholder="支付账号"></el-input>
+              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.platformAccountNo" placeholder="支付账号"></el-input>
+              <span v-else>{{ scope.row.platformAccountNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
                           label="支付渠道">
             <template slot-scope="scope">
               <!-- <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input> -->
-              <el-select  v-model="scope.row.channel" placeholder="请选择">
+              <el-select  v-if="scope.row.status == 'ING'"  v-model="scope.row.channel" placeholder="请选择" style="width: 100% !important;">
                 <el-option label="微信" value="WECHAT"> </el-option>
                 <el-option label="支付宝" value="ALIPAY"> </el-option>
                 <el-option label="银联" value="FAST_PAYMENT"> </el-option>
               </el-select>
+              <span v-else>{{ scope.row.channel }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
                           label="交易流水号">
             <template slot-scope="scope">
-              <el-input type="text" v-model="scope.row.transNo" placeholder="交易流水号"></el-input>
+              <el-input v-if="scope.row.status == 'ING'" type="text" v-model="scope.row.transNo" placeholder="交易流水号"></el-input>
+              <span v-else>{{ scope.row.transNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align='center'
                           label="操作">
-            <template slot-scope="scope">
-              <el-button @click="onSure(scope.row)" type="text">确认</el-button>
+            <template slot-scope="scope" v-if="scope.row.status == 'ING'">
+              <el-button @click="onSure(scope.row, 'SUCCESS')" type="text">确认</el-button>
+              <el-button @click="onSure(scope.row, 'FAilED')" type="text">拒绝</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -119,9 +123,15 @@ export default {
         }
       })
     },
-    onSure(row) {
+    onSure(row, type) {
+      let contentText = ''
+      if(type == 'SUCCESS') {
+        contentText = '您确定提现吗？'
+      } else if(type == 'FAilED') {
+        contentText = '您确定拒绝吗？'
+      }
       console.log(row)
-      this.$confirm('是否提现?', '提示', {
+      this.$confirm(contentText, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -130,12 +140,13 @@ export default {
           id: row.id,
           platformAccountNo: row.platformAccountNo,
           transType: row.channel,
+          status: type,
           transNo: row.transNo
         }).then(res => {
           if(res.code == 200) {
             this.$message({
               type: 'success',
-              message: '删除成功!'
+              message: '操作成功!'
             })
             this.getList()
           } else {

src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="m-container">
-    <!-- <h2>
+    <h2>
       <div class="squrt"></div> vip参数设置
-    </h2> -->
+    </h2>
     <div class="m-core">
       <div class="listWrap">
         <div class="left">

src/views/categroyManager/globalConfig.vue

@@ -12,20 +12,20 @@
         <el-tab-pane label="声部设置" name="1">
             <musicalManager v-if="activeStatus[1]" />
         </el-tab-pane>
-        <el-tab-pane label="建团收费类型" name="2">
+        <el-tab-pane label="乐团收费类型" name="2">
             <typesManager v-if="activeStatus[2]" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课程参数设置" name="3">
+        <!-- <el-tab-pane label="VIP课程参数设置" name="3">
           <vipParameterManager v-if="activeStatus[3]" />
-        </el-tab-pane>
-        <el-tab-pane label="作业模板管理" name="4">
-            <jobTemplateSetting v-if="activeStatus[4]" />
+        </el-tab-pane> -->
+        <el-tab-pane label="乐团作业模板" name="3">
+            <jobTemplateSetting v-if="activeStatus[3]" />
         </el-tab-pane>
         <!-- <el-tab-pane label="梯度结算规则设置" name="5">
             <gradientSet v-if="activeStatus[5]" />
         </el-tab-pane> -->
-        <el-tab-pane label="热词标签管理" name="5">
-          <errorManager v-if="activeStatus[5]" />
+        <el-tab-pane label="热词标签" name="4">
+          <errorManager v-if="activeStatus[4]" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -35,7 +35,7 @@
 import overallManager from './generalSettings/overallManager'
 import musicalManager from './specialSetup/musicalManager'
 import typesManager from './specialSetup/typesManager'
-import vipParameterManager from './generalSettings/vipParameterManager'
+// import vipParameterManager from './generalSettings/vipParameterManager'
 import jobTemplateSetting from './specialSetup/jobTemplateSetting'
 // import gradientSet from './insideSetting/gradientSet'
 import errorManager from './generalSettings/errorManager'
@@ -44,7 +44,7 @@ export default {
     overallManager, 
     musicalManager, 
     typesManager, 
-    vipParameterManager, 
+    // vipParameterManager, 
     jobTemplateSetting, 
     // gradientSet,
     errorManager

src/views/categroyManager/insideSetting/branchActive.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>VIP分部活动设置</h2>
+    <h2><div class="squrt"></div>VIP分部活动设置</h2>
     <div class="m-core">
       <div @click="openActive('create')" class='newBand'>新建</div>
       <!-- 搜索类型 -->
@@ -80,7 +80,7 @@ export default {
     },
     openActive(type, row) {
       let params = {
-        path: '/specialSetup/branchActiveOperation',
+        path: '/vipClassSet/branchActiveOperation',
         query: {
           type: type
         }

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -172,13 +172,13 @@ export default {
           message: title + '成功',
           type: 'success'
         })
-        this.$router.push('/specialSetup/branchActive')
+        this.$router.push('/vipClassSet/branchActive')
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel() {
-      this.$router.push('/specialSetup/branchActive')
+      this.$router.push('/vipClassSet/branchActive')
     },
     resetForm() {
         this.result = {

src/views/categroyManager/vipActiveList.vue

@@ -585,7 +585,7 @@ export default {
       })
     },
     gotoNewActive () {
-      this.$router.push({ path: '/insideSetting/vipNewActive?type=create' })
+      this.$router.push({ path: '/vipClassSet/vipNewActive?type=create' })
     }
   },
 }

src/views/categroyManager/vipNewActive.vue

@@ -282,7 +282,7 @@ export default {
                 type: 'success',
                 message: '恭喜你,活动创建成功'
               })
-              this.$router.push('/insideSetting/vipActiveList')
+              this.$router.push('/vipClassSet/vipActiveList')
             }
           })
         } else {
@@ -295,7 +295,7 @@ export default {
       // addVipActive().then(res => { })
     },
     onCancel () {
-      this.$router.push("/insideSetting/vipActiveList")
+      this.$router.push("/vipClassSet/vipActiveList")
     },
     onReSet () {
       this.vipform = {