diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2ca626 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +./unpackage \ No newline at end of file diff --git a/apis/interfaces/employees.js b/apis/interfaces/employees.js index 938e23a..f35fbc3 100644 --- a/apis/interfaces/employees.js +++ b/apis/interfaces/employees.js @@ -55,11 +55,19 @@ const employeesPut = (id, data) => { }) } +// 员工管理工具 手太欠 +const employeesTool = () => { + return request({ + url: 'companies/employees/permission' + }) +} + export { employees, employeesConfig, addEmployees, employeesInfo, employeesDelete, - employeesPut + employeesPut, + employeesTool } diff --git a/apis/interfaces/goods.js b/apis/interfaces/goods.js index 8ffb266..80381a4 100644 --- a/apis/interfaces/goods.js +++ b/apis/interfaces/goods.js @@ -55,7 +55,7 @@ const managesGoodsBurn = data => { }) } -// 商品管理-商品上架 +// 商品管理-商品上架 ********已废弃 const managesGoodsOnsale = id => { return request({ url: 'manages/goods/'+id+'/onsale', @@ -63,7 +63,7 @@ const managesGoodsOnsale = id => { }) } -// 商品管理-商品下架 +// 商品管理-商品下架 ********已废弃 const managesGoodsOffsale = id => { return request({ url: 'manages/goods/'+id+'/offsale', @@ -71,7 +71,7 @@ const managesGoodsOffsale = id => { }) } -// 发布商品前置 manages/goods/create +// 发布商品前置 const managesGoodsCreateBefore = () => { return request({ url: 'manages/goods/create' @@ -102,6 +102,59 @@ const managesCreate = (data) => { }) } +// 商品认证 +const managesGoodsAuth = (id, data) => { + return request({ + url: 'manages/goods/' + id + '/extends', + method:'POST', + data + }) +} + +// 商品删除 +const managesGoodsDelete = id => { + return request({ + url: 'manages/goods/' + id, + method:'DELETE' + }) +} + +// 产品信息 +const managesGoodsEdit = id => { + return request({ + url: 'manages/goods/' + id + }) +} + +// 区块链证书 +const managesChain = (id) => { + return request({ + url: 'mall/goods/'+ id + '/chain' + }) +} + +// 商品认证 +const managesAttestation = (id) => { + return request({ + url: 'mall/goods/'+ id +'/message' + }) +} + +// 商品溯源 +const managesTracedTo = (id) => { + return request({ + url: 'mall/goods/'+ id +'/trace' + }) +} + +// 领取优惠券 +const managesCoupons = (id) => { + return request({ + url: 'coupons/'+ id +'/grant', + method: 'POST' + }) +} + export { mall, list, @@ -114,5 +167,12 @@ export { managesGoodsCreateBefore, managesGoodsCreate, managesCategory, - managesCreate + managesGoodsAuth, + managesGoodsDelete, + managesGoodsEdit, + managesCreate, + managesChain, + managesAttestation, + managesTracedTo, + managesCoupons } diff --git a/components/store-staff/store-staff.vue b/components/store-staff/store-staff.vue index 9f1a4b7..d9e3fc7 100644 --- a/components/store-staff/store-staff.vue +++ b/components/store-staff/store-staff.vue @@ -1,25 +1,61 @@ @@ -27,46 +63,12 @@ export default { name:"store-staff", props:{ - // 店铺统计 - top: { - type: Object, - default: ()=> { - return { - barter_total: 0, - trading_day : 0, - eb_in : 0, - cash_in : 0 - } - } - }, - // 店铺概况 - middle: { - type: Object, - default: ()=> { - return { - visitors : 0, - clinch : 0, - employees: 0, - sale : 0, - hold : 0, - transfer : 0 - } - } - }, - // 店铺订单 - order: { - type: Object, - default: ()=> { - return { - not_shipped : 0, - already_shipped : 0, - not_pick : 0, - already_pick : 0, - after_sale : 0 - } - } - } - } + // 员工数据 + toolList: {}, + }, + created() { + // console.log(this.$props.toolList) + } } @@ -76,7 +78,7 @@ .statistical{ display: flex; background: $text-price; - padding: $padding ($padding/2) $padding*5; + padding: $padding ($padding/2) $padding*2; flex-wrap: wrap; justify-content: space-between; .item{ @@ -95,15 +97,15 @@ } // 店铺概况 .general{ - margin: -$margin*4 $margin 0 $margin; + margin: -$margin*2 $margin 0 $margin; .general-box{ background-color: white; border-radius: $radius/2; display: flex; - padding: $padding $padding/2; + padding: $padding - 20 $padding/2; flex-wrap: wrap; .general-item{ - width: 33.33%; + width: 50%; text-align: center; padding: $padding/2; box-sizing: border-box; @@ -122,27 +124,34 @@ } // 店铺工具 .tool-flex{ - background: white; - border-radius: $radius/2; - padding: $padding/2; - margin: $margin; - display: flex; - flex-wrap: wrap; + margin: $margin*2 $margin $margin; .store-item{ - padding: $padding/2; - text-align: center; - width: 25%; + background: white; + border-radius: $radius/2; + padding: $padding/2; box-sizing: border-box; + margin-bottom: $margin; + display: flex; + position: relative; .icon{ - width: 68rpx; - height: 68rpx; + width: 54rpx; + height: 54rpx; + margin-right: $margin - 15; vertical-align: top; } .title{ - font-size: $title-size-sm; + line-height: 58rpx; + font-size: $title-size-m; color: $text-gray; - padding-top: $padding/3; } + .arrow { + width: 38rpx; + height: 38rpx; + filter: brightness(.9); + position: absolute; + right: $padding - 20; + top: $padding - 6; + } } .order-item{ position: relative; diff --git a/pages.json b/pages.json index 571d3eb..b25e215 100644 --- a/pages.json +++ b/pages.json @@ -416,6 +416,13 @@ "navigationBarTitleText": "创建门店/部门", "navigationBarBackgroundColor": "#FFFFFF" } + }, { + "path": "pages/goods/goodsAuth", + "name": "goodsAuth", + "style": { + "navigationBarTitleText": "商品认证信息", + "navigationBarBackgroundColor": "#FFFFFF" + } } ], "tabBar": { diff --git a/pages/goods/add.vue b/pages/goods/add.vue index c9d0605..477f51c 100644 --- a/pages/goods/add.vue +++ b/pages/goods/add.vue @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + 商品详情（点击预览，长按删除） @@ -72,62 +72,109 @@ - - - - + + + + + + + + + - - + + - - logistic_type 1.快递，2.自提 - + + + {{logisticArr[logisticType].text}} + + + - + - - stores 自提必填 + + 已关联{{stores.length}}家店铺 + + + - - 321321 + + 已选{{services.length}}项服务 - + - - 321321 - + + + {{expiriedAt || '选择服务到期时间'}} + + + + + + + 选择商品服务 + + + + {{item.name}} + {{item.content}} + + + + + + + + + + + + 选择店铺 + + + + {{item.name}} + {{item.address}} + + + + + + + - + + + diff --git a/pages/goods/chain.vue b/pages/goods/chain.vue new file mode 100644 index 0000000..ae76393 --- /dev/null +++ b/pages/goods/chain.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pages/goods/details.vue b/pages/goods/details.vue index 2b9969f..a465b69 100644 --- a/pages/goods/details.vue +++ b/pages/goods/details.vue @@ -45,15 +45,15 @@ 进店 - + 区块链证书 - + 商品认证 - + 商品溯源 @@ -129,7 +129,7 @@ {{item.time.interval}} - + 领取 @@ -166,7 +166,7 @@ + + diff --git a/pages/goods/management.vue b/pages/goods/management.vue index ef7846b..df68e74 100644 --- a/pages/goods/management.vue +++ b/pages/goods/management.vue @@ -2,10 +2,10 @@ - 已上架 - 已下架 - 审核中 - 已驳回 + 已发布 + 待认证 + 审核中 + 已驳回 @@ -14,16 +14,19 @@ diff --git a/pages/goods/tracedTo.vue b/pages/goods/tracedTo.vue new file mode 100644 index 0000000..75e3311 --- /dev/null +++ b/pages/goods/tracedTo.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/pages/property/coupon/couponMore.vue b/pages/order/couponMore.vue similarity index 100% rename from pages/property/coupon/couponMore.vue rename to pages/order/couponMore.vue diff --git a/pages/property/index.vue b/pages/property/index.vue index e5ffb6a..a318f87 100644 --- a/pages/property/index.vue +++ b/pages/property/index.vue @@ -145,6 +145,11 @@ 推广海报 + + + + 临时退出 + 易品新境 beta 1.0.0 diff --git a/pages/store/index.vue b/pages/store/index.vue index 5cc4d16..0f63f2c 100644 --- a/pages/store/index.vue +++ b/pages/store/index.vue @@ -40,7 +40,7 @@ - + @@ -60,6 +60,7 @@