dev-hxf #26

Merged
huxiaofeng666 merged 2 commits from dev-hxf into master 1 year ago
  1. 4
      .env.development
  2. 2
      src/App.vue
  3. 3
      src/jtools/pay/index.js
  4. 2
      src/pages/index/index.vue
  5. 33
      src/pages/index/videoVip.vue
  6. 10
      src/pages/me/index.vue
  7. 4
      src/pages/me/info.vue
  8. 13
      src/pages/questionBank/exclusiveExercise.vue

@ -5,6 +5,6 @@ VITE_APP_TITLE = 金武联驾校
VITE_APP_ENV = 'development' 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'

@ -4,13 +4,13 @@ import useQuestionStore from '@/jtools/store/question' //引入store
export default { export default {
onLaunch: function () { onLaunch: function () {
useUserStore().queryVipList() useUserStore().queryVipList()
useQuestionStore().getAllQuestion()
if(useUserStore().isLogin) { if(useUserStore().isLogin) {
useUserStore().getUserInfo() useUserStore().getUserInfo()
useUserStore().searchUserVip() useUserStore().searchUserVip()
} }
}, },
onShow: function () { onShow: function () {
useQuestionStore().getAllQuestion()
console.log('App Show') console.log('App Show')
}, },
onHide: function () { onHide: function () {

@ -64,7 +64,8 @@ export default class JtoolsPay {
"description": this.order.description, "description": this.order.description,
"money": this.order.money, "money": this.order.money,
"outTradeNo": this.order.outTradeNo, "outTradeNo": this.order.outTradeNo,
"userId": this.order.userId "userId": this.order.userId,
"tradeType":'1'
} }
if (uni.getStorageSync('openId')) { if (uni.getStorageSync('openId')) {
params.openId = uni.getStorageSync('openId'); params.openId = uni.getStorageSync('openId');

@ -66,7 +66,7 @@
this.show=false this.show=false
}, },
computed: { computed: {
...mapState(useQuestionStore, ["loading_subject4", "loading_subject1","curSubject"]), //tagslist ...mapState(useQuestionStore, ["loading_subject4", "loading_subject1","curSubject","orderQuestion_subject1","orderQuestion_subject4"]), //tagslist
getLoading() { getLoading() {
return this.loading_subject4 && this.loading_subject1 return this.loading_subject4 && this.loading_subject1
} }

@ -60,7 +60,7 @@
</view> </view>
</view> </view>
<view class="wp100 mt15" v-if="subject=='1'||subject=='4'"> <view class="wp100 mt15" v-if="subject=='1'||subject=='4'">
<image class="wp100" mode="widthFix" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/vip%E6%8F%8F%E8%BF%B0_20230911211600.png"></image> <image class="wp100" mode="widthFix" :src="picUrl"></image>
</view> </view>
</view> </view>
</view> </view>
@ -86,6 +86,7 @@
export default { export default {
data(){ data(){
return{ return{
picUrl:'',
titleNum:500, titleNum:500,
subject:'1', subject:'1',
loading:true, loading:true,
@ -106,12 +107,19 @@
this.getVipList() this.getVipList()
this.getWXOpenId() this.getWXOpenId()
this.getTitle() this.getTitle()
this.getPic()
this.$set(this.order, 'userId', this.userInfo.userId); this.$set(this.order, 'userId', this.userInfo.userId);
}, },
computed: { computed: {
...mapState(useUserStore, ["userInfo"]) ...mapState(useUserStore, ["userInfo"])
}, },
methods:{ methods:{
getPic(){
const currentCartype = storage.get('carType') || '1001'
querySysConfig(currentCartype, 'VipDescImageUrl').then(res => {
this.picUrl = JSON.parse(res.data.configJson).url
})
},
getTitle(){ getTitle(){
const carId=storage.get('carType') || '1001' const carId=storage.get('carType') || '1001'
querySysConfig(carId,'SimplifyQuestionNum').then(resp=>{ querySysConfig(carId,'SimplifyQuestionNum').then(resp=>{
@ -142,16 +150,18 @@
carTypeId: storage.get('carType') || '1001', carTypeId: storage.get('carType') || '1001',
subject:this.subject subject:this.subject
}).then(resp=>{ }).then(resp=>{
this.priceList=resp.data if(resp.code==='0000'){
this.checkedId=this.priceList[0].memberId this.priceList=resp.data
this.order.outTradeNo=this.priceList[0].memberId this.checkedId=this.priceList[0].memberId
this.order.money=this.priceList[0].price this.order.outTradeNo=this.priceList[0].memberId
this.nowPrice=this.priceList[0].price this.order.money=this.priceList[0].price
this.priceList.forEach(item=>{ this.nowPrice=this.priceList[0].price
if(item.subjects.length>1){ this.priceList.forEach(item=>{
item.all=true if(item.subjects.length>1){
} item.all=true
}) }
})
}
}) })
}, },
checkPrice(val,price){ checkPrice(val,price){
@ -175,7 +185,6 @@
padding: 14px; padding: 14px;
} }
.checked_item{ .checked_item{
width: 228rpx;
background: #FFF0E5; background: #FFF0E5;
border: 4px solid #FF6E02; border: 4px solid #FF6E02;
} }

@ -189,9 +189,13 @@ export default {
}, },
handleTJ() { handleTJ() {
if (this.isLogin) { if (this.isLogin) {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/me/tijian' // url: '/pages/me/tijian'
}) // })
uni.showToast({
title:'敬请期待',
icon:'none'
})
} else { } else {
this.toLogin() this.toLogin()
} }

@ -15,7 +15,7 @@
<u-icon name="arrow-right" color="#999" /> <u-icon name="arrow-right" color="#999" />
</view> </view>
</view> </view>
<view class="flex jc-sb ai-c bb1" style="height: 110rpx;"> <!-- <view class="flex jc-sb ai-c bb1" style="height: 110rpx;">
<view class="title">身份证号</view> <view class="title">身份证号</view>
<view class="m30lr fs14 cor-333">{{sfzNum}}</view> <view class="m30lr fs14 cor-333">{{sfzNum}}</view>
</view> </view>
@ -23,7 +23,7 @@
<view class="title">证件照</view> <view class="title">证件照</view>
<view class="m30lr fs14 cor-333 fl1"></view> <view class="m30lr fs14 cor-333 fl1"></view>
<u-icon name="arrow-right" color="#999" /> <u-icon name="arrow-right" color="#999" />
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>

@ -15,7 +15,7 @@
<image style="width: 363rpx;height: 170rpx;" src="../../static/image/practice/chapter_bg.png"></image> <image style="width: 363rpx;height: 170rpx;" src="../../static/image/practice/chapter_bg.png"></image>
<view style="position: absolute;left: 0;top: 0;" class="p10"> <view style="position: absolute;left: 0;top: 0;" class="p10">
<view style="color: #FF6E02;font-size: 18px;">章节练习</view> <view style="color: #FF6E02;font-size: 18px;">章节练习</view>
<text style="color: #FF6E02;font-size: 14px;">5</text> <text style="color: #FF6E02;font-size: 14px;">{{chapterNum}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -67,6 +67,7 @@
export default { export default {
data() { data() {
return { return {
chapterNum:0,
errorIcon, errorIcon,
newRulesIcon, newRulesIcon,
neverWriteIcon, neverWriteIcon,
@ -111,6 +112,7 @@
} }
this.getExamPoint() this.getExamPoint()
this.getQuestionNum() this.getQuestionNum()
this.getChapterList()
}, },
computed: { computed: {
...mapState(useQuestionStore, ["loading_subject4", "loading_subject1", "version"]), //tagslist ...mapState(useQuestionStore, ["loading_subject4", "loading_subject1", "version"]), //tagslist
@ -120,6 +122,15 @@
}, },
methods: { methods: {
...mapActions(useQuestionStore, ['getAllQuestion']), ...mapActions(useQuestionStore, ['getAllQuestion']),
getChapterList(){
const carTypeId=storage.get('carType') || '1001'
const key=this.subject=='1'?'ChapterOfSubjectOne':'ChapterOfSubjectFour'
querySysConfigList(carTypeId,'ChapterOfSubjectOne').then(resp=>{
if(resp.code==='0000'&&resp.data){
this.chapterNum=resp.data.length
}
})
},
getQuestionNum() { getQuestionNum() {
querySpecialNum({ querySpecialNum({
carTypeId: storage.get('carType') || '1001', carTypeId: storage.get('carType') || '1001',

Loading…
Cancel
Save