charles/frontend-app
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/qinxingxing/alpha-shopping into develop

Browse Source 
# Conflicts:
#	pages/mine/mine.vue
#	pages/supply_chain/supply_chain.vue
This commit is contained in:
money
2025-09-08 10:03:59 +08:00
parent 2659d2c828 a335ef48fa
commit d3202d2a3b
29 changed files with 672 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.scss
+19 -16
View File
File diff suppressed because one or more lines are too long
components/custom-tab-bar.vue
+4 -3
View File
@@ -81,14 +81,15 @@ export default {
} }
.tab-icon { .tab-icon {
width: 24px; margin-top: 5rpx;
width: 44rpx;
/* 图标大小 */ /* 图标大小 */
height: 24px; height: 44rpx;
/* 图标大小 */ /* 图标大小 */
} }
.tab-text { .tab-text {
font-size: 12px; font-size: 24rpx
/* 文字大小 */ /* 文字大小 */
} }
pages/home/home.vue
+1 -1
View File
@@ -495,7 +495,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.home_warp { .home_warp {
background: $app-bj; background: $app-bj;
height: calc(100vh - 140rpx); // 140rpx 是底部的导航栏高度 height: calc(100vh - env(safe-area-inset-bottom)); // 是底部的导航栏高度
overflow: auto; overflow: auto;
position: relative; position: relative;
} }
pages/mine/mine.vue
+172 -145
View File
@@ -3,41 +3,54 @@
<view class="mine_header"> <view class="mine_header">
<view class="mine_login_data" v-if="currentUserData && Object.keys(currentUserData).length !== 0"> <view class="mine_login_data" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
<view class="mine_data"> <view class="mine_data">
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/logo_y.png" shape="circle" width="80" <up-image src="/static/mine/avatar.png" shape="circle" width="54" height="54" bgColor="#f1f6ff00"></up-image>
height="80" bgColor="#f1f6ff00"></up-image>
<view class="mine_info"> <view class="mine_info">
<view class="mine_info_name"> <view class="mine_info_name">
<text style="margin-right: 20rpx;">{{ currentUserData.name || '信任桥用户' }}</text> <text style="margin-right: 20rpx">{{ currentUserData.name || '信任桥用户' }}</text>
<view class="grade_warp" v-if="currentUserData && Object.keys(currentUserData).length !== 0"> <view class="level">
<up-image <up-image
:src="currentUserData.gradeLevel || currentUserData.gradeLevel === 0 ? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/grade/V' + currentUserData.gradeLevel + '.png' : 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/grade/V0.png'" src="/static/mine/rz.png"
width="96" height="26" bgColor="#f1f6ff00"></up-image> style="margin-right: 8rpx; margin-top: 6rpx"
<view shape="circle"
:class="currentUserData.gradeName.length > 3 ? 'grade_key_warp grade_key_warp3' : 'grade_key_warp grade_key_warp1'"> width="12"
{{ currentUserData.gradeName }}</view> height="12"
bgColor="#f1f6ff00"
></up-image>
<view>{{ currentUserData.gradeName }}</view>
</view> </view>
<!-- <view class="grade_warp" v-if="currentUserData && Object.keys(currentUserData).length !== 0">
<up-image
:src="
currentUserData.gradeLevel || currentUserData.gradeLevel === 0
? 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/grade/V' + currentUserData.gradeLevel + '.png'
: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/grade/V0.png'
"
width="96"
height="26"
bgColor="#f1f6ff00"
></up-image>
<view :class="currentUserData.gradeName.length > 3 ? 'grade_key_warp grade_key_warp3' : 'grade_key_warp grade_key_warp1'">
{{ currentUserData.gradeName }}
</view>
</view> -->
</view> </view>
<view class="mine_info_id"> <view class="mine_info_id">
<text style="margin-right: 20rpx;">邀请码:{{ currentUserData.inviteCode }} </text> <text style="margin-right: 20rpx">邀请码:{{ currentUserData.inviteCode }}</text>
<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" <up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyData(currentUserData.inviteCode)"></up-image>
@click="copyData(currentUserData.inviteCode)"></up-image>
</view> </view>
</view> </view>
</view> </view>
<view @click="jumpSetting"> <view @click="jumpSetting">
<up-image src="/static/common/setting.png" width="22" height="22" bgColor="#f1f6ff00"></up-image> <up-image src="/static/mine/icon_arrow_black_off.png" width="22" height="22" bgColor="#f1f6ff00"></up-image>
</view> </view>
</view> </view>
<view class="mine_no_login_data" v-else> <view class="mine_no_login_data" v-else>
<view class="mine_data"> <view class="mine_data">
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/avater_not.png" shape="circle" <up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/avater_not.png" shape="circle" width="80" height="80" bgColor="#f1f6ff00"></up-image>
width="80" height="80" bgColor="#f1f6ff00"></up-image> <view class="mine_info_not_login">未登录</view>
<view class="mine_info_not_login">
未登录
</view>
</view> </view>
<view @click="jumpLogin" class="login_warp"> <view @click="jumpLogin" class="login_warp">
<text style="margin-right: 10rpx;">立即登录</text> <text style="margin-right: 10rpx">立即登录</text>
<up-image src="/static/common/right_y_st.png" width="18" height="18" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/right_y_st.png" width="18" height="18" bgColor="#f1f6ff00"></up-image>
</view> </view>
</view> </view>
@@ -48,14 +61,13 @@
<view class="mine_order_title"> <view class="mine_order_title">
<view>我的订单</view> <view>我的订单</view>
<view class="mine_order_title_all" @click="jumpOrder({})"> <view class="mine_order_title_all" @click="jumpOrder({})">
<view style="margin-right: 10rpx;">全部</view> <view style="margin-right: 10rpx; font-size: 28rpx; font-weight: normal">全部</view>
<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image> <up-image style="margin-top: 10rpx" src="/static/common/right.png" width="15" height="15" bgColor="#f1f6ff00"></up-image>
</view> </view>
</view> </view>
<view class="mine_order_list"> <view class="mine_order_list">
<view class="mine_fontsize_comm_warp order_list_item" v-for="item in orderTemplList" :key="item.id" <view class="mine_fontsize_comm_warp order_list_item" v-for="item in orderTemplList" :key="item.id" @click="jumpOrder(item)">
@click="jumpOrder(item)"> <up-image :src="item.url" width="28" height="28" bgColor="#f1f6ff00"></up-image>
<up-image :src="item.url" width="30" height="30" bgColor="#f1f6ff00"></up-image>
<view>{{ item.title }}</view> <view>{{ item.title }}</view>
<up-badge :absolute="true" :offset="[0, 8]" max="99" :value="statisticsObj[item.note]"></up-badge> <up-badge :absolute="true" :offset="[0, 8]" max="99" :value="statisticsObj[item.note]"></up-badge>
</view> </view>
@@ -63,8 +75,7 @@
</view> </view>
<!-- 应用 --> <!-- 应用 -->
<view class="mine_content_comm_warp mine_top_comm_warp apply_list"> <view class="mine_content_comm_warp mine_top_comm_warp apply_list">
<view class="apply_item mine_fontsize_comm_warp" v-for="item in applyList" :key="item.id" <view class="apply_item mine_fontsize_comm_warp" v-for="item in applyList" :key="item.id" @click="jumpTool(item)">
@click="jumpTool(item)">
<up-image :src="item.url" width="36" height="36" bgColor="#f1f6ff00"></up-image> <up-image :src="item.url" width="36" height="36" bgColor="#f1f6ff00"></up-image>
<view>{{ item.title }}</view> <view>{{ item.title }}</view>
</view> </view>
@@ -75,8 +86,7 @@
<view class="settled_list"> <view class="settled_list">
<view class="enter_item" @click="jumpEnter('merchant')"> <view class="enter_item" @click="jumpEnter('merchant')">
<view class="enter_item_cell"> <view class="enter_item_cell">
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_sj.png" width="36" height="36" <up-image src="/static/mine/enter_sj.png" width="36" height="36" bgColor="#f1f6ff00"></up-image>
bgColor="#f1f6ff00"></up-image>
<view class="enter_item_text"> <view class="enter_item_text">
<view class="enter_title">商家入驻</view> <view class="enter_title">商家入驻</view>
<view class="enter_remark">获取更多客户与订单机会</view> <view class="enter_remark">获取更多客户与订单机会</view>
@@ -84,17 +94,15 @@
</view> </view>
<view class="enter_apply"> <view class="enter_apply">
<text class="enter_apply_title">申请</text> <text class="enter_apply_title">申请</text>
<view style="margin-top: 10rpx;"> <view style="margin-top: 10rpx">
<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
</view> </view>
</view> </view>
</view> </view>
<view class="enter_item" @click="jumpEnter('brand')"> <view class="enter_item" @click="jumpEnter('brand')">
<view class="enter_item_cell"> <view class="enter_item_cell">
<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_pp.png" width="36" height="36" <up-image src="/static/mine/enter_pp.png" width="36" height="36" bgColor="#f1f6ff00"></up-image>
bgColor="#f1f6ff00"></up-image>
<view class="enter_item_text"> <view class="enter_item_text">
<view class="enter_title">企业/品牌入驻</view> <view class="enter_title">企业/品牌入驻</view>
<view class="enter_remark">助您打造专属品牌馆</view> <view class="enter_remark">助您打造专属品牌馆</view>
@@ -103,7 +111,7 @@
<view class="enter_apply"> <view class="enter_apply">
<text class="enter_apply_title">申请</text> <text class="enter_apply_title">申请</text>
<view style="margin-top: 10rpx;"> <view style="margin-top: 10rpx">
<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
</view> </view>
</view> </view>
@@ -116,7 +124,7 @@
<view class="mine_tool_title">服务工具</view> <view class="mine_tool_title">服务工具</view>
<view class="tool_list"> <view class="tool_list">
<view class="tool_item" v-for="item in toolList" :key="item.id" @click="jumpTool(item)"> <view class="tool_item" v-for="item in toolList" :key="item.id" @click="jumpTool(item)">
<up-image :src="item.url" width="30" height="30" bgColor="#f1f6ff00"></up-image> <up-image :src="item.url" width="28" height="28" bgColor="#f1f6ff00"></up-image>
<text class="mine_fontsize_comm_warp">{{ item.title }}</text> <text class="mine_fontsize_comm_warp">{{ item.title }}</text>
</view> </view>
</view> </view>
@@ -128,7 +136,7 @@
<!-- 品牌入驻弹框 --> <!-- 品牌入驻弹框 -->
<up-modal :show="brandShow" :showConfirmButton="false"> <up-modal :show="brandShow" :showConfirmButton="false">
<view class="slot-content"> <view class="slot-content">
<view class="close_warp" @click="brandShow = false;"> <view class="close_warp" @click="brandShow = false">
<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
</view> </view>
<view class="content_"> <view class="content_">
@@ -138,14 +146,14 @@
</view> </view>
<view class="but_"> <view class="but_">
<view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view> <view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view>
<view class="but_close" @click="brandShow = false;">取消</view> <view class="but_close" @click="brandShow = false">取消</view>
</view> </view>
</view> </view>
</up-modal> </up-modal>
<!-- 我的客服 --> <!-- 我的客服 -->
<up-modal :show="serviceShow" :showConfirmButton="false"> <up-modal :show="serviceShow" :showConfirmButton="false">
<view class="slot-content"> <view class="slot-content">
<view class="close_warp" @click="serviceShow = false;"> <view class="close_warp" @click="serviceShow = false">
<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
</view> </view>
<view class="content_"> <view class="content_">
@@ -154,14 +162,14 @@
</view> </view>
<view class="but_"> <view class="but_">
<view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view> <view class="but_copy" @click="copyMobile(CUSTOMER_SERVICE_PHONE_NUMBER)">复制号码</view>
<view class="but_close" @click="serviceShow = false;">取消</view> <view class="but_close" @click="serviceShow = false">取消</view>
</view> </view>
</view> </view>
</up-modal> </up-modal>
<!-- 暂未开放 --> <!-- 暂未开放 -->
<up-modal :show="openShow" :showConfirmButton="false"> <up-modal :show="openShow" :showConfirmButton="false">
<view class="slot-content"> <view class="slot-content">
<view class="close_warp" @click="openShow = false;"> <view class="close_warp" @click="openShow = false">
<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image> <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
</view> </view>
<view class="content_"> <view class="content_">
@@ -169,7 +177,7 @@
<view class="content_2">暂未开放</view> <view class="content_2">暂未开放</view>
</view> </view>
<view class="but_"> <view class="but_">
<view class="but_copy" @click="openShow = false;">确定</view> <view class="but_copy" @click="openShow = false">确定</view>
</view> </view>
</view> </view>
</up-modal> </up-modal>
@@ -177,7 +185,7 @@
</template> </template>
<script> <script>
import { getStorageFun, USER_DATA, clear } from '@/utils/auth.js' import { getStorageFun, USER_DATA, clear } from '@/utils/auth.js';
import { ORDER_TYPE, MINE_ORDER_TYPE } from '@/utils/enumUtils.js'; import { ORDER_TYPE, MINE_ORDER_TYPE } from '@/utils/enumUtils.js';
import { copyData } from '@/utils/index.js'; import { copyData } from '@/utils/index.js';
import CustomTabBar from '@/components/custom-tab-bar.vue'; import CustomTabBar from '@/components/custom-tab-bar.vue';
@@ -189,7 +197,7 @@ export default {
computed: { computed: {
CUSTOMER_SERVICE_PHONE_NUMBER() { CUSTOMER_SERVICE_PHONE_NUMBER() {
return CUSTOMER_SERVICE_PHONE_NUMBER; return CUSTOMER_SERVICE_PHONE_NUMBER;
}, }
}, },
components: { CustomTabBar }, components: { CustomTabBar },
data() { data() {
@@ -199,54 +207,65 @@ export default {
orderTemplList: [ orderTemplList: [
{ {
id: ORDER_TYPE.UNPAID, id: ORDER_TYPE.UNPAID,
title: "待支付", title: '待支付',
url: '/static/mine/order_unpaid.png', url: '/static/mine/order_unpaid.png',
path: "/pages/mine_package/mine_order/mine_order?type=" + MINE_ORDER_TYPE.UNPAID, path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.UNPAID,
note: "unPayNum", note: 'unPayNum'
}, {
id: ORDER_TYPE.UNSHIPPED,
title: "待发货",
url: '/static/mine/order_unshipped.png',
path: "/pages/mine_package/mine_order/mine_order?type=" + MINE_ORDER_TYPE.UNSHIPPED,
note: "unSentNum",
}, {
id: ORDER_TYPE.NOT_RECEIVE,
title: "待收货",
url: '/static/mine/order_notReceive.png',
path: "/pages/mine_package/mine_order/mine_order?type=" + MINE_ORDER_TYPE.NOT_RECEIVE,
note: "unTakeNum",
}, {
id: ORDER_TYPE.SUCCEED,
title: "已完成",
url: '/static/mine/order_afterSale.png',
path: "/pages/mine_package/mine_order/mine_order?type=" + MINE_ORDER_TYPE.SUCCEED,
note: "unCommentNum",
}, },
{
id: ORDER_TYPE.UNSHIPPED,
title: '待发货',
url: '/static/mine/order_unshipped.png',
path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.UNSHIPPED,
note: 'unSentNum'
},
{
id: ORDER_TYPE.NOT_RECEIVE,
title: '待收货',
url: '/static/mine/order_notReceive.png',
path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.NOT_RECEIVE,
note: 'unTakeNum'
},
{
id: ORDER_TYPE.SUCCEED,
title: '已完成',
url: '/static/mine/order_afterSale.png',
path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.SUCCEED,
note: 'unCommentNum'
},
{
id: ORDER_TYPE.AFTER_SALE,
title: '售后',
url: '/static/mine/order_afterSale.png',
path: '/pages/mine_package/mine_order/mine_order?type=' + MINE_ORDER_TYPE.AFTER_SALE,
note: 'unCommentNum'
}
], ],
applyList: [ applyList: [
{ {
id: 1, id: 1,
title: "钱包", title: '钱包',
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_purse.png', url: '/static/mine/apply_purse.png',
path: "/pages/mine_package/mine_purse/mine_purse" path: '/pages/mine_package/mine_purse/mine_purse'
}, { },
{
id: 2, id: 2,
title: "抽奖", title: '抽奖',
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_prize.png', url: '/static/mine/apply_prize.png',
path: "/pages/other_package/nine-grid/nine-grid" path: '/pages/other_package/nine-grid/nine-grid'
}, },
{ {
id: 4, id: 4,
title: "我的推广", title: '我的推广',
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_team.png', url: '/static/mine/tool_team.png',
path: "/pages/mine_package/mine_my_team/mine_my_team" path: '/pages/mine_package/mine_my_team/mine_my_team'
}, },
{ {
id: 5, id: 5,
title: "加速次数", title: '加速次数',
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_js.png', url: '/static/mine/tool_js.png',
path: "/pages/rwa_package/dongjian/jia" path: '/pages/rwa_package/dongjian/jia'
}, }
// { // {
// id: 3, // id: 3,
// title: "交易", // title: "交易",
@@ -265,23 +284,24 @@ export default {
toolList: [ toolList: [
{ {
id: 5, id: 5,
title: "地址管理", title: '地址管理',
url: '/static/mine/tool_dz.png', url: '/static/mine/tool_dz.png',
path: '/pages/mine_package/mine_address/mine_address' path: '/pages/mine_package/mine_address/mine_address'
}, },
{ {
id: 9, id: 9,
title: "实名认证", title: '实名认证',
url: '/static/mine/tool_sm.png', url: '/static/mine/tool_sm.png'
}, },
{ {
id: 10, id: 10,
title: "银行卡管理", title: '银行卡管理',
url: '/static/mine/tool_card.png', url: '/static/mine/tool_card.png',
path: '/pages/mine_package/mine_bank_card/mine_bank_card' path: '/pages/mine_package/mine_bank_card/mine_bank_card'
}, { },
{
id: 3, id: 3,
title: "邀请好友", title: '邀请好友',
url: '/static/mine/tool_invite.png', url: '/static/mine/tool_invite.png',
path: '/pages/other_package/invite_friends/invite_friends' path: '/pages/other_package/invite_friends/invite_friends'
}, },
@@ -299,8 +319,8 @@ export default {
// }, // },
{ {
id: 7, id: 7,
title: "联系客服", title: '联系客服',
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_kf.png' url: '/static/mine/xlkf.png'
}, },
// { // {
// id:4, // id:4,
@@ -310,21 +330,22 @@ export default {
// }, // },
{ {
id: 8, id: 8,
title: "商学院资讯", title: '商学院资讯',
url: '/static/mine/tool_sxy.png', url: '/static/mine/tool_sxy.png',
path: "/pages/login_package/news/news" path: '/pages/login_package/news/news'
}, },
{ {
id: 12, id: 12,
title: "财务", title: '财务',
url: '/static/mine/tool_cw.png', url: '/static/mine/tool_cw.png',
path: "/pages/rwa_package/dongjian/finance", path: '/pages/rwa_package/dongjian/finance'
}, {
id: 11,
title: "股东行权",
url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_hxjy.png',
path: "/pages/rwa_package/rwa/rwa",
}, },
{
id: 11,
title: '股东行权',
url: '/static/mine/tool_gdxq.png',
path: '/pages/rwa_package/rwa/rwa'
}
// { // {
// id:1, // id:1,
// title:"IM聊天", // title:"IM聊天",
@@ -336,25 +357,24 @@ export default {
unPayNum: 0, //待支付数量 unPayNum: 0, //待支付数量
unSentNum: 0, //待发货数量 unSentNum: 0, //待发货数量
unTakeNum: 0, //待收货数量 unTakeNum: 0, //待收货数量
unCommentNum: 0,//待评价数量 unCommentNum: 0 //待评价数量
}, // 角标统计 }, // 角标统计
serviceShow: false, // 我的客服弹框 serviceShow: false, // 我的客服弹框
openShow: false,// 暂未开放 openShow: false // 暂未开放
} };
}, },
onShow() { onShow() {
this.userData = getStorageFun(USER_DATA); this.userData = getStorageFun(USER_DATA);
/*#ifdef APP-PLUS*/ /*#ifdef APP-PLUS*/
uni.hideTabBar({ uni.hideTabBar({
animation: false animation: false
}) });
/*#endif*/ /*#endif*/
this.getStatistics(); this.getStatistics();
this.getUserInfo(); this.getUserInfo();
}, },
mounted() { mounted() {},
},
methods: { methods: {
copyData, copyData,
// 查询用户等级 // 查询用户等级
@@ -372,56 +392,57 @@ export default {
jumpTool(item) { jumpTool(item) {
// 客服 // 客服
if (item.id === 7) { if (item.id === 7) {
// this.serviceShow = true;
uni.navigateTo({ uni.navigateTo({
url:'/pages/rwa_package/setting/kefu?type=5257' url:'/pages/rwa_package/setting/kefu?type=5257'
}) })
} else if (item.id === 9) {// 实名认证 } else if (item.id === 9) {
// 实名认证
const currentUserData = this.currentUserData; const currentUserData = this.currentUserData;
console.log('currentUserData',this.currentUserData) console.log('currentUserData', this.currentUserData);
let path = "/pages/mine_package/mine_authentication/mine_authentication" let path = '/pages/mine_package/mine_authentication/mine_authentication';
// if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) { // if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) {
// path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok" // path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok"
// } // }
uni.navigateTo({ uni.navigateTo({
url: path, url: path
}) });
} else if (item.path) { } else if (item.path) {
uni.navigateTo({ uni.navigateTo({
url: item.path, url: item.path
}) });
} else { } else {
this.openShow = true; this.openShow = true;
} }
}, },
jumpOrder(item) { jumpOrder(item) {
let path = '/pages/mine_package/mine_order/mine_order' let path = '/pages/mine_package/mine_order/mine_order';
if (item && Object.keys(item).length !== 0) { if (item && Object.keys(item).length !== 0) {
path = item.path; path = item.path;
} }
uni.navigateTo({ uni.navigateTo({
url: path, url: path
}) });
}, },
jumpLogin() { jumpLogin() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/login_package/login/login', url: '/pages/login_package/login/login'
}) });
}, },
// 跳转到入驻页面 // 跳转到入驻页面
jumpEnter(type) { jumpEnter(type) {
// 商家入驻 // 商家入驻
if (type === "merchant") { if (type === 'merchant') {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue', // url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue',
// }) // })
this.openShow = true; this.openShow = true;
} else if (type === "brand") { } else if (type === 'brand') {
// 企业/品牌入驻 // 企业/品牌入驻
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/brand_settlement/brand_settlement', // url: '/pages/brand_settlement/brand_settlement',
// }) // })
this.brandShow = true; // this.brandShow = true;
this.openShow = true;
} }
}, },
copyMobile(mobile) { copyMobile(mobile) {
@@ -435,21 +456,21 @@ export default {
if (result && result.bizcode === 100 && result.data) { if (result && result.bizcode === 100 && result.data) {
this.statisticsObj = { this.statisticsObj = {
...result.data, ...result.data,
unCommentNum: 0,//待评价数量 unCommentNum: 0 //待评价数量
}; };
} else { } else {
this.statisticsObj = { this.statisticsObj = {
unPayNum: 0, //待支付数量 unPayNum: 0, //待支付数量
unSentNum: 0, //待发货数量 unSentNum: 0, //待发货数量
unTakeNum: 0, //待收货数量 unTakeNum: 0, //待收货数量
unCommentNum: 0,//待评价数量 unCommentNum: 0 //待评价数量
}; };
} }
}, },
jumpSetting() { jumpSetting() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/rwa_package/setting/setting' url: '/pages/rwa_package/setting/setting'
}) });
} }
}, },
beforeDestroy() { beforeDestroy() {
@@ -457,26 +478,24 @@ export default {
unPayNum: 0, //待支付数量 unPayNum: 0, //待支付数量
unSentNum: 0, //待发货数量 unSentNum: 0, //待发货数量
unTakeNum: 0, //待收货数量 unTakeNum: 0, //待收货数量
unCommentNum: 0,//待评价数量 unCommentNum: 0 //待评价数量
}; // 角标统计 }; // 角标统计
},
} }
};
</script> </script>
<style lang="scss"> <style lang="scss">
.mine_warp { .mine_warp {
height: calc(100vh - 140rpx); height: calc(100vh - env(safe-area-inset-bottom));
overflow: auto; overflow: auto;
position: relative; position: relative;
background-color: $app-bj; background-color: $app-bj;
} }
.mine_header { .mine_header {
height: 300rpx; // height: 300rpx;
background-image: url("https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/resultmine.png"); background: linear-gradient(180deg, #f2ebff 0%, rgba(245, 245, 247, 0) 100%, #ffffff 100%);
background-size: 100% 100%;
background-position: center;
/* 将图片居中显示 */ /* 将图片居中显示 */
padding: 90rpx 40rpx 0; padding: 90rpx 40rpx 0;
@@ -488,14 +507,12 @@ export default {
} }
.mine_content_warp { .mine_content_warp {
position: absolute; margin-top: 20rpx;
top: 278rpx; margin-left: 30rpx;
width: 92%; width: 690rpx;
height: auto; padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
left: 4%;
} }
.mine_no_login_data { .mine_no_login_data {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -527,20 +544,30 @@ export default {
.mine_info_name { .mine_info_name {
font-weight: bold; font-weight: bold;
font-size: 36rpx; font-size: 40rpx;
color: #111111; color: #111111;
display: flex; display: flex;
justify-content: start;
align-items: center;
.grade_warp { .grade_warp {
position: relative; position: relative;
} }
.level {
background: rgba(122, 53, 246, 0.1);
border-radius: 8rpx;
display: flex;
justify-content: center;
align-items: center;
padding: 2rpx 16rpx;
color: #7a35f6;
font-size: 24rpx;
}
.grade_key_warp { .grade_key_warp {
position: absolute; position: absolute;
top: 0rpx; top: 0rpx;
left: 30%; left: 30%;
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #ffffff;
width: 100rpx; width: 100rpx;
height: 44rpx; height: 44rpx;
line-height: 50rpx; line-height: 50rpx;
@@ -567,8 +594,8 @@ export default {
/* 内容公共 start */ /* 内容公共 start */
.mine_content_comm_warp { .mine_content_comm_warp {
background: #FFFFFF; background: #ffffff;
box-shadow: 0rpx 0rpx 10rpx 0rpx #EEEEEE; box-shadow: 0rpx 0rpx 10rpx 0rpx #eeeeee;
border-radius: 30rpx; border-radius: 30rpx;
padding: 30rpx; padding: 30rpx;
} }
@@ -608,7 +635,6 @@ export default {
margin-top: 10rpx; margin-top: 10rpx;
} }
} }
} }
} }
} }
@@ -621,20 +647,22 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
font-weight: bold; font-weight: bold;
font-size: 30rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.mine_order_title_all { .mine_order_title_all {
display: flex; display: flex;
align-items: center;
justify-content: center;
font-size: 20rpx; font-size: 20rpx;
color: #BBBBBB; color: #bbbbbb;
} }
.mine_order_list { .mine_order_list {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 40rpx 0 30rpx 0; margin: 40rpx 0 10rpx 0;
} }
.order_list_item { .order_list_item {
@@ -646,7 +674,6 @@ export default {
.apply_list { .apply_list {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.apply_item { .apply_item {
@@ -661,7 +688,7 @@ export default {
.enter_item { .enter_item {
width: 40%; width: 40%;
background: #FFFFFF; background: #ffffff;
border-radius: 30rpx; border-radius: 30rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
pages/mine_package/mine_order/mine_order.vue
+3 -3
View File
@@ -352,7 +352,7 @@ export default {
onLoad(options) { onLoad(options) {
const type = options.type; const type = options.type;
this.form.type = this.form.type =
type && type < 5 ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID; type ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
this.loadData(); this.loadData();
// 待收货判断是否签署 // 待收货判断是否签署
if ( if (
@@ -403,7 +403,7 @@ export default {
this.aftterSalesProduct = item; this.aftterSalesProduct = item;
this.afterShow = true; this.afterShow = true;
this.aftterSalesProduct.status = 9; this.aftterSalesProduct.status = 9;
this.aftterSalesProduct.afterType = this.form.type - 1; this.aftterSalesProduct.afterType = this.form.type == MINE_ORDER_TYPE.UNSHIPPED ? 1 : 2;
} }
}, },
// 售后订单详情 // 售后订单详情
@@ -800,7 +800,7 @@ export default {
} }
.order_warp { .order_warp {
height: calc(100vh - 130rpx); height: calc(100vh - env(safe-area-inset-bottom));
background-color: $app-bj; background-color: $app-bj;
padding: 100rpx 30rpx 30rpx; padding: 100rpx 30rpx 30rpx;
overflow-y: hidden; overflow-y: hidden;
pages/other_package/invite_friends/invite_friends.vue
+18 -6
View File
@@ -1,8 +1,9 @@
<template> <template>
<view class="invite_friends_warp"> <view class="invite_friends_warp">
<view class="invite_img"> <view class="invite_img">
<up-image :loading="imageLoading" :src="inviteImage" width="100%" height="460" bgColor="#f1f6ff00" shape="square" <!-- <up-image :loading="imageLoading" :src="inviteImage" class="invite_imgage" bgColor="#f1f6ff00" shape="square"
radius=10></up-image> radius=10></up-image> -->
<image :src="inviteImage" class="invite_imgage"></image>
</view> </view>
<view class="invite_but"> <view class="invite_but">
<view class="save_but"> <view class="save_but">
@@ -97,12 +98,23 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.invite_friends_warp { .invite_friends_warp {
height: calc(100vh - 80rpx); height: calc(100vh - 80rpx);
padding: 40rpx; padding: 10rpx 40rpx 40rpx;
} }
.invite_img { // .invite_img {
margin-top: 52rpx; // height: 920rpx;
height: 930rpx; // }
.invite_imgage{
// width="100%" height="460"
img {
width: 100%;
height: 920rpx;
}
::v-deep(uni-image){
width: 100%;
height: 920rpx;
}
} }
.invite_but { .invite_but {
pages/sort/sort.vue
+1 -1
View File
@@ -244,7 +244,7 @@ export default {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
margin-top: 20rpx; margin-top: 20rpx;
height: calc(100vh - 356rpx); height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
} }
.u-search-inner { .u-search-inner {
static/common/copy.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 450 B

static/mine/apply_prize.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

static/mine/apply_purse.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

static/mine/avatar.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

static/mine/enter_pp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

static/mine/enter_sj.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

static/mine/icon_arrow_black_off.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 708 B

static/mine/order_afterSale.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

static/mine/order_notReceive.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

static/mine/order_unpaid.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 764 B

static/mine/order_unshipped.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

static/mine/rz.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

static/mine/tool_card.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

static/mine/tool_cw.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 969 B

static/mine/tool_dz.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 905 B

static/mine/tool_gdxq.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

static/mine/tool_invite.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

static/mine/tool_js.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

static/mine/tool_sm.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

static/mine/tool_sxy.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

static/mine/tool_team.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

static/mine/xlkf.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB