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

custom-tab-bar/index.wxss

@@ -211,13 +211,6 @@
   content: "\e6cf";
 }
 
-
-page {
-  --main-color: #ffffff;
-  --minor-color: #ffffff;
-  --theme-color:#EF114C;
-}
-
 @font-face {
   font-family: "ant";
   src: url('//cdn.mayi888.com/static/font/ant-171b61a6fb.eot');

src/App.vue

 <script>
 import shop from "@/api/shop";
-
+import {themeColor} from "@/utils/mayi"
 export default {
   created() {
     // NODE_ENV
@@ -10,7 +10,7 @@ export default {
       process.env.NODE_ENV == "development" ||
       JSON.stringify(extConfig) == "{}"
     ) {
-      extConfig = { mixid: "antgood" };
+      extConfig = { mixid: "antgood", shopid:67};
     }
     console.log("1444444444", extConfig.mixid);
     this.$store.commit("setExtConfig", extConfig.mixid);
@@ -40,12 +40,12 @@ export default {
     // 初始
     this.getShopInfo(extConfig);
     // 页面配置信息
-    this.getThemePage();
+    this.getThemePage(extConfig);
   },
   methods: {
     //商城配置
-    getShopInfo(extConfig) {
-      shop.getShopInfo({ shopMixId: "antgood" }).then((res) => {
+    getShopInfo({mixid}) {
+      shop.getShopInfo({ shopMixId: mixid }).then((res) => {
         if (res.data.code == 200) {
           let mpApp = getApp();
           // 商城基本数据
@@ -69,14 +69,20 @@ export default {
               mpApp.footerCallBack(footerVal);
             }
           }
+
+          // 设置主题色
+          themeColor['--main-color']=val.themeColor.mainColor
+          themeColor['--minor-color']=val.themeColor.minorColor
+          // 
+          console.log(this.mpApp,'mmmmm74',themeColor)
         }
       });
     },
-    getThemePage() {
+    getThemePage({mixid,shopid}) {
       shop
         .themePagesInfo({
-          shopid: 67,
-          shopMixId: "antgood",
+          shopid,
+          shopMixId: mixid,
         })
         .then((response) => {
           if (response.data.code == 200) {
@@ -128,4 +134,5 @@ export default {
 /* @import url("../static/nicon/iconfont.css"); */
 @import url("../static/font/iconfont.css");
 @import url("../static/css/common.scss");
+
 </style>

src/utils/mayi.js

+// 主题色
+export let themeColor={
+    "--main-color": "#ffffff",
+    "--minor-color": "#ffffff"
+}
+
+
 // 获取link 中页面地址(link兼容 有object或者string)
 export function getUrlofLink(data) {
     return data.link