商品bug修复

components/product/refund.vue

@@ -42,7 +42,7 @@
 				type: String,
 				default: ''
 			},
-			Label:{
+			Label: {
 				type: String,
 				default: ''
 			}
@@ -69,8 +69,14 @@
 					}
 				],
 				verifyCurrent: null,
-				refundLabel: [],
-				refundConfirm: [],
+				refundLabel: {
+					name: '随时退',
+					refundLabel: 1
+				},
+				refundConfirm: {
+					name: '需要确认',
+					refundConfirm: 1
+				},
 
 			};
 		},
@@ -79,12 +85,13 @@
 				this.$emit('close');
 			},
 			confirm() {
-				if (this.refundLabel.length == 0 || this.refundConfirm.length == 0) {
+				if (!this.refundLabel && !this.refundConfirm) {
 					uni.showToast({
 						title: '请选择退款规则',
 						icon: 'none'
 					});
 				} else {
+					console.log(this.refundLabel, this.refundConfirm);
 					this.$emit('confirm', {
 						refundLabel: this.refundLabel,
 						refundConfirm: this.refundConfirm
@@ -103,12 +110,12 @@
 			}
 		},
 		mounted() {
-			setTimeout(()=>{
+			setTimeout(() => {
 				this.tagCurrent = this.Label
-					this.verifyCurrent = this.Confirm 
-					this.$forceUpdate()
-			},100)
-		
+				this.verifyCurrent = this.Confirm
+				this.$forceUpdate()
+			}, 100)
+
 		}
 	};
 </script>

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.6.0",
-    "versionCode" : 1160,
+    "versionName" : "1.1.6.2",
+    "versionCode" : 1162,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/groupMeal/orders/order-alist.vue

@@ -248,7 +248,7 @@ export default {
 					} else {
 						// this.$tip.error(res.data.message);
 						uni.showToast({
-							icon:'error',
+							icon:'none',
 							title:res.data.message
 						})
 					}

pages/product/creatProduct.vue

@@ -595,6 +595,7 @@
 			},
 			// 保存退款规则
 			saveFound(rules) {
+				console.log(rules)
 				this.form.refundConfirm = rules.refundConfirm.refundConfirm
 				this.form.refundLabel = rules.refundLabel.refundLabel
 				let value1 = []
@@ -740,7 +741,7 @@
 						icon: 'none'
 					});
 					return
-				} else if (!this.form.availableEndDate && !this.form.expirationDays) {
+				} else if (!this.form.useType) {
 					uni.showToast({
 						title: '请选择可用时间',
 						icon: 'none'

pages/product/creatStandard.vue

@@ -130,7 +130,7 @@
 			          this.back()
 			        } else {
 			          uni.showToast({
-			            icon:'error',
+			            icon:'none',
 			            title:'不能重复添加'
 			          })
 			        }