Merge remote-tracking branch 'main/dev' into dev

packages/index.js

@@ -54,7 +54,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.9.7';
+const version = '0.9.8';
 const components = [
   Actionsheet,
   AddressEdit,

packages/sku/components/SkuMessages.vue

@@ -3,7 +3,7 @@
     <template v-for="(message, index) in internalMessages">
       <template v-if="message.type === 'image'"></template>
       <van-field v-else-if="message.multiple == '1'"
-        :key="index"
+        :key="`${goodsId}-${index}`"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap.textarea"
@@ -11,7 +11,7 @@
         v-model="messageValues[index]">
       </van-field>
       <van-field v-else
-        :key="index"
+        :key="`${goodsId}-${index}`"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap[message.type]"
@@ -39,7 +39,8 @@ export default {
 
   props: {
     messages: Array,
-    messagePlaceholderMap: Object
+    messagePlaceholderMap: Object,
+    goodsId: [Number, String]
   },
 
   data() {

packages/sku/containers/SkuContainer.vue

@@ -51,6 +51,7 @@
          <slot name="sku-messages">
             <van-sku-messages
               ref="skuMessages"
+              :goodsId="goodsId"
               :messagePlaceholderMap="messagePlaceholderMap"
               :messages="sku.messages">
             </van-sku-messages>
@@ -98,6 +99,7 @@ export default {
 
   props: {
     goods: Object,
+    goodsId: [Number, String],
     initialSku: {
       type: Object,
       default() {
@@ -313,6 +315,7 @@ export default {
         return;
       }
       this.$emit(type, {
+        goodsId: this.goodsId,
         selectedNum: this.selectedNum,
         selectedSkuComb: this.selectedSkuComb,
         messages: this.getSkuMessages(),

packages/vant-css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",