diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue index 5067495..2a229e3 100644 --- a/pages/activity/GoodsSeckill/index.vue +++ b/pages/activity/GoodsSeckill/index.vue @@ -5,15 +5,19 @@ </view> <scroll-view scroll-y="false" scroll-x="true"> <view class="timeScroll"> - <view class v-for="(item, index) in timeList" :key="index"> - <view :class="{'timeItem':true,'active':active==index}" @click="setTime(index)"> + <view v-for="(item, index) in timeList" :key="index"> + <view v-if="active==index" class="timeItem active" @click="setTime(index)"> + <view class="time">{{ item.time }}</view> + <view class="state">{{ item.state }}</view> + </view> + <view v-if="active!=index" class="timeItem" @click="setTime(index)"> <view class="time">{{ item.time }}</view> <view class="state">{{ item.state }}</view> </view> </view> </view> </scroll-view> - <view class v-for="(item, index) in timeList" :key="index"> + <view v-for="(item, index) in timeList" :key="index"> <view v-if="active == index"> <view class="countDown font-color-red acea-row row-center-wrapper"> <view v-if="item.status === 0" class="activity">活动已结束</view> @@ -70,12 +74,6 @@ </view> </view> </view> - <!-- - <vant-tabs :active="active" @change="setTime" :sticky="sticky" animated line-height="2" :ellipsis="false"> - <vant-tab :ellipsis="false" :title="[title[index]]"> - - </vant-tab> - </vant-tabs>--> </view> </template> <script> @@ -176,7 +174,7 @@ export default { that.status = false; that.active = index; that.datatime = that.timeList[that.active].stop; - this.seckillList=[] + this.seckillList = []; that.getSeckillList(); }, getSeckillList: function() { diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index de5d27b..98a3137 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -1,5 +1,5 @@ <template> - <view :class="[posterImageStatus ? 'noscroll product-con' : 'product-con']"> + <view :class="productConClass"> <product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper> <view class="wrapper"> <view class="share acea-row row-between row-bottom"> @@ -58,7 +58,6 @@ </view> </view> </view> - <!-- <a class="iconfont icon-dadianhua01 font-color-red" :href="'tel:' + system_store.phone"></a> --> </view> </view> <view class="userEvaluation" v-if="replyCount"> @@ -102,19 +101,21 @@ </view> <view style="height:100rpx;"></view> <view class="footer acea-row row-between-wrapper"> - <!--<view class="item" @click="goCustomerList()">--> - <!--<view class="iconfont icon-kefu"></view>--> - <!--<view>客服</view>--> - <!--</view>--> - <view class="item" @click="setCollect"> - <view class="iconfont" :class="storeInfo.userCollect ? 'icon-shoucang1' : 'icon-shoucang'"></view> + <view class="item" @click="setCollect" v-if="storeInfo.userCollect"> + <view class="iconfont icon-shoucang1"></view> <text>收藏</text> </view> - <view - @click="goShoppingCart()" - class="item animated" - :class="animated === true ? 'bounceIn' : ''" - > + <view class="item" @click="setCollect" v-if="!storeInfo.userCollect"> + <view class="iconfont icon-shoucang"></view> + <text>收藏</text> + </view> + <view @click="goShoppingCart()" v-if="animated" class="item animated bounceIn"> + <view class="iconfont icon-gouwuche1"> + <text class="num bg-color-red" v-if="CartCount > 0">{{CartCount}}</text> + </view> + <text>购物车</text> + </view> + <view @click="goShoppingCart()" class="item animated" v-if="!animated"> <view class="iconfont icon-gouwuche1"> <text class="num bg-color-red" v-if="CartCount > 0">{{CartCount}}</text> </view> @@ -138,14 +139,16 @@ :goodId="id" ></StorePoster> <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo> - <view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''"> - <view class="item" v-if="weixinStatus === true" @click="setShareInfoStatus"> - <view class="iconfont icon-weixin3"></view> - <view class>发送给朋友</view> + <view class="generate-posters acea-row row-middle on" v-if="posters"> + <view class="item" @click="setPosterImageStatus"> + <view class="iconfont icon-haibao"></view> + <view >生成海报</view> </view> + </view> + <view class="generate-posters acea-row row-middle" v-if="!posters"> <view class="item" @click="setPosterImageStatus"> <view class="iconfont icon-haibao"></view> - <view class>生成海报</view> + <view >生成海报</view> </view> </view> <view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view> @@ -158,9 +161,9 @@ :src="'https://apis.map.qq.com/uri/v1/geocoder?coord=' +system_store.latitude +',' +system_store.longitude +'&referer=' +mapKey" ></iframe> </view> - <div class="posterCanvasWarp"> + <view class="posterCanvasWarp"> <canvas class="posterCanvas" canvas-id="myCanvas"></canvas> - </div> + </view> </view> </template> @@ -253,7 +256,8 @@ export default { }, goodList: [], system_store: {}, - qqmapsdk: null + qqmapsdk: null, + productConClass: "product-con" }; }, computed: mapGetters(["isLogin"]), @@ -267,6 +271,16 @@ export default { } this.productCon(); }, + watch: { + posterImageStatus(status) { + console.log(status); + if (status) { + this.productConClass = "noscroll product-con"; + } else { + this.productConClass = "product-con"; + } + } + }, methods: { goShoppingCart() { this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");