更新

config/index.js

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

manifest.json

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

pages.json

@@ -743,7 +743,8 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "客户邀请",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
             }
             
         }

pages/erpbusiness/sm/sm.vue

@@ -32,7 +32,7 @@
 					<image class="img" :src="img2" alt=""></image>
 					<view class="text">您还未认证个人粮商身份</view>
 				</view>
-				<button v-if="grainMerchantList.length>0" :class="isAllselect?'':'custom-style'" @click="submit">{{btnVal}}</button>
+				<button v-if="grainMerchantList.length>0" :class="flag?'':'custom-style'" @click="submit">{{btnVal}}</button>
 				<button v-if="grainMerchantList.length==0" class="custom-style" @click="toGrainMerchantCertification()">接受并去认证</button>
 			</div>
 		</u-popup>
@@ -57,12 +57,23 @@
 					title: '',
 					companyId: ''
 				},
-				isAllselect:false
+				isAllselect:false,
+				flag : true
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onLoad(options) {
+			  //#ifdef APP-PLUS
+			  this.user.title = options.data.split(',')[2]
+			  this.user.companyId = options.data.split(',')[1]
+			  //#endif
+			  console.log("options:",options,this.user.title,this.user.companyId)
+		},
+		onShow() {
+			this.getList()
+		},
 		methods: {
 			selectItem(item) {
 				console.log("item", item)
@@ -86,18 +97,11 @@
 					url:'/pages/attestation/indexTwo'
 				})
 			},
-			onLoad(options) {
-				  //#ifdef APP-PLUS
-				  this.user.title = options.data.split(',')[2]
-				  this.user.companyId = options.data.split(',')[1]
-				  //#endif
-			},
-			onShow() {
-				this.getList()
-			},
+			
 			getList() {
 				console.log(this.userInfo)
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
+				this.grainMerchantList = []
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 100,
 						currentPage: 1,
@@ -113,6 +117,10 @@
 						}
 						var data = res.data.data.records
 						for (var i = 0; i < data.length; i++) {
+							if(data[i].authenticationStatus == "未通过")
+							{
+								continue
+							}
 							if (data[i].customerTypeFlag == 2) {
 								if (data[i].compName && data[i].compName.length > 10) {
 									data[i].compName = data[i].compName.substring(0, 10) + "..."
@@ -123,14 +131,15 @@
 								this.isAllselect = true
 							} else {
 								data[i].check = false
-								this.isAllselect = false
+								this.isAllselect = false								
+								this.flag = false
 							}
+							this.grainMerchantList.push(data[i])
 						}
-						if(this.isAllselect){
+						if(this.flag){
 							this.btnVal = "已接受"
 						}
-						this.grainMerchantList = res.data.data.records
-						console.log(this.grainMerchantList)
+						console.log("grainMerchantList",this.grainMerchantList)
 
 					})
 					.catch(res => {
@@ -150,7 +159,7 @@
 					});
 			},
 			submit() {
-				if(this.isAllselect) return
+				if(this.flag) return
 				// let _isAllCheck = false
 				// for (let i = 0; i < this.grainMerchantList.length; i++) {
 				// 	if (this.grainMerchantList[i].check) {
@@ -164,14 +173,13 @@
 				// 		icon: false
 				// 	})
 				// }
-				console.log("this.user.compId",this.user.companyId)
+				console.log("this.user.compId",this.user.companyId,this.selectID)
 				this.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
 						id: this.selectID,
 						compId:this.user.companyId,
 					}, 'application/json;charset=UTF-8').then(res => {
 						console.log(res);
-						if (res.statusCode == 200) {
-							
+						if (res.data.code == 200) {
 							this.getList()
 							
 						}

pages/user/user.vue

@@ -30,13 +30,12 @@
 
 		</view>
 		<view style='background:transparent;margin-bottom:0;padding:0;' class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-						<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
+						<view class="cu-item"  v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
 							<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-								<text v-if='item.num==1&&taskTip' class='badge_user'>{{taskTip}}</text>
 								<image :src="item.src" class="sign"></image>
+								
+								<text>{{item.name}}</text>
 							</view>
-							
-							<text>{{item.name}}</text>
 						</view>
 					</view>
 		<view class="cover-container">
@@ -46,6 +45,7 @@
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
 				<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<text v-if='item.num==1&&taskTip' class='badge_user'>{{taskTip}}</text>
 						<image :src="item.src" class="sign1"></image>
 					</view>		
 					<text>{{item.name}}</text>
@@ -291,14 +291,33 @@
 		methods: {
 			smBtnClick(){
 				console.log(2)
-				uni.scanCode({
-				    success: function (res) {
-				        console.log('条码内容：' + res.result);
-						uni.navigateTo({
-							url:"/pages/erpbusiness/sm/sm?data="+res.result
-						})
-				    }
-				});
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录，是否立即登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else {
+					uni.scanCode({
+					    success: function (res) {
+					        console.log('条码内容：' + res.result);
+							uni.navigateTo({
+								url:"/pages/erpbusiness/sm/sm?data="+res.result
+							})
+					    }
+					});
+				}
+				
 			},
 			fankui(){
 				uni.navigateTo({
@@ -930,13 +949,11 @@
 		width:35px;
 		height:35px;
 		top: 4px;
-		margin-right: 6px;
 	}
 	.sign1{
 		width:26px;
 		height:26px;
 		top: 4px;
-		margin-right: 6px;
 	}
 	.indexUp{
 		padding:0 20px;