更新打包

dist/assets/home-layout-center-legacy.b8ad10ff.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,s,a){try{var u=t[s](a),c=u.value}catch(i){return void n(i)}u.done?e(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.19a69a6b.js","./index-legacy.b5ca4eaa.js","./auth-legacy.918bd481.js","./routes-common-legacy.8bd31266.js"],(function(e){"use strict";var n,r,o,s,a,u,c,i,f,l;return{setters:[function(t){n=t.d,r=t.g,o=t.t,s=t.p,a=t.i,u=t.j,c=t.C,i=t.F},function(t){f=t.a,l=t.b},function(){},function(){}],execute:function(){e("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var e,n=this;return(e=regeneratorRuntime.mark((function t(){var e,u,c;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return e=t.sent,u=e.data.authentication,o(u.token_type+" "+u.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:u.token_type+" "+u.access_token}}),t.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=t.sent,a(c.data),n.$router.push("/home"),t.next=17;break;case 14:t.prev=14,t.t0=t.catch(0),n.status=!0;case 17:case"end":return t.stop()}}),t,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var a=e.apply(n,r);function u(e){t(a,o,s,u,c,"next",e)}function c(e){t(a,o,s,u,c,"throw",e)}u(void 0)}))})()}},render:function(){return u(i,null,[this.status?u("div",{class:l.error},[u(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):u("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.004c0a07.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.b8057a39.js
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.86c49983.js";import{a,b as h}from"./index.4c11a10f.js";import"./auth.631d0a27.js";import"./routes-common.8d206cf7.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.b4531198.js";import{a,b as h}from"./index.0539ad48.js";import"./auth.212f30c4.js";import"./routes-common.da70ca0a.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> colexiu-payment:dist/assets/home-layout-center.004c0a07.js

dist/assets/home-layout-center.b8057a39.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.b8057a39.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.86c49983.js";import{a,b as h}from"./index.4c11a10f.js";import"./auth.631d0a27.js";import"./routes-common.8d206cf7.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.b4531198.js";import{a,b as h}from"./index.0539ad48.js";import"./auth.212f30c4.js";import"./routes-common.da70ca0a.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> colexiu-payment:dist/assets/home-layout-center.004c0a07.js

dist/assets/member-active-legacy.9b918f2a.js

@@ -0,0 +1 @@
+!function(){var e=document.createElement("style");e.innerHTML="._memberActive_162ig_1{font-size:0;background-color:#ebe2b9}._memberActive_162ig_1 ._backIcon_162ig_5{position:fixed;top:.53333rem;font-size:.58667rem;color:#323233;left:.42667rem}._memberActive_162ig_1>img{width:100%;line-height:0}._memberActive_162ig_1 ._memberBtn_162ig_16{width:60%;margin:0 auto;padding:.26667rem 0 .66667rem}._memberActive_162ig_1 ._memberBtn_162ig_16 img{width:100%}\n",document.head.appendChild(e),System.register(["./index-legacy.19a69a6b.js"],(function(e){"use strict";var n,i,t,c,r,a,m,s;return{setters:[function(e){n=e.d,i=e.P,t=e.S,c=e.U,r=e.n,a=e.j,m=e.M,s=e.f}],execute:function(){var _="_memberActive_162ig_1",g="_backIcon_162ig_5",o="_memberBtn_162ig_16";e("default",n({setup:function(){var e=i(),n=t(0),l=function(){e.push("/memberCenter")},u=function(){s().isApp?r({api:"goBack"}):e.back()};return c((function(){r({api:"getNavHeight"},(function(e){var i=e.content,t=i.dpi||2;if(i.navHeight){var c=i.navHeight/t;n.value=c}}))})),function(){return a("div",{class:_},[a(m,{name:"arrow-left",class:g,style:{top:"calc(".concat(n.value,"px + 12px)")},onClick:u},null),a("img",{src:"./assets/1.31b016a2.png"},null),a("img",{src:"./assets/2.66fac122.png"},null),a("img",{src:"./assets/3.dc63c4a5.png"},null),a("div",{class:o},[a("img",{src:"./assets/btn.8f04e514.png",onClick:l},null)])])}}}))}}}))}();

dist/assets/member-active.0d46c6c4.js

@@ -0,0 +1 @@
+import{d as p,P as v,S as b,U as g,n as c,j as e,M as u,f as d}from"./index.b4531198.js";const f="_memberActive_162ig_1",k="_backIcon_162ig_5",_="_memberBtn_162ig_16";var t={memberActive:f,backIcon:k,memberBtn:_},B="./assets/1.31b016a2.png",h="./assets/2.66fac122.png",A="./assets/3.dc63c4a5.png",H="./assets/btn.8f04e514.png",C=p({setup(){const a=v(),n=b(0),r=()=>{a.push("/memberCenter")},o=()=>{d().isApp?c({api:"goBack"}):a.back()};return g(()=>{c({api:"getNavHeight"},i=>{const{content:s}=i,m=s.dpi||2;if(s.navHeight){const l=s.navHeight/m;n.value=l}})}),()=>e("div",{class:t.memberActive},[e(u,{name:"arrow-left",class:t.backIcon,style:{top:`calc(${n.value}px + 12px)`},onClick:o},null),e("img",{src:B},null),e("img",{src:h},null),e("img",{src:A},null),e("div",{class:t.memberBtn},[e("img",{src:H,onClick:r},null)])])}});export{C as default};

dist/index.html

@@ -36,10 +36,17 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.4c11a10f.js"></script>
   <link rel="modulepreload" href="./assets/index.86c49983.js">
   <link rel="modulepreload" href="./assets/auth.631d0a27.js">
   <link rel="modulepreload" href="./assets/routes-common.8d206cf7.js">
+=======
+  <script type="module" crossorigin src="./assets/index.0539ad48.js"></script>
+  <link rel="modulepreload" href="./assets/index.b4531198.js">
+  <link rel="modulepreload" href="./assets/auth.212f30c4.js">
+  <link rel="modulepreload" href="./assets/routes-common.da70ca0a.js">
+>>>>>>> colexiu-payment
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -52,7 +59,11 @@
   <!-- <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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.00452ac8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.b5ca4eaa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> colexiu-payment
 </body>
 
 </html>

dist/teacher.html

@@ -49,7 +49,11 @@
   
   <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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.36b10a99.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.eca69152.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> colexiu-payment
 </body>
 
 </html>

dist/tenant.html

@@ -51,7 +51,11 @@
   <!-- <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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.ffdc4221.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.102d87f3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> colexiu-payment
 </body>
 
 </html>

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

@@ -7,6 +7,7 @@ import btn from './images/active/btn.png'
 import { useRouter } from 'vue-router'
 import { postMessage } from '@/helpers/native-message'
 import { Icon } from 'vant'
+import { browser } from '@/helpers/utils'
 
 export default defineComponent({
   setup() {
@@ -17,6 +18,14 @@ export default defineComponent({
       router.push('/memberCenter')
     }
 
+    const onBack = () => {
+      if (browser().isApp) {
+        postMessage({ api: 'goBack' })
+      } else {
+        router.back()
+      }
+    }
+
     onMounted(() => {
       postMessage({ api: 'getNavHeight' }, res => {
         const { content } = res as any
@@ -35,6 +44,7 @@ export default defineComponent({
           style={{
             top: `calc(${navBarHeight.value}px + 12px)`
           }}
+          onClick={onBack}
         />
 
         <img src={p1} />

src/tenant/music/album-detail/index.tsx

@@ -203,7 +203,7 @@ export default defineComponent({
     }
     const cancelPayment = async (orderNo: string) => {
       try {
-        await request.post('/api-student/userOrder/orderCancel/v2', {
+        await request.post('/api-student/userOrder/orderCancel', {
           data: {
             orderNo
           }

src/views/order-detail/index.tsx

@@ -240,8 +240,8 @@ export default defineComponent({
 
           // 判断是否为原生支付
           if (
-            this.orderInfo.paymentVendor.indexOf('wxpay') > -1 ||
-            this.orderInfo.paymentVendor.indexOf('alipay') > -1
+            this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
+            this.orderInfo.paymentVendor?.indexOf('alipay') > -1
           ) {
             this.paymentStatus = true
           } else {