diff --git a/vue/src/views/iot/device/device-user.vue b/vue/src/views/iot/device/device-user.vue
index d2e6ee4a..6e3128cc 100644
--- a/vue/src/views/iot/device/device-user.vue
+++ b/vue/src/views/iot/device/device-user.vue
@@ -2,8 +2,8 @@
 <div style="padding-left:20px;">
     <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="selectUser" v-hasPermi="['iot:device:share']">分享设备</el-button>
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="selectUserShareAllDevice" v-hasPermi="['iot:device:share']">分享所有设备</el-button>
+            <el-button type="primary" plain icon="el-icon-share" size="mini" @click="selectUser" v-hasPermi="['iot:device:share']">分享设备</el-button>
+            <!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="selectUserShareAllDevice" v-hasPermi="['iot:device:share']">分享所有设备</el-button> -->
         </el-col>
         <el-col :span="1.5">
             <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
@@ -11,23 +11,25 @@
     </el-row>
 
     <el-table v-loading="loading" :data="deviceUserList" @selection-change="handleSelectionChange" size="mini">
-        <el-table-column label="用户昵称" align="center" prop="userName" width="200" />
-        <el-table-column label="手机号码" align="center" prop="phonenumber" width="200" />
-        <el-table-column label="设备所有者" align="center" prop="isOwner" width="100">
+        <el-table-column label="用户编号" align="center" prop="userId" width="100"/>
+        <el-table-column label="用户名称" align="center" prop="userName"/>
+        <el-table-column label="手机号码" align="center" prop="phonenumber" width="150" />
+        <el-table-column label="用户类型" align="center" prop="isOwner" width="150">
             <template slot-scope="scope">
-                <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isOwner" />
+                <el-tag type="primary" v-if="scope.row.isOwner">设备主人</el-tag>
+                <el-tag type="success" v-else>分享用户</el-tag>
             </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150">
+        <el-table-column label="分享时间" align="center" prop="createTime" width="150">
             <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
             </template>
         </el-table-column>
-        <el-table-column label="备注" align="left" prop="remark" al />
+        <el-table-column label="备注" align="left" prop="remark" header-align="center" min-width="150" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
             <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:device:share']" v-if="scope.row.isOwner==0">备注</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:device:share']" v-if="scope.row.isOwner==0">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:device:share']" v-if="scope.row.isOwner==0">取消分享</el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -218,11 +220,11 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const deviceUser = row;
-            this.$modal.confirm('是否确认删除设备用户编号为"' + deviceUser.deviceId + "-" + deviceUser.userId + '"的数据项？').then(function () {
+            this.$modal.confirm('确认取消分享设备？').then(function () {
                 return delDeviceUser(deviceUser);
             }).then(() => {
                 this.getList();
-                this.$modal.msgSuccess("删除成功");
+                this.$modal.msgSuccess("取消分享成功");
             }).catch(() => {});
         },
         /** 导出按钮操作 */
diff --git a/vue/src/views/iot/product/index.vue b/vue/src/views/iot/product/index.vue
index 13c33f1d..00e60da1 100644
--- a/vue/src/views/iot/product/index.vue
+++ b/vue/src/views/iot/product/index.vue
@@ -54,8 +54,9 @@
                                 <el-descriptions-item label="联网方式">
                                     <dict-tag :options="dict.type.iot_network_method" :value="item.networkMethod" />
                                 </el-descriptions-item>
-                                <el-descriptions-item label="创建时间">
-                                    <span>{{ parseTime(item.createTime, '{y}-{m}-{d}') }}</span>
+                                <el-descriptions-item label="设备授权">
+                                    <el-tag type="success" size="mini" v-if="item.isAuthorize==1">已启用</el-tag>
+                                    <el-tag type="info" size="mini" v-else>未启用</el-tag>
                                 </el-descriptions-item>
                             </el-descriptions>
                         </el-col>
@@ -83,7 +84,7 @@
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-link type="danger" style="padding-left:10px;" :underline="false">该功能暂未实现，参考教程和项目的SDK示例</el-link>
             <el-form label-width="80px">
-                <el-form-item label="选择设备">
+                <el-form-item label="设备类型">
                     <el-radio-group v-model="form.datatype">
                         <el-radio v-for="dict in dict.type.iot_device_chip" :key="dict.value" :label="dict.value" style="margin-top:15px;width:160px;">{{dict.label}}</el-radio>
                     </el-radio-group>
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index 90fbf290..db69b9ce 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -19,11 +19,11 @@
                                 <el-option v-for="dict in dict.type.iot_network_method" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="授权码" prop="networkMethod">
+                        <el-form-item label="设备授权" prop="networkMethod">
                             <el-switch v-model="form.isAuthorize" @change="changeIsAuthorize(form.isAuthorize)" :active-value="1" :inactive-value="0" :disabled="form.status==2" />
                         </el-form-item>
                         <el-form-item label="备注信息" prop="remark">
-                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="4" :readonly="form.status==2" />
+                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" :readonly="form.status==2" />
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
@@ -58,8 +58,13 @@
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                         <el-form-item label="产品图片">
-                            <imageUpload ref="image-upload" :value="form.imgUrl" :limit="form.status==2 ? 0 : 1" :fileSize="1" @input="getImagePath($event)"></imageUpload>
-                            <div class="el-upload__tip" style="color:#f56c6c">提示：上传后需要提交保存</div>
+                            <div v-if="form.status==2 && form.imgUrl==null">
+                                <el-image style="height:145px;height:145px;border-radius:10px;" :preview-src-list="[require('@/assets/images/product.jpg')]" :src="require('@/assets/images/product.jpg')" fit="cover"></el-image>
+                            </div>
+                            <div v-else>
+                                <imageUpload ref="image-upload" :disabled="true" :value="form.imgUrl" :limit="form.status==2 ? 0 : 1" :fileSize="1" @input="getImagePath($event)"></imageUpload>
+                            </div>
+                            <div class="el-upload__tip" style="color:#f56c6c" v-if="form.productId==null || form.productId==0">提示：上传后需要提交保存</div>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -82,7 +87,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="" name="productAuthorize" :disabled="form.productId==0 || form.isAuthorize==0">
-            <span slot="label">产品授权</span>
+            <span slot="label">设备授权</span>
             <product-authorize ref="productAuthorize" :product="form" />
         </el-tab-pane>
 
@@ -199,7 +204,7 @@ export default {
             this.uniqueId = time;
             // 获取产品信息
             let productId = this.$route.query.productId
-            if (productId != null && productId!=0) {
+            if (productId != null && productId != 0) {
                 this.form.productId = Number(productId);
                 this.getProduct();
                 this.getShortCategory();