Merge branch 'fix-home-0.0.1'

components/Topic/TopicExam.vue

@@ -283,7 +283,7 @@ const onBeforePageChange = (index) => {
     {
       catalogue_id: getRoute().params.id,
       real_topic_id: props.real_topic_id,
-      is_correct: item.isRight,
+      is_correct: item.isRight ? 1 : 0,
       answer: item.selectAns.join(","),
     },
     "post"

components/Topic/TopicPractice.vue

@@ -308,7 +308,6 @@ const questionSubmit = (item) => {
     item.selectAns.map((q) => q.value),
     item.ansList.map((q) => q.label)
   );
-  console.log(item);
 
   request("api/question_bank/question_reception/topic/answer_topic", {
     id: item.id,

pages/challenge/addContant.vue

@@ -8,7 +8,7 @@
     <view class="bg">
       <view class="bg-1">
         <image
-          src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/mBkOXhmyeJMMfONavrEVHj1ZIPBRc00jXbG8O2jT.png"
+          src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/S8CkzXdkVdToQYvRmfs9u9hbFpx3jaiBsfIor51m.png"
           show-menu-by-longpress
           class="qrcode"
         ></image>

pages/real/exam.vue

@@ -155,6 +155,7 @@ onMounted(async () => {
     :empty="!data.length"
     border
     v-if="!showReport && !showShare"
+    text="加载中···"
   />
   <Container
     bgColor="url('https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/7i6ROn34tZGe8QR4gaWDP1ZzyPYjqlvPgLLFRmIe.png')"

pages/real/history.vue

@@ -29,7 +29,7 @@
     >
 
     <view class="title-exam">考试记录</view>
-    <view class="exam-history">
+    <view class="exam-history" v-if="list.length">
       <view
         class="i"
         :class="index !== list.length - 1 && 'no-laster'"
@@ -48,10 +48,11 @@
 </template>
 
 <script setup name="history">
-import { ref, onMounted } from "vue";
+import { ref } from "vue";
 import Container from "../../components/Container/Container.vue";
 import { getRoute, router } from "../../utils/router";
 import { request } from "../../utils/request";
+import { onShow } from "@dcloudio/uni-app";
 
 const userInfo = ref({
   userpic: "https://img-cdn-qiniu.dcloud.net.cn/uniapp/images/uni@2x.png",
@@ -68,7 +69,7 @@ const onClick = () => {
     },
   });
 };
-onMounted(async () => {
+onShow(async () => {
   const res = await request(
     "api/question_bank/question_reception/real_topic/get_user_all_real_paper",
     {

pages/recharge/index.vue

@@ -1,53 +1,21 @@
 <template>
-  <Container title="VIP充值">
+  <Container title="VIP充值" bgColor="#f8f8f8" headerColor="#fff">
     <view class="recharge-main">
       <!-- 内容区 -->
       <view class="content">
         <!-- 套餐选择 -->
         <view class="plan-list">
-          <view class="p"
-            ><view
-              class="plan-card"
-              :class="activeCurrent === 1 && 'active'"
-              @click="activeCurrent = 1"
-            >
-              <view class="plan-title">
-                {{ data[1]?.package_name }}
-                <text class="plan-tag" v-if="data[1]?.is_automatic_renewal">首月</text>
-              </view>
-              <view class="plan-price">
-                <text class="price">{{
-                  data[1]?.automatic_renewal_first_price
-                }}</text>
-                <view class="plan-origin"
-                  >￥{{ data[1]?.package_original_price }}</view
-                >
-              </view>
-            </view>
-            <view
-              class="plan-tip"
-              v-if="data[1]?.is_automatic_renewal"
-              :style="{
-                opacity: activeCurrent === 1 ? 1 : 0,
-              }"
-              >每期自动续费{{
-                data[1]?.automatic_renewal_price
-              }}元，可取消</view
-            ></view
-          >
-
           <view
             class="plan-card"
-            :class="activeCurrent === 0 && 'active'"
-            @click="activeCurrent = 0"
+            v-for="(item, index) in data"
+            :class="activeCurrent === index && 'active'"
+            @click="activeCurrent = index"
           >
-            <view class="plan-title">{{ data[0]?.package_name }}</view>
+            <view class="plan-title">{{ item?.package_name }}</view>
             <view class="plan-price">
-              <text class="price">{{
-                data[0]?.package_preferential_price
-              }}</text>
+              <text class="price">{{ item?.package_preferential_price }}</text>
               <view class="plan-origin"
-                >￥{{ data[0]?.package_original_price }}</view
+                >￥{{ item?.package_original_price }}</view
               >
             </view>
           </view>
@@ -55,15 +23,15 @@
 
         <!-- 权益展示 -->
         <div class="title">权益展示</div>
-        <view class="benefit" v-show="activeCurrent === 1">
-          <view v-for="item in data[1]?.binding_rights_info" :key="item.id">{{
-            item.authority_title
-          }}</view>
-        </view>
-        <view class="benefit" v-show="activeCurrent === 0">
-          <view v-for="item in data[0]?.binding_rights_info" :key="item.id">{{
-            item.authority_title
-          }}</view>
+        <view class="benefit">
+          <view
+            v-for="(item, i) in data[activeCurrent]?.binding_rights_info"
+            :key="item.id"
+            class="benefit-item"
+          >
+            <view class="t">权益{{ i + 1 }}</view>
+            {{ item.authority_title }}
+          </view>
         </view>
       </view>
       <!-- 底部按钮 -->
@@ -112,16 +80,16 @@ import ext from "../../ext.json";
 
 const instance = getCurrentInstance();
 
-const activeCurrent = ref(1);
+const activeCurrent = ref(0);
 const isSelected = ref([0]);
 const data = ref([]);
 
 const onSubmit = () => {
-  // if (!isSelected.value[0])
-  //   return uni.showToast({
-  //     icon: "none",
-  //     title: "请阅读并确认",
-  //   });
+  if (!isSelected.value[0])
+    return uni.showToast({
+      icon: "none",
+      title: "请阅读并确认",
+    });
   uni.login({
     provider: instance.proxy.$mpPlatform.substring(3),
     success: async ({ code }) => {
@@ -176,7 +144,6 @@ onMounted(async () => {
 .recharge-main {
   display: flex;
   flex-direction: column;
-  background: #fff;
   position: relative;
   padding-bottom: 120rpx; // 预留底部按钮高度
 }
@@ -219,8 +186,7 @@ onMounted(async () => {
   gap: 52rpx;
   color: #666666;
   &.active {
-    color: $uni-primary;
-    border-color: $uni-primary;
+    border-color: #e7c8ac;
   }
   .plan-title {
     font-size: 28rpx;
@@ -246,6 +212,7 @@ onMounted(async () => {
     .price {
       font-size: 60rpx;
       font-weight: bold;
+      color: $error;
       ::before {
         content: "￥";
         font-size: 32rpx;
@@ -268,10 +235,34 @@ onMounted(async () => {
 }
 
 .benefit {
-  border: 2rpx solid $default;
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+}
+
+.benefit-item {
   border-radius: 12rpx;
-  padding: 24rpx;
+  padding: 32rpx 24rpx;
   font-weight: bold;
+  background: #ffffff;
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 24rpx;
+
+  .t {
+    width: 105rpx;
+    height: 56rpx;
+    background: linear-gradient(90deg, #f0dfcd 0%, #e7c8ac 100%);
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #000000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
   view {
     font-size: 28rpx;
     color: #333;
@@ -317,8 +308,8 @@ onMounted(async () => {
 
 .open-btn {
   width: 100%;
-  background: $uni-primary;
-  color: #fff;
+  background: linear-gradient(90deg, #f0dfcd 0%, #e7c8ac 100%);
+  color: #000;
   font-size: 32rpx;
   border-radius: 12rpx;
   height: 88rpx;
@@ -328,7 +319,7 @@ onMounted(async () => {
   border: none;
   margin-top: 0;
   &:active {
-    background: $uni-primary-disable;
+    background: linear-gradient(90deg, #f0dfcd 0%, #e7c8ac 100%);
   }
 }
 </style>

pages/regulations/index.vue

@@ -83,6 +83,7 @@ import { ref, getCurrentInstance, onMounted } from "vue";
 import { getRect, arrayToTree } from "../../utils";
 import { getRoute, router } from "../../utils/router";
 import { request } from "../../utils/request";
+import { onShow } from "@dcloudio/uni-app";
 const title = ref("");
 const collapse = ref(null);
 const popup = ref(null);
@@ -138,7 +139,7 @@ const onClickMask = () => {
   })
 };
 
-onMounted(async () => {
+onShow(async () => {
   const id = getRoute().params.id;
   const res = await request(
     "api/question_bank/question_reception/chapter/get_all_chapter",

pages/regulations/learing.vue

@@ -94,7 +94,7 @@ onShow(() => {
     <view>
       <view :key="item.id" v-for="(item, index) in context">
         <view class="title">考 点{{ index + 1 }} {{ item.name }}</view>
-        <uv-parse :content="item.context" selectable />
+        <uv-parse class="text" :content="item.context" selectable />
       </view>
       <text class="button" @click="onSubmit">已学完, 开启练习模式</text>
     </view>
@@ -106,5 +106,10 @@ onShow(() => {
   color: #703060;
   font-weight: bold;
   text-align: center;
+  margin: 10rpx 0;
+}
+
+.text {
+  line-height: 1.7;
 }
 </style>

pages/regulations/practice.vue

@@ -47,7 +47,10 @@ const getList = async (params) => {
   );
   if (!i.data) {
     const r = await request(
-      "api/question_bank/question_reception/topic/set_user_new_exercise_paper"
+      "api/question_bank/question_reception/topic/set_user_new_exercise_paper",
+      {
+        chapter_id: getRoute().params.id,
+      }
     );
     user_exercise_paper_id.value = r.data;
   } else {
@@ -58,6 +61,7 @@ const getList = async (params) => {
     {
       ...params,
       id: getRoute().params.id,
+      user_exercise_paper_id: user_exercise_paper_id.value,
     }
   );
   total.value = res.data.total;
@@ -121,10 +125,17 @@ const onStar = (item) =>
     });
   });
 
-const lookReport = (d, s) => {
+const lookReport = async (d, s) => {
   data.value = d;
-  showReport.value = true;
   const totalTime = Time.end();
+  await request(
+    "api/question_bank/question_reception/topic/user_submit_exercise_paper",
+    {
+      user_exercise_paper_id: user_exercise_paper_id.value,
+      chapter_id: getRoute().params.id,
+    }
+  );
+  showReport.value = true;
   submitter.value = {
     ...s,
     totalTime,
@@ -159,6 +170,7 @@ onMounted(() => {
     @lookReport="lookReport"
     :onStar="onStar"
     :empty="!data.length"
+    text="加载中···"
     border
     v-if="!showReport && !showShare"
   />

pages/user/share.vue

@@ -33,7 +33,7 @@ const onSaveImage = () => {
 
 onMounted(() => {
   // 生成二维码
-  request("api/question_bank/question_reception/user_share/get_invite_poster", {
+  request("api/question_bank/question_reception/user_share/get_invite_qrcode", {
     page_url: "/pages/index/index",
   }).then((res) => {
     console.log(res);