Compare commits

...

4 Commits

  1. 39
      pages/activity/DargainGoodsDetails/index.vue
  2. 39
      pages/activity/GroupDetails/index.vue
  3. 41
      pages/activity/SeckillDetails/index.vue
  4. 40
      pages/activity/activity/index.vue
  5. 50
      pages/order/MyOrder/index.vue
  6. 11
      pages/shop/Evaluations/EvaluationDetail/index.vue
  7. 2
      pages/shop/GoodsFoot/index.vue
  8. 4
      pages/shop/brands/brandAll/index.vue
  9. 17
      pages/user/AboutUs/index.vue
  10. 10
      pages/user/coupon/GetCoupon/index.vue
  11. 51
      pages/user/coupon/UserCoupon/index.vue
  12. BIN
      static/images/no-more.png

39
pages/activity/DargainGoodsDetails/index.vue

@ -72,7 +72,11 @@
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="goodsDetail.description"></view>
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="goodsDetail.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="goodsDetail.description"></view> -->
</view>
<view :style="addBottom?'height: 162rpx;':'height: 122rpx;'"></view>
@ -104,6 +108,14 @@
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
</view>
</template>
@ -111,6 +123,7 @@
import ProductConSwiper from '@/components/ProductConSwiper';
import CountDown from '@/components/CountDown';
import { getBargainDetail } from '@/api/activity';
import { getEntry } from '@/api/store'
import { handleQrCode } from '@/utils/index'
export default {
components: {
@ -129,6 +142,12 @@
imgUrls: [],
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: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
};
},
onLoad() {
@ -191,7 +210,23 @@
path: "/pages/activity/DargainDetails/index",
query: { id: this.bargainId, partake: 0 }
});
}
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
}
}
</script>

39
pages/activity/GroupDetails/index.vue

@ -188,8 +188,11 @@
<!-- 产品介绍 -->
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="storeInfo.description"></view>
<!-- <view class="conter" v-html=""></view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="storeInfo.description"></view> -->
</view>
<!-- 操作栏 -->
@ -257,6 +260,14 @@
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
<!-- 商品信息弹窗 -->
<ProductWindow v-if="cartNum" v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum" :storeInfo="storeInfo.info" :unitName="storeInfo.unitName"></ProductWindow>
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData"></StorePoster>
@ -272,7 +283,7 @@ import UserEvaluation from '@/components/UserEvaluation'
import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import { getCombinationDetail } from '@/api/activity'
import { postCartAdd } from '@/api/store'
import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'GroupDetails'
@ -330,6 +341,12 @@ export default {
},
cartNum: 1,
userCollect: false,
entryInfo: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
}
},
computed: {},
@ -600,6 +617,22 @@ export default {
this.attr.cartAttr = true
this.isOpen = true
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
},
}
</script>

41
pages/activity/SeckillDetails/index.vue

@ -118,7 +118,11 @@
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="storeInfo.description"></view>
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="storeInfo.description"></view> -->
</view>
<!-- 操作栏 -->
@ -189,7 +193,16 @@
</view> -->
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum" :storeInfo="storeInfo.info" :unitName="storeInfo.unitName"></ProductWindow>
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData"></StorePoster>
</view>
@ -207,7 +220,7 @@ import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import UserEvaluation from '@/components/UserEvaluation';
import { getSeckillDetail } from '@/api/activity'
import { postCartAdd } from '@/api/store'
import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'SeckillDetails'
@ -254,6 +267,12 @@ export default {
userCollect: false,
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: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
}
},
onShow: function() {
@ -526,6 +545,22 @@ export default {
})
}
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
},
}
</script>

40
pages/activity/activity/index.vue

@ -1,7 +1,7 @@
<template>
<view>
<view class="bargain on">
<view class="header">
<cu-custom :isBack="true" :isCenter="true" bgColor="''">
<cu-custom :isBack="true" :isCenter="true">
<block slot="backText">
<view class="backImg">
<image src="@/static/images/back-btn.png" mode=""></image>
@ -49,7 +49,7 @@
<view class="text">{{timeList[seckillActive].status == 2 ? timeList[seckillActive].time + '即将开始' : '本轮结束仅剩'}}</view>
<CountDown :isDay="true" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="timeList[seckillActive].stop"></CountDown>
</view>
<image src="../../../static/images/icon-tishi.png" mode=""></image>
<image src="../../../static/images/icon-tishi.png" mode="" @click="showRule"></image>
</view>
<view class="goods-box">
@ -84,8 +84,14 @@
</view>
</view>
</view>
</view>
<!-- 提示弹窗 -->
<view class="mask" @touchmove.stop.prevent :hidden="active === false && isShowRule === false" @click="close">
<view class="bargainTip" style="padding-bottom: 0;" :class="isShowRule === true ? 'on' : ''">
<view class="rule-content">111111111111111111</view>
</view>
</view>
</view>
</template>
@ -126,6 +132,8 @@
},
bargainList: [],
bargainLoaded: false,
isShowRule: false, //
active: false,
};
},
mounted() {
@ -143,6 +151,16 @@
})
},
methods: {
//
close: function () {
this.active = false;
this.isShowRule = false;
},
showRule() {
// console.log('asdqwer')
// this.active = true;
this.isShowRule = true;
},
goBannerDetail(item){
if (item.uniapp_url) {
this.$yrouter.push(item.uniapp_url)
@ -269,6 +287,20 @@
</script>
<style lang="less" scoped>
.bargainTip {
.rule-content {
padding: 24rpx;
min-height: 300rpx;
max-height: 600rpx;
overflow-y: scroll;
font-size: 26rpx;
font-weight: 600;
color: #3A3A3C;
line-height: 38rpx;
z-index: 100;
}
}
.header {
.tab-title {
font-size: 32rpx;

50
pages/order/MyOrder/index.vue

@ -143,11 +143,21 @@
<Loading :loaded="loaded" :loading="loading"></Loading>
</view>
<view class="noCart" v-if="orderList.length === 0 && page > 1">
<!-- <view class="noCart" v-if="orderList.length === 0 && page > 1">
<view class="pictrue">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/noOrder.png`" />
</view>
</view> -->
<view class="noCart" v-if="orderList.length === 0 && page > 1">
<view class="pictrue">
<image src="@/static/images/no-more.png" />
</view>
<view class="text-big">
什么都没有大概被外星人带走了
</view>
<view class="text-small">
快去下单吧
</view>
</view>
</view>
@ -432,21 +442,43 @@ export default {
}
}
}
.noCart {
margin-top: 0.17 * 100rpx;
padding-top: 0.1 * 100rpx;
// margin-top: 0.17 * 100rpx;
// padding-top: 0.1 * 100rpx;
}
.noCart .pictrue {
width: 4 * 100rpx;
height: 3 * 100rpx;
// width: 4 * 100rpx;
// height: 3 * 100rpx;
width: 428rpx;
height: 526rpx;
overflow: hidden;
margin: 0.7 * 100rpx auto 0.5 * 100rpx auto;
}
.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;
}
.noCart .pictrue image {
width: 4 * 100rpx;
height: 3 * 100rpx;
// width: 4 * 100rpx;
// height: 3 * 100rpx;
width: 428rpx;
height: 526rpx;
}
</style>

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

@ -16,8 +16,7 @@
<view class="synopsis-box acea-row" v-if="info.synopsis">
<view class="left-circle"></view>
<view class="info">
{{' ' + info.synopsis}}
<!-- <text>甄选评测介绍</text>{{' ' + info.synopsis}} -->
<!-- <text>甄选评测介绍</text> -->{{' ' + info.synopsis}}
</view>
<image src="../../../../static/images/evaluation-icon.png" mode=""></image>
</view>
@ -259,10 +258,10 @@
color: #2DB5AE;
line-height: 26rpx;
padding: 0rpx 8rpx;
text {
font-weight: 600;
// padding-right: 6rpx;
}
// text {
// font-weight: 600;
// // padding-right: 6rpx;
// }
}
}

2
pages/shop/GoodsFoot/index.vue

@ -44,7 +44,7 @@
<image class="img" :src="item.image" mode=""></image>
<view class="right-box acea-row row-column-between row-top">
<view class="title-top line2">{{ item.storeName }}</view>
<view class="pic" v-if="item.isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="pic" v-if="item.isIntegral == 1">{{ item.integral }}积分</view>
<view class="pic" v-else>{{ item.price }}</view>
</view>
</view>

4
pages/shop/brands/brandAll/index.vue

@ -204,6 +204,10 @@
text-align: center;
width: 170rpx;
flex-wrap: wrap;
font-size: 26rpx;
font-family: PingFang SC;
color: #3A3A3A;
line-height: 38rpx;
}
}
.brand-item:nth-child(3n+3){

17
pages/user/AboutUs/index.vue

@ -12,8 +12,10 @@
</block>
</cu-custom>
</view>
<view class="" v-html="aboutUsDetail">
<view class="conter">
<!-- <image class="img" src="../../../static/images/guanyu.jpg" mode="widthFix"></image> -->
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="aboutUsDetail"/>
</view>
</view>
</template>
@ -24,7 +26,10 @@
data() {
return {
aboutUsDetail:{}
aboutUsDetail:{},
tagStyle: {
img: 'padding:0;margin:0;font-size:0;display:block;'
}
};
},
@ -75,5 +80,13 @@
width: 100%;
// height: 100%;
}
.conter {
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
color: #3A3A3C;
// line-height: 32rpx;
padding: 0rpx 30rpx;
}
</style>

10
pages/user/coupon/GetCoupon/index.vue

@ -39,7 +39,8 @@
<!-- <view class="money">7<text></text></view> -->
<view class="line"></view>
<view class="tip acea-row row-between">
<view class="">{{item.ctype?'仅限定品牌可用':'全部商品可用'}}</view>
<!-- <view class="">{{item.ctype?'仅限定品牌可用':'全部商品可用'}}</view> -->
<view class="">全部商品可用</view>
<view v-if="item.endTime === 0">不限时</view>
<view v-else>{{ item.startTime }}-{{ item.endTime }}</view>
</view>
@ -50,7 +51,7 @@
<view class="type">{{'满减券' || '折扣券'}}</view>
<view class="tip">{{ item.useMinPrice }}可用</view>
<!-- <view v-if="item._msg == '已过期'" class="btn btn-fail">不可用</view> -->
<view v-if="item.isUse === true" class="btn btn-white">已领取</view>
<view v-if="item.isUse === true" class="btn btn-white" @click="goBrands">去使用</view>
<view v-else-if="item.isUse === 2" class="btn btn-fail">已领完</view>
<view v-else class="btn" @click="getCoupon(item.id, index)">立刻领取</view>
</view>
@ -142,6 +143,11 @@ export default {
!this.loading && this.getUseCoupons()
},
methods: {
goBrands: function() {
this.$yrouter.push({
path: '/pages/shop/brands/index',
})
},
goBannerDetail(item){
if (item.uniapp_url) {
this.$yrouter.push(item.uniapp_url)

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

@ -39,7 +39,7 @@
<!-- <view class="money">7<text></text></view> -->
<view class="line"></view>
<view class="tip acea-row row-between">
<view class="">仅限定品牌可用</view>
<view class="">全部商品可用</view>
<view v-if="item.endTime === 0">不限时</view>
<view v-else>{{navType===0? item.startTime : item.useStartTime }}-{{navType===0? item.endTime:item.useEndTime}}</view>
</view>
@ -78,7 +78,14 @@
<!--暂无优惠券-->
<view class="noCommodity" v-if="couponsList.length === 0 && loading === false" style="padding-top:208rpx;">
<view class="noPictrue">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/noCoupon.png`" class="image" />
<!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/noCoupon.png`" class="image" /> -->
<image src="@/static/images/no-more.png" class="image" />
</view>
<view class="text-big">
什么都没有大概被外星人带走了
</view>
<view class="text-small">
快去领取福利优惠券吧
</view>
</view>
@ -138,8 +145,8 @@
let that = this
if(that.navType===2) return
if(that.navType===1){
that.$yrouter.switchTab({
path: '/pages/home/index',
that.$yrouter.push({
path: '/pages/shop/brands/index',
})
return
}
@ -194,13 +201,11 @@
})
}else{
getUserFailure(type).then(res=>{
res.data.forEach(item=>{
let futureDate=new Date(item.useEndTime).getTime()
let currentDate=new Date().getTime()
if(futureDate<currentDate){
this.couponsList.push(item)
}
})
res.data.forEach(item=>{
if(item._msg==='已过期'){
this.couponsList.push(item)
}
})
this.loading = false
})
}
@ -325,5 +330,29 @@
.coupon-list {
padding-top: 104rpx;
}
.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>

BIN
static/images/no-more.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Loading…
Cancel
Save