Compare commits
No commits in common. "master" and "v2025.11" have entirely different histories.
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "芋道商城",
|
"name": "芋道商城",
|
||||||
"appid": "__UNI__460BC4C",
|
"appid": "__UNI__460BC4C",
|
||||||
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
|
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
|
||||||
"versionName": "2026.04",
|
"versionName": "2025.11",
|
||||||
"versionCode": "183",
|
"versionCode": "183",
|
||||||
"transformPx": false,
|
"transformPx": false,
|
||||||
"app-plus": {
|
"app-plus": {
|
||||||
|
|
@ -185,9 +185,7 @@
|
||||||
"requiredPrivateInfos": ["chooseAddress"]
|
"requiredPrivateInfos": ["chooseAddress"]
|
||||||
},
|
},
|
||||||
"mp-alipay": {
|
"mp-alipay": {
|
||||||
"usingComponents": true,
|
"usingComponents": true
|
||||||
"styleIsolation": "shared",
|
|
||||||
"mergeVirtualHostAttributes": true
|
|
||||||
},
|
},
|
||||||
"mp-baidu": {
|
"mp-baidu": {
|
||||||
"usingComponents": true
|
"usingComponents": true
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"format": 2,
|
|
||||||
"compileOptions": {
|
|
||||||
"component2": true,
|
|
||||||
"enableNodeModuleBabelTransform": true,
|
|
||||||
"transpile": {},
|
|
||||||
"globalObjectMode": "enable"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"id": "shopro",
|
"id": "shopro",
|
||||||
"name": "shopro",
|
"name": "shopro",
|
||||||
"displayName": "芋道商城",
|
"displayName": "芋道商城",
|
||||||
"version": "2026.04",
|
"version": "2025.11",
|
||||||
"description": "芋道商城,一套代码,同时发行到iOS、Android、H5、微信小程序多个平台,请使用手机扫码快速体验强大功能",
|
"description": "芋道商城,一套代码,同时发行到iOS、Android、H5、微信小程序多个平台,请使用手机扫码快速体验强大功能",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
|
"prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
|
||||||
|
|
|
||||||
10
pages.json
10
pages.json
|
|
@ -675,15 +675,7 @@
|
||||||
"navigationBarTitleText": "芋道商城",
|
"navigationBarTitleText": "芋道商城",
|
||||||
"navigationBarBackgroundColor": "#FFFFFF",
|
"navigationBarBackgroundColor": "#FFFFFF",
|
||||||
"backgroundColor": "#FFFFFF",
|
"backgroundColor": "#FFFFFF",
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom"
|
||||||
"mp-alipay": {
|
|
||||||
"titleImage": "",
|
|
||||||
"gestureBack": "YES",
|
|
||||||
"allowsBounceVertical": "NO",
|
|
||||||
"transparentTitle": "always",
|
|
||||||
"navigationStyle": "custom",
|
|
||||||
"titlePenetrate": "YES"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"tabBar": {
|
"tabBar": {
|
||||||
"list": [{
|
"list": [{
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@
|
||||||
<text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
|
<text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
|
||||||
</view>
|
</view>
|
||||||
<view>
|
<view>
|
||||||
<text class="num">{{ item.brokerageOrderCount || 0 }}</text
|
<text class="num">{{ item.orderCount || 0 }}</text
|
||||||
>单</view
|
>单</view
|
||||||
>
|
>
|
||||||
<view>
|
<view>
|
||||||
|
|
@ -320,7 +320,6 @@
|
||||||
|
|
||||||
function setType(e) {
|
function setType(e) {
|
||||||
state.pagination.list = [];
|
state.pagination.list = [];
|
||||||
state.pagination.pageNo = 1;
|
|
||||||
state.level = e + '';
|
state.level = e + '';
|
||||||
getTeamList();
|
getTeamList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@
|
||||||
>
|
>
|
||||||
<uni-easyinput
|
<uni-easyinput
|
||||||
:inputBorder="false"
|
:inputBorder="false"
|
||||||
:value="bankNameLabel"
|
:value="state.accountInfo.bankName"
|
||||||
placeholder="请选择银行"
|
placeholder="请选择银行"
|
||||||
suffixIcon="right"
|
suffixIcon="right"
|
||||||
disabled
|
disabled
|
||||||
|
|
@ -164,7 +164,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount, reactive, computed } from 'vue';
|
import { onBeforeMount, reactive } from 'vue';
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import accountTypeSelect from './components/account-type-select.vue';
|
import accountTypeSelect from './components/account-type-select.vue';
|
||||||
import { fen2yuan } from '@/sheep/hooks/useGoods';
|
import { fen2yuan } from '@/sheep/hooks/useGoods';
|
||||||
|
|
@ -199,14 +199,6 @@
|
||||||
bankListSelectedIndex: '', // 选中银行 bankList 的 index
|
bankListSelectedIndex: '', // 选中银行 bankList 的 index
|
||||||
});
|
});
|
||||||
|
|
||||||
const bankNameLabel = computed(() => {
|
|
||||||
if (!state.accountInfo.bankName || !state.bankList || state.bankList.length === 0) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
const item = state.bankList.find((it) => it.value === state.accountInfo.bankName);
|
|
||||||
return item ? item.label : '';
|
|
||||||
});
|
|
||||||
|
|
||||||
// 打开提现方式的弹窗
|
// 打开提现方式的弹窗
|
||||||
const onAccountSelect = (e) => {
|
const onAccountSelect = (e) => {
|
||||||
state.accountSelect = e;
|
state.accountSelect = e;
|
||||||
|
|
@ -308,8 +300,7 @@
|
||||||
function bankChange(e) {
|
function bankChange(e) {
|
||||||
const value = e.detail.value;
|
const value = e.detail.value;
|
||||||
state.bankListSelectedIndex = value;
|
state.bankListSelectedIndex = value;
|
||||||
const item = state.bankList[value];
|
state.accountInfo.bankName = state.bankList[value].label;
|
||||||
state.accountInfo.bankName = item ? item.value : undefined;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,7 @@
|
||||||
<su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
|
<su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
|
||||||
<su-status-bar />
|
<su-status-bar />
|
||||||
<view
|
<view
|
||||||
class="ui-bar ss-flex ss-col-center ss-row-between"
|
class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
|
||||||
:class="[{
|
|
||||||
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
|
|
||||||
}]"
|
|
||||||
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
||||||
>
|
>
|
||||||
<!-- 左 -->
|
<!-- 左 -->
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,7 @@
|
||||||
>
|
>
|
||||||
<su-status-bar />
|
<su-status-bar />
|
||||||
<view
|
<view
|
||||||
class="ui-bar ss-flex ss-col-center ss-row-between"
|
class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
|
||||||
:class="[{
|
|
||||||
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
|
|
||||||
}]"
|
|
||||||
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
||||||
>
|
>
|
||||||
<!-- 左 -->
|
<!-- 左 -->
|
||||||
|
|
|
||||||
|
|
@ -245,7 +245,7 @@
|
||||||
isDay: true,
|
isDay: true,
|
||||||
};
|
};
|
||||||
const isLogin = computed(() => sheep.$store('user').isLogin);
|
const isLogin = computed(() => sheep.$store('user').isLogin);
|
||||||
let state = reactive({
|
const state = reactive({
|
||||||
goodsId: 0,
|
goodsId: 0,
|
||||||
skeletonLoading: true, // SPU 加载中
|
skeletonLoading: true, // SPU 加载中
|
||||||
goodsInfo: {}, // SPU 信息
|
goodsInfo: {}, // SPU 信息
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import CategoryApi from '@/sheep/api/product/category';
|
import CategoryApi from '@/sheep/api/product/category';
|
||||||
import SpuApi from '@/sheep/api/product/spu';
|
import SpuApi from '@/sheep/api/product/spu';
|
||||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
import { onLoad } from '@dcloudio/uni-app';
|
||||||
import { computed, reactive } from 'vue';
|
import { computed, reactive } from 'vue';
|
||||||
import { concat } from 'lodash-es';
|
import { concat } from 'lodash-es';
|
||||||
import { handleTree } from '@/sheep/helper/utils';
|
import { handleTree } from '@/sheep/helper/utils';
|
||||||
|
|
@ -130,21 +130,14 @@
|
||||||
state.pagination.pageNo++;
|
state.pagination.pageNo++;
|
||||||
getGoodsList();
|
getGoodsList();
|
||||||
}
|
}
|
||||||
function initMenuIndex() {
|
|
||||||
// TODO @AI:可优化:增加一个 params.id 的兼容
|
onLoad(async (params) => {
|
||||||
const appStore = sheep.$store('app');
|
await getList();
|
||||||
// 处理 tabbar 传参的情况
|
|
||||||
const tabbarParams = appStore.paramsForTabbar || {};
|
|
||||||
const id = tabbarParams.id;
|
|
||||||
appStore.clearParamsForTabbar(); // 使用完后清理,避免影响下次跳转
|
|
||||||
// 首页点击分类的处理:查找满足条件的分类
|
// 首页点击分类的处理:查找满足条件的分类
|
||||||
const foundCategory = state.categoryList.find((category) => category.id === Number(id));
|
const foundCategory = state.categoryList.find((category) => category.id === Number(params.id));
|
||||||
// 如果找到则调用 onMenu 自动勾选相应分类,否则调用 onMenu(0) 勾选第一个分类
|
// 如果找到则调用 onMenu 自动勾选相应分类,否则调用 onMenu(0) 勾选第一个分类
|
||||||
onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
|
onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
|
||||||
}
|
|
||||||
onShow(async () => {
|
|
||||||
await getList();
|
|
||||||
initMenuIndex();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleScrollToLower() {
|
function handleScrollToLower() {
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
import { onLoad, onShow, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
|
import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import $share from '@/sheep/platform/share';
|
import $share from '@/sheep/platform/share';
|
||||||
// 隐藏原生tabBar
|
// 隐藏原生tabBar
|
||||||
|
|
@ -79,20 +79,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
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(() => {
|
onPullDownRefresh(() => {
|
||||||
sheep.$store('app').init();
|
sheep.$store('app').init();
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ const AuthUtil = {
|
||||||
},
|
},
|
||||||
custom: {
|
custom: {
|
||||||
showSuccess: true,
|
showSuccess: true,
|
||||||
loadingMsg: '登录中',
|
loadingMsg: '登陆中',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -91,7 +91,7 @@ const AuthUtil = {
|
||||||
},
|
},
|
||||||
custom: {
|
custom: {
|
||||||
showSuccess: true,
|
showSuccess: true,
|
||||||
loadingMsg: '登录中',
|
loadingMsg: '登陆中',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -107,7 +107,7 @@ const AuthUtil = {
|
||||||
},
|
},
|
||||||
custom: {
|
custom: {
|
||||||
showSuccess: true,
|
showSuccess: true,
|
||||||
loadingMsg: '登录中',
|
loadingMsg: '登陆中',
|
||||||
successMsg: '登录成功',
|
successMsg: '登录成功',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ export default {
|
||||||
data,
|
data,
|
||||||
custom: {
|
custom: {
|
||||||
showSuccess: true,
|
showSuccess: true,
|
||||||
loadingMsg: '登录中',
|
loadingMsg: '登陆中',
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -72,18 +72,6 @@
|
||||||
:src="sheep.$url.static('/static/img/shop/platform/apple.png')"
|
:src="sheep.$url.static('/static/img/shop/platform/apple.png')"
|
||||||
/>
|
/>
|
||||||
</button>
|
</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>
|
</view>
|
||||||
|
|
||||||
<!-- 用户协议的勾选 -->
|
<!-- 用户协议的勾选 -->
|
||||||
|
|
@ -97,7 +85,7 @@
|
||||||
<view class="agreement-options-container">
|
<view class="agreement-options-container">
|
||||||
<!-- 同意选项 -->
|
<!-- 同意选项 -->
|
||||||
<view class="agreement-option ss-m-b-20">
|
<view class="agreement-option ss-m-b-20">
|
||||||
<view class="radio ss-flex ss-col-center" @tap="onAgree">
|
<label class="radio ss-flex ss-col-center" @tap="onAgree">
|
||||||
<radio
|
<radio
|
||||||
:checked="state.protocol === true"
|
:checked="state.protocol === true"
|
||||||
color="var(--ui-BG-Main)"
|
color="var(--ui-BG-Main)"
|
||||||
|
|
@ -110,12 +98,12 @@
|
||||||
<view class="agreement-text">与</view>
|
<view class="agreement-text">与</view>
|
||||||
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
|
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</label>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 拒绝选项 -->
|
<!-- 拒绝选项 -->
|
||||||
<view class="agreement-option">
|
<view class="agreement-option">
|
||||||
<view class="radio ss-flex ss-col-center" @tap="onRefuse">
|
<label class="radio ss-flex ss-col-center" @tap="onRefuse">
|
||||||
<radio
|
<radio
|
||||||
:checked="state.protocol === false"
|
:checked="state.protocol === false"
|
||||||
color="#ff4d4f"
|
color="#ff4d4f"
|
||||||
|
|
@ -128,7 +116,7 @@
|
||||||
<view class="agreement-text">与</view>
|
<view class="agreement-text">与</view>
|
||||||
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
|
<view class="tcp-text" @tap.stop="onProtocol('隐私协议')"> 《隐私协议》 </view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</label>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -214,11 +214,6 @@
|
||||||
|
|
||||||
// 组件中使用 onMounted 监听页面加载,不是页面组件不使用 onShow
|
// 组件中使用 onMounted 监听页面加载,不是页面组件不使用 onShow
|
||||||
onMounted(()=>{
|
onMounted(()=>{
|
||||||
// #ifdef MP-ALIPAY
|
|
||||||
uni.setNavigationBarTitle({
|
|
||||||
title: "",
|
|
||||||
});
|
|
||||||
// #endif
|
|
||||||
if (!isEmpty(shareInfo.value)) {
|
if (!isEmpty(shareInfo.value)) {
|
||||||
sheep.$platform.share.updateShareInfo(shareInfo.value);
|
sheep.$platform.share.updateShareInfo(shareInfo.value);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
<template>
|
<template>
|
||||||
<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
|
<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
|
||||||
<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
|
<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
|
||||||
<uni-grid-item v-for="(item, index) in data.list" :key="index" >
|
<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" @tap="sheep.$router.go(item.url)">
|
<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
|
||||||
<view class="img-box">
|
<view class="img-box">
|
||||||
<view class="tag-box" v-if="item.badge.show"
|
<view class="tag-box" v-if="item.badge.show"
|
||||||
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
|
:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
|
||||||
|
|
|
||||||
|
|
@ -40,9 +40,7 @@
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// 修复 https://t.zsxq.com/8v0JG 反馈的问题,richtext height 不自适应的问题
|
|
||||||
.richtext {
|
.richtext {
|
||||||
width: 100%;
|
line-height: 0;
|
||||||
height: auto;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, reactive, watch } from 'vue';
|
import { computed, reactive, watch } from 'vue';
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import { convertProductPropertyList, initDefaultSelect, fen2yuan } from '@/sheep/hooks/useGoods';
|
import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
|
||||||
|
|
||||||
const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
|
const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
|
||||||
const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
|
const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
|
||||||
|
|
@ -315,8 +315,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
changeDisabled(false);
|
changeDisabled(false);
|
||||||
// 初始化默认选中规格中的第一个,如果不需要,注释这段代码即可
|
// TODO 芋艿:待讨论的优化点:1)单规格,要不要默认选中;2)默认要不要选中第一个规格
|
||||||
initDefaultSelect(propertyList, onSelectSku);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
|
|
@ -95,12 +95,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, reactive, watch } from 'vue';
|
import { computed, reactive, watch } from 'vue';
|
||||||
import sheep from '@/sheep';
|
import sheep from '@/sheep';
|
||||||
import {
|
import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
|
||||||
formatStock,
|
|
||||||
convertProductPropertyList,
|
|
||||||
fen2yuan,
|
|
||||||
initDefaultSelect,
|
|
||||||
} from '@/sheep/hooks/useGoods';
|
|
||||||
|
|
||||||
const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
|
const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
|
@ -310,8 +305,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
changeDisabled(false);
|
changeDisabled(false);
|
||||||
// 初始化默认选中规格中的第一个,如果不需要,注释这段代码即可
|
// TODO 芋艿:待讨论的优化点:1)单规格,要不要默认选中;2)默认要不要选中第一个规格
|
||||||
initDefaultSelect(propertyList, onSelectSku);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
:badgeStyle="tabbar.badgeStyle"
|
:badgeStyle="tabbar.badgeStyle"
|
||||||
:isCenter="getTabbarCenter(index)"
|
:isCenter="getTabbarCenter(index)"
|
||||||
:centerImage="sheep.$url.cdn(item.iconUrl)"
|
:centerImage="sheep.$url.cdn(item.iconUrl)"
|
||||||
@click="sheep.$router.go(item.url)"
|
@tap="sheep.$router.go(item.url)"
|
||||||
>
|
>
|
||||||
<template v-slot:active-icon>
|
<template v-slot:active-icon>
|
||||||
<image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>
|
<image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>
|
||||||
|
|
|
||||||
|
|
@ -497,18 +497,3 @@ export function getRewardActivityRuleItemDescriptions(activity) {
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 单规格,要默认选中 */
|
|
||||||
export function initDefaultSelect(propertyList, onSelectSku) {
|
|
||||||
if (propertyList.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// 遍历每一个属性
|
|
||||||
for (const property of propertyList) {
|
|
||||||
const firstValue = (property.values || [])[0];
|
|
||||||
// 不是禁用直接选中
|
|
||||||
if (firstValue && !firstValue.disabled) {
|
|
||||||
onSelectSku(property.id, firstValue.id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,8 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 调用后端接口,获得 JSSDK 初始化所需的签名
|
// 调用后端接口,获得 JSSDK 初始化所需的签名
|
||||||
// 微信要求签名 URL 与当前页面去掉 hash 后完全一致;不能直接用 location.origin(会丢子路径与 query)
|
const url = location.origin;
|
||||||
const signUrl = location.href.split('#')[0];
|
const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(url);
|
||||||
const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(signUrl);
|
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
jweixin.config({
|
jweixin.config({
|
||||||
debug: false,
|
debug: false,
|
||||||
|
|
@ -58,11 +57,7 @@ export default {
|
||||||
configSuccess = true;
|
configSuccess = true;
|
||||||
jweixin.error((err) => {
|
jweixin.error((err) => {
|
||||||
configSuccess = false;
|
configSuccess = false;
|
||||||
console.error('[wx-jssdk] config error', err, {
|
console.error('微信 JSSDK 初始化失败', err);
|
||||||
href: location.href,
|
|
||||||
signUrl,
|
|
||||||
data,
|
|
||||||
});
|
|
||||||
$helper.toast('微信JSSDK:' + err.errMsg);
|
$helper.toast('微信JSSDK:' + err.errMsg);
|
||||||
});
|
});
|
||||||
jweixin.ready(() => {
|
jweixin.ready(() => {
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ import { isEmpty } from 'lodash-es';
|
||||||
import { isWxBrowser } from '@/sheep/helper/utils';
|
import { isWxBrowser } from '@/sheep/helper/utils';
|
||||||
// #endif
|
// #endif
|
||||||
import wechat from './provider/wechat/index.js';
|
import wechat from './provider/wechat/index.js';
|
||||||
import alipay from './provider/alipay/index';
|
|
||||||
import apple from './provider/apple';
|
import apple from './provider/apple';
|
||||||
import share from './share';
|
import share from './share';
|
||||||
import Pay from './pay';
|
import Pay from './pay';
|
||||||
|
|
@ -54,19 +53,6 @@ platform = 'miniProgram';
|
||||||
provider = 'wechat';
|
provider = 'wechat';
|
||||||
// #endif
|
// #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)) {
|
if (isEmpty(name)) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '暂不支持该平台',
|
title: '暂不支持该平台',
|
||||||
|
|
@ -78,8 +64,6 @@ if (isEmpty(name)) {
|
||||||
const load = () => {
|
const load = () => {
|
||||||
if (provider === 'wechat') {
|
if (provider === 'wechat') {
|
||||||
wechat.load();
|
wechat.load();
|
||||||
} else if (provider === 'alipay') {
|
|
||||||
alipay.load();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -88,7 +72,6 @@ const useProvider = (_provider = '') => {
|
||||||
if (_provider === '') _provider = provider;
|
if (_provider === '') _provider = provider;
|
||||||
if (_provider === 'wechat') return wechat;
|
if (_provider === 'wechat') return wechat;
|
||||||
if (_provider === 'apple') return apple;
|
if (_provider === 'apple') return apple;
|
||||||
if (_provider === 'alipay') return alipay;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 支付服务转发
|
// 支付服务转发
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
// 这里 特指支付宝小程序,后面如果需要拓展什么阿里云小程序、淘宝小程序之类的,就自己新建
|
|
||||||
import service from './miniProgram';
|
|
||||||
|
|
||||||
const alipay = service;
|
|
||||||
|
|
||||||
export default alipay;
|
|
||||||
|
|
@ -1,220 +0,0 @@
|
||||||
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,
|
|
||||||
};
|
|
||||||
|
|
@ -10,8 +10,6 @@ import service from './miniProgram';
|
||||||
import service from './openPlatform';
|
import service from './openPlatform';
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
let wechat = {};
|
const wechat = service;
|
||||||
if (typeof service !== 'undefined') {
|
|
||||||
wechat = service;
|
|
||||||
}
|
|
||||||
export default wechat;
|
export default wechat;
|
||||||
|
|
|
||||||
|
|
@ -70,13 +70,8 @@ const _go = (
|
||||||
|
|
||||||
// 跳转底部导航
|
// 跳转底部导航
|
||||||
if (TABBAR.includes(page)) {
|
if (TABBAR.includes(page)) {
|
||||||
// wx.switchTab: url 不支持 queryString
|
|
||||||
// 设置全局变量
|
|
||||||
const params = queryToParams(query);
|
|
||||||
$store('app').setParamsForTabbar(params);
|
|
||||||
// 请记得在业务代码里使用完后,清理掉全局状态,避免影响下次跳转
|
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: page,
|
url,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -114,19 +109,6 @@ function paramsToQuery(params) {
|
||||||
return query.join('&');
|
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() {
|
function back() {
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
history.back();
|
history.back();
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ import { baseUrl, h5Url } from '@/sheep/config';
|
||||||
const app = defineStore({
|
const app = defineStore({
|
||||||
id: 'app',
|
id: 'app',
|
||||||
state: () => ({
|
state: () => ({
|
||||||
paramsForTabbar: {}, // 为全局tabbar跳转传参用。原因是 tabbar 无法传参,只能通过全局状态传递
|
|
||||||
info: {
|
info: {
|
||||||
// 应用信息
|
// 应用信息
|
||||||
name: '', // 商城名称
|
name: '', // 商城名称
|
||||||
|
|
@ -74,7 +73,7 @@ const app = defineStore({
|
||||||
this.info = {
|
this.info = {
|
||||||
name: '芋道商城',
|
name: '芋道商城',
|
||||||
logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
|
logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
|
||||||
version: '2026.04',
|
version: '2025.11',
|
||||||
copyright: '全部开源,个人与企业可 100% 免费使用',
|
copyright: '全部开源,个人与企业可 100% 免费使用',
|
||||||
copytime: 'Copyright© 2018-2025',
|
copytime: 'Copyright© 2018-2025',
|
||||||
|
|
||||||
|
|
@ -114,13 +113,6 @@ const app = defineStore({
|
||||||
$router.error('InitError', res.msg || '加载失败');
|
$router.error('InitError', res.msg || '加载失败');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 设置 paramsForTabbar
|
|
||||||
setParamsForTabbar(params = {}) {
|
|
||||||
this.paramsForTabbar = params;
|
|
||||||
},
|
|
||||||
clearParamsForTabbar() {
|
|
||||||
this.paramsForTabbar = {};
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
persist: {
|
persist: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
|
|
|
||||||
|
|
@ -17,12 +17,8 @@
|
||||||
-->
|
-->
|
||||||
<view class="ui-navbar-box">
|
<view class="ui-navbar-box">
|
||||||
<view
|
<view
|
||||||
class="ui-bar"
|
class="ui-bar ss-p-x-20"
|
||||||
:class="[{
|
:class="state.isDark ? 'text-white' : 'text-black'"
|
||||||
'text-white': state.isDark,
|
|
||||||
'text-black': !state.isDark,
|
|
||||||
'ss-p-x-20': sheep.$platform.provider !== 'alipay'
|
|
||||||
}]"
|
|
||||||
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
:style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
|
||||||
>
|
>
|
||||||
<view class="icon-box ss-flex">
|
<view class="icon-box ss-flex">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<!-- 自定义底部导航项 -->
|
<!-- 自定义底部导航项 -->
|
||||||
<template>
|
<template>
|
||||||
<view class="u-tabbar-item" :style="[addStyle(customStyle)]" @click="clickHandler">
|
<view class="u-tabbar-item" :style="[addStyle(customStyle)]">
|
||||||
<view v-if="isCenter" class="tabbar-center-item">
|
<view v-if="isCenter" class="tabbar-center-item">
|
||||||
<image class="center-image" :src="centerImage" mode="aspectFill"></image>
|
<image class="center-image" :src="centerImage" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue