From ba4626eb4272529aece9cc3100b23be8801f11a1 Mon Sep 17 00:00:00 2001 From: yanghao <781521347@qq.com> Date: Mon, 23 Aug 2021 09:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ShopLiveCard.vue | 2 +- config/index.js | 4 ++-- manifest.json | 9 +-------- pages.json | 28 +++++++++++++-------------- pages/course/detail.vue | 24 +++++++++++++++-------- pages/home/components/Live.vue | 2 +- pages/home/index.vue | 4 ++-- pages/knowledge/index.vue | 10 +++++++--- pages/serviceTeacher/courseDetail.vue | 7 +++++-- pages/study/dabang.vue | 7 +++---- pages/study/detail.vue | 2 ++ pages/user/PersonalData/index.vue | 6 ++++++ pages/user/User/index.vue | 4 ++++ 13 files changed, 64 insertions(+), 45 deletions(-) diff --git a/components/ShopLiveCard.vue b/components/ShopLiveCard.vue index 697e319..a886766 100644 --- a/components/ShopLiveCard.vue +++ b/components/ShopLiveCard.vue @@ -39,7 +39,7 @@ HAS_LIVE = true let livePlayer = null; if (HAS_LIVE) { - livePlayer = requirePlugin('live-player-plugin'); + // livePlayer = requirePlugin('live-player-plugin'); } // #endif let timer = null; diff --git a/config/index.js b/config/index.js index 8e753ab..263d6a0 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' -// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' // export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' -export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' +export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api' +// export const VUE_APP_API_URL = 'https://hm2a5x.39nat.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index ca0cb31..873c549 100644 --- a/manifest.json +++ b/manifest.json @@ -135,7 +135,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wx030578b829a4a49a", + "appid" : "wx240613bb73760835", "setting" : { "urlCheck" : false, "es6" : true, @@ -147,13 +147,6 @@ "scope.userLocation" : { "desc" : "你的位置信息将用于小程序位置接口的效果展示" } - }, - "plugins" : { - // #ifdef MP-WEIXIN - "live-player-plugin" : { - "version" : "1.2.8", - "provider" : "wx2b03c6e691cd7370" - } } }, // #endif diff --git a/pages.json b/pages.json index bf17b76..3e8c84a 100644 --- a/pages.json +++ b/pages.json @@ -43,20 +43,20 @@ "navigationBarTitleText": "禅易教育研究院" } }, - { - "path": "pages/diandeng/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - }, - { - "path": "pages/diandeng/lighting", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - }, + // { + // "path": "pages/diandeng/index", + // "style": { + // "navigationBarTitleText": "", + // "navigationStyle": "custom" + // } + // }, + // { + // "path": "pages/diandeng/lighting", + // "style": { + // "navigationBarTitleText": "", + // "navigationStyle": "custom" + // } + // }, { "path": "pages/course/index", "style": { diff --git a/pages/course/detail.vue b/pages/course/detail.vue index 3b242a8..c08ccd3 100644 --- a/pages/course/detail.vue +++ b/pages/course/detail.vue @@ -2,7 +2,9 @@ - + + + + 累计打卡{{item.counts}}次 diff --git a/pages/study/detail.vue b/pages/study/detail.vue index 5167881..b246604 100644 --- a/pages/study/detail.vue +++ b/pages/study/detail.vue @@ -93,6 +93,7 @@ import { getStudyDetail , enterStudyList } from '@/api/knowledge'; import { mapState, mapGetters, mapMutations, mapActions } from 'vuex' import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user' + import dayjs from 'dayjs' export default { computed: mapGetters(['userInfo']), data() { @@ -135,6 +136,7 @@ }) .then(res => { if(res.success){ + thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time)) thit.$store.dispatch('userInfo', true) uni.hideLoading() uni.showToast({ diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue index e751194..f07cb8a 100644 --- a/pages/user/PersonalData/index.vue +++ b/pages/user/PersonalData/index.vue @@ -285,6 +285,12 @@ export default { setTimeout(()=>{ this.$yrouter.back(); },2000) + } else{ + uni.showToast({ + title: res.msg, + icon: "none", + duration: 2000, + }); } }, (err) => { diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index 617df35..b0a8b23 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -226,6 +226,7 @@ import cookie from '@/utils/store/cookie' import SwitchWindow from '@/components/SwitchWindow' import Authorization from '@/pages/authorization/index' import { signCourse } from '@/api/knowledge' +import dayjs from 'dayjs' const NAME = 'User' export default { @@ -371,6 +372,7 @@ export default { getPhoneNumber: function(e) { let thit = this // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定 + console.log(e) if (e.mp.detail.errMsg == 'getPhoneNumber:ok') { uni.showLoading({ title: '绑定中', @@ -381,7 +383,9 @@ export default { }) .then(res => { // this.User(); + console.log(res.data) if(res.success){ + thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time)) thit.$store.dispatch('userInfo', true) uni.hideLoading() uni.showToast({