Commit 2f862a5f by 谢中龙

超值卡,增加触点

parent 1ff3af8e
...@@ -115,9 +115,6 @@ App({ ...@@ -115,9 +115,6 @@ App({
imageUrl: envInfo.imgCtx, //图片地址 imageUrl: envInfo.imgCtx, //图片地址
isFullSucreen: false, // 当前设备是否为 FullSucreen isFullSucreen: false, // 当前设备是否为 FullSucreen
commonFunc: commonFunc, commonFunc: commonFunc,
// brandId: 2711, brandId: envInfo.brandId,
// brandId: 2005,
// brandId: 1001,
brandId: 1002,
} }
}) })
const PROJECT_ENV = 'test' // 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre const PROJECT_ENV = 'prod' // 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const needMock = '' // const needMock = '' //
const brandId = 2711 ; //1002 测试 2711 生产
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wxac09792264c49b5c // appid_test_wx wxac09792264c49b5c
// appid_pre_711 wx358b56af62edbde1 // appid_pre_711 wx358b56af62edbde1
...@@ -37,11 +37,20 @@ const imgConfig = { ...@@ -37,11 +37,20 @@ const imgConfig = {
prod: prodImgCtx prod: prodImgCtx
} }
const tunulToken = {
dev: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
test: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
pre: '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63',
prod: '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63'
}
const envInfo = (() => { const envInfo = (() => {
return { return {
ctx: config[PROJECT_ENV], ctx: config[PROJECT_ENV],
env: PROJECT_ENV, env: PROJECT_ENV,
imgCtx: imgConfig[PROJECT_ENV] imgCtx: imgConfig[PROJECT_ENV],
brandId : brandId,
tunulToken: tunulToken[PROJECT_ENV]
} }
})() })()
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wx700028bf32a3be66",
"projectname": "7-11", "projectname": "7-11",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
...@@ -185,10 +185,11 @@ ...@@ -185,10 +185,11 @@
"query": "" "query": ""
}, },
{ {
"id": -1, "id": 22,
"name": "超值卡列表", "name": "超值卡列表",
"pathName": "subPackage/page/pages/valueCard/valueCard", "pathName": "subPackage/page/pages/valueCard/valueCard",
"query": "" "query": "scene=t%3Dc9bCCU1100",
"scene": null
}, },
{ {
"id": 23, "id": 23,
......
...@@ -17,10 +17,13 @@ ...@@ -17,10 +17,13 @@
mode='widthFix'></image> mode='widthFix'></image>
<!-- 过期时间展示 --> <!-- 过期时间展示 -->
<!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> --> <!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> -->
<view class="left-days">
<label wx:if="{{item.useResidueDays > 0}}">剩余{{item.leftTimes}}次/{{item.useResidueDays}}天后过期</label>
</view>
<view class='card-top-info-desc'> <view class='card-top-info-desc'>
<text wx:if="{{item.useResidueDays <= 0}}"></text> <text ></text>
<label wx:if="{{item.useResidueDays > 0}}">剩{{item.leftTimes}}次,{{item.useResidueDays}}天过期</label> <image class='qrcode'
<image class='qrcode' src='/assets/imgs/711_11.png' mode='aspectFit'></image> src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513.png' mode='aspectFit'></image>
</view> </view>
</view> </view>
<!-- 具体信息 --> <!-- 具体信息 -->
......
...@@ -56,6 +56,8 @@ view{ ...@@ -56,6 +56,8 @@ view{
align-items: center; align-items: center;
} }
.my-value-card-list .my-value-card-item .card-top-info{ .my-value-card-list .my-value-card-item .card-top-info{
width: 100%; width: 100%;
height: auto; height: auto;
...@@ -73,6 +75,31 @@ view{ ...@@ -73,6 +75,31 @@ view{
align-items: center; align-items: center;
} }
.left-days{
position: absolute;
top: 20rpx;
width: 100%;
height: 70rpx;
padding: 0 30rpx;
display: flex;
justify-content: flex-end;
align-items: center;
}
.left-days label{
height: 50rpx;
width: auto;
padding: 0 30rpx;
border-radius: 25rpx;
background: #ffffff;
color: #333333;
font-weight: bold;
font-size: 24rpx;
display: flex;
align-items: center;
justify-content: center;
}
.my-value-card-list .my-value-card-item .card-top-info .top-left-days label{ .my-value-card-list .my-value-card-item .card-top-info .top-left-days label{
height: 50rpx; height: 50rpx;
width: auto; width: auto;
......
<!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml--> <!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml-->
<view class='my-card-info'> <view class='my-card-info'>
<image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image> <image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image>
<label>剩{{valueCardInfo.leftTimes}}次,{{valueCardInfo.useResidueDays}}天过期</label> <label>剩余{{valueCardInfo.leftTimes}}次/{{valueCardInfo.useResidueDays}}天后过期</label>
</view> </view>
<view class='left-num-container'> <view class='left-num-container'>
......
...@@ -95,9 +95,7 @@ class Http { ...@@ -95,9 +95,7 @@ class Http {
url, url,
method: 'GET', method: 'GET',
header: { header: {
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 'tunnel-token': envInfo.tunulToken, // 生产 2711
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 3001
// 'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tentacle-content': this.getTentacle() 'tentacle-content': this.getTentacle()
}, },
data: parmas data: parmas
...@@ -125,8 +123,7 @@ class Http { ...@@ -125,8 +123,7 @@ class Http {
url, url,
method: 'POST', method: 'POST',
header: { header: {
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 'tunnel-token': envInfo.tunulToken, // 生产 2711
// 'tunnel-token': '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tentacle-content': this.getTentacle() 'tentacle-content': this.getTentacle()
}, },
data: parmas, data: parmas,
...@@ -139,8 +136,7 @@ class Http { ...@@ -139,8 +136,7 @@ class Http {
url, url,
method: 'POST', method: 'POST',
header: { header: {
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 'tunnel-token': envInfo.tunulToken, // 生产 2711
// 'tunnel-token': '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tentacle-content': this.getTentacle() 'tentacle-content': this.getTentacle()
}, },
data: parmas, data: parmas,
......
...@@ -16,6 +16,7 @@ import utils from './util' ...@@ -16,6 +16,7 @@ import utils from './util'
let openCardLister = null let openCardLister = null
const pathData = require('./currentAccessiblePath.js') const pathData = require('./currentAccessiblePath.js')
import * as watch from "./watch.js"; import * as watch from "./watch.js";
import { Integer } from './integerDigitalConvertion'
/** /**
* 单例 * 单例
......
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