lex 2 سال پیش
والد
کامیت
13fc455b00

+ 10 - 7
src/school/companion-teacher/companion-detail.tsx

@@ -24,6 +24,7 @@ import request from '@/helpers/request'
 import { state as baseState } from '@/state'
 import { useRoute, useRouter } from 'vue-router'
 import OEmpty from '@/components/o-empty'
+import detailItem from '../exercise-record/modals/detail-item'
 
 export default defineComponent({
   name: 'companion-detail',
@@ -197,13 +198,15 @@ export default defineComponent({
           {state.classList.length <= 0 && <OEmpty btnStatus={false} tips="暂无班级" />}
         </CellGroup>
 
-        <OSticky position="bottom">
-          <div class={['btnGroup']} style={{ paddingLeft: '13px', paddingRight: '13px' }}>
-            <Button type="primary" round block onClick={onDetail}>
-              解除绑定
-            </Button>
-          </div>
-        </OSticky>
+        {state.detail.delFalg && (
+          <OSticky position="bottom">
+            <div class={['btnGroup']} style={{ paddingLeft: '13px', paddingRight: '13px' }}>
+              <Button type="primary" round block onClick={onDetail}>
+                解除绑定
+              </Button>
+            </div>
+          </OSticky>
+        )}
 
         <Popup
           v-model:show={state.showMessage}

+ 1 - 1
src/student/music-group/pre-apply/order-detail.tsx

@@ -90,7 +90,7 @@ export default defineComponent({
             wxAppId: config.wxAppId,
             body: config.body,
             price: config.price,
-            orderNo: config.orderNo,
+            orderNo: config.merOrderNo,
             userId: config.userId
           }
         })

+ 1 - 0
src/views/adapay/pay-result/index.tsx

@@ -34,6 +34,7 @@ export default defineComponent({
 
     const init = () => {
       const query = route.query
+      console.log(query)
       // 判断是否有支付对象
       if (!query.orderNo || !query.pay_channel) {
         showConfirmDialog({