Commit 5975ea36 authored by 小耗子's avatar 小耗子

修改返回

parent c5e9154b
......@@ -5,12 +5,21 @@
},
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path" : "pages/h5/pay",
"name":"pay",
"style" :
{
"navigationBarTitleText": "支付",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "步数",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor":"#ffffff",
"navigationStyle": "custom"
"navigationBarBackgroundColor":"#ffffff"
},
"meta": {
"auth": true,
......@@ -29,15 +38,6 @@
"enablePullDownRefresh": false
}
},{
"path" : "pages/h5/pay",
"name":"pay",
"style" :
{
"navigationBarTitleText": "支付",
"enablePullDownRefresh": false
}
},{
"path" : "pages/index/cart",
"name" :"cart",
"style" :
......
<template>
<view>
<view style="position: fixed;width:100%;margin-top:50rpx;position: relative;">
<view style="position: absolute;width: 40px;text-align: center" @click="goback"> 返回 </view>
<view style="width: 100%;text-align:center">自定义头部</view>
</view>
<view class="pay-container" v-if="!isPay">
<view class="money-box"><text class="money">{{actuallyPay}}</text></view>
<u-button @click="pay" shape="circle" type="primary" text="确认支付" color="#61b077"></u-button>
......@@ -16,7 +22,7 @@
<u-button type="primary" color="#61b077" text="查看订单" @click="goPath('shopMallList')"></u-button>
</view>
<view class="rt">
<u-button type="primary" color="#61b077" :plain="true" text="继续购买" @click="goPath('')"></u-button>
<u-button type="primary" color="#61b077" :plain="true" text="回到商城" @click="goPath('')"></u-button>
</view>
</view>
</view>
......@@ -24,6 +30,7 @@
</template>
<script>
import http from '@/shopro/request/index';
import Coupons from '@/components/sh-empty/sh-empty'
export default {
data() {
return {
......@@ -77,7 +84,17 @@
}
})
}
},
goback: function() {
// var pages = getCurrentPages();
// console.log(666,pages);
// wx.navigateBack({
// delta: pages.length-2
// })
uni.navigateTo({
url: '/pages/h5/index'
})
}
},
onLoad(option){
let {data,orderId,actuallyPay} = option;
......@@ -91,12 +108,12 @@
<style lang="scss" scoped>
.pay-container{
.money-box{
font-size: 28rpx;
font-size: 34rpx;
font-weight: bold;
margin: 100rpx 0 ;
text-align: center;
.money{
font-size: 48rpx;
font-size: 60rpx;
}
}
::v-deep .u-button{
......
......@@ -8,7 +8,6 @@
<text class="title">今日步数</text>
<view class="steps" v-if="unregistered">
<text class="num">{{todayNum?todayNum:'--'}}</text>
<text></text>
</view>
<view v-else class="steps-empower">
<u-button open-type="getPhoneNumber" @getphonenumber="getInfoPhoneNumber" type="primary"
......
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