Skip to content

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

优化页面

上级 bf7cd660
隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 138 行删除
index.html
浏览文件 @ 5878f23a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<!-- <link rel="icon" href="./src/static/favicon.ico" type="png/x-icon" /> --> <link rel="icon" href="./src/static/favicon.ico" type="png/x-icon" />
<script> <script>
var coverSupport = var coverSupport =
'CSS' in window && 'CSS' in window &&
......
src/pages.json
浏览文件 @ 5878f23a
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "合口味" "navigationBarTitleText": "深圳市永信达科技有限公司"
} }
}, { }, {
"path": "pages/category/index", "path": "pages/category/index",
......
src/pages/category/index.vue
浏览文件 @ 5878f23a
...@@ -158,7 +158,7 @@ const initGoodsList = (data: any) => { ...@@ -158,7 +158,7 @@ const initGoodsList = (data: any) => {
height: 100%; height: 100%;
background-color: #fff; background-color: #fff;
padding: 0 24rpx; padding: 0 24rpx;
margin-right: 10rpx; margin-right: 6rpx;
.item-container { .item-container {
box-sizing: border-box; box-sizing: border-box;
......
src/pages/goods/index.vue
浏览文件 @ 5878f23a
...@@ -82,8 +82,7 @@ ...@@ -82,8 +82,7 @@
</u-popup> </u-popup>
</view> </view>
<goodsSku ref="goodsSkuRef" :cartId="cartId" @selected="selected"> <goodsSku ref="goodsSkuRef" :cartId="cartId" @selected="selected" />
</goodsSku>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
...@@ -358,6 +357,8 @@ const initParts = (goodsId: number, productId: number) => { ...@@ -358,6 +357,8 @@ const initParts = (goodsId: number, productId: number) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.goods-detail { .goods-detail {
margin: 0 6rpx;
.goods-img { .goods-img {
:deep(.swiper) { :deep(.swiper) {
margin-top: 200px; margin-top: 200px;
...@@ -568,10 +569,10 @@ const initParts = (goodsId: number, productId: number) => { ...@@ -568,10 +569,10 @@ const initParts = (goodsId: number, productId: number) => {
} }
.goods-intro { .goods-intro {
//height: 160rpx;
background-color: #ffffff; background-color: #ffffff;
margin-top: 20rpx; margin-top: 20rpx;
border-radius: 30rpx; border-radius: 20rpx;
padding: 0 20rpx;
.content { .content {
width: 100%; width: 100%;
......
src/pages/login/login.vue
浏览文件 @ 5878f23a
<template> <template>
<view class="login-container"> <view style="box-sizing: border-box;">
<image src="../../static/hkw.png" mode="widthFix" class="title-iamge"></image> <view class="login-container">
<text class="login-text">欢迎登陆</text> <image src="../../static/logo.png" mode="widthFix" class="title-iamge"></image>
<text class="login-text">欢迎登陆</text>
<view class="login-form"> <view class="login-form">
<input-login :inputData="inputData" @hangleInput="hangleInput" /> <input-login :inputData="inputData" @hangleInput="hangleInput" />
<input-login :inputData="inputData1" @hangleInput="hangleInput" /> <input-login :inputData="inputData1" @hangleInput="hangleInput" />
</view> </view>
<button @tap="clickNextStep" class="getCaptcha">登录</button> <button @tap="clickNextStep" class="getCaptcha">登录</button>
<!-- <image src="https://bytelibs-dev.oss-cn-beijing.aliyuncs.com/image/logo/logo.png" mode="" class="next-step" @click="clickNextStep"></image> --> <!-- <image src="https://bytelibs-dev.oss-cn-beijing.aliyuncs.com/image/logo/logo.png" mode="" class="next-step" @click="clickNextStep"></image> -->
</view>
</view> </view>
</template> </template>
...@@ -105,16 +107,23 @@ let initLogin = async (mobile: number, password: string) => { ...@@ -105,16 +107,23 @@ let initLogin = async (mobile: number, password: string) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page { :deep(uni-page-wrapper) {
background-color: #fff; background-color: #fff;
} }
:deep(uni-page) {
padding: 0 6rpx;
box-sizing: border-box;
}
.login-container { .login-container {
padding-top: 40%; padding-top: 40%;
box-sizing: border-box;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
background-color: #fff;
.getCaptcha { .getCaptcha {
width: 400rpx; width: 400rpx;
background-color: rgb(253, 243, 208); background-color: rgb(253, 243, 208);
...@@ -122,27 +131,33 @@ page { ...@@ -122,27 +131,33 @@ page {
border: none; border: none;
font-size: 30rpx; font-size: 30rpx;
margin-top: 20rpx; margin-top: 20rpx;
&::after { &::after {
border: none; border: none;
} }
} }
.title-iamge { .title-iamge {
width: 400rpx; width: 400rpx;
} }
.login-text { .login-text {
margin-top: 10%; margin-top: 10%;
font-weight: 700; font-weight: 700;
font-size: 40rpx; font-size: 40rpx;
color: #1d2b5f; color: #1d2b5f;
} }
.login-form { .login-form {
margin-top: 15%; margin-top: 15%;
} }
.next-step { .next-step {
margin-top: 20rpx; margin-top: 20rpx;
width: 245rpx; width: 245rpx;
height: 90rpx; height: 90rpx;
} }
.footer-text { .footer-text {
margin-top: 40%; margin-top: 40%;
display: block; display: block;
......
src/pages/order/checkout.vue
浏览文件 @ 5878f23a
...@@ -51,11 +51,9 @@ ...@@ -51,11 +51,9 @@
<!-- 提交订单 --> <!-- 提交订单 -->
<view class="footer"> <view class="footer">
<view> <u-button type="error" size="medium" shape="circle" @tap="onsubmit">
<u-button type="error" size="medium" shape="circle" @tap="onsubmit"> 提交订单
提交订单 </u-button>
</u-button>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -215,8 +213,9 @@ onShow(() => { ...@@ -215,8 +213,9 @@ onShow(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
margin: 0 6rpx;
.address { .address {
width: 100%;
padding: 20rpx 32rpx; padding: 20rpx 32rpx;
border-top: 2rpx solid #e8e8e8; border-top: 2rpx solid #e8e8e8;
background-color: #fff; background-color: #fff;
...@@ -311,13 +310,17 @@ onShow(() => { ...@@ -311,13 +310,17 @@ onShow(() => {
.footer { .footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; left: var(--window-left);
right: var(--window-right);
// width: 100%;
height: 100rpx; height: 100rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
padding: 0 32rpx; padding: 0 32rpx;
max-width: 420px;
margin: 0 auto;
} }
} }
</style> </style>
src/pages/order/downPdf.vue
浏览文件 @ 5878f23a
...@@ -134,7 +134,7 @@ onBackPress((options: any) => { ...@@ -134,7 +134,7 @@ onBackPress((options: any) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
box-sizing: border-box; box-sizing: border-box;
margin: 16rpx 32rpx; margin: 16rpx;
background-color: #fff; background-color: #fff;
.details { .details {
......
src/pages/order/orderList.vue
浏览文件 @ 5878f23a
<template> <template>
<view> <view style="border-top: 1rpx solid #f6f6f6;">
<view class="wrap"> <view class="wrap">
<view class="u-tabs-box"> <view class="u-tabs-box">
<u-tabs-swiper activeColor="#f29100" ref="swiperTabs" :list="list" :current="current" @change="change" <u-tabs-swiper activeColor="#f29100" ref="swiperTabs" :list="list" :current="current" @change="change"
......
src/pages/order/quotation.vue
浏览文件 @ 5878f23a
<template> <template>
<view style="padding: 30rpx;"> <view style="padding: 20rpx;">
<!-- 订单信息 --> <!-- 订单信息 -->
<view class="container"> <view class="container">
<block v-for="(item, index) in detailData"> <block v-for="(item, index) in detailData">
...@@ -593,13 +593,17 @@ let initQuotationPayment = () => { ...@@ -593,13 +593,17 @@ let initQuotationPayment = () => {
} }
.footer { .footer {
width: 100%;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: var(--window-left);
right: var(--window-right);
// width: 100%;
padding: 20rpx; padding: 20rpx;
z-index: 99; z-index: 99;
background-color: #fff; background-color: #fff;
border-top: 2rpx solid #f7f7f7; border-top: 2rpx solid #f7f7f7;
max-width: 420px;
margin: 0 auto;
.price { .price {
display: flex; display: flex;
......
src/pages/productLine/productLine.vue
浏览文件 @ 5878f23a
...@@ -677,6 +677,15 @@ let uploadLine = () => { ...@@ -677,6 +677,15 @@ let uploadLine = () => {
success(uploadFileRes: any) { success(uploadFileRes: any) {
uni.hideLoading() uni.hideLoading()
let fileRes = JSON.parse(uploadFileRes.data) let fileRes = JSON.parse(uploadFileRes.data)
if (fileRes.code === 501 || fileRes.code === 911) return uni.reLaunch({
url: '/pages/login/login',
success() {
uni.showToast({
title: '请登录',
icon: 'none',
});
},
});
if (!fileRes.data.isError) { if (!fileRes.data.isError) {
if (fileRes.data.cartList.length <= 20) { if (fileRes.data.cartList.length <= 20) {
// 判断是否为导入产品线 // 判断是否为导入产品线
...@@ -775,7 +784,7 @@ $nav-heigth: var(--window-bottom); ...@@ -775,7 +784,7 @@ $nav-heigth: var(--window-bottom);
// align-items: center; // align-items: center;
background-color: #fff; background-color: #fff;
min-height: 100vh; min-height: 100vh;
margin-right: 10rpx; margin-right: 6rpx;
.right-cates-list { .right-cates-list {
width: 80px; width: 80px;
......
src/pages/productLine/productLineDetails.vue
浏览文件 @ 5878f23a
...@@ -193,7 +193,7 @@ onBackPress((options: any) => { ...@@ -193,7 +193,7 @@ onBackPress((options: any) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.container { .container {
box-sizing: border-box; box-sizing: border-box;
margin: 16rpx 32rpx; margin: 16rpx;
// background-color: #fff; // background-color: #fff;
.details { .details {
......
src/pages/profile/address.vue
浏览文件 @ 5878f23a
...@@ -109,13 +109,9 @@ uni.$on('initAddress', () => { ...@@ -109,13 +109,9 @@ uni.$on('initAddress', () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page {
// padding: 0 20rpx;
}
.address { .address {
padding: 40rpx; padding: 40rpx;
margin: 0 10rpx 10rpx; margin: 0 6rpx 6rpx;
background-color: #fff; background-color: #fff;
border-top: 1px solid #f6f6f6; border-top: 1px solid #f6f6f6;
border-radius: 8rpx; border-radius: 8rpx;
......
src/pages/profile/collection.vue
浏览文件 @ 5878f23a
<template> <template>
<u-subsection :list="list" v-model="current" active-color="#ff9900" @change="change" /> <u-subsection :list="list" v-model="current" active-color="#ff9900" @change="change" />
<view v-if="collectList.length !== 0"> <view v-if="collectList.length !== 0">
<view v-if="current === 0" style="margin-top: 6rpx;"> <view v-if="current === 0" style="margin: 6rpx 6rpx 0 6rpx;">
<goodsItem v-for="item in collectList" :key="item.id" :src="item?.picUrl" :name="item.name" <goodsItem v-for="item in collectList" :key="item.id" :src="item?.picUrl" :name="item.name"
:brief="item.brief" :retailPrice="item.retailPrice" :isCollection="true" :brief="item.brief" :retailPrice="item.retailPrice" :isCollection="true"
@tapDelCollection="delCollection(item)" @tap="toGoods(item)" /> @tapDelCollection="delCollection(item)" @tap="toGoods(item)" />
...@@ -145,14 +145,13 @@ init(); ...@@ -145,14 +145,13 @@ init();
<style lang="scss" scoped> <style lang="scss" scoped>
.product-collection { .product-collection {
width: 100%;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
background-color: #fff; background-color: #fff;
padding: 0 30rpx; padding: 0 30rpx;
margin-bottom: 4rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 0 6rpx 4rpx 6rpx;
} }
</style> </style>
src/pages/profile/index.vue
浏览文件 @ 5878f23a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="profile-container"> <view class="profile-container">
<view class="profile-info"> <view class="profile-info">
<view class="profile-avatar"> <view class="profile-avatar">
<image style="width: 220rpx;" src="../../static/hkw.png" mode="scaleToFill" /> <image style="width: 220rpx;" src="../../static/logo.png" mode="scaleToFill" />
</view> </view>
<view class="profile-nickname"> <view class="profile-nickname">
<text>{{ nickName }}</text> <text>{{ nickName }}</text>
...@@ -154,6 +154,8 @@ let toAbout = () => { ...@@ -154,6 +154,8 @@ let toAbout = () => {
<style lang="scss" scoped> <style lang="scss" scoped>
.profile-container { .profile-container {
margin: 0 6rpx;
.profile-info { .profile-info {
height: 200rpx; height: 200rpx;
margin-top: 20rpx; margin-top: 20rpx;
......
src/pages/profile/setting.vue
浏览文件 @ 5878f23a
<template> <template>
<u-cell-group> <view style="margin: 0 6rpx;">
<u-cell-item icon="" title="头像" @click="toSetting" :arrow="false"> <u-cell-group>
<template #right-icon> <u-cell-item icon="" title="头像" :arrow="false">
<u-upload <template #right-icon>
ref="uploadRef" <u-upload ref="uploadRef" :action="action" :file-list="fileList" :header="headers"
:action="action" :custom-btn="true" @on-success="success" width="155" height="155">
:file-list="fileList" <template #addBtn>
:header="headers" <view v-if="!userData.avatar" class="avatar">
:custom-btn="true" <u-icon name="camera" color="#e6e6e6" size="40" class="icon"></u-icon>
@on-success="success" </view>
width="155" <u-image v-else :src="config.baseUrl + userData.avatar" width="120rpx" height="120rpx"
height="155" mode="scaleToFill"></u-image>
> </template>
<template #addBtn> </u-upload>
<view v-if="!userData.avatar" class="avatar"> </template>
<u-icon name="camera" color="#e6e6e6" size="40" class="icon"></u-icon> </u-cell-item>
</view> <u-cell-item icon="" title="姓名" :value="userData.nickName" @click="setName"></u-cell-item>
<u-image <u-cell-item icon="" title="密码设置" :value="userData.pwd" @click="setPwd"></u-cell-item>
v-else <u-cell-item icon="" title="手机号" :value="userData.mobile" @click="setTel"></u-cell-item>
:src="config.baseUrl + userData.avatar" <u-cell-item icon="" title="编码" :value="userData.username"></u-cell-item>
width="120rpx" <u-cell-item icon="" title="邮箱" :value="userData.email" @click="setEmail"></u-cell-item>
height="120rpx" <u-cell-item icon="" title="发货地址" :value="userData.workAddr" :value-style="{ marginLeft: '17%' }"
mode="scaleToFill" @tap="setAddr"></u-cell-item>
></u-image> </u-cell-group>
</template>
</u-upload>
</template>
</u-cell-item>
<u-cell-item icon="" title="姓名" :value="userData.nickName" @click="setName"></u-cell-item>
<u-cell-item icon="" title="密码设置" :value="userData.pwd" @click="setPwd"></u-cell-item>
<u-cell-item icon="" title="手机号" :value="userData.mobile" @click="setTel"></u-cell-item>
<u-cell-item icon="" title="编码" :value="userData.username"></u-cell-item>
<u-cell-item icon="" title="邮箱" :value="userData.email" @click="setEmail"></u-cell-item>
<u-cell-item
icon=""
title="发货地址"
:value="userData.workAddr"
:value-style="{ marginLeft: '17%' }"
@tap="setAddr"
></u-cell-item>
</u-cell-group>
<u-button style="margin-top: 100rpx;" @tap="openModel">退出当前用户</u-button> <u-button style="margin-top: 100rpx;" @tap="openModel">退出当前用户</u-button>
<u-modal </view>
v-model="options.show" <u-modal v-model="options.show" :content="options.content" @confirm="toLogin" show-cancel-button></u-modal>
:content="options.content"
@confirm="toLogin"
show-cancel-button
></u-modal>
<!-- 修改姓名 --> <!-- 修改姓名 -->
<u-popup v-model="options.showPopup" mode="center" width="80%"> <u-popup v-model="options.showPopup" mode="center" width="80%">
...@@ -74,24 +53,12 @@ ...@@ -74,24 +53,12 @@
</view> </view>
<u-form label-width="130"> <u-form label-width="130">
<u-form-item label="新密码:"> <u-form-item label="新密码:">
<u-input <u-input v-model="oldPwd" type="password" :border="true" :password-icon="true" clearable
v-model="oldPwd" placeholder="请输入新密码" />
type="password"
:border="true"
:password-icon="true"
clearable
placeholder="请输入新密码"
/>
</u-form-item> </u-form-item>
<u-form-item label="确认密码:"> <u-form-item label="确认密码:">
<u-input <u-input v-model="newPwd" type="password" :border="true" :password-icon="true" clearable
v-model="newPwd" placeholder="请再次输入密码" />
type="password"
:border="true"
:password-icon="true"
clearable
placeholder="请再次输入密码"
/>
</u-form-item> </u-form-item>
</u-form> </u-form>
<u-button :maxlength="11" type="error" style="margin-top: 8%;" @tap="pwdSave"> <u-button :maxlength="11" type="error" style="margin-top: 8%;" @tap="pwdSave">
...@@ -108,23 +75,11 @@ ...@@ -108,23 +75,11 @@
</view> </view>
<u-form label-width="155"> <u-form label-width="155">
<u-form-item label="选择地址"> <u-form-item label="选择地址">
<u-input <u-input v-model="temporaryAddr" :disabled="true" :border="true" clearable placeholder="请选择地址"
v-model="temporaryAddr" @tap="options.showSelectAddr = true" />
:disabled="true"
:border="true"
clearable
placeholder="请选择地址"
@tap="options.showSelectAddr = true"
/>
</u-form-item> </u-form-item>
<u-form-item label="详细信息"> <u-form-item label="详细信息">
<u-input <u-input v-model="detailAddr" type="textarea" :border="true" clearable placeholder="请输入详细信息" />
v-model="detailAddr"
type="textarea"
:border="true"
clearable
placeholder="请输入详细信息"
/>
</u-form-item> </u-form-item>
</u-form> </u-form>
<u-button :maxlength="11" type="error" style="margin-top: 8%;" @tap="addrSave"> <u-button :maxlength="11" type="error" style="margin-top: 8%;" @tap="addrSave">
...@@ -201,14 +156,14 @@ let setAddr = () => { ...@@ -201,14 +156,14 @@ let setAddr = () => {
}; };
let success = (res: any) => { let success = (res: any) => {
if(res.code === 200) { if (res.code === 200) {
init(); init();
} }
uploadRef.value?.clear() uploadRef.value?.clear()
}; };
let nameSave = () => { let nameSave = () => {
switch(label.value) { switch (label.value) {
case '邮箱:': case '邮箱:':
save(() => { save(() => {
resetEmail({ email: nameValue.value }).then((res: any) => { resetEmail({ email: nameValue.value }).then((res: any) => {
...@@ -232,15 +187,15 @@ let nameSave = () => { ...@@ -232,15 +187,15 @@ let nameSave = () => {
}) })
break; break;
case '手机号:': case '手机号:':
save(() => { save(() => {
resetMobile({ mobile: nameValue.value }).then((res: any) => { resetMobile({ mobile: nameValue.value }).then((res: any) => {
if (res.data.code === 200) { if (res.data.code === 200) {
nameValue.value = ''; nameValue.value = '';
options.showPopup = false; options.showPopup = false;
init(); init();
} }
}); });
}) })
break; break;
} }
...@@ -273,13 +228,13 @@ let addrSave = () => { ...@@ -273,13 +228,13 @@ let addrSave = () => {
title: '请输入收货地址', title: '请输入收货地址',
icon: 'none', icon: 'none',
}); });
let workAddr = temporaryAddr.value + detailAddr.value let workAddr = temporaryAddr.value + detailAddr.value
resetWorkAddr({ workAddr }).then((res: any) => { resetWorkAddr({ workAddr }).then((res: any) => {
if(res.data.code) { if (res.data.code) {
options.showPopupAddr = false options.showPopupAddr = false
init() init()
} }
}) })
} }
let pwdSave = () => { let pwdSave = () => {
...@@ -331,7 +286,7 @@ let init = () => { ...@@ -331,7 +286,7 @@ let init = () => {
let addr = userData.value.workAddr.match(reg) let addr = userData.value.workAddr.match(reg)
temporaryAddr.value = addr[0] + addr[1] + addr[2] temporaryAddr.value = addr[0] + addr[1] + addr[2]
addr.map((item: any, i: number) => { addr.map((item: any, i: number) => {
if(i > 2) { if (i > 2) {
detailAddr.value += item detailAddr.value += item
} }
}) })
......
src/static/favicon.ico
查看替换文件 @ bf7cd660 浏览文件 @ 5878f23a
src/static/favicon.ico

15.0 KB | W: | H:

src/static/favicon.ico

15.0 KB | W: | H:

src/static/favicon.ico
src/static/favicon.ico
src/static/favicon.ico
src/static/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
src/utils/request.ts
浏览文件 @ 5878f23a
...@@ -36,6 +36,8 @@ function request(url: string, method: 'GET' | 'POST' | 'PUT' | 'DELETE', data?: ...@@ -36,6 +36,8 @@ function request(url: string, method: 'GET' | 'POST' | 'PUT' | 'DELETE', data?:
header: header, header: header,
responseType, responseType,
success(res: any) { success(res: any) {
console.log(res);
uni.hideLoading(); uni.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
resolve(res); resolve(res);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论