111

manifest.json

@@ -2,8 +2,8 @@
     "name" : "心灵空间",
     "appid" : "__UNI__BBBDFD2",
     "description" : "心灵空间",
-    "versionName" : "1.0.33",
+    "versionName" : "1.0.37",
-    "versionCode" : 1033,
+    "versionCode" : 1037,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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: {
 		//判断显示‘上/中/下’

pages/curriculum/order/index.vue

@@ -65,7 +65,7 @@
 								</view>
 							</view>
 							
-							<view class="not_purchased" v-if="slotProps.data.type != 0&&!showNewPayBtn[0].status">
+							<view class="not_purchased" v-if="slotProps.data.type != 0&&!showNewPayBtn[slotProps.dataIndex].status">
 								<view class="spot"></view>
 								<view>
 									<text v-if="userVip==null&&slotProps.data.isBuy!=1">未购买</text>
@@ -76,11 +76,25 @@
 									<text v-if="userVip!=null">有效期至{{ userVip.endTime }}</text>
 								</view>
 							</view>
-							<view class="right">
+	
+							<view class="right" v-if="slotProps.dataIndex==0">
+								
 								<text v-if="slotProps.data.type == 0&&userVip==null&&slotProps.data.isBuy!=1" style="color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
 									@click="handleClickGetGoodsList(slotProps.data)">领取课程</text>
 									
-								<text v-else-if="showNewPayBtn[0]&&showNewPayBtn[0].status" style=" background: #f42c32; border: 0; padding: 15rpx 30rpx; color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
+								<text v-else-if="showNewPayBtn[0]&&showNewPayBtn[0].status==true" style=" background: #f42c32; border: 0; padding: 15rpx 30rpx; color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
+									@click="goNewPay(slotProps.data)">复读</text>
+									
+								<u-icon v-else-if="userVip==null&&slotProps.data.type != 0&&slotProps.data.isBuy!=1"
+									@click="handleClickGetGoodsList(slotProps.data)" class="editIcon" name="shopping-cart-fill"
+									color="#FF2B57" size="28"></u-icon>
+							</view>
+							<view class="right" v-else>
+								
+								<text v-if="slotProps.data.type == 0&&userVip==null&&slotProps.data.isBuy!=1" style="color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
+									@click="handleClickGetGoodsList(slotProps.data)">领取课程</text>
+									
+								<text v-else-if="showNewPayBtn[slotProps.dataIndex]&&showNewPayBtn[slotProps.dataIndex].status==true" style=" background: #f42c32; border: 0; padding: 15rpx 30rpx; color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
 									@click="goNewPay(slotProps.data)">复读</text>
 									
 								<u-icon v-else-if="userVip==null&&slotProps.data.type != 0&&slotProps.data.isBuy!=1"

pages/home/index.vue

@@ -10,6 +10,7 @@
 			</view>
 			<!-- 应对华为审核，去掉app跳转 -->
 			<view class="appJump">
+				
 				<view class="app_item wumen" @click="appjumpfun('wumen')">
 					<view class="img">
 						<image src="@/static/logo_wumen.png"></image>
@@ -18,6 +19,14 @@
 						<text>吴门医述</text>
 					</view>
 				</view>
+				<view class="app_item taihu" @click="appjumpfun('taihu')" v-if="isShowTaihu">
+					<view class="img">
+						<image src="@/static/logo_taihu.png"></image>
+					</view>
+					<view class="text">
+						<text>太湖云医</text>
+					</view>
+				</view>
 				<view class="app_item zmzm" @click="appjumpfun('zmzm')">
 					<view class="img">
 						<image src="@/static/logo_zmzm.png"></image>
@@ -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;