更新

dist/assets/index-legacy.362ddaf4.js → dist/assets/index-legacy.863cc5eb.js

@@ -1 +1 @@
-;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.eaf4816d.js','./index-legacy.f25f109a4.js','./index-legacy.e0c3e719.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.q;createTextVNode=module.b;Button=module.B;},function(){},function(module){browser=module.e;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.eaf4816d.js','./index-legacy.f25f109a4.js','./index-legacy.b4bb497d.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.q;createTextVNode=module.b;Button=module.B;},function(){},function(module){browser=module.e;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();

dist/assets/index.b08dee5f.js → dist/assets/index.23e618d7.js

@@ -1 +1 @@
-import{d as r,a as e,q as s,b as a,B as t}from"./vendor.50def595.js";/* empty css               */import{e as o,p as n}from"./index.722fca5f.js";const u="_f404_h02wy_1";var d={f404:u},i="./assets/404.91cd33be.png",c=r({name:"NotFound",render(){return e("div",{class:d.f404},[e(s,{src:i},null),e("p",null,[a("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),e(t,{type:"primary",plain:!0,round:!0,onClick:()=>{o().iPhone?n({api:"back"}):this.$router.back()}},{default:()=>[a("\u8FD4\u56DE")]})])}});export{c as default};
+import{d as r,a as e,q as s,b as a,B as t}from"./vendor.50def595.js";/* empty css               */import{e as o,p as n}from"./index.b3348130.js";const u="_f404_h02wy_1";var d={f404:u},i="./assets/404.91cd33be.png",m=r({name:"NotFound",render(){return e("div",{class:d.f404},[e(s,{src:i},null),e("p",null,[a("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),e(t,{type:"primary",plain:!0,round:!0,onClick:()=>{o().iPhone?n({api:"back"}):this.$router.back()}},{default:()=>[a("\u8FD4\u56DE")]})])}});export{m as default};

dist/assets/index.95756082.js → dist/assets/index.9eeab7df.js

@@ -1 +1 @@
-import{d as c,a as o,J as p,b as s,I as n,P as i}from"./vendor.50def595.js";/* empty css                *//* empty css               */import{a as r,i as d}from"./icon_checkbox_default.2fe5d57e.js";import{C as h}from"./index.1627d902.js";const f="_colProtocol_wgzww_1",m="_protocolText_wgzww_6",w="_boxStyle_wgzww_10";var e={colProtocol:f,protocolText:m,boxStyle:w},S=c({name:"protocol",props:{showHeader:{type:Boolean,default:!1},modelValue:{type:Boolean,default:!1}},data(){return{checked:!1,popupStatus:!1,protocolHTML:"",protocolPopup:null}},mounted(){this.checked=this.modelValue,window.addEventListener("hashchange",this.onHash,!1)},unmounted(){window.removeEventListener("hashchange",this.onHash,!1)},watch:{checked(t){this.$emit("update:modelValue",t)}},methods:{onHash(){this.popupStatus=!1},onPopupClose(){if(this.popupStatus=!this.popupStatus,this.popupStatus){const t=this.$route;let u=0;for(let x in t.query)u+=1;const l=window.location.href,a=u>0?"&pto="+ +new Date:"?pto="+ +new Date;history.pushState("","",`${l}${a}`)}else window.history.go(-1);this.protocolPopup&&(this.protocolPopup.scrollTop=0)}},render(){return o("div",{class:e.colProtocol},[o(p,{modelValue:this.checked,"onUpdate:modelValue":t=>this.checked=t},{default:()=>[s("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")],icon:t=>o(n,{class:e.boxStyle,name:t.checked?r:d,size:"15"},null)}),o("span",{onClick:this.onPopupClose,class:e.protocolText},[s("\u300A\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE\u300B")]),o(i,{ref:this.protocolPopup,show:this.popupStatus,position:"bottom",style:{height:"100%"}},{default:()=>[this.showHeader&&o(h,{title:"\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE"},null),o("div",{class:e.protocolContent},[o("div",{class:e.protocolTitle},[s("\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE")]),o("div",{class:e.protocolContent},[s("\u5446\u5934\u5446\u8111\u7684\u534F\u8BAE\u5185\u5BB9")])])]})])}});export{S as C};
+import{d as c,a as o,J as p,b as s,I as n,P as i}from"./vendor.50def595.js";/* empty css                *//* empty css               */import{a as r,i as d}from"./icon_checkbox_default.2fe5d57e.js";import{C as h}from"./index.f79d1954.js";const f="_colProtocol_wgzww_1",m="_protocolText_wgzww_6",w="_boxStyle_wgzww_10";var e={colProtocol:f,protocolText:m,boxStyle:w},S=c({name:"protocol",props:{showHeader:{type:Boolean,default:!1},modelValue:{type:Boolean,default:!1}},data(){return{checked:!1,popupStatus:!1,protocolHTML:"",protocolPopup:null}},mounted(){this.checked=this.modelValue,window.addEventListener("hashchange",this.onHash,!1)},unmounted(){window.removeEventListener("hashchange",this.onHash,!1)},watch:{checked(t){this.$emit("update:modelValue",t)}},methods:{onHash(){this.popupStatus=!1},onPopupClose(){if(this.popupStatus=!this.popupStatus,this.popupStatus){const t=this.$route;let u=0;for(let x in t.query)u+=1;const l=window.location.href,a=u>0?"&pto="+ +new Date:"?pto="+ +new Date;history.pushState("","",`${l}${a}`)}else window.history.go(-1);this.protocolPopup&&(this.protocolPopup.scrollTop=0)}},render(){return o("div",{class:e.colProtocol},[o(p,{modelValue:this.checked,"onUpdate:modelValue":t=>this.checked=t},{default:()=>[s("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")],icon:t=>o(n,{class:e.boxStyle,name:t.checked?r:d,size:"15"},null)}),o("span",{onClick:this.onPopupClose,class:e.protocolText},[s("\u300A\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE\u300B")]),o(i,{ref:this.protocolPopup,show:this.popupStatus,position:"bottom",style:{height:"100%"}},{default:()=>[this.showHeader&&o(h,{title:"\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE"},null),o("div",{class:e.protocolContent},[o("div",{class:e.protocolTitle},[s("\u9177\u4E50\u79C0\u5E73\u53F0\u670D\u52A1\u534F\u8BAE")]),o("div",{class:e.protocolContent},[s("\u5446\u5934\u5446\u8111\u7684\u534F\u8BAE\u5185\u5BB9")])])]})])}});export{S as C};

dist/assets/music-legacy.8492ef55.js

@@ -1 +0,0 @@
-;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var teacherChargeType=exports('t',{2:"\u662F",0:"\u5426"});var goodsType=exports('g',{LIVE:"\u76F4\u64AD\u8BFE",PRACTICE:"\u966A\u7EC3\u8BFE",VIDEO:"\u89C6\u9891\u8BFE",VIP:"\u5F00\u901A\u4F1A\u5458",MUSIC:"\u5355\u66F2\u70B9\u64AD"});}};});})();

dist/assets/music.58da0cac.js

@@ -1 +0,0 @@
-const u={2:"\u662F",0:"\u5426"},F={LIVE:"\u76F4\u64AD\u8BFE",PRACTICE:"\u966A\u7EC3\u8BFE",VIDEO:"\u89C6\u9891\u8BFE",VIP:"\u5F00\u901A\u4F1A\u5458",MUSIC:"\u5355\u66F2\u70B9\u64AD"};export{F as g,u as t};

dist/assets/order-legacy.f5915bed.js

@@ -0,0 +1 @@
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var goodsType=exports('g',{LIVE:"\u76F4\u64AD\u8BFE",PRACTICE:"\u966A\u7EC3\u8BFE",VIDEO:"\u89C6\u9891\u8BFE",VIP:"\u5F00\u901A\u4F1A\u5458",MUSIC:"\u5355\u66F2\u70B9\u64AD"});var orderType=exports('o',{WAIT_PAY:"\u5F85\u652F\u4ED8",PAYING:"\u652F\u4ED8\u4E2D",PAID:"\u5DF2\u4ED8\u6B3E",CLOSE:"\u5DF2\u5173\u95ED",FAIL:"\u652F\u4ED8\u5931\u8D25"});}};});})();

dist/assets/order.520781e2.js

@@ -0,0 +1 @@
+const u={LIVE:"\u76F4\u64AD\u8BFE",PRACTICE:"\u966A\u7EC3\u8BFE",VIDEO:"\u89C6\u9891\u8BFE",VIP:"\u5F00\u901A\u4F1A\u5458",MUSIC:"\u5355\u66F2\u70B9\u64AD"},E={WAIT_PAY:"\u5F85\u652F\u4ED8",PAYING:"\u652F\u4ED8\u4E2D",PAID:"\u5DF2\u4ED8\u6B3E",CLOSE:"\u5DF2\u5173\u95ED",FAIL:"\u652F\u4ED8\u5931\u8D25"};export{u as g,E as o};

dist/assets/switch.926e06a9.js → dist/assets/switch.03f2ce93.js

@@ -1 +1 @@
-import{d as a,a as t,B as l,b as u,z as n,y as d,G as o,H as i}from"./vendor.50def595.js";/* empty css               *//* empty css               *//* empty css               *//* empty css               */import{r as c}from"./index.722fca5f.js";var f=a({name:"MusicListItem",props:{data:{type:Object,default:()=>null}},render(){return this.data?t("div",null,null):null}}),h={"list-contaner":"_list-contaner_v1ygs_1"};function p(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!d(e)}var s=a({name:"MusicList",props:{auditStatus:{type:Number,default:0}},data(){return{list:[],loading:!1,error:!1,finished:!1,page:1}},methods:{async FetchList(){this.loading=!0;try{const e=await c.post("/api-web/music/sheet/list",{data:{auditStatus:this.auditStatus}});e.data.length&&(this.list=this.list.concat(e.data))}catch{this.error=!0}this.loading=!1},toUpload(){this.$router.push({path:"/music-upload"})}},render(){let e;return t("div",{class:h["list-contaner"]},[t(l,{onClick:this.toUpload},{default:()=>[u("\u4E0A\u4F20\u66F2\u8C31")]}),t(n,{loading:this.loading,error:this.error,finished:this.finished,onLoad:this.FetchList},p(e=this.list.map(r=>t(f,{data:r},null)))?e:{default:()=>[e]})])}}),L=a({name:"MusicListSwitch",render(){return t("div",null,[t(o,null,{default:()=>[t(i,{title:"\u5DF2\u4E0A\u67B6"},{default:()=>[t(s,{auditStatus:0},null)]}),t(i,{title:"\u5BA1\u6838\u4E2D"},{default:()=>[t(s,{auditStatus:1},null)]}),t(i,{title:"\u5BA1\u6838\u5931\u8D25"},{default:()=>[t(s,{auditStatus:2},null)]})]})])}});export{L as default};
+import{d as a,a as t,B as l,b as u,z as n,y as d,G as o,H as i}from"./vendor.50def595.js";/* empty css               *//* empty css               *//* empty css               *//* empty css               */import{r as c}from"./index.b3348130.js";var h=a({name:"MusicListItem",props:{data:{type:Object,default:()=>null}},render(){return this.data?t("div",null,null):null}}),p={"list-contaner":"_list-contaner_v1ygs_1"};function f(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!d(e)}var s=a({name:"MusicList",props:{auditStatus:{type:Number,default:0}},data(){return{list:[],loading:!1,error:!1,finished:!1,page:1}},methods:{async FetchList(){this.loading=!0;try{const e=await c.post("/api-web/music/sheet/list",{data:{auditStatus:this.auditStatus}});e.data.length&&(this.list=this.list.concat(e.data))}catch{this.error=!0}this.loading=!1},toUpload(){this.$router.push({path:"/music-upload"})}},render(){let e;return t("div",{class:p["list-contaner"]},[t(l,{onClick:this.toUpload},{default:()=>[u("\u4E0A\u4F20\u66F2\u8C31")]}),t(n,{loading:this.loading,error:this.error,finished:this.finished,onLoad:this.FetchList},f(e=this.list.map(r=>t(h,{data:r},null)))?e:{default:()=>[e]})])}}),L=a({name:"MusicListSwitch",render(){return t("div",null,[t(o,null,{default:()=>[t(i,{title:"\u5DF2\u4E0A\u67B6"},{default:()=>[t(s,{auditStatus:0},null)]}),t(i,{title:"\u5BA1\u6838\u4E2D"},{default:()=>[t(s,{auditStatus:1},null)]}),t(i,{title:"\u5BA1\u6838\u5931\u8D25"},{default:()=>[t(s,{auditStatus:2},null)]})]})])}});export{L as default};

dist/index.html

@@ -34,9 +34,9 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index.1d0766e3.js"></script>
+  <script type="module" crossorigin src="./assets/index.9e317187.js"></script>
   <link rel="modulepreload" href="./assets/vendor.50def595.js">
-  <link rel="modulepreload" href="./assets/index.722fca5f.js">
+  <link rel="modulepreload" href="./assets/index.b3348130.js">
   <link rel="stylesheet" href="./assets/vendor.177057eb.css">
   <link rel="stylesheet" href="./assets/index.b8b002f0.css">
   <link rel="stylesheet" href="./assets/index.1defe979.css">
@@ -49,7 +49,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.c37dee24.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.ef25121e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -34,9 +34,9 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/teacher.00c3ed3f.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.1b44f6d0.js"></script>
   <link rel="modulepreload" href="./assets/vendor.50def595.js">
-  <link rel="modulepreload" href="./assets/index.722fca5f.js">
+  <link rel="modulepreload" href="./assets/index.b3348130.js">
   <link rel="stylesheet" href="./assets/index.b8b002f0.css">
   <link rel="stylesheet" href="./assets/vendor.177057eb.css">
   <link rel="stylesheet" href="./assets/index.1defe979.css">
@@ -48,7 +48,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.535fb809.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.d6b7fdf2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/constant/music.ts

@@ -17,11 +17,3 @@ export const teacherChargeType = {
   2: '是',
   0: '否'
 }
-
-export const goodsType = {
-  LIVE: '直播课',
-  PRACTICE: '陪练课',
-  VIDEO: '视频课',
-  VIP: '开通会员',
-  MUSIC: '单曲点播'
-}

src/constant/order.ts

@@ -0,0 +1,15 @@
+export const goodsType = {
+  LIVE: '直播课',
+  PRACTICE: '陪练课',
+  VIDEO: '视频课',
+  VIP: '开通会员',
+  MUSIC: '单曲点播'
+}
+
+export const orderType = {
+  WAIT_PAY: '待支付',
+  PAYING: '支付中',
+  PAID: '已付款',
+  CLOSE: '已关闭',
+  FAIL: '支付失败'
+}

src/student/member-center/index.tsx

@@ -144,7 +144,7 @@ export default defineComponent({
 
           <ColProtocol
             v-model={this.agreeStatus}
-            style={{ paddingLeft: 0, paddingRight: 0, marginBottom: '20px' }}
+            style={{ paddingLeft: 0, paddingRight: 0, marginBottom: '64px' }}
           />
         </div>
         <div class={styles.btnGroup}>

src/student/member-center/member-record.tsx

@@ -14,43 +14,44 @@ export default defineComponent({
   render() {
     return (
       <div class={styles['member-record']}>
-        <Sticky position="top" offsetTop={0}>
-          <ColHeader
-            class={styles.memberHeader}
-            background="#00d1a1"
-            border={false}
-            color="#fff"
-            isFixed={false}
-            v-slots={{
-              default: () => (
-                <div class={styles.headerContent}>
-                  <Image
-                    class={styles.headerImg}
-                    src={getAssetsHomeFile('record_bg.png')}
-                  />
+        {/* <Sticky position="top" offsetTop={0}> */}
+        <ColHeader
+          class={styles.memberHeader}
+          background="#00d1a1"
+          backIconColor="white"
+          border={false}
+          color="#fff"
+          // isFixed={false}
+          v-slots={{
+            default: () => (
+              <div class={styles.headerContent}>
+                <Image
+                  class={styles.headerImg}
+                  src={getAssetsHomeFile('record_bg.png')}
+                />
 
-                  <div class={styles.headerCount}>
-                    <div class={styles.headerItem}>
-                      <span class={styles.num}>142</span>
-                      <span>累计训练天数</span>
-                    </div>
-                    <div class={styles.headerItem}>
-                      <span class={styles.num}>95</span>
-                      <span>累计训练时长</span>
-                    </div>
-                    <div class={styles.headerItem}>
-                      <span class={styles.num}>142</span>
-                      <span>累计训练次数</span>
-                    </div>
+                <div class={styles.headerCount}>
+                  <div class={styles.headerItem}>
+                    <span class={styles.num}>142</span>
+                    <span>累计训练天数</span>
+                  </div>
+                  <div class={styles.headerItem}>
+                    <span class={styles.num}>95</span>
+                    <span>累计训练时长</span>
+                  </div>
+                  <div class={styles.headerItem}>
+                    <span class={styles.num}>142</span>
+                    <span>累计训练次数</span>
                   </div>
                 </div>
-                //   <div class={[styles.certHeader, this.headStatus ? styles.certWhite : null]}>
-                //     老师认证
-                //   </div>
-              )
-            }}
-          />
-        </Sticky>
+              </div>
+              //   <div class={[styles.certHeader, this.headStatus ? styles.certWhite : null]}>
+              //     老师认证
+              //   </div>
+            )
+          }}
+        />
+        {/* </Sticky> */}
 
         <div style={{ overflow: 'hidden', paddingBottom: '12px' }}>
           <Cell

src/student/trade/index.tsx

@@ -23,7 +23,7 @@ export default defineComponent({
             <List />
           </Tab>
           <Tab name="refund" title="退费记录">
-            <List type="refund" />
+            {/* <List type="refund" /> */}
           </Tab>
         </Tabs>
       </div>

src/student/trade/list/index.tsx

@@ -8,12 +8,16 @@ import {
   Icon,
   Popup,
   Sticky,
-  Image
+  Image,
+  List
 } from 'vant'
 import { formatterDate } from '@/helpers/utils'
+import { goodsType, orderType } from '@/constant/order'
 
 import iconTeacher from '@common/images/icon_teacher.png'
 import request from '@/helpers/request'
+import dayjs from 'dayjs'
+import ColResult from '@/components/col-result'
 
 export default defineComponent({
   name: 'list',
@@ -28,23 +32,72 @@ export default defineComponent({
       timeStatus: false,
       currentDate: new Date(),
       typeStatus: false,
-      actions: [{ name: '全部' }, { name: '已完成' }, { name: '未完成' }]
+      // 订单状态 WAIT_PAY 待支付 PAYING 支付中 PAID 已付款 CLOSE 已关闭 FAIL 支付失败 （多选用,分割）
+      actions: [
+        { name: '全部' },
+        { name: '支付中', status: 'PAYING' },
+        { name: '已付款', status: 'PAID' },
+        { name: '已关闭', status: 'CLOSE' },
+        { name: '支付失败', status: 'FAIL' }
+      ],
+      list: [],
+      dataShow: true, // 判断是否有数据
+      loading: false,
+      finished: false,
+      searchName: '全部',
+      params: {
+        status: '',
+        page: 1,
+        rows: 20
+      }
     }
   },
   methods: {
     async getList() {
       try {
-        const res = await request.get
+        const params = {
+          ...this.params,
+          searchDate: dayjs(this.currentDate).format('YYYY-MM')
+        }
+        const res = await request.post('/api-student/userOrder/page', {
+          data: params
+        })
+        const result = res.data || {}
+        // 处理重复请求数据
+        if (this.list.length > 0 && result.pageNo === 1) {
+          return
+        }
+        this.list = this.list.concat(result.rows || [])
+        this.finished = result.pageNo >= result.totalPage
+        this.params.page = result.pageNo + 1
+        this.dataShow = this.list.length > 0
       } catch {}
     },
     onDetail(item: any) {
       this.$router.push({
-        path: '/tradeDetail'
+        path: '/tradeDetail',
+        query: {
+          orderNo: item.orderNo
+        }
       })
     },
     onConfirm(date: Date) {
       this.currentDate = date
       this.timeStatus = false
+      this.onSearch()
+    },
+    onSelect(item: any) {
+      this.params.status = item.status
+      this.searchName = item.name
+      this.onSearch()
+    },
+    onSearch() {
+      this.dataShow = true
+      this.loading = false
+      this.finished = false
+      this.list = []
+      this.params.page = 1
+      this.getList()
     }
   },
   render() {
@@ -65,7 +118,7 @@ export default defineComponent({
                   <span>
                     {(this as any).$filters.dateFormat(
                       this.currentDate,
-                      'YYYY-MM-DD'
+                      'YYYY-MM'
                     )}
                   </span>
                   <Icon
@@ -83,7 +136,7 @@ export default defineComponent({
                     this.typeStatus = true
                   }}
                 >
-                  <span>全部</span>
+                  <span>{this.searchName}</span>
                   <Icon
                     classPrefix="iconfont"
                     name="down"
@@ -95,43 +148,67 @@ export default defineComponent({
             }}
           ></Cell>
         </Sticky>
-
-        <div class={styles.list}>
-          <CellGroup onClick={this.onDetail}>
-            <Cell
-              title="2022-3-25 18:56"
-              value="交易成功"
-              valueClass={styles.tradeType}
-            />
-            <Cell
-              v-slots={{
-                icon: () => (
-                  <Image
-                    class={styles.tradeLogo}
-                    src={iconTeacher}
-                    fit="cover"
-                  />
-                ),
-                title: () => (
-                  <div class={styles.title}>
-                    <span>购买课程</span>
-                    <span class={styles.desc}>会员缴费</span>
-                  </div>
-                ),
-                default: () => (
-                  <div class={styles.content}>
-                    <span class={styles.price}>￥100</span>
-                    <span class={styles.num}>x1</span>
-                  </div>
-                )
-              }}
-            />
-          </CellGroup>
-        </div>
+        {this.dataShow ? (
+          <List
+            v-model:loading={this.loading}
+            finished={this.finished}
+            finishedText=" "
+            class={[styles.list]}
+            onLoad={this.getList}
+          >
+            {this.list.map((item: any) => (
+              <CellGroup
+                onClick={() => {
+                  this.onDetail(item)
+                }}
+              >
+                <Cell
+                  title={dayjs(item.createTime).format('YYYY-MM-DD HH:mm')}
+                  value={orderType[item.status]}
+                  valueClass={styles.tradeType}
+                />
+                <Cell
+                  v-slots={{
+                    // icon: () => (
+                    //   <Image
+                    //     class={styles.tradeLogo}
+                    //     src={iconTeacher}
+                    //     fit="cover"
+                    //   />
+                    // ),
+                    title: () => (
+                      <div class={styles.title}>
+                        <span>{item.orderName}</span>
+                        <span class={styles.desc}>
+                          {goodsType[item.orderType]}
+                        </span>
+                      </div>
+                    ),
+                    default: () => (
+                      <div class={styles.content}>
+                        <span class={styles.price}>
+                          ￥
+                          {(this as any).$filters.moneyFormat(item.actualPrice)}
+                        </span>
+                        {/* <span class={styles.num}>x1</span> */}
+                      </div>
+                    )
+                  }}
+                />
+              </CellGroup>
+            ))}
+          </List>
+        ) : (
+          <ColResult
+            btnStatus={false}
+            classImgSize="SMALL"
+            tips="暂无购买记录"
+          />
+        )}
 
         <Popup show={this.timeStatus} position="bottom" round closeOnPopstate>
           <DatetimePicker
-            type="date"
+            type="year-month"
             v-model={this.currentDate}
             formatter={formatterDate}
             onCancel={() => {
@@ -146,6 +223,7 @@ export default defineComponent({
           actions={this.actions}
           closeOnClickAction
           cancelText="取消"
+          onSelect={this.onSelect}
           onCancel={() => {
             this.typeStatus = false
           }}

src/teacher/live-class/create-components/detail.tsx

@@ -86,6 +86,7 @@ export default defineComponent({
           createState.live.mixStudentNum = null
           createState.live.backgroundPic = ''
           createState.live.backgroundPicTemplate = ''
+          createState.coursePlanStatus = false
         })
       }
     }

src/teacher/live-class/live-detail.tsx

@@ -3,6 +3,7 @@ import SectionDetail from '@/business-components/section-detail'
 import UserDetail from '@/business-components/user-detail'
 import UserList from '@/business-components/user-list'
 import ColResult from '@/components/col-result'
+import { postMessage } from '@/helpers/native-message'
 import request from '@/helpers/request'
 import { state } from '@/state'
 import dayjs from 'dayjs'

src/views/trade/trade-detail.tsx

@@ -2,7 +2,7 @@ import ColHeader from '@/components/col-header'
 import { Cell, CellGroup, Col, Image, Row } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './trade-detail.module.less'
-import { goodsType } from '@/constant/music'
+import { goodsType } from '@/constant/order'
 
 import iconTeacher from '@common/images/icon_teacher.png'
 import request from '@/helpers/request'