细节调整

common/request.js

@@ -3,8 +3,8 @@ const request = function(options) {
      options.url = baseUrl + options.url;
      try {
        // 获取放入缓存的字段token obj.header["token"] = userToken;
-       const token = uni.getStorageSync('sessionId');
-	   //const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MTI0MDg5NiwiZXhwIjoxNTkyMTA0ODk2LCJuYmYiOjE1OTEyNDA4OTYsInN1YiI6MTAwLCJwcnYiOiJlOWEzOWM4YWY2MDFmMjRjM2YwN2Y0NDYzMjJhNTZjODA1YzVjZGU2In0.gJTUiEVvMtHv8GGzUWZO_OSsG0hSrJ4sQDdCrtqQcTM';
+      //const token = uni.getStorageSync('sessionId');
+	   const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MTI0MDg5NiwiZXhwIjoxNTkyMTA0ODk2LCJuYmYiOjE1OTEyNDA4OTYsInN1YiI6MTAwLCJwcnYiOiJlOWEzOWM4YWY2MDFmMjRjM2YwN2Y0NDYzMjJhNTZjODA1YzVjZGU2In0.gJTUiEVvMtHv8GGzUWZO_OSsG0hSrJ4sQDdCrtqQcTM';
        if (token) { // 如果存在token 配置请求头
          options.header = {
            'X-TOKEN' : token,

pages/index/commemt.vue

@@ -24,6 +24,9 @@
 					</view>
 				</view>
 				<view style="color: #303133;font-size: 28upx;" class="uni-comment-content">{{item.geval_content}}</view>
+				<view>
+					<image  v-for="(items, index) in item.images"   :key="index" :src="items" style="width: 100upx;height: 100upx;float:left;"></image>
+				</view>
 			</view>
 		</view>
 		<view style="text-align: center;" v-if="assesslist.length == 0">
@@ -59,7 +62,12 @@
 						goodsid: this.goodId
 					},
 					success: (res) => {
+						console.log(res.data);
+						res.data.forEach(item => {
+							item.images = item.geval_image.split(',');
+						})
 						this.assesslist = res.data;
+						console.log(this.assesslist)
 					}
 				})
 			}

pages/index/index.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="content">
+	<view style="postion: fixed;top:0;">
 	 <uniNavBar class="top"  :shadow="false"  :fixed="false" color="#333333" background-color="#FFFFFF">
 	 	<block  style="width: 70%;padding-left: 32upx;" slot="left">
 	 		<view class="city" v-if="!allow">
-	 			<view style="font-size: 35upx;">{{ location }}</view>
+	 			<view style="font-size: 35upx;">
+				  <image @click="refeshadress" v-if="isrefesh" src="../../static/address.png" style="width: 50rpx;height: 50rpx;vertical-align: middle;padding-right:10upx;" ></image>
+				  <image @click="refeshadress"  v-if="!isrefesh" src="../../static/home_local2.png" style="width: 50rpx;height: 50rpx;vertical-align: middle;padding-right:10upx;" ></image>
+				  {{ location }}
+				</view>
 	 		</view>
 			<button plain="true" style="border: none;" 
 			  v-if="allow" @opensetting='handler'
@@ -24,6 +29,10 @@
 		 	<input confirm-type="search" class="input" type="text" placeholder="搜索您入住的酒店" disabled="true" />
 		 </view>
 	 </view>
+	 </view>
+	 <scroll-view  class="floor-list" style="height: 95vh;" 
+	  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+	  :refresher-enabled="false">
 	 <view  class="scrollswiper">
 		 <swiper class="swiper" 
 		  indicator-dots circular=true
@@ -43,9 +52,7 @@
 		 在附近酒店找到您入住的酒店
 	 </view>
 	 <view style="border-bottom: 2upx solid #EEEEEE;width: 100%;margin-bottom: 24upx 0;"></view>
-	<scroll-view  class="floor-list"
-	 :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-	 :refresher-enabled="false">
+	
 	<view v-if="!allow">
      <view class="hotelList" v-for='(item,index) in hotelist' :key="index" @click="openinfo(item)">
 		 <view class="hotleLeft">					
@@ -95,6 +102,7 @@
 		},
 		data() {
 			return {
+				isrefesh: true,
 				lat:'', // 经度
 				lot: '', // 维度
 				ishow: true,
@@ -178,6 +186,11 @@
 		},
 		methods: {
 			...mapMutations(['login','showDialog']),
+			// 刷星定位
+			refeshadress() {
+				this.isrefesh = false;
+				this.getRegeo();
+			},
 			intToFloat(val) {
 			    // body...
 			    return new Number(val).toFixed(1);
@@ -313,11 +326,12 @@
 		    getRegeo(){  //获取地理位置
 			 let _this=this;
 			 uni.showLoading({  
-				title: '获取信息中'  
+				title: '获取位置中'  
 			}); 
 			_this.amapPlugin.getRegeo({  
 				success: (data) => {
 					console.log(data);
+					this.isrefesh = true;
 					this.location = data[0].name;
 					this.lat = data[0].latitude; // 经度
 					this.lot = data[0].longitude; // 纬度

pages/myCenter/definite.vue

@@ -6,7 +6,7 @@
 		</view>
 		<van-cell v-for="(item,index) in point_list" :key="index" use-label-slot :title="'圈币来源:'+item.pl_desc" >
 			<template>
-				+{{item.pl_points}}
+				{{item.pl_stage == "payment" ? "-" : "+"}}{{item.pl_points}}
 			</template>
 			<template slot="label">
 				{{item.pl_addtime}}

pages/myCenter/index.vue

@@ -10,7 +10,7 @@
 						<image :src="userInfo.avatarUrl"></image>
 					</view>
                     <view v-if="successlogion&&hasLogin">
-						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
+						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{menberinfo.member_name}}</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{menberinfo.member_points}}></view>
 					</view>
 					

pages/myOrder/order.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="cart-list">
-       <view style="padding: 0 36upx;line-height: 70upx;border-bottom: 14upx solid #F5F5F5;">
+       <view style="padding: 0 36upx;line-height: 70upx;
+	   border-bottom: 14upx solid #F5F5F5;
+	   border-top: 1px solid #F5F5F5;"
+	   >
 		 <!--  <span v-if="detail.order_state == 10">未付款</span>
 		   <span v-if="detail.order_state == 0">已取消</span>
 		   <span v-if="detail.order_state == 20">待发货</span>  
@@ -41,14 +44,12 @@
 				  <view class="retungood" v-if="detail.status=='已收货' && items.status == 4" @click="goreturndetail(items.or_id)">退款成功</view>
 				  <view class="retungood" v-if="detail.status=='已收货' && items.status ==3" @click="goreturndetail(items.or_id)">退款申请中</view>
 			  </view>
-			 
 	 </view>
-	 
 	 <view class="topTip">
+		  <view style="padding-right: 20upx;">运费: {{detail.shipping_fee}}</view>
 		  <view style="font-size: 28upx;">合计：{{detail.order_amount}}</view>
-		  <view style="padding-left: 20upx;">运费: {{detail.shipping_fee}}</view>
 	 </view>
-	 <view style="padding: 15upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
+	 <view style="padding: 18upx 36upx;">订单编号:<text class="orderCode">{{detail.order_sn}}</text></view>
 	 <view class="adressbottom">
 		 <view>下单时间: <text  style="font-weight: 500;" class="time">{{detail.add_time}}</text></view> 
 		 <view>支付订单: 
@@ -69,17 +70,21 @@
 		<view  class="buttonStatus">
 		<!-- 	<view>{{detail.operate}}</view> -->
 			<!-- <view v-if="detail.order_state == 0 " @click="cancelOrder(2)" class="deleteOrder">删除订单</view> -->
-			<view @click="reminder"  v-if="detail.order_state == 20" class="deleteOrder">催单</view>
+			<view @click="reminder(1)"  v-if="detail.order_state == 20&&detail.shipping_type==0" class="deleteOrder">催单</view>
+			<view @click="reminder(2)"  v-if="detail.order_state == 20&&detail.shipping_type==1" class="deleteOrder">联系酒店</view>
 			<view @click="cancelOrder(1)" v-if="detail.order_state == 10" class="deleteOrder">取消订单</view>
 			<view class="payOrder" v-if="detail.order_state == 10" @click="goPay">去付款</view>
 			<!-- detail.order_state == 40 && detail.refund_state == 0 -->
 			<view v-if=" detail.status == '已发货'" @click="cancelOrder(3)" class="deleteOrder">确认收货</view>
 			<!-- <view v-if=" detail.status == '已收货'"  evaluation_state  class="deleteOrder">退货退款</view> -->
 			<view v-if=" detail.status == '已收货' && detail.evaluation_state == 0 || detail.status == '已完成' && detail.evaluation_state == 0 " @click="estimate" class="deleteOrder">去评价</view>
-			<view v-if=" detail.status == '已完成' && detail.evaluation_state == 1 || detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
+			<view v-if=" detail.order_state == 40 && detail.evaluation_state == 1 || detail.status == '已取消'" @click="cancelOrder(2)" class="deleteOrder">删除订单</view>
 		</view>
 		<!-- <view v-else>
-			<view v-if="detail.refund_state == 2">删除订单</view>
+			<view v-if="detail.refund_state == 2">
+			ji
+			
+			删除订单</view>
 		</view> -->
 	 </view>
 	<Dialog  :orderCancel="orderCancel" 
@@ -249,10 +254,11 @@
 			},
 			
 			// 催单
-			reminder() {
+			reminder(e) {
+			   let a = e;
 			   let order_id = this.id;
 				uni.navigateTo({
-					url: `/pages/myOrder/reminder?order_id=${order_id}`
+					url: `/pages/myOrder/reminder?order_id=${order_id}&a=${a}`
 				})
 			},
 		    
@@ -299,6 +305,7 @@
 	}
 	.shoplist {
 		padding: 10upx 32upx;
+		border-bottom:1px solid #F5F5F5;
 		// display: flex;
 		// justify-content: space-between;
 		// align-items: center;