From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
shop_vue/src/views/branch/branch/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/shop_vue/src/views/branch/branch/index.vue b/shop_vue/src/views/branch/branch/index.vue
index 367cb1d..682a18a 100644
--- a/shop_vue/src/views/branch/branch/index.vue
+++ b/shop_vue/src/views/branch/branch/index.vue
@@ -8,12 +8,12 @@
<!--添加分会-->
<div class="common-level-rail fl">
- <el-button size="small" type="primary" icon="el-icon-plus" @click="addClick" v-auth="'/branch/branch/add'">添加连盟</el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addClick" v-auth="'/branch/branch/add'">添加分会</el-button>
</div>
<div class="common-seach-wrap fr">
<el-form size="small" :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="">
- <el-input v-model="formInline.search" placeholder="请输入连盟名称"></el-input>
+ <el-input v-model="formInline.search" placeholder="请输入分会名称"></el-input>
</el-form-item>
<el-form-item>
@@ -25,8 +25,8 @@
<div class="product-content">
<div class="table-wrap">
<el-table size="small" :data="tableData" border style="width: 100%" v-loading="loading">
- <el-table-column prop="branch_id" label="连盟ID" width="90"></el-table-column>
- <el-table-column prop="name" label="连盟名称"></el-table-column>
+ <el-table-column prop="branch_id" label="分会ID" width="90"></el-table-column>
+ <el-table-column prop="name" label="分会名称"></el-table-column>
<el-table-column prop="branch_type.text" label="级别" width="100"></el-table-column>
<el-table-column prop="region" label="所在区域" width="200">
<template slot-scope="scope">
@@ -40,6 +40,7 @@
@change="recycle($event, scope.row)"></el-switch>
</template>
</el-table-column>
+ <el-table-column prop="sort" label="排序" width="100"></el-table-column>
<el-table-column prop="create_time" label="添加时间" width="180"></el-table-column>
<el-table-column fixed="right" label="操作" width="220">
<template slot-scope="scope">
--
Gitblit v1.9.2