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

src/api/business.js

@@ -340,3 +340,12 @@ export function getConsumptionRecordByUserIdAndAllianceCardIdApi(params) {
     method: 'GET'
   })
 }
+
+// 修改与商家的结算比例
+export function updateShopParticipationRecordApi(data) {
+  return request({
+    url: '/alliance-card/updateShopParticipationRecord',
+    data,
+    method: 'POST'
+  })
+}

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="allianceVisible" width="890px">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="基本信息" name="base">
         <BaseInfo :card="baseInfo"></BaseInfo>
       </el-tab-pane>

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

@@ -0,0 +1,81 @@
+<template>
+  <el-dialog :close-on-click-modal="false" append-to-body title="修改结算比例" :visible.sync="editProportionVisible" width="30%">
+    <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>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="editProportionVisible = false">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updateShopParticipationRecordApi } from '@/api/business'
+
+export default {
+  data() {
+    return {
+      editProportionVisible: false,
+      form: {
+        shopParticipationRecordId: '',
+        settlementRatio: ''
+      },
+      rules: {
+        settlementRatio: [
+          { required: true, message: '请填写商家结算比例', trigger: 'blur' },
+          {
+            validator: (_, value, cb) => {
+              const num = value * 1
+              if (typeof num !== 'number') {
+                cb(new Error('结算比例是一个数字'))
+              }
+              if (num < 0 || num > 1) {
+                cb(new Error('结算比例范围应该在0 - 1之间'))
+              }
+              cb()
+            },
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      isLoading: false
+    }
+  },
+
+  watch: {
+    editProportionVisible: {
+      handler(value) {
+        !value && (this.form = { shopParticipationRecordId: '', settlementRatio: '' })
+      }
+    },
+
+    immediate: true
+  },
+
+  methods: {
+    handleOpen(row) {
+      if (!row || !row.id) return this.$message.error('数据错误')
+      this.form.shopParticipationRecordId = row.id
+      this.form.settlementRatio = row.settlementRatio
+      this.editProportionVisible = true
+    },
+
+    async handleConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.formRef.validate()
+        await updateShopParticipationRecordApi(this.form)
+        this.$message.success('修改成功')
+        this.$emit('update', { ...this.form })
+        this.editProportionVisible = false
+      } finally {
+        this.isLoading = false
+      }
+    }
+  }
+}
+</script>

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

@@ -33,7 +33,12 @@
           <el-tag>{{ scope.row.settlementRatio * 100 }}%</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="报名时间" align="center" />
+      <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>
+        </template>
+      </el-table-column>
     </el-table>
 
     <div style="margin-top: 10px">
@@ -47,13 +52,17 @@
         @current-change="(val) => (listQuery.page = val) && getList()"
       />
     </div>
+
+    <EditProportion @update="handleRefreshBussnessInfo" ref="editProportionRrf"></EditProportion>
   </div>
 </template>
 
 <script>
 import { getRegistrationShopsByIdApi } from '@/api/business'
+import EditProportion from './EditProportion.vue'
 
 export default {
+  components: { EditProportion },
   props: {
     cardId: { type: [Number, String], required: true }
   },
@@ -66,7 +75,7 @@ export default {
       listQuery: {
         allianceCardId: undefined,
         page: 1,
-        pageSize: 20,
+        pageSize: 20
       }
     }
   },
@@ -98,12 +107,14 @@ export default {
     handleSearch() {
       this.listQuery.page = 1
       this.getList()
+    },
+
+    handleRefreshBussnessInfo({ shopParticipationRecordId, settlementRatio }) {
+      const current = this.list.find((item) => item.id * 1 === shopParticipationRecordId * 1)
+      if (current) {
+        current.settlementRatio = settlementRatio
+      }
     }
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.join-shop-list-container {
-}
-</style>