前端gjy

components/swiperup.vue

@@ -1,15 +1,17 @@
 <template>
-	<view class="wrap">
+	<view class="wrap" @click="clickInfoList()">
 		 <swiper
 	  id="_swiper_up"
 	  :indicator-dots="indicatorDots"
 	  :autoplay="autoplay" :interval="interval" :duration="duration" vertical="true" circular="true">
 	  <block v-for="(item,index) in list" :key="index">
-	    <swiper-item>
+	    <swiper-item >
 			<view class="itme_text">
 				<view>
-					<image class='gb' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/gb.png'></image>
-					<image class='horn' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/horn.png'></image>{{item.port}}{{item.goodsName}}&nbsp;&nbsp;({{item.newOld}})&nbsp;&nbsp;{{item.price}}元/吨
+					<image class='gb' src='https://taohaoliang.oss-cn-beijing.aliyuncs.com/tmp/new.png'></image>
+					最新价格：<{{item.goodsName}}> 
+					<text style="margin-right: 10px;margin-left: 10px;" :class="item.newPrice > item.openPrice ? 'text-red':'text-green'">{{item.newPrice}}</text>
+					元/吨
 				</view>
 			</view>
 	    </swiper-item>
@@ -61,21 +63,27 @@
 			console.log(this.list)
 		},
 		methods: {
+			clickInfoList(){
+				uni.navigateTo({
+					url: `/pageB/info/info_list`
+				})
+			},
 			eventClick() {
 				this.$emit('eventClick');
 			}
+			
 		},
 	}
 </script>
 
 <style scoped>
 	.wrap{
-		height: 64rpx;
+		height: 74rpx;
 		margin-bottom: 20rpx;
 		background: #fff;
-		line-height: 64rpx;
+		line-height: 74rpx;
 		position: relative;
-		width:84%;
+		width:90%;
 		margin:0 auto;
 		margin-top:12px;
 		box-shadow: 2px 2px 4px rgba(0,0,0,0.07);
@@ -85,29 +93,31 @@
 		position: absolute;
 		background: #fff;
 		display: block;
-		width: 35px;
-		height: 35px;
+		width: 37px;
+		height: 37px;
 		left: -15px;
 		z-index: 1;
-		-webkit-border-radius: 50%;
-		border-radius: 50%;
+		-webkit-border-radius: 30%;
+		border-radius: 30%;
 	}
 	.wrap::after{
 		content: "";
 		position: absolute;
 		background: #fff;
 		display: block;
-		width: 35px;
-		height: 35px;
+		width: 37px;
+		height: 37px;
 		right: -15px;
 		z-index: 1;
-		-webkit-border-radius: 50%;
-		border-radius: 50%;
+		-webkit-border-radius: 30%;
+		border-radius: 30%;
 	}
 	.gb{
 		width:27px;
 		height:21px;
 		vertical-align: middle;
+		margin-right: 10px;
+		
 	}
 	.horn{
 		width:14px;height:14px;
@@ -130,5 +140,6 @@
 	.itme_text {
 	  font-size: 26rpx;
 	  z-index: 999;
+	  color: #000000;
 	}
 </style>

main.js

@@ -174,8 +174,11 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 }
 // 现app调用方式
 
-const doRequest = (method, url, data = {},header)=> {
-	console.log(data)
+const doRequest = (method, url, data,header)=> {
+	var contentheader='application/json'
+	if(header){
+		contentheader=header
+	}
 	// let baseUrl = config.def().baseUrl
 	let baseUrl = config.def().baseUrlNew
         // 如果data为空
@@ -191,7 +194,7 @@ const doRequest = (method, url, data = {},header)=> {
                 // data: arr[0],
                 data:data,
                 header: {
-                    'content-type': 'application/json'//'application/x-www-form-urlencoded; charset=UTF-8',
+                    'content-type': contentheader //'application/x-www-form-urlencoded; charset=UTF-8',
                 },
                 success: function(result) {
                     // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑

pageD/identity/companyIdentity.vue

@@ -1,83 +1,86 @@
 <template>
 	<view class="center">
 		<view>
-			<label class="radio" v-model="radios">
-				<radio value="1" name="radios" /><text>公司</text>
-				<radio value="2" name="radios" /><text>个人</text>
-			</label>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>公司</text>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'"
+			 alt=""></image>
+			<text>个人</text>
 		</view>
-		<view v-if="radios == 1">
-		<view>
-			<button type="default">上传营业执照</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司名称</text>
-			<view class="con-list">
-				<input placeholder="请填写公司名称" name="input" @input="addressInput"></input>
+		<view v-if="consentStatus == true">
+			<view>
+				<button type="default">上传营业执照</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">纳税人识别号</text>
-			<view class="con-list">
-				<input placeholder="请填写纳税人识别号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">公司名称</text>
+				<view class="con-list">
+					<input placeholder="请填写公司名称" name="input" v-model="identityAuthenticationInfo.compName"></input>
+				</view>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传身份证正面</button>
-			<button type="default">上传身份证反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">姓名</text>
-			<view class="con-list">
-				<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">纳税人识别号</text>
+				<view class="con-list">
+					<input placeholder="请填写纳税人识别号" name="input" v-model="identityAuthenticationInfo.payTaxesCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">身份证号</text>
-			<view class="con-list">
-				<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">上传身份证正面</button>
+				<button type="default">上传身份证反面</button>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传银行卡正面</button>
-			<button type="default">上传银行卡反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">银行卡号</text>
-			<view class="con-list">
-				<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户支行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">上传银行卡正面</button>
+				<button type="default">上传银行卡反面</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">手机号</text>
-			<view class="con-list">
-				<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<button type="default">获取验证码</button>
-			<view class="con-list">
-				<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司地址</text>
-			<view class="con-list">
-				<input placeholder="请填写公司地址" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
+				</view>
+			</view>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司地址</text>
+				<view class="con-list">
+					<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
+				</view>
 			</view>
-		</view>
 		</view>
 		<view v-else>
 			<view>
@@ -87,13 +90,13 @@
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写身份证号" name="input" v-model="identityAuthenticationInfo.customerNumberCard"></input>
 				</view>
 			</view>
 			<view>
@@ -103,53 +106,58 @@
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+					<input placeholder="请填写开户行" name="input" v-model="identityAuthenticationInfo.bankDeposit"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+					<input placeholder="请填写开户支行" name="input" v-model="identityAuthenticationInfo.bankDepositBranch"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写收款人姓名" name="input" @input="addressInput"></input>
+					<input placeholder="请填写收款人姓名" name="input" v-model="identityAuthenticationInfo.payeeName"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写收款身份证号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写收款身份证号" name="input" v-model="identityAuthenticationInfo.payeeNumberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+					<input placeholder="请填写手机号" name="input" v-model="identityAuthenticationInfo.customerPhone"></input>
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<button type="default">获取验证码</button>
-				<view class="con-list">
-					<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode'>{{sendText}}</button>
+				<view style='width:70%;position:relative;margin-left: 200px;'>
+					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
+
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
-					<input placeholder="请填写联系地址" name="input" @input="addressInput"></input>
+					<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 				</view>
 			</view>
 		</view>
+		<view class="padding flex flex-direction">
+			<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+		</view>
 	</view>
+	
 </template>
 
 <script>
@@ -158,15 +166,105 @@
 		data() {
 			return {
 				radios: 2,
-
+				inputContent: null,
+				customerPhone: '',
+				consentStatus: true,
+				consentStatus1: false,
+				codestatus: false,
+				verifyCode: null,
+				inputStatus: 'none',
+				sendText: '获取验证码',
+				platform: '',
+				sendDisabled: false,
+				identityAuthenticationInfo: {
+					customerPhone: ''
+				},
 			};
 		},
 		methods: {
-			radioschenge( index ) {
+			consent() {
+				if (this.consentStatus == false && this.consentStatus1 == true) {
+					this.consentStatus = true
+					this.consentStatus1 = false
+				} else if (this.consentStatus == true && this.consentStatus1 == false) {
+					this.consentStatus = false
+					this.consentStatus1 = true
+				}
+
+			},
+
+			getcode() {
+				var that = this
+				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.customerPhone)) {
+					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
+							phone: this.customerPhone
+						}).then(res => {
+							if (res.data.code == 200) {
+								that.sendDisabled = true
+								let sec = 60
+								let interval = setInterval(() => {
+									sec--;
+									that.sendText = sec + 's后重发'
+									if (sec <= 0) {
+										that.sendDisabled = false
+										that.sendText = "获取验证码"
+										clearInterval(interval)
+									}
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						.catch(res => {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				} else {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+
+			},
+			verifyCodeInput(e) {
+				this.verifyCode = e.detail.value
+			},
+			phoneinput(e) {
+				if (e.detail.value.length == 11) {
+					this.codestatus = true
+				}
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.isPhone = false
+			},
+			radioschenge(index) {
 				console.log(index)
 				this.radios = index
-			}
-		}
+			},
+			commit() {
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this.identityAuthenticationInfo)
+					.then(res => {
+						console.log(12545645)
+					}).catch(res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					})
+			},
+		},
 	}
 </script>
 
@@ -186,6 +284,16 @@
 		position: relative;
 	}
 
+	.verificationCode {
+		margin-top: 20px;
+		background: #F5F6F9;
+		color: #AFB3BF;
+	}
+
+	.verificationCode:after {
+		border: none;
+	}
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -203,4 +311,36 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+
+	.verificationCode.active {
+		background: #22C572;
+		color: #fff;
+	}
+
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		/* 	right:0; */
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+
+	}
+
+	.getcode:after {
+		border: none;
+	}
+
+	.uni-navigator {
+		display: inline-block;
+		color: #22C572;
+	}
+
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
 </style>

pageD/identity/companyIdentityLook.vue

@@ -1,77 +1,81 @@
 <template>
 	<view class="center">
 		<view>
-			<label class="radio" v-model="radios">
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
+			<text>公司</text>
+			<image @click='consent' style='width:14px;height:14px;position:relative;top:2px;margin-right:5px;' :src="consentStatus1==true?'../../static/img/login/select@2x.png':'../../static/img/login/selected2.png'" alt=""></image>
+			<text>个人</text>
+			<!-- <label class="radio" v-model="radios">
 				<radio value="1" name="radios" /><text>公司</text>
 				<radio value="2" name="radios" /><text>个人</text>
-			</label>
+			</label> -->
 		</view>
-		<view v-if="radios == 1">
-		<view>
-			<button type="default">上传营业执照</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司名称</text>
-			<view class="con-list">
-				<input placeholder="请填写公司名称" name="input" @input="addressInput"></input>
+		<view v-if="consentStatus == true">
+			<view>
+				<button type="default">营业执照</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">纳税人识别号</text>
-			<view class="con-list">
-				<input placeholder="请填写纳税人识别号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">公司名称</text>
+				<view class="con-list">
+					{{deptList.compName}}
+				</view>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传身份证正面</button>
-			<button type="default">上传身份证反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">姓名</text>
-			<view class="con-list">
-				<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">纳税人识别号</text>
+				<view class="con-list">
+				{{deptList.payTaxesCard}}
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">身份证号</text>
-			<view class="con-list">
-				<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">身份证正面</button>
+				<button type="default">身份证反面</button>
 			</view>
-		</view>
-		<view>
-			<button type="default">上传银行卡正面</button>
-			<button type="default">上传银行卡反面</button>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">银行卡号</text>
-			<view class="con-list">
-				<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">姓名</text>
+				<view class="con-list">
+					{{deptList.customerName}}
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">身份证号</text>
+				<view class="con-list">
+					{{deptList.customerNumberCard}}
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">开户支行</text>
-			<view class="con-list">
-				<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+			<view>
+				<button type="default">银行卡正面</button>
+				<button type="default">银行卡反面</button>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">手机号</text>
-			<view class="con-list">
-				<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">银行卡号</text>
+				<view class="con-list">
+					{{deptList.bankCard}}
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<text class="tit">公司地址</text>
-			<view class="con-list">
-				<input placeholder="请填写公司地址" name="input" @input="addressInput"></input>
+			<view class="c-row b-b">
+				<text class="tit">开户行</text>
+				<view class="con-list">
+					{{deptList.bankDeposit}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">开户支行</text>
+				<view class="con-list">
+					{{deptList.bankDepositBranch}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">手机号</text>
+				<view class="con-list">
+					{{deptList.customerPhone}}
+				</view>
+			</view>
+			<view class="c-row b-b">
+				<text class="tit">公司地址</text>
+				<view class="con-list">
+					{{deptList.compAddress}}
+				</view>
 			</view>
-		</view>
 		</view>
 		<view v-else>
 			<view>
@@ -81,13 +85,13 @@
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" @input="addressInput"></input>
+					{{deptList.customerName}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" @input="addressInput"></input>
+					{{deptList.customerNumberCard}}
 				</view>
 			</view>
 			<view>
@@ -97,43 +101,43 @@
 			<view class="c-row b-b">
 				<text class="tit">银行卡号</text>
 				<view class="con-list">
-					<input placeholder="请填写银行卡号" name="input" @input="addressInput"></input>
+					{{deptList.bankCard}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户行" name="input" @input="addressInput"></input>
+					{{deptList.bankDeposit}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<view class="con-list">
-					<input placeholder="请填写开户支行" name="input" @input="addressInput"></input>
+					{{deptList.bankDepositBranch}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写收款人姓名" name="input" @input="addressInput"></input>
+					{{ deptList.payeeName}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写收款身份证号" name="input" @input="addressInput"></input>
+					{{deptList.payeeNumberCard}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" @input="addressInput"></input>
+					{{deptList.customerPhone}}
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
-					<input placeholder="请填写联系地址" name="input" @input="addressInput"></input>
+					{{deptList.compAddress}}
 				</view>
 			</view>
 		</view>
@@ -141,16 +145,52 @@
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		name: "buy",
 		data() {
 			return {
 				radios: 2,
-	
+				deptList:{},
+				id:"2c4b2845e9dc47ca95c05ad471881be0",
+				consentStatus:true,
+				consentStatus1:false,
+
 			};
 		},
+		onLoad() {
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
 		methods: {
-		
+			getList() {
+				
+				this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', {id:this.id}, 'application/json;').then(res => {
+						console.log("成功连接")
+						this.procurementPlanInfos = res.data.data
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			consent(){
+				if(this.consentStatus == false && this.consentStatus1 == true){
+					this.consentStatus = true
+					this.consentStatus1 = false
+				}else if(this.consentStatus == true && this.consentStatus1 == false){
+					this.consentStatus = false
+					this.consentStatus1 = true
+				}
+				
+			}
 		}
 	}
 </script>
@@ -159,7 +199,7 @@
 	.center {
 		padding: 10px 20px;
 	}
-	
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -170,7 +210,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;

pages.json

@@ -5,8 +5,8 @@
 		"lazyCodeLoading": "requiredComponents",
 		"tabBar": {
 			"custom":false,
-			"color": "#7A7E83",
-			"selectedColor": "#3cc51f",
+			"color": "#656765",
+			"selectedColor": "#22C572",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [
@@ -23,6 +23,12 @@
 					"selectedIconPath":"static/img/jiaoyi_check.png",
 					"text": "交易"
 				},
+				{
+					"pagePath": "pages/home/home",
+					"iconPath":"static/img/liangxin.png",
+					"selectedIconPath":"static/img/liangxin_check.png",
+					"text": "粮信"
+				},
 				{
 					"pagePath": "pages/tran/tran",
 					"iconPath":"static/img/wuliu.png",
@@ -621,6 +627,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+				    "path" : "info/info_list",
+				    "style" : {
+						"navigationBarTitleText": "期货信息",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 				    "path" : "contract/contract_detail",
 				    "style" : {

pages/attestation/index.vue

@@ -64,6 +64,7 @@
 				identityAuthenticationInfo:{
 					pageSize:10,
 					currentPage:1,
+					commonId:"",
 				},
 			};
 		},
@@ -75,9 +76,13 @@
 		},
 		methods: {
 			getList(){
+				
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
-			this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', this.identityAuthenticationInfo).then(res => {
-					console.log("添加成功")
+				console.log(12313)
+			this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {pageSize:10,
+					currentPage:1,
+					commonId:this.userInfo.id},'application/json;charset=UTF-8').then(res => {
+				console.log("成功连接")
 					this.procurementPlanInfos = res.data.data
 				})
 				.catch(res => {

pages/release/release.vue

@@ -50,7 +50,8 @@
 		},
 		methods: {
 			switch1(item){
-				if (!this.hasLogin) {
+				console.log(125489)
+				// if (!this.hasLogin) {
 					uni.showModal({
 						// title: '登录提示',
 						content: '隐藏后该信息不再展示给其他用户，是否确定隐藏？',
@@ -76,12 +77,12 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}
+				// }
 			},
 			
 			
 			deleteRelease(item){
-				if (!this.hasLogin) {
+				// if (!this.hasLogin) {
 					uni.showModal({
 						// title: '登录提示',
 						content: '确定删除该信息？',
@@ -92,6 +93,7 @@
 								this.procurementPlanInfos = res.data.data.records
 								if (res.errmsg == "Success") {
 									this.$api.msg('删除成功！')
+									this.getList()
 									return
 								}
 								
@@ -107,7 +109,7 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}	
+					// }
 			},
 			releaseChange(e){
 				this.receivePrivate = e.detail.value

pages/sale/information.vue

@@ -22,7 +22,7 @@
 				<text class="num">{{swiperLength}}</text>
 			</view> -->
 		</view> 
-		<swiper-up :list="portInfo"></swiper-up>
+		<swiper-up :list="infoList" ></swiper-up>
 		<scroll-view style='margin-top:12px;padding:0 20px;' scroll-x class="nav">
 			<view class="flex text-center">
 				<view style='position:relative;' class="cu-item flex-sub" :class="item.value==TabCur?'text-white':''" v-for="item in categoryList"@tap="tabSelect" :data-id="item.value">
@@ -130,7 +130,6 @@
 			<view v-show="isLoadMore">
 			    <uni-load-more :status="loadStatus" ></uni-load-more>
 			</view>
-			
 		</view>
 	</view>
 </template>
@@ -178,7 +177,8 @@
 				loadStatus:'loading',  //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				TabCur: 0,
 				category:0,
-				current: 0
+				current: 0,
+				infoList1:[]
 			};
 		},
 		onReady() {
@@ -188,11 +188,45 @@
 			this.pages = 1
 			this.isLoadMore = false
 			this.loadStatus = 'more'
-			const that = this
 			this.loadData()
 		},
 		onLoad(options) {
-			
+			var that = this
+			var infoList = [];
+			uni.request({
+			    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			    // url: "https://hq.sinajs.cn/list=C2109",
+			    header: {
+			        'content-type': 'application/x-www-form-urlencoded'
+			    },
+			    success: function(result) {
+			        // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+					var tmp = result.data.split('"')
+					for(var i = 1; i<tmp.length;i=i+2){
+						var list = tmp[i].split(",")
+						var data = {
+							goodsName:list[0],
+							newPrice:list[6],
+							openPrice:list[2]
+						}
+						if(data.goodsName){
+							infoList.push(data)
+						}
+					}
+					let name = 'infoList';
+					let value = infoList;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+					// console.log("infoList",infoList)
+			    },
+			    fail: function(e) {
+			        console.log('error in...')
+			        // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			        reject(e)
+			    },
+			})
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -214,6 +248,7 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			
 			DotStyle(e) {
 				this.dotStyle = e.detail.value
 			},
@@ -343,7 +378,7 @@
 					//价格简报
 					if (data.portInfo) {
 						that.portInfo = data.portInfo
-						console.log(that.portInfo)
+						console.log("portInfo",that.portInfo)
 					}
 					//分类5Buttom
 					if (data.advertisement.t4) {
@@ -491,6 +526,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.container{
+		margin: 10rpx 10rpx 10rpx 10rpx;
+	}
 	.cu-tag.badge {
 	    right: 26rpx;
 	}
@@ -634,6 +672,9 @@
 		background: #fff;
 		margin-bottom: 10px;
 	}
+	.swiper-item{
+		border-radius: 5%;
+	}
 	.guess-section {
 		margin-bottom: 120rpx;
 		margin-top:20rpx;

pages/user/user.vue

@@ -194,7 +194,7 @@
 							name: '我的任务',
 							icon:'cuIcon-copy',
 							tips: 0,
-							url:'/pages/user/task',
+							url:'/pages/task/my_task',
 							show:true
 						},
 						{

store/index.js

@@ -11,7 +11,7 @@ try {
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['firendItem','userData','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem','clientId'];
+let saveStateKeys = ['firendItem','userData','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem','clientId','infoList'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value) {
@@ -53,6 +53,8 @@ const store = new Vuex.Store({
 		hasLogin: false,
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		pushRes:lifeData.pushRes?lifeData.pushRes: {},
+		//期货数据获取
+		infoList:lifeData.infoList?lifeData.infoList: [],
 		//我的气泡提示
 		myTip:lifeData.myTip?lifeData.myTip: 0,
 		//我的气泡提示

websocket_sdk.js

@@ -35,6 +35,7 @@ export default class Websocket {
             //发送心跳
             _this.sendHeartbeatData(options);
 			_this.getTips()
+			_this.getInfo()
         }, this._timeout);
     }
     // 监听websocket连接关闭
@@ -296,4 +297,46 @@ export default class Websocket {
 			})
 		})
 	}
+	getInfo(){
+		return new Promise(resolve => {
+			var hour = new Date().getHours();
+			if((hour >= 9 && hour < 12) ||(hour >= 13 && hour < 15)){
+				var infoList = [];
+				uni.request({
+				    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+				    // url: "https://hq.sinajs.cn/list=C2109",
+				    header: {
+				        'content-type': 'application/x-www-form-urlencoded'
+				    },
+				    success: function(result) {
+				        // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+						var tmp = result.data.split('"')
+						for(var i = 1; i<tmp.length;i=i+2){
+							var list = tmp[i].split(",")
+							var data = {
+								goodsName:list[0],
+								newPrice:list[6],
+								openPrice:list[2]
+							}
+							if(data.goodsName){
+								infoList.push(data)
+							}
+						}
+						let name = 'infoList';
+						let value = infoList;
+						store.commit('$uStore', {
+							name,
+							value
+						});
+						// console.log("infoList",infoList)
+				    },
+				    fail: function(e) {
+				        console.log('error in...')
+				        // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+				        reject(e)
+				    },
+				})
+			}
+		})
+	}
 }