Skip to content

X
xoadoPlatform
Commit 6262cb00 by weix
Options

修改bug

parent 4f10ff57
Showing with 130 additions and 44 deletions
src/App.vue
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
await this.$store.dispatch('user/PlatformCode') await this.$store.dispatch('user/PlatformCode')
await this.mustFun(); await this.mustFun();
/** 测试环境需要解注 */ /** 测试环境需要解注 */
// await this.getEnvironment(); await this.getEnvironment();
}, },
mounted () { mounted () {
console.log(process.env.VUE_APP_BASE_API5) console.log(process.env.VUE_APP_BASE_API5)
...@@ -143,4 +143,9 @@ export default { ...@@ -143,4 +143,9 @@ export default {
margin-bottom: 0; margin-bottom: 0;
} }
} }
.pagination {
margin-top: 16px;
text-align: right;
}
</style> </style>
src/views/disposition/passDetail.vue
...@@ -38,29 +38,23 @@ ...@@ -38,29 +38,23 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div v-if="selectResult.pageLocation == 1" class="rotationIndex"> <div class="rotationIndex">
<img <img
v-if="selectResult.pageLocationOrder == 1" v-if="selectResult.pageLocation == 1"
src="@/assets/img/rotation-rigthgg.jpg" src="@/assets/img/rotation-rigthgg.png"
alt="" alt=""
/> />
<img <img
v-if="selectResult.pageLocationOrder == 2" v-if="selectResult.pageLocation == 2"
src="@/assets/img/rotation-wzgg.jpg" src="@/assets/img/rotation-wzgg.png"
alt="" alt=""
/> />
<img <img
v-if="selectResult.pageLocationOrder == 3" v-if="selectResult.pageLocation == 3"
src="@/assets/img/rotation-ddxq.jpg" src="@/assets/img/rotation-ddxq.png"
alt="" alt=""
/> />
</div> </div>
<div v-if="selectResult.pageLocation == 3" class="rotationIndex">
<img src="@/assets/img/rotation-ddxq.jpg" alt=""/>
</div>
<div v-if="selectResult.pageLocation == 2" class="rotationIndex">
<img src="@/assets/img/rotation-home.jpg" alt=""/>
</div>
</el-card> </el-card>
</el-aside> </el-aside>
<el-main> <el-main>
...@@ -133,7 +127,8 @@ ...@@ -133,7 +127,8 @@
justify="space-between" justify="space-between"
> >
<el-col :span="24"> <el-col :span="24">
<el-form-item label="模块图片：" prop="pictureUrl"> <el-form-item label="模块图片：" prop="pictureUrl" class="picture-url-item"
style="width: 100%">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
list-type="picture-card" list-type="picture-card"
...@@ -145,21 +140,31 @@ ...@@ -145,21 +140,31 @@
name="image" name="image"
:on-success="photoUrlSuccess" :on-success="photoUrlSuccess"
> >
<img <el-image
v-if="ruleForm.pictureUrl"
:src="ruleForm.pictureUrl" :src="ruleForm.pictureUrl"
lazy
class="avatar" class="avatar"
/> >
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <div slot="error" class="image-slot">
<i class="el-icon-plus avatar-uploader-icon"></i>
</div>
</el-image>
<!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
</el-upload> </el-upload>
<div style="width: 100%;">
<span class="prompt" <span class="prompt"
v-if="selectResult.pageLocationOrder == 1" v-if="selectResult.pageLocationOrder == 1"
>只能上传1张，支持jpg/png文件，建议图片比例为1：1（其他比例图片上传后将会影响展示效果）</span >只能上传1张，支持jpg/png文件，建议图片比例为2：1（其他比例图片上传后将会影响展示效果）</span
> >
<span class="prompt" <span class="prompt"
v-if="selectResult.pageLocationOrder != 1" v-if="selectResult.pageLocationOrder == 2"
>只能上传1张，支持jpg/png文件，建议图片比例为5：1（其他比例图片上传后将会影响展示效果）</span >只能上传1张，支持jpg/png文件，建议图片大小为359px*90px（其他比例图片上传后将会影响展示效果）</span
>
<span class="prompt"
v-if="selectResult.pageLocationOrder == 3"
>只能上传1张，支持jpg/png文件，建议图片大小为359px*100px（其他比例图片上传后将会影响展示效果）</span
> >
</div>
<!-- <span class="prompt" <!-- <span class="prompt"
>只能上传1张，支持jpg/png文件，{{ >只能上传1张，支持jpg/png文件，{{
selectResult.pageLocation == 1 selectResult.pageLocation == 1
...@@ -179,23 +184,27 @@ ...@@ -179,23 +184,27 @@
<!-- >全部--> <!-- >全部-->
<!-- </el-button>--> <!-- </el-button>-->
<el-select <el-cascader clearable v-model="ruleForm.codeList" :disabled="checked"
v-model="ruleForm.codeList" :show-all-levels="false" style="width: 100%;max-width: 221px;"
multiple :props="props"></el-cascader>
collapse-tags <!-- <el-select-->
placeholder="选择区域" <!-- v-model="ruleForm.codeList"-->
:disabled="checked" <!-- multiple-->
> <!-- collapse-tags-->
<el-option <!-- placeholder="选择区域"-->
v-for="item in restaurants" <!-- :disabled="checked"-->
:key="item.value" <!-- >-->
:label="item.label" <!-- <el-option-->
:value="item.value" <!-- v-for="item in restaurants"-->
> <!-- :key="item.value"-->
</el-option> <!-- :label="item.label"-->
</el-select> <!-- :value="item.value"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-checkbox style="margin-left: 10px;" v-model="checked" @change="changeCodeList">全选 <el-checkbox style="margin-left: 10px;" :disabled="selectResult.pageLocation == 1"
v-model="checked" @change="changeCodeList">全选
</el-checkbox> </el-checkbox>
<!-- <div class="prompt"> <!-- <div class="prompt">
说明：若页面跳转关联至活动，则展示区域以活动设置的展示区域为准 说明：若页面跳转关联至活动，则展示区域以活动设置的展示区域为准
...@@ -297,6 +306,9 @@ import { ...@@ -297,6 +306,9 @@ import {
} from "@/port/set-request"; } from "@/port/set-request";
import {addCarousel} from "@/port/pass/pass"; import {addCarousel} from "@/port/pass/pass";
import { import {
getAllprovinceAndCity,
} from "@/port/set-request";
import {
getRegionManageList, getRegionManageList,
} from '@/port/region/regionManage'; } from '@/port/region/regionManage';
...@@ -304,6 +316,34 @@ export default { ...@@ -304,6 +316,34 @@ export default {
name: "paddDetail", name: "paddDetail",
data() { data() {
return { return {
props: {
checkStrictly: true,
lazy: true,
lazyLoad(node, resolve) {
const {level} = node
console.log(node)
let parent
if (level == 0) {
parent = 100000
} else {
parent = node.value
}
getAllprovinceAndCity(parent).then(res => {
if (res.status == 200) {
let list = res.data
const nodes = list.map(item => {
return {
value: item.id,
label: item.fullname,
leaf: level >= 2,
disabled: parent == 100000 ? true : false,
}
})
resolve(nodes)
}
})
}
},
checked: true, checked: true,
configData: [], configData: [],
UnderLineUpdata: { UnderLineUpdata: {
...@@ -332,12 +372,12 @@ export default { ...@@ -332,12 +372,12 @@ export default {
name: "顶部轮播图", name: "顶部轮播图",
}, },
{ {
pid: "2", pid: "3",
id: "2", id: "2",
name: "中部轮播图", name: "中部轮播图",
}, },
{ {
pid: "3", pid: "2",
id: "3", id: "3",
name: "页底广告位", name: "页底广告位",
}, },
...@@ -442,19 +482,36 @@ export default { ...@@ -442,19 +482,36 @@ export default {
this.selectResult.pageLocationOrder = "1"; this.selectResult.pageLocationOrder = "1";
} }
if (this.selectResult.pageLocation == 2) { if (this.selectResult.pageLocation == 2) {
this.selectResult.pageLocationOrder = "2"; this.selectResult.pageLocationOrder = "3";
} }
if (this.selectResult.pageLocation == 3) { if (this.selectResult.pageLocation == 3) {
this.selectResult.pageLocationOrder = "3"; this.selectResult.pageLocationOrder = "2";
} }
this.$refs["ruleForm"].resetFields(); this.$refs["ruleForm"].resetFields();
// this.ruleForm = {
// positionIndex: "0",
// codeList: [],
// codeArry: ['000000'],
// activityName: "",
// insideJumpUrl: ""
// };
this.ruleForm = { this.ruleForm = {
displayPage: "",
positionInPage: "",
modelName: "",
positionIndex: "0", positionIndex: "0",
pictureUrl: "",
codeList: [], codeList: [],
codeArry: ['000000'], codeArry: ['000000'],
activityId: "",
activityName: "", activityName: "",
areaBelongSrting: "",
pageJumpFlag: "",
pageJumpUrl: "",
pageJumpText: "",
otherType: 0,
insideJumpUrl: "" insideJumpUrl: ""
}; },
this.interiorSkip = [ this.interiorSkip = [
{ {
label: '邀请好友', label: '邀请好友',
...@@ -749,7 +806,9 @@ export default { ...@@ -749,7 +806,9 @@ export default {
photoUrlSuccess(response, file, fileList) { photoUrlSuccess(response, file, fileList) {
let that = this; let that = this;
if (file.response.status == 200) { if (file.response.status == 200) {
this.$nextTick(() => {
that.ruleForm.pictureUrl = file.response.data[0].url; that.ruleForm.pictureUrl = file.response.data[0].url;
})
} }
}, },
codeListReset() { codeListReset() {
...@@ -760,6 +819,12 @@ export default { ...@@ -760,6 +819,12 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep.picture-url-item {
.el-form-item__content {
width: 100%;
}
}
.title { .title {
border-left: 5px solid #5692ff; border-left: 5px solid #5692ff;
text-align: left; text-align: left;
...@@ -782,6 +847,7 @@ export default { ...@@ -782,6 +847,7 @@ export default {
> img { > img {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
height: 650px;
} }
} }
......
src/views/disposition/passRotation.vue
...@@ -147,6 +147,17 @@ ...@@ -147,6 +147,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total"
>
</el-pagination>
</div>
</el-card> </el-card>
</template> </template>
...@@ -196,6 +207,10 @@ export default { ...@@ -196,6 +207,10 @@ export default {
await this.getAllData(); await this.getAllData();
}, },
methods: { methods: {
current_change(page) {
this.page = page;
this.getAllData();
},
delRow(row) { delRow(row) {
this.$confirm('是否删除', "提示", { this.$confirm('是否删除', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -262,7 +277,7 @@ export default { ...@@ -262,7 +277,7 @@ export default {
val = Number(val); val = Number(val);
switch (val) { switch (val) {
case 1: case 1:
return "无跳转" return "跳转链接"
case 2: case 2:
return "不跳转" return "不跳转"
case 3: case 3:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment