From f37335925bec9c088e04c5b73d3e776cac673dbb Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Sat, 13 Sep 2025 20:00:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update:=20=E5=8A=A8=E6=80=81=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=85=AC=E4=BC=97=E5=8F=B7=E7=BB=84=E4=BB=B6=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=8E=A5=E5=85=A5=E7=A1=AE=E8=AE=A4=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=BB=84=E4=BB=B6=E4=BD=86=E6=98=AF=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=8B=89=E8=B5=B7=E5=BE=AE=E4=BF=A1=E6=94=B6=E8=B4=A7=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/themes/diy.vue |  12 ++--
 member/order/list.vue     | 145 ++++++++++++++++++++++++++++++--------
 pagesub/index/store.vue   |   4 +-
 3 files changed, 126 insertions(+), 35 deletions(-)

diff --git a/components/themes/diy.vue b/components/themes/diy.vue
index 9631cd6..2cd969b 100644
--- a/components/themes/diy.vue
+++ b/components/themes/diy.vue
@@ -298,7 +298,7 @@
         </swiper>
       </view>
 
-      <view v-if="item.eltmType == 8" class="mTel" :style="{ 'background-color': item.bgColor }"
+      <view v-if="item.eltmType == 8" class="mTel" :style="{ 'background-color': item.bgColor, top: initY + 'px' }"
         :data-tel="item.eltm8.tel" @tap="callTel">
         <label class="iconfont icon-dianhua--copy"
           :style="{ 'font-size': '30px', color: item.eltm8.fontColor }"></label>
@@ -333,7 +333,7 @@
       </uni-nav-bar>
 
       <movable-area class="movableAreaIM" v-if="item.eltmType == 11 && hasLogin && chatUrl">
-        <movable-view class="movableView" @touchmove.stop.prevent="doNothing" direction="all" :x="initX" :y="initY">
+        <movable-view class="movableView" @touchmove.stop.prevent="doNothing" direction="all" :x="initX" :y="initY + 44 + 10">
           <view class="mCS" :style="{
             'background-color': item.bgColor,
             borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
@@ -1006,8 +1006,8 @@ export default {
         (data) => {
           if (data) {
             that.setData({
-              initX: data.width,
-              initY: data.height - 100,
+              initX: data.width - 50,
+              initY: data.height / 2,
             });
           }
         }
@@ -1532,6 +1532,10 @@ uni-page-body {
   height: 100% !important;
 }
 
+.mCS{
+  position: initial;
+}
+
 .diyPage {
   // padding-bottom: 8rpx;
       clear: both;
diff --git a/member/order/list.vue b/member/order/list.vue
index e2e3853..dd265f0 100644
--- a/member/order/list.vue
+++ b/member/order/list.vue
@@ -354,7 +354,7 @@
                   items.order_state_id == StateCode.ORDER_STATE_SHIPPED
                 "
                 class="u-link-btn"
-                @click="confirmReceipt"
+                @click="confirmReceipt(items, $event)"
                 >{{ __("确认收货") }}</view
               >
               <view
@@ -440,7 +440,6 @@
   </view>
 </template>
 
-
 <script>
 import paymentBox from "../../components/payment-box.vue";
 
@@ -793,37 +792,126 @@ export default {
         true
       );
     },
-    confirmReceipt: function (obj) {
+    confirmReceipt: function (data, obj) {
       var params = {
         order_id: obj.currentTarget.dataset.on,
       };
-
       var that = this;
-      that.$.confirm(
-        that.__("是否确认收货？"),
-        function (e) {
-          if (e.confirm) {
-            that.$.request({
-              url: that.Config.URL.user.order_receive,
-              data: params,
-              success: function (data, status, msg, code) {
-                if (status == 200) {
-                  that.$.alert(that.__("收货成功！"), function () {
-                    that.setData({
-                      orderlist: [],
-                      page: 1,
+
+      //拉起确认收货组件
+      if (wx.openBusinessView) {
+        wx.openBusinessView({
+          businessType: "weappOrderConfirm",
+          extraData: {
+            merchant_id: data.lkl_merchant_no,//用户交易商户号
+            merchant_trade_no: data.order_id,//商户订单号
+            // transaction_id: data.lkl_trade_no, //用户交易单号
+          },
+          success: (e) => {
+            console.log("e1", e);
+            if (e.extraData.status === "success") {
+              // 用户确认收货成功，再执行自己的代码
+              that.$.request({
+                url: that.Config.URL.user.order_receive,
+                data: params,
+                success: function (data, status, msg, code) {
+                  if (status == 200) {
+                    that.$.alert(that.__("收货成功！"), function () {
+                      that.setData({
+                        orderlist: [],
+                        page: 1,
+                      });
+                      setTimeout(function () {
+                        that.getOrderlist();
+                      }, 1000);
                     });
-                    setTimeout(function () {
-                      that.getOrderlist();
-                    }, 1000);
-                  });
-                }
-              },
+                  }
+                },
+              });
+            } else if (e.extraData.status === "fail") {
+              // 用户确认收货失败
+              uni.showToast({
+                title: "确认收货失败",
+                icon: "none",
+              });
+            } else if (e.extraData.status === "cancel") {
+              // 用户取消
+              uni.showToast({
+                title: "取消确认收货",
+                icon: "none",
+              });
+            }
+          },
+          fail: (e) => {
+            console.log("e2", e);
+            uni.showToast({
+              title: "确认收货失败",
+              icon: "none",
             });
-          }
-        },
-        true
-      );
+          },
+          complete: (e) => {
+            console.log("e3", e);
+            console.log("无论是否成功都会执行");
+          },
+        });
+      } else {
+        //引导用户升级微信版本
+        uni.showToast({
+          title: "请升级微信版本",
+          icon: "none",
+        });
+        that.$.confirm(
+          that.__("是否确认收货？"),
+          function (e) {
+            if (e.confirm) {
+              that.$.request({
+                url: that.Config.URL.user.order_receive,
+                data: params,
+                success: function (data, status, msg, code) {
+                  if (status == 200) {
+                    that.$.alert(that.__("收货成功！"), function () {
+                      that.setData({
+                        orderlist: [],
+                        page: 1,
+                      });
+                      setTimeout(function () {
+                        that.getOrderlist();
+                      }, 1000);
+                    });
+                  }
+                },
+              });
+            }
+          },
+          true
+        );
+      }
+
+      // that.$.confirm(
+      //     that.__("是否确认收货？"),
+      //     function (e) {
+      //       if (e.confirm) {
+      //         that.$.request({
+      //           url: that.Config.URL.user.order_receive,
+      //           data: params,
+      //           success: function (data, status, msg, code) {
+      //             if (status == 200) {
+      //               that.$.alert(that.__("收货成功！"), function () {
+      //                 that.setData({
+      //                   orderlist: [],
+      //                   page: 1,
+      //                 });
+      //                 setTimeout(function () {
+      //                   that.getOrderlist();
+      //                 }, 1000);
+      //               });
+      //             }
+      //           },
+      //         });
+      //       }
+      //     },
+      //     true
+      //   );
     },
     placeAnOrder: function (obj) {
       var params = {
@@ -910,7 +998,6 @@ export default {
 };
 </script>
 
-
 <style lang="scss">
 @import "../../styles/_variables";
 
@@ -1255,4 +1342,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesub/index/store.vue b/pagesub/index/store.vue
index 47254d2..86fdfd9 100644
--- a/pagesub/index/store.vue
+++ b/pagesub/index/store.vue
@@ -1863,9 +1863,9 @@ export default {
 
 .back-to-top {
   position: fixed;
-  top: 75%;
+  top: 80%;
   transform: translateY(-75%);
-  right: 20rpx;
+  right: 14rpx;
   width: 80rpx;
   height: 80rpx;
   text-align: center;

From e8fbaf9ff37352d4ddd621644f6f4f64e1283a72 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Mon, 15 Sep 2025 11:22:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update:=20=E8=81=94=E8=B0=83=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 member/order/detail.vue | 126 ++++++++++++++++++++++++++++++++--------
 member/order/list.vue   |   7 ++-
 2 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/member/order/detail.vue b/member/order/detail.vue
index bcf0dad..65e476b 100644
--- a/member/order/detail.vue
+++ b/member/order/detail.vue
@@ -5,7 +5,7 @@
       :border="false"
       :left-width="'400rpx'"
       :statusBar="true"
-      :height="'34px'"	
+      :height="'34px'"
     >
       <block slot="left">
         <view class="left-block" @click="handerSkip">
@@ -168,7 +168,7 @@
               OrderInfo.kind_id == 1201 &&
               OrderInfo.order_state_id == StateCode.ORDER_STATE_SHIPPED
             "
-            @click="confirmReceipt"
+            @click="confirmReceipt(OrderInfo, $event)"
             >{{ __("确认收货") }}</view
           >
           <view
@@ -1912,31 +1912,110 @@ export default {
         true
       );
     },
-    confirmReceipt: function (obj) {
+    confirmReceipt: function (data, obj) {
       var params = {
         order_id: obj.currentTarget.dataset.on,
       };
 
-      var that = this;
-      that.$.confirm(
-        that.__("是否确认收货？"),
-        function (e) {
-          if (e.confirm) {
-            that.$.request({
-              url: that.Config.URL.user.order_receive,
-              data: params,
-              success: function (data, status, msg, code) {
-                if (status == 200) {
-                  that.$.alert(that.__("收货成功！"), function () {
-                    that.notice.postNotificationName("RefreshMessage", e);
-                  });
-                }
-              },
+      //拉起确认收货组件
+      if (wx.openBusinessView) {
+        wx.openBusinessView({
+          businessType: "weappOrderConfirm",
+          extraData: {
+            // merchant_id: data.lkl_merchant_no,//用户交易商户号
+            // merchant_trade_no: data.order_id,//商户订单号
+            transaction_id: data.lkl_trade_no, //用户交易单号
+            // transaction_id: "4200002884202509154936380358", //用户交易单号
+          },
+          success: (e) => {
+            console.log("e1", e);
+            if (e.extraData.status === "success") {
+              // 用户确认收货成功，再执行自己的代码
+              that.$.request({
+                url: that.Config.URL.user.order_receive,
+                data: params,
+                success: function (data, status, msg, code) {
+                  if (status == 200) {
+                    that.$.alert(that.__("收货成功！"), function () {
+                      that.notice.postNotificationName("RefreshMessage", e);
+                    });
+                  } 
+                },
+              });
+            } else if (e.extraData.status === "fail") {
+              // 用户确认收货失败
+              uni.showToast({
+                title: "确认收货失败",
+                icon: "none",
+              });
+            } else if (e.extraData.status === "cancel") {
+              // 用户取消
+              uni.showToast({
+                title: "取消确认收货",
+                icon: "none",
+              });
+            }
+          },
+          fail: (e) => {
+            console.log("e2", e);
+            uni.showToast({
+              title: "确认收货失败",
+              icon: "none",
             });
-          }
-        },
-        true
-      );
+          },
+          complete: (e) => {
+            console.log("e3", e);
+            console.log("无论是否成功都会执行");
+          },
+        });
+      } else {
+        //引导用户升级微信版本
+        uni.showToast({
+          title: "请升级微信版本",
+          icon: "none",
+        });
+        that.$.confirm(
+          that.__("是否确认收货？"),
+          function (e) {
+            if (e.confirm) {
+              that.$.request({
+                url: that.Config.URL.user.order_receive,
+                data: params,
+                success: function (data, status, msg, code) {
+                  if (status == 200) {
+                    that.$.alert(that.__("收货成功！"), function () {
+                      that.notice.postNotificationName("RefreshMessage", e);
+                    });
+                  }
+                },
+              });
+            }
+          },
+          true
+        );
+      }
+
+      var that = this;
+
+      // that.$.confirm(
+      //   that.__("是否确认收货？"),
+      //   function (e) {
+      //     if (e.confirm) {
+      //       that.$.request({
+      //         url: that.Config.URL.user.order_receive,
+      //         data: params,
+      //         success: function (data, status, msg, code) {
+      //           if (status == 200) {
+      //             that.$.alert(that.__("收货成功！"), function () {
+      //               that.notice.postNotificationName("RefreshMessage", e);
+      //             });
+      //           }
+      //         },
+      //       });
+      //     }
+      //   },
+      //   true
+      // );
     },
     gotopay: async function (e) {
       var that = this;
@@ -2176,7 +2255,6 @@ export default {
 };
 </script>
 
-
 <style lang="scss">
 @import "../../styles/_variables";
 
@@ -2714,4 +2792,4 @@ export default {
     margin-left: 6rpx;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/member/order/list.vue b/member/order/list.vue
index dd265f0..e59ff98 100644
--- a/member/order/list.vue
+++ b/member/order/list.vue
@@ -803,9 +803,10 @@ export default {
         wx.openBusinessView({
           businessType: "weappOrderConfirm",
           extraData: {
-            merchant_id: data.lkl_merchant_no,//用户交易商户号
-            merchant_trade_no: data.order_id,//商户订单号
-            // transaction_id: data.lkl_trade_no, //用户交易单号
+            // merchant_id: data.lkl_merchant_no,//用户交易商户号
+            // merchant_trade_no: data.order_id,//商户订单号
+            transaction_id: data.lkl_trade_no, //用户交易单号
+            // transaction_id: "4200002884202509154936380358", //用户交易单号
           },
           success: (e) => {
             console.log("e1", e);