云仓bug修复；新接口梳理；添加商品分类功能

src/api/module/bankcard.js

@@ -49,6 +49,6 @@ export function delBankcard(ids) {
     return request({
         url: '/system/bankcard/delete',
         method: 'delete',
-        data:{ids:ids}
+        data:{id:ids}
     })
 }

src/views/entry/fillMainInf.vue

@@ -326,7 +326,7 @@
           upLoadImg(data).then((res) => {
             if(res && res.data.code ==  1){
               this.licenseImgFileList.push({'url':res.data.data.imageUrl});
-              this.$message('上传成功');
+              this.$message({type: 'success',message:'上传成功'});
               this.$refs.mainForm.clearValidate('license');
             }
           });

src/views/system/asset/bankcard/index.vue

 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <el-row :span="24" type="flex" align="middle" justify="space-between">
@@ -20,18 +20,17 @@
         </el-row>
       </div>
 
-      <el-table v-loading="loading" :height="tableHeight" :data="bankcardList"
+      <el-table :height="tableHeight" :data="bankcardList"
                 @selection-change="handleSelectionChange">
-        <el-table-column label="商户ID" align="center" prop="Id"/>
-        <el-table-column label="开户名" align="center" prop="BankAccountName"/>
-        <el-table-column label="城市名" align="center" prop="ProvinceCity"/>
-        <el-table-column label="银行名称" align="center" prop="BankName"/>
-        <el-table-column label="开户行" align="center" prop="Kaihuhang"/>
-        <el-table-column label="户名" align="center" prop="BankAccountName"/>
-        <el-table-column label="账号" align="center" prop="BankAccountNo"/>
+        <el-table-column label="商户ID" align="center" prop="id"/>
+        <el-table-column label="开户名" align="center" prop="bank_account_name"/>
+<!--        <el-table-column label="城市名" align="center" prop="ProvinceCity"/>-->
+        <el-table-column label="银行名称" align="center" prop="bank_name"/>
+        <el-table-column label="开户行" align="center" prop="bank_branch_name"/>
+        <el-table-column label="账号" align="center" prop="bank_account_sn"/>
         <!--             <el-table-column label="支付宝账户名称" align="center" prop="ZfbAccountName" />-->
         <!--             <el-table-column label="支付宝账户" align="center" prop="ZfbAccount" />-->
-        <el-table-column label="类型" :formatter="btypa" align="center" prop="State"/>
+<!--        <el-table-column label="类型" :formatter="btypa" align="center" prop="State"/>-->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -67,19 +66,19 @@
 <!--      </el-dialog>-->
 
       <el-dialog :visible.sync="bank" :title="banktitle">
-        <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-          <el-row>
-            <el-col :span="16" :offset="3">
-              <el-form-item label="开户城市" prop="ProvinceCity">
-                <el-input v-model="form.ProvinceCity" placeholder="请输入城市名和商户提交时一致"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
+<!--          <el-row>-->
+<!--            <el-col :span="16" :offset="3">-->
+<!--              <el-form-item label="开户城市" prop="ProvinceCity">-->
+<!--                <el-input v-model="form.ProvinceCity" placeholder="请输入城市名和商户提交时一致"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
 
           <el-row>
             <el-col :span="16" :offset="3">
               <el-form-item label="银行名称">
-                <el-select v-model="form.BankName" placeholder="状态" style="width: 100%">
+                <el-select v-model="form.bankName" placeholder="状态" style="width: 100%">
                   <el-option v-for="item in bankList" :key="item.value" :label="item.value"
                              :value="item.value"></el-option>
                 </el-select>
@@ -89,32 +88,32 @@
 
           <el-row>
             <el-col :span="16" :offset="3">
-              <el-form-item label="开户行" prop="kaihuhang">
-                <el-input v-model="form.kaihuhang" placeholder="请输入开户行"/>
+              <el-form-item label="开户行" prop="bank_branch_name">
+                <el-input v-model="form.bank_branch_name" placeholder="请输入开户行"/>
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="16" :offset="3">
-              <el-form-item label="户名" prop="BankAccountName">
-                <el-input v-model="form.BankAccountName" placeholder="请输入户名"/>
+              <el-form-item label="户名" prop="bankAccountName">
+                <el-input v-model="form.bankAccountName" placeholder="请输入户名"/>
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="16" :offset="3">
-              <el-form-item label="账号" prop="BankAccountNo">
-                <el-input v-model="form.BankAccountNo" placeholder="请输入账号"/>
+              <el-form-item label="账号" prop="BankAccountSn">
+                <el-input v-model="form.BankAccountSn" placeholder="请输入账号"/>
               </el-form-item>
             </el-col>
           </el-row>
 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel" size="small">取 消</el-button>
+          <el-button type="primary" @click="submitForm" size="small">确 定</el-button>
         </div>
       </el-dialog>
 
@@ -249,8 +248,8 @@
       getList() {
         listBankcard(this.queryParams).then(response => {
           this.bankcardList = response.data.data;
-          //this.total = response.data.count;
-          this.total = 1;
+          // debugger
+          this.total = response.data.count;
           if (this.total >= 3) {
             this.isAddbank = true;
           }else {
@@ -307,10 +306,12 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             this.form.sellerId = this.queryParams.sellerId;
-            this.form.TxType = 1;
+            // this.form.TxType = 1;
+            this.loading = true;
             addBankcard(this.form).then(response => {
-              if (response.code === 0) {
+              if (response.code === 1) {
                 this.msgSuccess("新增成功");
+                this.loading = false;
                 this.open = false;
                 this.bank = false;
                 this.zfb = false;
@@ -323,18 +324,20 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const ids = row.Id
+        const ids = row.id
         this.$confirm('是否确认删除商户银行卡编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function () {
-          return delBankcard(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function () {
-        });
+        }).then(async() => {
+          this.loading = true;
+          let result = await delBankcard(ids);
+          if(result.code === 1) {
+            this.$message({type:'success',message:'删除成功'});
+            this.getList()
+          }
+          this.loading = false;
+        }).catch(()=> {});
       },
     } //methods结束
   };

src/views/system/asset/verifyrecord/index.vue

@@ -210,8 +210,8 @@
       /** 查询商户账单列表 */
       getList() {
         listVerifyrecord(this.queryParams).then(response => {
-          this.verifyrecordList = response.data.list;
-          this.total = response.data.total;
+          this.verifyrecordList = response.data.data;
+          this.total = response.data.count;
         });
       },
       // 取消按钮

src/views/system/asset/withdraw/index.vue

@@ -211,8 +211,8 @@
       },
       //获取商户的信息
       getSellerInfoFn() {
-        const sellerid = this.sellerId;
-        getSellerInfo({sellerId: sellerid}).then(response => {
+        const sellerId = this.sellerId;
+        getSellerInfo({sellerId: sellerId}).then(response => {
           this.sellerinfo = response.data;
           this.sellerinfo.Balance = response.data.Balance / 100;
           this.sellerinfo.FrozenMoney = response.data.FrozenMoney / 100;
@@ -222,7 +222,7 @@
       //获取商户的银行卡列表
       getBankcardList() {
         getBankcardList({sellerId: this.sellerId}).then(response => {
-          this.banklist = response.data.list;
+          this.banklist = response.data.data;
         });
       },
 

src/views/system/goods/add/addIndex.vue

+<template>
+  <div>
+    <p>hi，你好</p>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "AddIndex",
+    data() {
+      return {}
+    }
+  }
+</script>
+
+<style lang="scss" type="text/stylus" scoped>
+
+</style>