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

修改样式错误的问题

Browse Source
This commit is contained in:
Gao xiaosong
2021-04-11 19:09:59 +08:00
parent 40310ac2f0
commit 15a6af63ac
11 changed files with 351 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
assets/css/style.css
View File

@ -2423,13 +2423,35 @@ page {
margin-top: 20rpx; margin-top: 20rpx;
} }
.product-con .product-intro .title { .product-con .product-intro .title {
position: relative;
width: 50%;
margin: 1.5em auto;
line-height: 1.5em;
font-size: 30rpx; font-size: 30rpx;
color: #282828; display: -webkit-box;
height: 86rpx; display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
.product-con .product-intro .title:after {
content: ' ';
position: absolute;
border-bottom: 0.5px solid #e5e5e5;
-webkit-transform: scaleY(0.5);
-ms-transform: scaleY(0.5);
transform: scaleY(0.5);
width: 100%; width: 100%;
background-color: #fff; top: 9px;
text-align: center; left: 0;
line-height: 86rpx; z-index: -1;
}
.product-con .product-intro .title text {
background: #f5f5f5;
padding: 0 20rpx;
} }
.product-con .product-intro .conter { .product-con .product-intro .conter {
width: 100%; width: 100%;

38
assets/css/style.less
View File

@ -2656,13 +2656,39 @@ page {
} }
.product-con .product-intro .title { .product-con .product-intro .title {
font-size: 0.3 * 100rpx; // font-size: 0.3 * 100rpx;
color: #282828; // color: #282828;
height: 0.86 * 100rpx; // height: 0.86 * 100rpx;
// width: 100%;
// background-color: #fff;
// text-align: center;
// line-height: 0.86 * 100rpx;
position: relative;
width: 50%;
margin: 1.5em auto;
line-height: 1.5em;
font-size: 30rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
&:after {
content: ' ';
position: absolute;
border-bottom: 0.5px solid #e5e5e5;
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
width: 100%; width: 100%;
background-color: #fff; top: 9px;
text-align: center; left: 0;
line-height: 0.86 * 100rpx; z-index: -1;
}
text {
background: #f5f5f5;
padding: 0 20rpx;
}
} }
.product-con .product-intro .conter { .product-con .product-intro .conter {

4
components/t-goods-item/t-goods-item.vue
View File

@ -23,10 +23,10 @@
<!-- <tui-button :width="status == 3 ? '146rpx' : '144rpx'" :height="status == 3 ? '60rpx' : '50rpx'" :size="status == 3 ? 26 : 24" :type="status == 1 ? 'gray' : 'danger'" :disabled="status == 1" :plain="status == 3"> <!-- <tui-button :width="status == 3 ? '146rpx' : '144rpx'" :height="status == 3 ? '60rpx' : '50rpx'" :size="status == 3 ? 26 : 24" :type="status == 1 ? 'gray' : 'danger'" :disabled="status == 1" :plain="status == 3">
{{ status | getBtnText(item.subscribe) }} {{ status | getBtnText(item.subscribe) }}
</tui-button> --> </tui-button> -->
<view class="grab bg-color-red" v-if="item.status === 1 && item.stock > 0" @click="goDetail()">马上抢</view> <view class="grab bg-color-red" v-if="item.status === 0 && item.stock > 0" @click="goDetail()">马上抢</view>
<view class="grab" v-if="item.status === 1 && item.stock <= 0">已售磬</view> <view class="grab" v-if="item.status === 1 && item.stock <= 0">已售磬</view>
<view class="grab bg-color-red" v-if="item.status === 2">即将开始</view> <view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
<view class="grab bg-color-red" v-if="item.status === 0">已结束</view> <view class="grab bg-color-red" v-if="item.status === 1">已结束</view>
</view> </view>
</view> </view>
</view> </view>

73
pages/Loading/index.vue
View File

@ -1,42 +1,29 @@
<template> <template>
<view class="lottie-bg"> <view class="lottie-bg">
<view id="lottie"> <view id="lottie">
<image src="../../static/images/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%;" /> <image :src="`${$VUE_APP_RESOURCES_URL}/images/live-logo.gif`" rel="preload" mode="widthFix" style="width: 100%;" />
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import { mapState, mapMutations, mapActions } from 'vuex'
mapState,
mapMutations,
mapActions
} from "vuex";
// 组件 // 组件
// import request from "@//api/request"; // import request from "@//api/request";
import { import { wxappAuth } from '@/api/user'
wxappAuth, import dayjs from 'dayjs'
} from "@/api/user"; import store from '@/store'
import dayjs from "dayjs"; import cookie from '@/utils/store/cookie'
import store from "@/store"; import { parseQuery, login, handleQrCode, getCurrentPageUrl, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
import cookie from "@/utils/store/cookie";
import {
parseQuery,
login,
handleQrCode,
getCurrentPageUrl,
handleUrlParam,
getCurrentPageUrlWithArgs
} from "@/utils";
export default { export default {
name: "Loading", name: 'Loading',
data() { data() {
return {}; return {}
}, },
onShow() { onShow() {
console.log('getUser') console.log('getUser')
var url = handleQrCode(); var url = handleQrCode()
if (!url) { if (!url) {
url = handleUrlParam(getCurrentPageUrlWithArgs()) url = handleUrlParam(getCurrentPageUrlWithArgs())
} }
@ -44,49 +31,49 @@
console.log('判断是否是分销') console.log('判断是否是分销')
// 判断是否是分销 // 判断是否是分销
if (url) { if (url) {
let urlSpread = parseInt(url.spread); let urlSpread = parseInt(url.spread)
if (urlSpread) { if (urlSpread) {
cookie.set("spread", urlSpread); cookie.set('spread', urlSpread)
} }
} }
if (this.$deviceType == "app" || this.$deviceType == "weixinh5") { if (this.$deviceType == 'app' || this.$deviceType == 'weixinh5') {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index" path: '/pages/home/index',
}); })
return; return
} }
if (this.$store.getters.token) { if (this.$store.getters.token) {
// 如果token存在，直接进行进页面 // 如果token存在，直接进行进页面
console.log('登录状态存在，直接进页面') console.log('登录状态存在，直接进页面')
this.toLaunch(); this.toLaunch()
return; return
} }
console.log('进行登录操作') console.log('进行登录操作')
login().finally(() => { login().finally(() => {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index" path: '/pages/home/index',
}); })
}); })
}, },
methods: { methods: {
...mapActions(["changeAuthorization", "setUserInfo", "getUser"]), ...mapActions(['changeAuthorization', 'setUserInfo', 'getUser']),
toLaunch() { toLaunch() {
console.log("loading home"); console.log('loading home')
this.changeAuthorization(false); this.changeAuthorization(false)
let redirect = cookie.get('redirect').replace(/\ /g, '') let redirect = cookie.get('redirect').replace(/\ /g, '')
if (redirect && redirect.indexOf('/pages') != -1) { if (redirect && redirect.indexOf('/pages') != -1) {
this.$yrouter.replace({ this.$yrouter.replace({
path: '/pages' + redirect.split('/pages')[1], path: '/pages' + redirect.split('/pages')[1],
}); })
cookie.remove('redirect'); cookie.remove('redirect')
} else { } else {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index" path: '/pages/home/index',
}); })
} }
},
},
} }
}
};
</script> </script>
<style scoped lang="less"> <style scoped lang="less">

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

@ -2,15 +2,14 @@
<view class="page_box"> <view class="page_box">
<view class="content_box"> <view class="content_box">
<scroll-view class="scroll-box" scroll-y enable-back-to-top scroll-with-animation @scrolltolower="loadMore"> <scroll-view class="scroll-box" scroll-y enable-back-to-top scroll-with-animation @scrolltolower="loadMore">
<view class="group-wrap"> <view class="group-wrap" :style="`background: url('${$VUE_APP_RESOURCES_URL}/images/index-bg.png') no-repeat;`">
<view class="group-head x-bc"> <view class="group-head x-bc">
<text class="group-head__title">爆款拼团</text> <text class="group-head__title">爆款拼团</text>
<text class="group-head__notice">省钱省心限时拼</text> <text class="group-head__notice">省钱省心限时拼</text>
</view> </view>
<view class="group-box"> <view class="group-box">
<view class="goods-item" v-for="(groupon, index) in grouponList" :key="groupon.id"> <view class="goods-item" v-for="(groupon, index) in grouponList" :key="groupon.id">
<activity-card :cid="groupon.id" :title="groupon.title" :info="groupon.info" :img="groupon.image" <activity-card :cid="groupon.id" :title="groupon.title" :info="groupon.info" :img="groupon.image" :price="groupon.price" :productPrice="groupon.productPrice">
:price="groupon.price" :productPrice="groupon.productPrice">
<block slot="tag"> <block slot="tag">
<view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view> <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
</block> </block>
@ -23,8 +22,7 @@
<text class="group-num">{{ groupon.people || 0 }}人团</text> <text class="group-num">{{ groupon.people || 0 }}人团</text>
</view> </view>
</block> </block>
<block slot="btn"><button class="cu-btn buy-btn" <block slot="btn"><button class="cu-btn buy-btn" @tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
@tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
</activity-card> </activity-card>
</view> </view>
</view> </view>
@ -36,17 +34,14 @@
</template> </template>
<script> <script>
import activityCard from './children/activity-card.vue'; import activityCard from './children/activity-card.vue'
import Loading from "@/components/Loading"; import Loading from '@/components/Loading'
import { getCombinationList } from '@/api/activity'
import {
getCombinationList
} from "@/api/activity";
export default { export default {
components: { components: {
activityCard, activityCard,
Loading Loading,
}, },
data() { data() {
return { return {
@ -54,18 +49,18 @@
img: '/static/imgs/empty/empty_goods.png', img: '/static/imgs/empty/empty_goods.png',
tip: '还没有拼团商品噢，去首页看看吧~', tip: '还没有拼团商品噢，去首页看看吧~',
path: '/pages/index/index', path: '/pages/index/index',
pathText: '去首页逛逛' pathText: '去首页逛逛',
}, },
loaded: false, loaded: false,
loading: false, loading: false,
lastPage: 0, lastPage: 0,
currentPage: 1, currentPage: 1,
limit: 10, limit: 10,
grouponList: [] grouponList: [],
}; }
}, },
onLoad() { onLoad() {
this.getGrouponList(); this.getGrouponList()
}, },
onPullDownRefresh() {}, onPullDownRefresh() {},
computed: {}, computed: {},
@ -74,27 +69,25 @@
jump(path, parmas) { jump(path, parmas) {
this.$yrouter.push({ this.$yrouter.push({
path: path, path: path,
query: parmas query: parmas,
}); })
}, },
// 加载更多 // 加载更多
loadMore() { loadMore() {},
},
// 拼团列表 // 拼团列表
getGrouponList() { getGrouponList() {
let that = this; let that = this
if (this.loading || this.loaded) return; if (this.loading || this.loaded) return
this.loading = true; this.loading = true
getCombinationList({ getCombinationList({
page: that.currentPage, page: that.currentPage,
limit: this.limit limit: this.limit,
}).then(res => { }).then(res => {
that.grouponList = that.grouponList.concat(res.data.storeCombinationQueryVos) that.grouponList = that.grouponList.concat(res.data.storeCombinationQueryVos)
this.currentPage++; this.currentPage++
this.loaded = res.data.storeCombinationQueryVos.length < this.limit; this.loaded = res.data.storeCombinationQueryVos.length < this.limit
this.loading = false; this.loading = false
}); })
// that.$api('goods.grouponList', { // that.$api('goods.grouponList', {
// page: that.currentPage // page: that.currentPage
@ -111,17 +104,16 @@
// } // }
// } // }
// }); // });
} },
}, },
onReachBottom() { onReachBottom() {
!this.loading && this.getGrouponList(); !this.loading && this.getGrouponList()
},
} }
};
</script> </script>
<style lang="scss"> <style lang="scss">
.group-wrap { .group-wrap {
background: url('https://h5.yixiang.co/images/index-bg.png') no-repeat;
background-size: 100% 374rpx; background-size: 100% 374rpx;
} }

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

@ -35,9 +35,9 @@
</view> </view>
</tui-divider> </tui-divider>
</view> </view>
<view class="tui-countdown__box" v-if="item.status == 1"> <view class="tui-countdown__box" v-if="item.status == 1 || item.status == 2">
<text>距离{{ item.status == 2 ? '结束还剩' : '开始还有' }}</text> <text>距离{{ item.status == 1 ? '结束还剩' : '开始还有' }}</text>
<count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="datatime / 1000"></count-down> <count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="item.stop"></count-down>
</view> </view>
</view> </view>
</block> </block>

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

@ -117,7 +117,7 @@
<!-- 产品介绍 --> <!-- 产品介绍 -->
<view class="product-intro"> <view class="product-intro">
<view class="title">产品介绍</view> <text class="title"><text>产品介绍</text></text>
<view class="conter" v-html="storeInfo.description"></view> <view class="conter" v-html="storeInfo.description"></view>
<!-- <view class="conter" v-html=""></view> --> <!-- <view class="conter" v-html=""></view> -->
</view> </view>

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

@ -47,7 +47,7 @@
<view class="iconfont icon-jiantou"></view> <view class="iconfont icon-jiantou"></view>
</view> </view>
<view class="product-intro"> <view class="product-intro">
<view class="title">产品介绍</view> <text class="title"><text>产品介绍</text></text>
<view class="conter" v-html="storeInfo.description"></view> <view class="conter" v-html="storeInfo.description"></view>
</view> </view>

2
pages/shop/GoodsCon/index.vue
View File

@ -120,7 +120,7 @@
<!-- 商品详情 --> <!-- 商品详情 -->
<view class="product-intro"> <view class="product-intro">
<text class="title">产品介绍</text> <text class="title"><text>产品介绍</text></text>
<view class="conter" v-html="storeInfo.description"></view> <view class="conter" v-html="storeInfo.description"></view>
</view> </view>

2
pages/shop/IntegralGoodsCon/index.vue
View File

@ -41,7 +41,7 @@
<!-- 商品详情 --> <!-- 商品详情 -->
<view class="product-intro"> <view class="product-intro">
<text class="title">产品介绍</text> <text class="title"><text>产品介绍</text></text>
<view class="conter" v-html="storeInfo.description"></view> <view class="conter" v-html="storeInfo.description"></view>
</view> </view>

3
utils/request.js
View File

@ -89,7 +89,6 @@ function baseRequest(options) {
}) })
.then(res => { .then(res => {
const data = res.data || {} const data = res.data || {}
if (res.status !== 200) { if (res.status !== 200) {
return Promise.reject({ msg: '请求失败', res, data }) return Promise.reject({ msg: '请求失败', res, data })
} }
@ -100,7 +99,7 @@ function baseRequest(options) {
} else if (data.status === 200) { } else if (data.status === 200) {
return Promise.resolve(data, res) return Promise.resolve(data, res)
} else if (data.status == 5101) { } else if (data.status == 5101) {
return Promise.resolve(data, res) return Promise.reject({ msg: res.data.msg, res, data })
} else { } else {
return Promise.reject({ msg: res.data.msg, res, data }) return Promise.reject({ msg: res.data.msg, res, data })
} }