1、消费者端 我的订单 金额出现很多小数位的问题修复

2、项目问题文档里，工圈子第三点

common/js/request.js

@@ -11,9 +11,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com:8881' + args.url;
+				// args.url = 'https://www.opsoul.com:8881' + args.url;
-				// args.url = 'http://192.168.2.42:80' + args.url;
+				// args.url = 'http://192.168.2.60:80' + args.url;
-				// args.url = 'http://127.0.0.1:80' + args.url;
+				args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;

components/custom-bar/module-bar.vue

@@ -52,6 +52,12 @@
 				this.$emit('getCurPageInfo', {
 					curPageCode: cur
 				});
+			},
+			navChangeByCode(curPageCode, isChangeFocus) {
+				this.curPageCode = isChangeFocus ? curPageCode : this.curPageCode;
+				this.$emit('getCurPageInfo', {
+					curPageCode: curPageCode
+				});
 			}
 		}
 	}

pages/index/index.vue

@@ -93,8 +93,15 @@
 				inParam: null
 			}
 		},
-		onLoad(option) {
+		async onLoad(option) {
-			if (option && option.scene) {
+			this.moduleBarInfos = await this.$api.data('moduleBarInfos');
+			if (option) {
+				// 跳转逻辑
+				if (option.menuCode) {
+					this.changeCurPageCode(option.menuCode);
+					return;
+				}
+				if (option.scene) {
 					let paraStr = decodeURIComponent(option.scene);
 					let kvStrArr = paraStr.split("&");
 					kvStrArr.forEach((kvStr) => {
@@ -102,6 +109,7 @@
 						option[kvArr[0]] = kvArr[1];
 					});
 				}
+			}
 			this.inParam = option;
 			this.loadData(option);
 		},
@@ -131,7 +139,6 @@
 		},
 		methods: {
 			async loadData(option) {
-				this.moduleBarInfos = await this.$api.data('moduleBarInfos');
 				this.curUserInfo = this.$request.getCurUserInfo();
 				// 更新分销人信息
 				if (option && option.distributor) {
@@ -151,6 +158,13 @@
 					}
 				}
 			},
+			changeCurPageCode(targetPageCode) {
+				// #ifdef MP
+				this.$nextTick(() => {
+					this.$refs.moduleBar.navChangeByCode(targetPageCode, true);
+				})
+				// #endif
+			},
 			reloadForwardPage() {
 				if (this.inByShare) {
 					this.loadData(this.inParam);

pages/index/my-home.vue

@@ -393,56 +393,47 @@
 					url: '/pages/my/my-address'
 				});
 			},
-			showApplyOperator() {
+			async showApplyOperator() {
 				this.curUserInfo = this.$request.getCurUserInfo();
 				// 判断当前用户的是否已提交分销资格申请
 				if (this.curUserInfo.placeStatus == 0) {
 					uni.navigateTo({
 						url: '/pages/my/apply-operator'
 					})
+				} else if (this.curUserInfo.placeStatus == 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '申请审核中'
+					})
 				} else if (this.curUserInfo.placeStatus == 2) {
+					// 判断是否有绑定银行信息
+					let res = await this.$request.getBindBankCardByCustomerId({
+						customerId: this.curUserInfo.customerId
+					})
+					let bindBankCardInfo = res.data;
+					if (bindBankCardInfo && bindBankCardInfo.bankNum) {
+						// 分销资格审核通过
 						uni.navigateTo({
 							url: '/pages/my/my-team-member'
 						})
 					} else {
-					uni.showToast({
+						// 跳转到银行卡绑定页面
-						icon: 'none',
-						title: '申请审核中'
-					})
-				}
-			},
-			async showAppInviteQrcode() {
-				this.curUserInfo = this.$request.getCurUserInfo();
-				// 判断当前用户的是否已通过分销资格审核
-				if (this.curUserInfo.placeStatus == 1) {
-					uni.showToast({
-						icon: 'none',
-						title: '申请审核中'
-					})
-				} else if (this.curUserInfo.placeStatus != 2) {
-					uni.navigateTo({
-						url: '/pages/my/apply-operator'
-					})
-				} else {
-					// 判断是否有绑定银行信息
-					let res = await this.$request.getBindBankCardByCustomerId({
-						customerId: this.curUserInfo.customerId
-					});
-					let bindBankCardInfo = res.data;
-					if (bindBankCardInfo && bindBankCardInfo.bankNum) {
-						// 分销资格审核通过，可进行二维码分享
-						let res = await this.$request.getUnlimitedWxacode({
-							scene: "distributor=" + this.curUserInfo.customerId
-						});
-						this.appQrcode = res.data;
-						this.appShareQrcodeModal = true;
-					} else {
 						uni.navigateTo({
 							url: '/pages/my/withdraw'
 						})
 					}
 				}
 			},
+			async showAppInviteQrcode() {
+				this.curUserInfo = this.$request.getCurUserInfo();
+				let res = await this.$request.getUnlimitedWxacode({
+					scene: "distributor=" + this.curUserInfo.customerId,
+					//FIXME: 只适用于体验版，正式版需要去掉
+					env_version: 'trial'
+				});
+				this.appQrcode = res.data;
+				this.appShareQrcodeModal = true;
+			},
 			showPage(pageUrl) {
 				if (pageUrl) {
 					uni.navigateTo({

pages/my/my-order.vue

@@ -46,7 +46,7 @@
 						<view class="text-lg" v-else-if="shopOrder.payStatus == 1"><text>实付款</text><text
 								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
 						<view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text
-								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney + shopOrder.changeMoney}}</text></view>
+								class="text-price text-red text-lg text-bold">{{Math.round((shopOrder.payMoney + shopOrder.changeMoney) * 100) / 100}}</text></view>
 					</view>
 					<view class="padding-bottom-sm flex justify-end align-end text-red text-lg" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney">您有报价/加价申请待付款中......</view>
 					<view v-if="orderType === 0" class="padding-tb-sm">

pages/order/order-detail.vue

@@ -296,7 +296,7 @@
 				} else if (this.formInfo.payWay == '1') {
 					// 上门支付则不拉起微信支付窗口，直接跳转至提示导航页面
 					uni.navigateTo({
-						url: '/pages/order/pay-result?customTip=下单成功，待上门支付'
+						url: '/pages/order/pay-result?customTip=您选择上门到付款，师傅/服务人员上门后会让您付款，请配合！可从对方出示的系统二维码或你订单中的“付款”键支付！'
 					})
 					return;
 				}

pages/order/pay-result.vue

@@ -80,7 +80,8 @@
 					}
 				}
 				uni.navigateTo({
-					url: '/pages/my/my-order?tabInfo=' + encodeURIComponent(JSON.stringify(params))
+					// url: '/pages/my/my-order?tabInfo=' + encodeURIComponent(JSON.stringify(params))
+					url: '/pages/index/index?menuCode=myPage'
 				})
 			}
 		},