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

App.vue

@@ -13,7 +13,11 @@
 		},
 		onLaunch: function() {
 			// #ifdef APP-PLUS
-			appUpdate()
+			let type = uni.getSystemInfoSync().platform
+			console.log(type)
+			if(type == "android"){
+				appUpdate()
+			}
 			// #endif
 			this.$socket.initWebIM(this.$ws, true, true)
 			let userInfo = uni.getStorageSync('userInfo') || '';

common/appUpdate.js

@@ -3,91 +3,78 @@
 
 import * as config from '../config'
 export default function appUpdate() {
-	var data ={
-			appid: plus.runtime.appid,
-			version: plus.runtime.version,
-			imei: "1"
-		}
 		
-	let baseUrl = config.def().baseUrl
-	let _gp = 'user'
-	let _mt = 'updateAppVersion'
+	let baseUrlNew = config.def().baseUrlNew
 	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) => {
-			
-			console.log("uni.request update success",res)
-			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
-				let client_version = wgtinfo.version
-				var flag_update = client_version.split(".").splice(0, 2).join(".") != res.data.data.version.split(".").splice(0, 2)
-					.join(".")
-				var flag_hot = (Number(client_version.split(".")[2]) < Number(res.data.data.version.split(".")[2])) & !flag_update
-				console.log("client_version",client_version) 
-				console.log("flag_update",flag_update)
-				console.log("flag_hot",flag_hot)
-
-				if (flag_update) {
-					console.log("更新弹窗")
-					// 提醒用户更新
-					uni.showModal({
-						title: '更新提示',
-						content: res.data.data.note,
-						success: (showResult) => {
-							if (showResult.confirm) {
-								plus.nativeUI.toast("正在准备环境，请稍后!");
-								console.log(res.data.data.url, )
-								var dtask = plus.downloader.createDownload(res.data.data.url, {
-									method: 'GET',
-									filename: '_doc/update/'
-								}, function(d, status) {
-									if (status == 200) {
-										var path = d.filename; //下载apk
-										plus.runtime.install(path); // 自动安装apk文件
-									} else {
-										plus.nativeUI.alert('版本更新失败:' + status);
-									}
-								});
-								dtask.start();
+	    url: baseUrlNew + '/appVersion/selectInfo',
+	    data: {
+	    	appid: plus.runtime.appid,
+	    	version: plus.runtime.version,
+	    	imei: "1"
+	    },
+	    method: 'GET',
+	    success: (res) => {			
+	    	if (res.statusCode === 200) {
+				console.log("uni.request update success",res)
+				plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
+					let client_version = wgtinfo.version
+					var flag_update = client_version.split(".").splice(0, 2).join(".") != res.data.data.version.split(".").splice(0, 2)
+						.join(".")
+					var flag_hot = (Number(client_version.split(".")[2]) < Number(res.data.data.version.split(".")[2])) & !flag_update
+					console.log("client_version",client_version) 
+					console.log("flag_update",flag_update)
+					console.log("flag_hot",flag_hot)
+				
+					if (flag_update) {
+						console.log("更新弹窗")
+						// 提醒用户更新
+						uni.showModal({
+							title: '更新提示',
+							content: res.data.data.note,
+							success: (showResult) => {
+								if (showResult.confirm) {
+									plus.nativeUI.toast("正在准备环境，请稍后!");
+									console.log(res.data.data.url, )
+									var dtask = plus.downloader.createDownload(res.data.data.url, {
+										method: 'GET',
+										filename: '_doc/update/'
+									}, function(d, status) {
+										if (status == 200) {
+											var path = d.filename; //下载apk
+											plus.runtime.install(path); // 自动安装apk文件
+										} else {
+											plus.nativeUI.alert('版本更新失败:' + status);
+										}
+									});
+									dtask.start();
+								}
 							}
-						}
-					})
-				} else if (flag_hot) {
-					console.log("热更新") 
-					uni.downloadFile({
-						url: res.data.data.wgtUrl,
-						success: (downloadResult) => {
-							console.log(downloadResult.tempFilePath)
-							if (downloadResult.statusCode === 200) {
-								plus.nativeUI.toast(`正在热更新!${res.data.data.versionCode}`);
-								plus.runtime.install(downloadResult.tempFilePath, {
-									force: false
-								}, function() {
-									plus.nativeUI.toast("热更新成功");
-									plus.runtime.restart();
-								}, function(e) {
-									console.log(e)
-									plus.nativeUI.toast(`热更新失败:${e.message}`);
-								});
+						})
+					} else if (flag_hot) {
+						console.log("热更新") 
+						uni.downloadFile({
+							url: res.data.data.wgtUrl,
+							success: (downloadResult) => {
+								console.log(downloadResult.tempFilePath)
+								if (downloadResult.statusCode === 200) {
+									plus.nativeUI.toast(`正在热更新!${res.data.data.versionCode}`);
+									plus.runtime.install(downloadResult.tempFilePath, {
+										force: false
+									}, function() {
+										plus.nativeUI.toast("热更新成功");
+										plus.runtime.restart();
+									}, function(e) {
+										console.log(e)
+										plus.nativeUI.toast(`热更新失败:${e.message}`);
+									});
+								}
 							}
-						}
-					});
-				}
-
-			});
-
-
-
-
-		}
+						});
+					}
+				
+				});
+	    	}
+	    }
 	})
+
 }

components/bert-suggest/suggest.vue

@@ -0,0 +1,98 @@
+<template>
+	<view>
+		<uni-card class="box" :isFull="true" title="反馈意见" :thumbnail="contentIcon">
+			<textarea v-model="data.content" placeholder="您的反馈对我们非常重要,请在此输入."></textarea>
+		</uni-card>
+		<uni-card class="box" :isFull="true" title="联系方式" :thumbnail="contactIcon">
+			<input v-model="data.contact" placeholder="手机 QQ或e-mail,方便我们联系您" />
+		</uni-card>
+		<button class="submit-btn" @click="submit">提交</button>
+	</view>
+</template>
+
+<script>
+	import uniCard from '@/components/uni-card/uni-card.vue';
+	export default {
+		components:{
+			uniCard
+		},
+		data() {
+			return {
+				data: {
+					imgList: [],
+					content: "",
+					contact: ""
+				},
+				contentIcon: require("./icons/suggestion.png"),
+				contactIcon: require("./icons/contact.png"),
+				imgListIcon: require("./icons/image.png")
+			}
+		},
+		methods: {
+			chooseImage() {
+				let _self = this;
+				uni.chooseImage({
+					sizeType: ['compressed', 'original'],
+					sourceType: ['album', 'camera'],
+					success: function(res) {
+						_self.data.imgList = _self.data.imgList.concat(res.tempFiles)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				});
+			},
+			removeImage(index) {
+				this.data.imgList.splice(index, 1)
+			},
+			previewImage(index) {
+				uni.previewImage({
+					current: index,
+					urls: this.data.imgList.map(r => r.path)
+				});
+			},
+			submit() {
+				this.$emit("submit", this.data)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.box {
+		margin-bottom: 20rpx;
+	}
+	.imgs {
+		position: relative;
+		display: inline-flex;
+		flex-wrap: wrap;
+		margin: 10rpx;
+		width: 150rpx;
+		height: 150rpx;
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 10rpx;
+			border: 1rpx solid #ebebeb;
+		}
+		.remove {
+			line-height: 30rpx;
+			text-align: center;
+			border-radius: 10rpx;
+			position: absolute;
+			right: 0rpx;	
+			top: 0rpx;
+			width: 30rpx;
+			height: 30rpx;
+			font-weight: bold;
+			background-color: #e53c25;
+		}
+		.add-img {
+			background-color: #f0f0f0;
+		}
+	}
+	.submit-btn {
+		background-color: #49abe8;
+		margin: 20rpx 0;
+	}
+</style>

components/swiperup.vue

@@ -93,8 +93,8 @@
 		position: absolute;
 		background: #fff;
 		display: block;
-		width: 37px;
-		height: 37px;
+		width: 78rpx;
+		height: 78rpx;
 		left: -15px;
 		z-index: 1;
 		-webkit-border-radius: 30%;
@@ -105,8 +105,8 @@
 		position: absolute;
 		background: #fff;
 		display: block;
-		width: 37px;
-		height: 37px;
+		width: 78rpx;
+		height: 78rpx;
 		right: -15px;
 		z-index: 1;
 		-webkit-border-radius: 30%;

components/uni-card/uni-card.vue

@@ -0,0 +1,431 @@
+<template>
+	<view class="uni-card uni-border"
+		:class="{ 'uni-card--full': isFull === true || isFull === 'true', 'uni-card--shadow': isShadow === true || isShadow === 'true'}">
+		<!-- 基础 -->
+		<view v-if="mode === 'basic' && title" @click.stop="onClick" class="uni-card__head-padding">
+			<view class="uni-card__header uni-border-bottom">
+				<slot name="header">
+					<view v-if="thumbnail" class="uni-card__header-extra-img-view">
+						<image :src="thumbnail" class="uni-card__header-extra-img" />
+					</view>
+					<text class="uni-card__header-title-text">{{ title }}</text>
+					<text v-if="extra" class="uni-card__header-extra-text">{{ extra }}</text>
+				</slot>
+			</view>
+		</view>
+		<!-- 标题 -->
+		<view v-if="mode === 'title'" @click.stop="onClick" class="uni-card__head-padding">
+			<view class="uni-card__title uni-border-bottom">
+				<slot name="header">
+					<view class="uni-card__title-box">
+						<view v-if="thumbnail" class="uni-card__title-header">
+							<image class="uni-card__title-header-image" :src="thumbnail" mode="scaleToFill" />
+						</view>
+						<view class="uni-card__title-content">
+							<text class="uni-card__title-content-title uni-ellipsis">{{ title }}</text>
+							<text class="uni-card__title-content-extra uni-ellipsis">{{ subTitle }}</text>
+						</view>
+					</view>
+					<view v-if="extra">
+						<text class="uni-card__header-extra-text">{{ extra }}</text>
+					</view>
+				</slot>
+			</view>
+		</view>
+		<!-- 图文 -->
+		<view v-if="mode === 'style'" class="uni-card__thumbnailimage" @click.stop="onClick">
+			<view class="uni-card__thumbnailimage-box">
+				<image v-if="thumbnail" class="uni-card__thumbnailimage-image" :src="thumbnail" mode="aspectFill" />
+				<uni-icons v-if="!thumbnail" type="image" size="30" color="#999" />
+			</view>
+			<view v-if="title" class="uni-card__thumbnailimage-title">
+				<text class="uni-card__thumbnailimage-title-text">{{ title }}</text>
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view class="uni-card__content uni-card__content--pd" @click.stop="onClick">
+			<view v-if="mode === 'style' && extra" class=""><text class="uni-card__content-extra">{{ extra }}</text>
+			</view>
+			<slot />
+		</view>
+		<!-- 底部 -->
+		<view v-if="note" class="uni-card__footer uni-border-top">
+			<slot name="footer">
+				<text class="uni-card__footer-text">{{ note }}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Card 卡片
+	 * @description 卡片视图组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=22
+	 * @property {String} title 标题文字
+	 * @property {String} subTitle 副标题（仅仅mode=title下生效）
+	 * @property {String} extra 标题额外信息
+	 * @property {String} note 底部信息
+	 * @property {String} thumbnail 标题左侧缩略图
+	 * @property {String} mode = [basic|style|title] 卡片模式
+	 * 	@value basic 基础卡片
+	 * 	@value style 图文卡片
+	 * 	@value title 标题卡片
+	 * @property {Boolean} isFull = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
+	 * @property {Boolean} isShadow = [true | false] 卡片内容是否开启阴影
+	 * @event {Function} click 点击 Card 触发事件
+	 * @example <uni-card title="标题文字" thumbnail="xxx.jpg" extra="额外信息" note="Tips">内容主体，可自定义内容及样式</uni-card>
+	 */
+	export default {
+		name: 'UniCard',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+			extra: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			thumbnail: {
+				type: String,
+				default: ''
+			},
+			mode: {
+				type: String,
+				default: 'basic'
+			},
+			isFull: {
+				// 内容区域是否通栏
+				type: Boolean,
+				default: false
+			},
+			isShadow: {
+				// 是否开启阴影
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-card {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex: 1;
+		box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+		/* #endif */
+		margin: $uni-spacing-col-lg $uni-spacing-row-lg;
+		background-color: $uni-bg-color;
+		position: relative;
+		flex-direction: column;
+		border-radius: 5px;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+
+	.uni-border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-color: $uni-border-color;
+		border-style: solid;
+		border-width: 0.5px;
+		/* #endif */
+		z-index: 1;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-border:after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		top: 0;
+		right: 0;
+		border: 1px solid $uni-border-color;
+		border-radius: 10px;
+		box-sizing: border-box;
+		width: 200%;
+		height: 200%;
+		transform: scale(0.5);
+		transform-origin: left top;
+		z-index: -1;
+	}
+
+	/* #endif */
+
+	.uni-border-bottom {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		/* #endif */
+		z-index: 1;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-border-bottom:after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		top: 0;
+		right: 0;
+		border-bottom: 1px solid $uni-border-color;
+		box-sizing: border-box;
+		width: 200%;
+		height: 200%;
+		transform: scale(0.5);
+		transform-origin: left top;
+		z-index: -1;
+	}
+
+	/* #endif */
+	.uni-border-top {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		z-index: 1;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-border-top:after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		top: 0;
+		right: 0;
+		border-top: 1px solid $uni-border-color;
+		box-sizing: border-box;
+		width: 200%;
+		height: 200%;
+		transform: scale(0.5);
+		transform-origin: left top;
+		z-index: -1;
+	}
+
+	/* #endif */
+
+	.uni-card__thumbnailimage {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		// display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		height: 150px;
+		background-color: #F1F1F1;
+		overflow: hidden;
+	}
+
+	.uni-card__thumbnailimage-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		height: 150px;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		overflow: hidden;
+	}
+
+	.uni-card__thumbnailimage-image {
+		flex: 1;
+	}
+
+	.uni-card__thumbnailimage-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		flex-direction: row;
+		padding: $uni-spacing-col-base $uni-spacing-col-lg;
+		background-color: $uni-bg-color-mask;
+	}
+
+	.uni-card__thumbnailimage-title-text {
+		flex: 1;
+		font-size: $uni-font-size-base;
+		color: #fff;
+	}
+
+	.uni-card__title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 10px;
+
+	}
+
+	.uni-card__title-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		overflow: hidden;
+	}
+
+	.uni-card__title-header {
+		width: 40px;
+		height: 40px;
+		overflow: hidden;
+		border-radius: 5px;
+		padding-right: 10px;
+	}
+
+	.uni-card__title-header-image {
+		width: 40px;
+		height: 40px;
+	}
+
+	.uni-card__title-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		flex: 1;
+		height: 40px;
+		overflow: hidden;
+	}
+
+	.uni-card__title-content-title {
+		font-size: $uni-font-size-base;
+		line-height: 22px;
+	}
+
+	.uni-card__title-content-extra {
+		font-size: $uni-font-size-sm;
+		line-height: 27px;
+		color: $uni-text-color-grey;
+	}
+
+	.uni-card__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		position: relative;
+		flex-direction: row;
+		padding: $uni-spacing-col-lg;
+		align-items: center;
+	}
+
+	.uni-card__header-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		margin-right: $uni-spacing-col-base;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-card__header-title-text {
+		font-size: $uni-font-size-lg;
+		flex: 1;
+		color: #333;
+	}
+
+	.uni-card__header-extra-img {
+		height: $uni-img-size-sm;
+		width: $uni-img-size-sm;
+		margin-right: $uni-spacing-col-base;
+	}
+
+	.uni-card__header-extra-text {
+		flex: 1;
+		margin-left: $uni-spacing-col-base;
+		font-size: $uni-font-size-sm;
+		text-align: right;
+		color: $uni-text-color-grey;
+	}
+
+	.uni-card__content {
+		color: $uni-text-color;
+	}
+
+	.uni-card__content--pd {
+		padding: $uni-spacing-col-lg;
+	}
+
+	.uni-card__content-extra {
+		font-size: $uni-font-size-base;
+		padding-bottom: 10px;
+		color: $uni-text-color-grey;
+	}
+
+	.uni-card__footer {
+		justify-content: space-between;
+		padding: $uni-spacing-col-lg;
+	}
+
+	.uni-card__footer-text {
+		color: $uni-text-color-grey;
+		font-size: $uni-font-size-sm;
+	}
+
+	.uni-card--shadow {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.1);
+		/* #endif */
+	}
+
+	.uni-card--full {
+		margin: 0;
+		border-radius: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-card--full:after {
+		border-radius: 0;
+	}
+
+	/* #endif */
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+
+	.uni-card__head-padding {
+		// mar: 12px;
+	}
+</style>

config/index.js

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

main.js

@@ -204,7 +204,7 @@ const doRequest = (method, url, data,header)=> {
                     resolve(result)
                 },
                 fail: function(e) {
-                    console.log('error in...')
+                    console.log('error in...',e)
                     // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
                     reject(e)
                 },

manifest.json

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

pageA/product/business_buy.vue

@@ -164,7 +164,7 @@
 					bankNameIndex:0,
 					packingIndex:0,
 					invoiceIndex:0,
-					packingType: ['散袋(默认)','大袋','小袋'],
+					packingType: ['散粮','大袋','小袋'],
 					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

pageB/contract/collectLook.vue

@@ -167,7 +167,7 @@
 						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
 
 					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&palnId=' + this.planId
+						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&planId=' + this.planId
 
 				})
 			},

pageB/contract/contract.vue

@@ -252,7 +252,7 @@
 			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&planId=${item.planId}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {

pageB/contract/contract_detail.vue

@@ -178,17 +178,15 @@
 						return new Date()
 					}
 				},	
-			onShow() {
-			},
+			// onShow() {
+			// },
 			onLoad(option) {
-				this.goods.planId=option.planId
-				this.goodsName=option.goodsName
+				this.goods.planId = option.planId
+				this.goodsName = option.goodsName
 				this.contractNo = option.contractNo
-				this.goods.goodsName=option.goodsName
+				this.goods.goodsName = option.goodsName
 				this.goods.contractNo = option.contractNo
-				this.goods.tranCarNo=option.tranCarNo
-				console.log(this.goods.tranCarNo)
-				
+				this.goods.tranCarNo = option.tranCarNo
 			},
 			methods: {
 				 DateChange(e) {

pageB/contract/look.vue

@@ -128,12 +128,10 @@
 				imgstatus: false,
 				reason: "",
 				price: undefined,
-
 				imgstatus:false,
 				reason:"",
 				price:undefined,
 				planId:'',
-
 			};
 		},
 		onShow() {
@@ -145,7 +143,6 @@
 			this.id = option.id
 			this.planId=option.planId
 			this.goods.contractNo = option.contractNo
-
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -182,13 +179,10 @@
 				} else if (this.carlist.length < 1000 && this.carlist.length > 99) {
 					tranCarNo = 'C' + (this.carlist.length + 1)
 				}
+				var that = this
 				uni.navigateTo({
-
-					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
-
-					url: `/pageB/contract/contract_detail?contractNo=`+this.goods.contractNo+'&goodsName='+this.goods.goodsName+'&tranCarNo='+tranCarNo+'&palnId='+this.planId
-
+					url: `/pageB/contract/contract_detail?contractNo=`
+					+that.goods.contractNo+'&goodsName='+that.goods.goodsName+'&tranCarNo='+tranCarNo+'&planId='+that.planId
 				})
 			},
 			confirmunload(item) {

pageD/identity/companyIdentityLook.vue

@@ -35,8 +35,6 @@
 				<image v-bind:src="idlow" class="picture"></image>
 			</view>
 			<view class="personalcss">
-				
-			
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">

pageD/identity/companyIdentityThree.vue

@@ -337,7 +337,12 @@
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							that.identityAuthenticationInfo.commonId = that.userInfo.id
+							if(that.userInfo){
+								that.identityAuthenticationInfo.commonId = that.userInfo.id
+							}
+							else{
+								that.identityAuthenticationInfo.commonId = res.data.data.id
+							}
 							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
 							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 							uni.showModal({

pageD/myRelease/buyGrain.vue

@@ -212,9 +212,9 @@
 					freightPayerKey: 0,
 					priceType: "定价采购",
 					procurementPlanType: "现货",
-					grain: "塔粮",
+					grain: "",
 					grade: "",
-					outputYear: "2020",
+					outputYear: "",
 					packingType: "",
 					freightPayer: "",
 				},

pageD/myRelease/sellGrain.vue

@@ -208,7 +208,7 @@
 					packingTypeKey: 0,
 					freightPayerKey: -1,
 					priceType: "定价销售",
-					grain: "塔粮",
+					 grain: "",
 					grade: "一等品",
 					packingType: "散装",
 					freightPayer: "",

pageD/warehousings/ex_warehouse.vue

@@ -304,34 +304,27 @@
 			this.getList(this.WarehouseInOutInfo.id)
 		},
 		onShow() {	
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
-				compId: '2710b21efc1e4393930c5dc800010dc4',
-				warehouseType: 1,
-			}).then(res => {
-				if (res.data.code == 200) {
-					var arr = []
-					for (var i = 0; i < res.data.data.length; i++) {
-						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-							this.warehouseIndex = i
-							this.ids = res.data.data[i].id
+			this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+				 if(res.data.code==200){
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
+						compId: res.data.data,
+						warehouseType: 1,
+					}).then(res => {
+						if (res.data.code == 200) {
+							var arr = []
+							for (var i = 0; i < res.data.data.length; i++) {
+								if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+									this.warehouseIndex = i
+									this.ids = res.data.data[i].id
+								}
+								arr.push(res.data.data[i].warehouseName)
+							}
+							this.warehouselist = res.data.data
+							this.warehouse = arr
 						}
-						arr.push(res.data.data[i].warehouseName)
-					}
-					this.warehouselist = res.data.data
-					this.warehouse = arr
-				}
-			})
-			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-			// 	id: this.ids,
-			// }).then(res => {
-			// 	var arr = []
-			// 	for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-			// 		console.log(res.data.data.warehousePositionInfoList[i])
-			// 		arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
-			// 	}
-			// 	this.warehouse1 = arr
-			// 	this.warehouselist11 = res.data.data
-			// })
+					})
+				 }
+			})	
 		},
 		
 		methods: {
@@ -340,8 +333,6 @@
 				this.$api.doRequest('get', '/warehouseInOutInfo/getInfo', {
 						id: id1
 					}).then(res => {
-						
-
 						if(res.data.code == 200){
 							this.WarehouseInOutInfo = res.data.data
 							if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
@@ -358,7 +349,6 @@
 								if(this.WarehouseInOutInfo.gradeKey != null){
 									this.pinIndex = this.WarehouseInOutInfo.gradeKey
 								}
-								
 								var positionid
 								for (var i = 0; i < this.warehouselist.length; i++) {
 									if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
@@ -430,11 +420,11 @@
 				this.warehouseIndex1 = e.detail.value
 				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
-				// for (var i = 0; i < this.binNumber.length; i++) {
-				// 	if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
-				// 		this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
-				// 	}
-				// }
+				for (var i = 0; i < this.binNumber.length; i++) {
+					if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+						this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+					}
+				}
 			},
 
 			DateChange(e) {
@@ -722,7 +712,7 @@
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
 				this.WarehouseInOutInfo.pcFlag = 0
-				// this.WarehouseInOutInfo.warehouseType=0
+				// this.WarehouseInOutInfo.baseId=0
 				this.WarehouseInOutInfo.taskType = "出库任务"
 				uni.showLoading({
 					title: "正在提交"

pageD/warehousings/warehousings.vue

@@ -34,14 +34,14 @@
 					<text class="tit">毛重（吨）</text>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight" @input="grossWeightInput"></input>
+						<input placeholder-style="font-size:14px" style="font-size: 14px;" placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight" @input="grossWeightInput"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="tit">皮重（吨）</view>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
+						<input placeholder-style="font-size:14px" style="font-size: 14px;" placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
 							@input="tareInput"></input>
 					</view>
 				</view>
@@ -215,7 +215,7 @@ import upload from '@/components/upload.vue';
 					contractNo: {},
 					carNo: {},
 				},
-				//pinIndex: '不限（默认）',
+				pinIndex: 0,
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: '采购入库',
@@ -237,7 +237,7 @@ import upload from '@/components/upload.vue';
 					month: true,
 					day: true,
 				},
-				show:false
+				show:false,
 			}
 		},
 		computed: {
@@ -264,19 +264,43 @@ import upload from '@/components/upload.vue';
 				}
 			},
 			onShow(){
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:'2710b21efc1e4393930c5dc800010dc4',warehouseType:1,}).then(res => {
-				 if(res.data.code==200){
-					 var arr=[]
-					 for(var i=0;i<res.data.data.length;i++){
-						 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
-							 this.warehouseIndex=i
-						 }
-						 arr.push(res.data.data[i].warehouseName)
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+					 if(res.data.code==200){
+						 console.log("selectCompId",res.data)
+						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:res.data.data,warehouseType:1,}).then(res => {
+							console.log("selectWarehouse",res.data)
+						 	 if(res.data.code==200){
+						 		 var arr=[]
+						 		 for(var i=0;i<res.data.data.length;i++){
+						 			 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
+						 				 this.warehouseIndex=i
+						 			 }
+						 			 arr.push(res.data.data[i].warehouseName)
+						 		 }
+								 this.warehouse = arr
+								 console.log(arr,this.warehouseIndex)
+						 		 this.warehouselist=res.data.data
+								 for(var i=0;i<this.warehouselist.length;i++){
+								 	if(this.warehouselist[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
+								 		var id=this.warehouselist[i].id
+										this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {id:id,}).then(res => {
+											var arr=[]
+											for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++)
+											{
+												if(res.data.data.warehousePositionInfoList[i].binNumber==this.WarehouseInOutInfo.binNumber){
+													this.warehouseIndex1=i
+												}
+												arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+											}
+											this.warehouse1=arr
+											this.warehouselist11=res.data.data
+										})
+								 	}
+								 }
+						 	 }
+						 })
 					 }
-					 this.warehouselist=res.data.data
-					 this.warehouse=arr
-				 }
-			})
+				})	
 			},
 		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
@@ -287,6 +311,10 @@ import upload from '@/components/upload.vue';
 			this.WarehouseInOutInfo.warehouseName = option.warehouseName
 			this.WarehouseInOutInfo.id = option.id
 			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.addressUrl = option.addressUrl
+			this.WarehouseInOutInfo.binNumber = option.binNumber
+			this.WarehouseInOutInfo.inOutDate = option.inOutDate
+			debugger
 			var date=new Date()
 			var year=date.getFullYear()
 			var month=date.getMonth()
@@ -295,6 +323,7 @@ import upload from '@/components/upload.vue';
 				month="0"+(month+1)
 			}
 			this.time = year+'-'+month+"-"+date1
+			this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
 			getList(id1){
@@ -302,12 +331,11 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					
 					that.WarehouseInOutInfo = res.data.data
-					console.log(that.WarehouseInOutInfo.warehouseInOutDetail != null)
 					if( that.WarehouseInOutInfo.warehouseInOutDetail != null){
 						that.list = that.WarehouseInOutInfo.warehouseInOutDetail
 					} 
 					this.pinIndex = this.WarehouseInOutInfo.gradeKey
-				this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
+					this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
 					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
 				})
 				.catch(res => {
@@ -330,7 +358,6 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {id:id,}).then(res => {
 					var arr=[]
 					for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++){
-						console.log(res.data.data.warehousePositionInfoList[i])
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 					}
 					this.warehouse1=arr
@@ -340,7 +367,13 @@ import upload from '@/components/upload.vue';
 			warehouseChange1(e){
 				var id=''
 				this.warehouseIndex1=e.detail.value
-				this.WarehouseInOutInfo.binNumber=this.warehouse1[this.warehouseIndex1]
+				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
+				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
+				for (var i = 0; i < this.binNumber.length; i++) {
+					if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+						this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+					}
+				}
 			},
 			DateChange(e) {
 				this.WarehouseInOutInfo.inOutDate=e.year+'-'+e.month+'-'+e.day
@@ -485,8 +518,8 @@ import upload from '@/components/upload.vue';
 							duration: 2000
 						})
 						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+							uni.navigateBack()
+						}, 1000)
 					}else{
 						uni.showToast({
 							title: res.data.message,
@@ -495,7 +528,6 @@ import upload from '@/components/upload.vue';
 						})
 					}
 					uni.hideLoading()
-					
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -644,8 +676,8 @@ import upload from '@/components/upload.vue';
 							icon: 'none'
 						})
 						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+							uni.navigateBack()
+						}, 1000)
 					}else{
 						uni.showToast({
 							title: res.data.message,

pages.json

@@ -469,7 +469,15 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
+		},{
+            "path" : "pages/user/fankui",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
 
 	],
 	"subpackages": [{

pages/attestation/index.vue

@@ -24,7 +24,7 @@
 			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 		</view>
 		
-		<!-- <view class="homePage2">
+		 <view class="homePage2">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
 			<view class="title">
 				粮农身份
@@ -33,7 +33,7 @@
 				<view style="margin-right: 30px;">{{changes}}</view>
 			</view>
 			<image src="../../static/img/authentication/farmer@2x.png" class="portrait1"></image>
-		</view> -->
+		</view> 
 	</view>
 </template>
 
@@ -88,24 +88,25 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: (e) => {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo,
-									'application/json;charset=UTF-8').then(res => {
-									// this.procurementPlanInfos = res.data.data.records
-									console.log("成功！")
-									if (res.data.message == "Success") {
-										this.$api.msg('确认成功！')
-										this.changes = "取消"
-										this.getList()
-										return
-									}
-								})
-								.catch(res => {
-									uni.showToast({
-										title: res.message,
-										icon: 'none',
-										duration: 2000
-									})
-								});
+								if (e.confirm) {
+									this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo,
+											'application/json;charset=UTF-8').then(res => {
+											if (res.data.message == "Success") {
+												this.$api.msg('确认成功！')
+												this.changes = "取消"
+												this.getList()
+												return
+											}
+										})
+										.catch(res => {
+											uni.showToast({
+												title: res.message,
+												icon: 'none',
+												duration: 2000
+											})
+										});
+								}
+							
 						},
 						fail: () => {},
 						complete: () => {}
@@ -121,24 +122,25 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: (e) => {
-							this.$api.doRequest('post', '/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', this.identityAuthenticationInfo,
-									'application/json;charset=UTF-8').then(res => {
-										console.log(res.data.message,"判断")
-										console.log(res)
-									if (res.data.message == "Success") {
-										this.$api.msg('取消成功！')
-										this.changes = "确认"
-										this.getList()
-										return
-									}
-								})
-								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
+							if (e.confirm) {
+								this.$api.doRequest('post', '/identityAuthenticationInfo/api/deleteIdentityAuthenticationInfo', this.identityAuthenticationInfo,
+										'application/json;charset=UTF-8').then(res => {
+										if (res.data.message == "Success") {
+											this.$api.msg('取消成功！')
+											this.changes = "确认"
+											this.getList()
+											return
+										}
 									})
-								});
+									.catch(res => {
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									});
+							}
+							
 						},
 						fail: () => {},
 						complete: () => {}
@@ -147,13 +149,11 @@
 				},	
 				
 			liangShang(){
-				console.log(1111)
 				uni.navigateTo({
 					url: `/pages/attestation/indexTwo`
 				})
 			},
 			siJi(){
-				console.log(2222)
 				uni.navigateTo({
 					url: `/pages/attestation/indexThree`
 				})
@@ -163,11 +163,6 @@
 					url: `/pageD/identity/driverIdentityEdit?id=${items.id}`
 				})
 			},
-			// companyEdit(item) {
-			// 	uni.navigateTo({
-			// 		url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
-			// 	})
-			// },
 			deleteLS(item) {
 				uni.showModal({
 					// title: '登录提示',
@@ -185,7 +180,6 @@
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({
@@ -200,7 +194,6 @@
 				})
 			},
 			deleteSJ(item) {
-				console.log(item.driverName)
 				this.deletes = {}
 				this.deletes.id = item.id
 				uni.showModal({
@@ -232,40 +225,6 @@
 				})
 			},
 			getList() {
-				// this.identityAuthenticationInfo.commonId = this.userInfo.id
-				// this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
-				// 		pageSize: 10,
-				// 		currentPage: 1,
-				// 		commonId: this.userInfo.id
-				// 	}, 'application/json;charset=UTF-8').then(res => {
-				// 		console.log("成功连接")
-				// 		this.businessman = res.data.data.records
-				// 	})
-				// 	.catch(res => {
-				// 		uni.showToast({
-				// 			title: res.errmsg,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
-
-				// this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {
-				// 		pageSize: 10,
-				// 		currentPage: 1,
-				// 		commonId: this.userInfo.id,
-				// 		flag: 0
-				// 	}, 'application/json;charset=UTF-8').then(res => {
-				// 		console.log("成功连接")
-				// 		this.drivers = res.data.data.records
-				// 		console.log(this.drivers, "skalkdkk")
-				// 	})
-				// 	.catch(res => {
-				// 		uni.showToast({
-				// 			title: res.errmsg,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				// 	});
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
 					customerTypeFlag:3,customerType:"粮农"
 					}, 'application/json;charset=UTF-8').then(res => {
@@ -277,7 +236,6 @@
 							}	
 							this.id = res.data.data.id
 						}
-						
 					})
 					.catch(res => {
 						uni.showToast({

pages/attestation/indexThree.vue

@@ -168,7 +168,6 @@
 											success: function(res) {										
 												if (res.confirm) {
 													that.identityAuthenticationInfo.id = item.id
-														console.log(that.identityAuthenticationInfo,"已覆盖")
 													that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
 														res => {
 															uni.showToast({
@@ -197,7 +196,6 @@
 										});
 									}else if(res.data.code == 200){
 										that.identityAuthenticationInfo.id = item.id
-										console.log(that.identityAuthenticationInfo,"未覆盖")
 										that.$api.doRequest('post','/driverViewInfo/api/modifyPhone',that.identityAuthenticationInfo).then(
 											res => {
 												uni.showToast({
@@ -335,21 +333,24 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: (e) => {
-						this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
-								'application/json;charset=UTF-8').then(res => {
-								if (res.data.code == 200) {
-									this.$api.msg('删除成功！')
-									this.getList()
-									return
-								}
-							})
-							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none',
-									duration: 2000
+						if(e.confirm){
+							this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
+									'application/json;charset=UTF-8').then(res => {
+									if (res.data.code == 200) {
+										this.$api.msg('删除成功！')
+										this.getList()
+										return
+									}
 								})
-							});
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						}
+						
 					},
 					fail: () => {},
 					complete: () => {}

pages/task/my_task.vue

@@ -200,7 +200,7 @@
 				})
 				}else{
 					uni.navigateTo({
-						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}`
+						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}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
 					})
 				}
 			}else if(item.taskType == "出库任务"){

pages/user/fankui.vue

@@ -0,0 +1,30 @@
+<template>
+	<view>
+		<suggest @submit="submit"></suggest>
+	</view>
+</template>
+
+<script>
+	import suggest from "@/components/bert-suggest/suggest.vue"
+	export default {
+	    components: { suggest },
+	    methods: {
+	        submit(v) {
+				uni.showModal({
+					title: '提示',
+					content: "感谢您提供反馈意见，我们将立即联系您",
+					showCancel: false,
+					confirmText: '确定',
+					success: () => {
+						uni.navigateBack()
+					}
+				})
+	            console.log(v)
+	        }
+	    }
+	}
+</script>
+
+<style>
+
+</style>

pages/user/set_nickname.vue

@@ -49,15 +49,12 @@
 							that.deptListurl.id = that.userInfo.id
 							that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(res => {
 								if (res.data.code == 200) {
-								// this.$api.msg('修改成功！')
-								var _student = wx.getStorageSync('userInfo');
-								_student.userName = that.nickname;
-								wx.setStorageSync('userInfo', _student);
-								
-									uni.navigateTo({
-										url: `/pages/user/setUp`
-									})
-									}
+									// this.$api.msg('修改成功！')
+									var _student = uni.getStorageSync('userInfo');
+									_student.userName = that.nickname;
+									uni.setStorageSync('userInfo', _student);
+									uni.navigateBack()
+								}
 								})
 								.catch(res => {
 									uni.showToast({

pages/user/set_picture.vue

@@ -130,13 +130,11 @@
 												// 	duration: 2000
 												// })
 											that.userInfo.avatarUrl = that.identityUrl
-											var _student = wx.getStorageSync('userInfo');
+											var _student = uni.getStorageSync('userInfo');
 											_student.avatarUrl = that.identityUrl;
-											wx.setStorageSync('userInfo', _student);
+											uni.setStorageSync('userInfo', _student);
 										    // this.$api.msg('修改成功！')
-											uni.navigateTo({
-												url: `/pages/user/setUp`
-											})
+											uni.navigateBack()
 										}
 									})
 								.catch(res => {

pages/user/user.vue

@@ -41,6 +41,13 @@
 					</view>
 					<!-- <image src="../../static/img/sign/authentication@3x.png" mode=""></image> -->
 				</view>
+				<view class='cu-item' @click='fankui'>
+					<view>
+						<image src="../../static/img/sign/authentication@2x.png" class="sign"></image>
+						<text class="text-grey">意见反馈</text>
+					</view>
+					<view class = 'tip_text cuIcon-right' ></view>
+				</view>
 				<!-- <view class='cu-item' @click='scanCode'>
 							<view>
 								<text class="cuIcon-scan icon text-grey"></text>
@@ -261,17 +268,23 @@
 			}else{
 				this.headUrl = this.userInfo.avatarUrl
 			}
-			if(!this.username){
-				this.username = "请更改昵称"
+			console.log("this.userInfo",this.userInfo)
+			if(this.userInfo.userName){
+				this.username = this.userInfo.userName
 			}
 			else{
-				this.username = this.userInfo.userName
+				this.username = "请更改昵称"
 			}
 			if(this.userInfo.phone){
 				this.userphone = this.userInfo.phone
 			}
 		},
 		methods: {
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
 			zhibo() {
 				uni.navigateTo({
 					url: `/pageB/video/broadcast`

websocket_sdk.js

@@ -15,6 +15,7 @@ export default class Websocket {
         // 心跳检测频率
         this._timeout = 3000;
         this._timeoutObj = null;
+        this._timeoutObj1 = null;
         // 当前重连次数
         this._connectNum = 0;
         // 心跳检测和断线重连开关，true为启用，false为关闭
@@ -26,6 +27,7 @@ export default class Websocket {
     // 心跳重置
     _reset() {
         clearTimeout(this._timeoutObj);
+        clearTimeout(this._timeoutObj1);
         return this;
     }
     // 心跳开始
@@ -34,9 +36,11 @@ export default class Websocket {
         this._timeoutObj = setInterval(() => {
             //发送心跳
             _this.sendHeartbeatData(options);
-			_this.getTips()
 			_this.getInfo()
         }, this._timeout);
+		this._timeoutObj1 = setInterval(() => {
+			_this.getTips()
+		}, 1000*60);
     }
     // 监听websocket连接关闭
     onSocketClosed(options) {