From 647bca20428df45695dc5da54a160e1b4d28fe0b Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 13 Dec 2024 20:25:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                   | 16 ++++++++--------
 src/pages/imaotai/iitem/list.vue |  2 +-
 src/pages/imaotai/iuser/add.vue  |  2 +-
 src/pages/imaotai/iuser/edit.vue |  5 ++++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 80e6a8d..8aa1c8b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -142,8 +142,8 @@
     "list": [
       {
         "pagePath": "pages/imaotai/iuser/list",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
+        "iconPath": "static/images/tabbar/home.png",
+        "selectedIconPath": "static/images/tabbar/home_.png",
         "text": "账号管理"
       },
       {
@@ -152,12 +152,12 @@
         "selectedIconPath": "static/images/tabbar/statistic_.png",
         "text": "预约记录"
       },
-      // {
-      //   "pagePath": "pages/imaotai/iitem/list",
-      //   "iconPath": "static/images/tabbar/statistic.png",
-      //   "selectedIconPath": "static/images/tabbar/statistic_.png",
-      //   "text": "商品"
-      // },
+      {
+        "pagePath": "pages/imaotai/iitem/list",
+        "iconPath": "static/images/tabbar/work.png",
+        "selectedIconPath": "static/images/tabbar/work.png",
+        "text": "商品"
+      },
       // {
       //   "pagePath": "pages/imaotai/ishop/list",
       //   "iconPath": "static/images/tabbar/statistic.png",
diff --git a/src/pages/imaotai/iitem/list.vue b/src/pages/imaotai/iitem/list.vue
index 5f6345c..1c11d78 100644
--- a/src/pages/imaotai/iitem/list.vue
+++ b/src/pages/imaotai/iitem/list.vue
@@ -12,7 +12,7 @@
         <view class="list-item">
           <view class="item-header">
             <u--text lines="2" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.title+'-'+item.itemCode" size="30rpx" color="#333333" :bold="true"></u--text>
+              :text="item.title+'（'+item.itemCode+'）'" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
           <view class="item-row">
             <image :src="item.pictureV2"></image>
diff --git a/src/pages/imaotai/iuser/add.vue b/src/pages/imaotai/iuser/add.vue
index 500fd31..2d4508c 100644
--- a/src/pages/imaotai/iuser/add.vue
+++ b/src/pages/imaotai/iuser/add.vue
@@ -23,7 +23,7 @@
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
           <u-form-item label="预约商品" prop="itemCode" required>
-            <mySelectCheckbox v-model="itemSelect" multiple placeholder="请选择预约商品" dataKey="title" dataValue="itemCode" :localdata="itemList"  
+            <mySelectCheckbox v-model="itemSelect" multiple placeholder="请选择预约商品" dataKey="itemCodeTitle" dataValue="itemCode" :localdata="itemList"  
             @change="itemChange"></mySelectCheckbox>
             </u-form-item>
             <u-form-item label="省份" prop="provinceName" required @click="handleProvinceName">
diff --git a/src/pages/imaotai/iuser/edit.vue b/src/pages/imaotai/iuser/edit.vue
index fc5f4d9..cd18515 100644
--- a/src/pages/imaotai/iuser/edit.vue
+++ b/src/pages/imaotai/iuser/edit.vue
@@ -20,7 +20,7 @@
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
           <u-form-item label="预约商品" prop="itemCode" required>
-            <mySelectCheckbox v-model="itemSelect" multiple dataKey="title" dataValue="itemCode" :localdata="itemList"  
+            <mySelectCheckbox v-model="itemSelect" multiple dataKey="itemCodeTitle" dataValue="itemCode" :localdata="itemList"  
             @change="itemChange"></mySelectCheckbox>
             </u-form-item>
             <u-form-item label="省份" prop="provinceName" required @click="handleProvinceName">
@@ -97,6 +97,7 @@ import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const title = ref("账号添加")
 
 const itemSelect = ref([])
+const modelValue = ref([])
 
 const provinceNameList = ref([])
 const showProvinceName = ref(false)
@@ -226,11 +227,13 @@ function  getData() {
     itemSelect.value = []
     if (form.value.itemCode.indexOf('@') == -1 && form.value.itemCode !== '') {
       itemSelect.value.push(form.value.itemCode)
+      modelValue.value.push(form.value.itemCode)
     } else {
       const arr = form.value.itemCode.split('@')
       arr.forEach((e) => {
         if (e !== '') {
           itemSelect.value.push(e)
+          modelValue.value.push(e)
         }
       })
     }