Merge branch 'master' of http://git.douniu8.com/mengqr/newlive

src/views/live.vue

@@ -164,7 +164,7 @@
                 <span class="buy">购买者</span><span class="name">{{udRealname}}</span>
               </div>
               <div class="Usret_p">
-                <span class="buy">购买项目</span><span class="name">xxxx谁的直播间</span>
+                <span class="buy">购买项目</span><span class="name">{{udNickname}}</span>
               </div>
               <div class="Lpin">支付方式 <span>{{text}}</span></div>
                   <!--牛币-->

src/views/mine/browse.vue

@@ -2,8 +2,9 @@
     <div class="biggestBox">
          <img src="../../assets/left.png" alt="" class="Lent_p" @click="go">
            <div class="brow">我的浏览</div>
-           <div class="time">一天之内</div>
-      <ul>
+           
+      <ul v-if="this.flag == 1">
+        <div class="time">一天之内</div>
         <!-- data-type=0 隐藏删除按钮 data-type=1 显示删除按钮 -->
         <li class="li_vessel" v-for="(item,index) in lists " data-type="0" :key="index">
           <!-- "touchstart" 当手指触摸屏幕时候触发  "touchend"  当手指从屏幕上离开的时候触发  "capture" 用于事件捕获-->
@@ -23,7 +24,7 @@
       </ul>
        <!-- 更早 -->
       
-       <ul v-if="updateTime"> 
+       <ul v-if="this.flag == 0"> 
         <div class="timetwo">更早</div>  
         <li class="li_vessel" v-for="(item,index) in lists " data-type="0" :key="index">
           <!-- "touchstart" 当手指触摸屏幕时候触发  "touchend"  当手指从屏幕上离开的时候触发  "capture" 用于事件捕获-->
@@ -33,7 +34,6 @@
               <div class="rightBox">
                 <div class="titl">{{item.lvrUbName}}</div>
                 <div class="name">{{item.lvrName}}</div>
-                <div> </div>
                 <div class="Time">{{item.updateTime}}</div>
               </div>
             </div>
@@ -51,6 +51,7 @@
 export default {
    data() {
       return {
+        flag:'',
         lists: [
         ],
         startX: 0, //滑动开始
@@ -86,7 +87,8 @@ export default {
                 this.lists =res.data.data.list
                 this.listtwo=res.data.data.list
                 this.updateTime=res.data.data.list.updateTime
-                console.log(this.lvrUbId,'-=----------------')
+                this.flag=res.data.data.list[0].flag
+                console.log(this.flag,'-=----------------')
               
             })
         },
@@ -208,6 +210,7 @@ export default {
   font-weight: 400;
   color: #666666;
   margin-bottom: 6px;
+  width: 47.33333vw;
 }
 .Time{
   font-size: 12px;

src/views/mine/index.vue

@@ -3,10 +3,10 @@
         <div>
             <div class="Plog">
             <div>
-                    <img class="portait-not" :src="avatar" alt="">
+                    <img class="portait-not" src="../../assets/title_logo.png" alt="">
             </div>
             <div class="Login">
-                <span>登录</span><span>/注册</span>
+                <span @click="login_a">登录</span><span>/注册</span>
                 <div>我们在等您登录注册哦</div>
             </div>
             
@@ -104,6 +104,9 @@ export default {
         this.userCenter()
     },
     methods: {
+         login_a:function(){
+            this.$router.push({name:'password'})
+         },
           openapp() {
                 var u = navigator.userAgent,
                 app = navigator.appVersion;

src/views/mine/proposal.vue

@@ -32,7 +32,7 @@
                 </div>
                 <div class="line">联系方式</div>
                 <div class="ba_c">
-                     <input type="number" @input='limitPhone'  maxlength="11" v-model="phone" placeholder="留下联系方式，更方便解决问题 ">
+                     <input type="number" @input='limitPhone'  maxlength="11" v-model="phonetwo" placeholder="留下联系方式，更方便解决问题 ">
                 </div>
                 <div class="log_t">
 
@@ -73,6 +73,7 @@ export default {
           percentage: 0,
           url:'',
           urls:[],
+          phonetwo:'',
           getToken:{
             sign:'',
           },
@@ -183,15 +184,18 @@ export default {
    },
  
       login_in:function(){
+      console.log(this.test,'ppppppptest')
+        console.log(this.imgObj,'pppppppimgobj')
+          console.log(this.phonetwo,'pppppppimgphoe')
         if(this.test == ''){
            alert('请填写内容')
            console.log(this.test,111)
            return
-        }if(this.phone == ''){
+        }if(this.phonetwo == ''){
            alert('请填写手机号')
-            console.log(this.phone,222)
+            console.log(this.phonetwo,222)
             return
-        }if(this.imgObj == ''){
+        }if(this.imgObj == '' || this.imgObj ==undefined){
            alert('请上传图片')
             return
         }
@@ -235,6 +239,7 @@ export default {
                 
                 if(res.code=200){
                     this.phone= res.data.data.phone
+                   
                     this.phoneText= res.data.data.phoneText
                 }
                 })