Merge branch 'dev' into 'master'

Dev

See merge request !87

pages/courselist/courselist.vue

@@ -79,8 +79,9 @@
 		<view class="productBox">
 		<view class="productBox">
 			<view class="productList" :style="{marginTop}">
 			<view class="productList" :style="{marginTop}">
 				<view class="tabBox">
 				<view class="tabBox">
-					<view :class="{'actived': courseClassify==3}" @click="transform('plan')"><text>规划产品</text></view>
 					<view :class="{'actived': courseClassify==4}" @click="transform('consult')"><text>咨询产品</text></view>
 					<view :class="{'actived': courseClassify==4}" @click="transform('consult')"><text>咨询产品</text></view>
+					
+					<view :class="{'actived': courseClassify==3}" @click="transform('plan')"><text>规划产品</text></view>
 				</view>
 				</view>
 				<view class="productItem" v-for="item in localCourseInfos" :key="item.fileId" >
 				<view class="productItem" v-for="item in localCourseInfos" :key="item.fileId" >
 					<view class="top" @click="goDetail(item)">
 					<view class="top" @click="goDetail(item)">
@@ -234,7 +235,7 @@
 				env:dataHandling.getRuntimeEnv2(),
 				env:dataHandling.getRuntimeEnv2(),
 				shareItem:{},//分享的产品
 				shareItem:{},//分享的产品
 				sharelogin: false,
 				sharelogin: false,
-				courseClassify:3,
+				courseClassify:4,
 				posterImg:'https://yindun-images.oss-cn-shanghai-finance-1-pub.aliyuncs.com/ydMall/product/serviceContent-zx_jqsw1-1.png',
 				posterImg:'https://yindun-images.oss-cn-shanghai-finance-1-pub.aliyuncs.com/ydMall/product/serviceContent-zx_jqsw1-1.png',
 				
 				
 				qrCodeUrl: 'https://example.com',//二维码的链接地址
 				qrCodeUrl: 'https://example.com',//二维码的链接地址
@@ -1224,4 +1225,4 @@
 	 	}
 	 	}
 	 }
 	 }
 	}
 	}
-</style>
+</style>
\ No newline at end of file