webapp / GreenwayWeb

Commit ed22b1274f9ee4185f1e80c3f6b7db8fad8d4867

Authored by wesley88
2 parents c7b1294b 3bfff9e5

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 8 changed files with 41 additions and 9 deletions
admin-web-master/src/components/add/addht.vue
  View file @ed22b12
... ... @@ -196,7 +196,7 @@ import {
196 196 this.redirectUrl = this.info.redirectUrl
197 197 }
198 198 if(this.info.coverImage){
199   - this.coverImage = this.info.coverImage
  199 + this.coverImage = this.info.coverImage
200 200 }
201 201 },
202 202 methods: {
... ... @@ -271,6 +271,7 @@ import {
271 271 }
272 272 }
273 273 this.formInline.templateInformation = JSON.stringify(this.list1)
  274 +
274 275 let from = {
275 276 ...this.formInline,
276 277 contractChangeReason: this.contractChangeReason,
... ... @@ -289,6 +290,8 @@ import {
289 290 createDate:this.updateCurrentTime(),
290 291 createUser: localStorage.getItem('roleName'),
291 292 }
  293 + // console.log(from)
  294 + // return
292 295 console.error(from)
293 296 let info = await this.culfj()
294 297 console.error(info)
... ... @@ -340,6 +343,7 @@ import {
340 343  
341 344 },
342 345 async add() {
  346 +
343 347 let ismb = false
344 348 await this.$refs.rulesmbinfoForm.validate((valid) => {
345 349 if (valid) {
... ... @@ -398,11 +402,18 @@ import {
398 402 documentAddress: this.templateAttachment,
399 403 insertData: JSON.stringify(info)
400 404 }
  405 +
  406 + if(this.formInline.coverImage){
  407 + this.formInline.coverImage = this.$baseURL+this.formInline.coverImage
  408 + }
  409 + console.log(this.formInline.coverImage,'this.formInline.coverImagethis.formInline.coverImagethis.formInline.coverImage')
  410 + return
401 411 dataInprotDocument(c1).then(res => {
402 412 console.error(res)
403 413 if(res.code == 200 && res.data) {
404 414 this.formInline.appendicesContract = res.data
405 415  
  416 +
406 417 contractinsertAdd({
407 418 ...this.formInline,
408 419 templateInformationUrl:this.templateAttachment,
... ...
admin-web-master/src/components/add/addmap.vue
  View file @ed22b12
... ... @@ -26,7 +26,7 @@
26 26 </el-form-item>
27 27 <el-form-item label="轮播图" prop="carouselId" >
28 28 <el-select v-model="formInline.carouselId" placeholder="请选择" style="width: 100%;">
29   - <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'" :value="item.id"></el-option>
  29 + <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'商城端':'商家端'}`" :value="item.id"></el-option>
30 30 </el-select>
31 31 </el-form-item>
32 32 <el-form-item label="广告尺寸" prop="dimensions" >
... ... @@ -45,6 +45,7 @@
45 45 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
46 46 @changimg="e=>changimg(e,'locationDiagram')"></upimg>
47 47 </el-form-item>
  48 +
48 49 <el-form-item label="介绍" prop="memo">
49 50 <wangEditor v-model="formInline.memo" ref="editor" :height="200"></wangEditor>
50 51 <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
... ... @@ -121,6 +122,7 @@
121 122 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
122 123 @changimg="e=>changimg(e,'locationDiagram')"></upimg>
123 124 </el-form-item>
  125 +
124 126 <el-row :gutter="20">
125 127 <el-col :span="12">
126 128 <el-form-item>
... ... @@ -212,9 +214,9 @@
212 214 onlineType: '' ,// 线上类型
213 215 belongingGreenwaySection: '', // 所属绿道段
214 216 belongingParkTrail: '', // 所属公园/步道
  217 + // carouselId:'',//选择租赁广告位置
215 218 },
216 219 rules: {
217   -
218 220 advertisingType: [{
219 221 required: true,
220 222 message: '请选择广告类型',
... ... @@ -245,6 +247,7 @@
245 247 message: '请上传位置示意图',
246 248 trigger: ['change']
247 249 }],
  250 +
248 251 },
249 252 rulesSt: {
250 253 belongingGreenwaySection: [{
... ... @@ -354,6 +357,11 @@
354 357 const lvdao = await lvdaoduan()
355 358 const gongyua = await parkTrails()
356 359 this.lvdaoList = lvdao.data.concat(gongyua.data)
  360 + let obj = {
  361 + pageNumber: 1,
  362 + pageSize: 10
  363 + }
  364 +
357 365 },
358 366 methods: {
359 367 validateNumber(field, value) {
... ...
admin-web-master/src/utils/request.js
  View file @ed22b12
... ... @@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - // baseURL = 'http://128.10.249.39:9003';
  25 + baseURL = 'http://128.10.249.37:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/utils/request2.js
  View file @ed22b12
... ... @@ -20,7 +20,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
20 20 baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
21 21 // baseURL = 'http://172.16.61.125:9004';
22 22 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
23   - // baseURL = 'http://128.10.249.44:9004';
  23 + baseURL = 'http://128.10.249.37:9004';
24 24 } else {
25 25 console.error('---------------------')
26 26 console.error(hostall)
... ...
admin-web-master/src/views/serve/salesReport.vue
  View file @ed22b12
... ... @@ -93,7 +93,7 @@
93 93  
94 94 </div>
95 95 </div>
96   -<iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" />
  96 +<!-- <iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
97 97 <!-- <iframe v-if="show" src="https://zhgw-uat.028wlkj.com/cdwlMall/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
98 98 </div>
99 99 </template>
... ...
ceres-uniapp-master/components/canvasShow/basics/banner.vue
  View file @ed22b12
... ... @@ -42,8 +42,14 @@
42 42 type:1
43 43 }
44 44 NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
45   -
46   - this.bannerList = res.data.content
  45 + res.data.content.map(item=>{
  46 + if(item.state ==1){
  47 + item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
  48 + item.jumpUrl = ''
  49 + }
  50 +
  51 + })
  52 + this.bannerList = res.data.content
47 53  
48 54 })
49 55 // uni.request({
... ...
lvdao-miniapp/pages/home/home.vue
  View file @ed22b12
... ... @@ -541,6 +541,13 @@
541 541 })
542 542 // 轮播图
543 543 this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex, 1).then(res => {
  544 + res.data.data.content.map(item=>{
  545 + if(item.state ==1){
  546 + item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
  547 + item.jumpUrl = ''
  548 + }
  549 +
  550 + })
544 551 this.swiperList = res.data.data.content
545 552 })
546 553 // 营销推广活动
... ...
lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
  View file @ed22b12
... ... @@ -3,7 +3,7 @@
3 3 <view class="title-top">
4 4 <div class="left" @click="show = true">
5 5 <text>{{year}}年<u-icon name="arrow-down"></u-icon></text>
6   - <u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" />
  6 + <!-- <u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" /> -->
7 7 <u-picker v-model="show" mode="time" :params="{year: true}" @confirm ="change"></u-picker>
8 8 </div>
9 9 <div class="right"><u-icon name="rmb" class="price" /><text class="price">{{allnum}}</text></div>
... ...