Merge remote-tracking branch 'origin/developer' into developer

components/cm-module/homeIndex/pageSpecial.vue

@@ -48,6 +48,20 @@
 							<view class="tui-goods__text" v-if="flIndex > 0">{{ info.title }}</view>
 						</view>
 					</view>
+                    <!-- 采美百科 -->
+                    <view class="tui-goods__item" v-if="tempData.baikeList.length > 0">
+                    	<view class="tui-group-name" @click="NavArticlePath('https://www.caimei365.com/encyclopedia/product.html')">
+                    		<view class="tui-group-title"><text>热门百科</text></view>
+                    		<view class="iconfont icon-xiayibu"></view>
+                    	</view>
+                    	<view class="tui-goods__main" :class="flIndex == 0 ? 'one' : ''" v-for="(item, flIndex) in tempData.baikeList" :key="flIndex" @click="NavArticlePath(item.link)">
+                    		<view class="tui-goods__imgbox" v-if="flIndex === 0">
+                    			<image :src="item.image" mode="" class="tui-goods__img"></image>
+                    			<view class="tui-goods__name">{{ item.name }}</view>
+                    		</view>
+                    		<view class="tui-goods__text" v-if="flIndex > 0">{{ item.name }}</view>
+                    	</view>
+                    </view>
 				</view>
 			</scroll-view>
 		</view>

services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.67:8008'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:8008'	 	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
-    URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    // URL_CONFIG = 'https://spi.caimei365.com'
 }else{ 
     // 生产环境
     // URL_CONFIG = 'https://spi-b.caimei365.com'