Merge branch 'feat/v20241110-同城联盟卡' into dev

src/views/business/alliance/components/EditProportion.vue

@@ -3,6 +3,7 @@
     <el-form :rules="rules" ref="formRef" :model="form" label-width="auto">
       <el-form-item label="结算比例" prop="settlementRatio">
         <el-input v-model="form.settlementRatio" placeholder="请填写结算比例"></el-input>
+        <div style="font-size: 12px; color: #cccc;">范围：0 - 1</div>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">

src/views/business/alliance/components/JoinShop.vue

@@ -36,7 +36,7 @@
       <el-table-column width="150" prop="createTime" label="报名时间" align="center" />
       <el-table-column align="center" label="操作" width="130" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
-          <el-button type="info" size="mini" @click="$refs.editProportionRrf && $refs.editProportionRrf.handleOpen(row)">修改结算比例</el-button>
+          <el-button type="primary" size="mini" @click="$refs.editProportionRrf && $refs.editProportionRrf.handleOpen(row)">修改结算比例</el-button>
         </template>
       </el-table-column>
     </el-table>