diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index e381fd2..8428578 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -214,7 +214,7 @@ onlineType: '' ,// 线上类型 belongingGreenwaySection: '', // 所属绿道段 belongingParkTrail: '', // 所属公园/步道 - // carouselId:'',//选择租赁广告位置 + carouselId:'',//选择租赁广告位置 }, rules: { advertisingType: [{ @@ -332,7 +332,32 @@ if (this.formInline.mapPunctuation) { this.lat = Number(this.formInline.mapPunctuation.split(',')[0]) this.lng = Number(this.formInline.mapPunctuation.split(',')[1]) + } + if(this.info.affiliation){ + console.log('this.info.affiliation',this.info.affiliation) + console.log('this.info.carouselId',this.info.carouselId) + let arList = [] + let res= await bannerGet({pageNumber: 1,pageSize: 20}) + arList = res.data.content + if(this.info.affiliation == '在线商城'){ + this.tableData = arList.filter(item => item.type === 1); + this.$forceUpdate() + }else{ + this.tableData = arList.filter(item => item.type === 2); + this.$forceUpdate() + } + console.log('111111111111111111',this.tableData) + this.tableData.map((item,index)=>{ + if(item.id == this.info.carouselId){ + this.handleSelectChange(index) + this.formInline.carouselId = this.info.carouselId + this.$forceUpdate() + } + }) + + console.log('222222222222222',this.tableData) + } this.ontype = this.formInline.advertisingType if (this.ontype == '线上广告位') { this.typelist = [{ @@ -372,6 +397,7 @@ } }, async affiliationChange(value){ + this.formInline.carouselId = '' let arList = [] let res= await bannerGet({pageNumber: 1,pageSize: 20}) arList = res.data.content @@ -380,6 +406,7 @@ this.$forceUpdate() }else{ this.tableData = arList.filter(item => item.type === 2); + this.$forceUpdate() } }, diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index cce1d9f..d4d5a30 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://192.168.8.103:9003'; + // baseURL = 'http://128.10.249.43:9003'; } else { diff --git a/admin-web-master/src/views/detect/analyse.vue b/admin-web-master/src/views/detect/analyse.vue index b09691c..c7b4842 100644 --- a/admin-web-master/src/views/detect/analyse.vue +++ b/admin-web-master/src/views/detect/analyse.vue @@ -12,7 +12,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;margin-right: 10px;" prefix-icon="none"> - diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue index 44311c1..41f267f 100644 --- a/lvdao-miniapp/pages/details/details.vue +++ b/lvdao-miniapp/pages/details/details.vue @@ -20,8 +20,8 @@ - {{moban[0].rentalPrice*tableData.actualUsableArea || ''}}元/{{moban[0].leaseTerm || ''}} - {{moban[0].rentalPrice*tableData.actualArea || ''}}元/{{moban[0].leaseTerm || ''}} + {{math(moban[0].rentalPrice*tableData.actualUsableArea) || ''}}元/{{moban[0].leaseTerm || ''}} + {{math(moban[0].rentalPrice*tableData.actualArea) || ''}}元/{{moban[0].leaseTerm || ''}} 自营 @@ -199,7 +199,7 @@ - + {{tableData.detailedLocation}} @@ -351,6 +351,9 @@ }, methods: { + math(val){ + return val.toFixed(4); + }, openimg1(urls,index) { let list = urls.map(item=>{ return this.imgUrl + item diff --git a/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue b/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue index cf1895f..3f30346 100644 --- a/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue +++ b/lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue @@ -127,7 +127,7 @@ - 取消 + 取消 提交 @@ -233,6 +233,10 @@ url: `/pagesA/PunchInAct/PunchInSetting?ids=${this.tableData.id}` }) }, + close(){ + this.addjiangliShow = false + + }, submit() { if (!this.form.userName) { uni.showToast({ @@ -301,6 +305,16 @@ return `${year}-${month}-${day}`; }, addjiangli(){ + + this.form = { + activityId: '', + userId: '', + createTime: '', + createUser: '', + userName: '', + userPhone: '', + canyutiem:'' + } this.addjiangliShow = true }, dakaSet(){ diff --git a/lvdao-miniapp/pagesA/moreZu/moreZu.vue b/lvdao-miniapp/pagesA/moreZu/moreZu.vue index 4f8a61f..6452001 100644 --- a/lvdao-miniapp/pagesA/moreZu/moreZu.vue +++ b/lvdao-miniapp/pagesA/moreZu/moreZu.vue @@ -4,7 +4,7 @@ {{item.policyName}} - {{item.rentalPrice*moprice}}元/{{item.leaseTerm}} + {{math(item.rentalPrice*moprice)}}元/{{item.leaseTerm}} 自营 @@ -67,6 +67,9 @@ }, methods: { + math(val){ + return val.toFixed(4); + }, getAll(){ this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', this.paesize,1).then(res => { this.moban = res.data.data diff --git a/merchant-web-master/src/App.vue b/merchant-web-master/src/App.vue index 009f9bb..44462b3 100644 --- a/merchant-web-master/src/App.vue +++ b/merchant-web-master/src/App.vue @@ -321,7 +321,7 @@ export default { border-bottom: 1px solid #EFEFEF; } - .el-dialog__title { + .el-dialog__title { font-size: 14px; color: #000000e6; } diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index f251ecd..28edcc7 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -21,7 +21,7 @@ let PREFIX; // PREFIX = 'http://8.130.38.56:8027/business-server'; // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - PREFIX = 'http://128.10.249.9:9004'; + PREFIX = 'http://128.10.249.43:9004'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004';