Compare commits

...

8 Commits

Author SHA1 Message Date
YunaiV 48811b88dc (〃'▽'〃) v2025.09 发布:新增 AI 支持联网搜索、推理、文件/图片、MCP 等功能,完善 IoT 场景联动 2025-08-31 11:36:50 +08:00
YunaiV 1ab9d97fce fix:uploadFilesFromPath 上传时,directory 存在 “[object Undefined]” 的情况 2025-08-24 11:15:05 +08:00
YunaiV 7b76e969af feat:【system 系统管理】租户支持匹配多域名、微信小程序 appid 等 2025-08-19 23:01:57 +08:00
YunaiV eca7bb81d3 fix:uploadFilesFromPath 上传时,directory 存在 “[object Undefined]” 的情况 2025-08-17 10:33:08 +08:00
芋道源码 ef56dd4a2a
!150 fix(chat): 修复uni-easyinput在手机键盘弹出时,导致页面整体上移的问题
Merge pull request !150 from wslyx/master
2025-08-09 02:32:26 +00:00
芋道源码 685905991d
!159 fix(支付): 兼容微信支付V3参数大小写
Merge pull request !159 from wuKong/master
2025-08-09 02:30:52 +00:00
wuKong fc1e6ac22b fix(支付): 兼容微信支付V3参数大小写
- 在解析支付参数时,增加对 appId、nonceStr 和 timeStamp 字段的兼容性处理
- 如果大写版本不存在,使用小写版本赋值
- 确保支付功能在不同环境下能够正常工作
2025-08-08 23:59:37 +08:00
wslyx 79e9540da5 fix(chat): 修复uni-easyinput在手机键盘弹出时,导致页面整体上移的问题
- 新增 OptimizeInput组件以替换 uni-easyinput
2025-05-24 20:32:22 +08:00
10 changed files with 641 additions and 91 deletions

View File

@ -2,7 +2,7 @@
"name": "芋道商城",
"appid": "__UNI__460BC4C",
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
"versionName": "2025.08",
"versionName": "2025.09",
"versionCode": "183",
"transformPx": false,
"app-plus": {

View File

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

View File

@ -1,17 +1,13 @@
<template>
<view class="send-wrap ss-flex">
<view class="left ss-flex ss-flex-1">
<uni-easyinput
<optimize-input
class="ss-flex-1 ss-p-l-22"
:inputBorder="false"
:clearable="false"
v-model="message"
placeholder="请输入你要咨询的问题"
:maxlength="maxLength"
:focus="autoFocus"
@focus="handleFocus"
></uni-easyinput>
<text v-if="showCharCount" class="char-count">{{ message.length }}/{{ maxLength }}</text>
></optimize-input>
</view>
<text class="sicon-basic bq" @tap.stop="onTools('emoji')"></text>
<text
@ -35,6 +31,7 @@
<script setup>
import { computed, ref, onUnmounted } from 'vue';
import OptimizeInput from '@/pages/chat/components/optimize-input.vue';
/**
* 消息发送组件
*/
@ -49,83 +46,27 @@
type: String,
default: '',
},
//
autoFocus: {
type: Boolean,
default: false,
},
//
maxLength: {
type: Number,
default: 500,
},
//
showCharCount: {
type: Boolean,
default: true,
},
});
const emits = defineEmits(['update:modelValue', 'onTools', 'sendMessage']);
const message = computed({
get() {
return props.modelValue;
},
set(newValue) {
emits(`update:modelValue`, newValue);
},
});
//
const sending = ref(false);
//
const isDisabled = computed(() => {
return !message.value.trim() || message.value.length > props.maxLength;
});
//
const handleFocus = () => {
//
if (props.toolsMode !== '') {
onTools('');
}
};
});
//
function onTools(mode) {
emits('onTools', mode);
}
//
let sendTimer = null;
//
function sendMessage() {
//
if (sending.value || isDisabled.value) return;
//
if (sendTimer) clearTimeout(sendTimer);
//
sending.value = true;
//
sendTimer = setTimeout(() => {
emits('sendMessage');
//
setTimeout(() => {
sending.value = false;
}, 300);
}, 300);
emits('sendMessage');
}
//
onUnmounted(() => {
if (sendTimer) clearTimeout(sendTimer);
});
</script>
<style scoped lang="scss">
@ -137,16 +78,6 @@
height: 64rpx;
border-radius: 32rpx;
background: var(--ui-BG-1);
position: relative;
.char-count {
position: absolute;
right: 15rpx;
top: 50%;
transform: translateY(-50%);
font-size: 22rpx;
color: #999;
}
}
.bq {
@ -174,12 +105,6 @@
font-size: 26rpx;
color: #fff;
margin-left: 11rpx;
transition: all 0.3s;
&.disabled {
opacity: 0.6;
background: #cccccc;
}
}
}
</style>

View File

@ -0,0 +1,540 @@
<template>
<view
class="uni-easyinput"
:class="{ 'uni-easyinput-error': msg }"
:style="{ color: inputBorder && msg ? '#e43d33' : styles.color }"
>
<view
class="uni-easyinput__content"
:class="{
'is-input-border': inputBorder,
'is-input-error-border': inputBorder && msg,
'is-textarea': type === 'textarea',
'is-disabled': disabled
}"
:style="{
'border-color': inputBorder && msg ? '#dd524d' : styles.borderColor,
'background-color': disabled ? styles.disableColor : ''
}"
>
<uni-icons
v-if="prefixIcon"
class="content-clear-icon"
:type="prefixIcon"
color="#c0c4cc"
@click="onClickIcon('prefix')"
></uni-icons>
<textarea
v-if="type === 'textarea'"
class="uni-easyinput__content-textarea"
:class="{ 'input-padding': inputBorder }"
:name="name"
:value="val"
:placeholder="placeholder"
:placeholderStyle="placeholderStyle"
:disabled="disabled"
placeholder-class="uni-easyinput__placeholder-class"
:maxlength="inputMaxlength"
:focus="focused"
:autoHeight="autoHeight"
:adjust-position="false"
@input="onInput"
@blur="onBlur"
@focus="onFocus"
@confirm="onConfirm"
></textarea>
<input
v-else
:type="type === 'password' ? 'text' : type"
class="uni-easyinput__content-input"
:style="{
'padding-right': type === 'password' || clearable || prefixIcon ? '' : '10px',
'padding-left': paddingLeft + 'px'
}"
:name="name"
:value="val"
:password="!showPassword && type === 'password'"
:placeholder="placeholder"
:placeholderStyle="placeholderStyle"
placeholder-class="uni-easyinput__placeholder-class"
:disabled="disabled"
:maxlength="inputMaxlength"
:focus="focused"
:confirmType="confirmType"
:adjust-position="false"
@focus="onFocus"
@blur="onBlur"
@input="onInput"
@change="onInput"
@confirm="onConfirm"
:cursor-spacing="30"
always-embed
/>
<template v-if="type === 'password' && passwordIcon">
<uni-icons
v-if="val"
class="content-clear-icon"
:class="{ 'is-textarea-icon': type === 'textarea' }"
:type="showPassword ? 'eye-slash-filled' : 'eye-filled'"
:size="18"
color="#c0c4cc"
@click="onEyes"
></uni-icons>
</template>
<template v-else-if="suffixIcon">
<uni-icons
v-if="suffixIcon"
class="content-clear-icon"
:type="suffixIcon"
color="#c0c4cc"
@click="onClickIcon('suffix')"
></uni-icons>
</template>
<template v-else>
<uni-icons
class="content-clear-icon"
:class="{ 'is-textarea-icon': type === 'textarea' }"
type="clear"
:size="clearSize"
v-if="clearable && val && !disabled"
color="#c0c4cc"
@click="onClear"
></uni-icons>
</template>
<slot name="right"></slot>
</view>
</view>
</template>
<script>
// import {
// debounce,
// throttle
// } from './common.js'
/**
* Easyinput 输入框
* @description 此组件可以实现表单的输入与校验包括 "text" "textarea" 类型
* @tutorial https://ext.dcloud.net.cn/plugin?id=3455
* @property {String} value 输入内容
* @property {String } type 输入框的类型默认text password/text/textarea/..
* @value text 文本输入键盘
* @value textarea 多行文本输入键盘
* @value password 密码输入键盘
* @value number 数字输入键盘注意iOS上app-vue弹出的数字键盘并非9宫格方式
* @value idcard 身份证输入键盘支付宝百度QQ小程序
* @value digit 带小数点的数字键盘 App的nvue页面微信支付宝百度头条QQ小程序支持
* @property {Boolean} clearable 是否显示右侧清空内容的图标控件点击可清空输入框内容默认true
* @property {Boolean} autoHeight 是否自动增高输入区域type为textarea时有效默认false
* @property {String } placeholder 输入框的提示文字
* @property {String } placeholderStyle placeholder的样式(内联样式字符串)"color: #ddd"
* @property {Boolean} focus 是否自动获得焦点默认false
* @property {Boolean} disabled 是否禁用默认false
* @property {Number } maxlength 最大输入长度设置为 -1 的时候不限制最大长度默认140
* @property {String } confirmType 设置键盘右下角按钮的文字仅在type="text"时生效默认done
* @property {Number } clearSize 清除图标的大小单位px默认15
* @property {String} prefixIcon 输入框头部图标
* @property {String} suffixIcon 输入框尾部图标
* @property {Boolean} trim 是否自动去除两端的空格
* @value both 去除两端空格
* @value left 去除左侧空格
* @value right 去除右侧空格
* @value start 去除左侧空格
* @value end 去除右侧空格
* @value all 去除全部空格
* @value none 不去除空格
* @property {Boolean} inputBorder 是否显示input输入框的边框默认true
* @property {Boolean} passwordIcon type=password时是否显示小眼睛图标
* @property {Object} styles 自定义颜色
* @event {Function} input 输入框内容发生变化时触发
* @event {Function} focus 输入框获得焦点时触发
* @event {Function} blur 输入框失去焦点时触发
* @event {Function} confirm 点击完成按钮时触发
* @event {Function} iconClick 点击图标时触发
* @example <uni-easyinput v-model="mobile"></uni-easyinput>
*/
export default {
name: 'optimize-input',
emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm'],
model: {
prop: 'modelValue',
event: 'update:modelValue'
},
props: {
name: String,
value: [Number, String],
modelValue: [Number, String],
type: {
type: String,
default: 'text'
},
clearable: {
type: Boolean,
default: true
},
autoHeight: {
type: Boolean,
default: false
},
placeholder: String,
placeholderStyle: String,
focus: {
type: Boolean,
default: false
},
disabled: {
type: Boolean,
default: false
},
maxlength: {
type: [Number, String],
default: 140
},
confirmType: {
type: String,
default: 'done'
},
clearSize: {
type: [Number, String],
default: 15
},
inputBorder: {
type: Boolean,
default: true
},
prefixIcon: {
type: String,
default: ''
},
suffixIcon: {
type: String,
default: ''
},
trim: {
type: [Boolean, String],
default: true
},
passwordIcon: {
type: Boolean,
default: true
},
styles: {
type: Object,
default() {
return {
color: '#333',
disableColor: '#F7F6F6',
borderColor: '#e5e5e5'
};
}
},
errorMessage: {
type: [String, Boolean],
default: ''
},
paddingLeft:{
type: [Number, String],
default: 0
}
},
data() {
return {
focused: false,
errMsg: '',
val: '',
showMsg: '',
border: false,
isFirstBorder: false,
showClearIcon: false,
showPassword: false
};
},
computed: {
msg() {
return this.errorMessage || this.errMsg;
},
// uniappinputmaxlength
inputMaxlength() {
return Number(this.maxlength);
}
},
watch: {
value(newVal) {
if (this.errMsg) this.errMsg = '';
this.val = newVal;
// fix by mehaotian is_reset uni-forms
if (this.form && this.formItem && !this.is_reset) {
this.is_reset = false;
this.formItem.setValue(newVal);
}
},
modelValue(newVal) {
if (this.errMsg) this.errMsg = '';
this.val = newVal;
if (this.form && this.formItem && !this.is_reset) {
this.is_reset = false;
this.formItem.setValue(newVal);
}
},
focus(newVal) {
this.$nextTick(() => {
this.focused = this.focus;
});
}
},
created() {
if (!this.value && this.value !== 0) {
this.val = this.modelValue;
}
if (!this.modelValue && this.modelValue !== 0) {
this.val = this.value;
}
this.form = this.getForm('uniForms');
this.formItem = this.getForm('uniFormsItem');
if (this.form && this.formItem) {
if (this.formItem.name) {
if (!this.is_reset) {
this.is_reset = false;
this.formItem.setValue(this.val);
}
this.rename = this.formItem.name;
this.form.inputChildrens.push(this);
}
}
},
mounted() {
this.$nextTick(() => {
this.focused = this.focus;
});
},
methods: {
/**
* 初始化变量值
*/
init() {},
onClickIcon(type) {
this.$emit('iconClick', type);
},
/**
* 获取父元素实例
*/
getForm(name = 'uniForms') {
let parent = this.$parent;
let parentName = parent.$options.name;
while (parentName !== name) {
parent = parent.$parent;
if (!parent) return false;
parentName = parent.$options.name;
}
return parent;
},
onEyes() {
this.showPassword = !this.showPassword;
},
onInput(event) {
let value = event.detail.value;
//
if (this.trim) {
if (typeof this.trim === 'boolean' && this.trim) {
value = this.trimStr(value);
}
if (typeof this.trim === 'string') {
value = this.trimStr(value, this.trim);
}
}
if (this.errMsg) this.errMsg = '';
this.val = value;
// TODO vue2
this.$emit('input', value);
// TODO  vue3
this.$emit('update:modelValue', value);
},
onFocus(event) {
this.$emit('focus', event);
},
onBlur(event) {
let value = event.detail.value;
this.$emit('blur', event);
},
onConfirm(e) {
this.$emit('confirm', e.detail.value);
},
onClear(event) {
this.val = '';
// TODO vue2
this.$emit('input', '');
// TODO vue2
// TODO  vue3
this.$emit('update:modelValue', '');
},
fieldClick() {
this.$emit('click');
},
trimStr(str, pos = 'both') {
if (pos === 'both') {
return str.trim();
} else if (pos === 'left') {
return str.trimLeft();
} else if (pos === 'right') {
return str.trimRight();
} else if (pos === 'start') {
return str.trimStart();
} else if (pos === 'end') {
return str.trimEnd();
} else if (pos === 'all') {
return str.replace(/\s+/g, '');
} else if (pos === 'none') {
return str;
}
return str;
}
}
};
</script>
<style lang="scss">
$uni-error: #e43d33;
$uni-border-1: #dcdfe6 !default;
.uni-easyinput {
/* #ifndef APP-NVUE */
width: 100%;
/* #endif */
flex: 1;
position: relative;
text-align: left;
color: #333;
font-size: 14px;
}
.uni-easyinput__content {
flex: 1;
/* #ifndef APP-NVUE */
width: 100%;
display: flex;
box-sizing: border-box;
min-height: 72rpx;
/* #endif */
flex-direction: row;
align-items: center;
}
.uni-easyinput__content-input {
/* #ifndef APP-NVUE */
width: auto;
/* #endif */
position: relative;
overflow: hidden;
flex: 1;
line-height: 56rpx;
font-size: 28rpx;
height: 56rpx;
}
.uni-easyinput__placeholder-class {
color: #bbbbbb;
font-size: 28rpx;
font-weight: 400;
line-height: normal;
}
.is-textarea {
align-items: flex-start;
}
.is-textarea-icon {
margin-top: 5px;
}
.uni-easyinput__content-textarea {
position: relative;
overflow: hidden;
flex: 1;
line-height: 1.5;
font-size: 14px;
padding-top: 6px;
padding-bottom: 10px;
height: 80px;
/* #ifndef APP-NVUE */
min-height: 80px;
width: auto;
/* #endif */
}
.input-padding {
padding-left: 10px;
}
.content-clear-icon {
padding: 0 5px;
}
.label-icon {
margin-right: 5px;
margin-top: -1px;
}
//
.is-input-border {
/* #ifndef APP-NVUE */
display: flex;
box-sizing: border-box;
/* #endif */
flex-direction: row;
align-items: center;
border: 1px solid $uni-border-1;
border-radius: 4px;
}
.uni-error-message {
position: absolute;
bottom: -17px;
left: 0;
line-height: 12px;
color: $uni-error;
font-size: 12px;
text-align: left;
}
.uni-error-msg--boeder {
position: relative;
bottom: 0;
line-height: 22px;
}
.is-input-error-border {
border-color: $uni-error;
.uni-easyinput__placeholder-class {
// color: mix(#fff, $uni-error, 50%);
}
}
.uni-easyinput--border {
margin-bottom: 0;
padding: 10px 15px;
// padding-bottom: 0;
border-top: 1px #eee solid;
}
.uni-easyinput-error {
padding-bottom: 0;
}
.is-first-border {
/* #ifndef APP-NVUE */
border: none;
/* #endif */
/* #ifdef APP-NVUE */
border-width: 0;
/* #endif */
}
.is-disabled {
border-color: red;
background-color: #f7f6f6;
color: #d5d5d5;
.uni-easyinput__placeholder-class {
color: #d5d5d5;
font-size: 12px;
}
}
</style>

View File

@ -3,7 +3,7 @@ import request, { getAccessToken } from '@/sheep/request';
const FileApi = {
// 上传文件
uploadFile: (file, directory) => {
uploadFile: (file, directory = '') => {
uni.showLoading({
title: '上传中',
});

17
sheep/api/infra/tenant.js Normal file
View File

@ -0,0 +1,17 @@
import request from '@/sheep/request';
/**
* 通过网站域名获取租户信息
* @param {string} website - 网站域名
* @returns {Promise<Object>} 租户信息
*/
export function getTenantByWebsite(website) {
return request({
url: '/system/tenant/get-by-website',
method: 'GET',
params: { website },
custom: {
isToken: false, // 避免登录情况下,跨租户访问被拦截
},
});
}

View File

@ -175,7 +175,7 @@ function uploadCloudFiles(files, max = 5, onUploadProgress) {
});
}
function uploadFilesFromPath(path, directory) {
function uploadFilesFromPath(path, directory = '') {
// 目的:用于微信小程序,选择图片时,只有 path
return uploadFiles(
Promise.resolve({

View File

@ -264,8 +264,16 @@ export default class SheepPay {
}
// 解析支付参数
const payConfig = JSON.parse(data.displayContent);
let payConfig = JSON.parse(data.displayContent);
if(typeof payConfig.appId === 'undefined'){
payConfig.appId = payConfig.appid;
}
if(typeof payConfig.nonceStr === 'undefined'){
payConfig.nonceStr = payConfig.noncestr;
}
if(typeof payConfig.timeStamp === 'undefined'){
payConfig.timeStamp = payConfig.timestamp;
}
// 调用微信支付
uni.requestPayment({
provider: 'wxpay',

View File

@ -26,7 +26,8 @@ const options = {
loadingMsg: '加载中',
// 需要授权才能请求 默认放开
auth: false,
// ...
// 是否传递 token
isToken: true,
};
// Loading全局实例
@ -90,14 +91,14 @@ http.interceptors.request.use(
}
// 增加 token 令牌、terminal 终端、tenant 租户的请求头
const token = getAccessToken();
const token = config.custom.isToken ? getAccessToken() : undefined;
if (token) {
config.header['Authorization'] = token;
}
config.header['terminal'] = getTerminal();
config.header['Accept'] = '*/*';
config.header['tenant-id'] = tenantId;
config.header['tenant-id'] = getTenantId();
return config;
},
(error) => {
@ -297,6 +298,11 @@ export const getRefreshToken = () => {
return uni.getStorageSync('refresh-token');
};
/** 获得租户编号 */
export const getTenantId = () => {
return uni.getStorageSync('tenant-id') || tenantId;
};
const request = (config) => {
return http.middleware(config);
};

View File

@ -1,4 +1,6 @@
import DiyApi from '@/sheep/api/promotion/diy';
import { getTenantByWebsite } from '@/sheep/api/infra/tenant';
import { getTenantId } from '@/sheep/request';
import { defineStore } from 'pinia';
import $platform from '@/sheep/platform';
import $router from '@/sheep/router';
@ -60,6 +62,9 @@ const app = defineStore({
$router.error('EnvError');
}
// 加载租户
await adaptTenant();
// 加载装修配置
await adaptTemplate(this.template, templateId);
@ -68,7 +73,7 @@ const app = defineStore({
this.info = {
name: '芋道商城',
logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
version: '2025.08',
version: '2025.09',
copyright: '全部开源,个人与企业可 100% 免费使用',
copytime: 'Copyright© 2018-2025',
@ -119,6 +124,55 @@ const app = defineStore({
},
});
/** 初始化租户编号 */
const adaptTenant = async () => {
// 1. 获取当前租户 ID
const oldTenantId = getTenantId();
let newTenantId = null;
try {
// 2.1 情况一H5根据 url 参数、域名来获取新的租户ID
// #ifdef H5
// H5 环境下的处理逻辑
if (window?.location) {
// 优先从 URL 查询参数获取 tenantId
const urlParams = new URLSearchParams(window.location.search);
newTenantId = urlParams.get('tenantId');
// 如果 URL 参数中没有,则通过 host 获取
if (!newTenantId && window.location.host) {
const { data } = await getTenantByWebsite(window.location.host);
newTenantId = data?.id;
}
}
// #endif
// 2.2 情况二:微信小程序:小程序环境下的处理逻辑 - 根据 appId 获取租户
// #ifdef MP
const appId = uni.getAccountInfoSync()?.miniProgram?.appId;
if (appId) {
const { data } = await getTenantByWebsite(appId);
newTenantId = data?.id;
}
// #endif
// 3. 如果是新租户(不相等),则进行切换
// noinspection EqualityComparisonWithCoercionJS
if (newTenantId && newTenantId != oldTenantId) {
// 清理掉登录用户的 token
const userStore = user();
userStore.setToken();
// 设置新的 tenantId 到本地存储
uni.setStorageSync('tenant-id', newTenantId);
console.log('租户 ID 已更新:', `${oldTenantId} -> ${newTenantId}`);
}
} catch (error) {
console.error('adaptTenant 执行失败:', error);
}
};
/** 初始化装修模版 */
const adaptTemplate = async (appTemplate, templateId) => {
const { data: diyTemplate } = templateId
? // 查询指定模板,一般是预览时使用