commit -m 楼层模板修复

components/cm-module/pageFloorTemplate/templateA.vue

@@ -166,7 +166,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateB.vue

@@ -178,7 +178,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateC.vue

@@ -178,7 +178,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateD.vue

@@ -190,7 +190,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateE.vue

@@ -166,7 +166,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageFloorTemplate/templateF.vue

@@ -154,7 +154,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateA.vue

@@ -166,7 +166,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateB.vue

@@ -178,7 +178,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateC.vue

@@ -178,7 +178,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateD.vue

@@ -190,7 +190,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateE.vue

@@ -166,7 +166,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateF.vue

@@ -166,7 +166,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateG.vue

@@ -154,7 +154,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				this.floorData = data
 				// console.log(this.floorData)

components/cm-module/pageTemplate/templateH.vue

@@ -170,7 +170,7 @@
 		methods:{
 			initData(data){
 				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
+					this.shopId = resolve.shopID ? resolve.shopID : 0
 				})
 				if(data.floorImageList.length>0){
 					this.productList.splice(0,this.productList.length);

h5/pages/other/brand.vue

@@ -53,7 +53,8 @@
 			NavToH5Page(index) {//跳转H5超皮秒防伪查询
 				switch(index){
 					case 1:
-						this.$api.navigateTo(`/h5/pages/activity/activity?id=223`)
+						let path ='https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
+						this.$api.navigateTo(`/h5/pages/activity/activity?link=${path}&title=品牌OEM服务`)
 						break;
 					case 2:
 						this.isBannerHome = false

store/index.js

@@ -49,12 +49,14 @@ const store = new Vuex.Store({
 			let TIME = api.formatDate()
 			console.log(`${TIME}`,provider)
 			state.userInfo = provider;
-			if(provider.userIdentity){
-				state.identity = provider.userIdentity
-			}else if(provider.userID == 5261 || provider.userID == 10947 || provider.userID == 11579){
-				state.identity = 1;
-			}else{
-				state.identity = 0;
+			if(state.userInfo){
+				if(provider.userIdentity){
+					state.identity = provider.userIdentity
+				}else if(provider.userID == 5261 || provider.userID == 10947 || provider.userID == 11579){
+					state.identity = 1;
+				}else{
+					state.identity = 0;
+				}
 			}
 			console.log('用户类型',state.identity)
 			uni.setStorage({//缓存用户登陆状态