Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
68ddc37f
Commit
68ddc37f
authored
Apr 27, 2020
by
程南
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改主题样式 手机号注册
parent
abaa90e4
Show whitespace changes
Inline
Side-by-side
Showing
62 changed files
with
281 additions
and
198 deletions
+281
-198
app.js
src/app.js
+1
-0
app.wxss
src/app.wxss
+10
-5
attention.wxss
src/component/attention/attention.wxss
+2
-1
personCenter.js
src/component/personCenter/personCenter.js
+12
-1
personCenter.wxml
src/component/personCenter/personCenter.wxml
+23
-5
productListStyleTwo.wxss
src/component/productListStyleTwo/productListStyleTwo.wxss
+2
-2
relatedOrderItem.wxss
src/component/relatedOrderItem/relatedOrderItem.wxss
+1
-1
scrollDel.js
src/component/scrollDel/scrollDel.js
+1
-1
scrollDel.wxss
src/component/scrollDel/scrollDel.wxss
+1
-1
selectCoupon.js
src/component/selectCoupon/selectCoupon.js
+2
-1
selectRelatedGoods.wxss
src/component/selectRelatedGoods/selectRelatedGoods.wxss
+2
-2
selectTab.wxss
src/component/selectTab/selectTab.wxss
+3
-3
skuPopup.js
src/component/skuPopup/skuPopup.js
+6
-0
skuPopup.wxml
src/component/skuPopup/skuPopup.wxml
+10
-1
skuPopup.wxss
src/component/skuPopup/skuPopup.wxss
+3
-3
cart.js
src/pages/cart/cart.js
+2
-1
category.wxss
src/pages/category/category.wxss
+0
-13
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+3
-3
confirmOrder.wxml
src/pages/confirmOrder/confirmOrder.wxml
+1
-1
confirmOrder.wxss
src/pages/confirmOrder/confirmOrder.wxss
+5
-6
extendProduct.wxss
src/pages/extendProduct/extendProduct.wxss
+1
-1
logistics.wxss
src/pages/logistics/logistics.wxss
+2
-2
my.wxml
src/pages/my/my.wxml
+2
-2
myShare.wxss
src/pages/myShare/myShare.wxss
+1
-1
order.js
src/pages/order/order.js
+2
-2
order.wxss
src/pages/order/order.wxss
+14
-14
orderDetail.js
src/pages/orderDetail/orderDetail.js
+2
-2
orderDetail.wxss
src/pages/orderDetail/orderDetail.wxss
+11
-11
productDetail.js
src/pages/productDetail/productDetail.js
+8
-0
productDetail.wxml
src/pages/productDetail/productDetail.wxml
+17
-21
productDetail.wxss
src/pages/productDetail/productDetail.wxss
+5
-5
refund.js
src/pages/refund/refund.js
+1
-1
refundDetail.wxss
src/pages/refundDetail/refundDetail.wxss
+4
-4
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+2
-1
wantToBuyDetail.wxss
src/pages/wantToBuyDetail/wantToBuyDetail.wxss
+3
-3
college.wxss
src/shoppingGuid/page/pages/college/college.wxss
+2
-2
releaseContent.js
src/shoppingGuid/page/pages/releaseContent/releaseContent.js
+1
-1
releaseContent.wxss
...hoppingGuid/page/pages/releaseContent/releaseContent.wxss
+5
-5
selectProductList.wxss
...gGuid/page/pages/selectProductList/selectProductList.wxss
+4
-4
welfare.wxss
src/shoppingGuid/page/pages/welfare/welfare.wxss
+1
-1
chooseStore.wxss
src/subPackage/page/pages/chooseStore/chooseStore.wxss
+1
-1
couponCenterInfo.wxss
...Package/page/pages/couponCenterInfo/couponCenterInfo.wxss
+1
-1
friendShareList.wxss
...ubPackage/page/pages/friendShareList/friendShareList.wxss
+3
-3
grassCommunity.wxss
src/subPackage/page/pages/grassCommunity/grassCommunity.wxss
+1
-1
myRelease.wxss
src/subPackage/page/pages/myRelease/myRelease.wxss
+1
-1
myReleaseDetail.wxss
...ubPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss
+5
-5
selfPickUpOrderInfo.js
...age/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js
+1
-1
selfPickUpOrderInfo.wxss
...e/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss
+10
-9
selfPickUpOrderList.wxss
...e/page/pages/selfPickUpOrderList/selfPickUpOrderList.wxss
+2
-2
share.wxss
src/subPackage/page/pages/share/share.wxss
+2
-2
shareConfig.js
src/subPackage/page/pages/shareConfig/shareConfig.js
+1
-1
shareConfig.wxss
src/subPackage/page/pages/shareConfig/shareConfig.wxss
+5
-5
subPage.wxml
src/subPackage/page/pages/subPage/subPage.wxml
+1
-1
valueCardInfo.js
src/subPackage/page/pages/valueCardInfo/valueCardInfo.js
+2
-1
deliveryCode.js
src/subPackageA/page/pages/deliveryCode/deliveryCode.js
+1
-1
deliveryCode.wxss
src/subPackageA/page/pages/deliveryCode/deliveryCode.wxss
+8
-8
shareArticle.wxss
src/subPackageA/page/pages/shareArticle/shareArticle.wxss
+5
-5
scratch.js
src/subPackageMarketing/page/pages/scratch/scratch.js
+4
-4
app.wxss
src/subPackageMarketing/page/pages/scratchRule/app.wxss
+5
-5
Http.js
src/utils/Http.js
+2
-1
util.js
src/utils/util.js
+6
-5
wxService.js
src/utils/wxService.js
+36
-1
No files found.
src/app.js
View file @
68ddc37f
...
...
@@ -171,6 +171,7 @@ App({
isPlusVip
:
isPlusVip
,
cityJson
:
cityJson
,
brandId
:
envInfo
.
brandId
,
themeColor
:
'#007d63'
,
//主题颜色
},
//跳转10级
navigateTo
(
routerObj
){
...
...
src/app.wxss
View file @
68ddc37f
page{
--themecolor: #007d63; /* var(--themecolor) --主题色配置 */
}
/**app.wxss**/
.container {
height: 100%;
...
...
@@ -14,11 +19,11 @@
/* 主题色 */
.theme-color {
background-color:
#cb3c3c
;
background-color:
var(--themecolor)
;
}
.theme-text-color {
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.empty{
...
...
@@ -61,9 +66,9 @@
}
.btn-primary {
background-color:
#cb3c3c
;
background-color:
var(--themecolor)
;
color: #ffffff;
border: 1px solid
#cb3c3c
;
border: 1px solid
var(--themecolor)
;
font-size: 25rpx;
}
.btn-gray {
...
...
@@ -74,7 +79,7 @@
}
.btn-outline {
background: none;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.clear-btn{
...
...
src/component/attention/attention.wxss
View file @
68ddc37f
...
...
@@ -31,6 +31,6 @@
height: 70rpx;
line-height: 70rpx;
border-radius: 35rpx;
background-color: rgba(
203, 60, 60
, 1);
background-color: rgba(
0,125,99
, 1);
text-align: center;
}
\ No newline at end of file
src/component/personCenter/personCenter.js
View file @
68ddc37f
...
...
@@ -9,6 +9,10 @@ Component({
type
:
Boolean
,
type
:
false
},
currentHasMobile
:
{
type
:
Boolean
,
type
:
false
},
personData
:
{
type
:
Object
,
value
:
{},
...
...
@@ -152,6 +156,12 @@ Component({
this
.
triggerEvent
(
'getAuth'
,
res
);
})
},
//获取手机号回调
getPhoneNumber
(
res
=
{}){
wxService
.
nextTick
(()
=>
{
this
.
triggerEvent
(
'getMobile'
,
res
);
})
},
_userInfoChange
(
newVal
,
oldVal
)
{
if
(
newVal
!==
oldVal
)
{
// console.log(newVal)
...
...
@@ -163,7 +173,8 @@ Component({
}
},
handleToMemberOfOwn
()
{
wxService
.
router
(
`/pages/memberOfOwn/memberOfOwn`
)
// wxService.router(`/pages/memberOfOwn/memberOfOwn`)
wxService
.
openCard
();
},
toBonusDetails
()
{
wxService
.
router
(
`/pages/integralWater/integralWater`
)
...
...
src/component/personCenter/personCenter.wxml
View file @
68ddc37f
<!--component/personCenter/personCenter.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="person-center-p">
<view wx:if='{{!current
Mobile
}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<view wx:if='{{!current
HasUserInfo
}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<image
wx:if="{{currentHasUserInfo}}"
src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}"
...
...
@@ -21,12 +21,12 @@
</button>
</view>
<view
wx:if='{{current
Mobile
}}'
wx:if='{{current
HasUserInfo
}}'
catchtap="handleToMemberOfOwn"
class="activation-content activation-bg {{true ? 'user-content' : ''}}"
style="{{personData.backgroundImageUrl ? 'background-image: url('+ utils.formateUrl(personData.backgroundImageUrl,baseImgUrl) +');' : 'background-color: ' + baseUrl + ';'}}"
>
<view class='user-info' wx:if='{{current
Mobile
}}'>
<view class='user-info' wx:if='{{current
HasUserInfo
}}'>
<view class="user-avatar">
<view class="avator">
<open-data type="userAvatarUrl" />
...
...
@@ -53,8 +53,9 @@
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<!-- 登录切有手机号 -->
<view class='df tc person-num' wx:if='{{currentHasUserInfo && currentHasMobile}}'>
<view class='df-1 point person-right positionRe' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
</view>
...
...
@@ -67,6 +68,23 @@
<view class='point-desc' style="color:{{personCenter.fontColor}};">超值卡</view>
</view>
</view>
<!-- 登录无手机号 -->
<view class='df tc person-num' wx:if='{{currentHasUserInfo && !currentHasMobile}}'>
<view class='df-1 point person-right positionRe' wx:if="{{personCenter.bonus == 0}}">
<button open-type="getPhoneNumber" class="positionAbs clear-btn" bindgetphonenumber="getPhoneNumber"></button>
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
</view>
<view class='df-1 point positionRe {{valueCardNum > 0 ? "person-right" : "" }}' wx:if="{{personCenter.coupon == 0}}">
<button open-type="getPhoneNumber" class="positionAbs clear-btn" bindgetphonenumber="getPhoneNumber"></button>
<view class='point-number' style="color:{{personCenter.fontColor}};">{{couponNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">优惠券</view>
</view>
<view class='df-1 point' bindtap="tapToMyValueCardPage" wx:if="{{valueCardNum > 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{valueCardNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">超值卡</view>
</view>
</view>
</view>
<!--plus-->
<!-- <view class='df tc person-num' wx:if='{{currentMobile}}'>
...
...
src/component/productListStyleTwo/productListStyleTwo.wxss
View file @
68ddc37f
...
...
@@ -71,7 +71,7 @@
text-decoration: line-through;
}
.vip-plus-price {
color:
rgba(203, 60, 60, 1)
;
color:
#cb3c3c
;
}
.buy-btn {
text-align: right;
...
...
@@ -83,7 +83,7 @@
line-height: 35rpx;
border-radius: 19rpx;
text-align: center;
background-color: rgba(
203, 60, 60
, 1);
background-color: rgba(
0,125,99
, 1);
border: 2rpx solid rgba(151, 151, 151, 1);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
...
...
src/component/relatedOrderItem/relatedOrderItem.wxss
View file @
68ddc37f
...
...
@@ -165,7 +165,7 @@
line-height: 40rpx;
text-align: center;
border-radius: 5rpx;
background-color: rgba(
203, 60, 60
, 1);
background-color: rgba(
0,125,99
, 1);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
font-family: PingFangSC-Regular;
...
...
src/component/scrollDel/scrollDel.js
View file @
68ddc37f
...
...
@@ -25,7 +25,7 @@ Component({
cartList
:
[{
content
:
"1"
,
right
:
0
},
{
content
:
"2"
,
right
:
0
}],
isScroll
:
true
,
windowHeight
:
0
,
checkedColor
:
'rgb(203, 60, 60)'
,
checkedColor
:
app
.
globalData
.
themeColor
,
},
ready
()
{
var
that
=
this
;
...
...
src/component/scrollDel/scrollDel.wxss
View file @
68ddc37f
...
...
@@ -10,7 +10,7 @@
width: 132rpx;
height: 100%;
/* background-color: rgba(149, 149, 149, 1); */
background-color:
#cb3c3c
;
background-color:
var(--themecolor)
;
color: white;
position: absolute;
top: 0;
...
...
src/component/selectCoupon/selectCoupon.js
View file @
68ddc37f
// component/selectCoupon/selectCoupon.js
const
wxService
=
require
(
'../../utils/wxService'
)
const
app
=
getApp
()
Component
({
/**
...
...
@@ -19,7 +20,7 @@ Component({
* 组件的初始数据
*/
data
:
{
checkedColor
:
'rgb(203, 60, 60)'
,
checkedColor
:
app
.
globalData
.
themeColor
,
isSelect
:
false
,
newConponOrderList
:
[]
},
...
...
src/component/selectRelatedGoods/selectRelatedGoods.wxss
View file @
68ddc37f
...
...
@@ -18,7 +18,7 @@
height: 60rpx;
line-height: 60rpx;
border-radius: 5rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color: rgba(255, 255, 255, 1);
font-size: 28rpx;
text-align: left;
...
...
@@ -41,7 +41,7 @@
text-align: center;
height: 88rpx;
line-height: 88rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color: rgba(255, 255, 255, 1);
font-size: 25rpx;
font-family: PingFangSC-Medium;
...
...
src/component/selectTab/selectTab.wxss
View file @
68ddc37f
...
...
@@ -21,7 +21,7 @@ page{
text-align: center;
height: 88rpx;
line-height: 88rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color: rgba(255, 255, 255, 1);
font-size: 25rpx;
font-family: PingFangSC-Medium;
...
...
@@ -100,9 +100,9 @@ page{
margin: 25rpx 23rpx 25rpx 0;
}
.tab-item.active{
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
background: #ffffff;
color:
rgba(203, 60, 60, 1
);
color:
var(--themecolor
);
}
.tab-list{
margin-bottom: 34rpx;
...
...
src/component/skuPopup/skuPopup.js
View file @
68ddc37f
...
...
@@ -146,6 +146,12 @@ Component({
* 组件的方法列表
*/
methods
:
{
//获取手机号回调
getPhoneNumber
(
res
=
{}){
wxService
.
nextTick
(()
=>
{
this
.
triggerEvent
(
'getMobile'
,
res
);
})
},
confirm
()
{
if
(
this
.
data
.
curSpec
.
length
<
1
){
wx
.
showToast
({
...
...
src/component/skuPopup/skuPopup.wxml
View file @
68ddc37f
...
...
@@ -81,7 +81,7 @@
</scroll-view>
<!-- 按钮状态 -->
<view wx:if="{{!currentHasUserInfo}}">
<button
<
!-- <
button
bindgetuserinfo="_getUserInfo"
data-jflag="false"
open-type='getUserInfo'
...
...
@@ -89,7 +89,16 @@
hover-class="btn-hover"
>
{{btnText}}
</button> -->
<button
bindgetphonenumber="getPhoneNumber"
open-type='getPhoneNumber'
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>
...
...
src/component/skuPopup/skuPopup.wxss
View file @
68ddc37f
...
...
@@ -119,15 +119,15 @@
border-color: #eaeaea; }
.mid-info .sku-info .spec-value.active {
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
background: #ffffff;
color:
rgba(203, 60, 60, 1
);
color:
var(--themecolor
);
}
.confirm-button {
font-size: 30rpx;
background:
#CB3C3C
;
background:
var(--themecolor)
;
border-radius: 0;
color: #ffffff;
line-height: 96rpx; }
...
...
src/pages/cart/cart.js
View file @
68ddc37f
// pages/cart/cart.js
const
app
=
getApp
()
const
wxService
=
require
(
'../../utils/wxService'
)
wxService
.
page
({
...
...
@@ -16,7 +17,7 @@ wxService.page({
cartList
:
[],
outGoods
:
[],
checkAll
:
false
,
checkedColor
:
'rgb(203, 60, 60)'
,
checkedColor
:
app
.
globalData
.
themeColor
,
shopCartTotalFee
:
0
,
// 商品总价
invalidCarts
:
[]
},
...
...
src/pages/category/category.wxss
View file @
68ddc37f
...
...
@@ -23,19 +23,6 @@ page {
line-height: 100rpx;
text-align: center; }
/* .nav-menu .menu-item::after {
content: '';
display: block;
position: absolute;
left: 0;
top: 18rpx;
width: 8rpx;
height: 60rpx;
background: transparent; } */
/* .nav-menu .menu-item.active::after {
background: #cB3C3C; } */
.nav-menu .menu-item .menu-name {
overflow: hidden;
white-space: nowrap;
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
68ddc37f
...
...
@@ -411,7 +411,7 @@ wxService.page({
content
:
'对不起,需要您先开卡后才能下单,点击确定去开卡'
,
showCancel
:
true
,
confirmText
:
'确定'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
res
)
{
if
(
res
.
confirm
)
{
//跳去开卡
...
...
@@ -905,7 +905,7 @@ wxService.page({
title
:
'商品限购提醒'
,
content
:
tips
,
confirmText
:
'好的'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
showCancel
:
false
,
success
(
confirm
)
{
if
(
confirm
.
confirm
)
{
...
...
@@ -1225,7 +1225,7 @@ wxService.page({
content
:
`您好,因地址库的修改,您当前的收货地址需要重新编辑才可下单,请先编辑此地址。感谢您的配合~`
,
showCancel
:
false
,
confirmText
:
'去更改'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
(
res
)
{
if
(
res
.
confirm
)
{
wxService
.
router
(
`/pages/addAddress/addAddress?id=
${
addressId
}
&from=order`
)
...
...
src/pages/confirmOrder/confirmOrder.wxml
View file @
68ddc37f
...
...
@@ -154,7 +154,7 @@
</view>
<view class="rg-item-info" bindtap="onTapChangeCheckPointDeductOpenStatus">
<view class="point-info">可用<label>{{avaliablePoint}}</label>积分,抵 <label>{{pointDeductMoney}}</label>元 </view>
<icon color="rgb(
203, 60, 60
)" size="20" type="{{deductCheckStatus ? 'success' : 'circle'}}" role="img"></icon>
<icon color="rgb(
0,125,99
)" size="20" type="{{deductCheckStatus ? 'success' : 'circle'}}" role="img"></icon>
</view>
</view>
<!-- -->
...
...
src/pages/confirmOrder/confirmOrder.wxss
View file @
68ddc37f
...
...
@@ -4,7 +4,6 @@
width: 84rpx;
height: 33rpx;
border-radius: 16rpx;
/* background-color: rgba(203, 60, 60, 1); */
}
.address-wrap{
padding: 0 30rpx;
...
...
@@ -181,7 +180,7 @@
}
.total-numer{
font-size: 36rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
font-weight: 600;
}
.address-list{
...
...
@@ -257,7 +256,7 @@
}
.button-hover, .button-active{
background-color:
#cb3c3c
!important;
background-color:
var(--themecolor)
!important;
}
.footer-btns button:active{
...
...
@@ -386,8 +385,8 @@
.deliveryType .de-type-item.active{
background: #ffffff;
color:
#cb3c3c
;
border-top: 4rpx solid
#cb3c3c
;
color:
var(--themecolor)
;
border-top: 4rpx solid
var(--themecolor)
;
}
.pick-up{
...
...
@@ -429,7 +428,7 @@
.pick-up .store-address .store-top .store-name .add-label{
font-size: 20rpx;
padding: 4rpx 6rpx;
background:
#cb3c3c
;
background:
var(--themecolor)
;
color: #ffffff;
border-radius: 19rpx;
margin-right: 10rpx;
...
...
src/pages/extendProduct/extendProduct.wxss
View file @
68ddc37f
...
...
@@ -248,7 +248,7 @@ swiper {
font-size: 26rpx;
}
.help-order{
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.loading-complete{
font-size: 20rpx;
...
...
src/pages/logistics/logistics.wxss
View file @
68ddc37f
...
...
@@ -40,9 +40,9 @@ page{
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
text-align: center;
margin-left: 30rpx;
vertical-align: middle;
...
...
src/pages/my/my.wxml
View file @
68ddc37f
...
...
@@ -5,7 +5,7 @@
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center isVip="{{isVip}}" bind:get
Auth="_getUserInfo
" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" valueCardNum="{{valueCardNum}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
<person-center isVip="{{isVip}}" bind:get
Mobile="userGetMobile" bind:getAuth="_getUserInfo" currentHasMobile="{{currentHasMobile}}
" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" valueCardNum="{{valueCardNum}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
</view>
<view class="" wx:if="{{pItem.type == 3}}">
<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
...
...
@@ -44,7 +44,7 @@
blockStyle="bubble"
buttonStyle="light"
buttonText="0"
bubbleColor="
cb3c3c
"
bubbleColor="
007d63
"
bind:completemessage="completemessage"
plugid='{{contactUsPluginId}}' />
</view>
...
...
src/pages/myShare/myShare.wxss
View file @
68ddc37f
...
...
@@ -56,7 +56,7 @@ scroll-view{
.add{
width: 82rpx;
height: 82rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
border-radius: 50%;
font-size: 60rpx;
color: #ffffff;
...
...
src/pages/order/order.js
View file @
68ddc37f
...
...
@@ -219,7 +219,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'再想想'
,
confirmText
:
'取消订单'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
//跳去开卡
...
...
@@ -290,7 +290,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'取消'
,
confirmText
:
'全部删除'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
const
{
id
}
=
e
.
currentTarget
.
dataset
...
...
src/pages/order/order.wxss
View file @
68ddc37f
...
...
@@ -37,19 +37,19 @@ scroll-view{
height: 8rpx;
right: -1rpx;
top: 14rpx;
background:
#cb3c3c
;
background:
var(--themecolor)
;
border-radius: 50%;
border: solid 1px
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
display: flex;
align-items: center;
justify-content: center;
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
font-weight: bold;
}
.active{
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.order-content{
margin-top: 100rpx;
...
...
@@ -80,8 +80,8 @@ scroll-view{
.order-number .copy{
width: 50rpx;
height: 30rpx;
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
font-size: 22rpx;
border-radius: 5rpx;
display: flex;
...
...
@@ -211,8 +211,8 @@ scroll-view{
.order-list-new .order-item-new .order-new-no .copy{
width: 50rpx;
height: 30rpx;
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
font-size: 22rpx;
border-radius: 5rpx;
display: flex;
...
...
@@ -323,14 +323,14 @@ scroll-view{
.order-package .package-products .product-item .rg-product-info .refund-count{
font-size: 22rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .pro-count label{
color:
#cb3c3c
;
color:
var(--themecolor)
;
font-size: 32rpx;
}
...
...
@@ -377,8 +377,8 @@ scroll-view{
}
.package-btns .btns.pay-now{
border: solid 1px
#cb3c3c
;
background:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
background:
var(--themecolor)
;
color: #ffffff;
}
...
...
@@ -389,8 +389,8 @@ scroll-view{
}
.package-btns .btns.sure-get-goods{
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
}
.package-btns .btns.normal-btn{
...
...
src/pages/orderDetail/orderDetail.js
View file @
68ddc37f
...
...
@@ -288,7 +288,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'取消'
,
confirmText
:
'删除'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
const
{
id
}
=
e
.
currentTarget
.
dataset
...
...
@@ -370,7 +370,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'再想想'
,
confirmText
:
'取消订单'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
//跳去开卡
...
...
src/pages/orderDetail/orderDetail.wxss
View file @
68ddc37f
...
...
@@ -98,13 +98,13 @@ page{
justify-content: space-between;
align-items: center;
font-size: 22rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
margin-top: 5rpx;
opacity: 0.7;
}
.refund-info .refund-name{
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.pro-img{
...
...
@@ -183,9 +183,9 @@ page{
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
text-align: center;
margin-left: 26rpx;
vertical-align: top;
...
...
@@ -370,14 +370,14 @@ page{
.order-package .package-products .product-item .rg-product-info .refund-count{
font-size: 22rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
display: flex;
justify-content: space-between;
align-items: center;
}
.order-package .package-products .product-item .rg-product-info .pro-count label{
color:
#cb3c3c
;
color:
var(--themecolor)
;
font-size: 32rpx;
}
...
...
@@ -405,14 +405,14 @@ page{
}
.package-btns .btns.pay-now{
border: solid 1px
#cb3c3c
;
background:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
background:
var(--themecolor)
;
color: #ffffff;
}
.package-btns .btns.sure-get-goods{
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
}
.package-btns .btns.normal-btn{
...
...
@@ -437,7 +437,7 @@ page{
align-items: center;
}
.refund-status{
color:
#cb3c3c
;
color:
var(--themecolor)
;
flex: 1;
}
.refund-status .status{
...
...
src/pages/productDetail/productDetail.js
View file @
68ddc37f
...
...
@@ -169,6 +169,14 @@ wxService.page({
this
.
data
.
productId
=
this
.
options
.
id
;
}
this
.
setData
({
udesk
:
{
nick_name
:
app
.
globalData
.
userInfo
?
app
.
globalData
.
userInfo
.
memberId
:
''
,
avatar
:
app
.
globalData
.
userInfo
?
app
.
globalData
.
userInfo
.
avatarUrl
:
''
}
})
this
.
getProInfo
()
this
.
getOpenStatus
()
this
.
data
.
currentShareContent
=
null
...
...
src/pages/productDetail/productDetail.wxml
View file @
68ddc37f
...
...
@@ -118,42 +118,37 @@
report-submit
name='home'
>
<!--<navigator
class='get-formId--btn footer-icon'
url="/pages/userCenter/userCenter"
formType="submit"
open-type="navigate"
>
<image src="/assets/imgs/7_1_0/home_un.png" mode="widthFix" />
<view>首页</view>
</navigator>-->
<view bindtap="handelToHome" class='get-formId--btn footer-icon'>
<image src="
/assets/imgs/7_1_0/home_un
.png" mode="widthFix" />
<image src="
https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-index
.png" mode="widthFix" />
<view>首页</view>
</view>
</form>
<form
class='get-formId'
bindsubmit="nav"
report-submit
name='nav
'
name='home
'
>
<navigator class='get-formId--btn footer-icon' open-type="navigate" url="/pages/cart/cart">
<image class="contact-share-img" src="/assets/imgs/7_1_0/cart_un.png" />
<view class="add-car-text">购物车</view>
</navigator>
<button class="get-formId--btn footer-icon" open-type="contact" session-from="udesk|{{udesk.nick_name}}|{{udesk.avatar}}"
send-message-title="{{productInfo.productName}}" show-message-card="true" send-message-img="{{productInfo.indexUrl}}">
<image src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-kefu.png" mode="widthFix"></image>
<view class="tab-text">客服</view>
</button>
</form>
<!-- <form
<form
class='get-formId'
bindsubmit="nav"
report-submit
name='
home
'
name='
nav
'
>
<navigator class=
"get-formId--btn footer-icon
">
<image
src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-kefu.png" mode="widthFix
" />
<view class="
tab-text">分享
</view>
<navigator class=
'get-formId--btn footer-icon' open-type="navigate" url="/pages/cart/cart
">
<image
class="contact-share-img" src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-shop-cart.png
" />
<view class="
add-car-text">购物车
</view>
</navigator>
</form>
-->
</form>
</view>
<block>
<view class="footer-buttons clearfix">
...
...
@@ -185,6 +180,7 @@
</view>
<sku-popup
bind:getMobile="userGetMobile"
product-name="{{productInfo.productName}}"
spec-item="{{productInfo.specItemList}}"
good-type="{{productInfo.productType}}"
...
...
src/pages/productDetail/productDetail.wxss
View file @
68ddc37f
...
...
@@ -54,9 +54,9 @@ page{
width: 88rpx;
height: 30rpx;
border-radius: 3rpx;
background-color: rgba(
203, 60, 60
, 0.08);
background-color: rgba(
0,125,99
, 0.08);
font-size: 13rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
line-height: 30rpx;
text-align: center;
vertical-align: middle;
...
...
@@ -163,7 +163,7 @@ page{
}
.surplus-number{
font-weight: bold;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.gray-line{
background-color: #f9f9f9;
...
...
@@ -238,7 +238,7 @@ page{
width: 240rpx;
}
.product-footer .footer-buttons button.btn-cart {
background: rgba(
203,60,60
,0.71);
background: rgba(
0,125,99
,0.71);
}
.product-footer .footer-buttons button.buy-button {
...
...
@@ -246,7 +246,7 @@ page{
}
.product-footer .footer-buttons button.btn-buy {
background:
#cb3c3c
;
background:
var(--themecolor)
;
}
.product-footer .footer-buttons button::after {
...
...
src/pages/refund/refund.js
View file @
68ddc37f
...
...
@@ -23,7 +23,7 @@ wxService.page({
// 所有退货原因
resonType
:
[],
refundAmount
:
0
,
checkedColor
:
'rgb(203, 60, 60)'
,
checkedColor
:
app
.
globalData
.
themeColor
,
pics
:
[],
id
:
''
,
returnOrder
:
0
...
...
src/pages/refundDetail/refundDetail.wxss
View file @
68ddc37f
...
...
@@ -22,7 +22,7 @@ page{
}
.refund-status{
padding: 49rpx 0 0 74rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.refund-status .status{
font-size: 30rpx;
...
...
@@ -61,7 +61,7 @@ page{
height: 46rpx;
line-height: 46rpx;
border-radius: 23rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
}
...
...
@@ -155,9 +155,9 @@ page{
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
text-align: center;
}
.refund-certificate{
...
...
src/pages/userCenter/userCenter.wxml
View file @
68ddc37f
...
...
@@ -12,6 +12,7 @@
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center isVip="{{isVip}}" bind:getAuth="_getUserInfo"
bind:getMobile="userGetMobile"
currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}"
person-data="{{pItem.customer}}" integral-num="{{integralNum}}"
valueCardNum="{{valueCardNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
...
...
@@ -62,7 +63,7 @@
blockStyle="bubble"
buttonStyle="light"
buttonText="0"
bubbleColor="
cb3c3c
"
bubbleColor="
007d63
"
bind:completemessage="completemessage"
plugid='{{contactUsPluginId}}' />
<!-- 766c50920993bf9c41c6c3d2761a2df5 -->
...
...
src/pages/wantToBuyDetail/wantToBuyDetail.wxss
View file @
68ddc37f
...
...
@@ -123,9 +123,9 @@ scroll-view{
line-height: 24rpx;
text-align: center;
border-radius: 15rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 13rpx;
color:
#CB3C3C
;
color:
var(--themecolor)
;
margin-top: 9rpx;
}
.bottom-price{
...
...
@@ -147,7 +147,7 @@ scroll-view{
line-height: 39rpx;
text-align: center;
border-radius: 19rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
border: 1px solid rgba(151, 151, 151, 1);
color: #ffffff;
font-size: 18rpx;
...
...
src/shoppingGuid/page/pages/college/college.wxss
View file @
68ddc37f
...
...
@@ -166,11 +166,11 @@ view{
.price-btn .rg-btn button{
font-size: 22rpx;
height: 45rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
display: flex;
align-items: center;
padding: 0 10rpx;
border: solid 2rpx
#cb3c3c
;
border: solid 2rpx
var(--themecolor)
;
background: #ffffff;
margin: 0;
}
...
...
src/shoppingGuid/page/pages/releaseContent/releaseContent.js
View file @
68ddc37f
...
...
@@ -259,7 +259,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'取消'
,
confirmText
:
'移除'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
_this
.
data
.
proGoods
.
splice
(
index
,
1
);
...
...
src/shoppingGuid/page/pages/releaseContent/releaseContent.wxss
View file @
68ddc37f
...
...
@@ -170,8 +170,8 @@ view{
justify-content: center;
font-size: 22rpx;
padding: 0 10rpx;
background: rgba(
203, 60, 60
, 0.2);
color:
rgba(203, 60, 60, 1
);
background: rgba(
0,125,99
, 0.2);
color:
var(--themecolor
);
border-radius: 5rpx;
}
...
...
@@ -225,7 +225,7 @@ view{
}
.product-list .product-item .product-info .rg-pro-info .product-price{
color:
rgba(203, 60, 60, 1)
;
color:
#cb3c3c
;
font-size: 22rpx;
}
...
...
@@ -247,7 +247,7 @@ view{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
border: solid 2rpx
rgba(203, 60, 60, 1
);
border: solid 2rpx
var(--themecolor
);
display: flex;
justify-content: center;
align-items: center;
...
...
@@ -266,7 +266,7 @@ view{
height: 90rpx;
left: 0;
bottom: 0;
background:
rgba(203, 60, 60, 1
);
background:
var(--themecolor
);
color: #ffffff;
font-size: 28rpx;
display: flex;
...
...
src/shoppingGuid/page/pages/selectProductList/selectProductList.wxss
View file @
68ddc37f
...
...
@@ -41,7 +41,7 @@ view{
height:60rpx;
line-height:60rpx;
border-radius:5rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color:rgba(255, 255, 255, 1);
font-size:28rpx;
font-family:PingFangSC-Regular;
...
...
@@ -94,7 +94,7 @@ view{
}
.product-list .product-item .product-info .rg-pro-info .product-price{
color:
rgba(203, 60, 60, 1)
;
color:
#cb3c3c
;
font-size: 22rpx;
}
...
...
@@ -116,7 +116,7 @@ view{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
border: solid 2rpx
rgba(203, 60, 60, 1
);
border: solid 2rpx
var(--themecolor
);
display: flex;
justify-content: center;
align-items: center;
...
...
@@ -133,7 +133,7 @@ view{
left: 0;
bottom: 0;
height: 90rpx;
background:
rgba(203, 60, 60, 1
);
background:
var(--themecolor
);
color: #ffffff;
font-size: 28rpx;
display: flex;
...
...
src/shoppingGuid/page/pages/welfare/welfare.wxss
View file @
68ddc37f
...
...
@@ -469,7 +469,7 @@ view{
.add{
width: 82rpx;
height: 82rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
border-radius: 50%;
font-size: 60rpx;
color: #ffffff;
...
...
src/subPackage/page/pages/chooseStore/chooseStore.wxss
View file @
68ddc37f
...
...
@@ -107,7 +107,7 @@ scroll-view{
display: flex;
align-items: center;
justify-content: center;
color:
#cb3c3c
;
color:
var(--themecolor)
;
font-size: 28rpx;
font-weight: 550;
}
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss
View file @
68ddc37f
...
...
@@ -107,7 +107,7 @@ view{
width: 100%;
height: 90rpx;
margin-top: 80rpx;
background: -webkit-linear-gradient(left,rgb(
203,60,60,0.7),rgb(203,60,60
,1));
background: -webkit-linear-gradient(left,rgb(
0,125,99,0.7),rgb(0,125,99
,1));
border-radius: 8rpx;
color: #ffffff;
font-size: 28rpx;
...
...
src/subPackage/page/pages/friendShareList/friendShareList.wxss
View file @
68ddc37f
...
...
@@ -73,9 +73,9 @@ scroll-view{
line-height: 24rpx;
text-align: center;
border-radius: 15rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 13rpx;
color:
#CB3C3C
;
color:
var(--themecolor)
;
margin-top: 9rpx;
}
.bottom-price{
...
...
@@ -97,7 +97,7 @@ scroll-view{
line-height: 39rpx;
text-align: center;
border-radius: 19rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color: #ffffff;
font-size: 18rpx;
float: right;
...
...
src/subPackage/page/pages/grassCommunity/grassCommunity.wxss
View file @
68ddc37f
...
...
@@ -52,7 +52,7 @@ page{
text-align: center;
height: 88rpx;
line-height: 88rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
color: rgba(255, 255, 255, 1);
font-size: 25rpx;
font-family: PingFangSC-Medium;
...
...
src/subPackage/page/pages/myRelease/myRelease.wxss
View file @
68ddc37f
...
...
@@ -40,7 +40,7 @@
.add{
width: 82rpx;
height: 82rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
border-radius: 50%;
font-size: 60rpx;
color: #ffffff;
...
...
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss
View file @
68ddc37f
...
...
@@ -88,8 +88,8 @@ page{
line-height: 52rpx;
text-align: center;
border-radius: 26rpx;
border: 2rpx solid
rgba(203, 60, 60, 1
);
color:
rgba(203, 60, 60, 1
);
border: 2rpx solid
var(--themecolor
);
color:
var(--themecolor
);
font-size: 26rpx;
font-family: PingFangSC-Medium;
}
...
...
@@ -146,9 +146,9 @@ page{
line-height: 24rpx;
text-align: center;
border-radius: 15rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 13rpx;
color:
#CB3C3C
;
color:
var(--themecolor)
;
margin-top: 9rpx;
}
.bottom-price{
...
...
@@ -170,7 +170,7 @@ page{
line-height: 39rpx;
text-align: center;
border-radius: 19rpx;
background-color:
rgba(203, 60, 60, 1
);
background-color:
var(--themecolor
);
border: 1px solid rgba(151, 151, 151, 1);
color: #ffffff;
font-size: 18rpx;
...
...
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js
View file @
68ddc37f
...
...
@@ -182,7 +182,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'再想想'
,
confirmText
:
'取消订单'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
)
{
wx
.
showLoading
({
...
...
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss
View file @
68ddc37f
...
...
@@ -64,9 +64,9 @@ view{
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
text-align: center;
margin-left: 26rpx;
vertical-align: top;
...
...
@@ -99,8 +99,8 @@ view{
min-width: 110rpx;
max-width: 110rpx;
height: 52rpx;
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
font-size: 24rpx;
border-radius: 26rpx;
display: flex;
...
...
@@ -153,13 +153,13 @@ view{
justify-content: space-between;
align-items: center;
font-size: 22rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
margin-top: 5rpx;
opacity: 0.7;
}
.refund-info .refund-name{
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.pro-img{
...
...
@@ -230,7 +230,7 @@ view{
padding: 5rpx 6rpx;
font-size: 20rpx;
background: rgba(255,34,34,0.1);
color:
#cb3c3c
;
color:
var(--themecolor)
;
margin-right: 20rpx;
border-radius: 6rpx;
}
...
...
@@ -310,7 +310,7 @@ view{
}
.bottom-btns .bto-btn.primary-red{
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
background: #ffffff;
}
\ No newline at end of file
src/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList.wxss
View file @
68ddc37f
...
...
@@ -119,8 +119,8 @@ view{
}
.order-list .order-items .operator .order-btn.primary{
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
}
.no-more{
...
...
src/subPackage/page/pages/share/share.wxss
View file @
68ddc37f
...
...
@@ -68,9 +68,9 @@ swiper-item{
.save-btn button[disabled]{
opacity: 0.5 !important;
background-color:
#cb3c3c
!important;
background-color:
var(--themecolor)
!important;
color: #ffffff !important;
border: 1px solid
#cb3c3c
!important;
border: 1px solid
var(--themecolor)
!important;
}
.tab-sort {
...
...
src/subPackage/page/pages/shareConfig/shareConfig.js
View file @
68ddc37f
...
...
@@ -325,7 +325,7 @@ wxService.page({
//价格
if
(
self
.
data
.
product
.
price
){
const
priceActX
=
rpx2px
(
345
*
2
)
ctx
.
setFillStyle
(
'#cb3c3c'
)
// 文字颜色
ctx
.
setFillStyle
(
app
.
globalData
.
themeColor
)
// 文字颜色
ctx
.
setFontSize
(
rpx2px
(
15
*
2
))
ctx
.
fillText
(
'¥'
,
rpx2px
(
15
*
2
),
priceActX
+
rpx2px
(
50
*
2
))
ctx
.
setFontSize
(
rpx2px
(
20
*
2
))
// 文字字号
...
...
src/subPackage/page/pages/shareConfig/shareConfig.wxss
View file @
68ddc37f
...
...
@@ -35,7 +35,7 @@ view{
}
.btns-containers .save-btn{
background:
#cb3c3c
;
background:
var(--themecolor)
;
color: #ffffff;
flex: 1;
height: 80rpx;
...
...
@@ -44,7 +44,7 @@ view{
align-items: center;
justify-content: center;
font-size: 24rpx;
border: solid 2rpx
#cb3c3c
;
border: solid 2rpx
var(--themecolor)
;
}
.btns-containers .save-btn.disabled{
...
...
@@ -53,7 +53,7 @@ view{
.btns-containers .edit-btn{
background: #ffffff;
color:
#cb3c3c
;
color:
var(--themecolor)
;
flex: 0;
min-width: 40%;
max-width: 40%;
...
...
@@ -63,7 +63,7 @@ view{
align-items: center;
justify-content: center;
font-size: 24rpx;
border: solid 2rpx
#cb3c3c
;
border: solid 2rpx
var(--themecolor)
;
margin-right: 30rpx;
}
...
...
@@ -147,5 +147,5 @@ view{
.input-body .bot-btns .mo-btns.sure{
border-left: solid 1rpx #eeeeee;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
src/subPackage/page/pages/subPage/subPage.wxml
View file @
68ddc37f
...
...
@@ -7,7 +7,7 @@
<image-swiper image-data="{{pItem.rotationchart.images}}" bind:updatePage="updatePage" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
</view>
<view class="" wx:if="{{pItem.type == 2}}">
<person-center bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" valueCardNum="{{valueCardNum}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
<person-center bind:get
Mobile="userGetMobile" bind:get
Auth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" valueCardNum="{{valueCardNum}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
</view>
<view class="" wx:if="{{pItem.type == 3}}">
<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
...
...
src/subPackage/page/pages/valueCardInfo/valueCardInfo.js
View file @
68ddc37f
// subPackage/page/pages/valueCardInfo/valueCardInfo.js
const
app
=
getApp
()
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
utils
=
require
(
'../../../../utils/util'
)
wxService
.
page
({
...
...
@@ -192,7 +193,7 @@ wxService.page({
wx
.
showModal
({
title
:
'购买成功'
,
content
:
'是否跳转到我的超值卡列表查看?'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
(
res
)
{
if
(
res
.
confirm
)
{
wx
.
navigateTo
({
...
...
src/subPackageA/page/pages/deliveryCode/deliveryCode.js
View file @
68ddc37f
...
...
@@ -91,7 +91,7 @@ wxService.page({
title
:
'自提收货确认'
,
content
:
'请确认用户已经收货切用户已同意收货'
,
confirmText
:
'确认收货'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
showCancel
:
false
,
success
(
confirm
)
{
if
(
confirm
.
confirm
)
{
...
...
src/subPackageA/page/pages/deliveryCode/deliveryCode.wxss
View file @
68ddc37f
...
...
@@ -65,9 +65,9 @@ view{
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid
rgba(203, 60, 60, 1
);
border: 1px solid
var(--themecolor
);
font-size: 16rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
text-align: center;
margin-left: 26rpx;
vertical-align: top;
...
...
@@ -100,8 +100,8 @@ view{
min-width: 110rpx;
max-width: 110rpx;
height: 52rpx;
border: solid 1px
#cb3c3c
;
color:
#cb3c3c
;
border: solid 1px
var(--themecolor)
;
color:
var(--themecolor)
;
font-size: 24rpx;
border-radius: 26rpx;
display: flex;
...
...
@@ -154,13 +154,13 @@ view{
justify-content: space-between;
align-items: center;
font-size: 22rpx;
color:
#cb3c3c
;
color:
var(--themecolor)
;
margin-top: 5rpx;
opacity: 0.7;
}
.refund-info .refund-name{
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.pro-img{
...
...
@@ -231,7 +231,7 @@ view{
padding: 5rpx 6rpx;
font-size: 20rpx;
background: rgba(255,34,34,0.1);
color:
#cb3c3c
;
color:
var(--themecolor)
;
margin-right: 20rpx;
border-radius: 6rpx;
}
...
...
@@ -281,7 +281,7 @@ view{
.guid-sure{
width: 100%;
height: 80rpx;
background: linear-gradient(to right, rgba(
203,60,60,0.5) , #cb3c3c
);
background: linear-gradient(to right, rgba(
0,125,99,0.5) , var(--themecolor)
);
display: flex;
align-items: center;
justify-content: center;
...
...
src/subPackageA/page/pages/shareArticle/shareArticle.wxss
View file @
68ddc37f
...
...
@@ -35,7 +35,7 @@ view{
}
.btns-containers .save-btn{
background:
#cb3c3c
;
background:
var(--themecolor)
;
color: #ffffff;
flex: 1;
height: 80rpx;
...
...
@@ -44,7 +44,7 @@ view{
align-items: center;
justify-content: center;
font-size: 24rpx;
border: solid 2rpx
#cb3c3c
;
border: solid 2rpx
var(--themecolor)
;
}
.btns-containers .save-btn.disabled{
...
...
@@ -53,7 +53,7 @@ view{
.btns-containers .edit-btn{
background: #ffffff;
color:
#cb3c3c
;
color:
var(--themecolor)
;
flex: 0;
min-width: 40%;
max-width: 40%;
...
...
@@ -63,7 +63,7 @@ view{
align-items: center;
justify-content: center;
font-size: 24rpx;
border: solid 2rpx
#cb3c3c
;
border: solid 2rpx
var(--themecolor)
;
margin-right: 30rpx;
}
...
...
@@ -147,5 +147,5 @@ view{
.input-body .bot-btns .mo-btns.sure{
border-left: solid 1rpx #eeeeee;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
src/subPackageMarketing/page/pages/scratch/scratch.js
View file @
68ddc37f
...
...
@@ -190,7 +190,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'取消'
,
confirmText
:
'去逛逛'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
if
(
modalRes
.
confirm
){
wx
.
reLaunch
({
...
...
@@ -225,7 +225,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'关闭'
,
confirmText
:
'再刮一次'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
self
.
scratch
.
restart
();
}
...
...
@@ -243,7 +243,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'关闭'
,
confirmText
:
'再刮一次'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
self
.
scratch
.
restart
();
}
...
...
@@ -262,7 +262,7 @@ wxService.page({
showCancel
:
true
,
cancelText
:
'关闭'
,
confirmText
:
'再刮一次'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
self
.
scratch
.
restart
();
}
...
...
src/subPackageMarketing/page/pages/scratchRule/app.wxss
View file @
68ddc37f
...
...
@@ -14,11 +14,11 @@
/* 主题色 */
.theme-color {
background-color:
#cb3c3c
;
background-color:
var(--themecolor)
;
}
.theme-text-color {
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.empty{
...
...
@@ -61,9 +61,9 @@
}
.btn-primary {
background-color:
#cb3c3c
;
background-color:
var(--themecolor)
;
color: #ffffff;
border: 1px solid
#cb3c3c
;
border: 1px solid
var(--themecolor)
;
font-size: 25rpx;
}
.btn-gray {
...
...
@@ -74,7 +74,7 @@
}
.btn-outline {
background: none;
color:
#cb3c3c
;
color:
var(--themecolor)
;
}
.clear-btn{
...
...
src/utils/Http.js
View file @
68ddc37f
const
Promise
=
require
(
'../lib/bluebird'
)
const
envInfo
=
require
(
'../config/index'
).
envInfo
const
app
=
getApp
()
class
Http
{
constructor
()
{
...
...
@@ -195,7 +196,7 @@ class Http {
content
:
error
.
msg
,
showCancel
:
false
,
confirmText
:
'好的'
,
confirmColor
:
'#cb3c3c'
,
confirmColor
:
app
.
globalData
.
themeColor
,
success
:
function
(
modalRes
)
{
}
});
...
...
src/utils/util.js
View file @
68ddc37f
...
...
@@ -384,11 +384,12 @@ function _getUserInfo(ev) {
function
setUserInfo
()
{
const
userInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
// 新用户去激活领卡
if
(
userInfo
&&
userInfo
.
member
&&
!
userInfo
.
member
.
mobile
)
{
wxService
.
openCard
()
return
false
}
else
{
}
//现在授权之后不需要跳转开卡
// if (userInfo && userInfo.member && !userInfo.member.mobile) {
// wxService.openCard()
// return false
// } else {
// }
// 跳转
const
urls
=
getCurrentPages
()
setTimeout
(()
=>
{
...
...
src/utils/wxService.js
View file @
68ddc37f
...
...
@@ -498,6 +498,7 @@ class WXService extends Http {
// 首页/商品详情页/内容列表/内容详情/分类/商品列表/集点列表/分享列表
const
NoLoginAuthPage
=
[
'/pages/userCenter/userCenter'
,
'/pages/my/my'
,
'/pages/myShare/myShare'
,
'/subPackage/page/pages/myReleaseDetail/myReleaseDetail'
,
'/pages/productDetail/productDetail'
,
...
...
@@ -595,6 +596,8 @@ class WXService extends Http {
const
_self
=
this
// 当前是否有用户信息
config
.
data
.
currentHasUserInfo
=
false
;
//当前用户是否有手机号
config
.
data
.
currentHasMobile
=
false
;
// 当前页面是否需要授权
config
.
data
.
currentPageRequireAuth
=
false
;
// vip
...
...
@@ -620,6 +623,22 @@ class WXService extends Http {
const
CONFIG_PAPGE
=
{
onLoad
:
function
(...
args
)
{
wx
.
login
({
success
:
(
res
)
=>
{
console
.
log
(
'************************************'
)
console
.
log
(
res
)
},
fail
:
(
res
)
=>
{
}
})
const
page
=
this
_self
.
initAppGlobalDataSync
()
watch
.
setWatcher
(
page
);
...
...
@@ -718,8 +737,10 @@ class WXService extends Http {
// console.log('当前时间 < 到期时间为vip', vipFlag)
if
(
baseUserInfo
&&
wx
.
getStorageSync
(
'token'
))
{
let
mobile
=
baseUserInfo
.
member
.
mobile
;
page
.
setData
({
currentHasUserInfo
:
true
,
currentHasMobile
:
mobile
?
true
:
false
,
isVip
:
vipFlag
},
()
=>
{
//开启体验功能时才进行校验这个功能
...
...
@@ -793,11 +814,25 @@ class WXService extends Http {
wx
.
showLoading
({
title
:
'用户登录中..'
,
});
_self
.
getAuthUserInfo
(
res
.
detail
).
then
(
res
=>
{
this
.
setData
({
currentHasUserInfo
:
true
});
wx
.
hideLoading
();
}).
catch
(
err
=>
{
wx
.
hideLoading
();
})
},
//统一处理手机号授权成功
userGetMobile
(
res
){
console
.
log
(
res
)
wx
.
showLoading
({
title
:
'用户登录中..'
,
});
_self
.
getAuthUserInfo
(
res
.
detail
).
then
(
res
=>
{
this
.
setData
({
currentHasUserInfo
:
true
});
wx
.
hideLoading
();
}).
catch
(
err
=>
{
wx
.
hideLoading
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment