gjy vor 2 Jahren
Ursprung
Commit
dc72edb23e
4 geänderte Dateien mit 22 neuen und 12 gelöschten Zeilen
  1. 1 1
      config/index.js
  2. 19 9
      pages/mine/index.vue
  3. 1 1
      pages/order/index.vue
  4. 1 1
      pages/public/register.vue

+ 1 - 1
config/index.js

@@ -1,5 +1,5 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	

+ 19 - 9
pages/mine/index.vue

@@ -6,7 +6,7 @@
 				<view style='margin-bottom:14px;' class="row flex flex-end">
 					<u--image class='image' :showLoading="true" src="../../static/mine/saoma.png" width="20px"
 						height="20px" @click="scanCode()" v-if='hasLogin'></u--image>
-					<u--image @click="goDetailPage('/pages/mine/set')" style='margin-right:0;' class='image'
+					<u--image @click="goDetailPage('/pages/mine/set',true)" style='margin-right:0;' class='image'
 						:showLoading="true" src="../../static/mine/shezhi.png" width="20px" height="20px"></u--image>
 				</view>
 				<view class="flex">
@@ -17,9 +17,9 @@
 						<view class='flex items-center'>
 							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-else class='username'>{{userInfo.userName}} </view>
-							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" v-if='status'
+							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" v-if='status'
 								class='currectstatus'>已认证</view>
-							<view@click="goDetailPage(' /pages/mine/cargoowner/cargoowner')" v-if='!status'
+							<view@click="goDetailPage(' /pages/mine/cargoowner/cargoowner',true)" v-if='!status'
 								class='currectstatus1'>
 								{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}
 						</view>
@@ -33,7 +33,7 @@
 					<view style='font-size:14px;'>货主身份认证</view>
 					<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
 				</view>
-				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" class='promptlyAuthentication'>立即认证
+				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" class='promptlyAuthentication'>立即认证
 				</view>
 			</view>
 		</view>
@@ -305,11 +305,21 @@
 					// 	uni.$u.route(src);
 					// }
 				} else {
-					if (isClick) {
-						uni.$u.route(src);
-					} else {
-						uni.$u.toast('请先完成货主认证!')
-					}
+					this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.userInfo.phone
+					}).then(res => {
+						uni.setStorageSync("firstAuthentication", res.data)
+						if (res.data.authenticationStatus!='已认证'&&!isClick) {
+							uni.$u.toast('请先完成货主认证!')
+						}else{
+							uni.$u.route(src);
+						}
+					})
+					// if (isClick) {
+					// 	uni.$u.route(src);
+					// } else {
+					// 	uni.$u.toast('请先完成货主认证!')
+					// }
 
 
 				}

+ 1 - 1
pages/order/index.vue

@@ -269,7 +269,7 @@
 					},
 					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						tip: '没有更多记录啦!'
+						tip: '暂无记录!'
 					}
 				},
 				searchKeyWord: '',

+ 1 - 1
pages/public/register.vue

@@ -34,7 +34,7 @@
 				<!-- <image v-if='password!=""' @click='password=""' class='close2' src='../../static/img/login/guanbi@2x.png'></image> -->
 				<!-- <view @click='switchover' style='position:absolute;right:0;top:38%;z-index:10;cursor:pointer;' class="iconfont " :class='type=="password"?"icon-yanjing-biyan":"icon-yanjing-zhengyan"'></view> -->
 			</view>
-			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='$u.throttle(register, 5000)'
+			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='$u.throttle(register(), 5000)'
 				class='verificationCode'>注册</button>
 			<view
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>