update

mobile-code/src/App.vue

@@ -18,13 +18,13 @@ export default {
 		uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjFfMTI1MzY2MzAifQ.eyJpc3MiOiJodHRwOlwvXC9tLmhoYi5jb20iLCJhdWQiOiJodHRwOlwvXC9tLmhoYi5jb20iLCJqdGkiOiIxXzEyNTM2NjMwIiwiaWF0IjoxNTc0NDIzMDc4LCJuYmYiOjE1NzQ0MjMwNzgsImV4cCI6MTU3NDQyNjY3OCwidXNlcklkIjoxMjUzNjYzMH0.v_T9NuFRpzuI7GtwuuuNlVg6EylImaCUwqo2A6NRTE4')
 		uni.setStorageSync('account', '12358')
 		// 登录
-		// if (this.$constant.source == 'business') {
-		this.$util.getCheckLogin().then(res => {
-			if (res) {
-				getUser()
-			}
-		})
-		// }
+		if (this.$constant.source == 'business') {
+			this.$util.getCheckLogin().then(res => {
+				if (res) {
+					getUser()
+				}
+			})
+		}
 	},
 	onShow() {
 		// this.isLogin()

mobile-code/src/components/app-swiper.vue

@@ -5,7 +5,7 @@
 				<img :src="item.img" class="tui-slide-image" mode="center" />
 			</swiper-item>
 		</swiper>
-		<app-tag v-if="tagShow" type="translucent" shape="circleLeft" size="small">{{index + 1}}/{{list.length}}</app-tag>
+		<app-tag v-if="tagShow" class="swiper-tag" type="translucent" shape="circleLeft" size="small">{{index + 1}}/{{list.length}}</app-tag>
 	</div>
 </template>
 
@@ -119,13 +119,6 @@ export default {
 	}
 
 	/* #endif */
-	// tag
-	.tui-tag-class {
-		position: absolute;
-		color: #fff;
-		bottom: 30rpx;
-		right: 0;
-	}
 }
 
 </style>

mobile-code/src/components/module/app-tag.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="tui-tag-class" :class="[size?'tui-tag-'+size:'tui-tag',getClassName(shape,plain),getTypeClass(type,plain)]"
-	 @tap="handleClick" v-if="visible">
+	<view class="tui-tag-class" :class="[size?'tui-tag-'+size:'tui-tag',getClassName(shape,plain),getTypeClass(type,plain)]" @tap="handleClick" v-if="visible">
 		<slot></slot>
 	</view>
 </template>
@@ -59,271 +58,270 @@ export default {
 }
 </script>
 
-<style scoped>
-/* color start*/
+<style scss scoped>
+	/* color start*/
 
-.tui-primary {
-  background: #5677fc !important;
-  color: #fff;
-}
-
-.tui-light-primary {
-  background: #5c8dff !important;
-  color: #fff;
-}
+	.tui-primary {
+		background: #5677fc !important;
+		color: #fff;
+	}
 
-.tui-dark-primary {
-  background: #4a67d6 !important;
-  color: #fff;
-}
+	.tui-light-primary {
+		background: #5c8dff !important;
+		color: #fff;
+	}
 
-.tui-dLight-primary {
-  background: #4e77d9 !important;
-  color: #fff;
-}
+	.tui-dark-primary {
+		background: #4a67d6 !important;
+		color: #fff;
+	}
 
-.tui-danger {
-  background: #ed3f14 !important;
-  color: #fff;
-}
+	.tui-dLight-primary {
+		background: #4e77d9 !important;
+		color: #fff;
+	}
 
-.tui-red {
-  background: #ff201f !important;
-  color: #fff;
-}
+	.tui-danger {
+		background: #ed3f14 !important;
+		color: #fff;
+	}
 
-.tui-warning {
-  background: #ff7900 !important;
-  color: #fff;
-}
+	.tui-red {
+		background: #ff201f !important;
+		color: #fff;
+	}
 
-.tui-green {
-  background: #19be6b !important;
-  color: #fff;
-}
+	.tui-warning {
+		background: #ff7900 !important;
+		color: #fff;
+	}
 
-.tui-high-green {
-  background: #52dcae !important;
-  color: #52dcae;
-}
+	.tui-green {
+		background: #19be6b !important;
+		color: #fff;
+	}
 
-.tui-black {
-  background: #000 !important;
-  color: #fff;
-}
+	.tui-high-green {
+		background: #52dcae !important;
+		color: #52dcae;
+	}
 
-.tui-white {
-  background: #fff !important;
-  color: #333 !important;
-}
+	.tui-black {
+		background: #000 !important;
+		color: #fff;
+	}
 
-.tui-translucent {
-  background: rgba(0, 0, 0, 0.7);
-}
+	.tui-white {
+		background: #fff !important;
+		color: #333 !important;
+	}
 
-.tui-light-black {
-  background: #333 !important;
-}
+	.tui-translucent {
+		background: rgba(0, 0, 0, 0.7);
+	}
 
-.tui-gray {
-  background: #ededed !important;
-}
+	.tui-light-black {
+		background: #333 !important;
+	}
 
-.tui-phcolor-gray {
-  background: #ccc !important;
-}
+	.tui-gray {
+		background: #ededed !important;
+	}
 
-.tui-divider-gray {
-  background: #eaeef1 !important;
-}
+	.tui-phcolor-gray {
+		background: #ccc !important;
+	}
 
-.tui-btn-gray {
-  background: #ededed !important;
-  color: #999 !important;
-}
+	.tui-divider-gray {
+		background: #eaeef1 !important;
+	}
 
-.tui-hover-gray {
-  background: #f7f7f9 !important;
-}
+	.tui-btn-gray {
+		background: #ededed !important;
+		color: #999 !important;
+	}
 
-.tui-bg-gray {
-  background: #fafafa !important;
-}
+	.tui-hover-gray {
+		background: #f7f7f9 !important;
+	}
 
-.tui-light-blue {
-  background: #ecf6fd;
-  color: #4dabeb !important;
-}
+	.tui-bg-gray {
+		background: #fafafa !important;
+	}
 
-.tui-light-brownish {
-  background: #fcebef;
-  color: #8a5966 !important;
-}
+	.tui-light-blue {
+		background: #ecf6fd;
+		color: #4dabeb !important;
+	}
 
-.tui-light-orange {
-  background: #fef5eb;
-  color: #faa851 !important;
-}
+	.tui-light-brownish {
+		background: #fcebef;
+		color: #8a5966 !important;
+	}
 
-.tui-light-green {
-  background: #e8f6e8;
-  color: #44cf85 !important;
-}
+	.tui-light-orange {
+		background: #fef5eb;
+		color: #faa851 !important;
+	}
 
-.tui-primary-outline::after {
-  border: 1px solid #5677fc !important;
-}
+	.tui-light-green {
+		background: #e8f6e8;
+		color: #44cf85 !important;
+	}
 
-.tui-primary-outline {
-  color: #5677fc !important;
-  background: none;
-}
+	.tui-primary-outline::after {
+		border: 1px solid #5677fc !important;
+	}
 
-.tui-danger-outline {
-  color: #ed3f14 !important;
-  background: none;
-}
+	.tui-primary-outline {
+		color: #5677fc !important;
+		background: none;
+	}
 
-.tui-danger-outline::after {
-  border: 1px solid #ed3f14 !important;
-}
+	.tui-danger-outline {
+		color: #ed3f14 !important;
+		background: none;
+	}
 
-.tui-red-outline {
-  color: #ff201f !important;
-  background: none;
-}
+	.tui-danger-outline::after {
+		border: 1px solid #ed3f14 !important;
+	}
 
-.tui-red-outline::after {
-  border: 1px solid #ff201f !important;
-}
+	.tui-red-outline {
+		color: #ff201f !important;
+		background: none;
+	}
 
-.tui-warning-outline {
-  color: #ff7900 !important;
-  background: none;
-}
+	.tui-red-outline::after {
+		border: 1px solid #ff201f !important;
+	}
 
-.tui-warning-outline::after {
-  border: 1px solid #ff7900 !important;
-}
+	.tui-warning-outline {
+		color: #ff7900 !important;
+		background: none;
+	}
 
-.tui-green-outline {
-  color: #44cf85 !important;
-  background: none;
-}
+	.tui-warning-outline::after {
+		border: 1px solid #ff7900 !important;
+	}
 
-.tui-green-outline::after {
-  border: 1px solid #44cf85 !important;
-}
+	.tui-green-outline {
+		color: #44cf85 !important;
+		background: none;
+	}
 
-.tui-high-green-outline {
-  color: #52dcae !important;
-  background: none;
-}
+	.tui-green-outline::after {
+		border: 1px solid #44cf85 !important;
+	}
 
-.tui-high-green-outline::after {
-  border: 1px solid #52dcae !important;
-}
+	.tui-high-green-outline {
+		color: #52dcae !important;
+		background: none;
+	}
 
-.tui-gray-outline {
-  color: #999 !important;
-  background: none;
-}
+	.tui-high-green-outline::after {
+		border: 1px solid #52dcae !important;
+	}
 
-.tui-gray-outline::after {
-  border: 1px solid #ccc !important;
-}
+	.tui-gray-outline {
+		color: #999 !important;
+		background: none;
+	}
 
-.tui-black-outline {
-  color: #333 !important;
-  background: none;
-}
+	.tui-gray-outline::after {
+		border: 1px solid #ccc !important;
+	}
 
-.tui-black-outline::after {
-  border: 1px solid #333 !important;
-}
+	.tui-black-outline {
+		color: #333 !important;
+		background: none;
+	}
 
-.tui-white-outline {
-  color: #fff !important;
-  background: none;
-}
+	.tui-black-outline::after {
+		border: 1px solid #333 !important;
+	}
 
-.tui-white-outline::after {
-  border: 1px solid #fff !important;
-}
+	.tui-white-outline {
+		color: #fff !important;
+		background: none;
+	}
 
-/* color end*/
+	.tui-white-outline::after {
+		border: 1px solid #fff !important;
+	}
 
-/* tag start*/
+	/* color end*/
 
-.tui-tag {
-  padding: 16upx 26upx 18px;
-  font-size: 28upx;
-  border-radius: 6upx;
-  /* display: inline-block;
-  vertical-align: middle; */
-  line-height: 28upx;
-}
+	/* tag start*/
 
-.tui-tag-small {
-  padding: 8upx 16upx 10px;
-  font-size: 24upx;
-  border-radius: 6upx;
-  /* display: inline-block;
-  vertical-align: middle; */
-  line-height: 24upx;
-}
+	.tui-tag {
+		padding: 16upx 26upx 18px;
+		font-size: 28upx;
+		border-radius: 6upx;
+		/* display: inline-block;
+		  vertical-align: middle; */
+		line-height: 28upx;
+	}
 
-.tui-tag-outline {
-  position: relative;
-  background: none;
-  color: #5677fc;
-}
+	.tui-tag-small {
+		padding: 8upx 16upx 10px;
+		font-size: 24upx;
+		border-radius: 6upx;
+		/* display: inline-block;
+		  vertical-align: middle; */
+		line-height: 24upx;
+	}
 
-.tui-tag-outline::after {
-  content: "";
-  position: absolute;
-  width: 200%;
-  height: 200%;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scale(0.5, 0.5);
-  transform: scale(0.5, 0.5);
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  left: 0;
-  top: 0;
-  border-radius: 80upx;
-  border: 1px solid #5677fc;
-}
+	.tui-tag-outline {
+		position: relative;
+		background: none;
+		color: #5677fc;
+	}
 
-.tui-tag-fillet {
-  border-radius: 50upx;
-}
+	.tui-tag-outline::after {
+		content: '';
+		position: absolute;
+		width: 200%;
+		height: 200%;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		-webkit-transform: scale(0.5, 0.5);
+		transform: scale(0.5, 0.5);
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		left: 0;
+		top: 0;
+		border-radius: 80upx;
+		border: 1px solid #5677fc;
+	}
 
-.tui-white.tui-tag-fillet::after {
-  border-radius: 80upx;
-}
+	.tui-tag-fillet {
+		border-radius: 50upx;
+	}
 
-.tui-tag-outline-fillet::after {
-  border-radius: 80upx;
-}
+	.tui-white.tui-tag-fillet::after {
+		border-radius: 80upx;
+	}
 
-.tui-tag-fillet-left {
-  border-radius: 50upx 0 0 50upx;
-}
+	.tui-tag-outline-fillet::after {
+		border-radius: 80upx;
+	}
 
-.tui-tag-fillet-right {
-  border-radius: 0 50upx 50upx 0;
-}
+	.tui-tag-fillet-left {
+		border-radius: 50upx 0 0 50upx;
+	}
 
-.tui-tag-fillet-left.tui-tag-outline::after {
-  border-radius: 100upx 0 0 100upx;
-}
+	.tui-tag-fillet-right {
+		border-radius: 0 50upx 50upx 0;
+	}
 
-.tui-tag-fillet-right.tui-tag-outline::after {
-  border-radius: 0 100upx 100upx 0;
-}
+	.tui-tag-fillet-left.tui-tag-outline::after {
+		border-radius: 100upx 0 0 100upx;
+	}
 
-/* tag end*/
+	.tui-tag-fillet-right.tui-tag-outline::after {
+		border-radius: 0 100upx 100upx 0;
+	}
 
+	/* tag end*/
 </style>

mobile-code/src/components/plugin/alert.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="tui-alert-class tui-alert-box" :class="[show?'tui-alert-show':'']">
-			<view class="tui-alert-content" :style="{fontSize:size+'rpx',color:color}">
+			<view class="tui-alert-content" :style="{fontSize:size+'rpx',color:color, padding: padding}">
 				<slot></slot>
 			</view>
 			<view class="tui-alert-btn" :style="{color:btnColor}" hover-class="tui-alert-btn-hover" :hover-stay-time="150"
@@ -39,6 +39,11 @@ export default {
 			type: String,
 			default: '知道了'
 		},
+		// content padding
+		padding: {
+			type: String,
+			default: '98rpx 48rpx 92rpx 48rpx'
+		},
 		// 点击遮罩 是否可关闭
 		maskClosable: {
 			type: Boolean,
@@ -99,7 +104,7 @@ export default {
 	.tui-alert-content {
 		text-align: center;
 		color: #333333;
-		padding: 98rpx 48rpx 92rpx 48rpx;
+		/* padding: 98rpx 48rpx 92rpx 48rpx; */
 		box-sizing: border-box;
 		word-break: break-all;
 	}

mobile-code/src/pages/goods/detail.vue

@@ -52,6 +52,8 @@
 		<app-trademark />
 		<sel-popup :show="popupShow" :info="data" :buyNum="buyNum" @change="changeNum" @close="hidePopup" />
 		<buy-foot @buy="showPopup" />
+		<!-- login -->
+		<go-login :show.sync="loginShow" />
 	</div>
 </template>
 
@@ -62,6 +64,8 @@ import AppTag from '@/components/module/app-tag.vue'
 import AppTrademark from '@/components/module/app-trademark'
 import BuyFoot from './components/buy-foot.vue'
 import SelPopup from './components/sel-popup.vue'
+import GoLogin from '@/pages/home/components/go-login.vue'
+// api
 import { getDetail } from '@/api/goods'
 export default {
 	name: 'goods-detail',
@@ -71,18 +75,25 @@ export default {
 		AppTrademark,
 		BuyFoot,
 		SelPopup,
-		AppImg
+		AppImg,
+		GoLogin
 	},
 	data() {
 		return {
 			data: {},
 			imgList: [],
 			buyNum: 1,
-			popupShow: false
+			popupShow: false,
+			loginShow: false
 		}
 	},
 	onLoad(option) {
+	},
+	mounted() {
+		// this.$util.getCheckLogin().then(res => {
+		// 	if (!res) return false
 		this.init()
+		// })
 	},
 	computed: {
 		// imgNormal() {
@@ -115,7 +126,11 @@ export default {
 			this.buyNum = e.value
 		},
 		showPopup() {
-			this.popupShow = true
+			if (this.$util.isLogin()) {
+				this.popupShow = true
+			} else {
+				this.loginShow = true
+			}
 		},
 		hidePopup() {
 			this.popupShow = false

mobile-code/src/pages/home/components/go-login.vue

@@ -0,0 +1,46 @@
+<template>
+	<alert-module :show="showAlert" btnText="去登陆" btnColor="#FF2842" padding="66rpx 24rpx 66rpx 24rpx" @click="goLogin" @cancel="hideAlert">
+		<div class="go-login-module">
+            <div>您还未登陆，请先登录体验更多功能！</div>
+        </div>
+	</alert-module>
+</template>
+
+<script>
+import AlertModule from '@/components/plugin/alert'
+export default {
+	name: 'go-login-module',
+	components: {
+		AlertModule
+	},
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			showAlert: false
+		}
+	},
+	watch: {
+		show(val) {
+		    console.log('监听')
+			this.showAlert = val
+		}
+	},
+	methods: {
+		goLogin() {
+			this.hideAlert()
+			this.$util.getCheckLogin()
+		},
+		hideAlert() {
+			this.$emit('update:show', false)
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

mobile-code/src/pages/home/user.vue

@@ -46,13 +46,13 @@
 					<div class="my-surplus">{{ shopUser.userAsset.balance || 0.00 }}</div>
 				</div>
 				<div class="surplus-right">
-					<button class="button-com" @click="pageTo({
+					<button class="button-com" @click="pageToFn({
 					url: '/pages/pay/index',
 					query: {
 						pageStatus: 'recharge'
 					}
 				})">充值</button>
-					<button class="button-com red" @click="pageTo({
+					<button class="button-com red" @click="pageToFn({
 					url: '/pages/pay/index',
 					query: {
 						pageStatus: 'payment'
@@ -63,29 +63,29 @@
 		</template>
 		<div class="list-content">
 			<tui-list-view class="tui-list-view">
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/order/list')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/order/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的订单</div>
 						<!-- <div class="list-text">{{ shopUser.userAsset.totalBuyNum }}</div> -->
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/interest/invite')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/invite')">
 					<div class="list-wrap">
 						<div class="list-label">我的邀请</div>
 						<div class="list-text">领金币奖励</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/coupon/list')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/coupon/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的优惠券</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/user/password')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/user/password')">
 					<div class="list-wrap">
 						<div class="list-label">支付密码设置</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/interest/level')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageToFn('/pages/interest/level')">
 					<div class="list-wrap">
 						<div class="list-label">会员权益</div>
 					</div>
@@ -106,6 +106,8 @@
 		<!-- 登录弹窗 -->
 		<app-trademark />
 		<!-- <app-footer :activeIndex="3" /> -->
+		<!-- login -->
+		<go-login :show.sync="loginShow" />
 	</div>
 </template>
 
@@ -116,6 +118,7 @@ import TuiListView from '@/components/plugin/list-view'
 import TuiListCell from '@/components/plugin/list-cell'
 import LoginPopup from '@/pages/home/components/login-popup'
 import AppTrademark from '@/components/module/app-trademark'
+import GoLogin from '@/pages/home/components/go-login.vue'
 // api
 import { getShopUser } from '@/utils/auth'
 import { getWxInfo, getWxPhone } from '@/api/mini'
@@ -126,7 +129,8 @@ export default {
 		TuiListView,
 		TuiListCell,
 		LoginPopup,
-		AppTrademark
+		AppTrademark,
+		GoLogin
 	},
 	data() {
 		return {
@@ -146,6 +150,14 @@ export default {
 		init() {
 			getShopUser()
 		},
+		// pageTo
+		pageToFn(item) {
+			if (this.$util.isLogin()) {
+				this.$util.pageTo(item)
+			} else {
+				this.loginShow = true
+			}
+		},
 		showPopup() {
 			// this.popupShow = true
 			this.$util.getCheckLogin()

mobile-code/src/static/css/base.scss

@@ -5,12 +5,12 @@
     // line-height: 1;
     background-color: $backColor;
     min-height: 100vh;
-    // #ifdef H5
-    &.app-main {
-        min-height: calc(100vh - 100px);
-    }
-    // #endif
 }
+/* #ifdef H5 */
+.app-content.app-main {
+    min-height: calc(100vh - 100px);
+}
+/* #endif */
 .gray_txt {
     color: #999 !important;
 }

mobile-code/src/static/css/reset.scss

@@ -113,6 +113,16 @@ image {
     }
 }
 
+// 轮播tag样式修改
+.swiper-wrap {
+    .tui-tag-class {
+		position: absolute;
+		color: #fff;
+		bottom: 30rpx;
+		right: 0;
+	}
+}
+
 uni-button::after {
     border: none;
 }