Merge branch 'test' of 121.36.198.49:zy_duanju/zhiyu_duanju_distribution_manage_front into test

src/views/payBack/juliangAccount/tabs/advertiserList/index.vue

@@ -45,7 +45,7 @@
           <el-button link type="primary" size="small" @click="handleEdit(scope.$index, scope.row)"
             v-action="'callback.JuliangAccount.updateCallbackConfig'">回传配置</el-button>
           <br />
-          <el-button link type="primary" size="small" @click="handleCancel(scope.row)"
+          <el-button link type="primary" v-if="scope.row.promotion_id >  0" size="small" @click="handleCancel(scope.row)"
             v-action="'callback.JuliangAccount.unbindPromotion'">取消推广回传关联</el-button>
         </template>
       </el-table-column>