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

src/App.vue

@@ -76,6 +76,7 @@ export default {
           // 设置主题色
           themeColor['--main-color']=val.themeColor.mainColor
           themeColor['--minor-color']=val.themeColor.minorColor
+          mpApp.themeColorCallBack(themeColor);
           // 
           console.log(this.mpApp,'mmmmm74',themeColor)
         }

src/main.js

@@ -41,6 +41,7 @@ mpApp.footerCallBack = function () { }
 // webview变化
 mpApp.webviewCallBack = function () { }
 mpApp.shareInit = function () {};
+mpApp.themeColorCallBack = function () {};
 
 console.log('3555555', wx)
 // 全局跳转 data为link对象

src/pages/home/index.vue

 <template>
-  <div class="domain">
+  <div class="domain" :style="{'--main-color':themeColor['--main-color'],'--minor-color':themeColor['--minor-color']}">
     <!-- <view class="ant-daipinglun">1</view> -->
     <!-- <goods-list id="goodsList"></goods-list> -->
     <!-- <scroll-view @scroll="scrolls" @scrolltolower="scrolltolower" style="height:100vh;overflow-y:auto;" scroll-y="true"> -->
@@ -89,7 +89,7 @@ import shopPopup from '@/components/basicTool/shop-popup/index.vue'
 import text from '@/components/content/text'
 import imgText from '@/components/content/imgText'
 import videoPlayer from '@/components/content/videoPlayer'
-import { setTabBarActive, checkTabbarPage } from "../../utils/mayi.js";
+import { setTabBarActive, checkTabbarPage,themeColor } from "../../utils/mayi.js";
 const app = getApp();
 
 export default {
@@ -97,6 +97,10 @@ export default {
     return {
       pageInfo: {},
       pageData: {},
+      themeColor:{
+        '--main-color':"",
+        '--minor-color':"",
+      }
     };
   },
   components:{
@@ -166,6 +170,13 @@ export default {
         that.init(params);
       };
     }
+    if(themeColor['--main-color']!='#ffffff'){
+      this.themeColor = themeColor
+    }else {
+      this.mpApp.themeColorCallBack=(res)=>{
+        this.themeColor = res
+      }
+    }
   },
   onShow() {
     setTabBarActive.bind(this)(checkTabbarPage('/'));

static/nativeComponents/GoodsList/GoodsItem/index.wxss

@@ -16,7 +16,7 @@ image{
 .goods-item-child {
   position: relative;
   overflow: hidden;
-  background: #ffffff;
+  background: #fff;
 }
 .goodsRowList .goods-item-child{
 display: flex;
@@ -88,7 +88,7 @@ align-items: flex-start;
   color: #fff;
 }
 .goodsPicture .saleWay .saleWayBg{
-  background: #eee;
+  background: var(--main-color);
   position: absolute;
   top: 0;
   left: 0;
@@ -256,7 +256,7 @@ align-items: flex-start;
   right: 0;
   bottom: 0;
   border-radius: 30rpx;
-  background-color: #333;
+  background-color: var(--main-color);
   width: 140rpx;
   white-space: nowrap;
   padding: 8rpx 20rpx;

static/nativeComponents/TimeLimitedDiscount/activityListItem/index.wxss

@@ -26,7 +26,6 @@
   height: 100%;
 }
 .countDown {
-  padding: 4rpx 10rpx;
   justify-content: flex-end;
   font-size: 24rpx;
   color: #666;

static/nativeComponents/TimeLimitedDiscount/index.wxss

@@ -96,7 +96,7 @@
 }
 .goods-item-child .info .allPrice .btn {
   font-size: 24rpx;
-  background: #333;
+  background: var(--main-color);
   padding: 8rpx;
   color: #fff;
   border-radius: 10rpx;