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

components/cats/style11.vue

@@ -30,7 +30,7 @@
 							<view class="good-name">{{ cx.name }}</view>
 							<view class="goodprice">
 								<view class="left">
-									<view v-if="cx.level_price">
+									<view v-if="cx.is_level==1">
 										<u-tag size="mini" text="会员价" shape="circle" type="warning" />
 										<span class="vip">￥{{ cx.level_price }}</span>
 									</view>

components/cats/style4.vue

@@ -46,7 +46,7 @@
             <div class="good-name">{{ cx.name }}</div>
             <div class="goodprice">
               <div class="left">
-                <div v-if="cx.level_price">
+                <div v-if="cx.is_level==1">
                   <!-- todo VIP价格显示-->
 				  <u-tag size="mini" shape="circle" text="会员价" type="warning" />
                   <!-- <u-tag color="#f39800" type="warning">会员价</u-tag> -->

components/cats/style8.vue

@@ -49,7 +49,7 @@
               <view class="good-name">{{ cx.name }}</view>
               <view class="goodprice">
                 <view class="left">
-                  <view v-if="cx.level_price">
+                  <view v-if="cx.is_level==1">
                     <van-tag plain color="#f39800">会员价</van-tag>
                     <span class="vip">￥{{cx.level_price}}</span>
                   </view>

pages/cart/cart.vue

@@ -181,7 +181,7 @@ import auth from "@/components/auth/index.vue";
 export default {
 	data() {
 		return {
-			isloading: true,
+			isloading: false,
 			pageTitle: '购物车',
 			navHeight: 0,
 			contentHeight: 0,
@@ -221,14 +221,7 @@ export default {
 		}
 	},
 	onShow(){
-		this.u = uni.getStorageSync('mall_UserInfo');
-		if (!this.u) {
-			this.u = {
-				nickName: '未登录',
-				avatarUrl: ''
-			};
-			this.showAuth = true;
-		}
+		
 	},
 	mounted() {
 		let currentPages = getCurrentPages();
@@ -246,12 +239,23 @@ export default {
 		uni.setNavigationBarTitle({
 			title: this.pageTitle
 		});
-		this.init();
+		this.u = uni.getStorageSync('mall_UserInfo');
+		if (!this.u) {
+			this.u = {
+				nickName: '未登录',
+				avatarUrl: ''
+			};
+			this.showAuth = true;
+		}else{
+			this.init();
+		}
+		
 	},
 	methods: {
 		reloadUserinfo() {
 			this.u = uni.getStorageSync('mall_UserInfo');
 			this.showAuth = false;
+			this.init()
 		},
 		//关闭登录窗口
 		gbAuth(){
@@ -265,6 +269,7 @@ export default {
 		init() {
 			uni.showNavigationBarLoading();
 			let h = this.apiheader();
+			this.isloading=true;
 			this.request2(
 				{
 					url: '/api/AppletOrder/GetGoodsShoppingCartPageList',
@@ -272,7 +277,6 @@ export default {
 				},
 				res => {
 					this.loading = false;
-					console.log('resggg', res);
 					if (res.resultCode == 1) {
 						uni.hideNavigationBarLoading();
 						this.isloading = false;