020900

package.json

@@ -1,5 +1,5 @@
 {
-	"name": "hxmini",
+	"name": "jiaoyi",
 	"version": "1.6.9",
 	"private": true,
 	"scripts": {

src/layout/components/userbar.vue

@@ -5,8 +5,8 @@
 					<el-icon><el-icon-timer /></el-icon> <span>{{userInfo.vip_at==0?'永久':''+$TOOL.getTime(userInfo.vip_at,'YYYY年MM月DD日')}}</span>
 			</div>
 		</el-tooltip>
-		<div class="screen panel-item hidden-sm-and-down" v-if="userInfo.agent_id>0">
-			<el-icon><el-icon-user /></el-icon> <span>{{userInfo.shop}}</span>
+		<div class="screen panel-item" v-if="userInfo.store_id">
+			<el-icon><el-icon-shop /></el-icon> <span>{{userInfo.shop}}</span>
 		</div>
 		<div class="screen panel-item hidden-sm-and-down" @click="screen">
 			<el-icon><el-icon-full-screen /></el-icon> <span>全屏</span>

src/views/merchant/goods/add.vue

@@ -1,14 +1,23 @@
 <template>
     <el-container>
         <el-main>
-            <el-form ref="dialogForm" :model="formData" :rules="rules" label-width="100px" label-position="top">
-                <el-card shadow="never" header="基础信息">
-                    <el-form-item label="商品品类" prop="category">
-                        <el-cascader v-model="formData.category" :options="categoryData" :props="deptsProps" clearable style="width: 100%;" />
-                        <div class="el-form-item-msg"></div>
-                    </el-form-item>
-                </el-card>
-            </el-form>
+            <el-row :gutter="20">
+                <el-col :span="18">
+                    <el-form ref="dialogForm" :model="formData" :rules="rules" label-width="100px" label-position="top">
+                        <el-card shadow="never" header="基础信息">
+                            <el-form-item label="商品品类" prop="category">
+                                <el-cascader v-model="formData.category" :options="categoryData" :props="deptsProps" clearable style="width: 100%;" />
+                                <div class="el-form-item-msg"></div>
+                            </el-form-item>
+                        </el-card>
+                    </el-form>
+                </el-col>
+                <el-col :span="6">
+                    <el-card shadow="never" header="详情预览">
+
+                    </el-card>
+                </el-col>
+            </el-row>
         </el-main>
         <el-footer style="text-align: center;">
             <el-button @click="reback" size="large">取 消</el-button>
@@ -56,4 +65,8 @@ export default {
         }
     }
 }
-</script>
+</script>
+
+<style>
+
+</style>