front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 样式问题

Browse Source
This commit is contained in:
qijq 2025-07-19 15:25:11 +08:00
parent a56b365c94
commit beb5c6c2d6
18 changed files with 348 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java-mall-app-shop-admin/App.vue
View File

@ -84,11 +84,11 @@ export default {
data: push_clientid, // 需要复制的内容
success: () => {
// 成功提示框显示 1 秒钟
uni.showToast({
title: "复制成功",
icon: "success",
duration: 1000,
});
// uni.showToast({
// title: "复制成功",
// icon: "success",
// duration: 1000,
// });
},
fail: () => {
// 失败提示框显示 1 秒钟

2
java-mall-app-shop-admin/api/warehouse/productList.js
View File

@ -83,7 +83,7 @@ export function DelectCommodity(params) {
export function GetCommoditSpecification(params) {
return http({
url: "/shop/shop-product-item/items",
method: "post",
method: "get",
params,
baseURL: config.adminApi,
});

17
java-mall-app-shop-admin/pages/IM/IM.vue
View File

@ -5,7 +5,9 @@
<view class="IM-status">
<image
class="img"
:src="msgInfo.mine.user_avatar || '../../static/images/user-avatar.jpg'"
:src="
msgInfo.mine.user_avatar || '../../static/images/user-avatar.jpg'
"
/>
<text>{{ msgInfo.mine.user_nickname }}</text>
<!-- <text class="status-color"></text> -->
@ -74,7 +76,9 @@
<view class="user-img-block">
<image
class="img"
:src="item.avatar || '../../static/images/chat/user-avatar.jpg'"
:src="
item.avatar || '../../static/images/chat/user-avatar.jpg'
"
/>
</view>
<u-badge
@ -220,6 +224,7 @@ export default {
this.currentTab = e.index;
},
skiupMsg(item) {
console.log(item);
this.$store.commit("user/REMOVE_IM_KEY", item.id.toString());
uni.navigateTo({
url: `/pages/IM/IMmsgContent?item=${JSON.stringify(item)}`,
@ -268,14 +273,14 @@ export default {
justify-content: space-between;
align-items: center;
padding: 20rpx 30rpx;
border-bottom: 1px solid rgba(238, 238, 238,0.5);
border-bottom: 1px solid rgba(238, 238, 238, 0.5);
// background: rgba(238, 238, 238,0.5);
.IM-status {
display: flex;
align-items: center;
gap: 10rpx;
.img{
.img {
width: 96rpx;
height: 96rpx;
border-radius: 100%;
@ -304,10 +309,10 @@ export default {
display: flex;
align-items: center;
margin: 30rpx;
border-bottom: 1px solid rgba(238, 238, 238,0.5);
border-bottom: 1px solid rgba(238, 238, 238, 0.5);
padding-bottom: 30rpx;
&:last-child{
&:last-child {
border: none;
}

10
java-mall-app-shop-admin/pages/order/order.vue
View File

@ -641,9 +641,8 @@
</view>
<view class="order-num">退货单号：{{ item.return_id }}</view>
</view>
<view class="rider-info" v-if="item.order_state_id" >
<view class="delivery-time">
</view>
<view class="rider-info" v-if="item.order_state_id">
<view class="delivery-time"></view>
<view class="delivery-status">
{{ sfFormatStatus(item.order_state_id) }}
</view>
@ -1459,6 +1458,9 @@ export default {
this.logoUrl = res.data.store_info.store_logo;
}
},
handerCloseReturnOrderPopup() {
this.showReturnOrderPopup = false;
},
makePhone(phone) {
// #ifdef H5
uni.showToast({
@ -1665,7 +1667,7 @@ export default {
::v-deep .tui-tabs-item {
line-height: 60rpx;
.tui-tabs-title{
.tui-tabs-title {
color: #333 !important;
}
&.tui__tab_current {

121
java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue Normal file
View File

@ -0,0 +1,121 @@
<template>
<view class="addAndEditProduct-container">
<navBar
class="nav-bar"
:statusBar="true"
:border="false"
:fixed="true"
:height="'44px'"
rightWidth="0"
:leftWidth="30"
title="编辑分类"
backgroundColor="#fff"
>
<block slot="left">
<u-icon
name="arrow-left"
color="#000"
size="20"
@click="pageBack()"
></u-icon>
</block>
</navBar>
<view class="addAndEditProduct-content">
<u--form
labelPosition="left"
:model="form"
ref="uForm"
label-width="100"
:rules="rules"
>
<u-form-item label="商品名称" prop="product_name" class="form-item">
<u--input
v-model="form.product_name"
placeholder="有输入商品名称"
border="none"
></u--input>
</u-form-item>
<u-form-item
label="商品分类"
prop="type_category_name"
class="form-item"
@click="hadnerShowClassifyListPopup()"
>
<u--input
v-model="form.type_category_name"
disabled
disabledColor="#ffffff"
placeholder="请选择商品分类"
border="none"
@click="hideKeyboard()"
></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
</u--form>
</view>
<u-toast ref="uToast"></u-toast>
</view>
</template>
<script>
import navBar from "@/components/uni-nav-bar/uni-nav-bar";
export default {
name: "addAndEditProduct",
props: {
productItem: {
type: Object,
default: {},
},
},
components: {
navBar,
},
data() {
return {
form: {
product_video: "",
product_buy_limit: undefined,
product_sale_time: "",
product_number: "",
product_name: "", // 商品名称
kind_id: 1201,
product_inventory_lock: 1001,
payment_type_id: 0,
product_state_id: 1001,
contract_type_ids: [],
product_transport_id: [],
transport_type_id: undefined,
store_category_ids: [],
product_service: "",
product_param: "",
product_detail: "",
product_id: undefined,
product_tips: "",
voucher_activity_id: "",
category_id: "",
category_name: "",
},
};
},
computed: {},
onLoad: function (options) {},
onReady() {},
onShow() {
// this.classifyItem = form;
},
mounted() {},
methods: {
pageBack() {
this.$emit("pageBack");
},
},
};
</script>
<style lang="scss" scoped>
@import "@/styles/variables.scss";
.addAndEditProduct-container {
}
</style>

24
java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
View File

@ -193,8 +193,8 @@
<u--image
:src="item.product_image"
radius="8"
width="68px"
height="68px"
width="60px"
height="60px"
@click="handlerShowImg(item.product_image)"
></u--image>
</view>
@ -409,8 +409,8 @@
>
<u-icon
class="u-icon-jianhao"
custom-prefix="custom-icon-jianhao custom-icon"
size="20"
custom-prefix="custom-icon-jianhao_fangxing custom-icon"
size="22"
></u-icon>
</view>
</view>
@ -505,7 +505,7 @@
<text style="margin: 0 6rx">
{{ this.selectCommodityList.length }}
</text>
个商品,现在退出将不保留操作几率
个商品,现在退出将不保留操作记录
</view>
<view class="popup-btn-list">
<u-button
@ -1654,8 +1654,8 @@ export default {
.commodity-img {
position: relative;
margin-right: 20rpx;
width: 68px;
height: 68px;
width: 60px;
height: 60px;
border: 1px solid #ebebeb;
border-radius: 16rpx;
}
@ -1684,8 +1684,8 @@ export default {
justify-content: space-between;
.commodity-name {
font-weight: bold;
font-size: 36rpx;
font-weight: 700;
font-size: 32rpx;
word-break: break-all; /* 允许在任意字符间断行 */
overflow-wrap: break-word; /* 优先在单词间断行 */
display: -webkit-box;
@ -1696,9 +1696,9 @@ export default {
}
.commodity-inventory {
font-size: 28rpx;
font-size: 24rpx;
color: #626262;
margin: 6rpx 0;
margin: 20rpx 0;
}
.commodity-price {
@ -1940,7 +1940,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {

2
java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
View File

@ -759,7 +759,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {

12
java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
View File

@ -761,7 +761,7 @@ export default {
},
skipuBrandList() {
uni.navigateTo({
url: "test?id=1&name=uniapp",
url: "/pages/warehouse/manage/typeManagement",
});
},
},
@ -956,6 +956,10 @@ export default {
}
.commodity-type-popup {
::v-deep.u-fade-enter-to {
z-index: 10079 !important;
}
.commodity-type-popup-content {
.commodity-type-popup-title {
padding: 40rpx;
@ -1009,10 +1013,12 @@ export default {
.add-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
font-size: 36rpx;
}
.add-tips {
padding: 0 24rpx;
text-align: center;
color: red;
}
@ -1063,7 +1069,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {

2
java-mall-app-shop-admin/pages/warehouse/manage/components/tree/style.css
View File

@ -37,7 +37,7 @@
.tki-tree-bar {
background-color: #fff;
height: 62px;
height: 65px;
padding-left: 20rpx;
padding-right: 20rpx;
display: flex;

14
java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
View File

@ -117,7 +117,7 @@
<view v-else class="icon-list">
<u-icon
class="u-icon-jianhao"
custom-prefix="custom-icon-jianhao custom-icon"
custom-prefix="custom-icon-jianhao_fangxing custom-icon"
size="20"
@click="handerShowDelectPopup(item)"
></u-icon>
@ -743,6 +743,11 @@ export default {
this.showCommodityTypePopup = false;
},
skipuBrandList() {
uni.navigateTo({
url: "/pages/warehouse/manage/typeManagement",
});
},
},
};
</script>
@ -888,7 +893,8 @@ export default {
.add-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
font-size: 36rpx;
}
.tips {
@ -959,7 +965,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {
@ -1025,7 +1031,7 @@ export default {
.u-icon-jianhao {
margin-right: 60rpx;
::v-deep.custom-icon-jianhao {
::v-deep.custom-icon-jianhao_fangxing {
color: $base-color !important;
}
}

196
java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
View File

@ -123,8 +123,8 @@
<u--image
:src="item.product_image"
radius="8"
width="68px"
height="68px"
width="60px"
height="60px"
></u--image>
</view>
<view class="commodity-info-box">
@ -245,41 +245,52 @@
}"
>
<view
class="commodity-item"
class="popup-commodity-item"
v-for="(item, index) of currSpecificationList"
:key="index"
>
<view class="commodity-info">
<view class="commodity-info-box">
<!-- <view class="commodity-name">
{{ item.product_name }}
</view> -->
<!-- <view class="commodity-price">
<view class="popup-commodity-info">
<view class="popup-commodity-info-name">
{{ item.item_name }}
</view>
<view class="commodity-info-item">
<view class="popup-commodity-info-lable">价格</view>
<u--input
placeholder="请输入内容"
class="input-price"
:placeholder="String(item.item_unit_price)"
border="surround"
v-model="value"
@change="change"
v-model="item.item_unit_price_2"
prefixIcon="¥"
type="number"
@change="haderPopupPriceInputChange($event, index)"
></u--input>
</view>
<view class="commodity-inventory">
库存{{ item.itemQuantity }}
</view> -->
<view class="commodity-info-item">
<view class="popup-commodity-info-lable">库存</view>
<u--input
class="input-price"
:placeholder="String(item.item_quantity)"
border="surround"
type="number"
v-model="item.item_quantity_2"
@change="haderPopupRepertoryInputChange($event, index)"
></u--input>
</view>
</view>
<!-- <view
class="icon-content"
@click="delectSelectCommodity(item, index)"
>
<u-icon
class="u-icon-jianhao"
custom-prefix="custom-icon-jianhao custom-icon"
size="20"
></u-icon>
</view> -->
</view>
</scroll-view>
</view>
<view class="bottom-btn">
<u-button
class="btn-item"
:hairline="true"
:plain="true"
shape="circle"
@click="handerSave"
>
保存
</u-button>
</view>
</view>
</u-popup>
</view>
@ -377,6 +388,9 @@ export default {
//#ifdef H5
top = 44;
//#endif
//#ifdef APP-PLUS
top = 70;
//#endif
this.height = res.windowHeight - uni.upx2px(header);
this.top = top + uni.upx2px(header);
},
@ -423,8 +437,8 @@ export default {
let res = await GetCommoditSpecification(params);
if (res && res.status == 200) {
this.currSpecificationList = res.data;
this.showBottomPopup = true;
this.currSpecificationList = res.data.items;
}
},
async getProductCategoryTree() {
@ -632,6 +646,13 @@ export default {
url: "../../news/search/search",
});
},
haderPopupPriceInputChange(e, index) {
this.currSpecificationList[index].item_unit_price_2 = e;
},
haderPopupRepertoryInputChange(e, index) {
this.currSpecificationList[index].item_quantity_2 = e;
},
handerSave() {},
skipuBatch() {
uni.navigateTo({
url: "/pages/warehouse/manage/batch",
@ -920,8 +941,8 @@ export default {
.commodity-img {
position: relative;
margin-right: 20rpx;
width: 68px;
height: 68px;
width: 60px;
height: 60px;
border: 1px solid #ebebeb;
border-radius: 16rpx;
}
@ -950,8 +971,8 @@ export default {
justify-content: space-between;
.commodity-name {
font-weight: bold;
font-size: 36rpx;
font-weight: 700;
font-size: 32rpx;
word-break: break-all; /* 允许在任意字符间断行 */
overflow-wrap: break-word; /* 优先在单词间断行 */
display: -webkit-box;
@ -962,8 +983,9 @@ export default {
}
.commodity-inventory {
font-size: 28rpx;
font-size: 24rpx;
color: #626262;
margin: 20rpx 0;
}
.commodity-price {
@ -1046,6 +1068,7 @@ export default {
::v-deep.u-popup__content {
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
background: #f8f8f8;
}
.productList-price-popup-content {
@ -1055,89 +1078,60 @@ export default {
padding: 40rpx;
text-align: center;
font-weight: 500;
background: #fff;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
}
.select-commodity-price-list {
padding: 20rpx;
background: #f8f8f8;
}
.commodity-item {
.popup-commodity-item {
margin-bottom: 20px;
background: #fff;
.popup-commodity-info {
.popup-commodity-info-name {
font-size: 36rpx;
font-weight: bold;
padding-left: 24rpx;
padding-top: 20rpx;
}
.commodity-info-item {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 40rpx;
padding: 0 40rpx;
padding: 12px;
border-bottom: 1px solid #efefef;
.u-icon-jianhao {
::v-deep.u-icon__icon {
color: $base-color !important;
.popup-commodity-info-lable {
margin-right: 60px;
}
::v-deep .input-price {
font-weight: bold;
color: 0 !important;
.u-icon__icon {
color: #000 !important;
}
}
}
}
}
}
.commodity-info {
display: flex;
.bottom-btn {
padding: 40rpx;
background: #fff;
.commodity-img {
position: relative;
margin-right: 20rpx;
width: 60px;
height: 60px;
border: 1px solid #ebebeb;
border-radius: 16rpx;
}
.commodity-img-sold-out {
&::before {
position: absolute;
bottom: 0;
width: 100%;
height: 20px;
line-height: 20px;
content: "已下架";
text-align: center;
background: rgba(0, 0, 0, 0.6);
.btn-item {
height: 80rpx;
background: $base-color;
color: #fff;
z-index: 99;
font-size: 14px;
border-bottom-left-radius: 16rpx;
border-bottom-right-radius: 16rpx;
}
}
.commodity-info-box {
display: flex;
flex-flow: column;
justify-content: space-between;
.commodity-name {
font-weight: bold;
font-size: 34rpx;
word-break: break-all; /* 允许在任意字符间断行 */
overflow-wrap: break-word; /* 优先在单词间断行 */
display: -webkit-box;
-webkit-line-clamp: 2; /* 限制最多2行 */
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
.commodity-inventory {
margin: 6rpx 0;
font-size: 25rpx;
color: #626262;
}
.commodity-price {
font-size: 32rpx;
font-weight: bold;
color: #ea3938;
.currency {
margin-right: 4px;
font-size: 24rpx;
}
}
}
}
&::after {
border: none;
}
}
}

15
java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
View File

@ -41,8 +41,8 @@
<view class="specification-btn-content">
<u-icon
class="u-icon-jianhao"
custom-prefix="custom-icon-jianhao custom-icon"
size="20"
custom-prefix="custom-icon-jianhao_fangxing custom-icon"
size="24"
@click="handerShowDelectPopup(item)"
></u-icon>
<u-icon
@ -542,11 +542,11 @@ export default {
.specification-info {
.specification-name {
font-size: 17px;
font-weight: 600;
font-weight: bold;
}
.specification-classify {
font-size: 30rpx;
font-size: 28rpx;
margin: 16rpx 0;
color: #606060;
}
@ -563,7 +563,7 @@ export default {
width: 220rpx;
.u-icon-jianhao {
::v-deep.custom-icon-jianhao {
::v-deep.custom-icon-jianhao_fangxing {
color: $base-color !important;
}
}
@ -586,7 +586,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {
@ -633,7 +633,8 @@ export default {
.add-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
font-size: 36rpx;
}
.u-form {

52
java-mall-app-shop-admin/pages/warehouse/manage/typeManagement.vue
View File

@ -30,8 +30,8 @@
<view class="specification-btn-content">
<u-icon
class="u-icon-jianhao"
custom-prefix="custom-icon-jianhao custom-icon"
size="20"
custom-prefix="custom-icon-jianhao_fangxing custom-icon"
size="24"
@click="handerShowDelectPopup(item)"
></u-icon>
<u-icon
@ -79,6 +79,7 @@
zIndex="10077"
:show="showAddAndEditPopup"
mode="center"
@close="handerCloseAddAndEditPopup"
>
<view class="add-popup-content">
<view class="add-popup-title">
@ -145,7 +146,7 @@
:hairline="true"
:plain="true"
shape="circle"
@click="showAddAndEditPopup = false"
@click="handerCloseAddAndEditPopup"
>
取消
</u-button>
@ -171,8 +172,19 @@
>
<view class="specification-popup-content">
<view class="specification-popup-title">选择规格</view>
<view class="no-data" v-if="allSpecificationList.length <= 0">
<view class="no-data-bg"></view>
<view class="no-data-tips" @click="skipuSpecification">
暂无商品规格，点击马上添加
<u-icon
style="display: inline-block"
name="arrow-right"
color="red"
></u-icon>
</view>
</view>
<scroll-view
v-if="typeManageList.length > 0"
v-if="allSpecificationList.length > 0"
scroll-y
class="specification-type-search-scroll"
:show-scrollbar="false"
@ -632,6 +644,11 @@ export default {
this.form.type_category_id = list[0].id;
}
},
skipuSpecification() {
uni.navigateTo({
url: "/pages/warehouse/manage/specification",
});
},
},
};
</script>
@ -657,6 +674,7 @@ export default {
.typeManagement-item {
display: flex;
justify-content: space-around;
align-items: center;
margin: 72rpx 0;
.typeManagement-info {
@ -679,10 +697,11 @@ export default {
.specification-btn-content {
display: flex;
justify-content: space-around;
align-items: center;
width: 220rpx;
.u-icon-jianhao {
::v-deep.custom-icon-jianhao {
::v-deep.custom-icon-jianhao_fangxing {
color: $base-color !important;
}
}
@ -718,7 +737,7 @@ export default {
}
.specification-name {
padding: 12rpx 36rpx;
padding: 24rpx 36rpx;
background: #f8f8f8;
color: #888888;
}
@ -755,6 +774,22 @@ export default {
}
}
.no-data {
.no-data-bg {
margin: 15% auto;
margin-bottom: 0;
width: 300rpx;
height: 200rpx;
background-image: url("../../../static/warehouse/no-classify.png");
background-size: 100%;
}
.no-data-tips {
margin: 80rpx auto;
color: red;
text-align: center;
}
}
.affirm-popup {
::v-deep.u-popup__content {
border-radius: 16rpx;
@ -770,7 +805,7 @@ export default {
.affirm-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
}
.affirm-popup-tips {
@ -817,7 +852,8 @@ export default {
.add-popup-title {
padding: 40rpx;
text-align: center;
font-weight: 500;
font-weight: bold;
font-size: 36rpx;
}
.u-form {

4
java-mall-app-shop-admin/static/font/iconfont.css
View File

@ -21,6 +21,10 @@
-moz-osx-font-smoothing: grayscale;
}
.custom-icon-jianhao_fangxing:before {
content: "\e728";
}
.custom-icon-jiahao:before {
content: "\e640";
}

BIN
java-mall-app-shop-admin/static/font/iconfont.ttf
View File

Binary file not shown.

BIN
java-mall-app-shop-admin/static/font/iconfont.woff
View File

Binary file not shown.

BIN
java-mall-app-shop-admin/static/font/iconfont.woff2
View File

Binary file not shown.

13
java-mall-app-shop-admin/store/modules/user.js
View File

@ -121,8 +121,13 @@ const actions = {
// #endif
params.cid = "ae9c4517a4ae17ea33570839a0f5fdba";
params.osType = 1;
const res = await GetAccountLogin(params);
console.log(res);
if (res && res.status == 200) {
let mobile = "";
@ -132,14 +137,16 @@ const actions = {
const userInfo = res.data;
uni.setStorageSync("uid", res.data.user_id);
uni.setStorageSync("ukey", res.data.key);
uni.setStorageSync("userInfo", res.data);
await dispatch("checkAccountIsPass", {
mobile: mobile,
userInfo: userInfo,
});
uni.setStorageSync("uid", res.data.user_id);
uni.setStorageSync("ukey", res.data.key);
uni.setStorageSync("userInfo", res.data);
await dispatch("connectSocket", res.data);
}
},
async GetLogin({ dispatch }, params) {