396316021
/
pet_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改问题

master
396316021 1 year ago
parent
76126c6807
commit
ce4972f8cb
3 changed files with 285 additions and 259 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 540
      pages/Coupons/index.vue
  2. 4
      pages/OrderDetail/index.vue
  3. BIN
      static/image/order-detail-share.jpg

540
pages/Coupons/index.vue
Unescape View File

@ -1,52 +1,57 @@
<template> <template>
<HeaderNav title="优惠在这" :is-back="true" :nav-to-url="navToUrl"></HeaderNav> <HeaderNav title="优惠在这" :is-back="true" :nav-to-url="navToUrl"></HeaderNav>
<view class="app-wallpaper" :style="{ <view class="app-wallpaper" :style="{
backgroundImage:'url('+staticImage.wallpaperBgImage+')' backgroundImage:'url('+staticImage.wallpaperBgImage+')'
}"> }">
<view class="capsule-container row"> <view class="capsule-container row">
<view class="capsule" :class="{active:item.value === couponType,'col-6':(types.length >1),'col-12':(types.length === 1)}" @click="couponTypeToggle(item)" v-for="item in types"> <view class="capsule"
{{ item.title }} :class="{active:item.value === couponType,'col-6':(types.length >1),'col-12':(types.length === 1)}"
</view> @click="couponTypeToggle(item)" v-for="item in types">
</view> {{ item.title }}
<view class="coupons-list" v-if="type === 'lists'"> </view>
<view v-for="item in couponsList" class="coupons-item-container" :style="{ </view>
<view class="coupons-list" v-if="type === 'lists'">
<view v-for="item in couponsList" class="coupons-item-container" :style="{
backgroundImage:'url('+((item.status > 0)?staticImage.couponsGrayBackground:staticImage.couponsBackground)+')' backgroundImage:'url('+((item.status > 0)?staticImage.couponsGrayBackground:staticImage.couponsBackground)+')'
}"> }">
<view class="coupons-item row"> <view class="coupons-item row">
<view class="coupons-left "> <view class="coupons-left ">
<view class="coupons-big-title-group row"> <view class="coupons-big-title-group row">
<view class="coupons-big-title"> <view class="coupons-big-title">
<u-text :text="item.price" :size="item.price>99?60:90" color="#ffffff" align="center" line-height="90" bold></u-text> <u-text :text="item.price" :size="item.price>99?60:90" color="#ffffff" align="center" line-height="90"
<!-- {{item.price}}--> bold></u-text>
<!-- {{item.price}}-->
</view> </view>
<view class="coupons-big-desc">元</view> <view class="coupons-big-desc">元</view>
</view> </view>
<view class="coupons-cause"> <view class="coupons-cause">
{{item.type_name}} {{ item.type_name }}
</view> </view>
</view> </view>
<view class="coupons-right col row"> <view class="coupons-right col row">
<view class=" "> <view class=" ">
<view class="coupons-title col-12">{{item.title}}</view> <view class="coupons-title col-12">{{ item.title }}</view>
<view class="coupons-desc col-12"> <view class="coupons-desc col-12">
<text v-if="item.number !== 0 && item.number !== -1">剩余:</text> <text v-if="item.number !== 0 && item.number !== -1">剩余:</text>
<text v-if="item.number === 0">不限数量</text> <text v-if="item.number === 0">不限数量</text>
<text v-if="item.number !== 0 && item.number !== -1">{{item.number}}</text> <text v-if="item.number !== 0 && item.number !== -1">{{ item.number }}</text>
<text v-if="item.number === -1">已领取完</text> <text v-if="item.number === -1">已领取完</text>
<text v-if="item.number !== 0 && item.number !== -1">张</text> <text v-if="item.number !== 0 && item.number !== -1">张</text>
</view> </view>
</view> </view>
<view class="coupons-gq " v-show="item.status === 2"> <view class="coupons-gq " v-show="item.status === 2">
<image class="img" :src="staticImage.couponsGQ" mode="aspectFill" /> <image class="img" :src="staticImage.couponsGQ" mode="aspectFill"/>
</view> </view>
<view class="coupons-gq " v-show="item.status === 1"> <view class="coupons-gq " v-show="item.status === 1">
<image class="img" :src="staticImage.couponsUse" mode="aspectFill" /> <image class="img" :src="staticImage.couponsUse" mode="aspectFill"/>
</view> </view>
<view class="coupons-bottom col-12 row"> <view class="coupons-bottom col-12 row">
<view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则 <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon></view> <view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则
<view class="coupons-button"> <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon>
<MzButton </view>
<view class="coupons-button">
<MzButton
title="立即领取" title="立即领取"
@click="clickCoupons(item)" @click="clickCoupons(item)"
button-width="145rpx" button-width="145rpx"
@ -58,12 +63,12 @@
:btn-style="{ :btn-style="{
boxShadow:((item.status > 0 || item.number === -1)?'2rpx -5rpx 0rpx 0rpx rgba(199,199,199,0.35)':'2rpx -5rpx 0rpx 0rpx rgba(77,195,184,0.35)') boxShadow:((item.status > 0 || item.number === -1)?'2rpx -5rpx 0rpx 0rpx rgba(199,199,199,0.35)':'2rpx -5rpx 0rpx 0rpx rgba(77,195,184,0.35)')
}"></MzButton> }"></MzButton>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore v-if="type === 'lists'" <u-loadmore v-if="type === 'lists'"
:status="status" fontSize="28" :status="status" fontSize="28"
color="#ACB4B6" color="#ACB4B6"
@ -71,15 +76,18 @@
line-color="#ACB4B6" line-color="#ACB4B6"
marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/> marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/>
<Draw v-if="type === 'draw'"></Draw> <Draw v-if="type === 'draw'"></Draw>
</view> </view>
<uv-popup ref="agreement" mode="bottom" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="position:relative;"> <uv-popup ref="agreement" mode="bottom" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom
custom-style="position:relative;">
<view class="title row" style="position:absolute;justify-content: center;width:100%;top:20rpx;left:0;"> <view class="title row" style="position:absolute;justify-content: center;width:100%;top:20rpx;left:0;">
<view class="value col" style="position: relative;text-align: center;"> <view class="value col" style="position: relative;text-align: center;">
<!-- <u-text text="协议内容" size="38" color="#191919"></u-text>--> <!-- <u-text text="协议内容" size="38" color="#191919"></u-text>-->
<view class="" style="position: relative;display:inline-block;"> <view class="" style="position: relative;display:inline-block;">
<view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">使用说明</view> <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">使用说明
<view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view> </view>
<view class="background"
style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
</view> </view>
</view> </view>
</view> </view>
@ -87,42 +95,48 @@
<u-parse :content="couponsContent"></u-parse> <u-parse :content="couponsContent"></u-parse>
</view> </view>
</uv-popup> </uv-popup>
<uv-popup z-index="10000" ref="notOpenPop" mode="center" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;"> <uv-popup :close-on-click-overlay="false" z-index="10000" ref="notOpenPop" mode="center" round="20rpx"
safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
<view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;"> <view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;">
<view class="value col" style="position: relative;text-align: center;"> <view class="value col" style="position: relative;text-align: center;">
<!-- <u-text text="协议内容" size="38" color="#191919"></u-text>--> <!-- <u-text text="协议内容" size="38" color="#191919"></u-text>-->
<view class="" style="position: relative;display:inline-block;"> <view class="" style="position: relative;display:inline-block;">
<view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view> <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view>
<view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view> <view class="background"
style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
</view> </view>
</view> </view>
</view> </view>
<view style="padding:30rpx 30rpx 0;max-height:700rpx;overflow: auto;"> <view style="padding:30rpx 30rpx 0;max-height:700rpx;overflow: auto;">
<view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前不在活动时间内 </view> <view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前不在活动时间内</view>
<view class="row"> <view class="row">
<!-- <view class="col-6">--> <!-- <view class="col-6">-->
<!-- <MzButton title="取消" @click="() => {}"></MzButton>--> <!-- <MzButton title="取消" @click="() => {}"></MzButton>-->
<!-- </view>--> <!-- </view>-->
<view class="col-12"> <view class="col-12">
<MzButton title="确认" @click="navTo('/pages/Index/index')" button-color="#4DC3B8" font-color="#fff"></MzButton> <MzButton title="确认" @click="navTo('/pages/Index/index')" button-color="#4DC3B8"
font-color="#fff"></MzButton>
</view> </view>
</view> </view>
</view> </view>
</uv-popup> </uv-popup>
<uv-popup z-index="10000" ref="notLoginPop" mode="center" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;"> <uv-popup :close-on-click-overlay="false" z-index="10000" ref="notLoginPop" mode="center" round="20rpx"
safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
<view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;"> <view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;">
<view class="value col" style="position: relative;text-align: center;"> <view class="value col" style="position: relative;text-align: center;">
<!-- <u-text text="协议内容" size="38" color="#191919"></u-text>--> <!-- <u-text text="协议内容" size="38" color="#191919"></u-text>-->
<view class="" style="position: relative;display:inline-block;"> <view class="" style="position: relative;display:inline-block;">
<view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view> <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view>
<view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view> <view class="background"
style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
</view> </view>
</view> </view>
</view> </view>
<view style="padding:30rpx 30rpx 0;max-height:700rpx;overflow: auto;"> <view style="padding:30rpx 30rpx 0;max-height:700rpx;overflow: auto;">
<view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前未登录，是否前往登录 </view> <view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前未登录，是否前往登录
</view>
<view class="row"> <view class="row">
<view class="col-6" style="padding:0 15rpx;"> <view class="col-6" style="padding:0 15rpx;">
<MzButton title="取消" @click="navTo('/pages/Index/index')"></MzButton> <MzButton title="取消" @click="navTo('/pages/Index/index')"></MzButton>
@ -140,220 +154,230 @@
</template> </template>
<script> <script>
import { import {
imghost imghost
} from '@/config/host.js' } from '@/config/host.js'
import HeaderNav from '@/components/HeaderNav/Index.vue'; import HeaderNav from '@/components/HeaderNav/Index.vue';
import FooterNav from '@/components/FooterNav/Index.vue'; import FooterNav from '@/components/FooterNav/Index.vue';
import RightNav from '@/components/RightNav/Index.vue'; import RightNav from '@/components/RightNav/Index.vue';
import MzButton from '@/components/MzButton/Index.vue'; import MzButton from '@/components/MzButton/Index.vue';
import Draw from '@/pages/Draw/index.vue'; import Draw from '@/pages/Draw/index.vue';
import {userCoupons, userDetail, userExtends} from "../../api/user"; import {userCoupons, userDetail, userExtends} from "../../api/user";
import {getConfig} from "@/api/other"; import {getConfig} from "@/api/other";
import {couponsList, obtainCoupons} from "@/api/coupons"; import {couponsList, obtainCoupons} from "@/api/coupons";
import {drawList} from "@/api/draw"; import {drawList} from "@/api/draw";
import {error} from "@/uni_modules/uv-ui-tools/libs/function"; import {error} from "@/uni_modules/uv-ui-tools/libs/function";
import api from "@/utils/functions"; import api from "@/utils/functions";
import {UserCache} from "@/config/config"; import {UserCache} from "@/config/config";
export default {
components: {
HeaderNav,
FooterNav,
RightNav,
MzButton,
Draw
},
data() {
return {
showModal:false,
title: 'Hello',
loading: true,
staticImage: {
screenActiveImg: imghost + '/order-screen-active.png',
orderCardBackground: imghost + '/order-card-background.png',
wallpaperBgImage: imghost + '/background.png',
couponsBackground: imghost + '/coupons-bg.png',
couponsGrayBackground: imghost + '/coupons-gray-bg.png',
couponsGQ: imghost + '/coupons-gq.png',
couponsUse: imghost + '/coupons-use.png',
},
indexBanner: [{
image: imghost + '/banner.png',
url: '',
}],
user: {
avatar: imghost + '/banner.png',
nickname: '清晨的风',
coupons: 221,
id: 88685
},
isTop: false,
petImage: imghost + '/pet_avatar1.jpeg', export default {
couponsList: [ ], components: {
type:'lists', HeaderNav,
couponType:2, FooterNav,
types:[ RightNav,
{title:'省点银子', value: 2}, MzButton,
], Draw
page:1, },
status:'loadmore', data() {
navToUrl:'', return {
couponsContent:'', showModal: false,
is_open_draw:false, title: 'Hello',
} loading: true,
}, staticImage: {
onLoad(option) { screenActiveImg: imghost + '/order-screen-active.png',
this.type = option.type||'lists' orderCardBackground: imghost + '/order-card-background.png',
this.navToUrl = option.url || '' wallpaperBgImage: imghost + '/background.png',
this.couponType = parseInt(option.coupon_type) || 2 couponsBackground: imghost + '/coupons-bg.png',
}, couponsGrayBackground: imghost + '/coupons-gray-bg.png',
onShareAppMessage() { couponsGQ: imghost + '/coupons-gq.png',
// if(!this.is_open_draw){ couponsUse: imghost + '/coupons-use.png',
// return false; },
// } indexBanner: [{
return { image: imghost + '/banner.png',
title:'优惠在这', url: '',
path:'/pages/Coupons/index?coupon_type='+this.couponType+'&type='+this.type, }],
} user: {
}, avatar: imghost + '/banner.png',
onShareTimeline() { nickname: '清晨的风',
// if(!this.is_open_draw){ coupons: 221,
// return false; id: 88685
// } },
return { isTop: false,
title:'优惠在这',
path:'/pages/Index/index?coupon_type='+this.couponType+'&type='+this.type, petImage: imghost + '/pet_avatar1.jpeg',
} couponsList: [],
}, type: 'lists',
methods: { couponType: 2,
getDrawList(){ types: [
drawList().then(data => { {title: '省点银子', value: 2},
if(data.code === 200){ ],
if(data.data.goodslists.length > 0){ page: 1,
status: 'loadmore',
navToUrl: '',
couponsContent: '',
is_open_draw: false,
}
},
onLoad(option) {
this.type = option.type || 'lists'
this.navToUrl = option.url || ''
this.couponType = parseInt(option.coupon_type) || 2
},
onShareAppMessage() {
// if(!this.is_open_draw){
// return false;
// }
return {
title: '优惠在这',
path: '/pages/Coupons/index?coupon_type=' + this.couponType + '&type=' + this.type,
}
},
onShareTimeline() {
// if(!this.is_open_draw){
// return false;
// }
return {
title: '优惠在这',
path: '/pages/Index/index?coupon_type=' + this.couponType + '&type=' + this.type,
}
},
methods: {
//分享进来 没有开启
//正常点击进来切换 开启 没有开启
getDrawList() {
drawList().then(data => {
if (data.code === 200) {
if (data.data.goodslists.length > 0) {
this.types = [ this.types = [
{title:'省点银子', value: 2}, {title: '省点银子', value: 2},
{title:'宝藏挖掘机', value: 1}, {title: '宝藏挖掘机', value: 1},
]; ];
}else { } else {
if(this.type === 'draw'){ if (this.type === 'draw') {
this.$refs.notOpenPop.open(); this.$refs.notOpenPop.open();
}
} }
} }
}).catch(err => {
this.$refs.notLoginPop.open();
});
},
showCoupons(item){
console.log(item)
console.log(item.use_info)
this.couponsContent = item.use_info;
this.$refs.agreement.open();
},
clickCoupons(item){
if(item.number !== -1){
obtainCoupons({
coupons_id:item.id,
number:1
}).then(res => {
api.success('领取成功')
userExtends().then(res => {
this.$store.commit('userExtends', UserCache.extSetAndReturn(res.data));
})
}).catch(err => {
api.error(err.msg)
})
} }
}, }).catch(err => {
navTo(url){ if (this.type === 'draw') {
uni.navigateTo({ if (err.msg === '暂未开放，敬请期待！') {
url:url this.$refs.notOpenPop.open();
}) } else {
}, this.$refs.notLoginPop.open();
getCouponsList(page = 1){ }
if (this.status === 'nomore'){ }
return; });
}else{ },
this.status = 'loading'; showCoupons(item) {
} console.log(item)
couponsList({ console.log(item.use_info)
page:page, this.couponsContent = item.use_info;
limit:10, this.$refs.agreement.open();
is_buy:this.couponType },
}).then((res) => { clickCoupons(item) {
let couponsList = res.data.map((row) => { if (item.number !== -1) {
let type_name; obtainCoupons({
switch (row.type){ coupons_id: item.id,
case 1: number: 1
type_name = '满减券'; }).then(res => {
break; api.success('领取成功')
case 2: userExtends().then(res => {
type_name = '折扣券'; this.$store.commit('userExtends', UserCache.extSetAndReturn(res.data));
break; })
case 3:
type_name = '抵扣券';
break;
}
return {
id:row.id,
price:parseFloat(row.deduction),
title:row.title,
type_name: type_name,
number: row.number,
cause:'满'+parseFloat(row.min_price)+'使用',
status: row.status,
use_info: row.use_info,
}
});
this.status = couponsList.length < 10 ? 'nomore' : 'loadmore';
if (page === 1) {
this.couponsList = couponsList;
return;
}
this.couponsList.push(...couponsList);
}).catch(err => { }).catch(err => {
this.$refs.notLoginPop.open(); api.error(err.msg)
})
}
},
navTo(url) {
uni.navigateTo({
url: url
})
},
getCouponsList(page = 1) {
if (this.status === 'nomore') {
return;
} else {
this.status = 'loading';
}
couponsList({
page: page,
limit: 10,
is_buy: this.couponType
}).then((res) => {
let couponsList = res.data.map((row) => {
let type_name;
switch (row.type) {
case 1:
type_name = '满减券';
break;
case 2:
type_name = '折扣券';
break;
case 3:
type_name = '抵扣券';
break;
}
return {
id: row.id,
price: parseFloat(row.deduction),
title: row.title,
type_name: type_name,
number: row.number,
cause: '满' + parseFloat(row.min_price) + '使用',
status: row.status,
use_info: row.use_info,
}
}); });
}, this.status = couponsList.length < 10 ? 'nomore' : 'loadmore';
couponTypeToggle(item){
this.couponType = item.value; if (page === 1) {
this.page = 1; this.couponsList = couponsList;
this.status = 'loadmore';
if(item.value === 1){
this.type = 'draw';
this.is_open_draw = true;
return; return;
}else{
this.type = 'lists';
this.is_open_draw = false;
} }
this.getCouponsList(); this.couponsList.push(...couponsList);
} }).catch(err => {
}, this.$refs.notLoginPop.open();
onPageScroll(res) { });
if (res.scrollTop <= 20) { },
uni.$emit('isTop', true); couponTypeToggle(item) {
} else { this.couponType = item.value;
uni.$emit('isTop', false); this.page = 1;
} this.status = 'loadmore';
}, if (item.value === 1) {
onReachBottom() { this.type = 'draw';
this.getCouponsList(++this.page); this.is_open_draw = true;
}, return;
created() { } else {
// this.pagePadding = (api.navHeight().navPaddingTop + this.type = 'lists';
// api.navHeight().navHeight + (api.navHeight().headerPadding * 2)) this.is_open_draw = false;
}, }
onShow() {
this.getCouponsList(); this.getCouponsList();
this.getDrawList();
} }
},
onPageScroll(res) {
if (res.scrollTop <= 20) {
uni.$emit('isTop', true);
} else {
uni.$emit('isTop', false);
}
},
onReachBottom() {
this.getCouponsList(++this.page);
},
created() {
// this.pagePadding = (api.navHeight().navPaddingTop +
// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
},
onShow() {
this.getCouponsList();
this.getDrawList();
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
@import './components/index.scss'; @import './components/index.scss';
</style> </style>

4
pages/OrderDetail/index.vue
Unescape View File

@ -328,6 +328,7 @@
import functions from "@/utils/functions.js"; import functions from "@/utils/functions.js";
import {orderDetail, orderServiceInfo} from "@/api/order"; import {orderDetail, orderServiceInfo} from "@/api/order";
import FomItem from "./components/fomItem.vue"; import FomItem from "./components/fomItem.vue";
import orderDetailShare from "@/static/image/order-detail-share.jpg"
export default { export default {
components: { components: {
FomItem, FomItem,
@ -360,7 +361,8 @@
petVideoTitle:imghost +'/pet-detail-video-title.png', petVideoTitle:imghost +'/pet-detail-video-title.png',
petPhotoTitle:imghost +'/pet-detail-photo-title.png', petPhotoTitle:imghost +'/pet-detail-photo-title.png',
orderDetailBackground:imghost+'/order-detail-background.png', orderDetailBackground:imghost+'/order-detail-background.png',
orderDetailShare:imghost+'/order-detail-share.png', // orderDetailShare:imghost+'/order-detail-share.png',
orderDetailShare:orderDetailShare,
}, },
indexBanner: [{ indexBanner: [{
image: imghost + '/banner.png', image: imghost + '/banner.png',

BIN
static/image/order-detail-share.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 139 KiB

Write Preview
Loading…
Cancel
Save