Merge pull request '修改' (#14) from dev-qsh into master

Reviewed-on: http://114.55.169.15:3000/huxiaofeng666/jwl-applet/pulls/14

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金武联驾校
 VITE_APP_ENV = 'development'
 
 # 金武联驾校/开发环境
-VITE_APP_BASE_API = 'http://118.31.23.45:8888/'
+VITE_APP_BASE_API = 'https://jwl.ahduima.com/'
 
 # 
-VITE_WEB_BASE_URL = 'http://118.31.23.45:8888/'
+VITE_WEB_BASE_URL = 'https://jwl.ahduima.com'

.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金武联驾校
 VITE_APP_ENV = 'production'
 
 # 金武联驾校/开发环境
-VITE_APP_BASE_API = 'https://i.equ-tech.com/zongheng-api/'
+VITE_APP_BASE_API = 'https://jwl.ahduima.com/'
 
 # 
-VITE_WEB_BASE_URL = 'https://i.equ-tech.com/zongheng'
+VITE_WEB_BASE_URL = 'https://jwl.ahduima.com'

src/App.vue

@@ -4,8 +4,8 @@ import useQuestionStore from '@/jtools/store/question' //引入store
 export default {
   onLaunch: function () {
     useUserStore().queryVipList()
-    if(useUserStore().isLogin) {
     useQuestionStore().getOrderQuestion('1')
+    if (useUserStore().isLogin) {
       useUserStore().getUserInfo()
       useUserStore().searchUserVip()
     }

src/jtools/api/question.js

@@ -1,11 +1,11 @@
 import request from '../request/index.js';
 
-
 export function queryQuestion(data) {
   return request({
     url: 'driver-api/tdQuestion/queryQuestion',
     method: 'POST',
     data,
+    noToken: true
   });
 }
 
@@ -13,7 +13,7 @@ export function questionCategory(data) {
   return request({
     url: 'driver-api/tdQuestion/questionCategory',
     method: 'POST',
-    data,
+    data
   });
 }
 
@@ -21,7 +21,7 @@ export function getTestQuestion(data) {
   return request({
     url: 'driver-api/tdQuestion/getTestQuestion',
     method: 'POST',
-    data,
+    data
   });
 }
 
@@ -29,7 +29,7 @@ export function submitTest(data) {
   return request({
     url: 'driver-api/tdQuestionTest/testSubmit',
     method: 'POST',
-    data,
+    data
   });
 }
 
@@ -37,7 +37,7 @@ export function testTotal(data) {
   return request({
     url: 'driver-api/tdQuestionTest/testTotal',
     method: 'POST',
-    data,
+    data
   });
 }
 
@@ -45,7 +45,7 @@ export function testTotal(data) {
 export function querySysConfigList(carTypeId, configKey) {
   return request({
     url: 'driver-api/tdSysConfigList/querySysConfigList?configKey=' + configKey + '&carTypeId=' + carTypeId,
-    method: 'GET',
+    method: 'GET'
   });
 }
 
@@ -54,6 +54,6 @@ export function queryProjectList(data) {
   return request({
     url: 'driver-api/tdTestProject/queryProjectList',
     method: 'POST',
-   data,
+    data
   });
 }

src/jtools/api/vip.js

@@ -4,7 +4,7 @@ export function queryVip(data) {
   return request({
     url: 'driver-api/tdMember/queryUserMember',
     method: 'POST',
-    data,
+    data
   });
 }
 
@@ -13,5 +13,6 @@ export function getVipList(data) {
     url: 'driver-api/tdMember/queryMember',
     method: 'POST',
     data,
+    noToken: true
   });
 }

src/pages/me/index.vue

@@ -33,20 +33,24 @@
             </view>
             <text class="ml5 fs16 fwb" style="color: #7E4012FF;">VIP会员</text>
           </view>
-          <text v-if="vipOn.length" class="fs12" style="color: #7E4012FF;">{{expireTime}}到期</text>
+          <text v-if="!isLogin || !vipOn.length" class="fs12" style="color: #7E4012FF;">您还不是VIP会员</text>
+          <text v-else-if="vipOn.length" class="fs12" style="color: #7E4012FF;">{{ expireTime }}到期</text>
         </view>
         <view class="absolute flex ai-c jc-c" style="left: 0;top: 40px;right: 0;bottom: 0;">
-          <view class="text-center">
+          <view v-if="!isLogin || !vipOn.length" class="text-center">
-            <view v-if="vipOn.length" class="fs18 fwb" style="color: #7E4012FF;">{{vipText}}</view>
+            <view class="fs18 fwb" style="color: #7E4012FF;">开通VIP尊享以下权益</view>
-            <view class="study fs16 text-center" style="margin: 25px auto 0;color: #F6E99FFF;">
+            <view class="fs15" style="color: #7E4012FF;">精选500题 / 真是模考 / 考前密卷</view>
-              {{ vipOn.length?'马上学习':'开通会员'}}
+            <view class="study fs16 text-center" style="margin: 25px auto 0;color: #F6E99FFF;">立即开通</view>
+          </view>
+          <view v-else-if="vipOn.length" class="text-center">
+            <view class="fs18 fwb" style="color: #7E4012FF;">{{ vipText }}</view>
+            <view class="study fs16 text-center" style="margin: 25px auto 0;color: #F6E99FFF;">马上学习</view>
           </view>
         </view>
       </view>
-      </view>
+      <view v-if="isLogin" class="br8 bc-fff p15 z-index2">
-      <view class="br8 bc-fff p15 z-index2">
         <text class="fs16 cor-333">我的驾校</text>
-        <view v-if="user.schoolId">
+        <view v-if="user?.schoolId">
           <div class="mt12 flex ai-c jc-sb">
             <text class="fs18 cor-000 fwb">{{ user.schoolName }}</text>
             <u-button text="切换驾校" shape="circle" @click="handleChangeSchool"></u-button>
@@ -60,7 +64,8 @@
             <text class="ml5 fs26 cor-333 fwb" style="line-height: 26px;">{{ user.schoolPhone }}</text>
           </view>
         </view>
-        <view v-else class="pt30 pb15">
+        <view v-else class="p15tb flex ai-c jc-sb">
+          <view class="fs20 cor-333 fwb">尚未绑定驾校</view>
           <u-button text="绑定驾校" shape="circle" @click="handleChangeSchool"></u-button>
         </view>
       </view>