From f380221fff648ae807513ae39d3a5f2252b2e69e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 27 Jun 2023 14:39:42 +0800
Subject: [PATCH] 2022.6.27

---
 pages/answer/answer.vue              |  27 ++++++++++++++++++---------
 pages/detail/detail.vue              |   8 ++++----
 pages/map/map.vue                    |  12 ++++++++++--
 static/flag.png                      | Bin 0 -> 3079 bytes
 static/html/explanation.html         |  14 +++++++-------
 static/html/skin/default/css/css.css |  10 +++++-----
 6 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 static/flag.png

diff --git a/pages/answer/answer.vue b/pages/answer/answer.vue
index eabe06b..d07cc08 100644
--- a/pages/answer/answer.vue
+++ b/pages/answer/answer.vue
@@ -85,7 +85,7 @@
           <template>
             <template v-if="!isTotalEnd">
               <div class="answers__text answers__result">
-                打卡成功，已完成<span>{{detail.point_answer_total + 1}}</span>个红色场馆的打卡， 完成{{detail.points.length}}家红色场馆打卡即可获得<span>荣誉证书</span>
+                打卡成功，已完成<span>{{ totalDone }}</span>个红色场馆的打卡， 完成{{ detail.points ? detail.points.length : 0}}家红色场馆打卡即可获得<span>荣誉证书</span>
               </div>
 
               <div class="answers__btn" @click="$u.throttle(toMap)">
@@ -127,12 +127,12 @@ export default {
   methods: {
     async getDetail () {
       const res = await this.$u.api.getPoints()
-      this.isTotalEnd = res.points.length == res.point_answer_total
+      this.isTotalEnd = res.points?.length == res.point_answer_total
       this.detail = res
     },
-    async getQuestions () {
+    async getQuestions (id) {
       const res = await this.$u.api.getQuestions({
-        point_id: this.vuex_point_id
+        point_id: id
       })
 
       this.answers = res.questions
@@ -148,12 +148,12 @@ export default {
 
       setTimeout(() => {
 
-        this.progress = this.now === (this.answers.length - 1) ? 3 : 2
+        this.progress = this.now === (this.answers?.length - 1) ? 3 : 2
 
         if (this.progress === 3) {
-          this.isTotalEnd = this.detail.points.length == ( Number(this.detail.point_answer_total) + 1)
+          this.isTotalEnd = this.detail.points?.length == ( Number(this.detail.point_answer_total) + 1)
           this.$u.api.saveQuiz({
-            point_id: this.vuex_point_id,
+            point_id: this.$route.query?.id ? this.$route.query.id : this.vuex_point_id,
             answers: this.myAnswers
           })
         }
@@ -175,6 +175,15 @@ export default {
     }
   },
   computed: {
+    totalDone () {
+      if (this.detail && this.detail.points) {
+        let id = this.$route.query?.id ? this.$route.query.id : this.vuex_point_id
+        let point = this.detail.points.find(i => i.id == id)
+        return point?.has_answer > 0 ? this.detail.point_answer_total : this.detail.point_answer_total+1
+      }
+      return 1
+    },
+
     correctAnswer () {
       let correct = this.answers[this.now]?.options?.find(i => i.is_correct)
       return `${this.num(correct?.myindex)}、${correct?.title}`
@@ -246,8 +255,8 @@ export default {
       }
     }
   },
-  onShow() {
-    this.getQuestions();
+  onLoad(option) {
+    this.getQuestions(option.id);
     this.getDetail();
   }
 }
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index 4743975..65b74ab 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -14,7 +14,7 @@ export default {
   methods: {
     toAnswer () {
       uni.navigateTo({
-        url: '/pages/answer/answer'
+        url: `/pages/answer/answer?id=${this.$route.query?.id}`
       })
     },
 
@@ -60,7 +60,7 @@ export default {
       uni.hideLoading()
     }
   },
-  onLoad () {
+  onLoad (option) {
     if (this.flag) {
       uni.showLoading({
         mask: true,
@@ -71,9 +71,9 @@ export default {
 
       this.$nextTick(() => {
         this.$refs['iframe'].onload = async () => {
-          let detail = await this.getDetail(this.vuex_point_id)
+          let detail = await this.getDetail(option.id)
           let vrs = detail.content
-          let images = await this.getImages(this.vuex_point_id)
+          let images = await this.getImages(option.id)
           this.$refs['iframe'].contentWindow.setDomData({ detail: detail.points , vrs: vrs, images: images.data })
         }
       })
diff --git a/pages/map/map.vue b/pages/map/map.vue
index 9f34038..32e5ad6 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -14,6 +14,7 @@
              :key="index"
              :style="{ 'transform': `translate(calc(${area.w * item.x / 100}px - 50%),calc(${area.h * item.y / 100}px - 50%))` }"
              @click="$u.throttle(() => toDetail(item))">
+          <u-image v-if="item.has_answer > 0" class="pointer__flag" :width="43" :height="50" :src="require('@/static/flag.png')"></u-image>
           <div class="pointer__horn" :class="{ 'pointer__horn--active': item.has_answer > 0 }" :style="{ 'transform': `translate(-3rpx, calc(-50% - 4rpx)) rotate(${item.d}deg)` }"></div>
 
           <div class="box" :style="{ 'transform': transformBox(item.d) }">
@@ -114,7 +115,7 @@ export default {
     toDetail (item) {
       this.$u.vuex('vuex_point_id', item.id)
       uni.navigateTo({
-        url: `/pages/detail/detail`
+        url: `/pages/detail/detail?id=${item.id}`
       })
     },
 
@@ -138,7 +139,7 @@ export default {
       this.done = res.point_answer_total || 0
       this.pointers = res.points?.map((i, index) => {
         return {
-          d: convertToEquivalentAngle(70 * index + 1),
+          d: convertToEquivalentAngle(53 * index + 1),
           ...i
         }
       })
@@ -226,6 +227,13 @@ export default {
 
       position: relative;
 
+      &__flag {
+
+        transform: translate(0%, -34rpx);
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
       &__horn {
         width: 20rpx;
         height: 26rpx;
diff --git a/static/flag.png b/static/flag.png
new file mode 100644
index 0000000000000000000000000000000000000000..679d687169d1f573897f057d390cd75820bde715
GIT binary patch
literal 3079
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

literal 0
HcmV?d00001

diff --git a/static/html/explanation.html b/static/html/explanation.html
index 03e39fb..547c820 100644
--- a/static/html/explanation.html
+++ b/static/html/explanation.html
@@ -41,10 +41,10 @@
     <div class="wrapper">
       <div class="clearfix study-swiperbox">
         <div class="study-party">
-          <div class="swiper-btn">
-            <li class="videonum">2</li>
-            <li class="picnum">6</li>
-          </div>
+<!--          <div class="swiper-btn">-->
+<!--            <li class="videonum">2</li>-->
+<!--            <li class="picnum">6</li>-->
+<!--          </div>-->
           <!-- 视频轮播图 -->
           <div class="swiper-list" data-num="0">
             <div class="swiper-container" id="swiper0">
@@ -64,9 +64,9 @@
           </div>
         </div>
         <!-- 右边固定栏 -->
-        <div class="study-right">
-          <img src="skin/default/images/rightimg.jpg">
-        </div>
+<!--        <div class="study-right">-->
+<!--          <img src="skin/default/images/rightimg.jpg">-->
+<!--        </div>-->
       </div>
       <div class="studyContent">
         <!-- 详情 -->
diff --git a/static/html/skin/default/css/css.css b/static/html/skin/default/css/css.css
index bd6c367..b8dc078 100644
--- a/static/html/skin/default/css/css.css
+++ b/static/html/skin/default/css/css.css
@@ -252,8 +252,7 @@ textarea::-webkit-input-placeholder{ color:#aaa; }
 
 }
 .study-party{
-    float: left;
-    width: 69.489%;
+    width: 100%;
     position: relative;
 }
 .swiper-btn{
@@ -392,13 +391,14 @@ textarea::-webkit-input-placeholder{ color:#aaa; }
 }
 .answer-start{
     width:100%;
-    height: 7.5rem;
+    height: 10.5rem;
     margin:0 auto;
     margin-top: 1.4rem;
     background: url(../images/answerbg.png) no-repeat center top;
     background-size: 100% auto;
-    padding-top: 4.2rem;
-    padding-left: 8.8rem;
+    padding-top: 5.2rem;
+    padding-left: 10.8rem;
+    padding-right: 2rem;
     box-sizing: border-box;
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;