售后优化，bug修复

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

@@ -99,8 +99,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="对公账户名称：" style="width:100%" prop="bankAccountName">
-            <el-input v-model="bankcardForm.bankAccountName" placeholder="对公账户名称，不能输入和修改" :disabled="true" style="width: 70%"></el-input>
+          <el-form-item label="对公账户名称：" style="width:100%">
+            <el-input v-model="bankAccountName" placeholder="对公账户名称，不能输入和修改" :disabled="true" style="width: 70%"></el-input>
             <p class="withdraw-tip">
               银行卡必须为对公账户，且与提交的公司名称相一致，不允许修改
             </p>
@@ -144,13 +144,11 @@
         bankAccountName: '', // 主体信息 公司名称
         bankcardForm: {
           bank_name: '',
-          bankAccountName: '',
           bank_branch_name: '',
           bank_account_sn: '',
         },
         bankcardRule: {
           bank_name: [{required: true,message: '银行名称不能为空',trigger: 'change'}],
-          bankAccountName: [{required: true,message: '对公账户不能为空',trigger: 'change'}],
           bank_branch_name: [{required: true,message: '开户行支行不能为空',trigger: 'blur'}],
           bank_account_sn: [{ required: true,message: '银行账号不能为空',trigger: 'blur'}]
         },
@@ -206,7 +204,15 @@
         getBankDetailsData({ id: id }).then(res=> {
           if(res.code == 1 && res.data) {
             this.addBankcardInfoDialog = true;
-            this.bankcardForm.bank_name = res.data.bank_name;
+            if(res.data.bank_name) {
+              for(let i = 0; i < this.bankOptions.length; i++) {
+                if(res.data.bank_name == this.bankOptions[i].name) {
+                  this.bankcardForm.bank_name = this.bankOptions[i].code;
+                  break
+                }
+              }
+            }
+
             this.bankcardForm.bankAccountName = res.data.corporate_account_name;
             this.bankcardForm.bank_branch_name = res.data.bank_branch_name;
             this.bankcardForm.bank_account_sn = res.data.bank_account_sn;
@@ -247,6 +253,7 @@
 
       /** 提交 添加银行卡信息 */
       submitBankcard() {
+
         let params = {
           bank_name: '',
           bank_branch_name: this.bankcardForm.bank_branch_name,
@@ -268,8 +275,8 @@
               addBankcardData(params).then(res=> {
                 if(res.code == 1) {
                   this.$message({type:'success',message: '新增成功'});
-                  this.addBankcardInfoDialog = false;
                   this.resetAddBankcardForm();
+                  this.addBankcardInfoDialog = false;
                   this.getMyAssetList(); // 更新数据
                 }else {
                   this.$message({type:'error',message:  res.message ? res.message : '新增失败' });
@@ -280,8 +287,8 @@
               editBankcardData(params).then(res=> {
                 if(res.code == 1) {
                   this.$message({type:'success',message: '修改成功'});
-                  this.addBankcardInfoDialog = false;
                   this.resetAddBankcardForm();
+                  this.addBankcardInfoDialog = false;
                   this.getMyAssetList(); // 更新数据
                 }else {
                   this.$message({type:'error',message:  res.message ? res.message : '修改失败' });
@@ -302,7 +309,6 @@
       /** 初始化 添加 银行卡 数据 */
       resetAddBankcardForm() {
         this.$refs['bankcardForm'].resetFields();
-        //this.bankcardForm.bankAccountName = this.bankAccountName
       },
 
       /** 提现 操作 */

src/views/system/retreat/edit.vue

@@ -23,7 +23,7 @@
 
     <el-card class="as-order-details">
       <!-- 倒计时 提示 -->
-      <p class="count-down-con" v-if="!(asOrderDetail.status == 5 || asOrderDetail.status == -1)"><i class="spec-icon-w el-icon-warning"></i>剩余处理时间： <span class="cd-time-span">{{ cdHour }} 小时 {{ cdMinute }} 分</span> 请在72小时内处理，逾期不处理，系统将自动退款到买家账户</p>
+      <p class="count-down-con" v-if="!(asOrderDetail.status == 5 || asOrderDetail.status == -1)"><i class="spec-icon-w el-icon-warning"></i>剩余处理时间： <span class="cd-time-span">{{ cdHour }} 小时 {{ cdMinute }} 分</span> 请在期限内处理，逾期不处理，系统将自动退款到买家账户</p>
       <!-- 售后信息 -->
       <div>
         <div class="card-header-title">
@@ -401,6 +401,13 @@
               this.cdHour = this.asOrderDetail.dead_line_hour
               this.cdMinute = this.asOrderDetail.dead_line_minute
 
+              if (this.cdHour < 0) {
+                this.cdHour = 0;
+              }
+              if (this.cdMinute < 0) {
+                this.cdMinute = 0;
+              }
+
               this.timer = setInterval(() => {
                 if (this.cdHour <= 0) {
                   this.cdHour = 0
@@ -451,6 +458,8 @@
             // 售后历史
             if(res.data.order_refund_history) {
               this.asApplyList = res.data.order_refund_history
+            }else {
+              this.asApplyList = [];
             }
           }
         });

src/views/system/retreat/retreat/index.vue

@@ -62,7 +62,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -104,13 +104,14 @@
       <!-- 分页 -->
       <div class="pagination-con">
         <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
+          :page-size="pageSize"
           :current-page="currentPage"
           :page-sizes="[20, 40, 60, 80, 100]"
-          :page-size="pageSize"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        >
         </el-pagination>
       </div>
     </el-card>
@@ -194,7 +195,7 @@
       }
     },
     created() {
-      this.getList();
+      this.searchList();
       this.$nextTick(() => {
         this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
       })
@@ -230,17 +231,16 @@
       //     this.queryParams.applyTime = [];
       //   }
       // },
+      searchList() {
+        this.currentPage = 1;
+        this.getList();
+      },
       /** 列表查询 */
       getList() {
         let params = {
           page: this.currentPage,
           limit: this.pageSize,
           status: this.goodsStatus,
-          //goods_id: this.queryParams.goods_id,
-          // goods_title: this.queryParams.goods_title,
-          // refund_type: '',
-          // goods_order_sn: '',
-          // reason: ''
         }
 
         if( this.queryParams.applyTime && this.queryParams.applyTime.length === 2) {