Finish Hotfix-zh-77

src/components/Common/image-upload.vue

@@ -165,7 +165,7 @@ export default {
         getOssConfig().then(res => {
           const fileKey = this.createName(fileName)
 
-          res.data.name = this.fileName ? this.fileName : fileName
+          res.data.name = fileName
           res.data.key = res.data.dir + fileKey
           resolve(res.data)
         }).catch(res => {
@@ -216,8 +216,9 @@ export default {
 
       }
 
-      this.$emit('handleIsFileName',this.fileName?this.fileName: file.name)
-      this.dataObj = await this.getOssConfig(this.fileName?this.fileName: file.name)
+      this.$emit('handleIsFileName',file.name)
+      this.dataObj = await this.getOssConfig( file.name)
+      console.log(this.dataObj,'56565' );
       this.waitUploadList.push(this.dataObj)
     },
 
@@ -239,7 +240,7 @@ export default {
         })
         this.waitUploadList = []
       } else {
-        const index = findElem(this.waitUploadList, 'name', this.fileName ? this.fileName : file.name)
+        const index = findElem(this.waitUploadList, 'name', file.name)
         this.fileList.push({
           name: this.waitUploadList[index].name,
           url: this.waitUploadList[index].key,

src/views/basic_data/material/components/modify_list-apply.vue

@@ -1565,8 +1565,6 @@ export default {
       const wallets = []
       for (let i = 0; i < array.length; i++) {
         if (array[i].walletsId.length){
-
-
         for (let j = 0; j < array[i].walleList.length; j++) {
           for (let k = 0; k < array[i].walletsId.length; k++) {
             if (array[i].walleList[j].id === array[i].walletsId[k]) {
@@ -1580,7 +1578,10 @@ export default {
             }
           }
         }
-        for (let k = 0; k < array[i].rebateList.length; k++) {
+        array[i].wallets = wallets
+      }
+       if(array[i].walletRebateId.length){
+          for (let k = 0; k < array[i].rebateList.length; k++) {
           if (!array[i].walletRebateId.length) return
           for (let j = 0; j < array[i].walletRebateId.length; j++) {
             if (array[i].rebateList[k].walletRebateId === array[i].walletRebateId[j]) {
@@ -1593,10 +1594,10 @@ export default {
               })
             }
           }
+              array[i].wallets = wallets
         }
 
-        array[i].wallets = wallets
-          }
+       }
       }
     }
   }

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -119,7 +119,7 @@
           show-summary
           highlight-current-row
           stripe
-          show-summary
+
           :summary-method="$getSummaries"
         >
           <el-table-column

src/views/supply/policy/policy_list.vue

@@ -354,12 +354,12 @@
               align="right"
               label="返利金额"
               sortable
-              prop="rebateAmount"
+              prop="payRebateAmount"
               min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <div>{{ scope.row.rebateAmount | numToFixed }}</div>
+                <div>{{ scope.row.payRebateAmount | numToFixed }}</div>
               </template>
             </el-table-column>