取消
确定
@@ -65,6 +65,7 @@ import {
onmbinfo:{},
mbData:[],
list1: [],
+ list2:[],
rulesmbinfo:{
type: [{
required: true,
@@ -113,11 +114,18 @@ import {
//模版信息
templateInformation:'',
//模版url
- templateInformationUrl:''
+ templateInformationUrl:'',
+
+ //跳转链接
+ redirectUrl:'',
+ //封面图片
+ coverImage:'',
},
templateAttachment:'',
AddData:[],
- dpinfo:null
+ dpinfo:null,
+ redirectUrl:'',
+ coverImage:'',
}
},
props: {
@@ -184,8 +192,44 @@ import {
if(this.info.templateInformationUrl){
this.templateAttachment = this.info.templateInformationUrl
}
+ if(this.info.redirectUrl){
+ this.redirectUrl = this.info.redirectUrl
+ }
+ if(this.info.coverImage){
+ this.coverImage = this.info.coverImage
+ }
},
methods: {
+ changeContractType(e) {
+ console.error(e)
+ this.isshow = false
+ if(e == '广告位合同') {
+ this.list1.push({
+ name: '跳转链接',
+ key: 'redirectUrl',
+ type: '单行文本',
+ isrequired: '是',
+ width: '100%（一行）',
+ length: '20',
+ value: this.redirectUrl ,
+ })
+ this.list1.push({
+ name: '封面图片',
+ key: 'coverImage',
+ type: '图片',
+ isrequired: '是',
+ width: '100%（一行）',
+ length: '',
+ value: this.coverImage,
+ })
+
+ } else {
+ this.list1 = this.list2
+ }
+ setTimeout(() => {
+ this.isshow = true
+ }, 100)
+ },
async add1() {
// this.addinfo1()
// return
@@ -208,6 +252,7 @@ import {
info1.shopNumber = 'sp' + element.value.id
} else if (element.value.advertisingType) {
info1.shopNumber = 'gg' + element.value.id
+ this.formInline.carouselId = element.value.carouselId
} else {
info1.shopNumber = 'cd' + element.value.id
}
@@ -328,6 +373,7 @@ import {
info1.shopNumber = 'sp' + element.value.id
} else if (element.value.advertisingType) {
info1.shopNumber = 'gg' + element.value.id
+ this.formInline.carouselId = element.value.carouselId
} else {
info1.shopNumber = 'cd' + element.value.id
}
@@ -356,6 +402,7 @@ import {
console.error(res)
if(res.code == 200 && res.data) {
this.formInline.appendicesContract = res.data
+
contractinsertAdd({
...this.formInline,
templateInformationUrl:this.templateAttachment,
@@ -451,6 +498,7 @@ import {
}
}
}
+ this.list2 = this.list1
//延迟2秒
setTimeout(() => {
this.isshow = true
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 8f718df..7e595b1 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -20,13 +20,15 @@
-
+
+
+
+
+
@@ -152,6 +154,9 @@
parkTrails,
gongyuan
} from '@/api/information.js';
+ import {
+ bannerGet,
+ } from '@/api/banner';
export default {
components: {
upimg,
@@ -230,6 +235,11 @@
message: '请选择轮播顺序',
trigger: ['change']
}],
+ carouselId: [{
+ required: true,
+ message: '请选择轮播图',
+ trigger: ['change']
+ }],
locationDiagram: [{
required: true,
message: '请上传位置示意图',
@@ -286,6 +296,7 @@
edit: true,
iShsow:true,
lvdaoList: [],
+ tableData:[]
};
},
computed: {
@@ -311,6 +322,8 @@
}
},
async created() {
+ const res = await bannerGet({pageNumber: 1,pageSize: 20})
+ this.tableData = res.data.content
if (this.info && this.info.id) {
this.formInline = this.info
if (this.formInline.mapPunctuation) {
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index a19cf9e..904821d 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -96,6 +96,14 @@
{{item.value?'查看详情':'暂无文件'}}
+
+
+ 无
+
{{item.value}} 元
diff --git a/admin-web-master/src/components/chakan/oneht.vue b/admin-web-master/src/components/chakan/oneht.vue
index a5e0854..ee86da9 100644
--- a/admin-web-master/src/components/chakan/oneht.vue
+++ b/admin-web-master/src/components/chakan/oneht.vue
@@ -6,7 +6,7 @@
-
+
+
+
+
+ {{item.value?'查看详情':'暂无文件'}}
+
+
+
+ 无
+
+
+ {{item.value}} 元
+
+
+
+
+ {{newinfo.appendicesContract?'查看详情':'暂无文件'}}
@@ -145,13 +166,15 @@
+
+
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index f98e762..6026f5a 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -3,10 +3,7 @@
@@ -112,7 +109,7 @@
this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
center: centerLatLng,
zoom: 13,
- mapStyleId: 'style1'
+ // mapStyleId: 'style1'
});
// 创建标记
@@ -205,42 +202,30 @@
position: absolute;
top: 10px;
left: 10px;
- z-index: 99;
- /* background: #fff; */
- /* padding: 10px; */
- /* border-radius: 5px; */
- /* box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); */
- /* width: 280px; */
- display: flex;
- justify-content: space-between;
+ z-index: 1000;
+ background: #fff;
+ padding: 10px;
+ border-radius: 5px;
+ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+ width: 280px;
}
.search-box input {
- /* padding: 5px; */
- padding: 15px 8px;
+ padding: 5px;
margin-right: 5px;
- font-size: 10px;
- box-sizing: border-box;
- border-radius: 5px;
- border: 1px solid #eee;
- box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
}
.search-box button {
- padding: 15px 0;
- background-color: #fff;
- /* color: #fff; */
+ padding: 5px 10px;
+ background-color: #007bff;
+ color: #fff;
border: none;
border-radius: 3px;
cursor: pointer;
- height: 100%;
- box-sizing: border-box;
- font-size: 10px;
- color: -internal-light-dark(black, white);
}
.search-box button:hover {
- background-color: #fff;
+ background-color: #0056b3;
}
.search-results {
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index ca59a6d..d58ebb1 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL = ''
if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
- // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+ baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
// baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
- baseURL = 'http://128.10.249.39:9003';
+ // baseURL = 'http://128.10.249.39:9003';
} else {
--
libgit2 0.21.4