Merge pull request 'gdpao' (#371) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/371

common/api/user.js

@@ -475,9 +475,9 @@ export default {
 				return vm.$u.post("Expertapply/hobbyList")
 			},
 			// 达人申请
-			applyExpert({ name, mobile, address, industry, hobby }) {
+			applyExpert({ name, mobile, idcard, address, industry, hobby }) {
 				return vm.$u.post("Expertapply/expertApply", {
-					name, mobile, address, industry, hobby
+					name, mobile, idcard, address, industry, hobby
 				})
 			},
 			getInvoiceList() {

pageE/mine/MineConcerns.vue

@@ -119,7 +119,7 @@ export default {
 		margin-left: -20rpx;
 		.daren-item {
 			width: 215rpx;
-			height: 282rpx;
+			height: 270rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;

pageE/mine/StoreCollection.vue

@@ -16,7 +16,7 @@
 					<view class="item-name u-line-1">{{ item.store_name }}</view>
 					<view class="item-date">
 						<image src="@/pageE/static/mine/26.png"></image>
-						<view>{{ item.fav_time | date }}</view>
+						<view>{{ item.fav_time }}</view>
 					</view>
 				</view>
 			</view>

pageE/mine/storeConcerns.vue

@@ -16,7 +16,7 @@
 					<view class="item-bottom">
 						<view class="item-date">
 							<image src="@/pageE/static/mine/26.png"></image>
-							<view>{{ item.friend_tomavatar | date }}</view>
+							<view>{{ item.friend_addtime }}</view>
 						</view>
 					</view>
 				</view>

pageE/more/ApplyLive.vue

@@ -9,6 +9,10 @@
         <label for="phone">手机号:</label>
         <input type="number" id="phone" @input="phones" maxlength="11" placeholder="请输入手机号" />
       </view>
+      <view>
+        <label for="idCard">身份证号:</label>
+        <input type="text" id="idCard" placeholder="请输入身份证号" @input="setIdCard" />
+      </view>
       <view @click="show=true">
         <label for="address">居住地址:</label>
         <input type="text" id="address" v-model="address" disabled placeholder="请选择居住地址" />
@@ -65,6 +69,7 @@ export default {
       areaList: [],
       name: '',
       phone: '',
+      idCard: '',
       address: '',
       details: '',
       industryList: [],
@@ -87,6 +92,9 @@ export default {
     phones(a){
       this.phone = a.detail.value
     },
+    setIdCard(v) {
+      this.idCard = v.detail.value;
+    },
     detailss(a){
       this.details = a.detail.value
     },
@@ -140,14 +148,22 @@ export default {
         this.$u.toast('手机号错误');
 				return false;
 			}
-			if(this.$u.test.isEmpty(this.address)) {
-        this.$u.toast('地址不能为空');
-				return false;
-			}
-			if(this.$u.test.isEmpty(this.details)) {
-        this.$u.toast('详细地址不能为空');
+      if(this.$u.test.isEmpty(this.idCard)) {
+        this.$u.toast('身份证号不可为空');
         return false;
       }
+      // if(!this.$u.test.idCard(this.idCard)) {
+      //   this.$u.toast('请正确填写身份证号');
+      //   return false;
+      // }
+			// if(this.$u.test.isEmpty(this.address)) {
+      //   this.$u.toast('地址不能为空');
+			// 	return false;
+			// }
+			// if(this.$u.test.isEmpty(this.details)) {
+      //   this.$u.toast('详细地址不能为空');
+			// 	return false;
+      // }
       if(!this.checkedIndustryList.length) {
         this.$u.toast('行业领域不能为空');
 				return false;
@@ -165,6 +181,7 @@ export default {
       this.$u.api.applyExpert({
         name: this.name, 
         mobile: this.phone, 
+        idcard: this.idCard,
         address: this.address + this.details, 
         industry: this.checkedIndustryList, 
         hobby: this.checkedHobbyList,

pages/index/index.vue

@@ -273,7 +273,7 @@
 			darenItem
 		},
 		onShow() {
-			console.log(this.imService.status)
+			console.log(this.imService.status,this.$store.state.hasLogin)
 			if(!this.imService.status && this.$store.state.hasLogin){
 				const user = uni.getStorageSync('user_info');
 				// console.log(user)

pages/shop/index.vue

@@ -351,7 +351,7 @@
 			z-index: 9;
 			position: fixed;
 			right: 30rpx;
-			bottom: 300rpx;
+			bottom: 110rpx;
 			width: 100rpx;
 			height: 100rpx;
 			background: rgba(253, 211, 96, 1);

pages/zhibo/index.nvue

@@ -418,6 +418,7 @@ export default {
         "Authorization" : 'Bearer' + " " + token
       },
       success(res){
+          
         console.log(res)
         that.info = res.data.data
         // that.list= res.data.data
@@ -461,6 +462,10 @@ export default {
       });
     },
     errors(a){
+        this.videoContext.stop();
+        setTimeout(() => {
+            this.videoContext.play()
+        },1000)
         console.log(a)
     },
     newpeople(list){
@@ -497,6 +502,11 @@ export default {
       // 	this.contentPosition = 'message-box'+(this.room.messages.length-1);
               // }, 300)
       console.log(message)
+      if(message.type == 1){
+         
+          console.log('stop')
+          return ;
+      }
               this.danmulist.push(message)
 
               if(this.danmulist.length > 7){