1

unimall-app/pages/buy/transaction.vue

@@ -50,33 +50,6 @@
 		</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="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>
-			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
-			</view>
-			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
-			 data-cur="trust">
-				<button :class="PageCur=='trust'?'cuIcon-group':'cu-btn cuIcon-group bg-white '">
-					<view v-if="liangxinTip" class="cu-tag badge">{{liangxinTip}}</view>
-				</button>
-				粮信
-			</view>
-			<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">
-				<view>
-				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
-				</view>
-				 我的
-			</view>
-		</view> -->
-		
-		<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
 		<drag-button
 			:isDock="true"
 			:existTabBar="true"
@@ -107,11 +80,7 @@
 			};
 		},
 		onShow() {
-			if(uni.getStorageSync("PageCur")){
-				this.PageCur = uni.getStorageSync("PageCur");
-			}
-			this.showTran = uni.getStorageSync("showTran")
-			console.log("buy onShow")
+			uni.showTabBar()
 		},
 		onLoad(options) {
 			console.log("buy onload")
@@ -162,56 +131,6 @@
 					url: `/pageB/trust/trust`
 				})
 			},
-			NavChange: function(e) {
-				// console.log(e)
-				var preCur = this.PageCur
-				this.PageCur = e.currentTarget.dataset.cur
-				uni.setStorageSync('PageCur', this.PageCur);
-				switch (this.PageCur) {
-					case "sale":
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						break;
-					case "buy":
-						uni.switchTab({
-							url: '/pages/buy/transaction'
-						});
-						break;
-					case "tran":
-						uni.switchTab({
-							url: '/pages/tran/tran'
-						});
-						break;
-					case "trust":
-						// uni.showModal({
-						// 	title: '温馨提示',
-						// 	content: '此功能正在开发中',
-						// 	showCancel: false,
-						// 	confirmText: '确定',
-						// 	success: (e) => {
-						// 	},
-						// 	fail: () => {},
-						// 	complete: () => {}
-						// })
-						// this.PageCur = preCur
-						// uni.setStorageSync('PageCur', this.PageCur);
-						uni.setTabBarItem({
-						  index: 0,
-						  pagePath:'pages/home/home'
-						})
-						uni.switchTab({
-							url: '/pages/home/home'
-						});
-						break;
-					case "my":
-						uni.switchTab({
-							url: '/pages/user/user'
-						});
-						break;
-				};
-				
-			},
 			//加载商品 ，带下拉刷新和上滑加载
 			async loadData(type = 'add', loading) {
 				const that = this

unimall-app/pages/home/home.vue

@@ -191,7 +191,7 @@ export default {
 		this.getChats(false)
 	},
 	computed: {
-		...mapState(['userInfo'])
+			...mapState(['hasLogin', 'userInfo'])
 	},
 	onShow() {
 		this.userInfo =  uni.getStorageSync("userInfo")
@@ -218,10 +218,31 @@ export default {
 		this.scrollTop = e.scrollTop;
 	},
 	onLoad(){	
-		uni.setTabBarItem({
-		  index: 1,
-		  pagePath:'pages/addressBook/addressBook'
-		})
+		if (!this.hasLogin) {
+			uni.showModal({
+				title: '登录提示',
+				content: '您尚未登录，是否立即登录？',
+				showCancel: true,
+				confirmText: '登录',
+				success: (e) => {
+					if (e.confirm) {
+						uni.navigateTo({
+							url: '/pages/public/login'
+						})
+					}
+					else{
+						uni.switchTab({
+							url: '/pages/sale/information'
+						});
+					}
+				},
+				fail: () => {},
+				complete: () => {}
+			})
+		}
+		else{
+			uni.hideTabBar()
+		}
 	},
 	onPullDownRefresh() {
 		if(this.PageCur=='msg'){

unimall-app/pages/sale/information.vue

@@ -132,36 +132,6 @@
 			</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="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>
-			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
-			</view>
-			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
-			 data-cur="trust">
-				<button :class="PageCur=='trust'?'cuIcon-group':'cu-btn cuIcon-group bg-white '">
-					<view v-if="liangxinTip" class="cu-tag badge">{{liangxinTip}}</view>
-				</button>
-				粮信
-			</view>
-			<view v-if="showTran" :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">
-				<view>
-				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
-				</view>
-				 我的
-			</view>
-		</view> -->
 	</view>
 </template>
 
@@ -180,7 +150,6 @@
 		name: "sale",
 		data() {
 			return {
-				PageCur: "sale",
 				titleNViewBackground: '',
 				swiperCurrent: 0,
 				swiperLength: 0,
@@ -215,52 +184,21 @@
 		onReady() {
 		},
 		onShow() {
-			if (uni.getStorageSync("PageCur")) {
-				this.PageCur = uni.getStorageSync("PageCur");
-			}
-			this.isVip = this.$api.isVip()
+			uni.showTabBar()
 			this.pages = 1
 			this.isLoadMore = false
 			this.loadStatus = 'more'
 			const that = this
-			// if(!uni.getStorageSync('policyStorageKey')){
-			// 	uni.navigateTo({
-			// 		url:'/pages/sale/index'
-			// 	})
-			// }
-			// else{
-				this.loadData()
-			// }
-			// if (!this.hasLogin) {
-			// 	uni.showModal({
-			// 		title: '登录提示',
-			// 		content: '您尚未登录，是否立即登录？',
-			// 		showCancel: true,
-			// 		confirmText: '登录',
-			// 		success: (e) => {
-			// 			if (e.confirm) {
-			// 				uni.navigateTo({
-			// 					url: '/pages/public/login'
-			// 				})
-			// 			}
-			// 			else{
-			// 				this.loadData()
-			// 			}
-			// 		},
-			// 		fail: () => {},
-			// 		complete: () => {}
-			// 	})
-			// }
-			// else{
-			// }
-			
-			
+			this.loadData()
 		},
 		onLoad(options) {
-			uni.removeStorage({
-				key: 'PageCur'
-			})
-			// this.loadData() 
+			// #ifdef APP-PLUS
+			plus.push.getClientInfoAsync((info) => {
+				uni.setStorageSync('clientId', info.clientid)
+				console.log("info.clientid",info.clientid)
+			   }, err => {
+			});
+			// #endif
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -285,7 +223,6 @@
 			DotStyle(e) {
 				this.dotStyle = e.detail.value
 			},
-							// cardSwiper
 			cardSwiper(e) {
 				this.cardCur = e.detail.current
 			},
@@ -299,56 +236,6 @@
 				this.category = this.TabCur
 				this.pages = 1
 				this.loadData()
-			},
-			NavChange: function(e) {
-			console.log(e)
-				var preCur = this.PageCur
-				this.PageCur = e.currentTarget.dataset.cur
-				uni.setStorageSync('PageCur', this.PageCur);
-				switch (this.PageCur) {
-					case "sale":
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						break;
-					case "buy":
-						uni.switchTab({
-							url: '/pages/buy/transaction'
-						});
-						break;
-					case "tran":
-						uni.switchTab({
-							url: '/pages/tran/tran'
-						});
-						break;
-					case "trust":
-						// uni.showModal({
-						// 	title: '温馨提示',
-						// 	content: '此功能正在开发中',
-						// 	showCancel: false,
-						// 	confirmText: '确定',
-						// 	success: (e) => {
-						// 	},
-						// 	fail: () => {},
-						// 	complete: () => {}
-						// })
-						// this.PageCur = preCur
-						// uni.setStorageSync('PageCur', this.PageCur);
-						uni.setTabBarItem({
-						  index: 0,
-						  pagePath:'pages/home/home'
-						})
-						uni.switchTab({
-							url: '/pages/home/home'
-						});
-						break;
-					case "my":
-						uni.switchTab({
-							url: '/pages/user/user'
-						});
-						break;
-				};
-				
 			},
 			 //回到顶部
 			  goTop(e) {  // 一键回到顶部

unimall-app/pages/tran/tran.vue

@@ -96,34 +96,6 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-	
-		<!-- <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>
-			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
-			</view>
-			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
-			 data-cur="trust">
-				<button :class="PageCur=='trust'?'cuIcon-group':'cu-btn cuIcon-group bg-white '">
-					<view v-if="liangxinTip" class="cu-tag badge">{{liangxinTip}}</view>
-				</button>
-				粮信
-			</view>
-			<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">
-				<view>
-				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
-				</view>
-				 我的
-			</view>
-		</view> -->
-		
-		<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
 	</view>
 </template>
 
@@ -141,17 +113,14 @@
 					limit:10 ,//每次取条目数
 					loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 					isLoadMore:false  ,//是否加载中
-					PageCur: "tran",
-					TabCur: 0,
-					current: 3
+					TabCur:0
 				};
 			},
 			computed: {
 				...mapState(['hasLogin','userInfo'])
 			},
 			onShow() {
-				this.PageCur = "tran"
-				uni.setStorageSync('PageCur', this.PageCur);
+				uni.showTabBar()
 				this.loadData()
 			},
 			//下拉刷新
@@ -163,14 +132,6 @@
 			},
 			onLoad() {
 			},
-			// onPageScroll(e) {
-			// 	//兼容iOS端下拉时顶部漂移
-			// 	if (e.scrollTop >= 0) {
-			// 		this.headerPosition = "fixed";
-			// 	} else {
-			// 		this.headerPosition = "absolute";
-			// 	}
-			// },
 			onReachBottom(){  //上拉触底函数
 			  if(!this.isLoadMore){  //此处判断，上锁，防止重复请求
 					this.isLoadMore=true
@@ -250,75 +211,6 @@
 							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: () => {}
-					// 	})
-					// }
-				},
-				NavChange: function(e) {
-					var preCur = this.PageCur
-					this.PageCur = e.currentTarget.dataset.cur
-					uni.setStorageSync('PageCur', this.PageCur);
-					switch (this.PageCur) {
-						case "sale":
-							uni.switchTab({
-								url: '/pages/sale/information'
-							});
-							// uni.switchTab({
-							// 	url: '/pages/sale/sale'
-							// });
-							break;
-						case "buy":
-							uni.switchTab({
-								url: '/pages/buy/transaction'
-							});
-							break;
-						case "tran":
-							uni.switchTab({
-								url: '/pages/tran/tran'
-							});
-							break;
-						case "trust":
-							// uni.showModal({
-							// 	title: '温馨提示',
-							// 	content: '此功能正在开发中',
-							// 	showCancel: false,
-							// 	confirmText: '确定',
-							// 	success: (e) => {
-							// 	},
-							// 	fail: () => {},
-							// 	complete: () => {}
-							// })
-							// this.PageCur = preCur
-							// uni.setStorageSync('PageCur', this.PageCur);
-							uni.setTabBarItem({
-							  index: 0,
-							  pagePath:'pages/home/home'
-							})
-							uni.switchTab({
-								url: '/pages/home/home'
-							});
-							break;
-						case "my":
-							uni.switchTab({
-								url: '/pages/user/user'
-							});
-							break;
-					};
-					
 				},
 				tabSelect(e) {
 					if(e.currentTarget.dataset.id){

unimall-app/pages/user/user.vue

@@ -78,49 +78,6 @@
 			</button>
 			
 		</neil-modal>
-		<!-- <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>
-			<view :class="PageCur=='buy'?'action text-pink':'action text-gray'" @click="NavChange" data-cur="buy">
-				<view><image style='width:25px;height:25px;' :src="PageCur=='buy'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/jiaoyi.png'"></image></view>交易
-			</view>
-			<view :class="PageCur=='trust'?'action text-pink add-action':'action text-gray add-action'" @click="NavChange"
-			 data-cur="trust">
-				<button :class="PageCur=='trust'?'cuIcon-group':'cu-btn cuIcon-group bg-white '">
-					<view v-if="liangxinTip" class="cu-tag badge">{{liangxinTip}}</view>
-				</button>
-				粮信
-			</view>
-			<view v-if="showTran" :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">
-				<view>
-				<view v-if="myTip" class="cu-tag badge">{{myTip}}</view>
-				<image style='width:21px;height:21px;' :src="PageCur=='my'?'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode_check.png':'https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/wode.png'"></image>
-				</view>
-				 我的
-			</view>
-		</view> -->
-		<!-- <drag-button
-			:isDock="true"
-			:existTabBar="true"
-			text="直播"
-			location="100"
-			icon='cuIcon-roundadd'
-			@btnClick="zhibo"
-			/>
-		<drag-button
-			:isDock="true"
-			:existTabBar="true"
-			text="观看"
-			location="40"
-			icon='cuIcon-roundadd'
-			@btnClick="look"
-			/> -->
-			
-			<!-- <u-tabbar v-model="current" :list="listTab" :mid-button="true"></u-tabbar> -->
     </view>  
 	
 </template>  
@@ -143,7 +100,6 @@
 				mycarStyle:'',
 				feild: undefined,
 				inputContent: '',
-				PageCur: "my",
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
@@ -226,7 +182,7 @@
 		},
 		
 		onShow() {
-			console.log('myTip',this.myTip)
+			uni.showTabBar()
 			this.loadData()
 		},
 		onLoad(){
@@ -278,46 +234,6 @@
 					}					
 				  });
 			},
-			NavChange: function(e) {
-				var preCur = this.PageCur
-				this.PageCur = e.currentTarget.dataset.cur
-				uni.setStorageSync('PageCur', this.PageCur);
-				switch (this.PageCur) {
-					case "sale":
-						// uni.navigateTo({
-						// 	url: '/pages/sale/information'
-						// });
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						break;
-					case "buy":
-						uni.switchTab({
-							url: '/pages/buy/transaction'
-						});
-						break;
-					case "tran":
-						uni.switchTab({
-							url: '/pages/tran/tran'
-						});
-						break;
-					case "trust":
-						uni.setTabBarItem({
-						  index: 0,
-						  pagePath:'pages/home/home'
-						})
-						uni.switchTab({
-							url: '/pages/home/home'
-						});
-						break;
-					case "my":
-						uni.switchTab({
-							url: '/pages/user/user'
-						});
-						break;
-				};
-				
-			},
 			loadData(){
 				const that = this
 				if(uni.getStorageSync("PageCur")){

unimall-app/store/index.js

@@ -11,7 +11,7 @@ try {
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['firendItem','userData','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem','listTab'];
+let saveStateKeys = ['firendItem','userData','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value) {
@@ -27,6 +27,9 @@ const saveLifeData = function(key, value) {
 			        console.log('震动成功');
 			    }
 			});
+			uni.showTabBarRedDot({
+				index: 4
+			});
 		}
 		if(key == 'taskTip' && tmp[key] < value){
 			uni.vibrateLong({
@@ -34,6 +37,9 @@ const saveLifeData = function(key, value) {
 			        console.log('震动成功');
 			    }
 			});
+			uni.showTabBarRedDot({
+				index: 4
+			});
 		}
 		tmp[key] = value;
 		// 执行这一步后，所有需要存储的变量，都挂载在本地的lifeData对象中
@@ -84,47 +90,6 @@ const store = new Vuex.Store({
 			// { src:require('@/static/image/circleBanner/2.jpg'), isCheck:false },
 			// { src:require('@/static/image/circleBanner/3.jpg'), isCheck:false },
 			// { src:require('@/static/image/circleBanner/4.jpg'), isCheck:false },
-		],
-		// 版本
-		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: '资讯',
-				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: lifeData.myTip?lifeData.myTip: 0,
-				isDot: false,
-				customIcon: false,
-				pagePath:'/pages/user/user'
-			},
 		]
 	},
 	mutations: {

unimall-data/src/main/java/com/iotechn/unimall/data/domain/UserDO.java

@@ -68,5 +68,7 @@ public class UserDO extends SuperDO {
     /* liangxinId */
     @TableField("liangxin_id")
     private String liangxinId;
+    @TableField("cid")
+    private String cid;
 
 }

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/TaskMapper.xml

@@ -296,7 +296,7 @@
             s.seller as seller,
             s.seller_phone as sellerPhone,
             s.status as status,
-            ifnull(uc.price,uw.price) as contractPrice,
+            uc.price as contractPrice,
             DATE_FORMAT(s.gmt_create, "%Y-%m-%d %H:%i:%S") AS gmtCreate,
             DATE_FORMAT(s.gmt_update, "%Y-%m-%d %H:%i:%S") AS gmtUpdate
         FROM