Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

评测，足迹样式修改

home_hotList
ld0104 2 years ago
parent
0e291bed07
commit
2e13124c2d
6 changed files with 53 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      config/index.js
  2. 11
      pages/shop/Evaluations/EvaluationDetail/index.vue
  3. 4
      pages/shop/GoodsCollection/index.vue
  4. 7
      pages/shop/GoodsFoot/index.vue
  5. 45
      pages/shop/brands/brandAll/index.vue
  6. 9
      pages/user/coupon/UserCoupon/index.vue

8
config/index.js
Unescape View File

@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
// export const BXG_TENANT_ID = 129
export const BXG_TENANT_ID = 138
export const BXG_TENANT_ID = 129
// export const BXG_TENANT_ID = 138
// export const BXG_TENANT_ID = 128

11
pages/shop/Evaluations/EvaluationDetail/index.vue
Unescape View File

@ -99,7 +99,7 @@
<view class="item" v-for="(item,index) in editableTabs" :key="index">
<view class="title-box acea-row row-middle">
<view class="num">{{index+1}}</view>
<view class="">{{item.content}}</view>
<view class="title">{{item.content}}</view>
</view>
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="item.configuration"/>
@ -140,8 +140,8 @@
accessibilityCurrent: 0,
editableTabs:[],
tagStyle: {
p: 'text-indent:2em;font-family: PingFang SC;font-size:28rpx;text-indent: 42rpx;',
img: 'padding:0;margin:0;font-size:0;display:block;'
// p: 'text-indent:2em;font-family: PingFang SC;font-size:28rpx;',
img: 'padding:0;margin:20rpx 0;font-size:0;display:block;border-radius: 16rpx;'
}
};
},
@ -430,6 +430,7 @@
font-weight: 600;
color: #3A3A3C;
line-height: 23px;
margin-bottom: 10rpx;
.num {
width: 34rpx;
height: 34rpx;
@ -443,6 +444,10 @@
text-align: center;
margin-right: 8rpx;
}
.title{
font-size: 32rpx;
font-weight: 600;
}
}
.info-text {
margin-bottom: 24rpx;

4
pages/shop/GoodsCollection/index.vue
Unescape View File

@ -60,9 +60,9 @@
</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">
<!-- <view class="more">
MORE
</view>
</view> -->
</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)"
:style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>

7
pages/shop/GoodsFoot/index.vue
Unescape View File

@ -43,7 +43,7 @@
<view class="acea-row" @click="goGoodsCon(item)">
<image class="img" :src="item.image" mode=""></image>
<view class="right-box acea-row row-column-between row-top">
<view class="title-top">{{ item.storeName }}</view>
<view class="title-top line2">{{ item.storeName }}</view>
<view class="pic" v-if="item.isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="pic" v-else>￥{{ item.price }}</view>
</view>
@ -100,7 +100,7 @@
goGoodsCon(item) {
if (item.isIntegral == 1) {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
path: '/pages/shop/IntegralGoodsCon/index',
query: {
id: item.pid
},
@ -232,6 +232,7 @@
}
.right-box {
width: 450rpx;
.title-top {
color: #3A3A3C;
font-size: 28rpx;
@ -248,7 +249,7 @@
.delete {
position: absolute;
top: 0;
right: -190rpx;
right: -250rpx;
width: 154rpx;
height: 210rpx;
background: #EC3A5B;

45
pages/shop/brands/brandAll/index.vue
Unescape View File

@ -27,14 +27,13 @@
<view class="nav-title">{{key}}</view>
<view class="moulding-right"></view>
</view>
<view class="acea-row row-between">
<view class="item-box acea-row row-top">
<view class="brand-item acea-row row-middle row-center-column row-center"
v-for="(item,index) in val" :key="index" @click="goDetail(item)">
<image class="brand-img" :src="item.pic" mode="aspectFill"></image>
<view class="brand-text">{{item.brandName}}</view>
<view class="brand-text line2">{{item.brandName}}</view>
</view>
</view>
</view>
</scroll-view>
</view>
@ -95,7 +94,7 @@
for(let i=0;i<this.rectInfoList.length;i++){
if(i<=this.rectInfoList.length-2){
let top=this.rectInfoList[i].top;
let bottom=this.rectInfoList[i].bottom;
let bottom=this.rectInfoList[i+1].bottom;
if(scrollTop>=top && scrollTop<bottom){
this.isLight=this.rectInfoList[i].key
}
@ -187,20 +186,32 @@
.scroll-box {
height: 1180rpx;
}
.brand-item {
font-family: PingFang SC;
width: 210rpx;
.brand-img {
width: 180rpx;
height: 180rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
border-radius: 16rpx;
.item-box{
flex: 1;
.brand-item {
font-family: PingFang SC;
width: 210rpx;
margin-right: 30rpx;
.brand-img {
width: 180rpx;
height: 180rpx;
background: #F5F6F8;
box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
border-radius: 16rpx;
}
.brand-text {
margin: 10rpx 0 20rpx 0;
text-align: center;
width: 170rpx;
flex-wrap: wrap;
}
}
.brand-text {
margin: 10rpx 0 20rpx 0;
.brand-item:nth-child(3n+3){
margin-right: 0;
}
}
.moulding-box {
width: 100%;
margin-bottom: 40rpx;
@ -208,13 +219,13 @@
.moulding-left {
margin-left: 15rpx;
width: 180rpx;
border-bottom: 4rpx solid #999;
border-bottom: 1rpx solid #999;
}
.moulding-right {
margin-right: 15rpx;
width: 180rpx;
border-bottom: 4rpx solid #999;
border-bottom: 1rpx solid #999;
}
.nav-title {

9
pages/user/coupon/UserCoupon/index.vue
Unescape View File

@ -180,7 +180,12 @@
if (i === 1) {
// 用户已领取列表
getCouponsUser(type).then(res => {
this.couponsList = res.data
res.data.forEach(item=>{
if(item._msg!=='已过期'){
this.couponsList.push(item)
}
})
// this.couponsList = res.data
this.loading = false
})
}else if(i===0){
@ -194,7 +199,7 @@
this.page = this.page + 1
})
}else{
getUserFailure().then(res=>{
getUserFailure(type).then(res=>{
res.data.forEach(item=>{
let futureDate=new Date(item.useEndTime).getTime()
let currentDate=new Date().getTime()

Write Preview
Loading…
Cancel
Save