Skip to content

7
7-Eleven
Commit b82e6ee4 by 谢中龙
Options

合并冲突

parents d7b0256e bb102297
Showing with 940 additions and 157 deletions
src/app.json
......@@ -110,7 +110,9 @@
"pages/payCardInfo/payCardInfo",
"pages/moneyBuyCoupon/moneyBuyCoupon",
"pages/moneyBuyCouponInfo/moneyBuyCouponInfo",
"pages/moneyBuyCouponRecords/moneyBuyCouponRecords"
"pages/moneyBuyCouponRecords/moneyBuyCouponRecords",
"pages/TimelimitedSales/TimelimitedSales",
"pages/belongWithGuide/belongWithGuide"
]
},
{
......
src/component/productListStyleOne/productListStyleOne.wxml
......@@ -16,6 +16,9 @@
<template name="water-list">
<navigator hover-class="none" url="/pages/productDetail/productDetail?id={{productId}}">
<view class="item">
<image wx:if="{{isFlashSale}}" class="limited-icon" src="https://img3.bigaka.com/prd/3001/202005/20200508/3001a6dcdf69-369a-4f43-8757-60f071946ea8.png" />
<!-- 图片主图时 -->
<image class="item-img"
src="{{indexUrl}}"
......@@ -34,11 +37,20 @@
<view class="item-title">{{productName}}</view>
</view>
<view class="pro-price-wrap">
<view class="pro-plus-price">
<view class="pro-plus-price" wx:if="{{falshSaleActivityPrice}}">
<text>￥</text>
<text class="plus-price">{{utils.numberFormat(falshSaleActivityPrice / 100)}}</text>
<text class="sale-price">￥{{utils.numberFormat(minSalePrice / 100)}}</text>
</view>
<view class="pro-plus-price" wx:if="{{!falshSaleActivityPrice}}">
<text>￥</text>
<text class="plus-price">{{memberPrice ? utils.numberFormat(memberPrice / 100) : utils.numberFormat(minSalePrice / 100)}}</text>
<image wx:if="{{memberPrice}}" mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image>
</view>
<view class="pro-member-price" wx:if="{{plusPrice}}">
<text>￥</text>
<text class="member-price">{{utils.numberFormat(plusPrice / 100)}}</text>
......
src/component/productListStyleOne/productListStyleOne.wxss
......@@ -11,7 +11,22 @@
border-radius: 10rpx;
box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
padding-bottom: 24rpx;
position: relative;
}
.sale-price{
color: rgba(170, 170, 170, 1);
font-size: 22rpx;
margin-left: 12rpx;
text-decoration: line-through;
}
.limited-icon{
position: absolute;
height: 36rpx;
width: 91rpx;
top: 0;
left: 0;
}
.item-ava{
width: 40rpx;
height: 40rpx;
......
src/component/productListStyleTwo/productListStyleTwo.wxml
<!--component/productListStyleTwo/productListStyleTwo.wxml-->
<!-- component/productListStyleTwo/productListStyleTwo.wxml -->
<wxs src="../../wxs/utils.wxs" module="utils" />
<block wx:for="{{imageData}}" wx:key="*this" wx:for-item="item">
<navigator hover-class="none" url="/pages/productDetail/productDetail?id={{item.productId}}">
<view class="hot-item border_box" >
<view class="hot-img-box">
<image class="hot-img"
src="{{item.indexUrl}}"
mode="aspectFit" lazy-load
wx:if="{{!utils.isVideo(item.indexUrl)}}"/>
<video id="myVideo"
class="hot-img"
src="{{item.indexUrl}}"
muted
wx:if="{{utils.isVideo(item.indexUrl)}}"></video>
</view>
<view class="hot-item-desc border_box">
<view class="item-name">{{item.productName}}</view>
<!-- <view class="item-desc">{{item.productStatusDesc}}</view>-->
<view class="item-vip-price weui-flex">
<text class="vip-sale-price border_box">
￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}
</text>
<view class="" >
<image
class="item-vip"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001918ef881-b117-44da-8cfe-72e26f051e29.png"
mode="widthFix"
wx:if="{{item.memberPrice}}"
/>
</view>
<!-- <text class="vip-original-price">￥189</text> -->
</view>
<view class="item-plus-price weui-flex" wx:if="{{item.plusPrice}}">
<text class="vip-plus-price vip-sale-price border_box">￥{{utils.numberFormat(item.plusPrice / 100)}}</text>
<view class="">
<image
class="item-plus"
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001fce746fd-c6f9-4016-bc0a-9aee0ac93f7a.png"
mode="widthFix"
lazy-load="false"
/>
<navigator hover-class="none" url="/pages/productDetail/productDetail?id={{item.productId}}">
<view class="hot-item border_box">
<view class="hot-img-box">
<image wx:if="{{item.isFlashSale}}" class="limited-icon" src="https://img3.bigaka.com/prd/3001/202005/20200508/3001a6dcdf69-369a-4f43-8757-60f071946ea8.png" />
<image class="hot-img" src="{{item.indexUrl}}" mode="aspectFit" lazy-load wx:if="{{!utils.isVideo(item.indexUrl)}}" />
<video id="myVideo" class="hot-img" src="{{item.indexUrl}}" muted wx:if="{{utils.isVideo(item.indexUrl)}}"></video>
</view>
</view>
<view/>
</view>
</view>
</navigator>
</block>
<view class="hot-item-desc border_box">
<view class="item-name">{{item.productName}}</view>
<!-- <view class="item-desc">{{item.productStatusDesc}}</view> -->
<view class="item-vip-price weui-flex">
<text class="vip-sale-price border_box" wx:if="{{item.falshSaleActivityPrice}}">
￥{{utils.numberFormat(item.falshSaleActivityPrice / 100)}}<text class="sale-price">￥{{utils.numberFormat(item.minSalePrice / 100)}}</text>
</text>
<text class="vip-sale-price border_box" wx:if="{{!item.falshSaleActivityPrice}}">
￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}
</text>
<view class="">
<image class="item-vip" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001918ef881-b117-44da-8cfe-72e26f051e29.png" mode="widthFix" wx:if="{{item.memberPrice}}" />
</view>
<!-- <text class="vip-original-price">￥189</text> -->
</view>
<view class="item-plus-price weui-flex" wx:if="{{item.plusPrice}}">
<text class="vip-plus-price vip-sale-price border_box">
￥{{utils.numberFormat(item.plusPrice / 100)}}
</text>
<view class="">
<image class="item-plus" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001fce746fd-c6f9-4016-bc0a-9aee0ac93f7a.png" mode="widthFix" lazy-load="false" />
</view>
</view>
<view />
</view>
</view>
</navigator>
</block>
\ No newline at end of file
src/component/productListStyleTwo/productListStyleTwo.wxss
......@@ -17,6 +17,22 @@
border-top-left-radius: 10rpx;
border-bottom-left-radius: 10rpx;
}
.sale-price{
color: rgba(170, 170, 170, 1);
font-size: 22rpx;
margin-left: 12rpx;
text-decoration: line-through;
}
.hot-img-box{
position: relative;
}
.limited-icon{
position: absolute;
height: 36rpx;
width: 91rpx;
top: 0;
left: 0;
}
.hot-item-desc {
margin-left: 28rpx;
margin-top: 33rpx;
......@@ -71,7 +87,7 @@
text-decoration: line-through;
}
.vip-plus-price {
color: #cb3c3c;
color: rgba(203, 60, 60, 1);
}
.buy-btn {
text-align: right;
......
src/component/scrollDel/scrollDel.wxml
<!--component/scrollDel/scrollDel.wxml-->
<!--<scroll-view scroll-y="{{isScroll}}" style='height:{{windowHeight}}px'>-->
<!-- component/scrollDel/scrollDel.wxml -->
<!-- <scroll-view scroll-y="{{isScroll}}" style='height:{{windowHeight}}px'> -->
<wxs src="../../wxs/utils.wxs" module="utils" />
<scroll-view scroll-y="{{isScroll}}">
<block class="cart-item" wx:key="item" wx:for="{{cartList}}">
<view data-index='{{index}}'
class="order-item cart-list"
bindtouchstart="drawStart"
bindtouchmove="drawMove"
bindtouchend="drawEnd"
style="right:{{item.right}}rpx">
<!--遮盖层 -->
<view data-index="{{index}}" class="checke-item" catchtap="checkPro">
<icon size="18" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}" ></icon>
<block class="cart-item" wx:key="item" wx:for="{{cartList}}">
<view data-index='{{index}}' class="order-item cart-list" bindtouchstart="drawStart" bindtouchmove="drawMove" bindtouchend="drawEnd" style="right:{{item.right}}rpx">
<!-- 遮盖层 -->
<view data-index="{{index}}" class="checke-item" catchtap="checkPro">
<icon size="18" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}"></icon>
</view>
<!-- bindtap="bindTapItem" data-id="{{item.id}}" -->
<!-- productStatus 0未发布1下架2上架3删除 -->
<view class="pro-info" bindtap="bindTapItem" data-id="{{item.productId}}" style='border-bottom:{{index == (cartList.length -1) ? "none" : "1rpx solid #eeeeee" }};opacity:{{(item.productStatus == 0 || item.productStatus == 1 || item.productStatus == 3) ? 0.2 : 1}};'>
<image wx:if="{{item.activityPrice}}" class="limited-icon" src="https://img3.bigaka.com/prd/3001/202005/20200508/3001a6dcdf69-369a-4f43-8757-60f071946ea8.png" />
<image class="pro-img" src="{{item.skuImgUrl}}" wx:if="{{!utils.isVideo(item.skuImgUrl)}}" mode="widthFix"></image>
<video id="myVideo" class="hot-img" src="{{item.skuImgUrl}}" muted wx:if="{{utils.isVideo(item.skuImgUrl)}}"></video>
<view class="pro-right-info">
<view class="pro-name">{{item.productName}}</view>
<view class="pro-sku">{{item.skuSpec}}</view>
<view class="pro-price">
<view class="price">
<text >￥{{item.activityPrice?item.activityPrice:item.price}}</text>
<text class="sale-price" wx:if="{{item.activityPrice}}">￥{{item.price}}</text>
</view>
<view class="pro-num-edit">
<button class="redus-num" data-index="{{index}}" catchtap="minusNum">
-
</button>
<input class="pro-num-edit-input" disabled type="number" data-index="{{index}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{item.count}}"></input>
<button class="add-num" data-index="{{index}}" catchtap="addNum">
+
</button>
</view>
</view>
</view>
</view>
<view class="remove" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="delItem">
删除
</view>
</view>
<!-- bindtap="bindTapItem" data-id="{{item.id}}" -->
<!-- productStatus 0未发布1下架2上架3删除 -->
<view class="pro-info" bindtap="bindTapItem" data-id="{{item.productId}}"
style='border-bottom:{{index == (cartList.length -1) ? "none" : "1rpx solid #eeeeee" }};opacity:{{(item.productStatus == 0 || item.productStatus == 1 || item.productStatus == 3) ? 0.2 : 1}};'>
<image class="pro-img" src="{{item.skuImgUrl}}"
wx:if="{{!utils.isVideo(item.skuImgUrl)}}"
mode="widthFix"></image>
<video id="myVideo"
class="hot-img"
src="{{item.skuImgUrl}}"
muted
wx:if="{{utils.isVideo(item.skuImgUrl)}}"></video>
<view class="pro-right-info">
<view class="pro-name">{{item.productName}}</view>
<view class="pro-sku">{{item.skuSpec}}</view>
<view class="pro-price">
<view class="price">￥{{item.price}}</view>
<view class="pro-num-edit">
<button class="redus-num" data-index="{{index}}" catchtap="minusNum">-</button>
<input class="pro-num-edit-input" disabled type="number"
data-index="{{index}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{item.count}}"></input>
<button class="add-num" data-index="{{index}}" catchtap="addNum">+</button>
</view>
</view>
</view>
</view>
<view class="remove" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="delItem">删除 </view>
</view>
</block>
</block>
</scroll-view>
\ No newline at end of file
src/component/scrollDel/scrollDel.wxss
......@@ -10,7 +10,7 @@
width: 132rpx;
height: 100%;
/* background-color: rgba(149, 149, 149, 1); */
background-color: var(--themecolor);
background-color: #cb3c3c;
color: white;
position: absolute;
top: 0;
......@@ -23,9 +23,26 @@
display: flex;
overflow: hidden;
}
.pro-info{
position: relative;
}
.sale-price{
color: rgba(170, 170, 170, 1);
font-size: 22rpx;
margin-left: 12rpx;
text-decoration: line-through;
}
.cart-item:last-child .pro-info{
border-bottom: none;
}
.limited-icon{
position: absolute;
height: 36rpx;
width: 91rpx;
top: 0;
left: 0;
}
.pro-info:last-child{
border-bottom: none;
......
src/component/skuPopup/skuPopup.js
......@@ -11,10 +11,6 @@ Component({
type: Boolean,
type: false
},
currentHasMobile : {
type: Boolean,
type: false
},
disableNum: { // 不能改变的数量
type: Number,
observer: '_disableNumChange',
......@@ -150,12 +146,6 @@ Component({
* 组件的方法列表
*/
methods: {
//获取手机号回调
getPhoneNumber(res = {}){
wxService.nextTick(() => {
this.triggerEvent('getMobile', res);
})
},
confirm() {
if (this.data.curSpec.length < 1){
wx.showToast({
......@@ -321,7 +311,7 @@ Component({
if (flag) {
this.setData({
skuStock: this.data.skuInfos[i].stock,
salePrice: this.data.skuInfos[i].salePrice,
salePrice: this.data.skuInfos[i].activityPrice ? this.data.skuInfos[i].activityPrice : this.data.skuInfos[i].salePrice ,
picUrl: this.data.skuInfos[i].picUrl,
skuId: this.data.skuInfos[i].skuId
})
......@@ -357,7 +347,7 @@ Component({
if (flag) {
skuStock = item.stock
skuId = item.skuId
salePrice = item.salePrice
salePrice = item.activityPrice ? item.activityPrice : item.salePrice
picUrl = item.picUrl
}
......
src/component/skuPopup/skuPopup.wxml
......@@ -80,28 +80,33 @@
</view>
</scroll-view>
<!-- 按钮状态 -->
<view wx:if="{{!currentHasMobile}}">
<!-- <button
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
<view wx:if="{{!currentHasMobile}}">
<button
bindgetphonenumber="getPhoneNumber"
open-type='getPhoneNumber'
class="confirm-button {{isOutStock? 'out-stock': ''}}"
hover-class="btn-hover"
>
{{btnText}}
</button> -->
</button>
</view>
<view wx:else>
<button class="confirm-button {{isOutStock? 'out-stock': ''}}" bindtap="confirm">{{btnText}}</button>
</view>
<!-- <view wx:if="{{!currentHasUserInfo}}">
<button
bindgetphonenumber="getPhoneNumber"
open-type='getPhoneNumber'
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
class="confirm-button {{isOutStock? 'out-stock': ''}}"
hover-class="btn-hover"
>
{{btnText}}
</button>
</view>
<view wx:else>
<button class="confirm-button {{isOutStock? 'out-stock': ''}}" bindtap="confirm">{{btnText}}</button>
</view>
</view> -->
</view>
src/component/tabSort/tabSort.js
......@@ -99,7 +99,8 @@ Component({
})
},
handelToVipCode() {
wxService.router(`/pages/memberOfOwn/memberOfOwn`)
// wxService.router(`/pages/memberOfOwn/memberOfOwn`)
wxService.openCard();
},
handelToCart() {
wxService.router(`/pages/cart/cart`)
......
src/pages/confirmOrder/confirmOrder.js
......@@ -412,7 +412,7 @@ wxService.page({
if(result == 0){
data.faceAmount = data.couponSetting.faceAmount;
data.postalDiscountPrice = '0.00';
data.couponSettingId = data.couponSetting.couponSettingId;
data.couponId = data.coupon.id;
this.data.currentPostalCoupon = data;
}else{
......@@ -1040,7 +1040,7 @@ wxService.page({
//处理包邮券信息
if(this.data.currentPostalCoupon){
params.postCouponSettingId = this.data.currentPostalCoupon.couponSettingId;
params.postCouponId = this.data.currentPostalCoupon.couponId;
}
let _this = this;
......
src/pages/coupons/coupons.js
......@@ -172,6 +172,8 @@ wxService.page({
},
//跳转到我的购买优惠券记录
onTapToBuyCouponRecords(){
wx.navigateTo({
url: '/subPackageA/page/pages/moneyBuyCouponRecords/moneyBuyCouponRecords',
});
},
})
\ No newline at end of file
src/pages/orderDetail/orderDetail.wxml
......@@ -152,8 +152,16 @@
<text>￥{{utils.numberFormat(detail.coouponDiscount)}}</text>
</view>
<view class="order-pro-list">
<text>包邮券优惠</text>
<text>￥{{utils.numberFormat(detail.order.postCouponDisCount)}}</text>
</view>
<view class="order-pro-list">
<text>支付券优惠</text>
<text>￥{{utils.numberFormat(detail.order.wechatCouponPrice)}}</text>
</view>
<view class="order-pro-list">
<text class="pay-amount">实付金额</text>
<text class="order-price">￥{{detail.payAmount}}</text>
<text class="order-price">￥{{detail.payAmount }}</text>
</view>
</view>
<view class="order-number-info">
......
src/pages/productDetail/productDetail.wxml
......@@ -43,7 +43,8 @@
<view class="product-price">
<view class="price-wrap">
<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
<text class="price">￥{{utils.numberFormat(productInfo.minSalePrice / 100)}}</text>
<text class="price">￥{{ productInfo.minActivityPrice? utils.numberFormat(productInfo.minActivityPrice / 100):utils.numberFormat(productInfo.minSalePrice / 100) }}</text>
<text wx:if="{{productInfo.minActivityPrice}}" class="sale-price">￥{{utils.numberFormat(productInfo.minSalePrice / 100)}}</text>
<!-- <text class="cost-price">￥888</text> -->
</view>
<button
......@@ -152,18 +153,14 @@
<view class="add-car-text">购物车</view>
</navigator>
</form>
</view>
<block>
<view class="footer-buttons clearfix">
<block>
<form
class='get-formId get-formId--form'
bindsubmit="addCart"
report-submit
name='nav'
>
<form class='get-formId get-formId--form' bindsubmit="addCart" report-submit name='nav'>
<button disabled="{{fromZc || productInfo.productStatus != 2}}"
class="cart-button get-formId--btn {{(fromZc || productInfo.productStatus != 2) ? 'btn-default' : 'btn-cart'}}" formType="submit">加入购物车</button>
class="cart-button get-formId--btn {{(fromZc || productInfo.productStatus != 2) ? 'btn-default' : 'btn-cart'}}" formType="submit">加入购物车</button>
</form>
<form
class='get-formId get-formId--form'
......@@ -183,14 +180,12 @@
</view>
<sku-popup
bind:getMobile="userGetMobile"
currentHasMobile="{{currentHasMobile}}"
product-name="{{productInfo.productName}}"
spec-item="{{productInfo.specItemList}}"
good-type="{{productInfo.productType}}"
index-img="{{productInfo.indexUrl}}"
sku-infos="{{productInfo.productSku}}"
product-price="{{productInfo.plusPrice ? productInfo.plusPrice : productInfo.minSalePrice}}"
product-price="{{ productInfo.plusPrice ? productInfo.plusPrice : productInfo.minSalePrice}}"
show="{{showSkuPopup}}"
bind:skuselect="confirmClick"
btn-text="{{btnText}}"
......
src/pages/productDetail/productDetail.wxss
......@@ -12,7 +12,12 @@ page{
.swiper-image{
width: 100%;
}
.sale-price{
color: rgba(170, 170, 170, 1);
font-size: 24rpx;
margin-left: 12rpx;
text-decoration: line-through;
}
.video-cover{
width: 100%;
height: 100%;
......@@ -54,9 +59,9 @@ page{
width: 88rpx;
height: 30rpx;
border-radius: 3rpx;
background-color: var(--themeColorRgba01);
background-color: rgba(203, 60, 60, 0.08);
font-size: 13rpx;
color: var(--themecolor);
color: #cb3c3c;
line-height: 30rpx;
text-align: center;
vertical-align: middle;
......@@ -163,7 +168,7 @@ page{
}
.surplus-number{
font-weight: bold;
color: var(--themecolor);
color: #cb3c3c;
}
.gray-line{
background-color: #f9f9f9;
......@@ -246,7 +251,7 @@ page{
}
.product-footer .footer-buttons button.btn-buy {
background: var(--themecolor);
background: var(--themecolor);
}
.product-footer .footer-buttons button::after {
......
src/pages/refundDetail/refundDetail.wxml
......@@ -87,7 +87,7 @@
<text class="refund-desc">{{refundDetail.reason}}</text>
</view>
<view class="refund-item">
<text class="refund-label">退款时间</text>
<text class="refund-label">申请时间</text>
<text class="refund-desc">{{refundDetail.createTime}}</text>
</view>
<view class="refund-item">
......
src/project.config.json
......@@ -150,7 +150,7 @@
"id": 16,
"name": "商品详情页",
"pathName": "pages/productDetail/productDetail",
"query": "id=697828280501407744",
"query": "id=684465422204145664",
"scene": null
},
{
......@@ -566,7 +566,7 @@
"id": 77,
"name": "领取中心优惠券详情",
"pathName": "subPackage/page/pages/couponCenterInfo/couponCenterInfo",
"query": "",
"query": "id=706914649421123584",
"scene": null
},
{
......@@ -647,25 +647,46 @@
"scene": null
},
{
"id": -1,
"name": "现金购券",
"id": 89,
"name": "现金购买活动列表",
"pathName": "subPackageA/page/pages/moneyBuyCoupon/moneyBuyCoupon",
"query": "",
"scene": null
},
{
"id": -1,
"name": "支付券详情",
"pathName": "subPackageA/page/pages/payCardInfo/payCardInfo",
"query": "id= 704753070554353664",
"name": "领券中心",
"pathName": "subPackage/page/pages/couponCenter/couponCenter",
"query": "",
"scene": null
},
{
"id": -1,
"name": "领券中心",
"pathName": "subPackage/page/pages/couponCenter/couponCenter",
"name": "限时抢购",
"pathName": "subPackageA/page/pages/TimelimitedSales/TimelimitedSales",
"query": "",
"scene": null
},
{
"id": -1,
"name": "所属门店信息",
"pathName": "subPackageA/page/pages/belongWithGuide/belongWithGuide",
"query": "",
"scene": null
},
{
"id": -1,
"name": "现金购买券记录",
"pathName": "subPackageA/page/pages/moneyBuyCouponRecords/moneyBuyCouponRecords",
"query": "",
"scene": null
},
{
"id": -1,
"name": "subPackage/page/pages/couponCenterInfo/couponCenterInfo",
"pathName": "subPackage/page/pages/couponCenterInfo/couponCenterInfo",
"query": "id=708696469342916608",
"scene": null
}
]
}
......
src/subPackage/page/pages/categoryPro/categoryPro.js
......@@ -143,7 +143,8 @@ wxService.page({
});
let pageNo = this.data.pageNo,
pageSize = this.data.pageSize;
wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
// wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
wxService.post(`/sale/product/buyer/findCategoryTreeIdByProductList?pageNo=${pageNo}&pageSize=${pageSize}&id=${this.data.form.mallCategoryId}`).then(res => {
const { result, data } = res.data
if (result == 0 && data.content) {
wx.hideLoading()
......
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
// subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
const wxService = require('../../../../utils/wxService')
const util = require('../../../../utils/util')
wxService.page({
/**
......@@ -7,7 +8,8 @@ wxService.page({
*/
data: {
activityId : null,
activityInfo : {}
activityInfo : {},
showDialog : false,
},
/**
......@@ -36,6 +38,14 @@ wxService.page({
obj.desc = arr.filter(item => item.type == 2);
obj.hasExpDate = arr.filter(item => item.type == 1).length > 0 ;
this.data.activityInfo = obj;
//判断老活动
if(this.data.activityInfo.couponList){
this.data.activityInfo.isStart = util.compareCurrentDate(obj.startTime);
}
else{
this.data.activityInfo.isStart = true;
}
this.setData({
activityInfo: this.data.activityInfo
});
......@@ -50,13 +60,42 @@ wxService.page({
title: '领取中..',
});
let id = this.data.activityId;
let isStart = this.data.activityInfo.isStart;
console.log(isStart)
//判断是不是老活动
if(!this.data.activityInfo.couponList){
this.getCoupon(id);
return ;
}
if(isStart){
this.getCoupon(id);
}
else{
//立即预约
this.orderCouponNow(id);
}
},
//立即；领取
getCoupon(id){
wxService.post(`/coupon/couponCenterActivity/buyer/coupon/draw?id=${id}`).then(res => {
wx.hideLoading();
if (res) {
if (res.data.result == 0) {
wx.showToast({
title: '领取成功',
});
//判断是不是老数据
if(!this.data.activityInfo.couponList){
wx.showToast({
title: '领取成功',
});
}
else{
this.data.showDialog = true;
this.setData({
showDialog : true
});
}
}
else {
wx.showToast({
......@@ -67,6 +106,44 @@ wxService.page({
}
});
},
//立即预约
orderCouponNow(id){
let baseUserInfo = wx.getStorageSync('_baseUserInfo');
wxService.post(`${'/merchant/message/wxSubMsgMapping/getListByParams'}`, {
scenarioIds: ['usernoticeappointment'],
sourceFrom: 2,
switchType: 3
}).then(res => {
let tempArr = res.data.data ? res.data.data : [];
let tempids = [];
tempArr.map(item => {
tempids.push(item.templateId);
});
wx.requestSubscribeMessage({
tmplIds: tempids,
success: (res) => {
for (let i = 0; i < tempArr.length; i++) {
wxService.post(`${'/merchant/message/wxSubMsgSubscride/member/subscribe'}`, {
businessId: id,
memberId: baseUserInfo.memberId,
scenarioId: tempArr[i].scenarioId,
templateId: tempArr[i].templateId
}).then(resp => { });
}
if (tempids.length > 0) {
let status = res[tempids[0]];
if (status == 'accept') {
this.getACtivityInfo();
wx.showToast({
title: '预约成功',
})
}
}
},
complete: (res) => { }
})
}).catch(err => { })
},
/**
* 用户点击右上角分享
......
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml
<!--subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml-->
<view class="coupon-info-con">
<view class="coupon-info-bg" style="background-image:url('https://img3.bigaka.com/prd/3001/202003/20200331/3001df30305c-f4fe-4c35-bd73-5d87d4882f7a.png')">
<!-- 老数据活动 -->
<view class="coupon-info-bg" wx:if="{{!activityInfo.couponList}}" style="background-image:url('https://img3.bigaka.com/prd/3001/202003/20200331/3001df30305c-f4fe-4c35-bd73-5d87d4882f7a.png')">
<view class="lf-coupon-Bg">
<image wx:if="{{activityInfo.listPicture}}" mode="aspectFit" src="{{activityInfo.listPicture}}"></image>
<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200331/3001649f2f08-3b4e-4b5b-97c1-30cdf646651c.png' />
......@@ -13,6 +14,12 @@
</view>
</view>
</view>
<!-- 修改为新的布局 -->
<view class="coupon-package" wx:if="{{activityInfo.couponList}}">
<image src="{{activityInfo.detailPicture}}" mode="widthFix"></image>
</view>
<!-- 活动说明 -->
<view class='integral-detail' wx:if="{{activityInfo.hasExpDate}}">
<view class='integral-list'>
......@@ -32,8 +39,12 @@
<button wx:if="{{!currentHasUserInfo}}"
bindgetuserinfo="_getUserInfo"
open-type='getUserInfo'
class="clear-btn positionAbs">立即领取</button>
<view wx:else class="view-btn" bindtap="onTapGetCoupon">立即领取</view>
class="clear-btn positionAbs">{{activityInfo.isStart ? '立即领取' : '立即预约'}}</button>
<!-- <view wx:else class="view-btn" bindtap="onTapGetCoupon">{{activityInfo.isStart ? '立即领取' : '立即预约'}}</view> -->
<view wx:if="{{currentHasUserInfo && !activityInfo.isAppointMent}}" class="view-btn" bindtap="onTapGetCoupon">{{activityInfo.isStart ? '立即领取' : '立即预约'}}</view>
<view wx:if="{{currentHasUserInfo && activityInfo.isAppointMent}}" class="view-btn" >已预约</view>
</view>
</view>
<!-- image-dialog -->
<image-dialog showDialog="{{showDialog}}" imageUrl="{{activityInfo.dialogPicture}}"></image-dialog>
\ No newline at end of file
src/subPackageA/page/pages/TimelimitedSales/TimelimitedSales.js 0 → 100644
// share/share.js
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const envInfo = require('../../../../config/index').envInfo
const app = getApp()
wxService.page({
data: {
bannerImg: '',
listData: [[], [], []],
current: 0,
typeArr: [1, 2, 3]
},
onLoad: function (options) {
this.getProductList();
this.getImg();
},
getImg() {
wxService.post(`/sale/specialPriceActivate/getPropagandaSet`).then(res => {
if (res.data.data && res.data.data.imgList.length > 0) {
this.setData({
bannerImg: res.data.data.imgList[0]
})
}
})
},
getProductList(current) {
current = current ? current : 0;
wxService.post(`/sale/specialPriceActivate/getActivityProductList?type=${this.data.typeArr[current]}`).then(res => {
let data = res.data.data?res.data.data:[];
data.map(item => {
item.activityPriceText = item.activityPrice ? String((item.activityPrice / 10 / 10).toFixed(2)).split('.') : ['00', '00'];
item.salePriceText = item.productPrice ? String((item.productPrice / 10 / 10).toFixed(2)).split('.') : ['00', '00'];
item.per = (item.salesCount / item.repertory).toFixed(2) * 10 * 10;
item.width = item.per / 10 / 10 * 254;
return item;
});
let list = this.data.listData;
list[current] = data;
this.setData({
listData: list
})
})
},
linkToProInfo(e) {
let productId = e.currentTarget.dataset.productid;
wxService.router(`/pages/productDetail/productDetail?id=${productId}`);
},
//消息订阅
subscribeClick(e) {
let activeId = e.currentTarget.dataset.id;
let itemIndex = e.currentTarget.dataset.index;
let baseUserInfo = wx.getStorageSync('_baseUserInfo');
wxService.post(`${'/merchant/message/wxSubMsgMapping/getListByParams'}`, {
scenarioIds: ['usernoticeappointment'],
sourceFrom: 2,
switchType: 3
}).then(res => {
let tempArr = res.data.data ? res.data.data : [];
let tempids = [];
tempArr.map(item => {
tempids.push(item.templateId);
});
console.log(tempids)
wx.requestSubscribeMessage({
tmplIds: tempids,
success: (res) => {
for (let i = 0; i < tempArr.length; i++) {
wxService.post(`${'/merchant/message/wxSubMsgSubscride/member/subscribe'}`, {
businessId: activeId,
memberId: baseUserInfo.memberId,
scenarioId: tempArr[i].scenarioId,
templateId: tempArr[i].templateId
}).then(resp => { });
}
if(tempids.length>0){
let status = res[tempids[0]];
if(status == 'accept'){
let list = this.data.listData;
list[this.data.current][itemIndex].isAppointMent = true;
this.setData({
listData: list
})
wx.showToast({
title: '预约成功',
})
}
}
},
complete: (res) => {
console.log(res)
}
})
}).catch(err => {})
},
changeTab(e) {
this.setData({
current: e.target.dataset.current * 1
})
},
swiperChange(e) {
let current = e.detail.current;
this.setData({
current: current
})
if (this.data.listData[current].length === 0) {
this.getProductList(current);
}
// this.getProductList(current);
},
onShow: function () {
},
});
\ No newline at end of file
src/subPackageA/page/pages/TimelimitedSales/TimelimitedSales.json 0 → 100644
{
"navigationBarTitleText": "限时抢购",
"usingComponents": {}
}
\ No newline at end of file
src/subPackageA/page/pages/TimelimitedSales/TimelimitedSales.wxml 0 → 100644
<view class="banner-wrap">
<image class="banner-img" src="{{bannerImg}}" />
</view>
<view class="tab-wrap">
<view class="tab-item {{current==0?'tab-item-active':''}}" bind:tap="changeTab" data-current="0">抢购中</view>
<view class="tab-item {{current==1?'tab-item-active':''}}" bind:tap="changeTab" data-current="1">未开始</view>
<view class="tab-item {{current==2?'tab-item-active':''}}" bind:tap="changeTab" data-current="2">抢先商品</view>
</view>
<view class="list-wrap" style="flex:1;">
<swiper bindchange="swiperChange" current="{{current}}">
<block wx:for="{{3}}" wx:key="*this">
<swiper-item>
<view class="list-item" wx:for="{{listData[index]}}" wx:if="{{listData[current].length}}" wx:key="*this" data-productid="{{item.productId}}" bind:tap="linkToProInfo">
<view class="item-lf">
<image class="item-img" src="{{item.indexUrl}}" />
<image wx:if="{{(item.repertory - item.salesCount)==0}}" class="sale-out" src="https://img3.bigaka.com/prd/3001/202005/20200511/3001de63752e-41ab-4736-ac2e-4ef3603c0309.png" />
</view>
<view class="item-rt">
<view class="tips">{{ item.subtitle }}</view>
<view class="title">{{item.productName}}</view>
<view class="start-time" wx:if="{{current==1}}">开始时间 {{item.startTime}}</view>
<view class="left" wx:if="{{current!=1}}">
<view class="all-line">
<view class="left-line" style="width: {{item.width}}rpx;" wx:if="{{item.repertory!=0}}">已抢{{item.salesCount}}件</view>
<text class="per-text" wx:if="{{item.repertory!=0}}">{{item.per}}%</text>
<view class="left-line-saled" wx:if="{{(item.repertory - item.salesCount)==0}}">已抢完</view>
</view>
</view>
<view class="price-wrap">
<view class="active-price"><text class="fs-24">￥</text><text class="fs-38">{{ item.activityPriceText[0] }}.</text><text class="fs-32">{{item.activityPriceText[1]}}</text></view>
<view class="sale-price"><text class="fs-15">￥</text><text class="fs-23">{{item.salePriceText[0]}}.</text><text class="fs-17">{{item.salePriceText[1]}}</text></view>
<view class="rush-btn" wx:if="{{current!=1&&(item.repertory - item.salesCount)>0}}">马上抢</view>
<view class="subscribe-btn" wx:if="{{current==1 && !item.isAppointMent}}" catchtap="subscribeClick" data-id="{{item.productId}}" data-index="{{index}}">预约提醒</view>
<view class="subscribe-btn" wx:if="{{current==1 && item.isAppointMent}}" data-id="{{item.activityId}}">已预约</view>
<view class="saled-btn" wx:if="{{current!=1&&(item.repertory - item.salesCount)==0}}">去看看</view>
</view>
<view class="time">结束时间 {{item.endTime}}</view>
</view>
</view>
<view class="empty" wx:if="{{listData[index].length === 0}}">
暂无商品哦~
</view>
</swiper-item>
</block>
</swiper>
</view>
\ No newline at end of file
src/subPackageA/page/pages/TimelimitedSales/TimelimitedSales.wxss 0 → 100644
page{
background-color: #F4F5F6;
width: 100%;
height: 100%;
display: flex;
position: fixed;
flex-direction: column;
}
swiper{
overflow: visible;
width: 100%;
height: 100%;
}
swiper-item{
overflow: visible;
overflow-y: auto;
width: 100%;
height: 100%;
}
.banner-wrap{
height: 276rpx;
padding: 0 30rpx;
background-color: #ffffff;
}
.banner-img{
height: 276rpx;
width: 690rpx;
border-radius: 10rpx;
}
.tab-wrap{
height: 80rpx;
display: flex;
background-color: #ffffff;
padding: 0 30rpx;
justify-content: space-around;
color: #000000;
}
.tab-item{
display: flex;
align-items: center;
justify-content: center;
padding: 0 10rpx;
font-size: 28rpx;
opacity: 0.6;
}
.tab-item-active{
font-size: 34rpx;
opacity: 1;
font-weight: bold;
}
.list-wrap{
padding: 20rpx 30rpx;
}
.list-item{
background-color: #ffffff;
height: 300rpx;
border-radius: 10rpx;
display: flex;
margin-bottom: 20rpx;
}
.item-lf{
min-width: 269rpx;
max-width: 269rpx;
display: flex;
justify-content: center;
position: relative;
}
.sale-out{
width: 210rpx;
height: 210rpx;
position: absolute;
top: 44.5rpx;
left: 14.5rpx;
}
.item-img{
width: 210rpx;
height: 210rpx;
margin: auto;
margin-top: 30rpx;
}
.item-rt{
flex-grow: 1;
display: flex;
flex-direction: column;
padding-right: 23rpx;
}
.tips{
height: 22rpx;
color: rgba(102, 102, 102, 1);
font-size: 22rpx;
text-align: left;
margin-top: 33rpx;
}
.title{
height: 70rpx;
line-height: 35rpx;
color: rgba(0, 0, 0, 1);
font-size: 28rpx;
text-align: left;
margin-top: 10rpx;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
}
.left{
margin-top: 8rpx;
}
.all-line{
width: 254rpx;
height: 26rpx;
border-radius: 13rpx;
background-color: rgba(255, 206, 206, 1);
position: relative;
text-align: right;
display: flex;
align-items: center;
justify-content: flex-end;
}
.left-line{
position: absolute;
top: 0;
left: 0;
width: 79rpx;
height: 26rpx;
border-radius: 13rpx;
background-image: linear-gradient(to right, #FF2569, #FF1038);
color: #ffffff;
white-space: nowrap;
font-size: 16rpx;
display: flex;
align-items: center;
padding-left: 8rpx;
}
.left-line-saled{
position: absolute;
top: 0;
left: 0;
width: 254rpx;
height: 26rpx;
border-radius: 13rpx;
background-image: linear-gradient(to right, #FF2569, #FF1038);
color: #ffffff;
font-size: 16rpx;
display: flex;
align-items: center;
justify-content: center;
}
.start-time{
height: 20rpx;
color: rgba(250, 100, 0, 1);
font-size: 20rpx;
margin-top: 8rpx;
}
.per-text{
font-size: 16rpx;
color: #FF1038;
margin-right: 8rpx;
}
.price-wrap{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 10rpx;
}
.active-price{
height: 53rpx;
color: rgba(255, 51, 51, 1);
vertical-align: bottom;
}
.sale-price{
vertical-align: bottom;
color: #9B9B9B;
text-decoration:line-through;
}
.rush-btn{
width: 123rpx;
height: 48rpx;
border-radius: 24rpx;
background-color: rgba(255, 16, 56, 1);
display: flex;
align-items: center;
justify-content: center;
color: rgba(255, 255, 255, 1);
font-size: 22rpx;
}
.subscribe-btn{
width: 138rpx;
height: 48rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 24rpx;
border: 2rpx solid rgba(255, 16, 56, 1);
color: rgba(255, 16, 56, 1);
font-size: 22rpx;
}
.saled-btn{
width: 123rpx;
height: 48rpx;
border-radius: 24rpx;
border: 1rpx solid rgba(155, 155, 155, 1);
display: flex;
align-items: center;
justify-content: center;
color: rgba(155, 155, 155, 1);
font-size: 22rpx;
}
.time{
height: 20rpx;
color: rgba(192, 191, 191, 1);
font-size: 20rpx;
}
.empty{
width: 300rpx;
color: #808080;
margin: 40% auto;
text-align: center;
}
.fs-24{
font-size: 24rpx;
}
.fs-38{
font-size: 38rpx;
}
.fs-32{
font-size: 32rpx;
}
.fs-15{
font-size: 15rpx;
}
.fs-13{
font-size: 13rpx;
}
.fs-17{
font-size: 17rpx;
}
\ No newline at end of file
src/subPackageA/page/pages/belongWithGuide/belongWithGuide.js 0 → 100644
// share/share.js
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const envInfo = require('../../../../config/index').envInfo
const app = getApp()
wxService.page({
data: {
storeId: undefined,
storeName: undefined,
shoppingGuidName: undefined,
latitude: undefined,
longitude: undefined,
contactPhone: undefined
},
onLoad: function (options) {
const userInfo = wx.getStorageSync('_baseUserInfo');
this.getUserInfo(userInfo.member.id);
},
locationClick() {
wx.openLocation({
latitude: this.data.latitude,
longitude: this.data.longitude,
name : this.data.storeName,
address : this.data.address,
scale: 18
})
},
getUserInfo(id) {
wxService.post(`/member/find`, {
memberId: id
}).then(res => {
let member = res.data.data.member;
this.setData({
storeId: member.storeId,
storeName: member.storeName,
shoppingGuidName: member.shoppingGuidName
})
this.getStoreInfo(member.storeId)
})
},
getStoreInfo(id) {
wxService.get(`/platform/securityB/organization/findById/` + id).then(res => {
let data = res.data.data ? res.data.data : {}
this.setData({
latitude: data.latitude,
longitude: data.longitude,
contactPhone: data.contactPhone,
address: data.addressArea+data.addressDetail
})
})
}
});
\ No newline at end of file
src/subPackageA/page/pages/belongWithGuide/belongWithGuide.json 0 → 100644
{
"navigationBarTitleText": "所属门店",
"usingComponents": {}
}
\ No newline at end of file
src/subPackageA/page/pages/belongWithGuide/belongWithGuide.wxml 0 → 100644
<view class="guide-wrap">
<view class="guide-head">
<view class="head-lf">
<view class="row-wrap">
<view class="title">所属门店：</view>
<view class="content">{{storeName?storeName:'无'}}</view>
</view>
<view class="row-wrap">
<view class="title">门店电话：</view>
<view class="content">{{contactPhone?contactPhone:'无'}}</view>
</view>
</view>
<view class="head-rt" bind:tap="locationClick">
<image src="https://img3.bigaka.com/prd/3001/202005/20200509/300123dc8d19-2c59-461a-89a3-bab020687557.png" />
</view>
</view>
<view class="guide-body">
<view class="row-wrap">
<view class="title">所属导购：</view>
<view class="content">{{shoppingGuidName?shoppingGuidName:'无'}}</view>
</view>
<view class="row-wrap">
<view class="title">联系方式：</view>
<view class="content">企业微信</view>
</view>
<!-- <view class="qrcode-wrap">
</view>
<view class="save-btn">保存图片</view> -->
</view>
</view>
\ No newline at end of file
src/subPackageA/page/pages/belongWithGuide/belongWithGuide.wxss 0 → 100644
page{
background-color: #F4F5F6;
width: 100%;
height: 100%;
display: flex;
position: fixed;
flex-direction: column;
}
.guide-wrap{
padding: 30rpx;
}
.guide-head{
height: 198rpx;
background-color: #ffffff;
display: flex;
align-items: center;
padding: 0 48rpx;
justify-content: space-between;
border-radius: 10rpx;
}
.head-lf{
}
.head-rt{
height: 100rpx;
width: 100rpx;
}
.head-rt image{
height: 100rpx;
width: 100rpx;
}
.row-wrap{
display: flex;
font-size: 25rpx;
margin-bottom: 12rpx;
}
.title{
color: rgba(0, 0, 0, 0.5);
}
.content{
color: rgba(0, 0, 0, 1);
}
.guide-body{
height: 198rpx;
background-color: #ffffff;
display: flex;
flex-direction: column;
padding: 0 48rpx;
margin-top: 30rpx;
justify-content: center;
border-radius: 10rpx;
}
.qrcode-wrap{
height: 500rpx;
}
.save-btn{
display: flex;
align-items: center;
justify-content: center;
width: 320rpx;
height: 86rpx;
border-radius: 10rpx;
border: 1rpx solid rgba(0, 0, 0, 0.25);
color: rgba(0, 0, 0, 0.7);
font-size: 30rpx;
}
\ No newline at end of file
src/utils/util.js
......@@ -399,7 +399,15 @@ function getSum(preValue,curValue,index, array) {
}
function _getUserInfo(ev,authType) {
const userInfo = ev.detail || ev
const userInfo = ev.detail || ev;
if (ev && ev.detail.errMsg.indexOf('fail') > -1){
wx.hideLoading();
return Promise.reject({
state : -1,
msg : '授权失败'
});
}
return getUserInfoByBtn(userInfo, authType).then((data = {}) => {
const { token } = data
wx.setStorageSync('_accreditUserInfo', userInfo)
......
src/utils/wxService.js
......@@ -820,6 +820,7 @@ class WXService extends Http {
title: '用户登录中..',
});
_self.getAuthUserInfo(res.detail,'phoneNumber').then(res => {
console.log(res)
this.setData({
currentHasMobile: true,
currentHasUserInfo : 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