diff --git a/packageA/afterSales/info.vue b/packageA/afterSales/info.vue
index d797b0e..db07498 100644
--- a/packageA/afterSales/info.vue
+++ b/packageA/afterSales/info.vue
@@ -569,7 +569,7 @@ export default {
.line {
width: 630rpx;
height: 1rpx;
- background: #F0F0F0;
+ background: #eeeeee;
margin: 30rpx 0;
}
@@ -692,7 +692,7 @@ export default {
.line {
width: 642rpx;
height: 1rpx;
- background: #F0F0F0;
+ background: #eeeeee;
//box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
//border-radius: 0rpx 0rpx 0rpx 0rpx;
}
diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue
index dc441eb..442ad23 100644
--- a/packageA/center/detailSys.vue
+++ b/packageA/center/detailSys.vue
@@ -1022,7 +1022,7 @@ export default {
width: 586rpx;
height: 52rpx;
font-family: PingFang SC, PingFang SC;
- font-weight: 400;
+ font-weight: 600;
font-size: 36rpx;
color: #323232;
// margin-left: 16rpx;
diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue
index 570c6a5..3df6b49 100644
--- a/packageA/my/cancelActivity.vue
+++ b/packageA/my/cancelActivity.vue
@@ -1,81 +1,75 @@
-
+
-
+
-
-
-
-
-
- {{detail.title}}
-
-
-
- {{ detailAny.user.nickname }}
- {{ detailAny.join_info.people_number }}人玩过
+
+
+
+
+
+ {{detail.title}}
+
+
+
+ {{ detailAny.user.nickname }}
+ {{ detailAny.join_info.people_number }}人玩过
-
-
- ¥{{detailAny.totalprice}}
+
+
+ ¥{{detailAny.totalprice}}
+
+
+
+
+
+ {{formattedTime.formattedTime}}
+
+
+
+
+
+
+ {{detail.address_detail}}
+
+
+
+
+
-
-
-
- {{formattedTime.formattedTime}}
-
-
-
-
-
- {{detail.address_detail}}
+
+
+
+
+
+ 订单编号
+ {{detailAny.order_no}}
+
+
+ 报名人昵称
+ {{ detailAny.user.nickname }}
+
+
+ 核销/报名人数
+ {{detailAny.verification.have_number}} /
+ {{ detailAny.verification.total_number }}
-
-
+
-
-
-
-
-
-
-
- 订单编号
- {{detailAny.order_no}}
+
+
-
- 报名人昵称
- {{ detailAny.user.nickname }}
-
-
- 核销/报名人数
- {{detailAny.verification.have_number}} / {{ detailAny.verification.total_number }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -119,7 +113,7 @@
img: 'width: 100%'
},
- value_slide:0,
+ value_slide: 0,
scrollTop: 0,
overlay: false,
userInfo: {},
@@ -134,7 +128,7 @@
order_no: '',
PayPirce: 0,
detail: {},
- detailAny:{},
+ detailAny: {},
people: {},
qrUrl: '',
is_collect: 0,
@@ -158,7 +152,7 @@
titleStyle: {
color: '#FFFFFF'
},
- wxcode:'',//核销code
+ wxcode: '', //核销code
};
},
@@ -169,18 +163,18 @@
this.userInfo = uni.getStorageSync("userInfo")
this.id = options.id
this.wxcode = options.code
-
+
this.getDetail()
},
methods: {
-
+
//星期
dateWeeks(timestamp) {
return dateWeek(timestamp)
},
//完整时间
- formattime(e){
+ formattime(e) {
return dayjs(e).format('YYYY-MM-DD HH:mm:ss')
},
@@ -203,14 +197,14 @@
});
}
},
-
-
-
-
-
-
+
+
+
+
+
+
// 提示
showErrorToast(msg) {
uni.showToast({
@@ -238,8 +232,8 @@
}
}).catch(error => {});
},
-
- hexiaohd(){
+
+ hexiaohd() {
let wxcc = this.wxcode
uni.$u.http.post('/api/school.newworker.activity.order/verification', {
code: wxcc
@@ -266,9 +260,9 @@
}
}).catch(error => {});
},
-
-
-
+
+
+
// 导航
toMap(latitude, longitude, name) {
uni.openLocation({
@@ -287,25 +281,26 @@
url: "/pages/index/index"
})
},
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
},
}
\ No newline at end of file
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index 98035e2..94b745f 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -55,7 +55,7 @@
-
+
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index 913d6bf..702a558 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -44,7 +44,7 @@
{{ item.title }}
- {{
+ {{
item.user.nickname
}}
diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index c7fad24..a30b672 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -1,135 +1,141 @@
-
+
-
+
-
-
-
-
-
- {{detail.title}}
-
-
-
- {{ detailAny.user.nickname }}
- {{ detailAny.join_info.people_number }}人玩过
-
-
- ¥{{detailAny.totalprice}}
+
+
+
+
+
+ {{ detail.title }}
+
+
+
+ {{ detailAny.user.nickname }}
+ {{ detailAny.join_info.people_number
+ }}人玩过
+
+
+ ¥{{ detailAny.totalprice }}
+
-
-
-
-
- {{formattedTime.formattedTime}}
-
-
-
-
-
-
- {{detail.address_detail}}
+
+
+
+ {{ formattedTime.formattedTime }}
-
+
+
+
+
+
+ {{ detail.address_detail }}
+
+
+
+
+
+
-
-
-
-
-
- 核销二维码
-
+
+
+ 核销二维码
+
+
-
-
-
-
-
- 左右滑动二维码核销({{qrindex}}/{{detailAny.num}})张
-
-
-
-
-
-
-
-
- 订单状态
- 待核销
-
-
- 订单编号
- {{detailAny.order_no}}
-
-
- 创建时间
- {{ formattime(detailAny.createtime)}}
-
-
- 付款金额
- ¥{{detailAny.totalprice}}
-
-
- 付款方式
- {{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}}
-
-
- 付款时间
- {{ formattime(detailAny.createtime)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{detail.title}}
-
- ¥{{detail.price}}
- 公益
+
+ 二维码核销({{ qrindex }}/{{ detailAny.num }})张
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detail.title }}
+
+ ¥{{ detail.price }}
+ 公益
+
+
-
-
-
-
- {{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节)
-
-
- {{detail.address_detail}}
-
-
+
+
-
-
-
+
-
-
-
- 保 存 海 报
-
+
+
+ 保 存 海 报
+
-
-
-
-
+
-
+
diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue
index ce2d1a2..92a26a0 100644
--- a/packageA/my/person-detail.vue
+++ b/packageA/my/person-detail.vue
@@ -607,7 +607,7 @@
color: #181818;
height: 110rpx;
line-height: 110rpx;
- border-bottom: 1rpx solid #f5f6fa;
+ border-bottom: 1rpx solid #eeeeee;
.right {
display: flex;
diff --git a/packageA/qrcodeSwiper.vue b/packageA/qrcodeSwiper.vue
index b6c2cf0..34422da 100644
--- a/packageA/qrcodeSwiper.vue
+++ b/packageA/qrcodeSwiper.vue
@@ -6,7 +6,10 @@
- {{item.name}}
+
+
+
+ {{item.name}}
diff --git a/pages/center/index.vue b/pages/center/index.vue
index b200ecb..6f2346b 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -19,8 +19,9 @@
-
+
@@ -46,7 +47,8 @@
集合地点
- {{form.address==''?'请填写地址':form.address}}
+ {{ form.address == '' ? '请填写地址' : form.address }}
@@ -67,7 +69,7 @@
- {{form.time==''?'请选择活动时间':form.time}}
+ {{ form.time == '' ? '请选择活动时间' : form.time }}
@@ -81,14 +83,15 @@
- {{form.cate_idsName==''?'请选择活动分类':form.cate_idsName}}
+ {{ form.cate_idsName == '' ? '请选择活动分类' : form.cate_idsName }}
-
+
*退款政策
@@ -96,7 +99,8 @@
- {{form.refund_idn==''?'请选择活动分类':form.refund_idn}}
+ {{ form.refund_idn == '' ? '请选择退款政策' : form.refund_idn }}
@@ -111,8 +115,8 @@
- 未上传
- 已上传
+ 未上传
+ 已上传
@@ -128,19 +132,33 @@
活动人数
-
+
-
+
*
活动价格
-
-
-
-
+
+
+
+
+
+ {{ priceName }}
+
+
+ ¥
+ {{ priceName }}
+ /人
+
+
+
+
+
+
@@ -158,7 +176,8 @@
-
+
确认发布
- 全部标签
+ 全部标签
取消
@@ -295,13 +315,13 @@
-
+
-
+
取消
@@ -312,7 +332,28 @@
-
+
+
+
+
+
+ 请输入活动价格
+
+
+
+
+ 活动价格
+
+
+
+
+
+
+
+
+ 确认
@@ -335,1553 +376,1588 @@
\ No newline at end of file
diff --git a/static/qrcode_yes.png b/static/qrcode_yes.png
new file mode 100644
index 0000000..6169275
Binary files /dev/null and b/static/qrcode_yes.png differ