ccj 3 سال پیش
والد
کامیت
48841f7ace
7فایلهای تغییر یافته به همراه36 افزوده شده و 32 حذف شده
  1. 17 17
      App.vue
  2. 4 8
      manifest.json
  3. 5 2
      pages/order/index.vue
  4. 2 2
      pages/order/orderDetails.vue
  5. 1 0
      pages/public/login.vue
  6. 7 3
      pages/release/release.vue
  7. 0 0
      unpackage/dist/build/app-plus/__uniappscan.js

+ 17 - 17
App.vue

@@ -21,23 +21,23 @@
 		},
 		onLaunch: function() {
 			let that = this
-			uni.onTabBarMidButtonTap(() => {
-				console.log("点击发布")
-				if (!that.hasLogin) {
-					// uni.$u.route('/pages/public/login');
-					uni.navigateTo({
-						url: "/pages/public/login",
-						animationType: "slide-in-bottom", // 动画类型
-						animationDuration: 150, // 窗口动画持续时间,单位为 ms
-						fail(err) {
-							console.log(err)
-						},
-						success(res) {
-							console.log(res)
-						}
-					})
-				}
-			})
+			// uni.onTabBarMidButtonTap(() => {
+			// 	console.log("点击发布")
+			// 	if (!that.hasLogin) {
+			// 		// uni.$u.route('/pages/public/login');
+			// 		uni.navigateTo({
+			// 			url: "/pages/public/login",
+			// 			animationType: "slide-in-bottom", // 动画类型
+			// 			animationDuration: 150, // 窗口动画持续时间,单位为 ms
+			// 			fail(err) {
+			// 				console.log(err)
+			// 			},
+			// 			success(res) {
+			// 				console.log(res)
+			// 			}
+			// 		})
+			// 	}
+			// })
 			uni.getSystemInfo({
 				success: function(e) {
 					Vue.prototype.statusBar = e.statusBarHeight

+ 4 - 8
manifest.json

@@ -20,8 +20,7 @@
         "modules" : {
             "Maps" : {},
             "VideoPlayer" : {},
-            "Geolocation" : {},
-            "iBeacon" : {}
+            "Geolocation" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -36,8 +35,6 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -51,10 +48,9 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-                ]
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {},

+ 5 - 2
pages/order/index.vue

@@ -138,7 +138,7 @@
 						<view class="start normal" @click.stop="toDetail(good.id)"
 							v-if="good.cargoOwnerStatus=='待确认装车'">确认装车</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
-						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'">
+						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click="$helper.contactCustomerService()">
 							联系客服</view>
 						<view class="start normal" @click.stop="confirmLoading(good,4)"
 							v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
@@ -309,7 +309,10 @@
 			let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 				phone: this.userInfo.phone,
 			}).then(res => {
-				return res.data.authenticationStatus
+				if(res.data){
+					return res.data.authenticationStatus
+				}
+				
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true

+ 2 - 2
pages/order/orderDetails.vue

@@ -6,7 +6,7 @@
 			<view class='title flex flex-center'>
 				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
 				<view class="nav-title">订单详情</view>
-				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService">
+				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService()">
 				</u-icon>
 			</view>
 		</view>
@@ -45,7 +45,7 @@
 				<u-button class="btn" text="付款" @click="closed"
 					v-if="dataObj.cargoOwnerStatus=='待结算'||dataObj.cargoOwnerStatus=='已结算'"></u-button>
 				<u-button class="btn" text="还款" @click="stop" v-if="dataObj.cargoOwnerStatus=='待还款'"></u-button>
-				<u-button class="btn" text="联系客服"
+				<u-button class="btn" text="联系客服" @click="$helper.contactCustomerService()"
 					v-if="dataObj.cargoOwnerStatus!='待接单'&&dataObj.cargoOwnerStatus!='未装车'">
 				</u-button>
 			</view>

+ 1 - 0
pages/public/login.vue

@@ -118,6 +118,7 @@
 		onShow() {
 			// this.loginType = "wechat"
 			this.$api.logout()
+			console.log("login onShow")
 		},
 		onLoad(options) {
 

+ 7 - 3
pages/release/release.vue

@@ -337,9 +337,10 @@
 				uni.$u.route('/pages/public/login');
 				return
 			}
-			if (uni.getStorageSync('firstAuthentication').authenticationStatus == '已认证') {
+			var auth = uni.getStorageSync('firstAuthentication')
+			if (auth && auth.authenticationStatus == '已认证') {
 				uni.$u.route('/pages/components/empty/index');
-			} else if (uni.getStorageSync('firstAuthentication').authenticationStatus == '审核中') {
+			} else if (auth && auth.authenticationStatus == '审核中') {
 				uni.showToast({
 					title: '身份信息审核中'
 				})
@@ -403,7 +404,10 @@
 			let _status = await this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 				phone: this.userInfo.phone,
 			}).then(res => {
-				return res.data.authenticationStatus
+				if(res.data){
+					return res.data.authenticationStatus
+				}
+				
 			})
 			if (_status == '已禁用') {
 				this.isShowAlert = true

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/build/app-plus/__uniappscan.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است