Compare commits

...

2 Commits

  1. 3
      pages.json
  2. 2
      pages/activity/DargainDetails/index.vue
  3. 38
      pages/activity/DargainGoodsDetails/index.vue
  4. 37
      pages/activity/GroupDetails/index.vue
  5. 37
      pages/activity/SeckillDetails/index.vue
  6. 2
      pages/shop/Evaluations/EvaluationDetail/index.vue
  7. 45
      pages/shop/GoodsCon/index.vue
  8. 9
      pages/shop/brands/brandDetail/index.vue
  9. 58
      pages/user/PersonalData/index.vue
  10. 12
      pages/user/address/AddressManagement/index.vue

3
pages.json

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

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

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 {

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;

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 {

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

@ -259,15 +259,16 @@
}
}
.info {
// height: 56rpx;
min-height: 58rpx;
max-height: 124rpx;
padding-top: 14rpx;
font-size: 16rpx;
padding-top: 6rpx;
// padding-top: 14rpx;
font-size: 18rpx;
// font-size: 16rpx;
font-family: PingFang SC;
font-weight: 500;
color: #2DB5AE;
line-height: 22rpx;
line-height: 24rpx;
word-break: break-all;
display: -webkit-box;
-webkit-line-clamp: 5;

58
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;
@ -429,4 +459,4 @@
}
}
}
</style>
</style>

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

Loading…
Cancel
Save