Commit bfccec7127dd48d5777b5df82a06ea3d67bac2ef
1 parent
249d13ce
拉去
Showing
5 changed files
with
25 additions
and
11 deletions
admin-web-master/src/components/add/addmap.vue
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="所属端" prop="affiliation" > |
| 14 | - <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;"> | |
| 14 | + <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;" @change="affiliationChange"> | |
| 15 | 15 | <!-- <el-option label="游客小程序" value="游客小程序"></el-option> |
| 16 | 16 | <el-option label="商家客户端" value="商家客户端"></el-option> --> |
| 17 | 17 | <el-option v-for="(item,index) in owningEndList" |
| ... | ... | @@ -371,6 +371,18 @@ |
| 371 | 371 | this.formInline.rotationOrder = '第' + (selectedIndex + 1) + '张'; |
| 372 | 372 | } |
| 373 | 373 | }, |
| 374 | + async affiliationChange(value){ | |
| 375 | + let arList = [] | |
| 376 | + let res= await bannerGet({pageNumber: 1,pageSize: 20}) | |
| 377 | + arList = res.data.content | |
| 378 | + if(value == '在线商城'){ | |
| 379 | + this.tableData = arList.filter(item => item.type === 1); | |
| 380 | + this.$forceUpdate() | |
| 381 | + }else{ | |
| 382 | + this.tableData = arList.filter(item => item.type === 2); | |
| 383 | + } | |
| 384 | + | |
| 385 | + }, | |
| 374 | 386 | validateNumber(field, value) { |
| 375 | 387 | // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数 |
| 376 | 388 | const regex = /^\d+(\.\d{1,2})?$/; | ... | ... |
admin-web-master/src/components/chakan/fa.vue
| ... | ... | @@ -49,9 +49,11 @@ |
| 49 | 49 | {{scope.row.shopinfo.policyName}} |
| 50 | 50 | </template> |
| 51 | 51 | </el-table-column> |
| 52 | - <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip> | |
| 52 | + <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip> | |
| 53 | 53 | <template slot-scope="scope"> |
| 54 | - {{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }} | |
| 54 | + | |
| 55 | + <span v-if="scope.row.type!='广告位'">{{scope.row.shopinfo.rentalPrice}} 元/m²</span> | |
| 56 | + <span v-else>{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span> | |
| 55 | 57 | </template> |
| 56 | 58 | </el-table-column> |
| 57 | 59 | <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip> | ... | ... |
admin-web-master/src/views/aaa/index.vue
| ... | ... | @@ -12,14 +12,14 @@ |
| 12 | 12 | </el-button> |
| 13 | 13 | </div> |
| 14 | 14 | <!-- 表格 --> |
| 15 | - <el-table :data="tableData" | |
| 15 | + <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" | |
| 16 | 16 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" |
| 17 | 17 | style="width: 100%"> |
| 18 | - <el-table-column label="序号" min-width="5%" prop="id"> | |
| 18 | + <!-- <el-table-column label="序号" min-width="5%" prop="id"> | |
| 19 | 19 | <template slot-scope="scope"> |
| 20 | 20 | {{scope.$index +1 }} |
| 21 | 21 | </template> |
| 22 | - </el-table-column> | |
| 22 | + </el-table-column> --> | |
| 23 | 23 | <el-table-column label="轮播图" prop="" min-width="20%"> |
| 24 | 24 | <template slot-scope="scope"> |
| 25 | 25 | <el-image style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image> |
| ... | ... | @@ -162,8 +162,8 @@ |
| 162 | 162 | handleSizeChange() { |
| 163 | 163 | |
| 164 | 164 | }, |
| 165 | - handleCurrentChange() { | |
| 166 | - | |
| 165 | + handleCurrentChange(val) { | |
| 166 | + this.currentPage = val | |
| 167 | 167 | }, |
| 168 | 168 | addCheck() { |
| 169 | 169 | this.$refs.ruleForm.validate((valid) => { | ... | ... |
ceres-uniapp-master/components/canvasShow/config/api.js
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | const host = `${window.location.protocol}//${window.location.host}` |
| 8 | 8 | const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` |
| 9 | 9 | // const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' |
| 10 | -const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.28:9007' | |
| 10 | +const BASEURL = (process.env.NODE_ENV === 'production') ? DOMAIN_PREFIX :'http://128.10.249.9:9007' | |
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | ... | ... |
ceres-uniapp-master/config/api.js
| ... | ... | @@ -2,8 +2,8 @@ |
| 2 | 2 | // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' |
| 3 | 3 | // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' |
| 4 | 4 | const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' |
| 5 | -const DOMAIN_PREFIXPING = 'http://128.10.249.28:9003' | |
| 6 | -const DOMAIN_PREFIX = 'http://128.10.249.28:9007' | |
| 5 | +const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003' | |
| 6 | +const DOMAIN_PREFIX = 'http://128.10.249.9:9007' | |
| 7 | 7 | // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' |
| 8 | 8 | // const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' |
| 9 | 9 | // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/' | ... | ... |