Skip to content

X
xinrenli-app
Commit 8c2cb0e5 by zhangmengjie
Options

23.3.7

parent ebb2e627
Showing with 97 additions and 53 deletions
components/tabbar/tabbar.vue
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
url: path.url url: path.url
}); });
} }
this.$emit('tabBarChange', path.url, path.type); // this.$emit('tabBarChange', path.url, path.type);
} }
} }
}; };
......
demand/payment/index.vue
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content-discounts"> <view class="content-discounts" @click="jump(1)">
<view class=""> <view class="">
选择优惠券 选择优惠券
</view> </view>
<view class=""> <view class="">
-99 {{times}}元
<image src="@/static/icon/jt.png" mode=""></image> <image src="@/static/icon/jt.png" mode=""></image>
</view> </view>
</view> </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<view class=""> <view class="">
截止1小时内支付完成 <text>00:59:42</text> 截止1小时内支付完成 <text>00:59:42</text>
</view> </view>
<button @click="jump">立即支付 300.00元</button> <button @click="jump(2)">立即支付 300.00元</button>
</view> </view>
</view> </view>
</template> </template>
...@@ -53,18 +53,25 @@ ...@@ -53,18 +53,25 @@
return { return {
imgBgUrl: apiBaseConfig.imgBgUrl, imgBgUrl: apiBaseConfig.imgBgUrl,
globalData: getApp().globalData, globalData: getApp().globalData,
scrollTopHeader: 0 scrollTopHeader: 0,
times:'0'
}; };
}, },
onLoad() {}, onLoad() {},
methods: { methods: {
jump() { jump(val) {
if(val == 1){
this.$uniGo.navigateTo({
url: `/my/coupon/index?type=pay`
});
}else{
this.$uniGo.navigateTo({ this.$uniGo.navigateTo({
url: `/demand/confirm/index` url: `/demand/confirm/index`
}); });
} }
} }
} }
}
</script> </script>
<style> <style>
page { page {
......
my/coupon/index.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<text></text> <text></text>
<view>可用优惠券(2)</view> <view>可用优惠券(2)</view>
</view> </view>
<view class="index-content-item-qu"> <view class="index-content-item-qu" @click="optionData.type === 'pay'?jump():null">
<image class="index-content-item-qu-bg" src="@/static/icon/xy01.png" mode=""></image> <image class="index-content-item-qu-bg" src="@/static/icon/xy01.png" mode=""></image>
<view class="index-content-item-qu-bl"> <view class="index-content-item-qu-bl">
<text class="index-content-item-qu-bl-tl">满减优惠券</text> <text class="index-content-item-qu-bl-tl">满减优惠券</text>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</view> </view>
<view class="index-content-item-qu-bl-lk-b">有效期：2022.3.1-2022.12.31</view> <view class="index-content-item-qu-bl-lk-b">有效期：2022.3.1-2022.12.31</view>
</view> </view>
<template v-if="optionData.type === 'coupon'"> <template v-if="optionData.type === 'pay'">
<view class="index-content-item-qu-bl-rk"> <view class="index-content-item-qu-bl-rk">
<view class="index-content-item-qu-bl-rk-a">订单金额满</view> <view class="index-content-item-qu-bl-rk-a">订单金额满</view>
<view class="index-content-item-qu-bl-rk-b">9999元</view> <view class="index-content-item-qu-bl-rk-b">9999元</view>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<view class="index-content-item-qu-bl-rk-d">当前可使用</view> <view class="index-content-item-qu-bl-rk-d">当前可使用</view>
</view> </view>
</template> </template>
<template v-if="optionData.type === 'pay'"> <template v-if="optionData.type === 'coupon'">
<view class="index-content-item-qu-bl-rk"> <view class="index-content-item-qu-bl-rk">
<view class="index-content-item-qu-bl-rk-a index-content-item-qu-bl-rk-axl">订单金额满</view> <view class="index-content-item-qu-bl-rk-a index-content-item-qu-bl-rk-axl">订单金额满</view>
<view class="index-content-item-qu-bl-rk-b index-content-item-qu-bl-rk-bxl">9999元</view> <view class="index-content-item-qu-bl-rk-b index-content-item-qu-bl-rk-bxl">9999元</view>
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
<text>200</text> <text>200</text>
优惠券 优惠券
</view> </view>
<view class="index-content-item-qu-bl-lk-b index-content-item-qu-bl-lk-bx">有效期：2022.3.1-2022.12.31</view> <view class="index-content-item-qu-bl-lk-b index-content-item-qu-bl-lk-bx">
有效期：2022.3.1-2022.12.31</view>
</view> </view>
<view class="index-content-item-qu-bl-rk"> <view class="index-content-item-qu-bl-rk">
<view class="index-content-item-qu-bl-rk-a index-content-item-qu-bl-rk-ax">订单金额满</view> <view class="index-content-item-qu-bl-rk-a index-content-item-qu-bl-rk-ax">订单金额满</view>
...@@ -69,8 +70,8 @@ ...@@ -69,8 +70,8 @@
</template> </template>
<script> <script>
import apiBaseConfig from '@/config/index.js'; import apiBaseConfig from '@/config/index.js';
export default { export default {
data() { data() {
return { return {
imgBgUrl: apiBaseConfig.imgBgUrl, imgBgUrl: apiBaseConfig.imgBgUrl,
...@@ -83,6 +84,7 @@ export default { ...@@ -83,6 +84,7 @@ export default {
onLoad(option) { onLoad(option) {
let self = this; let self = this;
self.optionData = option; self.optionData = option;
console.log(option)
self.initial(); self.initial();
}, },
methods: { methods: {
...@@ -96,26 +98,46 @@ export default { ...@@ -96,26 +98,46 @@ export default {
self.title = '确认支付'; self.title = '确认支付';
break; break;
} }
},
jump() {
console.log('22222')
// 获取所有页面栈实例列表
let pages = getCurrentPages();
// 上一页页面实例
let prevPage = pages[pages.length - 2];
// 修改上一页data里面的times参数值为100
prevPage.$vm.times = 100;
//uni.navigateTo跳转的返回，默认1为返回上一级
uni.navigateBack({
delta: 1
});
console.log('1111111')
} }
} }
}; };
</script> </script>
<style> <style>
page { page {
background-color: #f7f8f9; background-color: #f7f8f9;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.index { .index {
&-content { &-content {
margin: 24rpx 20rpx; margin: 24rpx 20rpx;
width: calc(100% - 20rpx * 2); width: calc(100% - 20rpx * 2);
&-item { &-item {
margin-bottom: 30rpx; margin-bottom: 30rpx;
&-nav { &-nav {
margin-bottom: 20rpx; margin-bottom: 20rpx;
> text {
>text {
display: inline-block; display: inline-block;
width: 6rpx; width: 6rpx;
height: 36rpx; height: 36rpx;
...@@ -123,24 +145,29 @@ page { ...@@ -123,24 +145,29 @@ page {
border-radius: 3rpx; border-radius: 3rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
> view {
>view {
font-size: 28rpx; font-size: 28rpx;
font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
> text {
>text {
color: #2c66ff; color: #2c66ff;
} }
} }
} }
&-nav:last-child { &-nav:last-child {
margin-bottom: 0rpx; margin-bottom: 0rpx;
} }
&-navx { &-navx {
> text { >text {
background: #666666; background: #666666;
} }
} }
&-qu { &-qu {
width: 710rpx; width: 710rpx;
height: 200rpx; height: 200rpx;
...@@ -150,22 +177,27 @@ page { ...@@ -150,22 +177,27 @@ page {
overflow: hidden; overflow: hidden;
margin-bottom: 20rpx; margin-bottom: 20rpx;
position: relative; position: relative;
&-bg, &-bg,
&-bl { &-bl {
width: 710rpx; width: 710rpx;
height: 200rpx; height: 200rpx;
} }
&-bg { &-bg {
position: absolute; position: absolute;
left: 0rpx; left: 0rpx;
top: 0rpx; top: 0rpx;
} }
&-bl { &-bl {
position: relative; position: relative;
> text,
> view { >text,
>view {
position: absolute; position: absolute;
} }
&-tl { &-tl {
font-size: 20rpx; font-size: 20rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
...@@ -174,24 +206,29 @@ page { ...@@ -174,24 +206,29 @@ page {
top: 4rpx; top: 4rpx;
left: 62rpx; left: 62rpx;
} }
&-tlx { &-tlx {
color: #666666; color: #666666;
} }
&-lk { &-lk {
bottom: 20rpx; bottom: 20rpx;
left: 20rpx; left: 20rpx;
&-t { &-t {
font-size: 30rpx; font-size: 30rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
> text:nth-child(1) {
>text:nth-child(1) {
font-size: 40rpx; font-size: 40rpx;
font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
font-weight: 500; font-weight: 500;
color: #2c66ff; color: #2c66ff;
} }
> text:nth-child(2) {
>text:nth-child(2) {
font-size: 72rpx; font-size: 72rpx;
font-family: AlibabaPuHuiTi-Bold, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Bold, AlibabaPuHuiTi;
font-weight: bold; font-weight: bold;
...@@ -199,33 +236,41 @@ page { ...@@ -199,33 +236,41 @@ page {
margin-right: 20rpx; margin-right: 20rpx;
} }
} }
&-tx { &-tx {
color: #999999; color: #999999;
> text:nth-child(1) {
>text:nth-child(1) {
color: #999999; color: #999999;
} }
> text:nth-child(2) {
>text:nth-child(2) {
color: #999999; color: #999999;
} }
} }
&-b { &-b {
font-size: 20rpx; font-size: 20rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }
&-bx { &-bx {
color: #999999; color: #999999;
} }
} }
&-rk { &-rk {
width: 170rpx; width: 170rpx;
height: 200rpx; height: 200rpx;
right: 0rpx; right: 0rpx;
top: 0rpx; top: 0rpx;
> view {
>view {
text-align: center; text-align: center;
} }
&-a { &-a {
font-size: 20rpx; font-size: 20rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
...@@ -233,13 +278,16 @@ page { ...@@ -233,13 +278,16 @@ page {
color: #ffffff; color: #ffffff;
margin-top: 26rpx; margin-top: 26rpx;
} }
&-ax { &-ax {
color: #999999; color: #999999;
margin-top: 21rpx; margin-top: 21rpx;
} }
&-axl { &-axl {
margin-top: 21rpx; margin-top: 21rpx;
} }
&-b { &-b {
font-size: 30rpx; font-size: 30rpx;
font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi; font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
...@@ -247,13 +295,16 @@ page { ...@@ -247,13 +295,16 @@ page {
color: #ffffff; color: #ffffff;
margin-top: 10rpx; margin-top: 10rpx;
} }
&-bx { &-bx {
color: #666666; color: #666666;
margin-top: 5rpx; margin-top: 5rpx;
} }
&-bxl { &-bxl {
margin-top: 5rpx; margin-top: 5rpx;
} }
&-c, &-c,
&-d { &-d {
font-size: 20rpx; font-size: 20rpx;
...@@ -262,17 +313,21 @@ page { ...@@ -262,17 +313,21 @@ page {
color: #ffffff; color: #ffffff;
margin-top: 10rpx; margin-top: 10rpx;
} }
&-cx { &-cx {
color: #999999; color: #999999;
margin-top: 5rpx; margin-top: 5rpx;
} }
&-cxl { &-cxl {
margin-top: 5rpx; margin-top: 5rpx;
} }
&-d { &-d {
font-weight: 500; font-weight: 500;
margin-top: 21rpx; margin-top: 21rpx;
} }
&-dx { &-dx {
width: 120rpx; width: 120rpx;
border: 1rpx solid #999999; border: 1rpx solid #999999;
...@@ -283,6 +338,7 @@ page { ...@@ -283,6 +338,7 @@ page {
color: #999999; color: #999999;
margin-top: 17rpx; margin-top: 17rpx;
} }
&-dxl { &-dxl {
width: 120rpx; width: 120rpx;
height: 44rpx; height: 44rpx;
...@@ -299,5 +355,5 @@ page { ...@@ -299,5 +355,5 @@ page {
} }
} }
} }
} }
</style> </style>
pages/demand/index.vue
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
<view v-show="subscript == index" class="content-tabs-text-area"></view> <view v-show="subscript == index" class="content-tabs-text-area"></view>
</view> </view>
</view> </view>
<template v-if="arr && arr.length"> <!-- <template v-if="arr && arr.length"> -->
<comindex class="content-mindex" :subscript='subscript'></comindex> <comindex class="content-mindex" :subscript='subscript'></comindex>
</template> <!-- </template> -->
<view v-else class="diagram"> <!-- <view v-else class="diagram">
<image src="@/static/icon/qst.png" mode=""></image> <image src="@/static/icon/qst.png" mode=""></image>
<view class=""> <view class="">
暂无数据 暂无数据
</view> </view>
</view> </view> -->
<com-tabbar @tabBarChange='tabBarChange' :list=" [{ <com-tabbar :list=" [{
name: '首页', name: '首页',
icon: '/static/tabbar/tb1.png', icon: '/static/tabbar/tb1.png',
selectIcon:'/static/tabbar/td1.png', selectIcon:'/static/tabbar/td1.png',
...@@ -84,13 +84,6 @@ ...@@ -84,13 +84,6 @@
} }
}, },
methods: { methods: {
tabBarChange(url, type) {
if (type == 'type') {
uniGo.reLaunch({
url: url
});
}
},
jump(ind) { jump(ind) {
this.subscript = ind this.subscript = ind
} }
......
pages/home/index.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</view> </view>
<com-navbar :leftIcon="false" :homeShow="false" bgColor="transparent" title="首页" <com-navbar :leftIcon="false" :homeShow="false" bgColor="transparent" title="首页"
:titleStyle="{ color: '#FFFFFF', fontSize: '32rpx',scrollTopHeader: scrollTopHeader }" /> :titleStyle="{ color: '#FFFFFF', fontSize: '32rpx',scrollTopHeader: scrollTopHeader }" />
<com-tabbar @tabBarChange='tabBarChange' :list="tabBarList"></com-tabbar> <com-tabbar :list="tabBarList"></com-tabbar>
</view> </view>
</template> </template>
...@@ -100,13 +100,6 @@ ...@@ -100,13 +100,6 @@
url: `/home/index/index` url: `/home/index/index`
}); });
}, },
tabBarChange(url, type) {
if (type == 'type') {
this.$uniGo.reLaunch({
url: url
});
}
}
} }
} }
</script> </script>
...@@ -119,7 +112,6 @@ ...@@ -119,7 +112,6 @@
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// align-items: center;
justify-content: center; justify-content: center;
&-swiper { &-swiper {
...@@ -149,7 +141,6 @@ ...@@ -149,7 +141,6 @@
>view:nth-child(2) { >view:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
...@@ -173,7 +164,6 @@ ...@@ -173,7 +164,6 @@
>view:nth-child(1) { >view:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
font-weight: 700; font-weight: 700;
color: #333333; color: #333333;
margin-top: 8rpx; margin-top: 8rpx;
...@@ -182,7 +172,6 @@ ...@@ -182,7 +172,6 @@
>view:nth-child(2) { >view:nth-child(2) {
margin-top: 6rpx; margin-top: 6rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
font-weight: 400; font-weight: 400;
color: #444444; color: #444444;
} }
...@@ -190,7 +179,6 @@ ...@@ -190,7 +179,6 @@
>view:nth-child(3) { >view:nth-child(3) {
margin-top: 9rpx; margin-top: 9rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
font-weight: 400; font-weight: 400;
color: #5281FF; color: #5281FF;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment