commit -m

components/cm-module/creatOrder/goodsList.vue

@@ -16,7 +16,7 @@
 							<view class="producttitle">{{pros.productName}}</view>
 							<view class="productspec">规格:{{pros.unit}}</view>
 							<view class="productprice">
-								<view class="price"><text>￥{{ (pros.productType == 2 ? 0 : pros.price) | NumFormat}}</text></view>
+								<view class="price"><text>￥{{ (pros.productType == 2 ? 0 : pros.retailPrice) | NumFormat}}</text></view>
 								<view class="count"><text class="small">x</text>{{pros.productCount}}</view>
 							</view>
 							<view class="floor-item-act" v-if="pros.promotion!=null">

pages.json

@@ -110,7 +110,7 @@
 			{
 				"path": "order/orderShareLogin",
 				"style": {
-					"navigationBarTitleText": "输入分享码"
+					"navigationBarTitleText": "查看订单"
 				}
 			},
 			{

pages/authorization/authorization.vue

@@ -4,9 +4,7 @@
 			<image class="logo" src="../../static/ws/logo.png" mode="widthFix"></image>
 		</view>
 		<view class="login-content">
-			<text
-				>您暂未授权采美采购小程序获取您的信息，将无法正常使用小程序的功能。如需正常使用，请点击“授权”按钮，并允许头像、昵称等信息的授权。</text
-			>
+			<text>您暂未授权维沙采购商城小程序获取你的信息，将无法正常使用小程序的功能。如需正常使用，请点击“授权”按钮，打开头像，昵称等信息的授权</text>
 		</view>
 		<view class="login-form">
 			<button

pages/user/order/create-order.vue

@@ -27,6 +27,11 @@
 					<text>共{{allCount}}件商品</text>
 				</view>
 				<view class="footer-price">
+					<view class="sum-none" v-if="reducedPrice>0">
+						<text class="money-sign">￥</text>
+						<text class="money">{{ totalOriginalPrice | NumFormat }}</text>
+						<text class="money-reduced">减<text>￥{{ reducedPrice | NumFormat}}</text></text>
+					</view>
 					<view class="sum" :class="reducedPrice == 0 ? 'none' : ''">总价:<text class="price">￥{{payAllPrice | NumFormat}}</text></view>
 				</view>
 			</view>

pages/user/order/order-details.vue

@@ -14,8 +14,6 @@
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-			<!-- 转账信息 -->
-			<!-- <transfe-record ref="transfe" v-if="receiptAmount == 0 || onlinePayFlag == '1'"></transfe-record> -->
 			<!-- 支付记录 -->
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
@@ -108,6 +106,7 @@
 				},
 				clauseData:{},
 				orderSubmitType:false,//自主订单
+				organizeId:0,
 				modal:false,
 				OperationType:'',
 				contentModalText:''
@@ -115,6 +114,9 @@
 		},
 		onLoad(option){
 			console.log(option)
+			this.$api.getStorage().then((resolve) =>{
+				this.organizeId = resolve.organizeId
+			})
 			this.shareType = option.type;
 			this.orderId = option.orderId
 			if(this.shareType ==='share'){
@@ -285,7 +287,7 @@
 			    }
 				return {
 					title: '点击查看您的订单~',
-					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userId=${this.userId}`,
+					path: `/pages/user/order/orderShareLogin?orderId=${this.orderId}&organizeId=${this.organizeId}`,
 					imageUrl:'https://static-b.caimei365.com/app/wisa/img/icon/icon-share.png'
 				}
 			},

pages/user/order/order-historylist.vue

@@ -392,7 +392,7 @@
 			    }
 				return {
 					title: '点击查看您的订单~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.userId}`,
+					path: `/pages/user/order/orderShareLogin?orderId=${this.btnoRderID}&organizeId=${this.organizeId}`,
 					imageUrl:'https://static-b.caimei365.com/app/wisa/img/icon/icon-share.png'
 				}
 			},

pages/user/order/order-list.vue

@@ -257,6 +257,7 @@
 				setTimeout(()=>{
 					this.$api.getStorage().then((resolve) =>{
 						this.userId = resolve.userId
+						this.organizeId = resolve.organizeId
 						let params = {orderState:index,organizeId:resolve.organizeId,pageNum:1,pageSize:this.pageSize};
 						this.OrderService.QueryOrderList(params).then(response =>{
 							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
@@ -411,7 +412,7 @@
 			    }
 				return {
 					title: '点击查看您的订单~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.userId}`,
+					path: `/pages/user/order/orderShareLogin?orderId=${this.btnoRderID}&organizeId=${this.organizeId}`,
 					imageUrl:'https://static-b.caimei365.com/app/wisa/img/icon/icon-share.png'
 				}
 			},

pages/user/order/order-sharedetails.vue

@@ -8,8 +8,6 @@
 		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 		<!-- 发票信息 -->
 		<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-		<!-- 转账记录 -->
-		<transfe-record ref="transfe" v-if="isRequest"></transfe-record>
 		<!-- 支付记录 -->
 		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 		<!-- 退款记录 -->

pages/user/order/orderShareLogin.vue

@@ -31,15 +31,15 @@ export default {
 			nickName: '', //存储用户名
 			userInfo: '', //存储微信用户授权信息
 			orderId: 0, //订单ID
-			userId: 0, //分享人的用户ID
+			organizeId: 0, //分享人的用户ID
 			isShareStatus: false
 		}
 	},
 	onLoad(e) {
 		// this.orderId = e.orderId || '13140'
-		// this.userId = e.userId || '13914'
+		// this.organizeId = e.organizeId || '13914'
 		this.orderId = e.orderId
-		this.userId = e.userId
+		this.organizeId = e.organizeId
 	},
 	computed: {
 		canSubmit() {
@@ -47,6 +47,31 @@ export default {
 		}
 	},
 	methods: {
+		initQueryUser(){
+			authorize.getCode('weixin').then(wechatcode =>{
+				let params ={
+						code:wechatcode,
+						orderId:this.orderId,
+						organizeId:this.organizeId,
+						shareCode:this.shareCode
+					}
+				this.OrderService.OrderShareCode(params).then(response =>{
+					console.log(response.code)
+					if(response.code === 2){
+						this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.orderId}`)
+					}else if(response.code === 0) {
+						console.log(response.data)
+						if(response.data == true){//同为会所运营人员查看订单详情
+							this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.orderId}`)
+						}else{//游客第二次查看订单详情
+							this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderId=${this.orderId}`)
+						}
+					}else if(response.code === -2){
+						this.$util.modal('提示',response.msg,'确定','',false,() =>{})
+					}
+				})
+			})
+		},
 		goLogin() {
 			if (this.shareCode == '') {
 				this.$util.msg('请联系分享人获取分享码', 2000)
@@ -60,7 +85,7 @@ export default {
 				let params = {
 					code: wechatcode,
 					orderId: this.orderId,
-					userId: this.userId,
+					organizeId: this.organizeId,
 					shareCode: this.shareCode
 				}
 				this.OrderService.OrderShareCode(params).then(response => {
@@ -76,7 +101,9 @@ export default {
 			})
 		}
 	},
-	onShow() {}
+	onShow() {
+		this.initQueryUser()
+	}
 }
 </script>
 

pages/user/order/search-order.vue

@@ -404,7 +404,7 @@
 			    }
 				return {
 					title: '点击查看您的订单~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.userId}`,
+					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&organizeId=${this.organizeId}`,
 					imageUrl:'https://static-b.caimei365.com/app/wisa/img/icon/icon-share.png'
 				}
 			},

services/config.env.js

@@ -2,7 +2,7 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8010'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8010'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     URL_CONFIG = 'https://mall2b-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://mall2b.caimei365.com'