diff --git a/apis/interfaces/coupon.js b/apis/interfaces/coupon.js
new file mode 100644
index 0000000..2520e5a
--- /dev/null
+++ b/apis/interfaces/coupon.js
@@ -0,0 +1,83 @@
+/**
+ * Web-zdx
+ * moduleName: 优惠券相关
+ */
+
+import request from '../request.js'
+
+// 我的优惠券
+const myCoupon = (data) => {
+ return request({
+ url: 'coupons/user/coupons',
+ method: 'get',
+ data: data
+ })
+}
+
+// 优惠券分组列表
+const getCouponsListById = (id,data) => {
+ return request({
+ url: 'coupons/user/coupons/'+id+'/list',
+ data:data
+ })
+}
+
+// 根据优惠券id获取优惠券的详情信息
+const getCouponsInfoById = (id) => {
+ return request({
+ url: 'coupons/user/coupons/'+id,
+ })
+}
+
+
+// 根据企业id获取企业首页的轮播图列表
+const couponsByCompanyId = (data) => {
+ return request({
+ url: 'coupons',
+ method: 'get',
+ data: data
+ })
+}
+
+// 领取优惠券
+const couponsGrant = (id) => {
+ return request({
+ url: 'coupons/'+id+'/grant',
+ method: 'POST'
+ })
+}
+// 获取优惠券可使用商品
+const getGoodsByGrantId = (data) => {
+ return request({
+ url: 'user/coupons/goods',
+ data: data
+ })
+}
+
+// 使用提货券兑换商品
+const exchangeGoods = (data) => {
+ return request({
+ url: 'user/coupons/exchange',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 获取核销二维码
+const getQrcodeByGrantId = (data) => {
+ return request({
+ url: 'coupons/user/coupons/qrcode',
+ data: data
+ })
+}
+
+export {
+ myCoupon,
+ couponsByCompanyId,
+ couponsGrant,
+ getGoodsByGrantId,
+ exchangeGoods,
+ getCouponsListById,
+ getCouponsInfoById,
+ getQrcodeByGrantId
+}
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 e7bc977..80381a4 100644
--- a/apis/interfaces/goods.js
+++ b/apis/interfaces/goods.js
@@ -125,6 +125,35 @@ const managesGoodsEdit = id => {
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,
@@ -138,8 +167,12 @@ export {
managesGoodsCreateBefore,
managesGoodsCreate,
managesCategory,
- managesCreate,
managesGoodsAuth,
managesGoodsDelete,
- managesGoodsEdit
+ managesGoodsEdit,
+ managesCreate,
+ managesChain,
+ managesAttestation,
+ managesTracedTo,
+ managesCoupons
}
diff --git a/apis/interfaces/numberWeight.js b/apis/interfaces/numberWeight.js
new file mode 100644
index 0000000..da795d3
--- /dev/null
+++ b/apis/interfaces/numberWeight.js
@@ -0,0 +1,140 @@
+/**
+ * Web-zdx
+ * moduleName: 我的数权
+ */
+
+import request from '../request.js'
+
+// 我的数权
+const mallWarrants = (data) => {
+ return request({
+ url: 'mall/warrants',
+ method: 'GET',
+ data: data
+ })
+}
+// 我的数权Id获取数权详情
+const mallWarrantsList = (symbol) => {
+ return request({
+ url: 'mall/warrants/exchange',
+ method: 'GET',
+ data: {
+ symbol:symbol
+ }
+ })
+ }
+// 确认提货
+const mallWarrantsSure = (data) => {
+ return request({
+ url: 'mall/warrants/exchange',
+ method: 'POST',
+ data: data
+ })
+}
+// 我的邮寄订单，我的提货单
+const mallShipmentsPostShop = (apiUrl,data) => {
+ return request({
+ url: apiUrl,
+ method: 'GET',
+ data: data
+ })
+}
+// 根据提货单的no 获取提货单的详情
+const mallShipmentsInfo = (no) => {
+ return request({
+ url: 'mall/shipments/'+no,
+ method: 'GET'
+ })
+}
+// 取消提货单
+const mallShipmentsCancel = (shipmentNo) => {
+ return request({
+ url: 'mall/shipments/'+ shipmentNo+'/cancel',
+ method: 'POST'
+ })
+}
+
+// 签收提货单
+const mallShipmentsSign = (shipmentNo) => {
+ return request({
+ url: 'mall/shipments/'+ shipmentNo+'/sign',
+ method: 'POST'
+ })
+}
+
+// 退货单申请退货
+const mallShipmentsRefund = (data) => {
+ return request({
+ url: 'mall/shipments/'+ data.shipment_no+'/refund',
+ method: 'POST',
+ data:data
+ })
+}
+
+// 退货单申请退货前置条件
+const mallShipmentsRefundInfo = (shipmentNo) => {
+ return request({
+ url: 'mall/shipments/'+ shipmentNo+'/refund',
+ method: 'GET'
+ })
+}
+
+// 查看物流接口
+const mallShipmentsLogistic = (shipmentNo) => {
+ return request({
+ url: 'mall/shipments/'+ shipmentNo+'/logistic',
+ method: 'GET'
+ })
+}
+
+// 我的退货单 mall/refunds
+const mallRefunds = (data) => {
+ return request({
+ url: 'mall/refunds',
+ method: 'GET',
+ data: data
+ })
+}
+
+//退货单详情页
+const mallRefundsInfo = (no) => {
+ return request({
+ url: 'mall/refunds/'+no,
+ method: 'GET'
+ })
+}
+// 确认退货mall/refunds/{refund}/deliver
+const mallRefundsDeliver = (data) => {
+ return request({
+ url: 'mall/refunds/'+data.refund+'/deliver',
+ method: 'POST',
+ data:data
+ })
+}
+
+// 提货单或者服务单生成提货二维码
+const mallWarrantsQrcode = (data) => {
+ return request({
+ url: 'mall/warrants/qrcode',
+ method: 'GET',
+ data:data
+ })
+}
+
+
+export {
+ mallWarrants,
+ mallWarrantsList,
+ mallWarrantsSure,
+ mallShipmentsPostShop,
+ mallShipmentsInfo,
+ mallShipmentsCancel,
+ mallShipmentsSign,
+ mallShipmentsRefund,
+ mallShipmentsRefundInfo,
+ mallShipmentsLogistic,
+ mallRefunds,
+ mallRefundsInfo,
+ mallRefundsDeliver,
+ mallWarrantsQrcode
+}
diff --git a/components/coupon-template/coupon-template-1.vue b/components/coupon-template/coupon-template-1.vue
new file mode 100644
index 0000000..b08367f
--- /dev/null
+++ b/components/coupon-template/coupon-template-1.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+ 新
+
+
+
+
+
+
+ {{item.price}} 元
+ {{item.type.text}}
+
+
+
+
+ {{item.title}}
+ {{item.time.interval}}
+ {{item.price_text}}
+ 剩余{{item.time.expire}}天
+
+
+ 去使用
+
+
+
+
+ 查看全部{{item.coupon_count}}张优惠券
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/goods-template/goods-template.vue b/components/goods-template/goods-template.vue
new file mode 100644
index 0000000..c9cf843
--- /dev/null
+++ b/components/goods-template/goods-template.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+ {{item.name}}
+
+ ￥{{item.price.price_min}}/权证
+ 点击量: {{item.clicks}}
+
+
+
+ 兑换商品
+
+
+
+
+
+
+
+
+
+
diff --git a/components/mall-refunds-template/mall-refunds-template.vue b/components/mall-refunds-template/mall-refunds-template.vue
new file mode 100644
index 0000000..9b623c2
--- /dev/null
+++ b/components/mall-refunds-template/mall-refunds-template.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+ {{item.shop.name}}
+
+ 退货单号： {{item.refund_no}}
+
+ {{item.state.text}}
+
+
+
+
+
+ {{item.goods_sku.goods_name}}
+
+
+ 数权个数 x {{item.qty}}
+
+
+
+
+
+
+
+
+
diff --git a/components/mall-shipments-template/mall-shipments-template.vue b/components/mall-shipments-template/mall-shipments-template.vue
new file mode 100644
index 0000000..d8cfe95
--- /dev/null
+++ b/components/mall-shipments-template/mall-shipments-template.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+ {{item.shop.name}}
+
+ 发货单号： {{item.shipment_no}}
+
+
+ {{item.state_text}}
+
+
+
+
+
+ {{item.goods_sku.goods_name}}
+
+
+ 数权个数 x {{item.qty}}
+ 提货方式 {{item.type_text}}
+
+
+
+
+
+
+
+
diff --git a/components/number-weight-template/number-weight-template.vue b/components/number-weight-template/number-weight-template.vue
new file mode 100644
index 0000000..892dc99
--- /dev/null
+++ b/components/number-weight-template/number-weight-template.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+ {{item.shop.name}}
+
+
+ 区块链地址： {{item.account.addr}} 复制
+
+
+
+
+
+
+
+ {{item.goods.goods_name}}
+
+
+ 数权个数 x {{item.account.balance}}
+
+
+
+
+
+
+
+
diff --git a/components/store-staff/store-staff.vue b/components/store-staff/store-staff.vue
index 33e6b85..d9e3fc7 100644
--- a/components/store-staff/store-staff.vue
+++ b/components/store-staff/store-staff.vue
@@ -1,6 +1,61 @@
- 员工
+
+
+
+
+
+ 扫码核销
+
+
+
+
+
+
+ 商品权证
+
+
+
+
+
+
+ 员工管理
+
+
+
+
+
+
+ 发货单管理
+
+
+
+
+
+
+ 退换货管理
+
+
+
+
+
+
+ 部门/门店
+
+
+
+
+
+
+ 优惠券管理
+
+
+
+
+
+ 营销推广码
+
+
@@ -8,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)
+ }
}
@@ -57,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{
@@ -76,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;
@@ -103,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 8a34f2a..bc9fb9c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,334 +1,421 @@
{
"pages": [{
- "path": "pages/equity/index",
- "name": "Equity",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/market/index",
- "name": "Market",
- "style": {
- "navigationBarTitleText": "转让市场",
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "buttons": [{
- "text": "成交历史",
- "fontSize": "14",
- "width": "80",
- "color": "#555555"
- }]
+ "path": "pages/equity/index",
+ "name": "Equity",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
}
- }
- }, {
- "path": "pages/store/index",
- "name": "Store",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "企业工具",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#e93340"
- }
- }, {
- "path": "pages/property/index",
- "name": "Property",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/property/address/list",
- "name": "AddressList",
- "style": {
- "navigationBarTitleText": "地址管理",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#e93340"
- }
- }, {
- "path": "pages/property/address/create",
- "name": "AddressCreate",
- "style": {
- "navigationBarTitleText": "地址新增",
- "navigationBarTextStyle": "white",
- "navigationBarBackgroundColor": "#e93340"
- }
- }, {
- "path": "pages/goods/details",
- "name": "goodsDetails",
- "style": {
- "navigationBarTitleText": "",
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "type": "transparent",
- "buttons": [{
- "text": "分享",
- "fontSize": "12",
- "color": "#555555"
- }]
- }
- }
- }, {
- "path": "pages/login/login",
- "name": "Login",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#FFFFFF",
- "disableScroll": true
- }
- }, {
- "path": "pages/company/registered",
- "name": "Registered",
- "style": {
- "navigationBarTitleText": ""
- }
- }, {
- "path": "pages/company/prompt",
- "name": "Prompt",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#FFFFFF",
- "disableScroll": true,
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "buttons": [{
- "text": "先逛一逛",
- "fontSize": "14",
- "width": "80",
- "color": "#555555"
- }]
- }
- }
- }, {
- "path": "pages/vip/index",
- "name": "Vip",
- "style": {
- "navigationBarTitleText": "会员",
- "navigationBarBackgroundColor": "#1f1b1c",
- "navigationBarTextStyle": "white",
- "backgroundColor": "#fefaef"
- }
- }, {
- "path": "pages/equity/search",
- "name": "Search",
- "style": {
- "navigationBarTitleText": "搜索"
- }
- }, {
- "path": "pages/market/logs",
- "name": "marketLogs",
- "style": {
- "navigationBarTitleText": "成交历史"
- }
- }, {
- "path": "pages/order/buy",
- "name": "Buy",
- "style": {
- "navigationBarTitleText": "确认订单",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/order/index",
- "name": "Order",
- "style": {
- "navigationBarTitleText": "订单管理"
- }
- }, {
- "path": "pages/order/details",
- "name": "OrderDetails",
- "style": {
- "navigationBarTitleText": "订单详情"
- }
- }, {
- "path": "pages/order/sales",
- "name": "Sales",
- "style": {
- "navigationBarTitleText": "售后"
- }
- }, {
- "path": "pages/goods/lists",
- "name": "goodsList",
- "style": {
- "navigationBarTitleText": "商品列表",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/company/approve",
- "name": "Approve",
- "style": {
- "navigationBarTitleText": ""
- }
- }, {
- "path": "pages/store/visitors",
- "name": "Visitors",
- "style": {
- "navigationBarTitleText": "访客统计",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/store/customer",
- "name": "Customer",
- "style": {
- "navigationBarTitleText": "成交客户",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/store/basics",
- "name": "Basics",
- "style": {
- "navigationBarTitleText": "基础信息",
- "app-plus": {
+ }, {
+ "path": "pages/market/index",
+ "name": "Market",
+ "style": {
+ "navigationBarTitleText": "转让市场",
"titleNView": {
"backgroundColor": "#FFFFFF",
"buttons": [{
- "text": "保存",
- "fontSize": "16",
+ "text": "成交历史",
+ "fontSize": "14",
"width": "80",
- "color": "#e93340"
+ "color": "#555555"
}]
}
}
- }
- }, {
- "path": "pages/employees/list",
- "name": "Employees",
- "style": {
- "navigationBarTitleText": "员工",
- "app-plus": {
- "bounce": "none",
+ }, {
+ "path": "pages/store/index",
+ "name": "Store",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "企业工具",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/index",
+ "name": "Property",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "pages/property/address/list",
+ "name": "AddressList",
+ "style": {
+ "navigationBarTitleText": "地址管理",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/address/create",
+ "name": "AddressCreate",
+ "style": {
+ "navigationBarTitleText": "地址新增",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/numberWeight",
+ "name": "NumberWeight",
+ "style": {
+ "navigationBarTitleText": "我的权证",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ },
+ {
+ "path": "pages/property/order/numberWeightInfo",
+ "name": "NumberWeightInfo",
+ "style": {
+ "navigationBarTitleText": "权证详情",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/mallShipments",
+ "name": "MallShipments",
+ "style": {
+ "navigationBarTitleText": "已经提货",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/logistics",
+ "name": "Orderlogistics",
+ "style": {
+ "navigationBarTitleText": "查看物流",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/mallShipmentsInfo",
+ "name": "MallShipmentsInfo",
+ "style": {
+ "navigationBarTitleText": "提货单详情页面",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/mallRefundsInfo",
+ "name": "MallRefundsInfo",
+ "style": {
+ "navigationBarTitleText": "退货单详情",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ }, {
+ "path": "pages/property/order/mallShipmentsRefund",
+ "name": "MallShipmentsRefund",
+ "style": {
+ "navigationBarTitleText": "申请退货",
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340"
+ }
+ },
+ {
+ "path": "pages/property/coupon/coupon",
+ "name": "CouponList",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340",
+ "navigationBarTitleText": "我的优惠券"
+ }
+ }, {
+ "path": "pages/property/coupon/couponMore",
+ "name": "CouponMoreList",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340",
+ "navigationBarTitleText": "优惠券列表"
+ }
+ }, {
+ "path": "pages/property/coupon/detail",
+ "name": "CouponDetail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#e93340",
+ "navigationBarTitleText": "优惠券详情"
+ }
+ },
+ {
+ "path": "pages/goods/details",
+ "name": "goodsDetails",
+ "style": {
+ "navigationBarTitleText": "",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "type": "transparent",
+ "buttons": [{
+ "text": "分享",
+ "fontSize": "12",
+ "color": "#555555"
+ }]
+ }
+ }
+ }, {
+ "path": "pages/login/login",
+ "name": "Login",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "disableScroll": true
+ }
+ }, {
+ "path": "pages/company/registered",
+ "name": "Registered",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }, {
+ "path": "pages/company/prompt",
+ "name": "Prompt",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "disableScroll": true,
"titleNView": {
"backgroundColor": "#FFFFFF",
"buttons": [{
- "text": "添加",
+ "text": "先逛一逛",
+ "fontSize": "14",
+ "width": "80",
+ "color": "#555555"
+ }]
+ }
+ }
+ }, {
+ "path": "pages/vip/index",
+ "name": "Vip",
+ "style": {
+ "navigationBarTitleText": "会员",
+ "navigationBarBackgroundColor": "#1f1b1c",
+ "navigationBarTextStyle": "white",
+ "backgroundColor": "#fefaef"
+ }
+ }, {
+ "path": "pages/equity/search",
+ "name": "Search",
+ "style": {
+ "navigationBarTitleText": "搜索"
+ }
+ }, {
+ "path": "pages/market/logs",
+ "name": "marketLogs",
+ "style": {
+ "navigationBarTitleText": "成交历史"
+ }
+ }, {
+ "path": "pages/order/buy",
+ "name": "Buy",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/order/index",
+ "name": "Order",
+ "style": {
+ "navigationBarTitleText": "订单管理"
+ }
+ }, {
+ "path": "pages/order/details",
+ "name": "OrderDetails",
+ "style": {
+ "navigationBarTitleText": "订单详情"
+ }
+ }, {
+ "path": "pages/order/sales",
+ "name": "Sales",
+ "style": {
+ "navigationBarTitleText": "售后"
+ }
+ }, {
+ "path": "pages/goods/lists",
+ "name": "goodsList",
+ "style": {
+ "navigationBarTitleText": "商品列表",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/company/approve",
+ "name": "Approve",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }, {
+ "path": "pages/store/visitors",
+ "name": "Visitors",
+ "style": {
+ "navigationBarTitleText": "访客统计",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/store/customer",
+ "name": "Customer",
+ "style": {
+ "navigationBarTitleText": "成交客户",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/store/basics",
+ "name": "Basics",
+ "style": {
+ "navigationBarTitleText": "基础信息",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "buttons": [{
+ "text": "保存",
+ "fontSize": "16",
+ "width": "80",
+ "color": "#e93340"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/employees/list",
+ "name": "Employees",
+ "style": {
+ "navigationBarTitleText": "员工",
+ "app-plus": {
+ "bounce": "none",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "buttons": [{
+ "text": "添加",
+ "fontSize": "14",
+ "width": "80",
+ "color": "#e93340"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/employees/add",
+ "name": "addEmployees",
+ "style": {
+ "navigationBarTitleText": "添加员工",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/goods/management",
+ "name": "GoodsMag",
+ "style": {
+ "navigationBarTitleText": "产品权证",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "buttons": [{
+ "text": "发布",
+ "fontSize": "16",
+ "width": "80",
+ "color": "#e93340"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/goods/addClassify",
+ "name": "addClassify",
+ "style": {
+ "navigationBarTitleText": "选择权证分类",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/goods/add",
+ "name": "GoodsMagAdd",
+ "style": {
+ "navigationBarTitleText": "发布权证",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/coupons/index",
+ "name": "Coupons",
+ "style": {
+ "navigationBarTitleText": "优惠券"
+ }
+ }, {
+ "path": "pages/coupons/management",
+ "name": "CouponsMag",
+ "style": {
+ "navigationBarTitleText": "优惠券管理",
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "buttons": [{
+ "text": "发布",
"fontSize": "14",
"width": "80",
"color": "#e93340"
}]
}
}
- }
- }, {
- "path": "pages/employees/add",
- "name": "addEmployees",
- "style": {
- "navigationBarTitleText": "添加员工",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/goods/management",
- "name": "GoodsMag",
- "style": {
- "navigationBarTitleText": "产品权证",
- "app-plus": {
+ }, {
+ "path": "pages/coupons/add",
+ "name": "couponsAdd",
+ "style": {
+ "navigationBarTitleText": "发布优惠券",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/coupons/selectGoods",
+ "name": "selectGoods",
+ "style": {
+ "navigationBarTitleText": "选择产品",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/coupons/magDetails",
+ "name": "magDetails",
+ "style": {
+ "navigationBarTitleText": "优惠券详情"
+ }
+ }, {
+ "path": "pages/verification/index",
+ "name": "Verification",
+ "style": {
+ "navigationBarTitleText": "扫码验证"
+ }
+ }, {
+ "path": "pages/verification/details",
+ "name": "VerificationDetails",
+ "style": {
+ "navigationBarTitleText": "核销券详情"
+ }
+ }, {
+ "path": "pages/shop/lists",
+ "name": "shopLists",
+ "style": {
+ "navigationBarTitleText": "部门/门店",
+ "navigationBarBackgroundColor": "#FFFFFF",
"titleNView": {
- "backgroundColor": "#FFFFFF",
"buttons": [{
- "text": "发布",
- "fontSize": "16",
+ "text": "创建",
+ "fontSize": "14",
"width": "80",
"color": "#e93340"
}]
}
}
- }
- }, {
- "path": "pages/goods/addClassify",
- "name": "addClassify",
- "style": {
- "navigationBarTitleText": "选择权证分类",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/goods/add",
- "name": "GoodsMagAdd",
- "style": {
- "navigationBarTitleText": "发布权证",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/coupons/index",
- "name": "Coupons",
- "style": {
- "navigationBarTitleText": "优惠券"
- }
- }, {
- "path": "pages/coupons/management",
- "name": "CouponsMag",
- "style": {
- "navigationBarTitleText": "优惠券管理",
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "buttons": [{
- "text": "发布",
- "fontSize": "14",
- "width": "80",
- "color": "#e93340"
- }]
+ }, {
+ "path": "pages/shop/create",
+ "name": "shopCreate",
+ "style": {
+ "navigationBarTitleText": "创建门店/部门",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/goods/goodsAuth",
+ "name": "goodsAuth",
+ "style": {
+ "navigationBarTitleText": "商品认证信息",
+ "navigationBarBackgroundColor": "#FFFFFF"
}
}
- }, {
- "path": "pages/coupons/add",
- "name": "couponsAdd",
- "style": {
- "navigationBarTitleText": "发布优惠券",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/coupons/selectGoods",
- "name": "selectGoods",
- "style": {
- "navigationBarTitleText": "选择产品",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/coupons/magDetails",
- "name": "magDetails",
- "style": {
- "navigationBarTitleText": "优惠券详情"
- }
- }, {
- "path": "pages/verification/index",
- "name": "Verification",
- "style": {
- "navigationBarTitleText": "扫码验证"
- }
- }, {
- "path": "pages/verification/details",
- "name": "VerificationDetails",
- "style": {
- "navigationBarTitleText": "核销券详情"
- }
- }, {
- "path": "pages/shop/lists",
- "name": "shopLists",
- "style": {
- "navigationBarTitleText": "部门/门店",
- "navigationBarBackgroundColor": "#FFFFFF",
- "titleNView": {
- "buttons": [{
- "text": "创建",
- "fontSize": "14",
- "width": "80",
- "color": "#e93340"
- }]
- }
- }
- }, {
- "path": "pages/shop/create",
- "name": "shopCreate",
- "style": {
- "navigationBarTitleText": "创建门店/部门",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }, {
- "path": "pages/goods/goodsAuth",
- "name": "goodsAuth",
- "style": {
- "navigationBarTitleText": "商品认证信息",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }],
+ ],
"tabBar": {
"color": "#bababa",
"selectedColor": "#e93340",
diff --git a/pages/goods/attestation.vue b/pages/goods/attestation.vue
new file mode 100644
index 0000000..c427093
--- /dev/null
+++ b/pages/goods/attestation.vue
@@ -0,0 +1,186 @@
+
+
+ 区块链溯源码：{{info.token}}
+
+
+ 商品认证
+
+
+ {{info.goods.type ===1?'商品名称':'项目名称'}}:
+ {{info.goods.name || '暂无数据'}}
+
+
+ 生产批次：
+ {{info.goods.batch || '暂无数据'}}
+
+
+ 项目分类：
+ {{info.goods.category || '暂无数据'}}
+
+
+
+ 规格：
+ {{info.goods.skus[0].unit || '暂无数据'}}
+
+
+ 数量：
+ {{info.goods.skus[0].stock || '暂无数据'}}
+
+
+ 售价：
+ {{info.goods.skus[0].price || '暂无数据'}}
+
+
+ 生产日期：
+ {{info.goods.producted_at || '暂无数据'}}
+
+
+ {{info.goods.type ===1?'保质期':'有效期'}}：
+ {{info.goods.expiried_at || '暂无数据'}}
+
+
+ 生产厂家：
+ {{info.goods.product_name || '暂无数据'}}
+
+
+ 生产地：
+ {{info.goods.product_address || '暂无数据'}}
+
+
+ 供应商：
+ {{info.goods.skus[0].price || '暂无数据'}}
+
+
+ 经营许可证：
+ {{info.goods.lisence || '暂无数据'}}
+
+
+ 实物照片：
+
+ 暂无数据
+
+
+
+
+
+
+ 企业认证
+
+
+ 企业名称：
+ {{info.certification.name || '暂无数据'}}
+
+
+ 企业地址：
+ {{info.certification.address || '暂无数据'}}
+
+
+ 统一信用代码：
+ {{info.certification.certification.code || '暂无数据'}}
+
+
+ 行业：
+ {{info.certification.industry.title || '暂无数据'}}
+
+
+ 经营范围：
+ {{info.certification.range || '暂无数据'}}
+
+
+ 联系电话：
+
+ 暂无数据
+
+
+ 营业执照：
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+ 易品新境区块链溯源证书
+ 区块链溯源证书：{{info.token}}
+
+ 兹证明：
+
+ {{info.company.name}}，产品符合溯源规范，认证内容如下：特授权其产品在易品新境区块链溯源商城出售！
+
+ 交易哈希: {{info.hash}}
+ 区块链高度: {{info.height}}
+
+ 授权时间: {{info.applied_at}}
+ 有效期至: {{info.ended_at}}
+ 易品新境区块链有限公司
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/goods/details.vue b/pages/goods/details.vue
index 59d0a93..a465b69 100644
--- a/pages/goods/details.vue
+++ b/pages/goods/details.vue
@@ -17,7 +17,7 @@
￥{{goodsObj.price.show}}
累计易货{{goodsObj.sales}}次
-
+
{{item.title}}
@@ -28,47 +28,54 @@
热卖{{goodsObj.name}}
-
-
+
+
-
- {{goodsObj.shop.name}}
-
-
-
- 进店
-
+
+ {{goodsObj.shop.name}}
+
+
+
+ 进店
+
-
+
区块链证书
+
-
+
商品认证
+
-
+
商品溯源
+
-
+
-
+
{{goodsObj.skus[0].goods_name}}
-
+
特价商品不可与优惠券叠加使用
- 易货严选自营･30天无忧退换･不可用券･国内部分地区不可配送
+
+
+ {{item.name}}
+
+
@@ -82,11 +89,84 @@
+
+
+
+
+
+
+
+
+
+
@@ -205,8 +312,8 @@
font-size: 24rpx;
border-radius: 50rpx;
padding: 0 10rpx;
- height: 38rpx;
- line-height: 38rpx;
+ height: 34rpx;
+ line-height: 36rpx;
margin: 6rpx 10rpx 0 0;
}
}
@@ -242,46 +349,70 @@
background-color: #fef2f2;
color: #e1293f;
border-radius: 8rpx;
- border: 2rpx solid #e7e2df;
- padding: $padding - 10;
+ border: 1rpx solid #ffe5e5;
+ padding: $padding - 15;
box-sizing: border-box;
display: flex;
position: relative;
margin-bottom: $margin - 10;
.coupon-list {
- font-size: 24rpx;
+ font-size: 22rpx;
.coupon-label {
display: inline-block;
- border: 2rpx solid #e1293f;
+ border: 1rpx solid #e998a1;
border-radius: 50rpx;
- padding: 4rpx 15rpx;
+ padding: 0 15rpx;
+ height: 34rpx;
+ line-height: 34rpx;
margin-right: $margin - 10;
}
}
.coupon-btn {
position: absolute;
- right: $padding - 10;
- top: $padding - 10;
- font-size: 28rpx;
+ right: $padding - 20;
+ top: 0;
+ line-height: 60rpx;
+ font-size: 24rpx;
display: flex;
font-weight: 700;
.coupon-btn-img {
- width: 30rpx;
- height: 30rpx;
- margin-top: 6rpx;
+ width: 22rpx;
+ height: 22rpx;
+ margin: 20rpx 0 0 4rpx;
}
}
}
}
+
+ // 新增服务
+ .goods-serve {
+ display: flex;
+ .goods-serve-img {
+ width: 36rpx;
+ height: 36rpx;
+ margin-top: 24rpx;
+ }
+ .goods-serve-name {
+ margin: 0 30rpx 0 20rpx;
+ width: calc(100% - 122rpx);
+ text {
+ padding-right: $padding;
+ position: relative;
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+ }
+ }
+
// 店铺
.store{
position: relative;
margin: 0 $margin;
- // background: #F8F8F8;
- background: #999;
+ background: #F8F8F8;
border-radius: $radius/2;
padding: $padding;
- min-height: 160rpx;
+ min-height: 220rpx;
.logo{
position: absolute;
left: $margin;
@@ -311,8 +442,8 @@
background-color: #fd683e;
border-radius: 8rpx 4rpx 4rpx 6rpx;
color: #FFFFFF;
- height: 52rpx;
- line-height: 52rpx;
+ height: 48rpx;
+ line-height: 48rpx;
padding: 0 $padding - 15;
box-sizing: border-box;
display: inline-block;
@@ -351,25 +482,44 @@
&:first-child::before {
border-color: #fae2b9;
}
+ .tooSee-label-img {
+ position: absolute;
+ right: -34rpx;
+ top: 12rpx;
+ width: 28rpx;
+ height: 28rpx;
+ z-index: 9;
+ }
+ &:first-child .tooSee-label-img {
+ filter: brightness(.2)
+ }
}
}
- .title{
+ .store-title{
font-size: $title-size-lg;
font-weight: bold;
line-height: 60rpx;
color: $text-color;
+ margin-bottom: 10rpx;
}
// rate
.openbtn{
position: absolute;
- right: $margin;
- top: $margin * 3;
+ right: $margin - 10;
+ top: $margin * 3.5;
color: #848484;
height: 60rpx;
line-height: 60rpx;
text-align: center;
font-size: $title-size-m;
margin-top: -30rpx;
+ display: flex;
+ .openbtn-img {
+ width: 32rpx;
+ height: 32rpx;
+ filter: brightness(.5);
+ margin-top: 14rpx;
+ }
}
}
// 产品规格
@@ -379,7 +529,7 @@
border-bottom: solid 20rpx #F8F8F8;
.size-item{
position: relative;
- padding: 0 $padding 0 ($padding + 150);
+ padding: 0 $padding 0 ($padding + 100);
line-height: 90rpx;
font-size: $title-size-m;
&::after{
@@ -435,4 +585,131 @@
margin-bottom: calc(constant(safe-area-inset-bottom) / 2);
}
}
+
+ // 优惠券弹出样式
+ .coupons-popup {
+ background-color: #FFFFFF;
+ border-radius: 40rpx 40rpx 0 0;
+ padding: $padding;
+ box-sizing: border-box;
+ .coupons-header {
+ text-align: center;
+ position: relative;
+ margin-bottom: $margin*1.5;
+ .title {
+ font-weight: 700;
+ }
+ .close {
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 2;
+ width: 38rpx;
+ height: 38rpx;
+ }
+ }
+ .coupons-cont {
+ .coupons-name {
+ color: #616065;
+ font-size: 30rpx;
+ }
+ .coupons-list {
+ border: 2rpx solid #d6b9be;
+ border-radius: 10rpx;
+ overflow: hidden;
+ position: relative;
+ margin-top: $margin;
+ .coupons-tips {
+ background-color: #211e17;
+ color: #efe8d8;
+ position: absolute;
+ border-radius: 0 0 20rpx 0;
+ padding: 0 8rpx;
+ height: 34rpx;
+ line-height: 34rpx;
+ left: 0;
+ top: 0;
+ .coupons-tips-text {
+ font-size: 24rpx;
+ transform:scale(.85);
+ display: block;
+ }
+ }
+ .coupons-left {
+ background-color: #fdedee;
+ color: #e1293f;
+ width: 190rpx;
+ text-align: center;
+ padding: $padding - 10 0;
+ border-right: 2rpx dashed #eccdd4;
+ .coupons-number {
+ font-size: 40rpx;
+ font-weight: 600;
+ text {
+ font-size: 24rpx;
+ }
+ &.coupons-small {
+ font-size: 32rpx;
+ padding: 20rpx 0;
+ }
+ }
+ .coupons-full {
+ font-size: 24rpx;
+ }
+ }
+ .coupons-center {
+ position: absolute;
+ width: 100%;
+ left: 0;
+ top: 0;
+ padding: $padding - 10 130rpx 0 220rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+ .coupons-time {
+ font-size: 24rpx;
+ margin-top: 10rpx;
+ color: #514c51;
+ }
+ }
+ .coupons-right {
+ position: absolute;
+ right: 20rpx;
+ top: 36rpx;
+ width: 110rpx;
+ text-align: center;
+ background-color: #e1293f;
+ color: #FFFFFF;
+ border-radius: 80rpx;
+ font-size: 24rpx;
+ line-height: 52rpx;
+ }
+ }
+ }
+ .coupons-true {
+ background-image: linear-gradient(to right, #e1293f, #fd275d);
+ color: #FFFFFF;
+ border-radius: 80rpx;
+ line-height: 84rpx;
+ text-align: center;
+ margin-top: $margin*5;
+ }
+ }
+
+ // 新增服务保障样式
+ .serve-label {
+ margin-top: $margin + 10;
+ font-size: 28rpx;
+ .serve-label-name {
+ font-weight: 700;
+ margin-bottom: $margin - 10;
+ }
+ .serve-label-text {
+ line-height: 44rpx;
+ }
+ }
+
+ .serve-cont {
+ height: 40vh;
+ overflow-y: scroll;
+ }
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 @@
+
+
+ 区块链溯源码：{{info.token}}
+
+
+
+ 商品交易{{item.blockTime}}
+
+
+
+
+
+
+
+
+
+ 名称：
+ {{item.goods.name}}
+
+
+ 规格：
+ {{item.goods.skus[0].unit}}
+
+
+ 购买数量：
+ {{item.amount}}
+
+
+ 区块链高度：
+ {{item.height}}
+
+
+ 交易哈希：
+ {{item.hash}}
+
+ 注释：{{item.note}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4e85958..5d02017 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -47,7 +47,6 @@
mobileNo: this.phone,
code : this.code
}).then(res => {
- console.log(res)
this.$store.commit('setToken', res.token_type + ' ' + res.access_token)
if(!res.is_company){
this.$Router.replace({name: "Registered"})
diff --git a/pages/property/coupon/coupon.vue b/pages/property/coupon/coupon.vue
new file mode 100644
index 0000000..f2cf61a
--- /dev/null
+++ b/pages/property/coupon/coupon.vue
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+ {{item.name}}
+ ({{count.all}})
+ ({{count.services}})
+ ({{count.reductions}})
+ ({{count.exchanges}})
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/coupon/couponMore.vue b/pages/property/coupon/couponMore.vue
new file mode 100644
index 0000000..286ebe2
--- /dev/null
+++ b/pages/property/coupon/couponMore.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/coupon/detail.vue b/pages/property/coupon/detail.vue
new file mode 100644
index 0000000..946afd8
--- /dev/null
+++ b/pages/property/coupon/detail.vue
@@ -0,0 +1,370 @@
+
+
+
+
+ {{info.title}}
+ {{info.price_text}}
+ 有效期:{{info.time.interval}}
+ {{info.way}} {{info.whole}}
+
+
+
+ 可用商品 （多选一）
+
+
+
+ {{item.name}}
+
+ ￥{{item.price}}
+ 立即购买
+
+
+
+
+
+
+ 使用须知
+
+ {{item}}
+
+
+
+ 立即兑换
+
+
+
+
+
+
+
+ 商品兑换码
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/coupon/index.vue b/pages/property/coupon/index.vue
new file mode 100644
index 0000000..9815da1
--- /dev/null
+++ b/pages/property/coupon/index.vue
@@ -0,0 +1,885 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item.subhead}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{it.title}}
+
+ {{it.channel.value === 'part'?'关联商品('+it.goods_count+')件':'全网商品通用'}}
+
+
+
+
+ {{it.price}} 元
+ {{it.title}}
+
+
+
+ {{it.title}}
+
+ {{it.channel.value === 'part'?'关联商品('+it.goods_count+')件':'全网商品通用'}}
+
+
+
+
+ 领取
+
+ 去使用
+
+ 过期
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+ 惊喜多多
+
+
+
+
+ {{item.title}}
+ {{item.price}}元
+ {{item.title}}
+ 满{{item.full}}元可用
+
+
+ 关联商品 ({{item.goods_count>0?item.goods_count:'-'}}) 件
+
+
+
+ 每人限领{{item.my_get_quantity}}/{{item.person_quantity}}张
+
+
+
+ {{item.ratio}}%
+
+
+
+ 立即领取
+ 去使用
+
+
+
+
+
+
+
+
+ 服务券
+
+
+
+
+
+
+
+ {{item.title}}
+ 每人限领{{item.my_get_quantity}}/{{item.person_quantity}}张
+
+
+ {{item.channel.value === 'part'?'关联商品'+item.goods_count+'件选1':'全网商品通用'}}
+
+
+
+
+
+
+ 已抢 {{item.ratio}}%
+
+
+
+ 立即领取
+ 去使用
+
+
+
+
+
+
+ 代金券
+
+
+
+ {{item.price}} 元
+ {{item.type.text}}
+
+
+ {{item.title}}
+ 每人限领{{item.my_get_quantity}}/{{item.person_quantity}}张
+
+ {{item.channel.value === 'part'?'关联商品'+item.goods_count+'件选1':'全网商品通用'}}
+
+
+
+
+
+
+
+ 已抢 {{item.ratio}}%
+
+
+ 立即领取
+ 去使用
+
+
+
+
+
+
+ 提货券
+
+
+
+
+
+
+
+ {{item.title}}
+ 每人限领{{item.my_get_quantity}}/{{item.person_quantity}}张
+
+
+ {{item.channel.value === 'part'?'关联商品'+item.goods_count+'件选1':'全网商品通用'}}
+
+
+
+
+
+
+ 已抢 {{item.ratio}}%
+
+
+ 立即领取
+ 去使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/index.vue b/pages/property/index.vue
index eb5072c..74958f5 100644
--- a/pages/property/index.vue
+++ b/pages/property/index.vue
@@ -58,23 +58,23 @@
-
+
我的权证
-
+
0
权证持有
-
+
0
权证转让
-
+
0
已使用
-
+
0
已提货
@@ -91,7 +91,7 @@
关注企业
-
+
我的优惠券
@@ -144,6 +144,11 @@
推广海报
+
+
+
+ 临时退出
+
易品新境 beta 1.0.0
diff --git a/pages/property/order/logistics.vue b/pages/property/order/logistics.vue
new file mode 100644
index 0000000..67b4833
--- /dev/null
+++ b/pages/property/order/logistics.vue
@@ -0,0 +1,174 @@
+
+
+
+
+ {{express.express_name}} 复制单号
+ 快递编号：{{express.express_no}}
+
+
+ 物流追踪
+
+
+
+
+ {{item.status}} - {{item.context}}
+
+ {{item.time}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/mallRefund.vue b/pages/property/order/mallRefund.vue
new file mode 100644
index 0000000..654ef8c
--- /dev/null
+++ b/pages/property/order/mallRefund.vue
@@ -0,0 +1,326 @@
+
+
+
+
+
+ {{item.name}}
+ {{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+ {{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+ {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+ {{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+ {{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+ {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/mallRefundsInfo.vue b/pages/property/order/mallRefundsInfo.vue
new file mode 100644
index 0000000..5155638
--- /dev/null
+++ b/pages/property/order/mallRefundsInfo.vue
@@ -0,0 +1,720 @@
+
+
+
+
+
+ {{info.state.text}}
+ {{info.state.remark}}
+
+
+
+
+
+
+ {{address.name}} {{address.mobile}}
+
+
+ {{address.full_address}}
+
+
+
+
+
+
+
+
+
+ {{info.shop.name}}
+
+
+ 退后单号： {{info.refund_no}}
+
+
+
+
+
+
+
+ {{info.goods_sku.goods_name}}
+
+
+ 数权个数 x {{info.qty}}
+
+
+
+ 再次购买
+
+ 创建退货时间 {{info.created_at}}
+ 运费 自行承担运费
+ 退货数量
+
+
+ 退货方式快递退回
+
+ 物流公司
+
+
+ 物流单号
+
+
+
+
+
+
+ 查看退货日志
+ 确认退货
+
+
+
+
+ 退货操作进度
+
+
+
+
+ {{item.state_text?item.state_text:'当前状态不明确，需后台返回'}}
+ 退货原因：{{item.title || '无理由'}} ； 退货备注：{{item.remark || '无备注'}}
+
+
+
+ {{item.created_at}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/mallShipments.vue b/pages/property/order/mallShipments.vue
new file mode 100644
index 0000000..de7e733
--- /dev/null
+++ b/pages/property/order/mallShipments.vue
@@ -0,0 +1,486 @@
+
+
+
+
+
+ {{item.name}}
+ {{item.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+ {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+ {{item.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+ {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+
+
+
+
+
+ {{it.name}}
+ {{it.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+ {{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+ {{it.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+ {{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+
+
+
+
+
+ {{it.name}}
+ {{it.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+ {{it.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+ {{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+ {{it.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+ {{it.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+ {{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+
+
+
+
+
+
+
+
+
+ 查看详情
+ 取消订单
+ 确认签收
+ 申请退货
+ 查看物流
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/mallShipmentsInfo.vue b/pages/property/order/mallShipmentsInfo.vue
new file mode 100644
index 0000000..e90e231
--- /dev/null
+++ b/pages/property/order/mallShipmentsInfo.vue
@@ -0,0 +1,667 @@
+
+
+
+
+
+ {{info.state_text}}
+ 您的快递正在坐着火箭朝您飞来
+
+
+
+
+
+
+ {{address.name}} {{address.mobile}}
+
+
+ {{address.full_address}}
+
+
+
+
+
+
+
+
+
+ {{info.shop.name}}
+
+
+ 发货单号： {{info.shipment_no}}
+
+
+
+
+
+
+
+ {{info.goods_sku.goods_name}}
+
+
+ 数权个数 x {{info.qty}}
+
+
+
+ 再次购买
+
+ 创建提货单时间 {{info.created_at}}
+ 运费 免邮
+ 提货数量
+ 提货方式
+
+
+ {{item.name}}
+
+
+
+
+
+ 提货门店
+
+
+
+
+ {{info.store.name}}
+ 营业时间：{{info.store.start_time}}
+ 联系电话：{{info.store.mobile}}
+ 门店地址：{{info.store.address}}
+
+
+
+
+
+
+
+ 取消订单
+ 确认签收
+ 申请退货
+ 查看物流
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/mallShipmentsRefund.vue b/pages/property/order/mallShipmentsRefund.vue
new file mode 100644
index 0000000..0a5cafe
--- /dev/null
+++ b/pages/property/order/mallShipmentsRefund.vue
@@ -0,0 +1,338 @@
+
+
+
+ 因您信誉良好 尊享：退货包运费·7天无理由退货
+
+
+
+
+ 申请类型
+ 申请退货
+
+
+
+
+ 退货原因
+
+ {{title?title:'请选择退货'}}
+
+
+
+
+
+
+ 退货图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注原因
+
+
+ {{remark.length+'/'+300}}
+
+
+
+
+
+ 确认退货
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/numberWeight.vue b/pages/property/order/numberWeight.vue
new file mode 100644
index 0000000..a5e26ac
--- /dev/null
+++ b/pages/property/order/numberWeight.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+ 去提货
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/property/order/numberWeightInfo.vue b/pages/property/order/numberWeightInfo.vue
new file mode 100644
index 0000000..447efe0
--- /dev/null
+++ b/pages/property/order/numberWeightInfo.vue
@@ -0,0 +1,788 @@
+
+
+
+
+
+ 待提货
+ 确认提货后快递会坐着火箭朝您飞来
+
+
+
+
+
+
+ {{address.name}} {{address.mobile}}
+
+
+ {{address.full_address}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{shop.name}}
+
+
+ 区块链地址： {{account.addr}} 复制
+
+
+
+
+
+
+
+ {{goods.goods_name}}
+
+
+ 可提个数 x {{account.balance}}
+
+
+
+ 再次购买
+
+ 运费 免邮
+ 提货数量
+
+
+ 提货方式
+
+
+ {{item.name}}
+
+
+
+
+
+ 提货门店
+
+ {{store_Name!==''?store_Name:'选择门店'}}
+
+
+
+
+
+
+ {{type === '2'?'生成提货二维码':'确认提货'}}
+
+
+
+
+
+ 可提货门店
+
+
+
+
+
+
+
+
+ {{item.name}}
+ 营业时间：{{item.opening_time}}
+ 门店地址：{{item.address}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提货二维码
+
+ 此码请小心保管,丢失或被用不退不换
+
+
+
+
+
+
+
+
+
+
+
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 @@