Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/App.vue

@@ -14,7 +14,7 @@ export default {
       process.env.NODE_ENV == "production" ||
       JSON.stringify(extConfig) == "{}"
     ) {
-      extConfig = { mixid: "antgood", shopid: 67 };
+      // extConfig = { mixid: "antgood", shopid: 67 };
       // extConfig = { "mixid":"xyyx",
       // "shopid":133 };
     }

src/main.js

@@ -12,13 +12,15 @@ import classificationApi from "./api/classification";
 import spokesmanApi from './api/spokesman'
 import { DFSImg, concatUrl } from "@/utils/index";
 import fenxiaoModel from "@/utils/fenxiaoModel";
-import {
-  $themeAddToCard,
-  $themeArticleLike,
-  getCoupon,
-  themeMemberCardClick
-} from "@/utils/mayi";
+// import {
+//   $themeAddToCard,
+//   $themeArticleLike,
+//   getCoupon,
+//   themeMemberCardClick
+// } from "@/utils/mayi";
+import { $themeToLink, $themeAddToCard, $themeArticleLike } from "@/utils/mayi";
 import "@/utils/themeModule";
+// import { themeToLinkInit } from "@/utils/themeModule";
 import shop from "./api/shop";
 import spokesman from "@/api/spokesman";
 
@@ -83,6 +85,8 @@ mpApp.indexBgCallBack = function(){ }
 
 // 全局数据
 mpApp.processEnv = process.env;
+// 全局跳转 data为link对象
+mpApp.$themeToLink = $themeToLink
 console.log('3555555', wx)
 // 全局加入购物车
 mpApp.$themeAddToCard = $themeAddToCard

static/nativeComponents/custom-tab-bar/index.wxml

@@ -29,7 +29,7 @@
 				</view>
 			</view>
 			<!-- 名称 -->
-			<view class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? componentData.selectionTextNum*2 : componentData.defaultTextNum*2}}rpx">
+			<view class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? (componentData.selectText==1?10:componentData.selectionTextNum)*2 : (componentData.defaultText==1?10:componentData.defaultTextNum)*2}}rpx">
 				{{item.title}}</view>
 			<!-- 购物车商品数量 -->
 			<view class="isCart" wx:if="{{item.link&&item.link.link&&item.link.link=='/shopCart/shoppingCart'&&cartNum>0}}">

static/nativeComponents/custom-tab-bar/index.wxss

@@ -1237,10 +1237,9 @@
   /* font-size: 10px; */
 }
 
-/* .img-view{
-  display: flex;
-  align-items: center;
-} */
+.img-view{
+  margin:auto;
+} 
 .img-view image{
   /* object-fit: contain; */
   width: 100%;