Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
This commit is contained in:
commit
a34880e6a6
GPG Key ID:
A7972FD973317FF3
@ -271,12 +271,13 @@ export default {
|
||||
});
|
||||
},
|
||||
// 我的优惠券(已有的)
|
||||
getMemberCouponList({ store_id, gc_id, type, status }) {
|
||||
getMemberCouponList({ store_id, gc_id, type, status, page }) {
|
||||
return vm.$u.post('Coupon/getMemberCouponList', {
|
||||
store_id: store_id,
|
||||
gc_id: gc_id,
|
||||
type: type,
|
||||
status: status,
|
||||
page: page,
|
||||
});
|
||||
},
|
||||
// 获取直播列表
|
||||
|
||||
@ -242,6 +242,10 @@ export default {
|
||||
if(type > 0) Object.assign(params, {type: type});
|
||||
return vm.$u.post('Order/orderList', params);
|
||||
},
|
||||
// 各种订单数量
|
||||
getOrderNumber() {
|
||||
return vm.$u.post('order/orderNumber');
|
||||
},
|
||||
// 售后列表
|
||||
// getAfterSaleList({ page }) {
|
||||
// return vm.$u.post('order/afterSaleList', { page: page });
|
||||
@ -353,6 +357,12 @@ export default {
|
||||
code: code,
|
||||
});
|
||||
},
|
||||
// 获取可送洗商品
|
||||
getSendOrderList({ page }) {
|
||||
return vm.$u.post('member/getSendOrderList', {
|
||||
page: page,
|
||||
});
|
||||
},
|
||||
// 送洗列表-平台订单 实体店订单
|
||||
sendLaundryOrderList({ type, page }) {
|
||||
return vm.$u.post('member/sendLaundryOrderList', {
|
||||
|
||||
@ -20,6 +20,7 @@ const store = new Vuex.Store({
|
||||
token: "", // 储存token
|
||||
showLoginModel: false, // 登录框
|
||||
question: {}, // 帮助与反馈
|
||||
showCoupons: true, // 是否显示新人领取优惠券
|
||||
},
|
||||
getters: {
|
||||
getOrderAddress(state) {
|
||||
@ -79,6 +80,9 @@ const store = new Vuex.Store({
|
||||
},
|
||||
setQuestion(state, question) {
|
||||
state.question = question;
|
||||
},
|
||||
updateShowCoupons(state, status) {
|
||||
state.showCoupons = status;
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<image :src="item.member_avatar"></image>
|
||||
<text>{{ item.member_nickname }}</text>
|
||||
</view>
|
||||
<image src="/static/image/common/4.png" @click.stop="showAction"></image>
|
||||
<image class="img-imp" src="/static/image/common/4.png" @click.stop="showAction"></image>
|
||||
<view class="action" v-if="show == item.article_id">
|
||||
<view class="bubble">
|
||||
<view @click.stop="articleLike">
|
||||
@ -105,6 +105,7 @@
|
||||
>image{
|
||||
width: 37rpx;
|
||||
height: 8rpx;
|
||||
padding: 20rpx;
|
||||
}
|
||||
.action {
|
||||
z-index: 19;
|
||||
@ -211,7 +212,7 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
item(newVal, old) {
|
||||
console.log(newVal);
|
||||
// console.log(newVal);
|
||||
this.item = newVal;
|
||||
},
|
||||
deep: true
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<image class="head" :src="info.pintuan_image" mode="widthFix"></image>
|
||||
<text class="title u-line-1">{{ info.pintuan_goods_name }}</text>
|
||||
<view class="price">
|
||||
<view>￥{{ info.pintuan_goods_price }}</view>
|
||||
<view>立即拼团</view>
|
||||
<view class="value">￥{{ info.pintuan_goods_price }}</view>
|
||||
<view class="btn">立即拼团</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -65,18 +65,18 @@ export default {
|
||||
// align-items: center;
|
||||
// align-content: flex-end;
|
||||
justify-content: space-between;
|
||||
margin-top: 10rpx;
|
||||
> view:first-child{
|
||||
margin-top: 16rpx;
|
||||
.value {
|
||||
font-size: 26rpx;
|
||||
color: #FF3131;
|
||||
margin-bottom: 12rpx;
|
||||
// margin-bottom: 12rpx;
|
||||
}
|
||||
> view:last-child{
|
||||
.btn {
|
||||
font-size: 22rpx;
|
||||
height: 22rpx;
|
||||
color: #FDD360;
|
||||
text-align: end;
|
||||
margin-top:8rpx;
|
||||
// margin-top:8rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,26 +1,26 @@
|
||||
<template>
|
||||
<view class="special">
|
||||
<view v-if="type == 'spike'">
|
||||
<image :src="item.groupbuy_image1" @click="spikeGoods"></image>
|
||||
<view v-if="type == 'spike'" @click="spikeGoods">
|
||||
<image :src="item.groupbuy_image1"></image>
|
||||
<view class="right">
|
||||
<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
|
||||
<view class="name u-line-1">{{ item.goods_name }}</view>
|
||||
<view class="price">
|
||||
<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
|
||||
<view class="goods-price">￥{{ item.goods_price }}</view>
|
||||
</view>
|
||||
<view class="buy">
|
||||
<view class="num">剩余{{ item.inventory }}件</view>
|
||||
<view class="btn" @click="spikeGoods">立即购买</view>
|
||||
<view class="btn">立即购买</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="type == 'group'">
|
||||
<image :src="item.pintuan_image" @click="toDetailsPage"></image>
|
||||
<view v-if="type == 'group'" @click="toDetailsPage">
|
||||
<image :src="item.pintuan_image"></image>
|
||||
<view class="right">
|
||||
<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
|
||||
<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
|
||||
<view class="price group">
|
||||
<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
|
||||
<view class="btn" @click="toDetailsPage">立即拼团</view>
|
||||
<view class="btn">立即拼团</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -82,6 +82,7 @@
|
||||
margin-top: 10rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
text-shadow: 0px 0px 4rpx #999999;
|
||||
}
|
||||
|
||||
.operat-img {
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
<view>我们有万能穿搭公式</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -60,8 +61,14 @@ export default {
|
||||
methods: {
|
||||
exchangeCoupon() {
|
||||
this.$u.api.getCoupon({ id: 1 }).then(res => {
|
||||
this.$u.toast(res.message);
|
||||
if(res.errCode == 0) {}
|
||||
if(res.errCode == 0) {
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
url: '/pageE/tool/MineCoupon'
|
||||
})
|
||||
} else {
|
||||
this.$u.toast(res.message);
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
@ -169,6 +169,7 @@
|
||||
}
|
||||
}
|
||||
.userinfo{
|
||||
z-index: 9999;
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
top: 50%;
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
<view class="comment-list-box">
|
||||
<view class="comment-list-header">
|
||||
<image class="avatar" :src="item.member_avatar" mode=""></image>
|
||||
<view>
|
||||
<view class="comment-title-info">
|
||||
<text class="comment-title">{{ item.member_nickname }}</text>
|
||||
<text class="comment-time">{{ item.create_time }}</text>
|
||||
</view>
|
||||
@ -679,6 +679,10 @@
|
||||
margin-right: 20rpx;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.comment-title-info {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.comment-title {
|
||||
font-size: 26rpx;
|
||||
|
||||
@ -310,17 +310,30 @@ export default {
|
||||
setTotalPrice() {
|
||||
const goods = this.orderInfo.store_goods_total;
|
||||
// console.log(this.freight);
|
||||
const freight = this.freight;
|
||||
let price = 0;
|
||||
let freight = 0, price = 0;
|
||||
// 商品价格加上运费
|
||||
[goods, freight].forEach(object => {
|
||||
for (const key in object) {
|
||||
if (object.hasOwnProperty(key)) {
|
||||
const element = object[key];
|
||||
price += Number(element);
|
||||
}
|
||||
// [goods, freight].forEach(object => {
|
||||
// for (const key in object) {
|
||||
// if (object.hasOwnProperty(key)) {
|
||||
// const element = object[key];
|
||||
// price += Number(element);
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// 运费
|
||||
for (const key in this.freight) {
|
||||
if (this.freight.hasOwnProperty(key)) {
|
||||
const element = this.freight[key];
|
||||
freight += Number(element);
|
||||
}
|
||||
})
|
||||
}
|
||||
// 商品价格
|
||||
for (const key in goods) {
|
||||
if (goods.hasOwnProperty(key)) {
|
||||
const element = goods[key];
|
||||
price += Number(element);
|
||||
}
|
||||
}
|
||||
// 减去优惠券
|
||||
// 平台
|
||||
if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
|
||||
@ -333,8 +346,10 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 最低付款 0.01
|
||||
if(price <= 0) price = 0.01;
|
||||
// console.log(price);
|
||||
this.totalPrice = price.toFixed(2);
|
||||
this.totalPrice = (price + freight).toFixed(2);
|
||||
},
|
||||
setDelivery(index) {
|
||||
if(index == 1) {
|
||||
|
||||
@ -17,7 +17,11 @@
|
||||
<view class="right">
|
||||
<view class="name u-line-1">{{ goods.goods_name }}</view>
|
||||
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
|
||||
<view class="price">￥{{ goods.goods_price }}</view>
|
||||
<!-- <view class="price">￥{{ goods.goods_price }}</view> -->
|
||||
<view class="price">
|
||||
<view class="present">￥{{ goods.goods_price }}</view>
|
||||
<view class="origin">￥{{ goods.goods_marketprice }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
|
||||
@ -189,9 +193,23 @@ export default {
|
||||
font-size: 28rpx;
|
||||
color: rgba(102,102,102,1);
|
||||
}
|
||||
// .price {
|
||||
// font-size: 26rpx;
|
||||
// color: rgba(255,49,49,1);
|
||||
// }
|
||||
.price {
|
||||
font-size: 26rpx;
|
||||
color: rgba(255,49,49,1);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.present {
|
||||
font-size: 26rpx;
|
||||
color: rgba(255,49,49,1);
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
.origin {
|
||||
text-decoration: line-through;
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import SpecialGoods from "../../components/shop/special-shop/index"
|
||||
import SpecialGoods from "@/components/shop/special-shop/index"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view id="actives">
|
||||
<view id="actives" :style="{height : height + 'px'}">
|
||||
<!-- 活动消息推送 -->
|
||||
<block v-for="(item, index) in actives" :key="index">
|
||||
<view class="time">{{ item.addtime }}</view>
|
||||
@ -22,13 +22,21 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
height:'600',
|
||||
actives: [
|
||||
|
||||
]
|
||||
};
|
||||
},
|
||||
onLoad(){
|
||||
this.messageactivityList()
|
||||
var _that = this
|
||||
_that.messageactivityList();
|
||||
uni.getSystemInfo({
|
||||
success: function (res) {
|
||||
console.log(res.windowHeight);
|
||||
_that.height = res.windowHeight
|
||||
}
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
titletext(){
|
||||
@ -55,7 +63,6 @@
|
||||
height: 100%;
|
||||
}
|
||||
#actives{
|
||||
height: 100%;
|
||||
background: #ECECEC;
|
||||
.time {
|
||||
padding: 30rpx 0;
|
||||
|
||||
@ -1,26 +1,6 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="header" v-if="type == 2">
|
||||
<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
|
||||
<view class="title">德铭阳光</view>
|
||||
<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
|
||||
</view>
|
||||
<rich-text :nodes="nodes" v-if="type != 2"></rich-text>
|
||||
<view class="main" v-if="type == 2">
|
||||
<view @click="show = true">
|
||||
<text>产品介绍</text>
|
||||
<u-icon name="arrow-right" color="#999"></u-icon>
|
||||
</view>
|
||||
<view>
|
||||
<text>版本更新</text>
|
||||
<text class="tips">已是最新版本</text>
|
||||
</view>
|
||||
</view>
|
||||
<u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
|
||||
<view class="u-content">
|
||||
<rich-text :nodes="nodes"></rich-text>
|
||||
</view>
|
||||
</u-popup>
|
||||
<view class="article-details">
|
||||
<rich-text :nodes="nodes"></rich-text>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -28,11 +8,7 @@ import common from '@/static/js/common.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
type: 1,
|
||||
nodes: "",
|
||||
version: "",
|
||||
show: false,
|
||||
phone_type: "",
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
@ -41,17 +17,6 @@ export default {
|
||||
if(option.id) this.getUseHelpInfo(option.id);
|
||||
if(option.type == 1) this.certificateInfo();
|
||||
if(option.type == 2) this.getAboutUsInfo();
|
||||
this.type = option.type;
|
||||
this.getVersion();
|
||||
this.phone_type = this.$u.os();
|
||||
},
|
||||
onBackPress() {
|
||||
if (this.show) {
|
||||
this.show = !this.show;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
onNavigationBarButtonTap(e) {
|
||||
console.log(e);
|
||||
@ -88,64 +53,16 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
// 检查版本号
|
||||
getVersion() {
|
||||
this.$u.post("Specialci/checkVersion",{app_version: 1}).then(res => {
|
||||
console.log(res);
|
||||
this.version = res.data.app_version;
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #f2f2f2;
|
||||
}
|
||||
.header {
|
||||
width: 500rpx;
|
||||
margin: 0 auto;
|
||||
padding: 30rpx;
|
||||
text-align: center;
|
||||
.tit-img {
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
}
|
||||
.title {
|
||||
margin: 18rpx 0;
|
||||
font-weight: bold;
|
||||
font-size: 26rpx;
|
||||
letter-spacing: 2rpx;
|
||||
}
|
||||
.tit-info {
|
||||
font-size: 22rpx;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
.main {
|
||||
margin: 20rpx 0;
|
||||
& > view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
padding: 0 20rpx;
|
||||
line-height: 100rpx;
|
||||
color: #333;
|
||||
font-size: 30rpx;
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
}
|
||||
.tips {
|
||||
color: #999;
|
||||
font-size: 22rpx;
|
||||
}
|
||||
}
|
||||
.u-content {
|
||||
padding: 20rpx;
|
||||
font-size: 30rpx;
|
||||
text-indent: 1rem;
|
||||
line-height: 1.2;
|
||||
// page {
|
||||
// background-color: #ECECEC;
|
||||
// }
|
||||
.article-details {
|
||||
min-height: calc(100vh - var(--window-top));
|
||||
background: #ECECEC;
|
||||
padding: 20rpx 35rpx 0;
|
||||
}
|
||||
</style>
|
||||
@ -25,6 +25,7 @@
|
||||
<view class="info u-line-2">{{ item.content }}</view>
|
||||
<view class="date">{{ item.kd_time }}</view>
|
||||
</view>
|
||||
<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60"></u-empty>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -64,7 +64,8 @@
|
||||
},
|
||||
{
|
||||
title: '关于我们',
|
||||
link: '../mine/ArticleDetails?type=2'
|
||||
// link: '../mine/ArticleDetails?type=2'
|
||||
link: '/pageE/setting/version'
|
||||
},
|
||||
{
|
||||
title: '帮助与反馈',
|
||||
@ -90,6 +91,8 @@
|
||||
});
|
||||
},
|
||||
async loginOut() {
|
||||
// 显示新人领取优惠券
|
||||
this.$store.commit('updateShowCoupons', true);
|
||||
let im = this.imService
|
||||
this.logout();
|
||||
uni.redirectTo({
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<view class="feedback-box">
|
||||
<view class="feedback-title">人工服务</view>
|
||||
<view class="feedback-itme">
|
||||
<view class="manual">
|
||||
<view class="service-phone">拨打官方客服电话：400-100-100</view>
|
||||
<view class="manual" @click="makePhone">
|
||||
<view class="service-phone">拨打官方客服电话：{{ tel400 }}</view>
|
||||
<view class="manual-time">{{ wkTime }}</view>
|
||||
</view>
|
||||
<view class="suggestions" @click="writeComments">意见反馈</view>
|
||||
@ -31,6 +31,11 @@ export default {
|
||||
this.getHelpList();
|
||||
},
|
||||
methods: {
|
||||
makePhone() {
|
||||
uni.makePhoneCall({
|
||||
phoneNumber: this.tel400,
|
||||
});
|
||||
},
|
||||
viewAnswer(item) {
|
||||
this.$store.commit('setQuestion', item);
|
||||
this.$u.route('pageE/setting/question');
|
||||
|
||||
58
pageE/setting/updateVersion.vue
Normal file
58
pageE/setting/updateVersion.vue
Normal file
@ -0,0 +1,58 @@
|
||||
<template>
|
||||
<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
|
||||
<view class="u-update-content">
|
||||
<rich-text :nodes="content"></rich-text>
|
||||
</view>
|
||||
</u-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
show: true,
|
||||
// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
|
||||
content: `
|
||||
1. 新增几个bug<br>
|
||||
2. 新增Modal模态框组件<br>
|
||||
3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
|
||||
`,
|
||||
}
|
||||
},
|
||||
onReady() {
|
||||
this.show = true;
|
||||
},
|
||||
methods: {
|
||||
cancel() {
|
||||
this.closeModal();
|
||||
},
|
||||
confirm() {
|
||||
this.closeModal();
|
||||
},
|
||||
closeModal() {
|
||||
uni.navigateBack();
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
page {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
/deep/ .u-mode-center-box {
|
||||
background-color: transparent;
|
||||
}
|
||||
// .u-full-content {
|
||||
// background-color: #00C777;
|
||||
// }
|
||||
.u-update-content {
|
||||
font-size: 26rpx;
|
||||
color: $u-content-color;
|
||||
line-height: 1.7;
|
||||
padding: 30rpx;
|
||||
}
|
||||
::v-deep.u-mode-center-box {
|
||||
background-color: transparent;
|
||||
}
|
||||
</style>
|
||||
108
pageE/setting/version.vue
Normal file
108
pageE/setting/version.vue
Normal file
@ -0,0 +1,108 @@
|
||||
<template>
|
||||
<view class="version">
|
||||
<view class="header">
|
||||
<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
|
||||
<view class="title">德铭阳光</view>
|
||||
<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
|
||||
</view>
|
||||
<view class="main">
|
||||
<view @click="viewAboutUs">
|
||||
<text class="title">产品介绍</text>
|
||||
<u-icon name="arrow-right" color="#999"></u-icon>
|
||||
</view>
|
||||
<view class="version-view">
|
||||
<text class="title">版本更新</text>
|
||||
<text class="tips" v-if="0">已是最新版本</text>
|
||||
<text class="tips" v-else @click="updateVersion">1.1.10</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
version: "",
|
||||
phone_type: "",
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.getVersion();
|
||||
this.phone_type = this.$u.os();
|
||||
},
|
||||
methods: {
|
||||
// 检查版本号
|
||||
getVersion() {
|
||||
this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => {
|
||||
// console.log(res);
|
||||
this.version = res.data.app_version;
|
||||
})
|
||||
},
|
||||
viewAboutUs() {
|
||||
this.$u.route('/pageE/mine/ArticleDetails', {
|
||||
type: 2
|
||||
});
|
||||
},
|
||||
updateVersion() {
|
||||
this.$u.route('/pageE/setting/updateVersion');
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.header {
|
||||
width: 500rpx;
|
||||
margin: 0 auto;
|
||||
padding: 30rpx;
|
||||
text-align: center;
|
||||
.tit-img {
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
}
|
||||
.title {
|
||||
margin: 18rpx 0;
|
||||
font-weight: bold;
|
||||
font-size: 26rpx;
|
||||
letter-spacing: 2rpx;
|
||||
}
|
||||
.tit-info {
|
||||
font-size: 22rpx;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
.main {
|
||||
margin: 20rpx 0;
|
||||
& > view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
padding: 0 20rpx;
|
||||
line-height: 100rpx;
|
||||
color: #333;
|
||||
font-size: 30rpx;
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
.title {
|
||||
width: 200rpx;
|
||||
}
|
||||
}
|
||||
.tips {
|
||||
color: #999;
|
||||
font-size: 22rpx;
|
||||
}
|
||||
.version-view {
|
||||
.tips {
|
||||
flex: 1;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
.u-content {
|
||||
padding: 20rpx;
|
||||
font-size: 30rpx;
|
||||
text-indent: 1rem;
|
||||
line-height: 1.2;
|
||||
}
|
||||
</style>
|
||||
@ -3,13 +3,14 @@
|
||||
<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
|
||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
|
||||
<swiper-item class="swiper-item" v-for="(_, index) in list" :key="index">
|
||||
<scroll-view scroll-y class="scroll-coupon">
|
||||
<scroll-view scroll-y class="scroll-coupon" @scrolltolower="onreachBottom">
|
||||
<view v-if="couponList[index]">
|
||||
<view class="coupon-item" v-for="(coupon, c_index) in couponList[index]" :key="c_index">
|
||||
<Coupon :couponInfo="coupon" :status='index' @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
|
||||
</view>
|
||||
</view>
|
||||
<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList[index] || !couponList[index].length"></u-empty>
|
||||
<u-loadmore :status="loadStatus[current]" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20" @loadmore="onreachBottom" v-if="!couponList[index] || couponList[index].length>=pageSize"></u-loadmore>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
@ -32,6 +33,10 @@ export default {
|
||||
swiperHeight: '',
|
||||
couponList: [],
|
||||
goodsClass: [],
|
||||
pageSize: 6,
|
||||
page: 0,
|
||||
timer: true,
|
||||
loadStatus: ['loadmore', 'loadmore', 'loadmore'],
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@ -46,8 +51,7 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
current(value) {
|
||||
let status = value + 1;
|
||||
this.getMemberCouponList(status);
|
||||
this.getMemberCouponList(value);
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@ -56,20 +60,34 @@ export default {
|
||||
this.goodsClass = res.data;
|
||||
})
|
||||
},
|
||||
getMemberCouponList(current) {
|
||||
this.$u.api.getMemberCouponList({
|
||||
status: current
|
||||
}).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
this.couponList[this.current] = res.data;
|
||||
} else {
|
||||
this.couponList[this.current] = [];
|
||||
}
|
||||
this.$forceUpdate();
|
||||
async getMemberCouponList({ load = 'reload' }) {
|
||||
const res = await this.$u.api.getMemberCouponList({
|
||||
status: this.current + 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
|
||||
page: this.page,
|
||||
})
|
||||
this.timer = true;
|
||||
if(load == 'reload') this.couponList[this.current] = res.data;
|
||||
else if(load == 'loadmore') this.couponList[this.current].push(...res.data);
|
||||
this.$forceUpdate();
|
||||
// console.log(this.couponList);
|
||||
return res.data.length;
|
||||
},
|
||||
onreachBottom() {
|
||||
if(!this.timer) return false;
|
||||
this.timer = false;
|
||||
this.loadStatus.splice(this.current, 1, "loading");
|
||||
this.page++;
|
||||
this.getMemberCouponList({ load: 'loadmore' }).then(length => {
|
||||
this.loadStatus.splice(this.current, 1, "nomore");
|
||||
if(length == 0) this.page--;
|
||||
}).catch(() => {
|
||||
this.loadStatus.splice(this.current, 1, "nomore");
|
||||
console.log(this.loadStatus[this.current]);
|
||||
this.page--;
|
||||
})
|
||||
},
|
||||
useCoupon(coupon) {
|
||||
console.log(coupon);
|
||||
// console.log(coupon);
|
||||
// if(coupon.type == 1) {
|
||||
// this.$u.route({
|
||||
// type: 'switchTab',
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
</view>
|
||||
<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
|
||||
<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
|
||||
<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
|
||||
<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length >= pageSize" @loadmore="reachBottom"></u-loadmore>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -160,7 +160,7 @@
|
||||
<text>选择订单</text>
|
||||
<u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon>
|
||||
</view>
|
||||
<scroll-view scroll-y class="order-list">
|
||||
<scroll-view scroll-y class="order-list" @scrolltolower="onreachBottom">
|
||||
<u-radio-group v-model="value" @change="radioChange">
|
||||
<view v-for="(items, index) in orderList" :key="index" class="order-item">
|
||||
<view class="store">
|
||||
@ -195,6 +195,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</u-radio-group>
|
||||
<u-loadmore :status="loadStatu" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20"></u-loadmore>
|
||||
</scroll-view>
|
||||
<view class="order-btn" @click="confirm">确认</view>
|
||||
</view>
|
||||
@ -222,7 +223,7 @@ export default {
|
||||
}],
|
||||
typeList: [], // 商品类型列表
|
||||
orderList: [], // 商品列表
|
||||
page: 0,
|
||||
page: 1,
|
||||
current: 0,
|
||||
swiperCurrent: 0,
|
||||
areaList: [], // 地址列表
|
||||
@ -244,6 +245,8 @@ export default {
|
||||
name: 'common', // 其他图片
|
||||
},
|
||||
debounce: true,
|
||||
timer: true,
|
||||
loadStatu: 'loadmore'
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
@ -284,17 +287,33 @@ export default {
|
||||
// console.log(e);
|
||||
this.type = e[0];
|
||||
},
|
||||
onreachBottom() {
|
||||
if(!this.timer) return false;
|
||||
this.timer = false;
|
||||
this.loadStatu = "loading";
|
||||
this.page++;
|
||||
this.getOrderList({ load: 'loadmore' }).then(length => {
|
||||
if(length == 0) {
|
||||
this.page--;
|
||||
this.loadStatu = "nomore";
|
||||
} else {
|
||||
this.loadStatu = "loadmore";
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loadStatu = "nomore";
|
||||
this.page--;
|
||||
})
|
||||
},
|
||||
async getOrderList({ load = 'reload' } = {}) {
|
||||
const res = await this.$u.api.getOrderList({
|
||||
const res = await this.$u.api.getSendOrderList({
|
||||
page: this.page,
|
||||
// type: '40',
|
||||
})
|
||||
this.timer = true;
|
||||
if(res.errCode == 0) {
|
||||
if(load == 'reload') this.orderList = res.data;
|
||||
else this.orderList.push(...res.data);
|
||||
}
|
||||
return res;
|
||||
return res.data.length;
|
||||
},
|
||||
submitImage() {
|
||||
// console.log(222);
|
||||
|
||||
@ -106,7 +106,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
|
||||
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * (90 + 30) + 'px';
|
||||
},
|
||||
toDetailsPage(id) {
|
||||
this.$u.route('/pageB/sdetails/index', {
|
||||
|
||||
36
pages.json
36
pages.json
@ -610,16 +610,7 @@
|
||||
"titleSize": "36px",
|
||||
"titleNView": {
|
||||
"titleColor": "#333333",
|
||||
"backgroundColor": "#FFFFFF",
|
||||
"buttons": [
|
||||
{
|
||||
"width": "0",
|
||||
"type":"none",
|
||||
"text":"关闭",
|
||||
"float":"right",
|
||||
"fontSize":"14"
|
||||
}
|
||||
]
|
||||
"backgroundColor": "#FFFFFF"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1002,6 +993,31 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "setting/version",
|
||||
"style": {
|
||||
"navigationBarTitleText": "关于我们",
|
||||
"app-plus": {
|
||||
"titleSize": "36px",
|
||||
"titleNView": {
|
||||
"titleColor": "#333333",
|
||||
"backgroundColor": "#FFFFFF"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "setting/updateVersion",
|
||||
"style": {
|
||||
"navigationStyle": "custom", // 取消本页面的导航栏
|
||||
"app-plus": {
|
||||
"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
|
||||
"background": "transparent", // 背景透明
|
||||
"backgroundColor": "rgba(0,0,0,0)", // 背景透明
|
||||
"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "order/Index",
|
||||
"style": {
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
<swiper-item>
|
||||
<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottom" :refresher-enabled="true" @refresherrefresh="dianji(1)" :refresher-triggered="refresher" @refresherpulling="onPulling"
|
||||
<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)" :refresher-enabled="true" @refresherrefresh="dianji(1)" :refresher-triggered="refresher" @refresherpulling="onPulling"
|
||||
@refresherrestore="onRestore" @refresherabort="onAbort">
|
||||
<view class="box">
|
||||
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
|
||||
@ -222,6 +222,7 @@
|
||||
|
||||
</style>
|
||||
<script>
|
||||
import common from '@/static/js/common.js';
|
||||
import { mapState } from 'vuex'
|
||||
import videoItem from "@/components/index/video-item/index"
|
||||
import zhiboItem from "@/components/index/zhibo-item/index"
|
||||
@ -271,9 +272,6 @@
|
||||
darenItem
|
||||
},
|
||||
onShow() {
|
||||
this.page = 1;
|
||||
if (this.page != 1) {
|
||||
}
|
||||
console.log(this.imService.status)
|
||||
if(!this.imService.status && this.$store.state.hasLogin){
|
||||
const user = uni.getStorageSync('user_info');
|
||||
@ -305,17 +303,15 @@
|
||||
// that.imService.connectIM()
|
||||
// },2000)
|
||||
// }
|
||||
|
||||
// if (this.hasLogin) {
|
||||
// this.isNewmembervoucher();
|
||||
// }
|
||||
// 新人优惠券
|
||||
if (this.$store.state.showCoupons) {
|
||||
this.isNewmembervoucher();
|
||||
}
|
||||
},
|
||||
async onLoad(){
|
||||
this.articleList = [];
|
||||
this.getArticlelist();
|
||||
this.getSwiper();
|
||||
this.isNewmembervoucher();
|
||||
|
||||
// 优惠券
|
||||
// if(this.$store.state.hasLogin){
|
||||
// const user = uni.getStorageSync('user_info');
|
||||
@ -420,7 +416,7 @@
|
||||
console.log(a);
|
||||
|
||||
if (a.type == "change") {
|
||||
this.num = a.detail.current
|
||||
this.num = a.detail.current;
|
||||
} else {
|
||||
this.num = a;
|
||||
}
|
||||
@ -430,16 +426,18 @@
|
||||
if (this.num == 0) {
|
||||
this.page = 1;
|
||||
this.articleList = [];
|
||||
this.status = "loadmore";
|
||||
this.status = "nomore";
|
||||
this.getArticlelist();
|
||||
this.getSwiper();
|
||||
} else if (this.num == 1) {
|
||||
this.live_page = 1;
|
||||
this.status_live = "nomore";
|
||||
this.getZhiBoSwiper(); // 直播轮播
|
||||
this.tabLiveList();
|
||||
} else if (this.num == 2) {
|
||||
this.follow_page = 0;
|
||||
this.fansList = [];
|
||||
this.status_1 = "nomore";
|
||||
if (this.hasLogin) {
|
||||
this.getFollowList(); // 关注列表
|
||||
}
|
||||
@ -466,9 +464,9 @@
|
||||
} else {
|
||||
this.articleList = this.articleList.concat(res.data.list);
|
||||
}
|
||||
this.page++;
|
||||
}
|
||||
})
|
||||
console.log(this.page);
|
||||
},
|
||||
// 屏蔽更新列表
|
||||
updateList() {
|
||||
@ -479,12 +477,11 @@
|
||||
},
|
||||
// 发现下拉加载
|
||||
swiperBottom(e) {
|
||||
if(this.num == 0){
|
||||
this.getArticlelist();
|
||||
}else if(this.num == 1){
|
||||
this.tabLiveList();
|
||||
}
|
||||
// console.log(e);
|
||||
this.page++;
|
||||
this.getArticlelist();
|
||||
},
|
||||
swiperBottomLive() {
|
||||
this.tabLiveList();
|
||||
},
|
||||
swiperTop() {
|
||||
// uni.startPullDownRefresh();
|
||||
@ -536,40 +533,20 @@
|
||||
},
|
||||
clickFImage(index) {
|
||||
const item = this.indexImageSwiper[index];
|
||||
console.log(item);
|
||||
this.activityLink({
|
||||
// console.log(item);
|
||||
this.jumpPage({
|
||||
type: item.url_type,
|
||||
id: item.info_id
|
||||
id: item.info_id,
|
||||
});
|
||||
},
|
||||
clickSImage(index) {
|
||||
const item = this.zhiboImageSwiper[index];
|
||||
console.log(item);
|
||||
this.activityLink({
|
||||
// console.log(item);
|
||||
this.jumpPage({
|
||||
type: item.url_type,
|
||||
id: item.info_id
|
||||
id: item.info_id,
|
||||
});
|
||||
},
|
||||
activityLink({
|
||||
type,
|
||||
id
|
||||
}) {
|
||||
console.log(type,id);
|
||||
if (type == 0) return false;
|
||||
// type 1 商品详情页, 2 店铺详情页
|
||||
const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
|
||||
let params = {
|
||||
id: id
|
||||
};
|
||||
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
|
||||
if (type == 1) Object.assign(params, {
|
||||
type: 1
|
||||
});
|
||||
this.$u.route({
|
||||
url: url,
|
||||
params: params
|
||||
})
|
||||
},
|
||||
goSearch() {
|
||||
this.$u.route("/pageB/search/index", {
|
||||
type: 2,
|
||||
@ -578,6 +555,7 @@
|
||||
},
|
||||
// 是否显示新人优惠券
|
||||
isNewmembervoucher() {
|
||||
this.$store.commit('updateShowCoupons', false);
|
||||
this.$u.api.isNewmembervoucher().then(res => {
|
||||
if(res.errCode == 0) {
|
||||
this.$u.route('/pageB/coupon/index');
|
||||
@ -593,7 +571,11 @@
|
||||
},
|
||||
onAbort() {
|
||||
console.log("onAbort");
|
||||
}
|
||||
},
|
||||
jumpPage(uri) {
|
||||
// console.log(uri);
|
||||
common.jumpPage({ type: uri.type, id: uri.id });
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -4,17 +4,6 @@
|
||||
<view class="top">
|
||||
<u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
|
||||
<view class="user-info">
|
||||
<!-- <view class="info-left">
|
||||
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
|
||||
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
|
||||
<image src="/static/image/mine/13.png"></image>
|
||||
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-right">
|
||||
<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
|
||||
<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
|
||||
</view> -->
|
||||
<view class="info-top">
|
||||
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
|
||||
<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
|
||||
@ -62,9 +51,15 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view @click="toOtherPage('/order/Index?current=1')">
|
||||
<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
|
||||
<image :src="item.img"></image>
|
||||
<view>{{ item.title }}</view>
|
||||
<view class="order-num" v-if="item.number">{{ item.number }}</view>
|
||||
</view>
|
||||
<!-- <view @click="toOtherPage('/order/Index?current=1')">
|
||||
<image src="/static/image/mine/6.png"></image>
|
||||
<view>待支付</view>
|
||||
<view class="order-num">{{ 99 }}</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=2')">
|
||||
<image src="/static/image/mine/35.png"></image>
|
||||
@ -89,7 +84,7 @@
|
||||
<view @click="toOtherPage('/order/Index?current=7')">
|
||||
<image src="/static/image/mine/9.png"></image>
|
||||
<view>售后</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="tool">
|
||||
@ -111,6 +106,10 @@
|
||||
<image src="/static/image/mine/25.png"></image>
|
||||
<view>优惠券</view>
|
||||
</view>
|
||||
<view @click="toOtherPage('/order/Index?current=4')">
|
||||
<image src="/static/image/mine/39.png"></image>
|
||||
<view>试穿试送</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="more-tool">
|
||||
@ -132,6 +131,7 @@
|
||||
<image src="/static/image/mine/15.png"></image>
|
||||
<view>投诉意见</view>
|
||||
</view>
|
||||
<!-- <view></view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -146,7 +146,51 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
userInfo: {},
|
||||
userInfo: {},
|
||||
orderList: [
|
||||
{
|
||||
name: 'wait_pay',
|
||||
title: '待支付',
|
||||
img: '/static/image/mine/6.png',
|
||||
link: '/order/Index?current=1',
|
||||
number: '',
|
||||
},
|
||||
{
|
||||
name: 'already_pay',
|
||||
title: '待发货',
|
||||
img: '/static/image/mine/35.png',
|
||||
link: '/order/Index?current=2',
|
||||
number: '',
|
||||
},
|
||||
{
|
||||
name: 'wait_receipt',
|
||||
title: '待收货',
|
||||
img: '/static/image/mine/2.png',
|
||||
link: '/order/Index?current=3',
|
||||
number: '',
|
||||
},
|
||||
{
|
||||
name: 'pintuan',
|
||||
title: '拼团中',
|
||||
img: '/static/image/mine/37.png',
|
||||
link: '/order/Index?current=5',
|
||||
number: '',
|
||||
},
|
||||
{
|
||||
name: 'wait_evaluation',
|
||||
title: '待评价',
|
||||
img: '/static/image/mine/3.png',
|
||||
link: '/order/Index?current=6',
|
||||
number: '',
|
||||
},
|
||||
{
|
||||
name: 'refund',
|
||||
title: '售后',
|
||||
img: '/static/image/mine/9.png',
|
||||
link: '/order/Index?current=7',
|
||||
number: '',
|
||||
},
|
||||
]
|
||||
};
|
||||
},
|
||||
filters: {
|
||||
@ -162,9 +206,11 @@ export default {
|
||||
})
|
||||
}
|
||||
this.getUserInfo();
|
||||
this.getOrderNumber();
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
this.toOtherPage("/setting/Index");
|
||||
onNavigationBarButtonTap(e) {
|
||||
console.log(e);
|
||||
if(e.index == 0) this.$u.route('/pageE/setting/Index');
|
||||
},
|
||||
methods: {
|
||||
getUserInfo() {
|
||||
@ -176,7 +222,22 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
getOrderNumber() {
|
||||
this.$u.api.getOrderNumber().then(res => {
|
||||
const object = res.data;
|
||||
for (const key in object) {
|
||||
if (object.hasOwnProperty(key)) {
|
||||
let element = object[key];
|
||||
const order = this.orderList.filter(item => item.name == key);
|
||||
if(element > 99) element = "99+";
|
||||
this.$set(order[0], 'number', element);
|
||||
}
|
||||
}
|
||||
// console.log(this.orderList);
|
||||
})
|
||||
},
|
||||
toOtherPage(url) {
|
||||
console.log(url);
|
||||
uni.navigateTo({
|
||||
url: '/pageE' + url
|
||||
});
|
||||
@ -200,45 +261,6 @@ export default {
|
||||
.user-info {
|
||||
margin-left: 30rpx;
|
||||
// display: flex;
|
||||
.info-left {
|
||||
margin-right: 15rpx;
|
||||
.user-nickname {
|
||||
max-width: 200rpx;
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-bottom: 19rpx;
|
||||
}
|
||||
.user-medal {
|
||||
display: flex;
|
||||
width: 110rpx;
|
||||
// height: 25rpx;
|
||||
background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
|
||||
border-radius: 13rpx;
|
||||
align-items: center;
|
||||
padding: 0 17rpx 0 10rpx;
|
||||
> image {
|
||||
margin-right: 9rpx;
|
||||
width: 20rpx;
|
||||
height: 22rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.rank-title {
|
||||
font-size: 16rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
.info-right {
|
||||
.info-phone {
|
||||
font-size: 24rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-bottom: 26rpx;
|
||||
}
|
||||
.user-rank {
|
||||
font-size: 24rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
}
|
||||
}
|
||||
.info-top {
|
||||
height: 30rpx;
|
||||
display: flex;
|
||||
@ -336,16 +358,6 @@ export default {
|
||||
font-size: 28rpx;
|
||||
color: #666;
|
||||
border-bottom: 1px solid #ececec;
|
||||
// &::after {
|
||||
// content: "";
|
||||
// position: absolute;
|
||||
// width: 650rpx;
|
||||
// height: 1rpx;
|
||||
// background: rgba(234,234,234,1);
|
||||
// bottom: 0;
|
||||
// left: 50%;
|
||||
// transform: translate(-50%,0);
|
||||
// }
|
||||
}
|
||||
.title-text-more {
|
||||
font-size: 24rpx;
|
||||
@ -397,24 +409,42 @@ export default {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
position: relative;
|
||||
.order-num {
|
||||
z-index: 9;
|
||||
position: absolute;
|
||||
top: -12rpx;
|
||||
right: -16rpx;
|
||||
border: 1rpx solid #FF7807;
|
||||
height: 24rpx;
|
||||
border-radius: 12rpx;
|
||||
padding: 6rpx 8rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #FF7807;
|
||||
background-color: #ffffff;
|
||||
font-size: 18rpx;
|
||||
color:rgba(255,120,15,1);
|
||||
}
|
||||
}
|
||||
> view:nth-child(1){
|
||||
@include image-size($image-width: 36rpx, $image-height: 34rpx);
|
||||
@include image-size($image-width: 33rpx, $image-height: 36rpx);
|
||||
}
|
||||
> view:nth-child(2){
|
||||
@include image-size($image-width: 38rpx, $image-height: 36rpx);
|
||||
@include image-size($image-width: 38rpx, $image-height: 32rpx);
|
||||
}
|
||||
> view:nth-child(3){
|
||||
@include image-size($image-width: 40rpx, $image-height: 36rpx);
|
||||
@include image-size($image-width: 41rpx, $image-height: 33rpx);
|
||||
}
|
||||
> view:nth-child(4){
|
||||
@include image-size($image-width: 38rpx, $image-height: 38rpx);
|
||||
@include image-size($image-width: 35rpx, $image-height: 35rpx);
|
||||
}
|
||||
> view:nth-child(5){
|
||||
@include image-size($image-width: 36rpx, $image-height: 40rpx);
|
||||
@include image-size($image-width: 37rpx, $image-height: 37rpx);
|
||||
}
|
||||
> view:nth-child(6){
|
||||
@include image-size($image-width: 36rpx, $image-height: 40rpx);
|
||||
@include image-size($image-width: 33rpx, $image-height: 35rpx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -426,8 +456,11 @@ export default {
|
||||
$image-width: 71rpx
|
||||
);
|
||||
.content {
|
||||
> view {
|
||||
width: 100rpx;
|
||||
}
|
||||
> view:not(:last-child) {
|
||||
margin-right: 58rpx;
|
||||
margin-right: 36rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -439,8 +472,11 @@ export default {
|
||||
$image-width: 71rpx
|
||||
);
|
||||
.content {
|
||||
> view {
|
||||
width: 100rpx;
|
||||
}
|
||||
> view:not(:last-child) {
|
||||
margin-right: 46rpx;
|
||||
margin-right: 36rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
<!-- 拼团列表 -->
|
||||
<group></group>
|
||||
<view class="activity-view">
|
||||
<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
|
||||
<image class="lingquan" :src="activityInfo.adv_code" @click="jumpPage({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
|
||||
</view>
|
||||
<!-- 优惠券 -->
|
||||
<youhq></youhq>
|
||||
@ -61,6 +61,7 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import common from '@/static/js/common.js';
|
||||
import shopitem from "@/components/shop/shop-item/index";
|
||||
import recommend from "@/components/shop/recommend/index";
|
||||
import pintuan from "@/components/shop/recommend/pintuan";
|
||||
@ -190,31 +191,11 @@
|
||||
clickImage(index) {
|
||||
// console.log(this.list[index]);
|
||||
let item = this.list[index];
|
||||
this.activityLink({
|
||||
type: item.url_type,
|
||||
this.jumpPage({
|
||||
type: item.url_type,
|
||||
id: item.info_id,
|
||||
});
|
||||
});
|
||||
},
|
||||
activityLink({
|
||||
type,
|
||||
id
|
||||
}) {
|
||||
console.log(type,id);
|
||||
if (type == 0) return false;
|
||||
// type 1 商品详情页, 2 店铺详情页
|
||||
const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
|
||||
let params = {
|
||||
id: id
|
||||
};
|
||||
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
|
||||
if (type == 1) Object.assign(params, {
|
||||
type: 1
|
||||
});
|
||||
this.$u.route({
|
||||
url: url,
|
||||
params: params
|
||||
})
|
||||
},
|
||||
// 下拉加载更多推荐商品
|
||||
onreachBottom() {
|
||||
this.$refs.recommendGoods.loadMore();
|
||||
@ -240,18 +221,10 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
activityLink({ type, id }) {
|
||||
if(type == 0 || type == 2) return false;
|
||||
// type 1 商品详情页, 2 店铺详情页
|
||||
const url = type == 1 ? 'pageB/sdetails/index' : '';
|
||||
let params = { id: id };
|
||||
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
|
||||
if(type == 1) Object.assign(params, { type: 1 });
|
||||
this.$u.route({
|
||||
url: url,
|
||||
params: params
|
||||
})
|
||||
},
|
||||
jumpPage(uri) {
|
||||
// console.log(uri);
|
||||
common.jumpPage({ type: uri.type, id: uri.id });
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
BIN
static/image/mine/39.png
Normal file
BIN
static/image/mine/39.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 6.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 22 KiB |
@ -67,5 +67,29 @@ const common = {
|
||||
else result = hours + ':' + minutes + ':' + seconds;
|
||||
return result;
|
||||
},
|
||||
/**
|
||||
* 广告位跳转
|
||||
* @param { String } type 跳转类型
|
||||
* @param { String | Number } id 跳转id 商品id/商家id...
|
||||
* @return { undefined } undefined
|
||||
*/
|
||||
jumpPage({ type, id }) {
|
||||
let url;
|
||||
switch (type) {
|
||||
case 1:
|
||||
url = '/pageB/sdetails/index?id=' + id;
|
||||
break;
|
||||
case 2:
|
||||
url = '/pageC/merchant/index?id=' + id;
|
||||
break;
|
||||
case 3:
|
||||
url = '/pageE/mine/MemberServe?current=1'
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
// console.log(url);
|
||||
uni.navigateTo({ url: url });
|
||||
},
|
||||
}
|
||||
export default common
|
||||
export default common;
|
||||
Loading…
Reference in New Issue
Block a user