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,16 +785,16 @@
 
 			// 获取店铺类型
 			getStoreType: function() {
-				getStoreTypeApi()
-					.then(res => {
-
-						this.storeTypeArr = res.data
-					})
-					.catch(res => {
-						this.$util.Tips({
-							title: res
-						});
+				getStoreTypeApi().then(res => {
+					this.storeTypeArr = res.data
+					// 初始化默认
+					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
 					});
+				});
 			},
 			// 图片预览
 			// 获得相册 idx

pages/users/invite_code/index.vue

@@ -24,7 +24,7 @@
 
 			<view class="table" v-if="list.length > 0">
 				<view class="table-title">
-          <view class="table-title-cell" style="width: 100rpx;">序号</view>
+					<view class="table-title-cell" style="width: 100rpx;">序号</view>
 					<view class="table-title-cell">用户名称</view>
 					<view class="table-title-cell">用户ID</view>
 					<view class="table-title-cell">状态</view>
@@ -36,7 +36,7 @@
 					<view class="scrollView-wrap">
 						<block v-for="(item,index) in list" :key="index">
 							<view class="table-con">
-                <view class="table-con-cell" style="width: 100rpx;">{{index+1}}</view>
+								<view class="table-con-cell" style="width: 100rpx;">{{index+1}}</view>
 								<view class="table-con-cell">{{item.real_name || '-'}}</view>
 								<view class="table-con-cell">{{item.uid}}</view>
 								<view class="table-con-cell">{{item.status == 0?'未入驻':'已入驻'}}</view>
@@ -99,7 +99,17 @@
 			// 获取二维码
 			getQrcode() {
 				qrcode().then(res => {
-					this.qrcodeUrl = res.data.url;
+					if (res.status == 200) {
+						this.qrcodeUrl = res.data.url;
+					} else {
+						uni.showModal({
+							content: '暂未开通邀请码，需开通邀请码请联系管理员',
+							showCancel: false,
+							success: (res) => {
+								uni.navigateBack();
+							}
+						})
+					}
 				}).catch(err => {
 					uni.showModal({
 						content: '暂未开通邀请码，需开通邀请码请联系管理员',