Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

jhim/jhim.js

@@ -108,8 +108,8 @@ class JhImGroup {
 	}
 	offReady(cb) {
 		if(!cb) return this;
-		this.tim.off(TIM.EVENT.SDK_READY, cb.jhimcbready);
-		this.tim.off(TIM.EVENT.SDK_NOT_READY, cb.jhimcbnotready);
+		this.jhim.tim.off(TIM.EVENT.SDK_READY, cb.jhimcbready);
+		this.jhim.tim.off(TIM.EVENT.SDK_NOT_READY, cb.jhimcbnotready);
 		return this;
 	}
 	sendText(text) {

jhlive/jhlive.nvue

@@ -9,22 +9,28 @@
 				<text class="top_left_box_text1">{{title}}</text>
 				<text class="top_left_box_text2">{{subtitle}}</text>
 			</view>
-			<image v-if="showFav" class="top_left_box_collect" :src="isFav?collect:notCollect" @click="$emit('onFav', isFav)"></image>
+			<view v-if="showFav" class="top_left_box_collect">
+				<text class="top_left_box_collect_text">{{isFav?textFav:textNotFav}}</text>
+			</view>
+			<!-- <image v-if="showFav" class="top_left_box_collect" :src="isFav?collect:notCollect" @click="$emit('onFav', isFav)"></image> -->
 		</view>
 		<view class="bottom-message">
 			<!-- 对话信息 --> 
 			<!-- <view class="jhim-message-box"> -->
 			<scroll-view scroll-y="true" v-if="showIm" class="jhim-message-box">
 			  <view class="jhim-message" v-for="(item, index) in imMsgs.slice(-10)" :key="index">
-				<text class="jhim-message-text2">{{item.name}}：</text>
-				<text class="jhim-message-text">{{item.text}}</text>
+				<view class="jhim-message-show" >
+					<!-- <text class="jhim-message-text2">{{item.name}}：</text> -->
+					<text class="jhim-message-text">{{item.name}}：{{item.text}}</text>
+				</view>
+				<view class="jhim-message-none"></view>
 			  </view>
 			 </scroll-view>
 			<!-- </view> -->
 			<!-- 下方功能 -->
 			<view v-if="showIm||btns.length" class="bottom-box">
 				<view v-if="showIm&&!imStatus" class="jhim-input-box">
-				  <image class="jhim-icon" :src="inputIcon"/>
+				  <image class="jhim-icon" :src="imgs.chat"/>
 				  <input 
 					class="jhim-input"
 					placeholder="请输入" 
@@ -38,20 +44,18 @@
 				<view class="bottom-box-btns">
 					<!-- <view class="" v-if="isAuthor && showBeauty" @click="btnBeautify"> -->
 					<view v-if="isAuthor&&showBeauty" class="bottom-box-btns-arr" @click="btnBeautify">
-						<image class="btns-icon" :src="beautyIcon"/>
-						<text class="btns-text">美颜</text>
+						<image class="btns-icon" :src="imgs.beauty"/>
 					</view>
 					<!-- <view class="" v-if="isAuthor && showSwitch" @click="btnChangeCamera"> -->
 					<view v-if="isAuthor&&showSwitch" class="bottom-box-btns-arr" @click="btnChangeCamera">
-						<image class="btns-icon" :src="switchIcon"/>
-						<text class="btns-text">切换</text>
+						<image class="btns-icon" :src="imgs.switch"/>
 					</view>
 					<view class="bottom-box-btns-arr" v-for="(item,index) in btns" :key="index" @click="clickBtns(index, item)">
 						<image class="btns-icon" :src="item.picture"/>
 						<text v-if="item.title" class="btns-text">{{item.title}}</text>
 					</view>
 					<view v-if="showLike" class="bottom-box-btns-arr" @click="btnLike">
-						<image class="btns-icon" :src="likeIcon"/>
+						<image class="btns-icon" :src="imgs.like"/>
 					</view>
 				</view>
 			</view>
@@ -60,6 +64,7 @@
 </template>
 
 <script>
+	import imgs from './res.js'
 	import LibGenerateTestUserSig from "./lib-generate-test-usersig-es.min";
 	// #ifdef MP-WEIXIN
 	import JhliveApp from './live-wechat';
@@ -77,6 +82,7 @@
 		//#endif
 		data() {
 			return {
+				imgs,
 				imInput: '',
 				userSig: '',
 				beautifyLevel: false,
@@ -101,6 +107,8 @@
 			subtitle: String,
 			isFav: {default: false,type: Boolean}, // 是否显示收藏
 			showFav: {default: false,type: Boolean}, // 是否显示收藏
+			textFav: {default: '已关注',type: String}, 
+			textNotFav: {default: '关注',type: String}, 
 			showBeauty: {default: false,type: Boolean}, // 是否显示美颜
 			showSwitch: {default: false,type: Boolean}, // 是否显示切换摄像头
 			showLike: {default: false,type: Boolean},
@@ -216,7 +224,9 @@
 <style scoped>
 	.container-jhlive {
 		position: relative;
+		/* #ifndef APP-NVUE */
 		display: flex;
+		/* #endif */
 		flex-direction: column;
 		align-items: stretch;
 		background-color: black;
@@ -238,7 +248,9 @@
 		z-index: 100;
 		background-color: rgba(115, 111, 117, 0.4);
 		border-radius: 1000px;
+		/* #ifndef APP-NVUE */
 		display: flex;
+		/* #endif */
 		flex-direction: row;
 		padding: 5px;
 		justify-content: center;
@@ -252,8 +264,15 @@
 		background-color: white;
 	}
     .top_left_box_collect {
-		width: 26px;
-		height: 26px;
+		/* width: 26px;
+		height: 26px; */
+		border-radius: 1000px;
+		padding: 3px 5px;
+		background-color: green;
+	}
+	.top_left_box_collect_text {
+		color: white;
+		font-size: 20rpx;
 	}
 	.top_left_box_text {
 		margin-left: 10px;
@@ -273,42 +292,54 @@
 	
 	.bottom-message {
 		width: 750rpx;
+		/* #ifndef APP-NVUE */
 		display: flex;
+		/* #endif */
 		flex-direction: column;
 		position: absolute;
 		bottom: 0px;
 	}
 	.bottom-box {
-		width: 750rpx;
+		/* #ifndef APP-NVUE */
 		display: flex;
+		/* #endif */
 		flex-direction: row;
 		bottom: 0px;
 		background-color:rgba(0, 0, 0, 0.4);
 	}
 	.jhim-message-box {
-		max-height: 230px;
-	  /* position: absolute; */
-	  /* padding: 5;
-	  left: 5px; */
-	  /* display: flex; */
-	  /* z-index: 100; */
+		max-height: 375rpx;
 	}
 	.jhim-message {
-	  /* flex: 1; */
-	  width: 400rpx;
-	  margin-left: 10px;
-	  margin-right: 10px;
+	  /* #ifndef APP-NVUE */
 	  display: flex;
+	  /* #endif */
 	  flex-direction: row;
 	  align-items: center;
+	  margin-left: 10px;
+	  margin-right: 10px;
+	  margin-bottom: 10px;
+	}
+	.jhim-message-show {
 	  background-color: rgba(115,119,120,0.3);
+	  border-radius: 15px;
 	  padding: 5px;
-	  border-radius: 12px;
-	  margin-bottom: 10px;
+	}
+	.jhim-message-none {
+	  flex: 1;
 	}
 	.jhim-message-text {
+	  max-width: 400rpx;
+	  
 	  color: #fff;
 	  font-size: 14px;
+	  /* #ifndef APP-NVUE */
+	  word-break: break-all;
+	  /* #endif */
+	  /* #ifdef APP-NVUE */
+	  lines: 5; 
+	  word-break: anywhere;
+	  /* #endif */
 	}
 	.jhim-message-text2 {
 	  color: #C8C8C8;
@@ -335,7 +366,7 @@
 	  font-size: 28rpx;
 	}
 	.jhim-logining {
-	  padding: 5px;
+	  padding: 10px;
 	  flex: 1;
 	}
 	.jhim-logining-text {

pages.json

@@ -1,20 +1,228 @@
-{
-	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [
-		{
-			"path": "pagesGood/liveDetail",
-			"style": {
-				"navigationBarTitleText": "直播详情"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationStyle": "default",
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "千家地",
-		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#F8F8F8"
-	}
-}
+{
+	"easycom": {
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/index/login",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/index",
+			"style": {
+				"navigationBarTitleText": "商城",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/user/index",
+			"style": {
+				"navigationBarTitleText": "个人",
+				"enablePullDownRefresh": true
+			}
+		}
+	],
+	"subPackages": [{
+		"root": "pagesGood",
+		"pages": [{
+			"path": "goodDetails",
+			"style": {
+				"navigationBarTitleText": "商品详情"
+			}
+		}, {
+			"path": "goodList",
+			"style": {
+				"navigationBarTitleText": "商品列表",
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "shopDetails",
+			"style": {
+				"navigationBarTitleText": "商铺详情"
+			}
+		}, {
+			"path": "auctionDetail",
+			"style": {
+				"navigationBarTitleText": "拍卖详情"
+			}
+		}, {
+			"path": "orderPay",
+			"style": {
+				"navigationBarTitleText": "填写订单"
+			}
+		}, {
+			"path": "evaluateList",
+			"style": {
+				"navigationBarTitleText": "评价列表",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "videoList",
+			"style": {
+				"navigationBarTitleText": "直播大厅",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "liveDetail",
+			"style": {
+				"navigationBarTitleText": "直播详情"
+			}
+		}, {
+			"path": "videoDetail",
+			"style": {
+				"navigationBarTitleText": "短视频详情"
+			}
+		}, {
+			"path": "plantVideo",
+			"style": {
+				"navigationBarTitleText": "共享种植直播"
+			}
+		}, {
+			"path": "pickVideo",
+			"style": {
+				"navigationBarTitleText": "自助采摘直播"
+			}
+		}]
+	}, {
+		"root": "pagesMain",
+		"pages": [{
+			"path": "plantList",
+			"style": {
+				"navigationBarTitleText": "我的种植",
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "entrustList",
+			"style": {
+				"navigationBarTitleText": "委托列表",
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "entrustForm",
+			"style": {
+				"navigationBarTitleText": "发布委托",
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "addressList",
+			"style": {
+				"navigationBarTitleText": "我的地址",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "addressForm",
+			"style": {
+				"navigationBarTitleText": "新增地址",
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "couponList",
+			"style": {
+				"navigationBarTitleText": "我的优惠券",
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "integralList",
+			"style": {
+				"navigationBarTitleText": "我的积分",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "orderList",
+			"style": {
+				"navigationBarTitleText": "订单中心",
+				"backgroundColor": "#f7f7f7",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"backgroundColor": "#f7f7f7"
+			}
+		}, {
+			"path": "logisticsDeatil",
+			"style": {
+				"navigationBarTitleText": "物流追踪"
+			}
+		}, {
+			"path": "evaluateForm",
+			"style": {
+				"navigationBarTitleText": "评价订单"
+			}
+		}, {
+			"path": "messageList",
+			"style": {
+				"navigationBarTitleText": "留言列表",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "messageForm",
+			"style": {
+				"navigationBarTitleText": "发布留言"
+			}
+		}, {
+			"path": "paySuccess",
+			"style": {
+				"navigationBarTitleText": "支付结果"
+			}
+		}, {
+			"path": "aboutUs",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		}]
+	}],
+	"globalStyle": {
+		"navigationStyle": "default",
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "千家地",
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"borderStyle": "black",
+		"backgroundColor": "#fff",
+		"color": "#9A9A9A",
+		"selectedColor": "#52A63A",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/images/icon-index.png",
+			"selectedIconPath": "static/images/icon-index-active.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/shop/index",
+			"iconPath": "static/images/icon-shop.png",
+			"selectedIconPath": "static/images/icon-shop-active.png",
+			"text": "商城"
+		}, {
+			"pagePath": "pages/cart/cart",
+			"iconPath": "static/images/icon-cart.png",
+			"selectedIconPath": "static/images/icon-cart-active.png",
+			"text": "购物车"
+		}, {
+			"pagePath": "pages/user/index",
+			"iconPath": "static/images/icon-mine.png",
+			"selectedIconPath": "static/images/icon-mine-active.png",
+			"text": "个人"
+		}]
+	}
+}

pagesGood/liveDetail.nvue

@@ -95,14 +95,14 @@
 			this.windowHeight = info.windowHeight;
 		},
 		onReady() {
-			this.isAuthor = false;
-			this.linkMic = true;
-			this.userId = "22";
-			this.userName = "ss";
-			this.title = 'test';
-			this.roomId = '11';
-			this.$nextTick(() => this.enterRoom());
-			return;
+			// this.isAuthor = false;
+			// this.linkMic = true;
+			// this.userId = "22";
+			// this.userName = "ss";
+			// this.title = 'test';
+			// this.roomId = '11';
+			// this.$nextTick(() => this.enterRoom());
+			// return;
 
 			this.init();
 		},
@@ -118,7 +118,7 @@
 		},
 		methods: {
 			init() {
-				NET.request(API.getLiveGoodsDetail + options.liveId, {}, 'GET').then(res => {
+				NET.request(API.getLiveGoodsDetail + this.liveId, {}, 'GET').then(res => {
 					this.goodsList = res.data
 				}).catch(res => {
 					uni.showToast({