Merge branch 'dev-auth-1201' into release

* dev-auth-1201:
  关闭后，不应该弹出信息
  按钮关闭问题
  关闭按钮问题
  不能修改
  医生小店只能查看
  只有超级管理员可能关闭
  关闭后没有刷新
  接口返回值status
  编辑变成查看 关闭小店，状态为下线
  传值错误
  参数有问题
  关闭店铺
  关闭医生店铺
  关闭的弹框
  关闭医生店铺
  添加关闭医生小店功能

src/utils/shop/index.js

@@ -78,3 +78,16 @@ export const refundApply = (params) => {
     description: '退货',
   })
 };
+
+// 关闭医生店铺
+export const closeShop = (storeId, status = 0) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/check/${storeId}/${status}`),
+    method: 'put',
+    data: {},
+    description: '关闭医生店铺',
+  })
+};
+
+

src/views/shop/create-shop.vue

@@ -7,7 +7,8 @@
           <p class="title">新建店铺</p>
         </el-col>
         <el-col :span="4" style="text-align: right">
-          <el-button size="small" type="primary" @click="complete">完成</el-button>
+          <el-button size="small" type="primary" :disabled="storeData.tradeStore.storeType == 3" @click="complete">完成</el-button>
+          <el-button size="small" type="primary" @click="back">返回</el-button>
         </el-col>
       </el-row>
         <el-form
@@ -35,7 +36,7 @@
                     class="bg-img"
                 />
                 <img v-if="!formData.storeLogo" class="bg-img" src="../../assets/image/small.png" />
-                <div
+                <div v-if="storeData.tradeStore.storeType == 3"
                     class="img-delete"
                     v-show="imgMouseOver1"
                     @click.stop="deleteImg('storeLogo')"
@@ -55,6 +56,7 @@
           <el-form-item label="店铺名称" prop="storeName">
             <el-col :span="10">
               <el-input
+                  :disabled="storeData.tradeStore.storeType == 3"
                   size="small"
                   v-model="formData.storeName"
                   placeholder="请输入店铺名称"
@@ -67,6 +69,7 @@
           <el-form-item label="店铺简介" prop="storeDescription">
             <el-col :span="10">
               <el-input
+                  :disabled="storeData.tradeStore.storeType == 3"
                   type="textarea"
                   rows="4"
                   maxlength="400"
@@ -258,6 +261,7 @@
             <el-col :span="10">
               <el-form-item label="医生姓名" prop="docName" class="required-label">
                 <el-input
+                    :disabled="storeData.tradeStore.storeType == 3"
                     type="text"
                     maxlength="50"
                     size="small"
@@ -443,7 +447,7 @@
         curmbFirst: '云鹊店铺',
         curmbSecond: '新建店铺',
         isDisabled: false,
-        storeData: {},
+        storeData: null,
         typeList: [
           {
             label: '供货商',
@@ -597,7 +601,7 @@
     created() {
       vm = this;
       this.formData.storeId = this.$route.query.storeId || null;
-      this.storeData = this.$route.query.storeData || {};
+      this.storeData = this.$route.query.storeData || null;
 
       if (this.formData.storeId) {
         this.curmbSecond = '编辑店铺';
@@ -719,6 +723,13 @@
           })
         }
       },
+
+      // 返回
+      back() {
+        this.$router.push({
+          path: '/shop-list'
+        })
+      },
       checkPhone(val) {
         if(!(/^1[3456789]\d{9}$/.test(val))) {
           return false;

src/views/shop/shop-list.vue

@@ -74,9 +74,10 @@
         <el-table-column label="操作" min-width="230" align="center" fixed="right">
           <template slot-scope="scope">
             <div>
-              <el-button @click="editShop(scope.row)" type="text" size="small">编辑</el-button>
+              <el-button @click="editShop(scope.row)" type="text" size="small">{{scope.row.tradeStore.storeType == 3 ? '查看' : '编辑'}}</el-button>
               <el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
               <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
+              <el-button v-if="storageIdType == 1 && (scope.row.tradeStore.storeType == 3 && scope.row.tradeStore.storeStatus == 1)" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
             </div>
           </template>
         </el-table-column>
@@ -99,7 +100,7 @@
 <script>
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { queryStore, queryShopAuth } from '@/utils/shop';
+  import { queryStore, queryShopAuth, closeShop } from '@/utils/shop';
   export default {
     components: {
       BreadCrumb
@@ -142,10 +143,15 @@
         }, {
           label: '医生小店',
           value: 3,
-        }]
+        }],
+        idType: 0,
+        storageIdType: 0,
       }
     },
     created() {
+      // this.idType = localStorage.getItem("storageIdType");
+      this.storageIdType = localStorage.getItem("storageIdType") - 0;
+      console.log(this.storageIdType);
       this.getAddAuth();
       this.searchList();
     },
@@ -238,6 +244,29 @@
         this.searchForm.pageNo = val;
         this.searchList();
       },
+
+      // 关闭医生小店
+      closeShopAction(row) {
+        this.$confirm('确定要关闭店铺吗', '', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+        }).then(() => {
+          closeShop(row.tradeStore.id).then(res => {
+            if (res.code == '000000') {
+              if(res.data.status == 0) {
+                this.$message.error(res.data.message);
+              } else {
+                this.searchList();
+              }              
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        }).catch( () => {
+          // this.$message.error('操作失败');          
+        })
+      },
     },
     filters: {
       storeTypeFormat: function(value){