Merge branch 'master' of http://114.55.169.15:3000/huxiaofeng666/jwl-applet into dev-hxf

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

.env.development

@@ -5,6 +5,6 @@ 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'

src/App.vue

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

src/jtools/pay/index.js

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

src/pages/index/index.vue

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

src/pages/index/videoVip.vue

@@ -60,7 +60,7 @@
 					</view>
 				</view>
 				<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>
@@ -86,6 +86,7 @@
 	export default {
 		data(){
 			return{
+				picUrl:'',
 				titleNum:500,
 				subject:'1',
 				loading:true,
@@ -106,12 +107,19 @@
 			this.getVipList()
 			this.getWXOpenId()
 			this.getTitle()
+			this.getPic()
 			this.$set(this.order, 'userId', this.userInfo.userId);
 		},
 		computed: {
 			...mapState(useUserStore, ["userInfo"]) 
 		},
 		methods:{
+			getPic(){
+				const currentCartype = storage.get('carType') || '1001'
+				querySysConfig(currentCartype, 'VipDescImageUrl').then(res => {
+					this.picUrl = JSON.parse(res.data.configJson).url
+					})
+			},
 			getTitle(){
 				const carId=storage.get('carType') || '1001'
 				querySysConfig(carId,'SimplifyQuestionNum').then(resp=>{
@@ -142,16 +150,18 @@
 					carTypeId: storage.get('carType') || '1001',
 					subject:this.subject
 				}).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){
@@ -175,7 +185,6 @@
 		padding: 14px;
 	}
 	.checked_item{
-		width: 228rpx;
 		background: #FFF0E5;
 		border: 4px solid #FF6E02;
 	}

src/pages/me/index.vue

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

src/pages/me/info.vue

@@ -15,7 +15,7 @@
 					<u-icon name="arrow-right" color="#999" />
 				</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="m30lr fs14 cor-333">{{sfzNum}}</view>
 			</view>
@@ -23,7 +23,7 @@
 			  <view class="title">证件照</view>
 				<view class="m30lr fs14 cor-333 fl1"></view>
 			  <u-icon name="arrow-right" color="#999" />
-			</view>
+			</view> -->
     </view>
   </view>
 </template>

src/pages/questionBank/exclusiveExercise.vue

@@ -15,7 +15,7 @@
 					<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="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>
@@ -67,6 +67,7 @@
 	export default {
 		data() {
 			return {
+				chapterNum:0,
 				errorIcon,
 				newRulesIcon,
 				neverWriteIcon,
@@ -111,6 +112,7 @@
 			}
 			this.getExamPoint()
 			this.getQuestionNum()
+			this.getChapterList()
 		},
 		computed: {
 			...mapState(useQuestionStore, ["loading_subject4", "loading_subject1", "version"]), //映射函数，取出tagslist
@@ -120,6 +122,15 @@
 		},
 		methods: {
 			...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() {
 				querySpecialNum({
 					carTypeId: storage.get('carType') || '1001',