gjy

components/addressBook.vue

@@ -22,7 +22,12 @@
 				<u-index-anchor :index="item.name" v-if="item.members&&item.members.length"/>
 				<view v-for="user in item.members" :key="user.id"  class="list-cell " @tap="linkToCard(user)" hover-class="message-hover-class">
 					<img-cache :src="user.avatar"></img-cache>
-					<view  class="list-cell-name">{{user.nickName}}</view>
+					<view>
+						<view  class="list-cell-name">{{user.nickName}}</view>
+						<u-tag v-if="user.traderFlag == 1" style="margin-left: 10px;font-weight: 500;" text="粮商" size ="mini"type="info" mode="plain"/>
+						<u-tag v-if="user.farmerFlag == 1" style="margin-left: 10px;font-weight: 500;" text="粮农" size ="mini"type="info" mode="plain"/>
+						<u-tag v-if="user.driverFlag == 1" style="margin-left: 10px;font-weight: 500;" text="物流" size ="mini"type="info" mode="plain"/>
+					</view>
 				</view>
 			</view>
 		</u-index-list>

components/chat/footer-input.vue

@@ -28,7 +28,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- #ifndef H5 -->
 			<view v-if='!show' class="more" @tap="showMore">
 				<view class="cuIcon-roundadd"></view>
 			</view>
@@ -36,7 +35,6 @@
 			<!-- <view class='textmsg' v-show='show'>
 				<view @tap="">发送</view>
 			</view> -->
-			<!-- #endif -->
 			<!-- #ifdef H5 -->
 			<view class="send" @tap="sendMsg(0, textMsg)" :class="isVoice?'hidden':''">
 				<view class="iconfont icontuiguang-weixuan"></view>

components/chatItem.vue

@@ -8,10 +8,18 @@
 				<view class="right_top_time ">{{value.lastOperTime || value.lastOpenTime | format}}</view>
 			</view>
 			<view class="right_btm ">
-				<view class="u-line-1">{{value.msgType==0?value.content:message[value.msgType]}}</view>
-				<view class="" v-show="voiceIcon">
-					<u-icon color="#c4c7cf" v-if="index%2==0" name="bell" size="22"></u-icon>
+				
+					<view class="u-line-1" >{{value.msgType==0?value.content:message[value.msgType]}}</view>
+					<view>
+					<u-tag v-if="value.traderFlag == 1" style="margin-left: 10rpx;" text="粮商" size ="mini"type="info" mode="plain"/>
+					<u-tag v-if="value.farmerFlag == 1" style="margin-left: 10rpx;" text="粮农" size ="mini"type="info" mode="plain"/>
+					<u-tag v-if="value.driverFlag == 1" style="margin-left: 10rpx;" text="物流" size ="mini"type="info" mode="plain"/>
 				</view>
+				
+				
+				<!-- <view class="" v-show="voiceIcon">
+					<u-icon color="#c4c7cf" v-if="index%2==0" name="bell" size="22"></u-icon>
+				</view> -->
 			</view>
 		</view>
 	</view>
@@ -97,7 +105,7 @@
 <style lang="scss">
 .item {
 		width: 750rpx;
-		height: 140rpx;
+		height: 160rpx;
 		display: flex;
 		align-items: center;
 		image {

pageB/contract/contract.vue

@@ -6,7 +6,7 @@
 		
 		<view class="cu-form-group">
 			<view class="title">采购</view>
-			
+	
 			<text style="margin-left: -30%;">编号{{item.contractNo}}{{item.procurementPlanType}}</text>
 			<text>{{item.status}}</text>
 		</view>

pageB/contract/look.vue

@@ -68,6 +68,41 @@
 				</view>
 			</view>
 			<view class="c-list">
+<<<<<<< HEAD
+=======
+				<view  class="c-row b-b">
+					<view class="con-list">
+						<text>{{goods.carNo}}</text>
+						<text>{{goods.sendDateStart}}发</text>
+					</view>
+				</view>
+				<view   class="c-row b-b">
+					<text class="tit">结算价(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.settlementPrice}}</text>
+					</view>
+				</view>
+				
+				<view  class="c-row b-b">
+					<text class="tit">净重(吨)</text>
+					<view class="con-list">
+						<text>{{goods.netWeight}}发&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{goods.packing}}收</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">扣款(元/吨)</text>
+					<view class="con-list">
+						<text>{{goods.minSale}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					
+					<!-- <view class="con-list"> -->
+					<text><button class="cu-btn commit margin-tb-sm lg" style="background-color:  #4CD964; width: 210rpx;height: 30px;"  @click="commit">发货磅单</button></text>
+					
+					<!-- </view> -->
+				</view>
+>>>>>>> 3b8362d62bd4fd79152708e10a20cdac52f16392
 				<view class="padding flex flex-direction">
 					<button class="cu-btn commit margin-tb-sm lg" style="background-color: #4CD964; " @click="commit1(goods)">添加发车信息</button>
 				</view>

pageC/businessCard/businessCard.vue

@@ -3,21 +3,26 @@
 		<view class="userinfo">
 			<u-avatar :src="userInfo.avatar" mode="square" size="110" @tap="previewImg(url)"></u-avatar>
 			<view class="userinfo-desc">
-				<view class="userinfo-desc-name">{{userInfo.nickName||userInfo.realname }}</view>
-				<view class="userinfo-desc-gray">积分：{{userInfo.money}}</view>
+				<view>
+					<view class="userinfo-desc-name">{{userInfo.nickName||userInfo.realname }}</view>
+					<u-tag v-if="userInfo.traderFlag == 1" style="margin-right: 10px;" text="粮商" size ="mini"type="info" mode="plain"/>
+					<u-tag v-if="userInfo.farmerFlag == 1" style="margin-right: 10px;" text="粮农" size ="mini"type="info" mode="plain"/>
+					<u-tag v-if="userInfo.driverFlag == 1" style="margin-right: 10px;" text="物流" size ="mini"type="info" mode="plain"/>
+				</view>
+				<!-- <view class="userinfo-desc-gray">积分：{{userInfo.money}}</view> -->
 			</view>
 		</view>
 		<view  class="perch"></view>
 		<u-cell-group v-if="1 == source">
-			<u-cell-item title="粮友圈" label="暂不支持查看粮友圈" hover-class="none" :title-style="{ marginLeft: '10rpx' }"></u-cell-item>
-			<u-cell-item title="更多信息" :title-style="{ marginLeft: '10rpx' }" @click="linkToMoreInfoMation"></u-cell-item>
+			<!-- <u-cell-item title="粮友圈" label="暂不支持查看粮友圈" hover-class="none" :title-style="{ marginLeft: '10rpx' }"></u-cell-item> -->
+			<!-- <u-cell-item title="更多信息" :title-style="{ marginLeft: '10rpx' }" @click="linkToMoreInfoMation"></u-cell-item> -->
 		</u-cell-group>
 		<view class="" v-if="!isItMe">
 			<view  class="perch"></view>
 			<u-cell-group v-if="0 == source || 2 == source">
-				<u-cell-item title=" " @click="toAddUser" :arrow="false" :center="true" :title-style="{ marginLeft: '10rpx' }">
+				<!-- <u-cell-item title=" " @click="toAddUser" :arrow="false" :center="true" :title-style="{ marginLeft: '10rpx' }">
 					<view style="text-align: center;">添加到通讯录</view>
-				</u-cell-item>
+				</u-cell-item> -->
 			</u-cell-group>
 			<u-cell-group v-else-if="1 == source">
 				<u-cell-item title="发消息" :arrow="false" :center="true" :title-style="{ marginLeft: '10rpx' }" @click="linkToChat">

pageD/identity/driverIdentity.vue

@@ -181,6 +181,7 @@
 				ModelIndex: '高栏',
 				Model: '',
 				ModelType: ["高栏", "集装箱", "自卸车"],
+				carLongIndex: '13',
 				carLong: '',
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				driverCarInfoList: {},

pageD/search/search.vue

@@ -36,7 +36,7 @@
 				:focus="true"
 				@custom="clickCancel"
 				@search="toSearch"
-				placeholder="h5能否自动获取焦点取决于浏览器的实现"
+				placeholder="请输入关键字搜索"
 				shape="square"
 				:action-style="{ color: '#007aff' }"
 				action-text="取消"
@@ -134,6 +134,7 @@ export default {
 						if (res.success) {
 							that.list = res.chats;
 						}
+						uni.hideLoading()
 					});
 					break;
 				case '2':
@@ -150,6 +151,8 @@ export default {
 						}
 						return flag
 					});
+					
+					uni.hideLoading()
 					break;
 				case '3':
 					that.$socket.getFriendMessageByCondition(this.chatId, that.userData.user.operId, this.pageNum, keyword, res => {

pageD/warehousings/warehousings.vue

@@ -27,7 +27,7 @@
 				<view class="c-row b-b">
 					<text class="tit">车牌号</text>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo.carNo}}</text>
+						<text>{{WarehouseInOutInfo1.carNo}}</text>
 					</view>
 				</view>
 			</view>
@@ -38,16 +38,18 @@
 			<view class="c-list">
 				<view class="cu-form-group align-start">
 					<view class="title">毛重(吨)</view>
-					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"></input>
+					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"
+						@input="grossWeightInput"></input>
 				</view>
 				<view class="cu-form-group align-start">
 					<view class="title">皮重(吨)</view>
-					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"></input>
+					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
+						@input="tareInput"></input>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">净重（吨）</text>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare > 0 ? WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare : 0}}</text>
+						<text>{{numFilter(WarehouseInOutInfo.netWeight)}}</text>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -59,10 +61,10 @@
 				<view class="cu-form-group align-start">
 					<view class="title">仓位号</view>
 					<view class="con-list">
-					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
-				</view>
+						<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+					</view>
 				</view>
-				
+
 				<view class="c-row b-b">
 					<text class="tit">入库类型 </text>
 					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
@@ -140,7 +142,7 @@
 							</view>
 							<!-- 底部操作菜单 -->
 							<view class="padding flex flex-direction">
-								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">暂存</button>
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit1">暂存</button>
 								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
 							</view>
 						</view>
@@ -160,26 +162,51 @@
 				goods: {},
 				list: {},
 				WarehouseInOutInfo: {
-					warehouseInOutDetail: {}
+					warehouseInOutDetail: {},
+					pcFlag: 0,
+					contractNo: {},
+					carNo: {},
 				},
-				pinIndex: 0,
+				WarehouseInOutInfo1: {
+					contractNo: {},
+					carNo: {},
+				},
+				pinIndex: '不限（默认）',
+				pinTypes: '',
 				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				ruIndex: 0,
+				ruIndex: '采购入库',
+				rutypes: '',
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
 			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.startNetWeight = option.startNetWeight
-			this.WarehouseInOutInfo.carNo = option.carNo+'('+ option.tranCarNo+ ')'
+			this.WarehouseInOutInfo.startWeight = option.startWeight
+			this.WarehouseInOutInfo1.carNo = option.carNo + '(' + option.tranCarNo + ')'
 			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
 		},
 		methods: {
+			commit1() {
+				console.log(this.list)
+				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.WarehouseInOutInfo.statusFlag = 1
+				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
 			commit() {
 				console.log(this.list)
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.WarehouseInOutInfo.statusFlag = 3
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 
 				}).catch(res => {
@@ -190,13 +217,33 @@
 					})
 				})
 			},
-			ruChange(e){
+			numFilter(value) {
+				if (!value) {
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
+			grossWeightInput(e) {
+				this.WarehouseInOutInfo.grossWeight = e.detail.value
+				if (this.WarehouseInOutInfo.grossWeight && this.WarehouseInOutInfo.tare) {
+					this.WarehouseInOutInfo.netWeight = this.WarehouseInOutInfo.grossWeight - this.WarehouseInOutInfo.tare
+				}
+			},
+			tareInput(e) {
+				this.WarehouseInOutInfo.tare = e.detail.value
+				if (this.WarehouseInOutInfo.grossWeight && this.WarehouseInOutInfo.tare) {
+					this.WarehouseInOutInfo.netWeight = this.WarehouseInOutInfo.grossWeight - this.WarehouseInOutInfo.tare
+				}
+			},
+			ruChange(e) {
 				this.ruIndex = e.detail.value
 				this.rutypes = this.ruType[this.ruIndex];
 			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
-				this.pintypes = this.pinType[this.pinIndex];
+				this.pinTypes = this.pinType[this.pinIndex];
 			},
 		}
 

pages.json

@@ -328,39 +328,7 @@
             }
             
         }
-        ,{
-            "path" : "pageD/identity/driverIdentity",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "司机认证",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pageD/identity/driverIdentityLook",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "认证信息",
-		        "enablePullDownRefresh": false
-		    }   
-		},
-		{
-		    "path" : "pageD/identity/companyIdentity",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "粮商认证",
-		        "enablePullDownRefresh": false
-		    }   
-		},
-		{
-		    "path" : "pageD/identity/companyIdentityLook",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "认证信息",
-		        "enablePullDownRefresh": false
-		    }   
-		}
+        
         ,{
             "path" : "pages/release/release",
             "style" :                                                                                    
@@ -376,61 +344,8 @@
                 "enablePullDownRefresh": false
             }
             
-        }
-        ,{
-            "path" : "pageD/myRelease/sellGrain",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "卖粮",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pageD/myRelease/buyGrain",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "买粮",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pageD/myRelease/sellDetails",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "卖粮详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pageD/myRelease/buyDetails",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "买粮详情",
-				"enablePullDownRefresh": false
-		    }
-		}
-        ,{
-            "path" : "pageD/warehousings/warehousings",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "入库",
-                "enablePullDownRefresh": false
-            }
-            
         }
 		
-		,{
-		    "path" : "pageD/warehousings/warehousingDetails",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "入库详情",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
     ],
 	"subpackages": [
 			{
@@ -987,12 +902,98 @@
 				    }
 				},
 				{
-				"path": "chooseBgImg/chooseBgImg",
-				"style": {
-					"enablePullDownRefresh": true ,
-					"navigationBarTitleText": "选择背景图"
+					"path": "chooseBgImg/chooseBgImg",
+					"style": {
+						"enablePullDownRefresh": true ,
+						"navigationBarTitleText": "选择背景图"
+					}
+				},{
+				    "path" : "identity/driverIdentity",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "司机认证",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},
+				{
+				    "path" : "identity/driverIdentityLook",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "认证信息",
+				        "enablePullDownRefresh": false
+				    }   
+				},
+				{
+				    "path" : "identity/companyIdentity",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "粮商认证",
+				        "enablePullDownRefresh": false
+				    }   
+				},
+				{
+				    "path" : "identity/companyIdentityLook",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "认证信息",
+				        "enablePullDownRefresh": false
+				    }   
+				}
+				,{
+				    "path" : "myRelease/sellGrain",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "卖粮",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},
+				{
+				    "path" : "myRelease/buyGrain",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "买粮",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},
+				{
+				    "path" : "myRelease/sellDetails",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "卖粮详情",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				},
+				{
+				    "path" : "myRelease/buyDetails",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "买粮详情",
+						"enablePullDownRefresh": false
+				    }
+				}
+				,{
+				    "path" : "warehousings/warehousings",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "入库",
+				        "enablePullDownRefresh": false
+				    }
+				    
+				}
+				
+				,{
+				    "path" : "warehousings/warehousingDetails",
+				    "style" :                                                                                    
+				    {
+				        "navigationBarTitleText": "入库详情",
+				        "enablePullDownRefresh": false
+				    }
+				    
 				}
-			}
 			  ]
 			}
 			

pages/business/business.vue

@@ -325,7 +325,7 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord,receivePrivate:thi
 	}
 </script>
 
-<style>
+<style lang='scss'>
 	page,
 	.content {
 		background: #F5F6FA;

pages/home/home.vue

@@ -13,12 +13,18 @@
 			<!-- #endif -->
 			
 			<!-- #ifdef APP-PLUS -->
-			<u-navbar :is-back="false" title="消息" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+				<view class="slot-wrap">
+						<text class = 'tip_text cuIcon-back' @click='back' ></text>
+				</view>
+			</u-navbar>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
 				<view class="slot-wrap">
 						<text class = 'tip_text cuIcon-back' @click='back' ></text>
 				</view>
 			</u-navbar>
-			
 			<!-- #endif -->
 			<!-- <selectInput :list="selectList" :list-key="'name'" :show.sync="selectShow" @on-select="checkSelect" @close="closeSelect" /> -->
 			<searchInput :searchType="1"/>
@@ -35,7 +41,14 @@
 			</u-navbar>
 			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
-			<u-navbar :is-back="false" title="通讯录" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+			<view class="slot-wrap">
+					<text class = 'tip_text cuIcon-back' @click='back'></text>
+			</view>
+			</u-navbar>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
 			<view class="slot-wrap">
 					<text class = 'tip_text cuIcon-back' @click='back'></text>
 			</view>
@@ -53,7 +66,14 @@
 			</u-navbar>
 			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
-			<u-navbar :is-back="false" title="发现" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
+			<view class="slot-wrap">
+					<text class = 'tip_text cuIcon-back' @click='back' ></text>
+			</view>
+			</u-navbar>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<u-navbar :is-back="false" title="粮信" :background="{ background: '#F6F7F8'  }" title-color="#404133" :border-bottom="false" z-index="1001">
 			<view class="slot-wrap">
 					<text class = 'tip_text cuIcon-back' @click='back' ></text>
 			</view>
@@ -65,7 +85,7 @@
 				</u-cell-item>
 			</u-cell-group>	
 			<view style="height: 10rpx;"></view>
-			<u-cell-group>
+			<!-- <u-cell-group>
 				<u-cell-item  title="扫一扫" :title-style="{marginLeft:'30rpx',fontWeight:'800'}" @tap="linkToScan">
 					<u-icon slot="icon" name="scan" color="#409eff" size="40"></u-icon> 
 				</u-cell-item>
@@ -78,56 +98,7 @@
 					</u-cell-item>
 				</u-cell-group>
 				<view v-if="index!=linkItem.length" class="" style="height: 10rpx;"></view>
-			</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>
-				</view>
-				<view class="u-flex u-row-right" style="width: 100%;">
-					<view class="camera u-flex u-row-center">
-						<u-icon @tap="linkToMoment" name="camera-fill" color="#000000" size="48"></u-icon>
-					</view>
-				</view>
-			</u-navbar>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<u-navbar :is-back="false" title="　" :border-bottom="false">
-				<view class="slot-wrap">
-					<text class = 'tip_text cuIcon-back' @click='back' ></text>
-				</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>
-				</view>
-				<view class="u-flex-1">
-					<view class="u-font-18 u-p-b-20">{{userData.user.realname}}</view>
-					<view class="u-font-14 u-tips-color">积分: {{userData.user.money}}</view>
-				</view>
-				<view class="u-m-l-10 u-p-10">
-					<u-icon name="arrow-right" color="#969799" size="28"></u-icon>
-				</view>
-			</view>
-			
-			<view class="u-m-t-20">
-				<u-cell-group>
-					<u-cell-item @tap="linkTomy(index)" v-for="(item, index) in groupList" :key="index" :title="item.title" :title-style="{ marginLeft: '30rpx' ,fontWeight:'800'}">
-						<u-icon slot="icon" :name="item.icon" :color="item.color" size="40"></u-icon>
-					</u-cell-item>
-				</u-cell-group>
-			</view>
-			
-			<view class="u-m-t-20">
-				<u-cell-group>
-					<u-cell-item @click="linkToSetting" title="设置" :title-style="{ marginLeft: '30rpx' ,fontWeight:'800'}">
-						<u-icon slot="icon" name="setting" color="#409eff" size="40"></u-icon>
-					</u-cell-item>
-				</u-cell-group>
-			</view>
+			</view> -->
 		</block>
 		<view class="cu-bar tabbar bg-white shadow foot">
 			<view :class="PageCur=='msg'?'action text-pink':'action text-gray'" @click="tabClick" data-cur="msg">
@@ -139,9 +110,6 @@
 			<view :class="PageCur=='find'?'action text-pink':'action text-gray'" @click="tabClick" data-cur="find">
 				<view :class="PageCur=='find'?'cuIcon-friendfill':'cuIcon-friendfill'"></view> 发现
 			</view>
-			<view :class="PageCur=='my'?'action text-pink':'action text-gray'" @click="tabClick" data-cur="my">
-				<view :class="PageCur=='my'?'cuIcon-people':'cuIcon-people'"></view> 我的
-			</view>
 		</view>
 	</view>
 </template>
@@ -224,8 +192,14 @@ export default {
 	computed: {
 			...mapState(['hasLogin', 'userInfo'])
 	},
+	onReady() {
+		uni.setNavigationBarTitle({
+			title: '新的标题'
+		});
+	},
 	onShow() {
 		uni.hideTabBar()
+		
 		this.userInfo =  uni.getStorageSync("userInfo")
 		console.log(this.userData.user.realname,this.userInfo.nickname)
 		// if(this.userData.user.realname == this.userInfo.nickname){

pages/public/code.vue

@@ -203,7 +203,7 @@
 	width: 100vw;
 	height: 100vh;
 	overflow: hidden;
-	background: url('../../static/img/login/bg.png');
+	background: url('~@/static/img/login/bg.png');
 	background-size:100%;}
 	.back-btn {
 		position: absolute;

pages/public/login.vue

@@ -863,7 +863,7 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: hidden;
-		background: url('../../static/img/login/bg.png');
+		background: url('~@/static/img/login/bg.png');
 		background-size:100%;
 	}
 

pages/public/login_account_number.vue

@@ -868,7 +868,7 @@ username: "13333333333"}).then(res => {
 		width: 100vw;
 		height: 100vh;
 		overflow: hidden;
-		background: url('../../static/img/login/bg.png');
+		background: url('~@/static/img/login/bg.png');
 		background-size:100%;
 	}
 

pages/public/register.vue

@@ -995,7 +995,7 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: hidden;
-		background: url('../../static/img/login/bg.png');
+		background: url('~@/static/img/login/bg.png');
 		background-size:100%;
 	}
 	.close{

pages/public/reset.vue

@@ -742,7 +742,7 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: hidden;
-		background: url('../../static/img/login/bg.png');
+		background: url('~@/static/img/login/bg.png');
 		background-size:100%;
 	}
 

pages/task/my_task.vue

@@ -109,9 +109,7 @@
 				})
 				}else{
 					uni.navigateTo({
-						url: `/pageD/warehousings/warehousings?id=${item.id}&contractNo=${item.contractNo}
-						&goodsName=${item.goodsName}&startNetWeight=${item.startNetWeight}
-						&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+						url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
 					})
 				}
 			}