diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index 7cb78cd..a8c4afa 100644
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -17,15 +17,25 @@ const wxPAY = (orderNo) => {
}
const alPAY = (orderNo) => {
- return request({
- url: 'mall/pay/' + orderNo + '/alipay',
- data: {
- type: 'app'
- }
- })
+ return request({
+ url: 'mall/pay/' + orderNo + '/alipay',
+ data: {
+ type: 'app'
+ }
+ })
}
+const dtPAY = (orderNo) => {
+ return request({
+ url: 'mall/pay/' + orderNo + '/account',
+ data: {
+ type: 'app'
+ }
+ })
+}
+
export {
wxPAY,
- alPAY
+ alPAY,
+ dtPAY
}
diff --git a/pages.json b/pages.json
index a682281..de9b122 100644
--- a/pages.json
+++ b/pages.json
@@ -159,7 +159,7 @@
}
},
{
- "path": "pages/refund/index",
+ "path": "pages/refund/list",
"name": "OrderRefund",
"style": {
"navigationBarTitleText": "退换货",
@@ -172,6 +172,20 @@
"navigationBarTitleText": " 选择售后类型",
"navigationBarBackgroundColor": "#FFFFFF"
}
+ }, {
+ "path": "pages/refund/refund_or_exchange_apply",
+ "name": "RefundOrExchangeApply",
+ "style": {
+ "navigationBarTitleText": "退换货申请",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }, {
+ "path": "pages/refund/exchange",
+ "name": "Exchange",
+ "style": {
+ "navigationBarTitleText": "换货",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
}, {
"path": "pages/account/integral",
"name": "AccountIntegral",
diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 7ae8619..0dc912e 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -1,30 +1,33 @@
-
+
diff --git a/pages/refund/index.vue b/pages/refund/list.vue
similarity index 100%
rename from pages/refund/index.vue
rename to pages/refund/list.vue
diff --git a/pages/refund/refund_or_exchange_apply.vue b/pages/refund/refund_or_exchange_apply.vue
new file mode 100644
index 0000000..a99bd98
--- /dev/null
+++ b/pages/refund/refund_or_exchange_apply.vue
@@ -0,0 +1,329 @@
+
+
+
+ 本次售后服务将由DT生态平台为您提供服务
+
+
+
+
+
+ {{goodsInfo.name}}
+ {{goodsInfo.shop.name}}
+ {{goodsInfo.price.price_min || '0'}}
+
+ DT积分
+
+
+
+
+
+
+
+ 申请数量(最多可申请3个)
+
+
+
+
+
+
+
+
+ 申请原因
+ 请选择申请原因
+
+
+
+
+ 商品状态
+
+
+
+
+
+
+ 备注
+
+
+
+
+ 申请{{this.type === 'refund'?'退货':'换货'}}
+
+
+
+
+
+
+
+
diff --git a/pages/store/buy.vue b/pages/store/buy.vue
index f5ffb49..c08bd69 100644
--- a/pages/store/buy.vue
+++ b/pages/store/buy.vue
@@ -120,12 +120,14 @@
address_id : this.address.address_id,
remark : this.remark || ''
}).then(res => {
+ console.log(res);
this.$store.commit('setAddress', {})
this.$Router.replace({
name: 'Pay',
params: {
orderNo: res.order_no,
- price : res.total
+ price : res.total,
+ coins : res.coins,
}
})
})
@@ -268,7 +270,8 @@
}
}
}
- // footer
+
+ // footer
.order-footer{
position: fixed;
bottom: 0;
diff --git a/pages/store/goods.vue b/pages/store/goods.vue
index b5bb0c5..b326cb5 100644
--- a/pages/store/goods.vue
+++ b/pages/store/goods.vue
@@ -19,9 +19,9 @@
{{goods.description}}
- ¥{{goods.price.show}}
+ {{goods.price.show}}DT积分
- 库存量{{goods.sales}}
+ 库存量{{goods.skus[0].stock}}
@@ -33,7 +33,7 @@
商品质量:5.0 服务态度:5.0
- 全部商品 {{goods.shop.count || 0}}
+ 全部商品 {{goods.shop.goods_count || 0}}
@@ -193,8 +193,8 @@
color: $text-price;
font-size: $title-size + 10;
text{
- font-size: 80%;
- margin-right: 10rpx;
+ font-size: 60%;
+ margin-left: 10rpx;
}
}
.sales{
diff --git a/pages/store/index.vue b/pages/store/index.vue
index bd636c3..3abd9c8 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -33,7 +33,7 @@
{{item.name}}
- ¥{{item.price.price_min}}
+ {{item.price.price_min}} DT积分
@@ -257,6 +257,10 @@
font-weight: bold;
color: $text-price;
line-height: 40rpx;
+ text{
+ margin-left: 6rpx;
+ font-size: 70%;
+ }
}
}
}
diff --git a/uni_modules/oct-goods/components/oct-goods/oct-goods.vue b/uni_modules/oct-goods/components/oct-goods/oct-goods.vue
index 50bc370..98e7de8 100644
--- a/uni_modules/oct-goods/components/oct-goods/oct-goods.vue
+++ b/uni_modules/oct-goods/components/oct-goods/oct-goods.vue
@@ -104,21 +104,22 @@
align-items: flex-end;
justify-content: flex-start;
box-sizing: border-box;
- line-height: 40rpx;
+ // line-height: 30rpx;
font-weight: bold;
font-size: 32rpx;
@extend .ellipsis-1;
.price-type{
display: flex;
flex-direction: row;
- align-items: flex-end;
+ align-items: center;
justify-content: space-between;
box-sizing: border-box;
flex: 1;
text{
margin-right: $margin/2;
padding-left: 6rpx;
- font-size: 70%;
+ font-size: 60%;
+ padding-bottom: 6rpx;
}
.kucun{
color: $text-gray;
diff --git a/uni_modules/oct-pay/components/oct-pay/oct-pay.vue b/uni_modules/oct-pay/components/oct-pay/oct-pay.vue
index 3d0d5bf..91e8210 100644
--- a/uni_modules/oct-pay/components/oct-pay/oct-pay.vue
+++ b/uni_modules/oct-pay/components/oct-pay/oct-pay.vue
@@ -2,7 +2,7 @@