Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

src/api/index.ts

@@ -7,10 +7,14 @@ import { AxiosPromise } from 'axios'
  * @param type 类型 0国内 1国外
  */
 
-export function sendsms(phone: string, type?: number):  Promise<AxiosPromise>{
+export function sendsms(phone: string, type?: number): Promise<AxiosPromise>{
     return post('SendSms',{phone, type})
 }
 
+export function loginpass(phone: string, password: string): Promise<AxiosPromise>{
+    return post("login",{type: 2,username: phone, password: password})
+}
+
 
 // 下面是示例接口 可以删除
 

src/components/VideoReview.vue

@@ -60,7 +60,7 @@
     .reply{
         padding-top: 28px;
         border-top: 1px solid #ededed;
-        ::v-deep() .ant-input{
+        ::v-deep(.ant-input){
             font-size: 11px;
         }
         .send{

src/config/axiosConfig.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-axios.defaults.baseURL = 'http://beelink.com/home/';
+axios.defaults.baseURL = '/beelink/public/home/';
 axios.defaults.headers.common['Authorization'] = 'token';
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 

src/import-png.d.ts

@@ -0,0 +1,4 @@
+declare module "*.png" {
+    const value: any;
+    export default value;
+}

src/types/index.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 只添加了一些必要的参数，并没有写完整，因为剩下的大部分用不到
+ */
+
+
+// 图片选择
+export interface ImgInfo {
+    file: string;
+}
+
+// 表单提交的验证
+export interface FromSend {
+    preventDefault: Function;
+}
+
+// 视频文件
+export interface VideoInfo {
+    type: string;
+    name: string;
+    uid: string;
+}

src/views/login/About.vue

@@ -89,10 +89,10 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.about ::v-deep()  .nav-bottom  ::v-deep() .nav-container{
+.about ::v-deep(.nav-bottom) ::v-deep(.nav-container){
   color:white!important
 }
-.about ::v-deep() .nav-bottom ::v-deep() .copyright{
+.about ::v-deep(.nav-bottom) ::v-deep(.copyright){
   color:white!important
 }
 .about {

src/views/login/Login.vue

@@ -48,6 +48,7 @@
                 <a-input
                   style="width: 80%"
                   placeholder="请输入您的邮箱或者手机号"
+                  v-model:value="userinfo.phone"
                 />
               </a-input-group>
             </a-form-item>
@@ -58,11 +59,12 @@
                   placeholder="请输入您的密码"
                   type="password"
                   class="shuru"
+                  v-model:value="userinfo.password"
                 />
                 <div class="forget">忘记密码?</div>
               </a-input-group>
             </a-form-item>
-            <div class="submit">立即登录</div>
+            <div class="submit" @click="login">立即登录</div>
           </a-form>
         </div>
       </div>
@@ -144,10 +146,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from "vue";
+import { defineComponent, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
-import { sendsms } from '@/api';
+import { loginpass, sendsms } from '@/api';
 
 export default defineComponent({
   name: "Login",
@@ -163,6 +165,10 @@ export default defineComponent({
     const tabselected = ref(1);  //tab切换的标志
     const time = ref(60);//倒计时
     const phone = ref(""); // 手机号
+    const userinfo = reactive({
+      phone: '',
+      password: ''
+    })
     /**
      * @param val  子组件传过来的值
      */
@@ -192,22 +198,31 @@ export default defineComponent({
         }
       }, 1000);
     };
+
+    function login(): void {
+        console.log(userinfo.phone,userinfo.password)
+        loginpass(userinfo.phone,userinfo.password).then((res)=>{
+          console.log(res)
+        })
+    }
     return {
       formLayout,
       tabselected,
       Selectnum,
       getcode,
       time,
-      phone
+      phone,
+      login,
+      userinfo
     };
   },
 });
 </script>
 <style lang="scss" scoped>
-.login ::v-deep() .ant-select-selection {
+.login ::v-deep(.ant-select-selection) {
   border: none;
 }
-.login ::v-deep() .ant-input {
+.login ::v-deep(.ant-input) {
   border: none;
 }
 .ant-input:focus {
@@ -215,10 +230,10 @@ export default defineComponent({
   border-bottom: 1px solid white !important;
   box-shadow: none;
 }
-.login ::v-deep() .ant-form-item-label {
+.login ::v-deep(.ant-form-item-label) {
   line-height: 14px;
 }
-.login ::v-deep() .ant-form-item ::v-deep() label {
+.login ::v-deep(.ant-form-item) ::v-deep(label) {
   color: #0dbba4;
   font-size: 11px;
   left: 1px;

src/views/login/Reset.vue

@@ -165,10 +165,10 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.login ::v-deep() .ant-select-selection {
+.login ::v-deep(.ant-select-selection) {
   border: none;
 }
-.login ::v-deep() .ant-input {
+.login ::v-deep(.ant-input) {
   border: none;
 }
 .ant-input:focus {
@@ -176,10 +176,10 @@ export default defineComponent({
   border-bottom: 1px solid white !important;
   box-shadow: none;
 }
-.login ::v-deep() .ant-form-item-label {
+.login ::v-deep(.ant-form-item-label) {
   line-height: 14px;
 }
-.login ::v-deep() .ant-form-item ::v-deep() label {
+.login ::v-deep(.ant-form-item) ::v-deep(label) {
   color: #0dbba4;
   font-size: 11px;
   left: 1px;

src/views/login/Sign.vue

@@ -191,10 +191,10 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.login ::v-deep() .ant-select-selection {
+.login ::v-deep(.ant-select-selection) {
   border: none;
 }
-.login ::v-deep() .ant-input {
+.login ::v-deep(.ant-input) {
   border: none;
 }
 .ant-input:focus {
@@ -202,10 +202,10 @@ export default defineComponent({
   border-bottom: 1px solid white !important;
   box-shadow: none;
 }
-.login ::v-deep() .ant-form-item-label {
+.login ::v-deep(.ant-form-item-label) {
   line-height: 14px;
 }
-.login ::v-deep() .ant-form-item ::v-deep() label {
+.login ::v-deep(.ant-form-item) ::v-deep(label) {
   color: #0dbba4;
   font-size: 11px;
   left: 1px;

src/views/mine/Addaccount.vue

@@ -189,21 +189,21 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.cashout ::v-deep() .ant-breadcrumb > span:last-child {
+.cashout ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
-.cashout ::v-deep() .ant-radio-wrapper {
+.cashout ::v-deep(.ant-radio-wrapper) {
   display: flex;
 }
-.cashout ::v-deep() .ant-radio-checked ::v-deep() .ant-radio-inner {
+.cashout ::v-deep(.ant-radio-checked) ::v-deep(.ant-radio-inner) {
   border-color: #08ae98 !important;
 }
-.cashout ::v-deep() .ant-radio-inner::after {
+.cashout ::v-deep(.ant-radio-inner::after) {
   background: #08ae98 !important;
 }
-.cashout ::v-deep() .ant-radio {
+// .cashout ::v-deep(.ant-radio) {
-  //   top: 43px;
+//   //   top: 43px;
-}
+// }
 .cashout {
   .mingxilist {
     width: 1150px;

src/views/mine/Archives.vue

@@ -496,7 +496,7 @@ export default defineComponent({
             }
             .main-container {
                 margin-left: 17px;
-                ::v-deep() .input-box {
+                ::v-deep(.input-box) {
                     display: flex;
                     align-items: center;
                     margin-bottom: 28px;
@@ -602,7 +602,7 @@ export default defineComponent({
                 }
             }
         }
-        ::v-deep() .modal-dialog {
+        ::v-deep(.modal-dialog) {
             .close {
                 width: 14px;
                 height: 14px;

src/views/mine/Cashout.vue

@@ -100,13 +100,13 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.cashout ::v-deep() .ant-breadcrumb > span:last-child {
+.cashout ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
-.cashout ::v-deep() .ant-radio-wrapper {
+.cashout ::v-deep(.ant-radio-wrapper) {
   display: flex;
 }
-.cashout ::v-deep() .ant-radio {
+.cashout ::v-deep(.ant-radio) {
   top: 43px;
 }
 .cashout {

src/views/mine/Cashoutdetail.vue

@@ -80,7 +80,7 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.transaction ::v-deep() .ant-breadcrumb > span:last-child {
+.transaction ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
 .transaction{

src/views/mine/ReleaseVideo.vue

@@ -53,6 +53,7 @@ import { defineComponent, reactive, Ref, ref } from 'vue';
 import { PlaySquareOutlined, PlusOutlined } from '@ant-design/icons-vue';
 import NavBottom from '@/components/NavBottom.vue';
 import { previewCover } from '@/static/js/common';
+import { FromSend, ImgInfo, VideoInfo } from '@/types';
 
 export default defineComponent({
     name: 'ReleaseWebcast',
@@ -81,7 +82,7 @@ export default defineComponent({
         /**
          * 封面改变触发事件
          */
-        function coverChange(info: any): void {
+        function coverChange(info: ImgInfo): void {
             // console.log(info);
             // 获取预览图片
             previewCover(info.file).then(url => previewImage.value = url);
@@ -108,7 +109,7 @@ export default defineComponent({
         /**
          * 删除封面
          */
-        function cancelCover(file: any): void {
+        function cancelCover(file: number): void {
             console.log(file);
             
         }
@@ -116,8 +117,8 @@ export default defineComponent({
          * 上传文件之前的钩子
          * @param file 上传的文件
          */
-        const beforeVideoUpload = (file: any): boolean => {
+        const beforeVideoUpload = (file: VideoInfo): boolean => {
-            // console.log(file);
+            console.log(file);
             if(file.type != '') {
                 // handleRemove(file);
             }
@@ -127,7 +128,7 @@ export default defineComponent({
         /**
          * 表单提交
          */
-        const onSubmit = (e: any) => {
+        const onSubmit = (e: FromSend) => {
             e.preventDefault();
         };
         
@@ -156,7 +157,7 @@ export default defineComponent({
     padding: 46px;
     border-radius: 17px;
     position: relative;
-    ::v-deep() .ant-form {
+    ::v-deep(.ant-form) {
         .title {
             font-size: 12px;
             font-weight: bold;

src/views/mine/ReleaseWebcast.vue

@@ -87,6 +87,7 @@ import { useForm } from '@ant-design-vue/use';
 import NavBottom from '@/components/NavBottom.vue';
 import RankList from './RankList.vue';
 import { previewCover } from '@/static/js/common';
+import { FromSend, ImgInfo } from "@/types/index"
 
 export default defineComponent({
     name: 'ReleaseWebcast',
@@ -144,13 +145,14 @@ export default defineComponent({
         });
 
         // 是否显示封面预览 封面的路径
-        const viewCover: Ref<boolean> = ref(false),
+        const viewCover: Ref<boolean> = ref(false);
-            previewImage: Ref<string> = ref('');
+        const previewImage: Ref<string> = ref('');
 
         /**
          * 封面改变触发事件
          */
-        function coverChange(info: any): void {
+        
+        function coverChange(info: ImgInfo): void {
             // console.log(info);
             // 获取预览图片
             previewCover(info.file).then(url => previewImage.value = url);
@@ -162,7 +164,8 @@ export default defineComponent({
         /**
          * 表单提交
          */
-        const onSubmit = (e: any) => {
+        
+        const onSubmit = (e: FromSend) => {
             e.preventDefault();
             validate().then(() => {
                 console.log(toRaw(form));
@@ -202,7 +205,7 @@ export default defineComponent({
     padding: 46px;
     border-radius: 17px;
     position: relative;
-    ::v-deep() .ant-form {
+    ::v-deep(.ant-form) {
         .title {
             font-size: 12px;
             font-weight: bold;
@@ -322,7 +325,7 @@ export default defineComponent({
         }
     }
     .modal-container {
-        ::v-deep() .modal-dialog {
+        ::v-deep(.modal-dialog) {
             .close {
                 width: 14px;
                 height: 14px;

src/views/mine/Transaction.vue

@@ -96,7 +96,7 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.transaction ::v-deep() .ant-breadcrumb > span:last-child {
+.transaction ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
 .transaction{

src/views/mine/Transactiondetail.vue

@@ -61,7 +61,7 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.transaction ::v-deep() .ant-breadcrumb > span:last-child {
+.transaction ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
 .transaction{

src/views/mine/Wallet.vue

@@ -231,7 +231,7 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-.wallet ::v-deep() .ant-breadcrumb > span:last-child {
+.wallet ::v-deep(.ant-breadcrumb) > span:last-child {
   color: #08ae98;
 }
 .wallet {

src/views/regime/Video.vue

@@ -111,13 +111,13 @@
         bottom:  114px;
         display: flex;
         justify-content: center;      
-        ::v-deep() .ant-pagination-next > .ant-pagination-item-link, ::v-deep() .ant-pagination-prev > .ant-pagination-item-link, ::v-deep() .ant-pagination-item, ::v-deep() .ant-pagination-jump-next-custom-icon, ::v-deep() .ant-pagination-jump-prev-custom-icon{
+        ::v-deep(.ant-pagination-next) > .ant-pagination-item-link, ::v-deep(.ant-pagination-prev) > .ant-pagination-item-link, ::v-deep(.ant-pagination-item), ::v-deep(.ant-pagination-jump-next-custom-icon), ::v-deep(.ant-pagination-jump-prev-custom-icon) {
             border: 1px solid #08AE98;
         }
-        ::v-deep() .ant-pagination-item-active a{
+        ::v-deep(.ant-pagination-item-active) a{
             color: #fff;
         }
-        ::v-deep() .ant-pagination-item-active{
+        ::v-deep(.ant-pagination-item-active) {
             background-color: #08AE98;
         }
     }

vue.config.js

@@ -17,6 +17,10 @@ module.exports = {
         // 为生产环境修改配置...
       } else {
         // 为开发环境修改配置...
+        
+        config.devServer = {
+          proxy: 'http://case.sy-my.net'
+        }
       }
     }
   }