diff --git a/pages.json b/pages.json index 0169bef..879c31e 100644 --- a/pages.json +++ b/pages.json @@ -53,6 +53,12 @@ "navigationBarBackgroundColor": "#FFFFFF" } },{ + "path": "pages/advertisementDetail/advertisementDetail", + "style": { + "navigationBarTitleText": "详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + },{ "path": "pages/advertisement/advertisement", "style": { "navigationBarTitleText": "租广告", @@ -103,7 +109,7 @@ },{ "path": "pages/advertisementAdd/advertisementAdd", "style": { - "navigationBarTitleText": "申请", + "navigationBarTitleText": "广告申请", "navigationBarBackgroundColor": "#FFFFFF" } }, diff --git a/pages/activityAdd/activityAdd.vue b/pages/activityAdd/activityAdd.vue index fe5a1a6..7e8f7f3 100644 --- a/pages/activityAdd/activityAdd.vue +++ b/pages/activityAdd/activityAdd.vue @@ -31,7 +31,6 @@ @@ -69,6 +68,8 @@ }, typeShow: false, typeList: [{ value: '1', label: '类型1' }, { value: '2', label: '类型2' }], + readOnly: false, + formats: {} }; }, methods:{ @@ -93,7 +94,7 @@ }, typeChange(val) { this.form.type = val[0].name; - } + }, } } diff --git a/pages/advertisement/advertisement.scss b/pages/advertisement/advertisement.scss index 033edf7..ffc0f69 100644 --- a/pages/advertisement/advertisement.scss +++ b/pages/advertisement/advertisement.scss @@ -6,49 +6,28 @@ height: 100%; } .head-search{ - display: flex; - align-items: center; - justify-content: space-between; + display: flex; + align-items: center; + justify-content: space-between; + position: relative; + margin: 20rpx 0; + background-color: #FFFFFF; + border-radius: 35rpx; + padding: 0 10rpx; + border: 2rpx solid #E8E8E8; + margin: 22rpx 24rpx; + .u-search { position: relative; - margin: 20rpx; - .search{ - display: flex; - align-items: center; - width: 100%; - height: 72rpx; - // border: 2rpx solid #E8E8E8; - border-radius: 100rpx; - .icon{ - display: flex; - align-items: center; - margin-left: 20rpx; - margin-right: 15rpx; - image{ - width: 29rpx; - height: 29rpx; - } - } - .hint{ - display: flex; - align-items: center; - position: relative; - width: 100%; - .max{ - font-size: 26rpx; - color: #fff; - background-color:#3F9B6A; - border-radius: 100rpx; - padding: 10rpx 25rpx; - position: absolute; - right: 0; - } - .min{ - font-size: 26rpx; - color: #B5B5B5; - } - } - } } + .u-btn { + border: unset; + border: 0px transparent; + height: 46rpx; + width: 88rpx; + font-size: 24rpx; + border-radius: 35rpx; + } +} /* 订单列表 */ .screen-list { display: flex; @@ -85,11 +64,14 @@ padding: 0 25rpx; .list{ display: flex; - margin-bottom: 40rpx; + margin-bottom: 20rpx; + background-color: #fff; + padding: 14rpx; + border-radius: 14rpx; .thumb{ display: flex; align-items: center; - width: 30%; + width: 20vw; image{ width: 100%; // height: 280rpx; diff --git a/pages/advertisement/advertisement.vue b/pages/advertisement/advertisement.vue index 70bea31..3756abb 100644 --- a/pages/advertisement/advertisement.vue +++ b/pages/advertisement/advertisement.vue @@ -2,21 +2,14 @@ - - - - + + 搜索 - + 类型 - + + 租金 @@ -35,9 +28,10 @@ - + - + + @@ -50,17 +44,9 @@ 投放定价:100元/天 - 历史平均点击率:80% - - - 高频时段:18:00 - 20:00 单次可租赁时间:1天 - - 可租赁时段 - - @@ -73,13 +59,21 @@ data() { return { tableData: [], + query: { + keyword: '', + advertisingType: '', + }, pageindex: { pageNumber: 1, pageSize: 10, - advertisingType:'线上广告位' }, - keyword:'', + typeshow: false, + typeList: [ + { value: '线上广告位', label: '线上广告位'}, + { value: '实体广告位', label: '实体广告位'}, + ], show:false, + companys:[ { value: '1', @@ -96,23 +90,41 @@ this.getAll() }, methods: { - advertisementTime() { - uni.navigateTo({ - url: '/pages/advertisementTime/advertisementTime' - }) - }, //查询全数据 - getAll() { - - this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', this.pageindex,1).then(res => { - //成功回调 - this.tableData = res.data.data.content - console.log(res.data.data.content) - }).catch(err => { - console.log(err) + getAll() { + let query = Object.assign(this.pageindex, this.query); + this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', query, 1).then(res => { + //成功回调 + this.tableData = res.data.data.content; + }).catch(err => { + console.log(err) //请求失败 - }) + }) + }, + search() { + this.pageindex = { + pageNumber: 1, + pageSize: 10, + }; + this.getAll(); + }, + queryChange(key, val) { + this.query[`${key}`] = val[0].value; + this.search(); + }, + toDetail(item) { + let items = JSON.stringify(item) + uni.navigateTo({ + url: `/pages/advertisementDetail/advertisementDetail?item=${items}` + }) }, + + + // advertisementTime() { + // uni.navigateTo({ + // url: '/pages/advertisementTime/advertisementTime' + // }) + // }, setList(val){ console.log(val) if(val == 0){ diff --git a/pages/advertisementAdd/advertisementAdd.scss b/pages/advertisementAdd/advertisementAdd.scss index 0143cde..d50de53 100644 --- a/pages/advertisementAdd/advertisementAdd.scss +++ b/pages/advertisementAdd/advertisementAdd.scss @@ -3,9 +3,13 @@ left: 0; top: 0; width: 100%; - height: 100%; + overflow-y: scroll; + height: calc(100% - 120rpx); background-color: #f6f6f6; } +.steps-box { + padding-top: 40rpx; +} .add-list{ padding: 0 4%; @@ -55,6 +59,38 @@ } } } + .deom-box { + width: 100vw; + display: flex !important; + padding: 14rpx 0; + background-color: #FFFFFF; + border-radius: 9px; + // margin-top: 9px; + width: 100%; + // .u-upload { + // .u-add-wrap { + // width: 304rpx !important; + // height: 182rpx !important; + // } + // } + // .u-upload { + // height: 88px; + // width: 155px; + // background: url(/static/images/uploadID1.png); + // background-size:134rpx 188rpx; + // background-repeat:no-repeat; + // } + .img-deom { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + padding: 20rpx; + text { + margin-top: 18rpx; + } + } + } } /* 保存按钮 */ @@ -63,8 +99,9 @@ left: 0; bottom: 0; display: flex; + align-items: center; width: 100%; - height: 100rpx; + height: 125rpx; background-color: #FFFFFF; padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); @@ -89,37 +126,6 @@ } } -.page-footera { - position: fixed; - left: 0; - bottom: 100rpx; - display: flex; - width: 100%; - height: 100rpx; - background-color: #FFFFFF; - .footer-buya{ - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - padding: 0 30rpx; - .cart-adda{ - display: flex; - align-items: center; - justify-content: center; - text{ - font-size: 28rpx; - } - } - .cart-addb { - text{ - font-size: 28rpx; - font-weight: bold; - } - } - } -} - .feedback-data{ width: 100%; padding-bottom: 20rpx; diff --git a/pages/advertisementAdd/advertisementAdd.vue b/pages/advertisementAdd/advertisementAdd.vue index 56e63a5..7c7459c 100644 --- a/pages/advertisementAdd/advertisementAdd.vue +++ b/pages/advertisementAdd/advertisementAdd.vue @@ -1,117 +1,130 @@ @@ -120,29 +133,53 @@ export default { data() { return { + active: 2, + numList: [{name: '租赁信息'}, {name: '主体信息'}, {name: '经营者信息'}], + model1: { + name: '', + type: '', + typeShow: false, + fileList: [], // 文件列表 + }, + rules: {}, + // 类型 + showType: false, + activesType: [ + {value: 1, label: '类型1'}, + {value: 2, label: '类型2'}, + ], + // 上传文件 + active: '', // 地址 }; }, - onShow() { - - - }, + onLoad() { + // 检查用户是否登录 + const isLogin = uni.getStorageSync('token') || false; + if (!isLogin) { + // 如果未登录,跳转到登录页面 + uni.redirectTo({ + url: '/pages/login/login' + }); + } + }, methods:{ - shenq(){ - const isLogin = uni.getStorageSync('token') || false; - if (!isLogin) { - // 如果未登录,跳转到登录页面 - uni.navigateTo({ - url: '/pages/login/login', - }) - }else{ - uni.navigateTo({ - url: '/pages/servicerecords/servicerecords', - }) - } - + typeChange(e) { + this.model1.type = e[0].label; + }, + go(){ + uni.navigateTo({ + url: '/pages/record/record' + }) + }, + // 上一步 + toBefor() { + this.active = +this.active - 1; + }, + // 下一步 + toNext() { + this.active = +this.active + 1; } - } } diff --git a/pages/details/details.scss b/pages/details/details.scss index 398c698..7172075 100644 --- a/pages/details/details.scss +++ b/pages/details/details.scss @@ -30,10 +30,12 @@ } .banner-item-form { .form-item { + line-height: 30rpx; + font-size: 24rpx; display: flex; justify-content: flex-start; align-items: top; - padding: 8rpx 0; + padding: 14rpx 0; } } &:last-child { diff --git a/pages/details/details.vue b/pages/details/details.vue index 0089a9b..b15ebe9 100644 --- a/pages/details/details.vue +++ b/pages/details/details.vue @@ -20,33 +20,41 @@