From 3afba2870e86fc942ec741c361c79b0b97acc430 Mon Sep 17 00:00:00 2001
From: liuyuan <liuyuan@artspring.com.cn>
Date: Wed, 19 Feb 2025 11:50:43 +0800
Subject: [PATCH] =?UTF-8?q?vip=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     |  Bin 0 -> 10244 bytes
 .idea/codeStyles/codeStyleConfig.xml          |    5 +
 .idea/dictionaries                            |    6 +
 .idea/modules.xml                             |    8 +
 .idea/sociology_app.iml                       |   12 +
 .idea/vagrant.xml                             |    7 +
 .idea/vcs.xml                                 |    6 +
 .idea/workspace.xml                           |   50 +
 bkhumor-emojiplus/.DS_Store                   |  Bin 0 -> 6148 bytes
 components/.DS_Store                          |  Bin 0 -> 10244 bytes
 config/baseUrl.js                             |   38 +-
 config/requestConfig.js                       |    3 +-
 js_sdk/.DS_Store                              |  Bin 0 -> 6148 bytes
 node_modules/.DS_Store                        |  Bin 0 -> 14340 bytes
 pages/.DS_Store                               |  Bin 0 -> 10244 bytes
 pages/bookShop/orderList.vue                  |    1 +
 .../component/input/{input.nvue => input.vue} |    0
 pages/curriculum/order/curriculum/detail.vue  |    7 +-
 pages/curriculum/order/curriculum/index.vue   |  288 +---
 .../curriculum/order/curriculum/mp3Detail.vue |   20 +-
 .../order/curriculum/operationsList.vue       |    1 -
 .../order/curriculum/videoDetail.vue          |   27 +-
 .../order/curriculum/videoDetailOss.vue       |    5 +-
 pages/mine/.DS_Store                          |  Bin 0 -> 6148 bytes
 pages/mine/mine/index.vue                     |  624 +++------
 pages/mine/vip/index.vue                      | 1221 ++++-------------
 pages/mine/vip/order.vue                      |  767 +++--------
 pages/tabBar/extUI/{extUI.nvue => extUI.vue}  |    0
 .../template/{template.nvue => template.vue}  |    0
 static/.DS_Store                              |  Bin 0 -> 8196 bytes
 static/icon/chao_svip.png                     |  Bin 0 -> 2524 bytes
 static/icon/chao_vip.png                      |  Bin 0 -> 1055 bytes
 uni_modules/.DS_Store                         |  Bin 0 -> 18436 bytes
 unpackage/.DS_Store                           |  Bin 0 -> 6148 bytes
 34 files changed, 793 insertions(+), 2303 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/dictionaries
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/sociology_app.iml
 create mode 100644 .idea/vagrant.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 bkhumor-emojiplus/.DS_Store
 create mode 100644 components/.DS_Store
 create mode 100644 js_sdk/.DS_Store
 create mode 100644 node_modules/.DS_Store
 create mode 100644 pages/.DS_Store
 rename pages/component/input/{input.nvue => input.vue} (100%)
 create mode 100644 pages/mine/.DS_Store
 rename pages/tabBar/extUI/{extUI.nvue => extUI.vue} (100%)
 rename pages/tabBar/template/{template.nvue => template.vue} (100%)
 create mode 100644 static/.DS_Store
 create mode 100644 static/icon/chao_svip.png
 create mode 100644 static/icon/chao_vip.png
 create mode 100644 uni_modules/.DS_Store
 create mode 100644 unpackage/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8835b6c7656370f393aa95b218b637f60fac8348
GIT binary patch
literal 10244
zcmeI1PiP!f9LIl?-6Weo=nBQE&}1(KF;<g{;zc*@R=w0#bMc@wo82@?v;Uf8F@Y+p
zH&LOeC>Er*N<2tG1kp<hMd(4ScoFnsD_$fJtKg*vzrQzcXMVrgnceL{vGAtMzUjR0
zo8RYs=e^&|n-GzAxLKYd$`MfpJD1sU{KRZr&wIx<V9zY0^w6FvOEYt&dbQD^bSInx
z&H?9ubHF*^9QeODfM+&unK8d~zs>>YfO8;lfb&BRJC}J|w*1nh4*ZxU0LnB@n+?ZV
zK0ukXW!{!8zeEi-&u@y-Z|d14hUYiO`JC0|ZQ1fmzd3n!@!{FXo?W4MCOWR4Gjj6s
ze(8Rl1I~d?2YBtCrblRrR%k=6-}j}SJ1Fa_^+I8xQeVKi%rob+yB}|VGpp;%UF#dm
z;kSW(>2qjGqlmjq3)DpH3YBS*)@V~Q5T(9P(n+3QzG%KXRWm%X*R0k<wq9DvX>-{i
zI9Ci`QPX9g1f8grOdnl*?b5W*q!b}Zyh6t}pHeb(6910TEFGcaG)FIL3bqp2Goq0!
zXTA&kiP42b-E^AE#7t3<8nmKmvSrlS8p$xS7cd01VdTzQ9WT!T@4;AE#fWKAmFgHP
zhcIIJ=rrz510$$O>xyOQ(xd&glAQNfZ{B;sAKQJzlOyZ)TB`ny?r{HxsD$2BO`mG2
zCv=nNsj8RE`;Tt5$A3f<I-I0Y9Nsi@j9QKcXln4dMjH`l$LDvFbdu}P1A&*Z*Ocz{
z(kjloIK1_vMyGK9m$YA>yb-OJTvv9^YQO9?Bu|n?anLoNW0|%vHrF^yXpWJ~hC|d#
zju);94y6h2Tard|WPOg)w2nNmj$E~>IX-;daEN-zarx>W?J+-u*%Vwu`jMp39M+F2
zoY=%(i;NqZ`pIyJddX2b@M?HplqU2eNuxPVupi@yUpIOCq?uD?WQYpJv&s_Q?+?G#
zO)L3+-VVld;<cq`{pcn4z?pN*J&0^p#1lC}N(YaBrfVhJm$w2o(O%NTD`b3nXrAMb
zm~2|atUm?+*5I9TjHvKwyh`%yUHP+pFJrDJxw<PAAHc8;+icJ8EFB~4>z6wflIw@Z
z|7vqZt|OU}Rhnmyc{1>bv!wq9gZZQ9o;MMvkxaK<3Ya>sC8@gUG*_0nhA@*iFp@Ul
zQ%N#;*<Zhk)=Qqx@0)zjzE7!ZNR}jx<nSi#cxDbBNsE$#X!2Q53>r#PD;csg0fSP6
znIK*v;}gvzfQ_)lb6>}wZR%PXf8uN;zG*KVh*!kKA4A@$;U09!Lc{ytJOGvirR2J>
z{dD`@B&tJ?daEVx@MC5?-)(u1z_B`x%Xrf&;&=s5IrKz(n7R(`9xWvQj~4@9d$tPu
z(SIx1AN&43V*0~5wS@OalUZdS#&WyI(1#e6<Zgbu_P(7HvC5FOyHfIvJ#YLT1Ru}Q
zN+ffno;q*FXHYA7c5l4h<`M1X_>5P`_>{Va0LZ7WAUfx-I*uaQYvO}Wh2;3{?|>t6
z9m$fcQam)xJma9)?D-DrP4U_=Q7ajrNWates*66ngZ=0gclrc#-)URQ2hQ>L|D%{I
z34i~;)4Jt&odeE++i<{37v>6w(ZGIN?`S%JGdb+@*m+}J%P&n6{IG=2o6qt1PX_;e
z(4I3%-5%#{+44)%9PLbVl>XQJfBlaEZvDS1pN~mvd-()U(x~TP`+JC3yURB%a_j%a
N=qf<^_g}96{{cD&OU(cP

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/dictionaries b/.idea/dictionaries
new file mode 100644
index 0000000..7793bcc
--- /dev/null
+++ b/.idea/dictionaries
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectDictionaryState">
+    <dictionary name="liuyuan" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..be40127
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sociology_app.iml" filepath="$PROJECT_DIR$/.idea/sociology_app.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/sociology_app.iml b/.idea/sociology_app.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/sociology_app.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml
new file mode 100644
index 0000000..a5aa786
--- /dev/null
+++ b/.idea/vagrant.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VagrantProjectSettings">
+    <option name="instanceFolder" value="" />
+    <option name="provider" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..82d92d1
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="dfe45a93-1e39-4dfb-998a-b7e9e7e56d8f" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/pages/component/input/input.nvue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/tabBar/extUI/extUI.nvue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/tabBar/template/template.nvue" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="2oVBuLEFt2modl2kF1Af1nW7QEi" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs.protractor.protractor_package" value="" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="settings.editor.selected.configurable" value="com.github.masahirosuzuka.PhoneGapIntelliJPlugin.PhoneGapConfigurationProvider" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="dfe45a93-1e39-4dfb-998a-b7e9e7e56d8f" name="Default Changelist" comment="" />
+      <created>1730945085136</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1730945085136</updated>
+      <workItem from="1730945086809" duration="384000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/bkhumor-emojiplus/.DS_Store b/bkhumor-emojiplus/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f185ada600e505c218b79cb71e4f9b73aa318b84
GIT binary patch
literal 6148
zcmeHKy-veG4EBXmg`c4#<L$7Ng*8;+2|BWrwg`%vUL*>0UICs0X5N99VdDw-d_IL7
zX(S{hgpe)SU*faxoG(Al5s?|)&4)w-B1)l*$qvj0;c?cMB*C)}G=2_8E4qZP>9!TE
zj=#tN-@9F!k)wi2*!uo0uZH89D@tE<a{Sa4SGYW%F5ML4>GR3`<KgP{v^#eG?b!0V
zx&8!G(l(y00yW;yBCd{(;?ZVJFI8PrBfoH;m28fP*XQ?x`gp3>bOBw^EUw`E{p)zM
zhPQ{hhG>pv6<sk=9evAns3-%<fHLq?2GFxv(mg@7%78MU4Aczp_rXFLvw)SL|8&6k
zEda0ww-+4ye<h%02QUj*3Bm(0k_wbm6Sf#e(&4uuE(=%*N;(<8GUf>@o3KMMes%b*
z4=0les#OM*ftZ0UIUR8SKkMHA$4Ppo3@8KtiUHHh$N31C6nbmx;<(pZ=mg5bag|`5
jf&<@*5zDRk0O|#P%Ll+LU?m6-M1KT44QiBuUuEC}x|46T

literal 0
HcmV?d00001

diff --git a/components/.DS_Store b/components/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f70896ecbb62bd13cb1fb61ef3fa1d9e7ec45bcb
GIT binary patch
literal 10244
zcmeI1O=w(I6vxk-j_ssP%1{uO9ZD$$8<IkoLZ)T33tbcft>7lf%$O7>^Ts5TnEJsi
zg>IT|Ty!TbT@|`(#f3<zf=bE4g^2D1L3eJt^?&YtbKg1dYhDUU7xxWsZsxuJx%YR@
z{k|ch;L@;jo~S`YHQb!mr}33>@q4~gS0#F~gfxIX(JbxIN4?eai|sI__78jnd<1+1
zd<1+1d<0&G2w=|Ut9Hz${@X{uN5DtGMS#bL25wH9Q981z89MM~wg5=0cx*2GjeUTz
zX+&u=N=G&|rpVLo9)id;h_)DkHOKn~%aJytbYxR&PJuP2ASyYCb|`@<9d->Pr=V$5
z|Lr5-Ban{35*{6)Wm?BQko))bffdgU(~9-5)mrI=D|l1;{`T(e*ZbdH%u;nqs0M3%
zS}-oHiEO~L0-6ncmT8r`_B>&%SlCZ1B+ug~f=A`E9>zTRD$TRRJjba`Yc!-jy+d8P
zjwo$X4`~O#HZ<LdZzt&`>+>HSYhf9ZysVA(qrrYm!;hhf>#p%(2R;naJ}k6~w37dy
z-yMH$-jcnHUUOez?iwN;;$*3hsE2419Ub#mj%R5k=bwK#&QxBKuSlo4%q&wkt)Ndg
z=tIP_jc9JsE-fOWJ=|^D(wwK~z&X)Ia_{}^xJ%f@t@|K$+OK(zch&f{ndCq9n|voZ
zSEp`_#{g$5<C^tempkBc51UbFgFZm?5_SB==gIf7{2w~5e3ge}$kS+!hs-ezjxPFm
z8+|22EPAM2?)}$QeFh8XinNmNo1YwCZr+l$j9zgE`^;Sj_kgy++7<0_fOgq7G1X($
zq36Grv5|hf{o2RldY)L8^yeUU%CBmj{hCpJanD*a^TQTxsv4pC&0@9m<=r#RmxBDI
z7v(Gzzg@&~oyYZ(S0D5SFJW`FlD)I%*bDUWcu+>Kxtl;y?dh`V5nE>d=wcoWxlQTl
zpPDISBmLO9>->=IDYGnD69=)=e$BIAHPi>sfXncvgWeHpKjzH3CaIC!_a8a#R9=#^
zNLRqM4JKY&B)HC<5bRDPx#pjwxP&fl4@J5Rt|_!$vl2th-bc-c$(f<@GsrSjlI`g;
z$Cjy#>57$_&x{W;zcs`ywL%D{5`2+L@}2x8lg}w*zG7tt-(keB2dZ7L=`oltJ^-0|
zFPWZAeKH<z6PlPNPop_*p%^*_ju7_{_iP@~(XaEBlI^co9a~PmvL{SdYu;$wXVw*v
z@(ebM9vPxv4Dma$CkXC=dB%8_sg~S(XB~H;MI7OB78(3CtOu9DKZ~`4nU(c8Gjj*j
zDUD>UUT~}#x|py?m&r8*Q{F6E`EuKEB{Y(2|2@H#(#2dwI>l9ah$7JsI4`d4esXR(
z!VN;bmppeqb36%6%#x>39QN?(C|#qsK!R}upA9qf>6J!M`3gLlI?46vRkwc6(Z+m}
zw2E_l%EeK8@#~N^ZSeX3o0#r%{{R2t1$avz0Uv>vJ_13twb;4@%;;=A1<Ysd4ctq(
z`C{G3rp5$cEaB(oI37QEFLO3}HqR+vc;AfDkxh*`o*Q$d_B8)L|7QT7c1Gt6YFs5V
o59RLB)%@-E|M8x7eD)>wwsQ67_y1U%j?ZO8j8uF2pZEX&0y6(A)Bpeg

literal 0
HcmV?d00001

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 5e03e6a..ad05360 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,42 +2,12 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	// baseUrl = "http://localhost:7001/";
-	// socketUrl = "ws://localhost:6001/";
-	// baseUrl = "https://twin-ui.com/demo/";
-	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-
-
-
-
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-
-
-	// baseUrl = "http://101.201.146.165:8088/App-EH/";   // 一路健康APP线上正式
-
-
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
-	// baseUrl = "http://59.110.212.44:9200/pb/";
-	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
-
-
-	// baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
-
-
-
-	// baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
-	// socketUrl = "ws://8.129.186.35:6001/";
+	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	//baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 } else if (process.env.NODE_ENV === 'production') {
-	// baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
 	// 生产环境11	
-
-	// baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
-	// baseUrl = "http://59.110.212.44:9100/pb/";
-	// baseUrl = "https://testapi.nuttyreading.com/";
-	baseUrl = "https://api.nuttyreading.com/"; //1
-	// baseUrl = "ws://twin-ui.com:6001/";
-	// socketUrl = "ws://twin-ui.com:6001/";
+	//baseUrl = "https://api.nuttyreading.com/"; //1
 }
 const courtConfig = {
 	//微信公众号APPID
diff --git a/config/requestConfig.js b/config/requestConfig.js
index 21d674b..34dfd86 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -39,7 +39,8 @@ let $http = new request({
 		// 'Content-Type': 'application/json;charset=UTF-8',
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
-	}
+	},
+	timeout: '15000' // 15秒
 });
 // 添加获取七牛云token的方法
 $http.getQnToken = function (callback) {
diff --git a/js_sdk/.DS_Store b/js_sdk/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..84389485b363d260d0ede31a6431f6ea907f7832
GIT binary patch
literal 6148
zcmeHKyH3MU3_TZ$sCbC7F-BqpB(gAvDtti)R!EDWQrkoz1V{||20n^UVPRlm=lJ@n
zO(><XAXM3veG<n`>~od47l3Qu_F|v~ph*>MtkHZSa$R&vmV#%4==?n{aE&4QxZ%&l
z7%&F@I|K6WZsHE-I6#5w``bs3(cm)fbn{`MZJZu`A3e;|G#lg@qnfWTk57A}=i_-9
zy<cV&SJjGqVOz87M~t}M!|paKnv+rOWB+a3$K0$*FF((!_jAbNu!?(RT#qhSpuj`D
z{uNn+PZ8C6JMZIqr=lkH&5o+qBXhxIK^fr87HO_4nl%QD0b^jyfP5b!s$deZRP>(?
z8ovb~Ht6=kV?Q&9kvND+z*3POiqll0rn<1jaGFkk6ylPArJ|<8`6u%};mI!SP+XW;
zF7n}UiK1C!z!<1Au&k#ong1uV_y6@IJ2M81frVngHPTMnW=mnVPBka9Hlm(UMI^3N
l^eHr99Qy+q#XD3lycWp;F$q{I(nGO70-gpl#=xI4@Bs`|gNpzF

literal 0
HcmV?d00001

diff --git a/node_modules/.DS_Store b/node_modules/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..091175868cf67dfcfcdfa2868fbfe87364fc0d03
GIT binary patch
literal 14340
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

literal 0
HcmV?d00001

diff --git a/pages/.DS_Store b/pages/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ea0a3886179f5f09d4923c1276cd76d1ede921ed
GIT binary patch
literal 10244
zcmeHMJ!lj`6n^7f^o$xbVqqaHC?eXJAPCXo3};~%h+yj_7nA61_DFImtPUcGg$QCH
zilVKRKOou)T3d^Sm7qc6PmxB%@6GJZ&AXfXNuj2gftk0r^SyoFeEW8GXO4)}Xtgv%
z6cJGlmF>>$Xgr1cxwe!|>6w$T3jRck<>{gE$t13{V8e-^Ku{nk5EKXs1O+yR0(fV0
z$!#+>v_XNOKv2Lc!1F_d$~K?cnz4H7K%<ucuvwhe1;<ziXrCyx`P9~o)vmavSv{!K
zRi#S|W!%vpF&s9Z+M2P(os@AWl}1+S3PtJY@QXB@RNmOo1_gowtqSnky^o4CK?zlx
z*YAT@WpA7m3KQjI0%vm<pMAc0WbVzWW<;qAqB7&|5JYgN9f)6|C7PmnTBKQ8z)_4k
z*UabGYG<^|@5yV+ufz4@q`|j056ORw`46<`Ps4IYWXr>Dcy|mp-rF&BjNy)=S06bJ
zJ!|H479@0u#%TumP!ZfS*J5yQ!MJ=MU0JE;ga_A9x)V<D%6vdb+DemP6H^84oF^}K
zk9_i@TyDoNuhzMFuIDP)87cVfdCdHFX?|5?FK6x<aJ&Gf^I%-m`3%-VNp<^UZ(c6{
z_^ajLLp*mp>+=-jQ*U{E{TLsQZXVAjAC*yKF`~?Ve*JoJ?ij}QeXHMtHrPgvbi)ds
znFq|X59%{ZXfN2&reWFZa=Q1+a&r7#{rm_K-+Z+6(KKQwn9CMKeD(aGj&FP2_<Ik0
zuWRD?yYc-95#QXWoPKI~<{U%jP1BTMLHF;1MGMB|a$?DH@!%TwrV~!^BK>^y>)E`d
zv!{scDS@F>h*n0x&5LvStsVYR*QyP+!Lb`w@HAhES@4|Y8Aj-qd9?;^w$J7B`<><E
z^fx&8`bFGqgiF(A%o6+t9!1-fx!0GQ``!3omVegu5Z7?CryWM{ApM*V(pfN=MHW?&
zK~*p+>w9(%_p6LK4eXk<q2d7e_2lRBesRmb*Lw7AXu4isInD~}oyFLArj}Z((jB+Y
z<@@rf)!F*G8vFW1Tvg+^p#%kj0zrYGKu};KD3CEEBHsT$-TwdojX*VU2nqxR{*nSJ
zTNp2l;^OJvdP^AIYmZRRqjF(f%~<V%MsLT%>g{;^;QfF@sEj?zmJ5#asjV4{GbsQ3
n&j4p1)4#fRzwZ4A@qHiG|8~zo>Jrxf=^nY=9}xQd$Mydocr^Ej

literal 0
HcmV?d00001

diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index d846550..884665e 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1421,6 +1421,7 @@
 
 	.commonDetailPage {
 		background-color: $themeBgColor;
+		height: calc(100vh);
 	}
 
 	.order_box {
diff --git a/pages/component/input/input.nvue b/pages/component/input/input.vue
similarity index 100%
rename from pages/component/input/input.nvue
rename to pages/component/input/input.vue
diff --git a/pages/curriculum/order/curriculum/detail.vue b/pages/curriculum/order/curriculum/detail.vue
index 82584ae..67a7a7f 100644
--- a/pages/curriculum/order/curriculum/detail.vue
+++ b/pages/curriculum/order/curriculum/detail.vue
@@ -1,10 +1,5 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
   <view class="container commonPageBox commonDetailPage">
-    <!-- 公共组件-每个页面必须引入 -->
-    <public-module></public-module>
     <template v-show="!screenLoading">
       <z-nav-bar bgColor="#333" fontColor="#fff" title="教学内容"></z-nav-bar>
 
diff --git a/pages/curriculum/order/curriculum/index.vue b/pages/curriculum/order/curriculum/index.vue
index f1d129b..a1503d4 100644
--- a/pages/curriculum/order/curriculum/index.vue
+++ b/pages/curriculum/order/curriculum/index.vue
@@ -65,8 +65,6 @@
 								<text class="courseTitle title">{{
                   curriculumData.title
                 }}</text>
-
-								<!-- <view class="start_learn_btn PM_font">进入学习</view> -->
 							</view>
 							<view style="color: #b0b0b0; padding: 0 20rpx">
 								{{
@@ -159,17 +157,11 @@
                           slotProps.row.viewFlg == 1 ? 'aui-text-success' : ''
                         }`">{{ slotProps.row.title }}</text>
 										</view>
-
-										<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
 									</template>
 
 									<template slot="leftSlot" slot-scope="slotProps">
-										<!-- {{ slotProps.row.bxType }} -->
-										<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
 									</template>
 									<template slot="rightSlot" slot-scope="slotProps">
-										<!-- {{ slotProps.row.bxType }} -->
-
 										<text class="fdButtonBox aui-text-success" style="background: none"
 											v-if="slotProps.row.isAudition == 1">试听</text>
 
@@ -178,26 +170,7 @@
 								</courseDescription>
 							</view>
 							<view class="small_class_teaching_box">
-								<!-- <view class="small_class_teaching_top">
-                    <view class="small_class_teaching_top_left">
-                        <image src="@/static/icon/course_ic.png" mode="aspectFil" class="icon1"></image>
-                        <text>小班教学</text>
-                    </view>
-                    <text>{{ curriculumInfo.remainingDays }}</text>
-
-
-                </view> -->
 								<view class="small_class_teaching_content">
-									<!-- <view class="top">
-                        <view class="top_item" v-for="(v, i) in teachingList">
-                            {{ v.title }}
-
-
-                        </view>
-
-
-                    </view> -->
-
 									<view class="schedule">
 										<view class="icon_box">
 											<image src="@/static/icon/course_07.png" mode="aspectFil" class="icon1">学习进度
@@ -224,15 +197,6 @@
 				</view>
 			</template>
 		</common-anchor-link>
-
-		<!-- <u-modal
-      :show="show"
-      :title="modalInfo.title"
-      :content="modalInfo.content"
-      showCancelButton
-      @confirm="hancleModalConfirm"
-      @cancel="hancleModalCancel"
-    ></u-modal> -->
 		<common-select-goods ref="commonSelectGoods" :selectGoodsData="selectGoodsData" :goodsList="goodsList"
 			:buyOptions="buyOptions" :customButtonGroup1="customButtonGroup1" @selectGoods="handleClickSelectGoods"
 			@onHandleClickBuy="
@@ -297,24 +261,7 @@
 				options: {},
 				percentage: 0,
 				selectGoodsData: {},
-				buyOptions: [
-					// {
-					// 		icon: 'chat',
-					// 		text: '客服'
-					// 	},
-					// {
-					//     icon: 'shop',
-					//     text: '店铺',
-					//     // info: 2,
-					//     infoBackgroundColor: '#007aff',
-					//     infoColor: "#f5f5f5"
-					// },
-					//  {
-					// 	icon: 'cart',
-					// 	text: '购物车',
-					// 	info: 2
-					// }
-				],
+				buyOptions: [],
 				customButtonGroup1: [{
 					with: 200,
 					text: "立即购买",
@@ -391,24 +338,17 @@
 		},
 		onLoad(options) {
 			this.options = options;
-
-			// this.getUserInfo()
-			// this.getCateList()
 		},
 		onHide() {
 			this.selectGoodsData = {};
 			this.protocolShow = false;
 			this.handleClickClose();
 			this.$refs.commonSelectGoods.close();
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		onUnload() {
 			this.selectGoodsData = {};
 			this.protocolShow = false;
 			this.$refs.commonSelectGoods.close();
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		computed: {
 			...mapState(["userInfo"]),
@@ -420,11 +360,6 @@
 			this.$nextTick(() => {
 				this.getCourseDescriptionData();
 			});
-
-			// 也可以通过主题形式调用，如：
-			// this.$refs.uNotify.primary('Primary主题')
-			// 关闭 notify
-			// this.$refs.uNotify.close()
 		},
 		methods: {
 			handleClickGetVip() {
@@ -432,10 +367,9 @@
 					url: "/pages/mine/vip/index",
 				});
 			},
+			//获取vip信息数据
 			getUserInfo() {
-				console.log("111111111111111111111111111");
 				this.$http.post("common/user/getUserInfo").then((res) => {
-					console.log(res, "111111111111111111111111111");
 					if (res.result.userVip) {
 						this.vip = res.result.userVip;
 					} else {
@@ -502,11 +436,6 @@
 				this.$forceUpdate();
 			},
 			onHandleClickBuy(e) {
-				console.log("e at line 387:", e);
-				// if (e.index == 0) {
-				//   this.handleClickClose();
-				// }
-				// if (e.index == 0) {
 				var mynavData = JSON.stringify({
 					goods: [this.selectGoodsData],
 					typeId: 0,
@@ -517,7 +446,6 @@
 				uni.navigateTo({
 					url: `/pages/goods/order/index?data=${mynavData}`,
 				});
-				// }
 			},
 			handleClickGoBuy() {},
 			handleClickClose() {
@@ -528,11 +456,8 @@
 			//获取相关关联课程商品
 			//获取相关关联课程商品
 			handleClickGetGoodsList(v) {
-				// console.log("data at line 313:", data);
-
 				if (v.type == 0) {
 					//免费
-
 					this.$http
 						.request({
 							url: this.urlList.startStudyForMF,
@@ -541,25 +466,13 @@
 								catalogueId: v.id,
 							},
 							header: {
-								//默认 无 说明：请求头
 								"Content-Type": "application/json",
 							},
 						})
 						.then(async (res) => {
-							console.log("res at line 493:", res);
 							if (res.code == 0) {
 								this.getCourseDescriptionData();
-								// this.$commonJS.showToast("");
 							}
-							// if (res.productList.length > 0) {
-							//   this.goodsList = res.productList;
-							//   this.selectGoodsData = this.goodsList[0];
-							//   this.$refs.commonSelectGoods.open();
-							//   this.show = true;
-							// } else {
-							//   this.$commonJS.showToast("此课程暂无购买方式");
-							// }
-
 							this.$forceUpdate();
 						});
 				} else {
@@ -585,7 +498,6 @@
 									id: v.id,
 								},
 								header: {
-									//默认 无 说明：请求头
 									"Content-Type": "application/json",
 								},
 							})
@@ -613,12 +525,6 @@
 						...this.taiHuClassInfo,
 					},
 				};
-				// $mars.progressBegin('申请中...');
-				// $mars.post(customerType, 'applyRelearn', data, function (ret) {
-				//     api.hideProgress();
-
-				//     fnLoadDataGrid();
-				// });
 			},
 			fnRelearn(oid, days, courseFee) {
 				//99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
@@ -654,33 +560,9 @@
 					fee: fee,
 				};
 				this.show = true;
-				// $aui.alert({
-				//     title: ,
-				//     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
-				//     buttons: ['取消', '确认'],
-				//     radius: 6,
-				//     titleColor: '#ff3300',
-				//     contColor: '#333',
-				//     btnColor: ''
 			},
 			//课程详情
 			async gotoDetail(v, index) {
-			console.log('v at line 664:', v)
-				console.log(
-					this.cateList[this.currentCateIndex],
-					8888888888888888888888888
-				);
-
-				// var result = await this.$commonJS.getCheckCourseStatus({
-				//   oid: v.courseOid,
-				// });
-				// console.log("result at line 364:", result);
-
-				// if (result.buyFlg == 0 && v.conditions != "01") {
-				//   this.$commonJS.showToast("请先购买课程");
-				//   return;
-				// }
-
 				if (
 					this.cateList[this.currentCateIndex].isBuy == 1 ||
 					v.isAudition == 1 ||
@@ -688,7 +570,6 @@
 					this.vip.type == "3"
 				) {
 					uni.navigateTo({
-						// url: '../bookShop/commodityDetail?id=' + item.id
 						url: `/pages/curriculum/order/curriculum/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
 					});
 				} else {
@@ -697,9 +578,7 @@
 			},
 			//相关课程
 			goCourseDescription(v) {
-				console.log(v);
 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
 				});
 			},
@@ -710,25 +589,17 @@
 				await $http
 					.request({
 						url: this.urlList.curriculumInfo,
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						method: "POST",
 						data: {
 							id: v.id,
 						},
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
 					.then(async (res) => {
 						if (res.code == 0 && res.chapterList.length > 0) {
-							// res.chapterList.map((item) => {
-							//   item.tryListen = [];
-							// });
-
 							list = JSON.parse(JSON.stringify(res.chapterList));
-
-							console.log("at line 1343:", list);
-							// console.log('status', res)
 						} else {
 							list = [];
 						}
@@ -741,8 +612,6 @@
 			getCourseDescriptionData() {
 				var data = {};
 				var that = this;
-				console.log(this.$store.state, "11111111111");
-
 				this.$http
 					.request({
 						url: this.urlList.list,
@@ -751,17 +620,12 @@
 							id: this.options.id,
 						},
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
 					.then(async (res) => {
 						that.curriculumData = res.data.course;
 						that.cateList = [...res.data.catalogues];
-
-						console.log("that.allDataList at line 1068:", that.allDataList);
-						// this..getPercentage();
-
 						for (let i = 0; i < that.cateList.length; i++) {
 							var list = await that.getChapterList(that.cateList[i]);
 
@@ -769,18 +633,12 @@
 								...that.cateList[i],
 								courseList: [...list],
 							};
-							// that.allDataList[i].courseList = [];
 						}
 
 						setTimeout(() => {
 							that.$refs.commonAnchorLink.getDistanceArr();
 						}, 200);
-						console.log("that.courseList at line 1238:", that.allDataList);
-						this.$forceUpdate(); // that.relatedCoursesList = res.data.correlatedList
-						//   ? res.data.correlatedList
-						//   : [];
-						// await that.handleselectCate(this.cateList[0], 0);
-						// socket.init();
+						this.$forceUpdate();
 					});
 			},
 			getPriceData() {
@@ -795,115 +653,12 @@
 			checkDisable() {
 				console.log("点击了");
 			},
-			// 显示无权限弹窗
-			// showNoRights() {
-			// 	let that = this
-			// 	uni.showModal({
-			// 		content: "",
-			// 		confirmText: '好的',
-			// 		showCancel: false,
-			// 		success: function(res) {
-			// 			if (res.confirm) {
-			// 				// console.log('用户点击确定');
-			// 				that.clear()
-			// 			}
-			// 		}
-			// 	})
-			// },
-			// // 获取用户详情
-			// getUserInfo() {
-			//   // 用户详情
-			//   if (this.userInfo.id != undefined) {
-			//     this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
-			//       this.userMes = res.user;
-			//       this.getCateList();
-			//       console.log(this.userMes, "呼呼");
-			//     });
-			//   }
-			// },
-
-			async handleselectCate(item, index) {
-				console.log("item at line 662:", item);
-				console.log("index at line 637:", index);
-				// this.description=`您还未购买当前【${item.title}】课程，`
-				var title1 = "";
-				this.currentCateIndex = index;
-				switch (this.vip.type) {
-					case 0:
-						this.goBuyTitle = "购买VIP,即可免费观看吴门医述所有课程";
-						this.goBuyType = 0;
-						break;
-					case 1 || 2:
-						var vipName = "";
-						if (this.vip.type == 1) {
-							vipName = "超级VIP";
-						}
-						if (this.vip.type == 2) {
-							vipName = "吴门医述VIP";
-						}
-						//超级VIP
-						this.goBuyTitle = `尊贵的${vipName},您的有效期到 ${
-            this.vip.endTime && this.vip.endTime.split(" ")[0]
-          }`;
-						this.goBuyType = 1;
-						break;
-
-					case 3:
-						//众妙之门
-						this.goBuyTitle =
-							"尊贵的众妙之门VIP,升级至超级VIP,即可免费观看吴门医述所有课程";
-
-						this.goBuyType = 2;
-						break;
-				}
-
-				//   this.currentCateIndex = index;
-				this.dataList = [];
-				var data = [];
-				console.log(item, index, 99999);
-				var that = this;
-
-				// curriculumInfo
-				this.$http
-					.request({
-						url: this.urlList.curriculumInfo,
-						method: "POST",
-						data: {
-							id: item.id,
-						},
-						header: {
-							//默认 无 说明：请求头
-							"Content-Type": "application/json",
-						},
-					})
-
-					.then(async (res) => {
-						//   that.curriculumInfo = res.obj;
-						//   that.currentCateIndex = index;
-						that.percentage = item.completion;
-						that.dataList = res.chapterList;
-						// that.getPercentage();
-						that.$forceUpdate();
-
-						// socket.init();
-					});
-
-				console.log(this.allDataList, this.dataList, "1688");
-
-				this.searchValue = "";
-				this.searchList = [];
-				this.showSearchList = false;
-
-				return data;
-			},
+			
 			async setOneCateIndex(item, index) {
 				this.allDataList = [];
-				console.log(index, 99999);
 				var that = this;
 
 				this.currentStatusIndex = index;
-				// this.currentCateIndex = 0
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
@@ -912,19 +667,6 @@
 
 					this.$forceUpdate();
 				});
-
-				// this.handleselectCate(this.cateList[this.currentCateIndex])
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
 			},
 
 			transformData(inputData) {
@@ -938,23 +680,8 @@
 					}
 					result[letter].push(item);
 				});
-				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
 				return result;
 			},
-
-			// 放大图片
-			previewImage(url) {
-				console.log(url);
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ["很抱歉，暂不支持保存图片到本地"],
-						success: function(res) {
-							// console.log(res,'+++++')
-						},
-					},
-				});
-			},
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -966,11 +693,6 @@
 
 <style lang="scss" scoped>
 	@import "@/style/mixin.scss";
-
-	.u-grid-list {
-		// height: 40rpx;
-	}
-
 	.searchList {
 		.item {
 			font-size: 28rpx;
diff --git a/pages/curriculum/order/curriculum/mp3Detail.vue b/pages/curriculum/order/curriculum/mp3Detail.vue
index 03c2f5a..ececcb5 100644
--- a/pages/curriculum/order/curriculum/mp3Detail.vue
+++ b/pages/curriculum/order/curriculum/mp3Detail.vue
@@ -1,27 +1,9 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
   <view
     class="container commonPageBox commonDetailPage"
     style="position: relative; height: auto"
   >
-    <!-- <cover-view class="image_box">
 
-
-      <image
-     
-        src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"
-        mode="aspectFit"
-        class="headImage"
-        style="background-color: #f5f5f5"
-       
-      >
-      </image>
-
-
-
-    </cover-view> -->
     <video
       @timeupdate="videoTimeUpdateEvent($event)"
       ref="videos"
diff --git a/pages/curriculum/order/curriculum/operationsList.vue b/pages/curriculum/order/curriculum/operationsList.vue
index e171f26..1a19fef 100644
--- a/pages/curriculum/order/curriculum/operationsList.vue
+++ b/pages/curriculum/order/curriculum/operationsList.vue
@@ -10,7 +10,6 @@
 </template>
 
 <script>
-// importScripts('@/static/aliplayer/aliplayer-min.js')
 export default {
   data() {
     return {
diff --git a/pages/curriculum/order/curriculum/videoDetail.vue b/pages/curriculum/order/curriculum/videoDetail.vue
index a92b886..7311a45 100644
--- a/pages/curriculum/order/curriculum/videoDetail.vue
+++ b/pages/curriculum/order/curriculum/videoDetail.vue
@@ -1,24 +1,5 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
   <view class="container commonPageBox commonDetailPage" style="position: relative;">
-     <!-- <cover-view class="image_box">
-
-
-      <image
-     
-        src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"
-        mode="aspectFit"
-        class="headImage"
-        style="background-color: #f5f5f5"
-       
-      >
-      </image>
-
-
-
-    </cover-view> -->
     <video
       @fullscreenchange="fullscreenchange"
       @timeupdate="videoTimeUpdateEvent($event)"
@@ -33,9 +14,6 @@
       :poster="`${videoUrl}?x-oss-process=video/snapshot,t_${1},f_jpg`"
       @play="playVideo"
     >
-    <!-- <cover-image class="controls-play img"  src="http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170411123240222.png"></cover-image>
-      
-    -->
   </video>
   
   </view>
@@ -43,14 +21,11 @@
 
 <script>
 import courseDescription from "@/pages/component/commonComponents/list";
-import price from "../price/index.vue";
-
 import $http from "@/config/requestConfig.js";
 import { mapState } from "vuex";
 export default {
   components: {
     courseDescription, //课程说明
-    price, //课程价格
   },
   data() {
     return {
diff --git a/pages/curriculum/order/curriculum/videoDetailOss.vue b/pages/curriculum/order/curriculum/videoDetailOss.vue
index 0b7333c..005824e 100644
--- a/pages/curriculum/order/curriculum/videoDetailOss.vue
+++ b/pages/curriculum/order/curriculum/videoDetailOss.vue
@@ -1,7 +1,4 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
   <view class="container" style="background-color: #000; position: relative">
     <u-icon
       @click="goBack"
diff --git a/pages/mine/.DS_Store b/pages/mine/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue
index 6a0c22b..3463635 100644
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -17,183 +17,63 @@
 
 		<view class="mine_box" :style="`top:${(45 + statusBarHeight) * 2}rpx`">
 			<view class="per_mes">
-				<view style="display: flex; align-items: center; flex-direction: column">
-					<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar != null"
-						class="per_mes_img color_shandow"></image>
-				</view>
-
-				<image src="@/static/icon/home_icon_logo.png" v-if="userMes.avatar == null"
-					class="per_mes_img color_shandow"></image>
-
-				<view class="userInfoBox" style="width: calc(100% - 120rpx)">
-					<view class="name">昵称：{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
-
-					<view class="name" v-if="!userMes.userVip" style="
-              font-size: 28rpx;
-              font-weight: 500;
-              color: #606266 !important;
-            ">普通用户</view>
-
-					<view style="display: flex; align-items: center" v-else-if="userMes.userVip&&$platform=='ios'">
-						<view class="user_vip_box1">
-							<view v-if="userMes.vip == 1" class="user_vip super user_vip_super">超级VIP</view>
-							<view v-if="userMes.vip == 3" class="user_vip user_vip_zmzm">众妙之门VIP</view>
-							<view v-if="userMes.vip == 2" class="user_vip user_vip_wumen">吴门医述VIP</view>
-
-
-						</view>
-						<view class="viptime" v-if="userMes.vip != 0">会员时长：{{
-                userMes.userVip.endTime.split(" ")[0]
-              }}&nbsp;到期</view>
+				<view :style="hasVipType2?'width: 170rpx;':''">
+					<view style="display: flex; align-items: center; flex-direction: column">
+						<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar"
+							class="per_mes_img color_shandow"></image>
+						<image src="@/static/icon/ic_login_health.png" v-else
+							class="per_mes_img color_shandow"></image>
+					</view>
+					
+					<view class="user_vip_box" v-if="isAndorid&&hasVipType1 || isAndorid&&hasVipType2">
+						<view class="user_vip super" :style="hasVipType2?'width: 170rpx;':''">
+							<view class="user_vip_item" v-if="hasVipType1"><text>医学</text><image src="@/static/icon/chao_svip.png"></image></view>
+							<view class="user_vip_item" v-if="hasVipType2"><text>国学心理学</text><image src="@/static/icon/chao_svip.png"></image></view>
+						</view>
 					</view>
-
-					<!--  -->
-
-					<!-- <view class="phone" v-if="userMes.tel">手机号：({{ userMes.tel }})</view>
-         
-        
-            <view class="phone email" v-if="userMes.email">邮箱({{ userMes.email }})</view>
-        -->
-
-					<!-- <text class="tong">累计读书5本
-					<span style="margin: 0 20upx;">|</span> 今日读50分钟
-				</text> -->
 				</view>
-				<br clear="both" />
+				
+				<view class="userInfoBox" style="margin-left: 30rpx;">
+					<view class="name">昵称：{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
+					<view class="name" style="color: #606266 !important;font-weight: normal;font-size: 28rpx;" v-if="userMes.tel">手机号：({{ userMes.tel }})</view>
+					
+					<template v-if="isAndorid&&textList.length>0">
+						<view class="vip_type">
+							<view class="vip_type_item" v-for="(item,index) in textList" :key="index">
+								{{item}}<image src="@/static/icon/chao_vip.png"></image>
+							</view>
+						</view>
+					</template>
+				</view>
 			</view>
-			<!-- <view class="now_vip" v-if="userMes.vip==0">
-			<text>
-				<image src="../../static/icon/mine_p.png" style="height: 44rpx;"></image>
-				开通会员畅享海量内容
-			</text>
-			<b class="kt_btn" @click="onPageJump('./opeVip')">开通VIP</b>
-		</view> -->
-
-			<!-- <view class="now_vip" v-if="userMes.vip==1">
-			<text>
-				<image src="../../static/icon/mine_v.png"></image>
-				尊贵的VIP会员
-				<font style="font-size: 14rpx;margin-left: 20rpx;">{{userMes.vipValidtime}}到期</font>
-			</text>
-			<b class="kt_btn" @click="onPageJump('./opeVip')">立即续费</b>
-		</view> -->
-
-			<view v-if="$platform=='android'" style="
-          padding: 20rpx 20rpx 0;
-          height: auto;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-        ">
 
+			<view v-if="isAndorid" style="
+				  padding: 20rpx 20rpx 0;
+				  margin-top: 50rpx;
+				  height: auto;
+				  display: flex;
+				  align-items: center;
+				  justify-content: space-between;
+				">
 				<template>
-					<view v-if="!userMes.userVip" :class="`chong_zhi boxShadow box_fillet vip_box`"
+					<view class="chong_zhi boxShadow box_fillet vip_box"
 						@click="onPageJump('/pages/mine/vip/index')">
 						<view class="noVip">
-							<view class="zhanghu PM_font" style="text-align: center">
-								<image class="vip_image" src="@/static/icon/mine_p.png" mode="aspectFit">
-								</image>
-
-								<text style="color: #452808; letter-spacing: 2rpx">超级VIP</text>
-							</view>
-							<view style="margin-left: 20rpx">加入会员，畅享更多专属权益</view>
-							<view class="right_arrow" style="color: #fff">
-								<!-- <image src="@/static/icon/mine_p.png" mode="aspectFit"> </image> -->
-								>
-							</view>
-
-							<!-- <swiper
-              :autoplay="true"
-              :interval="3000"
-              :duration="1000"
-              style="width: 100%; height: 60rpx"
-            >
-              <swiper-item
-                v-for="(item, index) in swiperList"
-                style="width: 100%; height: 100%"
-              >
-                <view
-                  style="
-                    background: linear-gradient(
-                        130deg,
-                        rgb(46, 103, 106) 0%,
-                        rgb(114, 173, 146) 100%
-                      )
-                      text;
-                    text-align: center;
-                  "
-                  :style="item.style"
-                  v-html="item.name"
-                ></view>
-                 </swiper-item>
-            </swiper> -->
-						</view>
-					</view>
-					<view v-else :class="`chong_zhi boxShadow box_fillet vip_box hasVipBox ${
-            userMes.vip == 1
-              ? 'hasVipSuper'
-              : userMes.vip == 2
-              ? 'hasVipWumen'
-              : userMes.vip == 3
-              ? 'hasVipZmZm'
-              : ''
-          }`" @click="onPageJump('/pages/mine/vip/index')">
-						<view class="current_identity">当前身份</view>
-						<view class="hasVip" style="position: relative">
-							<view class="zhanghu" style="text-align: center">
-								<view class="vbg" v-if="userMes.vip == 2 || userMes.vip == 3">V</view>
-								<image v-if="userMes.vip == 1" class="vip_image" src="@/static/icon/quanyi.png"
-									mode="aspectFit">
-								</image>
-								<!-- <image
-                v-if="userMes.vip == 3"
-                class="vip_image"
-                src="@/static/icon/quanyiZM.png"
-                mode="aspectFit"
-              >
-              </image>
-              <image
-                v-if="userMes.vip == 2"
-                class="vip_image"
-                src="@/static/icon/quanyi.png"
-                mode="aspectFit"
-              >
-              </image> -->
-
-								<view v-if="userMes.vip == 1" class="vip_info">
-									<view class="PM_font vip_name">超级VIP</view>
-								</view>
-								<view v-if="userMes.vip == 3" class="vip_info">
-									<view class="PM_font vip_name">众妙之门VIP</view>
-								</view>
-								<view v-if="userMes.vip == 2" class="vip_info">
-									<view class="PM_font vip_name">吴门医述VIP</view>
-								</view>
-								<view class="viptime">会员时长：{{
-                  userMes.userVip.endTime.split(" ")[0]
-                }}&nbsp;到期</view>
-							</view>
-							<view class="zhanghu quanyi" style="text-align: center">
-								<!-- <image
-                class="vip_image"
-                src="@/static/icon/quanyi.png"
-                mode="aspectFit"
-              >
-              </image> -->
-
-								<view v-if="userMes.vip == 1" class="vip_info vip_info_bottom">
-									<view style="color: #d33b1b">尊享 5 项专属特权</view>
-									<view class="xufei">立即续费</view>
-								</view>
-								<view v-if="userMes.vip == 2" class="vip_info vip_info_bottom">
-									<view style="">尊享 4 项专属特权,</view>
-									<view class="xufei">立即续费</view>
-								</view>
-								<view v-if="userMes.vip == 3" class="vip_info vip_info_bottom">
-									<view style="">尊享 4 项专属特权</view>
-									<view class="xufei">立即续费</view>
-								</view>
+							<view style="display: flex; align-items: center;">
+								<view class="zhanghu PM_font" style="text-align: left; margin-left: 15rpx;">
+									<image class="vip_image" src="@/static/icon/mine_p.png" mode="aspectFit"></image>
+									<text style="color: #fff; font-size: 60rpx;" v-if="vipList.length==0">VIP</text>
+								</view>
+								<view class="vip_infor" v-if="vipList&&vipList.length>0">
+									<view class="vip_infor_item" v-for="(item, index) in vipList" :key="index" :class="{expired: isExpired(item.endTime.split(' ')[0])}">
+										<text>{{item.text}}VIP</text>
+										<text v-if="isExpired(item.endTime.split(' ')[0])">（{{item.endTime.split(' ')[0]}} 已到期）</text>
+										<text v-else>（有效期到 {{item.endTime.split(' ')[0]}})</text>
+									</view>
+								</view>
+								<view v-else class="vip_null" style=" padding-left: 30rpx;">办理VIP，畅享更多专属权益</view>
 							</view>
+							<view class="vip_btn"><button v-if="vipList.length==0">办理</button><button v-else>续费</button></view>
 						</view>
 					</view>
 				</template>
@@ -207,13 +87,6 @@
           justify-content: space-between;
         ">
 				<view class="chong_zhi boxShadow box_fillet chongzhi_box">
-					<!-- <view
-          class="zhanghu"
-          @click="onPageJump('/pages/mine/wallet/index/index')"
-        >
-          我的账户
-          <image src="@/static/icon/icon_right.png" class="rightArrow"></image>
-        </view> -->
 					<view class="chong_list">
 						<view class="left">
 							<view class="chong_list_item" style="
@@ -225,12 +98,6 @@
 								<view class="pay_item_img">
 									天医币<u-icon @click.native.stop="openInfo()" name="question-circle"
 										style="float: right; margin: 0 6rpx"></u-icon>
-									<!-- <image
-                  style="width: 100%; height: 100%"
-                  src="@/static/icon/pay_3.png"
-                  mode="aspectFil"
-                >
-                </image> -->
 								</view>
 
 								<view class="text" style="line-height: 40rpx; display: flex">{{
@@ -246,12 +113,6 @@
                 " @click="onPageJump('/pages/mine/wallet/jf/index')">
 								<view class="pay_item_img">
 									积分
-									<!-- <image
-                  style="width: 100%; height: 100%"
-                  src="@/static/icon/jifen2.png"
-                  mode="aspectFil"
-                >
-                </image> -->
 								</view>
 
 								<view class="text" style="line-height: 40rpx">{{
@@ -259,13 +120,6 @@
                 }}</view>
 							</view>
 						</view>
-						<!-- v-if="iosHide" -->
-
-						<!-- <view v-if="iosHide" class="chong_list_item">
-            <b>{{ userMes.conponsCount }}</b>
-            优惠券
-          </view> -->
-						<!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
 						<view class="chong_list_item" style="
                 display: flex;
                 align-items: center;
@@ -278,24 +132,6 @@
 					</view>
 				</view>
 			</view>
-
-			<!-- <view class="list_box order_box">
-				<view class="xiugai boxShadow box_fillet">
-					<view class="title">我的订单</view>
-					<view class="cate_box">
-						
-						<view class="cate_item_box" v-for="(v, i) in orderList"
-							@click="goOrderList(`/pages/bookShop/orderList`, 'mine', i)">
-							<view class="cate_item_border">
-								<image :src="v.imgUrl" mode="aspectFill" style="width: 58rpx; height: 58rpx"></image>
-								<u-badge type="error" max="99" :value="v.badge.value"
-									style="position: absolute; top: -10rpx; right: -10rpx"></u-badge>
-							</view>
-							<view class="cate_item_name">{{ v.title }}</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
 			<view class="list_box">
 				<view class="xiugai boxShadow box_fillet">
 					<common-list :dataList="pageList" @hancleClick="handleClickTab" label="name">
@@ -306,34 +142,6 @@
 							<view> </view>
 						</template>
 					</common-list>
-
-					<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
-				<text>我的打卡</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="onPageJump('../listen/home')" v-if="iosHide">
-				<text>我的听书</text>
-			</view> -->
-					<!-- 暂时去掉 -->
-					<!-- <view class="nav_list" @click="onPageJump('../listen/setListen')" v-if="iosHide">
-				<text>听书设置</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="onPageJump('../peanut/myComments')">
-				<text>我的评价</text>
-			</view> -->
-
-					<!-- 暂时去掉 -->
-
-					<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
-				<text>电子书购买记录</text>
-			</view> -->
-					<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
-				<text>阅读记录</text>
-			</view> -->
-
-					<!-- <view class="nav_list" @click="onGoing()">
-				<text>帮助与反馈11111</text>
-			</view> -->
-					<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
 				</view>
 			</view>
 		</view>
@@ -363,20 +171,14 @@
 
                 justify-content: center;
               ">
-							<!-- <u-button
-               size="small"
-               text="不同意"
-               @click="protocolShow=false"
-             ></u-button> -->
-							<u-button style="width: 200rpx; float: center" :plain="true" text="知道啦" color="#9b9b9b"
+			  <u-button style="width: 200rpx; float: center" :plain="true" text="知道啦" color="#9b9b9b"
 								size="small" @click="infoShow = false"></u-button>
 						</view>
 					</view>
 				</view>
 			</view>
 		</u-popup>
-
-		<!-- <u-modal :show="infoShow" title="提示信息" :content=""></u-modal> -->
+		
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
 	</view>
@@ -385,7 +187,6 @@
 <script>
 	import musicPlay from "@/components/music.vue";
 	import $http from "@/config/requestConfig.js";
-	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
 		mapState,
 		mapMutations
@@ -460,11 +261,6 @@
 
 					  type: "switchTab",
 					},
-					// {
-					//   name: "购物车",
-					//   url: "../peanut/shopping",
-					//   type: "pageJump",
-					// },
 					{
 						name: "个人资料",
 						url: "/pages/mine/userInfo/persData",
@@ -491,22 +287,19 @@
 						name: "问题反馈/申诉",
 						url: "/pages/homePage/index/workOrder",
 						type: "workOrder"
-					},
-
-					//{ name: "设置", url: "/pages/mine/set/index", type: "pageJump" },
-					// { name: "退出登录", type: "quitLogin" },
-					// { name: "注销帐号", type: "loginOut" },
+					}
 				],
+				hasVipType1: false,
+				hasVipType2: false,
+				vipList: [],
+				textList: [],  //普通vip文字
 			};
 		},
 		//第一次加载
 		onLoad(e) {
-			// 隐藏原生的tabbar
-			// uni.hideTabBar();
 			// #ifdef APP-PLUS
 			this.getOS();
 			this.platform = uni.getSystemInfoSync().platform;
-			// console.log('操纵系统',this.platform)
 			// #endif
 		},
 		computed: {
@@ -514,11 +307,11 @@
 		},
 		//页面显示
 		onShow() {
-			console.log(this.userInfo, "11111111111111");
-			// 隐藏原生的tabbar
-			// uni.hideTabBar();
 			this.getBookList();
 			this.getData();
+			//获取vip身份
+			this.textList = [];
+			this.getUserVipType();
 		},
 		async onTabItemTap() {
 			this.getBookList();
@@ -533,11 +326,6 @@
 			getBookList(flag, refreshflag) {
 				this.isLoadingHide = false;
 				var that = this;
-				// 根据tab不同，获取最新书评、最热书评、书集列表
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
-
 				// 顶部红点数量
 				$http
 					.request({
@@ -594,7 +382,6 @@
 				this.onPageJump("/pages/mine/userInfo/persData");
 			},
 			handleClickTab(v) {
-				console.log("v at line 259:", v);
 				switch (v.type) {
 					case "pageJump":
 						this.onPageJump(v.url);
@@ -618,7 +405,6 @@
 						uni.navigateTo({
 							url: `${v.url}?name=userPage`
 						})
-						// this.onPageJump(v.url);
 						break;
 				}
 			},
@@ -626,7 +412,6 @@
 			getOS() {
 				let oprateOs = "";
 				oprateOs = uni.getSystemInfoSync().platform;
-				// console.log(oprateOs)
 				if (oprateOs == "android") {
 					this.isAndorid = true;
 				} else {
@@ -691,14 +476,7 @@
 					this.$http.post("common/user/getUserInfo").then((res) => {
 						this.userMes = res.result;
 						if (this.userMes.userVip) {
-							// console.log(
-							//   "this.userMes.vipValidtime at line 510:",
-							//   this.userMes.vipValidtime
-							// );
-							// this.userMes.vipValidtime = this.userMes.vipValidtime.substring(
-							//   0,
-							//   this.userMes.vipValidtime.indexOf(" ")
-							// );
+							
 						}
 					});
 				}
@@ -757,6 +535,73 @@
 					url: "/pages/user/login/login",
 				});
 			},
+			//获取vip身份
+			getUserVipType() {
+				this.$http.request({
+					url: "common/userVip/getUserVipType",
+					method: "POST",
+					data: {},
+					header: {
+						"Content-Type": "application/json",
+					},
+				})
+				.then((res) => {
+					if (res.code == 0) {
+						this.vipList = res.list;
+						this.hasVipType1 = this.vipList.some(item => item.type === 1);
+						this.hasVipType2 = this.vipList.some(item => item.type === 2);
+						//筛选出来已过期的
+						let listAll = this.vipList;
+						let list = this.vipList.filter(item => !this.isExpired(item.endTime.split(' ')[0]));
+						
+						//全部的 vip模块展示
+						if(listAll.length>0){
+							listAll = this.showDataList(listAll);
+						}
+						
+						console.log('-------listAll',listAll)
+						//筛选过期以后的 昵称模块展示需要
+						if(list.length>0){
+							list = this.showDataList(list);
+						}
+						console.log('-------list',list)
+					}
+				});
+			},
+			//分情况展示逻辑
+			showDataList(list){
+				this.textList = [];
+				list.forEach((item, index) => {
+					if(item.type=='4'){
+						item.text = '中医学';
+						this.textList.push(item.text);
+					}else if(item.type=='5'){
+						item.text = '针灸学';
+						this.textList.push(item.text);
+					}else if(item.type=='6'){
+						item.text = '肿瘤学';
+						this.textList.push(item.text);
+					}else if(item.type=='7'){
+						item.text = '国学';
+						this.textList.push(item.text);
+					}else if(item.type=='8'){
+						item.text = '心理学';
+						this.textList.push(item.text);
+					}else if(item.type=='1'){
+						item.text = '医学S';
+					}else if(item.type=='2'){
+						item.text = '国学心理学S';
+					}
+				});
+				
+				return this.textList;
+			},
+			//判断过期的vip
+			isExpired(dateString){
+				const date = new Date(dateString);
+				const now = new Date();
+				return date < now;
+			},
 		},
 	};
 </script>
@@ -764,34 +609,25 @@
 	@import "@/style/mixin.scss";
 
 	.per_mes {
-		// height: 200rpx;
 		position: relative;
 		margin: 0rpx 20rpx 0rpx 20rpx;
 		align-items: center;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
 
 		.per_mes_img {
-			// @include themeBorder(10rpx,10rpx,#4E79A3, #A6D8DC);
-			width: 90rpx;
-			height: 90rpx;
-			// background-color: #fff;
+			width: 120rpx;
+			height: 120rpx;
 			border-radius: 90rpx;
 			margin: 0 0 0 0;
 			float: left;
 		}
 
 		view {
-			float: left;
-			// margin-top: 20rpx;
-
 			.name {
 				width: 100%;
-				// display: inline-block;
 				font-weight: bold;
-				font-size: 30rpx;
-				margin-bottom: 10rpx;
+				font-size: 32rpx;
 				color: #333 !important;
 			}
 
@@ -860,18 +696,11 @@
 
 	.chong_zhi {
 		box-shadow: none;
-		// border-bottom-left-radius: 0rpx !important;
-		// border-bottom-right-radius: 0rpx !important;
-		// background-color: #d8f8e4;
-		// margin: 0 0 30upx 0;
 		padding: 0 30upx;
 		height: auto;
 
 		.zhanghu {
-			width: 100%;
 			margin-bottom: 10rpx;
-			font-size: 44rpx;
-			// line-height: 80rpx;
 			font-weight: bold;
 			display: flex;
 			align-items: center;
@@ -885,25 +714,17 @@
 			height: 100%;
 			display: flex;
 			align-items: center;
-			padding: 0 20rpx;
-
-			// justify-content: space-between;
-			// flex-direction: column;
+			justify-content: space-between;
+			
 			.zhanghu {
-				font-size: 42rpx;
-				width: auto;
-				display: inline-block;
-				// margin-top: 20rpx;
+				font-size: 40rpx;
 				margin-bottom: 0rpx;
 				text-align: center;
 				display: flex;
 				align-items: center;
-
-				// justify-content: space-around;
 				image {
-					width: 40rpx;
-					height: 40rpx;
-					margin-right: 10rpx;
+					width: 50rpx;
+					height: 50rpx;
 				}
 			}
 		}
@@ -1027,27 +848,12 @@
 		width: 100%;
 		height: auto;
 		border-radius: 10rx !important;
-		// background: rgba(255, 255, 255, 0.85);
-
-		// padding: 30rpx 20rpx 10rpx;
-		// background-color: $themeBgColor;
-		// @include themeBorder(6rpx, 20rpx, #3ab3ae, #a6d8dc);
-		// #FFE9BB
-		background-image: linear-gradient(80deg, #eaeff2 0%, #c2d0db 100%);
+		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 120%);
 
 		.PM_font {
 			color: #476379;
 		}
 
-		// @include themeBorder(
-		//   10rpx,
-		//   20rpx,
-		//   (
-		//     linear-gradient(#edf6f5ad, #edf6f5ad),
-		//     linear-gradient(to bottom left, #bed1b1, #a6d8dc)
-		//   )
-		// );
-
 		.zhanghu {
 			font-size: 80rpx;
 			text-align: center;
@@ -1065,25 +871,23 @@
 	}
 
 	.bg_top {
-		// background-position: center center;
 		padding: 0 30rpx;
-
 		height: 30vh;
 		position: relative;
+		margin-top: 30rpx;
 
 		.setIcon {
 			position: absolute;
 			right: 30rpx;
-			// top: 30rpx;
 		}
 	}
 
 	.mine_box {
 		width: 100%;
 		position: absolute;
-		// top: 90rpx;
 		left: 0;
 		padding: 0 0rpx;
+		margin-top: 30rpx;
 	}
 
 	.list_box {
@@ -1169,64 +973,13 @@
 			}
 		}
 	}
-
-	.user_vip_box {
-		z-index: 10;
-		// min-width: 130rpx;
-		// margin-top: -20rpx;
-		// position: absolute;
-		// bottom: -20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.user_vip {
-		font-size: 24rpx;
-		width: auto;
-		padding: 1rpx 20rpx;
-		font-weight: 800;
-		border-radius: 40rpx;
-		// background: linear-gradient(
-		//   to right,
-		//   rgb(204, 229, 244) 0%,
-		//   rgb(197, 227, 215) 100%
-		// );
-	}
-
-	.user_vip_box1 {
-		.user_vip {
-
-			// padding: 0;
-			font-size: 20rpx;
-			margin-right: 10rpx;
-		}
-
-		.user_vip_super {
-			background-image: linear-gradient(90deg, #fff0dc 0%, #f8e483 100%);
-
-		}
-
-		.user_vip_wumen {
-			background-image: linear-gradient(90deg, #c4e8fe 0%, #60bcff 100%);
-
-		}
-
-		.user_vip_zmzm {
-			background-image: linear-gradient(90deg, #aff7d6 0%, #edf5f1 100%);
-
-		}
-	}
-
 	.super {
-		// background: linear-gradient(to right, #fff0dc 0%, #f8e483 100%);
 		color: #f4a04c;
 	}
 
 	.cate_box {
 		width: 100%;
 		height: auto;
-		// background: $themeColor;
 		background-repeat: no-repeat;
 		display: flex;
 		justify-content: center;
@@ -1251,30 +1004,18 @@
 
 			.cate_item_border {
 				position: relative;
-				// width: 75rpx;
-				// height: 98rpx;
-				// background-size: 100% 100%;
-				// background-image: url("@/static/icon/homePage/cate_bg.png");
-				// border-radius: 4rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
-
-				image {
-					// height: 56rpx;
-				}
+				
 			}
 
 			.cate_item_name {
 				margin-top: 6rpx;
-				// font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
-
 				font-weight: normal;
 				font-size: 28rpx;
 				color: #000000;
-				// line-height: 46rpx;
 				text-align: center;
-				// color: #fff;
 			}
 		}
 	}
@@ -1513,4 +1254,91 @@
 	.vip_info_bottom {
 		height: 64rpx;
 	}
+	.user_vip_box{
+		width: 125rpx;
+		position: absolute;
+		margin-top: - 40rpx;
+		z-index: 99;
+	}
+	.user_vip_item{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.user_vip_item {
+		border-radius: 20rpx;
+		background: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+		color: #fff;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		height: 40rpx;
+		font-weight: bold;
+		margin-bottom: 5rpx;
+	}
+	.user_vip_item image{
+		width: 49rpx;
+		height: 16rpx;
+	}
+	.vip_type{
+		display: flex;
+		align-items: center;
+	}
+	.vip_type_item{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10rpx;
+		background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+		border-radius: 20rpx;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		height: 40rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-right: 10rpx;
+	}
+	.vip_type_item:last-child{
+		margin-right: 0;
+	}
+	.vip_type_item image{
+		width: 34rpx;
+		height: 24rpx;
+	}
+	.vip_infor{
+		padding-left: 15rpx;
+	}
+	.vip_infor_item{
+		display: block;
+		color: #fff;
+		font-size: 26rpx;
+		line-height: 36rpx;
+		font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+		font-weight: normal;
+	}
+	.vip_infor_item text{
+		color: #fff;
+	}
+	.vip_btn{
+		margin-right: 15rpx;
+		height: 50rpx;
+	}
+	.vip_btn button{
+		background: none;
+		border: 2rpx solid #3ab3ae;
+		border-radius: 40rpx;
+		font-size: 24rpx;
+		width: 82rpx;
+		line-height: 42rpx;
+		color: #3ab3ae;
+		font-weight: bold;
+	}
+	.vip_null{
+		color: #fff;
+		font-size: 26rpx;
+		line-height: 34rpx;
+	}
+	.expired{
+		opacity: 0.55;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/mine/vip/index.vue b/pages/mine/vip/index.vue
index f6b820d..147b6de 100644
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
@@ -1,965 +1,286 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
-  <view class="container commonPageBox vipBox" style="height: 100vh;">
-    <!-- 公共组件-每个页面必须引入 -->
-    <public-module></public-module>
-    <z-nav-bar
-      title=""
-      bgColor="rgba(188, 231, 223, 0.4)"
-      fontColor="#000"
-    >
-    
-    <!-- <template slot="right">
-					<text @click="handleClickDelete" v-if="addressId" style="padding-right: 20rpx; color: red">开通记录</text>
-				</template>
-      
-       -->
-      </z-nav-bar>
-
-    <view
-      class="contentBox commonPageContentBox"
-      :style="`margin-top: ${
-        (40 + statusBarHeight) * 2
-      }rpx;height: calc(100% - ${(50 + statusBarHeight) * 2}rpx) !important;`"
-    >
-      <view class="flash_sale_content">
-        <scroll-view scroll-y="true" class="scroll-Y" style="">
-          <view
-            class="scroll-view-item flash_sale_content_item color_shandow"
-            v-for="(v, i) in dataList"
-            :style="`background:${v.background ? v.background : '#f6f6f6'};`"
-          >
-            <view
-              class="book_name PM_font"
-              v-html="v.title"
-              :style="`background:  ${v.color};
-		;-webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-`"
-            ></view>
-
-            <view class="vip_content">
-              <view class="vip_image_box"
-                ><image
-                  class="vip_image"
-                  src="@/static/icon/quanyi.png"
-                  mode="aspectFit"
-                >
-                </image
-              ></view>
-              <view class="qunyi_box">
-                <view style="height: auto">
-                  <view
-                    v-for="(item, index1) in v.quanyi"
-                    :style="item.style"
-                    v-html="item.name"
-                    ></view
-                  ></view
-                >
-              </view>
-              <!-- buttonbg -->
-            </view>
-            <view class="vip_list vip_button_list">
-              <view
-                @click="openorderModal(item)"
-                v-for="(item, index) in v.list"
-                class="vip_button"
-                :style="`background:${v.buttonbg ? v.buttonbg : '#f6f6f6'};`"
-                ><view style="max-width: 200rpx">{{ item.title }}</view>
-                <view style="margin: 0 5rpx">￥{{ item.lastFee }}</view>
-              </view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </view>
-    <u-popup :show="orderModalShow" mode="bottom" :round="20">
-      <view class="orderModalShow popup_box">
-        <u-icon
-          name="close"
-          color="#333"
-          size="18"
-          @click="closeOrderModalShow"
-          style="
-            display: inline-block;
-            position: absolute;
-            right: 20rpx;
-            top: 20rpx;
-          "
-        ></u-icon>
-        <orderPay ref="orderPay" :dataInfo="selectVipData"></orderPay>
-        <!-- <view class="goods_nav_box">
-          <uni-goods-nav
-            :fill="true"
-            :options="[]"
-            :button-group="customButtonGroup1"
-            @click="onHandleClickBuy"
-            @buttonClick="onHandleClickBuy"
-          />
-        </view> -->
-      </view>
-    </u-popup>
-  </view>
+<template>
+	<page-meta
+	  :page-font-size="$baseFontSize() + 'px'"
+	  :root-font-size="$baseFontSize() + 'px'"
+	></page-meta>
+	<view class="commonPageBox">
+		<z-nav-bar title="VIP"></z-nav-bar>
+		<view class="vip_block">
+			<view class="vip_item" 
+			:class="[item.type==1||item.type==2?'vip_item_special':'',
+			item.state==1?'vip_item_overdue':'',
+			item.type==1&&item.state==0||item.type==2&&item.state==0?'vip_item_bg_1':'',
+			item.type!=1&&item.type!=2&&item.state==0?'vip_item_bg_2':'']" 
+			v-for="(item, index) in list" :key="index">
+				<view>
+					<text class="vip_item_title">{{item.title}}</text>
+					<text class="vip_item_tip" v-if="item.tip&&item.tip<100"><uni-icons type="info" size="17" color="#ff1f00"></uni-icons>还有{{item.tip}}天到期</text>
+					<text class="vip_item_flag" v-if="item.state==1">
+						<uni-icons type="info" size="17" color="#999"></uni-icons>已过期
+					</text>
+				</view>
+				
+				<view class="vip_price" style=" padding-top: 10rpx;">
+					<text class="font_bold">课程价格：</text>
+					<view class="vip_qx_v">一年<text class="vip_fee line">{{item.originalPrice||0}}</text>元</view>
+				</view>
+				
+				<text class="vip_item_btn" v-if="item.state==null" @click="openorderModal(item,0)">去办理</text>
+				<text class="vip_item_btn" v-else @click="openorderModal(item,0)">去续费</text>
+				
+				<view class="vip_price" v-if="item.vcbList&&item.vcbList.length>0">
+					<text class="font_bold" v-if="item.type==1||item.type==2">超级VIP价格：</text>
+					<text class="font_bold" v-else>VIP价格：</text>
+					<text class="vip_price_v" v-for="(item_price, index_price) in item.vcbList" :key="index_price" @click="openorderModal(item_price)">
+						{{item_price.year}}年<text>{{item_price.rebateFee}}</text>元
+					</text>
+				</view>
+				<view class="vip_price" v-if="item.yanqiList&&item.yanqiList.length>0">
+					<text class="font_bold">延期价格：</text>
+					<text class="vip_price_v" v-for="(item_yq, index_yq) in item.yanqiList" :key="index_yq" @click="openorderModal(item_yq,1)">
+						{{item_yq.year}}年<text>{{item_yq.rebateFee}}</text>元
+					</text>
+				</view>
+				<view class="vip_qx">
+					<text class="font_bold" style=" display: block;">VIP权限：</text>
+					<view class="vip_qx_v" v-if="item.type==1">无限制观看吴门医述APP中医学、针灸学、肿瘤学三个板块任意课程；</view>
+					<view class="vip_qx_v" v-else-if="item.type==2">无限制观看众妙之门APP与吴门医述APP心理学板块任意课程；</view>
+					<view class="vip_qx_v" v-else-if="item.type==7">无限制观看众妙之门APP任意课程；</view>
+					<view class="vip_qx_v" v-else>无限制观看吴门医述APP{{item.title.replace(/VIP/g, '')}}板块任意课程；</view>
+					
+					<view class="vip_qx_v">
+						<text v-if="item.type==1||item.type==2">{{item.title.replace(/超级VIP/g, '')}}</text>
+						<text v-else>{{item.title.replace(/VIP/g, '')}}</text>
+						培训班报名享受<text class="vip_fee" v-if="item.type==1||item.type==2">8折</text><text class="vip_fee" v-else>9折</text>优惠
+					</view>
+					<view class="vip_qx_v">疯子读书APP购书享受<text class="vip_fee" v-if="item.type==1||item.type==2">8折</text><text class="vip_fee" v-else>9折</text>优惠</view>
+				</view>
+			</view>
+		</view>
+		
+		<u-popup :show="orderModalShow" mode="bottom" :round="20">
+			<view class="orderModalShow popup_box">
+				<u-icon name="close" color="#333" size="18" @click="closeOrderModalShow" style="
+		    display: inline-block;
+		    position: absolute;
+		    right: 20rpx;
+		    top: 20rpx;
+		  "></u-icon>
+				<orderPay ref="orderPay" :dataInfo="selectVipData"></orderPay>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
-import list from "@/pages/component/commonComponents/list";
-import orderPay from "./order.vue";
 import $http from "@/config/requestConfig.js";
-import { mapState } from "vuex";
-export default {
-  components: {
-    list,
-    orderPay,
-  },
-  data() {
-    return {
-      selectVipData: {},
-      orderModalShow: false,
-      superQuanyi: [
-        { name: "众妙之门视频" },
-        {
-          name: "吴门医述视频",
-          style: {
-            color: "#42BFA1",
-          },
-        },
-        { name: "专属视频视听" },
-        {
-          name: "读书相关权益",
-          style: {
-            color: "#42BFA1",
-          },
-        },
-        { name: "活动报名折扣价<text style='color:red'>(更优惠)</text>" },
-      ],
-      sociologyQuanyi: [
-        { name: "众妙之门视频" },
-        {
-          name: "-",
-          style: {
-            color: "#b0b0b0",
-          },
-        },
-        { name: "专属视频视听" },
-        {
-          name: "-",
-          style: {
-            color: "#b0b0b0",
-          },
-        },
-        { name: "活动报名折扣价" },
-      ],
-
-      isLoadingHide: false,
-      playData: {},
-      options: {},
-      searchValue: "",
-      pagination: {
-        // 请求参数
-        page: 1, //页码
-        limit: 20, //每页显示
-        total: 0, //总条数
-      },
-      twoCateList: [], // 二级分类标题
-      titleList: [], // 方剂标题
-      curOneCateIndex: 0, // 当前选中的一级分类
-      curTwoCateIndex: 0, // 当前选中的二级分类
-      searchList: [], // 搜索结果数组
-      showSearchList: false,
-      userMes: {}, // 用户信息
-      searchDisable: false, // 搜索不可用
-      limitShow: false,
-      limitTitle: "提示",
-      limitContent: "",
-      scrollViewHeight: 0,
-      dataList: [],
-      urlList: {
-        list: "sociology/user/getVipProductForUser",
-      },
-    };
-  },
-  onLoad(options) {
-    console.log(options, "989");
-    this.options = options;
-    this.getUserInfo();
-    this.getData();
-  },
-  onHide() {
-    // this.showSearchList = false
-    // this.searchList = []
-  },
-  computed: {
-    ...mapState(["userInfo"]),
-  },
-  methods: {
-    closeOrderModalShow() {
-      this.orderModalShow = false;
-      this.selectVipData = {};
-    },
-    openorderModal(data) {
-      this.selectVipData = data;
-      this.orderModalShow = true;
-      this.$nextTick(() => {
-        this.$refs.orderPay.initPrepareOrder();
-      });
-    },
-    onReachBottom1() {
-      // 上拉加载
-      // 当列表数量不大于或等于总数量，则再次调用接口请求数据
-      if (this.dataList.length >= this.pagination.total) return;
-      this.pagination.page++;
-      this.getData();
-    },
-
-    // 检查是有权限使用搜索功能
-    checkDisable() {
-      console.log("点击了");
-    },
-    // 显示无权限弹窗
-    // showNoRights() {
-    // 	let that = this
-    // 	uni.showModal({
-    // 		content: "",
-    // 		confirmText: '好的',
-    // 		showCancel: false,
-    // 		success: function(res) {
-    // 			if (res.confirm) {
-    // 				// console.log('用户点击确定');
-    // 				that.clear()
-    // 			}
-    // 		}
-    // 	})
-    // },
-    // 获取用户详情
-    getUserInfo() {
-      // 用户详情
-      if (this.userInfo.id != undefined) {
-        this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
-          this.userMes = res.user;
-          this.getCateList();
-          console.log(this.userMes, "呼呼");
-        });
-      }
-    },
-    // 详情
-    gotoDetail(v) {
-      console.log(v);
-      uni.navigateTo({
-        // url: '../bookShop/commodityDetail?id=' + item.id
-        url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&id=${v.id}`,
-      });
-    },
-
-    getData() {
-      this.isLoadingHide = false;
-      this.$http
-        .request({
-          url: this.urlList.list,
-          method: "POST",
-          data: {},
-          header: {
-            //默认 无 说明：请求头
-            "Content-Type": "application/json",
-          },
-        })
-        .then((res) => {
-          console.log("res at line 144:", res.list);
-          if (res.code == 0) {
-            for (let i in res.list) {
-              if (res.list[i].length > 0) {
-                var type =
-                  i == "super_hd" || i == "sociology_hd" ? "hd" : "normal";
-                if (i == "super" || i == "super_hd") {
-                  this.dataList.push({
-                    title: "超级VIP",
-                    key: "super",
-                    type: type,
-                    titleStyle: {
-                      width: "120rpx",
-                    },
-                    background: "rgb(255 255 255 / 85%)",
-                    buttonbg:
-                      "linear-gradient(to right,  #CCE5F4 0%,#C5E3D7 100%) ",
-                    // titleBackground:
-                    //   "linear-gradient(130deg, rgb(153, 202, 192) 0%, rgb(192, 223, 207) 50%)",
-                    color: "linear-gradient(130deg,#2E676A  0%, #72AD92 100%)",
-                    list: res.list[i],
-                    quanyi: this.superQuanyi,
-                  });
-                } else if (i == "sociology" || i == "sociology_hd") {
-                  this.dataList.push({
-                    title: "众妙之门VIP",
-                    key: "sociology",
-                    type: type,
-                    list: res.list[i],
-                    background: "rgb(188 231 223 / 93%)",
-                    buttonbg: "rgba(255, 255, 255, 0.85)",
-                    // titleBackground:
-                    //   "linear-gradient(130deg,  #E4F3E9 0%,#D6E7EF 100%)  ",
-
-                    color: "linear-gradient(130deg,#2E676A  0%, #72AD92 100%)",
-                    quanyi: this.sociologyQuanyi,
-                  });
-                }
-              }
-            }
-          }
-        });
-    },
-
-    // 获取名称
-    getTitles(dictType) {
-      console.log("dictType", dictType);
-      if (this.curOneCateIndex == 0) {
-        if (dictType == 2) {
-          uni.navigateTo({
-            url: "./zhuanzhuchuban",
-          });
-          return;
-        }
-        $http
-          .request({
-            url: "book/generalArticle/articleByPage",
-            method: "POST",
-            data: {
-              // loadAnimate: 'none', // 请求加载动画
-              type: dictType == 1 ? "1" : "2",
-              limit: 1000,
-              current: 1,
-            },
-            header: {
-              //默认 无 说明：请求头
-              "Content-Type": "application/json",
-            },
-          })
-          .then((res) => {
-            console.log(res, "内容获取成功");
-            if (res.code == 0 && res.result && res.result.records.length > 0) {
-              this.titleList = res.result.records;
-            } else {
-              this.titleList = [];
-            }
-          })
-          .catch((e) => {
-            this.titleList = [];
-            console.log(e);
-          });
-      }
-      if (this.curOneCateIndex == 1) {
-        $http
-          .request({
-            url: "book/medicaldes/inheritListByPage",
-            method: "POST",
-            data: {
-              // loadAnimate: 'none', // 请求加载动画
-              dictType: dictType,
-              limit: 1000,
-              current: 1,
-            },
-            header: {
-              //默认 无 说明：请求头
-              "Content-Type": "application/json",
-            },
-          })
-          .then((res) => {
-            console.log(res, "内容获取成功");
-            if (res.code == 0 && res.result.records.length > 0) {
-              this.titleList = res.result.records;
-              for (let i = 0; i < this.titleList.length; i++) {
-                this.titleList[i].imageslist = [];
-                this.titleList[i].imageslist = this.titleList[i].img.split(";");
-              }
-            } else {
-              this.titleList = [];
-            }
-          })
-          .catch((e) => {
-            this.titleList = [];
-            console.log(e);
-          });
-      }
-      if (this.curOneCateIndex == 2) {
-        $http
-          .request({
-            url: "book/medicaldes/lightListByType?type=" + dictType,
-            method: "POST",
-            data: {
-              // loadAnimate: 'none', // 请求加载动画
-              limit: 1000,
-              page: 1,
-            },
-            header: {
-              //默认 无 说明：请求头
-              "Content-Type": "application/json",
-            },
-          })
-          .then((res) => {
-            console.log(res, "内容获取成功");
-            if (res.code == 0 && res.result.length > 0) {
-              this.titleList = res.result;
-            } else {
-              this.titleList = [];
-            }
-          })
-          .catch((e) => {
-            this.titleList = [];
-            console.log(e);
-          });
-      }
-      if (this.curOneCateIndex == 3) {
-        $http
-          .request({
-            url: "book/medicaldes/recordByType?type=" + dictType,
-            method: "POST",
-            data: {
-              // loadAnimate: 'none', // 请求加载动画
-              limit: 1000,
-              page: 1,
-            },
-            header: {
-              //默认 无 说明：请求头
-              "Content-Type": "application/json",
-            },
-          })
-          .then((res) => {
-            console.log(res, "内容获取成功");
-            if (res.code == 0 && res.result.length > 0) {
-              this.titleList = res.result;
-            } else {
-              this.titleList = [];
-            }
-          })
-          .catch((e) => {
-            this.titleList = [];
-            console.log(e);
-          });
-      }
-    },
-    setTwoCateIndex(item, index) {
-      let dictType = item.dictType;
-      this.curTwoCateIndex = index;
-      this.getTitles(dictType);
-    },
-    async setOneCateIndex(item, index) {
-      console.log(index, 99999);
-      var that = this;
-
-      // if(this.userMes.tgdzPower == 0){
-      // 	let that = this
-      // 	uni.showModal({
-      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-      // 		confirmText: '好的',
-      // 		showCancel: false,
-      // 		success: function(res) {
-      // 			if (res.confirm) {
-      // 				// console.log('用户点击确定');
-      // 			}
-      // 		}
-      // 	})
-      // 	return
-      // }
-      // if(item.title == "时辰取穴"){
-      // 	uni.navigateTo({
-      // 		url: "../timeAcupoint/timeAcupoint"
-      // 	})
-      // 	return
-      // }
-      let type = item.type;
-      this.curOneCateIndex = index;
-      this.curTwoCateIndex = 0;
-      this.searchValue = "";
-      this.searchList = [];
-      this.showSearchList = false;
-      // if (index != 2) {
-      await this.getTowCateList(type);
-
-      // uni.createSelectorQuery().select('.oneCateList').boundingClientRect(function (rect) {
-      // 	var height = rect.height
-      // 	console.log('元素高度：',);
-
-      // }).exec();
-
-      // } else {
-      // 	this.getJFList(dictType)
-      // }
-    },
-    async getTowCateList(type) {
-      var that = this;
-      $http
-        .request({
-          url: "book/medicaldes/typeList?label=" + type,
-          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-          data: {
-            loadAnimate: "none", // 请求加载动画
-            // 'categoryId': id
-          },
-          // header: { //默认 无 说明：请求头
-          // 	'Content-Type': 'application/json'
-          // },
-        })
-        .then((res) => {
-          console.log(res, "二级分类获取成功");
-          if (res.code == 0 && res.result.length >= 0) {
-            this.twoCateList = res.result;
-            if (this.curOneCateIndex == 0) {
-              this.twoCateList = [
-                {
-                  dictType: "1",
-                  dictValue: "学术思想",
-                },
-                {
-                  dictType: "2",
-                  dictValue: "出版专著",
-                },
-                {
-                  dictType: "3",
-                  dictValue: "学术平台",
-                },
-              ];
-            }
-            if (this.curOneCateIndex == 2) {
-              this.twoCateList = [
-                {
-                  dictType: "1",
-                  dictValue: "吴门之歌",
-                },
-                {
-                  dictType: "2",
-                  dictValue: "巴山夜语",
-                },
-                {
-                  dictType: "3",
-                  dictValue: "吴门之徽",
-                },
-              ];
-            }
-            if (this.curOneCateIndex == 3) {
-              this.twoCateList = [
-                {
-                  dictType: "1",
-                  dictValue: "学术贡献",
-                },
-                {
-                  dictType: "2",
-                  dictValue: "抗疫纪实",
-                },
-                {
-                  dictType: "3",
-                  dictValue: "吴门公益",
-                },
-              ];
-            }
-            this.getTitles(this.twoCateList[0].dictType);
-
-            this.$nextTick(async () => {
-              // await uni.createSelectorQuery().select('.uni-tabbar').boundingClientRect(function (rect) {
-              // 	console.log(rect.height, '3333')
-
-              // 	// var height = 42 + rect.height + 10;
-              // 	// that.scrollViewHeight = height;
-              // 	// console.log(that.scrollViewHeight, '111111')
-              // 	// that.$forceUpdate()
-              // 	// console.log('元素高度2：', height);
-              // }).exec();
-              await uni
-                .createSelectorQuery()
-                .select(".cateList")
-                .boundingClientRect(function (rect) {
-                  console.log(rect.height, "22222");
-
-                  var height = 42 + rect.height + 20;
-                  that.scrollViewHeight = height;
-                  console.log(that.scrollViewHeight, "111111");
-                  that.$forceUpdate();
-                  console.log("元素高度2：", height);
-                })
-                .exec();
-            });
-          } else {
-            this.twoCateList = [];
-            this.titleList = [];
-          }
-        })
-        .catch((e) => {
-          this.twoCateList = [];
-          this.titleList = [];
-          console.log(e);
-        });
-    },
-    transformData(inputData) {
-      const result = {};
-      inputData.forEach((item) => {
-        const { letter } = item;
-        if (!result[letter]) {
-          result[letter] = [];
-        }
-        result[letter].push(item);
-      });
-      // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
-      return result;
-    },
-    // getJFList(id) {
-    // 	$http.request({
-    // 		url: "book/prescript/prescriptListForJF",
-    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-    // 		data: {
-    // 			loadAnimate: 'none', // 请求加载动画
-    // 			'categoryId': id
-    // 		},
-    // 		header: { //默认 无 说明：请求头
-    // 			'Content-Type': 'application/json'
-    // 		},
-    // 	}).then(res => {
-    // 		if (res.code == 0 && res.list.length > 0) {
-    // 			this.twoCateList = []
-    // 			this.titleList = this.transformData(res.list)
-    // 			console.log('JF经方', this.titleList)
-    // 		} else {
-    // 			this.twoCateList = []
-    // 			this.titleList = []
-    // 		}
-    // 	}).catch(e => {
-    // 		this.twoCateList = []
-    // 		this.titleList = []
-    // 		console.log(e)
-    // 	})
-    // },
-    getCateList(id) {
-      id ? "" : (id = 0);
-      this.twoCateList = [];
-      this.curTwoCateIndex = 0;
-      // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
-      // $http.request({
-      // 	url: "book/prescript/prescriptCategoryList",
-      // 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-      // 	data: {
-      // 		loadAnimate: 'none', // 请求加载动画
-      // 		'categoryId': id
-      // 	},
-      // 	header: { //默认 无 说明：请求头
-      // 		'Content-Type': 'application/json'
-      // 	},
-      // }).then(res => {
-      // console.log(res, '脉穴分类获取成功')
-      // if (res.code == 0 && res.list.length > 0) {
-      // this.oneCateList = res.list
-      this.getTowCateList(this.oneCateList[0].type);
-      // } else {
-      // 	this.oneCateList = []
-      // }
-      // }).catch(e => {
-      // 	this.oneCateList = []
-      // 	console.log(e)
-      // })
-    },
-
-    // 放大图片
-    previewImage(url) {
-      console.log(url);
-      uni.previewImage({
-        urls: [url],
-        longPressActions: {
-          itemList: ["很抱歉，暂不支持保存图片到本地"],
-          success: function (res) {
-            // console.log(res,'+++++')
-          },
-        },
-      });
-    },
-    // getSearch() {
-    // 	$http.request({
-    // 		url: "book/prescript/searchPrescript",
-    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-    // 		data: {
-    // 			loadAnimate: 'none', // 请求加载动画
-    // 			'keywords': this.searchValue,
-    // 			type: this.curOneCateIndex + 1
-    // 		},
-    // 		header: { //默认 无 说明：请求头
-    // 			'Content-Type': 'application/json'
-    // 		},
-    // 	}).then(res => {
-    // 		console.log(res, '搜索结果')
-    // 		if (res.code == 0 && res.list.length >= 0) {
-    // 			this.showSearchList = true
-    // 			this.searchList = res.list
-    // 		} else {
-    // 			this.searchList = []
-    // 		}
-    // 	}).catch(e => {
-    // 		// this.titleList = []
-    // 		this.searchList = []
-    // 		console.log(e)
-    // 	})
-    // },
-    // search(res) {
-    // 	console.log(res, 'res')
-    // 	// uni.showToast({
-    // 	// 	title: '搜索：' + res,
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	if (res == '') {
-    // 		this.showSearchList = false
-    // 		this.searchList = []
-    // 	} else {
-    // 		this.getSearch()
-    // 	}
-
-    // },
-    // input(res) {
-    // 	console.log('----input:', res)
-    // 	if (res == '') {
-    // 		this.searchList = []
-    // 	} else {
-    // 		this.getSearch()
-    // 	}
-    // },
-    // clear(res) {
-    // 	console.log('----clear:', res)
-    // 	// uni.showToast({
-    // 	// 	title: 'clear事件，清除值为：',
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	this.searchValue = ''
-    // 	this.showSearchList = false
-    // },
-    // blur(res) {
-    // 	// console.log('----blur:', res)
-    // 	// if (res == '') {
-    // 	// 	this.showSearchList = false
-    // 	// 	this.searchList = []
-    // 	// } else {
-    // 	// 	this.getSearch()
-    // 	// }
-    // },
-    // focus(e) {
-    // 	console.log('----focus:')
-    // 	// uni.showToast({
-    // 	// 	title: 'focus事件，输出值为：' + e.value,
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	// 等于1 就是有权限
-    // 	// this.showSearchList = true
-
-    // },
-    // cancel(res) {
-    // 	uni.showToast({
-    // 		title: '点击取消，输入值为：' + res.value,
-    // 		icon: 'none'
-    // 	})
-    // }
-  },
-  onBackPress() {
-    // #ifdef APP-PLUS
-    plus.key.hideSoftKeybord();
-    // #endif
-  },
-};
+import orderPay from "./order.vue";
+export default{
+	data(){
+		return{
+			type: 0,
+			text: '',  //针对不同type展示文案
+			list: [],
+			orderModalShow: false,
+			selectVipData: {}
+		}
+	},
+	components: {
+		orderPay
+	},
+	onLoad(){
+		this.getData();
+	},
+	onShow(){
+		
+	},
+	methods: {
+		//获取数据
+		getData(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			$http.request({
+				url: "common/userVip/getVipBuyConfigList",
+				method: "POST",
+				data: {},
+				header: {
+					'Content-Type': 'application/json'
+				},
+			})
+			.then(res => {
+				uni.hideLoading();
+				if (res.code == 0) {
+					this.list = res.res;
+				}
+			}).catch(e => {
+				
+			});
+		},
+		//点击购买
+		openorderModal(item,type) {
+			let text = '';
+			//如果是右侧按钮点击展示
+			//判断点击类型是vip价格还是延期价格
+			if(type==0){
+				if(item.state==null){  //没有vip
+					this.selectVipData.list = item.vcbList;
+					this.selectVipData.id = item.vcbList[0].id;
+				}else{
+					this.selectVipData.list = item.yanqiList;
+					this.selectVipData.id = item.yanqiList[0].id;
+				}
+			}else{
+				this.selectVipData.id = item.id;
+			}
+			
+			if(type){
+				this.selectVipData.type = type;
+			}
+			
+			this.selectVipData.title = item.title + '-' + item.year + '年';
+			this.selectVipData.lastFee = item.rebateFee;
+			
+			this.orderModalShow = true;
+			console.log('-----selectVipData-----',this.selectVipData)
+			this.$nextTick(() => {
+				this.$refs.orderPay.initPrepareOrder();
+			});
+		},
+		//关闭
+		closeOrderModalShow() {
+			this.orderModalShow = false;
+			this.selectVipData = {};
+		},
+	}
+}
 </script>
 
-<style lang="scss" scoped>
-@import "@/style/mixin.scss";
-.vipBox {
-  background-repeat: no-repeat;
-  display: flex;
-  justify-content: center;
-  overflow: hidden;
-  background-size: 100% 100%;
-  background-image: url("@/static/icon/vipbg.png");
+<style>
+.commonPageBox {
+	height: 100% !important;
+}
+.vip_block{
+	padding: 20rpx;
+}
+.vip_item{
+	width: 100%;
+	padding: 30rpx 20rpx;
+	background-color: #fff;
+	border-radius: 10px;
+	box-shadow: 0px 0px 5px 0px #a7bbe4;
+	margin-bottom: 20rpx;
+	position: relative;
+}
+.vip_item_title{
+	display: inline-block;
+	height: 46rpx;
+	line-height: 46rpx;
+	font-size: 24rpx;
+	font-weight: bold;
+	color: #fff;
+	padding: 0 12rpx;
+	border-radius: 15rpx;
+	background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+}
+.vip_item_special .vip_item_title{
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 26rpx;
+	background-image: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+}
+.vip_price{
+	margin-top: 5rpx;
+}
+.vip_price text,.vip_qx text,.vip_qx_v{
+	display: inline-block;
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.vip_item_used{
+	position: absolute;
+	right: 20rpx;
+	bottom: 20rpx;
+	font-size: 24rpx;
+	color: #427ec5;
+	font-weight: bold;
+}
+.vip_item_btn{
+	position: absolute;
+	right: 20rpx;
+	top: 30rpx;
+	font-size: 23rpx;
+	line-height: 40rpx;
+	border: 1rpx solid #ff1f00;
+	color: #ff1f00;
+	padding: 0 12rpx;
+	border-radius: 15rpx;
+	opacity: 0.8;
+}
+.font_bold{
+	font-weight: bold;
+}
+.vip_fee{
+	font-size: 34rpx !important;
+	color: #ff1f00;
+	font-weight: bold;
+	padding: 0 5rpx;
+}
+.vip_price_v{
+	font-size: 26rpx !important;
+	color: #ff1f00;
+	border: 1rpx solid #ff1f00;
+	border-radius: 10rpx;
+	margin-right: 15rpx;
+	margin-bottom: 10rpx;
+	padding: 0 10rpx;
+}
+.vip_price_yq{
+	font-size: 26rpx !important;
+	color: #427ec5;
+	border: 1rpx solid #427ec5;
+	border-radius: 10rpx;
+	margin-right: 15rpx;
+	margin-bottom: 10rpx;
+	padding: 0 10rpx;
+}
+.line{
+	text-decoration: line-through;
+	color: #258feb;
+	font-style: italic;
+}
+.vip_item_flag{
+	font-size: 26rpx;
+	color: #666;
+	padding-left: 20rpx;
+}
+.vip_item_flag text{
+	vertical-align: bottom;
 }
 
-.u-grid-list {
-  // height: 40rpx;
-}
 
-.searchList {
-  .item {
-    font-size: 28rpx;
-    padding: 20rpx;
-    border-bottom: 1px solid #dadbde;
-  }
+.vip_item_overdue{
+	background: rgba(220, 223, 225, 0.9) !important;
+	opacity: 0.75;
 }
-
-.scroll-view_H {
-  background-color: #fff;
-  white-space: nowrap;
-  padding: 10rpx;
+.vip_item_overdue .vip_item_title{
+	background-image: none;
+	font-size: 32rpx;
+	color: #000;
+	padding: 0;
 }
-
-.scroll-Y {
-  height: 100%;
+.vip_item_bg_1{
+	background: rgba(227, 120, 125, 0.3) !important;
 }
-
-.scroll-view_H {
-  white-space: nowrap;
-  width: 100%;
+.vip_item_bg_2{
+	background: rgba(64, 148, 222, 0.3) !important;
 }
-
-.scroll-view-item {
-  display: inline-block;
-  // height: 300rpx;
-  // line-height: 300rpx;
-  // text-align: center;
-  // font-size: 36rpx;
+.vip_item_tip{
+	color: #ff1f00;
+	font-size: 26rpx;
+	padding-left: 20rpx;
 }
-
-.scroll-view-item_H {
-  display: inline-block;
-  width: 100%;
-  // height: 300rpx;
-  // line-height: 300rpx;
-  // text-align: center;
-  // font-size: 36rpx;
+.vip_item_tip text{
+	vertical-align: bottom;
 }
-
-.titleList {
-  height: 100%;
-}
-
-.titleList2 {
-  height: calc(100% - 170rpx);
-}
-.commonPageContentBox {
-  // min-height: 100% !important;
-}
-.related_courses_name {
-  display: inline-block;
-  float: left;
-  line-height: 60rpx;
-  width: calc(100% - 90rpx) !important;
-  padding-left: 20rpx;
-  font-weight: 700;
-  .aui-text-danger {
-    display: inline-block;
-    float: right;
-  }
-}
-.vip_image_box {
-  @include themFlex(center, center);
-  margin-bottom: 20rpx;
-}
-.vip_image {
-  width: 60rpx;
-  height: 60rpx;
-  // float: left;
-}
-/deep/.list_item {
-  .rightArrow {
-    margin-top: 10rpx !important;
-  }
-}
-
-.flash_sale_content {
-  width: 100%;
-  display: flex;
-  overflow: hidden;
-  height: 100%;
-  align-items: center;
-  justify-content: space-between;
-
-  .flash_sale_content_item {
-    width: auto;
-    min-width: 47%;
-    min-height: 48%;
-    margin: 10rpx !important;
-    border-radius: 20rpx;
-    overflow: hidden;
-    position: relative;
-    .vip_content {
-      width: 100%;
-      height: calc(100% - 80rpx);
-      padding: 20rpx;
-      padding-top: 0;
-      // display: flex;
-      // align-items: center;
-      // justify-content: center;
-      // flex-direction: column;
-      position: relative;
-    }
-  }
-
-  .book_image {
-    width: 165rpx;
-    height: 192rpx;
-    border-radius: 10rpx;
-    background-color: #f5f5f5;
-  }
-
-  .book_name {
-    border-radius: 20rpx;
-    padding: 10rpx 20rpx;
-    padding-top: 20rpx;
-    // height: 80rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: bold;
-    font-size: 46rpx;
-    line-height: 48rpx;
-    color: #64bec5;
-    text-align: center;
-    // margin-bottom: 10rpx;
-    overflow: hidden;
-    // text-overflow: ellipsis;
-    white-space: wrap;
-  }
-}
-.vip_button_list {
-  width: 100%;
-  max-height: 200rpx;
-  // @include themFlex(center, space-between);
-  // flex-direction: column;
-  padding-top: 0;
-  // display: flex;
-  padding: 20rpx 10rpx;
-  text-align: center;
-  position: absolute;
-  bottom: 20rpx;
-  left: 0;
-  width: 100%;
-  // justify-content: center;
-  // flex-direction: column;
-  .vip_button {
-    color: #265354;
-    width: 100%;
-    height: 80rpx !important;
-    // line-height: 80rpx;
-    display: flex;
-    // align-items: center;
-    justify-content: space-around;
-    padding: 0 0rpx;
-    font-size: 26rpx;
-    font-weight: bold;
-    width: 100%;
-    border-radius: 40rpx;
-    // line-height: 80rpx;
-    margin-top: 20rpx;
-    white-space: wrap;
-    view {
-      display: flex;
-      line-height: 30rpx;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  .vip_button:first-child {
-    margin-top: 0 !important;
-  }
-}
-.qunyi_box {
-  height: calc(100% - 280rpx);
-  color: #333;
-  font-weight: bold;
-  padding-left: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.popup_box {
-  max-height: 95vh;
-  overflow: auto;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/mine/vip/order.vue b/pages/mine/vip/order.vue
index 88333be..9dacf75 100644
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -1,7 +1,4 @@
-<template><page-meta
-    :page-font-size="$baseFontSize() + 'px'"
-    :root-font-size="$baseFontSize() + 'px'"
-  ></page-meta>
+<template>
 	<view class="container commonDetailPage" style="background-color: #fff !important">
 		<!-- 公共组件-每个页面必须引入 -->
 
@@ -9,10 +6,19 @@
 			<view class="order_top goods_box pay_box">
 				<view class="pay_title">支付方式</view>
 
-				<view style="margin-bottom: 20rpx">
-					<u-tag :text="`已选：${dataInfo.title}`" bgColor="rgba(188, 231, 223, 0.3)"
-						borderColor="rgb(197, 227, 215)" color="#2e676a" plain></u-tag>
+				<view style="margin-bottom: 20rpx" v-if="!dataInfo.list">
+					<u-tag :text="`已选：${dataInfo.title}`" bgColor="#EDFCF7" borderColor="#EDFCF7" color="#018F89"
+						plain></u-tag>
 				</view>
+				<view v-if="dataInfo.list&&dataInfo.list.length>0" style="margin: 20rpx 0 40rpx;">
+					{{dataInfo.list[0].title}}价格：<text v-if="dataInfo.title.includes('国学与心理学')"><br/></text>
+					<text v-for="(item,index) in dataInfo.list" :key="index" 
+					class="list_choose" 
+					:class="activeIndex==index?'list_choose_active':''"
+					@click="chooseYear(item, index)">{{item.year}}年</text>
+				</view>
+				
+				
 				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payList">
 					<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
 						<view class="left">
@@ -20,7 +26,7 @@
 							</image>
 							<template v-if="v.type == 4">
 								<text> {{ v.text }}</text>
-								<text style="color: #3ab3ae; font-weight: 600; margin-left: 10rpx">
+								<text style="color: #018F89; font-weight: 600; margin-left: 10rpx">
 									(余额：{{
                     initData && initData.user ? initData.user.peanutCoin : 0
                   }})</text>
@@ -29,11 +35,11 @@
 							<text v-else> {{ v.text }}</text>
 						</view>
 						<template v-if="isDefaultCurrency">
-							<radio v-if="i == 2" :value="v.value" color="#3ab3ae"
+							<radio v-if="i == 2" :value="v.value" color="#018F89"
 								:checked="selectPayIndex == i ? true : false" @click="radioChange(i)" size="10" />
 						</template>
 						<template v-else>
-							<radio :value="v.value" color="#3ab3ae" :checked="selectPayIndex == i ? true : false"
+							<radio :value="v.value" color="#018F89" :checked="selectPayIndex == i ? true : false"
 								@click="radioChange(i)" size="10" />
 						</template>
 					</view>
@@ -51,9 +57,8 @@
 								确保您的天医币足够支付
 							</view>
 
-							<text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right" @click="
-                  onPageJump('/pages/mine/wallet/recharge/index?source=order')
-                ">立即充值</text>
+							<text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right"
+								@click="onPageJump('/pages/mine/wallet/recharge/index?source=order')">立即充值</text>
 						</view>
 
 						<view class="other_info" style="margin-top: 12rpx">
@@ -64,23 +69,15 @@
 								<span style="font-size: 15px"><u @click="gotoPhone">022-24142321</u></span>
 							</view>
 							<view class="explain">
-								<!-- 3.非中国大陆用户可通过paypal账户支付
-              <br> &nbsp;&nbsp;&nbsp;&nbsp;
-              <account class="aui-text-success" style="text-decoration: underline;" tapmode onclick="fnCopyAccount()">
-                  户名：tmrpublishgroup@sina.com
-              </account>
-              （点击复制）
-              <br> &nbsp;&nbsp;&nbsp;&nbsp;请务必备注本软件的用户姓名及电话以便核对信息，我们将于24小时内为您完成充值及升级。 -->
-
 								3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
 								支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
 								<text @click="fnCopy('publisher@tmrjournals.com', '邮箱')" class="aui-text-success"
-									style="text-decoration: underline; color: #3ab3ae">
+									style="text-decoration: underline; color: #018F89">
 									publisher@tmrjournals.com
 								</text>
 								（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
 								<text class="aui-text-success" @click="fnCopy('yilujiankangkefu', '微信名')"
-									style="text-decoration: underline; color: #3ab3ae">
+									style="text-decoration: underline; color: #018F89">
 									yilujiankangkefu </text>）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
 							</view>
 						</view>
@@ -101,36 +98,20 @@
 				<!-- leftSlot -->
 				<template slot="leftSlot" slot-scope="slotProps">
 					<view class="price_box order_bottom_box">
-						<text class="price">合计:
-
+						<text class="price">合计：
 							<text class="total">￥{{ dataInfo.lastFee }}</text>
 						</text>
-						<!-- <text style="color: #333; margin-left: 10rpx"
-              >原价{{ dataInfo.fee }}</text
-            > -->
 					</view>
 				</template>
-				<template slot="bottomSlot" slot-scope="slotProps"> </template>
 			</common-goods-nav>
 			<view class="agree_wo" style="width: 100%; text-align: right">
-				<!-- <radio-group class="agree">
-					<view v-for="(item, index) in argee" :key="index">
-						<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue" color="#3AB3AE" size="12px"
-							@click="radioCheck(index)"></radio>
-					</view>
-				</radio-group> -->
 				<view>支付即同意众妙之门<span class="highlight" @click="showXieyi">《会员服务协议》</span></view>
 			</view>
 		</view>
-
-		<!-- @close="closeOrderModalShow" -->
-
-		<!-- <z-navigation></z-navigation> -->
 	</view>
 </template>
 
 <script>
-	import debounce from "@/common/debounce.js";
 	import courseDescription from "@/pages/component/commonComponents/list";
 	import {
 		setPay,
@@ -170,15 +151,17 @@
 					this.$forceUpdate();
 				},
 			},
+			lastFee:{
+				immediate: true,
+				handler(newRoute) {
+					if(this.dataInfo.list&&this.dataInfo.list.length>0){
+						this.dataInfo.lastFee = this.dataInfo.list[0].rebateFee
+					}
+				}
+			}
 		},
 		data() {
 			return {
-				radioValue: "",
-				argee: [{
-					value: false,
-					id: "1",
-				}, ], // 同意权限
-				xyText: "",
 				isDefaultCurrency: false,
 				isShowAddress: false,
 				jfNumber: 0,
@@ -218,14 +201,6 @@
 					},
 				],
 				priceBreakdownList: [],
-				// orderInfoList: [
-				//   {
-				//     text: "订单备注",
-				//     placeholder: "点击填写订单备注",
-				//     imgUrl: "",
-				//     type: "remark",
-				//   },
-				// ],
 				number: 1,
 				detailInfo: {},
 				content: "",
@@ -240,8 +215,8 @@
 				detailInfo: {},
 				fdButtonStyle: {
 					width: "90rpx",
-					"border-color": "#3AB3AE",
-					color: "#3AB3AE",
+					"border-color": "#258feb",
+					color: "#258feb",
 					float: "right",
 					"margin-right": "20rpx",
 					"margin-left": "30rpx",
@@ -274,7 +249,6 @@
 				urlList: {
 					list: "app/phone.do?getCourseDetail_new",
 					initPrepareOrder: "/common/buyOrder/initPrepareOrder",
-					// buyOrder: "book/buyOrder/placeOrder",
 					buyOrder: "common/userVip/placeVipOrder",
 					curriculumInfo: "app/phone.do?getCourseInfo",
 					detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
@@ -293,46 +267,21 @@
 					backgroundColor: "linear-gradient(90deg, #3AB3AE 0%, #117e4c 100%)",
 					color: "#fff",
 				}, ],
+				activeIndex: 0,  //选择付款 下标
 			};
 		},
 		async onLoad(options) {
-			console.log("调用了onLoad方法");
 			var that = this;
-			console.log("options at line 387:", options);
 			this.options = JSON.parse(options.data);
-			// if (this.options.goods.findIndex((e) => e.goodsType == "05") >= 0) {
-			//   this.isShowAddress = false;
-			// } else {
-			//   this.isShowAddress = true;
-			// }
 			this.goodsDataList = this.options.goods;
-			// if (this.options.sourceType == "curriculum") {
-			//   this.goToInfo = {
-			//     url: "/pages/curriculum/order/index/index",
-			//     type: 2,
-			//   };
-			// } else {
 			this.goToInfo = {
 				url: "/pages/bookShop/orderList",
 				type: 1,
 			};
-			// }
-			// that.initPrepareOrder();
-			console.log("this.options at line 375:", this.options, this.goToInfo);
-
-			// this.getUserInfo()
-			// this.getCateList()
-		},
-
-		onHide() {
-			// this.showSearchList = false
-			// this.searchList = []
 		},
 		async onShow() {
-			console.log("调用了onShow方法");
 			var that = this;
 			await uni.$on("returnData", function(data) {
-				console.log("data at line 415:", data);
 				if (data) {
 					that.addressData = {
 						...data,
@@ -347,23 +296,11 @@
 					console.log("没有接受到数据");
 				}
 			});
-			// this.selectPayIndex = 0;
-
-			console.log("this.addressData at line 416:", this.addressData);
 		},
 		computed: {
 			...mapState(["userInfo"]),
 		},
 		methods: {
-			showXieyi() {
-
-
-
-				uni.navigateTo({
-					url: "/pages/mine/aboutUs/agreement?id=105",
-				});
-			},
-
 			onHandleClickBuy() {
 				this.orderModalShow = false;
 				this.remark = this.content;
@@ -375,7 +312,6 @@
 				this.orderModalShow = false;
 			},
 			onPageJump(url) {
-				console.log(url, "url");
 				uni.navigateTo({
 					url: url,
 				});
@@ -393,9 +329,6 @@
 						type: 2,
 					},
 				];
-				// this.goodsDataList
-				console.log("this.goodsDataList at line 595:", this.goodsDataList);
-
 				var data = {
 					uid: this.userInfo.id,
 					productList: [],
@@ -405,12 +338,10 @@
 
 				this.$http
 					.request({
-						// url: "book/buyOrder/buySave",
 						url: `${this.urlList.initPrepareOrder}`,
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						method: "POST",
 						data,
 						header: {
-							//默认 无 说明：请求头
 							"Content-Type": "application/json",
 						},
 					})
@@ -422,8 +353,6 @@
 						}
 
 						this.$forceUpdate();
-
-						// await that.getDetailInfo();
 					});
 			},
 			// 获取订单初始话
@@ -473,10 +402,6 @@
 				uni.navigateTo({
 					url: "/pages/component/commonComponents/address/index?type=order",
 				});
-				// this.show = true;
-				// this.$nextTick(() => {
-				//   this.$refs.commonAddress.open();
-				// });
 			},
 			fnCopy(value, title) {
 				this.$commonJS.handleMakingPhoneCalls(value, title);
@@ -487,176 +412,152 @@
 			},
 			openOrderModal(v) {
 				this.orderModalShowInfo = v;
-				console.log(
-					"this.orderModalShowInfo at line 727:",
-					this.orderModalShowInfo
-				);
 				this.orderModalShow = true;
 				if (this.orderModalShowInfo.type == "remark") {
 					this.content = this.remark;
 				}
 			},
+			//支付请求
 			async goBuyJie() {
-				debounce(async () => {
-					// if (this.radioValue != 1) {
-					//   uni.showToast({
-					//     title: "请勾选 已阅读会员服务协议",
-					//     icon: "none",
-					//   });
-					//   return false;
-					// }
-					var that = this;
-
-					this.nowClick = false;
-					setTimeout(() => {
-						this.nowClick = true;
-					}, 5000);
-
-					let xiaBiao = [];
-
-					let data = {
-						paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
-						orderMoney: this.dataInfo.lastFee, //订单金额
-						realMoney: this.dataInfo.lastFee, //实际金额
-						shippingMoney: 0, //运费
-						jfDeduction: 0, //积分抵扣
-						vipBuyConfigId: this.dataInfo.id,
-						come: 1, //订单来源，0疯子读书1国学众妙之门2医学吴门医述
-						// appName: "zmzm",
-					};
-					console.log("data at line 477:", data);
-					await $http
-						.request({
-							// url: "book/buyOrder/buySave",
-							url: that.urlList.buyOrder,
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data,
-							header: {
-								//默认 无 说明：请求头
-								"Content-Type": "application/json",
-							},
-						})
-						.then(async (res) => {
-							console.log("res at line 598111111111111:", res);
-							if (res.code == 0) {
-								if (res.orderSn == null) {
+				var that = this;
+				this.nowClick = false;
+				setTimeout(() => {
+					this.nowClick = true;
+				}, 5000);
+				let xiaBiao = [];
+				if (this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee) {
+					uni.showToast({
+						title: '天医币余额不足',
+						icon: 'none'
+					})
+					return
+				}
+				let data = {
+					paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
+					orderMoney: this.dataInfo.lastFee, //订单金额
+					realMoney: this.dataInfo.lastFee, //实际金额
+					shippingMoney: 0, //运费
+					jfDeduction: 0, //积分抵扣
+					vipBuyConfigId: this.dataInfo.id,
+					come: 1, //订单来源，0疯子读书1国学众妙之门2医学吴门医述
+				};
+				await $http
+					.request({
+						url: that.urlList.buyOrder,
+						method: "POST",
+						data,
+						header: {
+							"Content-Type": "application/json",
+						},
+					})
+					.then(async (res) => {
+						if (res.code == 0) {
+							if (res.orderSn == null) {
+								uni.showToast({
+									title: "失败,请重新下单",
+									icon: "none",
+									image: "../../../static/icon/ic_close.png",
+								});
+							} else {
+								if (that.payType == 2) {
+									// 常规支付
 									uni.showToast({
-										title: "失败,请重新下单",
-										icon: "none",
-										image: "../../../static/icon/ic_close.png",
+										title: "正在支付",
+										icon: "loading",
 									});
-								} else {
-									console.log("that.payType at line 607:", that.payType);
-									if (that.payType == 2) {
-										// 常规支付
-										uni.showToast({
-											title: "正在支付",
-											icon: "loading",
-										});
-										await setPay({
-												typePay: "alipay",
-												subject: "vip",
-												totalAmount: res.money,
-												type: 2,
-												relevanceoid: res.orderSn,
-												customerId: that.userInfo.id,
-											},
-											(res) => {
-												uni.showLoading({
-													title: "加载中",
-												});
-												console.log(res, "支付支付");
-												if (res.success) {
-													uni.showToast({
-														title: "支付成功",
-													});
-													setTimeout(() => {
-														uni.setStorageSync(
-															"orderStatus", 0);
-														uni.switchTab({
-															url: "/pages/bookShop/orderList?type=order",
-															success: function(
-																res) {},
-														});
-													}, 1000);
-												} else {
-													console.log("失败失败失败");
-
-													// that.$commonJS.showToast('支付是失败')
-													setTimeout(() => {
-														console.log("延迟调用 失败提示");
-														uni.showToast({
-															title: "支付失败",
-
-															image: "../../../static/icon/ic_close.png",
-														});
-													}, 0);
-												}
-											}
-										);
-									} else if (this.payType == 1) {
-										// 微信支付
-										let data1 = {
-											orderSn: res.orderSn,
-											buyOrderId: null,
+									await setPay({
+											typePay: "alipay",
+											subject: "vip",
 											totalAmount: res.money,
-										};
-										setWXPay(data1, (res) => {
+											type: 2,
+											relevanceoid: res.orderSn,
+											customerId: that.userInfo.id,
+										},
+										(res) => {
+											uni.showLoading({
+												title: "加载中",
+											});
+											console.log(res, "支付支付");
 											if (res.success) {
 												uni.showToast({
 													title: "支付成功",
 												});
 												setTimeout(() => {
-													uni.setStorageSync(
-														"orderStatus", 0);
 													uni.switchTab({
 														url: "/pages/bookShop/orderList?type=order",
-														success: function(
-															res) {},
 													});
 												}, 1000);
 											} else {
-												console.log(res, "微信支付111111111111111");
-												if (res.data.errMsg.indexOf(
-														"User canceled") != -1) {
-													uni.showToast({
-														title: "用户取消支付",
-														icon: "none",
-														image: "../../../static/icon/ic_close.png",
-													});
-												} else {
+												setTimeout(() => {
+													console.log("延迟调用 失败提示");
 													uni.showToast({
 														title: "支付失败",
-														icon: "none",
 														image: "../../../static/icon/ic_close.png",
 													});
-												}
+												}, 0);
 											}
-										});
-									} else if (this.payType == 4) {
-										// 天医币支付
-										uni.showToast({
-											title: "购买成功",
-											icon: "success",
-										});
-										setTimeout(() => {
-											uni.setStorageSync("orderStatus", 0);
-											uni.switchTab({
-												url: "/pages/bookShop/orderList?type=order",
-												success: function(res) {},
+										}
+									);
+								} else if (this.payType == 1) {
+									// 微信支付
+									let data1 = {
+										orderSn: res.orderSn,
+										buyOrderId: null,
+										totalAmount: res.money,
+									};
+									setWXPay(data1, (res) => {
+										if (res.success) {
+											uni.showToast({
+												title: "支付成功",
 											});
-										}, 1000);
-									}
+											setTimeout(() => {
+												uni.switchTab({
+													url: "/pages/bookShop/orderList?type=order",
+												});
+											}, 1000);
+										} else {
+											if (res.data.errMsg.indexOf("User canceled") != -1) {
+												uni.showToast({
+													title: "用户取消支付",
+													icon: "none",
+													image: "../../../static/icon/ic_close.png",
+												});
+											} else {
+												uni.showToast({
+													title: "支付失败",
+													icon: "none",
+													image: "../../../static/icon/ic_close.png",
+												});
+											}
+										}
+									});
+								} else if (this.payType == 4) {
+									// 天医币支付
+									uni.showToast({
+										title: "购买成功",
+										icon: "success",
+									});
+									setTimeout(() => {
+										uni.switchTab({
+											url: "/pages/bookShop/orderList?type=order",
+										});
+									}, 1000);
 								}
 							}
-						});
-				}, 200);
+						}
+					});
+			},
+			//切换年份选项
+			chooseYear(item,index){
+				this.activeIndex = index;
+				this.dataInfo.lastFee = item.rebateFee;
+				
+				
+				console.log('----this.dataInfo',this.dataInfo);
 			},
-
 			radioChange(index) {
 				this.selectPayIndex = index;
 				this.payType = this.payList[this.selectPayIndex].type;
-				console.log("this.selectPayIndex at line 315:", this.selectPayIndex);
 				this.$forceUpdate();
 			},
 			handleValChange(e) {
@@ -676,12 +577,6 @@
 						...this.taiHuClassInfo,
 					},
 				};
-				// $mars.progressBegin('申请中...');
-				// $mars.post(customerType, 'applyRelearn', data, function (ret) {
-				//     api.hideProgress();
-
-				//     fnLoadDataGrid();
-				// });
 			},
 			fnRelearn(oid, days, courseFee) {
 				//99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
@@ -717,14 +612,6 @@
 					fee: fee,
 				};
 				this.show = true;
-				// $aui.alert({
-				//     title: ,
-				//     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
-				//     buttons: ['取消', '确认'],
-				//     radius: 6,
-				//     titleColor: '#ff3300',
-				//     contColor: '#333',
-				//     btnColor: ''
 			},
 			//课程详情
 			async gotoDetail(v) {
@@ -741,7 +628,6 @@
 				}
 
 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`,
 				});
 			},
@@ -749,14 +635,12 @@
 			goCourseDescription(v) {
 				console.log(v);
 				uni.navigateTo({
-					// url: '../bookShop/commodityDetail?id=' + item.id
 					url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
 				});
 			},
 			async getCourseDescriptionData() {
 				var data = {};
 				var that = this;
-				console.log(this.$store.state, "11111111111");
 				this.$http
 					.post(this.urlList.list, {
 						customerType: "D",
@@ -774,16 +658,10 @@
 							this.swiperList.push(that.curriculumData.explainsImg);
 						} else {
 							that.swiperList = that.curriculumData.productImageList.split(",");
-							// for (var i = 0; i < imgList.length; i++) {
-							// 	this.swiperList.push(imgList[i])
-							// }
 						}
 
 						that.dataList = res.obj.correlatedList;
 						await that.getDetailInfo();
-						// that.relatedCoursesList = res.obj.correlatedList
-						// await that.handleselectCate({ ...this.cateList[0], index: 0 })
-						// socket.init();
 					});
 			},
 			getPriceData() {
@@ -798,21 +676,6 @@
 			checkDisable() {
 				console.log("点击了");
 			},
-			// 显示无权限弹窗
-			// showNoRights() {
-			// 	let that = this
-			// 	uni.showModal({
-			// 		content: "",
-			// 		confirmText: '好的',
-			// 		showCancel: false,
-			// 		success: function(res) {
-			// 			if (res.confirm) {
-			// 				// console.log('用户点击确定');
-			// 				that.clear()
-			// 			}
-			// 		}
-			// 	})
-			// },
 			// 获取用户详情
 			getUserInfo() {
 				// 用户详情
@@ -830,9 +693,6 @@
 				var data = [];
 				console.log(item, index, 99999);
 				var that = this;
-
-				// curriculumInfo
-
 				this.$http
 					.post(this.urlList.curriculumInfo, {
 						customerType: "D",
@@ -843,141 +703,27 @@
 					.then(async (res) => {
 						that.curriculumInfo = res.obj;
 						that.dataList = res.obj.courseList;
-
-						// socket.init();
 					});
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
-
 				return data;
 			},
 			async getDetailInfo() {
 				var that = this;
-
-				// curriculumInfo
-
 				this.detailInfo = {
 					content: "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png'  ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
 				};
-
-				// this.$http
-				//     .post(this.urlList.detailInfo, {
-				//         customerType
-				//             :
-				//             "D",
-				//         token
-				//             : uni.getStorageSync("token")
-				//         ,
-				//         customerOid
-				//             : uni.getStorageSync("customerOid"),
-				//         classOid: 'f81b558ca4ee406e97c4045c87c2539c'
-
-				//     })
-				//     .then(async res => {
-				//         that.detailInfo = res.obj
-				//         // that.dataList = res.obj.courseList
-
-				//         // socket.init();
-
-				//     });
-
-				// this.$nextTick(() => {
-				//     switch (item.type) {
-				//         case 1:
-				//             // allDataList
-				//             this.dataList = that.allDataList.result1Lst
-				//             break;
-				//         case 2:
-				//             this.dataList = that.allDataList.result2Lst
-				//             break;
-				//         case 3:
-				//             this.dataList = that.allDataList.result3Lst
-				//             break;
-				//         case 4:
-				//             this.dataList = that.allDataList.result4Lst.filter(e =>
-				//                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
-
-				//             )
-
-				//             console.log(this.dataList.length, 6666666)
-				//             break;
-
-				//     }
-
-				//     this.currentCateIndex = item.index
-				// })
-				console.log(this.allDataList, this.dataList, "1688");
-				// if(this.userMes.tgdzPower == 0){
-				// 	let that = this
-				// 	uni.showModal({
-				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-				// 		confirmText: '好的',
-				// 		showCancel: false,
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				// console.log('用户点击确定');
-				// 			}
-				// 		}
-				// 	})
-				// 	return
-				// }
-				// if(item.title == "时辰取穴"){
-				// 	uni.navigateTo({
-				// 		url: "../timeAcupoint/timeAcupoint"
-				// 	})
-				// 	return
-				// }
-
-				// this.currentStatusIndex = index
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
-
 				return data;
 			},
 			async setOneCateIndex(item, index) {
 				this.allDataList = [];
 				console.log(index, 99999);
 				var that = this;
-
-				// if(this.userMes.tgdzPower == 0){
-				// 	let that = this
-				// 	uni.showModal({
-				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-				// 		confirmText: '好的',
-				// 		showCancel: false,
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				// console.log('用户点击确定');
-				// 			}
-				// 		}
-				// 	})
-				// 	return
-				// }
-				// if(item.title == "时辰取穴"){
-				// 	uni.navigateTo({
-				// 		url: "../timeAcupoint/timeAcupoint"
-				// 	})
-				// 	return
-				// }
-
 				this.currentStatusIndex = index;
-				// this.currentCateIndex = 0
-
 				this.searchValue = "";
 				this.searchList = [];
 				this.showSearchList = false;
@@ -986,19 +732,6 @@
 
 					this.$forceUpdate();
 				});
-
-				// this.handleselectCate(this.cateList[this.currentCateIndex])
-				// if (index != 2) {
-
-				// uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
-				// 	var height = rect.height
-				// 	console.log('元素高度：',);
-
-				// }).exec();
-
-				// } else {
-				// 	this.getJFList(dictType)
-				// }
 			},
 
 			transformData(inputData) {
@@ -1012,159 +745,13 @@
 					}
 					result[letter].push(item);
 				});
-				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
 				return result;
 			},
-			// getJFList(id) {
-			// 	$http.request({
-			// 		url: "book/prescript/prescriptListForJF",
-			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-			// 		data: {
-			// 			loadAnimate: 'none', // 请求加载动画
-			// 			'categoryId': id
-			// 		},
-			// 		header: { //默认 无 说明：请求头
-			// 			'Content-Type': 'application/json'
-			// 		},
-			// 	}).then(res => {
-			// 		if (res.code == 0 && res.list.length > 0) {
-			// 			this.twoCateList = []
-			// 			this.dataList = this.transformData(res.list)
-			// 			console.log('JF经方', this.dataList)
-			// 		} else {
-			// 			this.twoCateList = []
-			// 			this.dataList = []
-			// 		}
-			// 	}).catch(e => {
-			// 		this.twoCateList = []
-			// 		this.dataList = []
-			// 		console.log(e)
-			// 	})
-			// },
 			getCateList(id) {
 				id ? "" : (id = 0);
 				this.twoCateList = [];
 				this.curTwoCateIndex = 0;
-				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
-				// $http.request({
-				// 	url: "book/prescript/prescriptCategoryList",
-				// 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-				// 	data: {
-				// 		loadAnimate: 'none', // 请求加载动画
-				// 		'categoryId': id
-				// 	},
-				// 	header: { //默认 无 说明：请求头
-				// 		'Content-Type': 'application/json'
-				// 	},
-				// }).then(res => {
-				// console.log(res, '脉穴分类获取成功')
-				// if (res.code == 0 && res.list.length > 0) {
-				// this.statusList = res.list
-				// this.getTowCateList(this.statusList[0].type)
-				// } else {
-				// 	this.statusList = []
-				// }
-				// }).catch(e => {
-				// 	this.statusList = []
-				// 	console.log(e)
-				// })
 			},
-
-			// 放大图片
-			previewImage(url) {
-				console.log(url);
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ["很抱歉，暂不支持保存图片到本地"],
-						success: function(res) {
-							// console.log(res,'+++++')
-						},
-					},
-				});
-			},
-			// getSearch() {
-			// 	$http.request({
-			// 		url: "book/prescript/searchPrescript",
-			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-			// 		data: {
-			// 			loadAnimate: 'none', // 请求加载动画
-			// 			'keywords': this.searchValue,
-			// 			type: this.currentStatusIndex + 1
-			// 		},
-			// 		header: { //默认 无 说明：请求头
-			// 			'Content-Type': 'application/json'
-			// 		},
-			// 	}).then(res => {
-			// 		console.log(res, '搜索结果')
-			// 		if (res.code == 0 && res.list.length >= 0) {
-			// 			this.showSearchList = true
-			// 			this.searchList = res.list
-			// 		} else {
-			// 			this.searchList = []
-			// 		}
-			// 	}).catch(e => {
-			// 		// this.dataList = []
-			// 		this.searchList = []
-			// 		console.log(e)
-			// 	})
-			// },
-			// search(res) {
-			// 	console.log(res, 'res')
-			// 	// uni.showToast({
-			// 	// 	title: '搜索：' + res,
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	if (res == '') {
-			// 		this.showSearchList = false
-			// 		this.searchList = []
-			// 	} else {
-			// 		this.getSearch()
-			// 	}
-
-			// },
-			// input(res) {
-			// 	console.log('----input:', res)
-			// 	if (res == '') {
-			// 		this.searchList = []
-			// 	} else {
-			// 		this.getSearch()
-			// 	}
-			// },
-			// clear(res) {
-			// 	console.log('----clear:', res)
-			// 	// uni.showToast({
-			// 	// 	title: 'clear事件，清除值为：',
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	this.searchValue = ''
-			// 	this.showSearchList = false
-			// },
-			// blur(res) {
-			// 	// console.log('----blur:', res)
-			// 	// if (res == '') {
-			// 	// 	this.showSearchList = false
-			// 	// 	this.searchList = []
-			// 	// } else {
-			// 	// 	this.getSearch()
-			// 	// }
-			// },
-			// focus(e) {
-			// 	console.log('----focus:')
-			// 	// uni.showToast({
-			// 	// 	title: 'focus事件，输出值为：' + e.value,
-			// 	// 	icon: 'none'
-			// 	// })
-			// 	// 等于1 就是有权限
-			// 	// this.showSearchList = true
-
-			// },
-			// cancel(res) {
-			// 	uni.showToast({
-			// 		title: '点击取消，输入值为：' + res.value,
-			// 		icon: 'none'
-			// 	})
-			// }
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -1505,7 +1092,7 @@
 		border-color: #e6e6e6;
 		border-left-color: transparent;
 		border-style: solid;
-		// background-color: #3AB3AE;
+		// background-color: #258feb;
 
 		border-top-right-radius: 10rpx;
 		border-bottom-right-radius: 10rpx;
@@ -1719,23 +1306,41 @@
 		justify-content: space-between;
 	}
 
+	/deep/.commonDetailPage {
+		height: 100vh !important;
+	}
+	
+	.list_choose{
+		display: inline-block;
+		border:1rpx solid #999;
+		color: #999;
+		border-radius: 10rpx;
+		margin: 20rpx 30rpx 20rpx 0;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		line-height: 50rpx;
+	}
+	.list_choose_active{
+		border:1rpx solid #ff1f00;
+		color: #ff1f00;
+	}
 	.agree_wo {
-		float: right;
-		width: 100%;
-		color: #aaa;
-		font-size: 22rpx;
-		margin-top: -10rpx;
-		margin-bottom: 20rpx;
-		padding: 0 20rpx;
-		//   margin: 40rpx 50rpx 0 50rpx;
-		// padding-bottom: 40rpx;
-	}
-
-	.agree {
-		width: auto !important;
-	}
-
-	.highlight {
-		color: $uni-color-primary;
-	}
-</style>
+			float: right;
+			width: 100%;
+			color: #aaa;
+			font-size: 22rpx;
+			margin-top: -10rpx;
+			margin-bottom: 20rpx;
+			padding: 0 20rpx;
+			//   margin: 40rpx 50rpx 0 50rpx;
+			// padding-bottom: 40rpx;
+		}
+	
+		.agree {
+			width: auto !important;
+		}
+	
+		.highlight {
+			color: $uni-color-primary;
+		}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/extUI/extUI.nvue b/pages/tabBar/extUI/extUI.vue
similarity index 100%
rename from pages/tabBar/extUI/extUI.nvue
rename to pages/tabBar/extUI/extUI.vue
diff --git a/pages/tabBar/template/template.nvue b/pages/tabBar/template/template.vue
similarity index 100%
rename from pages/tabBar/template/template.nvue
rename to pages/tabBar/template/template.vue
diff --git a/static/.DS_Store b/static/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6a950546ebb108284cb48fb5b32745ac414eea01
GIT binary patch
literal 8196
zcmeI1yKmD_6vmGm(-@(uMPz7s$r6GA8i@>@%3!J>q>7<Zqzc49o2KMJ5{I;<BUxD(
z3L_JUfejWqu)x9!e*gm`D^Cf55a&K@pA+9iU7{j!uVkOd-#Pw$KB;|kT>x+vwkidH
zX#ntW6LIPg?hHfdVoQxNedGd02kQYk(1b16XjTiQRJJ`}J77CtJ77CtJ77ETFLVIs
zY%#n6^S)B;-gdxt;J@sEcs}^Ji5TeEQ&B!Ta3_}l7+pLp2Y$wNfUNO#40P<NC`<92
zYW3jgQb#W_9953GFVZmvI`&jl<>07ta5UM`D-=i4vCfz2-~=k#z3qVQK)M5B?e4)U
zuG~A2r|b8%u+>rNr(T+JT4AwRZiZ!{eSPz7=Un^kMRQ(dPkEhMp_DKKJQZZ1jLy2^
zZ9=SgPx6UEJ$#=39(mAptuP^{RmSt43tm?7po`QhtTQeY8tDwmU)qiNednP*24^up
zApK0BpIcDFH!3X%(N!MS<);SJnYXd)U(nl-Z0hq-^=H(lp%qE*_Ey3CkNao{|E?<N
zdmGyLRw%@tR+wvWcTG9e>)ju}BCn})(XI~5W4_?L@a4iy^wWk-=4bN72dYsY^NYVD
zA8{?^n{>vVe66@O*u-zJ$++1w?<7}il)E$gC*j6=^39lZ#?3A%ZXMRd6*KPB@@>i0
z8s)yaoO__}XBT2U;hJ>DefCjs4`6M}a4+SKbh%2|*D5m+o7B^8n==?c7YP1%!dLGk
z<EIGBwEA`G;o;oT$OAhEbulQ1`M?J%4i_4*k?Ozq=?c{-e|hd$#E)w!+oUt@!70TR
z&y7m|lguqjuGT1bVw-SdJ^9{EI^(JzZ5h1mI&|1y8yucRs#YlT?Ben0T4OaKrd7^c
z5!ac)yJ{86jOX20P87<kK0cA~WF75nT4g-%z2J=@?+&9m_pV0ADeLt8lMzeSP*T6f
zIQqw}fQ@iu)VZg{`v214_x~ewU{7s3U^}qi9dO)YskneH^x8V*M?8*v+*WWCL*(^T
zlqI;6Pb`dbIgT;@harCUF;&zAI`&k=BRKZwMSz|E<w^p78_@a6G{4h1%cQe;OMTUL
Y{@3f`{yCoZvR`9;ly{T7Jw~?s3vFUr;Q#;t

literal 0
HcmV?d00001

diff --git a/static/icon/chao_svip.png b/static/icon/chao_svip.png
new file mode 100644
index 0000000000000000000000000000000000000000..2437ade8a4d6f990f64850e255c580b09009e769
GIT binary patch
literal 2524
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
XL91LYYkM8e|1VWcqVm|=8O8qw-=@6@

literal 0
HcmV?d00001

diff --git a/static/icon/chao_vip.png b/static/icon/chao_vip.png
new file mode 100644
index 0000000000000000000000000000000000000000..6afdacbe2b6251955457744b442c095e711b710e
GIT binary patch
literal 1055
zcmV+)1mOFLP)<h;3K|Lk000e1NJLTq001=r001Be1^@s6vi&ev00001b5ch_0Itp)
z=>Px&*-1n}R9Hvtm}{t}QxwPlKO#z$M!AJVQBppb#w|0h4I|2>NFiz>nZl6V$EC>}
zw{e>krZhsNCKHV?7?*J!M3f1Qn)q-&Ad2+&theVqJ!if9yyxjTVVutT_U`pxYw!PB
zYp?a}7fnN98gkMMssBq>XEHUDssAtn)3f|+zg`IH3gDTx!M6RRq`eb<qoie$R%JiH
zyu4=n8cFk8?)jsnpCpX}w+#5VeUqeHlj1|*@HQLRK3meW3HynpIQXHG-b}jhf&H3m
zwoj9^y3KwC%-5360KV$$u)VLO?+W09fH0U)Z0{r~ob8oBrvs~PUm$5^(!B(n(qFS3
z1V4~8t0Sqt+4jJn@uPRAY)7Oc;!SxBxMUJi4@<f<VeSF0s{JmJbYs%r4P4zIwO-Ou
zQzR7TcLCQnNu4U`#q5}>U?<wlc0_wk(tjjrZguEiYf^Ea&P$k!fyZloDJWCnHxF1h
zc4*t5OFATZTm&r7yV%}A(#MhxPPzrvT^u87`&~(M66Ofty{;#(%k@l2BLyD=q#|`o
z6L51C)qM)20@q7*LzV&2!N$aPbg11DZWrL^uA~}e`)ze!$2FX2PB~M%OA26Qp((S0
zxX3-ReWIkb3G;qkcE2}p(c(8J+%Le+QzcZN!v#Nk0$ax2nJTr>siI>wWeu>PcC@Xe
zcO=bDnEAlVDN7~t8-c^7LaHvm3#<6vocyfo&%aFSgsKz0k~i%)4BNL!x*_S80@r05
z+lwUKm)4&L&Z+}c8v1Sc&Yb{sC2()(2D)2SUT;_Bb!0M(wjArPrS)h8(e3^ykXj*W
zVOsCqJKNhx`a#kjZCJFxtOPFV<4UBikaT}?6o(E1$ENj@fPu``nTYksd{Y(zkJ^qe
zjZa$~whd$iSlk4bNbOpGCFHJ^H@E}Hr8tJMy-Cvk$><nhz3p=)J=NyKLoo3v76bR`
zf$LH-vi*Rh%ZE6OuYf4Kzb3-i&fO_~&jLnm-!AF;4x~Pl6!Y|(n$T}0AH^>Q+eb@!
zYsjX@1NnY6vlQcDOS0bt98j0$bJgKufHq|gu%QFd0h3{$LD8a5E^M*{$nA6-%=U4T
zUQM=Zfu6s@*UM=2L^&|B_)n9HS@1;K<c)f2mj+)mQ&GB6!cBPuxU41>jc2=tazi!e
z^5;}%enVfr^#ig$7ru~m4)En<yV-uIdc^ezG-NR_VtYqP`7W#i&Y#S0Tm59Dg3yE2
zBP?FAceWu^XQDJ%mjf@@j>l)b3dTw41>2UyfUmBGTeIEt{NrV7j(FFz&19-;<o<2D
ZzX3YESul}Tk`@2}002ovPDHLkV1f;92H5}r

literal 0
HcmV?d00001

diff --git a/uni_modules/.DS_Store b/uni_modules/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f41c0044dd9e5e456b7864d7fdeed479d3f854a7
GIT binary patch
literal 18436
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
PUju~N$ko?(k^g@K8{)>k

literal 0
HcmV?d00001

diff --git a/unpackage/.DS_Store b/unpackage/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..08542421288be6799b55ea4ac39f355038fb1bf1
GIT binary patch
literal 6148
zcmeHLy-ve05I)mX6j-_-A*M(j836SKLKSud5*w)WM+GTuN?R7DOz;389)K6%0a%zA
z5fdZgF&G&5&UV`iNnt|>`6T;Ge0TmXUmLqF5vkf)Ym=x<L?tvvZxLONv7cMU=IqD{
zQ0Y0^QD<|n8F%}cSU2Dla0>iA1^C@9Qj?C*jw$v2s!DX3_IBeiY(#Mbqos@U*Q>SO
z<JQ-R)(;W=<LL^astMA;-=a1(=!`mY{U`)?2WhY5AKt88PxvSK-FV8MA0hb*!2|Pq
z;6I@ujU>Bjc^}dzxewoW$J~=#$(-kxylS+=yz?}`b4O@LU{7i9t>0f{BV-M6w>Pfg
z%RI7@*-^3{Z-dLBg05#MRiNVj^3)^w{g=}*zs-}pS+C@y;v4fV7(R;e$q(@TYg39_
zRc@d1qhuYc&x3ItIrGVyzK@jkscN0;`|pN5o2|5D(DhCMr+`ynq5!WCJ{n_SF)^r@
z4s`km0Q4}d4cBG90QwdKi-|#aV9KNdO{%g-3}w<W?%TM)Vq(ywlhVwX$1*E>LQ$F>
z<Gv0j6&Q5AQ@|;ZR-j;R%e?<@&p!XBliZzCz$x&r6i{Bc7uN7dc5lr*9PhP0S{;pz
p;}U~91)bfF^#yOm{J(-W_<X(q1{M>87=gJT0$K*wIR$=Iflqe1##{gZ

literal 0
HcmV?d00001