diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..c1b210c Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a70bc78 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/unpackage +/node_modules diff --git a/App.vue b/App.vue index 828a2e8..5092323 100644 --- a/App.vue +++ b/App.vue @@ -1,21 +1,25 @@ diff --git a/pages/address/index.vue b/pages/address/index.vue new file mode 100644 index 0000000..451ca0b --- /dev/null +++ b/pages/address/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/pages/attestation/index.vue b/pages/attestation/index.vue deleted file mode 100644 index a35ff0a..0000000 --- a/pages/attestation/index.vue +++ /dev/null @@ -1,450 +0,0 @@ - + + + + diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue new file mode 100644 index 0000000..d7bfb97 --- /dev/null +++ b/pages/login/agreement.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index 04cbef4..4225fad 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -6,21 +6,31 @@ 未注册的手机号码将自动注册 + + + + - - + + - - - - - - 黑ICP备2021013714号-1 + + + + + + + + 登录即表示同意用户《隐私协议》《服务协议》 + + + @@ -32,30 +42,65 @@ export default { data() { return { - phone : "", + name : "", code : "", - parentId: "", - smsTime : 60, + parentId: "", + tel : '', //获取手机号 + channelId: '', //渠道码 + newUser : '', //是否为新用户 + smsTime : 60, + checked : false, //勾选协议 getSms : false } }, mounted(){ - this.parentId = this.$Route.query.invite || '' + this.parentId = this.$store.getters.getParentId + this.channelId = this.$Route.query.channel || '' + this.name = this.$Route.query.name + this.tel = this.$Route.query.tel }, methods: { // 用户登录 login() { smsAuth({ - mobileNo : this.phone, + mobileNo : this.tel, code : this.code, - invite : this.parentId + invite : this.parentId, + channel : this.channelId, + name : this.name }).then(res => { - this.$store.commit('setToken', res.token_type + ' ' + res.access_token) - if(this.$Route.toName){ + this.$store.commit('setIntive', res.invite) + if(this.checked) { + this.$store.commit('setToken', res.token_type + ' ' + res.access_token) + if(this.$Route.query.skuId){ + this.$Router.replace({ + name: 'indexPlace', + params: { + name : this.name, + skuId : this.$Route.query.skuId + }, + }) + return + } this.$Router.back() - }else{ - this.$Router.replaceAll({name: 'Index'}) - } + // if(this.$Route.toName){ + // }else{ + // // this.$Router.back() + // if(getApp().globalData.envType == 'indexPage') { + // this.$Router.replaceAll({name: 'Index'}) + // } else if(getApp().globalData.envType == 'userPage') { + // this.$Router.replaceAll({name: 'Index'}) + // } else { + // this.$Router.replaceAll({name: 'Index'}) + // } + // } + } else { + uni.showToast({ + title: '请勾选用户隐私和服务协议', + icon: "none" + }) + } + }).catch(err => { uni.showToast({ title: err.message, @@ -67,8 +112,9 @@ getPhoneCode() { let outTime getSms({ - mobileNo: this.phone - }).then(res => { + mobileNo: this.tel + }).then(res => { + this.newUser = res.new uni.showToast({ title: res, icon: "none" @@ -88,7 +134,12 @@ icon: "none" }) }) - } + }, + + // 勾选协议 + radioChange() { + this.checked = !this.checked + } } } @@ -97,7 +148,7 @@ .content { height: 100vh; width: 100vw; - padding: $padding * 3; + padding: $padding * 3 $padding * 2; box-sizing: border-box; background: white; @@ -206,11 +257,9 @@ line-height: 90rpx; height: 90rpx; font-weight: bold; - &::after { border: none; } - &[disabled] { background: rgba($color: $mian-color, $alpha: .6); } @@ -219,7 +268,31 @@ font-size: $title-size-sm; color: $text-gray; text-align: center; - padding-top: $padding*2; + padding-top: $padding*2; + position: fixed; + width: 100%; + left: 0; + bottom: 50rpx; } - } + } + // 协议 + .agreement { + font-size: $title-size-sm; + color: $text-gray; + margin-top: $margin - 10; + display: flex; + .radioGroup { + transform: scale(.6); + width: 55rpx; + text-align: left; + } + .agreement-text { + width: calc(100% - 55rpx); + line-height: 48rpx; + view { + color: #000; + display: inline-block; + } + } + } diff --git a/pages/member/dredge.vue b/pages/member/dredge.vue new file mode 100644 index 0000000..691284f --- /dev/null +++ b/pages/member/dredge.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/pages/member/index.vue b/pages/member/index.vue new file mode 100644 index 0000000..e55655d --- /dev/null +++ b/pages/member/index.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/pages/member/look.vue b/pages/member/look.vue new file mode 100644 index 0000000..db5aced --- /dev/null +++ b/pages/member/look.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/pages/member/open.vue b/pages/member/open.vue new file mode 100644 index 0000000..6bab115 --- /dev/null +++ b/pages/member/open.vue @@ -0,0 +1,350 @@ + + + + + diff --git a/pages/member/partner.vue b/pages/member/partner.vue new file mode 100644 index 0000000..984233e --- /dev/null +++ b/pages/member/partner.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/pages/member/rights.vue b/pages/member/rights.vue new file mode 100644 index 0000000..d9522b7 --- /dev/null +++ b/pages/member/rights.vue @@ -0,0 +1,416 @@ + + + + + diff --git a/pages/merits/index.vue b/pages/merits/index.vue new file mode 100644 index 0000000..2b5c3fc --- /dev/null +++ b/pages/merits/index.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/pages/order/details.vue b/pages/order/details.vue index c352ed7..99bcde5 100644 --- a/pages/order/details.vue +++ b/pages/order/details.vue @@ -25,19 +25,21 @@ - + + + {{ item.sku.goods_name }} - ¥{{ item.sku.price }} - x{{ item.qty }} + x{{ item.qty }} + - + @@ -54,25 +56,48 @@ 交易状态 {{ goodsData.state }} - + + + + 物流信息 + + 物流公司 + {{ express.express_name }} + + + 收货姓名 + {{ express.name }} + + + 收货电话 + {{ express.mobile }} + + + 物流单号 + {{ express.express_no }}复制 - 返回订单 + + 返回订单 + 签收订单 @@ -136,8 +187,8 @@ // 订单 .orderData-cont-label { padding: 40rpx 30rpx; + display: flex; box-sizing: border-box; - position: relative; border-bottom: #f2f2f2 2rpx solid; .orderData-cont-img { width: 48rpx; @@ -145,11 +196,8 @@ vertical-align: middle; } .orderData-cont-text { - position: absolute; - left: 0; - top: 0; - width: 100%; - padding: 25rpx 30rpx 0 120rpx; + width: calc(100% - 68rpx); + margin-left: 20rpx; box-sizing: border-box; .orderData-cont-name { margin-bottom: 10rpx; @@ -168,7 +216,7 @@ margin-right: 20rpx; } view { - color: #edb25f; + color: #eb504c; } } } @@ -180,7 +228,6 @@ box-sizing: border-box; .orderGoods-wares { position: relative; - margin-bottom: 10rpx; .orderGoods-img { width: 100rpx; height: 100rpx; @@ -231,6 +278,7 @@ display: flex; padding: 0 30rpx 30rpx; box-sizing: border-box; + font-size: $title-size-m; .reserve-name { flex: 1; width: 200rpx; @@ -243,7 +291,18 @@ line-height: 50rpx; &.reserve-price { font-weight: 600; - color: #6d79ec; + color: #1d37e2; + } + .reserve-copy { + color: #6774ff; + border: #6774ff 2rpx solid; + display: inline-block; + height: 34rpx; + line-height: 34rpx; + font-size: $title-size-sm; + padding: 0 10rpx; + border-radius: 4rpx; + margin-left: 10rpx; } } } diff --git a/pages/order/index.vue b/pages/order/index.vue index 177448f..8761b04 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -2,6 +2,8 @@ + 全部 + 待支付 待发货 已发货 已签收 @@ -14,7 +16,9 @@ {{ item.state }} - + + + @@ -31,13 +35,23 @@ 下单时间:{{ item.created_at }} - 合计金额:¥{{ item.amount }} + - 立即签收 - 订单详情 + + 取消支付 + 去支付 + 签收 + + + 加载中... + + + 没有更多了~ + + @@ -47,12 +61,16 @@ - - diff --git a/pages/purine/index.vue b/pages/purine/index.vue deleted file mode 100644 index b1a39fc..0000000 --- a/pages/purine/index.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - diff --git a/pages/receive/index.vue b/pages/receive/index.vue deleted file mode 100644 index 560cb93..0000000 --- a/pages/receive/index.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/pages/redPaper/index.vue b/pages/redPaper/index.vue new file mode 100644 index 0000000..78865d0 --- /dev/null +++ b/pages/redPaper/index.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/pages/share/index.vue b/pages/share/index.vue new file mode 100644 index 0000000..9f87214 --- /dev/null +++ b/pages/share/index.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/pages/uricacid/index.vue b/pages/uricacid/index.vue deleted file mode 100644 index e6acca3..0000000 --- a/pages/uricacid/index.vue +++ /dev/null @@ -1,430 +0,0 @@ -