Merge pull request '0.0.0' (#89) from zj into master

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

src/api/index.ts

@@ -743,7 +743,7 @@ export async function putmember(data: any): Promise<any>{
         willsay: JSON.stringify(data.willsayValue),
         birthday: data.birthday,
         zoneid: data.zoneid,
-        currency: data.currency,
+        currency: data.currencyValue,
         language: data.languageValue,
         tlanguage: data.tlanguageValue,
         video: data.video,

src/components/Menu.vue

@@ -173,6 +173,7 @@ export default defineComponent({
         const userinfo = computed(() => store.state.userinfo)
         // 设置当前路由
         for(const i in list){
+            console.log(list[i].route==useRoute().path)
             if(list[i].route == useRoute().path){
                 selnum.value = parseInt(i);
             }

src/components/NavTop.vue

@@ -43,7 +43,7 @@
             <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
                 <div class="item" @click="e => e.preventDefault()">
                     <img src="@/static/images/qianbi.png" alt="" class="icon">
-                    <div class="name">{{userinfo.currencyValue}}</div>
+                    <div class="name">{{userinfo.currency}}</div>
                     <img src="@/static/images/jiantou2.png" alt="" class="down">
                 </div>
                 <template v-slot:overlay>
@@ -200,10 +200,6 @@ export default defineComponent({
         }
     },
     setup(props){
-        // console.log(useRoute().currentRoute.value.name)
-        axios.get("//api.map.baidu.com/location/ip?ak=YoG7yXzGNdKSDpAjvl7DpBaESaqzUKhT").then((res)=>{
-            console.log(res,"llllkljsdkoj")
-        })
         const routes = useRoute();
         console.log(routes.path);
         const types = ref(props.type)

src/components/ReviewItemtwo.vue

@@ -11,9 +11,9 @@
         <div class="bottom">
             <div class="date">{{date}}</div>
             <div class="operate">
-                <div class="reply" @click="reply(username)">
+                <!-- <div class="reply" @click="reply(username)">
                     回复
-                </div>
+                </div> -->
                 <div class="del" @click="del(replyid)" v-if="parseInt(memberid)==myid">
                     删除
                 </div>

src/components/VideoReview.vue

@@ -93,6 +93,7 @@
 <script lang="ts">
 import { addcomment, getcommentlist, videodetail } from '@/api';
 import store from '@/store';
+import { message } from 'ant-design-vue';
 import { defineComponent, onMounted, ref, toRaw } from 'vue';
 import { useRoute } from 'vue-router';
 import ReviewItem from "./ReviewItem.vue"
@@ -133,7 +134,12 @@ export default defineComponent({
             // data.value.score=uinfo.value.score
             data.value.content=commentval.value
             console.log(data.value,2221)
-            addcomment(toRaw(data.value))
+            if(uinfo.value.name){
+                addcomment(toRaw(data.value))
+            }else{
+                message.error("请先选择回复的学生")
+            }
+            // addcomment(toRaw(data.value))
 
         }
         async function refresh(e?: any){

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"  @click="todetail(i.videoid)">
             <img :src="i.img" alt="" class="pic"/>
             <div class="lessonname">
               <div>{{i.title}}</div>
@@ -249,6 +249,9 @@ export default defineComponent({
     function navto(){
       router.push("/about")
     }
+    function todetail(e?: number){
+      router.push("/regime/videoinfo?id="+e)
+    }
     return {
       formLayout,
       tabselected,
@@ -265,7 +268,8 @@ export default defineComponent({
       sublogin,
       videolist,
       tovideoxq,
-      navto
+      navto,
+      todetail
     };
   },
 });

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) {