front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: front:f803e7d4d67cab8df5ecb6bc7ed282d8572d63b8
Branches Tags
front:main
front:feat-tanjy
..
compare: front:64989931cb0e8958d208da671931fbb844090cd7
Branches Tags
front:main
front:feat-tanjy

No commits in common. "f803e7d4d67cab8df5ecb6bc7ed282d8572d63b8" and "64989931cb0e8958d208da671931fbb844090cd7" have entirely different histories.
f803e7d4d6 ... 64989931cb

7 changed files with 129 additions and 205 deletions
Show Stats Expand all files Collapse all files

139
java-mall-app-shop-admin/components/t-chat-bar/t-chat-bar.vue
View File

@ -5,8 +5,18 @@
:style="{ paddingBottom: `${keyboardHeight}px` }" :style="{ paddingBottom: `${keyboardHeight}px` }"
> >
<view :class="['tui-chat-tabbar', { isIos: 'tui-chat-ios-tabbar' }]"> <view :class="['tui-chat-tabbar', { isIos: 'tui-chat-ios-tabbar' }]">
<view
v-show="!showVoiceMask"
class="tui-icon tui-icon-im_more tui-icon-mr"
@tap="showKeyBoard(3)"
></view>
<view
v-show="!showVoiceMask"
class="tui-icon tui-icon-im_face tui-icon-mr"
@tap="showKeyBoard(2)"
></view>
<!-- v-show="showIndex != 2" --> <!-- v-show="showIndex != 2" -->
<!-- <view class="tui-icon tui-icon-im_keyboard" @tap="showKeyBoard(1)" v-show="showIndex == 2"></view> --> <!-- <view class="tui-icon tui-icon-im_keyboard tui-icon-mr" @tap="showKeyBoard(1)" v-show="showIndex == 2"></view> -->
<!-- <editor <!-- <editor
id="editor" id="editor"
@ -19,19 +29,6 @@
> >
</editor> --> </editor> -->
<view class="tui-send-box" v-show="!showVoiceMask">
<view
class="tui-icon tui-icon-im_voice"
v-if="!isVoice"
@tap="switchVoice"
></view>
<view
class="tui-icon tui-icon-im_keyboard"
v-if="isVoice"
@tap="switchInput"
></view>
</view>
<textarea <textarea
hold-keyboard hold-keyboard
auto-height auto-height
@ -46,10 +43,8 @@
@tap.stop="showKeyBoard(1)" @tap.stop="showKeyBoard(1)"
ref="textarea" ref="textarea"
v-show="!isVoice && !showVoiceMask" v-show="!isVoice && !showVoiceMask"
placeholder="一起畅聊解决问题吧~"
></textarea> ></textarea>
<view
<view
:class="[ :class="[
showVoiceMask ? 'mask-bottom' : 'tui-chat-voice_btn', showVoiceMask ? 'mask-bottom' : 'tui-chat-voice_btn',
{ 'no-area': needCancel }, { 'no-area': needCancel },
@ -74,20 +69,18 @@
" "
></image> ></image>
</view> </view>
<view class="tui-send-box" v-show="!showVoiceMask">
<view <view
v-show="!showVoiceMask" class="tui-icon tui-icon-im_voice"
class="tui-icon tui-icon-im_face" v-if="!isVoice && !content"
@tap="showKeyBoard(2)" @tap="switchVoice"
></view> ></view>
<view
<view class="tui-icon tui-icon-im_keyboard"
v-show="!showVoiceMask && !content" v-if="isVoice && !content"
class="tui-icon tui-icon-im_more" @tap="switchInput"
@tap="showKeyBoard(3)" ></view>
></view> <view
<view
class="tui-btn-send" class="tui-btn-send"
v-if="content" v-if="content"
:style="{ color: color }" :style="{ color: color }"
@ -97,8 +90,8 @@
> >
{{ sendText }} {{ sendText }}
</view> </view>
</view>
</view> </view>
<view class="tui-reply-more"> <view class="tui-reply-more">
<view class="tui-face-box" v-if="showIndex == 2"> <view class="tui-face-box" v-if="showIndex == 2">
<scroll-view scroll-y :style="{ height: replyContainerH + 'px' }"> <scroll-view scroll-y :style="{ height: replyContainerH + 'px' }">
@ -130,7 +123,7 @@
</view> </view>
<view <view
class="tui-more-box" class="tui-more-box"
style="height:110px" :style="{ height: replyContainerH + 'px' }"
v-if="showIndex == 3" v-if="showIndex == 3"
> >
<view <view
@ -556,8 +549,6 @@ export default {
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
color: #222;
background: #fff;
} }
.tui-icon-at:before { .tui-icon-at:before {
@ -568,19 +559,12 @@ export default {
content: "\eb95"; content: "\eb95";
} }
.tui-icon-im_more { .tui-icon-im_more:before {
&:before { content: "\eb96";
content: "\eb96";
}
} }
.tui-icon-im_face { .tui-icon-im_face:before {
margin-left: 28rpx;
margin-right: 28rpx;
content: "\eb97"; content: "\eb97";
&:before {
content: "\eb97";
}
} }
.tui-icon-link:before { .tui-icon-link:before {
@ -633,7 +617,7 @@ export default {
width: 100%; width: 100%;
background-color: $uni-bg-color-grey; background-color: $uni-bg-color-grey;
display: flex; display: flex;
align-items: center; align-items: flex-end;
padding: 16rpx 24rpx; padding: 16rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
@ -644,58 +628,56 @@ export default {
top: 0; top: 0;
right: 0; right: 0;
left: 0; left: 0;
border-top: 1rpx solid $uni-border-color; border-top: 1rpx solid $uni-text-color-placeholder;
-webkit-transform: scaleY(0.5); -webkit-transform: scaleY(0.5);
transform: scaleY(0.5); transform: scaleY(0.5);
} }
.tui-phcolor{
color: #666;
font-size: 24rpx;
}
.tui-chat-input { .tui-chat-input {
flex: 1; flex: 1;
// min-height: 80rpx; // min-height: 80rpx;
min-height: rpx; min-height: rpx;
padding: $uni-spacing-col-base 10rpx; padding: $uni-spacing-col-base 0;
background-color: $uni-bg-color; background-color: $uni-bg-color;
margin: 0;
border-radius: 8rpx; border-radius: 8rpx;
margin: 0;
} }
.tui-chat-voice_btn { .tui-chat-voice_btn {
flex: 1; flex: 1;
height: 68rpx; height: 78rpx;
border-radius: 12rpx; border-radius: 8rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 28rpx; font-weight: bold;
}
.tui-icon-mr {
margin-right: 28rpx;
} }
.tui-icon-ml { .tui-icon-ml {
margin-left: 28rpx; margin-left: 28rpx;
} }
// .tui-icon { .tui-icon {
// margin-bottom: 13rpx; margin-bottom: 13rpx;
// } }
.tui-send-box { .tui-send-box {
width: 80rpx; width: 80rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end;
} }
.tui-btn-send { .tui-btn-send {
flex-shrink: 0; flex-shrink: 0;
padding: 6rpx 24rpx; padding: 22rpx 0;
font-size: 30rpx; font-size: 30rpx;
border-radius: 100rpx; line-height: 30rpx;
color: #fff !important;
background: #fe411b;
} }
} }
@ -713,7 +695,7 @@ export default {
top: 0; top: 0;
right: 0; right: 0;
left: 0; left: 0;
border-top: 1rpx solid $uni-border-color; border-top: 1rpx solid $uni-text-color-placeholder;
-webkit-transform: scaleY(0.5); -webkit-transform: scaleY(0.5);
transform: scaleY(0.5); transform: scaleY(0.5);
} }
@ -746,16 +728,16 @@ export default {
.tui-delete-face_box { .tui-delete-face_box {
position: absolute; position: absolute;
background-color: #fff; background-color: $uni-bg-color-hover;
// width: 108rpx; width: 108rpx;
// height: 92rpx; height: 92rpx;
padding: 6rpx 20rpx; right: 20rpx;
border-top-left-radius: 12rpx; bottom: 0;
right: 30rpx;
bottom: 30rpx;
z-index: 10; z-index: 10;
.tui-delete-keybord { .tui-delete-keybord {
width: 108rpx;
height: 68rpx;
background-color: $uni-bg-color; background-color: $uni-bg-color;
display: flex; display: flex;
align-items: center; align-items: center;
@ -777,8 +759,7 @@ export default {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
background-color: $uni-bg-color-grey; background-color: $uni-bg-color-hover;
justify-content: space-evenly;
.tui-more-item { .tui-more-item {
width: 126rpx; width: 126rpx;
@ -786,7 +767,7 @@ export default {
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
// margin-right: 40rpx; margin-right: 40rpx;
&:active { &:active {
opacity: 0.6; opacity: 0.6;
@ -798,12 +779,12 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #ffffff; background-color: #ffffff;
height: 108rpx; height: 126rpx;
width: 108rpx; width: 126rpx;
border-radius: 20rpx; border-radius: 32rpx;
.tui-icon { .tui-icon {
font-size: 48rpx; font-size: 60rpx;
} }
} }

49
java-mall-app-shop-admin/components/tabbar/tabbar.vue
View File

@ -7,87 +7,86 @@
:placeholder="false" :placeholder="false"
:border="true" :border="true"
activeColor="#fe4119" activeColor="#fe4119"
inactiveColor="#333"
:safeAreaInsetBottom="true" :safeAreaInsetBottom="true"
> >
<u-tabbar-item text="工作台" name="order"> <u-tabbar-item text="工作台" name="order">
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-gongzuotai custom-icon" custom-prefix="custom-icon-gongzuotai custom-icon"
size="20" size="22"
slot="active-icon" slot="active-icon"
color="#fe4119" color="#fe4119"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-gongzuotai custom-icon" custom-prefix="custom-icon-gongzuotai custom-icon"
size="20" size="22"
slot="inactive-icon" slot="inactive-icon"
color="#666" color="#000"
></u-icon> ></u-icon>
</u-tabbar-item> </u-tabbar-item>
<u-tabbar-item text="数据" name="shituzhongxin"> <u-tabbar-item text="经营" name="warehouse">
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-jingyingguanli custom-icon" custom-prefix="custom-icon-jingyingguanli custom-icon"
size="16" size="22"
slot="active-icon" slot="active-icon"
color="#fe4119" color="#fe4119"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-jingyingguanli custom-icon" custom-prefix="custom-icon-jingyingguanli custom-icon"
size="16" size="22"
slot="inactive-icon" slot="inactive-icon"
color="#666" color="#000"
></u-icon> ></u-icon>
</u-tabbar-item> </u-tabbar-item>
<u-tabbar-item text="消息" name="IM" :badge="weiduNum"> <u-tabbar-item text="消息" name="IM" :badge="weiduNum">
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-xiaoxi1 custom-icon" custom-prefix="custom-icon-xiaoxi1 custom-icon"
size="20" size="22"
slot="active-icon" slot="active-icon"
color="#fe4119" color="#fe4119"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-xiaoxi1 custom-icon" custom-prefix="custom-icon-xiaoxi1 custom-icon"
size="20" size="22"
slot="inactive-icon" slot="inactive-icon"
color="#666" color="#000"
></u-icon> ></u-icon>
</u-tabbar-item> </u-tabbar-item>
<u-tabbar-item text="经营" name="warehouse"> <u-tabbar-item text="视图中心" name="shituzhongxin">
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-shituzhongxin custom-icon" custom-prefix="custom-icon-shituzhongxin custom-icon"
size="16" size="20"
slot="active-icon" slot="active-icon"
color="#fe4119" color="#fe4119"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-shituzhongxin custom-icon" custom-prefix="custom-icon-shituzhongxin custom-icon"
size="16" size="20"
slot="inactive-icon" slot="inactive-icon"
color="#666" color="#000"
></u-icon> ></u-icon>
</u-tabbar-item> </u-tabbar-item>
<u-tabbar-item text="我的" name="my"> <u-tabbar-item text="我的" name="my">
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-wode custom-icon" custom-prefix="custom-icon-wode custom-icon"
size="18" size="24"
slot="active-icon" slot="active-icon"
color="#fe4119" color="#fe4119"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon" class="u-icon"
custom-prefix="custom-icon-wode custom-icon" custom-prefix="custom-icon-wode custom-icon"
size="18" size="24"
slot="inactive-icon" slot="inactive-icon"
color="#666" color="#000"
></u-icon> ></u-icon>
</u-tabbar-item> </u-tabbar-item>
</u-tabbar> </u-tabbar>
@ -203,13 +202,7 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
::v-deep .u-border-top{
border-top-width: .5px !important;
border-color: #dadbde !important;
border-top-style: solid;
}
.tabbar-container { .tabbar-container {
.u-icon { .u-icon {
font-weight: bold; font-weight: bold;

2
java-mall-app-shop-admin/components/tui-tabs.vue
View File

@ -8,7 +8,7 @@
top: isFixed ? top + 'px' : 'auto', top: isFixed ? top + 'px' : 'auto',
zIndex: isFixed ? zIndex : 'auto' zIndex: isFixed ? zIndex : 'auto'
}" v-if="tabsWidth>0"> }" v-if="tabsWidth>0">
<view v-for="(item, index) in tabs" :key="index" :class="['tui-tabs-item', { 'tui__tab_current': currentTab==index}]" <view v-for="(item, index) in tabs" :key="index" class="tui-tabs-item"
:style="{ width: getItemWidth,height: height + 'rpx' }" @tap.stop="swichTabs(index)"> :style="{ width: getItemWidth,height: height + 'rpx' }" @tap.stop="swichTabs(index)">
<view class="tui-tabs-title" :class="{'tui-tabs-disabled': item.disabled }" :style="{ <view class="tui-tabs-title" :class="{'tui-tabs-disabled': item.disabled }" :style="{
color: currentTab == index ? getSelectedColor : color, color: currentTab == index ? getSelectedColor : color,

50
java-mall-app-shop-admin/pages/IM/IM.vue
View File

@ -3,10 +3,6 @@
<status-bar :backgroundColor="'#fff'" v-if="true"></status-bar> <status-bar :backgroundColor="'#fff'" v-if="true"></status-bar>
<view class="IM-setting"> <view class="IM-setting">
<view class="IM-status"> <view class="IM-status">
<image
class="img"
:src="msgInfo.mine.user_avatar || '../../static/images/user-avatar.jpg'"
/>
<text>{{ msgInfo.mine.user_nickname }}</text> <text>{{ msgInfo.mine.user_nickname }}</text>
<!-- <text class="status-color"></text> --> <!-- <text class="status-color"></text> -->
<!-- <u-icon name="arrow-down">arrow-down</u-icon> --> <!-- <u-icon name="arrow-down">arrow-down</u-icon> -->
@ -15,15 +11,15 @@
<u-icon <u-icon
class="u-icon icon-kefu" class="u-icon icon-kefu"
custom-prefix="custom-icon-kefu custom-icon" custom-prefix="custom-icon-kefu custom-icon"
size="24" size="26"
color="#666" color="#000"
@click="senMsgAdmin" @click="senMsgAdmin"
></u-icon> ></u-icon>
<u-icon <u-icon
class="u-icon icon-shezhi" class="u-icon icon-shezhi"
custom-prefix="custom-icon-shezhi custom-icon" custom-prefix="custom-icon-shezhi custom-icon"
size="20" size="22"
color="#666" color="#000"
@click="skipuIMsetting" @click="skipuIMsetting"
></u-icon> ></u-icon>
</view> </view>
@ -74,7 +70,7 @@
<view class="user-img-block"> <view class="user-img-block">
<image <image
class="img" class="img"
:src="item.avatar || '../../static/images/chat/user-avatar.jpg'" :src="item.avatar || '../../static/images/user-avatar.jpg'"
/> />
</view> </view>
<u-badge <u-badge
@ -267,26 +263,15 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 20rpx 30rpx; padding: 32rpx 40rpx;
border-bottom: 1px solid rgba(238, 238, 238,0.5);
// background: rgba(238, 238, 238,0.5);
.IM-status { .IM-status {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10rpx;
.img{
width: 96rpx;
height: 96rpx;
border-radius: 100%;
}
} }
.setting-icon-block { .setting-icon-block {
display: flex; display: flex;
align-items: center;
justify-content: center;
gap: 20rpx;
} }
} }
.tabs-block { .tabs-block {
@ -295,29 +280,22 @@ export default {
.IM-msg-content { .IM-msg-content {
.IM-msg-block { .IM-msg-block {
padding: 0; padding: 40rpx;
background: #fff; background: #fff;
.uni-swiper-list { .uni-swiper-list {
height: calc(100vh - 120px); height: calc(100vh - 190px);
.user-info-block { .user-info-block {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 30rpx; margin-bottom: 40rpx;
border-bottom: 1px solid rgba(238, 238, 238,0.5);
padding-bottom: 30rpx;
&:last-child{
border: none;
}
.user-img-content { .user-img-content {
position: relative; position: relative;
.user-img-block { .user-img-block {
width: 64rpx; width: 80rpx;
height: 64rpx; height: 80rpx;
background: #eee; border-radius: 50%;
border-radius: 100%;
overflow: hidden; overflow: hidden;
.img { .img {
@ -340,7 +318,7 @@ export default {
margin-left: 24rpx; margin-left: 24rpx;
.msg-title { .msg-title {
// font-weight: bold; font-weight: bold;
} }
.msg-info { .msg-info {
@ -379,7 +357,7 @@ export default {
} }
.icon-kefu { .icon-kefu {
// margin-right: 40rpx; margin-right: 40rpx;
} }
.IM-loading { .IM-loading {

19
java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
View File

@ -1078,7 +1078,7 @@ export default {
max-width: 66%; max-width: 66%;
border-radius: 10rpx; border-radius: 10rpx;
position: relative; position: relative;
padding: 12rpx 22rpx; padding: 20rpx 22rpx;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
word-break: break-all; word-break: break-all;
@ -1090,14 +1090,13 @@ export default {
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
top: 50%; top: 20rpx;
transform: translateY(-50%);
border: 16rpx solid; border: 16rpx solid;
} }
.tui-chatbox-left { .tui-chatbox-left {
background: #fff; background: #fff;
// border: 1rpx solid #fff; border: 1rpx solid #fff;
display: inline-block; display: inline-block;
} }
@ -1107,13 +1106,13 @@ export default {
} }
.tui-chatbox-right { .tui-chatbox-right {
background: #ffecf2; background: #a0d5f3;
// border: 1rpx solid #fe411b; border: 1rpx solid #a0d5f3;
} }
.tui-chatbox-right::before { .tui-chatbox-right::before {
left: 100%; left: 100%;
border-color: transparent transparent transparent #ffecf2; border-color: transparent transparent transparent #a0d5f3;
} }
/*chatbox*/ /*chatbox*/
@ -1138,8 +1137,8 @@ export default {
} }
.tui-user-pic { .tui-user-pic {
width: 64rpx; width: 80rpx;
height: 64rpx; height: 80rpx;
flex-shrink: 0; flex-shrink: 0;
border-radius: 50%; border-radius: 50%;
display: block; display: block;
@ -1163,7 +1162,7 @@ export default {
justify-content: center; justify-content: center;
height: 28rpx; height: 28rpx;
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #666;
padding-top: 36rpx; padding-top: 36rpx;
} }

73
java-mall-app-shop-admin/pages/order/order.vue
View File

@ -14,10 +14,10 @@
:currentTab="currentTab" :currentTab="currentTab"
backgroundColor="#fff" backgroundColor="#fff"
:height="88" :height="88"
color="#333" color="#888"
:size="32" selectedColor="#fe4119"
selectedColor="#FE411B" sliderBgColor="#fe4119"
sliderBgColor="#FE411B" :bold="true"
:width="width" :width="width"
unlined unlined
@change="handleTab" @change="handleTab"
@ -25,22 +25,21 @@
</view> </view>
<view class="tab2-content" v-if="currentTab == 0"> <view class="tab2-content" v-if="currentTab == 0">
<tui-tabs <tui-tabs
:class="['tabs-2', `tab_item_${currentTab2}`]" class="tabs-2"
:tabs="tabs2" :tabs="tabs2"
:width="300" :width="300"
:currentTab="currentTab2" :currentTab="currentTab2"
@change="handleTab2" @change="handleTab2"
backgroundColor="#fff" backgroundColor="#fff"
:height="60" :height="88"
:size="28"
unlined unlined
:sliderWidth="150" :sliderWidth="150"
:sliderHeight="48" :sliderHeight="60"
sliderRadius="4rpx"
bottom="50%" bottom="50%"
color="#888" color="#888"
selectedColor="#fff" selectedColor="#fff"
sliderBgColor="#FE411B" :bold="true"
sliderBgColor="#fe4119"
></tui-tabs> ></tui-tabs>
</view> </view>
<view class="search-contetn" v-if="currentTab2 != 2"> <view class="search-contetn" v-if="currentTab2 != 2">
@ -83,7 +82,6 @@
'sales-retrun-btn-item', 'sales-retrun-btn-item',
{ active: salesReturnBtnSearchAcitve == item.value }, { active: salesReturnBtnSearchAcitve == item.value },
]" ]"
size=""
@click="handelSalesReturnSearch(item)" @click="handelSalesReturnSearch(item)"
:style="{ width: item.width }" :style="{ width: item.width }"
v-for="(item, index) of salesReturnBtnSearchList" v-for="(item, index) of salesReturnBtnSearchList"
@ -97,7 +95,7 @@
<favorite-loading <favorite-loading
class="order-loading" class="order-loading"
v-show="showOrderLoading" v-show="showOrderLoading"
:color="'#FE411B'" :color="'#fe4119'"
text="" text=""
animation="spinner15" animation="spinner15"
></favorite-loading> ></favorite-loading>
@ -136,7 +134,7 @@
{{ sfFormatStatus(item.order_state_id) }} {{ sfFormatStatus(item.order_state_id) }}
</view> </view>
</view> </view>
<view class="rider-info" v-if="item.arrival_time && item.order_id"> <view class="rider-info">
<view class="delivery-time"> <view class="delivery-time">
预计送达{{ formatTime(item.arrival_time) }}前 预计送达{{ formatTime(item.arrival_time) }}前
</view> </view>
@ -350,7 +348,7 @@
<favorite-loading <favorite-loading
class="order-loading" class="order-loading"
v-show="showOrderLoading" v-show="showOrderLoading"
:color="'#FE411B'" :color="'#fe4119'"
text="" text=""
animation="spinner15" animation="spinner15"
></favorite-loading> ></favorite-loading>
@ -390,7 +388,7 @@
{{ sfFormatStatus(item.order_state_id) }} {{ sfFormatStatus(item.order_state_id) }}
</view> </view>
</view> </view>
<view class="rider-info" v-if="item.arrival_time && item.order_id"> <view class="rider-info">
<view class="delivery-time"> <view class="delivery-time">
预计送达{{ formatTime(item.arrival_time) }}前 预计送达{{ formatTime(item.arrival_time) }}前
</view> </view>
@ -600,7 +598,7 @@
<favorite-loading <favorite-loading
class="order-loading" class="order-loading"
v-show="showOrderLoading" v-show="showOrderLoading"
:color="'#FE411B'" :color="'#fe4119'"
text="" text=""
animation="spinner15" animation="spinner15"
></favorite-loading> ></favorite-loading>
@ -641,9 +639,8 @@
</view> </view>
<view class="order-num">退货单号：{{ item.return_id }}</view> <view class="order-num">退货单号：{{ item.return_id }}</view>
</view> </view>
<view class="rider-info" v-if="item.order_state_id" > <view class="rider-info">
<view class="delivery-time"> <view class="delivery-time"></view>
</view>
<view class="delivery-status"> <view class="delivery-status">
{{ sfFormatStatus(item.order_state_id) }} {{ sfFormatStatus(item.order_state_id) }}
</view> </view>
@ -693,7 +690,7 @@
name="phone-fill" name="phone-fill"
class="icon-phone-fill" class="icon-phone-fill"
size="40" size="40"
color="#FE411B" color="#fe4119"
></u-icon> ></u-icon>
</view> </view>
<view class="user-address"> <view class="user-address">
@ -1647,33 +1644,10 @@ export default {
.tab-content { .tab-content {
padding-bottom: 20rpx; padding-bottom: 20rpx;
background: #fff; background: #fff;
// ::v-deep .tui-tabs-title {
// font-size: 36rpx !important;
// }
::v-deep .tui-tabs__badge {
line-height: 32rpx;
}
} }
.tab2-content { .tab2-content {
background: #fff; background: #fff;
::v-deep .tui-tabs-slider {
background: #ffecf2 !important;
border: 2rpx solid #fe411b;
bottom: 48% !important;
}
::v-deep .tui-tabs-item {
line-height: 60rpx;
.tui-tabs-title{
color: #333 !important;
}
&.tui__tab_current {
.tui-tabs-title {
color: #fe411b !important;
}
}
}
} }
.sales-return-img-title { .sales-return-img-title {
@ -1690,7 +1664,7 @@ export default {
.search-contetn { .search-contetn {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 30rpx 40rpx 40rpx; padding: 40rpx;
.btn-content { .btn-content {
margin-left: 20rpx; margin-left: 20rpx;
@ -1705,7 +1679,7 @@ export default {
} }
.sales-retrun-btn-list { .sales-retrun-btn-list {
margin: 30rpx 10rpx 0; margin: 38rpx 24rpx 0;
height: 160rpx; height: 160rpx;
.sales-retrun-btn-item { .sales-retrun-btn-item {
@ -1714,7 +1688,6 @@ export default {
margin-left: 20rpx; margin-left: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
border: none; border: none;
font-size: 24rpx;
::after { ::after {
border: none; border: none;
@ -1722,8 +1695,8 @@ export default {
} }
.active { .active {
// background: $base-color; background: $base-color;
color: #fe411b; color: #fff;
} }
} }
@ -2057,7 +2030,7 @@ export default {
.no-data { .no-data {
.no-data-bg { .no-data-bg {
margin: auto; margin: 20% auto;
margin-bottom: 0; margin-bottom: 0;
width: 480rpx; width: 480rpx;
height: 480rpx; height: 480rpx;
@ -2065,7 +2038,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.no-data-tips { .no-data-tips {
margin: 20rpx auto 0; margin: 80rpx auto;
color: #aaaaaa; color: #aaaaaa;
text-align: center; text-align: center;
} }

2
java-mall-app-shop-admin/uni.scss
View File

@ -31,7 +31,7 @@ $uni-text-color-disable:#c0c0c0;
/* 背景颜色 */ /* 背景颜色 */
$uni-bg-color:#ffffff; $uni-bg-color:#ffffff;
$uni-bg-color-grey:#f6f6f6; $uni-bg-color-grey:#f8f8f8;
$uni-bg-color-hover:#f1f1f1;//点击状态颜色 $uni-bg-color-hover:#f1f1f1;//点击状态颜色
$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色