Skip to content

R
rs-cloud-platform-ui
Commit 05d95699 authored by lixy's avatar lixy
Browse files
Options

Merge branch 'master' of http://113.105.137.151:22280/zhoujw/rs-cloud-platform-ui

parents 29b45057 1e0df149
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 782 additions and 59 deletions
package-lock.json
View file @ 05d95699
......@@ -4572,6 +4572,11 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
"highlight.js": {
"version": "9.18.5",
"resolved": "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.18.5.tgz",
"integrity": "sha1-0Yo1mGfzeME41oGe38KorNXymCU="
},
"hmac-drbg": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
......@@ -10617,6 +10622,15 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true
},
"vcolorpicker": {
"version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/vcolorpicker/download/vcolorpicker-1.0.3.tgz",
"integrity": "sha1-7qbNU7tZnOY8KEZSLW2D1rFdZJI=",
"requires": {
"highlight.js": "^9.12.0",
"vue": "^2.5.17"
}
},
"vendors": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
......
src/api/website/aboutUs/index.js 0 → 100644
View file @ 05d95699
import fetch from 'utils/fetch';
// 获取详情
export function getCompanyInfo(params) {
return fetch({
url: "/api/website/companyInfo",
method: 'get',
params: params
})
}
//编辑详情
export function setCompanyInfo(params){
return fetch({
url: "/api/website/companyInfo/addUpdate/",
method: 'post',
data: params
})
}
\ No newline at end of file
src/api/website/industryApplication/index.js
View file @ 05d95699
/*
* @Author: Jenkins
* @Date: 2020-12-02 09:20:18
* @LastEditTime: 2020-12-08 17:59:51
* @LastEditTime: 2020-12-18 10:34:09
* @LastEditors: Please set LastEditors
* @Description: 行业应用页请求接口
* @FilePath: \rs-cloud-platform-ui\src\api\wsmanagement\industryApplication\index.js
......@@ -68,3 +68,27 @@ export function addUpdateApplicationInfo(obj){
data: obj
});
}
/**
* 新增或更新交易保障
* @param {Object} obj
*/
export function addUpdateProtection(obj){
return fetch({
url: "/api/website/commonInfo/addUpdate",
method: "post",
data: obj
})
}
/**
* 获取分页的交易保障
* @param {Object} obj
*/
export function getListProtections(obj){
return fetch({
url: "/api/website/commonInfo/getAll",
method: "get",
param: obj
})
}
\ No newline at end of file
src/main.js
View file @ 05d95699
......@@ -66,11 +66,17 @@ import '../static/utf8-jsp/lang/zh-cn/zh-cn.js'
import '../static/utf8-jsp/ueditor.parse.min.js'
import Viewer from 'v-viewer'
import 'viewerjs/dist/viewer.css'
Vue.use(Viewer, {
defaultOptions: {
zIndex: 9999
}
})
// 颜色选择器
import vcolorpicker from 'vcolorpicker'
Vue.use(vcolorpicker)
import VCharts from 'v-charts'
Vue.use(VCharts)
// register globally
......
src/router/index.js
View file @ 05d95699
......@@ -121,6 +121,11 @@ export const asyncRouterMap = [{
component: _import('webSiteManagement/industryApplication/applicationCate/index'),
name: '类别管理',
authority: 'applicationCate'
},{
path: 'transactionProtection',
component: _import('webSiteManagement/industryApplication/transactionProtection/index'),
name: '交易保障',
authority: 'transactionProtection'
}],
},
{
......
src/views/webSiteManagement/aboutUs/index.vue
View file @ 05d95699
<!--
* @Author: your name
* @Date: 2020-12-01 09:07:41
* @LastEditTime: 2020-12-04 15:18:16
* @LastEditTime: 2020-12-18 13:19:25
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \rs-cloud\src\views\webSiteManagement\aboutUs.vue
......@@ -80,7 +80,11 @@
</div>
</template>
<script type="javascript">
<script>
import {
getCompanyInfo,
setCompanyInfo,
} from "@/api/website/aboutUs/index";
import KindEditor from "@/components/Kindeditor";
import loadBMap from '@/utils/loadBMap.js'
import { addUpdate, companyInfo } from "api/website/aboutUs"
......@@ -140,7 +144,7 @@ export default {
},
async mounted() {
await loadBMap('gvQPveN9YrlPSgKUMPK2u2u2BA4yQFRm')
this.getCompanyInfo() // 获取关于我们详情
this.initMap()
},
methods: {
/**
......
src/views/webSiteManagement/bannerSetting/index.vue
View file @ 05d95699
......@@ -56,11 +56,20 @@
<!-- 分页 -->
<div class="page-foot">
<el-pagination
@size-change="handleSizeChange"
@current-change="currentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10, 20, 30, 40]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
<!-- <el-pagination
background
layout="prev, pager, next"
:page-size="listQuery.limit"
:total="total" @current-change="currentChange">
</el-pagination>
</el-pagination> -->
</div>
<!-- 使用图片查看器预览当前缩略图 -->
......@@ -140,6 +149,11 @@ export default {
this.getList()//获取数据
},
methods: {
handleSizeChange(val) {
this.listQuery.limit = val
this.getList();
},
closePreview() {
this.currentIcon.showPreview = false;
},
......@@ -180,27 +194,6 @@ export default {
}
this.getList()
},
// //清除搜索
// filterData() {
// if (this.searchForm.status === 0 && this.searchForm.title === '') {
// this.list = this.data;
// return ;
// }
// let temp = this.data.filter(v => this.searchForm.status === 0 ? true: !!(this.searchForm.status === v.status))
// if (!!this.searchForm.title) {
// temp = temp.filter(v => v.title.includes(this.searchForm.title))
// }
// this.list = temp
// },
// //清除搜索
// clearFilterData() {
// this.searchForm = {
// status: 0,
// title: ""
// }
// this.list = this.data;
// },
//切换页码
currentChange(val) {
this.listQuery.page = val;
......@@ -210,14 +203,7 @@ export default {
edit(row) {
this.dialogTitle = "编辑banner";
this.formObject.formVal = this.filterParams(row)
// this.formObject = {
// formVal: this.filterParams(row),
// rules: this.formObject.rules,//表单规则
// formItem: banner.formInfo,//表单项。
// }
this.dialogVisible = true;
// console.log(this.formObject.formVal)
},
closeDialog() {
this.$bus.$emit('upload-clearFiles')
......@@ -245,24 +231,6 @@ export default {
this.formObject.formVal = banner.init();
},
// //打开弹窗
// onOpen() {
// this.$nextTick(() => {
// this.formObject = {
// formVal: {
// title: "",
// cover: "",
// rank: "",
// url: "",
// status: 1,
// jumpType: 0,
// jumpId: '',
// },
// rules: this.formObject.rules,//表单规则
// formItem: banner.formInfo,//表单项。
// }
// })
// },
filterParams(row) {
let a = {};
for (let i in this.formObject.formVal) {
......@@ -329,8 +297,6 @@ export default {
cursor: pointer;
}
.page-foot {
display: flex;
justify-content: center;
margin-top: 20px;
}
</style>
src/views/webSiteManagement/imageLibrary/list.vue
View file @ 05d95699
......@@ -48,12 +48,21 @@
<div class="page-foot">
<el-pagination
@size-change="handleSizeChange"
@current-change="currentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10, 20, 30, 40]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="~~total">
</el-pagination>
<!-- <el-pagination
background
layout="prev, pager, next"
:total="~~total"
:current-page="listQuery.page"
@current-change="currentChange">
</el-pagination>
</el-pagination> -->
</div>
</div>
......@@ -106,6 +115,11 @@ export default {
this.getList()
},
methods: {
handleSizeChange(val) {
this.listQuery.limit = val
this.getList();
},
changePageInfo(page) {
// this.listQuery = page;
this.$emit('recordPageInfo', page)
......@@ -244,8 +258,6 @@ export default {
height: auto;
}
.page-foot {
display: flex;
justify-content: center;
margin-top: 20px;
}
</style>
src/views/webSiteManagement/satelliteIntroduction/list.vue
View file @ 05d95699
......@@ -52,12 +52,21 @@
/>
<div class="page-foot">
<el-pagination
@size-change="handleSizeChange"
@current-change="currentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10, 20, 30, 40]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="~~total">
</el-pagination>
<!-- <el-pagination
background
layout="prev, pager, next"
:page-size="listQuery.limit"
:current-page="listQuery.page"
:total="total" @current-change="currentChange">
</el-pagination>
</el-pagination> -->
</div>
</div>
......@@ -109,6 +118,11 @@ export default {
this.getList()
},
methods: {
handleSizeChange(val) {
this.listQuery.limit = val
this.getList();
},
showPreview(url) {
this.currentIcon.url = url;
this.currentIcon.showPreview = true;
......@@ -246,8 +260,6 @@ export default {
cursor: pointer;
}
.page-foot {
display: flex;
justify-content: center;
margin-top: 20px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment