ylj/caiyunyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-08-07 19:03:51 +08:00
parent bd66c8865b
commit 81a29d01bc
114 changed files with 1077 additions and 893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/shopTabbar.vue
View File

@ -86,6 +86,10 @@ export default {
type: Number, type: Number,
default: 99, default: 99,
}, },
comeForm: {
type: String,
default: "",
},
}, },
watch: { watch: {
page: { page: {
@ -110,9 +114,16 @@ export default {
} }
if (pageIndex === '/pages/shopMallPage/index/index') { if (pageIndex === '/pages/shopMallPage/index/index') {
if (this.comeForm === 'index') {
uni.redirectTo({
url: '/pages/shopMallPage/index/index',
});
} else {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
}); });
}
} else if (pageIndex === "/pages/shopMallPage/shopCar/index") { } else if (pageIndex === "/pages/shopMallPage/shopCar/index") {
if (!this.user && !this.user.MEMBERSHIP_ID) { if (!this.user && !this.user.MEMBERSHIP_ID) {
uni.showModal({ uni.showModal({
@ -198,7 +209,8 @@ export default {
line-height: 28rpx; line-height: 28rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
background: #fa5151; // background: #fa5151;
background: #4BCB7E;
border-radius: 16rpx; border-radius: 16rpx;
padding: 2rpx 8rpx; padding: 2rpx 8rpx;
} }

11
pages/couponDetail/index.vue
View File

@ -67,8 +67,8 @@
<div class="btnBox"> <div class="btnBox">
<div class="btn" :style="{ <div class="btn" :style="{
background: couponMsg.takeState background: couponMsg.takeState
? 'rgba(186, 146, 47, 1)' ? '#4BCB7E'
: 'rgba(186, 146, 47, 0.4)', : '#E7F8EE',
}" @tap="getCoupon"> }" @tap="getCoupon">
{{ couponMsg.takeState ? "立即领取" : "已领取" }} {{ couponMsg.takeState ? "立即领取" : "已领取" }}
</div> </div>
@ -358,7 +358,7 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #ba922f; color: #4BCB7E;
line-height: 40rpx; line-height: 40rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -368,7 +368,7 @@ export default {
font-family: DINAlternate, DINAlternate; font-family: DINAlternate, DINAlternate;
font-weight: bold; font-weight: bold;
font-size: 64rpx; font-size: 64rpx;
color: #ba922f; color: #4BCB7E;
line-height: 72rpx; line-height: 72rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -382,7 +382,7 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #ba922f; color: #4BCB7E;
line-height: 40rpx; line-height: 40rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -474,6 +474,7 @@ export default {
font-style: normal; font-style: normal;
padding: 22rpx 0; padding: 22rpx 0;
border-radius: 6rpx; border-radius: 6rpx;
border-radius: 32rpx;
} }
} }
} }

4
pages/index/index.vue
View File

@ -186,7 +186,7 @@
</view> </view>
<view class="scenicBottom"> <view class="scenicBottom">
<view class="scenicLeft"> <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 class="scenicLabel">距离{{ ScenicData.ScenicDistance || '-' }}km</view>
</view> </view>
<view class="scenicRight" v-if="ScenicData.TICKET_PRICE > 0"> <view class="scenicRight" v-if="ScenicData.TICKET_PRICE > 0">
@ -1478,7 +1478,7 @@ export default {
} else if (obj.value === 17) { } else if (obj.value === 17) {
if (obj.index === 0) { if (obj.index === 0) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopMallPage/shopType/index`, url: `/pages/shopMallPage/shopType/index?comeForm=index`,
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({

55
pages/myAddress/newAdd/index.vue
View File

@ -12,7 +12,7 @@
<span class="content-title"></span> <span class="content-title"></span>
<radio-group :value="saveMsg.userSex" @change="changRadio" class="radio-box borbottom"> <radio-group :value="saveMsg.userSex" @change="changRadio" class="radio-box borbottom">
<view class="radio-list" v-for="(item, index) in sexList" :key="index"> <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> <text class="radio-unit">{{ item.name }}</text>
</view> </view>
</radio-group> </radio-group>
@ -75,8 +75,16 @@
/> --> /> -->
</div> </div>
</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" <uni-popup :show="pageMsg.isSelect" position="bottom" overlay="false" @close="handleClosePopup" ref="popup"
:safe-area="false" custom-style="height: 760rpx;"> :safe-area="false" custom-style="height: 760rpx;">
<div class="addressSelecct"> <div class="addressSelecct">
@ -803,9 +811,9 @@ textarea {
} }
.tip-tag.active { .tip-tag.active {
color: #c7ac85; color: #4BCB7E;
border-color: #c7ac85; border-color: #4BCB7E;
background: #f7efe3; background: #E7F8EE;
} }
.content-title { .content-title {
@ -855,6 +863,41 @@ textarea {
text-align: center; 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 { .del-btn {
margin: 0 auto; margin: 0 auto;
height: 80rpx; height: 80rpx;

2
pages/order/buyOrder/index.vue
View File

@ -709,7 +709,7 @@ export default {
.statusBox { .statusBox {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 24rpx;
color: #F83D3D; color: #F83D3D;
line-height: 40rpx; line-height: 40rpx;
text-align: right; text-align: right;

73
pages/order/foodOrder/components/orderItem.vue
View File

@ -1,14 +1,12 @@
<template> <template>
<div class="flex-col list-item space-y-12"> <div class="flex-col list-item space-y-12">
<div class="flex-row justify-between" style="margin-bottom: 8px"> <div class="flex-row justify-between" style="margin-bottom: 8px">
<div <div style="
style="
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
width: 100%; width: 100%;
" ">
>
<!-- <div class="font_41" v-if="obj.SALEBILL_STATE === 1010 || obj.SALEBILL_STATE === 3050">期望送达: <!-- <div class="font_41" v-if="obj.SALEBILL_STATE === 1010 || obj.SALEBILL_STATE === 3050">期望送达:
{{ obj.RESERVATION_DATE }}</div> {{ obj.RESERVATION_DATE }}</div>
<div class="font_41" v-if="obj.SALEBILL_STATE === 4000 || obj.SALEBILL_STATE === 5000"> <div class="font_41" v-if="obj.SALEBILL_STATE === 4000 || obj.SALEBILL_STATE === 5000">
@ -19,40 +17,27 @@
}}</span> }}</span>
</div> </div>
</div> </div>
<div <div class="flex-col justify-start items-start relative info"
class="flex-col justify-start items-start relative info" style="overflow: hidden; display: flex; align-items: center">
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">
>
<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 class="imgBox" v-for="(item, idx) in obj.GOODSList" :key="idx">
<view style="display: flex; flex-direction: column"> <view style="display: flex; flex-direction: column">
<!-- --> <!-- -->
<img <img class="equal-division-item" :src="item.IMAGE_URL ||
class="equal-division-item"
:src="
item.IMAGE_URL ||
'https://eshangtech.com/ShopICO/no-picture.png' 'https://eshangtech.com/ShopICO/no-picture.png'
" " />
/>
<text class="name">{{ item.COMMODITY_NAME }}</text> <text class="name">{{ item.COMMODITY_NAME }}</text>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<div <div class="section_7" style="
class="section_7"
style="
height: 82px; height: 82px;
width: 30%; width: 30%;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
" ">
>
<div> <div>
<span class="font_6">¥</span> <span class="font_6">¥</span>
<span class="font_5 text_7">{{ obj.ORDER_AMOUNT }}</span> <span class="font_5 text_7">{{ obj.ORDER_AMOUNT }}</span>
@ -60,15 +45,9 @@
<span class="font_7">共{{ obj.TOTAL_COUNT }}件</span> <span class="font_7">共{{ obj.TOTAL_COUNT }}件</span>
</div> </div>
</div> </div>
<div <div class="flex-row justify-between" style="display: flex; align-items: center">
class="flex-row justify-between"
style="display: flex; align-items: center"
>
<div style="flex: 1; margin-right: 4px"> <div style="flex: 1; margin-right: 4px">
<p <p class="self-start font_7" v-if="obj.SALEBILL_STATE !== 4000 && obj.SALEBILL_STATE !== 5000">
class="self-start font_7"
v-if="obj.SALEBILL_STATE !== 4000 && obj.SALEBILL_STATE !== 5000"
>
{{ obj.ORDER_DATE }} {{ obj.ORDER_DATE }}
</p> </p>
<view class="desc" v-if="obj.SALEBILL_DESC"> <view class="desc" v-if="obj.SALEBILL_DESC">
@ -79,19 +58,12 @@
<img class="shrink-0 image_9" src="/static/images/recons/deliver.svg" /> <img class="shrink-0 image_9" src="/static/images/recons/deliver.svg" />
<span class="font_1">催单</span> <span class="font_1">催单</span>
</div> --> </div> -->
<div <div class="section_8 view space-x-4" style="display: flex; align-items: center"
class="section_8 view space-x-4" v-if="obj.SALEBILL_STATE === 2010" @click.stop="handleConfirmReceipt(obj)">
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" /> <img class="shrink-0 image_9" src="/static/images/home/notice.svg" />
<span class="font_1">确认收货</span> <span class="font_1">确认收货</span>
</div> </div>
<div <div class="flex-row items-center section_8 view space-x-4" v-if="obj.SALEBILL_STATE === 4000">
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" /> <img class="shrink-0 image_9" src="/static/images/recons/notice.svg" />
<span class="font_1">去评价</span> <span class="font_1">去评价</span>
</div> </div>
@ -181,7 +153,7 @@ export default {
this.isCuntTime = true; this.isCuntTime = true;
} }
}, },
countDownTime() {}, countDownTime() { },
handleToEvaluate(obj) { handleToEvaluate(obj) {
console.log("obj", obj); console.log("obj", obj);
uni.navigateTo({ uni.navigateTo({
@ -237,7 +209,7 @@ export default {
} }
.space-x-8 { .space-x-8 {
& > *:not(:first-child) { &>*:not(:first-child) {
margin-left: 16rpx; margin-left: 16rpx;
} }
@ -305,17 +277,16 @@ export default {
font-size: 28rpx; font-size: 28rpx;
font-family: "PingFang SC"; font-family: "PingFang SC";
line-height: 40rpx; line-height: 40rpx;
color: #1890ff; // color: #1890ff;
color: #4BCB7E;
} }
.section_7 { .section_7 {
padding: 24rpx 0 24rpx 24rpx; padding: 24rpx 0 24rpx 24rpx;
background-image: linear-gradient( background-image: linear-gradient(270deg,
270deg,
#ffffff 0%, #ffffff 0%,
#ffffff 95.72%, #ffffff 95.72%,
#ffffff00 100% #ffffff00 100%);
);
.font_6 { .font_6 {
font-size: 24rpx; font-size: 24rpx;
@ -390,14 +361,14 @@ export default {
} }
.space-x-4 { .space-x-4 {
& > *:not(:first-child) { &>*:not(:first-child) {
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
} }
.space-y-12 { .space-y-12 {
& > *:not(:first-child) { &>*:not(:first-child) {
margin-top: 24rpx; margin-top: 24rpx;
} }
} }

6
pages/order/foodOrder/index.vue
View File

@ -322,7 +322,8 @@ export default {
} }
.tab_active { .tab_active {
color: #1890ff; // color: #1890ff;
color: #4BCB7E;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
} }
@ -336,7 +337,8 @@ export default {
margin-left: -24rpx; margin-left: -24rpx;
width: 48rpx; width: 48rpx;
height: 6rpx; height: 6rpx;
background: #1890ff; // background: #1890ff;
background: #4BCB7E;
border-radius: 2rpx; border-radius: 2rpx;
} }
} }

16
pages/order/orderFoodDetail/index.vue
View File

@ -87,12 +87,12 @@
<div class="order-box"> <div class="order-box">
<div class="order-top" @click="goShop"> <div class="order-top" @click="goShop">
<div style="display: flex; align-items: center"> <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; width: 56rpx;
height: 36rpx; height: 36rpx;
vertical-align: middle; vertical-align: middle;
margin-right: 10rpx; margin-right: 10rpx;
" /> " /> -->
<span class="order-addr">{{ ShopAddress }}</span> <span class="order-addr">{{ ShopAddress }}</span>
</div> </div>
<van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" /> <van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
@ -250,6 +250,7 @@ export default {
wechatOpenId: _this.user.WECHATAPP_OPENID || "", wechatOpenId: _this.user.WECHATAPP_OPENID || "",
wechatUnionId: _this.user.USER_UNIONID || "", wechatUnionId: _this.user.USER_UNIONID || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE, oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
COUPON_AMOUNT: _this.orderInfo.COUPON_AMOUNT,
// addressId: this.addressInfo.MEMBERADDRESS_ID, // addressId: this.addressInfo.MEMBERADDRESS_ID,
// orderPersonTel: this.addressInfo.MOBILEPHONE, // orderPersonTel: this.addressInfo.MOBILEPHONE,
// couponCode: '',//优惠券 // couponCode: '',//优惠券
@ -757,7 +758,7 @@ export default {
uni.setNavigationBarColor({ uni.setNavigationBarColor({
frontColor: "#ffffff", frontColor: "#ffffff",
backgroundColor: "#2fa4ff", backgroundColor: "#4BCB7E",
animation: { animation: {
duration: 30, duration: 30,
timingFunc: "linear", timingFunc: "linear",
@ -802,7 +803,7 @@ page {
padding: 32rpx 32rpx 56rpx 32rpx; padding: 32rpx 32rpx 56rpx 32rpx;
// background: linear-gradient(#c8b190, #a18153); // background: linear-gradient(#c8b190, #a18153);
// background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%); // background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
background: #2fa4ff; background: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -846,7 +847,7 @@ page {
height: 48rpx; height: 48rpx;
text-align: center; text-align: center;
line-height: 48rpx; line-height: 48rpx;
border-radius: 6rpx; border-radius: 32rpx;
margin-left: 36rpx; margin-left: 36rpx;
padding: 0 12rpx; padding: 0 12rpx;
} }
@ -1033,7 +1034,7 @@ page {
} }
.link-store { .link-store {
color: #c6a376; color: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -1084,7 +1085,8 @@ hr {
font-weight: normal; font-weight: normal;
color: #fff; color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
background: #f5ba4f; // background: #f5ba4f;
background: #4BCB7E;
} }
.order-info-h { .order-info-h {

13
pages/order/orderdetail/index.vue
View File

@ -128,12 +128,12 @@
<div class="order-box"> <div class="order-box">
<div class="order-top" @click="goShop"> <div class="order-top" @click="goShop">
<div style="display: flex; align-items: center"> <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; width: 56rpx;
height: 36rpx; height: 36rpx;
vertical-align: middle; vertical-align: middle;
margin-right: 10rpx; margin-right: 10rpx;
" /> " /> -->
<span class="order-addr">{{ ShopAddress }}</span> <span class="order-addr">{{ ShopAddress }}</span>
</div> </div>
<van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" /> <van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
@ -905,7 +905,7 @@ export default {
uni.setNavigationBarColor({ uni.setNavigationBarColor({
frontColor: "#ffffff", frontColor: "#ffffff",
backgroundColor: "#2fa4ff", backgroundColor: "#4BCB7E",
animation: { animation: {
duration: 30, duration: 30,
timingFunc: "linear", timingFunc: "linear",
@ -950,7 +950,7 @@ page {
padding: 32rpx 32rpx 56rpx 32rpx; padding: 32rpx 32rpx 56rpx 32rpx;
// background: linear-gradient(#c8b190, #a18153); // background: linear-gradient(#c8b190, #a18153);
// background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%); // background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
background: #2fa4ff; background: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -992,7 +992,7 @@ page {
height: 48rpx; height: 48rpx;
text-align: center; text-align: center;
line-height: 48rpx; line-height: 48rpx;
border-radius: 6rpx; border-radius: 32rpx;
margin-left: 36rpx; margin-left: 36rpx;
padding: 0 12rpx; padding: 0 12rpx;
} }
@ -1189,7 +1189,8 @@ page {
} }
.link-store { .link-store {
color: #c6a376; // color: #c6a376;
color: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
} }

2
pages/reservationOrder/index.vue
View File

@ -628,7 +628,7 @@ export default {
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
padding: 8rpx 28rpx; padding: 8rpx 28rpx;
background-color: #FF6200; background-color: #4BCB7E;
border-radius: 32rpx; border-radius: 32rpx;
display: inline-block; display: inline-block;
} }

3
pages/serviceList/index.vue
View File

@ -482,7 +482,8 @@ export default {
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
padding: 8rpx 28rpx; padding: 8rpx 28rpx;
background-color: #FF6200; // background-color: #FF6200;
background-color: #4BCB7E;
border-radius: 32rpx; border-radius: 32rpx;
display: inline-block; display: inline-block;
} }

34
pages/shopMallPage/index/index.vue
View File

@ -1,14 +1,19 @@
<template> <template>
<scroll-view class="main" scroll-y @scroll="handlePageScroll" :scroll-into-view="scrollView" scroll-with-animation <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="{ <div id="navItem" class="header" :style="{
paddingTop: menu.top + menu.height + 'px', paddingTop: menu.top + menu.height + 'px',
backgroundImage: backgroundImage:
pageType === 'UnionMall' pageType === 'UnionMall'
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)' ? '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: backgroundSize:
pageType === 'UnionMall' ? '100% 480rpx' : '100% 300rpx', pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
paddingBottom: '16rpx' paddingBottom: '16rpx'
}"> }">
<view class="headerTop" :style="{ <view class="headerTop" :style="{
@ -17,19 +22,21 @@
backgroundImage: backgroundImage:
pageType === 'UnionMall' pageType === 'UnionMall'
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)' ? '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: backgroundSize:
pageType === 'UnionMall' ? '100% 480rpx' : '100% 300rpx', pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
}"> }">
<image class="backArrow" src="/static/images/home/backArrowWhite.svg" @click="handleBackHome" /> <image class="backArrow"
<view class="pageName">{{ :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" ? "工会之家" : "彩云驿商城" pageType === "UnionMall" ? "工会之家" : "彩云驿商城"
}}</view> }}</view>
<view class="backArrow"></view> <view class="backArrow"></view>
</view> </view>
<scroll-view class="typeBox" scroll-x> <scroll-view class="typeBox" scroll-x>
<div class="contentBox" :style="{ <div :class="pageType === 'UnionMall' ? 'contentBox' : 'contentBox contentBox2'" :style="{
height: height:
shopTypeList.length < 5 shopTypeList.length < 5
? '144rpx' ? '144rpx'
@ -1811,10 +1818,10 @@ export default {
width: calc(100% - 48rpx); width: calc(100% - 48rpx);
margin: 24rpx 0 0 24rpx; margin: 24rpx 0 0 24rpx;
//height: 392rpx; //height: 392rpx;
background: #fff; // background: #fff;
border-radius: 16rpx; border-radius: 16rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 2rpx; // padding: 2rpx;
.contentBox { .contentBox {
width: 100%; width: 100%;
@ -1822,6 +1829,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
min-height: 214rpx; min-height: 214rpx;
padding: 30rpx; padding: 30rpx;
background: linear-gradient(180deg, background: linear-gradient(180deg,
rgba(230, 240, 255, 1) 0%, rgba(230, 240, 255, 1) 0%,
rgba(255, 255, 255, 1) 50%, rgba(255, 255, 255, 1) 50%,
@ -1886,6 +1894,12 @@ export default {
//margin-right: 0!important; //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%;
}
} }
} }

46
pages/shopMallPage/shopCar/index.vue
View File

@ -65,9 +65,10 @@
" @touchstart="startTouch($event, index)" @touchmove="moveTouch" @touchend="endTouch" :key="index"> " @touchstart="startTouch($event, index)" @touchmove="moveTouch" @touchend="endTouch" :key="index">
<div class="detailLeft"> <div class="detailLeft">
<view style="display: flex"> <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> @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 || <image class="leftIcon" :src="item.IMAGE_PATH ||
item.DEFAULT_IMG || item.DEFAULT_IMG ||
'/static/images/home/defultImg.png' '/static/images/home/defultImg.png'
@ -136,10 +137,10 @@
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }"> <div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
<div class="bottomLeft" v-if="pageType === 'normal'"> <div class="bottomLeft" v-if="pageType === 'normal'">
<radio :checked="isAllSelect" color="#1890FF" @click="handleAllSelect" />全选 <radio :checked="isAllSelect" color="#4BCB7E" @click="handleAllSelect" />全选
</div> </div>
<div class="bottomLeft" v-else> <div class="bottomLeft" v-else>
<radio :checked="isAllDelete" color="#1890FF" @click="handleAllDelete" />全选 <radio :checked="isAllDelete" color="#4BCB7E" @click="handleAllDelete" />全选
</div> </div>
<div class="bottomRight" v-if="pageType === 'normal'"> <div class="bottomRight" v-if="pageType === 'normal'">
<text class="sum">合计</text> <text class="sum">合计</text>
@ -158,7 +159,7 @@
@click="handleClickAddressItem(item)"> @click="handleClickAddressItem(item)">
<view class="addressItemTop"> <view class="addressItemTop">
<view class="itemTopLeft"> <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> @click="handleChangeAddress(item.MEMBERADDRESS_ID)" :disabled="!item.MEMBERADDRESS_CODE"></radio>
<text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text> <text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text>
</view> </view>
@ -1231,27 +1232,36 @@ export default {
} }
.submitBtn { .submitBtn {
width: 210rpx;
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
line-height: 22px; text-align: center;
padding: 9px 28px; font-style: normal;
background: #1890ff; padding: 24rpx 0;
border-radius: 4px; // line-height: 22px;
margin-left: 4px; // padding: 9px 28px;
background: #4BCB7E;
// border-radius: 4px;
border-radius: 48rpx;
margin-left: 16rpx;
} }
} }
.deleteBtn { .deleteBtn {
width: 210rpx;
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #1890ff; color: #33BA69;
text-align: center;
font-style: normal;
line-height: 22px; line-height: 22px;
padding: 9px 38px; padding: 24rpx 0;
background: #e7f3ff; background: #E7F8EE;
border-radius: 4px; border-radius: 48rpx;
margin-left: 16rpx;
} }
} }
@ -1334,15 +1344,17 @@ export default {
height: 88rpx; height: 88rpx;
width: 90%; width: 90%;
line-height: 88rpx; line-height: 88rpx;
background: linear-gradient(to right, #1f1f1f, #62605f); // background: linear-gradient(to right, #1f1f1f, #62605f);
color: #f0dccf; // color: #f0dccf;
background: #4BCB7E;
color: #fff;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
position: fixed; position: fixed;
bottom: 32rpx; bottom: 32rpx;
transform: translateX(-50%); transform: translateX(-50%);
left: 50%; left: 50%;
border-radius: 12rpx; border-radius: 48rpx;
} }
} }
} }

42
pages/shopMallPage/shopType/index.vue
View File

@ -2,8 +2,10 @@
<view class="main"> <view class="main">
<div class="header" :style="{ paddingTop: menu.top + 'px' }"> <div class="header" :style="{ paddingTop: menu.top + 'px' }">
<view class="headerTop" :style="{ height: menu.height + 'px' }"> <view class="headerTop" :style="{ height: menu.height + 'px' }">
<image class="backArrow" src="/static/images/home/backArrowWhite.svg" @click="handleBackHome" /> <image class="backArrow"
<view class="pageName">{{ :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" ? "工会之家" : "分类" pageType === "UnionMall" ? "工会之家" : "分类"
}}</view> }}</view>
<view class="backArrow"></view> <view class="backArrow"></view>
@ -23,7 +25,8 @@
height: `calc(100vh - 50px - ${safeHeight}px - ${menu.top + 32 + 32 + 12 + 12 height: `calc(100vh - 50px - ${safeHeight}px - ${menu.top + 32 + 32 + 12 + 12
}px)`, }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"> <div class="scrollBox">
<!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" --> <!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
@ -139,7 +142,7 @@
</div> </div>
<div class="addReduceBox" v-else> <div class="addReduceBox" v-else>
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce"> <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> </div>
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span> <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)" <div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
@ -148,7 +151,7 @@
'_' + '_' +
item.SELLERCOMMODITYTYPE_ID item.SELLERCOMMODITYTYPE_ID
"> ">
<img class="optionBtn" src="/static/images/home/add.svg" /> <img class="optionBtn" src="/static/images/home/newAddIcon.png" />
</div> </div>
<div v-else class="shopState">已售罄</div> <div v-else class="shopState">已售罄</div>
</div> </div>
@ -261,7 +264,8 @@
</view> </view>
</uni-popup> </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> </view>
</template> </template>
@ -308,7 +312,8 @@ export default {
imageLoadedMap: {}, imageLoadedMap: {},
lastStartIndex: 0, lastStartIndex: 0,
hasWatched: 0, hasWatched: 0,
shopTopId: '' shopTopId: '',
comeForm: "",// 来自
}; };
}, },
watch: { watch: {
@ -382,6 +387,11 @@ export default {
this.leftId = query.leftId; this.leftId = query.leftId;
} }
if (query.comeForm) {
this.comeForm = query.comeForm;
}
let shopCarList = []; let shopCarList = [];
if (this.pageType === "UnionMall") { if (this.pageType === "UnionMall") {
shopCarList = this.$store.state.unionMyShopCar; shopCarList = this.$store.state.unionMyShopCar;
@ -1527,11 +1537,15 @@ export default {
.main { .main {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
background-size: 100% 100vh;
background-repeat: no-repeat;
.header { .header {
width: 100%; width: 100%;
box-sizing: border-box; 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; padding-bottom: 72rpx;
.headerTop { .headerTop {
@ -1622,7 +1636,8 @@ export default {
color: #fdfdfd; color: #fdfdfd;
line-height: 20px; line-height: 20px;
padding: 7px 16px; padding: 7px 16px;
background: #1890ff; // background: #1890ff;
background: #4BCB7E;
border-radius: 17px; border-radius: 17px;
} }
} }
@ -1733,12 +1748,13 @@ export default {
} }
.tab_active { .tab_active {
border: 1px solid #1890ff; border: 1px solid #4BCB7E;
} }
.tab_txt_active { .tab_txt_active {
padding: 0 5px; padding: 0 5px;
background: #1890ff; // background: #1890ff;
background: #4BCB7E;
border-radius: 8px; border-radius: 8px;
color: #fff !important; color: #fff !important;
} }
@ -1811,7 +1827,7 @@ export default {
background: #fff; background: #fff;
.smallItemTitle { .smallItemTitle {
color: #1890ff; color: #4BCB7E;
} }
} }
@ -1823,7 +1839,7 @@ export default {
height: 24px; height: 24px;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
background: #1890ff; background: #4BCB7E;
} }
} }

92
pages/shopMallPage/user/newIndex.vue
View File

@ -1,10 +1,14 @@
<template> <template>
<view class="main"> <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"> <view class="userInfoBox">
<!-- 头像内容 --> <!-- 头像内容 -->
@ -22,12 +26,13 @@
<view class="userInfo"> <view class="userInfo">
<view class="userInfoLeft"> <view class="userInfoLeft">
<view class="userInfoLeftTop"> <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 || (userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME ||
"未填写名称") }}</view> "未填写名称") }}</view>
<view class="userLevel"> <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 class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
</view> </view>
<view class="userSetting" @click="hanldGoConfig"> <view class="userSetting" @click="hanldGoConfig">
@ -42,7 +47,8 @@
</view> </view>
<view class="userInfoRight" @click="handleGoUserCode"> <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 class="userCodeText">会员码</view>
</view> </view>
</view> </view>
@ -73,6 +79,9 @@
</view> </view>
</view> </view>
</view>
<!-- {{ showErrorText || "" }} --> <!-- {{ showErrorText || "" }} -->
<view class="pageContent"> <view class="pageContent">
@ -1270,32 +1279,50 @@ export default {
.main { .main {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: #F5F5F5; background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
.fixedHeader { .fixedHeader {
width: 100vw; width: 100vw;
position: fixed; 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-repeat: no-repeat;
background-size: 100% 428rpx; background-size: 100% 100vh;
top: 0; top: 0;
left: 0; left: 0;
z-index: 999999; z-index: 999999;
display: flex;
align-items: flex-end;
.YDIcon {
width: 176rpx;
height: 48rpx;
margin-left: 32rpx;
margin-bottom: 16px;
}
} }
.pageTop { .pageTop {
width: 100vw; width: 100vw;
height: 456rpx; // height: 456rpx;
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-repeat: no-repeat;
background-size: 100% 428rpx; background-size: 100% 100vh;
box-sizing: border-box; box-sizing: border-box;
.userTopInfo {
width: calc(100vw - 64rpx);
margin-left: 32rpx;
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%);
border-radius: 16rpx;
.userInfoBox { .userInfoBox {
width: 100%; width: 100%;
height: 136rpx; // height: 136rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 42rpx; padding: 40rpx 42rpx;
display: flex; display: flex;
.headerImgBox { .headerImgBox {
@ -1355,7 +1382,8 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 0 14rpx; padding: 0 14rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #2D2D2D; // background-color: #2D2D2D;
background-color: #fff;
.userLevelIcon { .userLevelIcon {
width: 24rpx; width: 24rpx;
@ -1367,7 +1395,8 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #F4DA7F; // color: #F4DA7F;
color: #716F69;
line-height: 34rpx; line-height: 34rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -1399,27 +1428,31 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #2D2D2D;
line-height: 34rpx; line-height: 34rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #D8D8D8; // color: #2D2D2D;
// background-color: #D8D8D8;
color: #716F69;
background-color: #fff;
} }
.userCollect { .userCollect {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #2D2D2D;
line-height: 34rpx; line-height: 34rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #D8D8D8;
margin-left: 18rpx; 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-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #F2CC93; // color: #F2CC93;
color: #fff;
line-height: 34rpx; line-height: 34rpx;
text-align: center; text-align: center;
font-style: normal; font-style: normal;
@ -1454,16 +1488,18 @@ export default {
.couponBox { .couponBox {
width: 100%; width: 100%;
height: 132rpx; height: 132rpx;
margin-top: 36rpx; // margin-top: 36rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; // padding: 0 30rpx;
.CouponContent { .CouponContent {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
box-shadow: 2rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.09); 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; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
display: flex; display: flex;
@ -1506,15 +1542,9 @@ export default {
border-radius: 1rpx; border-radius: 1rpx;
} }
} }
} }
} }
}
.pageContent { .pageContent {
width: 100%; width: 100%;

11
pages/shopPages/coupon/index.vue
View File

@ -4,7 +4,7 @@
<radio-group :value="radio"> <radio-group :value="radio">
<radio <radio
style="width: 100%;background-color: #fff;margin-bottom: 24rpx;box-sizing: border-box;padding: 16rpx;border-radius: 16rpx;" 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)" :disabled="item.CouponState === -1" @click="handleChange(i)"
:class="{ 'coupon-bg': couponOrder <= item.WithAmount }"> :class="{ 'coupon-bg': couponOrder <= item.WithAmount }">
<div class="couponItem"> <div class="couponItem">
@ -268,7 +268,7 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 34rpx; font-size: 34rpx;
color: #FF3A3A; color: #4BCB7E;
line-height: 48rpx; line-height: 48rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -279,7 +279,7 @@ export default {
font-family: DINAlternate, DINAlternate; font-family: DINAlternate, DINAlternate;
font-weight: bold; font-weight: bold;
font-size: 48rpx; font-size: 48rpx;
color: #FF3A3A; color: #4BCB7E;
line-height: 56rpx; line-height: 56rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -529,7 +529,7 @@ export default {
padding-left: 20rpx; padding-left: 20rpx;
.pay-price { .pay-price {
color: #ea3323; color: #4BCB7E;
margin-left: 10rpx; margin-left: 10rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: bolder; font-weight: bolder;
@ -541,7 +541,8 @@ export default {
text-align: center; text-align: center;
color: #fff; color: #fff;
font-size: 30rpx; 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> </style>

21
pages/shopPages/settlement/index.vue
View File

@ -135,7 +135,7 @@
<view class="addressItem" v-for="(item, index) in addressList" :key="index"> <view class="addressItem" v-for="(item, index) in addressList" :key="index">
<view class="addressItemTop"> <view class="addressItemTop">
<view class="itemTopLeft"> <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> @click="handleChangeAddress(item.MEMBERADDRESS_ID)"></radio>
<text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text> <text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text>
</view> </view>
@ -1306,15 +1306,18 @@ export default {
} }
.place_order_btn { .place_order_btn {
width: 240rpx; width: 210rpx;
height: 80rpx; // height: 80rpx;
background: #1890ff; // background: #1890ff;
background: #4BCB7E;
border-radius: 8rpx; border-radius: 8rpx;
margin-right: 32rpx; margin-right: 32rpx;
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 80rpx; // line-height: 80rpx;
font-size: 32rpx; font-size: 32rpx;
padding: 24rpx 0;
border-radius: 48rpx;
} }
.back { .back {
@ -1413,15 +1416,17 @@ export default {
height: 88rpx; height: 88rpx;
width: 90%; width: 90%;
line-height: 88rpx; line-height: 88rpx;
background: linear-gradient(to right, #1f1f1f, #62605f); // background: linear-gradient(to right, #1f1f1f, #62605f);
color: #f0dccf; // color: #f0dccf;
background-color: #4BCB7E;
color: #fff;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
position: fixed; position: fixed;
bottom: 32rpx; bottom: 32rpx;
transform: translateX(-50%); transform: translateX(-50%);
left: 50%; left: 50%;
border-radius: 12rpx; border-radius: 48rpx;
} }
} }
} }

24
pages/shopPages/settlementFood/index.vue
View File

@ -67,8 +67,9 @@
<div class="time-title">行驶方向</div> <div class="time-title">行驶方向</div>
<radio-group :value="storeId" class="radio-box bb1"> <radio-group :value="storeId" class="radio-box bb1">
<!-- @change="onChangeStore" --> <!-- @change="onChangeStore" -->
<!-- #CAA97F -->
<label class="radio-list" v-for="(item, index) in nowStore.ShopList" :key="index"> <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)" /> @click="getFx(item)" />
<!-- <span class="radio-unit">{{ item.SHOPNAME }}</span> --> <!-- <span class="radio-unit">{{ item.SHOPNAME }}</span> -->
<span class="radio-unit">{{ item.SHOPDIRECTION }}</span> <span class="radio-unit">{{ item.SHOPDIRECTION }}</span>
@ -1147,8 +1148,9 @@ export default {
}, },
}; };
</script> </script>
<!-- bodyColor = #CAA97F; -->
<style lang="stylus" scoped> <style lang="stylus" scoped>
bodyColor = #CAA97F; bodyColor = #4BCB7E;
.disable { .disable {
color: #999; color: #999;
@ -1201,29 +1203,29 @@ bodyColor = #CAA97F;
.yy-img, .ts-img { .yy-img, .ts-img {
display: inline-block; display: inline-block;
width: 61rpx; width: 60rpx;
height: 53rpx; height: 60rpx;
margin-right: 20rpx; margin-right: 20rpx;
vertical-align: bottom; vertical-align: bottom;
} }
.yy-img { .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; background-size: contain;
} }
.yy-img-active { .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; background-size: contain;
} }
.ts-img { .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; background-size: contain;
} }
.ts-img-active { .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; background-size: contain;
} }
} }
@ -1449,7 +1451,6 @@ bodyColor = #CAA97F;
.go-pay { .go-pay {
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
line-height: 100rpx;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
@ -1478,13 +1479,12 @@ bodyColor = #CAA97F;
.pay-right { .pay-right {
width: 210rpx; width: 210rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
color: #ffffff; color: #ffffff;
background: #ba922f; background: #4BCB7E;
padding: 24rpx 0;
border-radius: 48rpx; border-radius: 48rpx;
} }
} }

3
pages/shopPages/shop/components/merchantEvaluation.vue
View File

@ -372,7 +372,8 @@ export default {
font-family: DINAlternate, DINAlternate; font-family: DINAlternate, DINAlternate;
font-weight: bold; font-weight: bold;
font-size: 72rpx; font-size: 72rpx;
color: #ba922f; // color: #ba922f;
color: #4BCB7E;
line-height: 84rpx; line-height: 84rpx;
text-align: justify; text-align: justify;
font-style: normal; font-style: normal;

39
pages/shopPages/shop/index.vue
View File

@ -123,7 +123,8 @@
good.COMMODITY_ID + good.COMMODITY_ID +
'_' + '_' +
good.USERDEFINEDTYPE_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">{{ <text class="acount" v-if="good.id">{{
shoppingCart[good.USERDEFINEDTYPE_ID + "_" + good.id] shoppingCart[good.USERDEFINEDTYPE_ID + "_" + good.id]
@ -137,7 +138,8 @@
good.COMMODITY_ID + good.COMMODITY_ID +
'_' + '_' +
good.USERDEFINEDTYPE_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> </view>
</view> </view>
@ -198,7 +200,8 @@
<view class="content-left" @click="showShopCartFn"> <view class="content-left" @click="showShopCartFn">
<view class="logo-wrapper"> <view class="logo-wrapper">
<view class="iconBox"> <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> </view>
<!-- <van-icon <!-- <van-icon
@ -1968,7 +1971,8 @@ export default {
font-weight: 700; font-weight: 700;
color: #fff; color: #fff;
// background: #ba922f; // background: #ba922f;
background: #009DFF; // background: #009DFF;
background: #4BCB7E;
box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4); box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4);
} }
@ -2104,9 +2108,9 @@ export default {
align-items: center; align-items: center;
.icon { .icon {
width: 40rpx; width: 50rpx;
height: 40rpx; height: 50rpx;
background: #ba922f; // background: #ba922f;
border-radius: 50%; border-radius: 50%;
} }
@ -2192,7 +2196,7 @@ export default {
.cart-decrease { .cart-decrease {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
border: 4rpx solid #f9efe2; border: 4rpx solid #4BCB7E;
position: relative; position: relative;
border-radius: 50%; border-radius: 50%;
} }
@ -2201,7 +2205,7 @@ export default {
content: ""; content: "";
height: 4rpx; height: 4rpx;
width: 27rpx; width: 27rpx;
background: #caa97f; background: #4BCB7E;
display: block; display: block;
position: absolute; position: absolute;
left: 13rpx; left: 13rpx;
@ -2212,7 +2216,7 @@ export default {
.cart-add { .cart-add {
width: 54rpx; width: 54rpx;
height: 54rpx; height: 54rpx;
background: #f9efe2; background: #4BCB7E;
position: relative; position: relative;
border-radius: 50%; border-radius: 50%;
} }
@ -2221,7 +2225,7 @@ export default {
content: ""; content: "";
height: 4rpx; height: 4rpx;
width: 27rpx; width: 27rpx;
background: #caa97f; background: #fff;
display: block; display: block;
position: absolute; position: absolute;
left: 14rpx; left: 14rpx;
@ -2233,7 +2237,7 @@ export default {
content: ""; content: "";
height: 27rpx; height: 27rpx;
width: 4rpx; width: 4rpx;
background: #caa97f; background: #fff;
display: block; display: block;
position: absolute; position: absolute;
top: 14rpx; top: 14rpx;
@ -2323,7 +2327,8 @@ export default {
font-size: 18rpx; font-size: 18rpx;
font-weight: 700; font-weight: 700;
color: #fff; color: #fff;
background: #009DFF; // background: #009DFF;
background: #4BCB7E;
box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4); box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.4);
} }
@ -2355,14 +2360,16 @@ export default {
} }
.content-right .pay-btn { .content-right .pay-btn {
height: 88rpx; // height: 88rpx;
line-height: 88rpx; // line-height: 88rpx;
padding: 24rpx 0;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
color: #ffffff; color: #ffffff;
// background: #ba922f; // background: #ba922f;
background: #009DFF; // background: #009DFF;
background: #4BCB7E;
border-radius: 48rpx; border-radius: 48rpx;
} }

2
pages/useConfig/FavoriteStore.vue
View File

@ -153,7 +153,7 @@ export default {
// 跳转商品详情页面 // 跳转商品详情页面
goShowDetail(obj) { goShowDetail(obj) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/shopPages/shopDetail/index?id=${obj.GoodsId}`, url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}`,
}); });
} }
} }

84
pages/user/index.vue
View File

@ -1,10 +1,15 @@
<template> <template>
<view class="main"> <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"> <view class="userInfoBox">
<!-- 头像内容 --> <!-- 头像内容 -->
@ -25,7 +30,7 @@
<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> (userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME || "未填写名称") }}</view>
<view class="userLevel"> <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 class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
</view> </view>
<view class="userSetting" @click="hanldGoConfig"> <view class="userSetting" @click="hanldGoConfig">
@ -39,7 +44,8 @@
</view> </view>
<view class="userInfoRight" @click="handleGoUserCode"> <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 class="userCodeText">会员码</view>
</view> </view>
</view> </view>
@ -70,6 +76,9 @@
</view> </view>
</view> </view>
</view>
<!-- {{ showErrorText || "" }} --> <!-- {{ showErrorText || "" }} -->
<view class="pageContent"> <view class="pageContent">
@ -1279,32 +1288,51 @@ export default {
.main { .main {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: #F5F5F5; // background-color: #F5F5F5;
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
.fixedHeader { .fixedHeader {
width: 100vw; width: 100vw;
position: fixed; 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-repeat: no-repeat;
background-size: 100% 428rpx; background-size: 100% 100vh;
top: 0; top: 0;
left: 0; left: 0;
z-index: 999999; z-index: 999999;
display: flex;
align-items: flex-end;
.YDIcon {
width: 176rpx;
height: 48rpx;
margin-left: 32rpx;
margin-bottom: 16px;
}
} }
.pageTop { .pageTop {
width: 100vw; width: 100vw;
height: 456rpx; // height: 456rpx;
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-repeat: no-repeat;
background-size: 100% 428rpx; background-size: 100% 100vh;
box-sizing: border-box; box-sizing: border-box;
.userTopInfo {
width: calc(100vw - 64rpx);
margin-left: 32rpx;
background: linear-gradient(270deg, #27B25F 0%, #4CCC7F 100%);
border-radius: 16rpx;
.userInfoBox { .userInfoBox {
width: 100%; width: 100%;
height: 136rpx; // height: 136rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 42rpx; padding: 40rpx 42rpx;
display: flex; display: flex;
.headerImgBox { .headerImgBox {
@ -1364,7 +1392,8 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 0 14rpx; padding: 0 14rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #2D2D2D; // background-color: #2D2D2D;
background-color: #fff;
.userLevelIcon { .userLevelIcon {
width: 24rpx; width: 24rpx;
@ -1376,7 +1405,8 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #F4DA7F; // color: #F4DA7F;
color: #716F69;
line-height: 34rpx; line-height: 34rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
@ -1408,27 +1438,31 @@ export default {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #2D2D2D;
line-height: 34rpx; line-height: 34rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #D8D8D8; // color: #2D2D2D;
// background-color: #D8D8D8;
color: #716F69;
background-color: #fff;
} }
.userCollect { .userCollect {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #2D2D2D;
line-height: 34rpx; line-height: 34rpx;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
padding: 4rpx 22rpx 2rpx 22rpx; padding: 4rpx 22rpx 2rpx 22rpx;
border-radius: 32rpx; border-radius: 32rpx;
background-color: #D8D8D8;
margin-left: 18rpx; 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-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #F2CC93; // color: #F2CC93;
color: #fff;
line-height: 34rpx; line-height: 34rpx;
text-align: center; text-align: center;
font-style: normal; font-style: normal;
@ -1463,16 +1498,18 @@ export default {
.couponBox { .couponBox {
width: 100%; width: 100%;
height: 132rpx; height: 132rpx;
margin-top: 36rpx; // margin-top: 36rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; // padding: 0 30rpx;
.CouponContent { .CouponContent {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
box-shadow: 2rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.09); 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; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
display: flex; display: flex;
@ -1519,6 +1556,9 @@ export default {
} }
}
} }

BIN
static/images/home/newAddIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
static/images/home/newReduce.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/shopTabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/allFunPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/bindCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/addEvaluate.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noDataPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderFoodDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/finance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/goPublicPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/insurance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopType/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/commodityItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/loading/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderInfo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderStatus.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/receiveGoods.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlementFood/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
unpackage/dist/dev/mp-weixin/components/shopTabbar.js vendored
View File

@ -151,6 +151,10 @@ var _default = {
zIndex: { zIndex: {
type: Number, type: Number,
default: 99 default: 99
},
comeForm: {
type: String,
default: ""
} }
}, },
watch: { watch: {
@ -175,9 +179,15 @@ var _default = {
return; return;
} }
if (pageIndex === '/pages/shopMallPage/index/index') { if (pageIndex === '/pages/shopMallPage/index/index') {
if (this.comeForm === 'index') {
uni.redirectTo({
url: '/pages/shopMallPage/index/index'
});
} else {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
}
} else if (pageIndex === "/pages/shopMallPage/shopCar/index") { } else if (pageIndex === "/pages/shopMallPage/shopCar/index") {
if (!this.user && !this.user.MEMBERSHIP_ID) { if (!this.user && !this.user.MEMBERSHIP_ID) {
uni.showModal({ uni.showModal({

2
unpackage/dist/dev/mp-weixin/components/shopTabbar.wxss vendored
View File

@ -36,7 +36,7 @@
line-height: 28rpx; line-height: 28rpx;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
background: #fa5151; background: #4BCB7E;
border-radius: 16rpx; border-radius: 16rpx;
padding: 2rpx 8rpx; padding: 2rpx 8rpx;
} }

2
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored
View File

@ -1394,7 +1394,7 @@ var _default = {
} else if (obj.value === 17) { } else if (obj.value === 17) {
if (obj.index === 0) { if (obj.index === 0) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/shopMallPage/shopType/index" url: "/pages/shopMallPage/shopType/index?comeForm=index"
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({

2
unpackage/dist/dev/mp-weixin/pages/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/mp-weixin/pages/myAddress/newAdd/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

38
unpackage/dist/dev/mp-weixin/pages/myAddress/newAdd/index.wxss vendored
View File

@ -94,9 +94,9 @@ textarea.data-v-f752e738 {
margin: 0 20rpx; margin: 0 20rpx;
} }
.tip-tag.active.data-v-f752e738 { .tip-tag.active.data-v-f752e738 {
color: #c7ac85; color: #4bcb7e;
border-color: #c7ac85; border-color: #4bcb7e;
background: #f7efe3; background: #e7f8ee;
} }
.content-title.data-v-f752e738 { .content-title.data-v-f752e738 {
min-width: 168rpx; min-width: 168rpx;
@ -136,6 +136,38 @@ textarea.data-v-f752e738 {
line-height: 80rpx; line-height: 80rpx;
text-align: center; 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 { .del-btn.data-v-f752e738 {
margin: 0 auto; margin: 0 auto;
height: 80rpx; height: 80rpx;

2
unpackage/dist/dev/mp-weixin/pages/order/buyOrder/index.wxss vendored
View File

@ -175,7 +175,7 @@
.main .orderListBox .orderItem .orderItemTop .orderItemTopRight .statusBox.data-v-50f48f45 { .main .orderListBox .orderItem .orderItemTop .orderItemTopRight .statusBox.data-v-50f48f45 {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 24rpx;
color: #F83D3D; color: #F83D3D;
line-height: 40rpx; line-height: 40rpx;
text-align: right; text-align: right;

28
unpackage/dist/dev/mp-weixin/pages/order/foodOrder/components/orderItem.js vendored
View File

@ -196,34 +196,6 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
// //
// //
// //
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
var _default = { var _default = {
props: { props: {
obj: {} obj: {}

2
unpackage/dist/dev/mp-weixin/pages/order/foodOrder/components/orderItem.wxss vendored
View File

@ -68,7 +68,7 @@
font-size: 28rpx; font-size: 28rpx;
font-family: "PingFang SC"; font-family: "PingFang SC";
line-height: 40rpx; line-height: 40rpx;
color: #1890ff; color: #4BCB7E;
} }
.list-item .section_7.data-v-b964e87e { .list-item .section_7.data-v-b964e87e {
padding: 24rpx 0 24rpx 24rpx; padding: 24rpx 0 24rpx 24rpx;

4
unpackage/dist/dev/mp-weixin/pages/order/foodOrder/index.wxss vendored
View File

@ -58,7 +58,7 @@
flex: 1; flex: 1;
} }
.main .fliter .tabs .tab_active.data-v-0dd499ae { .main .fliter .tabs .tab_active.data-v-0dd499ae {
color: #1890ff; color: #4BCB7E;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
} }
@ -71,7 +71,7 @@
margin-left: -24rpx; margin-left: -24rpx;
width: 48rpx; width: 48rpx;
height: 6rpx; height: 6rpx;
background: #1890ff; background: #4BCB7E;
border-radius: 2rpx; border-radius: 2rpx;
} }
.main .fliter .sum_count.data-v-0dd499ae { .main .fliter .sum_count.data-v-0dd499ae {

3
unpackage/dist/dev/mp-weixin/pages/order/orderFoodDetail/index.js vendored
View File

@ -271,6 +271,7 @@ var _default = {
wechatOpenId: _this.user.WECHATAPP_OPENID || "", wechatOpenId: _this.user.WECHATAPP_OPENID || "",
wechatUnionId: _this.user.USER_UNIONID || "", wechatUnionId: _this.user.USER_UNIONID || "",
oriSalebillCode: _this.orderInfo.SALEBILL_CODE, oriSalebillCode: _this.orderInfo.SALEBILL_CODE,
COUPON_AMOUNT: _this.orderInfo.COUPON_AMOUNT,
// addressId: this.addressInfo.MEMBERADDRESS_ID, // addressId: this.addressInfo.MEMBERADDRESS_ID,
// orderPersonTel: this.addressInfo.MOBILEPHONE, // orderPersonTel: this.addressInfo.MOBILEPHONE,
// couponCode: '',//优惠券 // couponCode: '',//优惠券
@ -822,7 +823,7 @@ var _default = {
console.log("option", option); console.log("option", option);
uni.setNavigationBarColor({ uni.setNavigationBarColor({
frontColor: "#ffffff", frontColor: "#ffffff",
backgroundColor: "#2fa4ff", backgroundColor: "#4BCB7E",
animation: { animation: {
duration: 30, duration: 30,
timingFunc: "linear" timingFunc: "linear"

2
unpackage/dist/dev/mp-weixin/pages/order/orderFoodDetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/dist/dev/mp-weixin/pages/order/orderFoodDetail/index.wxss vendored
View File

@ -12,7 +12,7 @@ page.data-v-4e9fff16 {
} }
.order-status.data-v-4e9fff16 { .order-status.data-v-4e9fff16 {
padding: 32rpx 32rpx 56rpx 32rpx; padding: 32rpx 32rpx 56rpx 32rpx;
background: #2fa4ff; background: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -48,7 +48,7 @@ page.data-v-4e9fff16 {
height: 48rpx; height: 48rpx;
text-align: center; text-align: center;
line-height: 48rpx; line-height: 48rpx;
border-radius: 6rpx; border-radius: 32rpx;
margin-left: 36rpx; margin-left: 36rpx;
padding: 0 12rpx; padding: 0 12rpx;
} }
@ -208,7 +208,7 @@ page.data-v-4e9fff16 {
margin-left: 10rpx; margin-left: 10rpx;
} }
.link-store.data-v-4e9fff16 { .link-store.data-v-4e9fff16 {
color: #c6a376; color: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -251,7 +251,7 @@ page.data-v-4e9fff16 {
font-weight: normal; font-weight: normal;
color: #fff; color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
background: #f5ba4f; background: #4BCB7E;
} }
.order-info-h.data-v-4e9fff16 { .order-info-h.data-v-4e9fff16 {
font-size: 28rpx; font-size: 28rpx;

2
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.js vendored
View File

@ -919,7 +919,7 @@ var _default = {
console.log("option", option); console.log("option", option);
uni.setNavigationBarColor({ uni.setNavigationBarColor({
frontColor: "#ffffff", frontColor: "#ffffff",
backgroundColor: "#2fa4ff", backgroundColor: "#4BCB7E",
animation: { animation: {
duration: 30, duration: 30,
timingFunc: "linear" timingFunc: "linear"

2
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

6
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxss vendored
View File

@ -12,7 +12,7 @@ page.data-v-8f520710 {
} }
.order-status.data-v-8f520710 { .order-status.data-v-8f520710 {
padding: 32rpx 32rpx 56rpx 32rpx; padding: 32rpx 32rpx 56rpx 32rpx;
background: #2fa4ff; background: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -48,7 +48,7 @@ page.data-v-8f520710 {
height: 48rpx; height: 48rpx;
text-align: center; text-align: center;
line-height: 48rpx; line-height: 48rpx;
border-radius: 6rpx; border-radius: 32rpx;
margin-left: 36rpx; margin-left: 36rpx;
padding: 0 12rpx; padding: 0 12rpx;
} }
@ -217,7 +217,7 @@ page.data-v-8f520710 {
margin-left: 10rpx; margin-left: 10rpx;
} }
.link-store.data-v-8f520710 { .link-store.data-v-8f520710 {
color: #c6a376; color: #4BCB7E;
display: flex; display: flex;
align-items: center; align-items: center;
} }

2
unpackage/dist/dev/mp-weixin/pages/reservationOrder/index.wxss vendored
View File

@ -239,7 +239,7 @@
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
padding: 8rpx 28rpx; padding: 8rpx 28rpx;
background-color: #FF6200; background-color: #4BCB7E;
border-radius: 32rpx; border-radius: 32rpx;
display: inline-block; display: inline-block;
} }

2
unpackage/dist/dev/mp-weixin/pages/serviceList/index.wxss vendored
View File

@ -171,7 +171,7 @@
font-style: normal; font-style: normal;
text-transform: none; text-transform: none;
padding: 8rpx 28rpx; padding: 8rpx 28rpx;
background-color: #FF6200; background-color: #4BCB7E;
border-radius: 32rpx; border-radius: 32rpx;
display: inline-block; display: inline-block;
} }

2
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

7
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxss vendored
View File

@ -110,10 +110,8 @@
.main .header .typeBox.data-v-79c11018 { .main .header .typeBox.data-v-79c11018 {
width: calc(100% - 48rpx); width: calc(100% - 48rpx);
margin: 24rpx 0 0 24rpx; margin: 24rpx 0 0 24rpx;
background: #fff;
border-radius: 16rpx; border-radius: 16rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 2rpx;
} }
.main .header .typeBox .contentBox.data-v-79c11018 { .main .header .typeBox .contentBox.data-v-79c11018 {
width: 100%; width: 100%;
@ -165,6 +163,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; 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 { .main .pageContent.data-v-79c11018 {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;

2
unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopCar/index.wxml vendored
View File

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