diff --git a/apis/interfaces/employees.js b/apis/interfaces/employees.js
new file mode 100644
index 0000000..d73fc46
--- /dev/null
+++ b/apis/interfaces/employees.js
@@ -0,0 +1,30 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 企业员工管理
+ */
+
+import { request } from '../index'
+
+// 员工列表
+const employees = () => {
+ return request({
+ url: 'companies/employees'
+ })
+}
+
+// 添加员工
+const addEmployees = (data) => {
+ return request({
+ url: 'companies/employees',
+ method: 'POST',
+ data
+ })
+}
+
+export {
+ employees,
+ addEmployees
+}
diff --git a/apis/interfaces/goods.js b/apis/interfaces/goods.js
index 1400cc3..2400d16 100644
--- a/apis/interfaces/goods.js
+++ b/apis/interfaces/goods.js
@@ -29,8 +29,73 @@ const goods = id => {
})
}
+// 商品管理-商品列表
+const managesGoodsIndex = data => {
+ return request({
+ url: 'manages/goods/index',
+ data:data
+ })
+}
+
+// // 商品管理-商品增发
+// const managesGoodsMint = data => {
+// return request({
+// url: 'manages/goods/'+data.id+'/mint',
+// data:data,
+// method:'POST'
+// })
+// }
+
+// // 商品管理-商品燃烧
+// const managesGoodsBurn = data => {
+// return request({
+// url: 'manages/goods/'+data.id+'/burn',
+// data:data,
+// method:'POST'
+// })
+// }
+
+// // 商品管理-商品上架
+// const managesGoodsOnsale = id => {
+// return request({
+// url: 'manages/goods/'+id+'/onsale',
+// method:'PUT'
+// })
+// }
+
+// // 商品管理-商品下架
+// const managesGoodsOffsale = id => {
+// return request({
+// url: 'manages/goods/'+id+'/offsale',
+// method:'PUT'
+// })
+// }
+
+// // 发布商品前置 manages/goods/create
+// const managesGoodsCreateBefore = () => {
+// return request({
+// url: 'manages/goods/create'
+// })
+// }
+
+// 发布商品
+const managesGoodsCreate = (data) => {
+ return request({
+ url: 'manages/goods',
+ method:'POST',
+ data:data
+ })
+}
+
export {
mall,
list,
- goods
+ goods,
+ managesGoodsIndex,
+ // managesGoodsMint,
+ // managesGoodsBurn,
+ // managesGoodsOnsale,
+ // managesGoodsOffsale,
+ // managesGoodsCreateBefore,
+ managesGoodsCreate
}
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 1191e33..950771f 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -15,8 +15,13 @@
￥{{item.original_price}}
- 已易{{item.sales}}
+
+
+ 已易{{item.sales}}
+
+
+
@@ -92,14 +97,16 @@ export default {
@extend .ellipsis;
}
.content-flex{
+ width: 100%;
display: flex;
justify-content: space-between;
- align-items: flex-end;
padding-top: $padding/2;
.price{
+ width: 50%;
color: $text-price;
font-weight: bold;
font-size: $title-size;
+ @extend .nowrap;
text{
font-size: $title-size-sm;
font-weight: normal;
@@ -108,9 +115,12 @@ export default {
}
}
.sales{
+ width: 50%;
font-size: $title-size-sm;
color: $text-gray;
line-height: 50rpx;
+ text-align: right;
+ @extend .nowrap;
}
}
}
diff --git a/pages.json b/pages.json
index df7d5b1..3f59f4e 100644
--- a/pages.json
+++ b/pages.json
@@ -212,14 +212,28 @@
},{
"path" : "pages/goods/management",
"name" : "GoodsMag",
- "style":{
- "navigationBarTitleText": "商品权证"
+ "style" :{
+ "navigationBarTitleText": "产品权证",
+ "app-plus":{
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "buttons": [
+ {
+ "text": "发布",
+ "fontSize": "16",
+ "width": "80",
+ "color": "#c82626"
+ }
+ ]
+ }
+ }
}
},{
"path" : "pages/goods/add",
"name" : "GoodsMagAdd",
"style":{
- "navigationBarTitleText": "添加权证"
+ "navigationBarTitleText": "发布权证",
+ "navigationBarBackgroundColor":"#FFFFFF"
}
},{
"path" : "pages/coupons/index",
@@ -248,7 +262,7 @@
"path" : "pages/coupons/add",
"name" : "couponsAdd",
"style":{
- "navigationBarTitleText": "添加优惠券",
+ "navigationBarTitleText": "发布优惠券",
"navigationBarBackgroundColor":"#FFFFFF"
}
},{
diff --git a/pages/coupons/magDetails.vue b/pages/coupons/magDetails.vue
index 8060559..34c3031 100644
--- a/pages/coupons/magDetails.vue
+++ b/pages/coupons/magDetails.vue
@@ -48,13 +48,15 @@
- 适用权证
-
-
- {{item.name}}
- ￥{{item.price}}
+
+ 适用权证
+
+
+ {{item.name}}
+ ￥{{item.price}}
+
-
+
使用说明
{{details.description || '-'}}
@@ -83,7 +85,7 @@
};
},
onShow() {
- magCouponsInfo(16).then(res => {
+ magCouponsInfo(this.$Route.query.couponId).then(res => {
this.isLoding = false
this.details = res
})
diff --git a/pages/coupons/management.vue b/pages/coupons/management.vue
index d8a8e23..cb5aea4 100644
--- a/pages/coupons/management.vue
+++ b/pages/coupons/management.vue
@@ -6,25 +6,33 @@
代金券
提货券
-
-
-
-
-
-
- {{item.title}}
- {{item.start_at}}至{{item.end_at}}
-
- {{item.status.text}}
- {{item.type.text}}
- {{item.channel.text}}
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.start_at}}至{{item.end_at}}
+
+ {{item.status.text}}
+ {{item.type.text}}
+ {{item.channel.text}}
+
+
+
+
-
-
-
-
+
+
+
+
+ 暂无相关优惠券
+
+
@@ -44,6 +52,7 @@
methods:{
// 选择类型
onTabs(value){
+ if(value == this.listType) return
this.listType = value
this.getCoupons()
},
@@ -91,6 +100,23 @@
}
}
}
+ // 空提示
+ .list-null{
+ width: 100vw;
+ height: 100vh;
+ padding-bottom: 20vh;
+ box-sizing: border-box;
+ background: white;
+ text-align: center;
+ @extend .vertical;
+ .sub-title{
+ color: $text-gray;
+ font-size: $title-size-m;
+ }
+ .icon{
+ width: 288rpx;
+ }
+ }
// 订单管理
.coupons{
padding-top: 90rpx;
diff --git a/pages/coupons/selectGoods.vue b/pages/coupons/selectGoods.vue
index 368fd65..17c5688 100644
--- a/pages/coupons/selectGoods.vue
+++ b/pages/coupons/selectGoods.vue
@@ -76,7 +76,7 @@
if(val.isSelect) selectArr.push(val.goods_sku_id)
}
this.selectGoods = selectArr
- if(selectArr.length == this.goods.length) this.allSelect = true
+ if(selectArr.length == this.goods.length && this.goods.length != 0) this.allSelect = true
else this.allSelect = false
},
// 添加设置产品
diff --git a/pages/employees/list.vue b/pages/employees/list.vue
index b0932e5..b84b72c 100644
--- a/pages/employees/list.vue
+++ b/pages/employees/list.vue
@@ -40,14 +40,20 @@
+ // 发布
+ .footer{
+ background: white;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ padding: 20rpx $padding;
+ box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+ z-index: 99;
+ .footer-btn{
+ border: none;
+ border-radius: 0;
+ background: $text-price;
+ height: 90rpx;
+ line-height: 90rpx;
+ font-weight: bold;
+ font-size: $title-size;
+ color: white;
+ &::after{
+ border: none;
+ }
+ }
+ }
+
diff --git a/pages/goods/management.vue b/pages/goods/management.vue
index c555c28..9c2eb0f 100644
--- a/pages/goods/management.vue
+++ b/pages/goods/management.vue
@@ -1,22 +1,113 @@
-
-
- 权证管理
-
-
-
+
+
+
+
+ 已上架
+ 已下架
+ 审核中
+ 已驳回
+
+
+
+
+ 库存{{goods.value.stock}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/store/basics.vue b/pages/store/basics.vue
index 4dd4377..db402a1 100644
--- a/pages/store/basics.vue
+++ b/pages/store/basics.vue
@@ -33,12 +33,19 @@
-
+
+
+
+
@@ -56,18 +63,21 @@
-
-
-
- 上传视频封面
-
+
+
+
+
+
+
+ 上传视频封面
+
+