From 6746c0b293799b0f70c0b6f37e2e2856af9f8808 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Wed, 27 Mar 2024 17:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                      |  2 +-
 pages/merchant/teacher_detail.vue  |  4 ++--
 pages/special/grade_special.vue    |  4 ++--
 pages/special/order_store_list.vue | 13 +++++++++++--
 pages/special/record.vue           |  8 ++++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1f96b0b..439b407 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "梦航教育宝",
-    "appid" : "__UNI__AB67F73",
+    "appid" : "__UNI__640EC10",
     "description" : "1.1",
     "versionName" : "1.0.1",
     "versionCode" : 101,
diff --git a/pages/merchant/teacher_detail.vue b/pages/merchant/teacher_detail.vue
index 81bc8f5..4c3407b 100644
--- a/pages/merchant/teacher_detail.vue
+++ b/pages/merchant/teacher_detail.vue
@@ -8,10 +8,10 @@
             <image :src="lecturer.lecturer_head" />
             <view class="con">
               <view class="name">
-                {{ lecturer.lecturer_name }}
+                {{ lecturer.lecturer_name || '' }}
               
               </view>
-              <view v-if="lecturer.explain" class="info">{{ lecturer.explain }}</view>
+              <view v-if="lecturer.explain" class="info">{{ lecturer.explain || '' }}</view>
              <!-- <navigator v-if="merId === lecturer.mer_id && lecturer.mer_id"
                   :url="`/pages/merchant/info?mer_id=${lecturer.mer_id}&type=1`" hover-class="none" class="info-btn">
                   查看信息
diff --git a/pages/special/grade_special.vue b/pages/special/grade_special.vue
index b60db7b..6f04206 100644
--- a/pages/special/grade_special.vue
+++ b/pages/special/grade_special.vue
@@ -139,11 +139,11 @@ export default {
   color: #999999;
 }
 .list {
-  position: absolute;
+  position: relative;
   left: 0;
   right: 0;
   margin: 0 auto;
-  margin-top: calc(128rpx + var(--safe-top));
+  margin-top: calc(88rpx + var(--safe-top));
   width: 686rpx;
   background: #FFFFFF;
   border-radius: 24rpx;
diff --git a/pages/special/order_store_list.vue b/pages/special/order_store_list.vue
index 6054fee..f72ec39 100644
--- a/pages/special/order_store_list.vue
+++ b/pages/special/order_store_list.vue
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-  import { getOrderCountByStatus, getUserOrderList, userTakeOrder } from "@/api/auth";
+  import { getOrderCountByStatus, getUserOrderList, userTakeOrder, userRemoveOrder } from "@/api/auth";
   import { getSpecialTemplateIds, getInitData, aliPayApp, aliPayWap } from "@/api/special";
   import PayDialog from "@/components/PayDialog/index.vue";
 
@@ -373,10 +373,19 @@
         if (!confirm) return;
         uni.showLoading({ mask: true });
         try {
-          await userRemoveOrder(this.id);
+          await userRemoveOrder(id);
           uni.hideLoading();
           this.$util.showMsg(title + "成功！");
+					this.orderList = {
+					  first: 0,
+					  limit: 8,
+					  list: [],
+					  loaded: false,
+					  top: 0,
+					};
+					this.getOrderList();
         } catch (err) {
+					console.log(err);
           uni.hideLoading();
           this.$util.showMsg(err.msg);
         }
diff --git a/pages/special/record.vue b/pages/special/record.vue
index f66eb4f..e59c589 100644
--- a/pages/special/record.vue
+++ b/pages/special/record.vue
@@ -194,7 +194,10 @@ page{
     right: 0;
     width: 686rpx;
     margin: 0 auto;
-    margin-top: calc(330rpx + var(--safe-top));
+		margin-top: calc(240rpx + var(--safe-top));
+		// #ifdef  MP-WEIXIN
+    margin-top: calc(280rpx + var(--safe-top));
+		// #endif
     border-radius: 24rpx;
     z-index: 999;
 
@@ -239,9 +242,10 @@ page{
   padding-bottom: 40rpx;
     width: 686rpx;
     margin: 0 auto;
-    margin-top: calc(210rpx + var(--safe-top));
+    margin-top: calc(170rpx + var(--safe-top));
     border-radius: 24rpx;
     z-index: 999;
+		position: relative;
 }
 
 .study-record .goods .item {