Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

pages/store/settled/index.vue

@@ -684,7 +684,7 @@
 					this.city_id = resData.city_id;
 					this.area_id = resData.area_id
 					this.street_id = resData.street_id
-					this.mer_storeType = resData.mer_storeType
+					// this.mer_storeType = resData.mer_storeType
 					this.village_id = resData.village_id;
 
 					const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
@@ -785,12 +785,12 @@
 
 			// 获取店铺类型
 			getStoreType: function() {
-				getStoreTypeApi()
-					.then(res => {
-
+				getStoreTypeApi().then(res => {
 					this.storeTypeArr = res.data
-					})
-					.catch(res => {
+					// 初始化默认
+					this.merchantData.mer_type = this.storeTypeArr[0].mer_type_id;
+					this.mer_storeType = this.storeTypeArr[0].type_name;
+				}).catch(res => {
 					this.$util.Tips({
 						title: res
 					});

pages/users/invite_code/index.vue

@@ -99,7 +99,17 @@
 			// 获取二维码
 			getQrcode() {
 				qrcode().then(res => {
+					if (res.status == 200) {
 						this.qrcodeUrl = res.data.url;
+					} else {
+						uni.showModal({
+							content: '暂未开通邀请码，需开通邀请码请联系管理员',
+							showCancel: false,
+							success: (res) => {
+								uni.navigateBack();
+							}
+						})
+					}
 				}).catch(err => {
 					uni.showModal({
 						content: '暂未开通邀请码，需开通邀请码请联系管理员',