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

4
assets/css/style.less
View File

@ -4454,7 +4454,7 @@ page {
} }
.bargain .header .time { .bargain .header .time {
background-image: url('https://h5.yixiang.co/static/images/time.png'); //background-image: url('https://h5.yixiang.co/static/images/time.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 4.4*100rpx; width: 4.4*100rpx;
@ -4596,7 +4596,7 @@ page {
.bargain .wrapper .lock, .bargain .wrapper .lock,
.bargain .bargainGang .lock, .bargain .bargainGang .lock,
.bargain .goodsDetails .lock { .bargain .goodsDetails .lock {
background-image: url('https://h5.yixiang.co/static/images/lock.png'); //background-image: url('https://h5.yixiang.co/static/images/lock.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 5.48*100rpx; width: 5.48*100rpx;

4
components/Menu.vue
View File

@ -13,8 +13,8 @@
<swiper-item class="menu-swiper-item" v-for="(itemList, index) in carousel" :key="index" :style="list.length <= menu ? `height:200rpx` : `height:340rpx`"> <swiper-item class="menu-swiper-item" v-for="(itemList, index) in carousel" :key="index" :style="list.length <= menu ? `height:200rpx` : `height:340rpx`">
<view class="menu-tab-box"> <view class="menu-tab-box">
<view class="tab-list y-f" :style="{ width: 690 / menu + 'rpx' }" v-for="item in itemList" :key="item.name" @tap="routerTo(item)"> <view class="tab-list y-f" :style="{ width: 690 / menu + 'rpx' }" v-for="item in itemList" :key="item.name" @tap="routerTo(item)">
<image class="tab-img shopro-selector-circular" :style="{ width: imgW + 'rpx', height: imgW + 'rpx' }" :src="item.pic"></image> <image class="tab-img Shop-selector-circular" :style="{ width: imgW + 'rpx', height: imgW + 'rpx' }" :src="item.pic"></image>
<text class="shopro-selector-rect">{{ item.name }}</text> <text class="Shop-selector-rect">{{ item.name }}</text>
</view> </view>
</view> </view>
</swiper-item> </swiper-item>

18
components/ShoproLiveCard.vue → components/ShopLiveCard.vue
View File

@ -7,7 +7,7 @@
<text class="status-text">{{ liveStatus[detail.liveStatus].title }}</text> <text class="status-text">{{ liveStatus[detail.liveStatus].title }}</text>
</view> </view>
<view class="item-title" :style="{ width: wh + 'rpx' }">{{ detail.name }}</view> <view class="item-title" :style="{ width: wh + 'rpx' }">{{ detail.name }}</view>
<!-- <image v-if="detail.liveStatus == 101" class="like-img" src="http://shopro.7wpp.com/imgs/live/zan.gif" mode=""></image> --> <!-- <image v-if="detail.liveStatus == 101" class="like-img" src="http://Shop.7wpp.com/imgs/live/zan.gif" mode=""></image> -->
</view> </view>
<view class="live-bottom" :style="{ width: wh + 'rpx' }"> <view class="live-bottom" :style="{ width: wh + 'rpx' }">
<view class="live-info"> <view class="live-info">
@ -44,37 +44,37 @@
// #endif // #endif
let timer = null; let timer = null;
export default { export default {
name: 'shoproLiveCard', name: 'shopLiveCard',
components: {}, components: {},
data() { data() {
return { return {
liveStatus: { liveStatus: {
'101': { '101': {
img: 'http://shopro.7wpp.com/imgs/live/live.png', img: 'https://wx.yixiang.co/static/images/live.png',
title: '直播中' title: '直播中'
}, },
'102': { '102': {
img: 'http://shopro.7wpp.com/imgs/live/prevue.png', img: 'https://wx.yixiang.co/static/images/prevue.png',
title: '未开始' title: '未开始'
}, },
'103': { '103': {
img: 'http://shopro.7wpp.com/imgs/live/playback.png', img: 'https://wx.yixiang.co/static/images/playback.png',
title: '已结束' title: '已结束'
}, },
'104': { '104': {
img: 'http://shopro.7wpp.com/imgs/live/104.png', img: 'https://wx.yixiang.co/static/images/104.png',
title: '禁播' title: '禁播'
}, },
'105': { '105': {
img: 'http://shopro.7wpp.com/imgs/live/105.png', img: 'https://wx.yixiang.co/static/images/105.png',
title: '暂停中' title: '暂停中'
}, },
'106': { '106': {
img: 'http://shopro.7wpp.com/imgs/live/106.png', img: 'https://wx.yixiang.co/static/images/106.png',
title: '异常' title: '异常'
}, },
'107': { '107': {
img: 'http://shopro.7wpp.com/imgs/live/past.png', img: 'https://wx.yixiang.co/static/images/past.png',
title: '已过期' title: '已过期'
} }
} }

6
components/sh-adv.vue
View File

@ -83,19 +83,19 @@
return { return {
detail: { detail: {
"list": [{ "list": [{
"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png", "image": "https:\/\/wx.yixiang.co\/static\/images\/index001.png",
"name": "", "name": "",
"path": "/pages/user/coupon/GetCoupon/index", "path": "/pages/user/coupon/GetCoupon/index",
"path_name": "优惠券", "path_name": "优惠券",
"path_type": 1 "path_type": 1
}, { }, {
"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/cddb5d90a4241f6235d16368534bc730.png", "image": "https:\/\/wx.yixiang.co\/static\/images\/index002.png",
"name": "", "name": "",
"path": "/pages/shop/GoodsList/index", "path": "/pages/shop/GoodsList/index",
"path_name": "商品", "path_name": "商品",
"path_type": 1 "path_type": 1
}, { }, {
"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/e047d312fb5930de972ae288b9b3bae7.png", "image": "https:\/\/wx.yixiang.co\/static\/images\/index003.png",
"name": "", "name": "",
"path": "/pages/user/signIn/Integral/index", "path": "/pages/user/signIn/Integral/index",
"path_name": "积分", "path_name": "积分",

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

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

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

@ -35,15 +35,15 @@
</view> </view>
</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> <view v-if="grouponList.length" class="cu-load text-gray" :class="loadStatus"></view>
<!-- loading --> <!-- loading -->
<shopro-load v-model="isLoading"></shopro-load> <Shop-load v-model="isLoading"></Shop-load>
</scroll-view> </scroll-view>
</view> </view>
<!-- 自定义底部导航 --> <!-- 自定义底部导航 -->
<shopro-tabbar></shopro-tabbar> <Shop-tabbar></Shop-tabbar>
</view> </view>
</template> </template>

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

@ -1,7 +1,7 @@
<template> <template>
<view class="banner-swiper-box"> <view class="banner-swiper-box">
<canvas canvas-id="colorThief" class="hide-canvas"></canvas> <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)"> <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 class="swiper-image " :src="item.pic" @click="goRoll(item)" mode="widthFix" lazy-load>
</image> </image>

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

@ -15,22 +15,15 @@
<text class="status-text">{{ liveStatus[live.liveStatus].title }}</text> <text class="status-text">{{ liveStatus[live.liveStatus].title }}</text>
</view> </view>
<view class="item-title">{{ live.name }}</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> mode=""></image>
</view> </view>
</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> </view>
</template> </template>
<script> <script>
import ShoproLiveCard from '@/components/ShoproLiveCard.vue' import ShopLiveCard from '@/components/ShopLiveCard.vue'
let HAS_LIVE = false let HAS_LIVE = false
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
@ -48,38 +41,38 @@
let timer = null; let timer = null;
export default { export default {
components: { components: {
ShoproLiveCard ShopLiveCard
}, },
data() { data() {
return { return {
liveList: [], liveList: [],
liveStatus: { liveStatus: {
'101': { '101': {
img: 'http://shopro.7wpp.com/imgs/live/live.png', img: 'https://wx.yixiang.co/static/images/live.png',
title: '直播中' title: '直播中'
}, },
'102': { '102': {
img: 'http://shopro.7wpp.com/imgs/live/prevue.png', img: 'https://wx.yixiang.co/static/images/prevue.png',
title: '未开始' title: '未开始'
}, },
'103': { '103': {
img: 'http://shopro.7wpp.com/imgs/live/playback.png', img: 'https://wx.yixiang.co/static/images/playback.png',
title: '已结束' title: '已结束'
}, },
'104': { '104': {
img: 'http://shopro.7wpp.com/imgs/live/104.png', img: 'https://wx.yixiang.co/static/images/104.png',
title: '禁播' title: '禁播'
}, },
'105': { '105': {
img: 'http://shopro.7wpp.com/imgs/live/105.png', img: 'https://wx.yixiang.co/static/images/105.png',
title: '暂停中' title: '暂停中'
}, },
'106': { '106': {
img: 'http://shopro.7wpp.com/imgs/live/106.png', img: 'https://wx.yixiang.co/static/images/106.png',
title: '异常' title: '异常'
}, },
'107': { '107': {
img: 'http://shopro.7wpp.com/imgs/live/past.png', img: 'https://wx.yixiang.co/static/images/past.png',
title: '已过期' title: '已过期'
} }
} }

2
pages/home/index.vue
View File

@ -5,7 +5,7 @@
<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]"> <view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">
<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]"> <view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">
<view class="action"> <view class="action">
<text class="nav-title shopro-selector-rect">{{ 'yshop商城' }}</text> <text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>
</view> </view>
<view class="content" :style="[{top:StatusBar + 'px'}]"> <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"> <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<view class="list-box"> <view class="list-box">
<block v-for="live in liveList" :key="live.roomId"> <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> </block>
</view> </view>
<view v-if="liveList.length" class="cu-load text-gray" :class="loadStatus"></view> <view v-if="liveList.length" class="cu-load text-gray" :class="loadStatus"></view>
@ -25,11 +25,11 @@
import { import {
yxWechatLive yxWechatLive
} from "@/api/live"; } from "@/api/live";
import ShoproLiveCard from '@/components/ShoproLiveCard.vue' import ShopLiveCard from '@/components/ShopLiveCard.vue'
export default { export default {
components: { components: {
ShoproLiveCard ShopLiveCard
}, },
data() { data() {
return { return {

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

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