资产\运费 bug修复

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

@@ -4,7 +4,7 @@
       <!-- 商品信息 -->
       <div class="card-header-custom">
         <div class="card-header-title">
-          <span class="blue-block blue-block-goods-title"></span>账号资产
+          <span class="blue-block blue-block-goods-title"></span>账户资产
         </div>
         <div class="card-header-handle">
           <el-button plain type="primary" size="small" @click="explainWithdrawal">提现说明</el-button>
@@ -111,7 +111,7 @@
           </el-form-item>
 
           <el-form-item label="对公银行账号：" prop="bank_account_sn">
-            <el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入快递单号" style="width: 70%"></el-input>
+            <el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入对公银行账号" style="width: 70%"></el-input>
           </el-form-item>
 
           <el-form-item>

src/views/system/freight/freight_list/index.vue

@@ -34,13 +34,13 @@
 
       <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column label="ID" align="center" prop="Id"/>
-        <el-table-column label="模板名称" align="center" prop="Name"/>
-        <el-table-column label="排序" align="center" prop="Sort"/>
-        <el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="IsDefault"/>
+        <el-table-column label="ID" align="center" prop="id"/>
+        <el-table-column label="模板名称" align="center" prop="name"/>
+        <el-table-column label="排序" align="center" prop="sort"/>
+        <el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="is_default"/>
         <!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
-        <el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="Publish"/>
-        <el-table-column label="创建时间" align="center" :formatter="formatTime" prop="Created"/>
+        <el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="publish"/>
+        <el-table-column label="创建时间" align="center" :formatter="formatTime" prop="created"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -148,9 +148,9 @@
         this.isOpen = val;
         this.getList();
       },
-      // 模板是否启用状态
+      /** 启用状态 格式化*/
       formaStatus(row) {
-        let isPublish = row.Publish;
+        let isPublish = row.publish;
         let publish = '';
         if(isPublish === 1) {
           publish = '启用';
@@ -172,7 +172,7 @@
       },
       //格式化状态
       formatDefault(row) {
-        var types = row.IsDefault
+        var types = row.is_default
         var optDes = ''
         if (types == 1) {
           optDes = "是"
@@ -183,7 +183,7 @@
       },
       //格式化时间
       formatTime(row) {
-        var Time = row.Created
+        var Time = row.created
         var newtime = ""
         if (Time > 0) {
           newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
@@ -194,7 +194,7 @@
       getList() {
         listFreight(this.queryParams).then(res => {
           if(res.data) {
-            debugger
+            //
             this.freightList = res.data.list;
             this.total = res.data.count;
           }
@@ -234,7 +234,7 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.Id)
+        this.ids = selection.map(item => item.id)
         this.single = selection.length !== 1
         this.multiple = !selection.length
       },
@@ -269,10 +269,10 @@
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
-        const id = row.Id
+        const id = row.id
         getFreight(id).then(response => {
           let formdate = response.data
-          debugger
+          //
           response.data.Dispatching = JSON.parse(formdate.Dispatching)
           console.log("点击修改获取的数据：",formdate.Dispatching);
           this.form = response.data
@@ -283,7 +283,7 @@
       /** 提交按钮 */
       submitForm() {
         this.$refs["form"].validate(valid => {
-          debugger
+
           if (valid) {
 
             if (this.form.id != null) {
@@ -311,8 +311,7 @@
       * */
       /** 删除按钮操作 */
       handleDelete(row) {
-        const ids = row.Id || this.ids;
-        debugger
+        const ids = row.id || this.ids;
         this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -321,13 +320,11 @@
           this.loading = true;
           let delResult = await delFreight(ids);
           if(delResult.code === 1) {
-            this.$message({type: 'success',message: delResult.msg});
+            this.$message({type: 'success',message: '删除成功'});
             this.getList();
+          } else {
+            this.$message({type: 'error',message: delResult.msg ? delResult.msg : '删除失败'});
           }
-          if(delResult.code === 0) {
-            this.$message({type: 'error',message: delResult.msg});
-          }
-          this.loading = false;
         }).catch(()=> {});
       },
     } //methods结束