diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 8835b6c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/config/baseUrl.js b/config/baseUrl.js index 2bf9987..dc91890 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,12 +2,12 @@ let baseUrl = ""; let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 - baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 - // baseUrl = "https://api.nuttyreading.com/"; // 线上正式 + //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 + baseUrl = "https://api.nuttyreading.com/"; // 线上正式 } else if (process.env.NODE_ENV === 'production') { // 生产环境11 - baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 - // baseUrl = "https://api.nuttyreading.com/"; //1 + //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 + baseUrl = "https://api.nuttyreading.com/"; //1 } const courtConfig = { //微信公众号APPID diff --git a/node_modules/.DS_Store b/node_modules/.DS_Store deleted file mode 100644 index 0911758..0000000 Binary files a/node_modules/.DS_Store and /dev/null differ diff --git a/pages/.DS_Store b/pages/.DS_Store deleted file mode 100644 index ea0a388..0000000 Binary files a/pages/.DS_Store and /dev/null differ diff --git a/pages/curriculum/order/curriculum/index.vue b/pages/curriculum/order/curriculum/index.vue index 231a580..3648614 100644 --- a/pages/curriculum/order/curriculum/index.vue +++ b/pages/curriculum/order/curriculum/index.vue @@ -38,16 +38,12 @@ - {{ - curriculumData.title - }} + {{curriculumData.title}} {{ cateList && cateList.length > 0 - ? `共${cateList.length}个目录` - : "" - }} + ? `共${cateList.length}个目录`}} @@ -68,9 +64,7 @@ - {{ - slotProps.data.title - }} + {{slotProps.data.title}} @@ -384,7 +378,9 @@ role = '国学'; }else if(type==8){ role = '心理学'; - } + }else if(type==9){ + role = '中西汇通学'; + } this.goBuyTitle = '尊贵的'+role+'VIP,您的有效期到'+res.userVip.endTime; this.goBuyType = 1; }else{ //否则没有开通vip @@ -422,6 +418,8 @@ text = '国学'; }else if(item=='8'){ text = '心理学'; + }else if(item=='9'){ + text = '中西汇通学'; } this.textList.push(text); }); diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index a889eea..fd049e0 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -30,13 +30,13 @@ - + 昵称:{{ userMes.nickname ? userMes.nickname : "未设置" }} 手机号:({{ userMes.tel }})