Skip to content

Y
yongxinda-h5
提交 1ca26a11 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

更新样式

上级 064df9e4
隐藏空白字符变更
内嵌 并排
正在显示 包含 123 行增加 和 139 行删除
index.html
浏览文件 @ 1ca26a11
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="./src/static/logo.png" type="png/x-icon" />
<!-- <link rel="icon" href="./src/static/favicon.ico" type="png/x-icon" /> -->
<script>
var coverSupport =
'CSS' in window &&
......@@ -14,9 +14,6 @@
'" />'
)
</script>
<title></title>
<!--preload-links-->
<!--app-context-->
</head>
<body>
<div id="app"><!--app-html--></div>
......@@ -24,4 +21,19 @@
</body>
</html>
<style></style>
<style>
body {
overflow-x: hidden;
max-width: 420px;
margin: 0 auto;
font-size: 14px;
}
.uni-page-head {
max-width: 420px;
margin: 0 auto;
}
html {
background-color: #fff;
}
</style>
src/components/vk-data-goods-sku-popup/vk-data-goods-sku-popup.vue
浏览文件 @ 1ca26a11
......@@ -131,7 +131,7 @@
</view>
</view>
<view class="btn-wrapper" v-else-if="mode == 5">
<view class="sure" :style="{
<view class="sure" style="width: 698rpx;" :style="{
color: themeColorFn('addCartColor'),
backgroundColor: themeColorFn('addCartBackgroundColor'),
}" @click="addProduct">
......@@ -1284,7 +1284,7 @@ export default {
background-color: #fff;
.specification-wrapper {
width: 100%;
// width: 100%;
padding: 30rpx 25rpx;
box-sizing: border-box;
......@@ -1458,7 +1458,8 @@ export default {
}
.sure {
width: 698rpx;
// width: 698rpx;
width: 50%;
height: 68rpx;
border-radius: 38rpx;
color: #fff;
......
src/pages.json
浏览文件 @ 1ca26a11
......@@ -10,7 +10,7 @@
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "深圳市永信达科技有限公司"
"navigationBarTitleText": "合口味"
}
}, {
"path": "pages/category/index",
......
src/pages/cart/index.vue
浏览文件 @ 1ca26a11
<template>
<u-navbar :is-back="false" title="">
<u-navbar :is-back="false" title="" :background="{ background: '#f8f8f8' }">
<template #right>
<text style="margin-right: 30rpx;" @tap="tapSwitch">
{{ type === 0 ? '切换产品线' : '返回商品' }}
......@@ -455,6 +455,15 @@ onShow(() => {
}
}
:deep(.u-navbar) {
max-width: 420px;
margin: 0 auto;
.u-navbar-content-title {
left: 36%
}
}
.footer {
position: fixed;
bottom: var(--window-bottom);
......
src/pages/category/index.vue
浏览文件 @ 1ca26a11
......@@ -2,29 +2,15 @@
<view class="u-wrap">
<!-- 搜索 -->
<view>
<uni-search-bar
placeholder="输入搜索商品"
bgColor="#EEEEEE"
clearButton="auto"
cancelButton="none"
@confirm="search"
/>
<uni-search-bar placeholder="输入搜索商品" bgColor="#EEEEEE" clearButton="auto" cancelButton="none"
@confirm="search" />
</view>
<view class="u-menu-wrap">
<scroll-view
scroll-y
scroll-with-animation
class="u-tab-view menu-scroll-view"
:scroll-top="scrollTop"
>
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
<block v-for="(item, index) in categoryList" :key="item.id">
<view
v-if="item.name !== '客户机器'"
class="u-tab-item"
:class="[current == index ? 'u-tab-item-active' : '']"
:data-current="index"
@tap.stop="swichMenu(index, item.id)"
>
<view v-if="item.name !== '客户机器'" class="u-tab-item"
:class="[current == index ? 'u-tab-item-active' : '']" :data-current="index"
@tap.stop="swichMenu(index, item.id)">
<text class="u-line-1">{{ item.name }}</text>
</view>
</block>
......@@ -32,15 +18,11 @@
<view class="right-cates">
<block v-for="(item, index) in currentSubCategoryData" :key="item.id">
<view class="item-container" @tap="cateGoryGoods(item)">
<u-image
width="100rpx"
height="100rpx"
:src="
item.picUrl.split('http').length > 1
? item.picUrl
: baseUrl + item.picUrl
"
></u-image>
<u-image width="100rpx" height="100rpx" :src="
item.picUrl.split('http').length > 1
? item.picUrl
: baseUrl + item.picUrl
"></u-image>
<view class="content">
<view class="title">
<text>{{ item.name }}</text>
......@@ -176,6 +158,8 @@ const initGoodsList = (data: any) => {
height: 100%;
background-color: #fff;
padding: 0 24rpx;
margin-right: 10rpx;
.item-container {
box-sizing: border-box;
width: 100%;
......@@ -185,20 +169,24 @@ const initGoodsList = (data: any) => {
justify-content: flex-start;
align-items: center;
border-bottom: 1rpx solid #f5f5f5;
.content {
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: 20rpx;
.title {
display: flex;
flex-direction: column;
}
.price {
.new-price {
font-size: 32rpx;
}
.old-price {
margin-left: 10rpx;
color: #969799;
......
src/pages/goods/index.vue
浏览文件 @ 1ca26a11
......@@ -82,7 +82,8 @@
</u-popup>
</view>
<goodsSku ref="goodsSkuRef" :cartId="cartId" @selected="selected"></goodsSku>
<goodsSku ref="goodsSkuRef" :cartId="cartId" @selected="selected">
</goodsSku>
</template>
<script lang="ts" setup>
......@@ -605,25 +606,11 @@ const initParts = (goodsId: number, productId: number) => {
.left {
padding: 20rpx 0;
font-size: 24rpx;
// overflow: hidden;
// text-overflow: ellipsis; /* 超出部分省略号 */
// word-break: break-all; /* break-all(允许在单词内换行。) */
// display: -webkit-box; /* 对象作为伸缩盒子模型显示 */
// -webkit-box-orient: vertical; /* 设置或检索伸缩盒对象的子元素的排列方式 */
// -webkit-line-clamp: 2; /* 显示的行数 */
// max-height: 80rpx; /* 设置最大高度，根据行高，要几行乘以几倍 */
}
.right {
padding: 20rpx 0;
font-size: 24rpx;
// overflow: hidden;
// text-overflow: ellipsis; /* 超出部分省略号 */
// word-break: break-all; /* break-all(允许在单词内换行。) */
// display: -webkit-box; /* 对象作为伸缩盒子模型显示 */
// -webkit-box-orient: vertical; /* 设置或检索伸缩盒对象的子元素的排列方式 */
// -webkit-line-clamp: 2; /* 显示的行数 */
// max-height: 80rpx; /* 设置最大高度，根据行高，要几行乘以几倍 */
}
}
......@@ -631,4 +618,9 @@ const initParts = (goodsId: number, productId: number) => {
width: 50%;
z-index: 99;
}
:deep(.uni-tab__cart-box) {
max-width: 420px;
margin: auto;
}
</style>
src/pages/order/editQuotation.vue
浏览文件 @ 1ca26a11
......@@ -54,12 +54,11 @@
</template>
<script setup lang="ts">
import { onLoad, onBackPress } from '@dcloudio/uni-app';
import { ref, computed, nextTick } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
import { ref, computed } from 'vue';
import { quotationInitAgain, fillQuotation } from '@/api/cart';
import { deleteAddress, getTax } from '@/api/index';
import { getTax } from '@/api/index';
import config from '@/utils/config';
import { numberLiteralTypeAnnotation } from '@babel/types';
let baseUrl = config.baseUrl;
let orderId = ref();
......@@ -201,6 +200,7 @@ let init = () => {
.app-container {
background-color: #fff;
padding: 20rpx;
margin: 10rpx;
.details {
display: flex;
......
src/pages/productLine/productLine.vue
浏览文件 @ 1ca26a11
......@@ -10,7 +10,7 @@
</u-navbar>
<view class="u-wrap">
<view class="u-menu-wrap">
<view style="position: fixed; left: 8rpx; top: 6%; min-height: 100vh;">
<view style="position: fixed; top: 6%; min-height: 100vh;">
<drag-and-drop-sort v-if="flag" ref="dragRef" style="display: flex; justify-content: center;"
:controlsList="lineList" :controlsSize="{ width: 180, height: itemHeight }"
@sheet-del="sheetDel" @sheet-copy="sheetCopy" @sheet-edit="sheetEdit">
......@@ -767,6 +767,7 @@ $nav-heigth: var(--window-bottom);
}
.right-cates {
box-sizing: border-box;
flex: 1;
display: flex;
flex-direction: row;
......@@ -774,6 +775,7 @@ $nav-heigth: var(--window-bottom);
// align-items: center;
background-color: #fff;
min-height: 100vh;
margin-right: 10rpx;
.right-cates-list {
width: 80px;
......@@ -785,6 +787,24 @@ $nav-heigth: var(--window-bottom);
}
}
:deep(.u-navbar) {
max-width: 420px;
margin: 0 auto;
// .u-navbar-content-title {
// left: 36%
// }
}
:deep(.u-navbar-content-title) {
left: 36%;
}
:deep(.uni-tab__cart-box) {
max-width: 420px;
margin: auto;
}
.u-wrap {
// height: calc(100vh);
/* #ifdef H5 */
......@@ -805,6 +825,7 @@ $nav-heigth: var(--window-bottom);
.goods-nav {
position: fixed;
left: 0;
bottom: $nav-heigth;
width: 100%;
display: inline;
......
src/pages/profile/addSite.vue
浏览文件 @ 1ca26a11
......@@ -4,59 +4,29 @@
<view class="item">
<view class="left">客户名称</view>
<u-select v-model="showSelect" :list="selectList" @confirm="onConfirm"></u-select>
<input
:disabled="true"
v-model="addressData.name"
placeholder-class="line"
placeholder="请填写客户名称"
@tap="showSelect = true"
/>
<input :disabled="true" v-model="addressData.name" placeholder-class="line" placeholder="请填写客户名称"
@tap="showSelect = true" />
</view>
<view class="item">
<view class="left">采购员</view>
<input
type="text"
v-model="addressData.contactName"
placeholder-class="line"
placeholder="请填写采购员"
/>
<input type="text" v-model="addressData.contactName" placeholder-class="line" placeholder="请填写采购员" />
</view>
<view class="item">
<view class="left">采购手机号</view>
<input
v-model="addressData.tel"
type="text"
placeholder-class="line"
placeholder="请填写采购手机号"
/>
<input v-model="addressData.tel" type="text" placeholder-class="line" placeholder="请填写采购手机号" />
</view>
<view class="item">
<view class="left">采购邮箱</view>
<input
v-model="addressData.customerEmail"
type="text"
placeholder-class="line"
placeholder="请填写采购邮箱"
/>
<input v-model="addressData.customerEmail" type="text" placeholder-class="line" placeholder="请填写采购邮箱" />
</view>
<view class="item" @tap="showRegionPicker">
<view class="left">所在地址</view>
<input
v-model="addressDetails"
disabled
type="text"
placeholder-class="line"
placeholder="省市区县、乡镇等"
/>
<input v-model="addressDetails" disabled type="text" placeholder-class="line" placeholder="省市区县、乡镇等" />
</view>
<view class="item address">
<view class="left">详细地址</view>
<textarea
v-model="addressData.addressDetail"
type="text"
placeholder-class="line"
placeholder="街道、楼牌等"
/>
<textarea v-model="addressData.addressDetail" type="text" placeholder-class="line"
placeholder="街道、楼牌等" />
</view>
</view>
<view class="bottom">
......@@ -79,12 +49,7 @@
</view>
<u-picker mode="region" ref="uPicker" v-model="show" @confirm="confirm" />
<u-modal
v-model="showModel"
:content="content"
show-cancel-button
@confirm="confirmModel"
></u-modal>
<u-modal v-model="showModel" :content="content" show-cancel-button @confirm="confirmModel"></u-modal>
</view>
</template>
......@@ -128,7 +93,7 @@ onLoad((options?: any) => {
editId.value = addressData.value?.id
}
consigneeList().then((res: any) => {
if(res.data.code === 200) {
if (res.data.code === 200) {
res.data.data.map((item: any) => {
selectList.value.push({
label: item.customerName,
......@@ -160,17 +125,17 @@ let confirm = (data: any) => {
// 确认删除地址
let confirmModel = () => {
deleteAddress(editId.value).then((res: any) => {
if(res.data.code === 200) {
uni.navigateBack({
delta: 1,
success() {
uni.$emit('initAddress')
uni.showToast({
title: '删除地址成功',
icon: 'none'
})
}
});
if (res.data.code === 200) {
uni.navigateBack({
delta: 1,
success() {
uni.$emit('initAddress')
uni.showToast({
title: '删除地址成功',
icon: 'none'
})
}
});
}
});
}
......@@ -347,8 +312,7 @@ let addressDel = () => {
font-size: 24rpx;
}
.right {
}
.right {}
}
}
}
......
src/pages/profile/address.vue
浏览文件 @ 1ca26a11
......@@ -3,16 +3,13 @@
<view class="address" v-for="(res, index) in siteList" :key="res.id">
<u-row>
<u-col :span="11">
<view
class="item"
@tap="
pagePathFlag
? setAddress(res)
: () => {
return;
}
"
>
<view class="item" @tap="
pagePathFlag
? setAddress(res)
: () => {
return;
}
">
<view class="top">
<u-row style="width: 100%;">
<u-col :span="5">
......@@ -22,12 +19,7 @@
<view class="phone">{{ res.tel }}</view>
</u-col>
<u-col :span="3" style="text-align: end;">
<u-tag
v-show="res.isDefault"
text="默认"
type="error"
size="mini"
/>
<u-tag v-show="res.isDefault" text="默认" type="error" size="mini" />
</u-col>
</u-row>
</view>
......@@ -85,7 +77,7 @@ const setAddress = (item: any) => {
let beforePage: any = pages[pages.length - 2]; // 上一页
// console.log(beforePage);
uni.navigateBack({
success: function() {
success: function () {
if (beforePage.route === 'pages/order/quotation')
uni.$emit('updateAddress', { addr: item });
if (beforePage.route === 'pages/order/checkout')
......@@ -118,13 +110,17 @@ uni.$on('initAddress', () => {
<style lang="scss" scoped>
page {
background-color: #fff;
padding: 0 20rpx;
// padding: 0 20rpx;
}
.address {
padding: 40rpx 20rpx;
padding: 40rpx;
margin: 0 10rpx 10rpx;
background-color: #fff;
border-top: 1px solid #f6f6f6;
border-radius: 8rpx;
}
.item {
.top {
font-weight: bold;
......@@ -170,7 +166,8 @@ page {
.addSite {
position: fixed;
bottom: 30rpx;
left: 80rpx;
left: 50%;
margin-left: -150px;
display: flex;
justify-content: space-around;
width: 600rpx;
......
src/pages/profile/index.vue
浏览文件 @ 1ca26a11
......@@ -2,7 +2,7 @@
<view class="profile-container">
<view class="profile-info">
<view class="profile-avatar">
<image style="width: 220rpx;" src="../../static/logo.png" mode="scaleToFill" />
<image style="width: 220rpx;" src="../../static/hkw.png" mode="scaleToFill" />
</view>
<view class="profile-nickname">
<text>{{ nickName }}</text>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论