diff --git a/pages.json b/pages.json
index c41ba9f..0169bef 100644
--- a/pages.json
+++ b/pages.json
@@ -132,8 +132,9 @@
{
"path": "pages/mycreated/mycreated",
"style": {
- "navigationBarTitleText": "我创建的活动",
- "navigationBarBackgroundColor": "#FFFFFF"
+ "navigationBarTitleText": "我的活动申请",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
}
},
{
diff --git a/pages/mycreated/mycreated.scss b/pages/mycreated/mycreated.scss
index 520fc28..ad686a3 100644
--- a/pages/mycreated/mycreated.scss
+++ b/pages/mycreated/mycreated.scss
@@ -4,38 +4,37 @@
top: 0;
width: 100%;
min-height: 100vh;
+ // padding: 0 40rpx;
+ // background-color: #fff;
+}
+.tabs-box {
+ width: 100%;
padding: 0 40rpx;
background-color: #fff;
}
.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 0;
- .search{
-
- display: flex;
- align-items: center;
- width: 100%;
- height: 72rpx;
-
- border: 2rpx solid #E8E8E8;
- justify-content: space-between;
- padding: 0 10rpx 0 30rpx;
- .icon{
- display: flex;
- align-items: center;
- margin-left: 20rpx;
- margin-right: 15rpx;
- image{
- width: 29rpx;
- height: 29rpx;
- }
- }
-
- }
}
+ .u-btn {
+ border: unset;
+ border: 0px transparent;
+ height: 46rpx;
+ width: 88rpx;
+ font-size: 24rpx;
+ border-radius: 35rpx;
+ }
+}
/* 订单列表 */
.screen-list{
display: flex;
@@ -55,48 +54,63 @@
.goods-data{
width: 100%;
+ padding: 0 24rpx;
.goods-list{
width: 100%;
-
- .list{
- display: flex;
- margin-bottom: 40rpx;
- .thumb{
- // display: flex;
- // align-items: center;
- width: 36%;
- image{
- width: 230rpx;
- height: 240rpx;
+ .good-item {
+ width: 100%;
+ background-color: #FFFFFF;
+ border-radius: 10rpx;
+ margin-bottom: 24rpx;
+ .body {
+ display: flex;
+ width: 100%;
+ height: calc(100% - 70rpx);
+ padding: 15rpx 18rpx;
+ image {
+ width: 190rpx;
+ height: 190rpx;
+ margin-right: 26rpx;
border-radius: 10rpx;
}
- }
-
- .item{
- width: 60%;
- margin-left: 4%;
- .title{
- display: flex;
- align-items: center;
- width: 100%;
- margin: 10rpx 0;
- .color{
- color: #A8A8A8;
+ .info {
+ width: calc(100% - 236rpx);
+ .title {
+ width: 100%;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ font-weight: 700;
+ white-space: nowrap;
+ overflow : hidden;
+ text-overflow: ellipsis;
+ margin-bottom: 2rpx;
+ }
+ .info-items {
+ .info-item {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ line-height: 30rpx;
+ margin-top: 16rpx;
+ font-size: 26rpx;
+ .label {
+ color: #676767;
+ }
+ text {
+ font-weight: 700;
+ }
+ }
}
}
-
- text{
- font-size: 30rpx;
- // font-weight: bold;
- color: #222222;
+ }
+ .footer {
+ background-color: #EEEEEE;
+ padding: 10rpx 18rpx;
+ border-radius: 0 0 10rpx 10rpx;
+ .u-btn {
+ margin-right: 22rpx;
}
-
}
-
- }
- .goods-border{
- padding: 30rpx;
- border: 1px solid #F3F3F3;
}
}
.canyu{
@@ -127,13 +141,17 @@
}
}
}
-/* 保存按钮 */
.page-footer{
+ position: fixed;
+ left: 0;
+ bottom: 0;
width: 100%;
+ height: 120rpx;
background-color: #FFFFFF;
+ padding: 20rpx 20rpx;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
- margin:40rpx 0 40rpx 0;
+ z-index: 999;
.footer-buy{
display: flex;
align-items: center;
@@ -153,4 +171,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/pages/mycreated/mycreated.vue b/pages/mycreated/mycreated.vue
index daf930f..e14f4aa 100644
--- a/pages/mycreated/mycreated.vue
+++ b/pages/mycreated/mycreated.vue
@@ -1,63 +1,50 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{item}}
+
+ 搜索
-
-
-
-
-
-
-
-
- 名称：绿道好物节
-
-
- 活动时间：2024-10-10至2024-10-20
-
-
- 参与商家：1人
-
-
- 活动状态：待开始
-
-
- 举办方：绿道
+
+
+
+
+ 这里有标题这里有标题这里有标题这里有标题
+
+
+ 活动时间：
+ 2022.22.22
+
+
+ 参与商家：
+ 6人
+
+
+ 活动状态：
+ 待审核
+
-
- 编辑
- 提交审核
- 查看详情
- 取消
-
+
-
+
+
+
@@ -65,22 +52,74 @@
export default {
data() {
return {
- shenlist:['全部','待提交','待审核','通过','驳回','进行中','已结束'],
+ tabList:[
+ { name: '全部' },
+ { name: '待提交' },
+ { name: '待审核' },
+ { name: '通过' },
+ { name: '驳回' },
+ { name: '进行中' },
+ { name: '已结束' },
+ ],
+ current: 0,
+ datalist: [{}],
+ total: 2,
+ statuslist: 'loadmore',
+ query: {
+ keyword: '',
+ pageSize: 10,
+ pageNum: 0,
+ },
listIn:0,
num:0,
};
},
onLoad(option) {
- console.log(option.id)
- this.num = option.id
+ console.log(option.id);
+ this.num = option.id;
+ this.statuslist = 'nomore';
+ },
+ onPullDownRefresh(e) {
+ let that = this
+ that.statuslist = 'loading';
+ this.page = 0;
+ setTimeout(() => {
+ that.datalist = [{}];
+ that.statuslist = that.datalist.length >= that.total ? 'nomore' : 'loadmore';
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ onReachBottom(e) {
+ // this.loading();
},
methods: {
+ tabsChange(val) {
+ this.current = val;
+ },
+ search() {},
+ loading() {
+ let that = this
+ if(that.statuslist == 'nomore') return;
+ that.statuslist = 'loading';
+ that.query.pageNum = ++that.query.pageNum;
+ setTimeout(() => {
+ let data = [{}, {}];
+ that.datalist = [...that.datalist, ...data];
+ console.log(that.datalist);
+ that.statuslist = that.datalist.length >= that.total ? 'nomore' : 'loadmore';
+ }, 300)
+ },
sel(val){
this.listIn = val
},
reconciliationdetail() {
+ },
+ toAdd() {
+ uni.navigateTo({
+ url: '/pages/activityAdd/activityAdd'
+ })
}
}
}
diff --git a/pages/participation/participation.vue b/pages/participation/participation.vue
index 3ebb559..ec995d9 100644
--- a/pages/participation/participation.vue
+++ b/pages/participation/participation.vue
@@ -10,30 +10,14 @@
-
+
搜索
-
- 默认排序
-
-
-
- 进行中
-
-
-
+
+
+
+
@@ -62,11 +46,26 @@
export default {
data() {
return {
- keyword: '', // 搜索项
status: 'loadmore',
list: 1,
- page: 0,
total: 1,
+ query: {
+ keyword: '', // 搜索项
+ sortType: '', // 排序方式
+ status: '', // 活动状态
+ pageNum: 0,
+ pageSize: 10,
+ },
+ sortTypeOptions: [
+ { label: '默认排序', value: 1 },
+ { label: '正序', value: 2 },
+ { label: '倒序', value: 3 },
+ ],
+ statusOptions: [
+ { label: '进行中', value: 1 },
+ { label: '已结束', value: 2 },
+ { label: '未开始', value: 3 },
+ ],
};
},
onLoad() {
@@ -88,9 +87,13 @@
methods: {
toMyAdd() {
// 跳转我的活动申请
+ uni.navigateTo({
+ url: '/pages/mycreated/mycreated'
+ })
},
search() {
// 搜索
+ // this.loading();
},
loading() {
let that = this
@@ -102,11 +105,6 @@
that.status = that.list >= that.total ? 'nomore' : 'loadmore';
}, 300)
},
- myativity() {
- uni.navigateTo({
- url: '/pages/mycreated/mycreated'
- })
- },
join(){
uni.navigateTo({
url: '/pages/mycreated/mycreated?id=1'
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index a3ee784..1c9b7b6 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -49,7 +49,7 @@
{ name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
{ name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
{ name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' },
- { name: '活动申请', img: '/workbench4.png', path: '/pages/activityAdd/activityAdd' },
+ { name: '我的活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
{ name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
]
},
diff --git a/static/images/back-icon.png b/static/images/back-icon.png
new file mode 100644
index 0000000..3b29577
--- /dev/null
+++ b/static/images/back-icon.png
diff --git a/static/images/front-icon.png b/static/images/front-icon.png
new file mode 100644
index 0000000..724c712
--- /dev/null
+++ b/static/images/front-icon.png
diff --git a/static/images/location-icon.png b/static/images/location-icon.png
new file mode 100644
index 0000000..80f69d9
--- /dev/null
+++ b/static/images/location-icon.png
diff --git a/static/images/sevice-icon.png b/static/images/sevice-icon.png
new file mode 100644
index 0000000..15b99e1
--- /dev/null
+++ b/static/images/sevice-icon.png
diff --git a/static/images/share-icon.png b/static/images/share-icon.png
new file mode 100644
index 0000000..98f6e20
--- /dev/null
+++ b/static/images/share-icon.png
diff --git a/static/images/uploadID1.png b/static/images/uploadID1.png
new file mode 100644
index 0000000..b9612c4
--- /dev/null
+++ b/static/images/uploadID1.png
diff --git a/static/images/uploadID2.png b/static/images/uploadID2.png
new file mode 100644
index 0000000..86b2c56
--- /dev/null
+++ b/static/images/uploadID2.png