diff --git a/apis/index.js b/apis/index.js
index b324613..b45c9bc 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -46,7 +46,7 @@ const request = (parameter, hideLoding = true) => {
data: parameter.data || {},
method: parameter.method || 'GET',
success: res => {
- // console.log(res)
+ console.log(res)
if (res.header.Authorization) {
updateToken('token', res.header.Authorization)
}
diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js
index 1c36234..e6716a9 100644
--- a/apis/interfaces/pay.js
+++ b/apis/interfaces/pay.js
@@ -44,9 +44,23 @@ const dtPAY = (orderNo,password) => {
}
+const collagePAY = (orderNo,password) => {
+ return request({
+ url: 'mall/pay/' + orderNo + '/collage/account',
+ method:'post',
+ data: {
+ type: 'app',
+ transfer_password:password
+ }
+ })
+}
+
+
+
export {
wxPAY,
alPAY,
dtPAY,
payIndex,
+ collagePAY,
}
diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js
index fb2a959..4c349ca 100644
--- a/apis/interfaces/store.js
+++ b/apis/interfaces/store.js
@@ -62,6 +62,21 @@ const buy = data => {
data
})
}
+// 拼团商品确认页面
+const buyPin = data => {
+ return request({
+ url: 'mall/buy/collages',
+ data
+ })
+}
+// 拼团商品确认下单
+const collages = data => {
+ return request({
+ url: 'mall/buy/collages',
+ method: 'POST',
+ data
+ })
+}
// 商品下单
const verify = data => {
@@ -79,6 +94,21 @@ const classify = id => {
})
}
+
+// 拼团成功后展示页面
+const repages = id => {
+ return request({
+ url: 'mall/collages/' + id + '/repages'
+ })
+}
+
+// 商城所有分类
+const categories = id => {
+ return request({
+ url: 'mall/categories/lists'
+ })
+}
+
export {
mall,
goods,
@@ -87,6 +117,10 @@ export {
shopsGoods,
lists,
buy,
+ buyPin,
verify,
- classify
+ collages,
+ repages,
+ classify,
+ categories
}
diff --git a/pages.json b/pages.json
index 3ce26a9..7e1dd74 100644
--- a/pages.json
+++ b/pages.json
@@ -154,9 +154,21 @@
"path": "pages/store/list",
"name": "StoreList",
"style": {
- "navigationBarTitleText": "商品",
+ "navigationBarTitleText": "更多商品",
"navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#fff",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue603",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }]
+ }
+ }
}
},
{
@@ -447,7 +459,7 @@
"color": "#696969",
"type": "none",
"fontSrc": "/static/fonts/iconfont1.ttf",
- "text": "\ue608" //小相机
+ "text": "\ue608"
}]
}
}
@@ -520,16 +532,16 @@
"style": {
"navigationBarTitleText": "公告详情",
"enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#FFFFFF",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "分享",
- "fontSize": "14",
- "width": "60px",
- "color": "#333"
- }]
- }
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "分享",
+ "fontSize": "14",
+ "width": "60px",
+ "color": "#333"
+ }]
+ }
}
}
}, {
@@ -543,40 +555,40 @@
}
,{
"path" : "pages/store/vip/index/index",
- "style" :
- {
- "navigationBarTitleText": "***店铺会员",
- "enablePullDownRefresh": false
- }
+ "style" :
+ {
+ "navigationBarTitleText": "***店铺会员",
+ "enablePullDownRefresh": false
+ }
}
,{
- "path" : "pages/user/my-card/my-card",
+ "path" : "pages/user/my-card/my-card",
"name": "MyCard",
- "style" :
- {
- "navigationBarTitleText": "我的卡券",
- "enablePullDownRefresh": false
- }
+ "style" :
+ {
+ "navigationBarTitleText": "我的卡券",
+ "enablePullDownRefresh": false
+ }
}
,{
"path" : "pages/group-book/success/success",
- "style" :
- {
- "navigationBarTitleText": "拼单更多",
- "enablePullDownRefresh": false
- }
+ "style" :
+ {
+ "navigationBarTitleText": "拼单更多",
+ "enablePullDownRefresh": false
+ }
}
,{
- "path" : "pages/store/vip-list/vip-list",
+ "path" : "pages/store/vip-list/vip-list",
"name": "VipList",
- "style" :
- {
- "navigationBarTitleText": "VIP换购中心",
- "enablePullDownRefresh": false
- }
+ "style" :
+ {
+ "navigationBarTitleText": "VIP换购中心",
+ "enablePullDownRefresh": false
+ }
}
],
"tabBar": {
@@ -617,14 +629,14 @@
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
- "condition" : { //模式配置,仅开发期间生效
- "current": 0, //当前激活的模式(list 的索引项)
+ "condition" : {
+ "current": 0,
"list": [
{
- "name": "", //模式名称
- "path": "", //启动页面,必选
- "query": "" //启动参数,在页面的onLoad函数里面得到
+ "name": "",
+ "path": "",
+ "query": ""
}
]
}
-}
+}
diff --git a/pages/group-book/success/success.vue b/pages/group-book/success/success.vue
index 44cc62a..5624616 100644
--- a/pages/group-book/success/success.vue
+++ b/pages/group-book/success/success.vue
@@ -1,41 +1,95 @@
-
+
- 还差 1 人,赶紧邀请好友来拼单吧
+ 还差 {{surplus}} 人,赶紧邀请好友来拼单吧
邀请好友拼单
去首页逛逛
-
-
-
-
- 订单详情
-
-
- 商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称
-
-
-
+
+
+
+
+
+
+ 订单详情
+
+ {{goodName}}
+
+
+
+
+ 拼单规则
+
+ 人满发货 · 人不满退款 · 只能拼一次
+
+
+