Merge branch 'master' of http://git.zthymaoyi.com/zhongtianhaoyuan/unimall

# Conflicts:
#	unimall-app/config/index.js

unimall-app/App.vue

@@ -25,6 +25,7 @@
 			}
 		},
 		onShow: function() {
+			uni.hideTabBar()
 			console.log('App Show')
 		},
 		onHide: function() {

unimall-app/config/index.js

@@ -1,6 +1,10 @@
 const dev = {
 	// baseUrl: 'http://127.0.0.1:8080',
+<<<<<<< HEAD
 	// baseUrl: 'http://192.168.1.109:8080',
+=======
+	// baseUrl: 'http://192.168.1.120:8080',
+>>>>>>> 0055f9d963529ffad903ba8e691bdf5c3dfacd25
 	// baseUrl: 'http://192.168.1.115:8080',
 	// baseUrl: 'http://192.168.1.124:8080',
 	// baseUrl: 'http://192.168.1.113:8080',

unimall-app/manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -45,6 +45,9 @@
         }
     },
     "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "distribute" : {
             "sdkConfigs" : {
                 "ad" : {},
@@ -105,6 +108,14 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "App会在您使用扫码或上传功能时，访问您的相册权限",
+                    "NSPhotoLibraryAddUsageDescription" : "App会在您使用扫码或上传功能时，访问您的相册权限",
+                    "NSCameraUsageDescription" : "App会在您使用扫码或上传功能时，访问您的拍照权限",
+                    "NSLocalNetworkUsageDescription" : "App会在您使用网络时，访问您的本地网络权限"
+                }
             }
         },
         "nvueCompiler" : "weex",

unimall-app/pages/buy/transaction.vue

@@ -50,7 +50,7 @@
 		</view>
 		<u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
 		 :iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square"icon="arrow-up" ></u-back-top>
-		<view class="cu-bar tabbar bg-white shadow foot">
+		<!-- <view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
 				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
@@ -64,7 +64,7 @@
 				</button>
 				粮信
 			</view>
-			<view v-if="showTran" :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
+			<view  :class="PageCur=='tran'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="tran">
 				<view><image style='width:25px;height:20px;' :src="PageCur=='tran'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png'"></image></view> 物流
 			</view>
 			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="my">
@@ -74,7 +74,9 @@
 				</view>
 				 我的
 			</view>
-		</view>
+		</view> -->
+		
+		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
 		<drag-button
 			:isDock="true"
 			:existTabBar="true"
@@ -101,9 +103,53 @@
 				scrollTop: 0,
 				categoryList:[{title:'我要买粮',id:'0'},{title:'我要卖粮',id:'1'}],
 				TabCur: 0,
+				listTab: [
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png",
+						text: '资讯',
+						count: 0	,
+						isDot: true,
+						customIcon: false,
+						pagePath:'/pages/sale/information'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png",
+						text: '交易',
+						customIcon: false,
+						pagePath:'/pages/buy/transaction'
+					},
+					{
+						iconPath: "chat",
+						selectedIconPath: "chat",
+						text: '粮信',
+						midButton: true,
+						customIcon: false,
+						// pagePath:'/pages/home/home'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png",
+						text: '物流',
+						customIcon: false,
+						pagePath:'/pages/tran/tran'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png",
+						text: '我的',
+						count: this.myTip,
+						isDot: false,
+						customIcon: false,
+						pagePath:'/pages/user/user'
+					},
+				],
+				current: 1
 			};
 		},
 		onShow() {
+			uni.hideTabBar()
 			if(uni.getStorageSync("PageCur")){
 				this.PageCur = uni.getStorageSync("PageCur");
 			}

unimall-app/pages/home/home.vue

@@ -58,6 +58,7 @@
 			</view>
 		</block>
 		<block v-if='PageCur=="my"'>
+			<!-- #ifdef MP-WEIXIN -->
 			<u-navbar :is-back="false" title="　" :border-bottom="false">
 				<view class="slot-wrap">
 					<text class = 'tip_text cuIcon-back' @click='back' ></text>
@@ -68,6 +69,7 @@
 					</view>
 				</view>
 			</u-navbar>
+			<!-- #endif -->
 			<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30" @tap="linkToPerson">
 				<view class="u-m-r-10">
 					<u-avatar mode="square" :src="userData.user.avatar" size="140"></u-avatar>

unimall-app/pages/public/login.vue

@@ -44,10 +44,10 @@
 					</view>
 					<button style='width:100%;' @click='phonelogin' class="cu-btn bg-gradual-green">登录</button>
 				</view>
-				<view style='    position: fixed;bottom: 9px;width: 100%;text-align-last: center;'>
+				<!-- <view style='    position: fixed;bottom: 9px;width: 100%;text-align-last: center;'>
 					<text  @click="wechatLogin" class="cuIcon-weixin"></text>
 					<image class='apple' src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/apple.png" @click="appleLogin" alt=""></image>
-				</view>
+				</view> -->
 			</block>
 			<!-- #endif -->
 			<!-- #ifdef H5 -->

unimall-app/pages/sale/information.vue

@@ -132,11 +132,13 @@
 			</view>
 			
 		</view>
+		
+		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
 		<!-- <view v-if='scrollTop>100' class='goTop'><image src='../../static/top.png'  @click="goTop"></image></view> -->
 		
 		<!-- <u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
 		 :iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square"icon="arrow-up" ></u-back-top> -->
-		<view class="cu-bar tabbar bg-white shadow foot">
+		<!-- <view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
 				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
@@ -160,7 +162,7 @@
 				</view>
 				 我的
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -207,12 +209,56 @@
 				limit:10 ,//每次取条目数
 				loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				TabCur: 0,
-				category:0
+				category:0,
+				listTab: [
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png",
+						text: '资讯',
+						count: 0	,
+						isDot: true,
+						customIcon: false,
+						pagePath:'/pages/sale/information'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png",
+						text: '交易',
+						customIcon: false,
+						pagePath:'/pages/buy/transaction'
+					},
+					{
+						iconPath: "chat",
+						selectedIconPath: "chat",
+						text: '粮信',
+						midButton: true,
+						customIcon: false,
+						// pagePath:'/pages/home/home'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png",
+						text: '物流',
+						customIcon: false,
+						pagePath:'/pages/tran/tran'
+					},
+					{
+						iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png",
+						selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png",
+						text: '我的',
+						count: this.myTip,
+						isDot: false,
+						customIcon: false,
+						pagePath:'/pages/user/user'
+					},
+				],
+				current: 0
 			};
 		},
 		onReady() {
 		},
 		onShow() {
+			uni.hideTabBar()
 			if (uni.getStorageSync("PageCur")) {
 				this.PageCur = uni.getStorageSync("PageCur");
 			}
@@ -221,14 +267,14 @@
 			this.isLoadMore = false
 			this.loadStatus = 'more'
 			const that = this
-			if(!uni.getStorageSync('policyStorageKey')){
-				uni.navigateTo({
-					url:'/pages/sale/index'
-				})
-			}
-			else{
+			// if(!uni.getStorageSync('policyStorageKey')){
+			// 	uni.navigateTo({
+			// 		url:'/pages/sale/index'
+			// 	})
+			// }
+			// else{
 				this.loadData()
-			}
+			// }
 			// if (!this.hasLogin) {
 			// 	uni.showModal({
 			// 		title: '登录提示',

unimall-app/pages/tran/car_detail.vue

@@ -150,24 +150,24 @@
 				this.modalName = null
 			},
 			showModal(e) {
-				if (!this.hasLogin||this.userInfo.phone == undefined) {
-					uni.showModal({
-						title: '登录提示',
-						content: '您尚未登录，是否立即登录？',
-						showCancel: true,
-						confirmText: '登录',
-						success: (e) => {
-							if (e.confirm) {
-								uni.navigateTo({
-									url: '/pages/public/login'
-								})
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					})
-				}
-				else{
+				// if (!this.hasLogin||this.userInfo.phone == undefined) {
+				// 	uni.showModal({
+				// 		title: '登录提示',
+				// 		content: '您尚未登录，是否立即登录？',
+				// 		showCancel: true,
+				// 		confirmText: '登录',
+				// 		success: (e) => {
+				// 			if (e.confirm) {
+				// 				uni.navigateTo({
+				// 					url: '/pages/public/login'
+				// 				})
+				// 			}
+				// 		},
+				// 		fail: () => {},
+				// 		complete: () => {}
+				// 	})
+				// }
+				// else{
 					let that = this
 					this.modalName = e.currentTarget.dataset.target
 					this.$api.request('tran', 'getTranNoList',{
@@ -184,7 +184,7 @@
 						}
 						uni.hideLoading()
 					})
-				}
+				// }
 				
 				
 			},

unimall-app/pages/tran/tran.vue

@@ -97,7 +97,7 @@
 			</swiper-item>
 		</swiper>
 	
-		<view class="cu-bar tabbar bg-white shadow foot">
+		<!-- <view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
 				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
@@ -121,7 +121,9 @@
 				</view>
 				 我的
 			</view>
-		</view>
+		</view> -->
+		
+		<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 
@@ -140,13 +142,57 @@
 					loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 					isLoadMore:false  ,//是否加载中
 					PageCur: "tran",
-					TabCur: 0
+					TabCur: 0,
+					listTab: [
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png",
+							text: '资讯',
+							count: 0	,
+							isDot: true,
+							customIcon: false,
+							pagePath:'/pages/sale/information'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png",
+							text: '交易',
+							customIcon: false,
+							pagePath:'/pages/buy/transaction'
+						},
+						{
+							iconPath: "chat",
+							selectedIconPath: "chat",
+							text: '粮信',
+							midButton: true,
+							customIcon: false,
+							// pagePath:'/pages/home/home'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png",
+							text: '物流',
+							customIcon: false,
+							pagePath:'/pages/tran/tran'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png",
+							text: '我的',
+							count: this.myTip,
+							isDot: false,
+							customIcon: false,
+							pagePath:'/pages/user/user'
+						},
+					],
+					current: 3
 				};
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo'])
 			},
 			onShow() {
+				uni.hideTabBar()
 				this.PageCur = "tran"
 				uni.setStorageSync('PageCur', this.PageCur);
 				this.loadData()
@@ -248,23 +294,23 @@
 							uni.stopPullDownRefresh()
 						})
 					}
-					if (!this.hasLogin) {
-						uni.showModal({
-							title: '登录提示',
-							content: '您尚未登录，是否立即登录？',
-							showCancel: true,
-							confirmText: '登录',
-							success: (e) => {
-								if (e.confirm) {
-									uni.navigateTo({
-										url: '/pages/public/login'
-									})
-								}
-							},
-							fail: () => {},
-							complete: () => {}
-						})
-					}
+					// if (!this.hasLogin) {
+					// 	uni.showModal({
+					// 		title: '登录提示',
+					// 		content: '您尚未登录，是否立即登录？',
+					// 		showCancel: true,
+					// 		confirmText: '登录',
+					// 		success: (e) => {
+					// 			if (e.confirm) {
+					// 				uni.navigateTo({
+					// 					url: '/pages/public/login'
+					// 				})
+					// 			}
+					// 		},
+					// 		fail: () => {},
+					// 		complete: () => {}
+					// 	})
+					// }
 				},
 				NavChange: function(e) {
 					var preCur = this.PageCur

unimall-app/pages/user/user.vue

@@ -7,7 +7,8 @@
 			</view>
 			<view class="user-info-box">
 				<view class="portrait-box">
-					<image class="portrait" :src="userInfo.avatarUrl"></image>
+					<image v-if="userInfo" class="portrait" :src="userInfo.avatarUrl"></image>
+					<u-avatar v-else class="portrait" text=""></u-avatar>
 				</view>
 				<view class="info-box">
 					<view @click="toLogin" class="username">{{hasLogin? (userInfo.nickname || '点击设置昵称') : '立即登录' }}</view>
@@ -77,7 +78,7 @@
 			</button>
 			
 		</neil-modal>
-		<view class="cu-bar tabbar bg-white shadow foot">
+		<!-- <view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='sale'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="sale">
 				<view><image style='width:21px;height:23px;' :src="PageCur=='sale'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png'"></image></view> 资讯
 			</view>
@@ -101,7 +102,7 @@
 				</view>
 				 我的
 			</view>
-		</view>
+		</view> -->
 		<!-- <drag-button
 			:isDock="true"
 			:existTabBar="true"
@@ -118,6 +119,8 @@
 			icon='cuIcon-roundadd'
 			@btnClick="look"
 			/> -->
+			
+			<u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar>
     </view>  
 	
 </template>  
@@ -217,13 +220,57 @@
 						
 					],
 					showTran:true,
-					companyId:1
+					companyId:1,
+					
+					listTab: [
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/zixun_check.png",
+							text: '资讯',
+							count: 0	,
+							isDot: true,
+							customIcon: false,
+							pagePath:'/pages/sale/information'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png",
+							text: '交易',
+							customIcon: false,
+							pagePath:'/pages/buy/transaction'
+						},
+						{
+							iconPath: "chat",
+							selectedIconPath: "chat",
+							text: '粮信',
+							midButton: true,
+							customIcon: false,
+							// pagePath:'/pages/home/home'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wuliu_check.png",
+							text: '物流',
+							customIcon: false,
+							pagePath:'/pages/tran/tran'
+						},
+						{
+							iconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png",
+							selectedIconPath: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png",
+							text: '我的',
+							count: this.myTip,
+							isDot: false,
+							customIcon: false,
+							pagePath:'/pages/user/user'
+						},
+					],
+					current: 3
 			}
-			
 		},
 		
 		onShow() {
 			console.log('myTip',this.myTip)
+			uni.hideTabBar()
 			this.loadData()
 		},
 		onLoad(){

unimall-app/unpackage/cache/appleConfig.ini

@@ -0,0 +1,9 @@
+[appleAppid]
+appleAppid=uni.UNI7297DA2
+
+[iosStyle]
+iosStyle=
+
+[universalLinks]
+spaceid=
+universalLinks=https://app.myhjdc.cn/

unimall-app/unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=/Users/zhangyuewen/Desktop/yiliangyiyun.mobileprovision
+ioscertFile=/Users/zhangyuewen/Desktop/证书.p12
+ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

unimall-app/webim.js

@@ -946,10 +946,14 @@ let send = (p) => {
 		data: p,
 		success(res) {
 			console.log('【websocket】发送成功')
+			
+			uni.hideLoading()
 		},
 		fail(err) {
 			console.log('【websocket】发送失败')
 			console.log(err)
+			
+			uni.hideLoading()
 		}
 	});
 }