diff --git a/common/config.js b/common/config.js
index 8b8ae54..f18fc9f 100644
--- a/common/config.js
+++ b/common/config.js
@@ -2,16 +2,15 @@ const mode = 'devLocal'; //devLocal：本地测试、devOnline：线上测试、
let ROOTPATH = ''; //域名
switch (mode) {
case 'devLocal':
- ROOTPATH = "http://h5.ali251.langye.net"
+ ROOTPATH = "//h5.ali251.langye.net"
break;
case 'devOnline':
- ROOTPATH = "https://xxxxx.cn"
+ ROOTPATH = ""
break;
case 'production':
- ROOTPATH = "http://h5.ali251.langye.net"
+ ROOTPATH = "//h5.ali251.langye.net"
break;
default:
throw new Error('未配置环境');
- console.log(`未配置环境`);
}
export { ROOTPATH }
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 8fe32fb..85376f8 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -55,7 +55,7 @@ const install = (Vue, vm) => {
}
} else {
uni.showToast({
- icon: "fail",
+ icon: "none",
title: res.statusCode
})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d843b45..911784d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,7 +22,7 @@
-
+
@@ -107,7 +107,6 @@ import popover from "@/component/popover/index.vue";
}
},
onLoad() {
- this.getNotices()
},
methods: {
toRaffle() {
@@ -127,33 +126,35 @@ import popover from "@/component/popover/index.vue";
},
sendCode() {
- if(!/^1[3-9]\d{9}$/.test(`192${this.inputMobile}`)) {
- uni.showToast({
- icon: 'none',
- title: '手机号不正确'
+ // if(!/^1[3-9]\d{9}$/.test(`192${this.inputMobile}`)) {
+ // uni.showToast({
+ // icon: 'none',
+ // title: '手机号不正确'
+ // })
+ // return
+ // }
+ if(this.$refs.uCode.canGetCode) {
+ this.$refs.uCode.start()
+ this.$u.api.sendSms({
+ tempate_key: 'sms_code_template',
+ mobile: this.inputMobile
+ //`192${this.inputMobile}`
+ }).then(res => {
+ uni.showToast({
+ icon: 'none',
+ title: res.msg
+ })
})
} else {
- if(this.$refs.uCode.canGetCode) {
- this.$refs.uCode.start()
- this.$u.api.sendSms({
- tempate_key: 'sms_code_template',
- mobile: `192${this.inputMobile}`
- }).then(res => {
- uni.showToast({
- icon: 'none',
- title: res.msg
- })
- })
- } else {
- this.$u.toast('倒计时结束后再发送');
- }
+ this.$u.toast('倒计时结束后再发送');
}
},
bindMobile() {
if(this.code) {
this.$u.api.bindMobile({
- mobile: `192${this.inputMobile}`,
+ mobile: this.inputMobile,
+ //`192${this.inputMobile}`,
code: this.code
}).then(res => {
this.popoverType = 3;
@@ -176,6 +177,16 @@ import popover from "@/component/popover/index.vue";
return 'laugh';
}
}
+ },
+ watch: {
+ vuex_token: {
+ handler(newVal){
+ if(newVal) {
+ this.getNotices()
+ }
+ },
+ immediate: true
+ }
}
}
@@ -205,13 +216,13 @@ import popover from "@/component/popover/index.vue";
& .logo {
- margin-top: 4vh;
+ margin-top: 3vh;
margin-left: 40rpx;
}
& .title {
- margin-top: 4vh;
+ margin-top: 3vh;
}
& .notice {
@@ -221,19 +232,19 @@ import popover from "@/component/popover/index.vue";
color: #fff;
text-align: center;
- margin: .2vh 140rpx 0 140rpx;
+ margin: .1vh 140rpx 0 140rpx;
}
.present {
- margin-top: 0.75vh;
+ margin-top: 0.5vh;
}
.login {
height: 448rpx;
position: relative;
- margin: -5.6vh 60rpx 0 60rpx;
+ margin: -12vh 60rpx 0 60rpx;
padding: 0 52rpx 3.5vh 40rpx;
&-bkg {
filter: drop-shadow(14rpx 14rpx 4rpx rgba(0,0,0,0.3));
@@ -308,7 +319,7 @@ import popover from "@/component/popover/index.vue";
line-height: 32rpx;
text-align: center;
- padding-top: 6.9vh;
+ padding-top: 4vh;
padding-bottom: 2.28vh;
}
}
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 81d4240..c3a5f1e 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -10,7 +10,7 @@
-
+
@@ -48,10 +48,10 @@
{{ i.draw_prize ? i.draw_prize.name : '' }}
- {{ i.draw_prize ? $moment(i.draw_prize.created_at).format('YYYY-MM-DD') : '' }}
+ {{ i.draw_prize ? $moment(i.created_at).format('YYYY-MM-DD') : '' }}
- {{ btnText(i.is_send) }}
+ {{ btnText(i.is_send) }}
@@ -74,7 +74,6 @@ export default {
const res = await this.$u.api.getPrize()
this.userInfo = res.user
this.draws = res.prize
- console.log(res)
}
},
computed: {
@@ -179,7 +178,7 @@ export default {
align-items: flex-end;
margin-top: 1.22vh;
- padding: 8rpx 30rpx 10rpx 16rpx;
+ padding: 8rpx 20rpx 10rpx 16rpx;
& .icon {
height: 24rpx;
diff --git a/pages/raffle/raffle.vue b/pages/raffle/raffle.vue
index 9c5299d..ec4a63f 100644
--- a/pages/raffle/raffle.vue
+++ b/pages/raffle/raffle.vue
@@ -99,7 +99,7 @@
做任务增加抽奖机会
- {{ item.b }}
+ }" shape="circle" :hair-line="false" :ripple="true" @click="index === 0 ? toShare = true : ''">{{ item.b }}
@@ -261,7 +261,7 @@ export default {
& .title {
- margin-top: 10vh;
+ margin-top: 5vh;
}
& .notice {
@@ -279,7 +279,7 @@ export default {
height: 924rpx;
position: relative;
- margin: 2.9vh auto 0 auto;
+ margin: 2.4vh auto 0 auto;
&-bkg {
z-index: 1;