Browse Source

修改样式错误的问题

master
Gao xiaosong 4 years ago
parent
commit
15a6af63ac
  1. 32
      assets/css/style.css
  2. 40
      assets/css/style.less
  3. 4
      components/t-goods-item/t-goods-item.vue
  4. 183
      pages/Loading/index.vue
  5. 336
      pages/activity/GoodsGroup/index.vue
  6. 6
      pages/activity/GoodsSeckill/index.vue
  7. 2
      pages/activity/GroupDetails/index.vue
  8. 2
      pages/activity/SeckillDetails/index.vue
  9. 2
      pages/shop/GoodsCon/index.vue
  10. 62
      pages/shop/IntegralGoodsCon/index.vue
  11. 3
      utils/request.js

32
assets/css/style.css

@ -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%;

40
assets/css/style.less

@ -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%; // width: 100%;
background-color: #fff; // background-color: #fff;
text-align: center; // text-align: center;
line-height: 0.86 * 100rpx; // 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%;
top: 9px;
left: 0;
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

@ -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>

183
pages/Loading/index.vue

@ -1,116 +1,103 @@
<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, // import request from "@//api/request";
mapActions import { wxappAuth } from '@/api/user'
} from "vuex"; import dayjs from 'dayjs'
// import store from '@/store'
// import request from "@//api/request"; import cookie from '@/utils/store/cookie'
import { import { parseQuery, login, handleQrCode, getCurrentPageUrl, handleUrlParam, getCurrentPageUrlWithArgs } from '@/utils'
wxappAuth,
} from "@/api/user";
import dayjs from "dayjs";
import store from "@/store";
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())
} }
console.log(url) console.log(url)
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({
path: '/pages/home/index',
})
return
}
if (this.$store.getters.token) {
// token
console.log('登录状态存在,直接进页面')
this.toLaunch()
return
}
console.log('进行登录操作')
login().finally(() => {
this.$yrouter.switchTab({
path: '/pages/home/index',
})
})
},
methods: {
...mapActions(['changeAuthorization', 'setUserInfo', 'getUser']),
toLaunch() {
console.log('loading home')
this.changeAuthorization(false)
let redirect = cookie.get('redirect').replace(/\ /g, '')
if (redirect && redirect.indexOf('/pages') != -1) {
this.$yrouter.replace({
path: '/pages' + redirect.split('/pages')[1],
})
cookie.remove('redirect')
} else {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index" path: '/pages/home/index',
}); })
return;
}
if (this.$store.getters.token) {
// token
console.log('登录状态存在,直接进页面')
this.toLaunch();
return;
} }
console.log('进行登录操作')
login().finally(() => {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
});
}, },
methods: { },
...mapActions(["changeAuthorization", "setUserInfo", "getUser"]), }
toLaunch() {
console.log("loading home");
this.changeAuthorization(false);
let redirect = cookie.get('redirect').replace(/\ /g, '')
if (redirect && redirect.indexOf('/pages') != -1) {
this.$yrouter.replace({
path: '/pages' + redirect.split('/pages')[1],
});
cookie.remove('redirect');
} else {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
}
}
}
};
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.lottie-bg { .lottie-bg {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
background-color: #fff; background-color: #fff;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 999; z-index: 999;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
-webkit-justify-content: center; -webkit-justify-content: center;
justify-content: center; justify-content: center;
} }
#lottie { #lottie {
width: 35%; width: 35%;
display: block; display: block;
overflow: hidden; overflow: hidden;
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
margin: auto; margin: auto;
} }
</style> </style>

336
pages/activity/GoodsGroup/index.vue

@ -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,197 +34,191 @@
</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 { export default {
getCombinationList components: {
} from "@/api/activity"; activityCard,
export default { Loading,
components: { },
activityCard, data() {
Loading return {
}, emptyData: {
data() { img: '/static/imgs/empty/empty_goods.png',
return { tip: '还没有拼团商品噢,去首页看看吧~',
emptyData: { path: '/pages/index/index',
img: '/static/imgs/empty/empty_goods.png', pathText: '去首页逛逛',
tip: '还没有拼团商品噢,去首页看看吧~',
path: '/pages/index/index',
pathText: '去首页逛逛'
},
loaded: false,
loading: false,
lastPage: 0,
currentPage: 1,
limit: 10,
grouponList: []
};
},
onLoad() {
this.getGrouponList();
},
onPullDownRefresh() {},
computed: {},
methods: {
//
jump(path, parmas) {
this.$yrouter.push({
path: path,
query: parmas
});
}, },
// loaded: false,
loadMore() { loading: false,
lastPage: 0,
}, currentPage: 1,
// limit: 10,
getGrouponList() { grouponList: [],
let that = this;
if (this.loading || this.loaded) return;
this.loading = true;
getCombinationList({
page: that.currentPage,
limit: this.limit
}).then(res => {
that.grouponList = that.grouponList.concat(res.data.storeCombinationQueryVos)
this.currentPage++;
this.loaded = res.data.storeCombinationQueryVos.length < this.limit;
this.loading = false;
});
// that.$api('goods.grouponList', {
// page: that.currentPage
// }).then(res => {
// if (res.code === 1) {
// that.isLoading = false;
// that.grouponList = [...that.grouponList, ...res.data.data];
// // that.grouponList=[];
// that.lastPage = res.data.last_page;
// if (that.currentPage < res.data.last_page) {
// that.loadStatus = '';
// } else {
// that.loadStatus = 'over';
// }
// }
// });
}
},
onReachBottom() {
!this.loading && this.getGrouponList();
} }
}; },
onLoad() {
this.getGrouponList()
},
onPullDownRefresh() {},
computed: {},
methods: {
//
jump(path, parmas) {
this.$yrouter.push({
path: path,
query: parmas,
})
},
//
loadMore() {},
//
getGrouponList() {
let that = this
if (this.loading || this.loaded) return
this.loading = true
getCombinationList({
page: that.currentPage,
limit: this.limit,
}).then(res => {
that.grouponList = that.grouponList.concat(res.data.storeCombinationQueryVos)
this.currentPage++
this.loaded = res.data.storeCombinationQueryVos.length < this.limit
this.loading = false
})
// that.$api('goods.grouponList', {
// page: that.currentPage
// }).then(res => {
// if (res.code === 1) {
// that.isLoading = false;
// that.grouponList = [...that.grouponList, ...res.data.data];
// // that.grouponList=[];
// that.lastPage = res.data.last_page;
// if (that.currentPage < res.data.last_page) {
// that.loadStatus = '';
// } else {
// that.loadStatus = 'over';
// }
// }
// });
},
},
onReachBottom() {
!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; }
.group-head {
padding: 0 25rpx;
height: 100rpx;
.group-head__title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
} }
.group-head { .group-head__notice {
padding: 0 25rpx; font-size: 26rpx;
height: 100rpx; font-family: PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
}
}
.group-head__title { .group-box {
font-size: 32rpx; width: 710rpx;
font-family: PingFang SC; background: linear-gradient(#fff, #f5f5f5);
font-weight: 500; border-radius: 20rpx;
color: rgba(255, 255, 255, 1); margin: 0 auto;
} min-height: 1000rpx;
.group-head__notice { .goods-item {
font-size: 26rpx; border-radius: 20rpx;
overflow: hidden;
position: relative;
margin-bottom: 20rpx;
.tag {
position: absolute;
left: 0;
top: 10rpx;
z-index: 2;
line-height: 35rpx;
background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1));
border-radius: 0px 18rpx 18rpx 0px;
padding: 0 10rpx;
font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: bold;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 0.8);
} }
}
.group-box { /deep/.goods-right {
width: 710rpx; width: 460rpx;
background: linear-gradient(#fff, #f5f5f5);
border-radius: 20rpx; .title {
margin: 0 auto; width: 460rpx;
min-height: 1000rpx;
.goods-item {
border-radius: 20rpx;
overflow: hidden;
position: relative;
margin-bottom: 20rpx;
.tag {
position: absolute;
left: 0;
top: 10rpx;
z-index: 2;
line-height: 35rpx;
background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1));
border-radius: 0px 18rpx 18rpx 0px;
padding: 0 10rpx;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: bold;
color: rgba(255, 255, 255, 0.8);
} }
/deep/.goods-right { .tip {
width: 460rpx; width: 460rpx;
}
}
.title { .buy-btn {
width: 460rpx; position: absolute;
} right: 0;
bottom: -10rpx;
width: 160rpx;
height: 60rpx;
background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1));
box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22);
border-radius: 30rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #fff;
padding: 0;
}
.tip { .group-num {
width: 460rpx; font-size: 20rpx;
} font-family: PingFang SC;
} font-weight: 500;
color: rgba(153, 153, 153, 1);
margin-left: 20rpx;
}
.buy-btn { .sell-box {
position: absolute; background: rgba(255, 224, 226, 0.3);
right: 0; border-radius: 16rpx;
bottom: -10rpx; line-height: 32rpx;
width: 160rpx; padding: 0 10rpx;
height: 60rpx;
background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1));
box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22);
border-radius: 30rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #fff;
padding: 0;
}
.group-num { .sell-num {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 400;
color: rgba(153, 153, 153, 1); color: rgba(247, 151, 156, 1);
margin-left: 20rpx;
} }
.sell-box { .cuIcon-hotfill {
background: rgba(255, 224, 226, 0.3); font-size: 26rpx;
border-radius: 16rpx; color: #e1212b;
line-height: 32rpx; margin-right: 8rpx;
padding: 0 10rpx;
.sell-num {
font-size: 20rpx;
font-family: PingFang SC;
font-weight: 400;
color: rgba(247, 151, 156, 1);
}
.cuIcon-hotfill {
font-size: 26rpx;
color: #e1212b;
margin-right: 8rpx;
}
} }
} }
} }
}
</style> </style>

6
pages/activity/GoodsSeckill/index.vue

@ -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

@ -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

@ -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

@ -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>

62
pages/shop/IntegralGoodsCon/index.vue

@ -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>
@ -96,7 +96,7 @@ export default {
StorePoster, StorePoster,
ShareInfo, ShareInfo,
}, },
data: function () { data: function() {
return { return {
shareInfoStatus: false, shareInfoStatus: false,
weixinStatus: false, weixinStatus: false,
@ -154,7 +154,7 @@ export default {
} }
}, },
computed: mapGetters(['isLogin', 'location']), computed: mapGetters(['isLogin', 'location']),
mounted: function () { mounted: function() {
this.$store.commit('get_to', 'goodcon') this.$store.commit('get_to', 'goodcon')
let url = handleQrCode() let url = handleQrCode()
if (!url) { if (!url) {
@ -185,7 +185,7 @@ export default {
}, },
}, },
methods: { methods: {
onShareAppMessage: function () { onShareAppMessage: function() {
return { return {
title: this.storeInfo.storeName, title: this.storeInfo.storeName,
imageUrl: this.storeInfo.image, imageUrl: this.storeInfo.image,
@ -235,7 +235,7 @@ export default {
}, },
}) })
}, },
showChang: function (data) { showChang: function(data) {
this.$yrouter.push({ this.$yrouter.push({
path: '/pages/map/index', path: '/pages/map/index',
query: data, query: data,
@ -244,23 +244,23 @@ export default {
updateTitle() { updateTitle() {
// document.title = this.storeInfo.storeName || this.$yroute.meta.title; // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
}, },
setShareInfoStatus: function () { setShareInfoStatus: function() {
this.shareInfoStatus = !this.shareInfoStatus this.shareInfoStatus = !this.shareInfoStatus
this.posters = false this.posters = false
}, },
shareCode: function () { shareCode: function() {
var that = this var that = this
getProductCode(that.id).then(res => { getProductCode(that.id).then(res => {
that.posterData.code = res.data.code that.posterData.code = res.data.code
that.listenerActionSheet() that.listenerActionSheet()
}) })
}, },
setPosterImageStatus: function () { setPosterImageStatus: function() {
this.posterImageStatus = !this.posterImageStatus this.posterImageStatus = !this.posterImageStatus
this.posters = false this.posters = false
}, },
// //
productCon: function () { productCon: function() {
let that = this let that = this
let from = this.location let from = this.location
if (this.$deviceType == 'app') { if (this.$deviceType == 'app') {
@ -320,7 +320,7 @@ export default {
}) })
}, },
// //
DefaultSelect: function () { DefaultSelect: function() {
let productAttr = this.attr.productAttr let productAttr = this.attr.productAttr
let value = [] let value = []
for (let i = 0; i < productAttr.length; i++) { for (let i = 0; i < productAttr.length; i++) {
@ -362,7 +362,7 @@ export default {
} }
}, },
// //
ChangeCartNum: function (changeValue) { ChangeCartNum: function(changeValue) {
//changeValue: | //changeValue: |
// //
let productSelect = this.productValue[this.attrValue] let productSelect = this.productValue[this.attrValue]
@ -395,29 +395,29 @@ export default {
} }
}, },
// //
changeFun: function (opt) { changeFun: function(opt) {
if (typeof opt !== 'object') opt = {} if (typeof opt !== 'object') opt = {}
let action = opt.action || '' let action = opt.action || ''
let value = opt.value === undefined ? '' : opt.value let value = opt.value === undefined ? '' : opt.value
this[action] && this[action](value) this[action] && this[action](value)
}, },
// //
couponTap: function () { couponTap: function() {
let that = this let that = this
that.coupons() that.coupons()
that.coupon.coupon = true that.coupon.coupon = true
}, },
changecoupon: function (msg) { changecoupon: function(msg) {
this.coupon.coupon = msg this.coupon.coupon = msg
this.coupons() this.coupons()
}, },
currentcoupon: function (res) { currentcoupon: function(res) {
let that = this let that = this
that.coupon.coupon = false that.coupon.coupon = false
that.$set(that.coupon.list[res], 'is_use', true) that.$set(that.coupon.list[res], 'is_use', true)
}, },
// //
coupons: function () { coupons: function() {
let that = this, let that = this,
q = { q = {
page: 1, page: 1,
@ -429,18 +429,18 @@ export default {
}) })
}, },
// //
selecAttrTap: function () { selecAttrTap: function() {
this.attr.cartAttr = true this.attr.cartAttr = true
this.isOpen = true this.isOpen = true
}, },
changeattr: function (msg) { changeattr: function(msg) {
// //
console.log(msg) console.log(msg)
this.attr.cartAttr = msg this.attr.cartAttr = msg
this.isOpen = false this.isOpen = false
}, },
// //
ChangeAttr: function (res) { ChangeAttr: function(res) {
// //
let productSelect = this.productValue[res.value] let productSelect = this.productValue[res.value]
@ -467,27 +467,27 @@ export default {
} }
}, },
// //
setCollect: function () { setCollect: function() {
let that = this, let that = this,
id = that.storeInfo.id, id = that.storeInfo.id,
category = 'collect' category = 'collect'
if (that.storeInfo.userCollect) { if (that.storeInfo.userCollect) {
getCollectDel(id, category).then(function () { getCollectDel(id, category).then(function() {
that.storeInfo.userCollect = !that.storeInfo.userCollect that.storeInfo.userCollect = !that.storeInfo.userCollect
}) })
} else { } else {
getCollectAdd(id, category).then(function () { getCollectAdd(id, category).then(function() {
that.storeInfo.userCollect = !that.storeInfo.userCollect that.storeInfo.userCollect = !that.storeInfo.userCollect
}) })
} }
}, },
// //
joinCart: function () { joinCart: function() {
//0= //0=
this.goCat(0) this.goCat(0)
}, },
// //
goCat: function (news) { goCat: function(news) {
let that = this, let that = this,
productSelect = that.productValue[this.attrValue] productSelect = that.productValue[this.attrValue]
// //
@ -516,7 +516,7 @@ export default {
uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '', uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
} }
postCartAdd(q) postCartAdd(q)
.then(function (res) { .then(function(res) {
console.log(res) console.log(res)
that.isOpen = false that.isOpen = false
that.attr.cartAttr = false that.attr.cartAttr = false
@ -558,7 +558,7 @@ export default {
}) })
}, },
// //
getCartCount: function (isAnima) { getCartCount: function(isAnima) {
let that = this let that = this
const isLogin = that.isLogin const isLogin = that.isLogin
if (isLogin) { if (isLogin) {
@ -569,7 +569,7 @@ export default {
// //
if (isAnima) { if (isAnima) {
that.animated = true that.animated = true
setTimeout(function () { setTimeout(function() {
that.animated = false that.animated = false
}, 500) }, 500)
} }
@ -577,20 +577,20 @@ export default {
} }
}, },
// //
tapBuy: function () { tapBuy: function() {
// 1= // 1=
this.goCat(1) this.goCat(1)
}, },
listenerActionSheet: function () { listenerActionSheet: function() {
if (isWeixin() === true) { if (isWeixin() === true) {
this.weixinStatus = true this.weixinStatus = true
} }
this.posters = true this.posters = true
}, },
listenerActionClose: function () { listenerActionClose: function() {
this.posters = false this.posters = false
}, },
setOpenShare: function () { setOpenShare: function() {
var data = this.storeInfo var data = this.storeInfo
var href = this.location.href var href = this.location.href
if (this.$deviceType == 'weixin') { if (this.$deviceType == 'weixin') {

3
utils/request.js

@ -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 })
} }

Loading…
Cancel
Save