end

App.vue

@@ -69,14 +69,12 @@ export default {
 		}
 	},
 	onLaunch: async function(options) {
-		// 原生底部导航，自定义底部导航切换。
-
 		if (options.query.mode === 'save') {
 			//截图模式
 			uni.setStorageSync('screenShot', true);
 			uni.setStorageSync('shop_id', options.query.shop_id);
 		}
-		// 自定义底部导航，控制显示隐藏。
+
 		this.init(options)
 			.then(res => {
 				this.autoLogin(res[2].data);

common/request/index.js

@@ -8,10 +8,10 @@ export default function api(url, data = {}) {
 	request.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
 		if (api.auth) {
 			let token = uni.getStorageSync('token');
-			if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行
-				cancel('token 不存在'); // 接收一个参数，会传给catch((err) => {}) err.errMsg === 'token 不存在'
+			if (!token) {
 				store.commit('LOGIN_TIP', true)
-				store.commit('OUT_LOGIN');
+				store.commit('OUT_LOGIN');
+				throw('暂未登录,已阻止此次API请求~');
 			}
 		}
 		if (uni.getStorageSync('token')) {

common/store/modules/init.js

@@ -23,7 +23,8 @@ const actions = {
 			api('init').then(res => {
 				commit('INIT_DATA', res.data);
 				uni.setStorageSync('sysInfo', res.data.info);
-				uni.setStorageSync('shareInfo', res.data.share);
+				uni.setStorageSync('shareInfo', res.data.share);
+				console.log(res,'init');
 				resolve(res)
 			}).catch(e => {
 				reject(e)
@@ -64,9 +65,9 @@ const actions = {
 				});
 			}
 			api('template', params).then(res => {
-
 				uni.setStorageSync('templateData', res.data);
-				commit('TEMPLATE_DATA', res.data);
+				commit('TEMPLATE_DATA', res.data);
+				console.log(res,'template');
 				resolve(res)
 			}).catch(e => {
 				reject(e)

components/shopro-float-btn/shopro-float-btn.vue

@@ -38,7 +38,7 @@ export default {
 	props: {},
 	computed: {
 		...mapState({
-			template: state => state.init.templateData.floatButton
+			template: state => state.init.templateData['float-button']
 		}),
 		floatData() {
 			if (this.template) {
@@ -62,7 +62,11 @@ export default {
 			}
 		}
 	},
-	created() {},
+	created() {
+		// setInterval(function(){ 
+		// 	console.log(this.template,123)
+		// 	}, 100);
+	},
 	methods: {
 		hideModal() {
 			this.showModal = false;

components/shopro-mini-card/shopro-mini-card.vue

@@ -5,7 +5,7 @@
 			<view class="y-start">
 				<view class="goods-title more-t">{{ detail.title }}</view>
 				<slot name="tipTag"></slot>
-				<view class="size-tip">{{ detail.goods_sku_text }}</view>
+				<view class="size-tip">{{ detail.goods_sku_text ? detail.goods_sku_text : ''}}</view>
 				<slot name="goodsBottom">
 					<view class="price">￥{{ detail.price }}</view>
 				</slot>
@@ -16,7 +16,7 @@
 			<view class="y-start">
 				<view class="goods-title more-t">{{ detail.title }}</view>
 				<slot name="tipTag"></slot>
-				<view class="size-tip">{{ sku.goods_sku_text }}</view>
+				<view class="size-tip">{{ sku.goods_sku_text ? sku.goods_sku_text: ''}}</view>
 				<slot name="goodsBottom">
 					<view class="price">￥{{ detail.price }}</view>
 				</slot>
@@ -38,7 +38,7 @@
 			<image class="goods-img" :src="detail.goods_image" mode=""></image>
 			<view class="y-start">
 				<view class="goods-title more-t">{{ detail.goods_title }}</view>
-				<view class="size-tip">{{ detail.goods_sku_text }}</view>
+				<view class="size-tip">{{ detail.goods_sku_text ? detail.goods_sku_text : ''}}</view>
 				<view class="order-goods flex align-center justify-between">
 					<text class="order-price">￥{{ detail.goods_price }}</text>
 					<text class="order-num">x{{ detail.goods_num }}</text>

components/shopro-notice-modal/shopro-notice-modal.vue

@@ -31,12 +31,12 @@ export default {
 	},
 	computed: {
 		...mapState({
-			templateData: state => state.init?.templateData,
+			templateData: state => state.init.templateData.popup,
 			showLoginTip: state => state.user.showLoginTip
 		}),
 		popupData() {
 			if (this.templateData) {
-				return this.templateData?.popup[0]?.content;
+				return this.templateData[0].content;
 			}
 		},
 		currentPath() {

components/shopro-tabbar/shopro-tabbar.vue

@@ -40,7 +40,7 @@ export default {
 			cartNum: state => state.cart.cartNum
 		}),
 		tabbarData() {
-			if (this.templateData.length) {
+			if (this.templateData) {
 				return this.templateData[0].content;
 			}
 		},