店铺管理

src/api/ss/mchApply.js

@@ -42,3 +42,16 @@ export function delMchApply(applyId) {
     method: 'delete'
   })
 }
+
+// 审核商家合作申请
+export function verifyMchApply(applyId, pass, remark) {
+  return request({
+    url: `/ss/mchApply/${applyId}/verify`,
+    method: 'put',
+    params: {
+      applyId,
+      pass,
+      remark
+    }
+  })
+}

src/assets/icons/svg/apply.svg

@@ -0,0 +1 @@
+<svg t="1714285091170" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21058" width="200" height="200"><path d="M835.380917 529.718409l-107.964199-90.055445a268.119621 268.119621 0 0 0 58.331368-166.807245 271.189693 271.189693 0 0 0-97.730625-208.764896A273.748086 273.748086 0 0 0 245.927094 209.407564a270.678014 270.678014 0 0 0 51.167866 230.2554l-111.03427 92.613838A381.200606 381.200606 0 0 0 51.489201 819.328534a51.167867 51.167867 0 0 0 51.167866 51.167866h818.685866a51.167867 51.167867 0 0 0 51.167866-51.167866 383.758999 383.758999 0 0 0-137.129882-289.610125zM157.918363 768.160667A290.121804 290.121804 0 0 1 256.160667 608.516923l148.386813-125.872951a51.167867 51.167867 0 0 0 0-78.798515 167.830602 167.830602 0 0 1-58.843046-171.412353 169.877317 169.877317 0 0 1 133.548131-126.38463 171.924032 171.924032 0 0 1 142.758348 36.840863 167.830602 167.830602 0 0 1 0 260.95612 51.167867 51.167867 0 0 0 0 78.798515L767.839333 605.95853A295.750269 295.750269 0 0 1 866.081637 768.160667zM767.839333 921.664267H256.160667a51.167867 51.167867 0 0 0 0 102.335733h511.678666a51.167867 51.167867 0 0 0 0-102.335733z" p-id="21059"></path></svg>

src/components/Business/SmUser/smUserDialog.vue

@@ -55,7 +55,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        ...this.search
+        ...this.query
       },
       total: 0,
       row: null,
@@ -79,7 +79,7 @@ export default {
       type: String,
       default: '选择用户'
     },
-    search: {
+    query: {
       type: Object,
       default: () => ({})
     },
@@ -91,7 +91,7 @@ export default {
         code: null,
         pageNum: 1,
         pageSize: 10,
-        ...this.search,
+        ...this.query,
       }
 
       if (this.initSelect) {

src/components/SimpleVerifyDialog/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :title="title" :visible.sync="show" width="500px" center @open="open" @close="close">
+    <el-form :model="form" :rules="rules" ref="form">
+      <el-form-item label="审核意见" prop="remark">
+        <el-input
+          type="textarea"
+          maxlength="200"
+          show-word-limit
+          v-model="form.remark"
+          placeholder="请输入审核意见，该审核意见会反馈给申请用户"
+          :rows="5"
+        />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button type="success" icon="el-icon-check" plain @click="handlePass">通过</el-button>
+      <el-button type="danger" icon="el-icon-close" plain @click="handleReject">驳回</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'SimpleVerifyDialog',
+  props: {
+    title: {
+      type: String,
+      default: '审核',
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    requiredRemark: {
+      type: Boolean,
+      default: true,
+    },
+    reset: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  data() {
+    return {
+      form: {},
+      rules: {
+        remark: [
+          {required: this.requiredRemark, message: '审核意见不能为空', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  created() {
+    this.resetForm();
+  },
+  methods: {
+    open() {
+      if (this.reset) {
+        this.resetForm();
+      }
+    },
+    close() {
+      this.$emit('update:show', false);
+    },
+    resetForm() {
+      this.form = {
+        remark: null,
+      }
+    },
+    handleReject() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        this.$confirm('确认驳回吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          this.$emit('reject', this.form);
+        });
+      });
+    },
+    handlePass() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        this.$confirm('确认通过吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          this.$emit('pass', this.form);
+        });
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/ss/mchApply/detail.vue

@@ -0,0 +1,104 @@
+<template>
+  <el-row class="app-container">
+    <el-card class="box-card">
+      <el-descriptions title="申请详情" v-loading="loading">
+        <template slot="extra">
+          <el-button type="warning" icon="el-icon-s-check" plain @click="handleVerify" v-if="isApproving">审核</el-button>
+        </template>
+        <el-descriptions-item label="申请用户">{{detail.userName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="申请时间">{{detail.createTime | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="申请状态" >
+          <dict-tag :value="detail.status" :options="dict.type.ss_mch_apply_status" size="mini"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="姓名">{{detail.name | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="手机号" :span="2">{{detail.mobile | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="详细信息" :span="3">{{detail.content | defaultValue}}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <el-card class="box-card" v-if="!isApproving">
+      <el-descriptions title="审核详情" v-loading="loading">
+        <el-descriptions-item label="审核人">{{detail.verifyName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="审核时间">{{detail.verifyTime | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="审核意见">{{detail.verifyRemark | defaultValue}}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <!--审核弹窗-->
+    <simple-verify-dialog
+      :show.sync="showVerify"
+      @reject="onReject"
+      @pass="onPass"
+    />
+
+  </el-row>
+</template>
+
+<script>
+import { getMchApply, verifyMchApply } from '@/api/ss/mchApply'
+import SimpleVerifyDialog from '@/components/SimpleVerifyDialog/index.vue'
+
+export default {
+  name: 'MchApplyDetail',
+  components: { SimpleVerifyDialog },
+  dicts: ['ss_mch_apply_status'],
+  data() {
+    return {
+      detail: {},
+      loading: false,
+      showVerify: false,
+    }
+  },
+  computed: {
+    // 审核中
+    isApproving() {
+      return this.detail.status === '0';
+    }
+  },
+  created() {
+    this.getDetail(this.$route.query.applyId);
+  },
+  methods: {
+    onPass(form) {
+      verifyMchApply(this.detail.applyId, true, form.remark).then(res => {
+        if (res.code !== 200) {
+          return this.$message.error(res.msg);
+        }
+        this.$message.success('审核成功');
+        this.showVerify = false;
+        this.getDetail(this.detail.applyId);
+      })
+    },
+    onReject(form) {
+      verifyMchApply(this.detail.applyId, false, form.remark).then(res => {
+        if (res.code !== 200) {
+          return this.$message.error(res.msg);
+        }
+        this.$message.success('驳回成功');
+        this.showVerify = false;
+        this.getDetail(this.detail.applyId);
+      })
+    },
+    handleVerify() {
+      this.showVerify = true;
+    },
+    getDetail(applyId) {
+      if (applyId == null) {
+        return this.$message.error('参数错误：applyId不允许为空');
+      }
+      this.loading = true;
+      getMchApply(applyId).then(response => {
+        this.detail = response.data;
+      }).finally(() => {
+        this.loading = false;
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container .box-card:nth-child(n + 1) {
+  margin-top: 1em;
+}
+</style>

src/views/ss/mchApply/index.vue

@@ -25,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核人" prop="verifyBy">
+      <el-form-item label="审核人" prop="verifyName">
         <el-input
-          v-model="queryParams.verifyBy"
+          v-model="queryParams.verifyName"
-          placeholder="请输入审核人"
+          placeholder="请输入审核人名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -68,25 +68,23 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="applyId" width="50"/>
       <el-table-column label="用户名称" align="center" prop="userName" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="申请状态" align="center" prop="status">
         <dict-tag slot-scope="d" :value="d.row.status" :options="dict.type.ss_mch_apply_status"/>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="手机号" align="center" prop="mobile" />
-      <el-table-column label="详细信息" align="center" prop="content" show-overflow-tooltip/>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="审核人" align="center" prop="verifyName" />
       <el-table-column label="审核时间" align="center" prop="verifyTime" width="180"/>
-      <el-table-column label="审核备注" align="center" prop="verifyRemark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-view"
-            @click="handleDelete(scope.row)"
+            @click="handleView(scope.row)"
             v-hasPermi="['ss:mchApply:remove']"
-          >删除</el-button>
+          >查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -101,8 +99,8 @@
 
     <!-- 添加或修改商家合作申请对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
-        <el-form-item label="用户id" prop="userId">
+        <el-form-item label="用户名称" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入用户id" />
         </el-form-item>
         <el-form-item label="姓名" prop="name">
@@ -114,9 +112,6 @@
         <el-form-item label="详细信息">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
         <el-form-item label="反馈信息" prop="callback">
           <el-input v-model="form.callback" placeholder="请输入反馈信息" />
         </el-form-item>
@@ -179,7 +174,7 @@ export default {
         mobile: null,
         content: null,
         callback: null,
-        verifyBy: null,
+        verifyName: null,
         verifyTime: null,
         verifyRemark: null,
       },
@@ -211,6 +206,11 @@ export default {
   created() {
     this.getList();
   },
+  computed: {
+    isView() {
+      return this.title === '查看商家合作申请';
+    }
+  },
   methods: {
     /** 查询商家合作申请列表 */
     getList() {
@@ -278,6 +278,14 @@ export default {
         this.title = "修改商家合作申请";
       });
     },
+    handleView(row) {
+      this.$router.push({
+        path: '/mch/mchApply/detail',
+        query: {
+          applyId: row.applyId,
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/ss/store/index.vue

@@ -124,7 +124,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row :gutter="8">
           <form-col label="绑定用户" prop="userId" :span="span * 2">
-            <user-input v-model="form.userId" />
+            <user-input v-model="form.userId" :query="userQuery"/>
           </form-col>
           <form-col label="店铺图片" prop="picture" :span="span * 2">
             <image-upload v-model="form.picture"/>
@@ -246,6 +246,11 @@ export default {
     };
   },
   computed: {
+    userQuery() {
+      return {
+        isMch: true,
+      }
+    },
     formatBusinessTime: {
       set(val) {
         this.form.businessTimeStart = val[0];

src/views/system/smUser/index.vue

@@ -234,7 +234,7 @@ export default {
         pageSize: 10,
         userName: null,
         nickName: null,
-        userType: '01',
+        isMch: true,
         phonenumber: null,
         sex: null,
         status: null,
@@ -350,7 +350,7 @@ export default {
     },
     /** 查看按钮操作 */
     handleSee(row) {
-      this.$router.push({path: '/smUser/detail', query: {userId: row.userId}})
+      this.$router.push({path: '/mch/detail', query: {userId: row.userId}})
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/system/tenant/index.vue

@@ -224,7 +224,7 @@ export default {
         pageSize: 10,
         userName: null,
         nickName: null,
-        userType: '00',
+        isMch: false,
         phonenumber: null,
         sex: null,
         status: null,