@@ -10,9 +10,7 @@ | |||
"pages/market/index", | |||
"pages/user/index", | |||
"pages/coupon/detail/index", | |||
"pages/shop/detail/index", | |||
"pages/rushToBuy/index", | |||
"pages/shop/index/index", | |||
"pages/couponorder/index/index", | |||
"pages/couponorder/detail/index", | |||
"pages/cardorder/index/index", | |||
@@ -38,7 +36,9 @@ | |||
"pages/specialcourtesy/specialcourtesy", | |||
"pages/discountCardList/discountCardList", | |||
"pages/cardListDetail/cardListDetail", | |||
"pages/freeBannerDetail/index" | |||
"pages/freeBannerDetail/index", | |||
"pages/user/scoreHistory/index", | |||
"pages/scanPay/scanPay" | |||
], | |||
"navigateToMiniProgramAppIdList": [ | |||
"wx192b7d2e8dcbefd0", | |||
@@ -110,3 +110,9 @@ page { | |||
height: 100%; | |||
font-weight: 400; | |||
} | |||
.fl{ | |||
float: left; | |||
} | |||
.fr{ | |||
float: right; | |||
} |
@@ -3,7 +3,7 @@ var config = { | |||
// url:"https://c.malls.iformall.com/C/api", | |||
// url:'https://ctest.malls.iformall.com/C/api', | |||
// url:'http://10.100.33.66:7000/C/api', | |||
// url: 'http://10.100.35.203:7000/C/api', | |||
// url: 'http://10.100.30.172:7000/C/api', | |||
api: { | |||
/** | |||
* 接口用途:login | |||
@@ -181,7 +181,15 @@ var config = { | |||
/** | |||
* C端扫B端储值卡支付订单 | |||
*/ | |||
orderCreate:"/carday/order_create" | |||
orderCreate:"/carday/order_create", | |||
/** | |||
* 兑换历史列表 | |||
*/ | |||
scoreHistory:"/scoreHistory/list", | |||
/** | |||
* 获取用户折扣率 | |||
*/ | |||
getDiscount:"/user/getDiscount" | |||
}, | |||
weapp: { | |||
@@ -66,8 +66,6 @@ Page({ | |||
else if (e.currentTarget.dataset.flags == 'single') { | |||
var answserIs = e.detail.value; | |||
} | |||
console.log(answserIs) | |||
console.log(e.currentTarget.dataset.questionid) | |||
Http.post({ | |||
url: config.api.answerQuestion, | |||
data: { | |||
@@ -38,18 +38,41 @@ Page({ | |||
}, | |||
// 扫一扫去支付 | |||
gotoPay:function(e){ | |||
console.log(e.currentTarget.dataset.cardid) | |||
Http.post({ | |||
url: config.api.orderCreate, | |||
data: { | |||
cardId: e.currentTarget.dataset.cardid, | |||
merchantCode: "234567451101102080", | |||
totalFee: "5" | |||
let that = this; | |||
wx.scanCode({ | |||
success: (res) => { | |||
that.merChantId = res.result; | |||
console.log(res); | |||
wx.navigateTo({ | |||
url: `/pages/scanPay/scanPay?`, | |||
}) | |||
}, | |||
fail: (res) => { | |||
console.log(res); | |||
} | |||
}).then(res=>{ | |||
console.log(res) | |||
}) | |||
}, | |||
// gotoPayMoney:function(){ | |||
// let that = this; | |||
// Http.post({ | |||
// url: config.api.orderCreate, | |||
// data: { | |||
// cardId: e.currentTarget.dataset.cardid, | |||
// merchantCode: that.data.merChantId, | |||
// totalFee: "5" | |||
// } | |||
// }) | |||
// .then(res => { | |||
// console.log(res) | |||
// }) | |||
// .catch(err => { | |||
// wx.showModal({ | |||
// title: "抱歉", | |||
// content: err.message, | |||
// showCancel: false | |||
// }) | |||
// }) | |||
// }, | |||
//点击跳转到券详情页面 | |||
gotouse: function (e) { | |||
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') { | |||
@@ -87,7 +110,7 @@ Page({ | |||
} | |||
Http.get({ | |||
url: config.api.cardorderList, | |||
data: data | |||
data:data | |||
}) | |||
.then(res => { | |||
if(res.code == 200){ | |||
@@ -13,7 +13,7 @@ | |||
</navigator> | |||
</view> | |||
<view class='section' wx:for='{{list}}' wx:key='{{index}}' bindtap='gotoPay' data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}"> | |||
<view class='section' wx:for='{{list}}' wx:key='{{index}}'> | |||
<view class='mms'> | |||
<view class='detail_msg'> | |||
<view class='logo'> | |||
@@ -26,8 +26,8 @@ | |||
<view class='subtitle'> | |||
<text>{{item.subTitle}}</text> | |||
</view> | |||
<view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">扫一扫</view> | |||
<!-- <view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> --> | |||
<view hover-class='active' bindtap='gotoPay' data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫</view> | |||
<view hover-class='active' wx:if="{{item.couponOrderStatus!=4}}" class="btns">已失效</view> | |||
</view> | |||
</view> | |||
<image class="liness" src='./../../../assets/img/liness.png' mode="widthFix"></image> | |||
@@ -442,6 +442,6 @@ page { | |||
border-radius:8rpx; | |||
font-style: normal; | |||
font-size: 30rpx; | |||
line-height: 50rpx; | |||
line-height: 40rpx; | |||
padding: 0 6rpx; | |||
} |
@@ -40,7 +40,7 @@ | |||
只有支付完成的时 | |||
才显示兑换码 | |||
--> | |||
<view wx:if="{{order.orderStatus==1}}" data-couponOrderStatus="{{order.couponOrderStatus}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.couponOrderId}}" bindtap="powerDrawer"> | |||
<view wx:if="{{order.orderStatus==1&&order.type!=7}}" data-couponOrderStatus="{{order.couponOrderStatus}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.couponOrderId}}" bindtap="powerDrawer"> | |||
<view style="width:86%;clear: both;"> | |||
<text>兑换码</text> | |||
<text class="fr">{{order.couponOrderId}}</text> | |||
@@ -1,65 +1,66 @@ | |||
// pages/scanPay/scanPay.js | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function (options) { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面初次渲染完成 | |||
*/ | |||
onReady: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面显示 | |||
*/ | |||
onShow: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面隐藏 | |||
*/ | |||
onHide: function () { | |||
}, | |||
/** | |||
* 生命周期函数--监听页面卸载 | |||
*/ | |||
onUnload: function () { | |||
}, | |||
/** | |||
* 页面相关事件处理函数--监听用户下拉动作 | |||
*/ | |||
onPullDownRefresh: function () { | |||
}, | |||
/** | |||
* 页面上拉触底事件的处理函数 | |||
*/ | |||
onReachBottom: function () { | |||
}, | |||
/** | |||
* 用户点击右上角分享 | |||
*/ | |||
onShareAppMessage: function () { | |||
} | |||
}) |
@@ -0,0 +1,3 @@ | |||
{ | |||
"navigationBarTitleText": "付款" | |||
} |
@@ -0,0 +1,12 @@ | |||
<view class='content'> | |||
<view class='head clearfix'> | |||
<text class='fl'>付款给呷脯呷脯</text> | |||
<image class='fr' src='./../../assets/img/logo.png' mode='widthFix'></image> | |||
</view> | |||
<text class='txt1'>金额</text> | |||
<view class='money'> | |||
<text class='icon'>¥</text> | |||
<text class='num'>200</text> | |||
<button>确认付款</button> | |||
</view> | |||
</view> |
@@ -0,0 +1,43 @@ | |||
.content{ | |||
padding:0 57rpx; | |||
} | |||
.head image{ | |||
width: 100rpx; | |||
height: 100rpx; | |||
border-radius:50%; | |||
} | |||
.head{ | |||
margin-top: 80rpx; | |||
} | |||
.head .fl{ | |||
font-size:32rpx; | |||
font-family:PingFang-SC-Bold; | |||
font-weight:bold; | |||
color:rgba(51,51,51,1); | |||
} | |||
.txt1{ | |||
font-size:32rpx; | |||
font-family:PingFang-SC-Regular; | |||
font-weight:400; | |||
color:rgba(134,134,134,1); | |||
} | |||
.money button{ | |||
width:636rpx; | |||
height:95rpx; | |||
margin:80rpx auto 0; | |||
background:rgba(2,192,255,1); | |||
border-radius:48rpx; | |||
color: #fff; | |||
} | |||
.money .icon{ | |||
font-size:38rpx; | |||
font-family:PingFang-SC-Medium; | |||
font-weight:500; | |||
color:rgba(51,51,51,1); | |||
} | |||
.money .num{ | |||
font-size:77rpx; | |||
font-family:PingFang-SC-Bold; | |||
font-weight:bold; | |||
color:rgba(51,51,51,1); | |||
} |
@@ -1,6 +0,0 @@ | |||
{ | |||
"usingComponents": { | |||
}, | |||
"navigationBarTitleText": "店铺详情" | |||
} |
@@ -1,93 +0,0 @@ | |||
<!-- 店铺详情页 --> | |||
<view class="spdetailContainer"> | |||
<!-- 头部 --> | |||
<view class='spheader'> | |||
<view class='spheaderL'><image src='/assets/img/splogo.png' class='splogo'></image></view> | |||
<view class='spheaderM'> | |||
<text class='shopname'>IFROMALL (西单大悦城店)</text> | |||
<text class='shopaddress'>北京市西城区西单北大街131号</text> | |||
</view> | |||
<view class='spheaderR'> | |||
<image src='/assets/img/spcode.png' class='spcode'></image> | |||
</view> | |||
</view> | |||
<!-- 到这里去 --> | |||
<view class='spheaderNext'> | |||
<view class='NextTop'><text>北京市西城区西单北大街131号</text></view> | |||
<view class='NextBottom'> | |||
<view class='NextBottomL'><image src='/assets/img/addresslogo.png' class='addresslogo'></image>12.5km</view> | |||
<view class='NextBottomM'><text>到这里去</text></view> | |||
<view class='NextBottomR'><image src='/assets/img/spphone.png' class='spphone'></image></view> | |||
</view> | |||
</view> | |||
<!-- 门店优惠 --> | |||
<view class='storeDiscount'> | |||
<view class='storeDiscountTitle'><text>门店优惠</text></view> | |||
<view class='storeDiscountCon'> | |||
<view class='storeDiscountConItem'> | |||
<view class='ConItemL'><image src='/assets/img/food.png' class='foodpng'></image></view> | |||
<view class='ConItemR'> | |||
<view class='ConItemRT'> | |||
<text>黑椒牛排</text> | |||
</view> | |||
<view class='ConItemRM'> | |||
<text class='presentPrice'>¥1.00</text> | |||
<text class='originalPrice'>59.00</text> | |||
</view> | |||
<view class='ConItemRB'> | |||
<text class='soldnum'>已售16张</text> | |||
<text class='buy'>购买</text> | |||
</view> | |||
</view> | |||
</view> | |||
<view class='storeDiscountConItem'> | |||
<view class='ConItemL'><image src='/assets/img/food.png' class='foodpng'></image></view> | |||
<view class='ConItemR'> | |||
<view class='ConItemRT'> | |||
<text>黑椒牛排</text> | |||
</view> | |||
<view class='ConItemRM'> | |||
<text class='presentPrice'>¥1.00</text> | |||
<text class='originalPrice'>59.00</text> | |||
</view> | |||
<view class='ConItemRB'> | |||
<text class='soldnum'>已售16张</text> | |||
<text class='buy'>购买</text> | |||
</view> | |||
</view> | |||
</view> | |||
<view class='storeDiscountConItem'> | |||
<view class='ConItemL'><image src='/assets/img/food.png' class='foodpng'></image></view> | |||
<view class='ConItemR'> | |||
<view class='ConItemRT'> | |||
<text>黑椒牛排</text> | |||
</view> | |||
<view class='ConItemRM'> | |||
<text class='presentPrice'>¥1.00</text> | |||
<text class='originalPrice'>59.00</text> | |||
</view> | |||
<view class='ConItemRB'> | |||
<text class='soldnum'>已售16张</text> | |||
<text class='buy'>购买</text> | |||
</view> | |||
</view> | |||
</view> | |||
<view class='storeDiscountConItem'> | |||
<view class='ConItemL'><image src='/assets/img/food.png' class='foodpng'></image></view> | |||
<view class='ConItemR'> | |||
<view class='ConItemRT'> | |||
<text>黑椒牛排</text> | |||
</view> | |||
<view class='ConItemRM'> | |||
<text class='presentPrice'>¥1.00</text> | |||
<text class='originalPrice'>59.00</text> | |||
</view> | |||
<view class='ConItemRB'> | |||
<text class='soldnum'>已售16张</text> | |||
<text class='buy'>购买</text> | |||
</view> | |||
</view> | |||
</view> | |||
</view> | |||
</view> | |||
</view> |
@@ -1,174 +0,0 @@ | |||
.spdetailContainer{ | |||
width: 100%; | |||
height: 100%; | |||
background: #eee; | |||
} | |||
.spheader{ | |||
width: 100%; | |||
height: 186rpx; | |||
background: #fff; | |||
display: flex; | |||
flex-direction: row; | |||
} | |||
.spheaderL{ | |||
flex: 1; | |||
display: flex; | |||
justify-content: center; | |||
align-items: center; | |||
} | |||
.spheaderM{ | |||
flex: 2; | |||
display: flex; | |||
flex-direction: column; | |||
justify-content: left; | |||
align-self: center; | |||
} | |||
.shopname{ | |||
font-size: 31rpx; | |||
color: #000; | |||
} | |||
.shopaddress{ | |||
font-size: 22rpx; | |||
color: #B8B8B8; | |||
margin-top: 20rpx; | |||
} | |||
.spheaderR{ | |||
flex: 1; | |||
display: flex; | |||
justify-content: center; | |||
align-items: center; | |||
} | |||
.splogo{ | |||
width: 150rpx; | |||
height: 150rpx; | |||
} | |||
.spcode{ | |||
width: 100rpx; | |||
height: 100rpx; | |||
} | |||
.spheaderNext{ | |||
width: 100%; | |||
height: 150rpx; | |||
background: #fff; | |||
display: flex; | |||
flex-direction: column; | |||
padding-top: 10rpx; | |||
} | |||
.NextTop{ | |||
margin-left: 30rpx; | |||
font-size: 30rpx; | |||
color: #000; | |||
} | |||
.NextBottom{ | |||
margin-top: 23rpx; | |||
display: flex; | |||
flex-direction: row; | |||
margin-left: 30rpx; | |||
} | |||
.addresslogo{ | |||
width: 20rpx; | |||
height: 20rpx; | |||
} | |||
.spphone{ | |||
width: 44rpx; | |||
height: 44rpx; | |||
} | |||
.NextBottomL{ | |||
flex: 1; | |||
color: #c0c0c0; | |||
font-size: 22rpx; | |||
align-self: center; | |||
} | |||
.NextBottomM{ | |||
flex: 3.5; | |||
justify-content: left; | |||
font-size:22rpx; | |||
color: #00C0FF; | |||
align-self: center; | |||
border-top-width: 2rpx; | |||
border-color: #00C0FF; | |||
} | |||
.NextBottomR{ | |||
flex: .5 | |||
} | |||
.storeDiscount{ | |||
width: 100%; | |||
height: auto; | |||
background: #fff; | |||
margin-top: 30rpx | |||
} | |||
.storeDiscountTitle{ | |||
width: 100%; | |||
height: 87rpx; | |||
line-height: 87rpx; | |||
} | |||
.storeDiscountTitle text{ | |||
margin-left: 30rpx; | |||
font-size:28rpx; | |||
color: #000; | |||
border-bottom: 1px solid #fff; | |||
} | |||
.storeDiscountCon{ | |||
width: 100%; | |||
height: auto; | |||
background: #fff; | |||
flex-direction: column; | |||
} | |||
.storeDiscountConItem{ | |||
width: 100%; | |||
height: 244rpx; | |||
display: flex; | |||
flex-direction: row; | |||
} | |||
.ConItemL{ | |||
flex: 1; | |||
align-self: center; | |||
} | |||
.foodpng{ | |||
width: 248rpx; | |||
height: 184rpx; | |||
margin-left: 30rpx; | |||
} | |||
.ConItemR{ | |||
margin-top: 22rpx; | |||
flex: 4; | |||
padding-left: 20rpx; | |||
} | |||
.ConItemRT{ | |||
color: #000; | |||
font-size: 30rpx; | |||
} | |||
.ConItemRM{ | |||
margin-top: 10rpx; | |||
} | |||
.presentPrice{ | |||
font-size: 36rpx; | |||
color: #FF3434; | |||
margin-right: 20rpx; | |||
} | |||
.originalPrice{ | |||
font-size: 24rpx; | |||
color: #B4B4B4; | |||
text-decoration: line-through; | |||
} | |||
.ConItemRB{ | |||
margin-top: 35rpx; | |||
} | |||
.soldnum{ | |||
color: #585858; | |||
font-size: 22rpx; | |||
} | |||
.buy{ | |||
margin-left: 215rpx; | |||
background: #00C0FF; | |||
color: #fff; | |||
font-size: 28rpx; | |||
width: 114rpx; | |||
height: 50rpx; | |||
line-height: 50rpx; | |||
text-align: center; | |||
border-radius: 10rpx; | |||
display: inline-block; | |||
} | |||
@@ -1,55 +0,0 @@ | |||
Page({ | |||
data: { | |||
tabs: [{ | |||
key: 1, | |||
name: "全部" | |||
}, | |||
{ | |||
key: 2, | |||
name: "待付款" | |||
}, | |||
{ | |||
key: 3, | |||
name: "已完成" | |||
} | |||
], | |||
list: [ | |||
{ | |||
key: '1', | |||
data: [ | |||
{ | |||
name: '111' | |||
} | |||
] | |||
}, | |||
{ | |||
key: '2', | |||
data: [ | |||
{ | |||
name: '222' | |||
} | |||
] | |||
}, | |||
{ | |||
key: '3', | |||
data: [ | |||
{ | |||
name: '333' | |||
} | |||
] | |||
} | |||
], | |||
current: '', | |||
current_scroll: '1' | |||
}, | |||
handleChange({ detail }) { | |||
this.setData({ | |||
current: detail.key | |||
}); | |||
}, | |||
handleChangeScroll({ detail }) { | |||
this.setData({ | |||
current_scroll: detail.key | |||
}); | |||
}, | |||
}) |
@@ -1,8 +0,0 @@ | |||
{ | |||
"usingComponents": { | |||
"i-tab": "../../../dist/tab/index", | |||
"i-tabs": "../../../dist/tabs/index", | |||
"c-coupons": "../../../components/coupons/index" | |||
}, | |||
"navigationBarTitleText": "我的订单" | |||
} |
@@ -1,5 +0,0 @@ | |||
<view class="market"> | |||
<i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | |||
</i-tabs> | |||
</view> |
@@ -1,15 +0,0 @@ | |||
.market { | |||
width: 100%; | |||
height: 100%; | |||
} | |||
.tabs { | |||
width: 100% !important; | |||
height: 88rpx; | |||
text-align: center; | |||
} | |||
.i-tab { | |||
width: 30% !important; | |||
display: inline-block; | |||
} |
@@ -90,6 +90,16 @@ | |||
</view> | |||
</view> | |||
</navigator> | |||
<!-- 显示兑换列表 --> | |||
<navigator url="/pages/user/scoreHistory/index"> | |||
<view class="user-btn app-border-bottom"> | |||
<view> | |||
<image style='width:50rpx;' class='icons' src="./../../assets/img/gift.png" mode='widthFix'></image>成长值记录</view> | |||
<view> | |||
<text class="iconfont icon-right"></text> | |||
</view> | |||
</view> | |||
</navigator> | |||
</view> | |||
<view class="margin"></view> | |||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | |||
@@ -0,0 +1,28 @@ | |||
var config = require("../../../config/config.js"); | |||
var app = getApp(); | |||
const Http = require("../../../utils/HttpBasics"); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
}, | |||
onShow(options){ | |||
this.record(); | |||
}, | |||
record:function(){ | |||
Http.get({ | |||
url: config.api.scoreHistory, | |||
data: { | |||
token:"d012a284-5e83-4062-be18-9bb01eaf868d", | |||
pageNum:1, | |||
pageSize:100 | |||
} | |||
}) | |||
.then(res => { | |||
console.log(res) | |||
}) | |||
.catch(err => { | |||
}) | |||
} | |||
}); |
@@ -0,0 +1,3 @@ | |||
{ | |||
"navigationBarTitleText": "成长值记录" | |||
} |
@@ -0,0 +1,13 @@ | |||
<view class='content'> | |||
<text class='title'>成长值记录</text> | |||
<view class='list'> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
<text>1.jdiueh dheude hdeuhdei </text> | |||
</view> | |||
</view> |
@@ -0,0 +1,14 @@ | |||
.content .title{ | |||
display: block; | |||
text-align: center; | |||
font-size: 30rpx; | |||
color: #333; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
} | |||
.list{ | |||
width: 690rpx; | |||
margin: 0 auto; | |||
color:#666; | |||
font-size: 28rpx; | |||
} |