antissoft / antis-greenway

Commit 00e7322c4bf5fea064dc145263fd6dfe92e6ef17

Authored by monkeyhouyi
1 parent caf58d15

我的活动申请

Inline Side-by-side
Showing 12 changed files with 200 additions and 144 deletions
pages.json
  View file @00e7322
@@ -132,8 +132,9 @@ @@ -132,8 +132,9 @@
132 { 132 {
133 "path": "pages/mycreated/mycreated", 133 "path": "pages/mycreated/mycreated",
134 "style": { 134 "style": {
135 - "navigationBarTitleText": "我创建的活动",  
136 - "navigationBarBackgroundColor": "#FFFFFF" 135 + "navigationBarTitleText": "我的活动申请",
  136 + "navigationBarBackgroundColor": "#FFFFFF",
  137 + "enablePullDownRefresh": true
137 } 138 }
138 }, 139 },
139 { 140 {
pages/mycreated/mycreated.scss
  View file @00e7322
@@ -4,38 +4,37 @@ @@ -4,38 +4,37 @@
4 top: 0; 4 top: 0;
5 width: 100%; 5 width: 100%;
6 min-height: 100vh; 6 min-height: 100vh;
  7 + // padding: 0 40rpx;
  8 + // background-color: #fff;
  9 +}
  10 +.tabs-box {
  11 + width: 100%;
7 padding: 0 40rpx; 12 padding: 0 40rpx;
8 background-color: #fff; 13 background-color: #fff;
9 } 14 }
10 .head-search{ 15 .head-search{
11 - display: flex;  
12 - align-items: center;  
13 - justify-content: space-between; 16 + display: flex;
  17 + align-items: center;
  18 + justify-content: space-between;
  19 + position: relative;
  20 + margin: 20rpx 0;
  21 + background-color: #FFFFFF;
  22 + border-radius: 35rpx;
  23 + padding: 0 10rpx;
  24 + border: 2rpx solid #E8E8E8;
  25 + margin: 22rpx 24rpx;
  26 + .u-search {
14 position: relative; 27 position: relative;
15 - margin: 20rpx 0;  
16 - .search{  
17 -  
18 - display: flex;  
19 - align-items: center;  
20 - width: 100%;  
21 - height: 72rpx;  
22 -  
23 - border: 2rpx solid #E8E8E8;  
24 - justify-content: space-between;  
25 - padding: 0 10rpx 0 30rpx;  
26 - .icon{  
27 - display: flex;  
28 - align-items: center;  
29 - margin-left: 20rpx;  
30 - margin-right: 15rpx;  
31 - image{  
32 - width: 29rpx;  
33 - height: 29rpx;  
34 - }  
35 - }  
36 -  
37 - }  
38 } 28 }
  29 + .u-btn {
  30 + border: unset;
  31 + border: 0px transparent;
  32 + height: 46rpx;
  33 + width: 88rpx;
  34 + font-size: 24rpx;
  35 + border-radius: 35rpx;
  36 + }
  37 +}
39 /* 订单列表 */ 38 /* 订单列表 */
40 .screen-list{ 39 .screen-list{
41 display: flex; 40 display: flex;
@@ -55,48 +54,63 @@ @@ -55,48 +54,63 @@
55 54
56 .goods-data{ 55 .goods-data{
57 width: 100%; 56 width: 100%;
  57 + padding: 0 24rpx;
58 .goods-list{ 58 .goods-list{
59 width: 100%; 59 width: 100%;
60 -  
61 - .list{  
62 - display: flex;  
63 - margin-bottom: 40rpx;  
64 - .thumb{  
65 - // display: flex;  
66 - // align-items: center;  
67 - width: 36%;  
68 - image{  
69 - width: 230rpx;  
70 - height: 240rpx; 60 + .good-item {
  61 + width: 100%;
  62 + background-color: #FFFFFF;
  63 + border-radius: 10rpx;
  64 + margin-bottom: 24rpx;
  65 + .body {
  66 + display: flex;
  67 + width: 100%;
  68 + height: calc(100% - 70rpx);
  69 + padding: 15rpx 18rpx;
  70 + image {
  71 + width: 190rpx;
  72 + height: 190rpx;
  73 + margin-right: 26rpx;
71 border-radius: 10rpx; 74 border-radius: 10rpx;
72 } 75 }
73 - }  
74 -  
75 - .item{  
76 - width: 60%;  
77 - margin-left: 4%;  
78 - .title{  
79 - display: flex;  
80 - align-items: center;  
81 - width: 100%;  
82 - margin: 10rpx 0;  
83 - .color{  
84 - color: #A8A8A8; 76 + .info {
  77 + width: calc(100% - 236rpx);
  78 + .title {
  79 + width: 100%;
  80 + font-size: 28rpx;
  81 + line-height: 40rpx;
  82 + font-weight: 700;
  83 + white-space: nowrap;
  84 + overflow : hidden;
  85 + text-overflow: ellipsis;
  86 + margin-bottom: 2rpx;
  87 + }
  88 + .info-items {
  89 + .info-item {
  90 + display: flex;
  91 + flex-direction: row;
  92 + align-items: center;
  93 + line-height: 30rpx;
  94 + margin-top: 16rpx;
  95 + font-size: 26rpx;
  96 + .label {
  97 + color: #676767;
  98 + }
  99 + text {
  100 + font-weight: 700;
  101 + }
  102 + }
85 } 103 }
86 } 104 }
87 -  
88 - text{  
89 - font-size: 30rpx;  
90 - // font-weight: bold;  
91 - color: #222222; 105 + }
  106 + .footer {
  107 + background-color: #EEEEEE;
  108 + padding: 10rpx 18rpx;
  109 + border-radius: 0 0 10rpx 10rpx;
  110 + .u-btn {
  111 + margin-right: 22rpx;
92 } 112 }
93 -  
94 } 113 }
95 -  
96 - }  
97 - .goods-border{  
98 - padding: 30rpx;  
99 - border: 1px solid #F3F3F3;  
100 } 114 }
101 } 115 }
102 .canyu{ 116 .canyu{
@@ -127,13 +141,17 @@ @@ -127,13 +141,17 @@
127 } 141 }
128 } 142 }
129 } 143 }
130 -/* 保存按钮 */  
131 .page-footer{ 144 .page-footer{
  145 + position: fixed;
  146 + left: 0;
  147 + bottom: 0;
132 width: 100%; 148 width: 100%;
  149 + height: 120rpx;
133 background-color: #FFFFFF; 150 background-color: #FFFFFF;
  151 + padding: 20rpx 20rpx;
134 padding-bottom: constant(safe-area-inset-bottom); 152 padding-bottom: constant(safe-area-inset-bottom);
135 padding-bottom: env(safe-area-inset-bottom); 153 padding-bottom: env(safe-area-inset-bottom);
136 - margin:40rpx 0 40rpx 0; 154 + z-index: 999;
137 .footer-buy{ 155 .footer-buy{
138 display: flex; 156 display: flex;
139 align-items: center; 157 align-items: center;
@@ -153,4 +171,4 @@ @@ -153,4 +171,4 @@
153 } 171 }
154 } 172 }
155 } 173 }
156 -} 174 -}
  175 +}
157 \ No newline at end of file 176 \ No newline at end of file
pages/mycreated/mycreated.vue
  View file @00e7322
1 <template> 1 <template>
2 <view class="page"> 2 <view class="page">
  3 + <view class="tabs-box">
  4 + <u-tabs-swiper ref="tabs" :current="current" :list="tabList" @change="tabsChange" :is-scroll="false" :font-size="24" active-color="#0FBB59" :height="70"></u-tabs-swiper>
  5 + </view>
3 <!-- 搜索 --> 6 <!-- 搜索 -->
4 <view class="head-search"> 7 <view class="head-search">
5 - <view class="search">  
6 - <input class="uni-input" placeholder="请输入关键词" />  
7 - <view class="icon">  
8 - <image :src="$imgUrl('/search.png')" ></image>  
9 - </view>  
10 -  
11 - </view>  
12 - </view>  
13 - <!-- 创建按钮 -->  
14 - <!-- <view class="page-footer" @click="createWen">  
15 - <view class="footer-buy">  
16 - <view class="cart-add">  
17 - <text>创建活动</text>  
18 - </view>  
19 - </view>  
20 - </view> -->  
21 -  
22 - <view class="screen-list">  
23 - <view :class="listIn == index ?'color':''" @click="sel(index)" v-for="(item,index) in shenlist">{{item}}</view> 8 + <u-search bg-color="#fff" placeholder="请输入关键词" v-model="query.keyword" :show-action="false" @search="search"></u-search>
  9 + <u-button type="success" @click="search">搜索</u-button>
24 </view> 10 </view>
25 - <!-- 订单列表 -->  
26 <view class="goods-data"> 11 <view class="goods-data">
27 <view class="goods-list"> 12 <view class="goods-list">
28 - <view class="goods-border" v-for="(item,index) in num" :key="index">  
29 - <view class="list ">  
30 - <view class="thumb">  
31 - <image :src="$imgUrl('/img/2.jpg')" ></image>  
32 - </view>  
33 - <view class="item">  
34 - <view class="">  
35 - <text class="one-omit">名称：绿道好物节</text>  
36 - </view>  
37 - <view class="title">  
38 - <text class="one-omit color">活动时间：2024-10-10至2024-10-20</text>  
39 - </view>  
40 - <view class="title">  
41 - <text class="one-omit color">参与商家：1人</text>  
42 - </view>  
43 - <view class="title">  
44 - <text class="one-omit color">活动状态：待开始</text>  
45 - </view>  
46 - <view class="title">  
47 - <text class="one-omit color">举办方：绿道</text> 13 + <view class="good-item" v-for="(v, i) in datalist" :key="i">
  14 + <view class="body">
  15 + <image :src="$imgUrl('/img/2.jpg')" ></image>
  16 + <view class="info">
  17 + <view class="title">这里有标题这里有标题这里有标题这里有标题</view>
  18 + <view class="info-items">
  19 + <view class="info-item">
  20 + <view class="label">活动时间：</view>
  21 + <text>2022.22.22</text>
  22 + </view>
  23 + <view class="info-item">
  24 + <view class="label">参与商家：</view>
  25 + <text>6人</text>
  26 + </view>
  27 + <view class="info-item">
  28 + <view class="label">活动状态：</view>
  29 + <text>待审核</text>
  30 + </view>
48 </view> 31 </view>
49 </view> 32 </view>
50 </view> 33 </view>
51 - <view class="canyu">  
52 - <view class="bj">编辑</view>  
53 - <view class="tij">提交审核</view>  
54 - <view class="xq">查看详情</view>  
55 - <view class="close">取消</view>  
56 - </view> 34 + <view class="footer">
  35 + <u-button type="primary" size="mini">编辑</u-button>
  36 + <u-button type="success" size="mini">提交审核</u-button>
  37 + <u-button type="success" size="mini">查看详情</u-button>
  38 + <u-button type="info" size="mini">撤回</u-button>
  39 + </view>
57 </view> 40 </view>
58 - 41 + <u-loadmore :status="statuslist" @loadmore='loading' style="width: 100%; text-align: center;"/>
59 </view> 42 </view>
60 </view> 43 </view>
  44 + <view style="height: 120rpx;"></view>
  45 + <view class="page-footer">
  46 + <u-button type="success" @click="toAdd">活动申请</u-button>
  47 + </view>
61 </view> 48 </view>
62 </template> 49 </template>
63 50
@@ -65,22 +52,74 @@ @@ -65,22 +52,74 @@
65 export default { 52 export default {
66 data() { 53 data() {
67 return { 54 return {
68 - shenlist:['全部','待提交','待审核','通过','驳回','进行中','已结束'], 55 + tabList:[
  56 + { name: '全部' },
  57 + { name: '待提交' },
  58 + { name: '待审核' },
  59 + { name: '通过' },
  60 + { name: '驳回' },
  61 + { name: '进行中' },
  62 + { name: '已结束' },
  63 + ],
  64 + current: 0,
  65 + datalist: [{}],
  66 + total: 2,
  67 + statuslist: 'loadmore',
  68 + query: {
  69 + keyword: '',
  70 + pageSize: 10,
  71 + pageNum: 0,
  72 + },
69 listIn:0, 73 listIn:0,
70 num:0, 74 num:0,
71 75
72 }; 76 };
73 }, 77 },
74 onLoad(option) { 78 onLoad(option) {
75 - console.log(option.id)  
76 - this.num = option.id 79 + console.log(option.id);
  80 + this.num = option.id;
  81 + this.statuslist = 'nomore';
  82 + },
  83 + onPullDownRefresh(e) {
  84 + let that = this
  85 + that.statuslist = 'loading';
  86 + this.page = 0;
  87 + setTimeout(() => {
  88 + that.datalist = [{}];
  89 + that.statuslist = that.datalist.length >= that.total ? 'nomore' : 'loadmore';
  90 + uni.stopPullDownRefresh();
  91 + }, 1000);
  92 + },
  93 + onReachBottom(e) {
  94 + // this.loading();
77 }, 95 },
78 methods: { 96 methods: {
  97 + tabsChange(val) {
  98 + this.current = val;
  99 + },
  100 + search() {},
  101 + loading() {
  102 + let that = this
  103 + if(that.statuslist == 'nomore') return;
  104 + that.statuslist = 'loading';
  105 + that.query.pageNum = ++that.query.pageNum;
  106 + setTimeout(() => {
  107 + let data = [{}, {}];
  108 + that.datalist = [...that.datalist, ...data];
  109 + console.log(that.datalist);
  110 + that.statuslist = that.datalist.length >= that.total ? 'nomore' : 'loadmore';
  111 + }, 300)
  112 + },
79 sel(val){ 113 sel(val){
80 this.listIn = val 114 this.listIn = val
81 }, 115 },
82 reconciliationdetail() { 116 reconciliationdetail() {
83 117
  118 + },
  119 + toAdd() {
  120 + uni.navigateTo({
  121 + url: '/pages/activityAdd/activityAdd'
  122 + })
84 } 123 }
85 } 124 }
86 } 125 }
pages/participation/participation.vue
  View file @00e7322
@@ -10,30 +10,14 @@ @@ -10,30 +10,14 @@
10 </view> 10 </view>
11 <!-- 搜索 --> 11 <!-- 搜索 -->
12 <view class="head-search"> 12 <view class="head-search">
13 - <u-search bg-color="#fff" placeholder="请输入关键词" v-model="keyword" :show-action="false" @search="search"></u-search> 13 + <u-search bg-color="#fff" placeholder="请输入关键词" v-model="query.keyword" :show-action="false" @search="search"></u-search>
14 <u-button type="success" @click="search">搜索</u-button> 14 <u-button type="success" @click="search">搜索</u-button>
15 </view> 15 </view>
16 <view class="screen-list"> 16 <view class="screen-list">
17 - <view class="list">  
18 - <text>默认排序</text>  
19 - <image :src="$imgUrl('/down.png')"></image>  
20 - </view>  
21 - <view class="list">  
22 - <text>进行中</text>  
23 - <image :src="$imgUrl('/down.png')"></image>  
24 - </view>  
25 - <!-- <view class="list">  
26 - <text>区域</text>  
27 - <image :src="$imgUrl('/down.png')"></image>  
28 - </view>  
29 - <view class="list">  
30 - <text>租金</text>  
31 - <image :src="$imgUrl('/down.png')" ></image>  
32 - </view>  
33 - <view class="list">  
34 - <text>筛选</text>  
35 - <image :src="$imgUrl('/down.png')" ></image>  
36 - </view> --> 17 + <u-dropdown menu-icon="arrow-down-fill">
  18 + <u-dropdown-item v-model="query.sortType" title="时间排序" :options="sortTypeOptions" @change="search"></u-dropdown-item>
  19 + <u-dropdown-item v-model="query.status" title="活动状态" :options="statusOptions" @change="search"></u-dropdown-item>
  20 + </u-dropdown>
37 </view> 21 </view>
38 <!-- 订单列表 --> 22 <!-- 订单列表 -->
39 <view class="goods-data"> 23 <view class="goods-data">
@@ -62,11 +46,26 @@ @@ -62,11 +46,26 @@
62 export default { 46 export default {
63 data() { 47 data() {
64 return { 48 return {
65 - keyword: '', // 搜索项  
66 status: 'loadmore', 49 status: 'loadmore',
67 list: 1, 50 list: 1,
68 - page: 0,  
69 total: 1, 51 total: 1,
  52 + query: {
  53 + keyword: '', // 搜索项
  54 + sortType: '', // 排序方式
  55 + status: '', // 活动状态
  56 + pageNum: 0,
  57 + pageSize: 10,
  58 + },
  59 + sortTypeOptions: [
  60 + { label: '默认排序', value: 1 },
  61 + { label: '正序', value: 2 },
  62 + { label: '倒序', value: 3 },
  63 + ],
  64 + statusOptions: [
  65 + { label: '进行中', value: 1 },
  66 + { label: '已结束', value: 2 },
  67 + { label: '未开始', value: 3 },
  68 + ],
70 }; 69 };
71 }, 70 },
72 onLoad() { 71 onLoad() {
@@ -88,9 +87,13 @@ @@ -88,9 +87,13 @@
88 methods: { 87 methods: {
89 toMyAdd() { 88 toMyAdd() {
90 // 跳转我的活动申请 89 // 跳转我的活动申请
  90 + uni.navigateTo({
  91 + url: '/pages/mycreated/mycreated'
  92 + })
91 }, 93 },
92 search() { 94 search() {
93 // 搜索 95 // 搜索
  96 + // this.loading();
94 }, 97 },
95 loading() { 98 loading() {
96 let that = this 99 let that = this
@@ -102,11 +105,6 @@ @@ -102,11 +105,6 @@
102 that.status = that.list >= that.total ? 'nomore' : 'loadmore'; 105 that.status = that.list >= that.total ? 'nomore' : 'loadmore';
103 }, 300) 106 }, 300)
104 }, 107 },
105 - myativity() {  
106 - uni.navigateTo({  
107 - url: '/pages/mycreated/mycreated'  
108 - })  
109 - },  
110 join(){ 108 join(){
111 uni.navigateTo({ 109 uni.navigateTo({
112 url: '/pages/mycreated/mycreated?id=1' 110 url: '/pages/mycreated/mycreated?id=1'
pages/workbench/workbench.vue
  View file @00e7322
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, 49 { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
50 { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, 50 { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
51 { name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' }, 51 { name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' },
52 - { name: '活动申请', img: '/workbench4.png', path: '/pages/activityAdd/activityAdd' }, 52 + { name: '我的活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
53 { name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' }, 53 { name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
54 ] 54 ]
55 }, 55 },
static/images/back-icon.png 0 → 100644
View file @00e7322

135 KB
static/images/front-icon.png 0 → 100644
View file @00e7322

135 KB
static/images/location-icon.png 0 → 100644
View file @00e7322

548 Bytes
static/images/sevice-icon.png 0 → 100644
View file @00e7322

1.7 KB
static/images/share-icon.png 0 → 100644
View file @00e7322

1.44 KB
static/images/uploadID1.png 0 → 100644
View file @00e7322

8.59 KB
static/images/uploadID2.png 0 → 100644
View file @00e7322

8.13 KB