Merge pull request 'xbx' (#282) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/282

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><link href="/css/chunk-02de301d.0e433876.css" rel="prefetch"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-0595a866.d9a1cd88.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-1ac4f1f4.7a9cfd91.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-3326ceee.61cdda7f.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-5299baae.0e433876.css" rel="prefetch"><link href="/css/chunk-52aea4a8.16692c13.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-686b9ef0.c6bfcda2.css" rel="prefetch"><link href="/css/chunk-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-77e7ddf0.4c3c344c.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/css/chunk-fe0963e2.87f3e66d.css" rel="prefetch"><link href="/js/chunk-02de301d.89e9c410.js" rel="prefetch"><link href="/js/chunk-04e3a2fa.8f93da5c.js" rel="prefetch"><link href="/js/chunk-0595a866.fae80a0c.js" rel="prefetch"><link href="/js/chunk-06828374.6edfa940.js" rel="prefetch"><link href="/js/chunk-1ac4f1f4.d8f4e8da.js" rel="prefetch"><link href="/js/chunk-1f21263e.2f3dfdf3.js" rel="prefetch"><link href="/js/chunk-21b42480.34ae0e36.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.583c97ef.js" rel="prefetch"><link href="/js/chunk-3326ceee.bb6377f9.js" rel="prefetch"><link href="/js/chunk-39b973ba.334f229f.js" rel="prefetch"><link href="/js/chunk-3c7641ed.3b9d36e0.js" rel="prefetch"><link href="/js/chunk-4663db36.dfc5ef3c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.js" rel="prefetch"><link href="/js/chunk-5299baae.c58b30b8.js" rel="prefetch"><link href="/js/chunk-52aea4a8.de5c0bb7.js" rel="prefetch"><link href="/js/chunk-650d0cb1.9ee9866a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-686b9ef0.fb66f2b6.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.4b143e99.js" rel="prefetch"><link href="/js/chunk-74d6e86d.65740bb4.js" rel="prefetch"><link href="/js/chunk-7582a703.b57d58c8.js" rel="prefetch"><link href="/js/chunk-77e7ddf0.03393538.js" rel="prefetch"><link href="/js/chunk-7da0eb18.b6282824.js" rel="prefetch"><link href="/js/chunk-922d780a.7aff86dc.js" rel="prefetch"><link href="/js/chunk-977f0f52.b19a2b8d.js" rel="prefetch"><link href="/js/chunk-a4a29886.a960f3b2.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.e4632726.js" rel="prefetch"><link href="/js/chunk-fe0963e2.c59d4951.js" rel="prefetch"><link href="/css/app.88800de3.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.4eca0f1d.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.88800de3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
+        }</style><meta property="og:type" content="website"><meta property="og:title" content="分享测试测试"><meta property="og:description" content="分享描述"><meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png"><meta property="og:url" content="https://beelink.theluyuan.com/"><link href="/css/chunk-02de301d.0e433876.css" rel="prefetch"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-0595a866.d9a1cd88.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-1ac4f1f4.7a9cfd91.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-3326ceee.61cdda7f.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-5299baae.0e433876.css" rel="prefetch"><link href="/css/chunk-52aea4a8.16692c13.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-686b9ef0.c6bfcda2.css" rel="prefetch"><link href="/css/chunk-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-77e7ddf0.4c3c344c.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/css/chunk-fe0963e2.87f3e66d.css" rel="prefetch"><link href="/js/chunk-02de301d.89e9c410.js" rel="prefetch"><link href="/js/chunk-04e3a2fa.8f93da5c.js" rel="prefetch"><link href="/js/chunk-0595a866.fae80a0c.js" rel="prefetch"><link href="/js/chunk-06828374.6edfa940.js" rel="prefetch"><link href="/js/chunk-1ac4f1f4.d8f4e8da.js" rel="prefetch"><link href="/js/chunk-1f21263e.2f3dfdf3.js" rel="prefetch"><link href="/js/chunk-21b42480.34ae0e36.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.583c97ef.js" rel="prefetch"><link href="/js/chunk-3326ceee.bb6377f9.js" rel="prefetch"><link href="/js/chunk-39b973ba.334f229f.js" rel="prefetch"><link href="/js/chunk-3c7641ed.3b9d36e0.js" rel="prefetch"><link href="/js/chunk-4663db36.dfc5ef3c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.js" rel="prefetch"><link href="/js/chunk-5299baae.c58b30b8.js" rel="prefetch"><link href="/js/chunk-52aea4a8.de5c0bb7.js" rel="prefetch"><link href="/js/chunk-650d0cb1.9ee9866a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-686b9ef0.fb66f2b6.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.4b143e99.js" rel="prefetch"><link href="/js/chunk-74d6e86d.65740bb4.js" rel="prefetch"><link href="/js/chunk-7582a703.b57d58c8.js" rel="prefetch"><link href="/js/chunk-77e7ddf0.03393538.js" rel="prefetch"><link href="/js/chunk-7da0eb18.b6282824.js" rel="prefetch"><link href="/js/chunk-922d780a.7aff86dc.js" rel="prefetch"><link href="/js/chunk-977f0f52.b19a2b8d.js" rel="prefetch"><link href="/js/chunk-a4a29886.a960f3b2.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.e4632726.js" rel="prefetch"><link href="/js/chunk-fe0963e2.c59d4951.js" rel="prefetch"><link href="/css/app.88800de3.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.e6bf35ab.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.88800de3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
             FB.init({
                 appId: '277826133389999',
                 autoLogAppEvents: true,
                 xfbml: true,
                 version: 'v8.0'
             });
-        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.4eca0f1d.js"></script></body></html>
+        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.e6bf35ab.js"></script></body></html>

src/api/base.ts

@@ -6,6 +6,7 @@ import { message } from 'ant-design-vue';
 import router from '@/router';
 import { MessageType } from 'ant-design-vue/types/message';
 import store from '@/store';
+import { geti18n } from '@/utils/i18n';
 
 // 泛型接口 
 export interface Get {
@@ -16,7 +17,7 @@ let count = 0;
 const div: any = document.getElementById("make");
 export function countadd(){
     if(count == 0){
-        login = message.loading('加载中..', 0)
+        login = message.loading(geti18n().$t('jiazaizhong'), 0)
         div.style.display = "block"
     }
     count++;
@@ -35,7 +36,7 @@ export function countdel(){
 }
 axios.interceptors.request.use((config)=>{
     if(count == 0){
-        login = message.loading('加载中..', 0)
+        login = message.loading(geti18n().$t('jiazaizhong'), 0)
         div.style.display = "block"
     }
     count++;

src/api/index.ts

@@ -2,6 +2,7 @@ import router from '@/router';
 import store from '@/store';
 import { LiveList, LivelistInfo, LoginData, UserInfo } from '@/types';
 import { getValue, saveValue, toindex } from '@/utils/common';
+import { geti18n } from '@/utils/i18n';
 import { message } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import { del, get, post, put, setToken } from './base'
@@ -185,7 +186,7 @@ export async function liveadd(data: any) {
 export async function videoadd( form: any,data: any) {
     const res=await post<Liveaddrule>('video',data)
     if(res.code==0){
-        message.success("发布成功")
+        message.success(geti18n().$t('shipinshangchuanchenggong'))
         form.value = {
             title: "",
             img: "",
@@ -283,7 +284,7 @@ export async function videodetail(data?: any,ifupdate?: number) {
 export async function videodel(data: any) {
     const res = await del<Liveaddrule>('video/'+data);
     if(res.code==0){
-        message.success("删除成功")
+        message.success(res.msg)
     }
    
     console.log(res)
@@ -295,7 +296,7 @@ export async function videodel(data: any) {
 export async function accountadd(data?: any) {
     const res = await post<Liveaddrule>('wallect',data);
     if(res.code==0){
-        message.success("新增成功")
+        message.success(res.msg)
         router.push("/mine/wallet")
     }
    
@@ -396,7 +397,7 @@ export async function getaccountinfo(data?: any){
 export async function editaccount( id: any,data?: any){
     const res=await put<Liveaddrule>('wallect/' +id ,data);
     if(res.code==0){
-        message.success("修改成功")
+        message.success(res.msg)
         router.push("/mine/wallet")
     }else{
         message.error(res.msg)
@@ -410,7 +411,7 @@ export async function deleteaccount(data: any) {
     
     const res = await del<Liveaddrule>('wallect/' + data);
     if(res.code==0){
-        message.success("删除成功")
+        message.success(res.msg)
         router.push("/mine/wallet")
     }
    
@@ -572,7 +573,7 @@ interface SendData{
 export async function addcomment(data?: any): Promise<void> {
     const res=await post<SendData>('comments',data)
     if(res.code==0){
-        message.success("发布成功")
+        message.success(res.msg)
     }
 }
 
@@ -583,7 +584,7 @@ export async function addcomment(data?: any): Promise<void> {
  export async function delreply(data?: any) {
     const res = await del<Liveaddrule>('comments/'+data);
     if(res.code==0){
-        message.success("删除成功")
+        message.success(res.msg)
     }
     return res
  }
@@ -675,7 +676,7 @@ export async function editsystemsetting(e?: any): Promise<boolean> {
     const res = await put(`member/${store.state.userinfo.memberid}`,newdata);
     console.log(res)
     if(res.code == 0){
-        message.success("修改成功")
+        message.success(res.msg)
         store.dispatch("setUserInfo");
         location.reload();
         return true;
@@ -922,7 +923,7 @@ export async function changetel(code: string,e: string) {
     const res = await put(`member/${store.state.userinfo.memberid}`,{code: code, mobile:e});
     console.log(res)
     if(res.code == 0){
-        message.success("修改成功")
+        message.success(res.msg)
         return true;
     }else{
         message.error(res.msg);

src/i18n/en.ts

@@ -353,6 +353,8 @@ export default {
     youxiangb:"Beelink email",
     chuanzhen:"Fax",
     appxiazai:"Download Beelink app",
+    shipinshangchuanchenggong:"Save correctly，waiting for review",
+    jiazaizhong:"Loding.",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",

src/i18n/zh.ts

@@ -353,6 +353,8 @@ export default {
     youxiangb:"Beelink邮箱",
     chuanzhen:"传真",
     appxiazai:"Beelink App下载",
+    shipinshangchuanchenggong:"上传成功，等待审核",
+    jiazaizhong:"加载中",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",