cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化3.0功能

Browse Source
This commit is contained in:
gaoxs
2020-07-14 16:10:44 +08:00
parent ae5860c94e
commit 963152460c
15 changed files with 366 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/order.js
View File

@ -29,8 +29,8 @@ export function postOrderComputed(key, data) {
* @param price
* @returns {*}
*/
export function getOrderCoupon(price) {
return request.get("/coupons/order/" + (parseFloat(price) || 0));
export function getOrderCoupon(cartId) {
return request.get("/coupons/order/" + cartId);
}
/**

2
assets/css/style.css Normal file
View File

File diff suppressed because one or more lines are too long

1
assets/css/style.css.map Normal file
View File

File diff suppressed because one or more lines are too long

38
assets/css/style.less
View File

@ -190,14 +190,11 @@ page {
}
.promotionGood .item .text .sp-money .moneyCon {
padding: 0 0.18*100rpx;
background-color: #eb3729;
height: 0.46*100rpx;
// padding: 0 0.18*100rpx;
height: 0.36*100rpx;
line-height: 0.46*100rpx;
background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
font-size: 0.2*100rpx;
color: #fff;
background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
font-size: 0.26*100rpx;
color:#ea3526;
border-radius: 0.24*100rpx 0.03*100rpx 0.24*100rpx 0.03*100rpx;
}
@ -470,10 +467,27 @@ page {
.coupon-list .item .text .data .bnt.gray {
background-color: #ccc;
}
.condition .line-title {
width: 0.9*100rpx;
height: 0.3*100rpx;
line-height: 0.3*100rpx;
padding: 0 0.1*100rpx;
box-sizing: border-box;
background: rgba(255, 247, 247, 1);
border: 1rpx solid rgba(232, 51, 35, 1);
opacity: 1;
border-radius: 0.22*100rpx;
font-size: 0.2*100rpx !important;
color: #e83323;
margin-right: 0.12*100rpx;
}
.coupon-list .pic-num {
color: #ffffff !important;
font-size: 0.24*100rpx !important;
}
/*优惠券列表弹窗*/
.coupon-list-window {
position: fixed;
@ -1423,6 +1437,9 @@ page {
width: 5.3*100rpx;
text-align: left;
}
.index .wrapper .title .text-center .name{
justify-content: center;
}
.index .wrapper .title .text .name {
color: #282828;
@ -1689,9 +1706,11 @@ page {
.index .wrapper.hot .newProducts .newProductsItem {
border: 0;
}
.index .wrapper.hot .title .text {
color: #fff;
font-size: 28rpx;
.iconfont {
margin-right: 10rpx;
}
@ -6517,7 +6536,7 @@ page {
.my-promotion .header .num {
text-align: center;
color: #fff;
margin-top: 0.25*100rpx;
// margin-top: 0.25*100rpx;
font-size: 0.9*100rpx;
font-family: 'GuildfordProBook 5';
}
@ -8557,7 +8576,8 @@ page {
}
}
.text .name .icon-jingpintuijian, .text .name .icon-xinpin{
.text .name .icon-jingpintuijian,
.text .name .icon-xinpin {
color: #00f !important;
}

51
components/CouponListWindow.vue
View File

@ -7,29 +7,31 @@
</view>
<view v-if="couponList.length > 0">
<view class="coupon-list">
<view
<div
class="item acea-row row-center-wrapper"
v-for="coupon in couponList"
:key="coupon.id"
@click="click(coupon)"
>
<view class="money">
￥
<text class="num">{{ coupon.couponPrice }}</text>
</view>
<view class="text">
<view class="condition line1">{{ coupon.couponTitle }}</view>
<view class="data acea-row row-between-wrapper">
<view v-if="coupon.endTime === 0">不限时</view>
<view v-else><data-format-t :date="coupon.addTime"></data-format-t> - <data-format-t :date="coupon.endTime"></data-format-t></view>
<view
<div class="money">
<div>
￥<span class="num">{{ coupon.couponPrice }}</span>
</div>
<div class="pic-num">满{{ coupon.useMinPrice }}元可用</div>
</div>
<div class="text">
<div class="condition line1">{{ coupon.couponTitle }}</div>
<div class="data acea-row row-between-wrapper">
<div v-if="coupon.endTime === 0">不限时</div>
<div v-else>截止:{{ coupon.endTime }}</div>
<div
class="iconfont icon-xuanzhong1 font-color-red"
v-if="checked === coupon.id"
></view>
<view class="iconfont icon-weixuanzhong" v-else></view>
</view>
</view>
</view>
></div>
<div class="iconfont icon-weixuanzhong" v-else></div>
</div>
</div>
</div>
</view>
<view class="couponNo bg-color-red" @click="couponNo">不使用优惠券</view>
</view>
@ -39,12 +41,7 @@
</view>
</view>
</view>
<view
class="mask"
@touchmove.prevent
:hidden="value === false"
@click="close"
></view>
<view class="mask" @touchmove.prevent :hidden="value === false" @click="close"></view>
</view>
</template>
<style scoped lang="less">
@ -78,6 +75,10 @@ export default {
price: {
type: [Number, String],
default: undefined
},
cartid: {
type: String,
default: ""
}
},
data: function() {
@ -90,6 +91,10 @@ export default {
price(n) {
if (n === undefined || n == null) return;
this.getCoupon();
},
cartid(n) {
if (n === undefined || n == null) return;
this.getCoupon();
}
},
mounted: function() {},
@ -99,7 +104,7 @@ export default {
this.$emit("close");
},
getCoupon() {
getOrderCoupon(this.price).then(res => {
getOrderCoupon(this.cartid).then(res => {
this.couponList = res.data;
this.loaded = true;
});

4
pages/authorization/index.vue
View File

@ -43,11 +43,11 @@ export default {
// // 先校验用户是否授权，如果没有授权，显示授权按钮
},
onHide() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.updateAuthorizationPage(false);
this.changeAuthorization(false);
},
onUnload() {
this.UPDATE_AUTHORIZATIONPAGE(false);
this.updateAuthorizationPage(false);
this.changeAuthorization(false);
},
methods: {

18
pages/home/index.vue
View File

@ -51,15 +51,7 @@
</view>
</view> -->
<!-- <view class="wrapper hot" v-if="likeInfo.length > 0"> -->
<view class="nav acea-row">
<view @click="goWxappUrl(item)" class="item" v-for="(item, menusIndex) in menus" :key="menusIndex">
<view class="pictrue">
<image :src="item.pic" />
</view>
<view>{{ item.name }}</view>
</view>
</view>
<uni-notice-bar scrollable="true" single="true" speed="30" showIcon="true" :text="singNew.info"></uni-notice-bar>
<uni-notice-bar scrollable="true" @click="goRoll(singNew)" single="true" speed="10" showIcon="true" :text="singNew.info"></uni-notice-bar>
<view class="wrapper hot" v-if="bastList.length > 0">
<image class="bg" src="../../static/images/index-bg.png" mode="widthFix"></image>
<view class="title no-border acea-row row-between-wrapper">
@ -130,17 +122,17 @@
</view>
</view>
<view class="wrapper" v-if="benefit.length > 0">
<view class="title acea-row row-between-wrapper">
<view class="text">
<view class="title acea-row row-center">
<view class="text text-center">
<div class="name line1 new-name">
<span class="iconfont icon-shoucang"></span>
<span class="txt">猜你喜欢</span>
</div>
</view>
<view @click="goGoodsPromotion(4)" class="more">
<!-- <view @click="goGoodsPromotion(4)" class="more">
更多
<text class="iconfont icon-jiantou"></text>
</view>
</view> -->
</view>
</view>
<PromotionGood :benefit="benefit"></PromotionGood>

2
pages/order/OrderDetails/index.vue
View File

@ -161,7 +161,7 @@
<view class="item acea-row row-between">
<view>下单时间：</view>
<view class="conter">
<data-format :date="orderInfo.addTime"></data-format>
{{ orderInfo.createTime }}
</view>
</view>
<view class="item acea-row row-between">

12
pages/order/OrderSubmission/index.vue
View File

@ -182,6 +182,7 @@
:price="orderPrice.totalPrice"
:checked="usableCoupon.id"
@checked="changeCoupon"
:cartid="cartid"
></CouponListWindow>
<AddressWindow
@checked="changeAddress"
@ -341,7 +342,8 @@ export default {
shipping_type: 0,
contacts: "",
contactsTel: "",
storeSelfMention: 0
storeSelfMention: 0,
cartid: ""
};
},
computed: mapGetters(["userInfo", "storeItems"]),
@ -360,8 +362,14 @@ export default {
let that = this;
this.$store.dispatch("getUser", true);
that.getCartInfo();
if (that.$yroute.query.pinkid !== undefined)
console.log(that.$yroute);
if (that.$yroute.query.pinkid !== undefined) {
that.pinkId = that.$yroute.query.pinkid;
}
if (that.$yroute.query.id !== undefined) {
that.cartid = that.$yroute.query.id;
console.log(that.cartid)
}
},
methods: {
showStoreList() {

11
pages/user/Recharge/index.vue
View File

@ -67,7 +67,9 @@ export default {
picList: [],
activePic: 0,
numberPic: "",
paid_price: ""
paid_price: "",
rechar_id: 0
};
},
computed: mapGetters(["userInfo"]),
@ -84,6 +86,7 @@ export default {
.then(res => {
this.picList = res.data.recharge_price_ways || [];
if (this.picList[0]) {
this.rechar_id = this.picList[0].id;
this.paid_price = this.picList[0].value.price;
this.numberPic = this.picList[0].value.give_price;
}
@ -103,10 +106,12 @@ export default {
picCharge(idx, item) {
this.activePic = idx;
if (idx == this.picList.length) {
this.rechar_id = 0;
this.paid_price = "";
this.numberPic = "";
} else {
this.money = "";
this.rechar_id = item.id;
this.paid_price = item.value.give_price;
this.numberPic = item.value.price;
}
@ -140,9 +145,9 @@ export default {
}
rechargeWechat({
price: prices,
// from: that.from,
from: that.from,
paidPrice: paid_price
paid_price: paid_price,
rechar_id: that.rechar_id
})
.then(res => {
console.log(res);

2
pages/user/UserAccount/index.vue
View File

@ -8,7 +8,7 @@
<view>总资产(元)</view>
<view class="money">{{ now_money }}</view>
</view>
<navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator>
<!-- <navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator> -->
</view>
<view class="cumulative acea-row row-top">
<view class="item">

42
pages/user/coupon/UserCoupon/index.vue
View File

@ -1,25 +1,31 @@
<template>
<view ref="container">
<view class="coupon-list" v-if="couponsList.length > 0">
<view
<div class="coupon-list" v-if="couponsList.length > 0">
<div
class="item acea-row row-center-wrapper"
v-for="(item, couponsListIndex) in couponsList"
:key="couponsListIndex"
v-cloak
v-for="(item, index) in couponsList"
:key="index"
>
<view class="money" :class="item._type === 0 ? 'moneyGray' : ''">
￥<text class="num">{{ item.couponPrice }}</text>
</view>
<view class="text">
<view class="condition line1">{{ item.couponTitle }}</view>
<view class="data acea-row row-between-wrapper">
<view v-if="item.endTime === 0">不限时</view>
<view v-else><data-format-t :date="item.addTime"></data-format-t> - <data-format-t :date="item.endTime"></data-format-t></view>
<view class="bnt gray" v-if="item._type === 0">{{ item._msg }}</view>
<view class="bnt bg-color-red" v-else>{{ item._msg }}</view>
</view>
</view>
</view>
</view>
<div class="money" :class="item._type === 0 ? 'moneyGray' : ''">
<div>
￥<span class="num">{{ item.couponPrice }}</span>
</div>
<div class="pic-num">满{{ item.useMinPrice }}元可用</div>
</div>
<div class="text">
<div class="condition line1">
{{ item.couponTitle }}
</div>
<div class="data acea-row row-between-wrapper">
<div v-if="item.endTime === 0">不限时</div>
<div v-else>{{ item.createTime }}-{{ item.endTime }}</div>
<div class="bnt gray" v-if="item._type === 0">{{ item._msg }}</div>
<div class="bnt bg-color-red" v-else>{{ item._msg }}</div>
</div>
</div>
</div>
</div>
<!--暂无优惠券-->
<view
class="noCommodity"

33
pages/user/promotion/PromoterList/index.vue
View File

@ -6,19 +6,23 @@
<view>
<view class="name">推广人数</view>
<view>
<text class="num">{{ first + second }}</text>
<text class="num">{{ first + second||'0' }}</text>
<text>人</text>
</view>
</view>
</view>
</view>
<view class="nav acea-row row-around">
<view class="item" :class="screen.grade == 0 ? 'on' : ''" @click="checkGrade(0)">
一级({{ first }})
</view>
<view class="item" :class="screen.grade == 1 ? 'on' : ''" @click="checkGrade(1)">
二级({{ second }})
</view>
<view
class="item"
:class="screen.grade == 0 ? 'on' : ''"
@click="checkGrade(0)"
>一级({{ first||'0' }})</view>
<view
class="item"
:class="screen.grade == 1 ? 'on' : ''"
@click="checkGrade(1)"
>二级({{ second||'0' }})</view>
</view>
<view class="search acea-row row-between-wrapper">
<form @submit.prevent="submitForm">
@ -52,7 +56,11 @@
</view>
</view>
<view :class="fixedState === true ? 'sortList' : ''">
<view class="item acea-row row-between-wrapper" v-for="(val, spreadListIndex) in spreadList" :key="spreadListIndex">
<view
class="item acea-row row-between-wrapper"
v-for="(val, spreadListIndex) in spreadList"
:key="spreadListIndex"
>
<view class="picTxt acea-row row-between-wrapper">
<view class="pictrue">
<image :src="val.avatar" />
@ -76,9 +84,7 @@
</view>
</template>
<script>
import {
getSpreadUser
} from "@/api/user";
import { getSpreadUser } from "@/api/user";
import Loading from "@/components/Loading";
export default {
name: "PromoterList",
@ -157,8 +163,9 @@
},
err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
},

2
pages/user/promotion/PromoterOrder/index.vue
View File

@ -5,7 +5,7 @@
<view>
<text class="name">累计推广订单</text>
<view>
<text class="num">{{ count }}</text>
<text class="num">{{ count||'0' }}</text>
<text>单</text>
</view>
</view>

1
utils/index.js
View File

@ -196,6 +196,7 @@ export const login = () => {
reject('获取用户信息失败')
});
}).catch(error => {
console.log(error)
console.log('登录接口调用失败')
reject('登录接口调用失败')
});