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

src/views/live.vue

@@ -108,9 +108,32 @@
     <div class="conten">
        <div class="Sue">确认支付</div>
         <div class="odiv">
-               <ul>
+                <!--卡片 -->
+           <ul v-if="this.Listfor.goodsType == 'Periodic'">
+             <li class="live_b"  @click="tab_li(index,item.chargeModeKey)" v-for="(item,index) in Listfor" :key="index"
+              :class="is_xuanzhong == `${is_Month + index}` ? 'Month'+index : item.chargeModeKey"
+             
+              >
+                 <div class="one_day">{{item.leftPromptText}}</div>
+                 <div class="Plef">
+                     <div class="div_p">{{item.chargeModeName}}</div>
+                     <div class="Uimg"> 
+                        <img src="../assets/niu.png" alt="" class="sent_r">
+                        <span>{{item.lvrfFee}} </span>
+                      </div>
+                    
+                     <div class="Mar_p">
+                      <img src="../assets/niu.png" alt="" class="U_both">
+                      <span class="d_num">{{item.promptFee}}/月</span>
+                     </div>
+                   
+                  </div>
+             </li>
+
+         </ul>
+         <ul else>
  
-                 <!--第一个卡片 -->
+                 <!--  -->
              <li class="live_b"  @click="tab_li(index,item.chargeModeKey)" v-for="(item,index) in Listfor" :key="index"
               :class="is_xuanzhong == `${is_Month + index}` ? 'Month'+index : item.chargeModeKey"
              
@@ -484,7 +507,7 @@ this.liveList()
             }
             
                 this.userList.push(list)
-            this.messages=''
+                this.messages=''
                     // this.lvrInfoText=res.data.data.lvrInfoText
                     // this.lvrStatus=res.data.data.lvrStatus
                     // if(res.data.data.lvrStatus==0){

src/views/mine/proposal.vue

@@ -73,6 +73,7 @@ export default {
           percentage: 0,
           url:'',
           urls:[],
+          imgObj:'',
           phonetwo:'',
           getToken:{
             sign:'',
@@ -126,8 +127,10 @@ export default {
         let imgObj = await uploadImg(this.ossConfig, file.file);
         this.imgOssName.push(imgObj.name);
         this.fileNameList.push(file.file.name);
-         console.log(imgObj,'img-----')
-        
+
+         console.log(imgObj,'img-----') 
+         console.log(imgObj.url,'imgurl-----') 
+
         if (imgObj.url) {
           this.imgOssList.push(imgObj.url);
         }
@@ -184,9 +187,24 @@ export default {
    },
  
       login_in:function(){
-      console.log(this.test,'ppppppptest')
-        console.log(this.imgObj,'pppppppimgobj')
+          console.log(this.test,'ppppppptest')
+          console.log(this.imgObj,'pppppppimgobj')
           console.log(this.phonetwo,'pppppppimgphoe')
+           let re = /^1(3|4|5|6|7|8|9)\d{9}$/
+        // 正则，验证手机号输入是否正确
+        let show = re.test(this.phonetwo)
+        // 若正确返回true，反之false
+        this.isShow = show
+        // isShow获取之后返回到v-if进行判断是消失还是出现
+        if (this.isShow) {
+          //  this.$router.push({name:'mine'}) 
+            // alert('反馈提交成功')
+          // this.$router.push('/Login_test')
+          // 一定要进行判断，只有返回的是true才证明输入电话号码正确，才能跳转到下一页获取验证码
+        }else{
+           alert('请填写正确的手机号')
+           return
+        }
         if(this.test == ''){
            alert('请填写内容')
            console.log(this.test,111)
@@ -195,10 +213,14 @@ export default {
            alert('请填写手机号')
             console.log(this.phonetwo,222)
             return
-        }if(this.imgObj == '' || this.imgObj ==undefined){
-           alert('请上传图片')
-            return
         }
+         if(this.imgOssList.length <= 0) {
+               alert('请上传图片');return
+             }
+        // if(this.imgObj == '' || this.imgObj ==undefined){
+        //   //  alert('请上传图片')
+        //     return
+        // }
         //调提交接口
         this.deal()
         
@@ -279,24 +301,27 @@ export default {
 
         },
         deal(){
-
+             console.log(this.imgObj,'有没有看看')
+            //  if(this.imgOssList.length <= 0) {
+            //    alert('请上传图片');return
+            //  }
              let temp=this.qs.stringify({
                    fbContext:this.test,
-                   fbPhone:this.phone,
-                   imgs:this.imgObj,
+                   fbPhone:this.phonetwo,
+                   imgs:this.imgOssList.join(','),
                 })
               this.server.live.deal(temp).then(res=>{
-                console.log(this.phone,'ppp')
-                if(res.code=200){
+                 console.log(res,'aa')
+                if(res.data.businessCode=200){
                   console.log(res.data.data.businessMessage,'oiiiii')
                   // alert(res.data.data.businessMessage)
-                  alert('反馈提交成功')
+                  alert(res.data.data.businessMessage)
                   // window.location.href='./mine'
                    this.$router.push({name:'mine'}) 
                 }
                 })
         },
-      //准备上传
+      
     },
     components: {}
 }