yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !173 from gzchenchangchun/master

pull/173/MERGE
gzchenchangchun 2025-12-28 09:18:34 +00:00 committed by Gitee
parent 44eec40775 a5aae8480b
commit c13f046274
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
24 changed files with 373 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifest.json
View File

@ -2,7 +2,7 @@
"name": "芋道商城",
"appid": "__UNI__460BC4C",
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
"versionName": "2025.10",
"versionName": "2025.12",
"versionCode": "183",
"transformPx": false,
"app-plus": {
@ -185,7 +185,9 @@
"requiredPrivateInfos": ["chooseAddress"]
},
"mp-alipay": {
"usingComponents": true
"usingComponents": true,
"styleIsolation": "shared",
"mergeVirtualHostAttributes": true
},
"mp-baidu": {
"usingComponents": true

9
mini.project.json Normal file
View File

@ -0,0 +1,9 @@
{
"format": 2,
"compileOptions": {
"component2": true,
"enableNodeModuleBabelTransform": true,
"transpile": {},
"globalObjectMode": "enable"
}
}

2
package.json
View File

@ -2,7 +2,7 @@
"id": "shopro",
"name": "shopro",
"displayName": "芋道商城",
"version": "2025.10",
"version": "2025.12",
"description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
"scripts": {
"prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""

10
pages.json
View File

@ -675,7 +675,15 @@
"navigationBarTitleText": "芋道商城",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#FFFFFF",
"navigationStyle": "custom"
"navigationStyle": "custom",
"mp-alipay": {
"titleImage": "",
"gestureBack": "YES",
"allowsBounceVertical": "NO",
"transparentTitle": "always",
"navigationStyle": "custom",
"titlePenetrate": "YES"
}
},
"tabBar": {
"list": [{

5
pages/goods/components/detail/detail-navbar.vue
View File

@ -3,7 +3,10 @@
<su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
<su-status-bar />
<view
class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
class="ui-bar ss-flex ss-col-center ss-row-between"
:class="[{
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
}]"
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
>
<!-- 左 -->

5
pages/goods/components/list/list-navbar.vue
View File

@ -11,7 +11,10 @@
>
<su-status-bar />
<view
class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
class="ui-bar ss-flex ss-col-center ss-row-between"
:class="[{
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
}]"
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
>
<!-- 左 -->

2
pages/goods/index.vue
View File

@ -245,7 +245,7 @@
isDay: true,
};
const isLogin = computed(() => sheep.$store('user').isLogin);
const state = reactive({
let state = reactive({
goodsId: 0,
skeletonLoading: true, // SPU 加载中
goodsInfo: {}, // SPU 信息

19
pages/index/category.vue
View File

@ -60,7 +60,7 @@
import sheep from '@/sheep';
import CategoryApi from '@/sheep/api/product/category';
import SpuApi from '@/sheep/api/product/spu';
import { onLoad } from '@dcloudio/uni-app';
import { onLoad, onShow } from '@dcloudio/uni-app';
import { computed, reactive } from 'vue';
import { concat } from 'lodash-es';
import { handleTree } from '@/sheep/helper/utils';
@ -130,14 +130,21 @@
state.pagination.pageNo++;
getGoodsList();
}
onLoad(async (params) => {
await getList();
function initMenuIndex() {
// TODO @AI：可优化：增加一个 params.id 的兼容
const appStore = sheep.$store('app');
// 处理 tabbar 传参的情况
const tabbarParams = appStore.paramsForTabbar || {};
const id = tabbarParams.id;
appStore.clearParamsForTabbar(); // 使用完后清理，避免影响下次跳转
// 首页点击分类的处理：查找满足条件的分类
const foundCategory = state.categoryList.find((category) => category.id === Number(params.id));
const foundCategory = state.categoryList.find((category) => category.id === Number(id));
// 如果找到则调用 onMenu 自动勾选相应分类，否则调用 onMenu(0) 勾选第一个分类
onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
}
onShow(async () => {
await getList();
initMenuIndex();
});
function handleScrollToLower() {

16
pages/index/index.vue
View File

@ -22,7 +22,7 @@
<script setup>
import { computed } from 'vue';
import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
import { onLoad, onShow, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
import sheep from '@/sheep';
import $share from '@/sheep/platform/share';
// 隐藏原生tabBar
@ -79,6 +79,20 @@
}
});
onShow(async() => {
// #ifdef APP-PLUS
// ios首次授权网络，需要重新加载一次应用初始化
// 可能需要考虑上uni.onNetworkStatusChange，uni.offNetworkStatusChange组合拳以及主动主动唤起权限申请
// 一开始放app.vue，感觉负载太重，搬到这里来了。
// 如果你的首页不是这个页面，需要把代码搬过去。
if (sheep.$platform.os === 'ios') {
if (await sheep.$platform.checkNetwork()) {
await sheep.$store('app').init();
}
}
// #endif
});
// 下拉刷新
onPullDownRefresh(() => {
sheep.$store('app').init();

6
sheep/api/member/auth.js
View File

@ -75,7 +75,7 @@ const AuthUtil = {
},
custom: {
showSuccess: true,
loadingMsg: '登陆中',
loadingMsg: '登录中',
},
});
},
@ -91,7 +91,7 @@ const AuthUtil = {
},
custom: {
showSuccess: true,
loadingMsg: '登陆中',
loadingMsg: '登录中',
},
});
},
@ -107,7 +107,7 @@ const AuthUtil = {
},
custom: {
showSuccess: true,
loadingMsg: '登陆中',
loadingMsg: '登录中',
successMsg: '登录成功',
},
});

2
sheep/api/migration/third.js
View File

@ -11,7 +11,7 @@ export default {
data,
custom: {
showSuccess: true,
loadingMsg: '登陆中',
loadingMsg: '登录中',
},
}),
},

20
sheep/components/s-auth-modal/s-auth-modal.vue
View File

@ -72,6 +72,18 @@
:src="sheep.$url.static('/static/img/shop/platform/apple.png')"
/>
</button>
<!-- 7.4 支付宝小程序登录 -->
<button
v-if="sheep.$platform.name === 'alipayMiniProgram'"
@tap="thirdLogin('alipay')"
class="ss-reset-button auto-login-btn"
>
<image
class="auto-login-img"
:src="sheep.$url.static('/static/img/shop/pay/alipay.png')"
/>
</button>
</view>
<!-- 用户协议的勾选 -->
@ -85,7 +97,7 @@
<view class="agreement-options-container">
<!-- 同意选项 -->
<view class="agreement-option ss-m-b-20">
<label class="radio ss-flex ss-col-center" @tap="onAgree">
<view class="radio ss-flex ss-col-center" @tap="onAgree">
<radio
:checked="state.protocol === true"
color="var(--ui-BG-Main)"
@ -98,12 +110,12 @@
<view class="agreement-text">与</view>
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
</view>
</label>
</view>
</view>
<!-- 拒绝选项 -->
<view class="agreement-option">
<label class="radio ss-flex ss-col-center" @tap="onRefuse">
<view class="radio ss-flex ss-col-center" @tap="onRefuse">
<radio
:checked="state.protocol === false"
color="#ff4d4f"
@ -116,7 +128,7 @@
<view class="agreement-text">与</view>
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
</view>
</label>
</view>
</view>
</view>
</view>

5
sheep/components/s-layout/s-layout.vue
View File

@ -214,6 +214,11 @@
// 组件中使用 onMounted 监听页面加载，不是页面组件不使用 onShow
onMounted(()=>{
// #ifdef MP-ALIPAY
uni.setNavigationBarTitle({
title: "",
});
// #endif
if (!isEmpty(shareInfo.value)) {
sheep.$platform.share.updateShareInfo(shareInfo.value);
}

4
sheep/components/s-menu-grid/s-menu-grid.vue
View File

@ -2,8 +2,8 @@
<template>
<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
<uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
<uni-grid-item v-for="(item, index) in data.list" :key="index" >
<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center" @tap="sheep.$router.go(item.url)">
<view class="img-box">
<view class="tag-box" v-if="item.badge.show"
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">

4
sheep/components/s-richtext-block/s-richtext-block.vue
View File

@ -40,7 +40,9 @@
});
</script>
<style lang="scss" scoped>
// 修复 https://t.zsxq.com/8v0JG 反馈的问题，richtext height 不自适应的问题
.richtext {
line-height: 0;
width: 100%;
height: auto;
}
</style>

2
sheep/components/s-tabbar/s-tabbar.vue
View File

@ -20,7 +20,7 @@
:badgeStyle="tabbar.badgeStyle"
:isCenter="getTabbarCenter(index)"
:centerImage="sheep.$url.cdn(item.iconUrl)"
@tap="sheep.$router.go(item.url)"
@click="sheep.$router.go(item.url)"
>
<template v-slot:active-icon>
<image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>

17
sheep/platform/index.js
View File

@ -14,6 +14,7 @@ import { isEmpty } from 'lodash-es';
import { isWxBrowser } from '@/sheep/helper/utils';
// #endif
import wechat from './provider/wechat/index.js';
import alipay from './provider/alipay/index';
import apple from './provider/apple';
import share from './share';
import Pay from './pay';
@ -53,6 +54,19 @@ platform = 'miniProgram';
provider = 'wechat';
// #endif
// #ifdef MP-ALIPAY
name = 'alipayMiniProgram';
platform = 'alipayMiniProgram';
provider = 'alipay';
if (!device.safeAreaInsets) {
device.safeAreaInsets = uni.getSystemInfoSync().safeAreaInsets
}
// 兜底一下。还是没有值时候，就给个默认值
if (!device.safeAreaInsets) {
device.safeAreaInsets = {}
}
// #endif
if (isEmpty(name)) {
uni.showToast({
title: '暂不支持该平台',
@ -64,6 +78,8 @@ if (isEmpty(name)) {
const load = () => {
if (provider === 'wechat') {
wechat.load();
} else if (provider === 'alipay') {
alipay.load();
}
};
@ -72,6 +88,7 @@ const useProvider = (_provider = '') => {
if (_provider === '') _provider = provider;
if (_provider === 'wechat') return wechat;
if (_provider === 'apple') return apple;
if (_provider === 'alipay') return alipay;
};
// 支付服务转发

6
sheep/platform/provider/alipay/index.js Normal file
View File

@ -0,0 +1,6 @@
// 这里 特指支付宝小程序，后面如果需要拓展什么阿里云小程序、淘宝小程序之类的，就自己新建
import service from './miniProgram';
const alipay = service;
export default alipay;

220
sheep/platform/provider/alipay/miniProgram.js Normal file
View File

@ -0,0 +1,220 @@
import SocialApi from '@/sheep/api/member/social';
import AuthUtil from '@/sheep/api/member/auth';
import UserApi from '@/sheep/api/member/user';
const socialType = 40; // 社交类型 - 支付宝小程序
let subscribeEventList = []
function load() {
checkUpdate()
getSubscribeTemplate()
}
// ================= 登录相关逻辑===================
// 基本上的登录逻辑是和微信小程序一样的
//支付宝小程序静默授权登录
const login = async () => {
return new Promise(async (resolve,reject)=>{
// 1. 获取支付宝的code
const codeResult = await uni.login({
provider: 'alipay',
scopes: 'auth_user',
});
if(codeResult.errMsg !== 'login:ok'){
return resolve(false);
}
// 2. 社交登录
const loginResult = await AuthUtil.socialLogin(socialType, codeResult.code, 'default');
if (loginResult.code === 0) {
setOpenid(loginResult.data.openid);
return resolve(true);
} else {
return resolve(false);
}
})
}
// 支付宝小程序手机号授权登录
const mobileLogin = async (e) =>{
return new Promise(async (resolve, reject) => {
if (e.errMsg !== 'getPhoneNumber:ok') {
return resolve(false);
}
// 1. 获得支付宝 code
const codeResult = await uni.login();
if (codeResult.errMsg !== 'login:ok') {
return resolve(false);
}
// TODO 2. 一键登录
// const loginResult = await AuthUtil.weixinMiniAppLogin(e.code, codeResult.code, 'default');
// if (loginResult.code === 0) {
// setOpenid(loginResult.data.openid);
// return resolve(true);
// } else {
// return resolve(false);
// }
// TODO 芋艿：shareInfo: uni.getStorageSync('shareLog') || {},
});
}
// 支付宝小程序绑定
const bind = () => {
return new Promise(async (resolve, reject) => {
// 1. 获得支付宝小程序 code
const codeResult = await uni.login({
provider: 'alipay',
scopes: 'auth_user',
});
if (codeResult.errMsg !== 'login:ok') {
return resolve(false);
}
// 2. 绑定账号
const bindResult = await SocialApi.socialBind(socialType, codeResult.code, 'default');
if (bindResult.code === 0) {
setOpenid(bindResult.data);
return resolve(true);
} else {
return resolve(false);
}
});
};
// 支付宝小程序解除绑定
const unbind = async (openid) => {
const { code } = await SocialApi.socialUnbind(socialType, openid);
return code === 0;
};
// 绑定用户手机号
const bindUserPhoneNumber = (e) => {
return new Promise(async (resolve, reject) => {
// todo 待完善
// const { code } = await UserApi.updateUserMobileByWeixin(e.code);
// if (code === 0) {
// resolve(true);
// }
resolve(false);
});
};
// 设置 openid 到本地存储，目前只有 pay 支付时会使用
function setOpenid(openid) {
uni.setStorageSync('openid', openid);
}
// 获得 openid
async function getOpenid(force = false) {
let openid = uni.getStorageSync('openid');
if (!openid && force) {
const info = await getInfo();
if (info && info.openid) {
openid = info.openid;
setOpenid(openid);
}
}
return openid;
}
// 获得社交信息
async function getInfo() {
const { code, data } = await SocialApi.getSocialUser(socialType);
if (code !== 0) {
return undefined;
}
return data;
}
// ========== 非登录相关的逻辑 ==========
// 小程序更新
const checkUpdate = (silence = true) => {
if (uni.canIUse('getUpdateManager')) {
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
if (res.hasUpdate) {
updateManager.onUpdateReady(function() {
uni.showModal({
title: '更新提示',
content: '新版本已经准备好，是否重启应用？',
success: function(res) {
if (res.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}
},
});
})
}
});
} else {
if(!silence) {
uni.showToast({
title: '当前为最新版本',
icon: 'none',
});
}
}
}
// 获取订阅消息模板
async function getSubscribeTemplate(){
const { code, data } = await SocialApi.getSubscribeTemplateList();
if (code === 0) {
subscribeEventList = data;
}
}
// 订阅消息
function subscribeMessage(event, callback = undefined){
let tmplIds = [];
if (typeof event === 'string') {
const temp = subscribeEventList.find(item => item.title.includes(event));
}
if (temp) {
tmplIds.push(temp.id);
}
if (typeof event === 'object') {
event.forEach((e) => {
const temp = subscribeEventList.find(item => item.title.includes(e));
if (temp) {
tmplIds.push(temp.id);
}
});
}
if (tmplIds.length === 0) return;
uni.requestSubscribeMessage({
tmplIds,
success: ()=>{
// 不管是拒绝还是同意都触发
callback && callback()
},
fail: (err) => {
console.log(err);
},
});
}
export default {
load,
login,
bind,
unbind,
bindUserPhoneNumber,
mobileLogin,
getInfo,
getOpenid,
subscribeMessage,
checkUpdate,
};

6
sheep/platform/provider/wechat/index.js
View File

@ -10,6 +10,8 @@ import service from './miniProgram';
import service from './openPlatform';
// #endif
const wechat = service;
let wechat = {};
if (typeof service !== 'undefined') {
wechat = service;
}
export default wechat;

20
sheep/router/index.js
View File

@ -70,8 +70,13 @@ const _go = (
// 跳转底部导航
if (TABBAR.includes(page)) {
// wx.switchTab: url 不支持 queryString
// 设置全局变量
const params = queryToParams(query);
$store('app').setParamsForTabbar(params);
// 请记得在业务代码里使用完后，清理掉全局状态，避免影响下次跳转
uni.switchTab({
url,
url: page,
});
return;
}
@ -109,6 +114,19 @@ function paramsToQuery(params) {
return query.join('&');
}
function queryToParams(query) {
if (isEmpty(query)) {
return {};
}
let params = {};
let pairs = query.split('&');
for (let i = 0; i < pairs.length; i++) {
let pair = pairs[i].split('=');
params[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
}
return params;
}
function back() {
// #ifdef H5
history.back();

10
sheep/store/app.js
View File

@ -11,6 +11,7 @@ import { baseUrl, h5Url } from '@/sheep/config';
const app = defineStore({
id: 'app',
state: () => ({
paramsForTabbar: {}, // 为全局tabbar跳转传参用。原因是 tabbar 无法传参，只能通过全局状态传递
info: {
// 应用信息
name: '', // 商城名称
@ -73,7 +74,7 @@ const app = defineStore({
this.info = {
name: '芋道商城',
logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
version: '2025.10',
version: '2025.12',
copyright: '全部开源，个人与企业可 100% 免费使用',
copytime: 'Copyright© 2018-2025',
@ -113,6 +114,13 @@ const app = defineStore({
$router.error('InitError', res.msg || '加载失败');
}
},
// 设置 paramsForTabbar
setParamsForTabbar(params = {}) {
this.paramsForTabbar = params;
},
clearParamsForTabbar() {
this.paramsForTabbar = {};
},
},
persist: {
enabled: true,

8
sheep/ui/su-inner-navbar/su-inner-navbar.vue
View File

@ -17,8 +17,12 @@
-->
<view class="ui-navbar-box">
<view
class="ui-bar ss-p-x-20"
:class="state.isDark ? 'text-white' : 'text-black'"
class="ui-bar"
:class="[{
'text-white': state.isDark,
'text-black': !state.isDark,
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
}]"
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
>
<view class="icon-box ss-flex">

2
sheep/ui/su-tabbar-item/su-tabbar-item.vue
View File

@ -1,6 +1,6 @@
<!-- 自定义底部导航项 -->
<template>
<view class="u-tabbar-item" :style="[addStyle(customStyle)]">
<view class="u-tabbar-item" :style="[addStyle(customStyle)]" @click="clickHandler">
<view v-if="isCenter" class="tabbar-center-item">
<image class="center-image" :src="centerImage" mode="aspectFill"></image>
</view>