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

Reviewed-on: #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')
-			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,15 +37,15 @@ export function testTotal(data) {
   return request({
     url: 'driver-api/tdQuestionTest/testTotal',
     method: 'POST',
-    data,
+    data
   });
 }
 
 //获取配置
-export function querySysConfigList(carTypeId,configKey) {
+export function querySysConfigList(carTypeId, configKey) {
   return request({
-    url: 'driver-api/tdSysConfigList/querySysConfigList?configKey='+configKey+'&carTypeId='+carTypeId,
+    url: 'driver-api/tdSysConfigList/querySysConfigList?configKey=' + configKey + '&carTypeId=' + carTypeId,
-    method: 'GET',
+    method: 'GET'
   });
 }
 
@@ -53,7 +53,7 @@ export function querySysConfigList(carTypeId,configKey) {
 export function queryProjectList(data) {
   return request({
     url: 'driver-api/tdTestProject/queryProjectList',
-   method: 'POST',
+    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

@@ -7,7 +7,7 @@
         <u-avatar class="br-p50 overflow-h" :size="64" mp-avatar shape="circle"></u-avatar>
         <view class="ml12">
           <view class="flex ai-c fs18 cor-333 fwb">
-            <text class="mr10">{{ user.userName }}{{user.userId}}</text>
+            <text class="mr10">{{ user.userName }}{{ user.userId }}</text>
             <image v-if="vipOn.length" src="/static/image/mine/vip.png" mode="widthFix" style="width: 18px;"></image>
           </view>
           <view class="mt5 fs14 cor-666">陪您学车 第{{ user.days }}天</view>
@@ -33,22 +33,26 @@
             </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>
+          <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 class="br8 bc-fff p15 z-index2">
+      <view v-if="isLogin" 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>
+            <text class="fs18 cor-000 fwb">{{ user.schoolName }}</text>
             <u-button text="切换驾校" shape="circle" @click="handleChangeSchool"></u-button>
           </div>
           <u-line margin="14px 0 18px 0"></u-line>
@@ -57,10 +61,11 @@
               <img src="/static/image/mine/phone.png" style="width: 12px;height: 12px;">
               <text class="ml2 fs12 cor-fff">客服热线</text>
             </view>
-            <text class="ml5 fs26 cor-333 fwb" style="line-height: 26px;">{{user.schoolPhone}}</text>
+            <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>
@@ -104,27 +109,27 @@ export default {
       return useUserStore().vipOnList
     },
     expireTime() {
-      if(this.vipOn.length) {
+      if (this.vipOn.length) {
         const t = this.vipOn.reduce((pre, cur) => {
-          if(Date.parse(pre) > Date.parse(cur.endDate)) {
+          if (Date.parse(pre) > Date.parse(cur.endDate)) {
             return cur.endDate
           }
           return pre
         }, '2099-12-31')
         return t.split(' ')[0]
-      }else {
+      } else {
         return ''
       }
     },
     vipText() {
-      if(this.vipOn.length) {
+      if (this.vipOn.length) {
         const t = this.vipOn.reduce((pre, cur) => {
-          return [...pre, ...cur.subjects.split(',').map(it =>['','一','二','三','四'][it])]
+          return [...pre, ...cur.subjects.split(',').map(it => ['', '一', '二', '三', '四'][it])]
         }, [])
         let val = Array.from(new Set(t))
-        val = val.length == 4 ? val.join('')+'全部':val.join('')
+        val = val.length == 4 ? val.join('') + '全部' : val.join('')
         return `尊享科目${val}付费权益`
-      }else {
+      } else {
         return ''
       }
     }
@@ -137,8 +142,8 @@ export default {
   },
   methods: {
     handleVip() {
-      if(this.isLogin) {
+      if (this.isLogin) {
-        if(this.vipOn.length) {
+        if (this.vipOn.length) {
           uni.navigateTo({
             url: '/pages/me/vip'
           })
@@ -157,7 +162,7 @@ export default {
       })
     },
     handleChangeSchool() {
-      if(this.isLogin) {
+      if (this.isLogin) {
         uni.navigateTo({
           url: '/pages/me/school'
         })
@@ -166,7 +171,7 @@ export default {
       }
     },
     handleInfo() {
-      if(this.isLogin) {
+      if (this.isLogin) {
         uni.navigateTo({
           url: '/pages/me/info'
         })
@@ -175,7 +180,7 @@ export default {
       }
     },
     handleTJ() {
-      if(this.isLogin) {
+      if (this.isLogin) {
         uni.navigateTo({
           url: '/pages/me/tijian'
         })