bug

common/helper.js

@@ -92,46 +92,24 @@ const setAudit = (item) => {
 	}
 	console.log(item)
 }
-const contactCustomerService = (phone) => {
-	console.log(phone)
-	if (!phone) {
-		phone = '13304979986'
+const contactCustomerService = (item) => {
+	console.log(item)
+	if (!item) {
+		// item = '400123123'
+		item = '13304979986'
 	}
-	const res = uni.getSystemInfoSync();
-	// ios系统默认有个模态框
-	if(res.platform=='ios'){
-		uni.makePhoneCall({
-		phoneNumber:phone,
-		success(){
-			console.log('拨打成功了');
+	console.log("联系客服")
+	uni.makePhoneCall({
+		phoneNumber: item,
+		success: (res) => {
+			console.log('调用成功!')
 		},
-		fail() {
-			console.log('拨打失败了');
+		// 失败回调
+		fail: (res) => {
+			console.log('调用失败!')
+			contactCustomerService(item)
 		}
-	})
-	}else{
-	//安卓手机手动设置一个showActionSheet
-		uni.showActionSheet({
-			itemList: [phone,'呼叫'],
-			success:function(res){
-				console.log(res);
-			   if(res.tapIndex==1){
-				uni.makePhoneCall({
-				  phoneNumber: phone,
-				success: (res) => {
-					console.log('调用成功!')
-				},
-			  
-				// 失败回调
-				fail: (res) => {
-					console.log('调用失败!')
-					// contactCustomerService(item)
-				}
-				})
-			  }
-			}
-		  })
-	}
+	});
 }
 // 获取市、区简称
 const filterUrban = (s) => {

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -111,7 +111,22 @@
                 }
             }
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {
+            "KJ-Camera" : {
+                "__plugin_info__" : {
+                    "name" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏 - [试用版，仅用于自定义调试基座]",
+                    "description" : "相机自定义拍照录像，可设置相机分辨率、相机焦距、相机无声录像、相机支持横竖屏、相机切换前后摄像头 QQ群：863776189 可接单 离线包：单价*10  源码：单价*15",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=3404",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "3404",
+                    "parameters" : {}
+                }
+            }
+        }
     },
     /* 快应用特有相关 */
     "quickapp" : {},

pages/mine/set.vue

@@ -41,13 +41,13 @@
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
-			<u-line color="#EEEEEE" class="line"></u-line>
+			<!-- <u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between wrap-item' @click='clearStorage'>
 				<view>
 					<text>清除缓存</text>
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
-			</view>
+			</view> -->
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logoutAlert()' class='exitlogin'>退出登录</button>

pages/public/register.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<!-- <view class="container">
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">
 			<h2 class="Semibold">手机号注册</h2>
@@ -10,12 +10,12 @@
 					<input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
 						placeholder="请输入手机号码" type="number" class="Regular" />
 				</view>
-				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
+				
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
 				<view style='width:70%;position:relative;'>
 					<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6"/>
-					<!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
+					
 				</view>
 				<button class='getcode Regular' :class='codestatus?"activeCode":""' @click='getcode'
 					>{{sendText}}</button>
@@ -23,6 +23,54 @@
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
 				<u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
 					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" />
+				
+			</view>
+			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='register'
+				class='verificationCode'>注册</button>
+			<view
+				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
+				<u--image @click='consent'
+					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
+					width="17px" height="17px" style="margin:0 10rpx"></u--image>
+				已阅读并同意
+				<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
+			</view>
+		</view>
+	</view> -->
+	<view class="container">
+		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
+		<view class="wrapper">
+			<h2 class="Semibold">手机号注册</h2>
+			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'
+				class="flex">
+				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
+				<view style='width:85%;'>
+					<!-- <u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+						placeholder="请输入手机号码" type="number" class="Regular" /> -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
+							placeholder="请输入手机号码" type="number" class="Regular" />
+				</view>
+				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
+			</view>
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+				<view style='width:70%;position:relative;'>
+				<!-- 	<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
+					 -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode'  style='padding-left:10px;'
+							placeholder="请输入验证码" type="number" class="Regular" /><!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
+				</view>
+				<button  :class='codestatus?"activeCode":""' @click='getcode'
+					class='getcode Regular'>{{sendText}}</button>
+			</view>
+			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
+				<!-- <u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
+					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" /> -->
+				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style='padding-left:10px;'
+							placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
 				<!-- 				<input maxlength='16' class='password Regular input-style' style='height:30px;' v-model='password' placeholder="请输入密码，6-16位字符" :type="type"> -->
 				<!-- <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> -->
@@ -33,7 +81,7 @@
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px" style="margin:0 10rpx"></u--image>
+					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"

pages/release/editRelease.vue

@@ -25,7 +25,7 @@
 					<view class="top" @click="selectAddress(0)">
 						<view class="send">寄</view>
 						<view class="title">
-							{{dataObj.sendArea?(dataObj.sendPrivate + dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
+							{{dataObj.sendArea?(dataObj.sendPrivate?dataObj.sendPrivate:'' + dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -41,7 +41,7 @@
 					<view class="top" @click="selectAddress(1)">
 						<view class="collect">收</view>
 						<view class="title">
-							{{dataObj.unloadArea?(dataObj.unloadPrivate + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
+							{{dataObj.unloadArea?(dataObj.unloadPrivate?dataObj.unloadPrivate:'' + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -302,10 +302,9 @@
 			}
 		},
 		onShow() {
-			// this.getSFList()
+			this.getSFList()
 		},
 		onLoad(options) {
-
 			_this = this;
 			_this = this;
 			this.dataObj = options
@@ -358,17 +357,24 @@
 						let _self = res.data.companyInfoList
 						//代理货主
 						let _dlhz = res.data.cargoOwnerCompInfoList
-						for (let i = 0; i < _self.length; i++) {
-							if (_self[i].status == '已认证') {
-								this.qyList.push(_self[i])
+						if(_self){
+							for (let i = 0; i < _self.length; i++) {
+								if (_self[i].status == '已认证') {
+									this.qyList.push(_self[i])
+								}
 							}
 						}
-
-						for (let i = 0; i < _dlhz.length; i++) {
-							if (_dlhz[i].status == '已认证') {
-								this.qyList.push(_dlhz[i])
+						if(_dlhz){
+							for (let i = 0; i < _dlhz.length; i++) {
+								if (_dlhz[i].status == '已认证') {
+									this.qyList.push(_dlhz[i])
+								}
 							}
 						}
+						let obj = uni.getStorageSync("firstAuthentication")
+						if(obj && obj.authenticationStatus == '已认证'){
+							this.columns[0].push("个人货主")
+						}
 						for (let i = 0; i < this.qyList.length; i++) {
 							this.columns[0].push(this.qyList[i].company ? this.qyList[i].company : this.qyList[i]
 								.companyName)

pages/release/selectAddress.vue

@@ -4,7 +4,8 @@
 			<u-search placeholder="可按地址、联系人和电话查找" v-model="searchKeyWord" :showAction='false' @search="getList()">
 			</u-search>
 		</view>
-		<view class="content2" v-for="(item,index) in dataList" :key='index' @click="configAddress(item)">
+		<view class="content2-wrap">
+			<view class="content2" v-for="(item,index) in dataList" :key='index' @click="configAddress(item)">
 			<view class="row flex row1">
 				<view class="name">
 					{{item.contacts}}
@@ -36,6 +37,8 @@
 				</view>
 			</view>
 		</view>
+		</view>
+		
 		<view class="bottom-btn">
 			<view class="btn-left" @click="selectAddress(0)">选择临时地址</view>
 			<view class="btn-right" @click="selectAddress(1)">新增地址</view>
@@ -403,11 +406,13 @@
 		background: white;
 		padding: 20rpx;
 	}
-
+	.content2-wrap{
+		margin-bottom:200rpx;
+	}
 	.content2 {
 		border-radius: 20rpx;
 		background: white;
-		margin: 20rpx;
+		margin: 20rpx ;
 		padding: 20rpx;
 
 		.row {
@@ -436,8 +441,10 @@
 
 	.bottom-btn {
 		position: fixed;
-		bottom: 50rpx;
+		bottom: 0rpx;
+		padding:50rpx 0;
 		width: 100%;
+		background-color: #fff;
 		display: flex;
 		justify-content: space-around;