diff --git a/manifest.json b/manifest.json index 24389a3..e077ff4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.33", - "versionCode" : 1033, + "versionName" : "1.0.37", + "versionCode" : 1037, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/curriculum/list/index.vue b/pages/curriculum/list/index.vue index cbac74d..6a2ab45 100644 --- a/pages/curriculum/list/index.vue +++ b/pages/curriculum/list/index.vue @@ -111,15 +111,7 @@ export default { } }, onShow(){ - let fixed = uni.getStorageSync('fixed'); - //如果是诊断标准子页面返回的 - if(fixed){ - this.activeTab = 1; - }else{ - this.activeTab = 0; - this.getPsycheTree(); - } - this.childrenTab = 0; + }, onLoad(options) { //清除缓存 @@ -146,6 +138,15 @@ export default { text= '城市'; } this.countryText = text; + // let fixed = uni.getStorageSync('fixed'); + // //如果是诊断标准子页面返回的 + // if(fixed){ + // this.activeTab = 1; + // }else{ + this.activeTab = 0; + this.getPsycheTree(); + // } + this.childrenTab = 0; }, methods: { //判断显示‘上/中/下’ diff --git a/pages/curriculum/order/index.vue b/pages/curriculum/order/index.vue index 63c03a6..907f5fc 100644 --- a/pages/curriculum/order/index.vue +++ b/pages/curriculum/order/index.vue @@ -65,7 +65,7 @@ - + 未购买 @@ -76,11 +76,25 @@ 有效期至{{ userVip.endTime }} - + + + 领取课程 - 复读 + + + + + + 领取课程 + + 复读 + @@ -18,6 +19,14 @@ 吴门医述 + + + + + + 太湖云医 + + @@ -117,6 +126,7 @@ import $http from "@/config/requestConfig.js"; export default { data() { return { + isShowTaihu:false, curriculumList: [], curriculumList: [ { @@ -144,10 +154,15 @@ export default { cateIndex: 0 //分类默认选中第一个 } }, - onLoad() { + onLoad() {if (plus.os.name == "Android") { + this.isShowTaihu=true + }else{ + this.isShowTaihu=false + } this.getCateList(); }, onShow() { + let cateIndex = uni.getStorageSync('cateIndex'); this.cateIndex = cateIndex; this.getCourseList(); @@ -316,6 +331,10 @@ export default { bagName = "com.cn.medicine"; schemes = "medicine"; } + if (name == "taihu") { + bagName = "com.cn.taimed"; + schemes = "taimed"; + } if (name == "zmzm") { bagName = "com.cn.zmzm"; schemes = "zmzm"; @@ -326,6 +345,7 @@ export default { } if (plus.os.name == "Android") { + //安卓 if ( plus.runtime.isApplicationExist({ @@ -619,7 +639,7 @@ export default { .app_item { background: rgba(255, 255, 255, 0.9); - margin-bottom: 20rpx; + margin-bottom: 10rpx; border: 1px solid #fff; display: flex; align-items: center; diff --git a/static/logo_taihu.png b/static/logo_taihu.png new file mode 100644 index 0000000..ea01649 Binary files /dev/null and b/static/logo_taihu.png differ