Commit 5ebff8862af14253191e37c520ed2f5e201fba2e
1 parent
516dff62
1
Showing
8 changed files
with
72 additions
and
70 deletions
admin-web-master/src/components/add/addfa.vue
| ... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 | </el-dialog> |
| 102 | 102 | <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false" |
| 103 | 103 | :close-on-press-escape="false" :show-close="false"> |
| 104 | - <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSevcl" @mingClose="mingClosecl"></cl> | |
| 104 | + <cl :type="oninfo.shopName?'商铺':oninfo.advertisingType?'广告位':'场地'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSevcl" @mingClose="mingClosecl"></cl> | |
| 105 | 105 | </el-dialog> |
| 106 | 106 | </div> |
| 107 | 107 | </template> | ... | ... |
admin-web-master/src/layout/index.vue
| ... | ... | @@ -197,17 +197,17 @@ |
| 197 | 197 | } |
| 198 | 198 | } |
| 199 | 199 | return { |
| 200 | - // msg: [], | |
| 201 | - // list: [], | |
| 200 | + msg: [], | |
| 201 | + list: [], | |
| 202 | 202 | // msg: ['招商服务系统'], |
| 203 | - msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], | |
| 204 | - list: [ | |
| 205 | - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 206 | - ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 207 | - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 208 | - ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 209 | - ['渠道售票统计分析', '销售额统计分析'], | |
| 210 | - ], | |
| 203 | + // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], | |
| 204 | + // list: [ | |
| 205 | + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 206 | + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 207 | + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 208 | + // ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 209 | + // ['渠道售票统计分析', '销售额统计分析'], | |
| 210 | + // ], | |
| 211 | 211 | listMune: [], |
| 212 | 212 | mumeList: [], |
| 213 | 213 | mumeChildren1: [], |
| ... | ... | @@ -296,10 +296,10 @@ |
| 296 | 296 | this.userAvatar = getUserAvatar() |
| 297 | 297 | }, |
| 298 | 298 | mounted() { |
| 299 | - // this.getMemu() | |
| 300 | - // this.address() | |
| 301 | - // this.waibu() | |
| 302 | - this.neibu() | |
| 299 | + this.getMemu() | |
| 300 | + this.address() | |
| 301 | + this.waibu() | |
| 302 | + // this.neibu() | |
| 303 | 303 | }, |
| 304 | 304 | |
| 305 | 305 | methods: { |
| ... | ... | @@ -512,7 +512,7 @@ |
| 512 | 512 | getMemu() { |
| 513 | 513 | // console.log(userData, 'userData') |
| 514 | 514 | |
| 515 | - // let userData = JSON.parse(localStorage.getItem('user')); | |
| 515 | + let userData = JSON.parse(localStorage.getItem('user')); | |
| 516 | 516 | if (!userData) { |
| 517 | 517 | window.location.href = 'https://admin-uat.028wlkj.com:1020/login' |
| 518 | 518 | // window.location.href = 'http://128.10.9.151:5173/home' |
| ... | ... | @@ -774,18 +774,18 @@ |
| 774 | 774 | clk(index) { |
| 775 | 775 | this.index = index |
| 776 | 776 | this.listMune = [] |
| 777 | - this.list = [ | |
| 778 | - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 779 | - ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 780 | - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 781 | - ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 782 | - ['渠道售票统计分析', '销售额统计分析'], | |
| 783 | - ] | |
| 784 | - // this.getMemu() | |
| 785 | - // this.waibu() | |
| 786 | - | |
| 787 | - this.neibu() | |
| 777 | + // this.list = [ | |
| 778 | + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], | |
| 779 | + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], | |
| 780 | + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], | |
| 781 | + // ['联机交易', '对账处理', '日志管理', '商户服务'], | |
| 782 | + // ['渠道售票统计分析', '销售额统计分析'], | |
| 783 | + // ] | |
| 784 | + this.getMemu() | |
| 785 | + this.waibu() | |
| 788 | 786 | this.list = this.mumeList |
| 787 | + // this.neibu() | |
| 788 | + | |
| 789 | 789 | }, |
| 790 | 790 | handleClickOutside() { |
| 791 | 791 | this.$store.dispatch('app/closeSideBar', { | ... | ... |
admin-web-master/src/utils/request.js
| ... | ... | @@ -17,7 +17,8 @@ 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 = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 20 | - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 20 | + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 21 | + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' | |
| 21 | 22 | // baseURL = 'http://128.10.249.21:9003'; |
| 22 | 23 | |
| 23 | 24 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; | ... | ... |
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
| ... | ... | @@ -412,7 +412,7 @@ |
| 412 | 412 | // console.error({...this.pagequery}) |
| 413 | 413 | const res = await AdvertiserInfoGetAll(this.pagequery) |
| 414 | 414 | this.tableData = res.data.content |
| 415 | - this.total = res.data.totalElements | |
| 415 | + this.total = res.data.totalElements || 0 | |
| 416 | 416 | let obj1 = { |
| 417 | 417 | pageNumber: 0, |
| 418 | 418 | pageSize: 10, | ... | ... |
admin-web-master/src/views/serve/MarkActivity/index.vue
| ... | ... | @@ -157,16 +157,16 @@ |
| 157 | 157 | </template> |
| 158 | 158 | </el-table-column> |
| 159 | 159 | |
| 160 | - <el-table-column label="场地名称" prop="venueName" width="150"> | |
| 160 | + <el-table-column label="场地名称" prop="venueName" > | |
| 161 | 161 | |
| 162 | 162 | </el-table-column> |
| 163 | - <el-table-column label="所属区域" prop="district" min-width="150"> | |
| 163 | + <el-table-column label="所属区域" prop="district" > | |
| 164 | 164 | </el-table-column> |
| 165 | - <el-table-column label="场地类型" prop="venueType" width="150"> | |
| 165 | + <el-table-column label="场地类型" prop="venueType" > | |
| 166 | 166 | |
| 167 | 167 | </el-table-column> |
| 168 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 169 | - </el-table-column> | |
| 168 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 169 | + </el-table-column> --> | |
| 170 | 170 | |
| 171 | 171 | </el-table> |
| 172 | 172 | </div> |
| ... | ... | @@ -260,14 +260,14 @@ |
| 260 | 260 | {{scope.$index + 1}} |
| 261 | 261 | </template> |
| 262 | 262 | </el-table-column> |
| 263 | - <el-table-column label="场地名称" prop="venueName" width="150"> | |
| 264 | - </el-table-column> | |
| 265 | - <el-table-column label="所属区域" prop="district" min-width="150"> | |
| 263 | + <el-table-column label="场地名称" prop="venueName" > | |
| 266 | 264 | </el-table-column> |
| 267 | - <el-table-column label="场地类型" prop="venueType" width="150"> | |
| 265 | + <el-table-column label="所属区域" prop="district" > | |
| 268 | 266 | </el-table-column> |
| 269 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 267 | + <el-table-column label="场地类型" prop="venueType" > | |
| 270 | 268 | </el-table-column> |
| 269 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 270 | + </el-table-column> --> | |
| 271 | 271 | <el-table-column label="操作" min-width="150"> |
| 272 | 272 | <template slot-scope="scope"> |
| 273 | 273 | <div class="tableBtn greens" @click="addziDel(scope.$index)">删除</div> |
| ... | ... | @@ -330,22 +330,22 @@ |
| 330 | 330 | <el-radio v-model="selectedRow" inert :label="scope.row" > </el-radio> |
| 331 | 331 | </template> |
| 332 | 332 | </el-table-column> |
| 333 | - <el-table-column label="序号" min-width="8%"> | |
| 333 | + <el-table-column label="序号" width="80"> | |
| 334 | 334 | <template slot-scope="scope"> |
| 335 | 335 | {{scope.$index + 1}} |
| 336 | 336 | </template> |
| 337 | 337 | </el-table-column> |
| 338 | 338 | |
| 339 | - <el-table-column label="场地名称" prop="venueName" min-width="15%"> | |
| 339 | + <el-table-column label="场地名称" prop="venueName"> | |
| 340 | 340 | |
| 341 | 341 | </el-table-column> |
| 342 | - <el-table-column label="场地类型" prop="venueType" min-width="15%"> | |
| 342 | + <el-table-column label="场地类型" prop="venueType" > | |
| 343 | 343 | |
| 344 | 344 | </el-table-column> |
| 345 | - <el-table-column label="所属区域" prop="district" min-width="15%"> | |
| 346 | - </el-table-column> | |
| 347 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip> | |
| 345 | + <el-table-column label="所属区域" prop="district" > | |
| 348 | 346 | </el-table-column> |
| 347 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip> | |
| 348 | + </el-table-column> --> | |
| 349 | 349 | </el-table> |
| 350 | 350 | </div> |
| 351 | 351 | </div> | ... | ... |
admin-web-master/src/views/serve/Merchant/index.vue
| ... | ... | @@ -162,16 +162,16 @@ |
| 162 | 162 | </el-table-column> |
| 163 | 163 | |
| 164 | 164 | </el-table-column> |
| 165 | - <el-table-column label="场地名称" prop="venueName" width="150"> | |
| 165 | + <el-table-column label="场地名称" prop="venueName"> | |
| 166 | 166 | |
| 167 | 167 | </el-table-column> |
| 168 | - <el-table-column label="所属区域" prop="district" min-width="150"> | |
| 168 | + <el-table-column label="所属区域" prop="district" > | |
| 169 | 169 | </el-table-column> |
| 170 | - <el-table-column label="场地类型" prop="venueType" width="150"> | |
| 170 | + <el-table-column label="场地类型" prop="venueType" > | |
| 171 | 171 | |
| 172 | 172 | </el-table-column> |
| 173 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 174 | - </el-table-column> | |
| 173 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 174 | + </el-table-column> --> | |
| 175 | 175 | |
| 176 | 176 | </el-table> |
| 177 | 177 | </div> |
| ... | ... | @@ -284,14 +284,14 @@ |
| 284 | 284 | {{scope.$index + 1}} |
| 285 | 285 | </template> |
| 286 | 286 | </el-table-column> |
| 287 | - <el-table-column label="场地名称" prop="venueName" width="150"> | |
| 288 | - </el-table-column> | |
| 289 | - <el-table-column label="所属区域" prop="district" min-width="150"> | |
| 287 | + <el-table-column label="场地名称" prop="venueName"> | |
| 290 | 288 | </el-table-column> |
| 291 | - <el-table-column label="场地类型" prop="venueType" width="150"> | |
| 289 | + <el-table-column label="所属区域" prop="district" > | |
| 292 | 290 | </el-table-column> |
| 293 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 291 | + <el-table-column label="场地类型" prop="venueType" > | |
| 294 | 292 | </el-table-column> |
| 293 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip> | |
| 294 | + </el-table-column> --> | |
| 295 | 295 | <el-table-column label="操作" min-width="150"> |
| 296 | 296 | <template slot-scope="scope"> |
| 297 | 297 | <div class="tableBtn greens" @click="handleDelete(scope.$index)" >删除</div> |
| ... | ... | @@ -356,21 +356,21 @@ |
| 356 | 356 | <el-radio v-model="selectedRow" inert :label="scope.row" > </el-radio> |
| 357 | 357 | </template> |
| 358 | 358 | </el-table-column> |
| 359 | - <el-table-column label="序号" min-width="8%" > | |
| 359 | + <el-table-column label="序号" width="80"> | |
| 360 | 360 | <template slot-scope="scope"> |
| 361 | 361 | {{scope.$index + 1}} |
| 362 | 362 | </template> |
| 363 | 363 | </el-table-column> |
| 364 | - <el-table-column label="场地名称" prop="venueName" min-width="15%"> | |
| 364 | + <el-table-column label="场地名称" prop="venueName" > | |
| 365 | 365 | |
| 366 | 366 | </el-table-column> |
| 367 | - <el-table-column label="场地类型" prop="venueType" min-width="15%"> | |
| 367 | + <el-table-column label="场地类型" prop="venueType"> | |
| 368 | 368 | |
| 369 | 369 | </el-table-column> |
| 370 | - <el-table-column label="所属区域" prop="district" min-width="15%"> | |
| 371 | - </el-table-column> | |
| 372 | - <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip> | |
| 370 | + <el-table-column label="所属区域" prop="district" > | |
| 373 | 371 | </el-table-column> |
| 372 | + <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip> | |
| 373 | + </el-table-column> --> | |
| 374 | 374 | </el-table> |
| 375 | 375 | </div> |
| 376 | 376 | </div> | ... | ... |
lvdao-miniapp/pages/workbench/workbench.vue
| ... | ... | @@ -131,11 +131,11 @@ |
| 131 | 131 | id: 1, |
| 132 | 132 | title: '活动与意向申请', |
| 133 | 133 | children: [ |
| 134 | - { name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, | |
| 134 | + { name: '问卷调查', img: '/wjdc.png', path: '/pages/questionnaire/questionnaire' }, | |
| 135 | 135 | // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, |
| 136 | - { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, | |
| 137 | - { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, | |
| 138 | - { name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' }, | |
| 136 | + { name: '我的活动', img: '/wdhd.png', path: '/pages/participation/participation' }, | |
| 137 | + { name: '活动申请', img: '/hdsq.png', path: '/pages/mycreated/mycreated' }, | |
| 138 | + { name: '意向申请', img: '/yxsq.png', path: '/pages/rsaManagement/rsaManagement' }, | |
| 139 | 139 | ] |
| 140 | 140 | }, |
| 141 | 141 | ], |
| ... | ... | @@ -148,8 +148,8 @@ |
| 148 | 148 | // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, |
| 149 | 149 | // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, |
| 150 | 150 | // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, |
| 151 | - { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' }, | |
| 152 | - { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' }, | |
| 151 | + { name: '销售上报', img: '/xssb.png', path: '/pages/saleReport/saleReport' }, | |
| 152 | + { name: '销售统计', img: '/xstj.png', path: '/pages/salesReporting/salesReporting' }, | |
| 153 | 153 | ] |
| 154 | 154 | }, |
| 155 | 155 | ], |
| ... | ... | @@ -161,8 +161,8 @@ |
| 161 | 161 | // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, |
| 162 | 162 | // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, |
| 163 | 163 | // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, |
| 164 | - // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, | |
| 165 | - { name: '租金缴费', img: '/workbench1.png', path: '/pagesA/rentPay/rentPay' }, | |
| 164 | + // { name: '活动申请', img: '/wyjf.png', path: '/pages/mycreated/mycreated' }, | |
| 165 | + { name: '租金缴费', img: '/zjjf.png', path: '/pagesA/rentPay/rentPay' }, | |
| 166 | 166 | ] |
| 167 | 167 | }, |
| 168 | 168 | ], | ... | ... |
lvdao-miniapp/utils/request.js
| 1 | 1 | |
| 2 | 2 | // let hostall = window.location.href; |
| 3 | 3 | // let c1 = hostall.split('cdwlMall')[0]; |
| 4 | -let c1 = 'https://jy.scjysm.asia:18086/' | |
| 4 | +// let c1 = 'https://jy.scjysm.asia:18086/' | |
| 5 | +let c1 = 'https://zhgw-uat.028wlkj.com/' | |
| 5 | 6 | //封装request请求 |
| 6 | 7 | const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { |
| 7 | 8 | //判断header提交数据类型 | ... | ... |