更新一些问题

my/setting/chat.vue

@@ -450,7 +450,7 @@
 					userHead: avatar,
 					userName: userName,
 					storeId: '0',
-					storeHead: '码兄外卖',
+					storeHead: '墨轩云商',
 					storeName: ''
 				}
 				this.$Request.postJson('/app/chats/save', data).then(res => {

pages.json

@@ -109,6 +109,12 @@
 			}
 		},
 		{
+			"path": "pages/order/feedbacks",
+			"style": {
+				"navigationBarTitleText": "点赞骑手"
+			}
+		},
+		{
 			"path": "pages/order/complaint/complaint",
 			"style": {
 				"navigationBarTitleText": "投诉"

pages/index/shop/goodsList.vue

@@ -37,7 +37,7 @@
 							</image>
 						</view>
 					</view>
-					<view class="flex align-center margin-top-xs">
+					<view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
 						<text style="width: 14%;">公告：</text>
 						<u-notice-bar color="#AAAAAA" :speed="100" border-radius="30" padding="0rpx 0rpx" bg-color="#f5f5f5" style="width: 86%;" type="none" mode="horizontal" :volume-icon="false" :list="shopDet.shopNotice.split(',')"></u-notice-bar>
 					</view>
@@ -434,6 +434,9 @@
 			let that = this
 			that.shopId = option.shopId
 			that.orderId = uni.getStorageSync('orderId')?uni.getStorageSync('orderId'):''
+			if (that.orderId) {
+				that.getOrderDetail();
+			}
 			console.log('店铺id', option.shopId)
 			console.log('订单id', that.orderId)
 			uni.getLocation({
@@ -465,6 +468,9 @@
 		},
 		onShow() {
 			this.userId = uni.getStorageSync('userId')
+			if (this.orderId) {
+				this.getOrderDetail();
+			}
 			this.getOrderList()
 			this.getcouponList()
 		},
@@ -483,6 +489,16 @@
 			}
 		},
 		methods: {
+			getOrderDetail() {
+				this.$Request.getT('/app/order/selectOrderById?orderId=' + this.orderId).then(res => {
+					if (res.code == 0 && res.data) {
+						if (res.data.isPay && res.data.isPay == 1) {
+							this.orderId = '';
+							uni.removeStorageSync('orderId')
+						}
+					}
+				});
+			},
 			getcoupons(){
 				this.coupons = true
 			},

pages/index/shop/im.vue

@@ -216,7 +216,7 @@
 					title: '连接中...'
 				})
 				console.log(userId, '*******************')
-				console.log(this.config("WSHOST1") +'/'+ this.ordersId, '*******************2')
+				console.log(this.config("WSHOST1") ,+ this.ordersId, '*******************2')
 				
 				uni.connectSocket({
 					// url: 'ws://192.168.1.17:8881/gameTeamChat/' + userId + '_' + this.teamId,
@@ -233,6 +233,7 @@
 					},
 					method: 'GET',
 					success(res) {
+						console.log(res,'接口成功')
 						uni.hideLoading();
 						that.getTimeOrListItem1();
 						// 这里是接口调用成功的回调，不是连接成功的回调，请注意
@@ -246,10 +247,10 @@
 					that.connecting = false
 					that.connected = true
 					uni.hideLoading()
-					// uni.showToast({
-					// 	icon: 'none',
-					// 	title: '连接成功'
-					// })
+					uni.showToast({
+						icon: 'none',
+						title: '连接成功'
+					})
 					console.log('onOpen', res);
 				});
 				uni.onSocketError((err) => {

pages/index/shop/index.vue

@@ -13,7 +13,7 @@
 					<view class="flex justify-between">
 						<view style="width: 500rpx;">
 							<view class="text-xl text-bold u-line-1">{{shopDet.shopName}}
-							
+
 							</view>
 							<view class="flex align-center margin-top-xs">
 								<view style="color: #FD6416;font-weight: bold;font-size: 30rpx;">
@@ -21,32 +21,41 @@
 									{{shopDet.shopScore?shopDet.shopScore:0}}
 								</view>
 
-								<view class="margin-left-xs text-gray">销量 {{shopDet.shopSales?shopDet.shopSales:0}}</view>
-								<view class="margin-left-xs text-gray" v-if="shopDet.errandTime">约{{shopDet.errandTime}}分钟
+								<view class="margin-left-xs text-gray">销量 {{shopDet.shopSales?shopDet.shopSales:0}}
+								</view>
+								<view class="margin-left-xs text-gray" v-if="shopDet.errandTime">
+									约{{shopDet.errandTime}}分钟
 								</view>
-								<view class="margin-left-xs text-gray" v-if="shopDet.minimumDelivery">{{shopDet.minimumDelivery}}元起送</view>
+								<view class="margin-left-xs text-gray" v-if="shopDet.minimumDelivery">
+									{{shopDet.minimumDelivery}}元起送</view>
 							</view>
 							<view class="flex align-center margin-top-xs">
 								<!-- <view style="color: #FCD202;margin-right: 8rpx;">{{shopDet.autoSendOrder==1?'商家配送':'平台配送'}}</view> -->
 								<view style="margin-right: 8rpx;">{{shopDet.autoSendOrder==1?'商家配送：':'平台配送：'}}</view>
-								<view class="text-gray" style="margin-right: 8rpx;">配送费{{shopDet.errandMoney?shopDet.errandMoney:0}}元</view>
-								<view class="lable text-gray" v-if="shopDet.exemptMinMoney">满{{shopDet.exemptMinMoney}}元免配送费</view>
+								<view class="text-gray" style="margin-right: 8rpx;">
+									配送费{{shopDet.errandMoney?shopDet.errandMoney:0}}元</view>
+								<view class="lable text-gray" v-if="shopDet.exemptMinMoney">
+									满{{shopDet.exemptMinMoney}}元免配送费</view>
 							</view>
-							
-							
+
+
 						</view>
 						<view>
-							<image :src="shopDet.shopCover" class="radius" style="width: 110rpx;height: 110rpx;margin-top: 30rpx;">
+							<image :src="shopDet.shopCover" class="radius"
+								style="width: 110rpx;height: 110rpx;margin-top: 30rpx;">
 							</image>
 						</view>
 					</view>
 					<view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
 						<text style="width: 14%;">公告：</text>
-						<u-notice-bar color="#AAAAAA" :speed="100" border-radius="30" padding="0rpx 0rpx" bg-color="#f5f5f5" style="width: 86%;" type="none" mode="horizontal" :volume-icon="false" :list="shopDet.shopNotice.split(',')"></u-notice-bar>
+						<u-notice-bar color="#AAAAAA" :speed="100" border-radius="30" padding="0rpx 0rpx"
+							bg-color="#f5f5f5" style="width: 86%;" type="none" mode="horizontal" :volume-icon="false"
+							:list="shopDet.shopNotice.split(',')"></u-notice-bar>
 					</view>
 					<view class="margin-top-xs" style="width: 100%;height: 40rpx;" v-if="couponList.length>0">
 						<scroll-view scroll-x="true" class="scroll-view_H">
-							<view class="coupon-item flex align-center" v-for="(item,index) in couponList" :key="index" @click="coupons=true">
+							<view class="coupon-item flex align-center" v-for="(item,index) in couponList" :key="index"
+								@click="coupons=true">
 								<view>¥</view>
 								<view class="" style="font-weight: bold;font-size: 24rpx;margin-right: 10rpx;">
 									{{item.money}}
@@ -57,7 +66,7 @@
 							<!-- <view class="flex align-center" style="width: 100%;height: 100%;">
 								
 							</view> -->
-							
+
 						</scroll-view>
 					</view>
 				</view>
@@ -192,7 +201,10 @@
 							<view class="margin-top-sm">{{item.evaluateMessage}}</view>
 							<view class="pinglunImg" v-if="item.pictures!=undefined && item.pictures">
 								<view class="pinglunImg-box flex justify-between flex-wrap">
-									<image style="margin-bottom: 20rpx;" @click="yuanlan(item.pictures==undefined?[]:item.pictures.split(','),index2)" v-for="(item2,index2) in item.pictures==undefined?[]:item.pictures.split(',')" :src="item2" mode=""></image>
+									<image style="margin-bottom: 20rpx;"
+										@click="yuanlan(item.pictures==undefined?[]:item.pictures.split(','),index2)"
+										v-for="(item2,index2) in item.pictures==undefined?[]:item.pictures.split(',')"
+										:src="item2" mode=""></image>
 									<image style="margin-bottom: 20rpx;width: 160rpx;height: 0;" src="" mode=""></image>
 									<image style="margin-bottom: 20rpx;width: 160rpx;height: 0;" src="" mode=""></image>
 								</view>
@@ -227,7 +239,8 @@
 							营业时间：{{shopDet.businessHours}}-{{shopDet.lockHours}}</view>
 						<view class="text-black margin-top-xs text-df">商家品类：{{shopDet.shopTypeName}}</view>
 						<view class="text-black margin-top-xs text-df">配送范围：{{shopDet.distributionDistance}}以内</view>
-						<view class="text-black margin-top-xs text-df">公告：{{shopDet.shopNotice}}</view>
+						<view class="text-black margin-top-xs text-df" v-if="shopDet.shopNotice">公告：{{shopDet.shopNotice}}</view>
+						<view class="text-black margin-top-xs text-df" v-else>公告：店铺开业啦！</view>
 					</view>
 				</view>
 				<!-- 结算 -->
@@ -238,9 +251,11 @@
 					</view>
 					<view class="settlement_le">
 						<text>￥</text>{{totalPrice}}
-						<text v-if="shopDet.minimumDelivery" style="margin-left: 10rpx;">{{shopDet.minimumDelivery}}元起送</text>
+						<text v-if="shopDet.minimumDelivery"
+							style="margin-left: 10rpx;">{{shopDet.minimumDelivery}}元起送</text>
+					</view>
+					<view v-if="totalPrice>=shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm()">去结算
 					</view>
-					<view v-if="totalPrice>=shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm()">去结算</view>
 					<view v-else class="settlement_ri1">去结算</view>
 				</view>
 				<!-- 购物车弹窗 -->
@@ -290,9 +305,11 @@
 						</view>
 						<view class="settlement_le">
 							<text>￥</text>{{totalPrice}}
-							<text v-if="shopDet.minimumDelivery" style="margin-left: 10rpx;">{{shopDet.minimumDelivery}}元起送</text>
+							<text v-if="shopDet.minimumDelivery"
+								style="margin-left: 10rpx;">{{shopDet.minimumDelivery}}元起送</text>
 						</view>
-						<view v-if="totalPrice>=shopDet.minimumDelivery" class="settlement_ri" @click.stop="goConfirm()">去结算</view>
+						<view v-if="totalPrice>=shopDet.minimumDelivery" class="settlement_ri"
+							@click.stop="goConfirm()">去结算</view>
 						<view v-else class="settlement_ri1">去结算</view>
 					</view>
 				</u-popup>
@@ -323,46 +340,52 @@
 						<view class="detail_account_bottom padding">
 							<view class="detail_account_bottom_le" @click="payment()">立即购买</view>
 							<view class="detail_account_bottom_ri" @click="orderSel(2)">加入购物车</view>
-							
+
 						</view>
 					</view>
 				</u-popup>
 				<!-- 优惠券弹窗 -->
 				<!-- coupons -->
 				<u-popup v-model="coupons" height="520rpx" mode="bottom" :closeable="true">
-						<view class="yhq flex justify-center align-center">
-							<view class="yhq-box">
-								<view class="yhq-box-title">
-									优惠券
-								</view>
-								<view class="yhq-box-list">
-									<scroll-view scroll-y="true" style="width: 100%;height: 100%;padding-bottom: 20rpx;">
-										<view class="yhq-box-list-item flex justify-center align-center" v-for="(item,index) in couponList" :key="index">
-											<view class="yhq-box-list-item-c flex justify-between align-center">
-												<view class="yhq-box-list-item-c-l flex align-center">
-													<image :src="item.couponPicture?item.couponPicture:'../../../static/logo.png'" style="width: 80rpx;height: 80rpx;border-radius: 20rpx;" mode=""></image>
-													<view class="" style="margin-left: 20rpx;">
-														<view class="">
-															<text style="color: red;margin-right: 10rpx;">¥{{item.money}}</text>
-															<text style="font-weight: bold;margin-right: 10rpx;">优惠券</text>
-															(满{{item.minMoney}}元可用)
-														</view>
-														<view class="" style="font-size: 20rpx;color: gray;">
-															领取后{{item.endDate}}天内有效
-														</view>
+					<view class="yhq flex justify-center align-center">
+						<view class="yhq-box">
+							<view class="yhq-box-title">
+								优惠券
+							</view>
+							<view class="yhq-box-list">
+								<scroll-view scroll-y="true" style="width: 100%;height: 100%;padding-bottom: 20rpx;">
+									<view class="yhq-box-list-item flex justify-center align-center"
+										v-for="(item,index) in couponList" :key="index">
+										<view class="yhq-box-list-item-c flex justify-between align-center">
+											<view class="yhq-box-list-item-c-l flex align-center">
+												<image
+													:src="item.couponPicture?item.couponPicture:'../../../static/logo.png'"
+													style="width: 80rpx;height: 80rpx;border-radius: 20rpx;" mode="">
+												</image>
+												<view class="" style="margin-left: 20rpx;">
+													<view class="">
+														<text
+															style="color: red;margin-right: 10rpx;">¥{{item.money}}</text>
+														<text style="font-weight: bold;margin-right: 10rpx;">优惠券</text>
+														(满{{item.minMoney}}元可用)
+													</view>
+													<view class="" style="font-size: 20rpx;color: gray;">
+														领取后{{item.endDate}}天内有效
 													</view>
-												</view>
-												<view class="yhq-box-list-item-c-r" style="color: red;" @click="lingqv(item.couponId)">
-													领取
 												</view>
 											</view>
+											<view class="yhq-box-list-item-c-r" style="color: red;"
+												@click="lingqv(item.couponId)">
+												领取
+											</view>
 										</view>
-									</scroll-view>
-								</view>
+									</view>
+								</scroll-view>
 							</view>
 						</view>
+					</view>
 				</u-popup>
-			
+
 			</view>
 			<view class="hintPopul" v-if="shopDet&&shopDet.putawayFlag==1">
 				<view class="content_">
@@ -375,13 +398,13 @@
 					<view class="Btns" @click="goBack()">知道了</view>
 				</view>
 			</view>
-			
+
 
 
 
 		</view>
-		
-		
+
+
 	</view>
 </template>
 
@@ -393,10 +416,10 @@
 		},
 		data() {
 			return {
-				maskCustomStyle:{
-					background:'rgba(0,0,0,0.1)'
+				maskCustomStyle: {
+					background: 'rgba(0,0,0,0.1)'
 				},
-				hdStyle:{
+				hdStyle: {
 					background: '#F5F5F5',
 				},
 				customStyle: {
@@ -466,10 +489,10 @@
 				grade: '',
 				count: 0,
 				orderId: '',
-				isTrue:false,
+				isTrue: false,
 				XCXIsSelect: '否',
-				couponList:[],//优惠券列表
-				coupons:false,
+				couponList: [], //优惠券列表
+				coupons: false,
 			}
 		},
 		onLoad(option) {
@@ -490,7 +513,7 @@
 			uni.showLoading({
 				title: '加载中'
 			})
-			
+
 			// #ifndef H5
 			uni.getLocation({
 				type: 'gcj02', //返回可以用于uni.openLocation的经纬度
@@ -498,7 +521,7 @@
 					console.log(res, '经纬度')
 					that.lat = res.latitude;
 					that.lng = res.longitude;
-					
+
 				}
 			});
 			that.getData()
@@ -513,7 +536,7 @@
 					that.getData()
 				}
 			});
-			
+
 			that.getData()
 			// #endif
 			that.orderId = uni.getStorageSync('orderId') ? uni.getStorageSync('orderId') : ''
@@ -523,10 +546,13 @@
 		},
 		onShow() {
 			this.orderId = uni.getStorageSync('orderId') ? uni.getStorageSync('orderId') : ''
+			if (this.orderId) {
+				this.getOrderDetail();
+			}
 			this.userId = uni.getStorageSync('userId')
 			this.getOrderList()
 			this.getcouponList()
-			
+
 		},
 		onShareAppMessage(res) { //发送给朋友
 			return {
@@ -544,7 +570,7 @@
 		},
 		methods: {
 			//领取优惠券
-			lingqv(couponId,needIntegral){
+			lingqv(couponId, needIntegral) {
 				let that = this
 				let data = {
 					couponId: couponId,
@@ -552,19 +578,19 @@
 				that.$Request.postT("/app/coupon/buyCoupon", data).then(res => {
 					if (res.code == 0) {
 						uni.showToast({
-							title:'领取成功'
+							title: '领取成功'
 						})
 						that.coupons = false
-					}else{
+					} else {
 						uni.showToast({
-							title:res.msg,
-							icon:'none'
+							title: res.msg,
+							icon: 'none'
 						})
 					}
 				});
 			},
 			//获取商家优惠券
-			getcouponList(){
+			getcouponList() {
 				// couponList
 				let data = {
 					shopId: this.shopId,
@@ -576,10 +602,10 @@
 				});
 			},
 			// 预览图片
-			yuanlan(arr,index){
+			yuanlan(arr, index) {
 				uni.previewImage({
-					urls:arr,
-					current:index
+					urls: arr,
+					current: index
 				})
 			},
 			goBack() {
@@ -599,7 +625,7 @@
 				if (this.current == 1) {
 					this.getData()
 				} else if (this.current == 2) {
-					this.evaluatePage =1;
+					this.evaluatePage = 1;
 					this.getEvaluateList()
 				} else if (this.current == 3) {
 
@@ -662,7 +688,7 @@
 						uni.setNavigationBarTitle({
 							title: this.shopDet.shopName
 						})
-						
+
 					}
 					uni.hideLoading()
 				});
@@ -832,8 +858,8 @@
 						return;
 					}
 				}
-				
-				
+
+
 				// if (this.echoSku.length) {
 				// 	this.echoSkuList.forEach(res => {
 				// 		if (res.skuMessage == this.skuMessage) {
@@ -852,8 +878,8 @@
 				// 			if (res.code == 0) {
 				// 				// setTimeout(function() {
 				// 			   this.$queue.showToast('添加成功');
-								
-								
+
+
 				// 				this.skuShow = false
 				// 				this.getOrderList()
 				// 				// },1000)
@@ -873,10 +899,10 @@
 					shopId: this.shopId,
 				}
 				let url = ''
-				if(this.types == 1){
+				if (this.types == 1) {
 					url = '/app/order/joinOrder'
-				}else{
-					url ='/app/order/insertOrder'
+				} else {
+					url = '/app/order/insertOrder'
 				}
 				this.$Request.post('/app/order/insertOrder', data).then(res => {
 					if (res.code == 0) {
@@ -1084,6 +1110,15 @@
 					}
 				})
 			},
+			getOrderDetail() {
+				this.$Request.getT('/app/order/selectOrderById?orderId=' + this.orderId).then(res => {
+					if (res.code == 0 && res.data) {
+						if (res.data.isPay && res.data.isPay == 1) {
+							uni.removeStorageSync('orderId')
+						}
+					}
+				});
+			},
 			goPindan() {
 				if (!this.userId) {
 					uni.navigateTo({
@@ -1091,10 +1126,11 @@
 					})
 					return
 				}
-				
+
 				if (uni.getStorageSync('orderId')) {
 					uni.navigateTo({
-						url: '/pages/index/shop/pindanDet?shopId=' + this.shopId + '&orderId=' + uni.getStorageSync('orderId')
+						url: '/pages/index/shop/pindanDet?shopId=' + this.shopId + '&orderId=' + uni
+							.getStorageSync('orderId')
 					})
 				} else {
 					let data = {
@@ -1127,45 +1163,53 @@
 	page {
 		background-color: #FFFFFF;
 	}
-	.yhq{
+
+	.yhq {
 		width: 100%;
 		height: 520rpx;
 		background-color: #F5F5F5;
 		overflow-y: hidden;
-		.yhq-box{
+
+		.yhq-box {
 			width: 686rpx;
 			height: 500rpx;
+
 			// background-color: red;
-			.yhq-box-title{
+			.yhq-box-title {
 				width: 100%;
 				text-align: center;
 				font-weight: bold;
 			}
-			.yhq-box-list{
+
+			.yhq-box-list {
 				width: 100%;
 				height: auto;
 				height: 460rpx;
 				margin-top: 30rpx;
-				.yhq-box-list-item{
+
+				.yhq-box-list-item {
 					width: 100%;
 					height: 120rpx;
 					border-radius: 24rpx;
 					background-color: #FFFFFF;
 					margin-bottom: 20rpx;
 				}
-				.yhq-box-list-item-c{
+
+				.yhq-box-list-item-c {
 					width: 646rpx;
 					height: 100%;
 				}
 			}
 		}
 	}
-	.scroll-view_H{
+
+	.scroll-view_H {
 		width: 100%;
-		
+
 		white-space: nowrap;
 	}
-	.coupon-item{
+
+	.coupon-item {
 		display: inline-block;
 		height: 46rpx;
 		margin-right: 20rpx;
@@ -1175,24 +1219,29 @@
 		font-size: 20rpx;
 		color: red;
 		line-height: 44rpx;
-		view{
+
+		view {
 			display: inline-block;
 		}
-		
+
 	}
-	.pinglunImg{
+
+	.pinglunImg {
 		width: 100%;
 		margin-top: 10rpx;
 	}
-	.pinglunImg-box{
+
+	.pinglunImg-box {
 		width: 100%;
-		image{
+
+		image {
 			// margin-left: 10rpx;
 			width: 160upx;
 			height: 160upx;
 			border-radius: 10rpx;
 		}
 	}
+
 	.hintPopul {
 		width: 100%;
 		height: 100vh;
@@ -1559,7 +1608,7 @@
 		line-height: 2.8;
 		border-radius: 49rpx;
 		position: relative;
-		
+
 		/* bottom: 10rpx; */
 		left: 0;
 		right: 0;
@@ -1590,7 +1639,7 @@
 		border-top-right-radius: 49rpx;
 		border-bottom-right-radius: 49rpx;
 	}
-	
+
 	.settlement_ri1 {
 		width: 35%;
 		background-color: #333333;
@@ -1777,4 +1826,4 @@
 		background: #FCD202;
 		border-radius: 36rpx;
 	}
-</style>
+</style>

pages/index/shop/pindanDet.vue

@@ -200,7 +200,7 @@
 			this.userId = uni.getStorageSync('userId')
 		},
 		onShow() {
-
+			this.getOrderDetail();
 			this.getGoodList()
 			this.$Request.getT('/app/common/type/238').then(res => {
 				if (res.code === 0) {
@@ -208,7 +208,12 @@
 				}
 			});
 		},
-
+		onBackPress() {
+			
+		},
+		onUnload() {
+			
+		},
 		methods: {
 			// 添加数量
 			add(item, index) {
@@ -385,7 +390,7 @@
 
 						if (this.goodsList && this.goodsList.orderGoodsList && this.goodsList.orderGoodsList[0]) {
 
-							this.totalPrice = res.data.money
+							this.totalPrice = parseFloat(parseFloat(res.data.money).toFixed(2));
 							this.goodsNum = 0
 
 							this.goodsList.orderGoodsList[0].forEach(res => {
@@ -404,6 +409,22 @@
 					uni.hideLoading()
 				});
 			},
+			getOrderDetail(){
+				this.$Request.getT('/app/order/selectOrderById?orderId=' + this.orderId).then(res =>{
+					if(res.code == 0 && res.data){
+						if(res.data.isPay && res.data.isPay == 1){
+							uni.showToast({
+								title: '拼单已结束',
+								icon: 'none'
+							})
+							setTimeout(function() {
+								uni.removeStorageSync('orderId')
+								uni.navigateBack()
+							}, 1000)
+						}
+					}
+				});
+			},
 			getGoodList() {
 				this.number = 0;
 				let data = {
@@ -413,13 +434,13 @@
 				this.$Request.get("/app/order/selectShareTheBill", data).then(res => {
 					if (res.code == 0) {
 						
-						if(!res.data){
+						if(!res.data){
 							uni.showToast({
 								title: '拼单已结束',
 								icon: 'none'
 							})
-							uni.removeStorageSync('orderId')
-							setTimeout(function() {
+							setTimeout(function() {
+								uni.removeStorageSync('orderId')
 								uni.navigateBack()
 							}, 1000)
 						}
@@ -429,10 +450,10 @@
 						let mySum = 0
 						for (var i = 0; i < this.myGoodList.length; i++) {
 							if (i == 0) {
-								mySum = this.myGoodList[i].goodsPrice * this.myGoodList[i].goodsNum
+								mySum = parseFloat(parseFloat(parseFloat(this.myGoodList[i].goodsPrice) * parseFloat(this.myGoodList[i].goodsNum)).toFixed(2))
 								this.number += this.myGoodList[i].goodsNum
 							} else {
-								mySum = mySum + this.myGoodList[i].goodsPrice * this.myGoodList[i].goodsNum
+								mySum = parseFloat(parseFloat(mySum + parseFloat(this.myGoodList[i].goodsPrice) * parseFloat(this.myGoodList[i].goodsNum)).toFixed(2))
 								this.number += this.myGoodList[i].goodsNum
 							}
 							if (i == (this.myGoodList.length - 1)) {
@@ -446,20 +467,23 @@
 						var sum = 0
 						for (var i = 0; i < this.otherGoodList.length; i++) {
 							if (i == 0) {
-								sum = this.otherGoodList[i].goodsPrice * this.otherGoodList[i].goodsNum
+								
+								sum = parseFloat(parseFloat(parseFloat(this.otherGoodList[i].goodsPrice) * parseFloat(this.otherGoodList[i].goodsNum)).toFixed(2))
+								
 								this.number += this.otherGoodList[i].goodsNum
 							} else {
 								this.number += this.otherGoodList[i].goodsNum
 								if (this.otherGoodList[i].userId == this.otherGoodList[i - 1].userId) {
-									sum = sum + this.otherGoodList[i].goodsPrice * this.otherGoodList[i].goodsNum
+									sum = parseFloat(parseFloat(sum + parseFloat(this.otherGoodList[i].goodsPrice) * parseFloat(this.otherGoodList[i].goodsNum)).toFixed(2))
 								} else {
 									this.otherGoodList[i - 1].goodsPrice = sum
-									sum = this.otherGoodList[i].goodsPrice * this.otherGoodList[i].goodsNum
+									sum = parseFloat(parseFloat(parseFloat(this.otherGoodList[i].goodsPrice) * parseFloat(this.otherGoodList[i].goodsNum)).toFixed(2))
 								}
 							}
 							if (i == (this.otherGoodList.length - 1)) {
 								this.otherGoodList[i].goodsPrice = sum
-								this.totalPrice += sum
+								this.totalPrice = parseFloat(parseFloat(parseFloat(this.totalPrice) + parseFloat(sum)).toFixed(2))
+								// parseFloat(parseFloat(mySum).toFixed(2))
 							}
 						}
 

pages/order/feedback.vue

@@ -1,442 +1,442 @@
-<template>
-	<view class="page">
-		<!-- <view class="feedback-title"> -->
-			<!-- <text>评价</text> -->
-			<!-- <text @tap="chooseMsg">快速键入</text> -->
-		<!-- </view> -->
-		<view class="feedback-body">
-			<textarea placeholder="请输入你的评价..." v-model="sendDate.content" class="feedback-textare" />
-		</view>
-		<!-- <view class="feedback-title"><text>QQ/邮箱</text></view> -->
-		<!-- <view class="feedback-body"><input class="feedback-input" v-model="sendDate.mail" placeholder="方便我们联系你 " /></view> -->
-		
-		<view class="text-white padding bg radius margin-tb">
-			<view>
-				<view class="text-lg margin-top-sm text-black">商品评价图（可多张）</view>
-				<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
-					<view>
-						<view class="margin-top flex margin-right-sm flex-wrap">
-							<view class="flex"
-								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;"
-								v-for="(image,index) in shopBanner" :key="index">
-								<!-- <image :src="image" style="width: 100%;height: 100%;"></image> -->
-								<image :src="image" style="width: 100%;height: 100%;"></image>
-								<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
-									@click="removeImg(index)">
-									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
-								</view>
-		
-							</view>
-							<view class="flex"
-								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;" @click="addImages(2)" v-if="shopBanner.length<9">
-								<!-- <image :src="image" style="width: 100%;height: 100%;"></image> -->
-								<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;"
-									class="flex justify-center align-center">
-									<view>
-										<view class="text-center">
-											<image src="/static/images/addimg.png" style="width: 65rpx;height: 55rpx;">
-											</image>
-										</view>
-										<view class="text-center text-black">添加图片</view>
-									</view>
-								</view>
-									
-							</view>
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-		<view class="feedback-title feedback-star-view">
-			<text>订单评分</text>
-			<view class="feedback-star-view">
-				<!-- <text class="feedback-star" v-for="(value, key) in stars" :key="key" :class="key < sendDate.score ? 'active' : ''" @tap="chooseStar(value)"></text> -->
-			</view>
-			<u-rate :count="count" min-count='1' active-color="#FCD202" v-model="value"></u-rate>
-		</view>
-		<button type="primary" style="background: #FCD202;margin-top: 32upx;" class="feedback-submit"
-			@tap="send">提交</button>
-	</view>
-</template>
-
-<script>
-	import configUrl from '../../common/config.js'
-	export default {
-		data() {
-			return {
-				shopBanner: [],
-				msgContents: ['界面显示错乱', '启动缓慢，卡出翔了', 'UI无法直视，丑哭了', '偶发性崩溃'],
-				stars: [1, 2, 3, 4, 5],
-				imageList: [],
-				sendDate: {
-					score: 5,
-					content: '',
-					contact: '',
-					goodsId: '',
-					ordersId: '',
-					orderNumber: '',
-					shopId: ''
-				},
-				
-				count: 5,
-				value: 5,
-				goodsId: '',
-				ordersId: '',
-				orderNumber: '',
-			};
-		},
-		onLoad(e) {
-			this.sendDate.goodsId = e.goodsId
-			this.sendDate.ordersId = e.ordersId
-			this.sendDate.orderNumber = e.orderNumber
-			this.sendDate.shopId = e.shopId
-			// let deviceInfo = {
-			// 	appid: plus.runtime.appid,
-			// 	imei: plus.device.imei, //设备标识
-			// 	p: plus.os.name === 'Android' ? 'a' : 'i', //平台类型，i表示iOS平台，a表示Android平台。
-			// 	md: plus.device.model, //设备型号
-			// 	app_version: plus.runtime.version,
-			// 	plus_version: plus.runtime.innerVersion, //基座版本号
-			// 	os: plus.os.version,
-			// 	net: '' + plus.networkinfo.getCurrentType()
-			// };
-			// this.sendDate = Object.assign(deviceInfo, this.sendDate);
-		},
-		methods: {
-			// 图片上传
-			addImages(e) {
-				let that = this
-				uni.chooseImage({
-					count: 9,
-					sourceType: ['album', 'camera'],
-					success: res => {
-						for (let i = 0; i < res.tempFilePaths.length; i++) {
-							that.$queue.showLoading("上传中...");
-							uni.uploadFile({ // 上传接口
-								// url: that.config("APIHOST1") + '/alioss/upload', //真实的接口地址
-								// url: 'https://www.daweilinli.com/sqx_fast/alioss/upload',
-								url:configUrl.APIHOST+'/alioss/upload',
-								filePath: res.tempFilePaths[i],
-								name: 'file',
-								success: (uploadFileRes) => {
-									if (that.shopBanner.length < 9) {
-										if(JSON.parse(uploadFileRes.data).data){
-											that.shopBanner.push(JSON.parse(uploadFileRes.data).data)
-										}else{
-											uni.showToast({
-												title:'图片上传失败，请重试',
-												icon:'none'
-											})
-										}
-										
-									}
-									console.log(that.shopBanner)
-									uni.hideLoading();
-								}
-							});
-						}
-					}
-				})
-			},
-			// 评价图删除
-			removeImg(index) {
-				this.shopBanner.splice(index, 1)
-			},
-			close(e) {
-				this.imageList.splice(e, 1);
-			},
-			chooseMsg() {
-				//快速输入
-				uni.showActionSheet({
-					itemList: this.msgContents,
-					success: res => {
-						this.sendDate.content = this.msgContents[res.tapIndex];
-					}
-				});
-			},
-			chooseImg() {
-				//选择图片
-				uni.chooseImage({
-					sourceType: ['camera', 'album'],
-					sizeType: 'compressed',
-					count: 8 - this.imageList.length,
-					success: res => {
-						this.imageList = this.imageList.concat(res.tempFilePaths);
-					}
-				});
-			},
-			chooseStar(e) {
-				//点击评星
-				this.sendDate.score = e;
-			},
-			previewImage() {
-				//预览图片
-				uni.previewImage({
-					urls: this.imageList
-				});
-			},
-			send() {
-				//发送反馈
-				// console.log(this.sendDate,'111111111');
-				// console.log(this.shopBanner.join(','),'22222222222222222')
-				
-				if (!this.sendDate.content) {
-					uni.showToast({
-						icon: 'none',
-						title: '请输入评价内容'
-					});
-					return;
-				}
-				
-				if(!this.shopBanner.length){
-					uni.showToast({
-						icon: 'none',
-						title: '请上传商品评价图'
-					});
-					return;
-				}
-				this.$queue.showLoading('加载中...');
-				console.log(this.orderNumber)
-				
-				this.$Request.postJson('/app/order/insertEvaluate', {
-					goodsId: this.sendDate.goodsId,
-					ordersId: this.sendDate.ordersId,
-					orderNumber: this.sendDate.orderNumber,
-					evaluateMessage: this.sendDate.content,
-					score: this.value,
-					shopId: this.sendDate.shopId,
-					pictures:this.shopBanner.length>0?this.shopBanner.join(','):[]
-				}).then(res => {
-					if (res.code === 0) {
-						uni.showToast({
-							title: '评价成功'
-						});
-						setTimeout(function() {
-							uni.navigateBack();
-						}, 1000);
-					} else {
-						uni.hideLoading();
-						uni.showModal({
-							showCancel: false,
-							title: '评价失败',
-							content: res.msg
-						});
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style>
-	@font-face {
-		font-family: uniicons;
-		font-weight: normal;
-		font-style: normal;
-		src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
-	}
-
-	page {
-		background-color: #FFFFFF;
-	}
-
-	view {
-		font-size: 28upx;
-	}
-
-	.input-view {
-		font-size: 28upx;
-	}
-
-	.close-view {
-		text-align: center;
-		line-height: 14px;
-		height: 16px;
-		width: 16px;
-		border-radius: 50%;
-		background: #ff5053;
-		color: #ffffff;
-		position: absolute;
-		top: -6px;
-		right: -4px;
-		font-size: 12px;
-	}
-
-	/* 上传 */
-	.uni-uploader {
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.uni-uploader-head {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-	}
-
-	.uni-uploader-info {
-		color: #b2b2b2;
-	}
-
-	.uni-uploader-body {
-		margin-top: 16upx;
-	}
-
-	.uni-uploader__files {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-	}
-
-	.uni-uploader__file {
-		margin: 10upx;
-		width: 210upx;
-		height: 210upx;
-	}
-
-	.uni-uploader__img {
-		display: block;
-		width: 210upx;
-		height: 210upx;
-	}
-
-	.uni-uploader__input-box {
-		position: relative;
-		margin: 10upx;
-		width: 208upx;
-		height: 208upx;
-		border: 2upx solid #d9d9d9;
-	}
-
-	.uni-uploader__input-box:before,
-	.uni-uploader__input-box:after {
-		content: ' ';
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		-webkit-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
-		background-color: #d9d9d9;
-	}
-
-	.uni-uploader__input-box:before {
-		width: 4upx;
-		height: 79upx;
-	}
-
-	.uni-uploader__input-box:after {
-		width: 79upx;
-		height: 4upx;
-	}
-
-	.uni-uploader__input-box:active {
-		border-color: #999999;
-	}
-
-	.uni-uploader__input-box:active:before,
-	.uni-uploader__input-box:active:after {
-		background-color: #999999;
-	}
-
-	.uni-uploader__input {
-		position: absolute;
-		z-index: 1;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		opacity: 0;
-	}
-
-	/*问题反馈*/
-	.feedback-title {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20upx;
-		color: #8f8f94;
-		font-size: 28upx;
-	}
-
-	.feedback-star-view.feedback-title {
-		justify-content: flex-start;
-		margin: 0;
-	}
-
-	.feedback-quick {
-		position: relative;
-		padding-right: 40upx;
-	}
-
-	.feedback-quick:after {
-		font-family: uniicons;
-		font-size: 40upx;
-		content: '\e581';
-		position: absolute;
-		right: 0;
-		top: 50%;
-		color: #bbb;
-		-webkit-transform: translateY(-50%);
-		transform: translateY(-50%);
-	}
-
-	.feedback-body {
-		font-size: 32upx;
-		padding: 16upx;
-		margin: 16upx;
-		border-radius: 16upx;
-		background: #F2F2F2;
-		color: #FFF;
-	}
-
-	.feedback-textare {
-		height: 200upx;
-		font-size: 30upx;
-		line-height: 50upx;
-		width: 100%;
-		box-sizing: border-box;
-		padding: 10upx 0upx 0;
-		color: #8f8f94;
-	}
-
-	.feedback-input {
-		font-size: 32upx;
-		height: 60upx;
-		padding: 15upx 20upx;
-		line-height: 60upx;
-	}
-
-	.feedback-uploader {
-		padding: 22upx 20upx;
-	}
-
-	.feedback-star {
-		font-family: uniicons;
-		font-size: 40upx;
-		margin-left: 6upx;
-	}
-
-	.feedback-star-view {
-		margin-left: 20upx;
-	}
-
-	.feedback-star:after {
-		content: '\e408';
-	}
-
-	.feedback-star.active {
-		color: #ffb400;
-	}
-
-	.feedback-star.active:after {
-		content: '\e438';
-	}
-
-	.feedback-submit {
-		background: #007aff;
-		color: #ffffff;
-		margin: 20upx;
-	}
-</style>
+<template>
+	<view class="page">
+		<!-- <view class="feedback-title"> -->
+			<!-- <text>评价</text> -->
+			<!-- <text @tap="chooseMsg">快速键入</text> -->
+		<!-- </view> -->
+		<view class="feedback-body">
+			<textarea placeholder="请输入你的评价..." v-model="sendDate.content" class="feedback-textare" />
+		</view>
+		<!-- <view class="feedback-title"><text>QQ/邮箱</text></view> -->
+		<!-- <view class="feedback-body"><input class="feedback-input" v-model="sendDate.mail" placeholder="方便我们联系你 " /></view> -->
+		
+		<view class="text-white padding bg radius margin-tb">
+			<view>
+				<view class="text-lg margin-top-sm text-black">商品评价图（可多张）</view>
+				<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
+					<view>
+						<view class="margin-top flex margin-right-sm flex-wrap">
+							<view class="flex"
+								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;"
+								v-for="(image,index) in shopBanner" :key="index">
+								<!-- <image :src="image" style="width: 100%;height: 100%;"></image> -->
+								<image :src="image" style="width: 100%;height: 100%;"></image>
+								<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
+									@click="removeImg(index)">
+									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
+								</view>
+		
+							</view>
+							<view class="flex"
+								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;" @click="addImages(2)" v-if="shopBanner.length<9">
+								<!-- <image :src="image" style="width: 100%;height: 100%;"></image> -->
+								<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;"
+									class="flex justify-center align-center">
+									<view>
+										<view class="text-center">
+											<image src="/static/images/addimg.png" style="width: 65rpx;height: 55rpx;">
+											</image>
+										</view>
+										<view class="text-center text-black">添加图片</view>
+									</view>
+								</view>
+									
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<view class="feedback-title feedback-star-view">
+			<text>订单评分</text>
+			<view class="feedback-star-view">
+				<!-- <text class="feedback-star" v-for="(value, key) in stars" :key="key" :class="key < sendDate.score ? 'active' : ''" @tap="chooseStar(value)"></text> -->
+			</view>
+			<u-rate :count="count" min-count='1' active-color="#FCD202" v-model="value"></u-rate>
+		</view>
+		<button type="primary" style="background: #FCD202;margin-top: 32upx;" class="feedback-submit"
+			@tap="send">提交</button>
+	</view>
+</template>
+
+<script>
+	import configUrl from '../../common/config.js'
+	export default {
+		data() {
+			return {
+				shopBanner: [],
+				msgContents: ['界面显示错乱', '启动缓慢，卡出翔了', 'UI无法直视，丑哭了', '偶发性崩溃'],
+				stars: [1, 2, 3, 4, 5],
+				imageList: [],
+				sendDate: {
+					score: 5,
+					content: '',
+					contact: '',
+					goodsId: '',
+					ordersId: '',
+					orderNumber: '',
+					shopId: ''
+				},
+				
+				count: 5,
+				value: 5,
+				goodsId: '',
+				ordersId: '',
+				orderNumber: '',
+			};
+		},
+		onLoad(e) {
+			this.sendDate.goodsId = e.goodsId
+			this.sendDate.ordersId = e.ordersId
+			this.sendDate.orderNumber = e.orderNumber
+			this.sendDate.shopId = e.shopId
+			// let deviceInfo = {
+			// 	appid: plus.runtime.appid,
+			// 	imei: plus.device.imei, //设备标识
+			// 	p: plus.os.name === 'Android' ? 'a' : 'i', //平台类型，i表示iOS平台，a表示Android平台。
+			// 	md: plus.device.model, //设备型号
+			// 	app_version: plus.runtime.version,
+			// 	plus_version: plus.runtime.innerVersion, //基座版本号
+			// 	os: plus.os.version,
+			// 	net: '' + plus.networkinfo.getCurrentType()
+			// };
+			// this.sendDate = Object.assign(deviceInfo, this.sendDate);
+		},
+		methods: {
+			// 图片上传
+			addImages(e) {
+				let that = this
+				uni.chooseImage({
+					count: 9,
+					sourceType: ['album', 'camera'],
+					success: res => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							that.$queue.showLoading("上传中...");
+							uni.uploadFile({ // 上传接口
+								// url: that.config("APIHOST1") + '/alioss/upload', //真实的接口地址
+								// url: 'https://tcwm.xianmaxiong.com/sqx_fast/alioss/upload',
+								url:configUrl.APIHOST+'/alioss/upload',
+								filePath: res.tempFilePaths[i],
+								name: 'file',
+								success: (uploadFileRes) => {
+									if (that.shopBanner.length < 9) {
+										if(JSON.parse(uploadFileRes.data).data){
+											that.shopBanner.push(JSON.parse(uploadFileRes.data).data)
+										}else{
+											uni.showToast({
+												title:'图片上传失败，请重试',
+												icon:'none'
+											})
+										}
+										
+									}
+									console.log(that.shopBanner)
+									uni.hideLoading();
+								}
+							});
+						}
+					}
+				})
+			},
+			// 评价图删除
+			removeImg(index) {
+				this.shopBanner.splice(index, 1)
+			},
+			close(e) {
+				this.imageList.splice(e, 1);
+			},
+			chooseMsg() {
+				//快速输入
+				uni.showActionSheet({
+					itemList: this.msgContents,
+					success: res => {
+						this.sendDate.content = this.msgContents[res.tapIndex];
+					}
+				});
+			},
+			chooseImg() {
+				//选择图片
+				uni.chooseImage({
+					sourceType: ['camera', 'album'],
+					sizeType: 'compressed',
+					count: 8 - this.imageList.length,
+					success: res => {
+						this.imageList = this.imageList.concat(res.tempFilePaths);
+					}
+				});
+			},
+			chooseStar(e) {
+				//点击评星
+				this.sendDate.score = e;
+			},
+			previewImage() {
+				//预览图片
+				uni.previewImage({
+					urls: this.imageList
+				});
+			},
+			send() {
+				//发送反馈
+				// console.log(this.sendDate,'111111111');
+				// console.log(this.shopBanner.join(','),'22222222222222222')
+				
+				if (!this.sendDate.content) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入评价内容'
+					});
+					return;
+				}
+				
+				if(!this.shopBanner.length){
+					uni.showToast({
+						icon: 'none',
+						title: '请上传商品评价图'
+					});
+					return;
+				}
+				this.$queue.showLoading('加载中...');
+				console.log(this.orderNumber)
+				
+				this.$Request.postJson('/app/order/insertEvaluate', {
+					goodsId: this.sendDate.goodsId,
+					ordersId: this.sendDate.ordersId,
+					orderNumber: this.sendDate.orderNumber,
+					evaluateMessage: this.sendDate.content,
+					score: this.value,
+					shopId: this.sendDate.shopId,
+					pictures:this.shopBanner.length>0?this.shopBanner.join(','):[]
+				}).then(res => {
+					if (res.code === 0) {
+						uni.showToast({
+							title: '评价成功'
+						});
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 1000);
+					} else {
+						uni.hideLoading();
+						uni.showModal({
+							showCancel: false,
+							title: '评价失败',
+							content: res.msg
+						});
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style>
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
+	}
+
+	page {
+		background-color: #FFFFFF;
+	}
+
+	view {
+		font-size: 28upx;
+	}
+
+	.input-view {
+		font-size: 28upx;
+	}
+
+	.close-view {
+		text-align: center;
+		line-height: 14px;
+		height: 16px;
+		width: 16px;
+		border-radius: 50%;
+		background: #ff5053;
+		color: #ffffff;
+		position: absolute;
+		top: -6px;
+		right: -4px;
+		font-size: 12px;
+	}
+
+	/* 上传 */
+	.uni-uploader {
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.uni-uploader-head {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-uploader-info {
+		color: #b2b2b2;
+	}
+
+	.uni-uploader-body {
+		margin-top: 16upx;
+	}
+
+	.uni-uploader__files {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-uploader__file {
+		margin: 10upx;
+		width: 210upx;
+		height: 210upx;
+	}
+
+	.uni-uploader__img {
+		display: block;
+		width: 210upx;
+		height: 210upx;
+	}
+
+	.uni-uploader__input-box {
+		position: relative;
+		margin: 10upx;
+		width: 208upx;
+		height: 208upx;
+		border: 2upx solid #d9d9d9;
+	}
+
+	.uni-uploader__input-box:before,
+	.uni-uploader__input-box:after {
+		content: ' ';
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		-webkit-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		background-color: #d9d9d9;
+	}
+
+	.uni-uploader__input-box:before {
+		width: 4upx;
+		height: 79upx;
+	}
+
+	.uni-uploader__input-box:after {
+		width: 79upx;
+		height: 4upx;
+	}
+
+	.uni-uploader__input-box:active {
+		border-color: #999999;
+	}
+
+	.uni-uploader__input-box:active:before,
+	.uni-uploader__input-box:active:after {
+		background-color: #999999;
+	}
+
+	.uni-uploader__input {
+		position: absolute;
+		z-index: 1;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+	}
+
+	/*问题反馈*/
+	.feedback-title {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20upx;
+		color: #8f8f94;
+		font-size: 28upx;
+	}
+
+	.feedback-star-view.feedback-title {
+		justify-content: flex-start;
+		margin: 0;
+	}
+
+	.feedback-quick {
+		position: relative;
+		padding-right: 40upx;
+	}
+
+	.feedback-quick:after {
+		font-family: uniicons;
+		font-size: 40upx;
+		content: '\e581';
+		position: absolute;
+		right: 0;
+		top: 50%;
+		color: #bbb;
+		-webkit-transform: translateY(-50%);
+		transform: translateY(-50%);
+	}
+
+	.feedback-body {
+		font-size: 32upx;
+		padding: 16upx;
+		margin: 16upx;
+		border-radius: 16upx;
+		background: #F2F2F2;
+		color: #FFF;
+	}
+
+	.feedback-textare {
+		height: 200upx;
+		font-size: 30upx;
+		line-height: 50upx;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10upx 0upx 0;
+		color: #8f8f94;
+	}
+
+	.feedback-input {
+		font-size: 32upx;
+		height: 60upx;
+		padding: 15upx 20upx;
+		line-height: 60upx;
+	}
+
+	.feedback-uploader {
+		padding: 22upx 20upx;
+	}
+
+	.feedback-star {
+		font-family: uniicons;
+		font-size: 40upx;
+		margin-left: 6upx;
+	}
+
+	.feedback-star-view {
+		margin-left: 20upx;
+	}
+
+	.feedback-star:after {
+		content: '\e408';
+	}
+
+	.feedback-star.active {
+		color: #ffb400;
+	}
+
+	.feedback-star.active:after {
+		content: '\e438';
+	}
+
+	.feedback-submit {
+		background: #007aff;
+		color: #ffffff;
+		margin: 20upx;
+	}
+</style>

pages/order/feedbacks.vue

@@ -0,0 +1,449 @@
+<template>
+	<view class="page">
+		<view class="feedback-title">
+			<text>是否满意</text>
+			<text @tap="chooseMsg">{{satisfactionFlagName?satisfactionFlagName:'请选择是否满意'}}</text>
+		</view>
+		<view class="feedback-body">
+			<textarea placeholder="请输入你的评价..." v-model="sendDate.content" class="feedback-textare" />
+		</view>
+		<!-- <view class="feedback-title"><text>QQ/邮箱</text></view> -->
+		<!-- <view class="feedback-body"><input class="feedback-input" v-model="sendDate.mail" placeholder="方便我们联系你 " /></view> -->
+		
+		<!-- <view class="text-white padding bg radius margin-tb-sm">
+			<view>
+				<view class="text-lg text-black">评价图（可多张）</view>
+				<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
+					<view>
+						<view class="margin-top flex margin-right-sm flex-wrap">
+							<view class="flex"
+								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;"
+								v-for="(image,index) in shopBanner" :key="index">
+								<image :src="image" style="width: 100%;height: 100%;"></image>
+								<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
+									@click="removeImg(index)">
+									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
+								</view>
+		
+							</view>
+							<view class="flex"
+								style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;" @click="addImages(2)" v-if="shopBanner.length<9">
+								<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;"
+									class="flex justify-center align-center">
+									<view>
+										<view class="text-center">
+											<image src="/static/images/addimg.png" style="width: 65rpx;height: 55rpx;">
+											</image>
+										</view>
+										<view class="text-center text-black">添加图片</view>
+									</view>
+								</view>
+									
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view> -->
+		<!-- <view class="feedback-title feedback-star-view">
+			<text>订单评分</text>
+			<view class="feedback-star-view">
+			</view>
+			<u-rate :count="count" min-count='1' active-color="#FCD202" v-model="value"></u-rate>
+		</view> -->
+		<button type="primary" style="background: #FCD202;margin-top: 32upx;" class="feedback-submit"
+			@tap="send">提交</button>
+	</view>
+</template>
+
+<script>
+	import configUrl from '../../common/config.js'
+	export default {
+		data() {
+			return {
+				satisfactionFlag:0,
+				satisfactionFlagName:'满意',
+				shopBanner: [],
+				msgContents: ['满意', '不满意'],
+				stars: [1, 2, 3, 4, 5],
+				imageList: [],
+				sendDate: {
+					score: 5,
+					content: '',
+					contact: '',
+					goodsId: '',
+					ordersId: '',
+					orderNumber: '',
+					shopId: ''
+				},
+				
+				count: 5,
+				value: 5,
+				goodsId: '',
+				ordersId: '',
+				orderNumber: '',
+				indentNumber:''
+			};
+		},
+		onLoad(e) {
+			this.indentNumber = e.indentNumber;
+			// this.sendDate.goodsId = e.goodsId
+			// this.sendDate.ordersId = e.ordersId
+			// this.sendDate.orderNumber = e.orderNumber
+			// this.sendDate.shopId = e.shopId
+			// let deviceInfo = {
+			// 	appid: plus.runtime.appid,
+			// 	imei: plus.device.imei, //设备标识
+			// 	p: plus.os.name === 'Android' ? 'a' : 'i', //平台类型，i表示iOS平台，a表示Android平台。
+			// 	md: plus.device.model, //设备型号
+			// 	app_version: plus.runtime.version,
+			// 	plus_version: plus.runtime.innerVersion, //基座版本号
+			// 	os: plus.os.version,
+			// 	net: '' + plus.networkinfo.getCurrentType()
+			// };
+			// this.sendDate = Object.assign(deviceInfo, this.sendDate);
+		},
+		methods: {
+			// 图片上传
+			addImages(e) {
+				let that = this
+				uni.chooseImage({
+					count: 9,
+					sourceType: ['album', 'camera'],
+					success: res => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							that.$queue.showLoading("上传中...");
+							uni.uploadFile({ // 上传接口
+								// url: that.config("APIHOST1") + '/alioss/upload', //真实的接口地址
+								// url: 'https://tcwm.xianmaxiong.com/sqx_fast/alioss/upload',
+								url:configUrl.APIHOST+'/alioss/upload',
+								filePath: res.tempFilePaths[i],
+								name: 'file',
+								success: (uploadFileRes) => {
+									if (that.shopBanner.length < 9) {
+										if(JSON.parse(uploadFileRes.data).data){
+											that.shopBanner.push(JSON.parse(uploadFileRes.data).data)
+										}else{
+											uni.showToast({
+												title:'图片上传失败，请重试',
+												icon:'none'
+											})
+										}
+										
+									}
+									console.log(that.shopBanner)
+									uni.hideLoading();
+								}
+							});
+						}
+					}
+				})
+			},
+			// 评价图删除
+			removeImg(index) {
+				this.shopBanner.splice(index, 1)
+			},
+			close(e) {
+				this.imageList.splice(e, 1);
+			},
+			chooseMsg() {
+				//快速输入
+				uni.showActionSheet({
+					itemList: this.msgContents,
+					success: res => {
+						console.log(res.tapIndex)
+						this.satisfactionFlagName = this.msgContents[res.tapIndex];
+						this.satisfactionFlag = res.tapIndex;
+					}
+				});
+			},
+			chooseImg() {
+				//选择图片
+				uni.chooseImage({
+					sourceType: ['camera', 'album'],
+					sizeType: 'compressed',
+					count: 8 - this.imageList.length,
+					success: res => {
+						this.imageList = this.imageList.concat(res.tempFilePaths);
+					}
+				});
+			},
+			chooseStar(e) {
+				//点击评星
+				this.sendDate.score = e;
+			},
+			previewImage() {
+				//预览图片
+				uni.previewImage({
+					urls: this.imageList
+				});
+			},
+			send() {
+				//发送反馈
+				// console.log(this.sendDate,'111111111');
+				// console.log(this.shopBanner.join(','),'22222222222222222')
+				
+				if(!this.satisfactionFlagName){
+					uni.showToast({
+						icon: 'none',
+						title: '请选择是否满意'
+					});
+					return;
+				}
+				
+				if (!this.sendDate.content) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入评价内容'
+					});
+					return;
+				}
+				
+				// if(!this.shopBanner.length){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请上传评价图'
+				// 	});
+				// 	return;
+				// }
+				this.$queue.showLoading('加载中...');
+				// console.log(this.orderNumber)
+				
+				this.$Request.postJson('/app/apperrandevaluate/userEvaluate', {
+					indentNumber: this.indentNumber,
+					evaluateMessage: this.sendDate.content,
+					satisfactionFlag: this.satisfactionFlag
+				}).then(res => {
+					if (res.code === 0) {
+						uni.showToast({
+							title: '评价成功'
+						});
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 1000);
+					} else {
+						uni.hideLoading();
+						uni.showModal({
+							showCancel: false,
+							title: '评价失败',
+							content: res.msg
+						});
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style>
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
+	}
+
+	page {
+		background-color: #FFFFFF;
+	}
+
+	view {
+		font-size: 28upx;
+	}
+
+	.input-view {
+		font-size: 28upx;
+	}
+
+	.close-view {
+		text-align: center;
+		line-height: 14px;
+		height: 16px;
+		width: 16px;
+		border-radius: 50%;
+		background: #ff5053;
+		color: #ffffff;
+		position: absolute;
+		top: -6px;
+		right: -4px;
+		font-size: 12px;
+	}
+
+	/* 上传 */
+	.uni-uploader {
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.uni-uploader-head {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-uploader-info {
+		color: #b2b2b2;
+	}
+
+	.uni-uploader-body {
+		margin-top: 16upx;
+	}
+
+	.uni-uploader__files {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-uploader__file {
+		margin: 10upx;
+		width: 210upx;
+		height: 210upx;
+	}
+
+	.uni-uploader__img {
+		display: block;
+		width: 210upx;
+		height: 210upx;
+	}
+
+	.uni-uploader__input-box {
+		position: relative;
+		margin: 10upx;
+		width: 208upx;
+		height: 208upx;
+		border: 2upx solid #d9d9d9;
+	}
+
+	.uni-uploader__input-box:before,
+	.uni-uploader__input-box:after {
+		content: ' ';
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		-webkit-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		background-color: #d9d9d9;
+	}
+
+	.uni-uploader__input-box:before {
+		width: 4upx;
+		height: 79upx;
+	}
+
+	.uni-uploader__input-box:after {
+		width: 79upx;
+		height: 4upx;
+	}
+
+	.uni-uploader__input-box:active {
+		border-color: #999999;
+	}
+
+	.uni-uploader__input-box:active:before,
+	.uni-uploader__input-box:active:after {
+		background-color: #999999;
+	}
+
+	.uni-uploader__input {
+		position: absolute;
+		z-index: 1;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		opacity: 0;
+	}
+
+	/*问题反馈*/
+	.feedback-title {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20upx;
+		color: #333333;
+		font-size: 28upx;
+	}
+
+	.feedback-star-view.feedback-title {
+		justify-content: flex-start;
+		margin: 0;
+	}
+
+	.feedback-quick {
+		position: relative;
+		padding-right: 40upx;
+	}
+
+	.feedback-quick:after {
+		font-family: uniicons;
+		font-size: 40upx;
+		content: '\e581';
+		position: absolute;
+		right: 0;
+		top: 50%;
+		color: #bbb;
+		-webkit-transform: translateY(-50%);
+		transform: translateY(-50%);
+	}
+
+	.feedback-body {
+		font-size: 32upx;
+		padding: 16upx;
+		margin: 16upx;
+		border-radius: 16upx;
+		background: #F2F2F2;
+		color: #FFF;
+	}
+
+	.feedback-textare {
+		height: 200upx;
+		font-size: 30upx;
+		line-height: 50upx;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10upx 0upx 0;
+		color: #8f8f94;
+	}
+
+	.feedback-input {
+		font-size: 32upx;
+		height: 60upx;
+		padding: 15upx 20upx;
+		line-height: 60upx;
+	}
+
+	.feedback-uploader {
+		padding: 22upx 20upx;
+	}
+
+	.feedback-star {
+		font-family: uniicons;
+		font-size: 40upx;
+		margin-left: 6upx;
+	}
+
+	.feedback-star-view {
+		margin-left: 20upx;
+	}
+
+	.feedback-star:after {
+		content: '\e408';
+	}
+
+	.feedback-star.active {
+		color: #ffb400;
+	}
+
+	.feedback-star.active:after {
+		content: '\e438';
+	}
+
+	.feedback-submit {
+		background: #007aff;
+		color: #ffffff;
+		margin: 20upx;
+	}
+</style>

pages/order/index.vue

@@ -17,9 +17,9 @@
 				</view>
 			</view>
 			<view>
-				<u-tabs v-if="orderType == 1" active-color="#FF8D1A" :list="qucanList" :is-scroll="true"
+				<u-tabs v-if="orderType == 1" active-color="#FCD202" :list="qucanList" :is-scroll="true"
 					:current="current" @change="change"></u-tabs>
-				<u-tabs v-if="orderType == 2" active-color="#FF8D1A" :list="waimaiList" :is-scroll="true"
+				<u-tabs v-if="orderType == 2" active-color="#FCD202" :list="waimaiList" :is-scroll="true"
 					:current="current1" @change="change1">
 				</u-tabs>
 				<u-tabs v-if="orderType == 3" :list="paotuiList" :is-scroll="true" active-color="#FCD202"
@@ -181,10 +181,11 @@
 					</view>
 					<u-line color="#E6E6E6" />
 					<view class="order_btn">
-						<!-- <view class="btn1" v-if="item.indentState == 7||item.indentState == 6 &&!item.evaluateMessage"
-							@tap.stop="pingjia(item)">
-							去评论
-						</view> -->
+						<!-- item.indentState == 7||item.indentState == 6 &&!item.evaluateMessage -->
+						<view class="btn" v-if="item.indentState == 7||item.indentState == 6 && (!item.evaluateMessage || item.evaluateMessage == 0)"
+							@tap.stop="pingjias(item)">
+							点赞骑手
+						</view>
 						<view class="btn" v-if="item.indentState == 0||item.indentState == 2"
 							@tap.stop="bindorderOff(item)">取消订单</view>
 						<view class="btn" @tap.stop="bindconfirm(item)" v-if="item.indentState == 5">确认订单</view>
@@ -457,8 +458,42 @@
 					}
 				});
 			},
-			// 评价订单
-			pingjia(e) {
+			// 评价订单
+			pingjia(e) {
+				// #ifdef MP-WEIXIN
+				if (uni.getStorageSync('sendMsg')) {
+					console.log('授权+1')
+					wx.requestSubscribeMessage({
+						tmplIds: this.arr,
+						success(re) {
+							console.log(JSON.stringify(re), 111111111111)
+							var datas = JSON.stringify(re);
+							if (datas.indexOf("accept") != -1) {
+								// console.log(re)
+							}
+						},
+						fail: (res) => {
+							// console.log(res)
+						}
+					})
+				}
+				// #endif
+				console.log(e)
+				let ordersId = e.orderId
+				let orderNumber = e.orderNumber
+				let goodsId = []
+				if (e.orderGoodsList) {
+					e.orderGoodsList.forEach(res => {
+						goodsId.push(res.goodsId)
+					})
+				}
+
+				uni.navigateTo({
+					url: '/pages/order/feedback?ordersId=' + ordersId + '&orderNumber=' + orderNumber +
+						'&goodsId=' + goodsId.toString() + '&shopId=' + e.shopId
+				})
+			},
+			pingjias(e) {
 				// #ifdef MP-WEIXIN
 				if (uni.getStorageSync('sendMsg')) {
 					console.log('授权+1')
@@ -477,19 +512,8 @@
 					})
 				}
 				// #endif
-				console.log(e)
-				let ordersId = e.orderId
-				let orderNumber = e.orderNumber
-				let goodsId = []
-				if (e.orderGoodsList) {
-					e.orderGoodsList.forEach(res => {
-						goodsId.push(res.goodsId)
-					})
-				}
-
 				uni.navigateTo({
-					url: '/pages/order/feedback?ordersId=' + ordersId + '&orderNumber=' + orderNumber +
-						'&goodsId=' + goodsId.toString() + '&shopId=' + e.shopId
+					url: '/pages/order/feedbacks?indentNumber=' + e.indentNumber
 				})
 			},
 			goShop(e) {
@@ -903,7 +927,7 @@
 	.active {
 		/* width: 82rpx; */
 		height: 16rpx;
-		background: #FF8D1A;
+		background: #FCD202;
 		position: relative;
 		top: -20rpx;
 		z-index: 9;

unpackage/dist/dev/mp-weixin/app.json

@@ -15,6 +15,7 @@
     "pages/order/detail",
     "pages/order/takefood",
     "pages/order/feedback",
+    "pages/order/feedbacks",
     "pages/order/complaint/complaint",
     "pages/order/waimaiMap",
     "pages/order/paotuiMap",
@@ -118,6 +119,5 @@
     "getLocation",
     "chooseLocation"
   ],
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/order/feedbacks.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "点赞骑手",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/order/feedbacks.wxss

@@ -0,0 +1,181 @@
+
+@font-face {
+	font-family: uniicons;
+	font-weight: normal;
+	font-style: normal;
+	src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
+}
+page {
+	background-color: #FFFFFF;
+}
+view {
+	font-size: 28rpx;
+}
+.input-view {
+	font-size: 28rpx;
+}
+.close-view {
+	text-align: center;
+	line-height: 14px;
+	height: 16px;
+	width: 16px;
+	border-radius: 50%;
+	background: #ff5053;
+	color: #ffffff;
+	position: absolute;
+	top: -6px;
+	right: -4px;
+	font-size: 12px;
+}
+
+/* 上传 */
+.uni-uploader {
+	flex: 1;
+	flex-direction: column;
+}
+.uni-uploader-head {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.uni-uploader-info {
+	color: #b2b2b2;
+}
+.uni-uploader-body {
+	margin-top: 16rpx;
+}
+.uni-uploader__files {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+.uni-uploader__file {
+	margin: 10rpx;
+	width: 210rpx;
+	height: 210rpx;
+}
+.uni-uploader__img {
+	display: block;
+	width: 210rpx;
+	height: 210rpx;
+}
+.uni-uploader__input-box {
+	position: relative;
+	margin: 10rpx;
+	width: 208rpx;
+	height: 208rpx;
+	border: 2rpx solid #d9d9d9;
+}
+.uni-uploader__input-box:before,
+.uni-uploader__input-box:after {
+	content: ' ';
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #d9d9d9;
+}
+.uni-uploader__input-box:before {
+	width: 4rpx;
+	height: 79rpx;
+}
+.uni-uploader__input-box:after {
+	width: 79rpx;
+	height: 4rpx;
+}
+.uni-uploader__input-box:active {
+	border-color: #999999;
+}
+.uni-uploader__input-box:active:before,
+.uni-uploader__input-box:active:after {
+	background-color: #999999;
+}
+.uni-uploader__input {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+}
+
+/*问题反馈*/
+.feedback-title {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	color: #333333;
+	font-size: 28rpx;
+}
+.feedback-star-view.feedback-title {
+	justify-content: flex-start;
+	margin: 0;
+}
+.feedback-quick {
+	position: relative;
+	padding-right: 40rpx;
+}
+.feedback-quick:after {
+	font-family: uniicons;
+	font-size: 40rpx;
+	content: '\e581';
+	position: absolute;
+	right: 0;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+.feedback-body {
+	font-size: 32rpx;
+	padding: 16rpx;
+	margin: 16rpx;
+	border-radius: 16rpx;
+	background: #F2F2F2;
+	color: #FFF;
+}
+.feedback-textare {
+	height: 200rpx;
+	font-size: 30rpx;
+	line-height: 50rpx;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 10rpx 0rpx 0;
+	color: #8f8f94;
+}
+.feedback-input {
+	font-size: 32rpx;
+	height: 60rpx;
+	padding: 15rpx 20rpx;
+	line-height: 60rpx;
+}
+.feedback-uploader {
+	padding: 22rpx 20rpx;
+}
+.feedback-star {
+	font-family: uniicons;
+	font-size: 40rpx;
+	margin-left: 6rpx;
+}
+.feedback-star-view {
+	margin-left: 20rpx;
+}
+.feedback-star:after {
+	content: '\e408';
+}
+.feedback-star.active {
+	color: #ffb400;
+}
+.feedback-star.active:after {
+	content: '\e438';
+}
+.feedback-submit {
+	background: #007aff;
+	color: #ffffff;
+	margin: 20rpx;
+}
+

unpackage/dist/dev/mp-weixin/pages/order/index.wxss

@@ -2,7 +2,7 @@
 .active.data-v-0ca91b30 {
 	/* width: 82rpx; */
 	height: 16rpx;
-	background: #FF8D1A;
+	background: #FCD202;
 	position: relative;
 	top: -20rpx;
 	z-index: 9;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.2.5",
+  "libVersion": "3.3.3",
   "appid": "wx45ab46867002aa0b",
   "projectname": "同城外卖用户端",
   "condition": {},

unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-form/u-form.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }