Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

# Conflicts:
#	pages/cart/cart.vue

App.vue

@@ -104,7 +104,7 @@ export default {
   font-family: "oswald";
   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
 }
-*{
+html,body{
   font-family: "oswald" !important;
 }
 swiper{

pages.json

@@ -3,6 +3,10 @@
         "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
     },
     "pages": [{
+            "path": "pages/order/index/index"
+
+        },
+        {
             "path": "pages/index/index"
         },
         {
@@ -49,10 +53,6 @@
         },
         {
             "path": "pages/order/index"
-        },
-        {
-            "path": "pages/order/index/index"
-
         }
     ],
     "globalStyle": {

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,9 +89,23 @@ 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(uni.getStorageSync("basedata"));
-    this.u = uni.getStorageSync("userinfo");
+    this.u = wx.getStorageSync("userinfo");
     if (!this.u) {
       this.u = {
         nickName: "未登录",
@@ -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 = uni.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;
@@ -47,6 +47,8 @@
 							<view class="cBox_item" v-for="(cx, ci) in item.goods" :key="ci" >
 								<view class="good-img" @click="clickHandler(cx.goods_id)">
 								  <image :src="cx.goodsWarehouse.cover_pic" style="width: 100%; height: 100%;" />
+								  <image src="../../../static/images/icon/plugins-out.png" v-if="item.goods_num==0"
+								  style="width: 100%; height: 100%;position: absolute;left:0;top:0;background: #000;opacity: 0.6;" />
 								</view>
 								<view class="good-info">
 									<Text class='good-name' @click="clickHandler(cx.goods_id)">{{cx.goodsWarehouse.name}}</Text>
@@ -60,14 +62,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 +131,7 @@
 	export default {
 		data() {
 			return {
+				pageTitle:"我的足迹",
 				isloading:true,
 				loading:false,
 				loading2:false,
@@ -165,6 +169,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 = uni.getStorageSync("userinfo");
 			if (!this.u) {
@@ -404,6 +423,7 @@
 		
 	}
 	.footStyle .good-img {
+		position: relative;
 	  width: 100%;
 	  height: 200rpx;
 	}

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 v-if='item.num>0' class='badge' :style="{'background':mainColor}">{{item.num}}</view>
 					</view>
 				</view>
 			</view>
@@ -87,7 +88,7 @@
 						<image :src='item.icon_url' style="width: 48rpx;height: 48rpx;"></image>
 						<Text :style="{'margin-top':meueData.user_center.menu_style == 1 ? '0rpx':'10rpx','margin-left':meueData.user_center.menu_style == 1 ? '10rpx':'0rpx'}">
 							{{item.name}}
-							</Text>
+						</Text>
 				</view>
 			</view>
 			<view class="copyright">
@@ -133,7 +134,7 @@
 		},
 		onLoad() {
 		  this.navHeight = this.$navHeight - 2;
-		  this.u = uni.getStorageSync("userinfo");
+		  this.u = wx.getStorageSync("userinfo");
 		  if (!this.u) {
 		    this.u = {
 		      nickName: "未登录",
@@ -141,10 +142,10 @@
 		    };
 		    this.showAuth = true;
 		  }
+		  
 		  this.cstyle = uni.getStorageSync("basedata")
 		    ? uni.getStorageSync("basedata").cat_style
 		    : [];
-			
 		  if (this.cstyle.cat_style == "4") {
 		 
 		  }
@@ -157,16 +158,18 @@
 			 this.contentHeight = this.$utils.calcContentHeight(c);
 			 
 			 let u = "/" + currentPages[currentPages.length - 1].route;
-			
-			 let pages = uni.getStorageSync("basedata")
-			   ? uni.getStorageSync("basedata").bar_title
+			 let pages = wx.getStorageSync("basedata")
+			   ? wx.getStorageSync("basedata").bar_title
 			   : [];
-			   console.log(uni.getStorageSync("basedata"))
+			   console.log(wx.getStorageSync("basedata"))
 			 pages.forEach((x) => {
 			   if (x.value == u) {
 			     this.pageTitle = x.new_name ? x.new_name : x.name;
 			   }
 			 });
+			 uni.setNavigationBarTitle({
+			   title: this.pageTitle,
+			 });
 			 this.userinfo()
 			 this.getmeue()
 		
@@ -324,6 +327,20 @@
 		flex-direction: column;
 		align-items: center;
 		margin-top: 20rpx;
+		position: relative
+	}
+	.userStyle .badge{
+		position: absolute;
+		right: -10rpx;
+		top: -10rpx;
+		padding:0 7rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 20rpx;
+		color: #fff;
+		height: 30rpx;
+		border-radius: 15rpx;
 	}
 	.userStyle .menus{
 		width: 94%;