3.30

src/api/user.js

@@ -120,4 +120,6 @@ export const postconfig = params => request({
   url: 'user/config',
   method: 'GET',
   params
-})
+})
+
+//勋章列表

src/components/Comments/index.vue

@@ -30,11 +30,10 @@ let commentList = ref([]);
 const __list__ = async () => {
   try {
     const { data } = await commentApi.list({
-      // source_type: Props.type,
-      source_type: "video",
-      source_id: 4,
+      source_type: article,
+      source_id: 15,
       order_type: "desc",
-      order: "like_count",
+      order: currentCommentType.value == "hot" ? "like_count" : "id",
     });
     commentList.value = data;
   } catch (error) {}
@@ -103,8 +102,8 @@ watch(currentCommentType, () => {
         <dd>
           <CommentRow />
         </dd>
-        <dd v-if="item.children.length>3">
-          <span  class="comment-list-more">
+        <dd v-if="item.children.length > 3">
+          <span class="comment-list-more">
             查看全部回复<el-icon>
               <ArrowDown></ArrowDown>
             </el-icon>
@@ -113,7 +112,7 @@ watch(currentCommentType, () => {
       </dl>
     </div>
     <!-- TODO: see more -->
-    <div v-if="commentList.length>3" class="comment-morebox">
+    <div v-if="commentList.length > 3" class="comment-morebox">
       <span style="cursor: pointer">点击查看更多评论</span>
     </div>
   </div>

src/components/IndexNews/index.vue

@@ -55,6 +55,7 @@ const Props = defineProps({
     background-color: #fff;
     border-radius: 6px;
     overflow: hidden;
+    height: 264px;
 
     .imgbox {
       width: 279px;

src/components/IndexSection/index.vue

@@ -40,7 +40,7 @@ const shareLink = () => {};
 <template>
   <div class="index-section-container" @click="todetails">
     <div v-if="type === 'common'" class="imgbox">
-      <img :src="image" alt="" />
+      <img :src="image" style="width: 279px; height: 155px" alt="" />
     </div>
     <div v-else class="article-wrapper">
       <div class="title ellipsis-two">{{ title }}</div>
@@ -81,7 +81,7 @@ const shareLink = () => {};
             <SvgIcon name="message" :size="16" :rgap="2" color="#999999" />
             <span>{{ collect_count || 0 }}</span>
           </li>
-          <li >
+          <li>
             <SvgIcon name="forward" :size="16" :rgap="2" color="#999999" />
             <span>{{ share_count || 0 }}</span>
           </li>

src/components/IndexTitle/index.vue

@@ -17,7 +17,7 @@ const seeMore = () => {
 <template>
   <div class="index-title-container flex-row flex-aic flex-jc-sb">
     <div class="title">{{ title }}</div>
-    <div v-if="title=='精选视频'||title=='精选文章'||title=='精选资讯'||title=='大家在聊'" class="more flex-row flex-aic" @click="seeMore()">
+    <div v-if="title=='精选视频'||title=='精选文章'||title=='精选资讯'" class="more flex-row flex-aic" @click="seeMore()">
       <span>查看更多</span>
       <el-icon class="icon" :size="12">
         <ArrowRight />

src/components/Servicer/index.vue

@@ -1,19 +1,32 @@
 <script setup name="Servicer">
-
-import { ref } from 'vue'
+import { ref } from "vue";
 // import { } from "@element-plus/icons-vue";
 
-import SvgIcon from '~/components/SvgIcon/index.vue'
+import SvgIcon from "~/components/SvgIcon/index.vue";
 
-const visibilityDialog = ref(true)
+// const visibilityDialog = ref(true)
 
+const Props = defineProps({
+  visibilityDialog: {
+    type: Number,
+    default: false,
+  },
+});
 </script>
 
 <template>
   <div class="servicer-container">
-    <el-dialog v-model="visibilityDialog" width="350" title="请添加客服微信">
+    <el-dialog
+      v-model="Props.visibilityDialog"
+      width="350"
+      title="请添加客服微信"
+    >
       <div class="dialog-main flex-col flex-aic">
-        <img class="qrcode" src="https://dummyimage.com/160x160/e3e3e3/fff" alt="">
+        <img
+          class="qrcode"
+          src="https://dummyimage.com/160x160/e3e3e3/fff"
+          alt=""
+        />
         <div class="dialog-foot flex-row flex-aic">
           <SvgIcon name="scan" :size="28" color="rgba(51, 51, 51, .6)" />
           <div>
@@ -59,4 +72,5 @@ const visibilityDialog = ref(true)
 
 .dialog-footer {
   text-align: center;
-}</style>
+}
+</style>

src/components/layouts/Header.vue

@@ -2,15 +2,37 @@
 import { ref, onMounted } from "vue";
 import { Search, Promotion, Avatar } from "@element-plus/icons-vue";
 import { useUser } from "~/store/user.js";
-
 import ActivateMembership from "~/components/ActivateMembership/index.vue";
 import SvgIcon from "~/components/SvgIcon/index.vue";
 import Login from "~/components/Login/Login.vue";
 import Level from "~/components/Level/index.vue";
 import * as qianApi from "~/api/qiandao";
 import { getPicUrl } from "~/utils/util";
-import router from "~/router";
 import * as taskApi from "~/api/task";
+import { useRouter } from "vue-router";
+const tosuccess = (type)=>{
+  if(type=='browse'){
+    router.replace({
+      name:'Forum'
+    })
+  }
+}
+
+const router = useRouter();
+// 弹出层
+const dialogVisible = ref(false);
+//退出
+const clearLocalStorage = () => {
+  localStorage.clear();
+  dialogVisible.value = false;
+  router.go(0);
+};
+//跳转到个人信息
+const topersonal = () => {
+  router.push({
+    path: "/personal",
+  });
+};
 
 //任务列表
 let taskList = ref([]);
@@ -27,7 +49,8 @@ onMounted(__task__);
 
 const User = useUser();
 console.log("user", User.name);
-let wid = User.already_upgrade_rate * 100;
+let wid = User.already_upgrade_rate * 100 || 0;
+console.log(User.already_upgrade_rate);
 
 const keyword = ref(""); // Search keyword
 
@@ -259,10 +282,10 @@ const attention = (idx) => {
               </div>
             </template>
             <div class="userinfo-container uc">
-              <div class="uc__avatar">
+              <div class="uc__avatar" @click="topersonal">
                 <img class="circle" :src="User.avatar" :alt="User.name" />
               </div>
-              <div class="uc__name">上海原文化传媒</div>
+              <div class="uc__name">{{ User.name }}</div>
               <!-- TODO: 用户徽章 -->
               <div class="uc__flags">
                 <img src="" alt="" />
@@ -282,7 +305,7 @@ const attention = (idx) => {
                         <el-dropdown-item>
                           <div
                             style="
-                              width: 238px;
+                              width: 320px;
                               padding: 12px 8px;
                               box-sizing: border-box;
                               display: flex;
@@ -319,17 +342,13 @@ const attention = (idx) => {
                             </div>
                             <div
                               class="success"
-                              v-if="item.status == 'finished'"
-                            >
-                              已完成
-                            </div>
-                            <div
-                              class="success"
                               v-if="item.status == 'pending'"
                               style="background: #00b0b0"
+                              @click="tosuccess(item.source_type)"
                             >
                               去完成
                             </div>
+                            <div class="success" v-else>已完成</div>
                           </div>
                         </el-dropdown-item>
                       </div>
@@ -424,7 +443,9 @@ const attention = (idx) => {
                       alt=""
                     />
                   </div>
-                  <div class="label">退出忆象</div>
+                  <div class="label" @click="dialogVisible = true">
+                    退出忆象
+                  </div>
                 </div>
               </div>
             </div>
@@ -439,6 +460,16 @@ const attention = (idx) => {
   <ActivateMembership :visiblePay="pan" />
 
   <Login v-model="visibilityLoginDialog" />
+  <!-- 退出意向 -->
+  <el-dialog title="提示" v-model="dialogVisible" width="416px">
+    <div>确定要退出忆象吗？</div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="clearLocalStorage">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>

src/components/layouts/LayoutHeader.vue

@@ -3,7 +3,7 @@
 import { computed } from "vue";
 import vHeader from "./Header.vue";
 import { useRoute } from "vue-router";
-const route = useRoute()
+const route = useRoute();
 const key = computed(() => route.path + Math.random());
 </script>
 

src/views/articles/index.vue

@@ -22,6 +22,8 @@ const __articles__ = async () => {
 };
 onMounted(__articles__);
 //最近文章
+const page = ref(1);
+const total = ref(0);
 let articleListj = ref([]);
 const __article__ = async () => {
   try {
@@ -32,10 +34,17 @@ const __article__ = async () => {
       page: 1,
     });
     articleListj.value = data.list;
+    total.value = data.total;
   } catch (error) {}
 };
 onMounted(__article__);
 
+//分页器
+const handleCurrentChange = (val) => {
+  page.value = val;
+  __article__();
+};
+
 //查看更多
 const pickmore = (val) => {
   router.push({
@@ -76,6 +85,7 @@ const todetails = (id) => {
           :comment_count="item.comment_count"
           :collect_count="item.collect_count"
           :share_count="item.share_count"
+          :image="item.image"
         />
       </template>
     </div>
@@ -96,12 +106,13 @@ const todetails = (id) => {
           :comment_count="item.comment_count"
           :collect_count="item.collect_count"
           :share_count="item.share_count"
+          :image="item.image"
         />
       </template>
     </div>
 
     <div class="pagination-container">
-      <el-pagination background layout="prev, pager, next" :total="1000" />
+      <el-pagination background layout="prev, pager, next" :total="total" :page-size="12" @current-change="handleCurrentChange"/>
     </div>
     <YXFooter />
   </div>

src/views/forum/index.vue

@@ -145,7 +145,7 @@ onMounted(() => {
       <div class="context-main">
         <template v-for="(item, idx) in forumTableData" :key="idx">
           <MomentLayout
-            @other="other"
+            @other="other(item.id)"
             type="forum"
             :detail="item"
             @refresh="handleRefreshListData"

src/views/index/components/ArticlesSelected.vue

@@ -1,14 +1,14 @@
 <script setup>
 import { ref, onMounted } from "vue";
-import * as videoApi from "~/api/video";
+import * as articleApi from "~/api/article";
 import { useRouter } from "vue-router";
 const router = useRouter();
 
-// 获取视频列表
+// 获取文章列表
 let videoList = ref([]);
 const __news__ = async () => {
   try {
-    const { data } = await videoApi.list({
+    const { data } = await articleApi.list({
       is_page: 0,
       is_boutique: 1,
     });
@@ -17,14 +17,14 @@ const __news__ = async () => {
 };
 onMounted(__news__);
 
-//跳转视频详情
+//跳转文章详情
 
 const toinfo = (id) => {
   router.push({
-    name: "videos",
+    name: "articles",
     query: {
       id: id,
-      type: "common",
+      type: "article",
     },
   });
 };

src/views/index/components/Calendar.vue

@@ -56,12 +56,10 @@ const showMonth = computed(() => (date, type) => {
 // NOTE: 判断是今天并且签到
 const currentDate = dayjs().format("YYYY-MM-DD");
 const isTodaySignin = computed(() => (day) => {
-  console.log('adwswwaaw',day,currentDate);
+  console.log("adwswwaaw", day, currentDate);
   return currentDate === day && signinList.value.includes(day);
 });
 
-
-
 const handleJumpToMonth = (type) => {
   calendarRef.value?.selectDate(type);
 };
@@ -108,7 +106,7 @@ const sign = async () => {
               </el-icon>
             </li>
           </ul>
-          <div class="hbottom">已连续签到{{signinList.length}}天</div>
+          <div class="hbottom">已连续签到{{ signinList.length }}天</div>
         </div>
       </template>
 
@@ -172,7 +170,14 @@ const sign = async () => {
     style="border-radius: 12px; box-sizing: border-box; padding: 0"
     :show-close="false"
   >
-    <div style="display: flex; flex-direction: column; align-items: center">
+    <div
+      style="
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-top: -20px;
+      "
+    >
       <img
         src="../../../assets/success.png"
         style="width: 224px; height: 200px"

src/views/index/content.vue

@@ -232,6 +232,7 @@ const topicinfo = (id) => {
           :comment_count="item.comment_count || 0"
           :collect_count="item.collect_count || 0"
           :share_count="item.share_count || 0"
+          :image="item.image"
         />
       </template>
     </div>
@@ -247,6 +248,7 @@ const topicinfo = (id) => {
           :topic-name="item.topic?.title"
           :author="item.user?.username"
           :author-avatar="item.user?.avatar"
+          :image="item.image"
         />
       </template>
     </div>

src/views/index/follow.vue

@@ -45,9 +45,9 @@ const __follow__ = async (id) => {
 
       <!-- 登录但是无关注用户发动态 -->
       <FloowEmpty />
-      <MomentLayout />
+      <!-- <MomentLayout /> -->
       <!-- Choose subject of a talk -->
-      <ChooseSubjectToTalk />
+      <!-- <ChooseSubjectToTalk /> -->
       <Login />
     </div>
     <div class="right-aside">

src/views/market/details.vue

@@ -50,6 +50,9 @@ const collect = async (id) => {
 const calculate = () => {
   router.push({
     name: "PlaceOrder",
+    query:{
+      id:route.query.id
+    }
   });
 };
 

src/views/market/placeOrder.vue

@@ -1,57 +1,146 @@
 <script setup>
-
-import { ref } from 'vue'
-import { ArrowLeft, LocationFilled, WarningFilled, SuccessFilled } from "@element-plus/icons-vue";
+import { ref, onMounted } from "vue";
+import {
+  ArrowLeft,
+  LocationFilled,
+  WarningFilled,
+  SuccessFilled,
+} from "@element-plus/icons-vue";
 import { placeholderPic } from "~/utils/util";
-import {useRouter} from "vue-router"
-import Servicer from '~/components/Servicer/index.vue'
-
-const router = useRouter()
-
-let address = ''
-
-const options = [
-  {
-    value: 'Option1',
-    label: 'Option1',
-  },
-  {
-    value: 'Option2',
-    label: 'Option2',
-  },
-  {
-    value: 'Option3',
-    label: 'Option3',
-  },
-  {
-    value: 'Option4',
-    label: 'Option4',
-  },
-  {
-    value: 'Option5',
-    label: 'Option5',
-  },
-]
-
-const value = ref('')
-
-const visibilityDialog = ref(false)
+import { useRouter, useRoute } from "vue-router";
+import Servicer from "~/components/Servicer/index.vue";
+import * as addApi from "~/api/address";
+import * as jifenApi from "~/api/jifen";
+import * as userApi from "~/api/user";
+
+//积分结果
+const result = () => {
+  if(goodsInfo.value.price){
+    return goodsInfo.value.price - you.value;
+  }else{
+    return "0"
+  }
+};
+//change
+const you = ref(0);
+const changeyou = (idx) => {
+  console.log(coupon.value[7]);
+  you.value = coupon.value[idx].coupon.amount;
+};
+
+const router = useRouter();
+const route = useRoute();
+//获取商品详情
+
+//获取地址列表
+const arrlist = ref([]);
+//默认地址
+const defaultid = ref();
+const defaultadd = ref([]);
+const list = async () => {
+  try {
+    const { data } = await addApi.list({
+      is_page: 0,
+    });
+    arrlist.value = data;
+    var defaultAddress = [];
+    data.forEach((item) => {
+      if (item.is_default == 1) {
+        defaultAddress.push(item);
+      }
+    });
+    defaultadd.value = defaultAddress;
+    defaultid.value = defaultAddress[0].id;
+  } catch (error) {}
+};
+onMounted(list);
+
+//商品详情
+const goodsInfo = ref([{}]);
+const goods = async () => {
+  try {
+    const { data } = await jifenApi.detail({
+      id: route.query.id,
+    });
+    goodsInfo.value = data;
+  } catch (error) {}
+};
+onMounted(goods);
+
+//打开模态框
+
+let address = "";
+
+//编辑页面
+const compile = () => {
+  router.push({
+    name: "",
+  });
+};
+
+//地址更换
+const ind = ref(0);
+const change = (idx, id) => {
+  ind.value = idx;
+  defaultid.value = id;
+};
+//地址详情
+const info = () => {
+  if (defaultid.value) {
+    infoa();
+  } else {
+    ElMessage.warning({
+      message: "请选择地址",
+      type: "warning",
+    });
+  }
+};
+const infoa = async () => {
+  try {
+    const { data } = await addApi.info({
+      id: defaultid.value,
+    });
+    defaultadd.value = data;
+    dialogVisible.value = false;
+  } catch (error) {}
+};
+
+//优惠券列表
+const coupon = ref([]);
+const __coupon__ = async () => {
+  try {
+    const { data } = await userApi.coupon({
+      is_page: 0,
+      is_expire: 0,
+      is_use: 0,
+      type: "integral",
+    });
+    coupon.value = data;
+  } catch (error) {}
+};
+onMounted(__coupon__);
+
+const value = ref("");
+
+const visibilityDialog = ref(false);
 
 const handleConfirmChange = () => {
-  visibilityDialog.value = true
-}
+  visibilityDialog.value = true;
+};
 const handleConfirmBtn = () => {
-  visibilityDialog.value = false
-  visibilityDialog2.value = true
-}
+  visibilityDialog.value = false;
+  visibilityDialog2.value = true;
+};
 
-const visibilityDialog2 = ref(false)
-
-const returnb = ()=>{
-  router.go(-1)
-}
+const addshow = ref(false);
 
+const visibilityDialog2 = ref(false);
 
+const returnb = () => {
+  router.go(-1);
+};
+//模态框
+const dialogVisible = ref(false);
 </script>
 
 <template>
@@ -62,33 +151,43 @@ const returnb = ()=>{
       </el-icon>
       返回
     </div>
-
     <div class="place-order__header flex-row flex-aic flex-jc-sb">
       <div class="title">确认收货地址</div>
-
       <!-- TODO: 跳转编辑页面 -->
-      <div class="edit-address">编辑收货地址</div>
+      <div
+        class="edit-address"
+        style="cursor: pointer"
+        @click="dialogVisible = true"
+      >
+        编辑收货地址
+      </div>
     </div>
 
     <!-- delivery address -->
     <div class="delivery-address flex-row flex-aic">
-      <span class="flex-row flex-aic"><el-icon>
-          <LocationFilled />
-        </el-icon>寄送至</span>
-      <ul class="flex-row flex-aic">
-        <li>address</li>
-        <li>username</li>
-        <li>mobile</li>
+      <span class="flex-row flex-aic"
+        ><el-icon> <LocationFilled /> </el-icon>寄送至</span
+      >
+      <ul class="flex-row flex-aic" v-if="defaultadd.length > 0">
+        <li>{{ defaultadd[0].full_address }}</li>
+        <li>{{ defaultadd[0].name }}</li>
+        <li>{{ defaultadd[0].mobile }}</li>
       </ul>
+      <span v-else style="color: #000; margin-left: 30px"> - </span>
     </div>
 
     <!-- TODO: 弹窗选择其他地址 -->
-    <div class="other-address-btns"><span>其他地址</span></div>
-
-    <div class="place-order-title">
-      确认订单信息
+    <div
+      class="other-address-btns"
+      v-if="defaultadd.length > 0"
+      style="cursor: pointer"
+      @click="addshow = true"
+    >
+      <span @click="rest">其他地址</span>
     </div>
 
+    <div class="place-order-title">确认订单信息</div>
+
     <div class="place-order-infobox">
       <div class="header flex-row flex-aic">
         <div>商品信息</div>
@@ -96,13 +195,17 @@ const returnb = ()=>{
       </div>
       <div class="row flex-row flex-aic">
         <div class="info flex-row">
-          <img :src="placeholderPic(50, 50)" alt="">
+          <img
+            :src="goodsInfo.image"
+            style="width: 50px; height: 50px"
+            alt=""
+          />
           <div class="info__right flex-col flex-jc-sb">
-            <div class="project-name">豆蔻创意草莓熊手机支架</div>
+            <div class="project-name">{{ goodsInfo.name }}</div>
             <div class="project-count">x1</div>
           </div>
         </div>
-        <div class="integral">8765</div>
+        <div class="integral">{{ goodsInfo.price }}</div>
       </div>
     </div>
 
@@ -111,25 +214,47 @@ const returnb = ()=>{
         <!-- 优惠券 -->
         <li>
           <span class="label">优惠券</span>
-          <el-select v-model="value" class="m-2" placeholder="Select" size="large">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="value"
+            class="m-2"
+            placeholder="请选择"
+            size="large"
+            @change="changeyou"
+          >
+            <el-option
+              v-for="(item, idx) in coupon"
+              :key="idx"
+              :label="item.coupon.description"
+              :value="idx"
+            />
           </el-select>
-          <div class="integralbox"><span>-1000</span>积分</div>
+          <div class="integralbox">
+            优惠<span>{{ you }}</span
+            >积分
+          </div>
         </li>
         <!-- 会员等级优惠 -->
         <li>
           <span class="label">会员等级优惠</span>
-          <el-select v-model="value" class="m-2" placeholder="Select" size="large">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="value"
+            class="m-2"
+            placeholder="请选择"
+            size="large"
+          >
+            <el-option
+              v-for="item in coupon"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
           <div class="integralbox"><span>-0</span>积分</div>
         </li>
       </ul>
     </div>
 
-    <div class="place-order-title">
-      结算信息
-    </div>
+    <div class="place-order-title">结算信息</div>
 
     <ul class="place-order-sum">
       <li>
@@ -147,11 +272,13 @@ const returnb = ()=>{
     </ul>
 
     <div class="place-order-sumtxt">
-      应付积分<span>8764</span>
+      应付积分<span>{{ result() }}</span>
     </div>
 
     <div class="place-order-footer">
-      <el-button type="primary" size="large" @click="handleConfirmChange">立即兑换</el-button>
+      <el-button type="primary" size="large" @click="handleConfirmChange"
+        >立即兑换</el-button
+      >
     </div>
 
     <el-dialog v-model="visibilityDialog" align="center" width="400">
@@ -162,7 +289,9 @@ const returnb = ()=>{
       <template #footer>
         <div class="dialog-footer">
           <el-button size="large">&nbsp;取消&nbsp;</el-button>
-          <el-button size="large" type="primary" @click="handleConfirmBtn">&nbsp;确定&nbsp;</el-button>
+          <el-button size="large" type="primary" @click="handleConfirmBtn"
+            >&nbsp;确定&nbsp;</el-button
+          >
         </div>
       </template>
     </el-dialog>
@@ -176,24 +305,142 @@ const returnb = ()=>{
       <template #footer>
         <div class="dialog-footer">
           <el-button size="large">&nbsp;稍后添加&nbsp;</el-button>
-          <el-button size="large" type="primary">&nbsp;添加客服&nbsp;</el-button>
+          <el-button size="large" type="primary"
+            >&nbsp;添加客服&nbsp;</el-button
+          >
         </div>
       </template>
     </el-dialog>
-
     <Servicer />
-
   </div>
+  <!-- 地址选择 -->
+  <el-dialog title="地址选择" v-model="dialogVisible" width="652px">
+    <div style="" v-if="arrlist.length > 0">
+      <div
+        :class="ind == idx ? 'activeb' : 'active1'"
+        style="
+          display: flex;
+          justify-content: space-between;
+          margin-top: 16px;
+          align-items: center;
+        "
+        v-for="(item, idx) in arrlist"
+        :key="idx"
+        @click="change(idx, item.id)"
+      >
+        <div>
+          <div>
+            <span class="namea">{{ item.name }}</span>
+            <span class="namea" style="margin-left: 5px">{{
+              item.mobile
+            }}</span>
+          </div>
+          <div class="address">{{ item.full_address }}</div>
+        </div>
+        <div class="compile">编辑</div>
+      </div>
+    </div>
+    <div style="text-align: center; margin: 10px 0" v-else>暂无数据</div>
+    <div class="btn">
+      <span style="color: rgba(0, 176, 176, 1); font-size: 20px">+</span>
+      <span
+        style="margin-left: 3px; color: rgba(0, 176, 176, 1); cursor: pointer"
+        >新增</span
+      >
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="info">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
+.btn {
+  width: 84px;
+  height: 38px;
+  border-radius: 4px;
+  border: 1px solid #57c3c2;
+  text-align: center;
+  line-height: 38px;
+  margin-top: 16px;
+}
+.address {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 12px;
+  color: #999999;
+  line-height: 17px;
+  text-align: right;
+  font-style: normal;
+  margin-top: 6px;
+}
+.name {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 17px;
+  color: #000000;
+  line-height: 24px;
+  text-align: right;
+  font-style: normal;
+}
+.compile {
+  width: 80px;
+  height: 35px;
+  background: #00b0b0;
+  border-radius: 4px;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 14px;
+  color: #ffffff;
+  line-height: 35px;
+  text-align: center;
+  font-style: normal;
+}
+.active1 {
+  background: #ffffff;
+  border-radius: 4px;
+  border: 1px solid #d1d1d1;
+  padding: 16px 24px 16px;
+}
+.activeb {
+  background: #ffffff;
+  border-radius: 4px;
+  border: 1px solid #00b0b0;
+  padding: 16px 24px 16px;
+}
+
+.usea {
+  width: 94px;
+  height: 42px;
+  background: #cecece;
+  border-radius: 4px;
+  font-weight: 400;
+  font-size: 16px;
+  color: #ffffff;
+  line-height: 42px;
+  text-align: center;
+  font-style: normal;
+  cursor: pointer;
+}
+.info {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 14px;
+  color: #666666;
+  line-height: 20px;
+  text-align: left;
+  font-style: normal;
+  margin-top: 10px;
+}
 .place-order {
   &-container {
     background-color: #fff;
     padding: 20px;
     border-radius: 6px;
 
-
     .dialog-footer {
       text-align: center;
     }
@@ -211,7 +458,7 @@ const returnb = ()=>{
 
   &__header {
     padding: 14px 0;
-    border-bottom: 1px solid #E5E5E5;
+    border-bottom: 1px solid #e5e5e5;
     margin-bottom: 15px;
 
     .title {
@@ -223,11 +470,10 @@ const returnb = ()=>{
     .edit-address {
       font-size: 12px;
       font-weight: 400;
-      color: #00B0B0;
+      color: #00b0b0;
     }
   }
 
-
   &-sumtxt {
     text-align: right;
     font-size: 16px;
@@ -238,7 +484,7 @@ const returnb = ()=>{
       margin-left: 10px;
       font-size: 30px;
       font-weight: 500;
-      color: #FF0000;
+      color: #ff0000;
       line-height: 36px;
     }
   }
@@ -256,14 +502,14 @@ const returnb = ()=>{
   }
 
   &-infobox {
-    border: 1px solid #F3F3F3;
+    border: 1px solid #f3f3f3;
 
     .header {
       padding: 8px 10px;
 
-      background: #F3F3F3;
+      background: #f3f3f3;
 
-      >div {
+      > div {
         flex: 1;
       }
     }
@@ -271,14 +517,12 @@ const returnb = ()=>{
     .row {
       padding: 8px 10px;
 
-      >div {
+      > div {
         flex: 1;
       }
 
       .info {
-
         img {
-
           margin-right: 10px;
         }
       }
@@ -287,7 +531,7 @@ const returnb = ()=>{
 
       .project {
         &-name {
-          font-size: 16px;
+          font-size: 12px;
           font-weight: 400;
           color: #333333;
         }
@@ -301,7 +545,7 @@ const returnb = ()=>{
     }
 
     .integral {
-      font-size: 22px;
+      font-size: 18px;
       font-weight: 500;
       color: #333333;
     }
@@ -327,7 +571,7 @@ const returnb = ()=>{
         width: 110px;
         font-size: 12px;
         font-weight: 400;
-        color: #FF0000;
+        color: #ff0000;
 
         span {
           font-size: 18px;
@@ -373,14 +617,13 @@ const returnb = ()=>{
 }
 
 .delivery-address {
-  border: 1px solid #57C3C2;
+  border: 1px solid #57c3c2;
   background: rgba(87, 195, 194, 0.1);
   padding: 8px 12px;
   border-radius: 4px;
 
-  >span {
-
-    color: #00B0B0;
+  > span {
+    color: #00b0b0;
   }
 
   ul {
@@ -405,6 +648,6 @@ const returnb = ()=>{
   padding: 14px 0;
   font-size: 12px;
   font-weight: 400;
-  color: #00B0B0;
+  color: #00b0b0;
 }
 </style>

src/views/more.vue

@@ -19,18 +19,32 @@ const __videos__ = async () => {
       is_boutique: 1,
     });
     videoList.value = data;
+    total.value = data.length;
   } catch (error) {}
 };
+//分页器
+const handleCurrentChange = (val) => {
+  page.value = val;
+  if (title.value == "精选视频") {
+    __videos__();
+  } else {
+    __articles__();
+  }
+};
+
 //精彩文章
+const total = ref(0);
+const page = ref(0);
 const __articles__ = async () => {
   try {
     const { data } = await articleApi.list({
-      page: 1,
+      page: page.value,
       limit: 12,
       is_page: 0,
       is_boutique: 1,
     });
     videoList.value = data;
+    total.value = data.length;
   } catch (error) {}
 };
 const title = ref("");
@@ -80,6 +94,7 @@ const todetails = (id, type) => {
           :comment_count="item.comment_count"
           :collect_count="item.collect_count"
           :share_count="item.share_count"
+          :image = item.image
         />
       </template>
     </div>
@@ -105,7 +120,13 @@ const todetails = (id, type) => {
     </div> -->
 
     <div class="pagination-container">
-      <el-pagination background layout="prev, pager, next" :total="1000" />
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="total"
+        :page-size="12"
+        @current-change="handleCurrentChange"
+      />
     </div>
     <YXFooter />
   </div>

src/views/personal/address.vue

@@ -11,7 +11,7 @@
       "
     >
       <div style="display: flex">
-        <div class="add">新增收货地址</div>
+        <div class="add" @click="dialogFormVisible = true">新增收货地址</div>
         <div class="address">
           您已创建{{ total }}个收货地址，最多可创建10 个
         </div>
@@ -60,48 +60,81 @@
     </div>
   </div>
   <!-- 弹出框 -->
-  <el-dialog title="添加收货地址" v-model="dialogFormVisible">
-    <el-form :model="form" :rules="rules" label-position="right">
-      <el-form-item label="收货人" :label-width="formLabelWidth">
+  <el-dialog
+    style="width: 540px"
+    title="添加收货地址"
+    v-model="dialogFormVisible"
+  >
+    <el-form
+      :model="form"
+      :rules="rules"
+      ref="form"
+      label-position="right"
+      label-width="80px"
+    >
+      <el-form-item prop="name" label="收货人" :label-width="formLabelWidth">
         <el-input
+          style="width: 378px"
           v-model="form.name"
           autocomplete="off"
           placeholder="请输入"
         ></el-input>
       </el-form-item>
       <el-form-item label="所在地区" :label-width="formLabelWidth">
-        <el-select v-model="form.name" placeholder="请选择">
+        <el-select
+          style="width: 118px"
+          v-model="form.name"
+          prop="region"
+          placeholder="请选择"
+        >
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
-        <el-select v-model="form.name" placeholder="请选择">
+        <el-select
+          style="width: 118px; margin-left: 12px"
+          v-model="form.name"
+          placeholder="请选择"
+        >
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
-        <el-select v-model="form.name" placeholder="请选择">
+        <el-select
+          style="width: 118px; margin-left: 12px"
+          v-model="form.name"
+          placeholder="请选择"
+        >
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="name" label="详细地址" :label-width="formLabelWidth">
+        <el-input
+          style="width: 378px"
+          v-model="form.name"
+          autocomplete="off"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="name" label="手机地址" :label-width="formLabelWidth">
+        <el-input
+          style="width: 378px"
+          v-model="form.name"
+          autocomplete="off"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
     </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogFormVisible = false"
-          >确 定</el-button
-        >
-      </span>
-    </template>
+    <div style="">保存收货地址</div>
   </el-dialog>
 </template>
       
   <script setup>
 // import { useRouter, useRoute } from "vue-router";
-import { onMounted, ref, toRefs, relative } from "vue";
+// import { onMounted, ref, relative } from "vue";
 import ExperienceCard from "./components/ExperienceCard.vue";
 import Routers from "./components/Routers.vue";
 import * as earaApi from "~/api/address";
-
+import { ref, onMounted, reactive } from "vue";
 const form = ref([
   {
     name: "",
@@ -109,20 +142,35 @@ const form = ref([
 ]);
 
 //规则
-const rules = relative({
-  name: [
-    { required: true, message: "请输入活动名称", trigger: "blur" },
-    {
-      min: 3,
-      max: 5,
-      message: "长度在 3 到 5 个字符",
-      trigger: "blur",
-    },
-  ],
-});
+const rules = ref([
+  {
+    name: [
+      { required: true, message: "请输入活动名称", trigger: "blur" },
+      {
+        min: 3,
+        max: 5,
+        message: "长度在 3 到 5 个字符",
+        trigger: "blur",
+      },
+    ],
+  },
+]);
+
+//地区列表
+const arealist = ref([]);
+const area = () => {
+  const __detail__ = async () => {
+    try {
+      const { data } = await earaApi.list({});
+      commList.value = data.list;
+      total.value = data.total;
+    } catch (error) {}
+  };
+  onMounted(__detail__);
+};
 
 //弹出框
-const dialogFormVisible = ref(true);
+const dialogFormVisible = ref(false);
 
 //常见问题列表
 let commList = ref([]);

src/views/personal/components/ExperienceCard.vue

@@ -3,6 +3,8 @@ import { useUser } from "~/store/user.js";
 import Level from "~/components/Level/index.vue";
 import { ref, onMounted } from "vue";
 import * as taskApi from "~/api/task";
+import { useRouter } from "vue-router";
+const router =  useRouter ()
 // import { useOpenMember, useRenewMember } from "~/useHook/useMember";
 const User = useUser();
 console.log("yusrgdfij", User.already_upgrade_rate);
@@ -27,13 +29,24 @@ const __task__ = async () => {
   } catch (error) {}
 };
 onMounted(__task__);
+
+//跳转
+const tosuccess = (type)=>{
+  if(type=='browse'){
+    router.replace({
+      name:'Forum'
+    })
+  }
+}
 </script>
 
 <template>
   <div class="experience-card-container">
     <div class="header flex-row flex-aic flex-jc-sb">
       <span class="tips"
-        >当前积分{{ User.integral }}，差{{ User.left_upgrade }}积分升级</span
+        >当前积分{{ User.integral_sum }}，差{{
+          User.left_upgrade
+        }}积分升级</span
       >
       <el-dropdown>
         <span class="btns">任务列表</span>
@@ -44,7 +57,7 @@ onMounted(__task__);
               <el-dropdown-item>
                 <div
                   style="
-                    width: 238px;
+                    width: 320px;
                     padding: 12px 8px;
                     box-sizing: border-box;
                     display: flex;
@@ -76,7 +89,7 @@ onMounted(__task__);
                       </div>
                     </div>
                   </div>
-                  <div class="success" v-if="item.status == 'finished'">
+                  <div @click="tosuccess(item.source_type)" class="success" v-if="item.status == 'finished'">
                     已完成
                   </div>
                   <div
@@ -100,7 +113,7 @@ onMounted(__task__);
         <div class="uc__grade__show-bar">
           <div
             class="sb-inside"
-            :style="`width: ${User.already_upgrade_rate}%;`"
+            :style="`width: ${User.already_upgrade_rate * 100}%;`"
           ></div>
         </div>
         <div class="uc__grade_txt flex-row flex-jc-sb">

src/views/personal/components/qiandao.vue

@@ -23,7 +23,7 @@
       <div style="display: flex">
         <div>
           <img
-            src="item.prize_image"
+            :src="item.prize_image"
             alt=""
             style="width: 60px; height: 60px"
           />
@@ -64,7 +64,7 @@
       <div style="display: flex">
         <div>
           <img
-            src="item.prize_image"
+            :src="item.prize_image"
             alt=""
             style="width: 60px; height: 60px"
           />
@@ -126,8 +126,8 @@
         <div class="compile">编辑</div>
       </div>
     </div>
-    <div class="btn" >
-      <span style="color: rgba(0, 176, 176, 1);font-size: 20px">+</span>
+    <div class="btn">
+      <span style="color: rgba(0, 176, 176, 1); font-size: 20px">+</span>
       <span style="margin-left: 3px; color: rgba(0, 176, 176, 1)">新增</span>
     </div>
     <template #footer>
@@ -164,9 +164,9 @@ const dialogVisible = ref(true);
 // const get = () => {
 //   dialogVisible.value = true;
 // };
-const get = ()=>{
+const get = () => {
   console.log(1111);
-}
+};
 //领取商品
 // const get = async () => {
 //   console.log(1111);

src/views/personal/components/sett.vue

@@ -25,15 +25,27 @@
         <div class="title">头像</div>
         <div style="display: flex">
           <img
-            src=""
+            :src="avatar"
             style="width: 70px; height: 70px; border-radius: 50%"
             alt=""
           />
           <div style="margin-left: 16px">
-            <div class="button">修改头像</div>
-            <div style="margin-top: 14px" class="font">
-              图片格式支持 GIF、PNG、JPEG、
-            </div>
+            <el-upload
+              class="upload-demo"
+              action="https://vr.hdlkeji.com/api/upload/file"
+              :on-success="handleRemove"
+              :show-file-list="false"
+            >
+              <div class="button">修改头像</div>
+              <template #tip>
+                <!-- <div class="el-upload__tip">
+                  只能上传 jpg/png 文件，且不超过 500kb
+                </div> -->
+                <div style="margin-top: 14px" class="font">
+                  图片格式支持 GIF、PNG、JPEG、
+                </div>
+              </template>
+            </el-upload>
           </div>
         </div>
       </div>
@@ -81,6 +93,7 @@
         <div class="buttona" @click="save">保存</div>
       </div>
     </div>
+    <!-- 邀请 -->
     <div v-if="subNavCurrent == 'invite'">
       <div>
         <div style="display: flex; justify-content: space-between">
@@ -113,6 +126,7 @@
       </div>
       <div></div>
     </div>
+    <!-- 设置 -->
     <div v-if="subNavCurrent == 'zhang'">
       <div style="margin-top: 35px">
         <div style="display: flex; align-items: center">
@@ -143,6 +157,7 @@
           <div>
             <span class="zhi">系统通知</span>
             <el-switch
+              @change="postconfig"
               v-model="is_system_notify"
               active-color="rgba(0, 176, 176, 1)"
               inactive-color="rgba(102, 102, 102, 0.8)"
@@ -151,6 +166,7 @@
           <div style="margin-left: 30px">
             <span class="zhi">点赞推送</span>
             <el-switch
+              @change="postconfig"
               v-model="is_like_notify"
               active-color="rgba(0, 176, 176, 1)"
               inactive-color="rgba(102, 102, 102, 0.8)"
@@ -159,6 +175,7 @@
           <div style="margin-left: 30px">
             <span class="zhi">评论推送</span>
             <el-switch
+              @change="postconfig"
               v-model="is_comment_notify"
               active-color="rgba(0, 176, 176, 1)"
               inactive-color="rgba(102, 102, 102, 0.8)"
@@ -167,42 +184,74 @@
         </div>
         <div style="margin-top: 26px">谁给我点赞</div>
         <div style="margin-top: 24px; display: flex">
-          <div><el-radio v-model="who_can_like" label="all">任何人</el-radio></div>
           <div>
-            <el-radio v-model="who_can_like" label="follower" style="margin-left: 90px"
+            <el-radio @change="postconfig" v-model="who_can_like" label="all"
+              >任何人</el-radio
+            >
+          </div>
+          <div>
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_like"
+              label="follower"
+              style="margin-left: 90px"
               >今我关注的</el-radio
             >
           </div>
           <div>
-            <el-radio v-model="who_can_like" label="fans" style="margin-left: 90px"
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_like"
+              label="fans"
+              style="margin-left: 90px"
               >仅关注我的</el-radio
             >
           </div>
         </div>
         <div style="margin-top: 30px">谁能收藏我的内容</div>
         <div style="margin-top: 24px; display: flex">
-          <div><el-radio v-model="who_can_collect" label="all">任何人</el-radio></div>
           <div>
-            <el-radio v-model="who_can_collect" label="follower" style="margin-left: 90px"
+            <el-radio v-model="who_can_collect" label="all">任何人</el-radio>
+          </div>
+          <div>
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_collect"
+              label="follower"
+              style="margin-left: 90px"
               >今我关注的</el-radio
             >
           </div>
           <div>
-            <el-radio v-model="who_can_collect" label="fans" style="margin-left: 90px"
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_collect"
+              label="fans"
+              style="margin-left: 90px"
               >仅关注我的</el-radio
             >
           </div>
         </div>
         <div style="margin-top: 30px">谁能评论回复我</div>
         <div style="margin-top: 24px; display: flex">
-          <div><el-radio v-model="who_can_comment" label="all">任何人</el-radio></div>
           <div>
-            <el-radio v-model="who_can_comment" label="follower" style="margin-left: 90px"
+            <el-radio v-model="who_can_comment" label="all">任何人</el-radio>
+          </div>
+          <div>
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_comment"
+              label="follower"
+              style="margin-left: 90px"
               >今我关注的</el-radio
             >
           </div>
           <div>
-            <el-radio v-model="who_can_comment" label="fans" style="margin-left: 90px"
+            <el-radio
+              @change="postconfig"
+              v-model="who_can_comment"
+              label="fans"
+              style="margin-left: 90px"
               >仅关注我的</el-radio
             >
           </div>
@@ -214,7 +263,6 @@
   <el-dialog
     v-model="dialogVisible"
     width="260px"
-    :before-close="handleClose"
     :show-close="false"
     style="border-radius: 6px"
   >
@@ -242,7 +290,6 @@
     title="更改手机号"
     v-model="dialog"
     width="406px"
-    :before-close="handleClose"
     style="border-radius: 8px; border: 1px solid #979797"
   >
     <div>
@@ -276,7 +323,6 @@
     title="修改密码"
     v-model="password"
     width="406px"
-    :before-close="handleClose"
     style="border-radius: 8px; border: 1px solid #979797"
   >
     <div>
@@ -306,6 +352,7 @@
       </div>
     </div>
   </el-dialog>
+  <!-- 修改头像 -->
 </template>
       
 <script setup>
@@ -317,12 +364,23 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { useUser } from "~/store/user";
 const User = useUser();
 
-const username = User.username;
-const introduction = User.introduction;
-const backgroud_image = User.backgroud_image;
-const avatar = User.avatar;
+console.log("user", User);
+
+const username = ref();
+const introduction = ref();
+const backgroud_image = ref();
+const avatar = ref();
 const column_1 = ref();
 const inviteidx = ref(0);
+avatar.value = User.avatar;
+backgroud_image.value = User.backgroud_image;
+username.value = User.name;
+introduction.value = User.introduction;
+column_1.value = User.column_1;
+//修改头像
+const handleRemove = (value) => {
+  avatar.value = value.data.url;
+};
 //消息推送
 //获取配置列表
 const confi = ref([{}]);
@@ -342,9 +400,10 @@ const config = async () => {
   try {
     const { data } = await userApi.config({});
     confi.value = data;
-    is_system_notify.value = data.is_system_notify;
-    is_like_notify.value = data.is_like_notify;
-    is_comment_notify.value = data.is_comment_notify;
+    console.log("data", data);
+    is_system_notify.value = data.is_system_notify == 1 ? true : false;
+    is_like_notify.value = data.is_like_notify == 1 ? true : false;
+    is_comment_notify.value = data.is_comment_notify == 1 ? true : false;
     who_can_like.value = data.who_can_like;
     who_can_collect.value = data.who_can_collect;
     who_can_comment.value = data.who_can_comment;
@@ -353,11 +412,12 @@ const config = async () => {
 onMounted(config);
 //设置用户配置
 const postconfig = async () => {
+  console.log(123);
   try {
     const { data } = await userApi.postconfig({
-      is_system_notify: is_system_notify.value,
-      is_like_notify: is_like_notify.value,
-      is_comment_notify: is_comment_notify.value,
+      is_system_notify: is_system_notify.value == true ? "1" : "0",
+      is_like_notify: is_like_notify.value == true ? "1" : "0",
+      is_comment_notify: is_comment_notify.value == true ? "1" : "0",
       who_can_like: who_can_like.value,
       who_can_collect: who_can_collect.value,
       who_can_comment: who_can_comment.value,
@@ -445,7 +505,7 @@ const save = async () => {
       column_1: column_1.value,
     });
     useUser();
-    dialogVisible.value = false;
+    dialogVisible.value = true;
   } catch (error) {}
 };
 //防抖

src/views/personal/index.vue

@@ -19,6 +19,27 @@ import * as follow from "~/api/user";
 //弹出层
 const dialogVisible = ref(false);
 const User = useUser();
+console.log(User);
+
+const backgroud_image = ref();
+backgroud_image.value = User.backgroud_image;
+//修改背景图
+const handleRemove = (value) => {
+  backgroud_image.value = value.data.url;
+  __image__();
+};
+//更换背景图接口
+const __image__ = async () => {
+  try {
+    const { data } = await follow.updata({
+      backgroud_image: backgroud_image.value,
+    });
+    ElMessage.success({
+      message: "更改成功",
+      type: "success",
+    });
+  } catch (error) {}
+};
 
 //弹出层
 const attention = () => {
@@ -56,7 +77,7 @@ const __fans__ = async () => {
     const { data } = await follow.fans({
       is_page: 0,
     });
-    fllowlist.value = data.list;
+    fllowlist.value = data;
   } catch (error) {}
 };
 //粉丝列表
@@ -65,7 +86,7 @@ const __articles__ = async () => {
     const { data } = await follow.follow({
       is_page: 0,
     });
-    fllowlist.value = data.list;
+    fllowlist.value = data;
   } catch (error) {}
 };
 onMounted(__articles__);
@@ -170,16 +191,12 @@ const handleRefreshListData = () => {
       <div
         :style="
           User.backgroud_image
-            ? `background-image: url(${User.backgroud_image})`
+            ? `background-image: url(${backgroud_image})`
             : ''
         "
-        class="pheader flex-col"
+        class="pheader"
+        style="display: flex; justify-content: space-between"
       >
-        <!-- bg-image -->
-        <div>
-          <span class="change-bgc">更换背景图</span>
-        </div>
-
         <div class="pinfo flex-row flex-aic">
           <img :src="User.avatar" alt="" class="avatar circle" />
           <div class="pinfo__info">
@@ -195,6 +212,17 @@ const handleRefreshListData = () => {
             <div class="rdesc">{{ User.introduction }}</div>
           </div>
         </div>
+        <!-- bg-image -->
+        <div>
+          <el-upload
+            class="upload-demo"
+            action="https://vr.hdlkeji.com/api/upload/file"
+            :on-success="handleRemove"
+            :show-file-list="false"
+          >
+            <span class="change-bgc">更换背景图</span>
+          </el-upload>
+        </div>
       </div>
 
       <div class="sub-nav">

src/views/personal/inviteinfo.vue

@@ -73,7 +73,7 @@
           <el-upload
             v-model:file-list="fileList"
             class="upload-demo"
-            action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+            action="https://vr.hdlkeji.com/api/upload/file"
             multiple
             :on-preview="handlePreview"
             :on-remove="handleRemove"
@@ -148,14 +148,7 @@ const beforeRemove = (uploadFile, uploadFiles) => {
 
 //上传数据
 const fileList = ref([
-  {
-    name: "element-plus-logo.svg",
-    url: "https://element-plus.org/images/element-plus-logo.svg",
-  },
-  {
-    name: "element-plus-logo2.svg",
-    url: "https://element-plus.org/images/element-plus-logo.svg",
-  },
+
 ]);
 //打开投递简历对话框
 const open = () => {

src/views/personal/make.vue

@@ -13,14 +13,29 @@
           <el-tab-pane label="预约记录" name="second"></el-tab-pane>
         </el-tabs>
         <div style="margin-top: 38px; display: flex">
-          <div class="btn1">立即预约</div>
-          <div class="btn2">会员预约</div>
+          <div :class="taps == 0 ? 'btn1' : 'btn2'" @click="make(0)">
+            立即预约
+          </div>
+          <div
+            style="margin-left: 18px"
+            :class="taps == 1 ? 'btn1' : 'btn2'"
+            @click="make(1)"
+          >
+            会员预约
+          </div>
         </div>
       </div>
-      <div class="content">
+      <div class="content" v-if="taps == 0">
         <div class="tl">即将前往外部链接</div>
         <div class="tl2">请注意个人帐号与财产安全</div>
-        <div style="display: flex;flex-direction: column;align-items: center;justify-content: center;">
+        <div
+          style="
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+          "
+        >
           <div>
             <img
               src="../../assets/rocket.png"
@@ -36,6 +51,64 @@
           <div class="goto">立即跳转</div>
         </div>
       </div>
+      <div
+        v-if="taps == 1"
+        style="
+          border-top: 1px solid #f7f7f7;
+          height: 579px;
+          background-color: #fff;
+          padding: 40px;
+          box-sizing: border-box;
+        "
+      >
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-form-item label="姓名">
+            <el-input
+              style="width: 562px; height: 44px"
+              v-model="form.name"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="手机号码">
+            <el-select style="width: 97px" v-model="form.region" placeholder="">
+              <el-option label="区域一" value="shanghai"></el-option>
+            </el-select>
+            <el-input
+              style="width: 457px; height: 44px; margin-left: 8px"
+              v-model="form.name"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="拍摄时间">
+            <el-date-picker style="width: 562px;" v-model="value1" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="拍摄地点">
+            <el-input
+              style="width: 562px; height: 44px"
+              v-model="form.name"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="拍摄预算">
+            <el-input
+              style="width: 562px; height: 44px"
+              v-model="form.name"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="优惠券">
+            <el-select
+              style="width: 562px; height: 44px"
+              v-model="form.region"
+              placeholder="请选择您的拍摄时间"
+            >
+              <el-option label="区域一" value="shanghai"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div
+          style="display: flex; align-items: center; justify-content: center"
+        >
+          <div class="btna">提交表单</div>
+        </div>
+      </div>
     </div>
     <div style="margin-left: 16px" class="personal-main flex-row flex-jc-sb">
       <!-- <div class="pm-content"></div> -->
@@ -48,12 +121,18 @@
   </div>
 </template>
     
-    <script setup>
+<script setup>
 // import { useRouter, useRoute } from "vue-router";
-import { onMounted, ref, toRefs } from "vue";
+import { onMounted, ref } from "vue";
 import ExperienceCard from "./components/ExperienceCard.vue";
 import Routers from "./components/Routers.vue";
 const activeName = ref("first");
+const taps = ref(0);
+//预约切换
+const make = (idx) => {
+  taps.value = idx;
+};
+
 //tabs切换
 const type = ref("");
 const handleClick = (tab) => {
@@ -66,11 +145,39 @@ const handleClick = (tab) => {
   }
 };
 
+const form = ref([
+  {
+    name: "",
+    region: "",
+    date1: "",
+    date2: "",
+    delivery: false,
+    type: [],
+    resource: "",
+    desc: "",
+  },
+]);
+
 onMounted(() => {});
 </script>
      
-    <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "~/styles/variable.scss";
+
+.btna {
+  width: 140px;
+  height: 48px;
+  background: #00b0b0;
+  border-radius: 4px;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 16px;
+  color: #ffffff;
+  line-height: 48px;
+  text-align: center;
+  font-style: normal;
+  cursor: pointer;
+}
 .goto {
   width: 454px;
   height: 52px;
@@ -136,7 +243,6 @@ onMounted(() => {});
   line-height: 44px;
   text-align: center;
   font-style: normal;
-  margin-left: 18px;
   cursor: pointer;
 }
 .top {
@@ -304,5 +410,8 @@ ul {
   color: #333333 !important;
   font-weight: 600 !important;
 }
+::v-deep .el-input__wrapper {
+  height: 44px !important;
+}
 </style>
     

src/views/postDetail.vue

@@ -19,7 +19,9 @@ import * as commentApi from "~/api/comment";
 const Route = useRoute();
 let postType = ref(); // [articles, news, videos]
 postType.value = Route.name;
-
+const toid = () => {
+  return Route.query.id;
+};
 //评论
 let comment = ref([]);
 const __comment__ = async () => {
@@ -132,12 +134,16 @@ const __videoDetail__ = async () => {
     });
   } catch (error) {}
 };
+const detaildType = ref();
 let type = ref("");
 if (Route.name == "news") {
   onMounted(__postDetail__);
+  detaildType.value = "info";
 } else if (Route.name == "articles") {
+  detaildType.value = "articles";
   onMounted(__articlesDetail__);
-} else {
+} else if (Route.name == "video") {
+  detaildType.value = "video";
   onMounted(__videoDetail__);
   type.value = Route.query.type;
 }
@@ -148,13 +154,6 @@ const open = (url) => {
 };
 
 console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
-
-let author = {
-  name: "作者姓名",
-  avatar: placeholderPic(40, 40),
-};
-
-//获取评论列表
 </script>
 
 <template>
@@ -204,7 +203,7 @@ let author = {
         class="author__avatar circle"
         v-if="details.user.avatar"
         :src="details.user.avatar"
-        :alt="author.name"
+        alt=""
       />
       <div class="author__name">{{ details.user.username }}</div>
       <div class="author__post-time">{{ details.user.created_at }}</div>
@@ -229,14 +228,9 @@ let author = {
         </span>
       </div>
     </div>
-    <Comments />
+    <Comments :type="detaildType" :id="toid()" />
   </div>
-  <el-dialog
-    title="分享"
-    v-model="dialogVisible"
-    width="500px"
-    :before-close="handleClose"
-  >
+  <el-dialog title="分享" v-model="dialogVisible" width="500px">
     <div style="display: flex">
       <input
         disabled

src/views/video/index.vue

@@ -36,7 +36,7 @@ const __article__ = async () => {
 };
 onMounted(__article__);
 const todetails = (id,type) => {
-  router.push({
+  router.push({   
     name: "videos",
     query: {
       id: id,
@@ -74,6 +74,7 @@ const pickmore = (val) => {
           :comment_count="item.comment_count"
           :collect_count="item.collect_count"
           :share_count="item.share_count"
+          :image="item.image"
         />
       </template>
     </div>
@@ -94,6 +95,7 @@ const pickmore = (val) => {
           :comment_count="item.comment_count"
           :collect_count="item.collect_count"
           :share_count="item.share_count"
+          :image="item.image"
         />
       </template>
     </div>

src/views/zixun.vue

@@ -7,17 +7,26 @@ import YXFooter from "~/components/layouts/Footer.vue";
 import * as newsApi from "~/api/news";
 import { useRouter } from "vue-router";
 const router = useRouter();
+
+const page = ref(1);
+const total = ref(0)
+//分页器
+const handleCurrentChange = (val) => {
+  page.value = val;
+  __news__();
+};
 // 获取精品咨询列表
 let newsList = ref([]);
 const __news__ = async () => {
   try {
     const { data } = await newsApi.list({
-      page: 1,
+      page: page.value,
       limit: 12,
       is_page: 1,
       is_boutique: 1,
     });
     newsList.value = data.list;
+    total.value = data.total
   } catch (error) {}
 };
 onMounted(__news__);
@@ -49,7 +58,13 @@ const todetails = (id) => {
     </div>
 
     <div class="pagination-container">
-      <el-pagination background layout="prev, pager, next" :total="1000" />
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="total"
+        :page-size="12"
+        @current-change="handleCurrentChange"
+      />
     </div>
     <YXFooter />
   </div>

src/views/zixun/index.vue

@@ -49,7 +49,6 @@ const todetails = (id) => {
 let page = ref(1);
 //分页器
 const handleCurrentChange = (val) => {
-  console.log(val);
   page.value = val;
   __new__();
 };
@@ -128,7 +127,7 @@ const zixunMore = (val) => {
     grid-template-columns: repeat(4, auto);
     justify-content: space-between;
     row-gap: 30px;
-    height: 525px;
+    min-height: 525px;
   }
 }
 </style>

vite.config.js

@@ -10,6 +10,7 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: './',
   resolve: {
     alias: {
       '~/': `${path.resolve(__dirname, 'src')}/`