Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

src/api/learn.js

@@ -15,12 +15,15 @@ let learnApiFun = function(vm) {
       '/rest/question/query/getQuestionWarehouse/' + subjectId,
       params
     )
+  let getProvinceList = async (params = {}) =>
+    await vm.$u.get('/rest/question/getProvinceList', params)
   const learnApi = {
     getQuestion,
     getQuestionTotal,
     answer,
     subjectList,
     getQuestionWarehouse,
+    getProvinceList,
   }
   return learnApi
 }

src/components/answer-operation-tips/index.vue

@@ -54,7 +54,7 @@ export default {
   },
   computed: {
     imageUrl() {
-      return '/static/logo.png'
+      return process.uniEnv.qn_base_url + 'zuoyouqiehuantishi.png'
     },
     buttonStyle() {
       return {
@@ -87,7 +87,7 @@ export default {
     text-align: center;
 
     .tip-image {
-      width: 670rpx;
+      width: 662rpx;
       height: 136rpx;
       margin-bottom: 60rpx;
     }

src/pages/learn/examSetting.vue

@@ -166,6 +166,7 @@ export default {
   onLoad(e) {
     this.getPageInfo()
     this.getLocation()
+    this.getProvinceList()
   },
   methods: {
     handleClickArea() {
@@ -198,6 +199,10 @@ export default {
     handleClickSure() {
       this.showPop = true
     },
+    async getProvinceList() {
+      let res = await this.$u.api.getProvinceList()
+      console.log(res)
+    },
     async handleClickSubmit() {
       if (this.buttonDisabled) return
       let param = {