Web/daimp-front
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

Browse Source
This commit is contained in:
沈鸿 2025-05-27 09:50:02 +08:00
commit 0bcd46de7b
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/micro/app.js
View File

@ -18,7 +18,7 @@ export const leftApps = [
icon: 'images/platform/icon-admin.png',
},
{
name: 'sub-app',
name: 'sub-app2',
entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app',
title: 'APP',
@ -49,7 +49,7 @@ export const rightApps = [
icon: 'images/platform/icon-admin.png',
},
{
name: 'sub-app',
name: 'sub-app1',
entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app',
title: 'APP',

8
main/src/views/index.vue
View File

@ -36,7 +36,13 @@ import { getAssetsFile } from '@/utils';
const gotoPage = (row) => {
// window.history.pushState({}, row.name, row.activeRule);
window.location.href = row.activeRule;
if (row.name == 'sub-app1') {
window.location.href = 'https://www.pgyer.com/MXd3uUrO';
} else if (row.name == 'sub-app2') {
window.location.href = 'https://www.pgyer.com/4SVVtpob';
} else {
window.location.href = row.activeRule;
}
};
</script>
<style lang="scss" scoped>

1
new-digital-agriculture-screen/components.d.ts vendored
View File

@ -12,7 +12,6 @@ declare module 'vue' {
'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
Components: typeof import('./src/components/index.js')['default']
copy: typeof import('./src/components/centerMap copy.vue')['default']
CurrentTime: typeof import('./src/components/currentTime.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

1
sub-operation-service/components.d.ts vendored
View File

@ -9,7 +9,6 @@ declare module 'vue' {
export interface GlobalComponents {
CenterMap: typeof import('./src/components/centerMap.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default']
CostomImg: typeof import('./src/components/costomImg.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

2
sub-operation-service/src/layouts/component/Main/index.vue
View File

@ -34,7 +34,7 @@ const isReload = computed(() => SettingStore.isReload);
flex: 1;
display: flex;
width: 100%;
height: 100%;
height: fit-content;
@include scrollable;
box-sizing: border-box;

2
sub-operation-service/src/layouts/index.vue
View File

@ -14,7 +14,7 @@ import Main from './component/Main';
.basic-layout {
width: 100%;
min-width: 1200px;
height: 100%;
height: fit-content;
&-container {
position: relative;
margin-left: 210px;

9
sub-operation-service/src/views/ecommerce/components/purchaserPopup.vue
View File

@ -85,8 +85,8 @@
</div>
<div style="display: flex; justify-content: flex-start; text-align: left; margin-top: 20px">
<div class="inputs" style="width: 100%">
<span class="labels" style="width: 14%">收货地址：</span>
<el-input v-model="formData.address" maxlength="30" style="width: 100%" placeholder="请输入" show-word-limit type="textarea" />
<span class="labels" style="padding-right: 12px">收货地址：</span>
<el-input v-model="formData.address" maxlength="30" style="width: 87%" placeholder="请输入" show-word-limit type="textarea" />
</div>
</div>
</el-form>
@ -193,7 +193,7 @@ defineExpose({
.unit::after {
content: 'kg';
position: absolute;
right: 10px; /* 调整单位与输入框的距离 */
right: 65px; /* 调整单位与输入框的距离 */
color: #000; /* 单位颜色 */
pointer-events: none; /* 防止单位遮挡输入框 */
}
@ -207,8 +207,7 @@ defineExpose({
display: flex;
align-items: center;
.labels {
width: 25%;
margin-right: 10px;
padding-right: 12px;
}
input {
width: calc(74% - 20px);