Merge branch 'iteration-create' of http://git.dayaedu.com/liushengqiang/classroom-app into iteration-create

src/views/collection-record/component/item.tsx

@@ -130,10 +130,16 @@ export default defineComponent({
     /** 取消订单 */
     const handleCancelOrder = async () => {
       data.cancelOrderLoading = true;
-      await api_userPaymentOrderCancelPayment(props.item.orderNo);
+      try {
+        await api_userPaymentOrderCancelPayment(props.item.orderNo);
+        setTimeout(() => {
+          showToast('取消成功');
+          emit('close');
+        }, 100);
+      } catch {
+        //
+      }
       data.cancelOrderLoading = false;
-      showToast('取消成功');
-      emit('close');
     };
     return () => (
       <div class={styles.item}>

src/views/student-register/shop-mall/goods-detail/index.module.less

@@ -1,3 +1,15 @@
+.arrowLeft {
+  position: fixed;
+  top: calc(20px + env(safe-area-inset-top));
+  left: 20px;
+  z-index: 999;
+  font-size: 22px;
+  background-color: rgba(0, 0, 0, 0.5);
+  color: #fff;
+  padding: 4px 4px 2px 2px;
+  border-radius: 50%;
+}
+
 .swipeItemImg,
 .swipe {
   width: 100%;

src/views/student-register/shop-mall/goods-detail/index.tsx

@@ -16,7 +16,8 @@ import {
   SubmitBar,
   showImagePreview,
   showToast,
-  Popup
+  Popup,
+  Icon
 } from 'vant';
 import { defineComponent } from 'vue';
 import styles from './index.module.less';
@@ -172,6 +173,14 @@ export default defineComponent({
     return (
       <div class={styles.goodsDetail}>
         {/* <ColHeader /> */}
+        <Icon
+          class={styles.arrowLeft}
+          name="arrow-left"
+          onClick={(e: any) => {
+            e.stopPropagation();
+            this.$router.back();
+          }}
+        />
         <Swipe
           class={styles.swipe}
           lazyRender

src/views/student-register/shop-mall/goods-list/index.module.less

@@ -9,6 +9,11 @@
   }
 }
 
+.arrowLeft {
+  font-size: 22px;
+  margin-right: 8px;
+}
+
 .filter-top {
   height: 37px;
   font-size: 14px;
@@ -105,4 +110,4 @@
     margin-top: -5px;
     margin-left: -1px;
   }
-}
+}

src/views/student-register/shop-mall/goods-list/index.tsx

@@ -135,8 +135,17 @@ export default defineComponent({
             modelValue={this.keyword}
             searchIcon={iconSearchY}
             onSearch={this.searchBtn}
-            placeholder="请输入商品名称"
-          />
+            placeholder="请输入商品名称">
+            {{
+              left: () => (
+                <Icon
+                  class={styles.arrowLeft}
+                  name="arrow-left"
+                  onClick={() => this.$router.back()}
+                />
+              )
+            }}
+          </ColSearch>
           <Row class={styles['filter-top']} align="center">
             <Col
               span={6}