diff --git a/App.vue b/App.vue
index 6712ddf..28f6b40 100644
--- a/App.vue
+++ b/App.vue
@@ -12,14 +12,14 @@ export default {
 
     // 分享注册
     const whiteList = [
-      'pages/shareRegist/index',
-      'pages/shareRegist/success',
+      // 'pages/shareRegist/index',
+      // 'pages/shareRegist/success',
       'pages/login/index',
-      'pages/wechatPay/bfPay/',
-      'pages/wechatPay/hfPay/',
-      'pages/shareArea/hiList',
-      'pages/shareArea/hiOrder',
-      'pages/pay/hiPay'
+      // 'pages/wechatPay/bfPay/',
+      // 'pages/wechatPay/hfPay/',
+      // 'pages/shareArea/hiList',
+      // 'pages/shareArea/hiOrder',
+      // 'pages/pay/hiPay'
     ]
     if (whiteList.indexOf(url) !== -1) {
     } else {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index a9622eb..468180b 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -23,24 +23,34 @@
               <!-- <view class="kuang">
 						    								{{userInfo.pkAwardsVal}}
 						    							</view> -->
-              <view class="btom_inder">
+              <!-- <view class="btom_inder">
                 <view class="jxbox">
-                  <!-- <image
+                  
+                  <image
                     class="jximg"
                     @click="goRoad(1)"
                     :src="userInfo.gradeIcon"
                     mode=""
-                  ></image> -->
+                  ></image>
                 </view>
-                <!-- <view class="jxbox">
+                <view class="jxbox">
 									<image class="jximg" @click="goRoad(2)" :src="userInfo.awardsIcon" mode=""></image>
-								</view> -->
+								</view>
+              </view> -->
+              <view class="grade_left">
+                <view class="gra_left1" v-if="userData.registerAuthority">
+                  <image
+                    class="gra_icon"
+                    src="@/static/images/fw_icon.png"
+                    mode=""
+                  ></image>
+                  <view class="">
+                    {{ userData.registerAuthorityVal }}
+                  </view>
+                </view>
               </view>
             </view>
-            <view class="cmem">
-              <view class="tTit2"
-                >{{ '结算等级' }}:{{ userInfo.pkGradeVal }}</view
-              >
+            <!-- <view class="cmem">
               <view class="grade_left">
                 <view class="gra_left1" v-if="userData.registerAuthority">
                   <image
@@ -63,7 +73,7 @@
                   </view>
                 </view>
               </view>
-            </view>
+            </view> -->
           </view>
         </view>
         <view class="top_right" @click="goTo('/pages/userData/index')">
@@ -86,13 +96,17 @@
         <view class="jxTit1">{{ awardsList.maxAwardsName }}</view>
       </view>
       <view class="jxTit">
+        <view>{{ '结算等级' }}</view>
+        <view class="jxTit1">{{ userInfo.pkGradeVal }}</view>
+      </view>
+      <!-- <view class="jxTit">
         <view>{{ '上月奖衔' }}</view>
         <view class="jxTit1">{{ awardsList.awardsName }}</view>
-      </view>
-      <view class="jxTit" v-if="awardsList.historyAwards">
+      </view> -->
+      <!-- <view class="jxTit" v-if="awardsList.historyAwards">
         <view>{{ '历史荣誉' }}</view>
         <view class="yt1">{{ awardsList.historyAwards }} </view>
-      </view>
+      </view> -->
     </view>
     <view class="ju_grade" v-if="!ifSpecial">
       <!-- <view class="ju_title">
@@ -1185,7 +1199,7 @@ export default {
       font-size: 12px;
       color: #fb3024;
       font-weight: 400;
-      margin-left: 20rpx;
+      // margin-left: 20rpx;
       .gra_left1 {
         background: #ffffff;
         border: 1rpx solid #ffffff;
@@ -1201,9 +1215,9 @@ export default {
           margin-right: 6rpx;
         }
       }
-      .gra_left1:last-child {
-        margin-left: 20rpx;
-      }
+      // .gra_left1:last-child {
+      //   margin-left: 20rpx;
+      // }
     }
 
     .grade_flex {
diff --git a/pages/mine/order/index.vue b/pages/mine/order/index.vue
index 31d8ddb..8ef58c7 100644
--- a/pages/mine/order/index.vue
+++ b/pages/mine/order/index.vue
@@ -10,36 +10,27 @@
     <view class="index_header">
       <view>{{'我的订单'}}</view>
     </view>
-    <view class="shareImg"
-          @click="rightOpen">
-      <img src="@/static/images/serach_999.png"
-           alt="">
+    <!-- <view class="clearFilter" @click="clearFilter">
+      清除筛选
+    </view> -->
+    <view 
+      class="shareImg"
+      @click="rightOpen"
+    >
+      <img 
+        src="@/static/images/serach_999.png"
+        alt=""
+      />
     </view>
     <view class="zhan1"></view>
     <view class="con_top">
-      <!-- <view class="seach">
-                    <view class="seach_i" @tap="goSeach">
-                        <u--input prefixIcon="search" v-model="select.queryStr" prefixIconStyle="font-size: 22px;color: #909399;height:32px" border="none" placeholder="请输入关键字" suffixIconStyle="color: #909399"></u--input>
-                    </view>
-                    <view class="seatch_r" @click="getDataList">
-                        <u-icon name="search" size="22" color="#fff"></u-icon>
-                    </view>
-                </view> -->
-      <!-- 日期区间 -->
-      <!-- <view class="timeSlide">
-                    <view class="timeA">{{'日期区间'}}</view>
-                    <view class="timeB" @click="openDate(0)">{{ select.creationTimeStart?select.creationTimeStart:'开始时间' }}</view>
-                    <view class="timeA">{{'至'}}</view>
-                    <view class="timeB" @click="openDate(1)">{{ select.creationTimeEnd?select.creationTimeEnd:'结束时间' }}</view>
-                </view>
-                <view class="hui"></view> -->
       <view class="tab">
         <view v-for="(item, index) in orderStatusList"
               :key="index"
               @click="isTab = item.value"
               class="tab_i">
           <view>{{ item.label }}</view>
-          <view :class="[isTab===item.value?'heng':'heng1']">
+          <view :class="isTab===item.value?'heng':'heng1'">
           </view>
         </view>
       </view>
@@ -48,6 +39,7 @@
     <view class="zhan"></view>
 
     <view v-for="(item, index) in orderLists"
+          :key="index"
           class="orderList_i">
       <view @click.stop="getDetails(item)">
         <view class="disFlex atm just mbt10">
@@ -508,6 +500,7 @@ export default {
     getDataList(index) {
       if (index) {
         this.queryParams.pageNum = 1
+        this.orderLists = []
       }
       this.rightShow = false
       api
@@ -546,6 +539,14 @@ export default {
     height: 40rpx;
   }
 }
+.clearFilter {
+  position: fixed;
+  top: 28rpx;
+  right: 90rpx;
+  z-index: 1000000000;
+  color: #999;
+  font-size: 28rpx;
+}
 
 .zhan1 {
   height: 50px;
diff --git a/pages/userData/index.vue b/pages/userData/index.vue
index 8804a2c..f2e2a97 100644
--- a/pages/userData/index.vue
+++ b/pages/userData/index.vue
@@ -33,18 +33,18 @@
 		  </view>
 	  </view>
 	  <view class="content">
-	  		  <view class="index-view tops">
-	  			  <view class="user-name">{{'真实姓名'}}</view>
-	  			   <view class="user-right">
-	  						{{userInfo.memberName}}
-	  			   </view>
-	  		  </view>
-	  		  <view class="index-view">
-	  				  <view class="user-name">{{'会员编号'}}</view>
-	  				   <view class="user-right">
-	  							{{userInfo.memberCode}}
-	  				   </view>
-	  		  </view>
+				<view class="index-view tops">
+					<view class="user-name">{{'真实姓名'}}</view>
+						<view class="user-right">
+							{{userInfo.memberName}}
+						</view>
+				</view>
+				<view class="index-view">
+						<view class="user-name">{{'会员编号'}}</view>
+							<view class="user-right">
+								{{userInfo.memberCode}}
+							</view>
+				</view>
 			  <view class="index-view">
 				  <view class="user-name">
             {{'联系方式'}}</view>
@@ -91,11 +91,11 @@
 					   </view>
 			  </view> -->
 			  <view class="index-view">
-					  <view class="user-name">{{'真实奖衔'}}</view>
-					   <view class="user-right">
-								{{userInfo.awardsVal}}
-					   </view>
-			  </view>
+					<view class="user-name">{{'真实奖衔'}}</view>
+						<view class="user-right">
+							{{userInfo.awardsVal}}
+						</view>
+			  	</view>
 			  <view class="index-view">
 					  <view class="user-name">荣誉奖衔</view>
 					   <view class="user-right">
@@ -139,27 +139,30 @@
 				   </view>
 			  </view>
 	  </view>
-	  <u-button type="success"
+	  <!-- <u-button type="success"
 	            shape="circle"
 	            class="btn"
 				@click="submit"
 	        >{{'保存'}}</u-button>
-			<view style="height: 20rpx;"></view>
-      <u-popup :show="downShow"
-             mode="bottom"
-             closeOnClickOverlay
-             closeable
-             round="10"
-             @close="close">
-      <view class="title">修改昵称</view>
-      <view class="kung">
-        <u--input
-        :maxlength="40"
-    placeholder="请输入内容"
-    v-model="userInfo.nickName"
-  ></u--input>
-      </view>
-        <u-button @click="submit" type="error" text="确定"></u-button>
+			<view style="height: 20rpx;"></view> -->
+      <u-popup 
+				:show="downShow"
+				mode="bottom"
+				closeOnClickOverlay
+				closeable
+				round="10"
+				@close="close"
+			>
+				<view class="title">修改昵称</view>
+				<view class="kung">
+					<u--input
+						:maxlength="40"
+						placeholder="请输入昵称"
+						v-model="userInfo.nickName"
+					>
+					</u--input>
+				</view>
+				<u-button :disabled="!userInfo.nickName" class="btn" @click="submit" type="error" text="确 定"></u-button>
     </u-popup>
   </view>
 </template>
@@ -211,22 +214,22 @@ export default {
 	  					});
 	  				},
 	  				fail: err => {
-	  					this.myToast('上传失败', 'none');
+	  					uni.$u.toast('上传失败', 'none');
 	  				}
 	  			});
 	  		},
 	  submit() {
-		 api.updateData({
-			  nickName: this.userInfo.nickName,
-		 }).then((res)=>{
-			  uni.showToast({
-				 title: res.msg,
-				 icon:	 'none',
-				 duration: 1500,
-			 })
-			 this.getInfo()
-       this.close()
-		 }) 
+			api.updateData({
+				nickName: this.userInfo.nickName,
+			}).then((res)=>{
+				uni.showToast({
+					title: res.msg,
+					icon:	 'none',
+					duration: 1500,
+				})
+				this.getInfo()
+				this.close()
+			}) 
 	  },
 	  // upload() {
 		 //  let that = this