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

src/app.json

@@ -14,30 +14,6 @@
     "pages/tabBar4/main",
     "pages/changeAdr/main"
   ],
-  "tabBar": {
-    "custom": true,
-    "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/home/main"
-      },
-      {
-        "pagePath": "pages/tabBar1/main"
-      },
-      {
-        "pagePath": "pages/tabBar2/main"
-      },
-      {
-        "pagePath": "pages/tabBar3/main"
-      },
-      {
-        "pagePath": "pages/tabBar4/main"
-      }
-    ]
-  },
   "usingComponents": {},
   "window": {
     "backgroundTextStyle": "light",

src/components/activity/spellGroup/index.vue

@@ -77,7 +77,9 @@
           :class="{ lastchild: swiperNum == index + 1 }"
           @click="onclickProduct(goodsList[index])"
         >
-          <goodsItem :datas="datas" :items="item" :style="{'margin-left':datas.componentData.proGap*2+'px'}"></goodsItem>
+          <div :style="{'margin-left':datas.componentData.proGap*2+'px'}">
+            <goodsItem :datas="datas" :items="item"></goodsItem>
+          </div>
         </div>
       </div>
       <!-- 瀑布流 -->

src/pages/home/index.vue

@@ -104,6 +104,8 @@
       <div v-if="applySucessEntry">
         <apply-sucess-entry></apply-sucess-entry>
       </div>
+
+      <custom-tab-bar></custom-tab-bar>
   </div>
 </template>
 
@@ -397,9 +399,9 @@ export default {
         this.beforeScrollTop = afterScrollTop;
          return;
       }
-      this.$mp.page.getTabBar().animation({'showFlag':delta>0?'down':'up'})
-      console.log(showFlag,'set296' )
-      // this.$mp.page.getTabBar().setData({'showFlag':delta>0?'down':'up'})
+      // this.$mp.page.getTabBar().animation({'showFlag':delta>0?'down':'up'})
+      // console.log(showFlag,'set296' )
+      this.$mp.page.getTabBar().setData({'showFlag':delta>0?'down':'up'})
     },
     scrolltolower(){
       console.log("scrolltolower")

src/pages/home/main.json

@@ -4,6 +4,7 @@
     "van-tab": "/static/vant/tab/index",
     "banner": "/static/nativeComponents/Banner/index",
     "goods-list": "/static/nativeComponents/GoodsList/index",
+    "custom-tab-bar": "/static/nativeComponents/custom-tab-bar/index",
     "time-limited-discount": "/static/nativeComponents/TimeLimitedDiscount/index",
     "waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index",
     "van-button": "/static/vant/button/index",

src/pages/login/index.vue

@@ -322,7 +322,7 @@ export default {
           // wx.navigateBack()
         // return
         if(isTabbarIndex>-1){
-          wx.switchTab({
+          wx.reLaunch({
             url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
           })
         }else{

src/utils/mayi.js

@@ -49,7 +49,8 @@ export function $themeToLink(data, option) {
                 return
             }
             isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex
-            wx.switchTab({
+
+            wx.reLaunch({
                 url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
             })
             return

static/nativeComponents/TimeLimitedDiscount/activityListItem/index.wxml

@@ -8,7 +8,7 @@
 		{{datas.singleItemActivityName}}
 	</view>
 	<view class="cover">
-		<image src="{{datas.singleItemActivityCoverImage}}"></image>
+		<image mode="center" src="{{datas.singleItemActivityCoverImage}}"></image>
 	</view>
 	<view class="countDown flex" wx:if="{{countDownShow}}">
 		<van-count-down

static/nativeComponents/TimeLimitedDiscount/index.js

@@ -232,7 +232,7 @@ const componentOptions = {
                 new Date(item.endTime.replace(/-/g, "/")).getTime() -
                 new Date().getTime();
               item.singleItemActivityCoverImage = DFSImg(
-                item.singleItemActivityCoverImage
+                item.singleItemActivityCoverImage,400,400
               );
               item.isStart =
                 new Date(item.startTime.replace(/-/g, "/")).getTime() >
@@ -245,6 +245,7 @@ const componentOptions = {
             if (hideNum == actList.length) {
               this.setData({ hideAll: true });
             }
+            this.setData({ isLoading: false });
           }
         }
       });

static/nativeComponents/TimeLimitedDiscount/index.json

@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "activity-list-item":"./activityListItem/index",
-    "van-count-down": "/static/vant/count-down/index"
+    "van-count-down": "/static/vant/count-down/index",
+    "skeleton-block": "../module/SkeletonBlock/index"
   }
 }

static/nativeComponents/TimeLimitedDiscount/index.wxml

@@ -119,12 +119,21 @@
 	</view>
 	<!-- 活动列表 -->
 	<activity-list-item
-	 wx:if="{{datas.componentData.dimension == 1}}"
+	 wx:if="{{datas.componentData.dimension == 1 && !isLoading}}"
 	 wx:for="{{datas.componentData.actList}}"
 	 wx:key="index"
 	 datas="{{item}}"
 	 num="{{index}}"
 	 countDownShow="{{datas.componentData['countDownShow']}}"
 	></activity-list-item>
+	<view wx:if="{{isLoading}}">
+		<skeleton-block
+		 loading="{{isLoading}}"
+		 type="{{'row'}}"
+		 height="60"
+		 row="1"
+		 col="1"
+		></skeleton-block>
+	</view>
 </view>
 

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

@@ -1175,6 +1175,7 @@
   bottom: 0;
   left: 0;
   background: #f5f5f4;
+  z-index:888;
   /* border-top: 1px solid #e2e2e2; */
 }