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

src/views/login/Login.vue

@@ -80,7 +80,7 @@
 
         <div class="lessons">
           <!-- @click="tovideoxq(i.videoid)" -->
-          <div class="lessonitem" v-for="(i,j) in videolist" :key="j" >
+          <div class="lessonitem" v-for="(i,j) in videolist" :key="j">
             <img :src="i.img" alt="" class="pic"/>
             <div class="lessonname">
               <div>{{i.title}}</div>

src/views/login/Sign.vue

@@ -246,6 +246,10 @@ export default defineComponent({
                 message.error("密码不能为空");
                 return false;
             }
+            if(userinfo.value.pass!=userinfo.value.passtow){
+				message.error("两次密码输入不一致")
+				return
+            }
             if (userinfo.value.name == "") {
                 message.error("姓名不能为空");
                 return false;
@@ -270,6 +274,7 @@ export default defineComponent({
         */
 
         async function next(e: number) {
+          
             if(!ifagree.value){
               message.error("请同意用户协议");
               return ;

src/views/mine/Archives.vue

@@ -309,7 +309,7 @@ import { uploadflie } from "@/utils/vod"
 import store from '@/store';
 import smile from "@/static/images/smile.png"
 import smilet from "@/static/images/smilet.png"
-import { changetel, checksmscode, editpassword, getarchives, getcurrencys, getlanguages, getquhaolist, getzonelist, putmember, sendsms } from "@/api/index"
+import { changetel, checksmscode, editpassword, editsystemsetting, getarchives, getcurrencys, getlanguages, getquhaolist, getzonelist, putmember, sendsms } from "@/api/index"
 import { message } from 'ant-design-vue';
 
 export default defineComponent({
@@ -330,12 +330,12 @@ export default defineComponent({
         }];
         const userinfo = computed(() => {return store.state.userinfo})
         // 表单数据
-        const currencyindex=ref<string>(userinfo.value.currencyValue)
+        const currencyindex=ref<string>(userinfo.value.currency)
         const formData = ref(toRaw(userinfo.value));
         watch(userinfo,() => {
             formData.value = toRaw(userinfo.value);
             console.log(userinfo.value.currencyValue,"listsssss")
-            currencyindex.value=userinfo.value.currencyValue
+            currencyindex.value=userinfo.value.currency
           
             console.log(currencyindex.value,"listsssss")
         })
@@ -591,7 +591,15 @@ export default defineComponent({
                     }
                 }
             }
-            putmember(uesrinfo)
+
+            const reg = /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/;
+            console.log(userinfo.value.email)
+            console.log()
+            if(reg.test(userinfo.value.email)){
+                 putmember(uesrinfo)
+            }else{
+                message.error("邮箱格式有误")
+            }
             
         }
        
@@ -638,7 +646,8 @@ export default defineComponent({
 
         function currencychange(e?: any){
             console.log(e)
-            userinfo.value.currency=e
+            userinfo.value.currencyValue=e
+            // editsystemsetting({currency:e})
 
         }
         async function uploadspic(file: AntUpload) {