Compare commits

...

5 Commits

  1. 10
      api/store.js
  2. 3
      pages.json
  3. 6
      pages/activity/DargainDetails/index.vue
  4. 38
      pages/activity/DargainGoodsDetails/index.vue
  5. 37
      pages/activity/GroupDetails/index.vue
  6. 37
      pages/activity/SeckillDetails/index.vue
  7. 3
      pages/activity/activity/index.vue
  8. 2
      pages/shop/Evaluations/EvaluationDetail/index.vue
  9. 194
      pages/shop/GoodsCollection/index.vue
  10. 45
      pages/shop/GoodsCon/index.vue
  11. 2
      pages/shop/brands/brandDetail/index.vue
  12. 24
      pages/shop/brands/index.vue
  13. 59
      pages/user/PersonalData/index.vue
  14. 12
      pages/user/address/AddressManagement/index.vue
  15. 2
      pages/user/coupon/UserCoupon/index.vue

10
api/store.js

@ -226,6 +226,7 @@ export function getBrandByName() {
login: false
});
}
/**
* 添加收藏
*
@ -250,6 +251,15 @@ export function getBrandDetail(id) {
});
}
/**
* 品牌馆滚动条信息
*/
export function getBrandNoticeInfo() {
return request.get("/brandInfo", {}, {
login: false
});
}
/**
* 词条名查询
*/

3
pages.json

@ -265,7 +265,8 @@
{
"path": "pages/user/PersonalData/index",
"style": {
"navigationBarTitleText": "个人资料"
"navigationBarTitleText": "个人资料",
"navigationStyle": "custom"
}
},
{

6
pages/activity/DargainDetails/index.vue

@ -259,7 +259,7 @@
</view>
<view class="cutOff on" v-else>
<view class="help font-color-red" v-text="'成功帮砍' + bargainHelpPrice + '元'"></view>
您也可以砍价低价拿哦快去挑选心仪的商品吧~
您也可以砍价低价拿哦快去挑选心仪的商品吧~
</view>
<button class="tipBnt" open-type="share" v-if="bargainUid === userInfo.uid" @click="close">邀请好友帮砍价</button>
<!-- <view class="tipBnt" @click="goPoster" v-if="bargainUid === userInfo.uid">邀请好友帮砍价</view> -->
@ -343,11 +343,11 @@ export default {
if (url) {
//
that.bargainId = url.bargainId
that.bargainUid = url.partake
that.bargainUid = Number(url.partake);
} else {
//
that.bargainId = that.$yroute.query.id
that.bargainUid = that.$yroute.query.partake
that.bargainUid = Number(that.$yroute.query.partake);
}
if (this.bargainUid == 0 || !this.bargainUid) {
// urluiduid

38
pages/activity/DargainGoodsDetails/index.vue

@ -41,13 +41,16 @@
</view>
</view>
<view class="safeguard-info acea-row row-between-wrapper">
<view class="safeguard-item">
<view class="safeguard-info acea-row" v-if="tempName || goodsDetail.config">
<view class="safeguard-item" v-if="tempName">
<image class="img" src="@/static/images/by.png" mode=""></image>
<view>{{199}}包邮</view>
<view class="line1">{{tempName}}</view>
</view>
<view class="line"></view>
<view class="safeguard-item">
<view class="safeguard-item" v-for="(item,index) in goodsDetail.config" :key="index">
<image class="img" :src="item.configuration" mode=""></image>
<view class="line1">{{item.content}}</view>
</view>
<!-- <view class="safeguard-item">
<image class="img" src="@/static/images/fxt.png" mode=""></image>
<view>7天无理由</view>
</view>
@ -55,7 +58,7 @@
<view class="safeguard-item">
<image class="img" src="@/static/images/bj.png" mode=""></image>
<view>30天保价</view>
</view>
</view> -->
</view>
<!-- 用户评价 -->
@ -71,7 +74,7 @@
</view> -->
<view class="product-intro">
<view class="title">商品展示</view>
<!-- <view class="title">商品展示</view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="goodsDetail.description" @linktap="linktap" />
@ -136,10 +139,13 @@
goodsDetail: {
minPrice: 0,
price: 0,
stock: '',
unitName: '',
},
bargainId: 0,
bargainUid: 0,
imgUrls: [],
tempName: '',
styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
entryInfo: {},
@ -183,6 +189,7 @@
// console.log(this.goodsDetail);
this.goodsDetail.description = this.goodsDetail.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"');
this.goodsDetail.rule = this.goodsDetail.rule.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"');
this.tempName = res.data.tempName;
}).catch(res => {
uni.hideLoading()
uni.showToast({
@ -388,7 +395,10 @@
padding: 18rpx 0rpx;
margin: 0rpx 32rpx 20rpx;
.safeguard-item {
width: 226rpx;
flex: 1;
// width: 226rpx;
height: 84rpx;
border-right: 2rpx solid #979797;
font-size: 20rpx;
font-family: SourceHanSansSCVF;
font-weight: 600;
@ -398,13 +408,17 @@
.img {
width: 46rpx;
height: 46rpx;
margin-top: 2rpx;
}
}
.line {
width: 2rpx;
height: 84rpx;
background-color: #979797;
.safeguard-item:last-child {
border-right: 0;
}
// .line {
// width: 2rpx;
// height: 84rpx;
// background-color: #979797;
// }
}
.tui-operation {

37
pages/activity/GroupDetails/index.vue

@ -86,13 +86,16 @@
<!-- <view class="iconfont icon-jiantou"></view> -->
</view>
<view class="safeguard-info acea-row row-between-wrapper">
<view class="safeguard-item">
<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
<view class="safeguard-item" v-if="tempName">
<image class="img" src="@/static/images/by.png" mode=""></image>
<view>{{199}}包邮</view>
<view class="line1">{{tempName}}</view>
</view>
<view class="line"></view>
<view class="safeguard-item">
<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
<image class="img" :src="item.configuration" mode=""></image>
<view class="line1">{{item.content}}</view>
</view>
<!-- <view class="safeguard-item">
<image class="img" src="@/static/images/fxt.png" mode=""></image>
<view>7天无理由</view>
</view>
@ -100,7 +103,7 @@
<view class="safeguard-item">
<image class="img" src="@/static/images/bj.png" mode=""></image>
<view>30天保价</view>
</view>
</view> -->
</view>
<!-- 拼团信息 -->
@ -187,7 +190,7 @@
<!-- 产品介绍 -->
<view class="product-intro">
<view class="title">商品展示</view>
<!-- <view class="title">商品展示</view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
@ -314,6 +317,7 @@ export default {
reply: [],
replyCount: 0,
replyChance: 0,
tempName: '',
imgUrls: [],
storeInfo: {},
itemNew: {},
@ -422,6 +426,7 @@ export default {
that.$set(that, 'reply', [res.data.reply])
that.$set(that, 'replyCount', res.data.replyCount)
that.$set(that, 'replyChance', res.data.replyChance)
that.$set(that, 'tempName', res.data.tempName);
that.posterData.image = that.storeInfo.image
if (that.storeInfo.title.length > 30) {
that.posterData.title = that.storeInfo.title.substring(0, 30) + '...'
@ -1669,7 +1674,10 @@ export default {
padding: 18rpx 0rpx;
margin: 0rpx 32rpx 20rpx;
.safeguard-item {
width: 226rpx;
flex: 1;
// width: 226rpx;
height: 84rpx;
border-right: 2rpx solid #979797;
font-size: 20rpx;
font-family: SourceHanSansSCVF;
font-weight: 600;
@ -1679,14 +1687,17 @@ export default {
.img {
width: 46rpx;
height: 46rpx;
// background-color: #FFFFFF;
margin-top: 2rpx;
}
}
.line {
width: 2rpx;
height: 84rpx;
background-color: #979797;
.safeguard-item:last-child {
border-right: 0;
}
// .line {
// width: 2rpx;
// height: 84rpx;
// background-color: #979797;
// }
}
.userEvaluation .title .replyCount {

37
pages/activity/SeckillDetails/index.vue

@ -87,13 +87,16 @@
<!-- <view class="iconfont icon-jiantou"></view> -->
</view>
<view class="safeguard-info acea-row row-between-wrapper">
<view class="safeguard-item">
<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
<view class="safeguard-item" v-if="tempName">
<image class="img" src="@/static/images/by.png" mode=""></image>
<view>{{199}}包邮</view>
<view class="line1">{{tempName}}</view>
</view>
<view class="line"></view>
<view class="safeguard-item">
<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
<image class="img" :src="item.configuration" mode=""></image>
<view class="line1">{{item.content}}</view>
</view>
<!-- <view class="safeguard-item">
<image class="img" src="@/static/images/fxt.png" mode=""></image>
<view>7天无理由</view>
</view>
@ -101,7 +104,7 @@
<view class="safeguard-item">
<image class="img" src="@/static/images/bj.png" mode=""></image>
<view>30天保价</view>
</view>
</view> -->
</view>
<!-- 用户评价 -->
@ -117,7 +120,7 @@
</view>
<view class="product-intro">
<view class="title">商品展示</view>
<!-- <view class="title">商品展示</view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
@ -253,6 +256,7 @@ export default {
replyCount: 0,
// replyChance: '',
reply: [],
tempName: '',
cartNum: 1,
attrTxt: '请选择',
productValue: [],
@ -348,6 +352,7 @@ export default {
that.$set(that, 'imgUrls', res.data.storeInfo.sliderImageArr)
that.$set(that, 'replyCount', res.data.replyCount)
that.$set(that, 'reply', res.data.reply)
that.$set(that, 'tempName', res.data.tempName)
that.posterData.image = that.storeInfo.image_base
that.updateTitle()
if (that.storeInfo.title.length > 30) {
@ -1160,7 +1165,10 @@ export default {
padding: 18rpx 0rpx;
margin: 0rpx 32rpx 20rpx;
.safeguard-item {
width: 226rpx;
flex: 1;
// width: 226rpx;
height: 84rpx;
border-right: 2rpx solid #979797;
font-size: 20rpx;
font-family: SourceHanSansSCVF;
font-weight: 600;
@ -1170,14 +1178,17 @@ export default {
.img {
width: 46rpx;
height: 46rpx;
// background-color: #FFFFFF;
margin-top: 2rpx;
}
}
.line {
width: 2rpx;
height: 84rpx;
background-color: #979797;
.safeguard-item:last-child {
border-right: 0;
}
// .line {
// width: 2rpx;
// height: 84rpx;
// background-color: #979797;
// }
}
.userEvaluation .title .replyCount {

3
pages/activity/activity/index.vue

@ -16,7 +16,7 @@
<view class="banner-box">
<swiper class="swiper" circular @change="swiperChange" :autoplay="true">
<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item" @click="goBannerDetail">
<image class="swiper-image " :src="item" mode="aspectFill" lazy-load>
<image class="swiper-image " :src="item.pic" mode="aspectFill" lazy-load>
</image>
</swiper-item>
</swiper>
@ -358,6 +358,7 @@
}
.banner-box {
position: relative;
width: 750rpx;
height: 488rpx;
.swiper {

2
pages/shop/Evaluations/EvaluationDetail/index.vue

@ -227,7 +227,7 @@
margin: 20rpx 32rpx 0rpx 90rpx;
padding: 20rpx 0rpx 20rpx 50rpx;
width: 628rpx;
// height: 146rpx;
min-height: 146rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
border-radius: 16rpx;

194
pages/shop/GoodsCollection/index.vue

@ -13,9 +13,9 @@
</cu-custom>
</view>
<view class="content-box" :style="'height:calc(100vh - '+CustomBar+'px);'">
<view class="content">
<view class="nav acea-row row-around" :style="'top:calc('+CustomBar+'px+2px)'">
<view class="content" :style="'min-height:calc(100vh - '+CustomBar+'px);'">
<view class="nav-box" :style="'top:'+CustomBar+'px;'">
<view class="nav acea-row row-around">
<view class="item" @click="changeType(0)">
<view :class="'title ' + (navType == 0? 'active' : '')">甄选商品</view>
</view>
@ -23,56 +23,50 @@
<view :class="'title ' + (navType === 1 ? 'active' : '')">甄选评测</view>
</view>
</view>
</view>
<view class="collectionGoods" v-if="collectProductList.length > 0">
<view class="item" v-for="(item, collectProductListIndex) in collectProductList"
:key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart"
@touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
<view v-if="navType==0" class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
<view class="pictrue">
<image :src="item.image" />
</view>
<view class="text">
<view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row sku-box">
<view class="sku" v-if="item.productInfo.attrInfo">
{{ item.productInfo.attrInfo.sku }}</view>
</view>
<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="money" v-else>{{ item.price }}</view>
</view>
<view class="collectionGoods" v-if="collectProductList.length > 0">
<view class="item" v-for="(item, collectProductListIndex) in collectProductList"
:key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart"
@touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
<view v-if="navType==0" class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
<view class="pictrue">
<image :src="item.image" />
</view>
<!-- 评测 -->
<!-- <view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
<view class="left acea-row row-column-between">
<view class="acea-row row-column-between">
<view class="title"></view>
<view class="title1"></view>
<view class="title2"></view>
</view>
<view @tap.stop="goMore" class="more">
MORE
</view>
</view>
<view class="right">
<image src="../../../static/images/earth-white.png" mode=""></image>
<view class="text">
<view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row sku-box">
<view class="sku" v-if="item.productInfo.attrInfo">
{{ item.productInfo.attrInfo.sku }}</view>
</view>
</view> -->
<view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
<image class="img" :src="item.homeImage" mode="aspectFill"></image>
<!-- <view class="more">
MORE
</view> -->
<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="money" v-else>{{ item.price }}</view>
</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)"
:style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>
</view>
<!-- 评测 -->
<view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
<image class="img" :src="item.homeImage" mode="aspectFill"></image>
<!-- <view class="more">MORE</view> -->
</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)"
:style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>
</view>
<Loading :loaded="loadend" :loading="loading"></Loading>
</view>
<!--暂无收藏-->
<view v-else class="noCommodity" style="padding-top:208rpx;">
<view class="noPictrue">
<image src="@/static/images/no-more.png" class="image" />
</view>
<view class="text-big">
什么都没有大概被外星人带走了
</view>
<!-- <view class="text-small">
快去领取福利优惠券吧
</view> -->
</view>
</view>
@ -283,70 +277,7 @@
}
</script>
<style lang="less" scoped>
// .review-box{
// padding: 30rpx 30rpx 20rpx 30rpx;
// width: 687rpx;
// height: 250rpx;
// border-radius: 16rpx;
// background: #F5F6F8;
// box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
// .left{
// max-width: 460rpx;
// .title{
// font-size: 36rpx;
// font-weight: 500;
// text-transform: uppercase;
// }
// .title1{
// margin: 10rpx 0 5rpx 0;
// font-size: 24rpx;
// text-transform: uppercase;
// }
// .title2{
// font-size: 28rpx;
// }
// .more{
// font-size: 24rpx;
// position: relative;
// }
// .more::before{
// position: absolute;
// border-bottom: 1rpx solid black;
// bottom: -8rpx;
// left: -4rpx;
// content: '';
// width: 100rpx;
// background-color: black;
// height: 1rpx;
// }
// .more::after{
// margin-left: 10rpx;
// content: '';
// display: inline-block;
// width: 0;
// height: 0;
// border-top: 10rpx solid transparent;
// border-left: 10rpx solid black;
// border-bottom: 10rpx solid transparent;
// border-right: 10rpx solid transparent;
// }
// }
// .right{
// image{
// width: 200rpx;
// height: 100%;
// }
// }
// }
.review-box {
// padding: 30rpx 30rpx 20rpx 30rpx;
// width: 687rpx;
// height: 240rpx;
border-radius: 16rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
@ -417,10 +348,10 @@
}
}
.content-box {
padding-top: 4rpx;
width: 100vw;
position: relative;
// .content-box {
// padding-top: 4rpx;
// width: 100vw;
// position: relative;
.content {
width: 100%;
@ -429,14 +360,19 @@
background: #FFFFFF;
border-radius: 28rpx 28rpx 0rpx 0rpx;
.nav-box {
width: 100vw;
padding-top: 4rpx;
position: fixed;
left: 0;
z-index: 5;
background: #F1F1F1;
}
.nav {
width: 100vw;
background: #FFFFFF;
height: 92rpx;
padding: 34rpx 32rpx 16rpx;
position: fixed;
left: 0;
z-index: 5;
border-radius: 28rpx 28rpx 0rpx 0rpx;
.item {
@ -478,7 +414,7 @@
}
}
}
}
// }
.info-box {
width: 686rpx;
@ -506,6 +442,9 @@
}
}
.collectionGoods {
padding-top: 114rpx;
}
.collectionGoods .item .delete {
position: absolute;
top: 0;
@ -528,4 +467,29 @@
height: 240rpx !important;
line-height: 240rpx !important;
}
.noCommodity{
.noPictrue{
width: 428rpx;
height: 526rpx;
}
.text-big{
padding: 0 30rpx;
text-align: center;
font-family: PingFangSC-Medium, PingFang SC;
font-style: 36rpx;
font-weight: 600;
color: #3A3A3C;
line-height: 50rpx;
}
.text-small{
padding: 0 80rpx;
font-family: PingFangSC-Medium, PingFang SC;
text-align: center;
font-style: 28rpx;
font-weight: 400;
color: #3A3A3C;
line-height: 40rpx;
}
}
</style>

45
pages/shop/GoodsCon/index.vue

@ -97,21 +97,22 @@
<!-- <view class="iconfont icon-jiantou"></view> -->
</view>
<view class="safeguard-info acea-row row-between-wrapper">
<view class="safeguard-item">
<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
<view class="safeguard-item" v-if="tempName">
<image class="img" src="../../../static/images/by.png" mode=""></image>
<view>{{199}}包邮</view>
<view class="line1">{{tempName}}</view>
</view>
<view class="line"></view>
<view class="safeguard-item">
<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
<image class="img" :src="item.configuration" mode=""></image>
<view class="line1">{{item.content}}</view>
</view>
<!-- <view class="line"></view> -->
<!-- <view class="safeguard-item">
<image class="img" src="../../../static/images/fxt.png" mode=""></image>
<view>7天无理由</view>
</view>
<view class="line"></view>
<view class="safeguard-item">
<image class="img" src="../../../static/images/bj.png" mode=""></image>
<view>30天保价</view>
</view>
</view> -->
</view>
<!-- 门店信息 -->
@ -200,7 +201,7 @@
<!-- 商品详情 -->
<view class="product-intro">
<view class="title">商品展示</view>
<!-- <view class="title">商品展示</view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
@ -407,7 +408,7 @@
systemStore: {},
qqmapsdk: null,
productConClass: 'product-con',
tempName: '全国包邮',
tempName: '',
isIntegral: false,
isUnfold: false, //
entryInfo: {},
@ -1076,7 +1077,7 @@
}
.info {
font-size: 16rpx;
font-size: 20rpx;
font-family: PingFang SC;
color: #2DB5AE;
line-height: 22rpx;
@ -1162,7 +1163,10 @@
margin: 0rpx 32rpx 20rpx;
.safeguard-item {
width: 226rpx;
flex: 1;
// width: 226rpx;
height: 84rpx;
border-right: 2rpx solid #979797;
font-size: 20rpx;
font-family: SourceHanSansSCVF;
font-weight: 600;
@ -1173,15 +1177,18 @@
.img {
width: 46rpx;
height: 46rpx;
// background-color: #FFFFFF;
margin-top: 2rpx;
}
}
.line {
width: 2rpx;
height: 84rpx;
background-color: #979797;
.safeguard-item:last-child {
border-right: 0;
}
// .line {
// width: 2rpx;
// height: 84rpx;
// background-color: #979797;
// }
}
.userEvaluation .title .replyCount {

2
pages/shop/brands/brandDetail/index.vue

@ -259,9 +259,9 @@
}
}
.info {
// height: 56rpx;
min-height: 58rpx;
max-height: 124rpx;
// padding-top: 6rpx;
padding-top: 14rpx;
font-size: 16rpx;
font-family: PingFang SC;

24
pages/shop/brands/index.vue

@ -30,16 +30,16 @@
</view>
</view>
<view class="notice-box acea-row row-middle">
<view class="notice-box acea-row row-middle" v-if="noticeInfo.info">
<view class="title">
<image src="../../../static/images/yanjie-logo.png" mode=""></image>
</view>
<view class="min-title acea-row row-between-wrapper">
<view class="">选品标准</view>
<view class="">{{noticeInfo.title}}</view>
<image src="../../../static/images/laba.png" mode="aspectFill"></image>
</view>
<view class="uni-notice-bar-box">
<uni-notice-bar color="#2DB5AE" backgroundColor="#F1F1F1" scrollable="true" single="true" :speed="60" text="热花今将机支物极十争才线来理始"></uni-notice-bar>
<uni-notice-bar color="#2DB5AE" backgroundColor="#F1F1F1" scrollable="true" single="true" :speed="50" :text="noticeInfo.info"></uni-notice-bar>
</view>
</view>
@ -97,7 +97,7 @@
<script>
import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
import { getBrands, getProducts ,getBanner} from '@/api/store';
import { getBrands, getProducts ,getBanner, getBrandNoticeInfo} from '@/api/store';
import Loading from '@/components/Loading';
export default {
components: {
@ -108,6 +108,10 @@
return {
currents: 0,
imgUrls: [],
noticeInfo: {
title: '',
info: ''
},
brandList: [],
where: {
page: 1,
@ -125,11 +129,13 @@
onLoad() {
this.getBrandList();
this.getNewProducts();
getBanner(1).then(
res => {
this.$set(this,'imgUrls',res.data.banner)
})
getBanner(1).then(res => {
this.$set(this,'imgUrls',res.data.banner)
})
getBrandNoticeInfo().then(res => {
this.noticeInfo.title = res.data.title;
this.noticeInfo.info = res.data.info;
})
},
onReachBottom() {
!this.loading && this.getNewProducts();

59
pages/user/PersonalData/index.vue

@ -1,5 +1,17 @@
<template>
<view class="personal-data">
<view class="header">
<cu-custom :isBack="true" :isCenter="true">
<block slot="backText">
<view class="backImg">
<image src="@/static/images/back-btn.png" mode=""></image>
</view>
</block>
<block slot="content">
<view class="tab-title">个人资料</view>
</block>
</cu-custom>
</view>
<!-- <view class="wrapper"> -->
<view class="wrapList acea-row row-between-wrapper">
<!-- <view class="item acea-row row-between-wrapper on"> -->
@ -42,12 +54,11 @@
<view class="item acea-row row-between-wrapper">
<view>生日</view>
<view class="input">
<picker mode="date" :value="birth" @change="bindDateChange">
<view v-if="!birth" class="empty">点击完善生日</view>
<view v-else>
{{birth}}
</view>
<picker v-if="!userInfo.birthday" mode="date" :value="birthday" @change="bindDateChange">
<view v-if="!birthday" class="empty">点击完善生日</view>
<view v-else>{{birthday}}</view>
</picker>
<view v-else>{{birthday}}</view>
</view>
</view>
<view class="item acea-row row-between-wrapper">
@ -109,12 +120,13 @@
currentAccounts: 0,
switchUserInfo: [],
userIndex: 0,
birth: '',
birthday: '',
};
},
computed: mapGetters(["userInfo"]),
mounted: function() {
this.avatar = this.userInfo.avatar;
this.birthday = this.userInfo.birthday;
this.isWeixin = isWeixin();
// this.getUserInfo();
},
@ -239,7 +251,7 @@
},
bindDateChange(e) {
console.log(e)
this.birth = e.detail.value;
this.birthday = e.detail.value;
},
//
phoneLogin(e) {
@ -248,7 +260,6 @@
uni.showLoading({
title: '绑定中',
})
// this.wxappBindPhone(e, e.mp.detail.code)
uni.login({
success: (loginRes) => {
wxappBindingPhone({
@ -288,14 +299,10 @@
})
}
},
wxappBindPhone(e, code) {
},
submit: function() {
let userInfo = this.userInfo;
console.log(userInfo, '==============');
// console.log(userInfo, '==============');
let data = {
nickname: '',
avatar: ''
@ -306,6 +313,10 @@
if (this.avatar) {
data.avatar = this.avatar;
}
if(this.birthday) {
data.birthday = this.birthday;
}
if (!this.userInfo.nickname && !this.avatar && !this.birthday) return
postUserEdit(data).then(
(res) => {
this.$store.dispatch("userInfo", true);
@ -353,6 +364,25 @@
};
</script>
<style lang="less" scoped>
.header {
.tab-title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 600;
color: #2DB5AE;
line-height: 42rpx;
}
.backImg {
width: 88rpx;
height: 62rpx;
padding-left: 26rpx;
image {
width: 100%;
height: 100%;
}
}
}
.wrapList {
padding: 20rpx 32rpx 32rpx;
@ -426,6 +456,9 @@
border-radius: 8rpx;
margin: 0;
padding: 0;
&::after{
border:none;
}
}
}
}

12
pages/user/address/AddressManagement/index.vue

@ -65,16 +65,14 @@
</view>
</view>
<Loading :loaded="loadend" :loading="loading"></Loading>
<Loading :loaded="loadend" :loading="loading" v-if="addressList.length > 0"></Loading>
<view class="no-address" v-if="addressList.length < 1 && page > 1">
<!-- <view class="noCommodity"> -->
<view class="no-address">
<image class="image" src="../../../../static/images/no-address.png" mode="widthFix"></image>
<view class="">等我们也造火箭或许能寄到火星</view>
<view class="tip">赶快添加收货地址吧</view>
<view class="add-icon" @click="addAddress"></view>
<image class="image" src="../../../../static/images/no-address.png" mode="widthFix"></image>
<view class="">等我们也造火箭或许能寄到火星</view>
<view class="tip">赶快添加收货地址吧</view>
<view class="add-icon" @click="addAddress"></view>
<!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/noAddress.png`" class="image" /> -->
</view>
</view>
<!-- <view style="height:100rpx;"></view> -->

2
pages/user/coupon/UserCoupon/index.vue

@ -14,7 +14,7 @@
</view>
<view class="content" :style="'min-height:calc(100vh - '+CustomBar+'px);'">
<view class="nav-box" :style="'top:calc('+CustomBar+'px)'">
<view class="nav-box" :style="'top:'+CustomBar+'px'">
<view class="nav acea-row row-around">
<view class="item" @click="setType(0)">
<view :class="'title ' + (navType == 0? 'active' : '')">待领取</view>

Loading…
Cancel
Save