样式的修改

pages/address/AddAddress.vue

@@ -53,6 +53,7 @@
 	export default {
 		data(){
 			return{
+				pageTitle:'收货地址',
 				contentHeight:0,
 				mainColor:'',
 				msg:{
@@ -75,7 +76,9 @@
 		created(){
 			 this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
 			 this.mainColor = this.$uiConfig.mainColor;
-			 
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
 		},
 		onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
 			if(option.u!=undefined){

pages/address/address.vue

@@ -70,6 +70,7 @@ import auth from "../../components/auth/index.vue";
 export default {
   data() {
     return {
+		pageTitle:'收货地址',
       loading: true,
       list: [],
       showAuth: false,
@@ -88,8 +89,22 @@ export default {
 	this.mainColor = this.$uiConfig.mainColor;
 	 
   },
+  mounted() {
+  	let currentPages = getCurrentPages();
+  	 let u = "/" + currentPages[currentPages.length - 1].route;
+  	 let pages = wx.getStorageSync("basedata")
+  	   ? wx.getStorageSync("basedata").bar_title
+  	   : [];
+  	 pages.forEach((x) => {
+  	   if (x.value == u) {
+  	     this.pageTitle = x.new_name ? x.new_name : x.name;
+  	   }
+  	 });
+  	 uni.setNavigationBarTitle({
+  	   title: this.pageTitle,
+  	 });
+  },
   onLoad() {
-    console.log(wx.getStorageSync("basedata"));
     this.u = wx.getStorageSync("userinfo");
     if (!this.u) {
       this.u = {
@@ -190,9 +205,7 @@ export default {
       });
     }
   },
-  mounted() {
-   
-  }
+
 };
 </script>
 

pages/favorite/favorite.vue

@@ -64,6 +64,7 @@
 	export default {
 		data() {
 			return {
+				pageTitle:'我的收藏',
 				loading: true,
 				contentHeight:0,
 				showAuth:false,
@@ -84,6 +85,21 @@
 			 this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
 			 this.init()
 		},
+		mounted() {
+			let currentPages = getCurrentPages();
+			 let u = "/" + currentPages[currentPages.length-1].route;
+			 let pages = wx.getStorageSync("basedata")
+			   ? wx.getStorageSync("basedata").bar_title
+			   : [];
+			 pages.forEach((x) => {
+			   if (x.value == u) {
+			     this.pageTitle = x.new_name ? x.new_name : x.name;
+			   }
+			 });
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
+		},
 		onLoad(){
 			this.u = wx.getStorageSync("userinfo");
 			if (!this.u) {
@@ -185,6 +201,7 @@
 	  margin-bottom: 3px;
 	  font-size: 13px;
 	  margin: 7px 10px;
+	  height: 36px;
 	}
 	.favoriteStyle .u-good-list .good .good-info {
 	  display: flex;

pages/foot/index/index.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view  v-if="g.length > 0"
 		  style="
-				height: calc(100vh - 40px);
+				height: calc(100vh - 50px);
 				width: calc(100vw);
 				overflow: hidden;
 				padding-top: 10px;
@@ -60,14 +60,15 @@
 					</view>
 					
 				</view>
-					
+					<u-divider
+					  contentPosition="center"
+					  v-if="isover"
+					  :margin-top="20"
+					  :margin-bottom="20"
+					  bg-color='#f3f4f6'
+					>没有更多足迹了</u-divider>
 				</scroll-view>
-			<u-divider
-			  contentPosition="center"
-			  v-if="isover"
-			  :margin-top="20"
-			  :margin-bottom="20"
-			>没有更多商品了</u-divider>
+			
 		</view>
 		<!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> -->
 		<view class="loading" v-show="loading">
@@ -128,6 +129,7 @@
 	export default {
 		data() {
 			return {
+				pageTitle:"我的足迹",
 				isloading:true,
 				loading:false,
 				loading2:false,
@@ -165,6 +167,21 @@
 			  this.fun_date(0)
 			 
 		},
+		mounted() {
+			let currentPages = getCurrentPages();
+			 let u = "/" + currentPages[currentPages.length-1].route;
+			 let pages = wx.getStorageSync("basedata")
+			   ? wx.getStorageSync("basedata").bar_title
+			   : [];
+			 pages.forEach((x) => {
+			   if (x.value == u) {
+			     this.pageTitle = x.new_name ? x.new_name : x.name;
+			   }
+			 });
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
+		},
 		onLoad(){
 			this.u = wx.getStorageSync("userinfo");
 			if (!this.u) {

pages/order/index/index.vue

@@ -63,7 +63,9 @@
 									  </view>
 									</view>
 								</template>
-								<Text style='font-size: 32rpx;text-align: right;width: 100%;'>￥{{item.total_price}}</Text>
+								<Text style='font-size: 32rpx;text-align: right;width: 100%;'>合计：￥{{item.total_price}} 
+									<Text v-if='item.express_price!=0' style='font-size: 20rpx;color: #A0A09D;'>(含运费 ￥{{item.express_price}})</Text> 
+								</Text>
 								
 								<!-- TODO 样式结构修改-->
 								<view class="handle">
@@ -77,7 +79,13 @@
 							</view>
 						</view>
 					</view>
-				
+				<u-divider
+				  contentPosition="center"
+				  v-if="isover"
+				  :margin-top="20"
+				  :margin-bottom="20"
+				  bg-color='#f3f4f6'
+				>没有更多订单了</u-divider>
 		  		
 		  	</scroll-view>
 		  
@@ -110,12 +118,13 @@
 		},
 		data() {
 			return {
+				pageTitle:'我的订单',
 				current: 0,
 				list: [{name: '全部'}, {name: '待付款'},{name: '待发货'},{name: '待收货'},{name: '待评价'},],
 				mainColor: "",
 				contentHeight:0,
 				page:1,
-				page_count:0,
+				page_count:1,
 				g:[],
 				loading:false,
 				showModal:false,
@@ -123,6 +132,7 @@
 				index:0,
 				goodData:[],
 				showGoodList:false,
+				isover:false
 			};
 		},
 		created(){
@@ -130,6 +140,21 @@
 			  this.mainColor = this.$uiConfig.mainColor;
 			  
 		},
+		mounted() {
+			let currentPages = getCurrentPages();
+			 let u = "/" + currentPages[currentPages.length-1].route;
+			 let pages = wx.getStorageSync("basedata")
+			   ? wx.getStorageSync("basedata").bar_title
+			   : [];
+			 pages.forEach((x) => {
+			   if (x.value == u) {
+			     this.pageTitle = x.new_name ? x.new_name : x.name;
+			   }
+			 });
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
+		},
 		onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
 			this.current = option.status;
 			this.loading = true;
@@ -144,9 +169,8 @@
 				this.init()
 			},
 			init(){
-			
+				this.isover = false;
 				let h=this.apiheader()
-				
 				this.request(
 				  {
 				    url: "",
@@ -160,11 +184,25 @@
 				  },
 				  res => {
 					  this.loading = false;
-					 this.g = res.data.list;
+					 this.g = this.g.concat(res.data.list);
+					 this.page_count = res.data.pagination.page_count;
+					 if (this.page_count == 1) {
+					   this.isover = true;
+					 }
 				  }
 				);
 				 
 			},
+			lower(e) {
+			  if (this.page < this.page_count) {
+			   
+			      this.page++;
+			      this.init();
+			    
+			  } else {
+			    this.isover = true;
+			  }
+			},
 			cancel(e,index){
 				this.showModal=true;
 				this.index=index;

pages/user-center/user-center.vue

@@ -77,6 +77,7 @@
 						:name="item.name" @click="goUrl(item.link_url)">
 						<image :src='item.icon_url' style="width: 66rpx;height: 60rpx;"></image>
 						<Text style='margin-top: 10rpx;'>{{item.name}}</Text>
+						<!-- <view class='badge'>{{item.}}</view> -->
 					</view>
 				</view>
 			</view>
@@ -157,7 +158,6 @@
 			 this.contentHeight = this.$utils.calcContentHeight(c);
 			 
 			 let u = "/" + currentPages[currentPages.length - 1].route;
-			
 			 let pages = wx.getStorageSync("basedata")
 			   ? wx.getStorageSync("basedata").bar_title
 			   : [];
@@ -167,6 +167,9 @@
 			     this.pageTitle = x.new_name ? x.new_name : x.name;
 			   }
 			 });
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
 			 this.userinfo()
 			 this.getmeue()
 		
@@ -324,6 +327,12 @@
 		flex-direction: column;
 		align-items: center;
 		margin-top: 20rpx;
+		position: relative
+	}
+	.userStyle .badge{
+		position: absolute;
+		right: -10rpx;
+		top: -10rpx;
 	}
 	.userStyle .menus{
 		width: 94%;