diff --git a/components/activityCard.vue b/components/activityCard.vue index 85eb503..ae1f53f 100644 --- a/components/activityCard.vue +++ b/components/activityCard.vue @@ -6,10 +6,6 @@ - - - - diff --git a/components/personalActive.vue b/components/personalActive.vue new file mode 100644 index 0000000..f90b294 --- /dev/null +++ b/components/personalActive.vue @@ -0,0 +1,118 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 255826b..a26afd8 100644 --- a/pages.json +++ b/pages.json @@ -1861,7 +1861,7 @@ "selectedColor": "#E93323", "borderStyle": "white", "backgroundColor": "#ffffff", - "iconWidth": "36", + // "iconWidth": "36", "list": [ @@ -1874,15 +1874,15 @@ { "pagePath": "pages/index/index", "iconPath": "static/tabbar_icon/a.png", - "selectedIconPath": "static/tabbar_icon/a-a.png" + "selectedIconPath": "static/tabbar_icon/a-a.png", // "text": "泸州" - // "text": "供销" + "text": "供销" }, { "pagePath": "pages/gather/gather", "iconPath": "static/tabbar_icon/b.png", - "selectedIconPath": "static/tabbar_icon/b-a.png" - // "text": "生产" + "selectedIconPath": "static/tabbar_icon/b-a.png", + "text": "生产" }, // { // "pagePath": "pages/plant_release/index", @@ -1894,14 +1894,14 @@ { "pagePath": "pages/order_addcart/order_addcart_t", "iconPath": "static/tabbar_icon/d.png", - "selectedIconPath": "static/tabbar_icon/d-a.png" - // "text": "购物车" + "selectedIconPath": "static/tabbar_icon/d-a.png", + "text": "购物车" }, { "pagePath": "pages/user/index", "iconPath": "static/tabbar_icon/e.png", - "selectedIconPath": "static/tabbar_icon/e-a.png" - // "text": "我的" + "selectedIconPath": "static/tabbar_icon/e-a.png", + "text": "我的" } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index c762a62..f9065ff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -18,7 +18,7 @@ - + @@ -28,7 +28,7 @@ - @@ -36,11 +36,11 @@ placeholder-style="font-size: 30rpx;" disabled> - + --> - + + - --> + + + + @@ -479,6 +482,7 @@ HTTP_REQUEST_URL } from '@/config/app'; import mConfig from '../component/index.js'; + import personalActive from "@/components/personalActive.vue" // #ifdef MP || APP-PLUS import activeParty from '@/pages/index/component/activeParty'; import coupon from '../../index/component/coupon'; @@ -505,6 +509,7 @@ emptyPage, WaterfallsFlow, easyLoadimage, + personalActive, // #ifdef MP || APP-PLUS activeParty, bargain, @@ -766,6 +771,12 @@ // #endif } this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; + + if(options.LihaiYun=='LiHaiQiJianDian'){ + this.$nextTick(()=>{ + this.$refs.activityPopup.open(); + }) + } }, onShow() { @@ -812,7 +823,9 @@ }, methods: { - + closeActivityCard(){ + this.$refs.activityPopup.close(); + }, getProductSpu() { let that = this; if (that.loadend) return; diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png index cb2f5c9..79f537f 100644 Binary files a/static/tabbar_icon/a-a.png and b/static/tabbar_icon/a-a.png differ diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png index 752fbb2..fac734f 100644 Binary files a/static/tabbar_icon/a.png and b/static/tabbar_icon/a.png differ diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png index 01fb60d..eb07884 100644 Binary files a/static/tabbar_icon/b-a.png and b/static/tabbar_icon/b-a.png differ diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png index 2549e1e..375e7fe 100644 Binary files a/static/tabbar_icon/b.png and b/static/tabbar_icon/b.png differ diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png index 72cc533..e2d38c1 100644 Binary files a/static/tabbar_icon/d-a.png and b/static/tabbar_icon/d-a.png differ diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png index 6d081bd..5090ed7 100644 Binary files a/static/tabbar_icon/d.png and b/static/tabbar_icon/d.png differ diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png index ce3f075..55a57c5 100644 Binary files a/static/tabbar_icon/e-a.png and b/static/tabbar_icon/e-a.png differ diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png index 7c8ec8e..051a657 100644 Binary files a/static/tabbar_icon/e.png and b/static/tabbar_icon/e.png differ