From d68b24445a8e38a4eba93354446a67e95e6e316f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 13 Aug 2023 20:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=91=201=E3=80=81=E6=8E=A5=E5=85=A5=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E5=8F=B7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/cashier/index.vue    |  2 +-
 pages/order_details/index.vue    | 42 ++++++++++++++------------------
 pages/users/order_list/index.vue |  1 +
 utils/request.js                 |  6 ++---
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/pages/goods/cashier/index.vue b/pages/goods/cashier/index.vue
index 1d8f98e7..e394cc19 100644
--- a/pages/goods/cashier/index.vue
+++ b/pages/goods/cashier/index.vue
@@ -155,7 +155,7 @@
 				});
 				PayOrderApi.submitOrder({
           id: this.orderId,
-          channelCode1: channelCode,
+          channelCode: channelCode,
           returnUrl: this.getPayReturnUrl(),
           channelExtras: { // TODO 芋艿：等登录接入完成，需要改成动态读取
             // openid: "ockUAwIZ-0OeMZl9ogcZ4ILrGba0" // wx_pub 微信公众号支付的 openid
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index b036a19b..ad22a762 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -201,26 +201,19 @@
 				</view>
 
         <!-- 配送信息 -->
-        <view v-if="orderInfo.status !== 0">
-					<view class='wrapper borRadius14' v-if='orderInfo.deliveryType === 1'>
+        <view v-if="orderInfo.logisticsId !== undefined">
+					<view class='wrapper borRadius14' v-if='orderInfo.logisticsId > 0'>
 						<view class='item acea-row row-between'>
 							<view>配送方式：</view>
 							<view class='conter'>发货</view>
 						</view>
-            <!-- TODO 芋艿：这里的字段对应 -->
 						<view class='item acea-row row-between'>
 							<view>快递公司：</view>
-							<view class='conter'>{{ orderInfo.deliveryName || ''}}</view>
+							<view class='conter'>{{ orderInfo.logisticsName || ''}}</view>
 						</view>
 						<view class='item acea-row row-between'>
 							<view>快递号：</view>
-							<view class='conter'>{{ orderInfo.deliveryId || ''}}</view>
-						</view>
-					</view>
-					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType === 2'>
-						<view class='item acea-row row-between'>
-							<view>配送方式：</view>
-							<view class='conter'>门店自提</view>
+							<view class='conter'>{{ orderInfo.logisticsNo || ''}}</view>
 						</view>
 					</view>
 					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType === 0'>
@@ -438,20 +431,21 @@
           title: '确认收货',
           content: '为保障权益，请收到货确认无误后，再确认收货',
           success: (res) => {
-            if (res.confirm) {
-              OrderApi.takeOrder(this.orderInfo.id).then(res => {
-                return this.$util.Tips({
-                  title: '收货成功',
-                  icon: 'success'
-                }, () => {
-                  this.getOrderInfo();
-                });
-              }).catch(err => {
-                return this.$util.Tips({
-                  title: err
-                });
-              })
+            if (!res.confirm) {
+              return
             }
+            OrderApi.takeOrder(this.orderInfo.id).then(res => {
+              return this.$util.Tips({
+                title: '收货成功',
+                icon: 'success'
+              }, () => {
+                this.getOrderInfo();
+              });
+            }).catch(err => {
+              return this.$util.Tips({
+                title: err
+              });
+            })
           }
         })
       },
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index fdc1af60..08fd7ad3 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -46,6 +46,7 @@
               <view class='font-color'>{{order.orderStatus}}</view>
               <view v-if="order.status === 0" class="font-color">待付款</view>
               <view v-else-if="order.status === 10 && order.deliveryType === 1" class="font-color">待发货</view>
+              <!-- TODO 芋艿：核销逻辑 -->
               <view v-else-if="order._status === 10 && order.deliveryType === 2" class="font-color">待核销</view>
               <view v-else-if="order.status === 20" class="font-color">待收货</view>
               <view v-else-if="order.status === 30 && !order.commentStatus" class="font-color">待评价</view>
diff --git a/utils/request.js b/utils/request.js
index 3652edaa..82c5b331 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -59,10 +59,10 @@ function baseRequest(url, method, data, {
 	return new Promise((reslove, reject) => {
 		uni.request({
 			// url: url.indexOf('app-api') < 0 ? Url + '/api/front/' + url
-      //   : 'http://127.0.0.1:48080/' + url, // TODO 芋艿：搞个 url 的配置
       url: url.indexOf('app-api') < 0 ? Url + '/api/front/' + url
-        : 'http://yunai.natapp1.cc/' + url, // TODO 芋艿：搞个 url 的配置
-			method: method || 'GET',
+        // : 'http://yunai.natapp1.cc/' + url, // TODO 芋艿：搞个 url 的配置
+        : 'http://127.0.0.1:48080/' + url, // TODO 芋艿：搞个 url 的配置
+      method: method || 'GET',
 			header: header,
 			data: data || {},
 			success: (res) => {