diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index bd810bb..01aafad 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -20,26 +20,26 @@ { index: 0, name: '首页', - img: `${this.$imgs}/tabbar/tab_01.png`, - acImg: `${this.$imgs}/tabbar/tab_02.png`, + img: '/static/tabbar/tab_01.png', + acImg: '/static/tabbar/tab_02.png', }, { index: 1, name: '工作台', - img: `${this.$imgs}/tabbar/tab_03.png`, - acImg: `${this.$imgs}/tabbar/tab_04.png` + img: '/static/tabbar/tab_03.png', + acImg:'/static/tabbar/tab_04.png' }, { index: 2, name: '消息', - img: `${this.$imgs}/tabbar/tab_05.png`, - acImg: `${this.$imgs}/tabbar/tab_06.png` + img: '/static/tabbar/tab_05.png', + acImg: '/static/tabbar/tab_06.png' }, { index: 3, name: '我的', - img: `${this.$imgs}/tabbar/tab_07.png`, - acImg:`${this.$imgs}/tabbar/tab_08.png` + img: '/static/tabbar/tab_07.png', + acImg:'/static/tabbar/tab_08.png' }, ], codeheight: 0, diff --git a/main.js b/main.js index 9bff4d6..6b42b04 100644 --- a/main.js +++ b/main.js @@ -9,11 +9,13 @@ import DialogBox from './components/DialogBox/DialogBox'; Vue.config.productionTip = false Vue.prototype.$http = http -Vue.prototype.$imgs = 'http://8.130.38.56:8027/local/file/static' +Vue.prototype.$imgUrl = (url) => { + return ("http://8.130.38.56:8027/local/file/static" + url); +}; + // 全局组件 Vue.component('DialogBox', DialogBox); - //mescroll import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue" import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue" diff --git a/pages.json b/pages.json index 73ff9e6..f499329 100644 --- a/pages.json +++ b/pages.json @@ -211,10 +211,14 @@ "navigationBarTitleText": "销售统计", "navigationBarBackgroundColor": "#FFFFFF" } + }, + { + "path": "pages/Iproposal/Iproposal", + "style": { + "navigationBarTitleText": "招商方案", + "navigationBarBackgroundColor": "#FFFFFF" + } } - - - ], "globalStyle": { "navigationBarTextStyle": "black" diff --git a/pages/Iproposal/Iproposal.scss b/pages/Iproposal/Iproposal.scss new file mode 100644 index 0000000..a9722a7 --- /dev/null +++ b/pages/Iproposal/Iproposal.scss @@ -0,0 +1,122 @@ +.page{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: #f6f6f6; +} + +.add-list{ + padding: 0 4%; + background-color: #FFFFFF; + border-radius: 20rpx; + margin-top: 20rpx; + width: 100%; + padding-bottom: 150rpx; + .list{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + height: 100rpx; + border-bottom: 2rpx solid #f6f6f6; + .title{ + display: flex; + align-items: center; + height: 100%; + text{ + font-size: 26rpx; + color: #222222; + } + .star{ + color: red; + } + } + .content{ + display: flex; + align-items: center; + text-align: right; + input{ + width: 100%; + color: #222222; + font-size: 26rpx; + padding-top: 6rpx; + /* #ifdef MP */ + padding-top: 5rpx; + /* #endif */ + } + image { + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; + /* #ifdef MP */ + margin-top: 5rpx; + /* #endif */ + } + } + } +} + +/* 保存按钮 */ +.page-footer{ + position: fixed; + left: 0; + bottom: 0; + display: flex; + width: 100%; + height: 100rpx; + background-color: #FFFFFF; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .footer-buy{ + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + height: 100%; + .cart-add{ + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 100rpx; + background-color: #3f9b6a; + text{ + font-size: 28rpx; + color: #FFFFFF; + } + } + } +} + +.feedback-data{ + width: 100%; + padding-bottom: 20rpx; + border-bottom: 2rpx solid #f6f6f6; + .title{ + display: flex; + align-items: center; + height: 100rpx; + text{ + font-size: 26rpx; + color: #222222; + } + .star{ + color: red; + } + } + .voucher-img{ + display: flex; + align-items: center; + .voucher-list { + width: 33%; + height: 100%; + image{ + width: 160rpx; + height: 160rpx; + border-radius: 10rpx; + } + } + } +} \ No newline at end of file diff --git a/pages/Iproposal/Iproposal.vue b/pages/Iproposal/Iproposal.vue new file mode 100644 index 0000000..adefbbc --- /dev/null +++ b/pages/Iproposal/Iproposal.vue @@ -0,0 +1,390 @@ + + + + + \ No newline at end of file diff --git a/pages/accepting/accepting.vue b/pages/accepting/accepting.vue index 8183629..a7f443f 100644 --- a/pages/accepting/accepting.vue +++ b/pages/accepting/accepting.vue @@ -6,7 +6,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -83,8 +83,8 @@ 身份证正反面 - - + + diff --git a/pages/activityAdd/activityAdd.vue b/pages/activityAdd/activityAdd.vue index 89bea2c..c19be51 100644 --- a/pages/activityAdd/activityAdd.vue +++ b/pages/activityAdd/activityAdd.vue @@ -44,7 +44,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/pages/advertisement/advertisement.scss b/pages/advertisement/advertisement.scss index ef40b5d..033edf7 100644 --- a/pages/advertisement/advertisement.scss +++ b/pages/advertisement/advertisement.scss @@ -89,10 +89,10 @@ .thumb{ display: flex; align-items: center; - width: 20%; + width: 30%; image{ - width: 130rpx; - height: 280rpx; + width: 100%; + // height: 280rpx; } } .item{ @@ -120,6 +120,9 @@ .goods-list-txt { width: 50%; padding-right: 2%; + white-space: nowrap; /* 防止文本换行 */ + overflow: hidden; /* 隐藏溢出的文本 */ + text-overflow: ellipsis; /* 添加省略号 */ } } .goods-btn { diff --git a/pages/advertisement/advertisement.vue b/pages/advertisement/advertisement.vue index 100266f..70bea31 100644 --- a/pages/advertisement/advertisement.vue +++ b/pages/advertisement/advertisement.vue @@ -16,11 +16,11 @@ 类型 - + 租金 - + 筛选 - + @@ -37,7 +37,7 @@ - + @@ -46,19 +46,20 @@ 轮播顺序:{{item.rotationOrder}} - 所属移动端:{{item.affiliation}} + 所属移动端:{{item.affiliation}} 投放定价:100元/天 - 历史平均点击率:80% + 历史平均点击率:80% 高频时段:18:00 - 20:00 - 单次可租赁时间:1天 + 单次可租赁时间:1天 - 可租赁时段 + 可租赁时段 + diff --git a/pages/advertisementAdd/advertisementAdd.vue b/pages/advertisementAdd/advertisementAdd.vue index bc72e7f..56e63a5 100644 --- a/pages/advertisementAdd/advertisementAdd.vue +++ b/pages/advertisementAdd/advertisementAdd.vue @@ -51,7 +51,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/pages/apply/apply.vue b/pages/apply/apply.vue index a7c2054..0f6197d 100644 --- a/pages/apply/apply.vue +++ b/pages/apply/apply.vue @@ -4,7 +4,7 @@ 记录查询 租赁申请记录 - + @@ -25,7 +25,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/pages/applyDetail/applyDetail.vue b/pages/applyDetail/applyDetail.vue index 579e091..ca179cc 100644 --- a/pages/applyDetail/applyDetail.vue +++ b/pages/applyDetail/applyDetail.vue @@ -71,8 +71,8 @@ - - + + diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue index f04f1a8..82af1eb 100644 --- a/pages/complaint/complaint.vue +++ b/pages/complaint/complaint.vue @@ -28,7 +28,7 @@ - + diff --git a/pages/details/details.vue b/pages/details/details.vue index 4f78a31..f242632 100644 --- a/pages/details/details.vue +++ b/pages/details/details.vue @@ -87,7 +87,7 @@ export default { { id: 0, type: 'image', - url: `${this.$imgs}/img/1.jpg` + url: this.$imgUrl('/img/1.jpg') } ], }; diff --git a/pages/field/field.scss b/pages/field/field.scss index d17a7f6..7aeb72c 100644 --- a/pages/field/field.scss +++ b/pages/field/field.scss @@ -15,10 +15,8 @@ display: flex; align-items: center; width: 100%; - padding: 0 10rpx; height: 72rpx; - background-color: #fff; - border: 2rpx solid #E8E8E8; + // border: 2rpx solid #E8E8E8; border-radius: 100rpx; .icon{ display: flex; diff --git a/pages/field/field.vue b/pages/field/field.vue index a365d26..ed71a0f 100644 --- a/pages/field/field.vue +++ b/pages/field/field.vue @@ -2,40 +2,42 @@ + - - + + 区域 - + 租金 - + 默认排序 - + 筛选 - + - + - + @@ -46,7 +48,7 @@ 标签标签 - + 这里有地址这里有地址这里有地址这里有地址