diff --git a/pages.json b/pages.json index 93c4064..bba2327 100644 --- a/pages.json +++ b/pages.json @@ -89,10 +89,16 @@ "path": "mine/verifyVoucher" }, { - "path": "mine/verifyRecord" + "path": "mine/signIn" }, { - "path": "mine/signIn" + "path": "mine/pointsRecord" + }, + { + "path": "mine/cooperation" + }, + { + "path": "mine/verifyRecord" }, diff --git a/pages/index/center copy.vue b/pages/index/center copy.vue deleted file mode 100644 index 27af34e..0000000 --- a/pages/index/center copy.vue +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - - - - - - - - - - {{ userInfo.nickName}} - - - - - - - - - - {{ userRole[userInfo.isPay] }} - - - - - - - 修改资料 - - - - - - 手机号:{{ userInfo.phone }} - - - - - - - - - - - - - - 开通时间:{{ riceInfo.openTime }} - - - - - - - - - - - - - - - 我的佣金 - ¥{{ riceInfo.canWithdraw || 0 }} - - - - - - - - 我的余额 - ¥{{ riceInfo.balance || 0 }} - - - - - - - - 我的服务 - - - - - - 我的订单 - - - - 我的团队 - - - - 联系客服 - - - - 邀请好友 - - - - - - - 合伙人招募 - - - - 会员权益 - - - - 优惠券 - - - - 帮助与反馈 - - - - - - - 我的地址 - - - - 礼包列表 - - - - 退出登录 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index b68c309..b980be8 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -115,13 +115,11 @@ 联系客服 - 每日签到 - - + 商家合作 @@ -133,16 +131,16 @@ 商家功能 - + - - + 核销明细 + @@ -249,7 +247,7 @@ }, data() { return { - role: '', // member-personal | member-business | merchant + role: 'merchant', // member-personal | member-business | merchant vipType: ['普通会员', '黄金会员', '渠道商'], vipImage: ['vip_vip', 'vip_user', 'vip_shop'], @@ -299,6 +297,18 @@ }, onScan() { // todo + uni.scanCode({ + success: (res) => { + console.log(res); + if (res.result) { + // 处理扫码结果 + console.log('扫码结果:', res.result); + } + }, + fail: (err) => { + console.error('扫码失败:', err); + } + }); }, } } diff --git a/pages/index/order.vue b/pages/index/order.vue index a9f8ee0..8997266 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -33,8 +33,6 @@ - - diff --git a/pages_order/components/formInput.vue b/pages_order/components/formInput.vue new file mode 100644 index 0000000..82e679b --- /dev/null +++ b/pages_order/components/formInput.vue @@ -0,0 +1,38 @@ + + + + + + \ No newline at end of file diff --git a/pages_order/components/formTextarea.vue b/pages_order/components/formTextarea.vue new file mode 100644 index 0000000..b351528 --- /dev/null +++ b/pages_order/components/formTextarea.vue @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/pages_order/components/formUpload.vue b/pages_order/components/formUpload.vue new file mode 100644 index 0000000..15c4af1 --- /dev/null +++ b/pages_order/components/formUpload.vue @@ -0,0 +1,66 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pages_order/components/verifyRecord/voucherCard.vue b/pages_order/components/verifyRecord/voucherCard.vue new file mode 100644 index 0000000..5da272a --- /dev/null +++ b/pages_order/components/verifyRecord/voucherCard.vue @@ -0,0 +1,76 @@ + + + + + + {{ data.userName }} + {{ `核销时间:${data.createTime}` }} + + + + 代金券: + {{ `${data.count}元` }} + + + + + + + \ No newline at end of file diff --git a/pages_order/mine/cooperation.vue b/pages_order/mine/cooperation.vue new file mode 100644 index 0000000..5a2da59 --- /dev/null +++ b/pages_order/mine/cooperation.vue @@ -0,0 +1,245 @@ + + + + + + + + 门头照片 + + + + + + + + + + + + + 店铺信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ form.address ? form.address : '请选择' }} + + + + + + + + + + + + + + + + + + 提交 + + + + + + + + \ No newline at end of file diff --git a/pages_order/mine/pointsRecord.vue b/pages_order/mine/pointsRecord.vue new file mode 100644 index 0000000..eea7df0 --- /dev/null +++ b/pages_order/mine/pointsRecord.vue @@ -0,0 +1,128 @@ + + + + + + + + + {{ displaySelectedTime }} + + + + + + + + + + {{ item.projectName }} + {{ item.createTime }} + + {{ `+${item.money}` }} + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue index e9b1351..61ec58f 100644 --- a/pages_order/mine/runningWater.vue +++ b/pages_order/mine/runningWater.vue @@ -8,6 +8,7 @@ ref="datetimePicker" v-model="selectedTime" mode="year-month" + confirmColor="#84A73F" @confirm="onTimeChange" > diff --git a/pages_order/mine/signIn.vue b/pages_order/mine/signIn.vue index 1140d84..3d78ab9 100644 --- a/pages_order/mine/signIn.vue +++ b/pages_order/mine/signIn.vue @@ -32,14 +32,14 @@ - + 积分明细 - 我要签到 + 我要签到 @@ -61,11 +61,29 @@ export default { badge: true, } }), + isSigned: false } }, methods: { onSignIn() { // todo + + setTimeout(() => { + this.isSigned = true + + const date = this.$dayjs() + + this.selected.push({ + date: date.format("YYYY-MM-DD"), + info: date.date(), + infoColor: '#FFFFFF', + badge: true, + }) + + uni.showToast({ + title: '签到成功~', + }); + }, 2000) } }, } @@ -211,6 +229,11 @@ export default { line-height: 40rpx; border-radius: 44rpx; background-image: linear-gradient(to right, #84A73F, #D8FF8F); + + &.is-disabled { + color: $uni-text-color-inverse; + background: #C7C7C7; + } } } diff --git a/pages_order/mine/verifyRecord.vue b/pages_order/mine/verifyRecord.vue index e82e1f9..8f0a55b 100644 --- a/pages_order/mine/verifyRecord.vue +++ b/pages_order/mine/verifyRecord.vue @@ -1,25 +1,203 @@ - - + + + + + + + + + + {{ displaySelectedTime }} + + + + + {{ `${displaySelectedMonth}总核销:` }} + + {{ 12 }} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages_order/mine/voucher.vue b/pages_order/mine/voucher.vue index 17185c6..cabd0cc 100644 --- a/pages_order/mine/voucher.vue +++ b/pages_order/mine/voucher.vue @@ -112,6 +112,8 @@ .list { &-item { + display: block; + & + & { margin-top: 20rpx; } diff --git a/pages_order/static/cooperation/icon-arrow.png b/pages_order/static/cooperation/icon-arrow.png new file mode 100644 index 0000000..98638d4 Binary files /dev/null and b/pages_order/static/cooperation/icon-arrow.png differ diff --git a/pages_order/static/cooperation/icon-upload.png b/pages_order/static/cooperation/icon-upload.png new file mode 100644 index 0000000..1ea170f Binary files /dev/null and b/pages_order/static/cooperation/icon-upload.png differ diff --git a/pages_order/static/pointsRecord/icon-points.png b/pages_order/static/pointsRecord/icon-points.png new file mode 100644 index 0000000..ac4974f Binary files /dev/null and b/pages_order/static/pointsRecord/icon-points.png differ