订单购买修改

component/textarea.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 			<view class="uni-textarea">
-				<textarea maxlength="100" @input="bindTextAreaBlur" :placeholder="tips"/>
+				<textarea :maxlength="maxnumber" @input="bindTextAreaBlur" :placeholder="tips"/>
 			    <view style="color:#909399;text-align:right;">{{numberList}}/100</view>
 			</view>
 		</view>
@@ -12,6 +12,10 @@
 			tips:{
 				default:'填写催单内容',
 				type: String
+			},
+			maxnumber:{
+				default: 100,
+				type: Number
 			}
 		},
 		data() {

pages.json

@@ -40,6 +40,7 @@
 		 				}
 		 	}
 		 },
+		
 		{
 			"path": "pages/index/cart",
 			"style": {
@@ -56,7 +57,6 @@
 					"van-radio": "/wxcomponents/dist/radio/index",
 					"van-radio-group": "/wxcomponents/dist/radio-group/index"
 			}
-				
 			}
 		},
 		
@@ -93,6 +93,15 @@
 			    }
 			}
 		},
+		{
+			"path": "pages/index/feedback",
+			"style": {
+				"navigationBarTitleText": "入住反馈",
+				"usingComponents":{
+							"van-uploader": "/wxcomponents/dist/uploader/index"
+						}
+			}
+		},
 		{
 			"path": "pages/index/hotelsearch",
 			"style": {
@@ -221,6 +230,15 @@
 				"navigationBarTitleText": "我的"
 			}
 		},
+		{
+			"path": "pages/myOrder/finsh",
+			"style": {
+				"navigationBarTitleText": "支付成功",
+				"usingComponents": {
+				   "van-icon": "/wxcomponents/dist/icon/index"
+				}
+			}
+		},
 		{
 			"path": "pages/myCenter/applyfor",
 			"style": {
@@ -294,6 +312,7 @@
     ],
 	"tabBar": {
 		"color": "#C0C4CC",
+		"selectedColor": "#fa436a",
 		"list": [
 			{
 				"pagePath": "pages/index/index",

pages/index/cart.vue

@@ -25,8 +25,8 @@
 			  			    title-class="changewidth"
 			  				price-class ="priceClass"
 			  			    :price="item.goods_price"
-			  			    :desc="item.desarray[1]+'X'+item.goods_num"
-			  			    :title="item.desarray[0]"
+			  			    :desc="item.descire+'X'+item.goods_num"
+			  			    :title="item.desarray"
 			  			    :thumb="pictureUrl + '/uploads/home/store/goods/' + item.goods_image.substr(0, item.goods_image.indexOf('\_')) + '/' + item.goods_image"
 			  			  >
 			  			    <view slot="footer">
@@ -52,9 +52,10 @@
 				   <view style="text-align: center;color: #909399;"> 去买点什么</view>
 			  </view>
 		  </view>
-		  
+		   
 		 <view style="position: fixed;bottom: 0;border-top:1px solid #eee;height: 8vh;">
 		 <van-submit-bar
+		   :price-class="isdelete? '':'isdiaplay' "	
 		   :price="prices"
 		   :button-text="listip"
 		   @submit="onClickButton"
@@ -63,9 +64,11 @@
 		 <van-checkbox checked-color="#D9332E" :value="isAll" shape="round" @change="onChange">
 		  全选
 		 </van-checkbox>
+	
 		 </van-submit-bar>
 		 </view>
 		 
+		
 	</view>
 </template>
 
@@ -87,6 +90,7 @@
 				old: {
 					scrollTop: 0
 				},
+				nums: 0,
 				store: {},
 				ispull:　true,
 				page:　1,
@@ -103,7 +107,7 @@
 		onLoad: function (options) {
 			console.log(options)
 			this.store_id = options.store_id;
-			this.listip = '结算'+ (this.lengthnumber);
+			this.listip = "结算" + '(' + this.nums + ')';
 			this.getshoplist();
 	    },
 		methods: {
@@ -132,10 +136,9 @@
 					this.deleteshop(ids);
 				}
 			},
+			// 保存订单生成订单id
             getorderId() {
 				let goods = [];
-				let store = JSON.stringify(this.store);
-				let pricelist = JSON.stringify(this.pricelist);
 				let prices = this.prices;
 				this.pricelist.forEach((item,index) => {
 					 goods.push({});
@@ -150,12 +153,11 @@
 						 goods: JSON.stringify(goods)
 					 },
 					 success:(res) => {
-						 console.log(res);
 						 let order_id = res.data.data.order_id;
+						 let store = this.store.store_id;
 						 uni.navigateTo({
-						   url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}&order_id=${order_id}`
+						   url: `/pages/index/sureBuy?store=${store}&prices=${prices}&order_id=${order_id}`
 						 });
-						 
 					 }
 				 })
 			},
@@ -191,8 +193,8 @@
 			},
 			changeShop() {
 				this.isdelete = !this.isdelete;
-				console.log(this.lengthnumber)
-				this.listip = this.isdelete ? "结算" + (this.lengthnumber) :'删除'+ (this.lengthnumber);
+				
+				 this.listip = this.isdelete ? "结算" + '(' + this.nums + ')' :'删除'+ '(' + this.nums + ')';
 			},
 			getshoplist() {
 				this.request({
@@ -205,9 +207,12 @@
 					success: (res) => {
 						let { data } = res.data;
 						 data.cart_list.forEach(item => {
-							 item.desarray = item.goods_name.split(' ')
+							 let arr = item.goods_name.split(' ');
+							 item.desarray = arr[0];
+							 item.descire = item.goods_name.replace(arr[0], '');
 						 })
 						this.list = data.cart_list;
+						console.log(this.list);
 						this.store = data.store;
 						//console.log(data.cart_list[0].goods_name.split(' '));
 					}
@@ -223,7 +228,6 @@
 			},
 			// 数量累加
 			bindChange(e) {
-				 console.log(e);
 				 this.list[e.index].goods_num = e.number;
 				 this.checkoutprice();
 			},
@@ -238,19 +242,27 @@
 			  this.checkboxList.forEach(item => {
 				  price.push(array[item])
 			  })
-			  this.pricelist = price
+			  this.pricelist = price;
+			  let num = 0
+			  this.pricelist.forEach(item => {
+				  num += item.goods_num;
+			  })
+			  this.nums = num;
 			  this.lengthnumber = this.pricelist.length;
-			  this.listip = this.isdelete ? "结算" + (this.lengthnumber) :'删除'+ (this.lengthnumber);
+			   this.listip = this.isdelete ? "结算" + '(' + this.nums + ')' :'删除'+ '(' + this.nums + ')';
 			  this.checkoutprice();
 			   },
 			 // 计算价格 
 			 checkoutprice() {
 				 let total = 0;
-				 console.log(this.pricelist)
+				 let num = 0
 				  this.pricelist.forEach(item =>　{
 					  total += item.goods_price * item.goods_num;
+					  num += item.goods_num;
 				  })
+				  this.nums = num;
 				  this.prices = Number(total.toFixed(2))*100;
+				  this.listip = this.isdelete ? "结算" + '(' + this.nums + ')' :'删除'+ '(' + this.nums + ')';
 				  
 			 },
 			// 全选
@@ -262,16 +274,19 @@
 						this.$set(this.checkboxList, idx, idx.toString())
 					})
 					 this.pricelist = this.list;
-					 console.log(this.pricelist);
-					 this.lengthnumber = this.pricelist.length;
-					 this.listip = this.isdelete ? `结算(${this.lengthnumber})` :'删除'+ (this.lengthnumber);
+					 let num = 0
+					 this.pricelist.forEach(item => {
+					 				  num += item.goods_num;
+					 })
+					 this.nums = num;
+					 this.listip = this.isdelete ? "结算" + '(' + this.nums + ')' :'删除'+ '(' + this.nums + ')';
 					 this.checkoutprice();
 				}else {
 					for (let i = 0, lenI = items.length; i < lenI; ++i) {
-						 this.checkboxList = []
+						  this.checkboxList = [];
 						  this.pricelist = [];
-						  this.lengthnumber = 0;
-						  this.listip = this.isdelete ? "结算" + (this.lengthnumber) :'删除'+ (this.lengthnumber);
+						  this.nums = 0;
+						  this.listip = this.isdelete ? "结算" + '(' + this.nums + ')' :'删除'+ '(' + this.nums + ')';
 						  this.checkoutprice();
 					}
 					
@@ -337,4 +352,11 @@
 		position: static!important;
 		float: right;
 	}
+	
+	.isdiaplay .van-submit-bar__text {
+		visibility: hidden;
+	}
+	.isdiaplay {
+		visibility: hidden;
+	}
 </style>

pages/index/commemt.vue

@@ -26,6 +26,9 @@
 				<view style="color: #303133;font-size: 28upx;" class="uni-comment-content">{{item.geval_content}}</view>
 			</view>
 		</view>
+		<view style="text-align: center;" v-if="assesslist.length == 0">
+			暂无评价
+		</view>
 	</view>
 </template>
 

pages/index/feedback.vue

@@ -0,0 +1,156 @@
+<template>
+	<view style="padding: 0 32upx;margin-bottom: 35upx;">
+		<view class="comment">满意度星级评价(完成此项送30圈币)</view>
+		<view class="comment">您对酒店的整体满意度</view>
+		<view class="comment">
+			<van-rate
+			  :value="satisfaction"
+			  void-icon="star"
+			  void-color="#eee"
+			  color="#ee0a24"
+			  @change="getsatisfaction"
+			/>
+		</view>
+		<view class="comment">您是否会再次入住或向他人介绍本酒店</view>
+		<view class="comment">
+			<van-rate
+			  :value="recommend"
+			  void-icon="star"
+			  void-color="#eee"
+			  color="#ee0a24"
+			  @change="getrecommend"
+			/>
+		</view>
+		<view class="comment">您对酒店的设施是否满意</view>
+		<view class="comment">
+			<van-rate
+			  :value="facilities"
+			  void-icon="star"
+			  void-color="#eee"
+			  @change="getfacilities"
+			  color="#ee0a24"
+			/>
+		</view>
+		<view class="comment">您对员工的待客礼仪否满意</view>
+		<view class="comment">
+			<van-rate
+			  :value="ceremony"
+			  void-icon="star"
+			  @change="getceremony"
+			  void-color="#eee"
+			  color="#ee0a24"
+			/>
+		</view>
+		<view class="comment">您对我们提供的网上购物的总体评价</view>
+		<view class="comment">
+			<van-rate
+			  :value="shopping"
+			  void-icon="star"
+			  @change="getshopping"
+			  void-color="#eee"
+			  color="#ee0a24"
+			/>
+		</view>
+		<view class="comment">文字建议与评价(完成此项送20圈币)</view>
+		<view class="comment" style="padding: 20rpx 40rpx;">对我们的酒店设施与服务，您还有什么建议吗？对我们的服务人员您有什么批评或表扬吗？请告诉我们...</view>
+		<TextArea :maxnumber="maxnumber" :tips="tips" @submitValue="submitValue"/>	
+		<view style="padding: 15upx 32upx;">
+			<view>添加图片(最多3张)</view>
+			<uploadImage @getImg="getImg" />	
+		</view>
+		<view class="submitRemin" @click="submitRemin">提交</view>
+	</view>
+</template>
+
+<script>
+	import TextArea from '@/component/textarea.vue'
+	import uploadImage from '@/component/uploadImage.vue'
+	export default {
+		components: {
+			TextArea,
+			uploadImage
+		},
+		data() {
+			return{
+				conent:'',
+				maxnumber: 300,
+				tips: '',
+				satisfaction:'',	//酒店整体满意度评分 取值范围1-5
+				recommend:'',	//	是否再次入住评分 取值范围1-5
+				facilities:'',	//设施评分 取值范围1-5
+				ceremony:'',	//是	string	礼仪评分 取值范围1-5
+				shopping:'',	//是	string	网上购物评分 取值范围1-5
+				content:'',	 //否	string	评价内容评分 取值范围1-5
+				img_list:'',
+				store_id: 0
+			}
+		},
+		onLoad(e) {
+			this.store_id = e.store_id;
+		},
+		
+		methods: {
+			getsatisfaction(e) {
+				this.satisfaction = e.detail;
+			},
+			getrecommend(e) {
+				this.recommend = e.detail;
+			},
+			getfacilities(e) {
+				this.facilities = e.detail;
+			},
+			getceremony(e){
+				this.ceremony = e.detail;
+			},
+			getshopping(e){
+				this.shopping = e.detail;
+			},
+			getImg(e) {
+				this.img_list = e.join(',');
+				console.log(this.img_list);
+			},
+			submitValue(e) {
+				this.content = e.detail.value;
+			},
+			submitRemin() {
+				if(this.satisfaction == '' || this.recommend == ''
+				|| this.facilities == ''|| this.ceremony == ''|| this.shopping == '') {
+					this.$msg("请完成星级评价！");
+					return;
+				}
+				if(this.content == '') {
+					this.$msg('请填写反馈内容！');
+					return;
+				}
+				if(this.content.length < 20 ) {
+					this.$msg( '反馈内容不能少于20个字！');
+					return;
+				}
+				this.request({
+					url: '/v2/store/feedback',
+					method: 'post',
+					data: {
+						store_id: this.store_id,
+						satisfaction: this.satisfaction,
+						recommend: this.recommend,
+						facilities: this.facilities,
+						ceremony: this.ceremony,
+						shopping: this.shopping,
+						content: this.content,
+						img_list: this.img_list,
+					},
+					success: (res) => {
+						uni.navigateBack();
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.comment {
+		text-align: center;
+		padding: 20upx 0;
+	}
+</style>

pages/index/hotel.vue

@@ -48,7 +48,6 @@
 							</image>
                             <p style="text-align: center;">{{item.gc_name}}</p>
                           </view>
-                           
                       </view>
                   
                   <view style="padding: 0upx 18upx;">
@@ -77,10 +76,8 @@
 										 <view   @click.stop="changeisclick(4)">
 											  <van-icon  :class="istopclick==4 ? 'active' : ''" size="8px" name="arrow-down" />
 										 </view>
-                                         
                                       </view>
                                   </view>
-                                  
                               </view>
                               <view  @click.stop="choseType(4)" class="typeItem">
 								    <view :class="tabIndex==4 ? 'active' : ''">分类</view>
@@ -109,7 +106,7 @@
                  </van-tab>
                   </van-tabs>
                <view v-if="activeindex == 2" class="bottomButton">
-                     <button type="warn">您的入住意见反馈(反馈送圈币)</button>
+                     <button type="warn" @click="gofeedback">您的入住意见反馈(反馈送圈币)</button>
                 </view>
        </view>
        </scroll-view>
@@ -138,6 +135,7 @@
         },
         data() {
             return {
+				hoteldetail: {},
 				has_collected: 0, // 收藏酒店
 				chosegoods_commonid:　true,
 				chosegoods_price: true,
@@ -184,7 +182,7 @@
                 autoplay: true,
                 interval: 2000,
                 duration: 500,
-                activeindex: 1,
+                activeindex: 0,
                 scrollTop: 0,
                 old: {
                     scrollTop: 0
@@ -209,10 +207,10 @@
         },
 		onLoad(options){
 			this.goodId = options.id;  // 商品和酒店Id
+			this.activeindex = 0;
 			this.getshopdetail(); // 获取商品详情
 			this.hotelmenu();  // 一级菜单
 			this.gethoteil();  // 获取酒店信息
-			this.activeindex = 0;
 		},
 		computed:{
 			...mapState([
@@ -221,6 +219,17 @@
 			]),
 		},
         methods: {
+			// 入住酒店反馈
+			gofeedback() {
+				if(this.hoteldetail.can_feedback == 0) {
+					this.$msg(this.hoteldetail.feedback_msg);
+					return;
+				}
+				let store_id = this.goodId;
+				uni.navigateTo({
+				        url: `/pages/index/feedback?store_id=${store_id}`
+				    });
+			},
 			// 搜说
 			gotosearch() {
 				let store_id = this.goodId;
@@ -314,7 +323,6 @@
 										 gc_id_1: this.gc_id_1
 				                    },
 								success: (res) => {
-									
 									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
 									if(res.data.data.goods_list.length < 10) {
 										this.isDetail = 2;
@@ -380,6 +388,7 @@
 					},
 					success: (res) => {
 						let { data } = res.data;
+						this.hoteldetail = data;
 						this.hotelitle = data.store_name;
 						this.store_slide = data.store_slide;
 						this.store_summary = data.store_summary;
@@ -554,7 +563,7 @@
     }
     .activeColor {
         background: #fff!important;
-        position: fixed;
+        position: sticky;
         background-color: #fff;
         top: 50upx;
         z-index: 99;

pages/index/index.vue

@@ -163,7 +163,8 @@
 			goinfor() {
 				if(this.hasLogin) {
 					uni.navigateTo({
-					   url: '../myCenter/information'  // 我的收藏
+						url: '/pages/myOrder/finsh'
+					   //url: '../myCenter/information'  // 我的收藏
 					})
 				}else {
 					this.showdialog = true;
@@ -227,14 +228,9 @@
 						}else {
 							console.log("yijing授权")
 							_this.showDialog(true);
-							// uni.getUserInfo({
-							// 	     success(res) {
-							// 		 console.log(res);
-							// 		 console.log("oooooo")
-							// 			 that.login(res.userInfo);
-							// 			 //that.showDialog(true); // 改变haslogion的值
-							// 	     }
-							//     })
+							let userInfo = uni.getStorageSync('userInfo');
+							 console.log(userInfo);
+							 _this.login(userInfo);
 						}
 					}
 				})

pages/index/shop.vue

@@ -296,6 +296,7 @@
 							this.datalist = data;
 							this.goods_id = data.goods_list[0].goods_id;
 							this.goods_storage = data.goods_storage;
+							//this.specSelected = data.goods_list;
 						}else {
 							array.spec_list[0].value_list.forEach( (item,idx) => {
 								item.goods_storage = data.goods_list[idx].goods_storage;
@@ -357,18 +358,26 @@
 			// 立即购买
 			buynow() {
 				if(this.hasLogin) {
-					if(this.specSelected.length == 0) {
+					if(this.datalist.store_id == 1 || this.datalist.goods_state != 1 ||　this.datalist.goods_storage < 1) {
+						this.$msg("商品已下架");
+						return;
+					}
+					if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0) {
 						this.$msg("请选择规格数量");
 						this.specClass = 'show';
 						return;
 					}
-					let goods = [];
-					this.specSelected.forEach((item,index) => {
-						 goods.push({});
-						 goods[0].goods_id = item.goods_id;
+					if(this.specSelected.length == 0&&this.datalist.spec_list.length == 0) {
+						this.specClass = 'show';
+						this.specSelected = this.datalist.goods_list;
+						return;
+					}
+					console.log( this.datalist);
+					 let goods = [];
+					     goods.push({});
+						 goods[0].goods_id = this.goods_id;
 						 goods[0].buy_num = this.shopnumber;
-					 })
-					 console.log(goods)
+					 let prices = this.datalist.goods_price*this.shopnumber;
 					 this.request({
 						 url:'/v1/order/save_og',
 						 method: 'post',
@@ -378,9 +387,10 @@
 						 },
 						 success:(res) => {
 							 console.log(res);
+							 let store = this.store_id;
 							 let order_id = res.data.data.order_id;
 							 uni.navigateTo({
-							   url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}&order_id=${order_id}`
+							   url: `/pages/index/sureBuy?store=${store}&prices=${prices}&order_id=${order_id}`
 							 });
 							 
 						 }
@@ -392,7 +402,16 @@
 			// 加入购物车
 			addCar() {
 				if(this.hasLogin) {
-						if(this.specSelected.length == 0 && this.datalist.spec_list.length != 0) {
+					if(this.datalist.store_id == 1 || this.datalist.goods_state != 1 ||　this.datalist.goods_storage < 1) {
+						this.$msg("商品已下架");
+						return;
+					}
+					if(this.specSelected.length == 0&&this.datalist.spec_list.length == 0) {
+						this.specClass = 'show';
+						this.specSelected = this.datalist.goods_list;
+						return;
+					}
+						if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0) {
 							this.specClass = 'show';
 							this.$msg("请选择规格数量");
 							return;
@@ -411,7 +430,6 @@
 								}
 							})
 						}
-						
 				}else {
 					this.showdialog = true;
 				}
@@ -426,6 +444,7 @@
 				if(goods_storage == 0) {
 					return;
 				}
+				
  				let list = this.datalist.spec_list[index].value_list;
  				this.datalist.spec_list[index].value_list.forEach(item=>{
  					if(item.value_id === pid){
@@ -543,6 +562,7 @@
  		/* padding-bottom: 160upx; */
 		position: relative;
  	}
+	
  	.icon-you{
  		font-size: 28upx + 2upx;
  		color: #888;
@@ -1009,6 +1029,7 @@
 	.uni-numbox {
 		float: right;
 	}
+	
  	/* 底部操作菜单 */
  	.page-bottom{
  		position: fixed;
@@ -1017,7 +1038,7 @@
  		display: flex;
  		justify-content: center;
  		align-items: center;
- 		width:  100%;
+ 		width:  100vw;
  		height: 100upx;
 		z-index: 99;
  		background: rgba(255,255,255,.9);

pages/index/sureBuy.vue

@@ -26,23 +26,28 @@
 		  "
 		 >
 		  <van-field 
-		     :value="username"
+		     @change="gethotelname"
+		     :value="hotelname"
 		     label="酒店"
+			 disabled
 		     placeholder="请输入酒店"
 		   />
 		   
 		   <van-field
-		      :value="username"
+		      @change="gethonename"
+		      :value="honename"
 		      label="房间号"
 		      placeholder="请输入房间号"
 		    />
 			<van-field
+			   @change="getusername"
 			   :value="username"
 			   label="收货人"
 			   placeholder="请输入收货人"
 			 />
 			<van-field
-			   :value="username"
+			   @change="getphone"
+			   :value="phone"
 			   label="手机号"
 			   placeholder="请输入手机号"
 			 />
@@ -55,27 +60,56 @@
 		  "
 		 >
 		  <van-field 
-		     :value="username"
+		    @change="getreserve"
+		     :value="reserve"
+			 disabled
 		     label="预定酒店"
 		     placeholder="请输入预定酒店"
 		   />
 		   
 		   <van-field
-		      :value="username"
+		    @change="getCheckedin"
+		      :value="Checkedin"
 		      label="入住人"
 		      placeholder="请输入入住人"
 		    />
 			<van-field
-			   :value="username"
+			@change="getnumberphone"
+			   :value="numberphone"
 			   label="手机号"
 			   placeholder="请输入手机号"
 			 />
 			 <van-field
-			    :value="username"
+			 @change="getremark"
+			    :value="remark"
 			    label="备注"
 			    placeholder="请输入备注"
 			  />
 		    </view>
+		
+		<view v-if="radio == 2">
+			<van-radio-group >
+			   <van-cell-group 
+			   >
+				 <van-cell
+				   :border="false"
+				   @click="getread"
+			     >
+				 <template slot="title">
+					 我已阅读并同意 <span style="color: #007AFF">预定须知</span>
+				 </template>
+				 <template slot="right-icon">
+				    <van-radio-group style="width: 20upx;" :value="read" >
+				      <van-radio checked-color="#D9332E" :name="4" >
+					  </van-radio>
+				    </van-radio-group>
+				 </template>
+			     </van-cell>
+			   </van-cell-group>
+			 </van-radio-group>
+		</view>
+		
+		 
 		 <van-cell v-if="radio === 1&&choseadress == '' " @click="goAdress" class="LinkAdress" title="选择地址"  is-link/>
 		  <view v-if="radio === 1&&choseadress != ''" class="wrapper">
 		  	<view class="u-box" @click="goAdress" >
@@ -102,8 +136,8 @@
 					title-class="changewidth"
 					price-class ="priceClass"
 					:price="item.goods_price"
-					:desc="item.desarray[1]+'X'+item.goods_num"
-					:title="item.desarray[0]"
+					:desc="item.descire+'X'+item.goods_num"
+					:title="item.desarray"
 					:thumb="pictureUrl + '/uploads/home/store/goods/' + item.goods_image.substr(0, item.goods_image.indexOf('\_')) + '/' + item.goods_image"
 				  >
 				  </van-card>
@@ -129,6 +163,15 @@
 	export default {
 		data() {
 			return {
+				read: 0,
+				hotelname:'', // 
+				honename:'',
+				phone:'',
+				username:'',
+				reserve:'', // yudingjiudian
+				Checkedin:'',
+				numberphone:'',
+				remark:'',
 				ralodprice: 0,
 				prices:'',
 				pictureUrl: this.pictureUrl,
@@ -137,21 +180,23 @@
 					{title:'快递到我的地址'},
 					{title:'处理我的客房预定'}
 				],
-				username:'',
+				
 				shipping_type: 0,
 				radio: 0,
 				store: {},
+				store_id:'',
 				pricelist: [],
 				choseadress: '',
 				order_id:''
 			}
 		},
 		onLoad(options) {
+			console.log(options);
 			this.order_id = options.order_id;
-			this.store = JSON.parse(options.store);
-			this.pricelist = JSON.parse(options.pricelist);
+			this.store_id = options.store;
 			let prices =  Number((options.prices/100).toFixed(2));
 			this.prices = prices; 
+			this.getorder(); // 获取订单详情
 			 uni.$on("getadress",(adress)=>{
 			        this.choseadress = adress;
 					this.address_id = this.choseadress.address_id;
@@ -159,16 +204,147 @@
 			 })
 		},
 		methods: {
+			getread() {
+				console.log("kkk")
+				this.read = 4;
+			},
+			// gethotelname(e) {
+			// 	this.hotelname = e.detail;
+			// },
+			gethonename(e) {
+				this.honename = e.detail;
+			},
+			getphone(e) {
+				this.phone = e.detail;
+			},
+			getusername(e) {
+				this.username = e.detail;
+			},
+			// reserve:'', // yudingjiudian
+			//	Checkedin:'',
+			//	numberphone:'',
+				//remark:'',
+				// getreserve(e) {
+				// 	this.reserve = e.detail;
+				// },
+				getCheckedin(e) {
+					this.Checkedin = e.detail;
+				},
+				getnumberphone(e) {
+					this.numberphone = e.detail;
+				},
+				getremark(e) {
+					this.remark = e.detail;
+				},
+			// 获取订单详情
+			getorder() {
+				this.request({
+					url: '/v2/order/og',
+					method: 'POST',
+					data: {
+						order_id: this.order_id,
+						store_id: this.store_id
+					},
+					success: (res) => {
+						let { data } = res.data;
+						this.store = data.store;
+						data.og_list.forEach(item => {
+						   let arr = item.goods_name.split(' ');
+						   item.desarray = arr[0];
+						   item.descire = item.goods_name.replace(arr[0], '');
+						})
+						this.hotelname = this.store.store_name
+						this.reserve = this.store.store_name
+						this.pricelist = data.og_list;
+					}
+				})
+			},
 			// 付款
 			goPay() {
+				let reg_phone = /^1[3456789]\d{9}$/;
+				if(this.radio == 1) {
+					this.gopaymoment();
+				}else if(this.radio == 0){
+					if(this.hotelname == '') {
+						this.$msg("请输入酒店名")
+						return;
+					}else if(this.honename == '') {
+						this.$msg("请输入房间号")
+						return;
+						
+					}else if( !reg_phone.test(this.phone)) {
+						this.$msg("请输入正确手机号")
+						return;
+					}else if(this.username == '') {
+						this.$msg("请输入收货人")
+						return;
+					}
+					this.request({
+						url:'/v2/address/add',
+						method:'post',
+						data: {
+							is_free: 1,
+							area_info: this.store.area_info,
+							address_detail:this.hotelname +  this.honename,
+							address_mob_phone: this.phone,
+							address_realname: this.username,
+							area_id: this.store.region_id
+						},
+						success: (res) => {
+							console.log(res.data.data.address_id);
+							this.address_id = res.data.data.address_id;
+							this.shipping_type = 1;
+							this.gopaymoment();
+						}
+					})
+					
+				}else if(this.radio == 2) {
+					if(this.reserve == '') {
+						this.$msg("请输入预定酒店")
+						return;
+					}else if(this.Checkedin == '') {
+						this.$msg("请输入入住人")
+						return;
+					}else if( !reg_phone.test(this.numberphone)) {
+						this.$msg("请输入正确手机号")
+						return;
+					}else if(this.read !=4) {
+						this.$msg("请阅读预定须知");
+						return;
+					}
+					this.request({
+						url:'/v2/address/add',
+						method:'post',
+						data: {
+							is_free: 1,
+							area_info: this.store.area_info,
+							address_detail:this.reserve,
+							address_mob_phone: this.numberphone,
+							address_realname: this.Checkedin,
+							area_id: this.store.region_id
+						},
+						success: (res) => {
+							console.log(res.data.data.address_id);
+							this.address_id = res.data.data.address_id;
+							this.shipping_type = 1;
+							this.gopaymoment();
+						}
+					})
+					
+				}
+				
+			},
+			// 下单
+			gopaymoment(){
 				this.request({
-					url:'/v1/order/create',
+					url:'/v2/order/create',
 					method: 'post',
 					data: {
 						gorderid: this.order_id,
 						address_id: this.address_id,
 						store_id: this.store.store_id,
-						shipping_type: this.shipping_type
+						shipping_type: this.shipping_type,
+						remark: this.remark
 					},
 					success: (res) => {
 						console.log(res);

pages/myCenter/index.vue

@@ -7,12 +7,18 @@
 			<view class="myNmae">
 				<view class="myNmaeLeft"> 
 					<view class="myNmaeImg">
-						<image src=""></image>
+						<image :src="userInfo.avatarUrl"></image>
 					</view>
-                    <view>
-						<view style="font-size: 34upx;margin-bottom: 32upx;">用户名</view>
+                    <view v-if="hasLogin">
+						
+						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{userinfo.member_points}}></view>
 					</view>
+					<view v-else>
+						
+						<view  style="font-size: 34upx;margin-bottom: 32upx;">请登录</view>
+						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币***></view>
+					</view>
 				</view>
 					<view class="myNmaeRight" @click="writeday" v-if="userinfo.has_sign == 0">每日签到></view>
 					<view class="myNmaeRight" v-if="userinfo.has_sign == 1">已签到></view>
@@ -22,23 +28,23 @@
 	    <view class="myorder">
 			<view class="orderList">
 				<view class="orderOne"  @click="gomyorder(1)">
-					<image class="imagewidth" src=""></image>
+					<image class="imagewidth" src="../../static/order_wat_pay.png" ></image>
 					<view>待付款</view>
 				</view>
 				<view class="orderOne"  @click="gomyorder(2)">
-					<image class="imagewidth" src=""></image>
+					<image class="imagewidth" src="../../static/order_handle.png"></image>
 					<view>处理中</view>
 				</view>
 				<view class="orderOne"  @click="gomyorder(3)">
-					<image class="imagewidth" src=""></image>
+					<image class="imagewidth" src="../../static/order_comment.png"></image>
 					<view>带评价</view>
 				</view>
 				<view class="orderOne"  @click="gomyorder(4)">
-					<image class="imagewidth" src=""></image>
+					<image class="imagewidth"  src="../../static/order_cancel.png"></image>
 					<view>已取消</view>
 				</view>
 				<view class="orderOne"  @click="gomyorder(5)">
-					<image class="imagewidth" src=""></image>
+					<image class="imagewidth" src="../../static/order_wat_pay.png"></image>
 					<view>退款/售后</view>
 				</view>
 			</view>
@@ -48,70 +54,68 @@
 		<van-cell  @click="goAdress(0)" title="圈在网代理" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
-				margin-right: 8upx;
-				vertical-align:middle"
-				src="" />
+				  margin-right: 8upx;
+				  vertical-align:middle"
+				 src="../../static/hotel.jpg"  />
 			</template>
 		</van-cell>
 		
 		<van-cell  @click="goAdress(2)" title="圈在网入驻" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../image/hotel.jpg" />
 			</template>
 		</van-cell>
 		
 		<van-cell  @click="goAdress(3)" title="圈币明细" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
+			
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../static/exchange.png" />
 			</template>
 		</van-cell>
 		
 		<van-cell  @click="goAdress(1)" title="我的地址" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
+			
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../static/local.png" />
 			</template>
 		</van-cell>
 		
 		<van-cell @click="goAdress(9)"   title="我的收藏" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
+			
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../static/favorite.png" />
 			</template>
 		</van-cell>
 		
 		<van-cell @click="goAdress(8)"  title="意见反馈" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
+				
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../static/service.png" />
 			</template>
 		</van-cell>
 		
 		<van-cell  @click="goAdress(7)"  title="商务合作" is-link>
 			<template slot="icon">
 				<image style="width: 29upx;height: 29upx;
-				background-color: #007AFF;
+				
 				margin-right: 8upx;
 				vertical-align:middle"
-				src="" />
+				src="../../static/setting.png" />
 			</template>
 		</van-cell>
 		
@@ -148,6 +152,8 @@
 			]),
 		},
 		onLoad() {
+			console.log(this.userInfo);
+			console.log(this.hasLogin);
 			if(this.hasLogin) {
 				this.getuserinfo();
 		  	}else {
@@ -177,7 +183,7 @@
 			gomyorder(e) {
 				if(this.hasLogin) {
 					if(e == 0) {
-						uni.navigateTo({
+						 ({
 							url: '/pages/myOrder/index'
 						})
 					}else if(e == 1) {

pages/myCenter/logion.vue

@@ -47,6 +47,7 @@
 				let  that = this;
 				    uni.getUserInfo({
 					     success(res) {
+							 console.log(res.userInfo);
 							 that.login(res.userInfo);
 							 that.showDialog(true); // 改变haslogion的值
 						//	 that.$emit('confirmDiaolog');

pages/myOrder/estimate.vue

@@ -5,18 +5,19 @@
 			<van-rate
 			  :value="valueNumber"
 			  :size="20"
-			  void-color="#ee0a24"
+			  void-color="#eee"
 			  void-icon="star"
-			  color="#eee"
+			  color="#ee0a24"
+			  @change="changestar"
 			/>
 		</view>
 		 <TextArea :tips="tips" @submitValue="submitValue"/>	
 		<view>
 			<view>添加图片(最多3张)</view>
-			<uploadImage />	
+			<uploadImage @getImg="getImg" />	
 				
 		</view>
-		<view class="submitRemin">提交</view>
+		<view class="submitRemin" @click="submitRemin">提交</view>
 	</view>
 </template>
 
@@ -30,25 +31,61 @@
 		},
 		data() {
 			return{
+				order_id:'',
 				valueNumber: 0,
-				imageList:[],
+				imageList:'',
 				size: 25,
 				goodComment:'',
-				
 				tips: '五星好评超过20个字就有机会获得积分'
 			}
 		},
 		onUnload() {
 			   
+		},
+		onLoad(e) {
+			this.order_id = e.order_id;
+			
 		},
 		methods: {
+			changestar(e) {
+				this.valueNumber = e.detail;
+			},
+			getImg(e) {
+				console.log(e);
+				this.imageList = e.join(',');
+			},
 			submitValue(e) {
 				this.goodComment = e.detail.value;
 			},
-			
-			previewImage() {
-				
+			submitRemin() {
+				if(this.valueNumber == 0) {
+					this.$msg("请完成星级评价");
+					return;
+					
+				}else if(this.goodComment == '') {
+					this.$msg("请填写反馈内容");
+					return;
+				}else {
+					this.request({
+						url: '/v2/order/evaluate',
+						method: 'post',
+						data: {
+							order_id: this.order_id,
+							score:　this.valueNumber,
+							content:　this.goodComment,
+							img_list:　this.imageList
+						},
+							
+						success: (res) => {
+							uni.$emit('finshesitmate');
+							setTimeout(()=> {
+								uni.navigateBack()
+							}, 2000)
+						}
+					})
+				}
 			}
+			
 		}
 	}
 </script>

pages/myOrder/finsh.vue

@@ -0,0 +1,42 @@
+<template>
+	<view style="padding: 0 36upx;">
+		<view  style="text-align: center;margin: 0 auto;padding: 10upx 0;">
+		<van-icon  color="#eee;" size="88px" name="passed" />
+		</view>
+		<view  style="text-align: center;padding: 10upx 0;">订单支付成功</view>
+		<view  class="submitRemin"  @click="lookfor" style="background-color: #fff;color:#303133;border: 1px solid #D9332E;">查看订单详情</view>
+		<view  class="submitRemin" @click="submitRemin">继续购物</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return{
+				order_id:''
+			}
+		},
+		onLoad(e) {
+			this.order_id = e.order_id;
+		},
+		methods:{
+			// ji xu gou wu
+			submitRemin() {
+				uni.navigateBack({
+				    delta: 2
+				});
+			},
+			// cha kan ding dan xiang qing 
+			lookfor() {
+				let order_id = this.order_id ;
+				uni.navigateTo({
+				        url: `/pages/myOrder/order?id=${order_id}`
+				});
+			}
+		}
+		
+	}
+</script>
+
+<style>
+</style>

pages/myOrder/index.vue

@@ -23,8 +23,8 @@
 					title-class="changewidth"
 					price-class ="priceClass"
 					:price="item.order_amount"
-					:desc="items.goods_name.split(' ')[1]+'X'+items.goods_num"
-					:title="items.goods_name.split(' ')[0]"
+					:desc="items.descire+'X'+items.goods_num"
+					:title="items.desarray"
 					:thumb="pictureUrl + '/uploads/home/store/goods/'+items.goods_image.substr(0, items.goods_image.indexOf('\_')) + '/' + items.goods_image"
 				  >
 				  </van-card>
@@ -57,6 +57,7 @@
 					<span style="color: #F76260;" @click="gotologion">去登录吧</span></view>
 			  </view>
 		</view>
+		<!-- 催单 -->
 		<Dialog  :orderCancel="orderCancel"
 		    :titles="titles"
 		    @colseDialog="cancelDialog" 
@@ -92,6 +93,7 @@
 					{name:'已取消'},
 					{name:'退款售后'}
 				],
+				deleteorder: 0, // 判断删除订单还是确认收货
 				// 要查找的订单状态 all-全部 waiting-待支付 payed-处理中 complete-已收货 cancel-已取消 refund-退款售后
 				active: 0,
 				scrollTop: 0,
@@ -112,9 +114,15 @@
 			]),
 		},
 		onLoad(a) {
-			uni.$emit("refehlist",()=>{
+			 uni.$on("refehlist",()=>{
+				  this.order_list = [];
 			      this.getlist();
 			  })
+			  // 完成评价  完成支付
+			  uni.$on("finshesitmate",()=>{
+				   this.order_list = [];
+			       this.getlist();
+			   })
 			if(this.hasLogin) {
 				console.log(a);
 				this.getlist(); // 获取订单
@@ -160,6 +168,7 @@
 					  console.log(e);
 					  this.active = e.target.name;
 					  this.page = 1;
+					  this.order_list = [];
 					  if(e.target.name == 0) {
 						this.state = 'all';
 					  }else if(e.target.name == 1) {
@@ -194,7 +203,19 @@
 						if(res.data.data.order_list.length< 10) {
 							this.ispull = false;
 						}
+						res.data.data.order_list.forEach((item,index) => {
+							item.goods.forEach(items => {
+								let arr = items.goods_name.split(' ');
+								items.desarray = arr[0];
+								items.descire = items.goods_name.replace(arr[0], '');
+							})
+						})
+						console.log(res.data.data.order_list)
+						// let arr = item.goods_name.split(' ');
+						// item.desarray = arr[0];
+						// item.descire = arr.replace(arr[0], '');
 						this.order_list = this.order_list.concat(res.data.data.order_list);
+						
 					}
 				})
 			},
@@ -203,27 +224,51 @@
 				let prices = e.order_amount;
 				this.order_id = e.order_id;
 				let order_id = e.order_id;
+			
 				if(e.operate == '去付款') {
 					uni.navigateTo({
-							url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
+				      url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
 				    })
 				}else if(e.operate == '删除') {
 					this.titles = '确认删除订单？'
+					this.deleteorder = 1;
+					this.orderCancel = true;
+				}else if(e.operate == '催单') {
+					let a = 1;
+					uni.navigateTo({
+							url:`/pages/myOrder/reminder?order_id=${order_id}&a=${a}`
+					})
+				}else if(e.operate == '确认收货') {
+					this.deleteorder = 2;
+					this.titles = '确认收货？'
 					this.orderCancel = true;
+				}else if(e.operate == '去评价') {
+					uni.navigateTo({
+							url:`/pages/myOrder/estimate?order_id=${order_id}`
+					})
+					
+				}else if(e.operate == '联系酒店') {
+					let a = 2;
+					uni.navigateTo({
+							url:`/pages/myOrder/reminder?order_id=${order_id}&a=${a}`
+					})
 				}
 			},
 			cancelDialog() {
 				this.orderCancel = false;
 			},
 			confirmOrder() {
+				// 删除订单 确认收货
 				this.orderCancel = false;
+				let url = this.deleteorder == 1?'/v2/order/drop':'/v2/order/confirm';
 				this.request({
-					url:'/v2/order/drop',
+					url: url,
 					method:'POST',
 					data: {
 						order_id: this.order_id
 					},
 					success: (res) => {
+						this.order_list = [];
 						this.getlist();
 					}
 				})

pages/myOrder/order.vue

@@ -158,8 +158,12 @@
 			goPay() {
 				let prices = this.detail.order_amount;
 				let order_id = this.id;
+				let isform = 1;
+			
+				return;
 				uni.navigateTo({
-					url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
+					url:`/pages/myOrder/paymoment?order_id=${order_id}
+					&prices=${prices}&isform=${isform}`
 				})
 			},
 			

pages/myOrder/paymoment.vue

@@ -18,7 +18,8 @@
 		     </van-cell>
 		   </van-cell-group>
 		 </van-radio-group>
-		 <view class="payMoney" @click="payMoney">支付({{prices}})</view>
+		 <view class="payMoney" @click="payMoney" v-if="radio ==  1">支付(圈币{{prices*ratio_points}})</view>
+		 <view class="payMoney" @click="payMoney"  v-if="radio == 0">支付(￥{{prices}})</view>
 		 <Dialog  :orderCancel="orderCancel"
 		     :titles="titles"
 			 :values="values"
@@ -45,17 +46,58 @@
 				],
 				radio: 0,
 				prices: '',
-				order_id:''
+				order_id:'',
+				isform: 0,
+				ratio_points: 2,
 			}
 		},
 		onLoad(e) {
+			console.log(e);
 			this.prices = e.prices;
 			this.order_id = e.order_id;
+			this.getuserInfo();
+			//this.ratio_points = e.ratio_points;
+			// this.isform = e.isform;  // 1 dingdanfukuanguolai
+			// if(this.ratio_points > 0) {
+			// 	this.list = [
+			// 		{title:'微信支付'},
+			// 		{title:'圈币支付'}
+			// 	];
+			// }else {
+			// 	this.list = [
+			// 		{title:'微信支付'}
+					
+			// 	];
+			// }
 		},
 		methods: {
+			//获取用户信息
+			getuserInfo() {
+				this.request({
+					url: '/v2/member/info',
+					method:'post',
+					success: (res) => {
+						this.ratio_points = res.data.data.ratio_points;
+						console.log(this.ratio_points);
+						if(this.ratio_points > 0) {
+							this.list = [
+								{title:'微信支付'},
+								{title:'圈币支付'}
+							];
+						}else {
+							this.list = [
+								{title:'微信支付'}
+								
+							];
+						}
+					}
+				})
+			},
+			// 圈币取消支付
 			cancelDialog() {
 				this.orderCancel = false;
 			},
+			// 圈币确定支付
 			confirmOrder() {
 				this.orderCancel = false;
 				this.request({
@@ -67,7 +109,13 @@
 					},
 					success: (res) => {
 						console.log(res);
-						
+						//uni.$emit('finshesitmate');
+						setTimeout(()=> {
+							uni.navigateTo({
+								url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
+							})
+							//uni.navigateBack()
+						}, 2000)
 					}
 				})
 			},
@@ -83,18 +131,19 @@
 						method: 'post',
 						data: {
 							pay_code: 'wx',
+							type: 1,
 							order_id: this.order_id
 						},
 						success:(res) => {
 							let { wx } = res.data.data;
-							console.log('prepay_id='+wx.prepayid,)
+							console.log(wx)
 							uni.requestPayment({
 								    provider: 'wxpay',
-								    timeStamp: wx.timestamp,
-								    nonceStr: wx.noncestr,
-								    package:  'prepay_id='+wx.prepayid,
+								    timeStamp: wx.timeStamp,
+								    nonceStr: wx.nonceStr,
+								    package:  wx.package,
 								    signType: 'MD5',
-								    paySign: wx.sign,
+								    paySign: wx.paySign,
 								    success: function (res) {
 								        console.log('success:' + JSON.stringify(res));
 								    },
@@ -106,7 +155,7 @@
 					})
 				}else {
 					this.titles = "圈币支付";
-					this.values = "使用圈币支付"+this.prices;
+					this.values = "使用圈币支付"+this.prices*this.ratio_points;
 					this.orderCancel = true;
 					// 圈币支付
 					// this.request({

pages/myOrder/reminder.vue

@@ -14,7 +14,23 @@
 		},
 		data() {
 			return{
-				reminder: ''
+				reminder: '',
+				order_id:''
+			}
+		},
+		onLoad(e) {
+			this.order_id = e.order_id;
+			let a = e.a;
+			console.log(a);
+			if(a == 1) {
+				uni.setNavigationBarTitle({
+				    title: '催单'
+				});
+				
+			}else if(a == 2) {
+				uni.setNavigationBarTitle({
+				    title: '联系酒店'
+				});
 			}
 		},
 		methods: {
@@ -22,9 +38,27 @@
 				this.reminder = e.detail.value;
 			},
 			submitRemin() {
-			   console.log(this.reminder)
-			   // console.log(this.$refs.getValue)
-			   // this.$refs.getValue.$emit('bindTextAreaBlur');
+			   if(this.reminder == '') {
+				   this.$msg("请填写催单内容");
+				   return;
+			   }
+			   this.request({
+				   url: '/v1/order/urge',
+				   method:'post',
+				   data: {
+					   order_id: this.order_id,
+					   content: this.reminder
+				   },
+				   success:(res) => {
+					   if(res.data.code == 1000) {
+						   this.$msg("催单成功");
+						   setTimeout(() => {
+							  uni.navigateBack();
+						   }, 2000)
+						 
+					   }
+ 				   }
+			   })
 			}
 		}
 	}

static/loading.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1561979733316" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2180" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M40.812571 448.219429l69.978286 34.130285A408.034286 408.034286 0 0 0 109.714286 511.998857c0 222.176 180.108571 402.285714 402.285714 402.285714 104.082286 0 198.932571-39.526857 270.357714-104.388571l69.940572 34.112C765.957714 932.491429 645.394286 987.427429 512 987.427429c-262.571429 0-475.428571-212.857143-475.428571-475.428572 0-21.627429 1.444571-42.916571 4.241142-63.779428z m101.580572-235.281143C229.556571 105.348571 362.746286 36.571429 512 36.571429c262.571429 0 475.428571 212.857143 475.428571 475.428571 0 36.854857-4.193143 72.730286-12.129142 107.173714l-67.822858-33.078857C911.947429 562.078857 914.285714 537.312 914.285714 512c0-222.176-180.108571-402.285714-402.285714-402.285714-120.201143 0-228.089143 52.717714-301.804571 136.293714l-67.803429-33.069714z" p-id="2181" fill="#d9251c"></path></svg>