Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/baseInfo/branchCompany/index.vue

@@ -119,7 +119,7 @@
           <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleView(scope.row)">详情</el-button>
           <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleSetting(scope.row)">基础信息</el-button>
           <el-button v-if="branchCompany_btn_edit" size="small"  class="el-button el-button--text el-button--small"  @click="handleCompanyInfo(scope.row)">公司介绍</el-button>
-          <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleSettingStock(scope.row)">设置股权</el-button>
+          <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleSettingStock(scope.row)" v-if="compnay_stock_update">设置股权</el-button>
           <el-button v-if="branchCompany_btn_del" size="small"  class="el-button el-button--text el-button--small"  style="color: red;" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -205,6 +205,7 @@
         infoVisible: false,//详情弹框
         allZoneArr:[],//全部片区
         provinceRegions: [],//片区下省份数据
+          compnay_stock_update:false,
         rules: {
           latitude: [
             {
@@ -380,6 +381,8 @@
       this.branchCompany_btn_edit = this.elements['branchCompany:btn_edit'];
       this.branchCompany_btn_del = this.elements['branchCompany:btn_del'];
       this.branchCompany_btn_add = this.elements['branchCompany:btn_add'];
+      this.compnay_stock_update = this.elements['compnay:stock:update']
+        debugger
     },
     computed: {
       ...mapGetters([

src/views/purseManage/discountRecord.vue

@@ -39,7 +39,11 @@
             <span>{{scope.row.phone}}</span>
           </template>
         </el-table-column>
-
+        <el-table-column align="center" label="提现账号">
+          <template scope="scope">
+            <span>{{scope.row.accountNumber}}</span>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="金额">
           <template scope="scope">
             <span>{{scope.row.amount}}</span>