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 @@
+
+
+
+
+ 默认{{item.name}}{{item.mobile}}
+
+ {{item.full_address}}
+
+
+ 删除
+
+
+
+
+ 选择地址
+
+
+
+
+
+
+ 暂无地址
+
+
+
+
+
+
+
+
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/bond/index.vue b/pages/bond/index.vue
new file mode 100644
index 0000000..971eed3
--- /dev/null
+++ b/pages/bond/index.vue
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+ 保证金支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/bond/tips.vue b/pages/bond/tips.vue
new file mode 100644
index 0000000..b7b3ae7
--- /dev/null
+++ b/pages/bond/tips.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+ 支付成功
+
+ 知道了
+
+
+
+
+
+
+
diff --git a/pages/circle/index.vue b/pages/circle/index.vue
deleted file mode 100644
index d9f032d..0000000
--- a/pages/circle/index.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
- {{ item.case.user.nickname }}
- 尿酸值{{ item.quantity }}
-
-
-
- {{ item.remark }}
-
-
-
- 发布时间:{{ item.created_at }}
-
-
-
-
- 加载中...
-
-
- 没有更多了~
-
-
-
-
-
- 暂无数据
-
-
-
-
-
-
-
diff --git a/pages/friend/index.vue b/pages/friend/index.vue
index 48e85da..3a8cdc7 100644
--- a/pages/friend/index.vue
+++ b/pages/friend/index.vue
@@ -1,11 +1,37 @@
+
+
+
+ 我的推荐(总)
+ {{count.all}}人
+
+
+
+
+
+
-
-
-
- {{ item.nickname }}{{ item.username }}
- 邀请时间:{{ item.created_at }}
+
+
+
+
+
+ {{ item.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21,6 +47,9 @@
export default {
data() {
return {
+ larerType : 1, //默认列表 1 直接 2 间接
+ count : '', //数量
+ identity : '', //身份
relationArr: [], //我的伙伴列表
};
},
@@ -31,14 +60,34 @@
methods: {
// 商品详情数据
relationsInfo() {
- relations().then(res => {
+ relations({
+ larer: this.larerType
+ }).then(res => {
+ this.count = res.count
this.relationArr = res.users
+ // if(res.users != '')this.identity = res.users[0].identity
+
}).catch(err => {
uni.showToast({
title: err.message,
icon: "none"
})
})
+ },
+ // 状态筛选
+ onTabs(val){
+ if(this.larerType === val) return
+ this.larerType = val
+
+ // 获取商品详情数据
+ this.relationsInfo();
+ },
+
+ //拨打电话
+ telClick(e){
+ uni.makePhoneCall({
+ phoneNumber: e
+ });
}
}
}
@@ -50,54 +99,116 @@
background: #f3f4f6;
}
- .While {
- border-radius: 10rpx;
- margin-bottom: 30rpx;
+ .all {
background-color: #FFFFFF;
- padding:30rpx;
- box-sizing: border-box;
- box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .05);
+ position: relative;
+ height: 220rpx;
+ .all-back {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
+ .all-text {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+ padding: $padding;
+ box-sizing: border-box;
+ color: #FFFFFF;
+ font-size: $title-size + 2;
+ font-weight: 600;
+ .number {
+ font-size: $title-size + 30;
+ font-weight: 600;
+ margin-top: 10rpx;
+ text {
+ font-size: $title-size-sm;
+ }
+ }
+ }
+ }
+
+ .tab {
+ height: 60rpx;
+ line-height: 60rpx;
+ position: relative;
+ display: flex;
+ margin-top: -20rpx;
+ .item {
+ flex: 2;
+ text-align: center;
+ border-radius: $radius $radius 0 0;
+ font-weight: 600;
+ background-color: #1e50f1;
+ color: #b4c8ff;
+ &.active {
+ background-color: #FFFFFF;
+ color: #000000;
+ }
+ image {
+ width: 34rpx;
+ height: 34rpx;
+ vertical-align: -7rpx;
+ margin-right: 10rpx;
+ }
+ }
}
.list {
- border-radius: 10rpx;
- margin: 30rpx;
- position: relative;
- .list-cover {
- width: 90rpx;
- height: 90rpx;
- border-radius: 50%;
- }
- .list-text{
- position: absolute;
- width: 100%;
- padding: 30rpx 30rpx 0 150rpx;
- box-sizing: border-box;
- left: 0;
- top: 0;
- .list-text-name {
- line-height: 40rpx;
- display: flex;
- font-size: 34rpx;
- margin-bottom: 10rpx;
- .list-like-online {
- font-weight: normal;
- font-size: 24rpx;
- border: solid 2rpx #edb25f;
- color: #edb25f;
- border-radius: 4rpx;
- display: inline-block;
- height: 32rpx;
- line-height: 32rpx;
- padding: 0 10rpx;
- margin: 4rpx 15rpx;
+ background-color: #FFFFFF;
+ padding: $padding;
+ box-sizing: border-box;
+ .item {
+ margin-bottom: $margin;
+ display: flex;
+ border-bottom: 2rpx solid #f3f3f3;
+ padding-bottom: $padding;
+ position: relative;
+ .list-cover {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 50%;
+ }
+ .list-text {
+ width: calc(100% - 120rpx);
+ margin-left: 20rpx;
+ margin-top: 5rpx;
+ .list-nick {
+ display: flex;
+ .name {
+ font-weight: 600;
+ }
+ .user-sex {
+ width: 40rpx;
+ margin-left: 10rpx;
+ }
+ }
+ .identity {
+ margin-top: 10rpx;
+ .user-identity {
+ width: 130rpx;
+ }
+ }
+ .list-user {
+ background-color: #f2f5fd;
+ width: 70rpx;
+ height: 70rpx;
+ border-radius: 50%;
+ text-align: center;
+ padding: 18rpx;
+ box-sizing: border-box;
+ position: absolute;
+ right: 0;
+ top: 20rpx;
+ image {
+ width: 100%;
+ }
}
}
- .list-text-time{
- font-size: 26rpx;
- line-height: 38rpx;
- color: #919191;
- }
}
- }
+ }
diff --git a/pages/index/details.vue b/pages/index/details.vue
index 1cbc896..51aefc6 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -3,15 +3,14 @@
-
-
- 记录三高
+
-
- 活动分享
-
-
+ -->
@@ -82,6 +81,8 @@
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ffd95ef..ee12bc7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,352 +1,266 @@
-
-
-
-
-
-
-
-
- 健康饮食
- 食品知识小科普
-
-
-
-
-
- 锶源昆仑
- 天然矿泉水
-
-
-
-
-
-
-
-
-
-
- 血糖
- 最近一次记录
-
- {{ caseData ? caseData.quantity : 0 }}mmol/L
-
- {{ caseData ? caseData.created_at : '暂无记录时间' }}
-
-
-
-
- 血脂
- 最近一次记录
-
- {{ caseData ? caseData.quantity : 0 }}mmol/L
-
- {{ caseData ? caseData.created_at : '暂无记录时间' }}
-
-
-
-
- 血压
- 最近一次记录
-
- {{ caseData ? caseData.quantity : 0 }} mmHg
-
- {{ caseData ? caseData.created_at : '暂无记录时间' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请先添加个人档案,成功后可添加记录
-
- 去添加
-
+
+
+
+
+
+
+
diff --git a/pages/index/pay.vue b/pages/index/pay.vue
new file mode 100644
index 0000000..d4e6109
--- /dev/null
+++ b/pages/index/pay.vue
@@ -0,0 +1,190 @@
+
+
+
+
+ 需支付金额(元)
+
+
+ ¥{{this.$Route.query.total}}
+
+
+
+
+
+ 微信支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/place.vue b/pages/index/place.vue
new file mode 100644
index 0000000..68379f6
--- /dev/null
+++ b/pages/index/place.vue
@@ -0,0 +1,358 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/write.vue b/pages/index/write.vue
new file mode 100644
index 0000000..29c4ecc
--- /dev/null
+++ b/pages/index/write.vue
@@ -0,0 +1,313 @@
+
+
+
+
+
+
+
+
+
+
+ +{{score}}
+ 水滴
+
+
+
+ 水滴已发放!
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+ 月卡会员
+ 季卡会员
+ 年卡会员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击开通会员
+
+
+ 立即续费
+
+
+ {{buttonText}}
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ 创始会员
+ 合伙人
+
+
+
+
+
+
+ {{identities.name}}
+
+
+
+
+ {{identities.times.serial}}
+
+
+
+ 到期时间:
+
+
+ {{identities.times.ended_at}}
+
+
+
+
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+ {{item.text}}
+
+
+ 现金
+
+
+
+
+
+
+ {{orderId == 5 ? '创始会员' : '合伙人'}}权益说明
+
+
+
+ {{index + 1}}
+
+ {{item.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+ {{status.text}}
+
+
+ {{status.text}}
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+ 季卡会员
+
+
+ 年卡会员
+
+
+
+
+
+
+
+ {{identities.name}}
+
+
+
+
+ {{identities.times.serial}}
+
+
+ 到期时间: {{identities.times.ended_at}}
+
+
+
+
+ 开通{{tabType == 'season' ? '季卡' : '年卡'}}会员金额
+
+
+ ¥{{identities.price}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name == 'recommend_coupon' ? '¥' : '+'}}
+ {{item.name == 'open_nk' ? '' : '+'}}
+ {{item.value}}
+
+
+ {{item.text}}
+
+
+ {{item.name == 'recommend_coupon' ? '券' : '水滴'}}
+
+
+ 折
+ 水
+ 水滴
+
+
+
+
+
+
+ {{tabType == 'season'?'季卡' : '年卡'}}权益说明
+
+
+
+ {{index + 1}}
+
+ {{item.remark}}
+
+
+
+
+
+
+
+
+
+ ¥{{identities.price}}
+ (抵值券¥{{couponPrice}})
+ ({{tabType == 'season'?'季卡会员' : '年卡会员'}})
+
+
+ 立即开通
+
+
+
+ 立即续费
+
+
+ {{buttonText}}
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+ 排名
+
+
+
+ 联系方式
+
+
+
+ {{index + 1}}
+
+
+ {{item.user.nickname}}
+
+ {{item.user.username}}
+
+
+
+
+ 捐赠份数
+
+
+ {{item.total}}份
+
+
+
+
+
+
+
+
+
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 @@