From 4ab094b4d234ce956195de985b0dbc21f7fe2996 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 14:14:11 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/category/economybusiness/list.vue | 34 ++++++++++++++++--------- pages/category/index.vue | 3 ++- pages/category/tradingentity/list.vue | 32 +++++++++++++++-------- pages/goods/list.vue | 10 +++++--- 4 files changed, 51 insertions(+), 28 deletions(-) diff --git a/pages/category/economybusiness/list.vue b/pages/category/economybusiness/list.vue index 76fda78..06960db 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: '', } }, @@ -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 c06d738..f87869f 100644 --- a/pages/category/index.vue +++ b/pages/category/index.vue @@ -201,9 +201,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..5a0454a 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: '', } }, @@ -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/list.vue b/pages/goods/list.vue index 584a1f3..e5b89d6 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: '', } }, @@ -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 { From 304d2c77d0f4067315e50995d62e7ccfa7deaa5f Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 14:36:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 4 ++-- pages/goods/payment/orderPayment.vue | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pages.json b/pages.json index f64d130..fa3edf8 100644 --- a/pages.json +++ b/pages.json @@ -398,7 +398,7 @@ "style" : { "navigationBarTitleText" : "认证订单结算", - "enablePullDownRefresh" : true + "enablePullDownRefresh" : false } }, { @@ -406,7 +406,7 @@ "style" : { "navigationBarTitleText" : "订单结算", - "enablePullDownRefresh" : true + "enablePullDownRefresh" : false } }, { diff --git a/pages/goods/payment/orderPayment.vue b/pages/goods/payment/orderPayment.vue index 79c28ef..3cb361f 100644 --- a/pages/goods/payment/orderPayment.vue +++ b/pages/goods/payment/orderPayment.vue @@ -29,7 +29,6 @@ - {{ item.buy_username }} {{ item.buy_islicode }} @@ -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" @@ -504,7 +502,7 @@ export default { } .item-pay-con-bu { - width: 200rpx; + width: 240rpx; margin-top: 30rpx; margin-left: 50rpx; border-radius: 15rpx; From e921eb8540a9f33afd23dab4d4408e963865c1b4 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 14:58:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/category/economybusiness/list.vue | 2 +- pages/category/tradingentity/list.vue | 2 +- pages/goods/list.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/category/economybusiness/list.vue b/pages/category/economybusiness/list.vue index 06960db..75ea144 100644 --- a/pages/category/economybusiness/list.vue +++ b/pages/category/economybusiness/list.vue @@ -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()) diff --git a/pages/category/tradingentity/list.vue b/pages/category/tradingentity/list.vue index 5a0454a..4e47bc8 100644 --- a/pages/category/tradingentity/list.vue +++ b/pages/category/tradingentity/list.vue @@ -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()) diff --git a/pages/goods/list.vue b/pages/goods/list.vue index e5b89d6..5daf0a1 100644 --- a/pages/goods/list.vue +++ b/pages/goods/list.vue @@ -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()) From 666b277344f524dfac7dc30df4503c31171b7f5f Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 15:23:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 04179eccfcc43d2eac3e017087f272a5acbe36bb Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 17:16:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/goods.js | 24 ++++++++++++++++++++---- pages/goods/payment/orderPayment.vue | 7 +++---- 2 files changed, 23 insertions(+), 8 deletions(-) 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/goods/payment/orderPayment.vue b/pages/goods/payment/orderPayment.vue index 3cb361f..8563608 100644 --- a/pages/goods/payment/orderPayment.vue +++ b/pages/goods/payment/orderPayment.vue @@ -30,7 +30,7 @@ - {{ item.buy_username }} + {{ item.order_detail[0].goods_name }} {{ item.buy_islicode }} {{ item.price_type}} {{ item.goods_entrust }} @@ -174,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 } @@ -183,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 { @@ -219,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) { From 0f2f6656072594097b84414ce95bfffec79610b9 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 17:23:18 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages.json b/pages.json index fa3edf8..1619d38 100644 --- a/pages.json +++ b/pages.json @@ -127,7 +127,7 @@ "path": "pages/goods/detail", "style": { "navigationBarTitleText": "标的详情", - "navigationStyle": "custom" + "enablePullDownRefresh": true } }, { From 863eac69aa9edcff9d600eae74a5666386973fa1 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 17:37:30 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/category/index.vue | 2 +- pages/user/shopcart/index.vue | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pages/category/index.vue b/pages/category/index.vue index f87869f..7098e2d 100644 --- a/pages/category/index.vue +++ b/pages/category/index.vue @@ -246,7 +246,7 @@ // 设置列表数据 await app.getCatList(page.num) .then(list => { - console.log('list',list) + //console.log('list',list) const curPageLen = list.data.length const totalSize = list.total app.mescroll.endBySize(curPageLen, totalSize) diff --git a/pages/user/shopcart/index.vue b/pages/user/shopcart/index.vue index be758d9..70f8e25 100644 --- a/pages/user/shopcart/index.vue +++ b/pages/user/shopcart/index.vue @@ -20,13 +20,13 @@ {{ item.detail.goods_name }} 交易方式：{{ item.detail.goods_entrust?'转让':'授权' }} 购买年限：{{ item.use_years }}年 - 单价：￥{{ item.goods_price }} + 单价：￥{{ item.detail.price_str }} 合计： ￥ - {{ item.use_years * item.goods_price }} + {{ item.total_money_str }} @@ -71,6 +71,7 @@ import { inArray, arrayIntersect, debounce } from '@/utils/util' import { checkLogin, setCartTotalNum, setCartTabBadge } from '@/core/app' import * as UserApi from '@/api/user' +import {formatAmount} from '@/api/order/comment' import EmptyCart from '@/components/empty-cart' import uniIcons from '../../../uni_modules/uni-icons/components/uni-icons/uni-icons' import {createOrder, delShopCart} from "../../../api/user"; @@ -159,6 +160,10 @@ export default { if (result.code == '200') { app.list = result.data app.total = result.data.length + app.list.forEach(item => { + item.total_money_str = formatAmount(item.total_money) + item.detail.price_str = formatAmount(Number(item.detail.price)) + }) } // 清除checkedIds中无效的ID app.onClearInvalidId() From f80285c63bc82df753ce63cb766b60f2fd268692 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq,com> Date: Tue, 2 Apr 2024 17:49:35 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/detail.scss | 3 +++ pages/goods/detail.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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}}