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

custom-tab-bar/index.js

@@ -64,26 +64,27 @@ Component({
         visible: 1
       }
     ],
-    mm:false,
+    mm: false,
     componentData: {},
     show: true,
-    mmm : false,
-    mainColor : ''
+    mmm: false,
+    mainColor: "",
+    showFlag: "up"
   },
-  ready(){
-    if (app.themeColor['--main-color'] != '#ffffff') {
+  ready() {
+    if (app.themeColor["--main-color"] != "#ffffff") {
       this.setData({
-        mainColor: app.themeColor['--main-color']
-      })
+        mainColor: app.themeColor["--main-color"]
+      });
     } else {
-      app.themeColorCallBack = (res) => {
+      app.themeColorCallBack = res => {
         this.setData({
-          mainColor: res['--main-color']
-        })
-      }
+          mainColor: res["--main-color"]
+        });
+      };
     }
 
-    console.log(this.data.themeColor,'themeColor')
+    console.log(this.data.themeColor, "themeColor");
     if (typeof this.getTabBar === "function" && this.getTabBar()) {
       this.getTabBar().setData({
         selected: 1

custom-tab-bar/index.wxss

@@ -1389,7 +1389,7 @@
   /* border-top: 1px solid #e2e2e2; */
 }
 
-.tab-bar-border {
+/* .tab-bar-border {
   background-color: rgba(0, 0, 0, 0.33);
   position: absolute;
   left: 0;
@@ -1397,7 +1397,7 @@
   width: 100%;
   height: 1px;
   transform: scaleY(0.5);
-}
+} */
 
 .tab-bar-item {
   flex: 1;

src/pages/home/index.vue

@@ -277,10 +277,10 @@ export default {
         (delta>0 && showFlag=='down') ||
         (delta<0 && showFlag=='up')
         ){
+        this.beforeScrollTop = afterScrollTop;
          return;
       }
       this.$mp.page.getTabBar().setData({'showFlag':delta>0?'down':'up'})
-      this.beforeScrollTop = afterScrollTop;
     },
     scrolltolower(){
       console.log("scrolltolower")

static/nativeComponents/TimeLimitedDiscount/index.wxss

@@ -22,6 +22,9 @@
   color: #333;
   font-weight: bold;
   text-align: left;
+  flex: 1;
+  margin-right: 4rpx;
+
 }
 .topInfo .subheading {
   position: relative;
@@ -53,6 +56,7 @@
 .goodsList {
   display: flex;
   align-items: flex-start;
+  flex-wrap: wrap;
 }
 .goodsItem {
   box-sizing: border-box;
@@ -61,7 +65,7 @@
   border-radius: 5px;
   overflow: hidden;
   background: #fff;
-  margin: 0 10rpx;
+  margin: 20rpx 10rpx 0;
 }
 
 .goods-item-child .info {