diff --git a/config/config.js b/config/config.js
index 98502ba..006b46a 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,9 +1,9 @@
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
var appId = extConfig.appId;
var config = {
- // url: "https://ciformall.youlane.cn/C/api",
+ url: "https://ciformall.youlane.cn/C/api",
// url:"https://c.malls.iformall.com/C/api",
- url:'https://ctest.malls.iformall.com/C/api',
+ // url:'https://ctest.malls.iformall.com/C/api',
// url:'http://10.100.33.68:7000/C/api',
// url: 'http://10.100.30.172:7000/C/api',
api: {
@@ -199,7 +199,7 @@ var config = {
},
weapp: {
- AppId: "wx649b3be73c1afe47"
+ AppId: "wxea71200db93d756b"
},
ErrorCode: {
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 3db97cc..5b752e0 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -59,6 +59,7 @@
+ 适用门店:
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index c21a611..98bb73e 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -170,7 +170,6 @@ page {
height: 87rpx;
display: flex;
justify-content: space-between;
- border-top: 1px solid #f6f6f6;
line-height: 87rpx;
}
@@ -445,4 +444,9 @@ page {
font-size: 30rpx;
line-height: 40rpx;
padding: 0 6rpx;
+}
+.applyshop{
+ font-size: 30rpx;
+ height:70rpx;
+ line-height:70rpx;
}
\ No newline at end of file
diff --git a/pages/grade/grade.js b/pages/grade/grade.js
index c2753bf..3709948 100644
--- a/pages/grade/grade.js
+++ b/pages/grade/grade.js
@@ -57,6 +57,7 @@ Page({
rules: JSON.parse(res.data.score.rules).concat(JSON.parse(res.data.score.rules)[1].childs),
levelList: res.data.levelList
})
+ console.log(that.data.rules)
})
.catch(res=>{
that.setData({
diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml
index 7362c67..fbd3f86 100644
--- a/pages/grade/grade.wxml
+++ b/pages/grade/grade.wxml
@@ -3,12 +3,12 @@
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index dd60141..a85fe53 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -68,8 +68,8 @@ Page({
},
// 买完卡跳转到立即使用页面
gotoUse:function(){
- wx.switchTab({
- url: '/pages/user/index'
+ wx.navigateTo({
+ url: '/pages/cardorder/index/index'
})
},
// 获取游戏
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index dc6b280..068edd2 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -63,10 +63,10 @@
{{order.salePrice/100}}元
- 适用门店列表
+ 适用门店:
- {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
+ {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
@@ -79,7 +79,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index 316ef0b..b1487be 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -1,15 +1,19 @@
@import "../../../app.wxss";
+
page {
- height: auto!important;
+ height: auto !important;
}
+
.order {
width: 100%;
}
-.success{
+
+.success {
vertical-align: middle;
width: 40rpx;
margin-right: 10rpx;
}
+
.tips {
width: 92%;
height: 88rpx;
@@ -18,9 +22,11 @@ page {
padding: 0 4%;
line-height: 88rpx;
}
-.merchantName{
+
+.merchantName {
color: #999;
}
+
.tips text:nth-child(2) {
font-size: 32rpx;
padding-left: 16rpx;
@@ -143,6 +149,7 @@ page {
.classif > view text:nth-child(2) {
color: #b8b8b8;
font-size: 30rpx;
+ margin-left:80rpx;
}
.classif > view:nth-child(1) {
@@ -358,13 +365,15 @@ radio {
.jine {
color: #f96563 !important;
font-size: 36rpx !important;
- font-weight: 400!important;
+ font-weight: 400 !important;
}
+
.jine1 {
color: #b8b8b8 !important;
font-size: 30rpx !important;
- font-weight: 400!important;
+ font-weight: 400 !important;
}
+
.buy-view {
background: #fff;
position: fixed;
@@ -385,28 +394,29 @@ radio {
line-height: 94rpx;
border-radius: 61rpx;
}
-.active{
- opacity: .6;
-}
+.active {
+ opacity: 0.6;
+}
-.game-entry{
+.game-entry {
width: 690rpx;
height: 140rpx;
margin: 20rpx auto 0;
}
-.gameimg{
+
+.gameimg {
display: block;
width: 100%;
height: 140rpx;
}
-
-.merchantVoList{
+.merchantVoList {
width: 100%;
position: relative;
}
-.merchantVoList image{
+
+.merchantVoList .tel {
width: 40rpx;
position: absolute;
top: 0;
@@ -414,4 +424,25 @@ radio {
margin: auto;
right: 14rpx;
z-index: 10;
+}
+
+.btns {
+ background: #00c0ff;
+ height: 94rpx;
+ width: 670rpx;
+ margin: 0 auto 30rpx;
+ color: #fff;
+ font-size: 36rpx;
+ line-height: 94rpx;
+ border-radius: 61rpx;
+}
+.merchantImgUrl{
+ width: 60rpx;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ left: 0;
+ border-radius: 10rpx;
+ z-index: 10;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 2970aaf..4e30ca0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
- "appid": "wx649b3be73c1afe47",
+ "appid": "wxea71200db93d756b",
"projectname": "C",
"isGameTourist": false,
"condition": {