cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改移除一些不规范的地方

Browse Source
This commit is contained in:
hupeng
2020-09-11 11:26:36 +08:00
parent aa7ef9bcc7
commit 01e2940839
11 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/activity/DargainDetails/index.vue
View File

@ -206,7 +206,7 @@
bargainSumCount: 0, //砍价成功人数
activeMsg: "",
// ssssss
active: true,
active: false,
loading: false,
datatime: 0,
lookCount: 0, //查看人数

6
pages/activity/GoodsGroup/index.vue
View File

@ -35,15 +35,15 @@
</view>
</view>
<!-- 空白 -->
<!-- <shopro-empty v-if="!grouponList.length && !isLoading" :emptyData="emptyData"></shopro-empty>-->
<!-- <Shop-empty v-if="!grouponList.length && !isLoading" :emptyData="emptyData"></Shop-empty>-->
<!-- 加载更多 -->
<view v-if="grouponList.length" class="cu-load text-gray" :class="loadStatus"></view>
<!-- loading -->
<shopro-load v-model="isLoading"></shopro-load>
<Shop-load v-model="isLoading"></Shop-load>
</scroll-view>
</view>
<!-- 自定义底部导航 -->
<shopro-tabbar></shopro-tabbar>
<Shop-tabbar></Shop-tabbar>
</view>
</template>

2
pages/home/components/Banner.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="banner-swiper-box">
<canvas canvas-id="colorThief" class="hide-canvas"></canvas>
<swiper class="banner-carousel shopro-selector-rect" circular @change="swiperChange" :autoplay="true">
<swiper class="banner-carousel Shop-selector-rect" circular @change="swiperChange" :autoplay="true">
<swiper-item v-for="(item, index) in list" :key="index" class="carousel-item" @tap="routerTo(item.path)">
<image class="swiper-image " :src="item.pic" @click="goRoll(item)" mode="widthFix" lazy-load>
</image>

29
pages/home/components/Live.vue
View File

@ -15,22 +15,15 @@
<text class="status-text">{{ liveStatus[live.liveStatus].title }}</text>
</view>
<view class="item-title">{{ live.name }}</view>
<image v-if="live.liveStatus == 101" class="like-img" src="http://shopro.7wpp.com/imgs/live/zan.gif"
<image v-if="live.liveStatus == 101" class="like-img" src="http://Shop.7wpp.com/imgs/live/zan.gif"
mode=""></image>
</view>
</view>
<!-- <view class="content-two">
<view class="content-two__item" v-for="live in detail" :key="live.id">
<ShoproLiveCard :detail="live" :wh="320">
<block slot="liveGoods"><text></text></block>
</ShoproLiveCard>
</view>
</view> -->
</view>
</template>
<script>
import ShoproLiveCard from '@/components/ShoproLiveCard.vue'
import ShopLiveCard from '@/components/ShopLiveCard.vue'
let HAS_LIVE = false
// #ifdef MP-WEIXIN
@ -48,38 +41,38 @@
let timer = null;
export default {
components: {
ShoproLiveCard
ShopLiveCard
},
data() {
return {
liveList: [],
liveStatus: {
'101': {
img: 'http://shopro.7wpp.com/imgs/live/live.png',
'101': {
img: 'https://wx.yixiang.co/static/images/live.png',
title: '直播中'
},
'102': {
img: 'http://shopro.7wpp.com/imgs/live/prevue.png',
img: 'https://wx.yixiang.co/static/images/prevue.png',
title: '未开始'
},
'103': {
img: 'http://shopro.7wpp.com/imgs/live/playback.png',
img: 'https://wx.yixiang.co/static/images/playback.png',
title: '已结束'
},
'104': {
img: 'http://shopro.7wpp.com/imgs/live/104.png',
img: 'https://wx.yixiang.co/static/images/104.png',
title: '禁播'
},
'105': {
img: 'http://shopro.7wpp.com/imgs/live/105.png',
img: 'https://wx.yixiang.co/static/images/105.png',
title: '暂停中'
},
'106': {
img: 'http://shopro.7wpp.com/imgs/live/106.png',
img: 'https://wx.yixiang.co/static/images/106.png',
title: '异常'
},
'107': {
img: 'http://shopro.7wpp.com/imgs/live/past.png',
img: 'https://wx.yixiang.co/static/images/past.png',
title: '已过期'
}
}

2
pages/home/index.vue
View File

@ -5,7 +5,7 @@
<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">
<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">
<view class="action">
<text class="nav-title shopro-selector-rect">{{ 'yshop商城' }}</text>
<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>
</view>
<view class="content" :style="[{top:StatusBar + 'px'}]">

6
pages/shop/Live/LiveList/index.vue
View File

@ -12,7 +12,7 @@
<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<view class="list-box">
<block v-for="live in liveList" :key="live.roomId">
<shopro-live-card :detail="live"></shopro-live-card>
<shop-live-card :detail="live"></shop-live-card>
</block>
</view>
<view v-if="liveList.length" class="cu-load text-gray" :class="loadStatus"></view>
@ -25,11 +25,11 @@
import {
yxWechatLive
} from "@/api/live";
import ShoproLiveCard from '@/components/ShoproLiveCard.vue'
import ShopLiveCard from '@/components/ShopLiveCard.vue'
export default {
components: {
ShoproLiveCard
ShopLiveCard
},
data() {
return {

1
pages/user/promotion/UserPromotion/index.vue
View File

@ -20,7 +20,6 @@
</view>
</view>
</view>
<view class="bnt bg-color-red" @click="toCash">立即提现</view>
<view class="list acea-row row-between-wrapper">
<view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
<text class="iconfont icon-erweima"></text>