增减用户列表页面，修改crud部分代码，修改店铺列表页面增加三方配置弹窗

src/views/shop/list/components/detailModal.vue

@@ -3,13 +3,16 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="聚合支付" name="pay">
         <el-form ref="form" :model="form" label-width="120px" label-position="left">
+          <el-form-item label="店铺id">
+            <el-input v-model="form.storeId" placeholder="请输入店铺id"></el-input>
+          </el-form-item>
           <el-form-item label="商户号">
             <el-input v-model="form.appId" placeholder="请输入商户号"></el-input>
           </el-form-item>
           <el-form-item label="商户密钥">
             <el-input
               type="textarea"
-              v-model="form.appToken"
+              v-model="form.appSecret"
               placeholder="请输入商户密钥"
             ></el-input>
           </el-form-item>
@@ -17,7 +20,10 @@
             <el-input v-model="form.payPassword" placeholder="请输入支付密码"></el-input>
           </el-form-item>
           <el-form-item label="微信appid">
-            <el-input v-model="form.smallAppid" placeholder="请输入微信小程序appid"></el-input>
+            <el-input
+              v-model="form.wechatSmallAppid"
+              placeholder="请输入微信小程序appid"
+            ></el-input>
           </el-form-item>
           <el-form-item label="支付宝appid">
             <el-input
@@ -31,32 +37,33 @@
                     <el-form-item label="支付宝商户密钥">
                         <el-input v-model="form.alipayAppToken" placeholder="请输入支付宝商户密钥"></el-input>
                     </el-form-item> -->
-          <el-form-item label="店铺id">
-            <el-input v-model="form.storeId" placeholder="请输入店铺id"></el-input>
-          </el-form-item>
+
           <el-form-item label="状态">
             <el-radio-group v-model="form.status">
-              <el-radio :label="1">启用</el-radio>
-              <el-radio :label="-1">禁用</el-radio>
+              <el-radio :value="1">启用</el-radio>
+              <el-radio :value="-1">禁用</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-form>
       </el-tab-pane>
     </el-tabs>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="submitHandle" :loading="formLoading">
-        <span v-if="!formLoading">保存</span>
-        <span v-else>保存中...</span>
-      </el-button>
-    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="submitHandle" :loading="formLoading">
+          <span v-if="!formLoading">保存</span>
+          <span v-else>保存中...</span>
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
 <script>
 // import { tbMerchantThirdApply, tbMerchantThirdApplyPut } from "@/api/shop";
 import ShopApi from "@/api/account/shop";
-
+import shopMerchantApi from "@/api/account/shopMerchant";
+import { ElNotification } from "element-plus";
 export default {
   data() {
     return {
@@ -64,12 +71,12 @@ export default {
       activeName: "pay",
       formLoading: false,
       form: {
-        appToken: "",
+        appSecret: "",
         id: "",
         payPassword: "",
         status: 1,
         appId: "",
-        smallAppid: "",
+        wechatSmallAppid: "",
         storeId: "",
         alipaySmallAppid: "",
         alipayAppToken: "",
@@ -82,12 +89,12 @@ export default {
     async submitHandle() {
       this.formLoading = true;
       try {
-        await tbMerchantThirdApplyPut(this.form);
+        await shopMerchantApi.edit(this.form.id, this.form);
         this.$emit("success");
         this.formLoading = false;
-        this.$notify({
+        ElNotification({
           title: "成功",
-          message: `提交成功`,
+          message: `修改成功`,
           type: "success",
         });
         this.close();
@@ -100,7 +107,7 @@ export default {
       this.dialogVisible = false;
     },
     reset() {
-      this.form.appToken = "";
+      this.form.appSecret = "";
       this.form.id = "";
       this.form.payPassword = "";
       this.form.status = 1;
@@ -108,14 +115,16 @@ export default {
     },
     // 详情（配置三方支付）
     async getDetail(id) {
+      console.log(id);
       try {
-        const res = await tbMerchantThirdApply(id);
-        this.form.appToken = res.appToken;
+        const res = await shopMerchantApi.get(id);
+        this.form.appSecret = res.appSecret;
         this.form.payPassword = res.payPassword;
         this.form.status = res.status;
         this.form.appId = res.appId;
-        this.form.smallAppid = res.smallAppid;
+        this.form.wechatSmallAppid = res.wechatSmallAppid;
         this.form.alipaySmallAppid = res.alipaySmallAppid;
+        this.form.merchantName = res.merchantName;
         //this.form.alipayAppToken = res.alipayAppToken
         //this.form.alipayAppId = res.alipayAppId
         this.form.storeId = res.storeId;
@@ -126,8 +135,8 @@ export default {
     },
     show(obj) {
       if (obj && obj.id) {
-        this.form.id = obj.merchantId;
-        this.getDetail(obj.merchantId);
+        this.form.id = obj.id;
+        this.getDetail(obj.id);
       }
     },
   },

src/views/shop/list/index.vue

@@ -184,12 +184,13 @@ onMounted(() => {
 
 const refDetailModal = ref(null);
 function dropdownClick(e) {
-  switch (e.command) {
-    case 1:
-      refDetailModal.value.show(e.row);
-      break;
-    default:
-      break;
+  console.log(e);
+  if (e.command == 1) {
+    refDetailModal.value.show(e.row);
+    return;
+  }
+  if (e == 5) {
+    return;
   }
 }
 // 重置查询