diff --git a/App.vue b/App.vue
index c276233..0240a06 100644
--- a/App.vue
+++ b/App.vue
@@ -4,7 +4,9 @@
onLaunch: function() {
console.log('App Launch')
// uni.hideTabBar();
+ // #ifdef MP-WEIXIN
initEid();
+ // #endif
},
onShow: function() {
console.log('App Show')
diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue
index 6cea124..fb5f5c3 100644
--- a/components/searchRow/searchRow.vue
+++ b/components/searchRow/searchRow.vue
@@ -4,7 +4,10 @@
-
+
+ {{ placeholder }}
+
+
@@ -13,7 +16,7 @@
+
+
\ No newline at end of file
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 784794b..43c95ce 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -21,6 +21,7 @@
+
@@ -32,9 +33,10 @@
+
-
-
+
+
@@ -204,7 +206,7 @@
text: '学车指南',
tps: '政府平台 一站服务',
icon: require('../../../static/images/index/img_1@2x.png'),
- url: ''
+ url: '/pages/indexEntry/parse/parse'
},
{
text: '公益视频',
@@ -280,7 +282,9 @@
}
// console.log(this.$store.state.user.vuex_cityInfo)
},
-
+ onPullDownRefresh() {
+ this.getarticleListFn()
+ },
onShow() {
this.$store.dispatch('getUserInfo')
if(!this.swiperInfo.length) {
@@ -356,9 +360,23 @@
success: function(res) {
console.log('条码类型:' + res.scanType);
console.log('条码内容6:' + res.result);
- let coderes = JSON.parse(res.result)
- console.log(coderes)
- console.log(decodeURIComponent(coderes.like))
+ let obj = JSON.parse(res.result)
+ // 扫教练码去报名的
+ if(obj.coachId) {
+ obj.nickname = decodeURIComponent(obj.nickname)
+ obj.schoolName = decodeURIComponent(obj.schoolName)
+ let item = {
+ schoolName: obj.schoolName,
+ schoolId: obj.schoolId,
+ name: obj.nickname,
+ id: obj.coachId
+ }
+ console.log('***********')
+ console.log(item)
+ _this.$store.commit('upDateSchoolClass', {})
+ _this.$store.commit('upDateSchoolCoach', item)
+ _this.$goPage('/pages/indexEntry/enroll/enroll')
+ }
// _this.$store.commit('updateWebVeiwUrl', res.result)
// uni.navigateTo({
diff --git a/pages/userCenter/login/comp/privacyRadion.vue b/pages/userCenter/login/comp/privacyRadion.vue
index 76a57e7..6119cd4 100644
--- a/pages/userCenter/login/comp/privacyRadion.vue
+++ b/pages/userCenter/login/comp/privacyRadion.vue
@@ -4,7 +4,7 @@
- 《用户协议》和 《隐私协议》666
+ 《用户协议》和 《隐私协议》
@@ -15,7 +15,11 @@
methods: {
changeRadio(val) {
this.$emit('changeRadio', val)
+ },
+ async goPage(type) {
+ this.$goPage('/pages/userCenter/login/privacyAgreement/privacyAgreement?type='+ type)
}
+
}
}
diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue
index 61a0e62..c250b68 100644
--- a/pages/userCenter/login/login.vue
+++ b/pages/userCenter/login/login.vue
@@ -21,7 +21,6 @@
我知道了
-
diff --git a/pages/userCenter/login/loginByPhone.vue b/pages/userCenter/login/loginByPhone.vue
index a6e75b8..8bc67f0 100644
--- a/pages/userCenter/login/loginByPhone.vue
+++ b/pages/userCenter/login/loginByPhone.vue
@@ -85,7 +85,8 @@
scene: 1,
mobile: FormData.phone,
}).then(()=>{
- var time = 60;
+ var time = 30;
+ this.codeText = time + "秒后重新发送"
var timer = setInterval(() => {
time--;
this.codeText = time + "秒后重新发送"
diff --git a/pages/userCenter/login/privacyAgreement/privacyAgreement.vue b/pages/userCenter/login/privacyAgreement/privacyAgreement.vue
new file mode 100644
index 0000000..e3da231
--- /dev/null
+++ b/pages/userCenter/login/privacyAgreement/privacyAgreement.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/store/modules/school.js b/store/modules/school.js
index 8412d69..dd7f534 100644
--- a/store/modules/school.js
+++ b/store/modules/school.js
@@ -1,5 +1,4 @@
-// import addApi from '@/api/add.js'; // 引入
const school = {
state: {