Commit 15ee21cf6ecc6ce3bb38eec34eec739699e39168

Authored by monkeyhouyi
1 parent abd11604

调查问卷,时间段选择

pages/advertisementAdd/advertisementAdd.vue
... ... @@ -8,7 +8,7 @@
8 8 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
9 9 <view class="add-list">
10 10 <u-form-item label="投放时段" prop="name" borderBottom>
11   - <u-input v-model="model1.name" ></u-input>
  11 + <u-input v-model="model1.name" type="select" @click="toChangeTime"></u-input>
12 12 </u-form-item>
13 13 </view>
14 14 <view class="add-list">
... ... @@ -187,6 +187,11 @@
187 187 url: '/pages/record/record'
188 188 })
189 189 },
  190 + toChangeTime(val) {
  191 + uni.navigateTo({
  192 + url: `/pages/advertisementTime/advertisementTime?val=${val}`
  193 + })
  194 + },
190 195 // 上一步
191 196 toBefor() {
192 197 this.active = +this.active - 1;
... ...
pages/advertisementDetail/advertisementDetail.vue
... ... @@ -71,8 +71,8 @@
71 71 <text>客服</text>
72 72 </view>
73 73 <view class="footer-btn">
74   - <u-button type="primary">意向申请</u-button>
75   - <u-button type="success" style="margin-left: unset;" @click="leaseAdd">租赁申请</u-button>
  74 + <u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')">意向申请</u-button>
  75 + <u-button type="success" style="margin-left: unset;" @click="leaseAdd('/pages/advertisementAdd/advertisementAdd')">租赁申请</u-button>
76 76 <!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
77 77 </view>
78 78 <view class="footer-service">
... ... @@ -106,11 +106,11 @@ export default {
106 106 console.log(this.tableData);
107 107 },
108 108 methods: {
109   - leaseAdd(){
110   - uni.navigateTo({
111   - url: '/pages/advertisementAdd/advertisementAdd',
112   - })
113   - }
  109 + leaseAdd(url){
  110 + uni.navigateTo({
  111 + url
  112 + })
  113 + }
114 114 }
115 115 };
116 116 </script>
... ...
pages/advertisementTime/advertisementTime.scss
... ... @@ -3,20 +3,47 @@
3 3 left: 0;
4 4 top: 0;
5 5 width: 100%;
6   - height: 100%;
  6 + overflow-y: scroll;
  7 + height: calc(100% - 120rpx);
  8 + background-color: #f6f6f6;
7 9 }
8   -.calendar {
9   - margin-top: 20rpx;
  10 +.calendar-box {
  11 + margin: 20rpx;
  12 + background-color: #fff;
  13 + border-radius: 14rpx;
  14 + overflow: hidden;
  15 + .wn-calendar {
  16 + .labels {
  17 + background-color: #fff;
  18 + }
  19 + }
  20 +}
  21 +.form-box {
  22 + padding: 0 20rpx;
  23 + .add-list{
  24 + padding: 0 4%;
  25 + background-color: #FFFFFF;
  26 + border-radius: 20rpx;
  27 + margin-top: 20rpx;
  28 + width: 100%;
  29 + }
  30 + .btns {
  31 + display: flex;
  32 + margin-top: 20rpx;
  33 + .u-btn {
  34 + padding: 0 60rpx;
  35 + }
  36 + }
10 37 }
11 38 /* 保存按钮 */
12 39 .page-footer{
13 40 position: fixed;
14 41 left: 0;
15 42 bottom: 0;
16   - display: flex;
17 43 width: 100%;
18   - height: 100rpx;
  44 + height: 120rpx;
19 45 background-color: #FFFFFF;
  46 + padding: 20rpx 20rpx;
20 47 padding-bottom: constant(safe-area-inset-bottom);
21 48 padding-bottom: env(safe-area-inset-bottom);
22 49 .footer-buy{
... ... @@ -30,7 +57,7 @@
30 57 align-items: center;
31 58 justify-content: center;
32 59 width: 100%;
33   - height: 100rpx;
  60 + height: 70rpx;
34 61 background-color: #3f9b6a;
35 62 text{
36 63 font-size: 28rpx;
... ...
pages/advertisementTime/advertisementTime.vue
1 1 <template>
2 2 <view class="page">
3   - <view class="calendar">
4   - <calendar ref="calendar" v-if="isShow" @cancel="cancel" :startDate="startDate" :height="height" :endDate="endDate" @selectDate="selectDate" :limit="limit" :bottom1="bottom1" :yimanArray="yimanArray" />
  3 + <view class="calendar-box">
  4 + <wn-calendar
  5 + ref="calendar"
  6 + :data="[{date:'2024/10/25', text:'显示文本', type: 2}]"
  7 + :isBorder="false"
  8 + :isLess="false"
  9 + :colors="['#f3a73f', '#2979ff', '#8f939c', '#18bc37', '#e43d33']"
  10 + :isEn="false"
  11 + format="/"
  12 + ></wn-calendar>
5 13 </view>
6   - <!-- 保存按钮 -->
  14 + <u-form class="form-box" labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
  15 + <view class="add-list">
  16 + <u-form-item label="开始时间" prop="val" borderBottom>
  17 + <u-input v-model="model1.val" ></u-input>
  18 + </u-form-item>
  19 + </view>
  20 + <view class="add-list">
  21 + <u-form-item label="结束时间" prop="val" borderBottom>
  22 + <u-input v-model="model1.val" ></u-input>
  23 + </u-form-item>
  24 + </view>
  25 + <view class="btns">
  26 + <u-button size="medium">1天</u-button>
  27 + <u-button size="medium">2天</u-button>
  28 + <u-button size="medium">3天</u-button>
  29 + <u-button size="medium">4天</u-button>
  30 + </view>
  31 + </u-form>
  32 + <view style="height: 120rpx;"></view>
7 33 <view class="page-footer">
8   - <view class="footer-buy" @click="advertisementAdd">
9   - <view class="cart-add">
10   - <text>下一步</text>
11   - </view>
12   - </view>
  34 + <u-button type="success">确定</u-button>
13 35 </view>
14 36 </view>
15 37 </template>
16 38  
17 39 <script>
18   - // import calendar from '@/components/fl-calendar1/fl-calendar1.vue'
19   - import calendar from '@/components/dc-calendar/dc-calendar.vue'
20   - export default {
21   - components: {
22   -
23   - calendar
24   -
25   - },
26   -
27   - data() {
28   - return {
29   - isShow:false,
30   - startDate:'', //开始日期2022-01-26
31   - endDate:'', //结束日期 2022-01-29
32   - height:600, //日历容器高度
33   - limit:12, //展示月份数量
34   - bottom1:0,
35   - yimanArray:[],
36   - dicdes:{
37   - price:1
38   - },//传过来的订单数据
39   - type:0,//1是进入订单 0是返回
40   -
41   - }
42   - },
43   - mounted() {
44   -
45   - },
46   - onUnload() {
47   - uni.setStorageSync('满日期显示',0)
48   -
49   - },
50   - onLoad(e) {
51   -
52   - uni.showLoading({
53   - title: '加载中'
54   - });
55   -
56   - let sys = uni.getSystemInfoSync();
57   - if (sys.statusBarHeight >=44) {
58   - // this.height = sys.windowHeight - 34;
59   - this.bottom1 = 34;
60   - } else{
61   - // this.height = sys.windowHeight;
62   - }
63   -
64   - // console.log(sys);
65   -
66   - var dicday = uni.getStorageSync('入离日期');
67   - if(dicday){
68   - this.startDate = dicday.startDate;
69   - this.endDate = dicday.endDate;
70   - }
71   - this.newdate();
72   -
73   - this.type = 1;
74   - // this.dicdes = JSON.parse(e.dic);
75   - uni.setStorageSync('满日期显示',1)
76   - // //取房间满房日期
77   - this.gethttpurl(this.dicdes.id);
78   -
79   -
80   -
81   - },
82   - methods: {
83   - advertisementAdd() {
84   - uni.navigateTo({
85   - url: '/pages/advertisementAdd/advertisementAdd'
86   - })
87   - },
88   - //取房间满房日期
89   - gethttpurl(id){
90   -
91   - this.yimanArray =['2022-03-25','2022-04-10'];
92   - this.isShow = true;
93   - uni.hideLoading();
94   -
95   -
96   - },
97   -
98   -
99   - // 展示选择器
100   - showCalendar() {
101   - this.isShow = true
102   - },
103   - // 隐藏选择器
104   - cancel(){
105   - this.isShow=false
106   - },
107   - // 获取传参
108   - selectDate(data) {
109   - console.log('拿到传参', data)
110   - uni.setStorageSync('入离日期',data);
111   -
112   -
113   -
114   - },
115   - // 获取当日的 年-月-日
116   - newdate() {
117   - let date = new Date()
118   - let year = date.getFullYear()
119   - let month = date.getMonth() + 1
120   - let week = date.getDay()
121   - let day = date.getDate()
122   - var days = new Date(year, month, 0).getDate(); //总共多少天
123   - // console.log(days,day);
124   - month = month < 10 ? '0' + month : month
125   - day = day < 10 ? '0' + day : day
126   - let today = `${year}-${month}-${day}`;
127   - let todayend = `${year}-${month}-${day}`;
128   - let today1 = `${month}月${day}日`;
129   - let today1end = `${month}月${day}日`;
130   - //加年
131   - if (month == 12 && parseInt(day) == parseInt(days)) {
132   -
133   - let day01 = '01';
134   - let month01 = '01';
135   - let year01 = parseInt(year) + 1;
136   - todayend = `${year01}-${month01}-${day01}`;
137   - today1end = `${year01}年${month01}月${day01}日`;
138   - } else if (parseInt(day) == parseInt(days)) {
139   - //加月
140   - let day01 = '01';
141   - let month01 = parseInt(month) + 1;
142   - month01 = month01 < 10 ? '0' + month01 : month01
143   - todayend = `${year}-${month01}-${day01}`;
144   - today1end = `${month01}月${day01}日`;
145   -
146   - } else {
147   - //加天数
148   - let day01 = parseInt(day) + 1;
149   - day01 = day01 < 10 ? '0' + day01 : day01
150   - todayend = `${year}-${month}-${day01}`;
151   - today1end = `${month}月${day01}日`;
152   - }
153   -
154   - let dicday = {
155   - startDate: today,
156   - endDate: todayend,
157   - startDate1: today1,
158   - endDate1: today1end,
159   - dayNum: '1'
160   - }
161   -
162   - this.startDate = dicday.startDate;
163   - this.endDate = dicday.endDate;
164   - uni.setStorageSync('入离日期', dicday);
165   - // console.log(this.dicday);
166   - },
167   - }
168   - }
  40 + export default {
  41 + data() {
  42 + return {
  43 + model1: {
  44 + val: '',
  45 + },
  46 + rules: {},
  47 + }
  48 + },
  49 + methods: {
  50 + // 点击日数方法
  51 + clickActive({year, month, date, index}){
  52 + console.log(year, month, date, index)
  53 + },
  54 +
  55 + // 点击任务方法
  56 + clickTask({row, index}){
  57 + console.log(row, index)
  58 + }
  59 + }
  60 + }
169 61 </script>
170 62  
171   -<style scoped lang="scss">
  63 +<style>
172 64 @import 'advertisementTime.scss';
173 65 -</style>
  66 +</style>
174 67 \ No newline at end of file
... ...
pages/createQuestionnaire/createQuestionnaire.scss
1 1 .page{
2   - padding: 20rpx 30rpx;
3   - background-color: #fff;
  2 + padding: 0 20rpx 20rpx;
  3 + background-color: #f6f6f6;
4 4 font-size: 24rpx;
5 5 font-weight: 500;
6 6 position: relative;
7   - .titles{
8   - display: flex;
9   - justify-content: space-between;
10   - margin-bottom: 30rpx;
11   - }
12   - .uni-textarea{
13   -
14   - padding: 20rpx 30rpx;
15   - min-height: 50rpx;
16   - font-size: 24rpx;
17   - background-color: #EFEFEF;
18   - /deep/ uni-textarea{
19   - height: 180rpx;
20   - }
21   - /deep/.textarea{
22   - width: 100%;
23   - font-size: 24rpx;
24   -
25   - }
  7 + .form-box {
  8 + padding: 0 4%;
  9 + background-color: #FFFFFF;
  10 + border-radius: 20rpx;
  11 + margin-top: 20rpx;
  12 + width: 100%;
26 13 }
27   - .listCont{
28   - margin-top: 60rpx;
29   - .listTitile{
30   - margin-bottom: 20rpx;
31   - }
32   - .uni-input{
33   - background-color: #E0E0E0;
34   - margin-bottom: 20rpx;
35   - height: 80rpx;
36   - padding: 10rpx 20rpx;
37   - font-size: 24rpx;
  14 + .select-item {
  15 + background-color: #FFFFFF;
  16 + border-radius: 20rpx;
  17 + margin-top: 20rpx;
  18 + width: 100%;
  19 + .top {
  20 + padding: 22rpx 4%;
  21 + .title {
  22 + font-size: 30rpx;
  23 + margin-bottom: 20rpx;
  24 + }
  25 + .radio-box {
  26 + font-size: 24rpx;
  27 + color: #7c7c7c;
  28 + }
38 29 }
39   - .btnList{
  30 + .bottom {
  31 + padding: 20rpx 4%;
40 32 display: flex;
41   - flex-wrap: wrap;
42   - font-weight: 200;
43   - background-color: #E0E0E0;
44   - padding: 14rpx 14rpx;
45   - justify-content: space-between;
46   - /deep/ uni-button{
  33 + background-color: #EDFFF5;
  34 + border: #0FBB59 solid 1rpx;
  35 + border-radius: 0 0 20rpx 20rpx;
  36 + .u-btn {
47 37 width: 18%;
48   - height:45rpx;
49   - font-size: 24rpx;
50   - border-radius:none;
51   - line-height: 45rpx;
  38 + }
  39 + :first-child {
  40 + margin-left: 0;
  41 + }
  42 + :last-child {
  43 + margin-right: 0;
52 44 }
53 45 }
54 46 }
55   - .page_foot{
  47 + .page-footer{
56 48 position: fixed;
  49 + left: 0;
57 50 bottom: 0;
58   - left: 0;
  51 + display: flex;
  52 + flex-direction: row;
  53 + align-items: center;
  54 + justify-content: space-between;
59 55 width: 100%;
60   - z-index: 10;
61   - .foot_btnList{
62   - display: flex;
63   - flex-wrap: wrap;
64   - font-weight: 200;
65   - padding: 14rpx 30rpx;
66   - justify-content: space-between;
67   - /deep/ uni-button{
68   - width: 21%;
69   - height:70rpx;
70   - font-size: 24rpx;
71   - border-radius:none;
72   - line-height: 70rpx;
73   - }
  56 + height: 120rpx;
  57 + background-color: #FFFFFF;
  58 + padding-bottom: constant(safe-area-inset-bottom);
  59 + padding-bottom: env(safe-area-inset-bottom);
  60 + .u-btn {
  61 + width: 30%;
  62 + }
  63 + .u-icon {
  64 + margin-right: 10rpx;
74 65 }
75 66 }
76 67 }
77 68 \ No newline at end of file
... ...
pages/createQuestionnaire/createQuestionnaire.vue
1 1 <template>
2 2 <view class="page">
3   - <view class="" style="margin-top: 20rpx;">
4   - <view class="titles">
5   - <view>问卷名称</view>
6   - <view>这里有名称</view>
7   - </view>
8   - <view class="" style="margin-bottom: 20rpx;">
9   - 问卷说明
  3 + <u-form :model="form" ref="uForm" :label-width="120">
  4 + <view class="form-box">
  5 + <u-form-item label="问卷名称"><u-input v-model="form.name" /></u-form-item>
10 6 </view>
11   - <view class="uni-textarea">
12   - <textarea placeholder-style="color:#A2A2A2" placeholder="请输入" placeholder-class="textarea"/>
13   - </view>
14   - <view class="listCont">
15   - <view class="listTitile">
16   - 1.这里有标题
17   - </view>
18   - <view class="">
19   - <radio-group>
20   - <view> <label class="radio"><radio value="r1" checked="true" style="transform:scale(0.5)"/>这里有选项这里有选项</label></view>
21   - <view><label class="radio"><radio value="r2" style="transform:scale(0.5)" />这里有选项这里有选项</label></view>
22   - </radio-group>
23   -
24   - </view>
25   - <view style="margin: 20rpx 0;">
26   - <view class="btnList">
27   - <button>编辑</button><button>复制</button><button>上移</button><button>下移</button><button>删除</button>
28   - </view>
29   - </view>
  7 + <view class="form-box">
  8 + <u-form-item label="问卷说明" label-position="top"><u-input v-model="form.name" type="textarea"/></u-form-item>
30 9 </view>
31   - <view class="listCont">
32   - <view class="listTitile">
33   - 1.这里有标题
34   - </view>
35   - <view class="" style="padding:0 20rpx;">
36   - <input class="uni-input" placeholder="请输入" />
37   - </view>
38   - <view>
39   - <view class="btnList">
40   - <button>编辑</button><button>复制</button><button>上移</button><button>下移</button><button>删除</button>
  10 + <view class="select-item" v-for="i in 2" :key="2">
  11 + <view class="top">
  12 + <view class="title">
  13 + 1.这里有标题这里有标题这里有标题
41 14 </view>
  15 + <u-radio-group class="radio-box">
  16 + <u-radio shape="circle">这里有选项这里有选项</u-radio>
  17 + <u-radio shape="circle">这里有选项这里有选项</u-radio>
  18 + </u-radio-group>
42 19 </view>
43   - </view>
44   - <view class="page_foot">
45   -
46   - <view class="foot_btnList">
47   - <button>添加题目</button><button>设置</button><button>预览</button><button>提交</button>
  20 + <view class="bottom">
  21 + <u-button type="primary" size="mini">编辑</u-button>
  22 + <u-button type="success" size="mini">复制</u-button>
  23 + <u-button type="success" size="mini">上移</u-button>
  24 + <u-button type="success" size="mini">下移</u-button>
  25 + <u-button type="error" size="mini">删除</u-button>
48 26 </view>
49 27 </view>
50   - </view>
51   -
  28 + </u-form>
  29 + <view class="page-footer">
  30 + <u-button type="info"><u-icon name="setting"></u-icon>设置</u-button>
  31 + <u-button type="info"><u-icon name="eye"></u-icon>预览</u-button>
  32 + <u-button type="success"><u-icon name="checkmark-circle"></u-icon>提交</u-button>
  33 + </view>
52 34 </view>
53 35 </template>
54 36  
... ... @@ -56,6 +38,9 @@
56 38 export default {
57 39 data() {
58 40 return {
  41 + form: {
  42 + name: '',
  43 + },
59 44 value:0
60 45 };
61 46 },
... ...
pages/questionnaire/questionnaire.vue
... ... @@ -31,7 +31,7 @@
31 31 </view>
32 32 <view style="height: 120rpx;"></view>
33 33 <view class="page-footer">
34   - <u-button type="success" @click="toAdd">创建问卷</u-button>
  34 + <u-button type="success" @click="createWen">创建问卷</u-button>
35 35 </view>
36 36 </view>
37 37 </template>
... ... @@ -79,9 +79,6 @@
79 79 this.search();
80 80 },
81 81 search() {},
82   - toAdd() {
83   -
84   - },
85 82 createWen(){
86 83 uni.navigateTo({
87 84 url: '/pages/createQuestionnaire/createQuestionnaire'
... ...