Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new

components/popups/index.vue

@@ -139,6 +139,7 @@
 
 			// 关闭
 			handleClose() {
+				if (this.$parent.$parent.load) this.$parent.$parent.load = false;
 				this.$refs.popup.close();
 			},
 
@@ -147,6 +148,7 @@
 				if (this.value && this.value.endsWith('.')) {
 					this.value = this.value.replace('.', '');
 				}
+				this.handleClose();
 				this.$emit('change', this.value);
 			}
 		}

pages/product/shop_type_change/list.vue

@@ -46,7 +46,7 @@
 						<view class="shop-type-list-item-con-item" v-if="item.status == 2">
 							<view class="shop-type-list-item-con-key">备注：</view>
 							<view class="shop-type-list-item-con-val" style="word-break: break-all;">
-								{{item.update_time || ''}}
+								{{item.fail_msg || ''}}
 							</view>
 						</view>
 					</view>