feat: 选品广场结算返回到我的店铺页,粉色卡默认false所有页面统一调整
This commit is contained in:
@@ -10,3 +10,5 @@
|
||||
- 首页`会员优选`分类兜底(已开通ai店铺不展示)
|
||||
- 首页`会员优选`分类点击购买直接跳转到购买页、支付完成返回首页
|
||||
- 我的社员ui重构
|
||||
- 粉色卡默认false所有页面统一调整
|
||||
- 选品广场结算返回到我的店铺页
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="收银台" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<s-pages title="收银台" :pink_bg="true" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<view class="p-x-32">
|
||||
<view class="center p-t-96 weight500 size100"><span class="size48">¥</span>
|
||||
{{ fen2yuan(state.orderInfo.payPrice) }}
|
||||
@@ -332,4 +332,4 @@
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="收银台" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<s-pages title="收银台" :pink_bg="true" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<view class="p-x-32">
|
||||
<view class="center p-t-96 weight500 size100"
|
||||
><span class="size48">¥</span>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="确认订单">
|
||||
<s-pages title="确认订单" :pink_bg="true">
|
||||
<view class="p-b-132">
|
||||
<AddressSelection v-model="addressState" theme="2" @getSettlementInfo="getSettlementInfo" />
|
||||
<view class="p-x-32 m-t-24">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 订单详情 -->
|
||||
<template>
|
||||
<s-pages title="订单详情">
|
||||
<s-pages title="订单详情" :pink_bg="true">
|
||||
<view class="flex-center al-flex-end ju-between p-x-32 m-b-54">
|
||||
<view>
|
||||
<view class="size40 weight500 m-b-16">{{ statusObj[state.orderInfo.status]?.text }}</view>
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="AI店铺" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<s-pages title="AI店铺" :pink_bg="true" :goLeft="false" @onClickLeft="onClickLeft">
|
||||
<view class="p-x-32 h100 flex-column">
|
||||
<view class="search flex-center m-t-48 m-b-56">
|
||||
<view class="searchLeft flex1 flex-center p-l-40 p-r-40">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 订单详情 -->
|
||||
<template>
|
||||
<s-pages title="订单详情">
|
||||
<s-pages title="订单详情" :pink_bg="true">
|
||||
<view class="flex-center al-flex-end ju-between p-x-32 m-b-54">
|
||||
<view>
|
||||
<view class="size40 weight500 m-b-16">{{ statusObj[state.orderInfo.status]?.text }}</view>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="确认订单">
|
||||
<s-pages title="确认订单" :pink_bg="true">
|
||||
<view class="p-b-132">
|
||||
<AddressSelection v-model="addressState" theme="2" @getSettlementInfo="getSettlementInfo" />
|
||||
<view class="p-x-32 m-t-24">
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<s-pages
|
||||
:pink_bg="false"
|
||||
tabbar="/pages/cart/cart"
|
||||
title="购物车"
|
||||
:showLeftButton="false"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages class="set-wrap" title="搜索" color="#ffffff">
|
||||
<s-pages class="set-wrap" title="搜索" color="#ffffff" :pink_bg="true">
|
||||
<card_search :modelValue="searchText" class="goods_search" @search="search"></card_search>
|
||||
|
||||
<pages_commodity
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="我的收益">
|
||||
<s-pages title="我的收益" :pink_bg="true">
|
||||
|
||||
<view class="pages">
|
||||
<!-- 1 -->
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="银行卡">
|
||||
<s-pages title="银行卡" :pink_bg="true">
|
||||
<view class="bg_img" style="min-height: 100vh">
|
||||
<view class="p-32">
|
||||
<view v-if="bankList.length" class="bank-list">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="计算">
|
||||
<s-pages title="计算" :pink_bg="true">
|
||||
<view class="p-x-32">
|
||||
<view class="flex-center m-b-20">
|
||||
<view class="w_150">利润:</view>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="去变现">
|
||||
<s-pages title="去变现" :pink_bg="true">
|
||||
<view class="liquidation">
|
||||
<view class="top_bar">
|
||||
<view class="record_link" @click="goRecord">变现记录</view>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="变现记录">
|
||||
<s-pages title="变现记录" :pink_bg="true">
|
||||
<card_mescroll ref="cardPages" @upCallback="getList" :height="height">
|
||||
<view class="bg24 radius12 m-x-42 p-y-28 p-x-40" v-if="detailList.length">
|
||||
<view
|
||||
@@ -70,4 +70,3 @@
|
||||
color: #366eee;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="修改密码">
|
||||
<s-pages title="修改密码" :pink_bg="true">
|
||||
<view class="pages flex-column ju-between">
|
||||
<card_list class="cardList bg24" :arr="listArr">
|
||||
<template #footer-2>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages :bgStyle="{ color: 'var(--color1)' }" :title="dataObj.title">
|
||||
<s-pages :bgStyle="{ color: 'var(--color1)' }" :title="dataObj.title" :pink_bg="true">
|
||||
<view class="pages p-t-28 p-x-40">
|
||||
<view class="radius12 pagesTop p-y-30 p-x-28 bg24">
|
||||
<view class="c0">{{ dataObj.text0 }}</view>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="提现">
|
||||
<s-pages title="提现" :pink_bg="true">
|
||||
<view class="pages p-y-28 p-x-40 c0">
|
||||
<!-- <view class="m-b-20 tab-header">
|
||||
<text class="tab-item" :class="{ active: type === 'yougou' }" @click="changeType('yougou')">优购提现</text>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="提现记录">
|
||||
<s-pages title="提现记录" :pink_bg="true">
|
||||
<card_mescroll ref="cardPages" @upCallback="getList" :height="height">
|
||||
<view class="bg24 radius12 m-x-42 p-y-28 p-x-40" v-if="detailList.length">
|
||||
<view
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="我的社员" :pink_bg="false" navPreset="float" :blue_bg="true">
|
||||
<s-pages title="我的社员" navPreset="float" :blue_bg="true">
|
||||
<!-- 头部 -->
|
||||
<view class="header" :style="{ backgroundImage: 'url(' + $url + 'home/staff2.png' + ')' }">
|
||||
<view class="header-content">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="钱包">
|
||||
<s-pages title="钱包" :pink_bg="true">
|
||||
<!-- 头部 -->
|
||||
<view class="header" :style="{ backgroundImage: 'url(' + $url + 'home/wallet2.png' + ')' }">
|
||||
<view class="header-content">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="我的" leftUrl="/pages/index/index" :goLeft="false">
|
||||
<s-pages title="我的" :pink_bg="true" leftUrl="/pages/index/index" :goLeft="false">
|
||||
<view class="p-x-32 w100 h_364 relative m-t-42 color0">
|
||||
<view class="p-x-32 w100 h100 absolute t0 l0">
|
||||
<image class="w100 h100" src="/static/increment/bg.png" mode="scaleToFill" />
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<template>
|
||||
<s-pages
|
||||
title="AI店铺"
|
||||
:pink_bg="false"
|
||||
navPreset="blue"
|
||||
tabbar="/pages/index/aiStore"
|
||||
:showLeftButton="false"
|
||||
@@ -166,7 +165,7 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, watch } from 'vue';
|
||||
import { onShow } from '@dcloudio/uni-app';
|
||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
||||
import * as api from '@/sheep/api/ai/index';
|
||||
import card_pages from '@/components/card_pages/card_pages';
|
||||
import card_payment from '@/components/card_payment/card_payment';
|
||||
@@ -217,6 +216,13 @@
|
||||
mesArr.value = res?.code === 0 ? res?.data || [] : [];
|
||||
};
|
||||
|
||||
onLoad((options) => {
|
||||
const tab = Number(options?.tab);
|
||||
if (tab === 1) {
|
||||
navChange(1);
|
||||
}
|
||||
});
|
||||
|
||||
onShow(() => {
|
||||
getSpuTimeList();
|
||||
getCartList();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages tabbar="/pages/cart/cart" title="购物车" :showLeftButton="false">
|
||||
<s-pages tabbar="/pages/cart/cart" title="购物车" :pink_bg="true" :showLeftButton="false">
|
||||
<s-empty
|
||||
v-if="state.list.length === 0"
|
||||
icon="/static/cart-empty.png"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="分类" :showLeftButton="false" color="#ffffff">
|
||||
<s-pages title="分类" :pink_bg="true" :showLeftButton="false" color="#ffffff">
|
||||
<card_search class="search" style="padding-bottom: 32rpx" @search="search"></card_search>
|
||||
<view class="page_bottom flex-row">
|
||||
<view class="classify shrink">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="列表记录" :pink_bg="false" navPreset="light">
|
||||
<s-pages title="列表记录" navPreset="light">
|
||||
<view class="list-record-page">
|
||||
<view class="share-btn" :style="{ top: shareTop }" @tap="onShare">
|
||||
一键分享
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 售后申请 -->
|
||||
<template>
|
||||
<s-pages title="申请售后">
|
||||
<s-pages title="申请售后" :pink_bg="true">
|
||||
<!-- 售后商品 -->
|
||||
<view class="goods-box">
|
||||
<s-goods-item
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="确认订单">
|
||||
<s-pages title="确认订单" :pink_bg="true">
|
||||
<!-- 头部地址选择【配送地址】【自提地址】 -->
|
||||
<AddressSelection v-model="addressState" />
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 订单详情 -->
|
||||
<template>
|
||||
<s-pages title="订单详情">
|
||||
<s-pages title="订单详情" :pink_bg="true">
|
||||
<!-- 收货地址 -->
|
||||
<view class="order-address-box flex-row bg24" v-if="state.orderInfo.receiverAreaId > 0">
|
||||
<view class="cityImg">
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<!-- 收银台 -->
|
||||
<template>
|
||||
<s-pages title="收银台">
|
||||
<s-pages title="收银台" :pink_bg="true">
|
||||
<view class="ss-modal-box ss-flex-col">
|
||||
<!-- 订单信息 -->
|
||||
<view class="modal-header ss-flex-col ss-col-center ss-row-center">
|
||||
|
||||
+10
-2
@@ -1,6 +1,6 @@
|
||||
<!-- 支付结果页面 -->
|
||||
<template>
|
||||
<s-pages :bgStyle="{ color: theme == 1 ? '#FFF' : '#F2F4F7' }" title="支付结果">
|
||||
<s-pages :bgStyle="{ color: theme == 1 ? '#FFF' : '#F2F4F7' }" title="支付结果" :pink_bg="true">
|
||||
<view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
|
||||
<!-- 信息展示 -->
|
||||
<view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
|
||||
@@ -35,7 +35,7 @@
|
||||
<button
|
||||
class="back-btn ss-reset-button"
|
||||
:class="{ c0: theme == 2 }"
|
||||
@tap="sheep.$router.redirect('/pages/index/index')"
|
||||
@tap="onBackHome"
|
||||
>
|
||||
返回首页
|
||||
</button>
|
||||
@@ -121,6 +121,14 @@
|
||||
}
|
||||
});
|
||||
|
||||
const onBackHome = () => {
|
||||
if (state.orderType === 'aiGoods') {
|
||||
uni.reLaunch({ url: '/pages/index/aiStore?tab=1' });
|
||||
return;
|
||||
}
|
||||
sheep.$router.redirect('/pages/index/index');
|
||||
};
|
||||
|
||||
function showRepayModal() {
|
||||
if (state.result !== 'failed') return;
|
||||
uni.showModal({
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="华贸专区">
|
||||
<s-pages title="华贸专区" :pink_bg="true">
|
||||
<view class="container">
|
||||
<web-view :src="url" />
|
||||
</view>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="账号注销">
|
||||
<s-pages title="账号注销" :pink_bg="true">
|
||||
<view class="pages p-x-20">
|
||||
<view class="card bg24">
|
||||
<view class="card_title flex-center ju-between">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 搜索界面 -->
|
||||
<template>
|
||||
<s-pages class="set-wrap" title="搜索" color="#ffffff">
|
||||
<s-pages class="set-wrap" title="搜索" color="#ffffff" :pink_bg="true">
|
||||
<view class="">
|
||||
<card_search class="search" style="margin-bottom: 32rpx" @search="onSearch"></card_search>
|
||||
<view class="search_top">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="设置" :pink_bg="false" :purple_bg="true">
|
||||
<s-pages title="设置" :purple_bg="true">
|
||||
<view class="setPage">
|
||||
<view class="card1">
|
||||
<card_list :arr="listArr">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<s-pages title="版本号">
|
||||
<s-pages title="版本号" :pink_bg="true">
|
||||
<view class="pages relative h100 p-t-50">
|
||||
<view class="w_150 h_150 m-b-50" style="margin: 0 auto">
|
||||
<image class="w100 h100" src="/static/logo.png" mode="scaleToFill" />
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
},
|
||||
pink_bg: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
default: false,
|
||||
},
|
||||
purple_bg: {
|
||||
type: Boolean,
|
||||
|
||||
Reference in New Issue
Block a user