diff --git a/api/goods.js b/api/goods.js
index b1754c3..6d1d591 100644
--- a/api/goods.js
+++ b/api/goods.js
@@ -99,13 +99,29 @@ export const getRankingList = (param) => {
}
// 缴费订单列表
-export const orderPaymentList = (data) => {
- return request.post(api.orderPaymentList,data)
+export const orderPaymentList = (param) => {
+ let option={header:{
+ "Content-Type":"application/x-www-form-urlencoded"
+ }}
+ let paramArr = [];
+ for (let key in param) {
+ paramArr.push(key + '=' + param[key])
+ }
+ let paramStr = '?' + paramArr.join('&')
+ return request.post(api.orderPaymentList+paramStr,{},option)
}
// 订单确认支付
-export const userOrderpay = (data) => {
- return request.post(api.userOrderpay,data)
+export const userOrderpay = (param) => {
+ let option={header:{
+ "Content-Type":"application/x-www-form-urlencoded"
+ }}
+ let paramArr = [];
+ for (let key in param) {
+ paramArr.push(key + '=' + param[key])
+ }
+ let paramStr = '?' + paramArr.join('&')
+ return request.post(api.userOrderpay+paramStr,{},option)
}
// 排行榜销售量
export const marketleader = (data) => {
diff --git a/pages.json b/pages.json
index dce29f7..bc1eb21 100644
--- a/pages.json
+++ b/pages.json
@@ -129,7 +129,7 @@
"path": "pages/goods/detail",
"style": {
"navigationBarTitleText": "标的详情",
- "navigationStyle": "custom"
+ "enablePullDownRefresh": true
}
},
{
@@ -400,7 +400,7 @@
"style" :
{
"navigationBarTitleText" : "认证订单结算",
- "enablePullDownRefresh" : true
+ "enablePullDownRefresh" : false
}
},
{
@@ -408,7 +408,7 @@
"style" :
{
"navigationBarTitleText" : "订单结算",
- "enablePullDownRefresh" : true
+ "enablePullDownRefresh" : false
}
},
{
diff --git a/pages/category/economybusiness/list.vue b/pages/category/economybusiness/list.vue
index 76fda78..75ea144 100644
--- a/pages/category/economybusiness/list.vue
+++ b/pages/category/economybusiness/list.vue
@@ -29,7 +29,7 @@
{{ userList.authType }}
-
+
标的数量：{{ total }}
@@ -136,7 +136,7 @@
},
],
targetTab: 1,
- total: 0,
+ total: '',
}
},
@@ -180,7 +180,7 @@
await app.getGoodsList(page.num)
.then(list => {
const curPageLen = list.data.length
- const totalSize = list.data.total
+ const totalSize = list.total
app.mescroll.endBySize(curPageLen, totalSize)
})
.catch(() => app.mescroll.endErr())
@@ -219,18 +219,26 @@
return new Promise((resolve, reject) => {
GoodsApi.nbgoods(param)
.then(result => {
- // 合并新数据
- const newList = app.initList(result.data)
- app.total = result.data.total
- app.list.data = getMoreListData(newList, app.list, pageNo)
- app.userList = newList.data[0].user
- app.userList.stateStr = this.getUserStateStr(app.userList.state)
- app.userList.user_islicode = newList.data[0].user_islicode
- resolve(newList)
+ if (result.data.length > 0) {
+ // 合并新数据
+ const newList = app.initList(result.data)
+ app.total = result.data.total
+ app.list.data = getMoreListData(newList, app.list, pageNo)
+ app.userList = newList.data[0].user
+ app.userList.stateStr = this.getUserStateStr(app.userList.state)
+ app.userList.user_islicode = newList.data[0].user_islicode
+ resolve(newList)
+ } else {
+ app.$error('该店铺信息不存在，即将返回分类页面！')
+ setTimeout(app.jumpReturn,2000)
+ }
})
.catch(reject)
})
},
+ jumpReturn() {
+ this.$navTo('pages/category/index',{curIndex: 3});
+ },
getUserStateStr(state){
let str = ''
if (state == "1" || state == "3" || state == "7" || state == "0") {
@@ -317,8 +325,11 @@
.search-text {
text-align: left;
float: left;
- font-size: 20rpx;
margin-left: 20rpx;
+
+ input {
+ font-size: 20rpx;
+ }
}
.search-text-bu {
margin-right: 20rpx;
@@ -364,7 +375,6 @@
.goods-name {
height: 90rpx;
- float: left;
}
.goods-auth-type {
diff --git a/pages/category/index.vue b/pages/category/index.vue
index fadd875..1d7a600 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -202,9 +202,10 @@
/**
* 生命周期函数--监听页面加载
*/
- onLoad() {
+ onLoad(options) {
// 加载页面数据
this.onRefreshPage()
+ this.curIndex = options.curIndex ? options.curIndex : 0
},
/**
diff --git a/pages/category/tradingentity/list.vue b/pages/category/tradingentity/list.vue
index 76fda78..4e47bc8 100644
--- a/pages/category/tradingentity/list.vue
+++ b/pages/category/tradingentity/list.vue
@@ -29,7 +29,7 @@
{{ userList.authType }}
-
+
标的数量：{{ total }}
@@ -136,7 +136,7 @@
},
],
targetTab: 1,
- total: 0,
+ total: '',
}
},
@@ -180,7 +180,7 @@
await app.getGoodsList(page.num)
.then(list => {
const curPageLen = list.data.length
- const totalSize = list.data.total
+ const totalSize = list.total
app.mescroll.endBySize(curPageLen, totalSize)
})
.catch(() => app.mescroll.endErr())
@@ -220,17 +220,25 @@
GoodsApi.nbgoods(param)
.then(result => {
// 合并新数据
- const newList = app.initList(result.data)
- app.total = result.data.total
- app.list.data = getMoreListData(newList, app.list, pageNo)
- app.userList = newList.data[0].user
- app.userList.stateStr = this.getUserStateStr(app.userList.state)
- app.userList.user_islicode = newList.data[0].user_islicode
- resolve(newList)
+ if (result.data.length > 0) {
+ const newList = app.initList(result.data)
+ app.total = result.data.total
+ app.list.data = getMoreListData(newList, app.list, pageNo)
+ app.userList = newList.data[0].user
+ app.userList.stateStr = this.getUserStateStr(app.userList.state)
+ app.userList.user_islicode = newList.data[0].user_islicode
+ resolve(newList)
+ } else {
+ app.$error('该店铺信息不存在，即将返回分类页面！')
+ setTimeout(app.jumpReturn,2000)
+ }
})
.catch(reject)
})
},
+ jumpReturn() {
+ this.$navTo('pages/category/index',{curIndex: 4});
+ },
getUserStateStr(state){
let str = ''
if (state == "1" || state == "3" || state == "7" || state == "0") {
@@ -317,8 +325,11 @@
.search-text {
text-align: left;
float: left;
- font-size: 20rpx;
margin-left: 20rpx;
+
+ input {
+ font-size: 20rpx;
+ }
}
.search-text-bu {
margin-right: 20rpx;
@@ -364,7 +375,6 @@
.goods-name {
height: 90rpx;
- float: left;
}
.goods-auth-type {
diff --git a/pages/goods/detail.scss b/pages/goods/detail.scss
index fe2e43d..d3c5be7 100644
--- a/pages/goods/detail.scss
+++ b/pages/goods/detail.scss
@@ -169,6 +169,9 @@
}
}
}
+ .item-content-long{
+ margin-bottom: 90rpx;
+ }
}
// 店铺详情
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index db4cb29..2779089 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -44,7 +44,7 @@
-
+
标的名称
{{goods.goods_name}}
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 584a1f3..5daf0a1 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -29,7 +29,7 @@
{{ userList.authType }}
-
+
标的数量：{{ total }}
@@ -131,7 +131,7 @@
},
],
targetTab: 1,
- total: 0,
+ total: '',
}
},
@@ -174,7 +174,7 @@
await app.getGoodsList(page.num)
.then(list => {
const curPageLen = list.data.length
- const totalSize = list.data.total
+ const totalSize = list.total
app.mescroll.endBySize(curPageLen, totalSize)
})
.catch(() => app.mescroll.endErr())
@@ -311,8 +311,11 @@
.search-text {
text-align: left;
float: left;
- font-size: 20rpx;
margin-left: 20rpx;
+
+ input {
+ font-size: 20rpx;
+ }
}
.search-text-bu {
margin-right: 20rpx;
@@ -358,7 +361,6 @@
.goods-name {
height: 90rpx;
- float: left;
}
.goods-auth-type {
diff --git a/pages/goods/payment/orderPayment.vue b/pages/goods/payment/orderPayment.vue
index 79c28ef..8563608 100644
--- a/pages/goods/payment/orderPayment.vue
+++ b/pages/goods/payment/orderPayment.vue
@@ -29,9 +29,8 @@
-
- {{ item.buy_username }}
+ {{ item.order_detail[0].goods_name }}
{{ item.buy_islicode }}
{{ item.price_type}}
{{ item.goods_entrust }}
@@ -76,7 +75,6 @@
import * as GoodsApi from '@/api/goods'
import * as VerifyApi from '@/api/verify'
-import * as Comment from '@/api/order/comment'
import uniTable from "@/uni_modules/uni-table/components/uni-table/uni-table"
import uniTr from "@/uni_modules/uni-table/components/uni-tr/uni-tr"
import uniTh from "@/uni_modules/uni-table/components/uni-th/uni-th"
@@ -176,7 +174,7 @@ export default {
getTableList(pageNo = 1) {
const app = this
let param = {
- user_isli : uni.getStorageSync("accountId"),
+ user_isli : uni.getStorageSync("isliCode"),
user_role : 1,
batchcode : app.batchcode
}
@@ -185,6 +183,7 @@ export default {
if (res.resultCode === "00000000" && res.data.length > 0) {
app.loading = false
app.tableList = res.data
+ app.good_money = res.data[0].total_money
app.handlerTableList()
app.quantitySale(app.tableList[0].order_detail)
} else {
@@ -221,8 +220,6 @@ export default {
item.small_count = app.handlerPrice(order_detail.price)
}
item.money = app.handlerPrice(order_detail.money)
- // 总合计金额
- app.good_money += item.total_money
})
if (this.good_money > 20000) {
@@ -504,7 +501,7 @@ export default {
}
.item-pay-con-bu {
- width: 200rpx;
+ width: 240rpx;
margin-top: 30rpx;
margin-left: 50rpx;
border-radius: 15rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 34f3730..f8e9697 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -205,13 +205,16 @@
app.isLogin = false
uni.clearStorageSync()
resolve(null)
+ setTimeout(app.jumpLogin,2000)
} else {
reject(err)
}
})
})
},
-
+ jumpLogin() {
+ this.$navTo('pages/login/index')
+ },
// 获取当前用户的
getOplogsTodo() {
const app = this