浏览代码

[订单详情门店样式修改,成长值等级规则修改][修改]

tags/广东版3.2.1
meo 6 年前
父节点
当前提交
e9397b5c75
共有 9 个文件被更改,包括 63 次插入26 次删除
  1. +3
    -3
      config/config.js
  2. +1
    -0
      pages/coupon/detail/index.wxml
  3. +5
    -1
      pages/coupon/detail/index.wxss
  4. +1
    -0
      pages/grade/grade.js
  5. +2
    -2
      pages/grade/grade.wxml
  6. +2
    -2
      pages/order/detail/index.js
  7. +4
    -4
      pages/order/detail/index.wxml
  8. +44
    -13
      pages/order/detail/index.wxss
  9. +1
    -1
      project.config.json

+ 3
- 3
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: {


+ 1
- 0
pages/coupon/detail/index.wxml 查看文件

@@ -59,6 +59,7 @@
</view>
</view>
<view class='posi'>
<view class='applyshop'>适用门店:</view>
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index">
<view>
<image src='{{item.merchantImgUrl}}'></image>


+ 5
- 1
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;
}

+ 1
- 0
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({


+ 2
- 2
pages/grade/grade.wxml 查看文件

@@ -3,12 +3,12 @@
<view class='scroll'>
<scroll-view scroll-x class="scroll-header">
<view class="scroll-view-item" wx:for="{{rules}}" wx:key="index">
<view class='thin_circle last' wx:if="{{item.id!=2}}">
<view class='thin_circle last' wx:if="{{item.desc}}">
<view class="view">
<text>{{item.title}}{{item.desc}}</text>
</view>
</view>
<text wx:if="{{item.id!=2}}">{{item.score}}成长值</text>
<text wx:if="{{item.score}}">{{item.score}}成长值</text>
</view>
</scroll-view>
</view>


+ 2
- 2
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'
})
},
// 获取游戏


+ 4
- 4
pages/order/detail/index.wxml 查看文件

@@ -63,10 +63,10 @@
<text class="jine">{{order.salePrice/100}}元</text>
</view>
<view class="clearfix" bindtap='showDoorList'>
<text>适用门店列表</text>
<text>适用门店:</text>
</view>
<view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}">
<view class='merchantVoList' bindtap='phone' data-merchantlinkphone='{{item.merchantLinkPhone}}'><text class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text><image class="tel" src="{{teljpgUrl}}" mode="widthFix"></image></view>
<view class='merchantVoList' bindtap='phone' data-merchantlinkphone='{{item.merchantLinkPhone}}'><image class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image><text class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text><image class="tel" src="{{teljpgUrl}}" mode="widthFix"></image></view>
</view>
</view>
<!-- 待付款 显示立即购买的按钮 -->
@@ -79,7 +79,7 @@
</view>
</view>
<!-- 如果是消费卡 就显示跳转到首页-->
<view style="margin-top:30rpx;" wx:if="{{order.orderStatus!=0&&order.type==7}}" class="buy-view app-border-top">
<button bindtap='gotoUse' hover-class='active' class='buy'>立即使用</button>
<view style="margin-top:30rpx;" wx:if="{{order.orderStatus!=0&&order.type==7}}" class="app-border-top">
<button class='btns' bindtap='gotoUse' hover-class='active'>立即使用</button>
</view>
</view>

+ 44
- 13
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;
}

+ 1
- 1
project.config.json 查看文件

@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
"appid": "wx649b3be73c1afe47",
"appid": "wxea71200db93d756b",
"projectname": "C",
"isGameTourist": false,
"condition": {


正在加载...
取消
保存