Merge branch 'dev/1.0' into custom/common

pages_tool/member/card.vue

@@ -183,7 +183,7 @@ export default {
 		if (options.from === 'navigateBack') {
 			return false;
 		}
-		this.$util.redirectTo('/pages/member/index');
+		this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
 		return true;
 	}
 };
@@ -220,7 +220,7 @@ export default {
 }
 </style>
 
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }