Skip to content

7
7-Eleven
Commit b905e357 by 赵雅纹
Options

Merge branch 'dev_7.1.0' into feature-zyw-sc 

# Conflicts:
#	src/app.json
#	src/project.config.json
parents 8c5a3696 ec3c3409
Showing with 238 additions and 3 deletions
src/app.json
......@@ -45,7 +45,8 @@
"pages/myReleaseDetail/myReleaseDetail",
"pages/grassCommunity/grassCommunity",
"pages/myInvite/myInvite",
"pages/share/share"
"pages/share/share",
"pages/paymentStatus/paymentStatus"
]
}
],
......
src/component/relatedOrderItem/relatedOrderItem.wxml
......@@ -33,6 +33,7 @@
<view class="grass-item-desc border_box">
<view class="item-name">商品名称称商品名称称称商品名称商品名称</view>
<view class="item-notice">预计赚5元红包</view>
</view>
<view class="select-radio">
<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
......
src/component/relatedOrderItem/relatedOrderItem.wxss
......@@ -156,4 +156,14 @@
.theme-color{
border: none;
}
.item-notice {
width: 143rpx;
height: 40rpx;
line-height: 40rpx;
text-align: center;
border-radius: 5rpx;
background-color: rgba(203, 60, 60, 1);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
font-family: PingFangSC-Regular;
}
src/project.config.json
......@@ -262,6 +262,14 @@
"id": -1,
"name": "分享",
"pathName": "subPackage/page/pages/share/share",
"query": "",
"scene": null
},
{
"id": 33,
"name": "支付状态",
"pathName": "subPackage/page/pages/paymentStatus/paymentStatus",
"query": "",
"scene": null
}
]
......
src/subPackage/page/pages/grassCommunity/grassCommunity.js
......@@ -10,7 +10,7 @@ wxService.page({
*/
data: {
pics:[],
showSelectRelatedGoods: true
showSelectRelatedGoods: false
},
/**
......
src/subPackage/page/pages/paymentStatus/paymentStatus.js 0 → 100644
// subPackage/page/pages/paymentStatus/paymentStatus.js
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
wxService.page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/subPackage/page/pages/paymentStatus/paymentStatus.json 0 → 100644
{
"navigationBarTitleText": "支付成功",
"usingComponents": {}
}
\ No newline at end of file
src/subPackage/page/pages/paymentStatus/paymentStatus.wxml 0 → 100644
<!--subPackage/page/pages/paymentStatus/paymentStatus.wxml-->
<view class="payment">
<view class="payment-status">
<image class="status-img" src="./../../../../assets/imgs/7_1_0/notice.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
<view class="status-success">支付成功</view>
<view class="status-price">￥ 306.90</view>
<view class="status-time">交易时间： 2019-03-24 至 2019-06-23</view>
<view class="status-btn weui-flex">
<view class="btn-detail">查看详情</view>
<view class="btn-go-on">继续逛逛</view>
</view>
</view>
<view class="status-look df">
<view class="look-store">关注店铺公众号（自定义页面）</view>
<view class="look-btn">关注</view>
</view>
<view class="status-vip df">
<view class="vip-tips">
<view class="tips-desc">
<image class="tips-img" src="./../../../../assets/imgs/7_1_0/notice.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
现在勾选成为vip，立领200元礼包，文案文案 </view>
<view class="tips-notice">vip 可尊享n大权益</view>
</view>
<view class="vip-go-to">去开卡</view>
</view>
</view>
\ No newline at end of file
src/subPackage/page/pages/paymentStatus/paymentStatus.wxss 0 → 100644
/* subPackage/page/pages/paymentStatus/paymentStatus.wxss */
@import './../../../../base/base.wxss';
.payment-status {
text-align: center;
height: 669rpx;
}
.status-img {
margin: 73rpx 0 21rpx 0;
width: 100rpx;
height: 100rpx;
}
.status-success {
height: 50rpx;
color: rgba(192, 154, 116, 1);
font-size: 36rpx;
font-family: PingFangSC-Medium;
}
.status-price {
height: 112rpx;
color: rgba(51, 51, 51, 1);
font-size: 40rpx;
margin: 43rpx 0 59rpx 0;
}
.status-btn {
justify-content: center;
margin: 40rpx 0 101rpx 0;
}
.status-time {
height: 28rpx;
color: rgba(170, 170, 170, 1);
font-size: 20rpx;
font-family: PingFangSC-Regular;
}
.btn-detail {
margin-right: 33rpx;
}
.btn-detail,
.btn-go-on {
width: 213rpx;
height: 70rpx;
line-height: 70rpx;
border-radius: 35rpx;
border: 1px solid rgba(128, 128, 128, 1);
color: rgba(120, 120, 120, 1);
font-size: 32rpx;
}
.status-look {
margin: 0 auto;
width: 710rpx;
height: 122rpx;
border-radius: 5rpx;
background-color: rgba(204, 204, 204, 1);
}
.look-store {
width: 392rpx;
height: 40rpx;
color: rgba(102, 102, 96, 1);
font-size: 28rpx;
}
.look-btn {
width: 100rpx;
height: 50rpx;
border-radius: 35rpx;
background-color: rgba(255, 255, 255, 1);
color: rgba(120, 120, 120, 1);
font-size: 24rpx;
text-align: center;
margin-left: 130rpx;
line-height: 50rpx;
}
.status-vip {
margin: 0 auto;
margin-top: 20rpx;
width: 710rpx;
height: 103rpx;
border-radius: 5rpx;
background-color: rgba(192, 154, 116, 0.2);
}
.tips-img {
width: 23rpx;
height: 11rpx;
}
.tips-desc {
width: 500rpx;
height: 32rpx;
color: rgba(51, 51, 51, 1);
font-size: 23rpx;
margin-bottom: 10rpx;
overflow: hidden;
}
.tips-notice {
width: 193rpx;
height: 28rpx;
color: rgba(192, 154, 116, 1);
font-size: 20rpx;
}
.vip-go-to {
width: 107rpx;
height: 38rpx;
text-align: center;
line-height: 38rpx;
border-radius: 21rpx;
background-color: rgba(192, 154, 116, 1);
box-shadow: 0px 2rpx 7rpx 0px rgba(192, 154, 116, 0.27);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
margin-left: 50rpx;
}
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