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

# Conflicts:
#	pages/sale/information.vue

config/index.js

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

manifest.json

@@ -81,6 +81,7 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>"
                 ]
             },
@@ -149,6 +150,9 @@
         },
         "splashscreen" : {
             "waiting" : false
+        },
+        "statusbar" : {
+            "immersed" : false
         }
     }
 }

pageA/product/Identity_switching.vue

@@ -150,7 +150,7 @@
 			},
 			checkBox(e, item) {
 				for (var i = 0; i < this.lists.length; i++) {
-					this.lists[i].checked = true
+					this.lists[i].checked = false
 				}
 				item.checked = true
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
@@ -159,13 +159,6 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.data.code == 200) {
-							// this.lists = res.data.data.records
-
-							uni.navigateBack({
-
-								delta: 1
-
-							})
 						}
 					})
 					.catch(res => {

pageA/product/business_buy.vue

@@ -119,7 +119,7 @@
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">包装费（元/吨）</view>
 				<view class="con-list">
-					<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
+					<input placeholder="请填写包装费" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="packingFee"></input>
 					
 				</view>
 			</view>
@@ -216,7 +216,7 @@
 				unloadingFee: 0,
 				packingMoney: 0,
 				packing: '散装',
-				packingFee: 0,
+				packingFee: null,
 				// choice : false,
 			};
 		},
@@ -244,7 +244,7 @@
 			
 		},
 		onShow() {
-			if( this.$store.state.choice != "" ){
+			if( this.$store.state.choice != "" && this.goods.customerTypeFlag){
 				if(this.goods.customerTypeFlag==1){
 					this.goods.customerName = this.$store.state.choice
 				}else if(this.goods.customerTypeFlag==2){
@@ -351,11 +351,11 @@
 											uni.showToast({
 												title: '提交成功，等待买方回复',
 												icon: 'none',
-												duration: 2000,
+												duration: 1500,
 												success() {
 													setTimeout(()=>{
 														uni.navigateBack(1)
-													},2000)
+													},1500)
 												}
 											})
 										} else {

pageA/product/business_sale.vue

@@ -156,7 +156,7 @@
 					},
 					purchaseOrder: {
 						invoiceFee:0,
-						packingFee:0,
+						packingFee:null,
 						packingType:"散装",
 						packingTypeKey:1,
 						type:'不开发票',
@@ -329,19 +329,11 @@
 										uni.showToast({
 											title: '提交成功，等待卖方回复',
 											icon: 'none',
-											duration: 2000,
+											duration: 1500,
 											success() {
-												uni.showToast({
-													title: '提交成功，等待买方回复',
-													icon: 'none',
-													duration: 2000,
-													success() {
-														setTimeout(()=>{
-														uni.navigateBack(1)	
-														},2000)
-														
-													}
-												})
+												setTimeout(()=>{
+												uni.navigateBack(1)	
+												},1500)
 											}
 										})
 										// uni.navigateTo({

pageA/product/buydetails.vue

@@ -288,6 +288,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

pageA/product/detail.vue

@@ -119,10 +119,10 @@
 						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" @click="contactUs">
 					<text class="tit">买方电话</text>
 					<view class="con-list">
-						<view>{{goods.buyerPhone}} <a :href="'tel:'+goods.buyerPhone"><image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
+						<view>{{goods.buyerPhone}}<image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></view>
 					</view>
 				</view>
 			</view>
@@ -132,67 +132,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row"  v-if="goods.waterContent!=null">
+				<view class="c-row"  v-if="goods.waterContent">
 					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.bulkDensity!=null">
+				<view class="c-row" v-if="goods.bulkDensity">
 					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.jiaorenli!=null">
+				<view class="c-row" v-if="goods.jiaorenli">
 					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.impurity!=null">
+				<view class="c-row" v-if="goods.impurity">
 					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.mildewGrain!=null">
+				<view class="c-row" v-if="goods.mildewGrain">
 					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.imperfectGrain!=null">
+				<view class="c-row" v-if="goods.imperfectGrain">
 					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.protein!=null">
+				<view class="c-row" v-if="goods.protein">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grain!=null">
+				<view class="c-row" v-if="goods.grain">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grade!=null">
+				<view class="c-row" v-if="goods.grade">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputPrivate!=null">
+				<view class="c-row" v-if="goods.outputPrivate">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputYear!=null">
+				<view class="c-row" v-if="goods.outputYear">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
@@ -321,6 +321,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 				  });		
 			},
@@ -1214,5 +1215,7 @@
 		padding:35px 10px;
 		border-radius:15px;
 	}
-	
+	a{
+		text-decoration: none;
+	}
 </style>

pageA/product/detail_buy.vue

@@ -220,6 +220,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" maxlength="20" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>
@@ -156,19 +156,14 @@
 			//详情
 			navToDetailPage(item) {
 				let id = item.id;
-				if (item.unitPrice === 0) {
-					this.contactUs();
+				if (this.TabCur == 0) {
+					uni.navigateTo({
+						url: `/pageA/product/detail?id=${id}`
+					})
 				} else {
-					if (this.TabCur == 0) {
-						uni.navigateTo({
-							url: `/pageA/product/detail?id=${id}`
-						})
-					} else {
-						uni.navigateTo({
-							url: `/pageA/product/sales_detail?id=${id}`
-						})
-					}
-			
+					uni.navigateTo({
+						url: `/pageA/product/sales_detail?id=${id}`
+					})
 				}
 			},
 			init() {

pageA/product/saledetails.vue

@@ -288,6 +288,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

pageA/product/sales_detail.vue

@@ -118,10 +118,10 @@
 						<text>{{goods.seller}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" @click="contactUs">
 					<text class="tit">卖方电话</text>
 					<view class="con-list">
-						<view>{{goods.sellerPhone}} <a :href="'tel:'+goods.sellerPhone"><image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
+						<view>{{goods.sellerPhone}} <image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></view>
 					</view>
 				</view>
 			</view>
@@ -131,67 +131,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row" v-if="goods.waterContent!=null">
+				<view class="c-row" v-if="goods.waterContent">
 					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.bulkDensity!=null">
+				<view class="c-row" v-if="goods.bulkDensity">
 					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.jiaorenli!=null">
+				<view class="c-row" v-if="goods.jiaorenli">
 					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.impurity!=null">
+				<view class="c-row" v-if="goods.impurity">
 					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.mildewGrain!=null">
+				<view class="c-row" v-if="goods.mildewGrain">
 					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.imperfectGrain!=null">
+				<view class="c-row" v-if="goods.imperfectGrain">
 					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.protein!=null">
+				<view class="c-row" v-if="goods.protein">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grain!=null">
+				<view class="c-row" v-if="goods.grain">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grade!=null">
+				<view class="c-row" v-if="goods.grade">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputPrivate!=null||goods.outputCity!=null">
+				<view class="c-row" v-if="goods.outputPrivate&&goods.outputCity">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputYear!=null">
+				<view class="c-row" v-if="goods.outputYear">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
@@ -300,7 +300,7 @@
 				const that = this
 				uni.makePhoneCall({
 				 	// 手机号
-				    phoneNumber: that.goods.buyerPhone, 
+				    phoneNumber: that.goods.sellerPhone, 
 				
 					// 成功回调
 					success: (res) => {
@@ -310,6 +310,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

pageB/contract/contract_detail.vue

@@ -279,6 +279,7 @@
 														99) {
 														num = 'C' + num
 													}
+													
 													that.goods = {
 														tranCarNo: num,
 														carNo: '',
@@ -288,7 +289,8 @@
 														loadPoundImg: '',
 														contractNo: that.contractNo,
 														goodsName: that.goodsName,
-														sendDateStart: ''
+														sendDateStart: '', 
+														driverPhone:that.goods.driverPhone
 													}
 													uni.navigateBack({
 														delta: 1

pageB/contract/look.vue

@@ -72,7 +72,7 @@
 			</view>
 		</view>
 		<view class='footer'>
-			<button class="btn" @click="commit1(goods)">添加发车信息</button>
+			<button class="btn car" @click="commit1(goods)">添加发车信息</button>
 		</view>
 		<!-- <view class="addcarwrap">
 				<view class="addcar" style="background-color: #FFFFFF;"
@@ -365,7 +365,7 @@
 	.center {
 		padding: 10px 20px;
 		background-color: #F5F6FA;
-		margin-bottom: 50px;
+		margin-bottom: 100px;
 	}
 
 	page {
@@ -1074,6 +1074,7 @@
 		bottom: 0;
 		width: 90%;
 		padding: 20px 0;
+		z-index:4;
 	}
 	.btn {
 		width: 90%;

pageB/info/info_list.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="introduce-section">
-		<view class="cu-card article no-card" style='width: 100%;'>
-			<view class="cu-item shadow factoryItem flex justify-between align-center">
-				<view style='flex:1;font-weight:900;'>合约</view>
-				<view style='flex:1;font-weight:900;'>最新价</view>
+		<view class="article no-card" style='width: 100%;'>
+			<view class="shadow factoryItem flex justify-between">
+				<view style='flex:1;color:#B2B3BB;'>合约</view>
+				<view style='flex:1;text-align:right;color:#B2B3BB;'>最新价</view>
 			</view>
 		</view>
 		<view
 			v-for="(item, index) in infoList" :key="index"
 			class="guess-item"
 		>
-		<view class="cu-card article no-card" >
+		<view class="article no-card" >
 			<view class="cu-item shadow factoryItem flex justify-between align-center">
 				<view style='flex:1;'>
-					<view class='factory'>{{item.goodsName}}</view>
+					<view style='color:#333;' class='factory'>{{item.goodsName}}</view>
 				</view>
-				<view style='flex:1;' >
+				<view style='flex:1;text-align:right;font-weight:900;font-size:17px;' >
 					<view :class="item.newPrice > item.openPrice ? 'text-red':'text-green'">{{item.newPrice}}</view>
 				</view>
 			</view>
@@ -338,7 +338,7 @@
 		.guess-item {
 			padding-top: 10upx;
 			padding-bottom: 10upx;
-			border-bottom: 1px solid #b9b9b9;
+			border-bottom: 1px solid #EEEEEE;
 		}
 		.title {
 			font-size: 28upx;

pages.json

@@ -173,8 +173,7 @@
 		{
 			"path": "pages/attestation/index",
 			"style": {
-				"navigationBarTitleText": "身份认证",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "身份认证"
 			}
 		},
 		{

pages/attestation/index.vue

@@ -5,7 +5,7 @@
 			<view class="title" @click="liangShang">
 				粮商身份
 			</view>
-			<view class="arrows1" @click="liangShang">
+			<view class="arrows1" @click="addliangShang">
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
@@ -17,7 +17,7 @@
 			<view class="title" @click="siJi">
 				司机身份
 			</view>
-			<view class="arrows1" @click="siJi">
+			<view class="arrows1" @click="addsiJi">
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
@@ -162,11 +162,29 @@
 					url: `/pages/attestation/indexTwo`
 				})
 			},
+			addliangShang(){
+				uni.navigateTo({
+					url: `/pageD/identity/companyIdentity`
+				})
+			},
 			siJi(){
 				uni.navigateTo({
 					url: `/pages/attestation/indexThree`
 				})
 			},
+			addsiJi(){
+				if(this.drivers.length > 0){
+					uni.navigateTo({
+						url: `/pages/attestation/indexThree`
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: `/pageD/identity/driverIdentity`
+					})
+				}
+				
+			},
 			driverIdentityEdit(items) {
 				uni.navigateTo({
 					url: `/pageD/identity/driverIdentityEdit?id=${items.id}`
@@ -252,17 +270,19 @@
 				})
 			},
 			getList() {
-				this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
-					customerTypeFlag:3,customerType:"粮农"
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.$api.doRequest('get', '/driverViewInfo/selectDriverInfoPage', {
+						pageSize: 10,
+						currentPage: 1,
+						commonId: this.userInfo.id,
+						pcFlag: 0
 					}, 'application/json;charset=UTF-8').then(res => {
-						if(res.data.data){
-							if(res.data.data.id == "" || res.data.data.id == null){
-								this.changes = "确认"
-							}else if(res.data.data.id != "" || res.data.data.id == null){
-								this.changes = "取消"
-							}	
-							this.id = res.data.data.id
+						console.log(res.data.data.records)
+						for(var i = 0 ; i < res.data.data.records.length ; i++){
+							res.data.data.records[i].logo = res.data.data.records[i].driverName.substr(0,1)
 						}
+						
+						this.drivers = res.data.data.records
 					})
 					.catch(res => {
 						if(res.errmsg){
@@ -280,6 +300,34 @@
 							})
 						}
 					});
+				// this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
+				// 	customerTypeFlag:3,customerType:"粮农"
+				// 	}, 'application/json;charset=UTF-8').then(res => {
+				// 		if(res.data.data){
+				// 			if(res.data.data.id == "" || res.data.data.id == null){
+				// 				this.changes = "确认"
+				// 			}else if(res.data.data.id != "" || res.data.data.id == null){
+				// 				this.changes = "取消"
+				// 			}	
+				// 			this.id = res.data.data.id
+				// 		}
+				// 	})
+				// 	.catch(res => {
+				// 		if(res.errmsg){
+				// 			uni.showToast({
+				// 				title: res.errmsg,
+				// 				icon: 'none',
+				// 				duration: 2000
+				// 			})
+				// 		}
+				// 		else{
+				// 			uni.showToast({
+				// 				title: "系统异常，请联系管理员",
+				// 				icon: 'none',
+				// 				duration: 2000
+				// 			})
+				// 		}
+				// 	});
 			},
 			adddriver(index) {
 				if (index == 1) {

pages/business/business.vue

@@ -326,36 +326,16 @@
 			//详情
 			navToDetailPage(item) {
 				let id = item.id;
-				if (item.unitPrice === 0) {
-					this.contactUs();
+				if (this.TabCur == 0) {
+					uni.navigateTo({
+						url: `/pageA/product/detail?id=${id}&compId=${item.compId}`
+					})
 				} else {
-					if (this.TabCur == 0) {
-						uni.navigateTo({
-							url: `/pageA/product/detail?id=${id}&compId=${item.compId}`
-						})
-					} else {
-						uni.navigateTo({
-							url: `/pageA/product/sales_detail?id=${id}&compId=${item.compId}`
-						})
-					}
-
+					uni.navigateTo({
+						url: `/pageA/product/sales_detail?id=${id}&compId=${item.compId}`
+					})
 				}
 			},
-			contactUs() {
-				const that = this
-				uni.makePhoneCall({
-					// 手机号
-					phoneNumber: '15145408888',
-					// 成功回调
-					success: (res) => {
-						console.log('调用成功!')
-					},
-					// 失败回调
-					fail: (res) => {
-						console.log('调用失败!')
-					}
-				});
-			},
 			getIndexBuyData() {
 				const that = this
 				uni.showLoading({

pages/sale/information.vue

@@ -249,6 +249,41 @@
 					reject(e)
 				},
 			})
+			uni.showTabBar()
+			this.pages = 1
+			this.isLoadMore = false
+			this.loadStatus = 'more'
+			this.loadData()
+			var userInfo = uni.getStorageSync("userInfo")
+			var that = this
+			this.$api.doRequest('get', '/salePlanInfo/getTips', {phone:userInfo.phone}).then(res => {
+				if (res.data.data) {
+					let name = 'myTip';
+					let value = res.data.data.myTip;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+					if(value != 0){
+						uni.setTabBarBadge({
+							index:3,
+							text:value+""
+						})
+					}
+					name = 'taskTip';
+					value = res.data.data.taskTip;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+					name = 'contractTip';
+					value = res.data.data.contractTip;
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+				}
+			})
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -370,9 +405,6 @@
 					that.categoryList = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				// 工厂价格
 				that.$api.request('news', 'getFactoryPriceInfo', {
 					category: this.category,
@@ -429,9 +461,6 @@
 					that.newsInfo = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
 					this.isLoadMore = false
@@ -559,6 +588,8 @@
 				uni.showLoading({
 					title: '正在加载',
 				})
+				var pages=that.pages
+				var limit=that.limit
 				that.$api.request('news', 'getNewsInfo', {
 					category: 2,
 					page: 1,

pages/task/my_task.vue

@@ -296,4 +296,7 @@
 		bottom:0;
 		border-bottom:1px solid #22C572;
 	}
+	/deep/.u-action-active{
+		margin-right:6px;
+	}
 </style>

pages/user/setUp.vue

@@ -9,7 +9,7 @@
 				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
 			</view>
 		</view>
-		<view class="flex headPortrait justify-between" @click="nickname">
+		<view class="flex headPortrait justify-between" @click="nickname(username)">
 			<view class="title">昵称</view>
 			<view class="nextStep flex">
 				<view class="username">
@@ -54,9 +54,9 @@
 					url: `/pages/user/set_picture`
 				})
 			},
-			nickname(){
+			nickname(username){
 				uni.navigateTo({
-					url: `/pages/user/set_nickname`
+					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			}
 		}

pages/user/set_nickname.vue

@@ -24,6 +24,9 @@
 				deptListurl: {},
 			}
 		},
+		onLoad(param) {
+			this.nickname = param.nickname
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
@@ -114,7 +117,7 @@
 
 	.texts {
 		line-height: 50px;
-		color: #C6C6C8;
+		/* color: #C6C6C8; */
 		font-size: 16px;
 		/* placeholder-style="font-size:18px" */
 	}