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] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AB=8B=E5=8D=B3=E6=94=AF?=
 =?UTF-8?q?=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 @@
                 <image v-if="item.order_detail[0].goods_image" class="td-image" :src="item.order_detail[0].goods_image"></image>
                 <image v-else-if="img" class="td-image" :src="img"></image>
               </uni-td>
-              <uni-td align="center">{{ item.buy_username }}</uni-td>
+              <uni-td align="center">{{ item.order_detail[0].goods_name }}</uni-td>
               <uni-td align="center">{{ item.buy_islicode }}</uni-td>
               <uni-td align="center">{{ item.price_type}}</uni-td>
               <uni-td align="center">{{ item.goods_entrust }}</uni-td>
@@ -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) {