Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/components/shopList/index.vue

@@ -5,7 +5,7 @@
                 <el-input v-model="searhForm.name" placeholder="商品名称"></el-input>
             </el-form-item>
             <el-form-item>
-                <el-select v-model="searhForm.category" placeholder="商品分类">
+                <el-select v-model="searhForm.category" placeholder="商品分类" :disabled="disableCategory">
                     <el-option :label="item.name" :value="item.id" v-for="item in categoryList"
                         :key="item.id"></el-option>
                 </el-select>
@@ -75,6 +75,11 @@
 import { tbShopCategoryGet, tbProduct } from "@/api/shop";
 export default {
     props: {
+        // 是否禁用分类
+        disableCategory: {
+            type: Boolean,
+            default: false
+        },
         // 是否为单选
         radio: {
             type: Boolean,

src/views/application/components/invite_friend/share.vue

@@ -26,7 +26,7 @@
                                     <span class="t">{{ shopInfo.name }}</span>
                                 </div>
                                 <div class="title">{{ form.title }}</div>
-                                <el-image :src="form.shareImg" style="width: 100%;height: 90px;" fit="cover">
+                                <el-image :src="form.shareImg" style="width: 100%;height: 110px;" fit="cover">
                                     <div slot="error" class="image-slot">
                                         <i class="el-icon-folder-delete"></i>
                                     </div>
@@ -337,7 +337,7 @@ export default {
             display: flex;
 
             .content {
-                width: 150px;
+                width: 180px;
                 background-color: #fff;
                 border-radius: 4px;
                 padding: 10px 10px 6px;

src/views/shop/components/addPadPage.vue

@@ -46,7 +46,7 @@
                 <el-button type="primary" :loading="loading" @click="submitHandle">保 存</el-button>
             </div>
         </el-dialog>
-        <shopList ref="shopList" radio @success="selectConfirmGoods" />
+        <shopList ref="shopList" disableCategory radio @success="selectConfirmGoods" />
     </div>
 </template>