Skip to content

7
7-Eleven
Commit 251fcc8c by 谢中龙
Options

修改超值卡和刪除部分静态资源

parent 79c8c869
Showing with 53 additions and 285 deletions
src/component/authorization-modal-point/authorization-modal-point.wxml
......@@ -2,7 +2,8 @@
<view class="modal-mask"></view>
<view class="modal-container" style="top:{{isAuthorizationActiveText ? '12%' : '26%' }};">
<view class='auth-avatar'>
<image class='auth-avatar-img' src='/assets/imgs/auth-avatar.png'></image>
<image class='auth-avatar-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/300107c21634-e337-4f34-a430-e7336edd8b25.png'></image>
</view>
<view class='auth-shop' wx:if="{{isAuthorizationActiveText}}">
<view class="auto-old"><span class="auto-old-num">1. </span>老会员无需领取新会员卡,即可在会员小程序享受全部会员权益。</view>
......
src/component/authorization-modal/authorization-modal.wxml
......@@ -2,7 +2,8 @@
<view class="modal-mask"></view>
<view class="modal-container" style="top:{{isAuthorizationActiveText ? '12%' : '26%' }};">
<view class='auth-avatar'>
<image class='auth-avatar-img' src='/assets/imgs/auth-avatar.png'></image>
<image class='auth-avatar-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/300107c21634-e337-4f34-a430-e7336edd8b25.png'></image>
</view>
<view class='auth-shop' wx:if="{{isAuthorizationActiveText}}">
<view class="auto-old"><span class="auto-old-num">1. </span>老会员无需领取新会员卡,即可在会员小程序享受全部会员权益。</view>
......
src/component/progressImage/progressImage.wxml
......@@ -4,7 +4,6 @@
<!-- 当前已完成 -->
<block wx:for="{{currentProgress}}" wx:key="{{index}}">
<view class="text-item" style="width: {{100 / 8}}%;">
<!--<image class="item-img" style="" src="/assets/imgs/point/color.png" mode="widthFix" />-->
<image class="item-img" style="" src="{{iconImageFinsh}}" mode="widthFix" />
</view>
</block>
......
src/config/index.js
......@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 ：
//3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3
......@@ -21,7 +21,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2015 花在花园
//2016 阿吉豆
//2017 ACTREE wx2aae34874e88cdf5
const BRANCH_ID = 3001
const BRANCH_ID = 1002
const isMall = true
// const needMock = '' //
......
src/custom-tab-bar/index.js deleted 100644 → 0
const app = getApp();
const utils = require('../utils/util')
const wxService = require('../utils/wxService')
Component({
//数据
data: {
currentHeight: 52,
currentMarginTop: 25,
currentPaddingTop: 5,
selected: 0,//当前tabBar页面
color: "#cdcdcd",//未选中tabBar时的文字颜色
selectedColor: "#22385d",//选中时tabBar文字颜色
addImgPath:'/assets/imgs/7_1_0/share_un.png',//添加发布图标
// tabBar对象集合
list: [
{
pagePath: "/pages/userCenter/userCenter",
iconPath: "/assets/imgs/7_1_0/home_un.png",
selectedIconPath: "/assets/imgs/7_1_0/home.png",
text: "首页"
},
{
pagePath: "/pages/category/category",
iconPath: "/assets/imgs/7_1_0/category_un.png",
selectedIconPath: "/assets/imgs/7_1_0/category.png",
text: "分类"
},
{
pagePath: "/pages/cart/cart",
iconPath: "/assets/imgs/7_1_0/cart_un.png",
selectedIconPath: "/assets/imgs/7_1_0/cart.png",
text: "购物车"
},
{
pagePath: "/pages/my/my",
iconPath: "/assets/imgs/7_1_0/my_un.png",
selectedIconPath: "/assets/imgs/7_1_0/my.png",
text: "我的"
}
]
},
ready() {
wxService.getSystemInfo().then(res => {
const {statusBarHeight} = res
const {currentHeight,currentMarginTop,currentPaddingTop} = this.data
this.setData({
currentHeight: currentHeight + statusBarHeight,
currentMarginTop: currentMarginTop + (statusBarHeight) / 6,
currentPaddingTop: statusBarHeight== 44 ? currentPaddingTop + 5 : currentPaddingTop,
})
})
},
methods: {
// tabBar切换事件
tab_bar_index(e) {
const data = e.currentTarget.dataset
const url = data.path
wx.switchTab({ url })
},
// 发布添加按钮跳转
tab_bar_add() {
var url = "/pages/shareNumber/shareNumber"
wx.navigateTo({url})
}
}
})
\ No newline at end of file
src/custom-tab-bar/index.json deleted 100644 → 0
{
"component":true
}
\ No newline at end of file
src/custom-tab-bar/index.wxml deleted 100644 → 0
<cover-view class="tab-bar" style="height:{{currentHeight}}px">
<!-- 背景图片 -->
<cover-image class='tab-bar-bg'
src='https://img3.bigaka.com/prd/3001/202003/20200309/3001fda28a82-5b79-44f4-b9d0-b0d9bf7fa7d0.png' />
<!-- 首页 -->
<cover-view
class='tab-bar-index'
style="margin-top:{{currentMarginTop}}px"
data-index='0'
data-path='{{list[0].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 0 ? list[0].selectedIconPath : list[0].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 0 ? selectedColor : color}}'>{{list[0].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 分类 -->
<cover-view
class='tab-bar-index'
data-index='1'
data-path='{{list[1].pagePath}}'
bindtap='tab_bar_index'
style="margin-top:{{currentMarginTop}}px"
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 1 ? list[1].selectedIconPath : list[1].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 1 ? selectedColor : color}}'>{{list[1].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 分享号 -->
<cover-view class='tab-bar-index-add' bindtap='tab_bar_add'>
<cover-view class='tab-bar-icon_add'>
<cover-view style='width:100%;height:42rpx;' />
<cover-image class='tab-bar-img-add' src='{{addImgPath}}' />
</cover-view>
<cover-view class="share-text" style="padding-top:{{currentPaddingTop}}px">分享号</cover-view>
</cover-view>
<!-- 购物车 -->
<cover-view
class='tab-bar-index'
style="margin-top:{{currentMarginTop}}px"
data-index='2'
data-path='{{list[2].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 2 ? list[2].selectedIconPath : list[2].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 2 ? selectedColor : color}}'>{{list[2].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 我的 -->
<cover-view
class='tab-bar-index'
style="margin-top:{{currentMarginTop}}px"
data-index='3'
data-path='{{list[3].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 3 ? list[3].selectedIconPath : list[3].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 3 ? selectedColor : color}}'>{{list[3].text}}</cover-view>
</cover-view>
</cover-view>
</cover-view>
src/custom-tab-bar/index.wxss deleted 100644 → 0
/* tabBar总体 */
.tab-bar{
width: 100%;
height: 144rpx;
display: flex;
flex-direction: row;
position: fixed;
bottom: 0;
background-color: #fff;
}
/* 背景图片 */
.tab-bar-bg{
display: flex;
position: absolute;
width: 100%;
height: 80%;
z-index: -1;
}
/* 背景一条线 */
.tab-bar-bg-view{
width: 100%;
height: 1px;
background: rgba(0, 0, 0, 0.33);
position: absolute;
top: 17px;
z-index: -1;
}
/* tabBar内容快 */
.tab-bar-index{
display: flex;
flex: 1;
font-size: 30rpx;
height: 50px;
margin-top: 25px;
z-index: 1;
box-sizing: border-box;
}
/* tarBar添加发布单独内容快 */
.tab-bar-index-add{
font-size: 30rpx;
z-index: 1;
height: 150rpx;
text-align: center;
}
/* 图标字体结合内容快 */
.tab-bar-icon{
width: 100%;
height: 45px;
margin-top: 5px;
display: flex;
flex-direction: column;
}
/* 图标字体结合内容快添加发布单独设置 */
.tab-bar-icon_add{
width: 100%;
height: 66%;
display: flex;
flex-direction: column;
}
/* 内容快图片 */
.tab-bar-img{
width: 37rpx;
height: 37rpx;
margin: 0 auto;
}
/* 内容块添加发布单独图片设置 */
.tab-bar-img-add{
width: 80rpx;
height: 80rpx;
margin: 0 auto;
}
/* 内容快挤位置 */
.tab-bar-tmp{
width: 100%;
height: 3.5px;
}
/* 内容快文字 */
.tab-bar-text,.share-text{
width: 40px;
text-align: center;
font-size: 12px;
margin: 0 auto;
}
.share-text {
padding-top: 10rpx;
color: #cdcdcd;
}
.fix-Full-button {
bottom:68rpx!important;
}
\ No newline at end of file
src/pages/IntegralMall/IntegralMall.wxml
......@@ -33,7 +33,8 @@
</view>
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
......
src/pages/couponCodeDetail/couponCodeDetail.wxml
......@@ -4,7 +4,7 @@
<view class="qrcode">
<view class='avatar-img'>
<image wx:if="{{codeDetail.couponDetail.style.takeCouponBgimg}}" src='{{codeDetail.couponDetail.style.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/avatar.png' />
<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30013fd40075-5622-49cd-9f82-e9c6e57f39f8.png' />
</view>
<view class='title fs-36'>{{codeDetail.couponSetting.title}}</view>
</view>
......
src/pages/coupons/coupons.wxml
......@@ -41,7 +41,8 @@
</scroll-view>
<view class='empty-wrap' wx:if="{{!couponList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
......@@ -79,7 +80,8 @@
<view class='empty-wrap' wx:if="{{!invalidCouponList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
......
src/project.config.json
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"appid": "wx313ec36b710125d4",
"appid": "wxac09792264c49b5c",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": {
"hidedInDevtools": []
......
src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxml
......@@ -62,7 +62,8 @@
</view>
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
......@@ -103,7 +104,8 @@
</view>
<view class='empty-wrap' wx:if="{{!integralGoodsList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何物品</view>
</view>
</view>
......
src/subPackage/page/pages/couponCenter/couponCenter.wxml
......@@ -37,7 +37,8 @@
</view>
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img'
src='https://img3.bigaka.com/prd/3001/202003/20200309/30012bce7628-f373-4fa7-a6a4-ada9c1c721d6.png' />
<view class='empty-text'>没有任何领劵活动</view>
</view>
</view>
......
src/subPackage/page/pages/myValueCard/myValueCard.js
......@@ -8,12 +8,12 @@ wxService.page({
* 页面的初始数据
*/
data: {
no : '',
pageNum : 1,
pageSize : 10,
totalPage : 0,
isNoData :false,
myCardsList : []
no: '',
pageNum: 1,
pageSize: 10,
totalPage: 0,
isNoData: false,
myCardsList: []
},
/**
......@@ -32,17 +32,17 @@ wxService.page({
},
//barcode 失败回调
canvasIdErrorCallback(e){
canvasIdErrorCallback(e) {
},
//跳转到购买记录
onTapToBuyRecords(){
onTapToBuyRecords() {
wx.navigateTo({
url: '/subPackage/page/pages/valueCardRecords/valueCardRecords',
});
},
//跳转到详情
onTapToInfoPage(e){
onTapToInfoPage(e) {
let item = e.currentTarget.dataset.item;
wx.navigateTo({
url: '/subPackage/page/pages/myValueCardInfo/myValueCardInfo?id=' + item.id,
......@@ -50,13 +50,13 @@ wxService.page({
},
//刷新no
onTapRefreshNo(e){
onTapRefreshNo(e) {
let supValCardId = e.currentTarget.dataset.id;
let index = e.currentTarget.dataset.index;
let url = `/merchant/superValueCard/miniProgram/getChangeCode?supValCardId=${supValCardId}`;
wxService.post(url).then(res => {
if (res) {
if (res.data.data){
if (res.data.data) {
let no = res.data.data;
this.data.no = no;
let canvasId = 'barcode' + index;
......@@ -69,10 +69,10 @@ wxService.page({
});
});
}
else{
else {
wx.showToast({
title: '刷新失败，请重试',
icon : ' none'
icon: ' none'
})
}
}
......@@ -80,7 +80,7 @@ wxService.page({
},
//获取我的超值卡列表
getMyValueCardList(refresh){
getMyValueCardList(refresh) {
const { member } = wx.getStorageSync('_baseUserInfo');
if (!member) {
wx.showToast({
......@@ -99,12 +99,12 @@ wxService.page({
pageSize = this.data.pageSize;
let url = `/merchant/superValueCard/miniProgram/getPageList?memberId=${memeberId}&pageNum=${pageNum}&pageSize=${pageSize}`;
wxService.post(url).then(res => {
if(res){
if (res) {
let data = res.data.data ? res.data.data : [];
if(data.length == 0 && this.data.pageNum > 1){
if (data.length == 0 && this.data.pageNum > 1) {
this.data.isNoData = true;
}
else{
else {
this.data.isNoData = false;
}
//buyAwayType 1 现金 2 积分
......@@ -114,7 +114,8 @@ wxService.page({
item.no = item.supValCardCode ? item.supValCardCode : item.supValCardId;
item.id = item.supValCardId;
item.startTime = item.startTime.substring(0, 10);
item.endTime = item.endTime.substring(0,10);
item.endTime = item.endTime.substring(0, 10);
item.useResidueDays = item.useResidueDays ? item.useResidueDays : 0;
});
this.data.myCardsList = this.data.myCardsList.concat(data);
......@@ -124,7 +125,7 @@ wxService.page({
})
}
if(refresh){
if (refresh) {
wx.showToast({
title: '刷新成功',
});
......@@ -135,8 +136,8 @@ wxService.page({
},
//生成条形码
generatorBarCode(canvasId){
if (this.data.no){
generatorBarCode(canvasId) {
if (this.data.no) {
wxbarcode.barcode(canvasId, this.data.no, 500, 100);
setTimeout(() => {
wxbarcode.barcode(canvasId, this.data.no, 500, 100);
......@@ -144,11 +145,11 @@ wxService.page({
}
},
//展开
onTapShowMoreInfo(e){
onTapShowMoreInfo(e) {
let item = e.currentTarget.dataset.item;
let index = e.currentTarget.dataset.index;
if (item.isOpen){
return ;
if (item.isOpen) {
return;
}
this.data.myCardsList.forEach(item => {
......@@ -168,7 +169,7 @@ wxService.page({
},
//关闭
onTapCloseExtro(e){
onTapCloseExtro(e) {
let index = e.currentTarget.dataset.index;
this.data.myCardsList[index].isOpen = false;
this.data.no = '';
......@@ -193,7 +194,7 @@ wxService.page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
if(!this.data.isNoData){
if (!this.data.isNoData) {
this.data.pageNum++;
this.getMyValueCardList();
}
......
src/subPackage/page/pages/myValueCard/myValueCard.wxml
......@@ -6,11 +6,11 @@
wx:for-index="idx"
wx:key="*this">
<!-- 失效的时候 -->
<!-- <view class='invalide'>
<view class='invalide' wx:if="{{item.useResidueDays <= 0}}">
<view class='status-bar'>
<view class='card-status'>已过期</view>
</view>
</view> -->
</view>
<view class='card-top-info' bindtap='onTapShowMoreInfo' data-item="{{item}}" data-index="{{idx}}">
<image class='bg-image {{item.isOpen ? "expand" : "unexpand"}}'
src='{{item.backGroundUrl}}'
......@@ -18,7 +18,8 @@
<!-- 过期时间展示 -->
<!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> -->
<view class='card-top-info-desc'>
<label>剩{{item.leftTimes}}次，{{item.leftTimes}}天过期</label>
<text wx:if="{{item.useResidueDays <= 0}}"></text>
<label wx:if="{{item.useResidueDays > 0}}">剩{{item.leftTimes}}次，{{item.useResidueDays}}天过期</label>
<image class='qrcode' src='/assets/imgs/711_11.png' mode='aspectFit'></image>
</view>
</view>
......@@ -40,9 +41,7 @@
</view>
<view class='exp-info'>
<label style='color:#76A1D5;' data-item="{{item}}" bindtap="onTapToInfoPage">查看详细使用说明</label>
<image data-item="{{item}}" bindtap="onTapToInfoPage"
src='/assets/imgs/icon_arrow_right.png'
class='arrow-image' mode='aspectFit'></image>
<image data-item="{{item}}" bindtap="onTapToInfoPage" src='/assets/imgs/icon_arrow_right.png' class='arrow-image' mode='aspectFit'></image>
<image class='unexpand-icon'
bindtap='onTapCloseExtro'
data-index="{{idx}}"
......
src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml
<!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml-->
<view class='my-card-info'>
<image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image>
<label>剩{{valueCardInfo.leftTimes}}次，{{valueCardInfo.leftTimes}}天过期</label>
<label>剩{{valueCardInfo.leftTimes}}次，{{valueCardInfo.useResidueDays}}天过期</label>
</view>
<view class='left-num-container'>
......
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