解决视频横竖屏的问题，以及商品列表的问题

components/WaterfallsFlowItem/WaterfallsFlowItems.vue

@@ -38,8 +38,8 @@
 
 
 		methods: {
-
 			gogogo(item) {
+				if (this.userid) {
 					if (item.video_link.length > 0) {
 						uni.navigateTo({
 							// #ifdef MP || H5
@@ -54,6 +54,13 @@
 							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
 						})
 					}
+				} else {
+					this.$util.Tips({
+						title: '用户信息不存在,请完成登录在进行该操作',
+						icon: 'error'
+					})
+				}
+
 			},
 
 		}

pages/commissionedSales/receivedCommission/index.vue

@@ -23,7 +23,7 @@
 			</view>
 
 			<view class="content-two_one" v-if="item.type==1">
-				<view class="content-two-edita" @click="soldEdit(item)">
+				<view class="content-two-edita" @click="soldEdit">
 					待处理
 				</view>
 				<view class="contentgn">

pages/plantGrass/plant_detail/index.vue

@@ -23,7 +23,7 @@
 						<view v-if="followDetail.author" class="title">
 							<view class="author">
 								<navigator hover-class="none" :url="'/pages/plantGrass/plant_user/index?id='+followDetail.uid">
-									<image class="picture" :src="followDetail.author.avatar || '/static/images/f.png'"></image>
+									<image class="picture" :src="followDetail.author.avatar || '/static/images/f.png'"  mode="aspectFit"></image>
 								</navigator>
 								<view class="name acea-row">
 									<text>{{followDetail.author.nickname}}</text>

pages/short_video/appSwiper/index.nvue

@@ -401,7 +401,7 @@
 				newTime: 0, //跟手滑动后的最新时间💗
 				timeNumber: 0, //🌟💗
 				ProgressBarBottom: 20, //进度条离底部的距离💗
-				object_fit: 'cover', //视频样式默认包含🌟💗
+				object_fit: 'contain', //视频样式默认包含🌟💗
 				mode: 'aspectFit', //图片封面样式🌟💗
 				timeout: "", //🌟用来阻止 setTimeout()方法
 				voice: "", //🌟用来阻止 setTimeout()方法
@@ -1116,7 +1116,7 @@
 		/* #ifdef MP */
 		padding-top: 200rpx;
 		/* #endif */
-		// background-color: #000000;
+		background-color: #000000;
 		background-color: #F5F5F5;
 
 		.goods_item {

pages/trading_hall/transfer_goods/index.vue

@@ -616,10 +616,8 @@
 				if (this.type == 'edit') {
 					this.formData.product_info = []
 				}
-
 				this.productList = []
 				this.price = 0;		
-		
 				if (data.length > 0) {
 					this.productList = data;
 					for (let i in data) {

pages/users/order_confirm/index.vue

@@ -10,8 +10,8 @@
 						<view>
 						
 							<text class='default t-color'
-								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}
-						
+								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}
+						 <text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
 						</view>
 					</view>
 					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
@@ -1083,7 +1083,7 @@
 					that.order_key = res.data.key
 					that.cartArr[4].title =
 						`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
-					console.log(res.data.order[0]);
+				
 					if (res.data.order[0].credit_buy == 1 && this.type_id == 12) {
 						this.cartArr[4].payStatus = 1
 					} else {
@@ -1126,7 +1126,7 @@
 							real_name: res.data.real_name,
 							phone: res.data.phone
 						}
-						console.log(that.addressId);
+				
 						this.$nextTick(() => {
 							this.getConfirm(that.addressId);
 						})

utils/uniMP.js

@@ -1,4 +1,9 @@
-import { getGXconfig } from "@/api/uniMP.js";
+import {
+	getGXconfig
+} from "@/api/uniMP.js";
+import {
+	HTTP_REQUEST_URL
+} from '@/config/app';
 const mp = uni.requireNativePlugin('uniMP');
 
 let appid = ''; // 应用id
@@ -34,7 +39,14 @@ const loadMP = async (id) => {
 	})
 	mp.getUniMPVersion(id, (ret) => {
 		console.log('当前版本', ret);
-    if (0 != ret.code || compareVersions(info.data.version, ret.versionInfo.name) == 1 || true) {
+		let flag;
+		if (HTTP_REQUEST_URL == 'https://shop.lihaink.cn') {
+			flag = false
+		} else {
+			flag = true
+		}
+		if (0 != ret.code || compareVersions(info.data.version, ret.versionInfo.name) == 1 || flag ==
+			true) {
 			let count = 0;
 			timer = setInterval(() => {
 				if (count < 100) uni.showLoading({