页面优化

src/common/env.js

@@ -54,7 +54,7 @@ export const getAddress = () => {
         Url = ipAddress + "/ADMIN_CMS_FE/rest/";
         //msUrl = "http://10.177.15.117:10201" + "/contents/";
         // msUrl = "http://10.177.15.154:10203" + "/contents/";
-        msUrl = "http://dev-sc.yunqueyi.com" + "/contents/";
+        msUrl = "https://dev-sc.yunqueyi.com" + "/contents/";
         lectureUrl = "https://dev-sc.yunqueyi.com"
         liveUrl = "https://dev-sc.yunqueyi.com/campaign/";
         kfUrl = "http://test1-kf.yunqueyi.com" + "/api/";

src/common/index.js

@@ -102,4 +102,22 @@ export function getStrCodeNum(str) {
         return false
     }
     return true
+}
+
+// 封装一下请求通用的方法
+export function getData(context, type, url, req, callback) {
+    openLoading(context);
+    context.$axios[type](localStorage.getItem("lectureUrl") + url, req)
+        .then(res => {
+            closeLoading(context);
+            let data = res.data;
+            if (data.code == "000000") {
+                if (callback) callback(data);
+            } else {
+                context.$message.error(data.message);
+            }
+        }).catch(error => {
+            closeLoading(this);
+            this.$message.error("网络出现点问题");
+        });
 }
\ No newline at end of file

src/views/black-list/doctor-black.vue

@@ -91,11 +91,10 @@
                         >
                         <el-button type="default">点击上传</el-button>
                     </el-upload>
-                    <span>{{importFileName.name}}</span>
-                    <p v-if="tipTextFlag" style="color:red;">请选择上传文件</p>
-                    <div v-if="importError" @click="downloadError">导入的Excel有问题，点击下载查看具体问题</div>
+                    <p>{{importFileName.name}}</p>
+                    <span class="el-upload__tip down-file" v-if="importError" @click="downloadError">导入的Excel有问题，点击下载查看具体问题</span>
                 </el-form-item>
-                <div class="el-upload__tip" @click="download">下载导入模板</div>
+                <span class="el-upload__tip down-file" @click="download">下载导入模板</span>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="importDialogVisible = false">取 消</el-button>
@@ -107,6 +106,7 @@
 <script>
 import { doUpload, getFilePath } from "../../common/qiniuUtil";
 import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -131,7 +131,6 @@ export default {
                 token: window.localStorage.getItem('token')
             },
             importFileName: {},
-            tipTextFlag: false,
             importError: false,
             importErrorFileUrl: '',
             filePath: ''
@@ -164,7 +163,7 @@ export default {
         search(param) {
             openLoading(this);
             if(param) this.searchParam.pageNo = 1;
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/blacklist/list?searchName=${this.searchParam.searchName}&pageNo=${this.searchParam.pageNo}&pageSize=${this.searchParam.pageSize}`, {},
                 data => {
                     closeLoading(this);
@@ -176,7 +175,6 @@ export default {
         // 批量导入
         importBatch() {
             this.importDialogVisible = true;
-            this.tipTextFlag = false;
         },
         // returnActionUrl() {
         //     return localStorage.getItem("lectureUrl") + "/riskcontrol/blacklist/import";
@@ -186,13 +184,14 @@ export default {
             let req = {
                 file: this.filePath
             };
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/blacklist/import`, req,
                 data => {
-                    if(data.code == '000000') {
+                    if(!data.data) {
                         this.importDialogVisible = false;
                     }else {
-                        this.tipTextFlag = true;
+                        this.importError = true;
+                        this.importErrorFileUrl = data.data;
                     }
                 }
             );
@@ -200,8 +199,7 @@ export default {
         // 上传文件
         uploadImportFile(file) {
             let _this = this;
-            _this.tipTextFlag = false;
-            var FileExt = file.name.replace(/.+\./, "");
+            let FileExt = file.name.replace(/.+\./, "");
             if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
                 _this.$message({
                     type: "warning",
@@ -222,14 +220,12 @@ export default {
         // },
         // 下载查看导入的有问题Excel
         downloadError() {
-            //window.open(this.importErrorFileUrl);
             let a = document.createElement('a');
-            a.setAttribute('href',this.importErrorFileUrl);
+            a.setAttribute('href', this.importErrorFileUrl);
             a.click();
         },
         // 下载导入模板
         download() {
-            //window.open('https://file.yunqueyi.com/risk/template.xlsx');  // 后台给的导入Excel地址
             let a = document.createElement('a');
             a.setAttribute('href', 'https://file.yunqueyi.com/risk/template.xlsx');
             a.click();
@@ -240,7 +236,7 @@ export default {
         },
         confirmAdd() {
             let req = this.addParam;
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/blacklist/create`, req,
                 data => {
                     if(data.code == '000000') {
@@ -257,7 +253,7 @@ export default {
             this.removeDialogVisible = true;
         },
         confirmRemove() {
-            this.getData(
+            getData(this,
                 "delete", `/riskcontrol/blacklist/remove/${this.removeId}`, {},
                 data => {
                     if(data.code == '000000') {
@@ -283,5 +279,9 @@ export default {
     .upload-input {
         width: 300px;
     }
+    .down-file {
+        color: #3a8ee6;
+        text-decoration: underline;
+    }
 }
 </style>
\ No newline at end of file

src/views/black-list/empty-phone.vue

@@ -90,11 +90,10 @@
                         :before-upload="uploadImportFile">
                         <el-button type="default">点击上传</el-button>
                     </el-upload>
-                    <span>{{importFileName.name}}</span>
-                    <p v-if="tipTextFlag" style="color:red;">请选择上传文件</p>
-                    <div v-if="importError" @click="downloadError">导入的Excel有问题，点击下载查看具体问题</div>
+                    <p>{{importFileName.name}}</p>
+                    <span class="el-upload__tip down-file" v-if="importError" @click="downloadError">导入的Excel有问题，点击下载查看具体问题</span>
                 </el-form-item>
-                <div class="el-upload__tip" @click="download">下载导入模板</div>
+                <span class="el-upload__tip down-file" @click="download">下载导入模板</span>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="importDialogVisible = false">取 消</el-button>
@@ -106,6 +105,7 @@
 <script>
 import { doUpload, getFilePath } from "../../common/qiniuUtil";
 import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -130,7 +130,6 @@ export default {
                 token: window.localStorage.getItem('token'),
                 'Content-Type': 'multipart/form-data'
             },
-            tipTextFlag: false,
             importError: false,
             importErrorFileUrl: '',
             filePath: ''
@@ -145,24 +144,10 @@ export default {
         this.search();
     },
     methods: {
-        // 封装一下请求通用的方法
-        getData(type, url, req, callback) {
-            // openLoading(this);
-            this.$axios[type](localStorage.getItem("lectureUrl") + url, req)
-                .then(res => {
-                    // closeLoading(this);
-                    let data = res.data;
-                    if (data.code == "000000") {
-                        if (callback) callback(data);
-                    } else {
-                        this.$message.error(data.message);
-                    }
-                })
-        },
         search(param) {
             openLoading(this);
             if(param) this.searchParam.pageNo = 1;
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/emptyNumber/list?searchName=${this.searchParam.searchName}&pageNo=${this.searchParam.pageNo}&pageSize=${this.searchParam.pageSize}`, {},
                 data => {
                     closeLoading(this);
@@ -177,7 +162,7 @@ export default {
         },
         confirmAdd() {
             let req = this.addParam;
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/emptyNumber/create`, req,
                 data => {
                     if(data.code == '000000') {
@@ -194,7 +179,7 @@ export default {
             this.removeDialogVisible = true;
         },
         confirmRemove() {
-            this.getData(
+            getData(this,
                 "delete", `/riskcontrol/emptyNumber/remove/${this.removeId}`, {},
                 data => {
                     if(data.code == '000000') {
@@ -207,20 +192,21 @@ export default {
         // 批量导入
         importBatch() {
             this.importDialogVisible = true;
-            this.tipTextFlag = false;
         },
         // 判断有没有导入文件
         confirmImport() {
             let req = {
                 file: this.filePath
             };
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/emptyNumber/import`, req,
                 data => {
-                    if(data.code == '000000') {
+                    console.log("ddddddddddd",data)
+                    if(!data.data) {
                         this.importDialogVisible = false;
                     }else {
-                        this.tipTextFlag = true;
+                        this.importError = true;
+                        this.importErrorFileUrl = data.data;
                     }
                 }
             );
@@ -228,7 +214,6 @@ export default {
         // 上传文件
         uploadImportFile(file) {
             let _this = this;
-            _this.tipTextFlag = false;
             var FileExt = file.name.replace(/.+\./, "");
             if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
                 _this.$message({
@@ -270,5 +255,9 @@ export default {
     .upload-input {
         width: 300px;
     }
+    .down-file {
+        color: #3a8ee6;
+        text-decoration: underline;
+    }
 }
 </style>
\ No newline at end of file

src/views/order-list/order-detail.vue

@@ -45,7 +45,8 @@
     </div>
 </template>
 <script>
-import { openLoading, closeLoading } from "../../common/utils";
+// import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -61,26 +62,8 @@ export default {
         this.getDetailData();
     },
     methods: {
-        // 封装一下请求通用的方法
-        getData(type, url, req, callback) {
-            openLoading(this);
-            this.$axios[type](localStorage.getItem("lectureUrl") + url, req)
-                .then(res => {
-                closeLoading(this);
-                let data = res.data;
-                if (data.code == "000000") {
-                    if (callback) callback(data);
-                } else {
-                    this.$message.error(data.message);
-                }
-                })
-                .catch(error => {
-                closeLoading(this);
-                this.$message.error("网络出现点问题");
-            });
-        },
         getDetailData() {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/tradeOrder/info/${this.rowId}`, {},
                 data => {
                     this.detailData = data.data;

src/views/order-list/order-list.vue

@@ -96,7 +96,7 @@
     </div>
 </template>
 <script>
-import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -124,27 +124,9 @@ export default {
         this.getRiskLeverData();
     },
     methods: {
-        // 封装一下请求通用的方法
-        getData(type, url, req, callback) {
-            openLoading(this);
-            this.$axios[type](localStorage.getItem("lectureUrl") + url, req)
-                .then(res => {
-                closeLoading(this);
-                let data = res.data;
-                if (data.code == "000000") {
-                    if (callback) callback(data);
-                } else {
-                    this.$message.error(data.message);
-                }
-                })
-                .catch(error => {
-                closeLoading(this);
-                this.$message.error("网络出现点问题");
-            });
-        },
         // 获取风险等级数据
         getRiskLeverData() {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/tradeOrder/riskLevel`, {},
                 data => {
                     let arr = data.data;
@@ -158,7 +140,7 @@ export default {
         },
         search(param) {
             if(param) this.searchParam.pageNo = 1;
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/tradeOrder/list?searchName=${this.searchParam.searchName}&pageNo=${this.searchParam.pageNo}&pageSize=${this.searchParam.pageSize}&date=${this.searchParam.date}&riskLevel=${this.searchParam.riskLevel}`, {},
                 data => {
                     this.tableData = data.data.tradeOrders;
@@ -181,7 +163,7 @@ export default {
                     riskLevel: this.addParam.riskLevel,
                     riskLevelRemark: this.addParam.riskLevelRemark
                 };
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/tradeOrder/changeRiskLevel`, req,
                 data => {
                     if(data.code == '000000') {

src/views/strategy-data/strategy-edit.vue

@@ -55,7 +55,7 @@
     </div>
 </template>
 <script>
-import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -83,24 +83,6 @@ export default {
         this.getStrategyDetail();
     },
     methods: {
-        // 封装一下请求通用的方法
-        getData(type, url, req, callback) {
-            openLoading(this);
-            this.$axios[type](localStorage.getItem("lectureUrl") + url, req)
-                .then(res => {
-                closeLoading(this);
-                let data = res.data;
-                if (data.code == "000000") {
-                    if (callback) callback(data);
-                } else {
-                    this.$message.error(data.message);
-                }
-                })
-                .catch(error => {
-                closeLoading(this);
-                this.$message.error("网络出现点问题");
-            });
-        },
         // 删除版本
         deleteSteps(i) {
             this.versionArray.splice(i,1);
@@ -122,7 +104,7 @@ export default {
         },
         // 获取策略下拉数据
         getCategyData() {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/strategy/listBizType`, {},
                 data => {
                     this.strategyData = data.data;
@@ -131,7 +113,7 @@ export default {
         },
         // 获取策略详情
         getStrategyDetail() {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/strategy/detail?id=${this.strategyId}`, {},
                 data => {
                     this.searchParam = data.data;
@@ -173,7 +155,7 @@ export default {
         },
         // 修改策略分类
         changeStrategy(val) {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/strategy/listStrategyLibrary?bizTypeId=${val}`, {},
                 data => {
                     this.strategySelect = data.data;
@@ -242,7 +224,7 @@ export default {
                     return;
                 }
             }
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/strategy/save`, req,
                 data => {
                     if(data.code == '000000') {

src/views/strategy-data/strategy-list.vue

@@ -75,7 +75,7 @@
     </div>
 </template>
 <script>
-import { openLoading, closeLoading } from "../../common/utils";
+import { getData } from "../../common";
 export default {
     data() {
         return {
@@ -107,27 +107,9 @@ export default {
         }
     },
     methods: {
-        // 封装一下请求通用的方法
-        getData(type, url, req, callback) {
-            openLoading(this);
-            this.$axios[type](localStorage.getItem("lectureUrl") + url, req)
-                .then(res => {
-                closeLoading(this);
-                let data = res.data;
-                if (data.code == "000000") {
-                    if (callback) callback(data);
-                } else {
-                    this.$message.error(data.message);
-                }
-                })
-                .catch(error => {
-                closeLoading(this);
-                this.$message.error("网络出现点问题");
-            });
-        },
         search(param) {
             if(param) this.searchParam.pageNo = 1;
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/strategy/list?bizTypeId=${this.searchParam.bizTypeId}&pageNo=${this.searchParam.pageNo}&pageSize=${this.searchParam.pageSize}`, {},
                 data => {
                     this.tableData = data.data.data;
@@ -137,7 +119,7 @@ export default {
         },
         // 获取策略下拉数据
         getCategyData() {
-            this.getData(
+            getData(this,
                 "get", `/riskcontrol/strategy/listBizType`, {},
                 data => {
                     this.strategyData = data.data;
@@ -154,7 +136,7 @@ export default {
                 id: row.id,
                 publishFlag: 2   // 1 下线   2 激活
             }
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/strategy/deploy`, req,
                 data => {
                     if(data.code == '000000') {
@@ -173,7 +155,7 @@ export default {
                 id: this.downLineId,
                 publishFlag: 1   // 1 下线   2 激活
             }
-            this.getData(
+            getData(this,
                 "post", `/riskcontrol/strategy/deploy`, req,
                 data => {
                     if(data.code == '000000') {