diff --git a/assets/image/icon_adv.webp b/assets/image/icon_adv.webp
deleted file mode 100644
index 4096790..0000000
Binary files a/assets/image/icon_adv.webp and /dev/null differ
diff --git a/pages/index/index.js b/pages/index/index.js
index 0541672..d9568f9 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -64,8 +64,8 @@ Page({
data: { openid: app.globalData.openId },
method: 'POST',
success: function (result) {
- if (result.data.code == 0 && result.data.data.token) {
- app.globalData.token = result.data.data.token
+ if (result.data.code == 0 && result.data.data.userToken) {
+ app.globalData.token = result.data.data.userToken
}
},
complete: function () {
diff --git a/pages/mall/order-offer/index.js b/pages/mall/order-offer/index.js
index 07916cf..7b35f64 100644
--- a/pages/mall/order-offer/index.js
+++ b/pages/mall/order-offer/index.js
@@ -19,7 +19,7 @@ Page({
onLoad: function (options) {
if (options.json) {
var form = JSON.parse(options.json)
- form.payType = form.sellMode == 1 ? 1 : 3
+ form.payType = form.sellMode == 2 ? 3 : 1
// form.totalPrice = float.accAdd(float.accMul(form.unitPrice, form.number), form.dividePrice)
form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2)
form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2)
diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml
index c821b9a..ddeb8a4 100644
--- a/pages/mall/order-offer/index.wxml
+++ b/pages/mall/order-offer/index.wxml
@@ -76,14 +76,14 @@
付款方式
-
+
预付定金
预付款10%,余款货到付款
-
+
全额支付
diff --git a/pages/mall/shops/index.js b/pages/mall/shops/index.js
index 8a37682..0367ada 100644
--- a/pages/mall/shops/index.js
+++ b/pages/mall/shops/index.js
@@ -51,7 +51,7 @@ Page({
}
this.fetchTabList()
this.fetchCheapList()
- this.fetchTaskList()
+ // this.fetchTaskList()
},
onReady: function(){
wx.getSystemInfo({
@@ -119,17 +119,28 @@ Page({
finished: false
})
this.fetchCheapList()
- this.fetchTaskList()
+ // this.fetchTaskList()
},
// 获取特价列表
fetchCheapList: function () {
- request.get('/bxe-mall/product/cheapList', this.data.form).then(result => {
+ if (this.data.requesting || this.data.finished) {
+ return
+ }
+ if(this.data.loading){
+ this.data.requesting = true
+ } else {
+ this.setData({ requesting: true })
+ }
+ request.get('/bxe-mall/product/indexList', this.data.form).then(result => {
//成功回调
if(this.data.form.pageNum == 1){
- this.setData({ loading: false, top: 0, cheapList: result.data })
+ this.setData({ requesting: false, loading: false, finished: true, top: 0, cheapList: result.data })
} else {
- this.setData({ loading: false, cheapList: result.data })
+ this.setData({ requesting: false, loading: false, finished: true, cheapList: result.data })
}
+ }).catch(err => {
+ //异常回调
+ this.setData({ requesting: false, loading: false, finished: true })
})
},
// 获取团购列表
@@ -208,8 +219,8 @@ Page({
data: { openid: app.globalData.openId },
method: 'POST',
success: function (result) {
- if (result.data.code == 0 && result.data.data.token) {
- app.globalData.token = result.data.data.token
+ if (result.data.code == 0 && result.data.data.userToken) {
+ app.globalData.token = result.data.data.userToken
}
},
complete: function () {
diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml
index e5aa496..cbba76a 100644
--- a/pages/mall/shops/index.wxml
+++ b/pages/mall/shops/index.wxml
@@ -103,15 +103,15 @@
-
-
-
- 特价
- 专区
+
+
+
+ {{item.name}}
+
- 限时限量 售完即止
+ {{item.summary}}
-
+
@@ -121,11 +121,11 @@
大厂品牌 质量保证
-
+
-
+
{{finished?'到底啦~':'加载中...'}}
diff --git a/pages/mall/shops/index.wxss b/pages/mall/shops/index.wxss
index 4b65da2..67a540d 100644
--- a/pages/mall/shops/index.wxss
+++ b/pages/mall/shops/index.wxss
@@ -50,7 +50,7 @@
}
.shadow {
- width: 36px;
+ width: 72px;
height: 25px;
font-size: 18px;
font-family: PingFang-SC-Medium, PingFang-SC;
diff --git a/utils/request.js b/utils/request.js
index 86894e7..e1f4b06 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -72,8 +72,8 @@ function loginByOpenId(form, resolve, reject) {
data: form,
method: 'POST',
success: function (result) {
- if (result.data.code == 0 && result.data.data.token) {
- app.globalData.token = result.data.data.token
+ if (result.data.code == 0 && result.data.data.userToken) {
+ app.globalData.token = result.data.data.userToken
wx.showToast({
title: '登录成功',
icon: "none"