Commit d0fdf3d7533c26cb7c865004b5d53c59d095f60b
1 parent
521b3983
最新
Showing
6 changed files
with
65 additions
and
24 deletions
admin-web-master/src/components/add/addmap.vue
| ... | ... | @@ -214,7 +214,7 @@ |
| 214 | 214 | onlineType: '' ,// 线上类型 |
| 215 | 215 | belongingGreenwaySection: '', // 所属绿道段 |
| 216 | 216 | belongingParkTrail: '', // 所属公园/步道 |
| 217 | - // carouselId:'',//选择租赁广告位置 | |
| 217 | + carouselId:'',//选择租赁广告位置 | |
| 218 | 218 | }, |
| 219 | 219 | rules: { |
| 220 | 220 | advertisingType: [{ |
| ... | ... | @@ -332,7 +332,32 @@ |
| 332 | 332 | if (this.formInline.mapPunctuation) { |
| 333 | 333 | this.lat = Number(this.formInline.mapPunctuation.split(',')[0]) |
| 334 | 334 | this.lng = Number(this.formInline.mapPunctuation.split(',')[1]) |
| 335 | + | |
| 335 | 336 | } |
| 337 | + if(this.info.affiliation){ | |
| 338 | + console.log('this.info.affiliation',this.info.affiliation) | |
| 339 | + console.log('this.info.carouselId',this.info.carouselId) | |
| 340 | + let arList = [] | |
| 341 | + let res= await bannerGet({pageNumber: 1,pageSize: 20}) | |
| 342 | + arList = res.data.content | |
| 343 | + if(this.info.affiliation == '在线商城'){ | |
| 344 | + this.tableData = arList.filter(item => item.type === 1); | |
| 345 | + this.$forceUpdate() | |
| 346 | + }else{ | |
| 347 | + this.tableData = arList.filter(item => item.type === 2); | |
| 348 | + this.$forceUpdate() | |
| 349 | + } | |
| 350 | + console.log('111111111111111111',this.tableData) | |
| 351 | + this.tableData.map((item,index)=>{ | |
| 352 | + if(item.id == this.info.carouselId){ | |
| 353 | + this.handleSelectChange(index) | |
| 354 | + this.formInline.carouselId = this.info.carouselId | |
| 355 | + this.$forceUpdate() | |
| 356 | + } | |
| 357 | + }) | |
| 358 | + | |
| 359 | + console.log('222222222222222',this.tableData) | |
| 360 | + } | |
| 336 | 361 | this.ontype = this.formInline.advertisingType |
| 337 | 362 | if (this.ontype == '线上广告位') { |
| 338 | 363 | this.typelist = [{ |
| ... | ... | @@ -372,6 +397,7 @@ |
| 372 | 397 | } |
| 373 | 398 | }, |
| 374 | 399 | async affiliationChange(value){ |
| 400 | + this.formInline.carouselId = '' | |
| 375 | 401 | let arList = [] |
| 376 | 402 | let res= await bannerGet({pageNumber: 1,pageSize: 20}) |
| 377 | 403 | arList = res.data.content |
| ... | ... | @@ -380,6 +406,7 @@ |
| 380 | 406 | this.$forceUpdate() |
| 381 | 407 | }else{ |
| 382 | 408 | this.tableData = arList.filter(item => item.type === 2); |
| 409 | + this.$forceUpdate() | |
| 383 | 410 | } |
| 384 | 411 | |
| 385 | 412 | }, | ... | ... |
admin-web-master/src/layout/index.vue
| ... | ... | @@ -200,17 +200,17 @@ |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | return { |
| 203 | - msg: [], | |
| 204 | - list: [], | |
| 203 | + // msg: [], | |
| 204 | + // list: [], | |
| 205 | 205 | // msg: ['招商服务系统'], |
| 206 | - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], | |
| 207 | - // list: [ | |
| 208 | - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 209 | - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 210 | - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 211 | - // ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 212 | - // ['渠道售票统计分析', '销售额统计分析'], | |
| 213 | - // ], | |
| 206 | + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], | |
| 207 | + list: [ | |
| 208 | + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 209 | + ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 210 | + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 211 | + ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 212 | + ['渠道售票统计分析', '销售额统计分析'], | |
| 213 | + ], | |
| 214 | 214 | listMune: [], |
| 215 | 215 | mumeList: [], |
| 216 | 216 | mumeChildren1: [], |
| ... | ... | @@ -299,10 +299,10 @@ |
| 299 | 299 | this.userAvatar = getUserAvatar() |
| 300 | 300 | }, |
| 301 | 301 | mounted() { |
| 302 | - this.getMemu() | |
| 303 | - this.address() | |
| 304 | - this.waibu() | |
| 305 | - // this.neibu() | |
| 302 | + // this.getMemu() | |
| 303 | + // this.address() | |
| 304 | + // this.waibu() | |
| 305 | + this.neibu() | |
| 306 | 306 | }, |
| 307 | 307 | |
| 308 | 308 | methods: { |
| ... | ... | @@ -786,12 +786,12 @@ |
| 786 | 786 | ['联机交易', '对账处理', '日志管理', '商户服务'], |
| 787 | 787 | ['渠道售票统计分析', '销售额统计分析'], |
| 788 | 788 | ] |
| 789 | - // this.neibu() | |
| 789 | + this.neibu() | |
| 790 | 790 | |
| 791 | 791 | |
| 792 | - this.getMemu() | |
| 793 | - this.waibu() | |
| 794 | - this.list = this.mumeList | |
| 792 | + // this.getMemu() | |
| 793 | + // this.waibu() | |
| 794 | + // this.list = this.mumeList | |
| 795 | 795 | |
| 796 | 796 | |
| 797 | 797 | }, | ... | ... |
admin-web-master/src/utils/request.js
| ... | ... | @@ -17,12 +17,12 @@ let baseURL = '' |
| 17 | 17 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 18 | 18 | |
| 19 | 19 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; |
| 20 | - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 20 | + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 21 | 21 | |
| 22 | 22 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 23 | 23 | |
| 24 | 24 | |
| 25 | - // baseURL = 'http://192.168.8.103:9003'; | |
| 25 | + baseURL = 'http://128.10.249.43:9003'; | |
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | } else { | ... | ... |
admin-web-master/src/views/detect/analyse.vue
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" |
| 13 | 13 | style="width: 300px;margin-right: 10px;" prefix-icon="none"> |
| 14 | 14 | </el-date-picker> |
| 15 | - <el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择" | |
| 15 | + <el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择所属绿道段" | |
| 16 | 16 | style="width: 168px;margin-right: 10px;"> |
| 17 | 17 | <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList" |
| 18 | 18 | :key="index"></el-option> | ... | ... |
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue
| ... | ... | @@ -127,7 +127,7 @@ |
| 127 | 127 | </u-radio-group> |
| 128 | 128 | </view> |
| 129 | 129 | <view style="display: flex;justify-content: space-between;margin-top: 10px;"> |
| 130 | - <u-button type="" style="width: 45%;" @click="submit">取消</u-button> | |
| 130 | + <u-button type="" style="width: 45%;" @click="close">取消</u-button> | |
| 131 | 131 | <u-button type="success" style="width: 45%;" @click="submit">提交</u-button> |
| 132 | 132 | </view> |
| 133 | 133 | </view> |
| ... | ... | @@ -233,6 +233,10 @@ |
| 233 | 233 | url: `/pagesA/PunchInAct/PunchInSetting?ids=${this.tableData.id}` |
| 234 | 234 | }) |
| 235 | 235 | }, |
| 236 | + close(){ | |
| 237 | + this.addjiangliShow = false | |
| 238 | + | |
| 239 | + }, | |
| 236 | 240 | submit() { |
| 237 | 241 | if (!this.form.userName) { |
| 238 | 242 | uni.showToast({ |
| ... | ... | @@ -301,6 +305,16 @@ |
| 301 | 305 | return `${year}-${month}-${day}`; |
| 302 | 306 | }, |
| 303 | 307 | addjiangli(){ |
| 308 | + | |
| 309 | + this.form = { | |
| 310 | + activityId: '', | |
| 311 | + userId: '', | |
| 312 | + createTime: '', | |
| 313 | + createUser: '', | |
| 314 | + userName: '', | |
| 315 | + userPhone: '', | |
| 316 | + canyutiem:'' | |
| 317 | + } | |
| 304 | 318 | this.addjiangliShow = true |
| 305 | 319 | }, |
| 306 | 320 | dakaSet(){ | ... | ... |
merchant-web-master/src/utils/request.js
| ... | ... | @@ -21,7 +21,7 @@ let PREFIX; |
| 21 | 21 | // PREFIX = 'http://8.130.38.56:8027/business-server'; |
| 22 | 22 | // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; |
| 23 | 23 | // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; |
| 24 | - PREFIX = 'http://128.10.249.9:9004'; | |
| 24 | + PREFIX = 'http://128.10.249.43:9004'; | |
| 25 | 25 | }else{ |
| 26 | 26 | // PREFIX = '/merchant-business'; |
| 27 | 27 | // PREFIX = 'http://8.130.38.56:9004'; | ... | ... |