webapp / GreenwayWeb

Commit fb82c6079b2fb769e047de724c87adf795f56691

Authored by 李宇
1 parent 12472e36

1

Inline Side-by-side
Showing 5 changed files with 52 additions and 8 deletions
admin-web-master/src/views/shopRental/manage/index.vue
  View file @fb82c60
... ... @@ -55,13 +55,13 @@
55 55 </el-table-column>
56 56 <el-table-column label="合同名称" min-width="200">
57 57 <template slot-scope="scope">
58   - {{scope.row.cereContractInformation.contractName}}
  58 + {{scope.row.contractName}}
59 59  
60 60 </template>
61 61 </el-table-column>
62 62 <el-table-column label="合同金额" min-width="100">
63 63 <template slot-scope="scope">
64   - {{scope.row.cereContractInformation.contractAmount}}
  64 + {{scope.row.contractAmount}}
65 65  
66 66 </template>
67 67 </el-table-column>
... ... @@ -71,9 +71,9 @@
71 71  
72 72 </template>
73 73 </el-table-column>
74   - <el-table-column label="起租日期" min-width="300">
  74 + <el-table-column label="终止日期" min-width="300">
75 75 <template slot-scope="scope">
76   - {{scope.row.cereContractInformation.leaseStartDate}}
  76 + {{scope.row.cereContractInformation.contractTerminationDate}}
77 77  
78 78 </template>
79 79 </el-table-column>
... ...
yanshouban/src/main.js
  View file @fb82c60
... ... @@ -12,7 +12,7 @@ import &#39;@/assets/font.css&#39;
12 12 import App from './App.vue'
13 13 import store from './store'
14 14 import router from './router'
15   -import {encrypt,decrypt} from './utils/jiami.js'
  15 +import {encrypt,decrypt,decryptall} from './utils/jiami.js'
16 16 import '@/icons' // icon
17 17 import '@/permission' // permission control
18 18  
... ... @@ -30,6 +30,7 @@ Vue.prototype.$echarts = echarts
30 30 Vue.prototype.$API = 'https://jy.scjysm.asia:18086/meserver/api'
31 31 Vue.prototype.$encrypt = encrypt;
32 32 Vue.prototype.$decrypt = decrypt;
  33 +Vue.prototype.$decryptall = decryptall;
33 34 // Vue.prototype.$API = 'https://wjdc.scjysm.asia:1443/meserver/api'
34 35 // Vue.prototype.$API = 'http://8.130.38.56:8019/api'
35 36 // https://jy.scjysm.asia:18086 http://172.16.61.126:8080 http://8.130.38.56:8027
... ...
yanshouban/src/utils/jiami.js
  View file @fb82c60
... ... @@ -34,3 +34,42 @@ export const decrypt = (str) =&gt; {
34 34         return '解密失败！'
35 35     }
36 36 }
  37 +
  38 +export const decryptall = (obj,isjmlist) => {
  39 + console.error(isjmlist)
  40 + console.error(obj)
  41 + let list = []
  42 + let objnew = {}
  43 + for (let key in obj) {
  44 + let item = {
  45 + typeis:'2',//是否加密 1加密 2不加密
  46 + keyname:key,//变量名
  47 + value:obj[key],//值
  48 + }
  49 + if(isjmlist.length> 0) {
  50 +
  51 + // let found = isjmlist.find(function(element) {
  52 + // return key == element;
  53 + // });
  54 + console.log(isjmlist.indexOf(key) != -1)
  55 + if(isjmlist.indexOf(key) != -1) {
  56 + item.typeis = '1'
  57 + }
  58 + } else {
  59 + item.typeis = '1'
  60 + }
  61 + console.error(item)
  62 + list.push(item)
  63 + }
  64 + console.log(list);
  65 +
  66 + list.forEach(element => {
  67 + if(element.typeis == '1' && element.value) {
  68 + console.error(element)
  69 + element.value = encrypt(element.value)
  70 + }
  71 + objnew[element.keyname] = element.value
  72 + });
  73 + console.log(objnew);
  74 + return objnew
  75 +}
37 76 \ No newline at end of file
... ...
yanshouban/src/utils/request.js
  View file @fb82c60
... ... @@ -21,9 +21,9 @@ if (host == &#39;172.16.61.48&#39; || host == &#39;172.16.61.49:5173&#39; || host ==&#39;172.16.61.1
21 21 // PREFIX = 'http://172.16.61.48/meserver/admin-server';
22 22 // PREFIX = 'http://192.168.2.213:9003';
23 23 // PREFIX = 'http://8.130.38.56:8019/admin-server';
24   - PREFIX = 'http://192.168.2.7:9003';
  24 +// PREFIX = 'http://192.168.2.7:9003';
25 25 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
26   - // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
  26 + PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
27 27 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
28 28 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
29 29  
... ...
yanshouban/src/views/business/businessList/index.vue
  View file @fb82c60
... ... @@ -910,6 +910,10 @@ export default {
910 910 },
911 911 // 新建商家确定
912 912 addCheck (ruleForm) {
  913 + let newinfo = this.$decryptall(this.ruleForm,['shopPhone','shopPassword'])
  914 + console.error(newinfo)
  915 + return
  916 +
913 917 this.$refs[ruleForm].validate(valid => {
914 918 if (valid) {
915 919  
... ... @@ -944,7 +948,7 @@ export default {
944 948 }
945 949  
946 950 if (!this.userState) {
947   -
  951 +
948 952 // this.ruleForm.shopPhone = this.$encrypt(this.ruleForm.shopPhone)
949 953 // this.ruleForm.shopPassword = this.$encrypt(this.ruleForm.shopPassword)
950 954 // this.ruleForm.idCardNum = this.$encrypt(this.ruleForm.idCardNum)
... ...