Начало Каталог Помощ
Регистрация Вход
qcf
/
pc--vr
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

4.12

zhaogongxue преди 11 месеца
родител
9a5c2f546a
ревизия
a1225719d4
променени са 28 файла, в които са добавени 1074 реда и са изтрити 177 реда
Разделен изглед Покажи статистика за разликите
  1. 0 0
      dist/assets/address.7e6488ad.css
  2. 0 0
      dist/assets/content.e7848e51.css
  3. 0 0
      dist/assets/index.eccd882f.css
  4. 0 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_true_lang.38c2ea68.css
  5. 0 1
      dist/assets/outshoping.34274dfb.css
  6. 2 2
      dist/index.html
  7. 8 0
      src/api/video.js
  8. 26 9
      src/components/ActivateMembership/index.vue
  9. 29 27
      src/components/Banner/index.vue
  10. 2 1
      src/components/Comments/index.vue
  11. 1 1
      src/components/IndexSection/index.vue
  12. 2 2
      src/components/Level/index.vue
  13. 2 2
      src/components/Login/Login.vue
  14. 3 3
      src/components/layouts/Aside.vue
  15. 281 33
      src/components/layouts/Header.vue
  16. 1 1
      src/views/index/content.vue
  17. 7 1
      src/views/market/outshoping.vue
  18. 2 1
      src/views/market/placeOrder.vue
  19. 78 10
      src/views/personal/address.vue
  20. 22 13
      src/views/personal/components/ExperienceCard.vue
  21. 9 6
      src/views/personal/components/count.vue
  22. 59 5
      src/views/personal/components/sett.vue
  23. 24 2
      src/views/personal/components/wallet.vue
  24. 10 5
      src/views/personal/index.vue
  25. 31 5
      src/views/personal/make.vue
  26. 41 20
      src/views/personal/video.vue
  27. 3 2
      src/views/postDetail.vue
  28. 431 24
      src/views/reservation/index.vue

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/address.7e6488ad.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/content.e7848e51.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/assets/index.eccd882f.css


+ 0 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_true_lang.38c2ea68.css
Целия файл 

@@ -1 +0,0 @@
 
-.banner-container[data-v-d9749d44]{margin-bottom:30px}.banner-container .demonstration[data-v-d9749d44]{color:var(--el-text-color-secondary)}.banner-container .el-carousel__item[data-v-d9749d44]{border-radius:6px}.banner-container .el-carousel__item img[data-v-d9749d44]{width:100%;height:auto;object-fit:cover}.banner-container .el-carousel__item[data-v-d9749d44]:nth-child(2n){background-color:#99a9bf}.banner-container .el-carousel__item[data-v-d9749d44]:nth-child(2n+1){background-color:#d3dce6}

+ 0 - 1
dist/assets/outshoping.34274dfb.css
Целия файл 

@@ -1 +0,0 @@
 
-.out-shop-container[data-v-ceb15e2c]{width:680px;background-color:#fff;padding:20px;border-radius:10px}.out-shop__header .title[data-v-ceb15e2c]{font-size:18px;font-weight:600;color:#333;line-height:2.2em}.out-shop__header .tips[data-v-ceb15e2c]{font-size:14px;font-weight:400;color:#999;line-height:1.8em}.out-shop__main[data-v-ceb15e2c]{padding:10px 0;display:grid;grid-template-columns:repeat(4,auto);gap:20px;justify-content:space-between}.out-shop__footer[data-v-ceb15e2c]{margin-top:20px}.out-shop__footer .el-button[data-v-ceb15e2c]{width:100%}

+ 2 - 2
dist/index.html
Целия файл 

@@ -6,8 +6,8 @@
 
   <link rel="icon" href="./favicon.ico" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title>Vite App</title>
 
-  <script type="module" crossorigin src="./assets/index.dd054a39.js"></script>
 
-  <link rel="stylesheet" href="./assets/index.5817c0dd.css">
 
+  <script type="module" crossorigin src="./assets/index.4130092b.js"></script>
 
+  <link rel="stylesheet" href="./assets/index.4e7c1976.css">
 
 </head>
 
 
 <body>

+ 8 - 0
src/api/video.js
Целия файл 

@@ -10,6 +10,12 @@ export const list = params => request({
 
   url: 'video'
 
 })
 
 
+export const adminlist = params => request({
 
+  params,
 
+  method: 'GET',
 
+  url: 'admin/video'
 
+})
 
+
 
 export const post = data => request({
 
   data,
 
   method: 'POST',
 
@@ -32,3 +38,5 @@ export const del = data => request({
 
   method: 'DELETE',
 
   url: `video/${data.id}`
 
 })
 
+
 
+

+ 26 - 9
src/components/ActivateMembership/index.vue
Целия файл 

@@ -3,7 +3,9 @@ import { ref, onMounted } from "vue";
 
 import { Close } from "@element-plus/icons-vue";
 
 import SvgIcon from "~/components/SvgIcon/index.vue";
 
 import * as vipApi from "~/api/vip";
 
-
 
+import Login from "~/components/Login/Login.vue";
 
+import { useUser } from "~/store/user.js";
 
+const User = useUser();
 
 const id = ref("");
 
 
 //列表
 
@@ -69,6 +71,12 @@ const prop = defineProps({
 
   },
 
 });
 
 
+// Login logic 注册登录
 
+const visibilityLoginDialog = ref(false);
 
+const handleLogin = () => {
 
+  visibilityLoginDialog.value = true;
 
+};
 
+
 
 // NOTE: 事件
 
 </script>
 
 
@@ -86,10 +94,19 @@ const prop = defineProps({
 
         <div class="headerbox flex-row flex-aic flex-jc-sb">
 
           <div class="infobox flex-row flex-aic">
 
             <!-- NOTE: 只有登录才展示用户头像 -->
 
-            <img src="https://dummyimage.com/50x50/e3e3e3/fff" />
 
-            <div class="info">
 
-              <template v-if="true">
 
-                <div class="infobox__title">注册/登录</div>
 
+            <div v-if="User.token">
 
+              <img :src="User.avatar" />
 
+              <span>{{ User.name }}</span>
 
+            </div>
 
+            <div v-else class="info">
 
+              <template>
 
+                <div
 
+                  class="infobox__title"
 
+                  style="cursor: pointer"
 
+                  @click="handleLogin"
 
+                >
 
+                  注册/登录
 
+                </div>
 
                 <div class="infobox__description">请登录后再购买</div>
 
               </template>
 
             </div>
 
@@ -110,10 +127,9 @@ const prop = defineProps({
 
         <div class="left">
 
           <div class="title">开通权益</div>
 
           <ul>
 
-            <li>购买额外赠送18888积分</li>
 
-            <li>额外免费2次拍摄</li>
 
-            <li>升级领福利</li>
 
-            <li>积分商城折扣</li>
 
+            <li>购买额外赠送{{ info.integral }}积分</li>
 
+            <li>开通赠送{{ info.coupon_count || 0 }}张优惠券</li>
 
+            <li>开通会员天数{{ info.days }}天</li>
 
           </ul>
 
         </div>
 
         <div class="right">
 
@@ -185,6 +201,7 @@ const prop = defineProps({
 
         </div>
 
       </div>
 
     </el-dialog>
 
+    <Login v-model="visibilityLoginDialog" />
 
   </div>
 
 </template>

+ 29 - 27
src/components/Banner/index.vue
Целия файл 

@@ -1,7 +1,6 @@
 
 <script setup name="Banner">
 
-
 
-import { ElMessage } from 'element-plus';
 
-import { ref, onMounted } from 'vue'
 
+import { ElMessage } from "element-plus";
 
+import { ref, onMounted } from "vue";
 
 import { bannerList } from "~/api/common";
 
 
 const BANNER_HEIGHT = ref(420);
 
@@ -10,54 +9,57 @@ const Props = defineProps({
 
   type: {
 
     // : index.首页, integral_shop.积分商城, article.文章, info.资讯, video.视频, post.论坛
 
     type: String,
 
-    require: true
 
+    require: true,
 
   },
 
   limit: {
 
     type: Number,
 
-    default: 5
 
-  }
 
-})
 
+    default: 5,
 
+  },
 
+});
 
 
-const list = ref([])
 
+const list = ref([]);
 
 
 const __banner__ = async () => {
 
   try {
 
     const { msg, data } = await bannerList({
 
       type: Props.type,
 
-      limit: Props.limit
 
-    })
 
+      limit: Props.limit,
 
+    });
 
 
     if (data && Array.isArray(data)) {
 
-      list.value = data
 
+      list.value = data;
 
     }
 
-  } catch (error) {
 
-  }
 
-}
 
+  } catch (error) {}
 
+};
 
 
-onMounted(__banner__)
 
+onMounted(__banner__);
 
 
-// 图片存在活动时； 点击跳转 
-const handleClickActive = detail => {
 
-  const { jump_type, jump_url } = detail
 
+// 图片存在活动时； 点击跳转
 
+const handleClickActive = (detail) => {
 
+  const { jump_type, jump_url } = detail;
 
   // 跳转类型、跳转页面
 
   // 类型: index.首页, integral_shop.积分商城, article.文章, info.资讯, video.视频, post.论坛
 
   // 跳转类型: external.外部链接, internal.内部链接
 
-
 
-  if (jump_type === 'external') { // 外部链接
 
-
 
-  } else if (jump_type === 'internal') { // 内部链接
 
+  if (jump_type == "external") {
 
+    // 外部链接
 
+    window.open(jump_url);
 
+  } else if (jump_type == "internal") {
 
+    // 内部链接
 
+    window.open(jump_url);
 
   } else {
 
-    ElMessage.error('错误的图片')
 
+    ElMessage.error("错误的图片");
 
   }
 
-}
 
-
 
+};
 
 </script>
 
-
 
 <template>
 
   <div class="banner-container">
 
     <el-carousel :height="`${BANNER_HEIGHT}px`">
 
       <el-carousel-item v-for="item in list" :key="item">
 
-        <img :src="item.image" :alt="item.image" @click="item.is_jump ? handleClickActive(item) : null">
 
+        <img
 
+          :src="item.image"
 
+          :alt="item.image"
 
+          @click="item.is_jump ? handleClickActive(item) : null"
 
+        />
 
         <!-- <h3 class="small justify-center" text="2xl">{{ item }}</h3> -->
 
       </el-carousel-item>
 
     </el-carousel>

+ 2 - 1
src/components/Comments/index.vue
Целия файл 

@@ -12,7 +12,7 @@ const User = useUser();
 
 
 const currentCommentType = ref("hot"); // hot, new
 
 
-const total = ref(6344); // 评论数量
 
+const total = ref(); // 评论数量
 
 
 const Props = defineProps({
 
   type: {
 
@@ -48,6 +48,7 @@ const replace1 = async () => {
 
       content: textarea.value,
 
     });
 
     textarea.value = "";
 
+    __list__()
 
   } catch (error) {}
 
 };

+ 1 - 1
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" style="width: 279px; height: 155px" alt="" />
 
+      <img :src="image" style="width: 279px; height: 155px;object-fit: cover;" alt=""  />
 
     </div>
 
     <div v-else class="article-wrapper">
 
       <div class="title ellipsis-two">{{ title }}</div>

+ 2 - 2
src/components/Level/index.vue
Целия файл 

@@ -15,8 +15,8 @@ const Props = defineProps({
 
 // 等级前缀标识路径
 
 const LevelPath = computed(() =>
 
   Props.full
 
-    ? getPicUrl("../../assets/vip/level-full.png", import.meta.url)
 
-    : getPicUrl("../../assets/vip/level-unfull.png", import.meta.url)
 
+    ? getPicUrl("./vip/level-full.png", import.meta.url)
 
+    : getPicUrl("./vip/level-unfull.png", import.meta.url)
 
 );
 
 
 const TextBgc = computed(() => (Props.full ? "#00b0b0" : "#cccccc"));

+ 2 - 2
src/components/Login/Login.vue
Целия файл 

@@ -172,7 +172,7 @@ const handleLoginForm = formInstance => {
 
       4 微信扫一扫 
         4-1 绑定手机号
 
      -->
 
-    <el-dialog :show-close="false" v-model="Props.modelValue" title="" width="400px" :close-on-click-modal="false">
 
+    <el-dialog :show-close="true" v-model="Props.modelValue" title="" width="400px" :close-on-click-modal="false">
 
       <template v-if="['login', 'register', 'bindmobile'].includes(mode)">
 
         <el-tabs v-if="mode === 'login'" v-model="tabValue" class="demo-tabs" @tab-click="handleTabClick">
 
           <el-tab-pane label="手机登录" name="mobilelogin"></el-tab-pane>
 
@@ -317,7 +317,7 @@ const handleLoginForm = formInstance => {
 
 
   .wechat-login {
 
     display: flex;
 
-    flex-derieaction: column;
 
+    // flex-derieaction: column;
 
     flex-direction: column;
 
     align-items: center;
 
     row-gap: 20px;

+ 3 - 3
src/components/layouts/Aside.vue
Целия файл 

@@ -8,8 +8,7 @@ const Route = useRoute();
 
 console.log("%c Route >>>", "background: blue; color: #fff", Route.fullPath);
 
 
 // currying
 
-const getImg = (filename) =>
 
-  getPicUrl(`../../assets/cicons/${filename}`, import.meta.url);
 
+const getImg = (filename) => getPicUrl(`./cicons/${filename}`, import.meta.url);
 
 
 let routers = [
 
   [
 
@@ -94,7 +93,8 @@ const setActiveClass = computed(
 
           :key="rowIdx"
 
         >
 
           <RouterLink :to="row.link">
 
-            <img class="icon" :src="row.defaultIcon" alt="" />
 
+            <img class="icon" :src="`${row.defaultIcon}`" alt="" />
 
+            <!-- <img src="../../assets/cicons/header-01.png" alt=""> -->
 
             <span class="title">{{ row.title }}</span>
 
           </RouterLink>
 
         </div>

+ 281 - 33
src/components/layouts/Header.vue
Целия файл 

@@ -1,5 +1,5 @@
 
 <script setup>
 
-import { ref, onMounted } from "vue";
 
+import { ref, onMounted, reactive } from "vue";
 
 import { Search, Promotion, Avatar } from "@element-plus/icons-vue";
 
 import { useUser } from "~/store/user.js";
 
 import ActivateMembership from "~/components/ActivateMembership/index.vue";
 
@@ -11,6 +11,73 @@ import { getPicUrl } from "~/utils/util";
 
 import * as taskApi from "~/api/task";
 
 import { useRouter } from "vue-router";
 
 import * as userApi from "~/api/user";
 
+const router = useRouter();
 
+
 
+//跳转
 
+const collect = (idx) => {
 
+  if (idx == 0) {
 
+    router.push({
 
+      path: "personal",
 
+      query: {
 
+        subNavCurrent: "collect",
 
+      },
 
+    });
 
+  } else {
 
+    router.push({
 
+      path: "foot",
 
+    });
 
+  }
 
+};
 
+
 
+//关注弹出层
 
+const attentio = () => {
 
+  dialogVisible.value = true;
 
+};
 
+//关注
 
+const atten = async (id) => {
 
+  try {
 
+    const { data } = await userApi.userfollow({
 
+      id: id,
 
+    });
 
+    if (inde.value == 0) {
 
+      __article__();
 
+    } else {
 
+      __fans__();
 
+    }
 
+  } catch (error) {}
 
+};
 
+
 
+const inde = ref(0);
 
+//关注列表
 
+const guan = (id) => {
 
+  inde.value = id;
 
+  if (id == 0) {
 
+    __article__();
 
+  } else {
 
+    __fans__();
 
+  }
 
+};
 
+//关注列表
 
+const fllowlist = ref([]);
 
+const __fans__ = async () => {
 
+  try {
 
+    const { data } = await userApi.fans({
 
+      is_page: 0,
 
+    });
 
+    fllowlist.value = data;
 
+  } catch (error) {}
 
+};
 
+//粉丝列表
 
+const __article__ = async () => {
 
+  try {
 
+    const { data } = await userApi.follow({
 
+      is_page: 0,
 
+    });
 
+    fllowlist.value = data;
 
+  } catch (error) {}
 
+};
 
+onMounted(__article__);
 
+
 
 const tosuccess = (type) => {
 
   if (type == "browse") {
 
     router.replace({
 
@@ -23,7 +90,6 @@ const tosuccess = (type) => {
 
   }
 
 };
 
 
-const router = useRouter();
 
 // 弹出层
 
 const dialogVisible = ref(false);
 
 //退出
 
@@ -62,7 +128,9 @@ onMounted(__badge__);
 
 
 const User = useUser();
 
 console.log("user", User.name);
 
-let wid = User.already_upgrade_rate * 100 || 0;
 
+
 
+let wid =
 
+  (User.integral_sum / (User.integral_sum + User.left_upgrade)) * 100 || 0;
 
 console.log(User.already_upgrade_rate);
 
 
 const keyword = ref(""); // Search keyword
 
@@ -100,33 +168,88 @@ const __leve__ = async (id) => {
 
 const momentList = ref([
 
   {
 
     label: "论坛",
 
-    icon: getPicUrl("../../assets/cicons/send-01.png", import.meta.url),
 
+    icon: getPicUrl("./cicons/send-01.png", import.meta.url),
 
     type: "", // 类型跳转发布时的type
 
   },
 
   {
 
     label: "文章",
 
-    icon: getPicUrl("../../assets/cicons/send-02.png", import.meta.url),
 
+    icon: getPicUrl("./cicons/send-02.png", import.meta.url),
 
 
     type: "", // 类型跳转发布时的type
 
   },
 
   {
 
     label: "资讯",
 
-    icon: getPicUrl("../../assets/cicons/send-03.png", import.meta.url),
 
+    icon: getPicUrl("./cicons/send-03.png", import.meta.url),
 
 
     type: "", // 类型跳转发布时的type
 
   },
 
   {
 
     label: "视频",
 
-    icon: getPicUrl("../../assets/cicons/send-04.png", import.meta.url),
 
-
 
+    icon: getPicUrl("./cicons/send-04.png", import.meta.url),
 
     type: "", // 类型跳转发布时的type
 
   },
 
   {
 
     label: "草稿箱",
 
-    icon: getPicUrl("../../assets/cicons/send-05.png", import.meta.url),
 
+    icon: getPicUrl("./cicons/send-05.png", import.meta.url),
 
     type: "", // 类型跳转发布时的type
 
   },
 
 ]);
 
+const RankTitleEnum = {
 
+  score: "积分排行",
 
+  essence: "精华帖排行",
 
+  like: "点赞排行",
 
+};
 
+const dialogUserRank = reactive({
 
+  visibility: false,
 
+  type: "",
 
+  list: [],
 
+});
 
+const __user_rank__ = (type, limit = 10) =>
 
+  new Promise(async (resolve) => {
 
+    try {
 
+      const { data } = await userApi.userRank({
 
+        type,
 
+        limit,
 
+        is_page: 0,
 
+      });
 
+      resolve(data);
 
+    } catch (error) {}
 
+  });
 
+const handleSeeMoreRank = async (type, componentType) => {
 
+  try {
 
+    pai.value = false;
 
+    dialogUserRank.type = "";
 
+    dialogUserRank.list = [];
 
+    dialogUserRank.visibility = false;
 
+    // Top 50 obtained.before
 
+    const list = await __user_rank__(type, 50);
 
+    if (list) {
 
+      dialogUserRank.type = componentType;
 
+      dialogUserRank.list = list;
 
+      dialogUserRank.visibility = true;
 
+    }
 
+  } catch (error) {}
 
+};
 
+// 首页个人排行
 
+const integralList = ref([]);
 
+const likeList = ref([]);
 
+const boutiqueList = ref([]);
 
+const userRankList = () => {
 
+  try {
 
+    Promise.all([
 
+      __user_rank__("integral"),
 
+      __user_rank__("like"),
 
+      __user_rank__("boutique"),
 
+    ]).then((result) => {
 
+      const [integral_list = [], like_list = [], boutique_list = []] = result;
 
+      integralList.value = integral_list;
 
+      likeList.value = like_list;
 
+      boutiqueList.value = boutique_list;
 
+    });
 
+  } catch (error) {}
 
+};
 
+
 
+onMounted(userRankList);
 
 
 const handleClickMoment = (moment) => {
 
   console.log(
 
@@ -135,7 +258,7 @@ const handleClickMoment = (moment) => {
 
     moment
 
   );
 
 };
 
-
 
+const pai = ref(false);
 
 //兑换
 
 const toinform = (idx) => {
 
   if (idx == 0) {
 
@@ -145,7 +268,7 @@ const toinform = (idx) => {
 
     });
 
   } else if (idx == 2) {
 
     router.push({
 
-      path: "/",
 
+      path: "/reservation",
 
     });
 
   } else if (idx == 1) {
 
     router.push({
 
@@ -162,6 +285,8 @@ const toinform = (idx) => {
 
     router.push({
 
       path: "/wallet",
 
     });
 
+  } else if (idx == 5) {
 
+    pai.value = true;
 
   }
 
 };
 
 
@@ -314,22 +439,36 @@ const attention = (idx) => {
 
               </div>
 
             </template>
 
             <div class="userinfo-container uc">
 
-              <div style="display: flex">
 
-                <div class="uc__avatar" @click="topersonal">
 
-                  <img class="circle" :src="User.avatar" alt="" />
 
-                </div>
 
-                <div style="margin-left: 10px">
 
-                  <div class="uc__name">{{ User.name }}</div>
 
-                  <!-- TODO: 用户徽章 -->
 
-                  <div class="uc__flags">
 
-                    <img
 
-                      v-for="(item, idx) in imglist"
 
-                      :key="idx"
 
-                      :src="item.image"
 
-                      alt=""
 
-                    />
 
+              <div
 
+                style="
 
+                  display: flex;
 
+                  justify-content: space-between;
 
+                  align-items: center;
 
+                "
 
+              >
 
+                <div style="display: flex">
 
+                  <div class="uc__avatar" @click="topersonal">
 
+                    <img class="circle" :src="User.avatar" alt="" />
 
+                  </div>
 
+                  <div style="margin-left: 10px">
 
+                    <div class="uc__name">{{ User.name }}</div>
 
+                    <!-- TODO: 用户徽章 -->
 
+                    <div class="uc__flags">
 
+                      <img
 
+                        v-for="(item, idx) in imglist"
 
+                        :key="idx"
 
+                        :src="item.image"
 
+                        alt=""
 
+                      />
 
+                    </div>
 
                   </div>
 
                 </div>
 
+                <img
 
+                  @click="dialogVisible = true"
 
+                  src="../../assets/vip/clear.png"
 
+                  style="width: 20px; height: 20px; cursor: pointer"
 
+                  alt=""
 
+                />
 
               </div>
 
               <div class="uc__integral flex-row flex-aic flex-jc-sb">
 
                 <span class="integral_text"
 
@@ -407,19 +546,19 @@ const attention = (idx) => {
 
                 </div>
 
               </div>
 
               <div class="uc__part">
 
-                <div>
 
+                <div style="cursor: pointer" @click="attentio">
 
                   <div>{{ User.follow_count || 0 }}</div>
 
                   <div>关注</div>
 
                 </div>
 
-                <div>
 
+                <div style="cursor: pointer" @click="attentio">
 
                   <div>{{ User.fans_count || 0 }}</div>
 
                   <div>粉丝</div>
 
                 </div>
 
-                <div>
 
+                <div style="cursor: pointer" @click="collect(0)">
 
                   <div>{{ User.collect_count || 0 }}</div>
 
                   <div>收藏</div>
 
                 </div>
 
-                <div>
 
+                <div style="cursor: pointer" @click="collect(1)">
 
                   <div>{{ User.view_count || 0 }}</div>
 
                   <div>足迹</div>
 
                 </div>
 
@@ -479,14 +618,12 @@ const attention = (idx) => {
 
                 <div class="itembox" @click="toinform(5)">
 
                   <div class="icon">
 
                     <img
 
-                      src="../../assets/cicons/header-06.png"
 
+                      src="../../assets/cicons/header-07.png"
 
                       style="width: 20px; height: 20px"
 
                       alt=""
 
                     />
 
                   </div>
 
-                  <div class="label" @click="dialogVisible = true">
 
-                    退出忆象
 
-                  </div>
 
+                  <div class="label">排行榜</div>
 
                 </div>
 
               </div>
 
             </div>
 
@@ -511,10 +648,103 @@ const attention = (idx) => {
 
       </span>
 
     </template>
 
   </el-dialog>
 
+  <el-dialog v-model="pai" width="440px">
 
+    <div style="margin-top: -30px">
 
+      <TheCharts
 
+        :list="integralList"
 
+        type="score"
 
+        @more="handleSeeMoreRank('integral', 'score')"
 
+        :is-show-more="true"
 
+        :header-title="RankTitleEnum.score"
 
+      />
 
+    </div>
 
+  </el-dialog>
 
+  <el-dialog v-model="dialogUserRank.visibility" title="积分排行" width="440px">
 
+    <div class="dialog-userrank scroll-optimize">
 
+      <TheCharts
 
+        :list="dialogUserRank.list"
 
+        :type="dialogUserRank.type"
 
+        header-title=""
 
+      />
 
+    </div>
 
+  </el-dialog>
 
+  <!-- 弹出层 -->
 
+  <el-dialog
 
+    v-model="dialogVisible"
 
+    width="500px"
 
+    style="height: 560px; border-radius: 10px"
 
+    :show-close="true"
 
+  >
 
+    <div style="padding: 0px 24px; box-sizing: border-box">
 
+      <div style="display: flex; margin-top: -20px">
 
+        <div :class="inde == 0 ? 'active' : 'toptitle'" @click="guan(0)">
 
+          已关注
 
+        </div>
 
+        <div
 
+          :class="inde == 1 ? 'active' : 'toptitle'"
 
+          style="margin-left: 46px"
 
+          @click="guan(1)"
 
+        >
 
+          被关注
 
+        </div>
 
+      </div>
 
+      <div v-if="fllowlist.length > 0">
 
+        <div class="boxa" v-for="(item, idx) in fllowlist" :key="idx">
 
+          <div style="display: flex">
 
+            <img
 
+              :src="item.avatar"
 
+              style="width: 46px; height: 46px; border-radius: 50%"
 
+              alt=""
 
+            />
 
+            <div style="margin-left: 12px">
 
+              <div class="name">{{ item.username }}</div>
 
+              <div class="info">{{ item.introduction || "" }}</div>
 
+            </div>
 
+          </div>
 
+          <div>
 
+            <div
 
+              class="attentio"
 
+              @click="atten(item.id)"
 
+              v-if="item.is_follow == 0"
 
+            >
 
+              关注
 
+            </div>
 
+            <div
 
+              class="atten"
 
+              @click="atten(item.id)"
 
+              v-if="item.is_follow == 1"
 
+            >
 
+              已关注
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div
 
+        v-else
 
+        style="
 
+          display: flex;
 
+          flex-direction: column;
 
+          align-items: center;
 
+          justify-content: center;
 
+          height: 450px;
 
+        "
 
+      >
 
+        <div>还没有内容</div>
 
+      </div>
 
+    </div>
 
+  </el-dialog>
 
 </template>
 
 
 <style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
+.sortlist-container {
 
+  column-gap: 26px;
 
+}
 
+
 
+.dialog-userrank {
 
+  max-height: 700px;
 
+  overflow: auto;
 
+}
 
 .bottom {
 
   font-family: PingFangSC, PingFang SC;
 
   font-weight: 400;
 
@@ -524,6 +754,24 @@ const attention = (idx) => {
 
   text-align: left;
 
   font-style: normal;
 
 }
 
+.active {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 500;
 
+  font-size: 18px;
 
+  color: #222222;
 
+  line-height: 25px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+}
 
+.toptitle {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 500;
 
+  font-size: 18px;
 
+  color: #999999;
 
+  line-height: 25px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+}
 
 .title {
 
   font-family: PingFangSC, PingFang SC;
 
   font-weight: 500;

+ 1 - 1
src/views/index/content.vue
Целия файл 

@@ -305,7 +305,7 @@ const topicinfo = (id) => {
 
       </div>
 
     </el-dialog>
 
 
-    <ErrorReport :visibility="tan"/>
 
+    <ErrorReport :visibility="tan" />
 
   </div>
 
 </template>

+ 7 - 1
src/views/market/outshoping.vue
Целия файл 

@@ -6,18 +6,24 @@ import * as commonApi from "~/api/common";
 
 
 // 获取商品列表
 
 let getConfig = ref([]);
 
+const urladd = ref();
 
 const __news__ = async () => {
 
   try {
 
     const { data } = await commonApi.getConfig({
 
       module: "shop",
 
     });
 
     getConfig.value = data.shop_images;
 
+    urladd.value = data.shop_url;
 
   } catch (error) {}
 
 };
 
 
 onMounted(__news__);
 
 
 let imgPath = placeholderPic(140, 140);
 
+
 
+const tourl = () => {
 
+  window.open(urladd.value);
 
+};
 
 </script>
 
 
 <template>
 
@@ -32,7 +38,7 @@ let imgPath = placeholderPic(140, 140);
 
       </template>
 
     </div>
 
     <div class="out-shop__footer">
 
-      <el-button type="primary" size="large">继续跳转</el-button>
 
+      <el-button type="primary" size="large" @click="tourl">继续跳转</el-button>
 
     </div>
 
   </div>
 
 </template>

+ 2 - 1
src/views/market/placeOrder.vue
Целия файл 

@@ -93,7 +93,6 @@ const saveadd = () => {
 
   } else {
 
     __multipart__();
 
   }
 
-  list();
 
 };
 
 //添加
 
 const __multipart__ = async () => {
 
@@ -107,6 +106,7 @@ const __multipart__ = async () => {
 
       message: "添加成功",
 
       type: "success",
 
     });
 
+    list()
 
   } catch (error) {}
 
 };
 
 //更新
 
@@ -132,6 +132,7 @@ const __put__ = async () => {
 
       message: "编辑成功",
 
       type: "success",
 
     });
 
+    list()
 
   } catch (error) {}
 
 };
 
 //地区列表

+ 78 - 10
src/views/personal/address.vue
Целия файл 

@@ -149,15 +149,38 @@
 
     </el-form>
 
     <div style="" class="saveadd" @click="saveadd">保存收货地址</div>
 
   </el-dialog>
 
+  <el-dialog v-model="delectshow" width="354">
 
+    <div
 
+      style="
 
+        display: flex;
 
+        flex-direction: column;
 
+        justify-content: center;
 
+        align-items: center;
 
+      "
 
+    >
 
+      <el-icon color="rgba(246, 177, 19, 1)" :size="34" class="no-inherit">
 
+        <WarningFilled />
 
+      </el-icon>
 
+      <div style="margin-top: 16px" class="changeadd">确定要删除该地址吗？</div>
 
+      <div style="display: flex; margin-top: 26px">
 
+        <div class="cancel" @click="delectshow = false">取消</div>
 
+        <div class="confirm" @click="del1">确定</div>
 
+      </div>
 
+    </div>
 
+  </el-dialog>
 
 </template>
 
       
   <script setup>
 
-// import { useRouter, useRoute } from "vue-router";
 
-// 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";
 
+import {
 
+  ArrowLeft,
 
+  LocationFilled,
 
+  WarningFilled,
 
+  SuccessFilled,
 
+} from "@element-plus/icons-vue";
 
 const form = reactive({
 
   name: "",
 
   mobile: "",
 
@@ -179,11 +202,11 @@ console.log("name", form.name);
 
 // const is_default = ref()
 
 
 //规则
 
-const rules = ref([
 
-  {
 
-    name: [{ required: true, message: "请输入收货地址", trigger: "blur" }],
 
-  },
 
-]);
 
+// const rules = ref([
 
+//   {
 
+//     name: [{ required: true, message: "请输入收货地址", trigger: "blur" }],
 
+//   },
 
+// ]);
 
 
 //编辑
 
 const compilevalue = ref(0);
 
@@ -208,13 +231,19 @@ const __detail__ = async () => {
 
   } catch (error) {}
 
 };
 
 onMounted(__detail__);
 
-
 
+const delectshow = ref(false);
 
+const deleid = ref();
 
 const del = async (id) => {
 
+  delectshow.value = true;
 
+  deleid.value = id;
 
+};
 
+const del1 = async (id) => {
 
   try {
 
     const { data } = await earaApi.del({
 
-      id: id,
 
+      id: deleid.value,
 
     });
 
     __detail__();
 
+    delectshow.value = false;
 
   } catch (error) {}
 
 };
 
 //地区列表
 
@@ -294,7 +323,6 @@ const saveadd = () => {
 
   } else {
 
     __multipart__();
 
   }
 
-  __detail__();
 
 };
 
 //添加
 
 const __multipart__ = async () => {
 
@@ -308,6 +336,7 @@ const __multipart__ = async () => {
 
       message: "添加成功",
 
       type: "success",
 
     });
 
+    __detail__();
 
   } catch (error) {}
 
 };
 
 //更新
 
@@ -333,12 +362,51 @@ const __put__ = async () => {
 
       message: "编辑成功",
 
       type: "success",
 
     });
 
+    __detail__();
 
   } catch (error) {}
 
 };
 
 </script>
 
              
 <style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
+.confirm {
 
+  width: 78px;
 
+  height: 36px;
 
+  background: #00b0b0;
 
+  border-radius: 4px;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: #ffffff;
 
+  font-style: normal;
 
+  margin-left: 22px;
 
+  line-height: 36px;
 
+  text-align: center;
 
+  cursor: pointer;
 
+}
 
+.cancel {
 
+  width: 78px;
 
+  height: 36px;
 
+  background: #c5c5c5;
 
+  border-radius: 4px;
 
+  text-align: center;
 
+  line-height: 36px;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: #ffffff;
 
+  font-style: normal;
 
+  cursor: pointer;
 
+}
 
+.changeadd {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 16px;
 
+  color: #222222;
 
+  line-height: 22px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+}
 
 .saveadd {
 
   width: 122px;
 
   height: 40px;

+ 22 - 13
src/views/personal/components/ExperienceCard.vue
Целия файл 

@@ -4,7 +4,7 @@ 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 ()
 
+const router = useRouter();
 
 // import { useOpenMember, useRenewMember } from "~/useHook/useMember";
 
 const User = useUser();
 
 console.log("yusrgdfij", User.already_upgrade_rate);
 
@@ -31,19 +31,19 @@ const __task__ = async () => {
 
 onMounted(__task__);
 
 
 //跳转
 
-const tosuccess = (type)=>{
 
-  if(type=='browse'){
 
+const tosuccess = (type) => {
 
+  if (type == "browse") {
 
     router.replace({
 
-      name:'Forum'
 
-    })
 
+      name: "Forum",
 
+    });
 
   }
 
-}
 
+};
 
 //编辑信息
 
-const toinfo = ()=>{
 
+const toinfo = () => {
 
   router.push({
 
-    path:'/setting'
 
-  })
 
-}
 
+    path: "/setting",
 
+  });
 
+};
 
 </script>
 
 
 <template>
 
@@ -95,7 +95,11 @@ const toinfo = ()=>{
 
                       </div>
 
                     </div>
 
                   </div>
 
-                  <div @click="tosuccess(item.source_type)" class="success" v-if="item.status == 'finished'">
 
+                  <div
 
+                    @click="tosuccess(item.source_type)"
 
+                    class="success"
 
+                    v-if="item.status == 'finished'"
 
+                  >
 
                     已完成
 
                   </div>
 
                   <div
 
@@ -112,14 +116,19 @@ const toinfo = ()=>{
 
         </template>
 
       </el-dropdown>
 
     </div>
 
-
 
+    <!-- :style="`width: ${User.already_upgrade_rate * 100}%;`" -->
 
     <!-- 进度条 -->
 
     <div class="process">
 
       <div class="uc__grade">
 
         <div class="uc__grade__show-bar">
 
           <div
 
             class="sb-inside"
 
-            :style="`width: ${User.already_upgrade_rate * 100}%;`"
 
+            :style="{
 
+              width:
 
+                (User.integral_sum / (User.integral_sum + User.left_upgrade)) *
 
+                  100 +
 
+                '%',
 
+            }"
 
           ></div>
 
         </div>
 
         <div class="uc__grade_txt flex-row flex-jc-sb">

+ 9 - 6
src/views/personal/components/count.vue
Целия файл 

@@ -36,6 +36,7 @@
 
                 满{{ item.coupon.threshold }}可用
 
               </div>
 
             </div>
 
+
 
             <div v-else>
 
               <div v-if="item.coupon.type == 'shoot'">预约拍摄优惠券</div>
 
               <div v-if="item.coupon.type == 'lease'">设备租赁优惠券</div>
 
@@ -57,7 +58,7 @@
 
           <div style="margin-left: 16px">
 
             <div>
 
               <div class="title">{{ item.coupon.name }}</div>
 
-              <div class="use">{{ item.coupon.description }}</div>
 
+              <div class="use" style="width: 300px;">{{ item.coupon.description }}</div>
 
             </div>
 
             <div class="date">到期时间：{{ item.expired_at }}</div>
 
           </div>
 
@@ -157,7 +158,7 @@ const handleSwitchSubNav = debounce((type) => {
 
 onMounted(() => {});
 
 </script>
 
   
-  <style lang="scss" scoped>
 
+<style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
 .title {
 
   font-family: PingFangSC, PingFang SC;
 
@@ -203,7 +204,6 @@ onMounted(() => {});
 
   font-style: normal;
 
 }
 
 .font {
 
-  padding-top: 38px;
 
   box-sizing: border-box;
 
   text-align: center;
 
   background: url(../../../assets/count/discounts.png) no-repeat;
 
@@ -214,10 +214,11 @@ onMounted(() => {});
 
   font-weight: 400;
 
   font-size: 22px;
 
   color: #ffffff;
 
-  line-height: 60px;
 
+  display: flex;
 
+  flex-direction: column;
 
+  justify-content: center;
 
 }
 
 .font1 {
 
-  padding-top: 38px;
 
   box-sizing: border-box;
 
   text-align: center;
 
   background: url(../../../assets/count/lostBack.png) no-repeat;
 
@@ -228,7 +229,9 @@ onMounted(() => {});
 
   font-weight: 400;
 
   font-size: 22px;
 
   color: #ffffff;
 
-  line-height: 60px;
 
+  display: flex;
 
+  flex-direction: column;
 
+  justify-content: center;
 
 }
 
 .box {
 
   // width: 714px;

+ 59 - 5
src/views/personal/components/sett.vue
Целия файл 

@@ -60,11 +60,11 @@
 
             />
 
           </div>
 
           <div class="font">
 
-            支持中英文，长度不能超过 20 个字符，180内仅支出修改一次
 
+            支持中英文，长度不能超过 20 个字符，180天内仅支出修改一次
 
           </div>
 
         </div>
 
       </div>
 
-      <div class="fla" style="margin-top: 24px">
 
+      <div style="margin-top: 24px; display: flex">
 
         <div class="title">个人简介</div>
 
         <div>
 
           <el-input
 
@@ -309,8 +309,9 @@
 
         <div
 
           style="position: absolute; cursor: pointer; right: 30px; top: 15px"
 
           class="code"
 
+          @click="handleStartTimeCount(elformRef)"
 
         >
 
-          获取验证码
 
+          {{ msgCodeTxt }}
 
         </div>
 
       </div>
 
       <div
 
@@ -364,9 +365,57 @@ import { onMounted, ref } from "vue";
 
 import { USER_INFO } from "~/utils/constance";
 
 import debounce from "loadsh/debounce";
 
 import * as userApi from "~/api/user";
 
-import { ElMessage, ElMessageBox } from "element-plus";
 
+import { ElMessage } from "element-plus";
 
 import { useUser } from "~/store/user";
 
 import { useRoute } from "vue-router";
 
+import { checkPhone } from "~/utils/util";
 
+import { COUNT_DOWN_MAX } from "~/utils/constance";
 
+//获取验证码
 
+// 获取短信二维码
 
+let msgCodeTxt = ref("获取短信验证码");
 
+let timeId = null;
 
+
 
+const __sendcode__ = async (formdata) => {
 
+  try {
 
+    await sendCode(formdata);
 
+    ElMessage.success("验证码已发送");
 
+  } catch (error) {}
 
+};
 
+// NOTE: 倒计时
 
+const handleStartTimeCount = debounce(async function () {
 
+  if (timeId) return;
 
+  let mobileNumber = mobile.value || "";
 
+
 
+  if (!mobileNumber) {
 
+    ElMessage({ message: "手机号不能为空", type: "error" });
 
+    return;
 
+  }
 
+
 
+  if (!checkPhone(mobileNumber)) {
 
+    ElMessage({ message: "手机号格式不正确", type: "error" });
 
+    return;
 
+  }
 
+
 
+  await __sendcode__({
 
+    mobile: mobileNumber,
 
+    type: "register", // register | login | forget
 
+  });
 
+
 
+  const timeCount = (time) => {
 
+    msgCodeTxt.value = `${time}s`;
 
+    if (typeof time === "number") {
 
+      time -= 1;
 
+      if (time >= 0) {
 
+        timeId = setTimeout(timeCount.bind(null, time), 1100);
 
+      } else {
 
+        msgCodeTxt.value = "获取短信验证码";
 
+        timeId = null;
 
+      }
 
+    }
 
+  };
 
+  timeCount(COUNT_DOWN_MAX);
 
+}, 300);
 
+
 
 const route = useRoute();
 
 const User = useUser();
 
 
@@ -470,6 +519,7 @@ const passchange = async () => {
 
       message: "修改成功",
 
       type: "success",
 
     });
 
+    User.getUser();
 
   } catch (error) {}
 
 };
 
 
@@ -486,8 +536,12 @@ const change = async () => {
 
       mobile: mobile.value,
 
       code: code.value,
 
     });
 
-    User.useUser();
 
     dialog.value = false;
 
+    ElMessage.success({
 
+      message: "修改成功",
 
+      type: "success",
 
+    });
 
+    User.setLogin();
 
   } catch (error) {}
 
 };

+ 24 - 2
src/views/personal/components/wallet.vue
Целия файл 

@@ -61,8 +61,10 @@
 
             </div>
 
           </div>
 
         </div>
 
-        <div class="success" @click="tosucc(item.source_type)">去完成</div>
 
         <div class="complete" v-if="item.status == 'finished'">已完成</div>
 
+        <div class="success" v-else @click="tosucc(item.source_type)">
 
+          去完成
 
+        </div>
 
       </div>
 
       <!-- <div class="box">
 
         <div style="display: flex">
 
@@ -138,6 +140,9 @@
 
       <el-table-column prop="remark" label="详细说明"> </el-table-column>
 
     </el-table>
 
   </div>
 
+  <el-dialog v-model="dialogVisible" title="积分说明" width="500">
 
+    <div v-html="articleContent"></div>
 
+  </el-dialog>
 
 </template>
 
     
 <script setup>
 
@@ -149,13 +154,30 @@ import { ElMessage, ElMessageBox } from "element-plus";
 
 import { useUser } from "~/store/user";
 
 import * as taskApi from "~/api/task";
 
 import { useRouter } from "vue-router";
 
+import { getAgreementDetail } from "~/api/common";
 
 const User = useUser();
 
 const router = useRouter();
 
+const dialogVisible = ref(false);
 
 //打开提示框
 
 const open = () => {
 
-  ElMessageBox.alert();
 
+  dialogVisible.value = true;
 
 };
 
 
+const articleContent = ref();
 
+//积分说明
 
+const __detail__ = async () => {
 
+  try {
 
+    const { data } = await getAgreementDetail({
 
+      code: "rule",
 
+    });
 
+    if (data) {
 
+      const { name = "", content = "" } = data;
 
+      document.title = name;
 
+      articleContent.value = content;
 
+    }
 
+  } catch (error) {}
 
+};
 
+onMounted(__detail__);
 
 //去完成
 
 const tosucc = (type) => {
 
   if (type == "like") {

+ 10 - 5
src/views/personal/index.vue
Целия файл 

@@ -6,7 +6,7 @@ import Routers from "./components/Routers.vue";
 
 import MomentLayout from "~/components/MomentLayout/index.vue";
 
 import Level from "~/components/Level/index.vue";
 
 import { useUser } from "~/store/user";
 
-import { onMounted, reactive, ref, watch, watchEffect } from "vue";
 
+import { onMounted, reactive, ref, watch, watchEffect, } from "vue";
 
 import {
 
   PERSONAL_SUB_NAV_LIST,
 
   PERSONAL_SECOND_SUB_NAV_LIST,
 
@@ -15,7 +15,9 @@ import {
 
 import { usePersonalIndexList } from "~/useHook/usePersonalIndex";
 
 import debounce from "loadsh/debounce";
 
 import * as follow from "~/api/user";
 
-
 
+import { collect } from "~/api/gather";
 
+import { useRoute } from "vue-router";
 
+const route = useRoute()
 
 //弹出层
 
 const dialogVisible = ref(false);
 
 const User = useUser();
 
@@ -94,7 +96,11 @@ onMounted(__articles__);
 
 console.log("user see>>", User);
 
 
 // forum, news, article, video, collect
 
-const subNavCurrent = ref("forum"); // default value 'forum'
 
+const subNavCurrent = ref("forum");
 
+if (route.query.subNavCurrent) {
 
+  subNavCurrent.value = "collect";
 
+}
 
+// default value 'forum'
 
 const subNavList = PERSONAL_SUB_NAV_LIST;
 
 
 const handleSwitchSubNav = debounce((type) => {
 
@@ -485,11 +491,10 @@ ul {
 
       padding: 20px;
 
       background-color: rgba(0, 0, 0, 0.18);
 
       box-sizing: border-box;
 
-
 
       background-repeat: no-repeat;
 
       background-position: cover;
 
       background-attachment: fixed;
 
-
 
+      background-size: 100% 100%;
 
       .pinfo {
 
         .avatar {
 
           width: 60px;

+ 31 - 5
src/views/personal/make.vue
Целия файл 

@@ -44,7 +44,7 @@
 
                 恭喜！你已成功的提交了预约申请
 
               </div>
 
             </div>
 
-            <div class="add">添加客服</div>
 
+            <div class="add" @click="getConfiguser">添加客服</div>
 
           </div>
 
         </div>
 
       </div>
 
@@ -178,11 +178,23 @@
 
     <p class="dialog-desc">请前往添加客服微信</p>
 
     <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" @click="visibilityDialog2 = false"
 
+          >&nbsp;稍后添加&nbsp;</el-button
 
+        >
 
+        <el-button size="large" type="primary" @click="getConfiguser"
 
+          >&nbsp;添加客服&nbsp;</el-button
 
+        >
 
       </div>
 
     </template>
 
   </el-dialog>
 
+  <!-- 二维码展示 -->
 
+  <el-dialog title="添加客服" v-model="imageshow" align="center" width="400">
 
+    <img
 
+      :src="customer_service_qrcode"
 
+      style="width: 350px; height: 350px"
 
+      alt=""
 
+    />
 
+  </el-dialog>
 
 </template>
 
     
 <script setup>
 
@@ -193,6 +205,7 @@ import Routers from "./components/Routers.vue";
 
 import * as shootApi from "~/api/subscribe";
 
 import * as userApi from "~/api/user";
 
 import { useRoute } from "vue-router";
 
+import * as commonApi from "~/api/common";
 
 import {
 
   ArrowLeft,
 
   LocationFilled,
 
@@ -208,6 +221,20 @@ if (route.query.type) {
 
   activeName.value = "second";
 
   type.value = 1;
 
 }
 
+const imageshow = ref(false)
 
+
 
+//添加客服接口
 
+const customer_service_qrcode = ref();
 
+const getConfiguser = async () => {
 
+  try {
 
+    const { data } = await commonApi.getConfiguser({
 
+      module: "basic",
 
+    });
 
+    customer_service_qrcode.value = data.customer_service_qrcode;
 
+  } catch (error) {}
 
+  imageshow.value = true;
 
+};
 
+
 
 
 //预约切换
 
 const make = (idx) => {
 
@@ -216,7 +243,6 @@ const make = (idx) => {
 
 const visibilityDialog = ref(false);
 
 const bang = ref("+86");
 
 
-
 
 const handleClick = (tab) => {
 
   if (tab.index == 0) {
 
     type.value = 0;
 
@@ -255,7 +281,7 @@ const list = async () => {
 
       is_page: 0,
 
       is_expire: 0,
 
       is_use: 0,
 
-      type: "is_use",
 
+      type: "shoot",
 
     });
 
     couponList.value = data.list;
 
   } catch (error) {}

+ 41 - 20
src/views/personal/video.vue
Целия файл 

@@ -4,26 +4,43 @@
 
     <!-- main -->
 
     <div style="width: 840px">
 
       <div class="back">视频管理</div>
 
-      <div
 
-        v-for="(item, idx) in commList"
 
-        :key="idx"
 
-        class="video"
 
-        style="display: flex"
 
-      >
 
-        <img :src="item.image" style="width: 120px; height: 130px" alt="" />
 
+      <div v-if="commList.length > 0">
 
         <div
 
-          style="
 
-            margin-left: 16px;
 
-            height: 130px;
 
-            display: flex;
 
-            flex-direction: column;
 
-            justify-content: space-between;
 
-          "
 
+          v-for="(item, idx) in commList"
 
+          :key="idx"
 
+          class="video"
 
+          style="display: flex; cursor: pointer"
 
+          @click="open(item.url)"
 
         >
 
-          <div class="title">{{ item.title }}</div>
 
-          <div class="time">2小时前创建 1个小时前有过修改</div>
 
+          <img :src="item.image" style="width: 120px; height: 130px" alt="" />
 
+          <div
 
+            style="
 
+              margin-left: 16px;
 
+              height: 130px;
 
+              display: flex;
 
+              flex-direction: column;
 
+              justify-content: space-between;
 
+            "
 
+          >
 
+            <div class="title">{{ item.title }}</div>
 
+            <div class="time">
 
+              {{ item.created_at }}创建 {{ item.updated_at }}有过修改
 
+            </div>
 
+          </div>
 
         </div>
 
       </div>
 
+      <div
 
+        v-else
 
+        style="
 
+          height: 600px;
 
+          display: flex;
 
+          flex-direction: column;
 
+          justify-content: center;
 
+          justify-content: center;
 
+        "
 
+      >
 
+        <div style="text-align: center">暂无内容</div>
 
+      </div>
 
     </div>
 
     <div style="margin-left: 16px" class="personal-main flex-row flex-jc-sb">
 
       <div class="pm-side">
 
@@ -43,16 +60,20 @@ import Routers from "./components/Routers.vue";
 
 import * as videoApi from "~/api/video";
 
 import { useUser } from "~/store/user";
 
 const user = useUser();
 
-//tabs切换
 
+//播放视频
 
+//打开视频
 
+const open = (url) => {
 
+  window.open(url);
 
+};
 
 
 //常见问题列表
 
 let commList = ref([]);
 
 const __detail__ = async () => {
 
   try {
 
-    const { data } = await videoApi.list({
 
-      user_id: user.id,
 
+    const { data } = await videoApi.adminlist({
 
+      is_page: 0,
 
     });
 
-    commList.value = data.list;
 
+    commList.value = data;
 
   } catch (error) {}
 
 };
 
 onMounted(__detail__);

+ 3 - 2
src/views/postDetail.vue
Целия файл 

@@ -37,7 +37,8 @@ const toid = () => {
 
 // onMounted(__comment__);
 
 //分享
 
 const dialogVisible = ref(false);
 
-var url = window.location.href;
 
+const url = ref();
 
+url.value = window.location.href;
 
 const shareLink = async () => {
 
   try {
 
     await navigator.clipboard.writeText(url.value);
 
@@ -185,7 +186,7 @@ console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
 
 <template>
 
   <div
 
     class="video flex-row"
 
-    v-if="type == 'common'"
 
+    v-if="Route.name == 'videos'"
 
     @click="open(details.video_url)"
 
   >
 
     <div style="position: relative">

+ 431 - 24
src/views/reservation/index.vue
Целия файл 

@@ -1,41 +1,437 @@
 
 <template>
 
-  <!-- 设备租赁 -->
 
-  <div class="personal-container">
 
+  <!-- 预约-->
 
+  <div class="personal-container" style="display: flex">
 
+    <!-- main -->
 
     <div>
 
-      <div class="personal-main flex-row flex-jc-sb">
 
-        <div class="pm-content">
 
-          <!-- 理应只有4种适配 -->
 
-
 
-          <!-- 收藏 -->
 
+      <div class="top">
 
+        <el-tabs
 
+          v-model="activeName"
 
+          class="demo-tabs"
 
+          @tab-click="handleClick"
 
+        >
 
+          <el-tab-pane label="设备租赁" name="first"></el-tab-pane>
 
+          <el-tab-pane label="租赁记录" name="second"></el-tab-pane>
 
+        </el-tabs>
 
+        <div v-if="type == 1">
 
+          <div
 
+            v-for="(item, idx) in shootli"
 
+            :key="idx"
 
+            class="box"
 
+            style="
 
+              display: flex;
 
+              justify-content: space-between;
 
+              align-items: center;
 
+            "
 
+          >
 
+            <div>
 
+              <div>
 
+                <span class="success">提交成功</span>
 
+                <span style="margin-left: 10px" class="date">{{
 
+                  item.created_at
 
+                }}</span>
 
+              </div>
 
+              <div style="margin-top: 21px" class="topbto">
 
+                恭喜！你已成功的提交了租赁申请
 
+              </div>
 
+            </div>
 
+            <div class="add" style="cursor: pointer" @click="getConfiguser">
 
+              添加客服
 
+            </div>
 
+          </div>
 
         </div>
 
-
 
-        <div class="pm-side">
 
-          <ExperienceCard />
 
-          <div class="gap"></div>
 
-          <Routers />
 
+        <div v-if="type == 0"></div>
 
+      </div>
 
+      <div
 
+        v-if="type == 0"
 
+        style="
 
+          border-top: 1px solid #f7f7f7;
 
+          height: 579px;
 
+          background-color: #fff;
 
+          padding: 40px;
 
+          box-sizing: border-box;
 
+        "
 
+      >
 
+        <el-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="bang" placeholder="">
 
+              <el-option label="+86" value="1"></el-option>
 
+            </el-select>
 
+            <el-input
 
+              style="width: 457px; height: 44px; margin-left: 8px"
 
+              v-model="form.mobile"
 
+            ></el-input>
 
+          </el-form-item>
 
+          <el-form-item label="租赁时间">
 
+            <el-date-picker
 
+              style="width: 562px"
 
+              v-model="form.date"
 
+              type="date"
 
+              placeholder="选择日期"
 
+              value-format="YYYY-MM-DD"
 
+            >
 
+            </el-date-picker>
 
+          </el-form-item>
 
+          <el-form-item label="收货地址">
 
+            <el-input
 
+              style="width: 562px; height: 44px"
 
+              v-model="form.address"
 
+            ></el-input>
 
+          </el-form-item>
 
+          <!-- <el-form-item label="收货地址">
 
+            <el-select
 
+              style="width: 562px; height: 44px"
 
+              v-model="form.coupon_id"
 
+              placeholder="请选择收货地址"
 
+              @change="change"
 
+            >
 
+              <el-option
 
+                v-for="(item, idx) in couponList"
 
+                :key="idx"
 
+                :label="item.coupon.name"
 
+                :value="item.coupon.id"
 
+              ></el-option>
 
+            </el-select>
 
+          </el-form-item> -->
 
+          <el-form-item label="优惠券">
 
+            <el-select
 
+              style="width: 562px; height: 44px"
 
+              v-model="form.coupon_id"
 
+              placeholder="请选择优惠券"
 
+              @change="change"
 
+            >
 
+              <el-option
 
+                v-for="(item, idx) in couponList"
 
+                :key="idx"
 
+                :label="item.coupon.name"
 
+                :value="item.coupon.id"
 
+              ></el-option>
 
+            </el-select>
 
+          </el-form-item>
 
+        </el-form>
 
+        <div
 
+          style="display: flex; align-items: center; justify-content: center"
 
+        >
 
+          <div class="btna" @click="visibilityDialog = true">提交表单</div>
 
         </div>
 
       </div>
 
     </div>
 
+    <div style="margin-left: 16px" class="personal-main flex-row flex-jc-sb">
 
+      <!-- <div class="pm-content"></div> -->
 
+      <div class="pm-side">
 
+        <ExperienceCard />
 
+        <div class="gap"></div>
 
+        <Routers />
 
+      </div>
 
+    </div>
 
   </div>
 
+  <el-dialog v-model="visibilityDialog" align="center" width="400">
 
+    <el-icon :size="60" color="rgba(255, 144, 0, 1)">
 
+      <WarningFilled />
 
+    </el-icon>
 
+    <p class="dialog-desc">是否提交预约表单</p>
 
+    <template #footer>
 
+      <div class="dialog-footer">
 
+        <el-button size="large" @click="visibilityDialog = false"
 
+          >&nbsp;取消&nbsp;</el-button
 
+        >
 
+        <el-button size="large" type="primary" @click="submit"
 
+          >&nbsp;确定&nbsp;</el-button
 
+        >
 
+      </div>
 
+    </template>
 
+  </el-dialog>
 
+  <el-dialog v-model="visibilityDialog2" align="center" width="400">
 
+    <el-icon :size="60" color="rgba(0, 155, 115, 1)">
 
+      <SuccessFilled />
 
+    </el-icon>
 
+    <h4>提交成功</h4>
 
+    <p class="dialog-desc">请前往添加客服微信</p>
 
+    <template #footer>
 
+      <div class="dialog-footer">
 
+        <el-button size="large" @click="visibilityDialog2 = false"
 
+          >&nbsp;稍后添加&nbsp;</el-button
 
+        >
 
+        <el-button
 
+          @click="getConfiguser"
 
+          size="large"
 
+          type="primary"
 
+          style="cursor: pointer"
 
+          >&nbsp;添加客服&nbsp;</el-button
 
+        >
 
+      </div>
 
+    </template>
 
+  </el-dialog>
 
+  <!-- 二维码展示 -->
 
+  <el-dialog title="添加客服" v-model="imageshow" align="center" width="400">
 
+    <img
 
+      :src="customer_service_qrcode"
 
+      style="width: 350px; height: 350px"
 
+      alt=""
 
+    />
 
+  </el-dialog>
 
 </template>
 
+      
+  <script setup>
 
+// import { useRouter, useRoute } from "vue-router";
 
+import { onMounted, ref, reactive } from "vue";
 
+import ExperienceCard from "./components/ExperienceCard.vue";
 
+import Routers from "./components/Routers.vue";
 
+import * as shootApi from "~/api/shoot";
 
+import * as userApi from "~/api/user";
 
+import { useRoute } from "vue-router";
 
+import * as commonApi from "~/api/common";
 
+import {
 
+  ArrowLeft,
 
+  LocationFilled,
 
+  WarningFilled,
 
+  SuccessFilled,
 
+} from "@element-plus/icons-vue";
 
+//tabs切换
 
+const type = ref("");
 
+const route = useRoute();
 
+const taps = ref(0);
 
+const activeName = ref("first");
 
+if (route.query.type) {
 
+  activeName.value = "second";
 
+  type.value = 1;
 
+}
 
+const imageshow = ref(false);
 
 
-<script setup>
 
-import { useRouter } from "vue-router";
 
-import { onMounted, ref } from "vue";
 
-import ExperienceCard from "../personal/components/ExperienceCard.vue";
 
-import Routers from "../personal/components/Routers.vue";
 
+//添加客服接口
 
+const customer_service_qrcode = ref();
 
+const getConfiguser = async () => {
 
+  try {
 
+    const { data } = await commonApi.getConfiguser({
 
+      module: "basic",
 
+    });
 
+    visibilityDialog2.value = false;
 
+    customer_service_qrcode.value = data.customer_service_qrcode;
 
+    imageshow.value = true;
 
+  } catch (error) {}
 
+};
 
+//预约切换
 
+const make = (idx) => {
 
+  taps.value = idx;
 
+};
 
+const visibilityDialog = ref(false);
 
+const bang = ref("+86");
 
 
-</script>
 
+const handleClick = (tab) => {
 
+  if (tab.index == 0) {
 
+    type.value = 0;
 
+  } else if (tab.index == 1) {
 
+    type.value = 1;
 
+  }
 
+};
 
+//预约记录
 
+const shootli = ref([]);
 
+const shootlist = async () => {
 
+  try {
 
+    const { data } = await shootApi.list({
 
+      is_page: 0,
 
+    });
 
+    shootli.value = data;
 
+  } catch (error) {}
 
+};
 
+onMounted(shootlist);
 
+
 
+const form = reactive({
 
+  name: "",
 
+  mobile: "",
 
+  date: "",
 
+  address: "",
 
+  coupon_id: "",
 
+});
 
+const change = (val) => {
 
+  form.coupon_id = val;
 
+};
 
+const visibilityDialog2 = ref(false);
 
+//预约拍摄
 
+const submit = async () => {
 
+  try {
 
+    const { data } = await shootApi.shoot({
 
+      ...form,
 
+    });
 
+    visibilityDialog2.value = true;
 
+    shootlist();
 
+  } catch (error) {}
 
+};
 
+userApi;
 
+//优惠券列表
 
+const couponList = ref([]);
 
+const list = async () => {
 
+  try {
 
+    const { data } = await userApi.coupon({
 
+      is_page: 0,
 
+      is_expire: 0,
 
+      is_use: 0,
 
+      type: "lease",
 
+    });
 
+    couponList.value = data.list;
 
+  } catch (error) {}
 
+};
 
+onMounted(list);
 
 
-<style lang="scss" scoped>
 
+onMounted(() => {});
 
+</script>
 
+       
+  <style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
+.succsee {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 500;
 
+  font-size: 18px;
 
+  color: #333333;
 
+  line-height: 25px;
 
+  text-align: left;
 
+  font-style: normal;
 
+}
 
+.date {
 
+  font-family: SFPro, SFPro;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: #666666;
 
+  line-height: 16px;
 
+  text-align: left;
 
+  font-style: normal;
 
+}
 
+.topbto {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: #444444;
 
+  line-height: 20px;
 
+  text-align: left;
 
+  font-style: normal;
 
+}
 
+.add {
 
+  width: 112px;
 
+  height: 44px;
 
+  background: #00b0b0;
 
+  border-radius: 4px;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 16px;
 
+  color: #ffffff;
 
+  line-height: 44px;
 
+  text-align: center;
 
+  font-style: normal;
 
+}
 
+.box {
 
+  // width: 714px;
 
+  height: 108px;
 
+  background: #f5f5f5;
 
+  border-radius: 4px;
 
+  padding: 24px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.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;
 
+  background: #00b0b0;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 500;
 
+  font-size: 18px;
 
+  color: #ffffff;
 
+  line-height: 52px;
 
+  text-align: center;
 
+  font-style: normal;
 
+}
 
+.content {
 
+  width: 842px;
 
+  height: 432px;
 
+  background: #ffffff;
 
+  padding: 32px 34px;
 
+  margin-top: 16px;
 
+  box-sizing: border-box;
 
+  .tl {
 
+    font-family: PingFangSC, PingFang SC;
 
+    font-weight: 500;
 
+    font-size: 20px;
 
+    color: #333333;
 
+    line-height: 28px;
 
+    text-align: left;
 
+    font-style: normal;
 
+  }
 
+  .tl2 {
 
+    font-family: PingFangSC, PingFang SC;
 
+    font-weight: 400;
 
+    font-size: 16px;
 
+    color: #333333;
 
+    line-height: 22px;
 
+    text-align: left;
 
+    font-style: normal;
 
+    margin-top: 16px;
 
+  }
 
+}
 
+.btn1 {
 
+  width: 124px;
 
+  height: 44px;
 
+  background: #00b0b0;
 
+  border-radius: 4px;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 18px;
 
+  color: #ffffff;
 
+  line-height: 44px;
 
+  text-align: center;
 
+  font-style: normal;
 
+  cursor: pointer;
 
+}
 
+.btn2 {
 
+  width: 124px;
 
+  height: 44px;
 
+  border-radius: 4px;
 
+  border: 1px solid #979797;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 18px;
 
+  color: #444444;
 
+  line-height: 44px;
 
+  text-align: center;
 
+  font-style: normal;
 
+  cursor: pointer;
 
+}
 
+.top {
 
+  width: 842px;
 
+  height: 194px;
 
+  background: #ffffff;
 
+  padding: 26px 24px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+ul {
 
+  list-style: none;
 
+  padding: 0;
 
+  margin: 0;
 
+}
 
+
 
 .personal {
 
   // &-container {}
 
-
 
   &-header {
 
     background-color: #fff;
 
     margin-bottom: 16px;
 
-
 
     .change-bgc {
 
       width: 74px;
 
       height: 26px;
 
@@ -91,7 +487,7 @@ import Routers from "../personal/components/Routers.vue";
 
 
     .sub-nav {
 
       &__main {
 
-        padding: 12px 24px;
 
+        // padding: 12px 24px;
 
 
         .snm-left {
 
           ul {
 
@@ -147,14 +543,14 @@ import Routers from "../personal/components/Routers.vue";
 
       }
 
     }
 
   }
 
-
 
   &-main {
 
     column-gap: 16px;
 
 
     .pm-content {
 
       width: 0;
 
       flex: 1;
 
-      // background-color: rgba(255, 255, 255, 0.46);
 
+      background-color: rgba(255, 255, 255);
 
+      padding: 12px 24px;
 
 
       .moment-layout-container {
 
         border-radius: 8px;
 
@@ -175,4 +571,15 @@ import Routers from "../personal/components/Routers.vue";
 
     }
 
   }
 
 }
 
+::v-deep .el-tabs__nav-wrap::after {
 
+  background-color: rgba(0, 0, 0, 0) !important;
 
+}
 
+::v-deep .el-tabs__item.is-active {
 
+  color: #333333 !important;
 
+  font-weight: 600 !important;
 
+}
 
+::v-deep .el-input__wrapper {
 
+  height: 44px !important;
 
+}
 
 </style>
 
+

Някои файлове не бяха показани, защото твърде много файлове са промени