zhuxiuping 2 rokov pred
rodič
commit
aad5531b1c

+ 1 - 1
App.vue

@@ -1,7 +1,7 @@
 <script>
 <script>
 export default {
 export default {
 	globalData: {
 	globalData: {
-		baseurl: 'https://www.daweilinli.com/cloud-mall'
+		baseurl: 'https://www.jinganrenjiams.com/cloud-mall-tmp'
 	},
 	},
 	onLaunch: function () {},
 	onLaunch: function () {},
 	onShow: function () {},
 	onShow: function () {},

+ 4 - 1
packageShang/pages/pay/success.vue

@@ -5,7 +5,7 @@
 			<view class="title">支付成功</view>
 			<view class="title">支付成功</view>
 		</view>
 		</view>
 		<view class="padding-lr-16" style="margin-top: 200rpx;">
 		<view class="padding-lr-16" style="margin-top: 200rpx;">
-			<view class="dflex-b border-radius-big "><view class=" tac padding-tb-sm flex1 bg-base-succ" @click="toOrder">查看订单</view></view>
+			<view class="dflex-b border-radius-big "><view class=" tac padding-tb-sm flex1 chakan" @click="toOrder">查看订单</view></view>
 			<view class=" border-radius-big margin-tb-lg padding-lr-16"><view class="tac padding-tb-sm flex1 " @click="fanhui">返回首页</view></view>
 			<view class=" border-radius-big margin-tb-lg padding-lr-16"><view class="tac padding-tb-sm flex1 " @click="fanhui">返回首页</view></view>
 		</view>
 		</view>
 	</view>
 	</view>
@@ -45,4 +45,7 @@ export default {
 	font-size: 38rpx;
 	font-size: 38rpx;
 	color: #303133;
 	color: #303133;
 }
 }
+.chakan{
+	background-color: rgba(36, 147, 241, 1); color:rgba(255, 255, 255, 1) ;width: 158rpx;height: 71rpx;font-size: 24rpx;
+}
 </style>
 </style>

+ 1 - 0
packageShang/pages/user/order/order-evaluate.vue

@@ -158,6 +158,7 @@
 							var data={
 							var data={
 								"orderId": _this.postData.orderId,
 								"orderId": _this.postData.orderId,
 								"goodsId": _this.order_detail[0].goodsId,
 								"goodsId": _this.order_detail[0].goodsId,
+								"skuId":_this.order_detail[0].skuId,
 								"reviewContent": _this.postData.review_content,
 								"reviewContent": _this.postData.review_content,
 								"reviewType": type,//1差评 2中评 3好评
 								"reviewType": type,//1差评 2中评 3好评
 								"reviewCnt": _this.postData.review_cnt,//1-5
 								"reviewCnt": _this.postData.review_cnt,//1-5

+ 1 - 1
packageShang/pages/user/order/order.vue

@@ -141,7 +141,7 @@
 											</text>
 											</text>
 										<view class="ft-dark fs-xs padding-top-xs">
 										<view class="ft-dark fs-xs padding-top-xs">
 											<text class="margin-right">× {{goodsItem.goodsCount}}</text>
 											<text class="margin-right">× {{goodsItem.goodsCount}}</text>
-											<!-- {{ goodsItem.goods_sku_name || '&nbsp;&nbsp;' }} -->
+											{{ goodsItem.goodsAttr || '&nbsp;&nbsp;' }}
 										</view>
 										</view>
 										<view class="margin-top-sm">
 										<view class="margin-top-sm">
 											<text class="price ft-main fs-sm">{{ goodsItem.goodsActualPrice}}</text>
 											<text class="price ft-main fs-sm">{{ goodsItem.goodsActualPrice}}</text>

+ 32 - 32
pages/my/my.vue

@@ -20,12 +20,42 @@
 		</view>
 		</view>
 
 
 		<!-- 内容区域 -->
 		<!-- 内容区域 -->
-		<view class="body">
+		<view class="body">
+			<!-- 民宿管理区域 -->
+			<view class="body_box">
+				<view class="box_title">民宿管理</view>
+				<view class="box_list">
+					<view class="item_box" @click="handleGoPage('/pages/orderManage/orderManage')">
+						<img class="box_img" src="../../static/my/order.png" />
+						<view class="box_text">订单管理</view>
+					</view>
+					<view class="item_box" @click="handleGoPage('/pages/myEvaluate/myEvaluate')">
+						<img class="box_img" src="../../static/my/evaluate.png" />
+						<view class="box_text">我的评价</view>
+					</view>
+					<view class="item_box" @click="handleGoPage('/pages/myComplaint/myComplaint')">
+						<img class="box_img" src="../../static/my/complaint.png" />
+						<view class="box_text">投诉进度</view>
+					</view>
+					<view class="item_box" @click="handleGoPage('/pages/collect/collect')">
+						<img class="box_img" src="../../static/my/collect.png" />
+						<view class="box_text">收藏/住过</view>
+					</view>
+					<view class="item_box" @click="handleGoPage('/pages/myCoupon/myCoupon')">
+						<img class="box_img" src="../../static/my/coupon.png" />
+						<view class="box_text">我的卡券</view>
+					</view>
+					<view class="item_box" @click="handleGoPage('/pages/common/common')">
+						<img class="box_img" src="../../static/my/people.png" />
+						<view class="box_text">常用旅客</view>
+					</view>
+				</view>
+			</view>
 			<!-- 我的订单区域 -->
 			<!-- 我的订单区域 -->
 			<view class="myOrder">
 			<view class="myOrder">
 				<view class="myOrder_header">
 				<view class="myOrder_header">
 					<img class="header_img" src="../../static/my/myorder5.png" />
 					<img class="header_img" src="../../static/my/myorder5.png" />
-					<view class="header_title">我的订单</view>
+					<view class="header_title">商城订单</view>
 					<view class="header_more" @click="toOrder('/packageShang/pages/user/order/order', '全部')">
 					<view class="header_more" @click="toOrder('/packageShang/pages/user/order/order', '全部')">
 						全部订单
 						全部订单
 						<img class="more_img" src="../../static/my/right.png" />
 						<img class="more_img" src="../../static/my/right.png" />
@@ -72,36 +102,6 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<!-- 民宿管理区域 -->
-			<view class="body_box">
-				<view class="box_title">民宿管理</view>
-				<view class="box_list">
-					<view class="item_box" @click="handleGoPage('/pages/orderManage/orderManage')">
-						<img class="box_img" src="../../static/my/order.png" />
-						<view class="box_text">订单管理</view>
-					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myEvaluate/myEvaluate')">
-						<img class="box_img" src="../../static/my/evaluate.png" />
-						<view class="box_text">我的评价</view>
-					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myComplaint/myComplaint')">
-						<img class="box_img" src="../../static/my/complaint.png" />
-						<view class="box_text">投诉进度</view>
-					</view>
-					<view class="item_box" @click="handleGoPage('/pages/collect/collect')">
-						<img class="box_img" src="../../static/my/collect.png" />
-						<view class="box_text">收藏/住过</view>
-					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myCoupon/myCoupon')">
-						<img class="box_img" src="../../static/my/coupon.png" />
-						<view class="box_text">我的卡券</view>
-					</view>
-					<view class="item_box" @click="handleGoPage('/pages/common/common')">
-						<img class="box_img" src="../../static/my/people.png" />
-						<view class="box_text">常用旅客</view>
-					</view>
-				</view>
-			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>