From c1940e57f978ac852c1a3b63e4682f23d90f7e31 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 11 Feb 2025 16:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js               |  2 +-
 package_sub/pages/Shop/Order.vue         |  4 ++--
 package_sub/pages/Shop/Pay.vue           |  4 +---
 package_sub/pages/Shop/ProductDetail.vue | 24 ++++++++++++++++++++++--
 pages/me/me.vue                          | 13 +++++++++++--
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index f422583..e8d3004 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -48,7 +48,7 @@ const install = (Vue, vm) => {
 				} else {
 					uni.showToast({
 						icon: "none",
-						title: res.errmsg||"系统错误"
+						title: res.data.errmsg||"系统错误"
 					})
 					return false
 				}
diff --git a/package_sub/pages/Shop/Order.vue b/package_sub/pages/Shop/Order.vue
index 6d44ea4..7cdf97e 100644
--- a/package_sub/pages/Shop/Order.vue
+++ b/package_sub/pages/Shop/Order.vue
@@ -15,7 +15,7 @@
             :current="swiperCurrent"
             @change="change"
             :is-scroll="false"
-            :offset="[5, 5]"
+            :offset="[10, 5]"
             swiperWidth="750"
         ></u-tabs-swiper>
       </view>
@@ -44,7 +44,7 @@
 
                 <view class="price">
                   <view class="price-icon">
-                    <u-icon :name="i.cover ? i.cover.url : vuex_default_icon" size="30"></u-icon>
+                    <u-icon :name="(i.order_detail[0] && i.order_detail[0].product && i.order_detail[0].product.image) ? i.order_detail[0].product.image.url : vuex_default_icon" size="30"></u-icon>
                   </view>
 
                   <view class="price-text">
diff --git a/package_sub/pages/Shop/Pay.vue b/package_sub/pages/Shop/Pay.vue
index c827722..8d5d1cf 100644
--- a/package_sub/pages/Shop/Pay.vue
+++ b/package_sub/pages/Shop/Pay.vue
@@ -202,9 +202,6 @@
                 >{{ item.address }}</view
               >
             </view>
-            <view class="bottom">
-              <text>{{ item.name }} {{ item.mobile }}</text>
-            </view>
           </view>
         </scroll-view>
       </view>
@@ -338,6 +335,7 @@ export default {
       try {
         const res = await this.$u.api.userOrdersDetail({ id })
         this.detail = res
+        this.carts = res.order_detail
       } catch (err) {
         console.error(err)
       }
diff --git a/package_sub/pages/Shop/ProductDetail.vue b/package_sub/pages/Shop/ProductDetail.vue
index 4561f7f..82f4ad2 100644
--- a/package_sub/pages/Shop/ProductDetail.vue
+++ b/package_sub/pages/Shop/ProductDetail.vue
@@ -307,10 +307,10 @@
     <!--    -->
     <view class="navigation">
       <view class="left">
-        <view class="item">
+        <button class="item" open-type="contact">
           <u-icon name="server-fill" :size="40" color="#333"></u-icon>
           <view class="text u-line-1">客服</view>
-        </view>
+        </button>
         <view class="item car" @tap="$u.route({ url: '/package_sub/pages/Shop/Cart' })">
           <u-badge
             class="car-num"
@@ -596,6 +596,9 @@ export default {
           this.getCartNum();
         }
         if (this.isImmediateBuy) {
+          this.$u.route({
+            url: '/package_sub/pages/Shop/Pay'
+          })
         }
         this.showType = false;
       } catch (err) {}
@@ -1050,6 +1053,23 @@ page {
   .left {
     display: flex;
     font-size: 20rpx;
+    button {
+      display: block;
+      margin: 0;
+      padding: 0;
+      line-height: normal;
+      background: none;
+      border-radius: 0;
+      box-shadow: none;
+      border: none;
+      font-size: unset;
+      text-align: unset;
+      overflow: visible;
+      color: inherit;
+      &::after {
+        border: none;
+      }
+    }
     .item {
       color: #333;
       margin: 0 30rpx;
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 31a56a1..36273f5 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -115,8 +115,11 @@
                 <image :src="form.headimgurl || vuex_default_icon" mode="aspectFit"></image>
               </button>
             </u-form-item>
+            <u-form-item label="昵称">
+              <input type="nickname" v-model="form.nickname" @change="nicknameChange"></input>
+            </u-form-item>
             <u-form-item label="性别">
-              <u-radio-group v-model="form.sex">
+              <u-radio-group v-model="form.sex" active-color="#b83531">
                 <u-radio name="男">男</u-radio>
                 <u-radio name="女">女</u-radio>
                 <u-radio name="保密">保密</u-radio>
@@ -154,6 +157,7 @@ export default {
       isShowModal: false,
       isShowMyInfo: false,
       form: {
+        nickname: '',
         headimgurl: '',
         mobile: '',
         sex: ''
@@ -161,6 +165,9 @@ export default {
     };
   },
   methods: {
+    nicknameChange(e) {
+      this.form.nickname = e.target.value
+    },
     async onPhoneNumber(e) {
       try {
          if (e.detail.encryptedData) {
@@ -230,7 +237,9 @@ export default {
         this.form.mobile = newVal.mobile
         this.form.sex = newVal.sex
         this.form.headimgurl = newVal.headimgurl
-      }
+        this.form.nickname = newVal.nickname
+      },
+      immediate: true
     }
   },
   onLoad() {