Browse Source

合并冲突

zyh
gaoxs 5 years ago
parent
commit
ae5860c94e
  1. 12
      api/order.js
  2. 2
      assets/css/style.css
  3. 1
      assets/css/style.css.map
  4. 27
      assets/css/style.less
  5. 132
      components/uni-icons/icons.js
  6. 67
      components/uni-icons/uni-icons.vue
  7. 395
      components/uni-notice-bar/uni-notice-bar.vue
  8. 21
      pages/home/index.vue
  9. 8
      pages/order/MyOrder/index.vue
  10. 2
      pages/order/OrderDetails/index.vue
  11. 8
      pages/order/OrderSubmission/index.vue
  12. 4
      pages/shop/GoodsCollection/index.vue
  13. 16
      pages/user/Recharge/index.vue
  14. 8
      pages/user/User/index.vue
  15. 2
      pages/user/UserAccount/index.vue
  16. 3
      pages/user/address/AddAddress/index.vue
  17. 52
      pages/user/coupon/GetCoupon/index.vue
  18. 6
      pages/user/promotion/UserPromotion/index.vue
  19. BIN
      static/images/promotionBg.png

12
api/order.js

@ -97,9 +97,9 @@ export function postOrderRefund(data) {
* 确认收货
* @returns {*}
*/
export function takeOrder(uni) {
export function takeOrder(orderId) {
return request.post("/order/take", {
uni
orderId
});
}
@ -107,9 +107,9 @@ export function takeOrder(uni) {
* 删除订单
* @returns {*}
*/
export function delOrder(uni) {
export function delOrder(orderId) {
return request.post("/order/del", {
uni
orderId
});
}
@ -125,9 +125,9 @@ export function express(params) {
* 订单查询物流信息
* @returns {*}
*/
export function payOrder(uni, paytype, from) {
export function payOrder(orderId, paytype, from) {
return request.post("order/pay", {
uni,
orderId,
paytype,
from
});

2
assets/css/style.css

File diff suppressed because one or more lines are too long

1
assets/css/style.css.map

File diff suppressed because one or more lines are too long

27
assets/css/style.less

@ -399,13 +399,14 @@ page {
}
/*优惠券列表公共*/
.coupon-list {
padding: 0 0.3*100rpx;
margin-top: 0.25*100rpx;
box-sizing: border-box;
}
.coupon-list .item {
box-sizing: border-box;
width: 100%;
height: 1.7*100rpx;
margin-bottom: 0.16*100rpx;
@ -421,7 +422,10 @@ page {
font-size: 0.36*100rpx;
font-weight: bold;
text-align: center;
line-height: 1.7*100rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.coupon-list .item .money.moneyGray {
@ -433,9 +437,10 @@ page {
}
.coupon-list .item .text {
flex: 1;
width: 4.5*100rpx;
padding: 0 0.17*100rpx 0 0.24*100rpx;
background-color: #fff;
box-sizing: border-box;
}
.coupon-list .item .text .condition {
@ -465,7 +470,10 @@ page {
.coupon-list .item .text .data .bnt.gray {
background-color: #ccc;
}
.coupon-list .pic-num {
color: #ffffff !important;
font-size: 0.24*100rpx !important;
}
/*优惠券列表弹窗*/
.coupon-list-window {
position: fixed;
@ -476,11 +484,22 @@ page {
border-radius: 0.16*100rpx 0.16*100rpx 0 0;
z-index: 111;
transition: all .3s cubic-bezier(.25, .5, .5, .9);
-webkit-transition: all .3s cubic-bezier(.25, .5, .5, .9);
-moz-transition: all .3s cubic-bezier(.25, .5, .5, .9);
-o-transition: all .3s cubic-bezier(.25, .5, .5, .9);
transform: translate3d(0, 100%, 0);
-webkit-transform: translate3d(0, 100%, 0);
-ms-transform: translate3d(0, 100%, 0);
-moz-transform: translate3d(0, 100%, 0);
-o-transform: translate3d(0, 100%, 0);
}
.coupon-list-window.on {
transform: translate3d(0, 0, 0);
-webkit-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
-moz-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
}
.coupon-list-window .title {

132
components/uni-icons/icons.js

@ -0,0 +1,132 @@
export default {
"pulldown": "\ue588",
"refreshempty": "\ue461",
"back": "\ue471",
"forward": "\ue470",
"more": "\ue507",
"more-filled": "\ue537",
"scan": "\ue612",
"qq": "\ue264",
"weibo": "\ue260",
"weixin": "\ue261",
"pengyouquan": "\ue262",
"loop": "\ue565",
"refresh": "\ue407",
"refresh-filled": "\ue437",
"arrowthindown": "\ue585",
"arrowthinleft": "\ue586",
"arrowthinright": "\ue587",
"arrowthinup": "\ue584",
"undo-filled": "\ue7d6",
"undo": "\ue406",
"redo": "\ue405",
"redo-filled": "\ue7d9",
"bars": "\ue563",
"chatboxes": "\ue203",
"camera": "\ue301",
"chatboxes-filled": "\ue233",
"camera-filled": "\ue7ef",
"cart-filled": "\ue7f4",
"cart": "\ue7f5",
"checkbox-filled": "\ue442",
"checkbox": "\ue7fa",
"arrowleft": "\ue582",
"arrowdown": "\ue581",
"arrowright": "\ue583",
"smallcircle-filled": "\ue801",
"arrowup": "\ue580",
"circle": "\ue411",
"eye-filled": "\ue568",
"eye-slash-filled": "\ue822",
"eye-slash": "\ue823",
"eye": "\ue824",
"flag-filled": "\ue825",
"flag": "\ue508",
"gear-filled": "\ue532",
"reload": "\ue462",
"gear": "\ue502",
"hand-thumbsdown-filled": "\ue83b",
"hand-thumbsdown": "\ue83c",
"hand-thumbsup-filled": "\ue83d",
"heart-filled": "\ue83e",
"hand-thumbsup": "\ue83f",
"heart": "\ue840",
"home": "\ue500",
"info": "\ue504",
"home-filled": "\ue530",
"info-filled": "\ue534",
"circle-filled": "\ue441",
"chat-filled": "\ue847",
"chat": "\ue263",
"mail-open-filled": "\ue84d",
"email-filled": "\ue231",
"mail-open": "\ue84e",
"email": "\ue201",
"checkmarkempty": "\ue472",
"list": "\ue562",
"locked-filled": "\ue856",
"locked": "\ue506",
"map-filled": "\ue85c",
"map-pin": "\ue85e",
"map-pin-ellipse": "\ue864",
"map": "\ue364",
"minus-filled": "\ue440",
"mic-filled": "\ue332",
"minus": "\ue410",
"micoff": "\ue360",
"mic": "\ue302",
"clear": "\ue434",
"smallcircle": "\ue868",
"close": "\ue404",
"closeempty": "\ue460",
"paperclip": "\ue567",
"paperplane": "\ue503",
"paperplane-filled": "\ue86e",
"person-filled": "\ue131",
"contact-filled": "\ue130",
"person": "\ue101",
"contact": "\ue100",
"images-filled": "\ue87a",
"phone": "\ue200",
"images": "\ue87b",
"image": "\ue363",
"image-filled": "\ue877",
"location-filled": "\ue333",
"location": "\ue303",
"plus-filled": "\ue439",
"plus": "\ue409",
"plusempty": "\ue468",
"help-filled": "\ue535",
"help": "\ue505",
"navigate-filled": "\ue884",
"navigate": "\ue501",
"mic-slash-filled": "\ue892",
"search": "\ue466",
"settings": "\ue560",
"sound": "\ue590",
"sound-filled": "\ue8a1",
"spinner-cycle": "\ue465",
"download-filled": "\ue8a4",
"personadd-filled": "\ue132",
"videocam-filled": "\ue8af",
"personadd": "\ue102",
"upload": "\ue402",
"upload-filled": "\ue8b1",
"starhalf": "\ue463",
"star-filled": "\ue438",
"star": "\ue408",
"trash": "\ue401",
"phone-filled": "\ue230",
"compose": "\ue400",
"videocam": "\ue300",
"trash-filled": "\ue8dc",
"download": "\ue403",
"chatbubble-filled": "\ue232",
"chatbubble": "\ue202",
"cloud-download": "\ue8e4",
"cloud-upload-filled": "\ue8e5",
"cloud-upload": "\ue8e6",
"cloud-download-filled": "\ue8e9",
"headphones":"\ue8bf",
"shop":"\ue609"
}

67
components/uni-icons/uni-icons.vue

File diff suppressed because one or more lines are too long

395
components/uni-notice-bar/uni-notice-bar.vue

@ -0,0 +1,395 @@
<template>
<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
<!-- #ifdef MP-ALIPAY -->
<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" @click="close">
<uni-icons type="closeempty" :color="color" size="12" />
</view>
<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
<uni-icons type="sound" :color="color" size="14" />
</view>
<!-- #endif -->
<!-- #ifndef MP-ALIPAY -->
<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closeempty" :color="color"
size="12" @click="close" />
<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color"
size="14" />
<!-- #endif -->
<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
:style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
</view>
</view>
<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more" @click="clickMore">
<text v-if="moreText" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
<uni-icons type="arrowright" :color="moreColor" size="14" />
</view>
</view>
</template>
<script>
import uniIcons from '../uni-icons/uni-icons.vue'
// #ifdef APP-NVUE
const dom = weex.requireModule('dom');
const animation = weex.requireModule('animation');
// #endif
/**
* NoticeBar 自定义导航栏
* @description 通告栏组件
* @tutorial https://ext.dcloud.net.cn/plugin?id=30
* @property {Number} speed 文字滚动的速度默认100px/
* @property {String} text 显示文字
* @property {String} backgroundColor 背景颜色
* @property {String} color 文字颜色
* @property {String} moreColor 查看更多文字的颜色
* @property {String} moreText 设置查看更多的文本
* @property {Boolean} single = [true|false] 是否单行
* @property {Boolean} scrollable = [true|false] 是否滚动为true时NoticeBar为单行
* @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
* @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
* @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标为true时NoticeBar为单行
* @event {Function} click 点击 NoticeBar 触发事件
* @event {Function} close 关闭 NoticeBar 触发事件
* @event {Function} getmore 点击查看更多时触发事件
*/
export default {
name: 'UniNoticeBar',
components: {
uniIcons
},
props: {
text: {
type: String,
default: ''
},
moreText: {
type: String,
default: ''
},
backgroundColor: {
type: String,
default: '#fffbe8'
},
speed: {
// 1s100px
type: Number,
default: 100
},
color: {
type: String,
default: '#de8c17'
},
moreColor: {
type: String,
default: '#999999'
},
single: {
//
type: [Boolean, String],
default: false
},
scrollable: {
//
type: [Boolean, String],
default: false
},
showIcon: {
// icon
type: [Boolean, String],
default: false
},
showGetMore: {
//
type: [Boolean, String],
default: false
},
showClose: {
//
type: [Boolean, String],
default: false
}
},
data() {
const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
return {
textWidth: 0,
boxWidth: 0,
wrapWidth: '',
webviewHide: false,
// #ifdef APP-NVUE
stopAnimation: false,
// #endif
elId: elId,
elIdBox: elIdBox,
show: true,
animationDuration: 'none',
animationPlayState: 'paused',
animationDelay: '0s'
}
},
mounted() {
// #ifdef APP-PLUS
var pages = getCurrentPages();
var page = pages[pages.length - 1];
var currentWebview = page.$getAppWebview();
currentWebview.addEventListener('hide',()=>{
this.webviewHide = true
})
currentWebview.addEventListener('show',()=>{
this.webviewHide = false
})
// #endif
this.$nextTick(() => {
this.initSize()
})
},
// #ifdef APP-NVUE
beforeDestroy() {
this.stopAnimation = true
},
// #endif
methods: {
initSize() {
if (this.scrollable) {
// #ifndef APP-NVUE
let query = [],
boxWidth = 0,
textWidth = 0;
let textQuery = new Promise((resolve, reject) => {
uni.createSelectorQuery()
// #ifndef MP-ALIPAY
.in(this)
// #endif
.select(`#${this.elId}`)
.boundingClientRect()
.exec(ret => {
this.textWidth = ret[0].width
resolve()
})
})
let boxQuery = new Promise((resolve, reject) => {
uni.createSelectorQuery()
// #ifndef MP-ALIPAY
.in(this)
// #endif
.select(`#${this.elIdBox}`)
.boundingClientRect()
.exec(ret => {
this.boxWidth = ret[0].width
resolve()
})
})
query.push(textQuery)
query.push(boxQuery)
Promise.all(query).then(() => {
this.animationDuration = `${this.textWidth / this.speed}s`
this.animationDelay = `-${this.boxWidth / this.speed}s`
setTimeout(() => {
this.animationPlayState = 'running'
}, 1000)
})
// #endif
// #ifdef APP-NVUE
dom.getComponentRect(this.$refs['animationEle'], (res) => {
let winWidth = uni.getSystemInfoSync().windowWidth
this.textWidth = res.size.width
animation.transition(this.$refs['animationEle'], {
styles: {
transform: `translateX(-${winWidth}px)`
},
duration: 0,
timingFunction: 'linear',
delay: 0
}, () => {
if (!this.stopAnimation) {
animation.transition(this.$refs['animationEle'], {
styles: {
transform: `translateX(-${this.textWidth}px)`
},
timingFunction: 'linear',
duration: (this.textWidth - winWidth) / this.speed * 1000,
delay: 1000
}, () => {
if (!this.stopAnimation) {
this.loopAnimation()
}
});
}
});
})
// #endif
}
// #ifdef APP-NVUE
if (!this.scrollable && (this.single || this.moreText)) {
dom.getComponentRect(this.$refs['textBox'], (res) => {
this.wrapWidth = res.size.width
})
}
// #endif
},
loopAnimation() {
// #ifdef APP-NVUE
animation.transition(this.$refs['animationEle'], {
styles: {
transform: `translateX(0px)`
},
duration: 0
}, () => {
if (!this.stopAnimation) {
animation.transition(this.$refs['animationEle'], {
styles: {
transform: `translateX(-${this.textWidth}px)`
},
duration: this.textWidth / this.speed * 1000,
timingFunction: 'linear',
delay: 0
}, () => {
if (!this.stopAnimation) {
this.loopAnimation()
}
});
}
});
// #endif
},
clickMore() {
this.$emit('getmore')
},
close() {
this.show = false;
this.$emit('close')
},
onClick() {
this.$emit('click')
}
}
}
</script>
<style lang="scss" scoped>
.uni-noticebar {
/* #ifndef APP-NVUE */
display: flex;
width: 100%;
box-sizing: border-box;
/* #endif */
flex-direction: row;
align-items: center;
padding: 6px 12px;
margin-bottom: 10px;
}
.uni-noticebar-close {
margin-right: 5px;
}
.uni-noticebar-icon {
margin-right: 5px;
}
.uni-noticebar__content-wrapper {
flex: 1;
flex-direction: column;
overflow: hidden;
}
.uni-noticebar__content-wrapper--single {
/* #ifndef APP-NVUE */
line-height: 18px;
/* #endif */
}
.uni-noticebar__content-wrapper--single,
.uni-noticebar__content-wrapper--scrollable {
flex-direction: row;
}
/* #ifndef APP-NVUE */
.uni-noticebar__content-wrapper--scrollable {
position: relative;
height: 18px;
}
/* #endif */
.uni-noticebar__content--scrollable {
/* #ifdef APP-NVUE */
flex: 0;
/* #endif */
/* #ifndef APP-NVUE */
flex: 1;
display: block;
overflow: hidden;
/* #endif */
}
.uni-noticebar__content--single {
/* #ifndef APP-NVUE */
display: flex;
flex: none;
width: 100%;
justify-content: center;
/* #endif */
}
.uni-noticebar__content-text {
font-size: 14px;
line-height: 18px;
/* #ifndef APP-NVUE */
word-break: break-all;
/* #endif */
}
.uni-noticebar__content-text--single {
/* #ifdef APP-NVUE */
lines: 1;
/* #endif */
/* #ifndef APP-NVUE */
display: block;
width: 100%;
white-space: nowrap;
/* #endif */
overflow: hidden;
text-overflow: ellipsis;
}
.uni-noticebar__content-text--scrollable {
/* #ifdef APP-NVUE */
lines: 1;
padding-left: 750rpx;
/* #endif */
/* #ifndef APP-NVUE */
position: absolute;
display: block;
height: 18px;
line-height: 18px;
white-space: nowrap;
padding-left: 100%;
animation: notice 10s 0s linear infinite both;
animation-play-state: paused;
/* #endif */
}
.uni-noticebar__more {
/* #ifndef APP-NVUE */
display: inline-flex;
/* #endif */
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
padding-left: 5px;
}
.uni-noticebar__more-text {
font-size: 14px;
}
@keyframes notice {
100% {
transform: translate3d(-100%, 0, 0);
}
}
</style>

21
pages/home/index.vue

@ -30,7 +30,7 @@
<view>{{ item.name }}</view>
</view>
</view>
<view class="news acea-row ">
<!-- <view class="news acea-row ">
<view class="pictrue" v-if="$VUE_APP_RESOURCES_URL">
<image src="@/static/images/news.png" />
</view>
@ -49,8 +49,18 @@
</block>
</swiper>
</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 class="wrapper hot" v-if="likeInfo.length > 0">
<view>{{ item.name }}</view>
</view>
</view>
<uni-notice-bar scrollable="true" single="true" speed="30" 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">
<div class="text line1">
@ -148,6 +158,7 @@
import GoodList from '@/components/GoodList';
import PromotionGood from '@/components/PromotionGood';
import CouponWindow from '@/components/CouponWindow';
import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue'
import {
getHomeData,
getShare
@ -165,6 +176,7 @@
components: {
// swiper,
// swiperSlide,
uniNoticeBar,
GoodList,
PromotionGood,
CouponWindow
@ -245,6 +257,11 @@
observeParents: true
}
};
},
computed:{
singNew() {
return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦!";
}
},
onShow: function() {
this.getLocation()

8
pages/order/MyOrder/index.vue

@ -4,11 +4,7 @@
<view class="picTxt acea-row row-between-wrapper">
<view class="text">
<view class="name">订单信息</view>
<view>
累计订单{{ orderData.orderCount || 0 }} 总消费{{
orderData.sumPrice || 0
}}
</view>
<view>累计订单{{ orderData.orderCount || 0 }} 总消费{{orderData.sumPrice || 0 }}</view>
</view>
</view>
</view>
@ -45,7 +41,7 @@
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
{{ dataFormat(order.addTime) }}
{{ order.createTime }}
</view>
<view class="font-color-red">{{ getStatus(order) }}</view>
</view>

2
pages/order/OrderDetails/index.vue

@ -5,7 +5,7 @@
<view class="data" :class="refundOrder ? 'on' : ''">
<view class="state">{{ orderInfo._status._msg }}</view>
<view>
<data-format :date="orderInfo.addTime"></data-format>
{{ orderInfo.createTime }}
</view>
</view>
</view>

8
pages/order/OrderSubmission/index.vue

@ -12,7 +12,7 @@
class="item font-color-red"
:class="shipping_type === 1 ? 'on' : 'on2'"
@click="addressType(1)"
v-if="storeSelfMention"
v-if="systemStore"
></view>
</view>
<view
@ -634,7 +634,11 @@ export default {
.catch(err => {
uni.hideLoading();
uni.showToast({
title: err.response.data.msg || "创建订单失败",
title:
err.msg ||
err.response.data.msg ||
err.response.data.message ||
"创建订单失败",
icon: "none",
duration: 2000
});

4
pages/shop/GoodsCollection/index.vue

@ -14,7 +14,7 @@
<view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row row-between-wrapper">
<view class="money font-color-red">{{ item.price }}</view>
<view class="delete" @click.prevent="delCollection(collectProductListIndex)">删除</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
</view>
</view>
</view>
@ -86,7 +86,7 @@ export default {
category = that.collectProductList[index].category;
getCollectDel(id, category).then(function() {
uni.showToast({
title: "添加购物车成功",
title: "删除成功",
icon: "success",
duration: 2000,
complete: () => {

16
pages/user/Recharge/index.vue

@ -24,13 +24,13 @@
>
<view class="pic-number-pic">
<text>
{{ item.price }}
{{ item.value.price }}
<text class="pic-number"></text>
</text>
</view>
<view class="pic-number">赠送{{ item.give_price }} </view>
<view class="pic-number" v-if="item.value.give_price > 0">赠送{{ item.value.give_price }} </view>
</view>
<view
<!-- <view
class="pic-box pic-box-color acea-row row-center-wrapper"
@click="picCharge(picList.length, money)"
>
@ -40,7 +40,7 @@
v-model="money"
class="pic-box-money pic-number-pic"
/>
</view>
</view> -->
</view>
<view class="tip">提示充值后帐户的金额不能提现</view>
<view class="pay-btn bg-color-red" @click="recharge">立即充值</view>
@ -84,8 +84,8 @@ export default {
.then(res => {
this.picList = res.data.recharge_price_ways || [];
if (this.picList[0]) {
this.paid_price = this.picList[0].price;
this.numberPic = this.picList[0].give_price;
this.paid_price = this.picList[0].value.price;
this.numberPic = this.picList[0].value.give_price;
}
})
.catch(res => {
@ -107,8 +107,8 @@ export default {
this.numberPic = "";
} else {
this.money = "";
this.paid_price = item.give_price;
this.numberPic = item.price;
this.paid_price = item.value.give_price;
this.numberPic = item.value.price;
}
},
recharge: function() {

8
pages/user/User/index.vue

@ -313,6 +313,14 @@ export default {
});
return;
}
if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) {
uni.showToast({
title: "您没有核销权限,请后台店员设置!!",
icon: "none",
duration: 2000
});
return;
}
this.$yrouter.push({
path: this.MyMenus[index].uniapp_url

2
pages/user/UserAccount/index.vue

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

3
pages/user/address/AddAddress/index.vue

@ -177,7 +177,8 @@ export default {
this.address = {
province: values.province.name || "",
city: values.city.name || "",
district: values.district.name || ""
district: values.district.name || "",
city_id: values.city.id
};
this.addressText = `${this.address.province}${this.address.city}${this.address.district}`;
// this.addressText =

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

@ -1,30 +1,35 @@
<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-for="(item, index) in couponsList"
:key="index"
>
<view class="money" :class="item.isUse ? 'moneyGray' : ''">
<div class="money" :class="item.isUse ? 'moneyGray' : ''">
<div>
<text class="num">{{ item.couponPrice }}</text>
</view>
<view class="text">
<view class="condition line1">购物满{{ item.useMinPrice }}元可用</view>
<view class="data acea-row row-between-wrapper">
<view v-if="item.endTime !== 0">
<data-format-t :date="item.startTime"></data-format-t>-
<data-format-t :date="item.endTime"></data-format-t>
</view>
<view v-else>不限时</view>
<view class="bnt gray" v-if="item.isUse === true">已领取</view>
<view class="bnt gray" v-else-if="item.isUse === 2">已领完</view>
<view class="bnt bg-color-red" v-else @click="getCoupon(item.id, couponsListIndex)">立即领取</view>
</view>
</view>
</view>
</view>
<span class="num">{{ item.couponPrice }}</span>
</div>
<div class="pic-num">{{ item.useMinPrice }}元可用</div>
</div>
<div class="text">
<div class="condition line1">
<span class="line-title bg-color-check" v-if="item.ctype === 0">通用劵</span>
<span class="line-title bg-color-check" v-else-if="item.ctype === 1">商品券</span>
<span class="line-title bg-color-check" v-else>未知</span>
<span>{{ item.cname }}</span>
</div>
<div class="data acea-row row-between-wrapper">
<div v-if="item.endTime !== 0">{{ item.startTime }}-{{ item.endTime }}</div>
<div v-else>不限时</div>
<div class="bnt gray" v-if="item.isUse === true">已领取</div>
<div class="bnt gray" v-else-if="item.isUse === 2">已领完</div>
<div class="bnt bg-color-red" v-else @click="getCoupon(item.id, index)">立即领取</div>
</div>
</div>
</div>
</div>
<Loading :loaded="loadend" :loading="loading"></Loading>
<!--暂无优惠券-->
@ -76,7 +81,8 @@ export default {
})
.catch(function(err) {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});

6
pages/user/promotion/UserPromotion/index.vue

@ -20,7 +20,7 @@
</view>
</view>
</view>
<view class="bnt bg-color-red" @click="toCash">立即提现</view>
<!-- <view class="bnt bg-color-red" @click="toCash">立即提现</view> -->
<view class="list acea-row row-between-wrapper">
<view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
<text class="iconfont icon-erweima"></text>
@ -38,6 +38,10 @@
<text class="iconfont icon-dingdan"></text>
<view>推广人订单</view>
</view>
<view class="item acea-row row-center-wrapper row-column" @click="toCash()">
<text class="iconfont icon-chongzhi"></text>
<view>立即提现</view>
</view>
</view>
</view>
</template>

BIN
static/images/promotionBg.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Loading…
Cancel
Save