Skip to content

7
7-Eleven
Commit c7971084 by 谢中龙
Options

优化功能

parent 300fef09
Showing with 349 additions and 21 deletions
src/component/pointDeductRule/pointDeductRule.js 0 → 100644
// component/adDialog/adDialog.js
var app = getApp()
const wxService = require('../../utils/wxService')
Component({
/**
* 组件的属性列表
*/
properties: {
showDialog : {
type: Boolean,
value: false
},
ruleImg : {
type : String,
value : ''
}
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
//关闭
onTapClose(){
this.setData({
showDialog :false
});
}
}
})
src/component/pointDeductRule/pointDeductRule.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/pointDeductRule/pointDeductRule.wxml 0 → 100644
<!--component/adDialog/adDialog.wxml-->
<view class="ad-modal-bg" wx:if="{{showDialog}}">
<view class="ad-modal-body">
<view class="modal-container">
<view class="header">积分使用规则</view>
<view class="main-body">
<image mode="widthFix" src="{{ruleImg}}"></image>
</view>
</view>
<view class="close-dia">
<image src="/assets/imgs/close.png" mode="aspectFit" bindtap="onTapClose"></image>
</view>
</view>
</view>
src/component/pointDeductRule/pointDeductRule.wxss 0 → 100644
/* component/pointDeductRule/pointDeductRule.wxss */
/* component/adDialog/adDialog.wxss */
.ad-modal-bg{
position: fixed;
z-index: 9999;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
left: 0;
top: 0;
display: flex;
justify-content: center;
align-items: center;
}
.ad-modal-bg .ad-modal-body{
width: 70vw;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.modal-container{
width: 100%;
/* height: 60vh; */
/* max-height: 60vh; */
background: #ffffff;
border-radius: 10rpx;
}
.modal-container .header{
padding: 20rpx;
font-size: 28rpx;
color: #333333;
display: flex;
align-items: center;
justify-content: center;
border-bottom: solid 1rpx #eeeeee;
font-weight: bold;
}
.modal-container .main-body{
padding: 20rpx;
/* height: 60vh; */
max-height: 60vh;
overflow: hidden;
overflow-y: auto;
}
.modal-container .main-body image{
width: 100%;
}
.ad-modal-bg .ad-modal-body .close-dia{
width: 100%;
height: auto;
padding-top: 20rpx;
display: flex;
align-items: center;
justify-content: center;
}
.ad-modal-bg .ad-modal-body .close-dia image{
width: 80rpx;
height: 80rpx;
}
.ad-modal-bg .ad-modal-body .close-dia image:active{
opacity: 0.7;
}
\ No newline at end of file
src/config/index.js
......@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应
const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 ：
//3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播
......@@ -25,7 +25,7 @@ const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test , 测试门户
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab
const BRANCH_ID = 1001
const BRANCH_ID = 1002
const isMall = true
// const needMock = '' //
......@@ -77,7 +77,8 @@ const prod_brand_config = {
guiderCanScanQrcode : true,//导购是否有扫一扫功能
shareTitle: '【舞象星品荟-社交商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : true,//是否开启退货须知显示
refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】',//退货须知文本
},
//泰华配置
2006: {
......@@ -100,6 +101,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【泰华微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30017df01559-a34f-4106-81a6-3e2ed7e6304c.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//多多一上
2007 : {
......@@ -121,6 +124,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【多多一上】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30013df6a0c2-7f3f-4475-8657-5c0ac87e02de.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//雪岛书屋
2008 : {
......@@ -142,6 +147,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【雪岛书屋】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//苏州邻里
2003 : {
......@@ -163,6 +170,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【苏州邻里】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//拉如小程序
2009 : {
......@@ -184,6 +193,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【LA RUTA DE VIA】',//分享海报上显示的小程序title
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001c17ed02e-7c2b-4b61-a81d-f8dcde3301df.jpg',//商户logo
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//热风
2010 : {
......@@ -205,6 +216,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【hotwind热风微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001377a0bb9-8f7f-4b40-8966-9fc5f8a69cdd.png',
openRefundTips : true,//是否开启退货须知显示
refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】',//退货须知文本
},
//悦芙媞
2012 : {
......@@ -226,6 +239,8 @@ const prod_brand_config = {
isNeedGetLocation: true,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【悦芙媞微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30010a5f2325-9818-455d-a707-e8afc373701e.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//阿特里里
2013 : {
......@@ -247,6 +262,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【阿特里里微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//包鞋
2014: {
......@@ -268,6 +285,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【包鞋微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//2015花在花园里
2015 : {
......@@ -289,6 +308,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【花在花园里~】',
logo: 'https://img3.bigaka.com/prd/3001/202004/20200410/30019e5121d1-5e2c-49b6-b807-1dbf1481b361.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//阿吉豆
2016: {
......@@ -310,6 +331,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【阿吉豆微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//【ACTREE】
2017: {
......@@ -331,6 +354,8 @@ const prod_brand_config = {
isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【ACTREE】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001df8c09f7-8e9b-4901-8627-a533daf2bf8d.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//山东盛联微商城
2992 : {
......@@ -352,6 +377,8 @@ const prod_brand_config = {
isNeedGetLocation: true,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【山东盛联微商城】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001edfaf8b7-0f9f-4d3e-8a74-73ed7398a4bc.jpg',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
},
//2002 巴黎贝甜
2002 : {
......@@ -373,6 +400,8 @@ const prod_brand_config = {
isNeedGetLocation: true,//是否开启小程序获取位置（提交订单时获取门店信息）
shareTitle: '【有一种甜叫巴黎贝甜~】',
logo: 'https://img3.bigaka.com/prd/3001/202003/20200318/3001c0647584-3656-45e9-ae60-c898d435113e.png',
openRefundTips : false,//是否开启退货须知显示
refundTips : '',//退货须知文本
//要跳转的外部小程序appid
// "wxa006e9b0a0ee1bfe", 外卖
// "wx39b5d8891f375d1c" 礼品卡
......@@ -475,6 +504,8 @@ let hasLiveVideo = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].hasLiveV
let guiderCanScanQrcode = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].guiderCanScanQrcode : true;
let canRefundDaysAfterDelivery = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].canRefundDaysAfterDelivery : 15;
let touchPointStorageTime = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].touchPointStorageTime : 1800000;
let openRefundTips = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].openRefundTips : true;
let refundTips = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】';
//配置信息导出
const envInfo = (() => {
return {
......@@ -500,6 +531,8 @@ const envInfo = (() => {
guiderCanScanQrcode: guiderCanScanQrcode,
canRefundDaysAfterDelivery: canRefundDaysAfterDelivery,
touchPointStorageTime: touchPointStorageTime,
openRefundTips : openRefundTips,
refundTips : refundTips,
}
})()
......
src/pages/cart/cart.js
......@@ -469,6 +469,43 @@ wxService.page({
}
});
},
//清空有效宝贝
onTapEmptyValidCarts(){
let self = this;
wx.showModal({
title: '提示',
content: '确认清空购物车中所有有效宝贝？',
success(res) {
if (res.confirm) {
wx.showLoading('清除中...');
let promiseArr = [];
self.data.cartList.forEach(item => {
let skuId = item.skuId;
let tempPromise = wxService.post(`/sale/trolley/remove?skuId=${skuId}`);
promiseArr.push(tempPromise);
});
Promise.all(promiseArr).then(promiseArr => {
wx.hideLoading();
wx.showToast({
title: '清除成功',
});
self.setData({
cartList : [],
checkAll : false,
shopCartTotalFee : 0,
});
}).catch(err => {
wx.hideLoading();
wx.showToast({
title: '清除失败，请稍后再试',
icon : 'none'
});
});
}
}
});
},
//删除商品
deletePro(e) {
const {index, skuid} = e
......
src/pages/cart/cart.wxml
<!--pages/cart/cart.wxml-->
<view class="page-cart" style="padding-bottom:{{currentHeight}}px">
<view class="cart-content" wx:if="{{cartList.length}}">
<view class="invalid-title">
<label>有效宝贝</label>
<text class="theme-text-color" bindtap="onTapEmptyValidCarts">清空</text>
</view>
<!-- 购物车列表 -->
<scroll-del
cartList="{{cartList}}"
......@@ -28,7 +32,7 @@
</view>
<!-- 空状态时 -->
<view class="empty" wx-if="{{cartList !== null && cartList.length == 0}}">
<view class="empty" wx-if="{{invalidCarts.length == 0 && cartList.length == 0}}">
<view class="empty-img">
<image class="no-cart-img"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001236fb5c6-5740-4415-b330-385d951832f0.png" mode="widthFix" />
......
src/pages/cart/cart.wxss
......@@ -218,12 +218,13 @@ page{
background: #ffffff;
padding: 20rpx 0;
margin-top: 20rpx;
padding-top: 0;
}
.invalid-title{
padding: 30rpx;
padding: 20rpx;
border-bottom: solid 1rpx #eeeeee;
font-size: 28rpx;
font-size: 24rpx;
color: #333333;
display: flex;
justify-content: space-between;
......
src/pages/confirmOrder/confirmOrder.js
......@@ -53,6 +53,11 @@ wxService.page({
},
orderStoreInfo: null,
couponDiscountPreviews: [],
//积分抵扣
pointDeductOpen : true,//是否开启积分抵扣
deductCheckStatus : false,//是否勾选使用积分抵扣
pointDeductRuleShow : true,//是否显示积分抵扣规则
pointDeductRuleUrl : 'https://hwimagecdn.ihotwind.cn/hotwind-activity/home_get_coupon.png',//积分规则说明
},
/**
......@@ -62,6 +67,19 @@ wxService.page({
wx.hideShareMenu();
this.getMyLocationInfo();
},
//切换使用积分抵扣状态
onTapChangeCheckPointDeductOpenStatus(){
this.data.deductCheckStatus = !this.data.deductCheckStatus;
this.setData({
deductCheckStatus : this.data.deductCheckStatus
});
},
//显示积分抵扣规则
onTapShowDeductRule(){
this.setData({
pointDeductRuleShow : true
});
},
//输入
onInput(e) {
let key = e.target.dataset.name;
......
src/pages/confirmOrder/confirmOrder.json
......@@ -2,6 +2,7 @@
"navigationBarTitleText": "确认订单",
"usingComponents": {
"select-coupon": "/component/selectCoupon/selectCoupon",
"go-home": "/component/goHome/goHome"
"go-home": "/component/goHome/goHome",
"point-deduct-rule" : "/component/pointDeductRule/pointDeductRule"
}
}
\ No newline at end of file
src/pages/confirmOrder/confirmOrder.wxml
......@@ -144,12 +144,20 @@
</view>
</view>
<!-- 积分抵扣 -->
<view class="coupon">
<view>
<text class="price-label">积分抵扣</text>
<text class="total-price">￥{{0}}</text>
</view>
<view class="flex-item clear-box" wx:if="{{pointDeductOpen}}">
<view class="lf-item-title">
<view>积分抵扣</view>
<view class="lf-item-desc" bindtap="onTapShowDeductRule">
<image src="/assets/imgs/7_1_0/explain.png" mode="aspectFit"></image>
<label>积分使用规则</label>
</view>
</view>
<view class="rg-item-info" bindtap="onTapChangeCheckPointDeductOpenStatus">
<view class="point-info">可用<label>400</label>积分,抵 <label>4.00</label>元 </view>
<icon color="rgb(203, 60, 60)" size="20" type="{{deductCheckStatus ? 'success' : 'circle'}}" role="img"></icon>
</view>
</view>
<!-- -->
<view class="coupon">
<!-- class='coupon-items' -->
<view bindtap="selectCoupon">
......@@ -242,4 +250,6 @@
<!--goHome-->
<go-home/>
<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage" />
<select-coupon show="{{showSelectCoupon}}" bind:updateCoupon="updateCoupon" coupon-list="{{couponDiscountPreviews}}" />
\ No newline at end of file
<select-coupon show="{{showSelectCoupon}}" bind:updateCoupon="updateCoupon" coupon-list="{{couponDiscountPreviews}}" />
<!-- 积分抵扣规则 -->
<point-deduct-rule showDialog="{{pointDeductRuleShow}}" ruleImg="{{pointDeductRuleUrl}}"/>
\ No newline at end of file
src/pages/confirmOrder/confirmOrder.wxss
......@@ -490,4 +490,57 @@
height: 21rpx;
vertical-align: middle;
margin-left: 14rpx;
}
.clear-box{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.flex-item{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding: 24rpx 20rpx;
font-size: 28rpx;
color: #333333;
border-bottom: 1px solid rgba(151, 151, 151, 0.3);
}
.flex-item .lf-item-title{
flex: 0;
min-width: 200rpx;
max-width: 200rpx;
}
.flex-item .rg-item-info{
flex: 1;
display: flex;
align-items: center;
justify-content: flex-end;
color: #999999;
height: 100%;
}
.flex-item .rg-item-info .point-info{
margin-right: 10rpx;
}
.flex-item .rg-item-info .point-info label{
color: #333333;
}
.lf-item-desc{
display: flex;
align-items: center;
font-size: 24rpx;
color: #999999;
margin-top: 10rpx;
}
.lf-item-desc image{
width: 26rpx;
height: 26rpx;
margin-right: 10rpx;
}
\ No newline at end of file
src/pages/refundDetail/refundDetail.wxml
......@@ -73,6 +73,14 @@
</block>
</view>
<!-- 温馨提示 -->
<view class="warn-tips" wx:if="{{openRefundTips}}">
<view class="header">退货须知</view>
<view class="tips-content">
{{refundTips}}
</view>
</view>
<view class="refund-info">
<view class="refund-item">
<text class="refund-label">退款原因</text>
......@@ -131,6 +139,8 @@
</view>
</view>
<apply-refund show="{{showApplyRefundModal}}" refundId="{{refundId}}" bind:ok="onDeliveryOk"/>
<!--goHome-->
......
src/pages/refundDetail/refundDetail.wxss
......@@ -130,7 +130,7 @@ page{
}
.refund-info{
background-color: #ffffff;
margin-top: 22rpx;
margin-top: 15rpx;
padding: 30rpx 27rpx 30rpx 30rpx;
}
.refund-item{
......@@ -178,3 +178,24 @@ page{
left: 0;
width: 750rpx;
}
.warn-tips{
background-color: #ffffff;
margin-top: 15rpx;
padding: 30rpx;
font-size: 24rpx;
color: #999999;
}
.warn-tips .header{
padding-bottom: 20rpx;
color: #333333;
font-weight: bold;
border-bottom: dashed 1rpx #eeeeee;
}
.tips-content{
padding-top: 20rpx;
letter-spacing: 2rpx;
line-height: 30rpx;
}
\ No newline at end of file
src/project.config.json
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"appid": "wxc3b64b09b1d3dfc2",
"appid": "wxac09792264c49b5c",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": {
"hidedInDevtools": []
......
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.js
......@@ -42,11 +42,14 @@ wxService.page({
if (currentUserInfo){
wx.qy.checkSession({
success : res => {
//
console.log('checksession res -----',res)
wx.redirectTo({
url: '/shoppingGuid/page/pages/home/home',
});
},
fail : res => { //失效了
console.log('checkesession failed -----',res)
wx.removeStorageSync('guidBaseInfo');
console.log('check session fail , starting login ----')
this.qyLogin();
......
src/subPackageMarketing/page/components/scratch/scratch.js
......@@ -148,7 +148,7 @@ class Scratch {
this.maxX = ''
this.maxY = ''
this.isStart = true
this.page.data.scratch.awardTxt = '开奖中...';
this.page.data.scratch.awardTxt = '多刮一点，再多刮一点😊😜';
this.page.setData({
'isScroll': false,
scratch : this.page.data.scratch,
......@@ -173,7 +173,7 @@ class Scratch {
if (!this.isStart) return
// 自动清楚采用点范围值方式判断
const { canvasWidth, canvasHeight, minX, minY, maxX, maxY } = this
if (maxX - minX > .7 * canvasWidth && maxY - minY > .7 * canvasHeight) {
if (maxX - minX > .3 * canvasWidth && maxY - minY > .3 * canvasHeight) {
this.ctx.draw()
this.endCallBack && this.endCallBack()
this.isStart = false
......
src/subPackageMarketing/page/pages/scratch/scratch.js
......@@ -157,7 +157,7 @@ wxService.page({
canvasWidth: width*0.9 - 30,
canvasHeight: 130,
imageResource: self.data.activityInfo.backColor ? self.data.activityInfo.backColor : defaultScratchCover,
r: 15,
r: 18,
awardTxt: '多刮一点，再多刮一点😊😜',
awardTxtColor: '#333333',
awardTxtFontSize: '22px',
......
src/subPackageMarketing/page/pages/scratch/scratch.wxml
......@@ -27,7 +27,8 @@
<loading wx:if="{{loading}}"/>
<!-- 未获取活动信息时 -->
<view wx:if="{{hasNoActivity}}"></view>
<!-- <empty text=""/> -->
<view wx:if="{{hasNoActivity}}" class="empty">该活动已失效或已被删除~</view>
......
src/utils/wxService.js
......@@ -612,7 +612,9 @@ class WXService extends Http {
config.data.canUseWechatAddress = envInfo.canUseWechatAddress;
config.data.guiderCanScanQrcode = envInfo.guiderCanScanQrcode;
config.data.canRefundDaysAfterDelivery = envInfo.canRefundDaysAfterDelivery;
config.data.openRefundTips = envInfo.openRefundTips;
config.data.refundTips = envInfo.refundTips;
//默认
config.data.loading = true;
......
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