yanghao
/
chanyishenghuo-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

上传代码

chanyi2.0
yanghao 3 years ago
parent
2b9abfec89
commit
ba4626eb42
13 changed files with 64 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      components/ShopLiveCard.vue
  2. 4
      config/index.js
  3. 9
      manifest.json
  4. 28
      pages.json
  5. 14
      pages/course/detail.vue
  6. 2
      pages/home/components/Live.vue
  7. 4
      pages/home/index.vue
  8. 10
      pages/knowledge/index.vue
  9. 7
      pages/serviceTeacher/courseDetail.vue
  10. 5
      pages/study/dabang.vue
  11. 2
      pages/study/detail.vue
  12. 6
      pages/user/PersonalData/index.vue
  13. 4
      pages/user/User/index.vue

2
components/ShopLiveCard.vue
Unescape View File

@ -39,7 +39,7 @@
HAS_LIVE = true HAS_LIVE = true
let livePlayer = null; let livePlayer = null;
if (HAS_LIVE) { if (HAS_LIVE) {
livePlayer = requirePlugin('live-player-plugin'); // livePlayer = requirePlugin('live-player-plugin');
} }
// #endif // #endif
let timer = null; let timer = null;

4
config/index.js
Unescape View File

@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // 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 = '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 = '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 = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://thapi.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'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';

9
manifest.json
Unescape View File

@ -135,7 +135,7 @@
}, },
"quickapp" : {}, "quickapp" : {},
"mp-weixin" : { "mp-weixin" : {
"appid" : "wx030578b829a4a49a", "appid" : "wx240613bb73760835",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"es6" : true, "es6" : true,
@ -147,13 +147,6 @@
"scope.userLocation" : { "scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示" "desc" : "你的位置信息将用于小程序位置接口的效果展示"
} }
},
"plugins" : {
// #ifdef MP-WEIXIN
"live-player-plugin" : {
"version" : "1.2.8",
"provider" : "wx2b03c6e691cd7370"
}
} }
}, },
// #endif // #endif

28
pages.json
Unescape View File

@ -43,20 +43,20 @@
"navigationBarTitleText": "禅易教育研究院" "navigationBarTitleText": "禅易教育研究院"
} }
}, },
{ // {
"path": "pages/diandeng/index", // "path": "pages/diandeng/index",
"style": { // "style": {
"navigationBarTitleText": "", // "navigationBarTitleText": "",
"navigationStyle": "custom" // "navigationStyle": "custom"
} // }
}, // },
{ // {
"path": "pages/diandeng/lighting", // "path": "pages/diandeng/lighting",
"style": { // "style": {
"navigationBarTitleText": "", // "navigationBarTitleText": "",
"navigationStyle": "custom" // "navigationStyle": "custom"
} // }
}, // },
{ {
"path": "pages/course/index", "path": "pages/course/index",
"style": { "style": {

14
pages/course/detail.vue
Unescape View File

@ -2,7 +2,9 @@
<view class="course-detail-index"> <view class="course-detail-index">
<view v-if="$store.getters.token || userInfo.uid"> <view v-if="$store.getters.token || userInfo.uid">
<view class="swiper-box"> <view class="swiper-box">
<view class="swiper-item"><image :src="item" mode="aspectFill" v-for="(item,index) in detail.imageArr"></image></view> <view class="swiper-item">
<image :src="item" mode="aspectFill" v-for="(item,index) in detail.imageArr" :key="index"></image>
</view>
<!-- <swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"> <!-- <swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item v-for="(item,index) in detail.imageArr" :key="index"> <swiper-item v-for="(item,index) in detail.imageArr" :key="index">
<view class="swiper-item"><image :src="item" mode="aspectFill"></image></view> <view class="swiper-item"><image :src="item" mode="aspectFill"></image></view>
@ -186,6 +188,7 @@
<script> <script>
// import WucTab from '@/components/wuc-tab/wuc-tab.vue'; // import WucTab from '@/components/wuc-tab/wuc-tab.vue';
import { mapState, mapGetters, mapMutations, mapActions } from 'vuex' import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
import dayjs from 'dayjs'
import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user' import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user'
import { getCourseDetail ,enterCourse } from '@/api/knowledge'; import { getCourseDetail ,enterCourse } from '@/api/knowledge';
import Authorization from '@/pages/authorization/index' import Authorization from '@/pages/authorization/index'
@ -226,12 +229,16 @@
} else{ } else{
this.courseId = this.$yroute.query.id; this.courseId = this.$yroute.query.id;
} }
if(this.userInfo.uid){
this.getDetail() this.getDetail()
this.$nextTick(()=>{ this.$nextTick(()=>{
this.getHeightArr() this.getHeightArr()
}) })
} // if(this.userInfo.uid){
// this.getDetail()
// this.$nextTick(()=>{
// this.getHeightArr()
// })
// }
}, },
computed:{ computed:{
userInfo(){ userInfo(){
@ -260,6 +267,7 @@
}) })
.then(res => { .then(res => {
if(res.success){ if(res.success){
thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
thit.$store.dispatch('userInfo', true) thit.$store.dispatch('userInfo', true)
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({

2
pages/home/components/Live.vue
Unescape View File

@ -28,7 +28,7 @@
HAS_LIVE = true HAS_LIVE = true
let livePlayer = null; let livePlayer = null;
if (HAS_LIVE) { if (HAS_LIVE) {
livePlayer = requirePlugin('live-player-plugin'); // livePlayer = requirePlugin('live-player-plugin');
} }
// #endif // #endif
import { import {

4
pages/home/index.vue
Unescape View File

@ -158,7 +158,7 @@ import Banner from './components/Banner'
import HotCommodity from './components/HotCommodity' import HotCommodity from './components/HotCommodity'
import FirstNewProduct from './components/FirstNewProduct' import FirstNewProduct from './components/FirstNewProduct'
import ProductsRecommended from './components/ProductsRecommended' import ProductsRecommended from './components/ProductsRecommended'
import Live from './components/Live' // import Live from './components/Live'
import { getHomeData, getShare, getCanvas } from '@/api/public' import { getHomeData, getShare, getCanvas } from '@/api/public'
import cookie from '@/utils/store/cookie' import cookie from '@/utils/store/cookie'
@ -188,7 +188,7 @@ export default {
HotCommodity, HotCommodity,
FirstNewProduct, FirstNewProduct,
ProductsRecommended, ProductsRecommended,
Live, // Live,
}, },
props: {}, props: {},
data: function() { data: function() {

10
pages/knowledge/index.vue
Unescape View File

@ -25,14 +25,14 @@
</view> </view>
<view class="content-box"> <view class="content-box">
<view class="knowledge-list"> <view class="knowledge-list">
<view class="knowledge-item acea-row" v-if="articleList.length > 0" v-for="item in articleList" @click="toDetail(item.id)"> <view class="knowledge-item acea-row" v-if="articleList.length > 0" v-for="item in articleList" :key="item.id" @click="toDetail(item.id)">
<view class="img-box"> <view class="img-box">
<image :src="item.imageInput" mode="aspectFill"></image> <image :src="item.imageInput" mode="aspectFill"></image>
</view> </view>
<view class="knowledge-info-box acea-row row-column row-between"> <view class="knowledge-info-box acea-row row-column row-between">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="title line1">{{item.title}}</view> <view class="title line2">{{item.title}}</view>
<view class="intro">{{item.synopsis}}</view> <view class="intro line1">{{item.synopsis}}</view>
</view> </view>
<view class="type-box acea-row"> <view class="type-box acea-row">
<view class="tip" :class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'"> <view class="tip" :class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
@ -116,9 +116,13 @@
this.currentTab = item this.currentTab = item
this.tabSelect = index this.tabSelect = index
this.moveTo(index) this.moveTo(index)
if(item.categoryList.length > 0){ if(item.categoryList.length > 0){
this.$set(this, 'active', item.categoryList[0].id) this.$set(this, 'active', item.categoryList[0].id)
} else{
this.$set(this, 'active', null)
} }
console.log(item)
this.secondMenu = item.categoryList this.secondMenu = item.categoryList
this.getArticle() this.getArticle()
}, },

7
pages/serviceTeacher/courseDetail.vue
Unescape View File

@ -11,7 +11,9 @@
<view class="state-box default" v-if="detail.courseState == 3">已取消</view> <view class="state-box default" v-if="detail.courseState == 3">已取消</view>
<view class="name">{{detail.courseName}}</view> <view class="name">{{detail.courseName}}</view>
</view> </view>
<view class="desc">{{detail.courseIntroduce}}</view> <view class="desc">
<rich-text class="content" :nodes="detail.courseIntroduce"></rich-text>
</view>
</view> </view>
<view class="course-active-box"> <view class="course-active-box">
<view class="title-box acea-row row-middle">活动时间及地点</view> <view class="title-box acea-row row-middle">活动时间及地点</view>
@ -135,7 +137,8 @@
getDetail(){ getDetail(){
getCourseDetail(this.id).then(res=>{ getCourseDetail(this.id).then(res=>{
if(res.success){ if(res.success){
this.detail = res.data this.detail = res.data;
res.data.courseIntroduce = res.data.courseIntroduce.replace(/\<img/g, "<img style='width: 100%;'")
} }
}) })
}, },

5
pages/study/dabang.vue
Unescape View File

@ -83,15 +83,14 @@
<view class="rank-img" v-if="index == 0"><image src="../../static/num1.png" mode=""></image></view> <view class="rank-img" v-if="index == 0"><image src="../../static/num1.png" mode=""></image></view>
<view class="rank-img" v-if="index == 1"><image src="../../static/num2.png" mode=""></image></view> <view class="rank-img" v-if="index == 1"><image src="../../static/num2.png" mode=""></image></view>
<view class="rank-img" v-if="index == 2"><image src="../../static/num3.png" mode=""></image></view> <view class="rank-img" v-if="index == 2"><image src="../../static/num3.png" mode=""></image></view>
<view class="ranking" v-if="index > 2">{{index+1}}</view> <view class="ranking" v-if="index > 2">{{index+1}}</view>
<view class="header-img"><image :src="item.headImg" mode=""></image></view> <view class="header-img"><image :src="item.headImg" mode=""></image></view>
<view class="name line1">{{item.realName}}</view> <view class="name line1">{{item.realName}}</view>
</view> </view>
<view class="acea-row row-column row-center-wrapper"> <view class="acea-row row-column row-center-wrapper">
<view>完成打榜{{item.finishNum}}项</view> <view>完成打榜{{item.finishNum}}项</view>
<view class="jifen">{{item.integral}}积分</view> <!-- <view class="jifen">{{item.integral}}积分</view> -->
<view class="jifen">累计打卡{{item.counts}}次</view>
</view> </view>
</view> </view>
</view> </view>

2
pages/study/detail.vue
Unescape View File

@ -93,6 +93,7 @@
import { getStudyDetail , enterStudyList } from '@/api/knowledge'; import { getStudyDetail , enterStudyList } from '@/api/knowledge';
import { mapState, mapGetters, mapMutations, mapActions } from 'vuex' import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user' import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user'
import dayjs from 'dayjs'
export default { export default {
computed: mapGetters(['userInfo']), computed: mapGetters(['userInfo']),
data() { data() {
@ -135,6 +136,7 @@
}) })
.then(res => { .then(res => {
if(res.success){ if(res.success){
thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
thit.$store.dispatch('userInfo', true) thit.$store.dispatch('userInfo', true)
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({

6
pages/user/PersonalData/index.vue
Unescape View File

@ -285,6 +285,12 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.$yrouter.back(); this.$yrouter.back();
},2000) },2000)
} else{
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000,
});
} }
}, },
(err) => { (err) => {

4
pages/user/User/index.vue
Unescape View File

@ -226,6 +226,7 @@ import cookie from '@/utils/store/cookie'
import SwitchWindow from '@/components/SwitchWindow' import SwitchWindow from '@/components/SwitchWindow'
import Authorization from '@/pages/authorization/index' import Authorization from '@/pages/authorization/index'
import { signCourse } from '@/api/knowledge' import { signCourse } from '@/api/knowledge'
import dayjs from 'dayjs'
const NAME = 'User' const NAME = 'User'
export default { export default {
@ -371,6 +372,7 @@ export default {
getPhoneNumber: function(e) { getPhoneNumber: function(e) {
let thit = this let thit = this
// 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定 // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
console.log(e)
if (e.mp.detail.errMsg == 'getPhoneNumber:ok') { if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
uni.showLoading({ uni.showLoading({
title: '绑定中', title: '绑定中',
@ -381,7 +383,9 @@ export default {
}) })
.then(res => { .then(res => {
// this.User(); // this.User();
console.log(res.data)
if(res.success){ if(res.success){
thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
thit.$store.dispatch('userInfo', true) thit.$store.dispatch('userInfo', true)
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({

Write Preview
Loading…
Cancel
Save