Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

AuthKey_6465D27N2F.p8

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgKuRfyjQBCfmmZaEy
+TtxSYc6iGFyNYtcQboS4fpRkm3OgCgYIKoZIzj0DAQehRANCAAQtNN5TzB1SpBBJ
+gQ6w0fetmm3XzN/Q94joy0oNYw0eURSsQOiN5I/LY3echAi13QLJk4rj5KfgZGFX
+O7Yi2xUv
+-----END PRIVATE KEY-----

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
-	// baseUrl: 'http://192.168.1.120:8090/',
+	// baseUrlNew: 'http://192.168.1.122:9100/',
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.110:8090/',
+	baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.9",
+    "versionCode" : 109,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pageA/product/business_buy.vue

@@ -27,7 +27,7 @@
 		<view   class="c-row b-b ">
 			<view class="title">收货库</view>
 			<view class="con-list">
-				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}{{purchaseOrder.receiveWarehouse}}</view>
+				<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
 			</view>
 		</view>
 		<view v-if='companyId!=2' class="c-row b-b">

pageA/product/business_sale.vue

@@ -27,7 +27,7 @@
 		<view   class="c-row b-b ">
 			<view class="title">出货库</view>
 			<view class="con-list">
-				<view class="title">{{purchaseOrder.sendPrivate}}{{purchaseOrder.sendCity}}{{purchaseOrder.sendArea}}{{purchaseOrder.sendWarehouse}}</view>
+				<view class="title">{{purchaseOrder.sendWarehouse}}</view>
 			</view>
 		</view>
 		<view v-if='companyId!=2' class="c-row b-b">

pageA/product/sales_detail.vue

@@ -384,7 +384,7 @@
 							uni.navigateTo({
 								url: `/pageA/product/business_sale?id=${this.goods.id}&sendArea=${this.goods.sendArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&sendCity=${this.goods.sendCity}&sendPrivate=${this.goods.sendPrivate}&seller=${this.goods.seller}
-										&basisPrice=${this.goods.basisPrice}&salPrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
+										&basisPrice=${this.goods.basisPrice}&salePrice=${this.goods.salePrice}&sendWarehouse=${this.goods.sendWarehouse}
 										&salePlanType=${this.goods.salePlanType}&salePlan=${this.goods.salePlanNo}&baggingNotes=${this.goods.baggingNotes}&compId=${this.goods.compId}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}

pages/attestation/indexTwo.vue

@@ -374,7 +374,8 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: (e) => {
-						this.$api.doRequest('post',
+						if (res.confirm) {
+							this.$api.doRequest('post',
 								'/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', {
 									id: item.id
 								}, 'application/json;charset=UTF-8').then(res => {
@@ -392,6 +393,7 @@
 									duration: 2000
 								})
 							});
+						}
 					},
 					fail: () => {},
 					complete: () => {}

pages/sale/information.vue

@@ -569,7 +569,7 @@
 		margin-right:10px;
 	}
 	.yesterday{
-		font-size:18px;
+		font-size:14px;
 		font-weight:600;
 		vertical-align: middle;
 	}

pages/task/my_task.vue

@@ -38,8 +38,12 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		name: "task",
+		
 		data() {
 			return {
 				PageCur: "task",
@@ -59,8 +63,13 @@
 				keyword:""
 			};
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onShow() {
 			this.getIndexBuyData()
+			this.userInfo =  uni.getStorageSync("userInfo")
+			this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		// onLoad(options) {
 		// 	this.getIndexBuyData()
@@ -144,6 +153,7 @@
 					title:"正在加载"
 				})
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				this.warehouseInOutInfo.phone = this.userInfo.phone
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {

pages/user/user.vue

@@ -18,7 +18,7 @@
 		<view class="indexUp flex">
 			<image v-bind:src="headUrl" class="headPortrait"></image>
 			<view class="personal">
-				<view class="information">{{username}}</view>
+				<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
 				<view class="information">{{userphone}}</view>
 			</view>
 
@@ -35,8 +35,8 @@
 						<text class="text-grey">{{item.name}}</text>
 					</view>
 					<view>
-						<text v-if='item.num==4&&taskTip' class='badge_user'>{{taskTip}}</text>
-						<text v-if='item.num==2&&contractTip' class='badge_user'>{{contractTip}}</text>
+						<text v-if='item.num==2&&taskTip' class='badge_user'>{{taskTip}}</text>
+						<text v-if='item.num==1&&contractTip' class='badge_user'>{{contractTip}}</text>
 						<text class='tip_text cuIcon-right'></text>
 					</view>
 					<!-- <image src="../../static/img/sign/authentication@3x.png" mode=""></image> -->
@@ -255,16 +255,19 @@
 		onShow() {
 			uni.showTabBar()
 			this.loadData()
-			if(this.userInfo.avatarUrl == "" || this.userInfo.avatarUrl == null){
-					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
-			}else if(this.userInfo.avatarUrl != "" || this.userInfo.avatarUrl != null){
+			this.userInfo =  uni.getStorageSync("userInfo")
+			if(!this.userInfo.avatarUrl){
+				this.headUrl = "../../static/img/myimg/YongHu@3x.png"
+			}else{
 				this.headUrl = this.userInfo.avatarUrl
 			}
-			this.username = this.userInfo.userName
-			if(	this.username == null || this.username == ""){
+			if(!this.username){
 				this.username = "请更改昵称"
 			}
-			if(this.userInfo.phone != null || this.userInfo.phone != ""){
+			else{
+				this.username = this.userInfo.userName
+			}
+			if(this.userInfo.phone){
 				this.userphone = this.userInfo.phone
 			}
 		},
@@ -383,7 +386,7 @@
 			toLogin() {
 				if (!this.hasLogin) {
 					uni.navigateTo({
-						url: '/pages/public/login'
+						url: '/pages/public/login_account_number'
 					})
 				}
 				// else if(!this.userInfo.nickname){

websocket_sdk.js

@@ -274,45 +274,81 @@ export default class Websocket {
 					}
 				})
 			}
-			let accessToken = userInfo ? userInfo.accessToken : ''
-			var data = {}
-			var _mt = 'getTips'
-			var _gp = 'integral'
 			uni.request({
-				url: baseUrl + '/m.api',
-				data: {
-					...data,
-					_gp,
-					_mt
-				},
-				method: 'POST',
-				header: {
-					'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-					'ACCESSTOKEN': accessToken
-				},
-				success: (res) => {						
-					if (res.statusCode === 200) {
-						let name = 'myTip';
-						let value = res.data.data.myTips;
-						store.commit('$uStore', {
-							name,
-							value
-						});
-						name = 'taskTip';
-						value = res.data.data.task;
-						store.commit('$uStore', {
-							name,
-							value
-						});
-						name = 'contractTip';
-						value = res.data.data.contract;
-						store.commit('$uStore', {
-							name,
-							value
-						});
-					}
-				}
+			    url: baseUrlNew + '/salePlanInfo/getTips',
+			    data: {
+			    	phone: userInfo.phone
+			    },
+			    method: 'GET',
+			    success: (res) => {			
+			    	if (res.statusCode === 200) {
+			    		let name = 'myTip';
+			    		let value = res.data.data.myTip;
+			    		store.commit('$uStore', {
+			    			name,
+			    			value
+			    		});
+						if(value != 0){
+							uni.setTabBarBadge({
+								index:3,
+								text:value+""
+							})
+						}
+			    		name = 'taskTip';
+			    		value = res.data.data.taskTip;
+			    		store.commit('$uStore', {
+			    			name,
+			    			value
+			    		});
+			    		name = 'contractTip';
+			    		value = res.data.data.contractTip;
+			    		store.commit('$uStore', {
+			    			name,
+			    			value
+			    		});
+			    	}
+			    }
 			})
+			
+			// let accessToken = userInfo ? userInfo.accessToken : ''
+			// var data = {}
+			// var _mt = 'getTips'
+			// var _gp = 'integral'
+			// uni.request({
+			// 	url: baseUrl + '/m.api',
+			// 	data: {
+			// 		...data,
+			// 		_gp,
+			// 		_mt
+			// 	},
+			// 	method: 'POST',
+			// 	header: {
+			// 		'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+			// 		'ACCESSTOKEN': accessToken
+			// 	},
+			// 	success: (res) => {						
+			// 		if (res.statusCode === 200) {
+			// 			let name = 'myTip';
+			// 			let value = res.data.data.myTips;
+			// 			store.commit('$uStore', {
+			// 				name,
+			// 				value
+			// 			});
+			// 			name = 'taskTip';
+			// 			value = res.data.data.task;
+			// 			store.commit('$uStore', {
+			// 				name,
+			// 				value
+			// 			});
+			// 			name = 'contractTip';
+			// 			value = res.data.data.contract;
+			// 			store.commit('$uStore', {
+			// 				name,
+			// 				value
+			// 			});
+			// 		}
+			// 	}
+			// })
 		})
 	}
 	getInfo(){