Merge branch 'feature-mmcai'

pages/index/index.vue

@@ -41,11 +41,19 @@
 
 			<!-- 金刚位 -->
 			<view v-if="index['shortcutList']" class="i-list">
-				<view class='mian-item' v-for="(item, index) in JSON.parse(index['shortcutList'])" :key="item.id"
-					@click="jump(item, index, 'diamond')">
-					<image class='item-img' :src='item.url'></image>
-					<view class='item-text'>{{ item.name }}</view>
-				</view>
+
+				<template v-for="(item, index) in JSON.parse(index['shortcutList'])">
+
+					<view class='mian-item'
+						v-if="item.tager !== 'uni:/subPackage/indexfinance/index,tab'"
+						:key="item.id" @click="jump(item, index, 'diamond')">
+						<image class='item-img' :src='item.url'></image>
+						<view class='item-text'>{{ item.name }}</view>
+					</view>
+
+				</template>
+
+
 			</view>
 
 
@@ -114,6 +122,7 @@ export default {
 			IndexList: indexGoods,
 			index: cacheIndexData,
 			isFixed: false,
+			deviceBrand: uni.getSystemInfoSync().deviceBrand,
 
 
 			// 商品过滤

utils/index.js

@@ -58,15 +58,16 @@ export const switchShowTabbar = async () => {
         try {
             const res = await API.initTabBar()
             const { data } = res.result
-            if (data) {
-                uni.setStorageSync('loanSwitch',true)
+            // V1.0.8 版本华为贷款口子不放出来
+            if (data && uni.getSystemInfoSync().deviceBrand !== 'huawei') {
+                uni.setStorageSync('loanSwitch', true)
                 uni.setTabBarItem({
                     index: 1,
                     text: '贷款',
                     visible: true,
                 })
             } else {
-                uni.setStorageSync('loanSwitch',false)
+                uni.setStorageSync('loanSwitch', false)
                 uni.setTabBarItem({
                     index: 1,
                     visible: false