更换

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/106

common/http.api.js

@@ -157,6 +157,11 @@ const install = (Vue, vm) => {
         // 达人登录
         starLogin({member_mobile,sms_code}) {
             return vm.$u.post("/Login/platformExpertPhoneLogin",{member_mobile,sms_code})
+		},
+		//上传直播间人数
+		//https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber?live_id=1&realtime_number=10
+		changeLiveRealtimeNumber({id,number}){
+			return vm.$u.post("Streaming/changeLiveRealtimeNumber",{live_id:id,realtime_number:number})
 		}
 		
     }

pages/index/details.vue

@@ -16,19 +16,19 @@
 			</view>	
 		</view>
 		<u-radio-group class="box" v-model="value" v-if="type>3">
-			<view class="goods-info" v-for="list in info.refund_list">
+			<view class="goods-info" v-for="list in info.goods_list">
-				<image :src="list.goods_image"></image>
+				<image :src="list.image_480_url"></image>
 				<view class="info-right">
 					<view class="name u-line-1">{{ list.goods_name }}</view>
 					<view class="info">
 						<view class="num">共{{ list.goods_num }}件商品</view>
 						<view class="price">
 							实付
-							<span>￥{{ list.refund_amount }}</span>
+							<span>￥{{ list.goods_pay_price }}</span>
 						</view>
 					</view>
 				</view>
-				<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
+				<!-- <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange"> -->
 				</u-radio >
 			</view>
 		</u-radio-group>
@@ -408,14 +408,15 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
-            if (!this.refundid) {
+            // if (!this.refundid) {
-                this.$refs.uToast.show({
+            //     this.$refs.uToast.show({
-                	title: "请选择商品",
+            //     	title: "请选择商品",
-                	type: "warning"
+            //     	type: "warning"
-                });
+            //     });
-                return;
+            //     return;
-            }
+            // }
 			if (this.cur == 0) {
+                console.log(this.refundid);
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
@@ -593,6 +594,8 @@ export default {
 					// 自提
 					this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
 					this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
+                    // 退款id
+                    this.refundid = res.data.refund_list[0].refund_id;
 					// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
 				}
 			});

pages/login/login.vue

@@ -20,7 +20,7 @@
 				<view class="" v-if="state==0">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghao" type="text" @blur="getBlurVal" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -30,7 +30,7 @@
 				<view class="" v-else-if="state==1">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghaoA" type="text" @blur="getBlurVal1" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -128,6 +128,15 @@ export default {
                 }
             })
 		},
+        // 失去焦点获取数据
+        getBlurVal(e) {
+            // console.log(e.detail.value);
+            this.zhanghao = this.$u.trim(e.detail.value,"all");
+        },
+        getBlurVal1(e) {
+            this.zhanghaoA = this.$u.trim(e.detail.value,"all");
+            // console.log(this.$u.trim(this.zhanghaoA));
+        },
 		logins() {
 			// 判断是否可以点击
             // console.log(this.zhanghao);

pages/release/tosign.vue

@@ -13,7 +13,7 @@
 			<view id="content_tosign">
 				<u-form :model="form" ref="uForm">
 					<u-form-item label-position="right">
-						<u-input v-model="max"  :placeholder="userinfo.rple != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
+						<u-input v-model="max"  :placeholder="userinfo.role != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
 					</u-form-item>
 					<view class="values"><text>{{this.titleMaxLength - this.max.length}}</text>/20</view>
 					<u-form-item label-position="right">
@@ -189,6 +189,7 @@
 
 			this.token = uni.getStorageSync('token');
 			this.userinfo = uni.getStorageSync("userinfo")
+            console.log(this.userinfo)
 			 var config = {
                 appkey: 'mgb7ka1',
                 debug:true

pages/release/zhibo.nvue

@@ -47,7 +47,7 @@
         <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
         <image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
         <image v-if="zhibo && list.length != 0" class="shoptapimg" @click="xianshi" src="../../static/image/shop.png" ></image>
-        <text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
+        <text v-if="zhibo && fen" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx;">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
         </text>
         <div v-if="zhibo" class="danmulist">
             <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
@@ -344,10 +344,11 @@
     width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
     word-wrap:anywhere;
+    font-weight: bold;
 }
 .livePusher{
     width: 750rpx;
@@ -374,7 +375,9 @@
             danmulist:[],
             zhibo:true,
             jieshu:{},
-            renshumax:0
+            renshumax:0,
+            changeLiveRealtimeNumber:{},
+            fen:true
         },
         onLaunch: function() {
             console.log('App Launch');
@@ -386,9 +389,16 @@
             this.stop()
             this.startPreview()
             this.start()
+            // var message = {
+            // 	senderNickname : this.room.currentUser.nickname ,
+            // 	type : 1,
+            // 	content : '重连'
+            // }
+            // this.chatRoomService.sendMessages(this.room.id, message);
         },
         onHide: function() {
             console.log('App Hide');
+            this.chatRoomService.warrings = ()=>{};
         },
         //模拟onshow生命周期
         created() {
@@ -438,6 +448,7 @@
             return true;  
         }, 
         onLoad(a){
+            
 		    console.log(getApp().globalData.im)
             uni.setKeepScreenOn({
                 keepScreenOn: true
@@ -448,6 +459,7 @@
             console.log('Bearer' + " " + token)
             this.chatroom_id = a.id
             this.live_id = a.live_id
+            
             uni.request({
                 url:"https://mall.dmygkeji.com/storeapi/Streaming/liveStreamList",
                 method:"POST",
@@ -489,6 +501,7 @@
                     that.chatRoomService.warrings = that.jinggao
                     //获取当前聊天室数据
                     that.room = that.chatRoomService.room;
+                    console.log(that.room)
                     that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                 }
             })
@@ -501,6 +514,9 @@
                 miao = parseInt(miao)
                 miao = miao + 1 
                 // console.log(miao)
+                if(fen > 0){
+                    that.fen = false;
+                }
                 if(miao == 60){
                     miao = 0;
                     fen +=1
@@ -520,6 +536,24 @@
                 }
                 that.time = shi + ":" + fen + ":" + miao
             }, 1000);
+            setInterval(()=>{
+                    console.log("定时")
+                    uni.request({
+                        url:"https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber",
+                        method:"POST",
+                        header:{
+                            'Authorization' : 'Bearer' + " " + token
+                        },
+                        data:{
+                            live_id:that.live_id,
+                            realtime_number: that.room.onlineUsers.users.length - 1 < 0 ? 0 : that.room.onlineUsers.users.length - 1
+                        },
+                        success(res){
+                            console.log(JSON.stringify(res))
+                        }
+                    })
+                 },
+            10 * 1000)
             // var roomToken = JSON.parse(options.roomToken);
 	
 
@@ -635,6 +669,8 @@
                     });
                     return ;
                 }
+                this.chatRoomService.warrings = ()=>{};
+
                 const token = uni.getStorageSync('token');
                 let that = this
                 console.log(that.url)

pages/user/index.vue

@@ -6,7 +6,7 @@
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                     <text>账号：{{info.member_name}}</text>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                 </view>
             </view>
             <image src="/static/image/user/1.png"></image>
@@ -160,6 +160,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;

pages/user/myinfo.vue

@@ -6,7 +6,7 @@
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                     <text>账号：{{info.member_name}}</text>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                 </view>
             </view>
             <image src="/static/image/user/1.png"></image>
@@ -278,6 +278,7 @@ export default {
             align-items: center;
             
             >image{
+                flex-shrink: 0;
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;

static/imservice.js

@@ -36,7 +36,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     //当前“我”
     this.currentUser = null;