diff --git a/java-mall-app-shop-admin/App.vue b/java-mall-app-shop-admin/App.vue
index 1ea7822..426fbf3 100644
--- a/java-mall-app-shop-admin/App.vue
+++ b/java-mall-app-shop-admin/App.vue
@@ -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 秒钟
diff --git a/java-mall-app-shop-admin/api/warehouse/productList.js b/java-mall-app-shop-admin/api/warehouse/productList.js
index 9cec28a..0f90f8d 100644
--- a/java-mall-app-shop-admin/api/warehouse/productList.js
+++ b/java-mall-app-shop-admin/api/warehouse/productList.js
@@ -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,
});
diff --git a/java-mall-app-shop-admin/pages/IM/IM.vue b/java-mall-app-shop-admin/pages/IM/IM.vue
index fe07fbb..256987f 100644
--- a/java-mall-app-shop-admin/pages/IM/IM.vue
+++ b/java-mall-app-shop-admin/pages/IM/IM.vue
@@ -4,9 +4,11 @@
+ class="img"
+ :src="
+ msgInfo.mine.user_avatar || '../../static/images/user-avatar.jpg'
+ "
+ />
{{ msgInfo.mine.user_nickname }}
@@ -74,7 +76,9 @@
退货单号：{{ item.return_id }}
-
-
-
+
+
{{ sfFormatStatus(item.order_state_id) }}
@@ -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,15 +1667,15 @@ export default {
::v-deep .tui-tabs-item {
line-height: 60rpx;
- .tui-tabs-title{
+ .tui-tabs-title {
color: #333 !important;
}
- &.tui__tab_current {
- .tui-tabs-title {
- color: #fe411b !important;
+ &.tui__tab_current {
+ .tui-tabs-title {
+ color: #fe411b !important;
+ }
}
}
- }
}
.sales-return-img-title {
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
new file mode 100644
index 0000000..1ac0981
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
index 9701f2b..928aa47 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
@@ -193,8 +193,8 @@
@@ -409,8 +409,8 @@
>
@@ -505,7 +505,7 @@
{{ this.selectCommodityList.length }}
- 个商品,现在退出将不保留操作几率
+ 个商品,现在退出将不保留操作记录
@@ -245,41 +245,52 @@
}"
>
-
-
-
-
+
-
+
+
+ 保存
+
+
@@ -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,92 +1078,63 @@ 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 {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 40rpx;
- padding: 0 40rpx;
+ .popup-commodity-item {
+ margin-bottom: 20px;
+ background: #fff;
- .u-icon-jianhao {
- ::v-deep.u-icon__icon {
- color: $base-color !important;
- }
+ .popup-commodity-info {
+ .popup-commodity-info-name {
+ font-size: 36rpx;
+ font-weight: bold;
+ padding-left: 24rpx;
+ padding-top: 20rpx;
}
- .commodity-info {
+ .commodity-info-item {
display: flex;
+ align-items: center;
+ padding: 12px;
+ border-bottom: 1px solid #efefef;
- .commodity-img {
- position: relative;
- margin-right: 20rpx;
- width: 60px;
- height: 60px;
- border: 1px solid #ebebeb;
- border-radius: 16rpx;
+ .popup-commodity-info-lable {
+ margin-right: 60px;
}
- .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);
- 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;
- }
+ ::v-deep .input-price {
+ font-weight: bold;
+ color: 0 !important;
+ .u-icon__icon {
+ color: #000 !important;
}
}
}
}
}
}
+
+ .bottom-btn {
+ padding: 40rpx;
+ background: #fff;
+
+ .btn-item {
+ height: 80rpx;
+ background: $base-color;
+ color: #fff;
+
+ &::after {
+ border: none;
+ }
+ }
+ }
}
.commodity-loading {
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue b/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
index 2ba2393..8c28233 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
@@ -41,8 +41,8 @@