4 次代码提交 7dcee6a9cc ... 31b4768456

作者 SHA1 备注 提交日期
  maqingyang 31b4768456 Merge remote-tracking branch 'origin/develop' into develop 11 月之前
  maqingyang c98f12d63f fixed bugs in business pagesplit 11 月之前
  maqingyang faadf5e47a Merge remote-tracking branch 'origin/develop' into develop 11 月之前
  maqingyang 67735ada08 fixed bugs in cooperatorNum 11 月之前

+ 6 - 6
src/views/system/business.vue

@@ -218,7 +218,7 @@ export default {
     handleCurrentChange:function(currentPage){
       this.currentPage=currentPage;
       if(!this.input){
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
+        businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -228,7 +228,7 @@ export default {
           )
         }
       else {
-        selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+        selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;
@@ -240,7 +240,7 @@ export default {
     handleSizeChange:function(size){
       this.pagesize=size;
       if(!this.input){
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
+        businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -249,7 +249,7 @@ export default {
           )
         }
         else {
-          selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+          selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;
@@ -343,7 +343,7 @@ export default {
     filterTable(){
 
       if (this.input.trim() === '') {
-          businessList(this.currentPage,this.pagesize,this.businessType).then(
+          businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -354,7 +354,7 @@ export default {
         // 如果输入框为空,显示所有数据
       } else {
         // 否则,只显示与输入文本匹配的数据
-        selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+        selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;

+ 1 - 1
src/views/system/cooperatorDetailed.vue

@@ -48,7 +48,7 @@
             <el-row>
               <el-col span="10" >
                 <el-form-item label="合作方编号: " width="100px">
-                <span>{{cooperatorId}}</span>
+                <span>{{cooperatorNum}}</span>
                 </el-form-item>
               </el-col>
               <el-col span="10"  >

+ 1 - 1
src/views/system/cooperatorInfo.vue

@@ -38,7 +38,7 @@
               <el-table :data="cooperatorShowData" style="width: 100%;" @row-click="onButtonClick" stripe>
                 <el-table-column align="center" label="合作方编号" >
                   <template v-slot="{row}">
-                    <span>{{ row.id}}</span>
+                    <span>{{ row.cooperatorNum}}</span>
                   </template>
                 </el-table-column>
 

+ 1 - 1
src/views/system/cooperatorProductInfoBase.vue

@@ -166,7 +166,7 @@ import { Row } from 'element-ui';
       gotolink2()
       {
         //指定跳转地址
-        this.$router.push('/cooperatorProductInfo');
+        this.$router.push('/cooperatorInfo');
         this.selected1 = false;
         this.selected2 = true;
         this.selected3 = false;