Merge branch 'dev_v2' into feat-two

package-lock.json

@@ -4267,9 +4267,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.2.8",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.2.8.tgz",
-      "integrity": "sha512-fLALFt4AsWL6pC71Mi3fuvZEY6rx1cCk8ZuonYOXT0a1A+cibSZuVrCAaEM9f5Y7ECt+UiQrjusaiTDyF/yrPQ==",
+      "version": "2.3.0",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.3.0.tgz",
+      "integrity": "sha512-OqvXOTpe2ZbmMsMGy7cKES5lYrafXhIE0E0y1wL3TxHKMJQe/n0k8Jx0flnwA0BxgOFicjpgaLLt28EaasFSlA==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -15,7 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@zjlib/element-plugins": "^2.2.8",
+    "@zjlib/element-plugins": "^2.3.0",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

src/components/template/template-page-1.vue

@@ -362,6 +362,7 @@ export default {
         </div>
       )
     },
+    // 过滤按钮集合
     selBtn(arr) {
       for (var i = 0; i < arr.length; i++) {
         if (Array.isArray(arr[i])) {

src/views/finance/credit_list.vue

@@ -169,11 +169,13 @@ export default {
     async addDataFn() {
       await this.$refs.addForm.validate()
       await getCreditListEdit({ ...this.addForm, ...this.data })
-      this.getDataList({
-        type: 'COMMONLY',
-        pageSize: this.pageSize,
-        pageNum: this.currentPage
-      })
+      // this.getDataList({
+      //   type: 'COMMONLY',
+      //   pageSize: this.pageSize,
+      //   pageNum: this.currentPage
+      // })
+      this.$refs.pageRef.refreshList()
+
       this.$message.success('设置成功')
       this.dialogForm = false
     },

src/views/sales_policy/components/editPolicy.vue

@@ -835,9 +835,9 @@ export default {
           commercialType: this.detail.commercialType
         }
         this.region = res.data.flag
-
+ 
         // this.srcList = [this.$imageUrl + this.detail.imgSrc]
-        if (this.isShow === 5 && this.detail.imgSrc) {
+        if (this.isShow === 3 && this.detail.imgSrc) {
           this.detail.imgSrc.split(',').forEach(k => {
             this.fileList.push({
               hover: '',