update
This commit is contained in:
ylj20011123
parent
bd66c8865b
commit
81a29d01bc
@ -86,6 +86,10 @@ export default {
|
||||
type: Number,
|
||||
default: 99,
|
||||
},
|
||||
comeForm: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
page: {
|
||||
@ -110,9 +114,16 @@ export default {
|
||||
}
|
||||
|
||||
if (pageIndex === '/pages/shopMallPage/index/index') {
|
||||
if (this.comeForm === 'index') {
|
||||
uni.redirectTo({
|
||||
url: '/pages/shopMallPage/index/index',
|
||||
});
|
||||
} else {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
});
|
||||
}
|
||||
|
||||
} else if (pageIndex === "/pages/shopMallPage/shopCar/index") {
|
||||
if (!this.user && !this.user.MEMBERSHIP_ID) {
|
||||
uni.showModal({
|
||||
@ -198,7 +209,8 @@ export default {
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
background: #fa5151;
|
||||
// background: #fa5151;
|
||||
background: #4BCB7E;
|
||||
border-radius: 16rpx;
|
||||
padding: 2rpx 8rpx;
|
||||
}
|
||||
|
||||
@ -67,8 +67,8 @@
|
||||
<div class="btnBox">
|
||||
<div class="btn" :style="{
|
||||
background: couponMsg.takeState
|
||||
? 'rgba(186, 146, 47, 1)'
|
||||
: 'rgba(186, 146, 47, 0.4)',
|
||||
? '#4BCB7E'
|
||||
: '#E7F8EE',
|
||||
}" @tap="getCoupon">
|
||||
{{ couponMsg.takeState ? "立即领取" : "已领取" }}
|
||||
</div>
|
||||
@ -358,7 +358,7 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #ba922f;
|
||||
color: #4BCB7E;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -368,7 +368,7 @@ export default {
|
||||
font-family: DINAlternate, DINAlternate;
|
||||
font-weight: bold;
|
||||
font-size: 64rpx;
|
||||
color: #ba922f;
|
||||
color: #4BCB7E;
|
||||
line-height: 72rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -382,7 +382,7 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #ba922f;
|
||||
color: #4BCB7E;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -474,6 +474,7 @@ export default {
|
||||
font-style: normal;
|
||||
padding: 22rpx 0;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 32rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -186,7 +186,7 @@
|
||||
</view>
|
||||
<view class="scenicBottom">
|
||||
<view class="scenicLeft">
|
||||
<image class="scenicIcon" src="https://eshangtech.com/caiyunyiImg/fixedIcon.png" />
|
||||
<image class="scenicIcon" src="/static/images/home/servicePosition.svg" />
|
||||
<view class="scenicLabel">距离{{ ScenicData.ScenicDistance || '-' }}km</view>
|
||||
</view>
|
||||
<view class="scenicRight" v-if="ScenicData.TICKET_PRICE > 0">
|
||||
@ -1478,7 +1478,7 @@ export default {
|
||||
} else if (obj.value === 17) {
|
||||
if (obj.index === 0) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/shopMallPage/shopType/index`,
|
||||
url: `/pages/shopMallPage/shopType/index?comeForm=index`,
|
||||
});
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<span class="content-title"></span>
|
||||
<radio-group :value="saveMsg.userSex" @change="changRadio" class="radio-box borbottom">
|
||||
<view class="radio-list" v-for="(item, index) in sexList" :key="index">
|
||||
<radio :value="item.value" color="#CAA97F" :checked="item.isChecked" @click="getSex(item)" />
|
||||
<radio :value="item.value" color="#4BCB7E" :checked="item.isChecked" @click="getSex(item)" />
|
||||
<text class="radio-unit">{{ item.name }}</text>
|
||||
</view>
|
||||
</radio-group>
|
||||
@ -75,8 +75,16 @@
|
||||
/> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="save-btn" @click="checkFn">保存并使用</div>
|
||||
<div class="del-btn" @click="deleteFn" v-if="pageMsg.id">删除地址</div>
|
||||
|
||||
|
||||
<!-- <div class="save-btn" @click="checkFn">保存并使用</div>
|
||||
<div class="del-btn" @click="deleteFn" v-if="pageMsg.id">删除地址</div> -->
|
||||
<view class="btnBox">
|
||||
<view class="saveBtn" @click="checkFn" :style="{ width: pageMsg.id ? '' : '100%' }">保存并使用</view>
|
||||
<view class="loginOut" @click="deleteFn" v-if="pageMsg.id">删除地址</view>
|
||||
</view>
|
||||
|
||||
|
||||
<uni-popup :show="pageMsg.isSelect" position="bottom" overlay="false" @close="handleClosePopup" ref="popup"
|
||||
:safe-area="false" custom-style="height: 760rpx;">
|
||||
<div class="addressSelecct">
|
||||
@ -803,9 +811,9 @@ textarea {
|
||||
}
|
||||
|
||||
.tip-tag.active {
|
||||
color: #c7ac85;
|
||||
border-color: #c7ac85;
|
||||
background: #f7efe3;
|
||||
color: #4BCB7E;
|
||||
border-color: #4BCB7E;
|
||||
background: #E7F8EE;
|
||||
}
|
||||
|
||||
.content-title {
|
||||
@ -855,6 +863,41 @@ textarea {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.btnBox {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0 32rpx;
|
||||
margin-top: 32rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.saveBtn {
|
||||
width: calc(50% - 16rpx);
|
||||
border-radius: 48rpx;
|
||||
background-color: #07C160;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
padding: 24rpx 0;
|
||||
}
|
||||
|
||||
.loginOut {
|
||||
width: calc(50% - 16rpx);
|
||||
border-radius: 48rpx;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #07C160;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
padding: 24rpx 0;
|
||||
border: 1px solid #07C160;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
|
||||
.del-btn {
|
||||
margin: 0 auto;
|
||||
height: 80rpx;
|
||||
|
||||
@ -709,7 +709,7 @@ export default {
|
||||
.statusBox {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #F83D3D;
|
||||
line-height: 40rpx;
|
||||
text-align: right;
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
<template>
|
||||
<div class="flex-col list-item space-y-12">
|
||||
<div class="flex-row justify-between" style="margin-bottom: 8px">
|
||||
<div
|
||||
style="
|
||||
<div style="
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
"
|
||||
>
|
||||
">
|
||||
<!-- <div class="font_41" v-if="obj.SALEBILL_STATE === 1010 || obj.SALEBILL_STATE === 3050">期望送达:
|
||||
{{ obj.RESERVATION_DATE }}</div>
|
||||
<div class="font_41" v-if="obj.SALEBILL_STATE === 4000 || obj.SALEBILL_STATE === 5000">
|
||||
@ -19,40 +17,27 @@
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="flex-col justify-start items-start relative info"
|
||||
style="overflow: hidden; display: flex; align-items: center"
|
||||
>
|
||||
<scroll-view
|
||||
class="flex-row space-x-8"
|
||||
:scroll-x="true"
|
||||
style="height: 82px; width: 70%; white-space: nowrap"
|
||||
>
|
||||
<div class="flex-col justify-start items-start relative info"
|
||||
style="overflow: hidden; display: flex; align-items: center">
|
||||
<scroll-view class="flex-row space-x-8" :scroll-x="true" style="height: 82px; width: 70%; white-space: nowrap">
|
||||
<view class="imgBox" v-for="(item, idx) in obj.GOODSList" :key="idx">
|
||||
<view style="display: flex; flex-direction: column">
|
||||
<!-- -->
|
||||
<img
|
||||
class="equal-division-item"
|
||||
:src="
|
||||
item.IMAGE_URL ||
|
||||
<img class="equal-division-item" :src="item.IMAGE_URL ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
"
|
||||
/>
|
||||
" />
|
||||
<text class="name">{{ item.COMMODITY_NAME }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<div
|
||||
class="section_7"
|
||||
style="
|
||||
<div class="section_7" style="
|
||||
height: 82px;
|
||||
width: 30%;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
"
|
||||
>
|
||||
">
|
||||
<div>
|
||||
<span class="font_6">¥</span>
|
||||
<span class="font_5 text_7">{{ obj.ORDER_AMOUNT }}</span>
|
||||
@ -60,15 +45,9 @@
|
||||
<span class="font_7">共{{ obj.TOTAL_COUNT }}件</span>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="flex-row justify-between"
|
||||
style="display: flex; align-items: center"
|
||||
>
|
||||
<div class="flex-row justify-between" style="display: flex; align-items: center">
|
||||
<div style="flex: 1; margin-right: 4px">
|
||||
<p
|
||||
class="self-start font_7"
|
||||
v-if="obj.SALEBILL_STATE !== 4000 && obj.SALEBILL_STATE !== 5000"
|
||||
>
|
||||
<p class="self-start font_7" v-if="obj.SALEBILL_STATE !== 4000 && obj.SALEBILL_STATE !== 5000">
|
||||
{{ obj.ORDER_DATE }}
|
||||
</p>
|
||||
<view class="desc" v-if="obj.SALEBILL_DESC">
|
||||
@ -79,19 +58,12 @@
|
||||
<img class="shrink-0 image_9" src="/static/images/recons/deliver.svg" />
|
||||
<span class="font_1">催单</span>
|
||||
</div> -->
|
||||
<div
|
||||
class="section_8 view space-x-4"
|
||||
style="display: flex; align-items: center"
|
||||
v-if="obj.SALEBILL_STATE === 2010"
|
||||
@click.stop="handleConfirmReceipt(obj)"
|
||||
>
|
||||
<div class="section_8 view space-x-4" style="display: flex; align-items: center"
|
||||
v-if="obj.SALEBILL_STATE === 2010" @click.stop="handleConfirmReceipt(obj)">
|
||||
<img class="shrink-0 image_9" src="/static/images/home/notice.svg" />
|
||||
<span class="font_1">确认收货</span>
|
||||
</div>
|
||||
<div
|
||||
class="flex-row items-center section_8 view space-x-4"
|
||||
v-if="obj.SALEBILL_STATE === 4000"
|
||||
>
|
||||
<div class="flex-row items-center section_8 view space-x-4" v-if="obj.SALEBILL_STATE === 4000">
|
||||
<img class="shrink-0 image_9" src="/static/images/recons/notice.svg" />
|
||||
<span class="font_1">去评价</span>
|
||||
</div>
|
||||
@ -305,17 +277,16 @@ export default {
|
||||
font-size: 28rpx;
|
||||
font-family: "PingFang SC";
|
||||
line-height: 40rpx;
|
||||
color: #1890ff;
|
||||
// color: #1890ff;
|
||||
color: #4BCB7E;
|
||||
}
|
||||
|
||||
.section_7 {
|
||||
padding: 24rpx 0 24rpx 24rpx;
|
||||
background-image: linear-gradient(
|
||||
270deg,
|
||||
background-image: linear-gradient(270deg,
|
||||
#ffffff 0%,
|
||||
#ffffff 95.72%,
|
||||
#ffffff00 100%
|
||||
);
|
||||
#ffffff00 100%);
|
||||
|
||||
.font_6 {
|
||||
font-size: 24rpx;
|
||||
|
||||
@ -322,7 +322,8 @@ export default {
|
||||
}
|
||||
|
||||
.tab_active {
|
||||
color: #1890ff;
|
||||
// color: #1890ff;
|
||||
color: #4BCB7E;
|
||||
font-weight: 600;
|
||||
position: relative;
|
||||
}
|
||||
@ -336,7 +337,8 @@ export default {
|
||||
margin-left: -24rpx;
|
||||
width: 48rpx;
|
||||
height: 6rpx;
|
||||
background: #1890ff;
|
||||
// background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
border-radius: 2rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@ -87,12 +87,12 @@
|
||||
<div class="order-box">
|
||||
<div class="order-top" @click="goShop">
|
||||
<div style="display: flex; align-items: center">
|
||||
<img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
|
||||
<!-- <img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
|
||||
width: 56rpx;
|
||||
height: 36rpx;
|
||||
vertical-align: middle;
|
||||
margin-right: 10rpx;
|
||||
" />
|
||||
" /> -->
|
||||
<span class="order-addr">{{ ShopAddress }}</span>
|
||||
</div>
|
||||
<van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
|
||||
@ -250,6 +250,7 @@ export default {
|
||||
wechatOpenId: _this.user.WECHATAPP_OPENID || "",
|
||||
wechatUnionId: _this.user.USER_UNIONID || "",
|
||||
oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
|
||||
COUPON_AMOUNT: _this.orderInfo.COUPON_AMOUNT,
|
||||
// addressId: this.addressInfo.MEMBERADDRESS_ID,
|
||||
// orderPersonTel: this.addressInfo.MOBILEPHONE,
|
||||
// couponCode: '',//优惠券
|
||||
@ -757,7 +758,7 @@ export default {
|
||||
|
||||
uni.setNavigationBarColor({
|
||||
frontColor: "#ffffff",
|
||||
backgroundColor: "#2fa4ff",
|
||||
backgroundColor: "#4BCB7E",
|
||||
animation: {
|
||||
duration: 30,
|
||||
timingFunc: "linear",
|
||||
@ -802,7 +803,7 @@ page {
|
||||
padding: 32rpx 32rpx 56rpx 32rpx;
|
||||
// background: linear-gradient(#c8b190, #a18153);
|
||||
// background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
|
||||
background: #2fa4ff;
|
||||
background: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
@ -846,7 +847,7 @@ page {
|
||||
height: 48rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 32rpx;
|
||||
margin-left: 36rpx;
|
||||
padding: 0 12rpx;
|
||||
}
|
||||
@ -1033,7 +1034,7 @@ page {
|
||||
}
|
||||
|
||||
.link-store {
|
||||
color: #c6a376;
|
||||
color: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
@ -1084,7 +1085,8 @@ hr {
|
||||
font-weight: normal;
|
||||
color: #fff;
|
||||
border-radius: 4rpx;
|
||||
background: #f5ba4f;
|
||||
// background: #f5ba4f;
|
||||
background: #4BCB7E;
|
||||
}
|
||||
|
||||
.order-info-h {
|
||||
|
||||
@ -128,12 +128,12 @@
|
||||
<div class="order-box">
|
||||
<div class="order-top" @click="goShop">
|
||||
<div style="display: flex; align-items: center">
|
||||
<img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
|
||||
<!-- <img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
|
||||
width: 56rpx;
|
||||
height: 36rpx;
|
||||
vertical-align: middle;
|
||||
margin-right: 10rpx;
|
||||
" />
|
||||
" /> -->
|
||||
<span class="order-addr">{{ ShopAddress }}</span>
|
||||
</div>
|
||||
<van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
|
||||
@ -905,7 +905,7 @@ export default {
|
||||
|
||||
uni.setNavigationBarColor({
|
||||
frontColor: "#ffffff",
|
||||
backgroundColor: "#2fa4ff",
|
||||
backgroundColor: "#4BCB7E",
|
||||
animation: {
|
||||
duration: 30,
|
||||
timingFunc: "linear",
|
||||
@ -950,7 +950,7 @@ page {
|
||||
padding: 32rpx 32rpx 56rpx 32rpx;
|
||||
// background: linear-gradient(#c8b190, #a18153);
|
||||
// background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
|
||||
background: #2fa4ff;
|
||||
background: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
@ -992,7 +992,7 @@ page {
|
||||
height: 48rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 32rpx;
|
||||
margin-left: 36rpx;
|
||||
padding: 0 12rpx;
|
||||
}
|
||||
@ -1189,7 +1189,8 @@ page {
|
||||
}
|
||||
|
||||
.link-store {
|
||||
color: #c6a376;
|
||||
// color: #c6a376;
|
||||
color: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@ -628,7 +628,7 @@ export default {
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 8rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
background-color: #4BCB7E;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
@ -482,7 +482,8 @@ export default {
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 8rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
// background-color: #FF6200;
|
||||
background-color: #4BCB7E;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
<template>
|
||||
<scroll-view class="main" scroll-y @scroll="handlePageScroll" :scroll-into-view="scrollView" scroll-with-animation
|
||||
@scrolltolower="handleScrollBottom">
|
||||
@scrolltolower="handleScrollBottom" :style="{
|
||||
backgroundImage:
|
||||
pageType === 'UnionMall'
|
||||
? ''
|
||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||
}">
|
||||
<div id="navItem" class="header" :style="{
|
||||
paddingTop: menu.top + menu.height + 'px',
|
||||
backgroundImage:
|
||||
pageType === 'UnionMall'
|
||||
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)'
|
||||
: 'url(https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/indexBg.png)',
|
||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||
backgroundSize:
|
||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 300rpx',
|
||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
|
||||
paddingBottom: '16rpx'
|
||||
}">
|
||||
<view class="headerTop" :style="{
|
||||
@ -17,19 +22,21 @@
|
||||
backgroundImage:
|
||||
pageType === 'UnionMall'
|
||||
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)'
|
||||
: 'url(https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/indexBg.png)',
|
||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||
backgroundSize:
|
||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 300rpx',
|
||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
|
||||
}">
|
||||
<image class="backArrow" src="/static/images/home/backArrowWhite.svg" @click="handleBackHome" />
|
||||
<view class="pageName">{{
|
||||
<image class="backArrow"
|
||||
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowWhite.svg' : '/static/images/home/backArrowblack.svg'"
|
||||
@click="handleBackHome" />
|
||||
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '' : '#000' }">{{
|
||||
pageType === "UnionMall" ? "工会之家" : "彩云驿商城"
|
||||
}}</view>
|
||||
<view class="backArrow"></view>
|
||||
</view>
|
||||
|
||||
<scroll-view class="typeBox" scroll-x>
|
||||
<div class="contentBox" :style="{
|
||||
<div :class="pageType === 'UnionMall' ? 'contentBox' : 'contentBox contentBox2'" :style="{
|
||||
height:
|
||||
shopTypeList.length < 5
|
||||
? '144rpx'
|
||||
@ -1811,10 +1818,10 @@ export default {
|
||||
width: calc(100% - 48rpx);
|
||||
margin: 24rpx 0 0 24rpx;
|
||||
//height: 392rpx;
|
||||
background: #fff;
|
||||
// background: #fff;
|
||||
border-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 2rpx;
|
||||
// padding: 2rpx;
|
||||
|
||||
.contentBox {
|
||||
width: 100%;
|
||||
@ -1822,6 +1829,7 @@ export default {
|
||||
box-sizing: border-box;
|
||||
min-height: 214rpx;
|
||||
padding: 30rpx;
|
||||
|
||||
background: linear-gradient(180deg,
|
||||
rgba(230, 240, 255, 1) 0%,
|
||||
rgba(255, 255, 255, 1) 50%,
|
||||
@ -1886,6 +1894,12 @@ export default {
|
||||
//margin-right: 0!important;
|
||||
}
|
||||
}
|
||||
|
||||
.contentBox2 {
|
||||
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/Special Offers.png");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -65,9 +65,10 @@
|
||||
" @touchstart="startTouch($event, index)" @touchmove="moveTouch" @touchend="endTouch" :key="index">
|
||||
<div class="detailLeft">
|
||||
<view style="display: flex">
|
||||
<radio v-if="pageType === 'normal'" :checked="item.select" color="#1890FF"
|
||||
<!-- color="#1890FF" -->
|
||||
<radio v-if="pageType === 'normal'" :checked="item.select" color="#4BCB7E"
|
||||
@click="handleChangeSelect(item)"></radio>
|
||||
<radio v-else :checked="item.selectDelete" color="#1890FF" @click="handleChangeDelete(item)"></radio>
|
||||
<radio v-else :checked="item.selectDelete" color="#4BCB7E" @click="handleChangeDelete(item)"></radio>
|
||||
<image class="leftIcon" :src="item.IMAGE_PATH ||
|
||||
item.DEFAULT_IMG ||
|
||||
'/static/images/home/defultImg.png'
|
||||
@ -136,10 +137,10 @@
|
||||
|
||||
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
|
||||
<div class="bottomLeft" v-if="pageType === 'normal'">
|
||||
<radio :checked="isAllSelect" color="#1890FF" @click="handleAllSelect" />全选
|
||||
<radio :checked="isAllSelect" color="#4BCB7E" @click="handleAllSelect" />全选
|
||||
</div>
|
||||
<div class="bottomLeft" v-else>
|
||||
<radio :checked="isAllDelete" color="#1890FF" @click="handleAllDelete" />全选
|
||||
<radio :checked="isAllDelete" color="#4BCB7E" @click="handleAllDelete" />全选
|
||||
</div>
|
||||
<div class="bottomRight" v-if="pageType === 'normal'">
|
||||
<text class="sum">合计</text>
|
||||
@ -158,7 +159,7 @@
|
||||
@click="handleClickAddressItem(item)">
|
||||
<view class="addressItemTop">
|
||||
<view class="itemTopLeft">
|
||||
<radio :checked="item.MEMBERADDRESS_ID === selectAddressId" color="#1890FF"
|
||||
<radio :checked="item.MEMBERADDRESS_ID === selectAddressId" color="#4BCB7E"
|
||||
@click="handleChangeAddress(item.MEMBERADDRESS_ID)" :disabled="!item.MEMBERADDRESS_CODE"></radio>
|
||||
<text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text>
|
||||
</view>
|
||||
@ -1231,27 +1232,36 @@ export default {
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
width: 210rpx;
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #ffffff;
|
||||
line-height: 22px;
|
||||
padding: 9px 28px;
|
||||
background: #1890ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 4px;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
padding: 24rpx 0;
|
||||
// line-height: 22px;
|
||||
// padding: 9px 28px;
|
||||
background: #4BCB7E;
|
||||
// border-radius: 4px;
|
||||
border-radius: 48rpx;
|
||||
margin-left: 16rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.deleteBtn {
|
||||
width: 210rpx;
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #1890ff;
|
||||
color: #33BA69;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
line-height: 22px;
|
||||
padding: 9px 38px;
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
padding: 24rpx 0;
|
||||
background: #E7F8EE;
|
||||
border-radius: 48rpx;
|
||||
margin-left: 16rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1334,15 +1344,17 @@ export default {
|
||||
height: 88rpx;
|
||||
width: 90%;
|
||||
line-height: 88rpx;
|
||||
background: linear-gradient(to right, #1f1f1f, #62605f);
|
||||
color: #f0dccf;
|
||||
// background: linear-gradient(to right, #1f1f1f, #62605f);
|
||||
// color: #f0dccf;
|
||||
background: #4BCB7E;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
position: fixed;
|
||||
bottom: 32rpx;
|
||||
transform: translateX(-50%);
|
||||
left: 50%;
|
||||
border-radius: 12rpx;
|
||||
border-radius: 48rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,10 @@
|
||||
<view class="main">
|
||||
<div class="header" :style="{ paddingTop: menu.top + 'px' }">
|
||||
<view class="headerTop" :style="{ height: menu.height + 'px' }">
|
||||
<image class="backArrow" src="/static/images/home/backArrowWhite.svg" @click="handleBackHome" />
|
||||
<view class="pageName">{{
|
||||
<image class="backArrow"
|
||||
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowWhite.svg' : '/static/images/home/backArrowblack.svg'"
|
||||
@click="handleBackHome" />
|
||||
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '' : '#000' }">{{
|
||||
pageType === "UnionMall" ? "工会之家" : "分类"
|
||||
}}</view>
|
||||
<view class="backArrow"></view>
|
||||
@ -23,7 +25,8 @@
|
||||
height: `calc(100vh - 50px - ${safeHeight}px - ${menu.top + 32 + 32 + 12 + 12
|
||||
}px)`,
|
||||
}">
|
||||
<scroll-view class="bigTabBox" scroll-x :scroll-into-view="bigTypeScroll">
|
||||
<scroll-view class="bigTabBox" scroll-x :scroll-into-view="bigTypeScroll"
|
||||
:style="{ background: pageType === 'UnionMall' ? '' : 'transparent' }">
|
||||
<div class="scrollBox">
|
||||
<!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
|
||||
|
||||
@ -139,7 +142,7 @@
|
||||
</div>
|
||||
<div class="addReduceBox" v-else>
|
||||
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
|
||||
<img class="optionBtn" src="/static/images/home/reduce.svg" />
|
||||
<img class="optionBtn" src="/static/images/home/newReduce.png" />
|
||||
</div>
|
||||
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
|
||||
<div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
|
||||
@ -148,7 +151,7 @@
|
||||
'_' +
|
||||
item.SELLERCOMMODITYTYPE_ID
|
||||
">
|
||||
<img class="optionBtn" src="/static/images/home/add.svg" />
|
||||
<img class="optionBtn" src="/static/images/home/newAddIcon.png" />
|
||||
</div>
|
||||
<div v-else class="shopState">已售罄</div>
|
||||
</div>
|
||||
@ -261,7 +264,8 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
||||
<shop-tabbar :page="'/pages/shopMallPage/shopType/index'" :pageType="pageType" :shopCarLength="shopCarListLength" />
|
||||
<shop-tabbar :page="'/pages/shopMallPage/shopType/index'" :pageType="pageType" :shopCarLength="shopCarListLength"
|
||||
:comeForm="comeForm" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -308,7 +312,8 @@ export default {
|
||||
imageLoadedMap: {},
|
||||
lastStartIndex: 0,
|
||||
hasWatched: 0,
|
||||
shopTopId: ''
|
||||
shopTopId: '',
|
||||
comeForm: "",// 来自
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -382,6 +387,11 @@ export default {
|
||||
this.leftId = query.leftId;
|
||||
}
|
||||
|
||||
if (query.comeForm) {
|
||||
this.comeForm = query.comeForm;
|
||||
}
|
||||
|
||||
|
||||
let shopCarList = [];
|
||||
if (this.pageType === "UnionMall") {
|
||||
shopCarList = this.$store.state.unionMyShopCar;
|
||||
@ -1527,11 +1537,15 @@ export default {
|
||||
.main {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-size: 100% 100vh;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.header {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
|
||||
// background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
|
||||
background: transparent;
|
||||
padding-bottom: 72rpx;
|
||||
|
||||
.headerTop {
|
||||
@ -1622,7 +1636,8 @@ export default {
|
||||
color: #fdfdfd;
|
||||
line-height: 20px;
|
||||
padding: 7px 16px;
|
||||
background: #1890ff;
|
||||
// background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
border-radius: 17px;
|
||||
}
|
||||
}
|
||||
@ -1733,12 +1748,13 @@ export default {
|
||||
}
|
||||
|
||||
.tab_active {
|
||||
border: 1px solid #1890ff;
|
||||
border: 1px solid #4BCB7E;
|
||||
}
|
||||
|
||||
.tab_txt_active {
|
||||
padding: 0 5px;
|
||||
background: #1890ff;
|
||||
// background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
border-radius: 8px;
|
||||
color: #fff !important;
|
||||
}
|
||||
@ -1811,7 +1827,7 @@ export default {
|
||||
background: #fff;
|
||||
|
||||
.smallItemTitle {
|
||||
color: #1890ff;
|
||||
color: #4BCB7E;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1823,7 +1839,7 @@ export default {
|
||||
height: 24px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
<template>
|
||||
<view class="main">
|
||||
<view class="fixedHeader" :style="{ height: menu.bottom + 16 + 'px' }">
|
||||
<image class="YDIcon" src="/static/images/home/yunnanLogo.svg" />
|
||||
</view>
|
||||
|
||||
<view class="fixedHeader" :style="{ height: menu.bottom + 'px' }"></view>
|
||||
<view class="pageTop" :style="{ paddingTop: menu.bottom + 16 + 'px' }">
|
||||
|
||||
<view class="pageTop" :style="{ paddingTop: menu.bottom + 'px' }">
|
||||
|
||||
<!-- 两个包一下 改一下样式 -->
|
||||
<view class="userTopInfo">
|
||||
<!-- 用户信息内容 -->
|
||||
<view class="userInfoBox">
|
||||
<!-- 头像内容 -->
|
||||
@ -22,12 +26,13 @@
|
||||
<view class="userInfo">
|
||||
<view class="userInfoLeft">
|
||||
<view class="userInfoLeftTop">
|
||||
<view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME || user.MEMBERSHIP_NAME
|
||||
|| "微信用户") :
|
||||
<view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME ||
|
||||
user.MEMBERSHIP_NAME || "微信用户") :
|
||||
(userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME ||
|
||||
"未填写名称") }}</view>
|
||||
<view class="userLevel">
|
||||
<image class="userLevelIcon" src="https://eshangtech.com/caiyunyiImg/levelIcon.png" />
|
||||
<image class="userLevelIcon"
|
||||
src="https://eshangtech.com/caiyunyiImg/levelIcon2.png" />
|
||||
<view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
|
||||
</view>
|
||||
<view class="userSetting" @click="hanldGoConfig">
|
||||
@ -42,7 +47,8 @@
|
||||
</view>
|
||||
|
||||
<view class="userInfoRight" @click="handleGoUserCode">
|
||||
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" />
|
||||
<!-- <image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" /> -->
|
||||
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userInfoCode.png" />
|
||||
<view class="userCodeText">会员码</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -73,6 +79,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<!-- {{ showErrorText || "" }} -->
|
||||
|
||||
<view class="pageContent">
|
||||
@ -1270,32 +1279,50 @@ export default {
|
||||
.main {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-color: #F5F5F5;
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
|
||||
.fixedHeader {
|
||||
width: 100vw;
|
||||
position: fixed;
|
||||
background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
// background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 428rpx;
|
||||
background-size: 100% 100vh;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 999999;
|
||||
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
|
||||
.YDIcon {
|
||||
width: 176rpx;
|
||||
height: 48rpx;
|
||||
margin-left: 32rpx;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.pageTop {
|
||||
width: 100vw;
|
||||
height: 456rpx;
|
||||
background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
// height: 456rpx;
|
||||
// background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 428rpx;
|
||||
background-size: 100% 100vh;
|
||||
box-sizing: border-box;
|
||||
|
||||
.userTopInfo {
|
||||
width: calc(100vw - 64rpx);
|
||||
margin-left: 32rpx;
|
||||
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%);
|
||||
border-radius: 16rpx;
|
||||
|
||||
.userInfoBox {
|
||||
width: 100%;
|
||||
height: 136rpx;
|
||||
// height: 136rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 0 42rpx;
|
||||
padding: 40rpx 42rpx;
|
||||
display: flex;
|
||||
|
||||
.headerImgBox {
|
||||
@ -1355,7 +1382,8 @@ export default {
|
||||
box-sizing: border-box;
|
||||
padding: 0 14rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #2D2D2D;
|
||||
// background-color: #2D2D2D;
|
||||
background-color: #fff;
|
||||
|
||||
.userLevelIcon {
|
||||
width: 24rpx;
|
||||
@ -1367,7 +1395,8 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 500;
|
||||
font-size: 24rpx;
|
||||
color: #F4DA7F;
|
||||
// color: #F4DA7F;
|
||||
color: #716F69;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -1399,27 +1428,31 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #2D2D2D;
|
||||
line-height: 34rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
padding: 4rpx 22rpx 2rpx 22rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #D8D8D8;
|
||||
// color: #2D2D2D;
|
||||
// background-color: #D8D8D8;
|
||||
color: #716F69;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.userCollect {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #2D2D2D;
|
||||
line-height: 34rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
padding: 4rpx 22rpx 2rpx 22rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #D8D8D8;
|
||||
margin-left: 18rpx;
|
||||
// color: #2D2D2D;
|
||||
// background-color: #D8D8D8;
|
||||
color: #716F69;
|
||||
background-color: #fff;
|
||||
|
||||
}
|
||||
}
|
||||
@ -1442,7 +1475,8 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #F2CC93;
|
||||
// color: #F2CC93;
|
||||
color: #fff;
|
||||
line-height: 34rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
@ -1454,16 +1488,18 @@ export default {
|
||||
.couponBox {
|
||||
width: 100%;
|
||||
height: 132rpx;
|
||||
margin-top: 36rpx;
|
||||
// margin-top: 36rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 0 30rpx;
|
||||
// padding: 0 30rpx;
|
||||
|
||||
.CouponContent {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #fff;
|
||||
box-shadow: 2rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.09);
|
||||
border-radius: 8rpx;
|
||||
// border-radius: 8rpx;
|
||||
border-bottom-left-radius: 16rpx;
|
||||
border-bottom-right-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 20rpx 0;
|
||||
display: flex;
|
||||
@ -1506,15 +1542,9 @@ export default {
|
||||
border-radius: 1rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
.pageContent {
|
||||
width: 100%;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<radio-group :value="radio">
|
||||
<radio
|
||||
style="width: 100%;background-color: #fff;margin-bottom: 24rpx;box-sizing: border-box;padding: 16rpx;border-radius: 16rpx;"
|
||||
color="#CAA97F" v-for="(item, i) in couponList" :key="i" :checked="radio === i"
|
||||
color="#4BCB7E" v-for="(item, i) in couponList" :key="i" :checked="radio === i"
|
||||
:disabled="item.CouponState === -1" @click="handleChange(i)"
|
||||
:class="{ 'coupon-bg': couponOrder <= item.WithAmount }">
|
||||
<div class="couponItem">
|
||||
@ -268,7 +268,7 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 34rpx;
|
||||
color: #FF3A3A;
|
||||
color: #4BCB7E;
|
||||
line-height: 48rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -279,7 +279,7 @@ export default {
|
||||
font-family: DINAlternate, DINAlternate;
|
||||
font-weight: bold;
|
||||
font-size: 48rpx;
|
||||
color: #FF3A3A;
|
||||
color: #4BCB7E;
|
||||
line-height: 56rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -529,7 +529,7 @@ export default {
|
||||
padding-left: 20rpx;
|
||||
|
||||
.pay-price {
|
||||
color: #ea3323;
|
||||
color: #4BCB7E;
|
||||
margin-left: 10rpx;
|
||||
font-size: 36rpx;
|
||||
font-weight: bolder;
|
||||
@ -541,7 +541,8 @@ export default {
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-size: 30rpx;
|
||||
background: linear-gradient(to right, #C5A671, #DCC194);
|
||||
// background: linear-gradient(to right, #C5A671, #DCC194);
|
||||
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -135,7 +135,7 @@
|
||||
<view class="addressItem" v-for="(item, index) in addressList" :key="index">
|
||||
<view class="addressItemTop">
|
||||
<view class="itemTopLeft">
|
||||
<radio :checked="item.MEMBERADDRESS_ID === selectAddressId" color="#1890FF"
|
||||
<radio :checked="item.MEMBERADDRESS_ID === selectAddressId" color="#4BCB7E"
|
||||
@click="handleChangeAddress(item.MEMBERADDRESS_ID)"></radio>
|
||||
<text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text>
|
||||
</view>
|
||||
@ -1306,15 +1306,18 @@ export default {
|
||||
}
|
||||
|
||||
.place_order_btn {
|
||||
width: 240rpx;
|
||||
height: 80rpx;
|
||||
background: #1890ff;
|
||||
width: 210rpx;
|
||||
// height: 80rpx;
|
||||
// background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
border-radius: 8rpx;
|
||||
margin-right: 32rpx;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 80rpx;
|
||||
// line-height: 80rpx;
|
||||
font-size: 32rpx;
|
||||
padding: 24rpx 0;
|
||||
border-radius: 48rpx;
|
||||
}
|
||||
|
||||
.back {
|
||||
@ -1413,15 +1416,17 @@ export default {
|
||||
height: 88rpx;
|
||||
width: 90%;
|
||||
line-height: 88rpx;
|
||||
background: linear-gradient(to right, #1f1f1f, #62605f);
|
||||
color: #f0dccf;
|
||||
// background: linear-gradient(to right, #1f1f1f, #62605f);
|
||||
// color: #f0dccf;
|
||||
background-color: #4BCB7E;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
position: fixed;
|
||||
bottom: 32rpx;
|
||||
transform: translateX(-50%);
|
||||
left: 50%;
|
||||
border-radius: 12rpx;
|
||||
border-radius: 48rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -67,8 +67,9 @@
|
||||
<div class="time-title">行驶方向</div>
|
||||
<radio-group :value="storeId" class="radio-box bb1">
|
||||
<!-- @change="onChangeStore" -->
|
||||
<!-- #CAA97F -->
|
||||
<label class="radio-list" v-for="(item, index) in nowStore.ShopList" :key="index">
|
||||
<radio color="#CAA97F" :value="item.SERVERPARTSHOP_ID" :checked="storeId === item.SERVERPARTSHOP_ID"
|
||||
<radio color="#4BCB7E" :value="item.SERVERPARTSHOP_ID" :checked="storeId === item.SERVERPARTSHOP_ID"
|
||||
@click="getFx(item)" />
|
||||
<!-- <span class="radio-unit">{{ item.SHOPNAME }}</span> -->
|
||||
<span class="radio-unit">{{ item.SHOPDIRECTION }}</span>
|
||||
@ -1147,8 +1148,9 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<!-- bodyColor = #CAA97F; -->
|
||||
<style lang="stylus" scoped>
|
||||
bodyColor = #CAA97F;
|
||||
bodyColor = #4BCB7E;
|
||||
|
||||
.disable {
|
||||
color: #999;
|
||||
@ -1201,29 +1203,29 @@ bodyColor = #CAA97F;
|
||||
|
||||
.yy-img, .ts-img {
|
||||
display: inline-block;
|
||||
width: 61rpx;
|
||||
height: 53rpx;
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
margin-right: 20rpx;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.yy-img {
|
||||
background: url('https://eshangtech.com/wanmeiyizhanImg/yy.png') no-repeat;
|
||||
background: url('https://eshangtech.com/caiyunyiImg/newyy.png') no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.yy-img-active {
|
||||
background: url('https://eshangtech.com/wanmeiyizhanImg/yy-a.png') no-repeat;
|
||||
background: url('https://eshangtech.com/caiyunyiImg/newyy-a.png') no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.ts-img {
|
||||
background: url('https://eshangtech.com/wanmeiyizhanImg/md.png') no-repeat;
|
||||
background: url('https://eshangtech.com/caiyunyiImg/newmd.png') no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.ts-img-active {
|
||||
background: url('https://eshangtech.com/wanmeiyizhanImg/md-a.png') no-repeat;
|
||||
background: url('https://eshangtech.com/caiyunyiImg/newmd-a.png') no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
}
|
||||
@ -1449,7 +1451,6 @@ bodyColor = #CAA97F;
|
||||
|
||||
.go-pay {
|
||||
border-top: 1rpx solid #eee;
|
||||
line-height: 100rpx;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
@ -1478,13 +1479,12 @@ bodyColor = #CAA97F;
|
||||
|
||||
.pay-right {
|
||||
width: 210rpx;
|
||||
height: 88rpx;
|
||||
line-height: 88rpx;
|
||||
text-align: center;
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
color: #ffffff;
|
||||
background: #ba922f;
|
||||
background: #4BCB7E;
|
||||
padding: 24rpx 0;
|
||||
border-radius: 48rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@ -372,7 +372,8 @@ export default {
|
||||
font-family: DINAlternate, DINAlternate;
|
||||
font-weight: bold;
|
||||
font-size: 72rpx;
|
||||
color: #ba922f;
|
||||
// color: #ba922f;
|
||||
color: #4BCB7E;
|
||||
line-height: 84rpx;
|
||||
text-align: justify;
|
||||
font-style: normal;
|
||||
|
||||
@ -123,7 +123,8 @@
|
||||
good.COMMODITY_ID +
|
||||
'_' +
|
||||
good.USERDEFINEDTYPE_ID
|
||||
" src="/static/images/home/reduce.png" />
|
||||
" src="/static/images/home/newReduce.png" />
|
||||
<!-- /static/images/home/reduce.png -->
|
||||
|
||||
<text class="acount" v-if="good.id">{{
|
||||
shoppingCart[good.USERDEFINEDTYPE_ID + "_" + good.id]
|
||||
@ -137,7 +138,8 @@
|
||||
good.COMMODITY_ID +
|
||||
'_' +
|
||||
good.USERDEFINEDTYPE_ID
|
||||
" class="icon" src="/static/images/home/add.png" />
|
||||
" class="icon" src="/static/images/home/newAddIcon.png" />
|
||||
<!-- /static/images/home/add.png -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -198,7 +200,8 @@
|
||||
<view class="content-left" @click="showShopCartFn">
|
||||
<view class="logo-wrapper">
|
||||
<view class="iconBox">
|
||||
<image class="shopCarFood" src="/static/images/home/shopCarFoodIcon.svg" />
|
||||
<!-- <image class="shopCarFood" src="/static/images/home/shopCarFoodIcon.svg" /> -->
|
||||
<image class="shopCarFood" src="https://eshangtech.com/caiyunyiImg/shopDai.png" />
|
||||
</view>
|
||||
|
||||
<!-- <van-icon
|
||||
@ -1968,7 +1971,8 @@ export default {
|
||||
font-weight: 700;
|
||||
color: #fff;
|
||||
// background: #ba922f;
|
||||
background: #009DFF;
|
||||
// background: #009DFF;
|
||||
background: #4BCB7E;
|
||||
box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
@ -2104,9 +2108,9 @@ export default {
|
||||
align-items: center;
|
||||
|
||||
.icon {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
background: #ba922f;
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
// background: #ba922f;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
@ -2192,7 +2196,7 @@ export default {
|
||||
.cart-decrease {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
border: 4rpx solid #f9efe2;
|
||||
border: 4rpx solid #4BCB7E;
|
||||
position: relative;
|
||||
border-radius: 50%;
|
||||
}
|
||||
@ -2201,7 +2205,7 @@ export default {
|
||||
content: "";
|
||||
height: 4rpx;
|
||||
width: 27rpx;
|
||||
background: #caa97f;
|
||||
background: #4BCB7E;
|
||||
display: block;
|
||||
position: absolute;
|
||||
left: 13rpx;
|
||||
@ -2212,7 +2216,7 @@ export default {
|
||||
.cart-add {
|
||||
width: 54rpx;
|
||||
height: 54rpx;
|
||||
background: #f9efe2;
|
||||
background: #4BCB7E;
|
||||
position: relative;
|
||||
border-radius: 50%;
|
||||
}
|
||||
@ -2221,7 +2225,7 @@ export default {
|
||||
content: "";
|
||||
height: 4rpx;
|
||||
width: 27rpx;
|
||||
background: #caa97f;
|
||||
background: #fff;
|
||||
display: block;
|
||||
position: absolute;
|
||||
left: 14rpx;
|
||||
@ -2233,7 +2237,7 @@ export default {
|
||||
content: "";
|
||||
height: 27rpx;
|
||||
width: 4rpx;
|
||||
background: #caa97f;
|
||||
background: #fff;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 14rpx;
|
||||
@ -2323,7 +2327,8 @@ export default {
|
||||
font-size: 18rpx;
|
||||
font-weight: 700;
|
||||
color: #fff;
|
||||
background: #009DFF;
|
||||
// background: #009DFF;
|
||||
background: #4BCB7E;
|
||||
box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
@ -2355,14 +2360,16 @@ export default {
|
||||
}
|
||||
|
||||
.content-right .pay-btn {
|
||||
height: 88rpx;
|
||||
line-height: 88rpx;
|
||||
// height: 88rpx;
|
||||
// line-height: 88rpx;
|
||||
padding: 24rpx 0;
|
||||
text-align: center;
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
color: #ffffff;
|
||||
// background: #ba922f;
|
||||
background: #009DFF;
|
||||
// background: #009DFF;
|
||||
background: #4BCB7E;
|
||||
border-radius: 48rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -153,7 +153,7 @@ export default {
|
||||
// 跳转商品详情页面
|
||||
goShowDetail(obj) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/shopPages/shopDetail/index?id=${obj.GoodsId}`,
|
||||
url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
<template>
|
||||
<view class="main">
|
||||
|
||||
<view class="fixedHeader" :style="{ height: menu.bottom + 'px' }"></view>
|
||||
<view class="fixedHeader" :style="{ height: menu.bottom + 16 + 'px' }">
|
||||
<image class="YDIcon" src="/static/images/home/yunnanLogo.svg" />
|
||||
</view>
|
||||
|
||||
<view class="pageTop" :style="{ paddingTop: menu.bottom + 'px' }">
|
||||
<view class="pageTop" :style="{ paddingTop: menu.bottom + 16 + 'px' }">
|
||||
|
||||
|
||||
<!-- 两个包一下 改一下样式 -->
|
||||
<view class="userTopInfo">
|
||||
<!-- 用户信息内容 -->
|
||||
<view class="userInfoBox">
|
||||
<!-- 头像内容 -->
|
||||
@ -25,7 +30,7 @@
|
||||
<view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME || user.MEMBERSHIP_NAME || "微信用户") :
|
||||
(userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME || "未填写名称") }}</view>
|
||||
<view class="userLevel">
|
||||
<image class="userLevelIcon" src="https://eshangtech.com/caiyunyiImg/levelIcon.png" />
|
||||
<image class="userLevelIcon" src="https://eshangtech.com/caiyunyiImg/levelIcon2.png" />
|
||||
<view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
|
||||
</view>
|
||||
<view class="userSetting" @click="hanldGoConfig">
|
||||
@ -39,7 +44,8 @@
|
||||
</view>
|
||||
|
||||
<view class="userInfoRight" @click="handleGoUserCode">
|
||||
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" />
|
||||
<!-- <image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" /> -->
|
||||
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userInfoCode.png" />
|
||||
<view class="userCodeText">会员码</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -70,6 +76,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<!-- {{ showErrorText || "" }} -->
|
||||
|
||||
<view class="pageContent">
|
||||
@ -1279,32 +1288,51 @@ export default {
|
||||
.main {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-color: #F5F5F5;
|
||||
// background-color: #F5F5F5;
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
|
||||
.fixedHeader {
|
||||
width: 100vw;
|
||||
position: fixed;
|
||||
background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
// background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 428rpx;
|
||||
background-size: 100% 100vh;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 999999;
|
||||
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
|
||||
.YDIcon {
|
||||
width: 176rpx;
|
||||
height: 48rpx;
|
||||
margin-left: 32rpx;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.pageTop {
|
||||
width: 100vw;
|
||||
height: 456rpx;
|
||||
background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
// height: 456rpx;
|
||||
// background-image: url('https://eshangtech.com/caiyunyiImg/userInfoBg.png');
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 428rpx;
|
||||
background-size: 100% 100vh;
|
||||
box-sizing: border-box;
|
||||
|
||||
.userTopInfo {
|
||||
width: calc(100vw - 64rpx);
|
||||
margin-left: 32rpx;
|
||||
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%);
|
||||
border-radius: 16rpx;
|
||||
|
||||
.userInfoBox {
|
||||
width: 100%;
|
||||
height: 136rpx;
|
||||
// height: 136rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 0 42rpx;
|
||||
padding: 40rpx 42rpx;
|
||||
display: flex;
|
||||
|
||||
.headerImgBox {
|
||||
@ -1364,7 +1392,8 @@ export default {
|
||||
box-sizing: border-box;
|
||||
padding: 0 14rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #2D2D2D;
|
||||
// background-color: #2D2D2D;
|
||||
background-color: #fff;
|
||||
|
||||
.userLevelIcon {
|
||||
width: 24rpx;
|
||||
@ -1376,7 +1405,8 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 500;
|
||||
font-size: 24rpx;
|
||||
color: #F4DA7F;
|
||||
// color: #F4DA7F;
|
||||
color: #716F69;
|
||||
line-height: 34rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
@ -1408,27 +1438,31 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #2D2D2D;
|
||||
line-height: 34rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
padding: 4rpx 22rpx 2rpx 22rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #D8D8D8;
|
||||
// color: #2D2D2D;
|
||||
// background-color: #D8D8D8;
|
||||
color: #716F69;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.userCollect {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #2D2D2D;
|
||||
line-height: 34rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
padding: 4rpx 22rpx 2rpx 22rpx;
|
||||
border-radius: 32rpx;
|
||||
background-color: #D8D8D8;
|
||||
margin-left: 18rpx;
|
||||
// color: #2D2D2D;
|
||||
// background-color: #D8D8D8;
|
||||
color: #716F69;
|
||||
background-color: #fff;
|
||||
|
||||
}
|
||||
}
|
||||
@ -1451,7 +1485,8 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #F2CC93;
|
||||
// color: #F2CC93;
|
||||
color: #fff;
|
||||
line-height: 34rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
@ -1463,16 +1498,18 @@ export default {
|
||||
.couponBox {
|
||||
width: 100%;
|
||||
height: 132rpx;
|
||||
margin-top: 36rpx;
|
||||
// margin-top: 36rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 0 30rpx;
|
||||
// padding: 0 30rpx;
|
||||
|
||||
.CouponContent {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #fff;
|
||||
box-shadow: 2rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.09);
|
||||
border-radius: 8rpx;
|
||||
// border-radius: 8rpx;
|
||||
border-bottom-left-radius: 16rpx;
|
||||
border-bottom-right-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 20rpx 0;
|
||||
display: flex;
|
||||
@ -1519,6 +1556,9 @@ export default {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
BIN
static/images/home/newAddIcon.png
Normal file
BIN
static/images/home/newAddIcon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
BIN
static/images/home/newReduce.png
Normal file
BIN
static/images/home/newReduce.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -151,6 +151,10 @@ var _default = {
|
||||
zIndex: {
|
||||
type: Number,
|
||||
default: 99
|
||||
},
|
||||
comeForm: {
|
||||
type: String,
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@ -175,9 +179,15 @@ var _default = {
|
||||
return;
|
||||
}
|
||||
if (pageIndex === '/pages/shopMallPage/index/index') {
|
||||
if (this.comeForm === 'index') {
|
||||
uni.redirectTo({
|
||||
url: '/pages/shopMallPage/index/index'
|
||||
});
|
||||
} else {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
}
|
||||
} else if (pageIndex === "/pages/shopMallPage/shopCar/index") {
|
||||
if (!this.user && !this.user.MEMBERSHIP_ID) {
|
||||
uni.showModal({
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
line-height: 28rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
background: #fa5151;
|
||||
background: #4BCB7E;
|
||||
border-radius: 16rpx;
|
||||
padding: 2rpx 8rpx;
|
||||
}
|
||||
|
||||
@ -1394,7 +1394,7 @@ var _default = {
|
||||
} else if (obj.value === 17) {
|
||||
if (obj.index === 0) {
|
||||
uni.navigateTo({
|
||||
url: "/pages/shopMallPage/shopType/index"
|
||||
url: "/pages/shopMallPage/shopType/index?comeForm=index"
|
||||
});
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -94,9 +94,9 @@ textarea.data-v-f752e738 {
|
||||
margin: 0 20rpx;
|
||||
}
|
||||
.tip-tag.active.data-v-f752e738 {
|
||||
color: #c7ac85;
|
||||
border-color: #c7ac85;
|
||||
background: #f7efe3;
|
||||
color: #4bcb7e;
|
||||
border-color: #4bcb7e;
|
||||
background: #e7f8ee;
|
||||
}
|
||||
.content-title.data-v-f752e738 {
|
||||
min-width: 168rpx;
|
||||
@ -136,6 +136,38 @@ textarea.data-v-f752e738 {
|
||||
line-height: 80rpx;
|
||||
text-align: center;
|
||||
}
|
||||
.btnBox.data-v-f752e738 {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0 32rpx;
|
||||
margin-top: 32rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.btnBox .saveBtn.data-v-f752e738 {
|
||||
width: calc(50% - 16rpx);
|
||||
border-radius: 48rpx;
|
||||
background-color: #07c160;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
padding: 24rpx 0;
|
||||
}
|
||||
.btnBox .loginOut.data-v-f752e738 {
|
||||
width: calc(50% - 16rpx);
|
||||
border-radius: 48rpx;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #07c160;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
padding: 24rpx 0;
|
||||
border: 1px solid #07c160;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.del-btn.data-v-f752e738 {
|
||||
margin: 0 auto;
|
||||
height: 80rpx;
|
||||
|
||||
@ -175,7 +175,7 @@
|
||||
.main .orderListBox .orderItem .orderItemTop .orderItemTopRight .statusBox.data-v-50f48f45 {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
font-size: 24rpx;
|
||||
color: #F83D3D;
|
||||
line-height: 40rpx;
|
||||
text-align: right;
|
||||
|
||||
@ -196,34 +196,6 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
var _default = {
|
||||
props: {
|
||||
obj: {}
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
font-size: 28rpx;
|
||||
font-family: "PingFang SC";
|
||||
line-height: 40rpx;
|
||||
color: #1890ff;
|
||||
color: #4BCB7E;
|
||||
}
|
||||
.list-item .section_7.data-v-b964e87e {
|
||||
padding: 24rpx 0 24rpx 24rpx;
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
flex: 1;
|
||||
}
|
||||
.main .fliter .tabs .tab_active.data-v-0dd499ae {
|
||||
color: #1890ff;
|
||||
color: #4BCB7E;
|
||||
font-weight: 600;
|
||||
position: relative;
|
||||
}
|
||||
@ -71,7 +71,7 @@
|
||||
margin-left: -24rpx;
|
||||
width: 48rpx;
|
||||
height: 6rpx;
|
||||
background: #1890ff;
|
||||
background: #4BCB7E;
|
||||
border-radius: 2rpx;
|
||||
}
|
||||
.main .fliter .sum_count.data-v-0dd499ae {
|
||||
|
||||
@ -271,6 +271,7 @@ var _default = {
|
||||
wechatOpenId: _this.user.WECHATAPP_OPENID || "",
|
||||
wechatUnionId: _this.user.USER_UNIONID || "",
|
||||
oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
|
||||
COUPON_AMOUNT: _this.orderInfo.COUPON_AMOUNT,
|
||||
// addressId: this.addressInfo.MEMBERADDRESS_ID,
|
||||
// orderPersonTel: this.addressInfo.MOBILEPHONE,
|
||||
// couponCode: '',//优惠券
|
||||
@ -822,7 +823,7 @@ var _default = {
|
||||
console.log("option", option);
|
||||
uni.setNavigationBarColor({
|
||||
frontColor: "#ffffff",
|
||||
backgroundColor: "#2fa4ff",
|
||||
backgroundColor: "#4BCB7E",
|
||||
animation: {
|
||||
duration: 30,
|
||||
timingFunc: "linear"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -12,7 +12,7 @@ page.data-v-4e9fff16 {
|
||||
}
|
||||
.order-status.data-v-4e9fff16 {
|
||||
padding: 32rpx 32rpx 56rpx 32rpx;
|
||||
background: #2fa4ff;
|
||||
background: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
@ -48,7 +48,7 @@ page.data-v-4e9fff16 {
|
||||
height: 48rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 32rpx;
|
||||
margin-left: 36rpx;
|
||||
padding: 0 12rpx;
|
||||
}
|
||||
@ -208,7 +208,7 @@ page.data-v-4e9fff16 {
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
.link-store.data-v-4e9fff16 {
|
||||
color: #c6a376;
|
||||
color: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
@ -251,7 +251,7 @@ page.data-v-4e9fff16 {
|
||||
font-weight: normal;
|
||||
color: #fff;
|
||||
border-radius: 4rpx;
|
||||
background: #f5ba4f;
|
||||
background: #4BCB7E;
|
||||
}
|
||||
.order-info-h.data-v-4e9fff16 {
|
||||
font-size: 28rpx;
|
||||
|
||||
@ -919,7 +919,7 @@ var _default = {
|
||||
console.log("option", option);
|
||||
uni.setNavigationBarColor({
|
||||
frontColor: "#ffffff",
|
||||
backgroundColor: "#2fa4ff",
|
||||
backgroundColor: "#4BCB7E",
|
||||
animation: {
|
||||
duration: 30,
|
||||
timingFunc: "linear"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -12,7 +12,7 @@ page.data-v-8f520710 {
|
||||
}
|
||||
.order-status.data-v-8f520710 {
|
||||
padding: 32rpx 32rpx 56rpx 32rpx;
|
||||
background: #2fa4ff;
|
||||
background: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
@ -48,7 +48,7 @@ page.data-v-8f520710 {
|
||||
height: 48rpx;
|
||||
text-align: center;
|
||||
line-height: 48rpx;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 32rpx;
|
||||
margin-left: 36rpx;
|
||||
padding: 0 12rpx;
|
||||
}
|
||||
@ -217,7 +217,7 @@ page.data-v-8f520710 {
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
.link-store.data-v-8f520710 {
|
||||
color: #c6a376;
|
||||
color: #4BCB7E;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@ -239,7 +239,7 @@
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 8rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
background-color: #4BCB7E;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
@ -171,7 +171,7 @@
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 8rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
background-color: #4BCB7E;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -110,10 +110,8 @@
|
||||
.main .header .typeBox.data-v-79c11018 {
|
||||
width: calc(100% - 48rpx);
|
||||
margin: 24rpx 0 0 24rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 2rpx;
|
||||
}
|
||||
.main .header .typeBox .contentBox.data-v-79c11018 {
|
||||
width: 100%;
|
||||
@ -165,6 +163,11 @@
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.main .header .typeBox .contentBox2.data-v-79c11018 {
|
||||
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/Special Offers.png");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
.main .pageContent.data-v-79c11018 {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
|
||||
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user