Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

.env.js

@@ -10,8 +10,8 @@
 		}
 
 	} else if (process.env.NODE_ENV === "production") {
-		ENV_VAR = require('./.env.prod.js');
-		//ENV_VAR = require('./.env.test.js');
+		// ENV_VAR = require('./.env.prod.js');
+		ENV_VAR = require('./.env.test.js');
 	}
 	if (ENV_VAR) {
 		process.uniEnv = {};

src/components/order/index.vue

@@ -17,7 +17,7 @@
 			<view class="address-view">
 				<view class="address-left-view">
 					<image class="address-image" :src="dizhiImage" mode="widthFix"></image>
-					<text>{{orderData.contactAddress }}</text>
+					<text>{{ formatAddress(orderData) }}</text>
 				</view>
 				<view v-if="showDistance">
 					{{orderDistance}}km
@@ -110,7 +110,7 @@
 				*/
 				orderType: 0 
 			};
-		},
+		},
 		computed: {
 			orderText() { // 按钮文字
 				return this.typeTexts[this.orderType]
@@ -269,6 +269,17 @@
 					}, 1000)
 				}
 			},
+			formatAddress(order) {
+				let address = ""
+				if(order) {
+					address = order.contactProvinceText || ""
+					address += order.contactCityText || ""
+					address += order.contactCommunityText || ""
+					address += order.contactStreetText || ""
+					address += order.contactAddress || ""
+				}
+				return address
+			},
 			/**  
 			 * echo distance(116.3896,39.91917,116.3940,39.91726);
 			 * 计算两点之间直线距离  

src/pages/login/index.vue

@@ -162,7 +162,7 @@ export default {
 				if(index) {
 					let prevPage = pages[index]; //上一个页面
 					if(prevPage.route == "pages/login/index") {
-						uni.navigateTo({
+						uni.redirectTo({
 							url:'pages/index/index'
 						})
 					} else {
@@ -174,12 +174,12 @@ export default {
 						})
 					}
 				} else {
-					uni.navigateTo({
+					uni.redirectTo({
 						url:'pages/index/index'
 					})
 				}
 			} else {
-				uni.navigateTo({
+				uni.reLaunch({
 					url: "pages/index/mine"
 				})
 			}

src/pages/order/complete.vue

@@ -320,8 +320,8 @@
                 return pass
             },
             confirm(){// 检查结果窗口 确认回调
-                uni.switchTab({
-                    url: '/pages/index/order'
+                uni.reLaunch({
+                    url: '/pages/index/order?type=3'
                 })
             },
             closeCheckResult(){// 检查结果窗口取消回调

src/pages/settle/prompt.vue

@@ -16,9 +16,9 @@
 						v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text>
 				</view>
 				<view class="services-view">
-					<view v-if="[1, 2, 3, 4].indexOf(status) != -1">
-					<image class="service-info-image" :src="erweimaImage"></image>
-					<view class="content-info-tip">长按二维码添加官方客服微信</view>
+					<view v-if="[1, 2, 3, 4, 7].indexOf(status) != -1">
+					<image class="service-info-image" :src="erweimaImage" @longtap="saveQrcode"></image>
+					<view class="content-info-tip">长按二维码保存图片，添加官方客服微信</view>
 					<view class="content-info-tip">及时了解审核进度</view>
 					</view>
 				</view>
@@ -183,6 +183,25 @@
 				}
 				this.info = info
 			},
+			saveQrcode() {
+				let that = this;
+				uni.downloadFile({           //获得二维码的临时地址
+					url: that.erweimaImage,
+					success:(res)=>{
+						if(res.statusCode == 200){
+							uni.saveImageToPhotosAlbum({
+								filePath:res.tempFilePath,//传入临时地址
+								success() {
+									that.$u.toast('保存成功!');
+								},
+								fail() {
+									that.$u.toast('保存失败!');
+								}
+							})
+						}
+					}
+				})
+			},
 			goPage() {
 				const url = this.info.url
 				if (this.status == 1 || this.status == 3 || this.status == 7) {